Skip to content

Commit 6b690bd

Browse files
chore(libs): Update to uirouter/core 5.0.7, typescript 2.5, rollup 0.50, etc
1 parent 61f7dfe commit 6b690bd

File tree

3 files changed

+707
-121
lines changed

3 files changed

+707
-121
lines changed

package.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"jsnext:main": "lib-esm/index.js",
7474
"typings": "lib/index.d.ts",
7575
"dependencies": {
76-
"@uirouter/core": "=5.0.6"
76+
"@uirouter/core": "5.0.7"
7777
},
7878
"peerDependencies": {
7979
"angular": ">=1.2.0"
@@ -84,12 +84,12 @@
8484
"@types/angular-mocks": "^1.5.5",
8585
"@types/jasmine": "^2.2.34",
8686
"@types/jquery": "^1.10.31",
87-
"@uirouter/publish-scripts": "^1.0.6",
88-
"awesome-typescript-loader": "3.0.0-beta.10",
87+
"@uirouter/publish-scripts": "1.0.7",
88+
"awesome-typescript-loader": "3.2.3",
8989
"babel-core": "^5.8.14",
9090
"clone": "^1.0.2",
91-
"conventional-changelog": "^1.1.0",
92-
"conventional-changelog-cli": "^1.1.1",
91+
"conventional-changelog": "1.1.5",
92+
"conventional-changelog-cli": "1.3.3",
9393
"dts-downlevel": "^0.3.0",
9494
"glob": "^7.0.5",
9595
"jasmine-core": "^2.4.1",
@@ -106,21 +106,21 @@
106106
"readline-sync": "^1.4.5",
107107
"remap-istanbul": "^0.6.3",
108108
"replace-in-file": "^2.0.3",
109-
"rollup": "^0.38.0",
110-
"rollup-plugin-node-resolve": "^2.0.0",
111-
"rollup-plugin-progress": "^0.1.0",
109+
"rollup": "0.50.0",
110+
"rollup-plugin-node-resolve": "3.0.0",
111+
"rollup-plugin-progress": "0.4.0",
112112
"rollup-plugin-sourcemaps": "^0.4.1",
113-
"rollup-plugin-uglify": "^1.0.1",
114-
"rollup-plugin-visualizer": "^0.1.5",
113+
"rollup-plugin-uglify": "2.0.1",
114+
"rollup-plugin-visualizer": "0.3.1",
115115
"shelljs": "^0.7.0",
116-
"shx": "^0.1.4",
116+
"shx": "0.2.2",
117117
"systemjs": "^0.18.4",
118-
"tslint": "^5.1.0",
118+
"tslint": "5.7.0",
119119
"typedoc": "~0.5.0",
120120
"typedoc-plugin-external-module-name": "^1.0.2",
121121
"typedoc-plugin-internal-external": "^1.0.0",
122122
"typedoc-plugin-ui-router": "^1.0.0",
123-
"typescript": "~2.4.0",
123+
"typescript": "2.5.3",
124124
"ui-router-typedoc-themes": "^1.0.1",
125125
"watch": "^0.18.0",
126126
"webpack": "1.x",

rollup.config.js

+48-28
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ import progress from 'rollup-plugin-progress';
44
import sourcemaps from 'rollup-plugin-sourcemaps';
55
import visualizer from 'rollup-plugin-visualizer';
66

7-
var MINIFY = process.env.MINIFY;
8-
var MONOLITHIC = process.env.MONOLITHIC;
9-
var ROUTER = process.env.ROUTER;
10-
var EVENTS = process.env.EVENTS;
11-
var RESOLVE = process.env.RESOLVE;
7+
const MINIFY = process.env.MINIFY;
8+
const MONOLITHIC = process.env.MONOLITHIC;
9+
const ROUTER = process.env.ROUTER;
10+
const EVENTS = process.env.EVENTS;
11+
const RESOLVE = process.env.RESOLVE;
1212

13-
var pkg = require('./package.json');
14-
var banner =
13+
const pkg = require('./package.json');
14+
let banner =
1515
`/**
1616
* ${pkg.description}`;
1717
if (ROUTER && MONOLITHIC) {
@@ -30,12 +30,20 @@ banner += `
3030
* @license MIT License, http://www.opensource.org/licenses/MIT
3131
*/`;
3232

33-
var uglifyOpts = { output: {} };
33+
const uglifyOpts = { output: {} };
3434
// retain multiline comment with @license
3535
uglifyOpts.output.comments = (node, comment) =>
3636
comment.type === 'comment2' && /@license/i.test(comment.value);
3737

38-
var plugins = [
38+
const onwarn = (warning) => {
39+
// Suppress this error message... https://github.com/rollup/rollup/wiki/Troubleshooting#this-is-undefined
40+
const ignores = ['THIS_IS_UNDEFINED'];
41+
if (!ignores.some(code => code === warning.code)) {
42+
console.error(warning.message);
43+
}
44+
};
45+
46+
const plugins = [
3947
nodeResolve({jsnext: true}),
4048
progress({ clearLine: false }),
4149
sourcemaps(),
@@ -44,47 +52,59 @@ var plugins = [
4452
if (MINIFY) plugins.push(uglify(uglifyOpts));
4553
if (ROUTER && MINIFY) plugins.push(visualizer({ sourcemap: true }));
4654

47-
var extension = MINIFY ? ".min.js" : ".js";
55+
const extension = MINIFY ? ".min.js" : ".js";
4856

4957
const BASE_CONFIG = {
50-
sourceMap: true,
51-
format: 'umd',
58+
sourcemap: true,
5259
exports: 'named',
5360
plugins: plugins,
5461
banner: banner,
62+
onwarn: onwarn,
5563
};
5664

5765
const ROUTER_CONFIG = Object.assign({
58-
moduleName: '@uirouter/angularjs',
59-
entry: 'lib-esm/index.js',
60-
dest: 'release/ui-router-angularjs' + extension,
61-
globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
66+
input: 'lib-esm/index.js',
6267
external: ['angular', '@uirouter/core'],
68+
output: {
69+
file: 'release/ui-router-angularjs' + extension,
70+
format: 'umd',
71+
name: '@uirouter/angularjs',
72+
globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
73+
},
6374
}, BASE_CONFIG);
6475

6576
// Also bundles the code from @uirouter/core into the same bundle
6677
const MONOLITHIC_ROUTER_CONFIG = Object.assign({
67-
moduleName: '@uirouter/angularjs',
68-
entry: 'lib-esm/index.js',
69-
dest: 'release/angular-ui-router' + extension,
70-
globals: { angular: 'angular' },
78+
input: 'lib-esm/index.js',
7179
external: 'angular',
80+
output: {
81+
file: 'release/angular-ui-router' + extension,
82+
format: 'umd',
83+
name: '@uirouter/angularjs',
84+
globals: { angular: 'angular' },
85+
},
7286
}, BASE_CONFIG);
7387

7488
const EVENTS_CONFIG = Object.assign({}, BASE_CONFIG, {
75-
moduleName: '@uirouter/angularjs-state-events',
76-
entry: 'lib-esm/legacy/stateEvents.js',
77-
dest: 'release/stateEvents' + extension,
78-
globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
89+
input: 'lib-esm/legacy/stateEvents.js',
7990
external: ['angular', '@uirouter/core'],
91+
output: {
92+
file: 'release/stateEvents' + extension,
93+
format: 'umd',
94+
name: '@uirouter/angularjs-state-events',
95+
globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
96+
},
8097
});
8198

8299
const RESOLVE_CONFIG = Object.assign({}, BASE_CONFIG, {
83-
moduleName: '@uirouter/angularjs-resolve-service',
84-
entry: 'lib-esm/legacy/resolveService.js',
85-
dest: 'release/resolveService' + extension,
86-
globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
100+
input: 'lib-esm/legacy/resolveService.js',
87101
external: ['angular', '@uirouter/core'],
102+
output: {
103+
file: 'release/resolveService' + extension,
104+
format: 'umd',
105+
name: '@uirouter/angularjs-resolve-service',
106+
globals: { angular: 'angular', '@uirouter/core': '@uirouter/core' },
107+
},
88108
});
89109

90110
const CONFIG =

0 commit comments

Comments
 (0)