Merge branch 'master' into universal-inline

Author: mlrawlings

CHANGELOG.md

@@ -2,18 +2,27 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [3.3.1](https://github.com/webpack/webpack-dev-server/compare/v3.3.0...v3.3.1) (2019-04-09)
+
+
+### Bug Fixes
+
+* **regression:** always get necessary stats for hmr ([#1780](https://github.com/webpack/webpack-dev-server/issues/1780)) ([66b04a9](https://github.com/webpack/webpack-dev-server/commit/66b04a9))
+* **regression:** host and port can be undefined or null ([#1779](https://github.com/webpack/webpack-dev-server/issues/1779)) ([028ceee](https://github.com/webpack/webpack-dev-server/commit/028ceee))
+* only add entries after compilers have been created ([#1774](https://github.com/webpack/webpack-dev-server/issues/1774)) ([b31cbaa](https://github.com/webpack/webpack-dev-server/commit/b31cbaa))
+
+
+
 # [3.3.0](https://github.com/webpack/webpack-dev-server/compare/v3.2.1...v3.3.0) (2019-04-08)
 
 
 ### Bug Fixes
 
-* **deps:** update dependency yargs to v12.0.5 ([#1707](https://github.com/webpack/webpack-dev-server/issues/1707)) ([fa17131](https://github.com/webpack/webpack-dev-server/commit/fa17131))
-* **example/util:** use path.resolve ([#1678](https://github.com/webpack/webpack-dev-server/issues/1678)) ([5d1476e](https://github.com/webpack/webpack-dev-server/commit/5d1476e)), closes [#1428](https://github.com/webpack/webpack-dev-server/issues/1428)
 * compatibility with [email protected] ([#1754](https://github.com/webpack/webpack-dev-server/issues/1754)) ([fd7cb0d](https://github.com/webpack/webpack-dev-server/commit/fd7cb0d))
 * ignore proxy when bypass return false ([#1696](https://github.com/webpack/webpack-dev-server/issues/1696)) ([aa7de77](https://github.com/webpack/webpack-dev-server/commit/aa7de77))
 * respect stats option from webpack config ([#1665](https://github.com/webpack/webpack-dev-server/issues/1665)) ([efaa740](https://github.com/webpack/webpack-dev-server/commit/efaa740))
 * use location.port when location.hostname is used to infer HMR socket URL ([#1664](https://github.com/webpack/webpack-dev-server/issues/1664)) ([2f7f052](https://github.com/webpack/webpack-dev-server/commit/2f7f052))
-* **Server:** validate express.static.mime.types ([#1765](https://github.com/webpack/webpack-dev-server/issues/1765)) ([919ff77](https://github.com/webpack/webpack-dev-server/commit/919ff77))
+* don't crash with express.static.mime.types ([#1765](https://github.com/webpack/webpack-dev-server/issues/1765)) ([919ff77](https://github.com/webpack/webpack-dev-server/commit/919ff77))
 
 
 ### Features

CONTRIBUTING.md

@@ -39,11 +39,16 @@ Pull requests often need some real-world testing.
 
 1. In your `package.json`, change the line with `webpack-dev-server` to:
 
-```json
-"webpack-dev-server": "github:webpack/webpack-dev-server#pull/<ID>/head"
-```
+  ```json
+  "webpack-dev-server": "<PATH>"
+  ```
 
-`<ID>` is the ID of the pull request.
+  `<PATH>`:
+
+  - `github:webpack/webpack-dev-server#pull/<ID>/head`
+  where `<ID>` is the ID of the pull request.
+
+  - `file:../path/to/local/webapck-dev-server/fork` is the path to your local repo, just make sure you hit the correct path
 
 2. Run `npm install`.
 

bin/webpack-dev-server.js

@@ -20,7 +20,6 @@ const webpack = require('webpack');
 const options = require('./options');
 const Server = require('../lib/Server');
 
-const addEntries = require('../lib/utils/addEntries');
 const colors = require('../lib/utils/colors');
 const createConfig = require('../lib/utils/createConfig');
 const createDomain = require('../lib/utils/createDomain');
@@ -140,8 +139,6 @@ function processOptions(config) {
 function startDevServer(config, options) {
   const log = createLogger(options);
 
-  addEntries(config, options);
-
   let compiler;
 
   try {

lib/Server.js

@@ -97,10 +97,8 @@ class Server {
 
     updateCompiler(compiler, options);
 
-    this.stats =
-      options.stats && Object.keys(options.stats).length
-        ? options.stats
-        : Server.DEFAULT_STATS;
+    this.originalStats =
+      options.stats && Object.keys(options.stats).length ? options.stats : {};
 
     this.hot = options.hot || options.hotOnly;
     this.headers = options.headers;
@@ -724,7 +722,13 @@ class Server {
   }
 
   getStats(statsObj) {
-    return statsObj.toJson(this.stats);
+    const stats = Server.DEFAULT_STATS;
+
+    if (this.originalStats.warningsFilter) {
+      stats.warningsFilter = this.originalStats.warningsFilter;
+    }
+
+    return statsObj.toJson(stats);
   }
 
   use() {

lib/options.json

@@ -17,7 +17,27 @@
       "type": "boolean"
     },
     "host": {
-      "type": "string"
+      "anyOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
+    },
+    "port": {
+      "anyOf": [
+        {
+          "type": "number"
+        },
+        {
+          "type": "string"
+        },
+        {
+          "type": "null"
+        }
+      ]
     },
     "allowedHosts": {
       "type": "array",
@@ -41,16 +61,6 @@
     "publicPath": {
       "type": "string"
     },
-    "port": {
-      "anyOf": [
-        {
-          "type": "number"
-        },
-        {
-          "type": "string"
-        }
-      ]
-    },
     "socket": {
       "type": "string"
     },

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",

package.json

@@ -12,38 +12,38 @@ describe('Before And After options', () => {
     server = helper.start(
       config,
       {
-        before: (app, server, compiler) => {
-          if (!app) {
+        before: (appArg, serverArg, compilerArg) => {
+          if (!appArg) {
             throw new Error('app is not defined');
           }
 
-          if (!server) {
+          if (!serverArg) {
             throw new Error('server is not defined');
           }
 
-          if (!compiler) {
+          if (!compilerArg) {
             throw new Error('compiler is not defined');
           }
 
-          app.get('/before/some/path', (req, res) => {
-            res.send('before');
+          appArg.get('/before/some/path', (_, response) => {
+            response.send('before');
           });
         },
-        after: (app, server, compiler) => {
-          if (!app) {
+        after: (appArg, serverArg, compilerArg) => {
+          if (!appArg) {
             throw new Error('app is not defined');
           }
 
-          if (!server) {
+          if (!serverArg) {
             throw new Error('server is not defined');
           }
 
-          if (!compiler) {
+          if (!compilerArg) {
             throw new Error('compiler is not defined');
           }
 
-          app.get('/after/some/path', (req, res) => {
-            res.send('after');
+          appArg.get('/after/some/path', (_, response) => {
+            response.send('after');
           });
         },
       },

test/BeforeAndAfter.test.js

@@ -68,6 +68,32 @@ describe('createConfig', () => {
     expect(config).toMatchSnapshot();
   });
 
+  it('host option (undefined)', () => {
+    const config = createConfig(
+      webpackConfig,
+      Object.assign({}, argv, {
+        // eslint-disable-next-line no-undefined
+        host: undefined,
+      }),
+      { port: 8080 }
+    );
+
+    expect(config).toMatchSnapshot();
+  });
+
+  it('host option (null)', () => {
+    const config = createConfig(
+      webpackConfig,
+      Object.assign({}, argv, {
+        // eslint-disable-next-line no-undefined
+        host: null,
+      }),
+      { port: 8080 }
+    );
+
+    expect(config).toMatchSnapshot();
+  });
+
   it('host option (devServer config)', () => {
     const config = createConfig(
       Object.assign({}, webpackConfig, { devServer: { host: 'example.dev' } }),
@@ -893,6 +919,38 @@ describe('createConfig', () => {
     expect(config).toMatchSnapshot();
   });
 
+  it('port option (same) (string)', () => {
+    const config = createConfig(
+      webpackConfig,
+      Object.assign({}, argv, { port: '9090' }),
+      { port: '9090' }
+    );
+
+    expect(config).toMatchSnapshot();
+  });
+
+  it('port option (same) (null)', () => {
+    const config = createConfig(
+      webpackConfig,
+      Object.assign({}, argv, { port: null }),
+      { port: null }
+    );
+
+    expect(config).toMatchSnapshot();
+  });
+
+  it('port option (same) (undefined)', () => {
+    const config = createConfig(
+      webpackConfig,
+      // eslint-disable-next-line no-undefined
+      Object.assign({}, argv, { port: undefined }),
+      // eslint-disable-next-line no-undefined
+      { port: undefined }
+    );
+
+    expect(config).toMatchSnapshot();
+  });
+
   it('port option (difference)', () => {
     const config = createConfig(
       webpackConfig,