webpack-dev-server 3.1.12 → 3.2.1

package/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 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.1](https://github.com/webpack/webpack-dev-server/compare/v3.2.0...v3.2.1) (2019-02-25)
+
+
+### Bug Fixes
+
+* 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))
+
+
+
+<a name="3.1.14"></a>
+## [3.1.14](https://github.com/webpack/webpack-dev-server/compare/v3.1.13...v3.1.14) (2018-12-24)
+
+
+### Bug Fixes
+
+* add workaround for Origin header in sockjs ([#1608](https://github.com/webpack/webpack-dev-server/issues/1608)) ([1dfd4fb](https://github.com/webpack/webpack-dev-server/commit/1dfd4fb))
+
+
+
+<a name="3.1.13"></a>
+## [3.1.13](https://github.com/webpack/webpack-dev-server/compare/v3.1.12...v3.1.13) (2018-12-22)
+
+
+### Bug Fixes
+
+* delete a comma for Node.js <= v7.x ([#1609](https://github.com/webpack/webpack-dev-server/issues/1609)) ([0bab1c0](https://github.com/webpack/webpack-dev-server/commit/0bab1c0))
+
+
+
 <a name="3.1.12"></a>
 ## [3.1.12](https://github.com/webpack/webpack-dev-server/compare/v3.1.11...v3.1.12) (2018-12-22)
 

package/README.md

@@ -19,6 +19,17 @@ live reloading. This should be used for **development only**.
 It uses [webpack-dev-middleware][middleware-url] under the hood, which provides
 fast in-memory access to the webpack assets.
 
+## Table of Contents
+
+1. [Getting Started](#getting-started)
+2. [Usage](#usage)
+3. [Browser Support](#browser-support)
+4. [Support](#support)
+5. [Contributing](#contributing)
+6. [Maintainers](#maintainers)
+7. [Attribution](#attribution)
+8. [License](#license)
+
 ## Getting Started
 
 First things first, install the module:
@@ -44,6 +55,8 @@ The easiest way to use it is with the CLI. In the directory where your
 node_modules/.bin/webpack-dev-server
 ```
 
+_**Note**: Many CLI options are available with `webpack-dev-server`. Explore this [link](https://webpack.js.org/configuration/dev-server/)._
+
 ### With NPM Scripts
 
 NPM package.json scripts are a convenient and useful means to run locally installed
@@ -142,25 +155,18 @@ This project is heavily inspired by [peerigon/nof5](https://github.com/peerigon/
 
 #### [MIT](./LICENSE)
 
-
 [npm]: https://img.shields.io/npm/v/webpack-dev-server.svg
 [npm-url]: https://npmjs.com/package/webpack-dev-server
-
 [node]: https://img.shields.io/node/v/webpack-dev-server.svg
 [node-url]: https://nodejs.org
-
 [deps]: https://david-dm.org/webpack/webpack-dev-server.svg
 [deps-url]: https://david-dm.org/webpack/webpack-dev-server
-
 [tests]: http://img.shields.io/travis/webpack/webpack-dev-server.svg
 [tests-url]: https://travis-ci.org/webpack/webpack-dev-server
-
 [cover]: https://codecov.io/gh/webpack/webpack-dev-server/branch/master/graph/badge.svg
 [cover-url]: https://codecov.io/gh/webpack/webpack-dev-server
-
 [chat]: https://badges.gitter.im/webpack/webpack.svg
 [chat-url]: https://gitter.im/webpack/webpack
-
 [docs-url]: https://webpack.js.org/configuration/dev-server/#devserver
 [hash-url]: https://twitter.com/search?q=webpack
 [middleware-url]: https://github.com/webpack/webpack-dev-middleware

package/bin/options.js

@@ -15,43 +15,44 @@ const BASIC_GROUP = 'Basic options:';
 const options = {
   bonjour: {
     type: 'boolean',
-    describe: 'Broadcasts the server via ZeroConf networking on start'
+    describe: 'Broadcasts the server via ZeroConf networking on start',
   },
   lazy: {
     type: 'boolean',
-    describe: 'Lazy'
+    describe: 'Lazy',
   },
   inline: {
     type: 'boolean',
     default: true,
-    describe: 'Inline mode (set to false to disable including client scripts like livereload)'
+    describe:
+      'Inline mode (set to false to disable including client scripts like livereload)',
   },
   progress: {
     type: 'boolean',
     describe: 'Print compilation progress in percentage',
-    group: BASIC_GROUP
+    group: BASIC_GROUP,
   },
   'hot-only': {
     type: 'boolean',
     describe: 'Do not refresh page if HMR fails',
-    group: ADVANCED_GROUP
+    group: ADVANCED_GROUP,
   },
   stdin: {
     type: 'boolean',
-    describe: 'close when stdin ends'
+    describe: 'close when stdin ends',
   },
   open: {
     type: 'string',
-    describe: 'Open the default browser, or optionally specify a browser name'
+    describe: 'Open the default browser, or optionally specify a browser name',
   },
   useLocalIp: {
     type: 'boolean',
-    describe: 'Open default browser with local IP'
+    describe: 'Open default browser with local IP',
   },
   'open-page': {
     type: 'string',
     describe: 'Open default browser with the specified page',
-    requiresArg: true
+    requiresArg: true,
   },
   color: {
     type: 'boolean',
@@ -62,105 +63,106 @@ const options = {
       return require('supports-color').stdout;
     },
     group: DISPLAY_GROUP,
-    describe: 'Enables/Disables colors on the console'
+    describe: 'Enables/Disables colors on the console',
   },
   info: {
     type: 'boolean',
     group: DISPLAY_GROUP,
     default: true,
-    describe: 'Info'
+    describe: 'Info',
   },
   quiet: {
     type: 'boolean',
     group: DISPLAY_GROUP,
-    describe: 'Quiet'
+    describe: 'Quiet',
   },
   'client-log-level': {
     type: 'string',
     group: DISPLAY_GROUP,
     default: 'info',
-    describe: 'Log level in the browser (info, warning, error or none)'
+    describe: 'Log level in the browser (info, warning, error or none)',
   },
   https: {
     type: 'boolean',
     group: SSL_GROUP,
-    describe: 'HTTPS'
+    describe: 'HTTPS',
   },
   key: {
     type: 'string',
     describe: 'Path to a SSL key.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   cert: {
     type: 'string',
     describe: 'Path to a SSL certificate.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   cacert: {
     type: 'string',
     describe: 'Path to a SSL CA certificate.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   pfx: {
     type: 'string',
     describe: 'Path to a SSL pfx file.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   'pfx-passphrase': {
     type: 'string',
     describe: 'Passphrase for pfx file.',
-    group: SSL_GROUP
+    group: SSL_GROUP,
   },
   'content-base': {
     type: 'string',
     describe: 'A directory or URL to serve HTML content from.',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   'watch-content-base': {
     type: 'boolean',
     describe: 'Enable live-reloading of the content-base.',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   'history-api-fallback': {
     type: 'boolean',
     describe: 'Fallback to /index.html for Single Page Applications.',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   compress: {
     type: 'boolean',
     describe: 'Enable gzip compression',
-    group: RESPONSE_GROUP
+    group: RESPONSE_GROUP,
   },
   port: {
     describe: 'The port',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   'disable-host-check': {
     type: 'boolean',
     describe: 'Will not check the host',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   socket: {
     type: 'String',
     describe: 'Socket to listen',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   public: {
     type: 'string',
     describe: 'The public hostname/ip address of the server',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   host: {
     type: 'string',
     default: 'localhost',
     describe: 'The hostname/ip address the server will bind to',
-    group: CONNECTION_GROUP
+    group: CONNECTION_GROUP,
   },
   'allowed-hosts': {
     type: 'string',
-    describe: 'A comma-delimited string of hosts that are allowed to access the dev server',
-    group: CONNECTION_GROUP
-  }
+    describe:
+      'A comma-delimited string of hosts that are allowed to access the dev server',
+    group: CONNECTION_GROUP,
+  },
 };
 
 module.exports = options;

package/bin/webpack-dev-server.js

@@ -4,20 +4,13 @@
 
 /* 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');
 
 const fs = require('fs');
 const net = require('net');
-const path = require('path');
 
 const portfinder = require('portfinder');
 const importLocal = require('import-local');
@@ -27,23 +20,20 @@ const webpack = require('webpack');
 
 const options = require('./options');
 
-const {
-  colors,
-  status,
-  version,
-  bonjour,
-  defaultTo
-} = 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 getVersions = require('../lib/utils/getVersions');
+const runBonjour = require('../lib/utils/runBonjour');
+const status = require('../lib/utils/status');
 
 let server;
 
-const signals = [ 'SIGINT', 'SIGTERM' ];
+const signals = ['SIGINT', 'SIGTERM'];
 
 signals.forEach((signal) => {
   process.on(signal, () => {
@@ -70,7 +60,9 @@ try {
   require.resolve('webpack-cli');
 } catch (err) {
   console.error('The CLI moved into a separate package: webpack-cli');
-  console.error('Please install \'webpack-cli\' in addition to webpack itself to use the CLI');
+  console.error(
+    "Please install 'webpack-cli' in addition to webpack itself to use the CLI"
+  );
   console.error('-> When using npm: npm i -D webpack-cli');
   console.error('-> When using yarn: yarn add -D webpack-cli');
 
@@ -78,26 +70,30 @@ 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'
+  outputFilename: '/bundle.js',
 });
+
 // Taken out of yargs because we must know if
 // it wasn't given by the user, in which case
 // we should use portfinder.
 const DEFAULT_PORT = 8080;
 
-function processOptions (config) {
+function processOptions(config) {
   // processOptions {Promise}
   if (typeof config.then === 'function') {
     config.then(processOptions).catch((err) => {
@@ -109,201 +105,9 @@ function processOptions (config) {
     return;
   }
 
-  const firstWpOpt = Array.isArray(config)
-    ? config[0]
-    : config;
-
-  const options = config.devServer || firstWpOpt.devServer || {};
-
-  if (argv.bonjour) {
-    options.bonjour = true;
-  }
-
-  if (argv.host !== 'localhost' || !options.host) {
-    options.host = argv.host;
-  }
-
-  if (argv['allowed-hosts']) {
-    options.allowedHosts = argv['allowed-hosts'].split(',');
-  }
-
-  if (argv.public) {
-    options.public = argv.public;
-  }
-
-  if (argv.socket) {
-    options.socket = argv.socket;
-  }
-
-  if (argv.progress) {
-    options.progress = argv.progress;
-  }
-
-  if (!options.publicPath) {
-    // eslint-disable-next-line
-    options.publicPath = firstWpOpt.output && firstWpOpt.output.publicPath || '';
-
-    if (
-      !/^(https?:)?\/\//.test(options.publicPath) &&
-      options.publicPath[0] !== '/'
-    ) {
-      options.publicPath = `/${options.publicPath}`;
-    }
-  }
-
-  if (!options.filename) {
-    options.filename = firstWpOpt.output && firstWpOpt.output.filename;
-  }
-
-  if (!options.watchOptions) {
-    options.watchOptions = firstWpOpt.watchOptions;
-  }
-
-  if (argv.stdin) {
-    process.stdin.on('end', () => {
-      // eslint-disable-next-line no-process-exit
-      process.exit(0);
-    });
-
-    process.stdin.resume();
-  }
-
-  if (!options.hot) {
-    options.hot = argv.hot;
-  }
-
-  if (!options.hotOnly) {
-    options.hotOnly = argv['hot-only'];
-  }
-
-  if (!options.clientLogLevel) {
-    options.clientLogLevel = argv['client-log-level'];
-  }
-
-  // eslint-disable-next-line
-  if (options.contentBase === undefined) {
-    if (argv['content-base']) {
-      options.contentBase = argv['content-base'];
-
-      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 (argv['watch-content-base']) {
-    options.watchContentBase = true;
-  }
+  const options = createConfig(config, argv, { port: DEFAULT_PORT });
 
-  if (!options.stats) {
-    options.stats = {
-      cached: false,
-      cachedAssets: false
-    };
-  }
-
-  if (
-    typeof options.stats === 'object' &&
-    typeof options.stats.colors === 'undefined'
-  ) {
-    options.stats = Object.assign(
-      {},
-      options.stats,
-      { colors: argv.color }
-    );
-  }
-
-  if (argv.lazy) {
-    options.lazy = true;
-  }
-
-  if (!argv.info) {
-    options.noInfo = true;
-  }
-
-  if (argv.quiet) {
-    options.quiet = true;
-  }
-
-  if (argv.https) {
-    options.https = true;
-  }
-
-  if (argv.cert) {
-    options.cert = fs.readFileSync(
-      path.resolve(argv.cert)
-    );
-  }
-
-  if (argv.key) {
-    options.key = fs.readFileSync(
-      path.resolve(argv.key)
-    );
-  }
-
-  if (argv.cacert) {
-    options.ca = fs.readFileSync(
-      path.resolve(argv.cacert)
-    );
-  }
-
-  if (argv.pfx) {
-    options.pfx = fs.readFileSync(
-      path.resolve(argv.pfx)
-    );
-  }
-
-  if (argv['pfx-passphrase']) {
-    options.pfxPassphrase = argv['pfx-passphrase'];
-  }
-
-  if (argv.inline === false) {
-    options.inline = false;
-  }
-
-  if (argv['history-api-fallback']) {
-    options.historyApiFallback = true;
-  }
-
-  if (argv.compress) {
-    options.compress = true;
-  }
-
-  if (argv['disable-host-check']) {
-    options.disableHostCheck = true;
-  }
-
-  if (argv['open-page']) {
-    options.open = true;
-    options.openPage = argv['open-page'];
-  }
-
-  if (typeof argv.open !== 'undefined') {
-    options.open = argv.open !== '' ? argv.open : true;
-  }
-
-  if (options.open && !options.openPage) {
-    options.openPage = '';
-  }
-
-  if (argv.useLocalIp) {
-    options.useLocalIp = true;
-  }
-  // Kind of weird, but ensures prior behavior isn't broken in cases
-  // that wouldn't throw errors. E.g. both argv.port and options.port
-  // were specified, but since argv.port is 8080, options.port will be
-  // tried first instead.
-  options.port = argv.port === DEFAULT_PORT
-    ? defaultTo(options.port, argv.port)
-    : defaultTo(argv.port, options.port);
+  portfinder.basePort = DEFAULT_PORT;
 
   if (options.port != null) {
     startDevServer(config, options);
@@ -311,8 +115,6 @@ function processOptions (config) {
     return;
   }
 
-  portfinder.basePort = DEFAULT_PORT;
-
   portfinder.getPort((err, port) => {
     if (err) {
       throw err;
@@ -345,11 +147,14 @@ function startDevServer(config, options) {
 
   if (options.progress) {
     new webpack.ProgressPlugin({
-      profile: argv.profile
+      profile: argv.profile,
     }).apply(compiler);
   }
 
-  const suffix = (options.inline !== false || options.lazy === true ? '/' : '/webpack-dev-server/');
+  const suffix =
+    options.inline !== false || options.lazy === true
+      ? '/'
+      : '/webpack-dev-server/';
 
   try {
     server = new Server(compiler, options, log);
@@ -411,7 +216,7 @@ function startDevServer(config, options) {
       }
 
       if (options.bonjour) {
-        bonjour(options);
+        runBonjour(options);
       }
 
       const uri = createDomain(options, server.listeningApp) + suffix;