webpack-dev-server 4.4.0 → 4.5.0

package/README.md

@@ -109,8 +109,9 @@ Options:
   --client-web-socket-url-protocol <value>  Tells clients connected to devServer to use the provided protocol.
   --client-web-socket-url-username <value>  Tells clients connected to devServer to use the provided username to authenticate.
   --client-web-socket-url-password <value>  Tells clients connected to devServer to use the provided password to authenticate.
-  --web-socket-server <value>               Allows to set web socket server and options (by default 'ws').
+  --web-socket-server <value>               Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option. Allows to set web socket server and options (by default 'ws').
   --no-web-socket-server                    Negative 'web-socket-server' option.
+  --web-socket-server-type <value>          Allows to set web socket server and options (by default 'ws').
   --compress                                Enables gzip compression for everything served.
   --no-compress                             Disables gzip compression for everything served.
   --history-api-fallback                    Allows to proxy requests through a specified index page (by default 'index.html'), useful for Single Page Applications that utilise the HTML5 History API.
@@ -118,9 +119,10 @@ Options:
   --host <value>                            Allows to specify a hostname to use.
   --hot [value]                             Enables Hot Module Replacement.
   --no-hot                                  Disables Hot Module Replacement.
-  --http2                                   Allows to serve over HTTP/2 using SPDY.
+  --http2                                   Allows to serve over HTTP/2 using SPDY. Deprecated, it will be removed in favor of the `server` option.
   --no-http2                                Does not serve over HTTP/2 using SPDY.
-  --https                                   Allows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP).
+--https                                   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.
   --no-https                                Disallows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP).
   --https-passphrase <value>                Passphrase for a pfx file. Deprecated, it will be removed in favor of the `server.options.passphrase` option.
   --https-request-cert                      Request for an SSL certificate. Deprecated, it will be removed in favor of the `server.options.requestCert`

package/bin/cli-flags.js

