webpack-dev-server 3.1.12 → 3.2.1

package/lib/options.json

@@ -51,6 +51,9 @@
     "socket": {
       "type": "string"
     },
+    "sockPath": {
+      "type": "string"
+    },
     "watchOptions": {
       "type": "object"
     },
@@ -68,22 +71,10 @@
       "type": "object"
     },
     "logLevel": {
-      "enum": [
-        "info",
-        "warn",
-        "error",
-        "debug",
-        "trace",
-        "silent"
-      ]
+      "enum": ["info", "warn", "error", "debug", "trace", "silent"]
     },
     "clientLogLevel": {
-      "enum": [
-        "none",
-        "info",
-        "error",
-        "warning"
-      ]
+      "enum": ["none", "info", "error", "warning"]
     },
     "overlay": {
       "anyOf": [
@@ -174,9 +165,7 @@
     "contentBase": {
       "anyOf": [
         {
-          "enum": [
-            false
-          ]
+          "enum": [false]
         },
         {
           "type": "number"
@@ -273,13 +262,7 @@
           "type": "boolean"
         },
         {
-          "enum": [
-            "none",
-            "errors-only",
-            "minimal",
-            "normal",
-            "verbose"
-          ]
+          "enum": ["none", "errors-only", "minimal", "normal", "verbose"]
         }
       ]
     },
@@ -321,6 +304,7 @@
       "filename": "should be {String|RegExp|Function} (https://webpack.js.org/configuration/dev-server/#devserver-filename-)",
       "port": "should be {String|Number} (https://webpack.js.org/configuration/dev-server/#devserver-port)",
       "socket": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-socket)",
+      "sockPath": "should be {String} (https://webpack.js.org/configuration/dev-server/#devserver-sockPath)",
       "watchOptions": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserver-watchoptions)",
       "writeToDisk": "should be {Boolean|Function} (https://github.com/webpack/webpack-dev-middleware#writetodisk)",
       "headers": "should be {Object} (https://webpack.js.org/configuration/dev-server/#devserver-headers-)",

package/lib/utils/addEntries.js

@@ -1,14 +1,9 @@
 'use strict';
 
-/* eslint-disable
-  no-shadow,
-  no-param-reassign,
-  array-bracket-spacing,
-  space-before-function-paren
-*/
+const webpack = require('webpack');
 const createDomain = require('./createDomain');
 
-function addEntries (config, options, server) {
+function addEntries(config, options, server) {
   if (options.inline !== false) {
     // we're stubbing the app in this method as it's static and doesn't require
     // a server to be supplied. createDomain requires an app with the
@@ -16,11 +11,14 @@ function addEntries (config, options, server) {
     const app = server || {
       address() {
         return { port: options.port };
-      }
+      },
     };
 
     const domain = createDomain(options, app);
-    const entries = [ `${require.resolve('../../client/')}?${domain}` ];
+    const sockPath = options.sockPath ? `&sockPath=${options.sockPath}` : '';
+    const entries = [
+      `${require.resolve('../../client/')}?${domain}${sockPath}`,
+    ];
 
     if (options.hotOnly) {
       entries.push(require.resolve('webpack/hot/only-dev-server'));
@@ -46,8 +44,21 @@ 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');
+
+      if (options.hot || options.hotOnly) {
+        config.plugins = config.plugins || [];
+        if (
+          !config.plugins.find(
+            (plugin) =>
+              plugin.constructor === webpack.HotModuleReplacementPlugin
+          )
+        ) {
+          config.plugins.push(new webpack.HotModuleReplacementPlugin());
+        }
+      }
     });
   }
 }

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,11 +1,8 @@
 'use strict';
 
-/* eslint-disable
-  space-before-function-paren
-*/
 const selfsigned = require('selfsigned');
 
-function createCertificate (attrs) {
+function createCertificate(attrs) {
   return selfsigned.generate(attrs, {
     algorithm: 'sha256',
     days: 30,
@@ -13,7 +10,7 @@ function createCertificate (attrs) {
     extensions: [
       {
         name: 'basicConstraints',
-        cA: true
+        cA: true,
       },
       {
         name: 'keyUsage',
@@ -21,7 +18,7 @@ function createCertificate (attrs) {
         digitalSignature: true,
         nonRepudiation: true,
         keyEncipherment: true,
-        dataEncipherment: true
+        dataEncipherment: true,
       },
       {
         name: 'subjectAltName',
@@ -29,36 +26,36 @@ function createCertificate (attrs) {
           {
             // type 2 is DNS
             type: 2,
-            value: 'localhost'
+            value: 'localhost',
           },
           {
             type: 2,
-            value: 'localhost.localdomain'
+            value: 'localhost.localdomain',
           },
           {
             type: 2,
-            value: 'lvh.me'
+            value: 'lvh.me',
           },
           {
             type: 2,
-            value: '*.lvh.me'
+            value: '*.lvh.me',
           },
           {
             type: 2,
-            value: '[::1]'
+            value: '[::1]',
           },
           {
             // type 7 is IP
             type: 7,
-            ip: '127.0.0.1'
+            ip: '127.0.0.1',
           },
           {
             type: 7,
-            ip: 'fe80::1'
-          }
-        ]
-      }
-    ]
+            ip: 'fe80::1',
+          },
+        ],
+      },
+    ],
   });
 }
 

package/lib/utils/createConfig.js

