webpack-dev-server 3.4.1 → 3.7.0

package/lib/utils/findPort.js

@@ -1,35 +1,28 @@
 'use strict';
 
-const portfinder = require('portfinder');
-
-function runPortFinder(defaultPort, cb) {
-  portfinder.basePort = defaultPort;
-  portfinder.getPort((err, port) => {
-    cb(err, port);
-  });
-}
-
-function findPort(server, defaultPort, defaultPortRetry, fn) {
-  let tryCount = 0;
-  const portFinderRunCb = (err, port) => {
-    tryCount += 1;
-    fn(err, port);
-  };
-
-  server.listeningApp.on('error', (err) => {
-    if (err && err.code !== 'EADDRINUSE') {
-      throw err;
-    }
-
-    if (tryCount >= defaultPortRetry) {
-      fn(err);
-      return;
-    }
-
-    runPortFinder(defaultPort, portFinderRunCb);
+const { getPortPromise } = require('portfinder');
+const defaultPort = require('./defaultPort');
+const defaultTo = require('./defaultTo');
+const tryParseInt = require('./tryParseInt');
+
+function findPort(port) {
+  if (typeof port !== 'undefined') {
+    return Promise.resolve(port);
+  }
+
+  // Try to find unused port and listen on it for 3 times,
+  // if port is not specified in options.
+  // Because NaN == null is false, defaultTo fails if parseInt returns NaN
+  // so the tryParseInt function is introduced to handle NaN
+  const defaultPortRetry = defaultTo(
+    tryParseInt(process.env.DEFAULT_PORT_RETRY),
+    3
+  );
+
+  return getPortPromise({
+    port: defaultPort,
+    stopPort: defaultPort + defaultPortRetry,
   });
-
-  runPortFinder(defaultPort, portFinderRunCb);
 }
 
 module.exports = findPort;

package/lib/utils/getSocketServerImplementation.js

@@ -0,0 +1,41 @@
+'use strict';
+
+function getSocketServerImplementation(options) {
+  let ServerImplementation;
+  let serverImplFound = true;
+  switch (typeof options.serverMode) {
+    case 'string':
+      // could be 'sockjs', in the future 'ws', or a path that should be required
+      if (options.serverMode === 'sockjs') {
+        // eslint-disable-next-line global-require
+        ServerImplementation = require('../servers/SockJSServer');
+      } else {
+        try {
+          // eslint-disable-next-line global-require, import/no-dynamic-require
+          ServerImplementation = require(options.serverMode);
+        } catch (e) {
+          serverImplFound = false;
+        }
+      }
+      break;
+    case 'function':
+      // potentially do more checks here to confirm that the user implemented this properlly
+      // since errors could be difficult to understand
+      ServerImplementation = options.serverMode;
+      break;
+    default:
+      serverImplFound = false;
+  }
+
+  if (!serverImplFound) {
+    throw new Error(
+      "serverMode must be a string denoting a default implementation (e.g. 'sockjs'), a full path to " +
+        'a JS file which exports a class extending BaseServer (webpack-dev-server/lib/servers/BaseServer) ' +
+        'via require.resolve(...), or the class itself which extends BaseServer'
+    );
+  }
+
+  return ServerImplementation;
+}
+
+module.exports = getSocketServerImplementation;

package/lib/utils/processOptions.js

@@ -0,0 +1,29 @@
+'use strict';
+
+const createConfig = require('./createConfig');
+const defaultPort = require('./defaultPort');
+
+function processOptions(config, argv, callback) {
+  // processOptions {Promise}
+  if (typeof config.then === 'function') {
+    config
+      .then((conf) => processOptions(conf, argv, callback))
+      .catch((err) => {
+        // eslint-disable-next-line no-console
+        console.error(err.stack || err);
+        // eslint-disable-next-line no-process-exit
+        process.exit(1);
+      });
+
+    return;
+  }
+
+  // Taken out of yargs because we must know if
+  // it wasn't given by the user, in which case
+  // we should use portfinder.
+  const options = createConfig(config, argv, { port: defaultPort });
+
+  callback(config, options);
+}
+
+module.exports = processOptions;

package/lib/utils/runOpen.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const open = require('opn');
+
+function runOpen(uri, options, log) {
+  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 = runOpen;

package/lib/utils/setupExitSignals.js

@@ -0,0 +1,21 @@
+'use strict';
+
+const signals = ['SIGINT', 'SIGTERM'];
+
+function setupExitSignals(server) {
+  signals.forEach((signal) => {
+    process.on(signal, () => {
+      if (server) {
+        server.close(() => {
+          // eslint-disable-next-line no-process-exit
+          process.exit();
+        });
+      } else {
+        // eslint-disable-next-line no-process-exit
+        process.exit();
+      }
+    });
+  });
+}
+
+module.exports = setupExitSignals;

package/lib/utils/status.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const open = require('opn');
 const colors = require('./colors');
+const runOpen = require('./runOpen');
 
 // TODO: don't emit logs when webpack-dev-server is used via Node.js API
 function status(uri, options, log, useColor) {
@@ -44,19 +44,7 @@ function status(uri, options, log, useColor) {
   }
 
   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`
-      );
-    });
+    runOpen(uri, options, log);
   }
 }
 

package/lib/utils/updateCompiler.js

@@ -48,6 +48,14 @@ function updateCompiler(compiler, options) {
     compilers.forEach((compiler) => {
       const config = compiler.options;
       compiler.hooks.entryOption.call(config.context, config.entry);
+
+      const providePlugin = new webpack.ProvidePlugin({
+        // SockJSClient.getClientPath(options)
+        __webpack_dev_server_client__: require.resolve(
+          '../../client/clients/SockJSClient.js'
+        ),
+      });
+      providePlugin.apply(compiler);
     });
 
     // do not apply the plugin unless it didn't exist before.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "3.4.1",
+  "version": "3.7.0",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -14,9 +14,9 @@
     "node": ">= 6.11.5"
   },
   "scripts": {
-    "lint:prettier": "prettier '{**/*,*}.{js,json,md,yml,css}' --list-different",
+    "lint:prettier": "prettier \"{**/*,*}.{js,json,md,yml,css}\" --list-different",
     "lint:js": "eslint . --cache",
-    "lint": "npm-run-all -l -p 'lint:**'",
+    "lint": "npm-run-all -l -p \"lint:**\"",
     "commitlint": "commitlint --from=master",
     "security": "npm audit",
     "test:only": "jest --runInBand",
@@ -24,8 +24,9 @@
     "test:watch": "npm run test:coverage --watch",
     "test": "npm run test:coverage",
     "pretest": "npm run lint",
-    "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 './client-src/default/*.config.js'",
+    "prepare": "rimraf ./ssl/*.pem && npm run -s transpile:index && npm run transpile:clients && 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 \"./client-src/default/*.config.js\"",
+    "transpile:clients": "babel client-src/clients --out-dir client/clients",
     "build:index": "webpack ./client-src/default/index.js -o client/index.bundle.js --color --config client-src/default/webpack.config.js",
     "build:live": "webpack ./client-src/live/index.js -o client/live.bundle.js --color --config client-src/live/webpack.config.js",
     "build:sockjs": "webpack ./client-src/sockjs/index.js -o client/sockjs.bundle.js --color --config client-src/sockjs/webpack.config.js",
@@ -40,19 +41,19 @@
     "connect-history-api-fallback": "^1.6.0",
     "debug": "^4.1.1",
     "del": "^4.1.1",
-    "express": "^4.17.0",
+    "express": "^4.17.1",
     "html-entities": "^1.2.1",
     "http-proxy-middleware": "^0.19.1",
     "import-local": "^2.0.0",
     "internal-ip": "^4.3.0",
     "ip": "^1.1.5",
     "killable": "^1.0.1",
-    "loglevel": "^1.6.1",
+    "loglevel": "^1.6.2",
     "opn": "^5.5.0",
     "portfinder": "^1.0.20",
     "schema-utils": "^1.0.0",
     "selfsigned": "^1.10.4",
-    "semver": "^6.0.0",
+    "semver": "^6.1.1",
     "serve-index": "^1.9.1",
     "sockjs": "0.3.19",
     "sockjs-client": "1.3.0",
@@ -66,41 +67,41 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
+    "@babel/core": "^7.4.5",
+    "@babel/preset-env": "^7.4.5",
     "@commitlint/cli": "^7.6.1",
     "@commitlint/config-conventional": "^7.6.0",
     "babel-loader": "^8.0.6",
-    "commitlint-azure-pipelines-cli": "^1.0.1",
+    "body-parser": "^1.19.0",
+    "commitlint-azure-pipelines-cli": "^1.0.2",
     "copy-webpack-plugin": "^5.0.3",
     "css-loader": "^2.1.1",
     "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.3.0",
     "eslint-config-webpack": "^1.2.5",
-    "eslint-plugin-import": "^2.17.2",
+    "eslint-plugin-import": "^2.17.3",
     "execa": "^1.0.0",
     "file-loader": "^3.0.1",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.2.0",
-    "husky": "^2.3.0",
+    "husky": "^2.4.0",
     "jest": "^24.8.0",
     "jest-junit": "^6.4.0",
     "jquery": "^3.4.1",
     "less": "^3.9.0",
     "less-loader": "^5.0.0",
-    "lint-staged": "^8.1.7",
+    "lint-staged": "^8.2.0",
     "marked": "^0.6.2",
-    "memfs": "^2.15.2",
+    "memfs": "^2.15.4",
     "npm-run-all": "^4.1.5",
-    "nyc": "^14.1.1",
     "prettier": "^1.17.1",
-    "puppeteer": "^1.16.0",
+    "puppeteer": "^1.17.0",
     "rimraf": "^2.6.3",
     "standard-version": "^6.0.1",
     "style-loader": "^0.23.1",
     "supertest": "^4.0.2",
     "url-loader": "^1.1.2",
-    "webpack": "^4.31.0",
+    "webpack": "^4.33.0",
     "webpack-cli": "^3.3.2",
     "ws": "^6.2.1"
   },