updating deps and patching as necessary

webpack · Jan 5, 2018 · 00e8500 · 00e8500
1 parent 082ddae
commit 00e8500
Show file tree

Hide file tree

Showing 6 changed files with 2,033 additions and 616 deletions.
diff --git a/bin/webpack-dev-server.js b/bin/webpack-dev-server.js
@@ -55,7 +55,7 @@ require('webpack/bin/config-yargs')(yargs);
 
 // It is important that this is done after the webpack yargs config,
 // so it overrides webpack's version info.
-yargs.version(versionInfo);
+yargs.version(versionInfo());
 
 const ADVANCED_GROUP = 'Advanced options:';
 const DISPLAY_GROUP = 'Stats options:';

diff --git a/lib/Server.js b/lib/Server.js
@@ -80,8 +80,16 @@ function Server(compiler, options) {
     res.send('Invalid Host header');
   });
 
+  const wdmOptions = {};
+
+  if (options.quiet === true) {
+    wdmOptions.logLevel = 'silent';
+  }
+  if (options.noInfo === true) {
+    wdmOptions.logLevel = 'warn';
+  }
   // middleware for serving webpack bundle
-  this.middleware = webpackDevMiddleware(compiler, options);
+  this.middleware = webpackDevMiddleware(compiler, Object.assign({}, options, wdmOptions));
 
   app.get('/__webpack_dev_server__/live.bundle.js', (req, res) => {
     res.setHeader('Content-Type', 'application/javascript');