@@ -321,7 +321,7 @@ module.exports = {
     configs: [
       {
         description:
-          "Allows to set web socket server and options (by default 'ws').",
+          "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option.",
         multiple: false,
         path: "webSocketServer",
         type: "enum",
@@ -329,7 +329,7 @@ module.exports = {
       },
       {
         description:
-          "Allows to set web socket server and options (by default 'ws').",
+          "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option.",
         multiple: false,
         path: "webSocketServer",
         type: "enum",
@@ -344,6 +344,30 @@ module.exports = {
       },
     ],
 
+    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: [
+      {
+        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').",
+        multiple: false,
+        path: "webSocketServer.type",
+        type: "string",
+      },
+    ],
+
     description:
       "Allows to set web socket server and options (by default 'ws').",
     simpleType: "string",
@@ -424,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,
@@ -439,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",

package/client/index.js

@@ -157,8 +157,6 @@ var onSocketMessage = {
     if (needShowOverlayForWarnings) {
       show("warning", _warnings);
     }
-
-    reloadApp(options, status);
   },
   errors: function errors(_errors) {
     log.error("Errors while compiling. Reload prevented.");

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

@@ -1880,7 +1880,7 @@ module.exports = function (SockJS, availableTransports) {
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
     objectUtils = __webpack_require__(/*! ./utils/object */ "./node_modules/sockjs-client/lib/utils/object.js");
@@ -1941,7 +1941,7 @@ module.exports = InfoAjax;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
     XHRLocalObject = __webpack_require__(/*! ./transport/sender/xhr-local */ "./node_modules/sockjs-client/lib/transport/sender/xhr-local.js"),
     InfoAjax = __webpack_require__(/*! ./info-ajax */ "./node_modules/sockjs-client/lib/info-ajax.js");
@@ -1981,7 +1981,7 @@ module.exports = InfoReceiverIframe;
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
     utils = __webpack_require__(/*! ./utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
@@ -2062,7 +2062,7 @@ module.exports = InfoIframe;
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     urlUtils = __webpack_require__(/*! ./utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     XDR = __webpack_require__(/*! ./transport/sender/xdr */ "./node_modules/sockjs-client/lib/transport/sender/xdr.js"),
@@ -3087,7 +3087,7 @@ __webpack_require__(/*! ./transport/websocket */ "./node_modules/sockjs-client/l
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     utils = __webpack_require__(/*! ../../utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
     urlUtils = __webpack_require__(/*! ../../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
@@ -3416,7 +3416,7 @@ module.exports = HtmlFileTransport;
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     JSON3 = __webpack_require__(/*! json3 */ "./node_modules/json3/lib/json3.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     version = __webpack_require__(/*! ../version */ "./node_modules/sockjs-client/lib/version.js"),
     urlUtils = __webpack_require__(/*! ../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     iframeUtils = __webpack_require__(/*! ../utils/iframe */ "./node_modules/sockjs-client/lib/utils/iframe.js"),
@@ -3660,7 +3660,7 @@ module.exports = AjaxBasedTransport;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -3804,7 +3804,7 @@ module.exports = function (transport) {
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -3926,7 +3926,7 @@ module.exports = SenderReceiver;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     EventSourceDriver = __webpack_require__(/*! eventsource */ "./node_modules/sockjs-client/lib/transport/browser/eventsource.js");
 
 var debug = function debug() {};
@@ -4007,7 +4007,7 @@ module.exports = EventSourceReceiver;
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     iframeUtils = __webpack_require__(/*! ../../utils/iframe */ "./node_modules/sockjs-client/lib/utils/iframe.js"),
     urlUtils = __webpack_require__(/*! ../../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     random = __webpack_require__(/*! ../../utils/random */ "./node_modules/sockjs-client/lib/utils/random.js");
 
 var debug = function debug() {};
@@ -4108,7 +4108,7 @@ var utils = __webpack_require__(/*! ../../utils/iframe */ "./node_modules/sockjs
     browser = __webpack_require__(/*! ../../utils/browser */ "./node_modules/sockjs-client/lib/utils/browser.js"),
     urlUtils = __webpack_require__(/*! ../../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -4312,7 +4312,7 @@ module.exports = JsonpReceiver;
 
 
 var inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter;
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter);
 
 var debug = function debug() {};
 
@@ -4514,7 +4514,7 @@ module.exports = function (url, payload, callback) {
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
     eventUtils = __webpack_require__(/*! ../../utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
     browser = __webpack_require__(/*! ../../utils/browser */ "./node_modules/sockjs-client/lib/utils/browser.js"),
@@ -4660,10 +4660,12 @@ module.exports = XHRCorsObject;
 "use strict";
 
 
-var EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+var EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js");
 
-function XHRFake() {
+function
+  /* method, url, payload, opts */
+XHRFake() {
   var self = this;
   EventEmitter.call(this);
   this.to = setTimeout(function () {
@@ -4720,7 +4722,7 @@ module.exports = XHRLocalObject;
 var utils = __webpack_require__(/*! ../utils/event */ "./node_modules/sockjs-client/lib/utils/event.js"),
     urlUtils = __webpack_require__(/*! ../utils/url */ "./node_modules/sockjs-client/lib/utils/url.js"),
     inherits = __webpack_require__(/*! inherits */ "./node_modules/inherits/inherits_browser.js"),
-    EventEmitter = __webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter,
+    EventEmitter = (__webpack_require__(/*! events */ "./node_modules/sockjs-client/lib/event/emitter.js").EventEmitter),
     WebsocketDriver = __webpack_require__(/*! ./driver/websocket */ "./node_modules/sockjs-client/lib/transport/browser/websocket.js");
 
 var debug = function debug() {};

package/lib/Server.js

@@ -32,6 +32,7 @@ class Server {
 
     this.options = options;
     this.staticWatchers = [];
+    this.listeners = [];
     // Keep track of websocket proxies for external websocket upgrade.
     this.webSocketProxies = [];
     this.sockets = [];
@@ -523,6 +524,17 @@ class Server {
     const isHTTPs = Boolean(options.https);
     const isSPDY = Boolean(options.http2);
 
+    if (isHTTPs || isSPDY) {
+      // TODO: remove in the next major release
+      util.deprecate(
+        () => {},
+        `'${
+          isHTTPs ? "https" : "http2"
+        }' option is deprecated. Please use the 'server' option.`,
+        `DEP_WEBPACK_DEV_SERVER_${isHTTPs ? "HTTPS" : "HTTP2"}`
+      )();
+    }
+
     options.server = {
       type:
         // eslint-disable-next-line no-nested-ternary
@@ -1157,15 +1169,11 @@ class Server {
 
       let needForceShutdown = false;
 
-      const exitProcess = () => {
-        // eslint-disable-next-line no-process-exit
-        process.exit();
-      };
-
       signals.forEach((signal) => {
-        process.on(signal, () => {
+        const listener = () => {
           if (needForceShutdown) {
-            exitProcess();
+            // eslint-disable-next-line no-process-exit
+            process.exit();
           }
 
           this.logger.info(
@@ -1176,19 +1184,26 @@ class Server {
 
           this.stopCallback(() => {
             if (typeof this.compiler.close === "function") {
-              this.compiler.close(exitProcess);
+              this.compiler.close(() => {
+                // eslint-disable-next-line no-process-exit
+                process.exit();
+              });
             } else {
-              exitProcess();
+              // eslint-disable-next-line no-process-exit
+              process.exit();
             }
           });
-        });
+        };
+
+        this.listeners.push({ name: signal, listener });
+
+        process.on(signal, listener);
       });
     }
 
     // Proxy WebSocket without the initial http request
     // https://github.com/chimurai/http-proxy-middleware#external-websocket-upgrade
-    // eslint-disable-next-line func-names
-    this.webSocketProxies.forEach(function (webSocketProxy) {
+    this.webSocketProxies.forEach((webSocketProxy) => {
       this.server.on("upgrade", webSocketProxy.upgrade);
     }, this);
   }
@@ -1608,6 +1623,7 @@ class Server {
     });
   }
 
+  // TODO: remove `--web-socket-server` in favor of `--web-socket-server-type`
   createWebSocketServer() {
     this.webSocketServer = new (this.getServerTransport())(this);
     this.webSocketServer.implementation.on("connection", (client, request) => {
@@ -1633,7 +1649,9 @@ class Server {
       ) {
         this.sendMessage([client], "error", "Invalid Host/Origin header");
 
-        client.terminate();
+        // With https enabled, the sendMessage above is encrypted asynchronously so not yet sent
+        // Terminate would prevent it sending, so use close to allow it to be sent
+        client.close();
 
         return;
       }
@@ -1701,22 +1719,25 @@ class Server {
     );
   }
 
-  runBonjour() {
-    const bonjour = require("bonjour")();
+  stopBonjour(callback = () => {}) {
+    this.bonjour.unpublishAll(() => {
+      this.bonjour.destroy();
+
+      if (callback) {
+        callback();
+      }
+    });
+  }
 
-    bonjour.publish({
+  runBonjour() {
+    this.bonjour = require("bonjour")();
+    this.bonjour.publish({
       name: `Webpack Dev Server ${os.hostname()}:${this.options.port}`,
       port: this.options.port,
       type: this.options.server.type === "http" ? "http" : "https",
       subtypes: ["webpack"],
       ...this.options.bonjour,
     });
-
-    process.on("exit", () => {
-      bonjour.unpublishAll(() => {
-        bonjour.destroy();
-      });
-    });
   }
 
   logStatus() {
@@ -2187,13 +2208,21 @@ class Server {
     }
   }
 
-  startCallback(callback) {
+  startCallback(callback = () => {}) {
     this.start()
       .then(() => callback(null), callback)
       .catch(callback);
   }
 
   async stop() {
+    if (this.bonjour) {
+      await new Promise((resolve) => {
+        this.stopBonjour(() => {
+          resolve();
+        });
+      });
+    }
+
     this.webSocketProxies = [];
 
     await Promise.all(this.staticWatchers.map((watcher) => watcher.close()));
@@ -2247,9 +2276,15 @@ class Server {
         this.middleware = null;
       }
     }
+
+    // We add listeners to signals when creating a new Server instance
+    // So ensure they are removed to prevent EventEmitter memory leak warnings
+    for (const item of this.listeners) {
+      process.removeListener(item.name, item.listener);
+    }
   }
 
-  stopCallback(callback) {
+  stopCallback(callback = () => {}) {
     this.stop()
       .then(() => callback(null), callback)
       .catch(callback);

package/lib/options.json

@@ -207,7 +207,7 @@
     },
     "HTTP2": {
       "type": "boolean",
-      "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.",
       "link": "https://webpack.js.org/configuration/dev-server/#devserverhttp2"
     },
     "HTTPS": {
@@ -382,7 +382,7 @@
           }
         }
       ],
-      "description": "Allows to configure the server's listening socket for TLS (by default, dev server will be served over HTTP).",
+      "description": "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.",
       "link": "https://webpack.js.org/configuration/dev-server/#devserverhttps"
     },
     "HeaderObject": {
@@ -1026,16 +1026,14 @@
         {
           "$ref": "#/definitions/WebSocketServerType"
         }
-      ]
+      ],
+      "description": "Deprecated: please use 'webSocketServer.type'/'--web-socket-server-type' option."
     },
     "WebSocketServerFunction": {
       "instanceof": "Function"
     },
     "WebSocketServerObject": {
       "type": "object",
-      "cli": {
-        "exclude": true
-      },
       "properties": {
         "type": {
           "anyOf": [
@@ -1052,7 +1050,10 @@
         },
         "options": {
           "type": "object",
-          "additionalProperties": true
+          "additionalProperties": true,
+          "cli": {
+            "exclude": true
+          }
         }
       },
       "additionalProperties": false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "4.4.0",
+  "version": "4.5.0",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -66,14 +66,16 @@
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/preset-env": "^7.14.5",
     "@babel/runtime": "^7.14.5",
-    "@commitlint/cli": "^13.1.0",
-    "@commitlint/config-conventional": "^13.1.0",
+    "@commitlint/cli": "^14.1.0",
+    "@commitlint/config-conventional": "^14.1.0",
     "acorn": "^8.2.4",
     "babel-jest": "^27.0.2",
     "babel-loader": "^8.2.2",
     "body-parser": "^1.19.0",
     "core-js": "^3.12.1",
     "css-loader": "^5.2.4",
+    "css-tree": "^1.1.3",
+    "csstree": "^0.0.3",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-webpack": "^1.2.5",
@@ -103,7 +105,7 @@
     "tcp-port-used": "^1.0.2",
     "typescript": "^4.2.4",
     "url-loader": "^4.1.1",
-    "webpack": "^5.54.0",
+    "webpack": "^5.64.0",
     "webpack-cli": "^4.7.2",
     "webpack-merge": "^5.8.0"
   },