webpack-dev-server 4.2.1 → 4.5.0

package/bin/cli-flags.js

@@ -174,6 +174,29 @@ module.exports = {
     simpleType: "boolean",
     multiple: false,
   },
+  "client-reconnect": {
+    configs: [
+      {
+        type: "boolean",
+        multiple: false,
+        description:
+          "Tells dev-server the number of times it should try to reconnect the client.",
+        path: "client.reconnect",
+      },
+      {
+        type: "number",
+        multiple: false,
+        description:
+          "Tells dev-server the number of times it should try to reconnect the client.",
+        path: "client.reconnect",
+      },
+    ],
+    description:
+      "Tells dev-server the number of times it should try to reconnect the client.",
+    negatedDescription: "Tells dev-server to not to try to connect the client.",
+    simpleType: "string",
+    multiple: false,
+  },
   "client-web-socket-url": {
     configs: [
       {
@@ -297,21 +320,54 @@ module.exports = {
   "web-socket-server": {
     configs: [
       {
+        description:
+          "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option.",
+        multiple: false,
+        path: "webSocketServer",
         type: "enum",
-        values: [false, "sockjs", "ws"],
+        values: [false],
+      },
+      {
+        description:
+          "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option.",
         multiple: false,
+        path: "webSocketServer",
+        type: "enum",
+        values: ["sockjs", "ws"],
+      },
+      {
         description:
           "Allows to set web socket server and options (by default 'ws').",
+        multiple: false,
         path: "webSocketServer",
+        type: "string",
       },
+    ],
+
+    description:
+      "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws').",
+    simpleType: "string",
+    multiple: false,
+  },
+  "web-socket-server-type": {
+    configs: [
       {
-        type: "string",
+        description:
+          "Allows to set web socket server and options (by default 'ws').",
         multiple: false,
+        path: "webSocketServer.type",
+        type: "enum",
+        values: ["sockjs", "ws"],
+      },
+      {
         description:
           "Allows to set web socket server and options (by default 'ws').",
-        path: "webSocketServer",
+        multiple: false,
+        path: "webSocketServer.type",
+        type: "string",
       },
     ],
+
     description:
       "Allows to set web socket server and options (by default 'ws').",
     simpleType: "string",
@@ -392,11 +448,13 @@ module.exports = {
       {
         type: "boolean",
         multiple: false,
-        description: "Allows to serve over HTTP/2 using SPDY.",
+        description:
+          "Allows to serve over HTTP/2 using SPDY. Deprecated, it will be removed in favor of the `server` option.",
         path: "http2",
       },
     ],
-    description: "Allows to serve over HTTP/2 using SPDY.",
+    description:
+      "Allows to serve over HTTP/2 using SPDY. Deprecated, it will be removed in favor of the `server` option.",
     negatedDescription: "Does not serve over HTTP/2 using SPDY.",
     simpleType: "boolean",
     multiple: false,
@@ -407,12 +465,12 @@ module.exports = {
         type: "boolean",
         multiple: false,
         description:
-          "Allows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP).",
+          "Allows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP). Deprecated, it will be removed in favor of the `server` option.",
         path: "https",
       },
     ],
     description:
-      "Allows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP).",
+      "Allows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP). Deprecated, it will be removed in favor of the `server` option.",
     negatedDescription:
       "Disallows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP).",
     simpleType: "boolean",
@@ -423,11 +481,13 @@ module.exports = {
       {
         type: "string",
         multiple: false,
-        description: "Passphrase for a pfx file.",
+        description:
+          "Passphrase for a pfx file. Deprecated, it will be removed in favor of the `server.options.passphrase` option.",
         path: "https.passphrase",
       },
     ],
-    description: "Passphrase for a pfx file.",
+    description:
+      "Passphrase for a pfx file. Deprecated, it will be removed in favor of the `server.options.passphrase` option.",
     simpleType: "string",
     multiple: false,
   },
@@ -436,11 +496,13 @@ module.exports = {
       {
         type: "boolean",
         multiple: false,
-        description: "Request for an SSL certificate.",
+        description:
+          "Request for an SSL certificate. Deprecated, it will be removed in favor of the `server.options.requestCert` option.",
         path: "https.requestCert",
       },
     ],
-    description: "Request for an SSL certificate.",
+    description:
+      "Request for an SSL certificate. Deprecated, it will be removed in favor of the `server.options.requestCert` option.",
     negatedDescription: "Does not request for an SSL certificate.",
     simpleType: "boolean",
     multiple: false,
@@ -451,12 +513,12 @@ module.exports = {
         type: "string",
         multiple: true,
         description:
-          "Path to an SSL CA certificate or content of an SSL CA certificate.",
+          "Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.ca` option.",
         path: "https.ca[]",
       },
     ],
     description:
-      "Path to an SSL CA certificate or content of an SSL CA certificate.",
+      "Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.ca` option.",
     simpleType: "string",
     multiple: true,
   },
@@ -464,14 +526,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Clear all items provided in 'https.ca' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+          "Clear all items provided in 'https.ca' configuration. Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.ca` option.",
         multiple: false,
         path: "https.ca",
         type: "reset",
       },
     ],
     description:
