Merge branch 'next' of github.com:webpack/webpack-dev-server into next

webpack · Dec 19, 2017 · 3f54bce · 3f54bce
2 parents d982dd7 + fcfe099
commit 3f54bce
Show file tree

Hide file tree

Showing 3 changed files with 2,561 additions and 236 deletions.
diff --git a/cli.js b/cli.js
@@ -5,7 +5,7 @@
 require('./lib/polyfills');
 require('loud-rejection/register');
 
-const convertArgv = require('webpack/bin/convert-argv');
+const convertArgv = require('webpack-cli/bin/convert-argv');
 const debug = require('debug')('webpack-dev-server');
 const importLocal = require('import-local');
 const updateNotifier = require('update-notifier');