webpack-dev-server 3.2.0 → 3.2.1

package/CHANGELOG.md

@@ -2,21 +2,15 @@
 
 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.2.0](https://github.com/webpack/webpack-dev-server/compare/v3.1.14...v3.2.0) (2019-02-20)
+## [3.2.1](https://github.com/webpack/webpack-dev-server/compare/v3.2.0...v3.2.1) (2019-02-25)
 
 
 ### Bug Fixes
 
-* allow single object proxy config ([#1633](https://github.com/webpack/webpack-dev-server/issues/1633)) ([252ea4f](https://github.com/webpack/webpack-dev-server/commit/252ea4f))
-* SPDY fails in node >= 11.1.0 ([#1660](https://github.com/webpack/webpack-dev-server/issues/1660)) ([b92e5fd](https://github.com/webpack/webpack-dev-server/commit/b92e5fd))
-
-
-### Features
-
-* add `sockPath` option (`options.sockPath`) ([#1553](https://github.com/webpack/webpack-dev-server/issues/1553)) ([4bf1f76](https://github.com/webpack/webpack-dev-server/commit/4bf1f76))
-* allow to use `ca`, `pfx`, `key` and `cert` as string ([#1542](https://github.com/webpack/webpack-dev-server/issues/1542)) ([0b89fd9](https://github.com/webpack/webpack-dev-server/commit/0b89fd9))
-* automatically add the HMR plugin when hot or hotOnly is enabled ([#1612](https://github.com/webpack/webpack-dev-server/issues/1612)) ([178e6cc](https://github.com/webpack/webpack-dev-server/commit/178e6cc))
-* set `development` mode by default when unspecified ([#1653](https://github.com/webpack/webpack-dev-server/issues/1653)) ([5ea376b](https://github.com/webpack/webpack-dev-server/commit/5ea376b))
+* deprecation message about `setup` now warning about `v4` ([#1684](https://github.com/webpack/webpack-dev-server/issues/1684)) ([523a6ec](https://github.com/webpack/webpack-dev-server/commit/523a6ec))
+* **regression:** allow `ca`, `key` and `cert` will be string ([#1676](https://github.com/webpack/webpack-dev-server/issues/1676)) ([b8d5c1e](https://github.com/webpack/webpack-dev-server/commit/b8d5c1e))
+* **regression:** handle `key`, `cert`, `cacert` and `pfx` in CLI ([#1688](https://github.com/webpack/webpack-dev-server/issues/1688)) ([4b2076c](https://github.com/webpack/webpack-dev-server/commit/4b2076c))
+* **regression:** problem with `idb-connector` after update `internal-ip` ([#1691](https://github.com/webpack/webpack-dev-server/issues/1691)) ([eb48691](https://github.com/webpack/webpack-dev-server/commit/eb48691))
 
 
 

package/bin/webpack-dev-server.js

@@ -4,14 +4,8 @@
 
 /* eslint-disable
   import/order,
-  import/no-extraneous-dependencies,
-  global-require,
   no-shadow,
-  no-console,
-  multiline-ternary,
-  arrow-parens,
-  array-bracket-spacing,
-  space-before-function-paren
+  no-console
 */
 const debug = require('debug')('webpack-dev-server');
 
@@ -26,14 +20,16 @@ const webpack = require('webpack');
 
 const options = require('./options');
 
-const { colors, status, version, bonjour } = require('./utils');
-
 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');
 const createLogger = require('../lib/utils/createLogger');
-const createConfig = require('../lib/utils/createConfig');
+const getVersions = require('../lib/utils/getVersions');
+const runBonjour = require('../lib/utils/runBonjour');
+const status = require('../lib/utils/status');
 
 let server;
 
@@ -74,17 +70,20 @@ try {
 }
 
 yargs.usage(
-  `${version()}\nUsage:  https://webpack.js.org/configuration/dev-server/`
+  `${getVersions()}\nUsage:  https://webpack.js.org/configuration/dev-server/`
 );
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 require('webpack-cli/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(version());
+yargs.version(getVersions());
 yargs.options(options);
 
 const argv = yargs.argv;
 
+// eslint-disable-next-line import/no-extraneous-dependencies
 const config = require('webpack-cli/bin/convert-argv')(yargs, argv, {
   outputFilename: '/bundle.js',
 });
@@ -217,7 +216,7 @@ function startDevServer(config, options) {
       }
 
       if (options.bonjour) {
-        bonjour(options);
+        runBonjour(options);
       }
 
       const uri = createDomain(options, server.listeningApp) + suffix;

package/lib/Server.js

@@ -4,10 +4,7 @@
   import/order,
   no-shadow,
   no-undefined,
-  func-names,
-  multiline-ternary,
-  array-bracket-spacing,
-  space-before-function-paren
+  func-names
 */
 const fs = require('fs');
 const path = require('path');
@@ -505,7 +502,7 @@ class Server {
       setup: () => {
         if (typeof options.setup === 'function') {
           this.log.warn(
-            'The `setup` option is deprecated and will be removed in v3. Please update your config to use `before`'
+            'The `setup` option is deprecated and will be removed in v4. Please update your config to use `before`'
           );
 
           options.setup(app, this);
@@ -570,8 +567,21 @@ class Server {
         const value = options.https[property];
         const isBuffer = value instanceof Buffer;
 
-        if (value && !isBuffer && fs.lstatSync(value).isFile()) {
-          options.https[property] = fs.readFileSync(path.resolve(value));
+        if (value && !isBuffer) {
+          let stats = null;
+
+          try {
+            stats = fs.lstatSync(value).isFile();
+          } catch (error) {
+            // ignore error
+          }
+
+          if (stats) {
+            // It is file
+            options.https[property] = fs.readFileSync(path.resolve(value));
+          } else {
+            options.https[property] = value;
+          }
         }
       }
 
@@ -610,7 +620,7 @@ class Server {
           const pems = createCertificate(attrs);
 
           fs.writeFileSync(certPath, pems.private + pems.cert, {
-            encoding: 'utf-8',
+            encoding: 'utf8',
           });
         }
 
@@ -689,7 +699,10 @@ class Server {
       return true;
     }
 
-    if (!headerToCheck) headerToCheck = 'host';
+    if (!headerToCheck) {
+      headerToCheck = 'host';
+    }
+
     // get the Host header and extract hostname
     // we don't care about port not matching
     const hostHeader = headers[headerToCheck];
@@ -723,7 +736,9 @@ class Server {
       for (let hostIdx = 0; hostIdx < this.allowedHosts.length; hostIdx++) {
         const allowedHost = this.allowedHosts[hostIdx];
 
-        if (allowedHost === hostname) return true;
+        if (allowedHost === hostname) {
+          return true;
+        }
 
         // support "." as a subdomain wildcard
         // e.g. ".example.com" will allow "example.com", "www.example.com", "subdomain.example.com", etc
@@ -765,7 +780,7 @@ class Server {
   listen(port, hostname, fn) {
     this.hostname = hostname;
 
-    const returnValue = this.listeningApp.listen(port, hostname, (err) => {
+    return this.listeningApp.listen(port, hostname, (err) => {
       const socket = sockjs.createServer({
         // Use provided up-to-date sockjs-client
         sockjs_url: '/__webpack_dev_server__/sockjs.bundle.js',
@@ -836,8 +851,6 @@ class Server {
         fn.call(this.listeningApp, err);
       }
     });
-
-    return returnValue;
   }
 
   close(cb) {

package/lib/utils/addEntries.js

@@ -1,11 +1,5 @@
 'use strict';
 
-/* eslint-disable
-  no-shadow,
-  no-param-reassign,
-  array-bracket-spacing,
-  space-before-function-paren
-*/
 const webpack = require('webpack');
 const createDomain = require('./createDomain');
 
@@ -50,6 +44,7 @@ function addEntries(config, options, server) {
       return entries.concat(entry);
     };
 
+    // eslint-disable-next-line no-shadow
     [].concat(config).forEach((config) => {
       config.entry = prependEntry(config.entry || './src');
 

package/lib/utils/colors.js

@@ -0,0 +1,22 @@
+'use strict';
+
+const colors = {
+  info(useColor, msg) {
+    if (useColor) {
+      // Make text blue and bold, so it *pops*
+      return `\u001b[1m\u001b[34m${msg}\u001b[39m\u001b[22m`;
+    }
+
+    return msg;
+  },
+  error(useColor, msg) {
+    if (useColor) {
+      // Make text red and bold, so it *pops*
+      return `\u001b[1m\u001b[31m${msg}\u001b[39m\u001b[22m`;
+    }
+
+    return msg;
+  },
+};
+
+module.exports = colors;

package/lib/utils/createCertificate.js

@@ -1,8 +1,5 @@
 'use strict';
 
-/* eslint-disable
-  space-before-function-paren
-*/
 const selfsigned = require('selfsigned');
 
 function createCertificate(attrs) {

package/lib/utils/createConfig.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const path = require('path');
-const { defaultTo } = require('../../bin/utils');
+const defaultTo = require('./defaultTo');
 
 function createConfig(config, argv, { port }) {
   const firstWpOpt = Array.isArray(config) ? config[0] : config;
@@ -14,12 +14,12 @@ function createConfig(config, argv, { port }) {
     options.bonjour = true;
   }
 
-  if (argv.host !== 'localhost' || !options.host) {
+  if (argv.host && (argv.host !== 'localhost' || !options.host)) {
     options.host = argv.host;
   }
 
-  if (argv['allowed-hosts']) {
-    options.allowedHosts = argv['allowed-hosts'].split(',');
+  if (argv.allowedHosts) {
+    options.allowedHosts = argv.allowedHosts.split(',');
   }
 
   if (argv.public) {
@@ -47,11 +47,11 @@ function createConfig(config, argv, { port }) {
     }
   }
 
-  if (!options.filename) {
+  if (!options.filename && firstWpOpt.output && firstWpOpt.output.filename) {
     options.filename = firstWpOpt.output && firstWpOpt.output.filename;
   }
 
-  if (!options.watchOptions) {
+  if (!options.watchOptions && firstWpOpt.watchOptions) {
     options.watchOptions = firstWpOpt.watchOptions;
   }
 
@@ -64,38 +64,42 @@ function createConfig(config, argv, { port }) {
     process.stdin.resume();
   }
 
+  // TODO https://github.com/webpack/webpack-dev-server/issues/616 (v4)
+  // We should prefer CLI arg under config, now we always prefer `hot` from `devServer`
   if (!options.hot) {
     options.hot = argv.hot;
   }
 
+  // TODO https://github.com/webpack/webpack-dev-server/issues/616 (v4)
+  // We should prefer CLI arg under config, now we always prefer `hotOnly` from `devServer`
   if (!options.hotOnly) {
-    options.hotOnly = argv['hot-only'];
+    options.hotOnly = argv.hotOnly;
   }
 
-  if (!options.clientLogLevel) {
-    options.clientLogLevel = argv['client-log-level'];
+  // TODO https://github.com/webpack/webpack-dev-server/issues/616 (v4)
+  // We should prefer CLI arg under config, now we always prefer `clientLogLevel` from `devServer`
+  if (!options.clientLogLevel && argv.clientLogLevel) {
+    options.clientLogLevel = argv.clientLogLevel;
   }
 
-  // eslint-disable-next-line
-  if (options.contentBase === undefined) {
-    if (argv['content-base']) {
-      options.contentBase = argv['content-base'];
+  if (argv.contentBase) {
+    options.contentBase = argv.contentBase;
 
-      if (Array.isArray(options.contentBase)) {
-        options.contentBase = options.contentBase.map((p) => path.resolve(p));
-      } else if (/^[0-9]$/.test(options.contentBase)) {
-        options.contentBase = +options.contentBase;
-      } else if (!/^(https?:)?\/\//.test(options.contentBase)) {
-        options.contentBase = path.resolve(options.contentBase);
-      }
-      // It is possible to disable the contentBase by using
-      // `--no-content-base`, which results in arg["content-base"] = false
-    } else if (argv['content-base'] === false) {
-      options.contentBase = false;
+    if (Array.isArray(options.contentBase)) {
+      options.contentBase = options.contentBase.map((p) => path.resolve(p));
+    } else if (/^[0-9]$/.test(options.contentBase)) {
+      options.contentBase = +options.contentBase;
+    } else if (!/^(https?:)?\/\//.test(options.contentBase)) {
+      options.contentBase = path.resolve(options.contentBase);
     }
   }
+  // It is possible to disable the contentBase by using
+  // `--no-content-base`, which results in arg["content-base"] = false
+  else if (argv.contentBase === false) {
+    options.contentBase = false;
+  }
 
-  if (argv['watch-content-base']) {
+  if (argv.watchContentBase) {
     options.watchContentBase = true;
   }
 
@@ -108,7 +112,8 @@ function createConfig(config, argv, { port }) {
 
   if (
     typeof options.stats === 'object' &&
-    typeof options.stats.colors === 'undefined'
+    typeof options.stats.colors === 'undefined' &&
+    argv.color
   ) {
     options.stats = Object.assign({}, options.stats, { colors: argv.color });
   }
@@ -117,10 +122,12 @@ function createConfig(config, argv, { port }) {
     options.lazy = true;
   }
 
+  // TODO remove in `v4`
   if (!argv.info) {
     options.noInfo = true;
   }
 
+  // TODO remove in `v4`
   if (argv.quiet) {
     options.quiet = true;
   }
@@ -129,15 +136,31 @@ function createConfig(config, argv, { port }) {
     options.https = true;
   }
 
-  if (argv['pfx-passphrase']) {
-    options.pfxPassphrase = argv['pfx-passphrase'];
+  if (argv.key) {
+    options.key = argv.key;
+  }
+
+  if (argv.cert) {
+    options.cert = argv.cert;
+  }
+
+  if (argv.cacert) {
+    options.ca = argv.cacert;
+  }
+
+  if (argv.pfx) {
+    options.pfx = argv.pfx;
+  }
+
+  if (argv.pfxPassphrase) {
+    options.pfxPassphrase = argv.pfxPassphrase;
   }
 
   if (argv.inline === false) {
     options.inline = false;
   }
 
-  if (argv['history-api-fallback']) {
+  if (argv.historyApiFallback) {
     options.historyApiFallback = true;
   }
 
@@ -145,13 +168,13 @@ function createConfig(config, argv, { port }) {
     options.compress = true;
   }
 
-  if (argv['disable-host-check']) {
+  if (argv.disableHostCheck) {
     options.disableHostCheck = true;
   }
 
-  if (argv['open-page']) {
+  if (argv.openPage) {
     options.open = true;
-    options.openPage = argv['open-page'];
+    options.openPage = argv.openPage;
   }
 
   if (typeof argv.open !== 'undefined') {

package/lib/utils/createDomain.js

@@ -1,10 +1,5 @@
 'use strict';
 
-/* eslint-disable
-  no-nested-ternary,
-  multiline-ternary,
-  space-before-function-paren
-*/
 const url = require('url');
 const ip = require('internal-ip');
 
@@ -14,6 +9,7 @@ function createDomain(options, server) {
     ? ip.v4.sync() || 'localhost'
     : options.host;
 
+  // eslint-disable-next-line no-nested-ternary
   const port = options.socket ? 0 : server ? server.address().port : 0;
   // use explicitly defined public url
   // (prefix with protocol if not explicitly given)

package/lib/utils/createLogger.js

@@ -1,8 +1,5 @@
 'use strict';
 
-/* eslint-disable
-  space-before-function-paren
-*/
 const log = require('webpack-log');
 
 function createLogger(options) {

package/lib/utils/defaultTo.js

@@ -0,0 +1,7 @@
+'use strict';
+
+function defaultTo(value, def) {
+  return value == null ? def : value;
+}
+
+module.exports = defaultTo;

package/lib/utils/getVersions.js

@@ -0,0 +1,12 @@
+'use strict';
+
+/* eslint-disable global-require */
+
+function getVersions() {
+  return (
+    `webpack-dev-server ${require('../../package.json').version}\n` +
+    `webpack ${require('webpack/package.json').version}`
+  );
+}
+
+module.exports = getVersions;

package/lib/utils/runBonjour.js

@@ -0,0 +1,21 @@
+'use strict';
+
+function runBonjour(options) {
+  // eslint-disable-next-line global-require
+  const bonjour = require('bonjour')();
+
+  bonjour.publish({
+    name: 'Webpack Dev Server',
+    port: options.port,
+    type: 'http',
+    subtypes: ['webpack'],
+  });
+
+  process.on('exit', () => {
+    bonjour.unpublishAll(() => {
+      bonjour.destroy();
+    });
+  });
+}
+
+module.exports = runBonjour;

package/{bin/utils.js → lib/utils/status.js}

@@ -1,44 +1,7 @@
 'use strict';
 
-/* eslint-disable
-  no-shadow,
-  global-require,
-  multiline-ternary,
-  array-bracket-spacing,
-  space-before-function-paren
-*/
 const open = require('opn');
-
-const colors = {
-  info(useColor, msg) {
-    if (useColor) {
-      // Make text blue and bold, so it *pops*
-      return `\u001b[1m\u001b[34m${msg}\u001b[39m\u001b[22m`;
-    }
-
-    return msg;
-  },
-  error(useColor, msg) {
-    if (useColor) {
-      // Make text red and bold, so it *pops*
-      return `\u001b[1m\u001b[31m${msg}\u001b[39m\u001b[22m`;
-    }
-
-    return msg;
-  },
-};
-
-// eslint-disable-next-line
-const defaultTo = (value, def) => {
-  return value == null ? def : value;
-};
-
-function version() {
-  return (
-    `webpack-dev-server ${require('../package.json').version}\n` +
-    `webpack ${require('webpack/package.json').version}`
-  );
-}
+const colors = require('./colors');
 
 function status(uri, options, log, useColor) {
   const contentBase = Array.isArray(options.contentBase)
@@ -96,27 +59,4 @@ function status(uri, options, log, useColor) {
   }
 }
 
-function bonjour(options) {
-  const bonjour = require('bonjour')();
-
-  bonjour.publish({
-    name: 'Webpack Dev Server',
-    port: options.port,
-    type: 'http',
-    subtypes: ['webpack'],
-  });
-
-  process.on('exit', () => {
-    bonjour.unpublishAll(() => {
-      bonjour.destroy();
-    });
-  });
-}
-
-module.exports = {
-  status,
-  colors,
-  version,
-  bonjour,
-  defaultTo,
-};
+module.exports = status;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -37,7 +37,7 @@
     "html-entities": "^1.2.0",
     "http-proxy-middleware": "^0.19.1",
     "import-local": "^2.0.0",
-    "internal-ip": "^4.0.0",
+    "internal-ip": "^4.2.0",
     "ip": "^1.1.5",
     "killable": "^1.0.0",
     "loglevel": "^1.4.1",
@@ -62,7 +62,7 @@
     "@babel/core": "^7.2.2",
     "@babel/preset-env": "^7.3.1",
     "babel-loader": "^8.0.5",
-    "copy-webpack-plugin": "^4.5.1",
+    "copy-webpack-plugin": "^5.0.0",
     "css-loader": "^2.1.0",
     "eslint": "^5.4.0",
     "eslint-config-prettier": "^4.0.0",
@@ -79,7 +79,7 @@
     "less": "^3.7.1",
     "less-loader": "^4.1.0",
     "lint-staged": "^8.1.1",
-    "marked": "^0.6.0",
+    "marked": "^0.6.1",
     "nyc": "^13.3.0",
     "prettier": "^1.16.3",
     "rimraf": "^2.6.2",