Skip to content

Commit

Permalink
Merge pull request #53 from weaverryan/webpack3
Browse files Browse the repository at this point in the history
[WIP] upgrading to webpack 3
  • Loading branch information
weaverryan committed Jul 12, 2017
2 parents de3dbf3 + c690d7e commit 46572da
Show file tree
Hide file tree
Showing 3 changed files with 190 additions and 154 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"chalk": "^1.1.3",
"clean-webpack-plugin": "^0.1.16",
"css-loader": "^0.26.2",
"extract-text-webpack-plugin": "^2.1.0",
"extract-text-webpack-plugin": "^3.0.0",
"file-loader": "^0.10.1",
"friendly-errors-webpack-plugin": "^1.6.1",
"fs-extra": "^2.0.0",
Expand All @@ -42,7 +42,7 @@
"pretty-error": "^2.1.1",
"resolve-url-loader": "^2.0.2",
"style-loader": "^0.13.2",
"webpack": "^2.2.0",
"webpack": ">=2.2.0 <4",
"webpack-chunk-hash": "^0.4.0",
"webpack-dev-server": "^2.4.5",
"yargs": "^8.0.1"
Expand Down
2 changes: 1 addition & 1 deletion test/functional.js
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ describe('Functional tests using webpack', function() {
testSetup.runWebpack(config, (webpackAssert) => {
expect(config.outputPath).to.be.a.directory()
.with.files([
'0.38a901b572534329da92.js', // chunks are also versioned
'0.d002be21e9bcf76057e9.js', // chunks are also versioned
'main.292c0347ed1240663cb1.js',
'h1.c84caea6dd12bba7955dee9fedd5fd03.css',
'bg.42ced8eae2254268bb3c65f1e65bd041.css',
Expand Down
Loading

0 comments on commit 46572da

Please sign in to comment.