Skip to content

Commit 157dc84

Browse files
iclantoniclanton
authored
Merge pull request microsoft#59 from Microsoft/ianc/bumping-karma-webpack
Updating karma-webpack to support Webpack 2.X.
2 parents e64f73d + 0c2d723 commit 157dc84

4 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎common/changes/ianc-bumping-karma-webpack_2017-01-20-00-31.json‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"changes": [
3+
{
4+
"packageName": "@microsoft/gulp-core-build-karma",
5+
"comment": "Upgrading webpack-karma to support webpack 2.X",
6+
"type": "patch"
7+
}
8+
],
9+
"email": "ianc@microsoft.com"
10+
}

‎common/npm-shrinkwrap.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎common/temp_modules/rush-gulp-core-build-karma/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"karma-mocha-clean-reporter": "~0.0.1",
2020
"karma-phantomjs-launcher": "~1.0.0",
2121
"karma-sinon-chai": "~1.2.0",
22-
"karma-webpack": "~1.7.0",
22+
"karma-webpack": "~2.0.1",
2323
"lolex": "~1.4.0",
2424
"mocha": "~2.5.3",
2525
"phantomjs-polyfill": "~0.0.2",

‎gulp-core-build-karma/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"karma-mocha-clean-reporter": "~0.0.1",
2727
"karma-phantomjs-launcher": "~1.0.0",
2828
"karma-sinon-chai": "~1.2.0",
29-
"karma-webpack": "~1.7.0",
29+
"karma-webpack": "~2.0.1",
3030
"lolex": "~1.4.0",
3131
"mocha": "~2.5.3",
3232
"phantomjs-polyfill": "~0.0.2",

0 commit comments

Comments
 (0)