-      "Clear all items provided in 'https.ca' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+      "Clear all items provided in 'https.ca' configuration. Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.ca` option.",
     multiple: false,
     simpleType: "boolean",
   },
@@ -481,12 +543,12 @@ module.exports = {
         type: "string",
         multiple: true,
         description:
-          "Path to an SSL CA certificate or content of an SSL CA certificate.",
+          "Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.cacert` option.",
         path: "https.cacert[]",
       },
     ],
     description:
-      "Path to an SSL CA certificate or content of an SSL CA certificate.",
+      "Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.cacert` option.",
     simpleType: "string",
     multiple: true,
   },
@@ -494,14 +556,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Clear all items provided in 'https.cacert' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+          "Clear all items provided in 'https.cacert' configuration. Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.cacert` option.",
         multiple: false,
         path: "https.cacert",
         type: "reset",
       },
     ],
     description:
-      "Clear all items provided in 'https.cacert' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+      "Clear all items provided in 'https.cacert' configuration. Path to an SSL CA certificate or content of an SSL CA certificate. Deprecated, it will be removed in favor of the `server.options.cacert` option.",
     multiple: false,
     simpleType: "boolean",
   },
@@ -510,11 +572,13 @@ module.exports = {
       {
         type: "string",
         multiple: true,
-        description: "Path to an SSL key or content of an SSL key.",
+        description:
+          "Path to an SSL key or content of an SSL key. Deprecated, it will be removed in favor of the `server.options.key` option.",
         path: "https.key[]",
       },
     ],
-    description: "Path to an SSL key or content of an SSL key.",
+    description:
+      "Path to an SSL key or content of an SSL key. Deprecated, it will be removed in favor of the `server.options.key` option.",
     simpleType: "string",
     multiple: true,
   },
@@ -522,14 +586,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Clear all items provided in 'https.key' configuration. Path to an SSL key or content of an SSL key.",
+          "Clear all items provided in 'https.key' configuration. Path to an SSL key or content of an SSL key. Deprecated, it will be removed in favor of the `server.options.key` option.",
         multiple: false,
         path: "https.key",
         type: "reset",
       },
     ],
     description:
-      "Clear all items provided in 'https.key' configuration. Path to an SSL key or content of an SSL key.",
+      "Clear all items provided in 'https.key' configuration. Path to an SSL key or content of an SSL key. Deprecated, it will be removed in favor of the `server.options.key` option.",
     multiple: false,
     simpleType: "boolean",
   },
@@ -538,11 +602,13 @@ module.exports = {
       {
         type: "string",
         multiple: true,
-        description: "Path to an SSL pfx file or content of an SSL pfx file.",
+        description:
+          "Path to an SSL pfx file or content of an SSL pfx file. Deprecated, it will be removed in favor of the `server.options.pfx` option.",
         path: "https.pfx[]",
       },
     ],
-    description: "Path to an SSL pfx file or content of an SSL pfx file.",
+    description:
+      "Path to an SSL pfx file or content of an SSL pfx file. Deprecated, it will be removed in favor of the `server.options.pfx` option.",
     simpleType: "string",
     multiple: true,
   },
@@ -550,14 +616,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Clear all items provided in 'https.pfx' configuration. Path to an SSL pfx file or content of an SSL pfx file.",
+          "Clear all items provided in 'https.pfx' configuration. Path to an SSL pfx file or content of an SSL pfx file. Deprecated, it will be removed in favor of the `server.options.pfx` option.",
         multiple: false,
         path: "https.pfx",
         type: "reset",
       },
     ],
     description:
