webpack-dev-server 4.3.1 → 4.4.0

package/client/modules/logger/index.js

@@ -91,33 +91,61 @@ function _createClass(Constructor, protoProps, staticProps) {
 }
 
 var LogType = Object.freeze({
-  error: "error",
+  error:
+  /** @type {"error"} */
+  "error",
   // message, c style arguments
-  warn: "warn",
+  warn:
+  /** @type {"warn"} */
+  "warn",
   // message, c style arguments
-  info: "info",
+  info:
+  /** @type {"info"} */
+  "info",
   // message, c style arguments
-  log: "log",
+  log:
+  /** @type {"log"} */
+  "log",
   // message, c style arguments
-  debug: "debug",
+  debug:
+  /** @type {"debug"} */
+  "debug",
   // message, c style arguments
-  trace: "trace",
+  trace:
+  /** @type {"trace"} */
+  "trace",
   // no arguments
-  group: "group",
+  group:
+  /** @type {"group"} */
+  "group",
   // [label]
-  groupCollapsed: "groupCollapsed",
+  groupCollapsed:
+  /** @type {"groupCollapsed"} */
+  "groupCollapsed",
   // [label]
-  groupEnd: "groupEnd",
+  groupEnd:
+  /** @type {"groupEnd"} */
+  "groupEnd",
   // [label]
-  profile: "profile",
+  profile:
+  /** @type {"profile"} */
+  "profile",
   // [profileName]
-  profileEnd: "profileEnd",
+  profileEnd:
+  /** @type {"profileEnd"} */
+  "profileEnd",
   // [profileName]
-  time: "time",
+  time:
+  /** @type {"time"} */
+  "time",
   // name, time as [seconds, nanoseconds]
-  clear: "clear",
+  clear:
+  /** @type {"clear"} */
+  "clear",
   // no arguments
-  status: "status" // message, arguments
+  status:
+  /** @type {"status"} */
+  "status" // message, arguments
 
 });
 exports.LogType = LogType;
@@ -314,6 +342,7 @@ var WebpackLogger = /*#__PURE__*/function () {
       if (this[TIMERS_AGGREGATES_SYMBOL] === undefined) return;
       var time = this[TIMERS_AGGREGATES_SYMBOL].get(label);
       if (time === undefined) return;
+      this[TIMERS_AGGREGATES_SYMBOL].delete(label);
       this[LOG_SYMBOL](LogType.time, [label].concat(_toConsumableArray(time)));
     }
   }]);

package/client/modules/sockjs-client/index.js

@@ -2958,7 +2958,8 @@ if ('ab'.split(/(?:ab)*/).length !== 2 || '.'.split(/(.?)(.?)/).length !== 4 ||
       }
 
       var output = [],
-          flags = (separator.ignoreCase ? 'i' : '') + (separator.multiline ? 'm' : '') + (separator.extended ? 'x' : '') + (separator.sticky ? 'y' : ''),
+          flags = (separator.ignoreCase ? 'i' : '') + (separator.multiline ? 'm' : '') + (separator.extended ? 'x' : '') + ( // Proposed for ES6
+      separator.sticky ? 'y' : ''),
           // Firefox 3+
       lastLastIndex = 0,
           // Make `global` and avoid `lastIndex` issues by working with a copy

package/client/socket.js

@@ -1,5 +1,6 @@
 /* global __webpack_dev_server_client__ */
-import WebSocketClient from "./clients/WebSocketClient.js"; // this WebsocketClient is here as a default fallback, in case the client is not injected
+import WebSocketClient from "./clients/WebSocketClient.js";
+import { log } from "./utils/log.js"; // this WebsocketClient is here as a default fallback, in case the client is not injected
 
 /* eslint-disable camelcase */
 
@@ -9,12 +10,14 @@ typeof __webpack_dev_server_client__.default !== "undefined" ? __webpack_dev_ser
 /* eslint-enable camelcase */
 
 var retries = 0;
+var maxRetries = 10;
 var client = null;
 