@@ -0,0 +1,204 @@
+'use strict';
+
+const path = require('path');
+const defaultTo = require('./defaultTo');
+
+function createConfig(config, argv, { port }) {
+  const firstWpOpt = Array.isArray(config) ? config[0] : config;
+  const options = firstWpOpt.devServer || {};
+
+  // This updates both config and firstWpOpt
+  firstWpOpt.mode = defaultTo(firstWpOpt.mode, 'development');
+
+  if (argv.bonjour) {
+    options.bonjour = true;
+  }
+
+  if (argv.host && (argv.host !== 'localhost' || !options.host)) {
+    options.host = argv.host;
+  }
+
+  if (argv.allowedHosts) {
+    options.allowedHosts = argv.allowedHosts.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 && firstWpOpt.output && firstWpOpt.output.filename) {
+    options.filename = firstWpOpt.output && firstWpOpt.output.filename;
+  }
+
+  if (!options.watchOptions && firstWpOpt.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();
+  }
+
+  // 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.hotOnly;
+  }
+
+  // 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;
+  }
+
+  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.contentBase === false) {
+    options.contentBase = false;
+  }
+
+  if (argv.watchContentBase) {
+    options.watchContentBase = true;
+  }
+
+  if (!options.stats) {
+    options.stats = {
+      cached: false,
+      cachedAssets: false,
+    };
+  }
+
+  if (
+    typeof options.stats === 'object' &&
+    typeof options.stats.colors === 'undefined' &&
+    argv.color
+  ) {
+    options.stats = Object.assign({}, options.stats, { colors: argv.color });
+  }
+
+  if (argv.lazy) {
+    options.lazy = true;
+  }
+
+  // TODO remove in `v4`
+  if (!argv.info) {
+    options.noInfo = true;
+  }
+
+  // TODO remove in `v4`
+  if (argv.quiet) {
+    options.quiet = true;
+  }
+
+  if (argv.https) {
+    options.https = true;
+  }
+
+  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.historyApiFallback) {
+    options.historyApiFallback = true;
+  }
+
+  if (argv.compress) {
+    options.compress = true;
+  }
+
+  if (argv.disableHostCheck) {
+    options.disableHostCheck = true;
+  }
+
+  if (argv.openPage) {
+    options.open = true;
+    options.openPage = argv.openPage;
+  }
+
+  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 === port
+      ? defaultTo(options.port, argv.port)
+      : defaultTo(argv.port, options.port);
+
+  return options;
+}
+
+module.exports = createConfig;

package/lib/utils/createDomain.js

@@ -1,22 +1,16 @@
 'use strict';
 
-/* eslint-disable
-  no-nested-ternary,
-  multiline-ternary,
-  space-before-function-paren
-*/
 const url = require('url');
 const ip = require('internal-ip');
 
-function createDomain (options, server) {
+function createDomain(options, server) {
   const protocol = options.https ? 'https' : 'http';
-  const hostname = options.useLocalIp ? ip.v4.sync() || 'localhost' : options.host;
+  const hostname = options.useLocalIp
+    ? ip.v4.sync() || 'localhost'
+    : options.host;
 
-  const port = options.socket
-    ? 0
-    : server
-      ? server.address().port
-      : 0;
+  // 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)
   if (options.public) {
@@ -28,7 +22,7 @@ function createDomain (options, server) {
   return url.format({
     protocol,
     hostname,
-    port
+    port,
   });
 }
 

package/lib/utils/createLogger.js

@@ -1,11 +1,8 @@
 'use strict';
 
-/* eslint-disable
-  space-before-function-paren
-*/
 const log = require('webpack-log');
 
-function createLogger (options) {
+function createLogger(options) {
   let level = options.logLevel || 'info';
 
   if (options.noInfo === true) {
@@ -19,7 +16,7 @@ function createLogger (options) {
   return log({
     name: 'wds',
     level,
-    timestamp: options.logTime
+    timestamp: options.logTime,
   });
 }
 

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/lib/utils/status.js

@@ -0,0 +1,62 @@
+'use strict';
+
+const open = require('opn');
+const colors = require('./colors');
+
+function status(uri, options, log, useColor) {
+  const contentBase = Array.isArray(options.contentBase)
+    ? options.contentBase.join(', ')
+    : options.contentBase;
+
+  if (options.socket) {
+    log.info(`Listening to socket at ${colors.info(useColor, options.socket)}`);
+  } else {
+    log.info(`Project is running at ${colors.info(useColor, uri)}`);
+  }
+
+  log.info(
+    `webpack output is served from ${colors.info(useColor, options.publicPath)}`
+  );
+
+  if (contentBase) {
+    log.info(
+      `Content not from webpack is served from ${colors.info(
+        useColor,
+        contentBase
+      )}`
+    );
+  }
+
+  if (options.historyApiFallback) {
+    log.info(
+      `404s will fallback to ${colors.info(
+        useColor,
+        options.historyApiFallback.index || '/index.html'
+      )}`
+    );
+  }
+
+  if (options.bonjour) {
+    log.info(
+      'Broadcasting "http" with subtype of "webpack" via ZeroConf DNS (Bonjour)'
+    );
+  }
+
+  if (options.open) {
+    let openOptions = {};
+    let openMessage = 'Unable to open browser';
+
+    if (typeof options.open === 'string') {
+      openOptions = { app: options.open };
+      openMessage += `: ${options.open}`;
+    }
+
+    open(uri + (options.openPage || ''), openOptions).catch(() => {
+      log.warn(
+        `${openMessage}. If you are running in a headless environment, please do not use the --open flag`
+      );
+    });
+  }
+}
+
+module.exports = status;