Skip to content
This repository was archived by the owner on May 26, 2023. It is now read-only.

Commit bd6046a

Browse files
chore(test): Switch to fork-ts-checker-webpack-plugin. Update libs
1 parent 03d9234 commit bd6046a

File tree

4 files changed

+624
-1758
lines changed

4 files changed

+624
-1758
lines changed

karma.conf.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ function karmaServedFiles(ngVersion) {
3131
}
3232

3333
var webpackConfig = require('./webpack.config.js');
34-
webpackConfig.entry = {};
35-
webpackConfig.plugins = [];
3634
webpackConfig.devtool = 'inline-source-map';
3735

3836
module.exports = function(config) {

package.json

Lines changed: 12 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -81,31 +81,23 @@
8181
"devDependencies": {
8282
"@types/angular": "^1.5.14",
8383
"@types/angular-animate": "^1.5.5",
84-
"@types/angular-mocks": "^1.5.5",
85-
"@types/jasmine": "^2.2.34",
84+
"@types/angular-mocks": "1.5.11",
85+
"@types/jasmine": "2.6.0",
8686
"@types/jquery": "^1.10.31",
8787
"@uirouter/publish-scripts": "1.0.7",
88-
"awesome-typescript-loader": "3.2.3",
89-
"babel-core": "^5.8.14",
90-
"clone": "^1.0.2",
91-
"conventional-changelog": "1.1.5",
92-
"conventional-changelog-cli": "1.3.3",
88+
"conventional-changelog": "1.1.6",
89+
"conventional-changelog-cli": "1.3.4",
9390
"dts-downlevel": "^0.3.0",
94-
"glob": "^7.0.5",
95-
"jasmine-core": "^2.4.1",
96-
"karma": "^1.2.0",
97-
"karma-chrome-launcher": "~0.1.0",
98-
"karma-coverage": "^0.5.3",
91+
"fork-ts-checker-webpack-plugin": "^0.2.8",
92+
"jasmine-core": "2.8.0",
93+
"karma": "1.7.1",
94+
"karma-chrome-launcher": "2.2.0",
9995
"karma-jasmine": "^1.0.2",
10096
"karma-phantomjs-launcher": "^1.0.2",
101-
"karma-script-launcher": "~0.1.0",
10297
"karma-sourcemap-loader": "^0.3.7",
103-
"karma-systemjs": "^0.7.2",
104-
"karma-webpack": "^1.8.0",
98+
"karma-webpack": "2.0.4",
10599
"lodash": "^4.5.1",
106-
"readline-sync": "^1.4.5",
107-
"remap-istanbul": "^0.6.3",
108-
"replace-in-file": "^2.0.3",
100+
"replace-in-file": "2.6.4",
109101
"rollup": "0.50.0",
110102
"rollup-plugin-node-resolve": "3.0.0",
111103
"rollup-plugin-progress": "0.4.0",
@@ -114,7 +106,7 @@
114106
"rollup-plugin-visualizer": "0.3.1",
115107
"shelljs": "^0.7.0",
116108
"shx": "0.2.2",
117-
"systemjs": "^0.18.4",
109+
"ts-loader": "^2.3.7",
118110
"tslint": "5.7.0",
119111
"typedoc": "~0.5.0",
120112
"typedoc-plugin-external-module-name": "^1.0.2",
@@ -123,8 +115,7 @@
123115
"typescript": "2.5.3",
124116
"ui-router-typedoc-themes": "^1.0.1",
125117
"watch": "^0.18.0",
126-
"webpack": "1.x",
127-
"webpack-dev-server": "1.x",
118+
"webpack": "3.6.0",
128119
"yargs": "^4.2.0"
129120
}
130121
}

webpack.config.js

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,27 @@
1-
var pkg = require('./package.json');
2-
var banner = pkg.description + '\n' +
3-
'@version v' + pkg.version + '\n' +
4-
'@link ' + pkg.homepage + '\n' +
5-
'@license MIT License, http://www.opensource.org/licenses/MIT';
1+
const ForkTsCheckerWebpackPlugin = require('fork-ts-checker-webpack-plugin');
62

7-
var webpack = require('webpack');
83
module.exports = {
94
entry: {
10-
"angular-ui-router": "./src/index.ts",
11-
"angular-ui-router.min": "./src/index.ts",
12-
"stateEvents": "./src/legacy/stateEvents.ts",
13-
"stateEvents.min": "./src/legacy/stateEvents.ts",
5+
'angular-ui-router': './src/index.ts',
6+
'stateEvents': './src/legacy/stateEvents.ts',
147
},
158

16-
output: {
17-
path: __dirname + "/release",
18-
filename: "[name].js",
19-
libraryTarget: "umd",
20-
library: "@uirouter/angularjs",
21-
umdNamedDefine: true
22-
},
23-
24-
devtool: 'source-map',
25-
269
resolve: {
27-
modulesDirectories: ['node_modules'],
28-
extensions: ['', '.js', '.ts']
10+
modules: ['node_modules'],
11+
extensions: ['.js', '.jsx', '.ts', '.tsx']
2912
},
3013

31-
plugins: [
32-
new webpack.optimize.UglifyJsPlugin({
33-
include: /\.min\.js$/, minimize: true
34-
}),
35-
new webpack.BannerPlugin(banner)
36-
],
37-
3814
module: {
39-
loaders: [
40-
{ test: /\.tsx?$/, loader: "awesome-typescript-loader?noEmit=true" }
15+
rules: [
16+
{ test: /\.tsx?$/, loader: 'ts-loader', options: { transpileOnly: true } }
4117
]
4218
},
4319

44-
ts: {
45-
compilerOptions: {
46-
declaration: false
47-
}
48-
},
49-
50-
externals: {
51-
"angular": { root: 'angular', amd: 'angular', commonjs2: 'angular', commonjs: 'angular' }
52-
}
20+
stats: false,
21+
22+
plugins: [
23+
new ForkTsCheckerWebpackPlugin(),
24+
],
25+
26+
externals: [ 'angular' ]
5327
};

0 commit comments

Comments
 (0)