Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for webpack@2.1.0-beta #128

Merged
merged 1 commit into from
Jul 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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