Skip to content

Commit

Permalink
updating deps and patching as necessary
Browse files Browse the repository at this point in the history
  • Loading branch information
shellscape committed Jan 5, 2018
1 parent 082ddae commit 00e8500
Show file tree
Hide file tree
Showing 6 changed files with 2,033 additions and 616 deletions.
2 changes: 1 addition & 1 deletion bin/webpack-dev-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:';
Expand Down
10 changes: 9 additions & 1 deletion lib/Server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
Loading

0 comments on commit 00e8500

Please sign in to comment.