Skip to content

Commit 698f3b9

Browse files
authored
Merge pull request #7 from angular-redux/es-chore-update-webpack
Update Webpack / Use Yarn
2 parents 3a01cfc + e1f6e86 commit 698f3b9

File tree

3 files changed

+3213
-9
lines changed

3 files changed

+3213
-9
lines changed

karma.conf.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module.exports = function (karma) {
4040
logLevel: karma.LOG_INFO,
4141
autoWatch: true,
4242
singleRun: false,
43-
webpackServer: { noInfo: true },
43+
webpackServer: { noInfo: false },
4444
webpack: {
4545
devtool: 'inline-source-map',
4646
resolve: {

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@
1717
"clean:post": "rimraf **/*.ngsummary.json",
1818
"postversion": "npm run build"
1919
},
20-
"repository": {
21-
"type": "git",
22-
"url": "git+https://github.com/angular-redux/redux-observable-decorator.git"
23-
},
20+
"repository": "git+https://github.com/angular-redux/redux-observable-decorator.git",
2421
"author": "Evan Schultz",
2522
"license": "MIT",
2623
"bugs": {
@@ -45,14 +42,14 @@
4542
"core-js": "^2.4.1",
4643
"istanbul-instrumenter-loader": "^1.1.0",
4744
"jasmine-core": "^2.5.2",
48-
"karma": "^1.3.0",
45+
"karma": "^1.4.1",
4946
"karma-chrome-launcher": "^2.0.0",
5047
"karma-coverage": "^1.1.1",
5148
"karma-jasmine": "^1.1.0",
5249
"karma-mocha-reporter": "^2.2.1",
5350
"karma-sourcemap-loader": "^0.3.7",
54-
"karma-typescript-preprocessor": "^0.3.0",
55-
"karma-webpack": "^1.8.0",
51+
"karma-typescript-preprocessor": "^0.3.1",
52+
"karma-webpack": "^2.0.2",
5653
"redux": "^3.6.0",
5754
"redux-observable": "^0.12.2",
5855
"reflect-metadata": "^0.1.8",
@@ -61,8 +58,9 @@
6158
"ts-loader": "^1.3.3",
6259
"tslint": "^4.1.1",
6360
"tslint-loader": "^3.3.0",
61+
"typescript": "latest",
6462
"uglifyjs": "^2.4.10",
65-
"webpack": "^2.1.0-beta.28",
63+
"webpack": "^2.2.1",
6664
"zone.js": "^0.7.4"
6765
}
6866
}

0 commit comments

Comments
 (0)