-      "Clear all items provided in 'https.pfx' configuration. Path to an SSL pfx file or content of an SSL pfx file.",
+      "Clear all items provided in 'https.pfx' configuration. Path to an SSL pfx file or content of an SSL pfx file. Deprecated, it will be removed in favor of the `server.options.pfx` option.",
     multiple: false,
     simpleType: "boolean",
   },
@@ -567,11 +633,12 @@ module.exports = {
         type: "string",
         multiple: true,
         description:
-          "Path to an SSL certificate or content of an SSL certificate.",
+          "Path to an SSL certificate or content of an SSL certificate. Deprecated, it will be removed in favor of the `server.options.cert` option.",
         path: "https.cert[]",
       },
     ],
-    description: "Path to an SSL certificate or content of an SSL certificate.",
+    description:
+      "Path to an SSL certificate or content of an SSL certificate. Deprecated, it will be removed in favor of the `server.options.cert` option.",
     simpleType: "string",
     multiple: true,
   },
@@ -579,14 +646,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Clear all items provided in 'https.cert' configuration. Path to an SSL certificate or content of an SSL certificate.",
+          "Clear all items provided in 'https.cert' configuration. Path to an SSL certificate or content of an SSL certificate. Deprecated, it will be removed in favor of the `server.options.cert` option.",
         multiple: false,
         path: "https.cert",
         type: "reset",
       },
     ],
     description:
-      "Clear all items provided in 'https.cert' configuration. Path to an SSL certificate or content of an SSL certificate.",
+      "Clear all items provided in 'https.cert' configuration. Path to an SSL certificate or content of an SSL certificate. Deprecated, it will be removed in favor of the `server.options.cert` option.",
     multiple: false,
     simpleType: "boolean",
   },
@@ -594,14 +661,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+          "Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists). Deprecated, it will be removed in favor of the `server.options.crl` option.",
         multiple: true,
         path: "https.crl[]",
         type: "string",
       },
     ],
     description:
-      "Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+      "Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists). Deprecated, it will be removed in favor of the `server.options.crl` option.",
     multiple: true,
     simpleType: "string",
   },
@@ -609,14 +676,14 @@ module.exports = {
     configs: [
       {
         description:
-          "Clear all items provided in 'https.crl' configuration. Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+          "Clear all items provided in 'https.crl' configuration. Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists). Deprecated, it will be removed in favor of the `server.options.crl` option.",
         multiple: false,
         path: "https.crl",
         type: "reset",
       },
     ],
     description:
-      "Clear all items provided in 'https.crl' configuration. Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+      "Clear all items provided in 'https.crl' configuration. Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists). Deprecated, it will be removed in favor of the `server.options.crl` option.",
     multiple: false,
     simpleType: "boolean",
   },
@@ -820,6 +887,221 @@ module.exports = {
     simpleType: "string",
     multiple: false,
   },
