Skip to content

Commit

Permalink
feat(webpack): add support for [email protected]
Browse files Browse the repository at this point in the history
 - Fixes the error that webpack 2.1.0-beta.7 will throw if not entry or plugins are specified in options.=
 - Update peer dependencies for [email protected]
  • Loading branch information
goldhand authored and joshwiens committed Jan 14, 2017
1 parent 7334dbc commit bdd8c80
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
4 changes: 4 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ function Plugin(
// The webpack tier owns the watch behavior so we want to force it in the config
webpackOptions.watch = true;

// Webpack 2.1.0-beta.7+ will throw in error if both entry and plugins are not specified in options
// https://github.com/webpack/webpack/commit/b3bc5427969e15fd3663d9a1c57dbd1eb2c94805
if(!webpackOptions.entry) webpackOptions.entry = {};

if(!webpackOptions.output) webpackOptions.output = {};

// When using an array, even of length 1, we want to include the index value for the build.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"author": "Tobias Koppers @sokra",
"description": "Use webpack with karma",
"peerDependencies": {
"webpack": "^1.4.0"
"webpack": "^1.4.0 || ^2 || ^2.1.0-beta"
},
"dependencies": {
"async": "~0.9.0",
Expand Down

0 comments on commit bdd8c80

Please sign in to comment.