webpack-dev-server 3.1.14 → 3.3.1

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;

package/lib/utils/tryParseInt.js

@@ -0,0 +1,11 @@
+'use strict';
+
+function tryParseInt(input) {
+  const output = parseInt(input, 10);
+  if (Number.isNaN(output)) {
+    return null;
+  }
+  return output;
+}
+
+module.exports = tryParseInt;

package/lib/utils/updateCompiler.js

@@ -0,0 +1,67 @@
+'use strict';
+
+/* eslint-disable
+  no-shadow,
+  no-undefined
+*/
+const webpack = require('webpack');
+const addEntries = require('./addEntries');
+
+function updateCompiler(compiler, options) {
+  if (options.inline !== false) {
+    const findHMRPlugin = (config) => {
+      if (!config.plugins) {
+        return undefined;
+      }
+
+      return config.plugins.find(
+        (plugin) => plugin.constructor === webpack.HotModuleReplacementPlugin
+      );
+    };
+
+    const compilers = [];
+    const compilersWithoutHMR = [];
+    let webpackConfig;
+    if (compiler.compilers) {
+      webpackConfig = [];
+      compiler.compilers.forEach((compiler) => {
+        webpackConfig.push(compiler.options);
+        compilers.push(compiler);
+        if (!findHMRPlugin(compiler.options)) {
+          compilersWithoutHMR.push(compiler);
+        }
+      });
+    } else {
+      webpackConfig = compiler.options;
+      compilers.push(compiler);
+      if (!findHMRPlugin(compiler.options)) {
+        compilersWithoutHMR.push(compiler);
+      }
+    }
+
+    // it's possible that we should clone the config before doing
+    // this, but it seems safe not to since it actually reflects
+    // the changes we are making to the compiler
+    // important: this relies on the fact that addEntries now
+    // prevents duplicate new entries.
+    addEntries(webpackConfig, options);
+    compilers.forEach((compiler) => {
+      const config = compiler.options;
+      compiler.hooks.entryOption.call(config.context, config.entry);
+    });
+
+    // do not apply the plugin unless it didn't exist before.
+    if (options.hot || options.hotOnly) {
+      compilersWithoutHMR.forEach((compiler) => {
+        // addDevServerEntrypoints above should have added the plugin
+        // to the compiler options
+        const plugin = findHMRPlugin(compiler.options);
+        if (plugin) {
+          plugin.apply(compiler);
+        }
+      });
+    }
+  }
+}
+
+module.exports = updateCompiler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.1.14",
+  "version": "3.3.1",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -15,7 +15,8 @@
   },
   "scripts": {
     "lint": "eslint bin lib test examples client-src",
-    "test": "nyc --reporter lcovonly mocha --full-trace --check-leaks --exit",
+    "pretty": "prettier --loglevel warn --write \"**/*.{js,css,md,json,yml}\"",
+    "test": "jest --runInBand",
     "prepare": "rimraf ./ssl/*.pem && npm run -s transpile:index && npm run -s build:live && npm run -s build:index && npm run -s build:sockjs",
     "transpile:index": "babel client-src/default --out-dir client --ignore *.config.js",
     "build:index": "webpack ./client-src/default/index.js -o client/index.bundle.js --color --config client-src/default/webpack.config.js",
@@ -27,70 +28,89 @@
   "dependencies": {
     "ansi-html": "0.0.7",
     "bonjour": "^3.5.0",
-    "chokidar": "^2.0.0",
-    "compression": "^1.5.2",
-    "connect-history-api-fallback": "^1.3.0",
-    "debug": "^3.1.0",
-    "del": "^3.0.0",
-    "express": "^4.16.2",
-    "html-entities": "^1.2.0",
-    "http-proxy-middleware": "~0.18.0",
+    "chokidar": "^2.1.5",
+    "compression": "^1.7.4",
+    "connect-history-api-fallback": "^1.6.0",
+    "debug": "^4.1.1",
+    "del": "^4.1.0",
+    "express": "^4.16.4",
+    "html-entities": "^1.2.1",
+    "http-proxy-middleware": "^0.19.1",
     "import-local": "^2.0.0",
-    "internal-ip": "^3.0.1",
+    "internal-ip": "^4.2.0",
     "ip": "^1.1.5",
-    "killable": "^1.0.0",
-    "loglevel": "^1.4.1",
-    "opn": "^5.1.0",
-    "portfinder": "^1.0.9",
+    "killable": "^1.0.1",
+    "loglevel": "^1.6.1",
+    "opn": "^5.5.0",
+    "portfinder": "^1.0.20",
     "schema-utils": "^1.0.0",
-    "selfsigned": "^1.9.1",
-    "semver": "^5.6.0",
-    "serve-index": "^1.7.2",
+    "selfsigned": "^1.10.4",
+    "semver": "^6.0.0",
+    "serve-index": "^1.9.1",
     "sockjs": "0.3.19",
     "sockjs-client": "1.3.0",
     "spdy": "^4.0.0",
-    "strip-ansi": "^3.0.0",
-    "supports-color": "^5.1.0",
+    "strip-ansi": "^3.0.1",
+    "supports-color": "^6.1.0",
     "url": "^0.11.0",
-    "webpack-dev-middleware": "3.4.0",
+    "webpack-dev-middleware": "^3.6.2",
     "webpack-log": "^2.0.0",
-    "yargs": "12.0.2"
+    "yargs": "12.0.5"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-core": "^6.26.0",
-    "babel-loader": "^7.1.4",
-    "babel-preset-env": "^1.6.1",
-    "copy-webpack-plugin": "^4.5.1",
-    "css-loader": "^1.0.0",
-    "eslint": "^5.4.0",
-    "eslint-config-webpack": "^1.2.5",
-    "eslint-plugin-import": "^2.9.0",
-    "execa": "^0.11.0",
-    "file-loader": "^2.0.0",
-    "html-loader": "^0.5.5",
-    "html-webpack-plugin": "^3.0.6",
-    "jquery": "^3.2.1",
-    "less": "^3.7.1",
-    "less-loader": "^4.1.0",
-    "marked": "^0.5.0",
-    "mocha": "^5.2.0",
-    "mocha-sinon": "^2.0.0",
-    "nyc": "^12.0.2",
-    "rimraf": "^2.6.2",
-    "should": "^13.2.0",
-    "sinon": "^6.1.5",
-    "standard-version": "^4.4.0",
-    "style-loader": "^0.22.1",
-    "supertest": "^3.0.0",
-    "url-loader": "^1.1.1",
-    "webpack": "^4.17.1",
-    "webpack-cli": "^3.1.0",
-    "ws": "^6.0.0"
+    "@babel/cli": "7.4.3",
+    "@babel/core": "7.4.3",
+    "@babel/preset-env": "7.4.3",
+    "babel-loader": "8.0.5",
+    "copy-webpack-plugin": "5.0.2",
+    "css-loader": "2.1.1",
+    "eslint": "5.16.0",
+    "eslint-config-prettier": "4.1.0",
+    "eslint-config-webpack": "1.2.5",
+    "eslint-plugin-import": "2.16.0",
+    "eslint-plugin-prettier": "3.0.1",
+    "execa": "1.0.0",
+    "file-loader": "3.0.1",
+    "html-loader": "0.5.5",
+    "html-webpack-plugin": "3.2.0",
+    "husky": "1.3.1",
+    "jest": "24.7.1",
+    "jquery": "3.3.1",
+    "less": "3.9.0",
+    "less-loader": "4.1.0",
+    "lint-staged": "8.1.5",
+    "marked": "0.6.2",
+    "nyc": "13.3.0",
+    "prettier": "1.16.4",
+    "puppeteer": "1.14.0",
+    "rimraf": "2.6.3",
+    "standard-version": "5.0.2",
+    "style-loader": "0.23.1",
+    "supertest": "4.0.2",
+    "url-loader": "1.1.2",
+    "webpack": "4.29.6",
+    "webpack-cli": "3.3.0",
+    "ws": "6.2.1"
   },
   "peerDependencies": {
     "webpack": "^4.0.0"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "*.js": [
+      "eslint --fix",
+      "prettier --write",
+      "git add"
+    ],
+    "*.{css,md,json,yml}": [
+      "prettier --write",
+      "git add"
+    ]
+  },
   "author": "Tobias Koppers @sokra",
   "bugs": "https://github.com/webpack/webpack-dev-server/issues",
   "homepage": "https://github.com/webpack/webpack-dev-server#readme",

package/bin/utils.js

@@ -1,114 +0,0 @@
-'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}`;
-}
-
-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`
-      );
-    });
-  }
-}
-
-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
-};