-var socket = function initSocket(url, handlers) {
+var socket = function initSocket(url, handlers, reconnect) {
   client = new Client(url);
   client.onOpen(function () {
     retries = 0;
+    maxRetries = reconnect;
   });
   client.onClose(function () {
     if (retries === 0) {
@@ -24,12 +27,13 @@ var socket = function initSocket(url, handlers) {
 
     client = null; // After 10 retries stop trying, to prevent logspam.
 
-    if (retries <= 10) {
+    if (retries < maxRetries) {
       // Exponentially increase timeout to reconnect.
       // Respectfully copied from the package `got`.
       // eslint-disable-next-line no-mixed-operators, no-restricted-properties
       var retryInMs = 1000 * Math.pow(2, retries) + Math.random() * 100;
       retries += 1;
+      log.info("Trying to reconnect...");
       setTimeout(function () {
         socket(url, handlers);
       }, retryInMs);

package/lib/Server.js

@@ -155,7 +155,7 @@ class Server {
         if (typeof this.options.client.webSocketURL.protocol !== "undefined") {
           protocol = this.options.client.webSocketURL.protocol;
         } else {
-          protocol = this.options.https ? "wss:" : "ws:";
+          protocol = this.options.server.type === "http" ? "ws:" : "wss:";
         }
 
         searchParams.set("protocol", protocol);
@@ -258,6 +258,10 @@ class Server {
           searchParams.set("logging", this.options.client.logging);
         }
 
+        if (typeof this.options.client.reconnect !== "undefined") {
+          searchParams.set("reconnect", this.options.client.reconnect);
+        }
+
         webSocketURL = searchParams.toString();
       }
 
@@ -474,6 +478,14 @@ class Server {
         };
       }
 
+      if (typeof options.client.reconnect === "undefined") {
+        options.client.reconnect = 10;
+      } else if (options.client.reconnect === true) {
+        options.client.reconnect = Infinity;
+      } else if (options.client.reconnect === false) {
+        options.client.reconnect = 0;
+      }
+
       // Respect infrastructureLogging.level
       if (typeof options.client.logging === "undefined") {
         options.client.logging = compilerOptions.infrastructureLogging
@@ -508,23 +520,51 @@ class Server {
         ? options.hot
         : true;
 
-    // if the user enables http2, we can safely enable https
-    if ((options.http2 && !options.https) || options.https === true) {
-      options.https = {
-        requestCert: false,
+    const isHTTPs = Boolean(options.https);
+    const isSPDY = Boolean(options.http2);
+
+    options.server = {
+      type:
+        // eslint-disable-next-line no-nested-ternary
+        typeof options.server === "string"
+          ? options.server
+          : // eslint-disable-next-line no-nested-ternary
+          typeof (options.server || {}).type === "string"
+          ? options.server.type
+          : // eslint-disable-next-line no-nested-ternary
+          isSPDY
+          ? "spdy"
+          : isHTTPs
+          ? "https"
+          : "http",
+      options: {
+        ...options.https,
+        ...(options.server || {}).options,
+      },
+    };
+
+    if (
+      options.server.type === "spdy" &&
+      typeof options.server.options.spdy === "undefined"
+    ) {
+      options.server.options.spdy = {
+        protocols: ["h2", "http/1.1"],
       };
     }
 
-    // https option
-    if (options.https) {
+    if (options.server.type === "https" || options.server.type === "spdy") {
+      if (typeof options.server.options.requestCert === "undefined") {
+        options.server.options.requestCert = false;
+      }
+
       // TODO remove the `cacert` option in favor `ca` in the next major release
       for (const property of ["cacert", "ca", "cert", "crl", "key", "pfx"]) {
-        if (typeof options.https[property] === "undefined") {
+        if (typeof options.server.options[property] === "undefined") {
           // eslint-disable-next-line no-continue
           continue;
         }
 
-        const value = options.https[property];
+        const value = options.server.options[property];
         const readFile = (item) => {
           if (
             Buffer.isBuffer(item) ||
@@ -547,14 +587,14 @@ class Server {
           }
         };
 
-        options.https[property] = Array.isArray(value)
+        options.server.options[property] = Array.isArray(value)
           ? value.map((item) => readFile(item))
           : readFile(value);
       }
 
       let fakeCert;
 
-      if (!options.https.key || !options.https.cert) {
+      if (!options.server.options.key || !options.server.options.cert) {
         const certificateDir = Server.findCacheDir();
         const certificatePath = path.join(certificateDir, "server.pem");
         let certificateExists;
@@ -577,7 +617,7 @@ class Server {
             const del = require("del");
 
             this.logger.info(
-              "SSL Certificate is more than 30 days old. Removing..."
+              "SSL certificate is more than 30 days old. Removing..."
             );
 
             await del([certificatePath], { force: true });
@@ -587,7 +627,7 @@ class Server {
         }
 
         if (!certificateExists) {
-          this.logger.info("Generating SSL Certificate...");
+          this.logger.info("Generating SSL certificate...");
 
           const selfsigned = require("selfsigned");
           const attributes = [{ name: "commonName", value: "localhost" }];
@@ -669,20 +709,20 @@ class Server {
         this.logger.info(`SSL certificate: ${certificatePath}`);
       }
 
-      if (options.https.cacert) {
-        if (options.https.ca) {
+      if (options.server.options.cacert) {
+        if (options.server.options.ca) {
           this.logger.warn(
-            "Do not specify 'https.ca' and 'https.cacert' options together, the 'https.ca' option will be used."
+            "Do not specify 'ca' and 'cacert' options together, the 'ca' option will be used."
           );
         } else {
-          options.https.ca = options.https.cacert;
+          options.server.options.ca = options.server.options.cacert;
         }
 
-        delete options.https.cacert;
+        delete options.server.options.cacert;
       }
 
-      options.https.key = options.https.key || fakeCert;
-      options.https.cert = options.https.cert || fakeCert;
+      options.server.options.key = options.server.options.key || fakeCert;
+      options.server.options.cert = options.server.options.cert || fakeCert;
     }
 
     if (typeof options.ipc === "boolean") {
@@ -1547,28 +1587,11 @@ class Server {
   }
 
   createServer() {
-    if (this.options.https) {
-      if (this.options.http2) {
-        // TODO: we need to replace spdy with http2 which is an internal module
-        this.server = require("spdy").createServer(
-          {
-            ...this.options.https,
-            spdy: {
-              protocols: ["h2", "http/1.1"],
-            },
-          },
-          this.app
-        );
-      } else {
-        const https = require("https");
-
-        this.server = https.createServer(this.options.https, this.app);
-      }
-    } else {
-      const http = require("http");
-
-      this.server = http.createServer(this.app);
-    }
+    // eslint-disable-next-line import/no-dynamic-require
+    this.server = require(this.options.server.type).createServer(
+      this.options.server.options,
+      this.app
+    );
 
     this.server.on("connection", (socket) => {
       // Add socket to list
@@ -1627,6 +1650,10 @@ class Server {
         this.sendMessage([client], "progress", this.options.client.progress);
       }
 
+      if (this.options.client && this.options.client.reconnect) {
+        this.sendMessage([client], "reconnect", this.options.client.reconnect);
+      }
+
       if (this.options.client && this.options.client.overlay) {
         this.sendMessage([client], "overlay", this.options.client.overlay);
       }
@@ -1680,7 +1707,7 @@ class Server {
     bonjour.publish({
       name: `Webpack Dev Server ${os.hostname()}:${this.options.port}`,
       port: this.options.port,
-      type: this.options.https ? "https" : "http",
+      type: this.options.server.type === "http" ? "http" : "https",
       subtypes: ["webpack"],
       ...this.options.bonjour,
     });
@@ -1731,7 +1758,7 @@ class Server {
     if (this.options.ipc) {
       this.logger.info(`Project is running at: "${this.server.address()}"`);
     } else {
-      const protocol = this.options.https ? "https" : "http";
+      const protocol = this.options.server.type === "http" ? "http" : "https";
       const { address, port } = this.server.address();
       const prettyPrintURL = (newHostname) =>
         url.format({ protocol, hostname: newHostname, port, pathname: "/" });
@@ -1850,7 +1877,9 @@ class Server {
 
     if (this.options.bonjour) {
       const bonjourProtocol =
-        this.options.bonjour.type || this.options.https ? "https" : "http";
+        this.options.bonjour.type || this.options.server.type === "http"
+          ? "http"
+          : "https";
 
       this.logger.info(
         `Broadcasting "${bonjourProtocol}" with subtype of "webpack" via ZeroConf DNS (Bonjour)`
@@ -2159,7 +2188,9 @@ class Server {
   }
 
   startCallback(callback) {
-    this.start().then(() => callback(null), callback);
+    this.start()
+      .then(() => callback(null), callback)
+      .catch(callback);
   }
 
   async stop() {
@@ -2219,7 +2250,9 @@ class Server {
   }
 
   stopCallback(callback) {
-    this.stop().then(() => callback(null), callback);
+    this.stop()
+      .then(() => callback(null), callback)
+      .catch(callback);
   }
 
   // TODO remove in the next major release