+  "server-options-ca": {
+    configs: [
+      {
+        description:
+          "Path to an SSL CA certificate or content of an SSL CA certificate.",
+        multiple: true,
+        path: "server.options.ca[]",
+        type: "string",
+      },
+    ],
+    description:
+      "Path to an SSL CA certificate or content of an SSL CA certificate.",
+    multiple: true,
+    simpleType: "string",
+  },
+  "server-options-ca-reset": {
+    configs: [
+      {
+        description:
+          "Clear all items provided in 'server.options.ca' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+        multiple: false,
+        path: "server.options.ca",
+        type: "reset",
+      },
+    ],
+    description:
+      "Clear all items provided in 'server.options.ca' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-options-cacert": {
+    configs: [
+      {
+        description:
+          "Path to an SSL CA certificate or content of an SSL CA certificate.",
+        multiple: true,
+        path: "server.options.cacert[]",
+        type: "string",
+      },
+    ],
+    description:
+      "Path to an SSL CA certificate or content of an SSL CA certificate.",
+    multiple: true,
+    simpleType: "string",
+  },
+  "server-options-cacert-reset": {
+    configs: [
+      {
+        description:
+          "Clear all items provided in 'server.options.cacert' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+        multiple: false,
+        path: "server.options.cacert",
+        type: "reset",
+      },
+    ],
+    description:
+      "Clear all items provided in 'server.options.cacert' configuration. Path to an SSL CA certificate or content of an SSL CA certificate.",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-options-cert": {
+    configs: [
+      {
+        description:
+          "Path to an SSL certificate or content of an SSL certificate.",
+        multiple: true,
+        path: "server.options.cert[]",
+        type: "string",
+      },
+    ],
+    description: "Path to an SSL certificate or content of an SSL certificate.",
+    multiple: true,
+    simpleType: "string",
+  },
+  "server-options-cert-reset": {
+    configs: [
+      {
+        description:
+          "Clear all items provided in 'server.options.cert' configuration. Path to an SSL certificate or content of an SSL certificate.",
+        multiple: false,
+        path: "server.options.cert",
+        type: "reset",
+      },
+    ],
+    description:
+      "Clear all items provided in 'server.options.cert' configuration. Path to an SSL certificate or content of an SSL certificate.",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-options-crl": {
+    configs: [
+      {
+        description:
+          "Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+        multiple: true,
+        path: "server.options.crl[]",
+        type: "string",
+      },
+    ],
+    description:
+      "Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+    multiple: true,
+    simpleType: "string",
+  },
+  "server-options-crl-reset": {
+    configs: [
+      {
+        description:
+          "Clear all items provided in 'server.options.crl' configuration. Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+        multiple: false,
+        path: "server.options.crl",
+        type: "reset",
+      },
+    ],
+    description:
+      "Clear all items provided in 'server.options.crl' configuration. Path to PEM formatted CRLs (Certificate Revocation Lists) or content of PEM formatted CRLs (Certificate Revocation Lists).",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-options-key": {
+    configs: [
+      {
+        description: "Path to an SSL key or content of an SSL key.",
+        multiple: true,
+        path: "server.options.key[]",
+        type: "string",
+      },
+    ],
+    description: "Path to an SSL key or content of an SSL key.",
+    multiple: true,
+    simpleType: "string",
+  },
+  "server-options-key-reset": {
+    configs: [
+      {
+        description:
+          "Clear all items provided in 'server.options.key' configuration. Path to an SSL key or content of an SSL key.",
+        multiple: false,
+        path: "server.options.key",
+        type: "reset",
+      },
+    ],
+    description:
+      "Clear all items provided in 'server.options.key' configuration. Path to an SSL key or content of an SSL key.",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-options-passphrase": {
+    configs: [
+      {
+        description: "Passphrase for a pfx file.",
+        multiple: false,
+        path: "server.options.passphrase",
+        type: "string",
+      },
+    ],
+    description: "Passphrase for a pfx file.",
+    multiple: false,
+    simpleType: "string",
+  },
+  "server-options-pfx": {
+    configs: [
+      {
+        description: "Path to an SSL pfx file or content of an SSL pfx file.",
+        multiple: true,
+        path: "server.options.pfx[]",
+        type: "string",
+      },
+    ],
+    description: "Path to an SSL pfx file or content of an SSL pfx file.",
+    multiple: true,
+    simpleType: "string",
+  },
+  "server-options-pfx-reset": {
+    configs: [
+      {
+        description:
+          "Clear all items provided in 'server.options.pfx' configuration. Path to an SSL pfx file or content of an SSL pfx file.",
+        multiple: false,
+        path: "server.options.pfx",
+        type: "reset",
+      },
+    ],
+    description:
+      "Clear all items provided in 'server.options.pfx' configuration. Path to an SSL pfx file or content of an SSL pfx file.",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-options-request-cert": {
+    configs: [
+      {
+        description: "Request for an SSL certificate.",
+        multiple: false,
+        path: "server.options.requestCert",
+        type: "boolean",
+      },
+    ],
+    description: "Request for an SSL certificate.",
+    multiple: false,
+    simpleType: "boolean",
+  },
+  "server-type": {
+    configs: [
+      {
+        description: "Allows to set server and options (by default 'http').",
+        multiple: false,
+        path: "server.type",
+        type: "enum",
+        values: ["http", "https", "spdy"],
+      },
+    ],
+    description: "Allows to set server and options (by default 'http').",
+    multiple: false,
+    simpleType: "string",
+  },
   static: {
     configs: [
       {

package/client/index.js

@@ -3,7 +3,7 @@ import webpackHotLog from "webpack/hot/log.js";
 import stripAnsi from "./modules/strip-ansi/index.js";
 import parseURL from "./utils/parseURL.js";
 import socket from "./socket.js";
-import { show, hide } from "./overlay.js";
+import { formatProblem, show, hide } from "./overlay.js";
 import { log, setLogLevel } from "./utils/log.js";
 import sendMessage from "./utils/sendMessage.js";
 import reloadApp from "./utils/reloadApp.js";
@@ -13,8 +13,7 @@ var status = {
   // TODO Workaround for webpack v4, `__webpack_hash__` is not replaced without HotModuleReplacement
   // eslint-disable-next-line camelcase
   currentHash: typeof __webpack_hash__ !== "undefined" ? __webpack_hash__ : ""
-}; // console.log(__webpack_hash__);
-
+};
 var options = {
   hot: false,
   liveReload: false,
@@ -37,6 +36,10 @@ if (parsedResourceQuery.logging) {
   options.logging = parsedResourceQuery.logging;
 }
 
+if (typeof parsedResourceQuery.reconnect !== "undefined") {
+  options.reconnect = Number(parsedResourceQuery.reconnect);
+}
+
 function setAllLogLevel(level) {
   // This is needed because the HMR logger operate separately from dev server logger
   webpackHotLog.setLogLevel(level === "verbose" || level === "log" ? "info" : level);
@@ -88,6 +91,13 @@ var onSocketMessage = {
 
     options.overlay = value;
   },
+  reconnect: function reconnect(value) {
+    if (parsedResourceQuery.reconnect === "false") {
+      return;
+    }
+
+    options.reconnect = value;
+  },
   progress: function progress(_progress) {
     options.progress = _progress;
   },
@@ -128,41 +138,47 @@ var onSocketMessage = {
   warnings: function warnings(_warnings) {
     log.warn("Warnings while compiling.");
 
-    var strippedWarnings = _warnings.map(function (warning) {
-      return stripAnsi(warning.message ? warning.message : warning);
+    var printableWarnings = _warnings.map(function (error) {
+      var _formatProblem = formatProblem("warning", error),
+          header = _formatProblem.header,
+          body = _formatProblem.body;
+
+      return "".concat(header, "\n").concat(stripAnsi(body));
     });
 
-    sendMessage("Warnings", strippedWarnings);
+    sendMessage("Warnings", printableWarnings);
 
-    for (var i = 0; i < strippedWarnings.length; i++) {
-      log.warn(strippedWarnings[i]);
+    for (var i = 0; i < printableWarnings.length; i++) {
+      log.warn(printableWarnings[i]);
     }
 
     var needShowOverlayForWarnings = typeof options.overlay === "boolean" ? options.overlay : options.overlay && options.overlay.warnings;
 
     if (needShowOverlayForWarnings) {
-      show(_warnings, "warnings");
+      show("warning", _warnings);
     }
-
-    reloadApp(options, status);
   },
   errors: function errors(_errors) {
     log.error("Errors while compiling. Reload prevented.");
 
-    var strippedErrors = _errors.map(function (error) {
-      return stripAnsi(error.message ? error.message : error);
+    var printableErrors = _errors.map(function (error) {
+      var _formatProblem2 = formatProblem("error", error),
+          header = _formatProblem2.header,
+          body = _formatProblem2.body;
+
+      return "".concat(header, "\n").concat(stripAnsi(body));
     });
 
-    sendMessage("Errors", strippedErrors);
+    sendMessage("Errors", printableErrors);
 
-    for (var i = 0; i < strippedErrors.length; i++) {
-      log.error(strippedErrors[i]);
+    for (var i = 0; i < printableErrors.length; i++) {
+      log.error(printableErrors[i]);
     }
 
     var needShowOverlayForErrors = typeof options.overlay === "boolean" ? options.overlay : options.overlay && options.overlay.errors;
 
     if (needShowOverlayForErrors) {
-      show(_errors, "errors");
+      show("error", _errors);
     }
   },
   error: function error(_error) {
@@ -179,4 +195,4 @@ var onSocketMessage = {
   }
 };
 var socketURL = createSocketURL(parsedResourceQuery);
-socket(socketURL, onSocketMessage);
+socket(socketURL, onSocketMessage, options.reconnect);