webpack-dev-server 4.7.4 → 4.8.0

package/client/socket.js

@@ -9,8 +9,11 @@ typeof __webpack_dev_server_client__ !== "undefined" ? typeof __webpack_dev_serv
 /* eslint-enable camelcase */
 
 var retries = 0;
-var maxRetries = 10;
-var client = null;
+var maxRetries = 10; // Initialized client is exported so external consumers can utilize the same instance
+// It is mutable to enforce singleton
+// eslint-disable-next-line import/no-mutable-exports
+
+export var client = null;
 /**
  * @param {string} url
  * @param {{ [handler: string]: (data?: any, params?: any) => any }} handlers

package/client/utils/createSocketURL.js

@@ -5,7 +5,7 @@
 function format(objURL) {
   var protocol = objURL.protocol || "";
 
-  if (protocol && protocol.substr(-1) !== ":") {
+  if (protocol && !protocol.endsWith(":")) {
     protocol += ":";
   }
 

package/client/utils/parseURL.js

@@ -9,7 +9,7 @@ function parseURL(resourceQuery) {
   var options = {};
 
   if (typeof resourceQuery === "string" && resourceQuery !== "") {
-    var searchParams = resourceQuery.substr(1).split("&");
+    var searchParams = resourceQuery.slice(1).split("&");
 
     for (var i = 0; i < searchParams.length; i++) {
       var pair = searchParams[i].split("=");

package/client/utils/stripAnsi.js

@@ -0,0 +1,20 @@
+var ansiRegex = new RegExp(["[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)", "(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]))"].join("|"), "g");
+/**
+ *
+ * Strip [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code) from a string.
+ * Adapted from code originally released by Sindre Sorhus
+ * Licensed the MIT License
+ *
+ * @param {string} string
+ * @return {string}
+ */
+
+function stripAnsi(string) {
+  if (typeof string !== "string") {
+    throw new TypeError("Expected a `string`, got `".concat(typeof string, "`"));
+  }
+
+  return string.replace(ansiRegex, "");
+}
+
+export default stripAnsi;

package/lib/Server.js

@@ -29,8 +29,8 @@ const schema = require("./options.json");
 /** @typedef {import("chokidar").WatchOptions} WatchOptions */
 /** @typedef {import("chokidar").FSWatcher} FSWatcher */
 /** @typedef {import("connect-history-api-fallback").Options} ConnectHistoryApiFallbackOptions */
-/** @typedef {import("bonjour").Bonjour} Bonjour */
-/** @typedef {import("bonjour").BonjourOptions} BonjourOptions */
+/** @typedef {import("bonjour-service").Bonjour} Bonjour */
+/** @typedef {import("bonjour-service").Service} BonjourOptions */
 /** @typedef {import("http-proxy-middleware").RequestHandler} RequestHandler */
 /** @typedef {import("http-proxy-middleware").Options} HttpProxyMiddlewareOptions */
 /** @typedef {import("http-proxy-middleware").Filter} HttpProxyMiddlewareOptionsFilter */
@@ -188,7 +188,7 @@ const schema = require("./options.json");
  * @property {"auto" | "all" | string | string[]} [allowedHosts]
  * @property {boolean | ConnectHistoryApiFallbackOptions} [historyApiFallback]
  * @property {boolean} [setupExitSignals]
- * @property {boolean | BonjourOptions} [bonjour]
+ * @property {boolean | Record<string, never> | BonjourOptions} [bonjour]
  * @property {string | string[] | WatchFiles | Array<string | WatchFiles>} [watchFiles]
  * @property {boolean | string | Static | Array<string | Static>} [static]
  * @property {boolean | ServerOptions} [https]
@@ -1133,13 +1133,15 @@ class Server {
 
           // cert is more than 30 days old, kill it with fire
           if ((now - Number(certificateStat.ctime)) / certificateTtl > 30) {
-            const del = require("del");
+            const { promisify } = require("util");
+            const rimraf = require("rimraf");
+            const del = promisify(rimraf);
 
             this.logger.info(
               "SSL certificate is more than 30 days old. Removing..."
             );
 
-            await del([certificatePath], { force: true });
+            await del(certificatePath);
 
             certificateExists = false;
           }
@@ -2592,14 +2594,18 @@ class Server {
    * @returns {void}
    */
   runBonjour() {
+    const { Bonjour } = require("bonjour-service");
     /**
      * @private
-     * @type {import("bonjour").Bonjour | undefined}
+     * @type {Bonjour | undefined}
      */
-    this.bonjour = require("bonjour")();
+    this.bonjour = new Bonjour();
     this.bonjour.publish({
+      // @ts-expect-error
       name: `Webpack Dev Server ${os.hostname()}:${this.options.port}`,
+      // @ts-expect-error
       port: /** @type {number} */ (this.options.port),
+      // @ts-expect-error
       type:
         /** @type {ServerConfiguration} */
         (this.options.server).type === "http" ? "http" : "https",

package/lib/options.json

@@ -28,7 +28,10 @@
     "Bonjour": {
       "anyOf": [
         {
-          "type": "boolean"
+          "type": "boolean",
+          "cli": {
+            "negatedDescription": "Disallows to broadcasts dev server via ZeroConf networking on start."
+          }
         },
         {
           "type": "object",
@@ -37,17 +40,17 @@
         }
       ],
       "description": "Allows to broadcasts dev server via ZeroConf networking on start.",
-      "link": " https://webpack.js.org/configuration/dev-server/#devserverbonjour",
-      "cli": {
-        "negatedDescription": "Disallows to broadcasts dev server via ZeroConf networking on start."
-      }
+      "link": " https://webpack.js.org/configuration/dev-server/#devserverbonjour"
     },
     "Client": {
       "description": "Allows to specify options for client script in the browser or disable client script.",
       "link": "https://webpack.js.org/configuration/dev-server/#devserverclient",
       "anyOf": [
         {
-          "enum": [false]
+          "enum": [false],
+          "cli": {
+            "negatedDescription": "Disables client script."
+          }
         },
         {
           "type": "object",
@@ -87,7 +90,7 @@
           "link": "https://webpack.js.org/configuration/dev-server/#overlay",
           "type": "boolean",
           "cli": {
-            "negatedDescription": "Disables a full-screen overlay in the browser when there are compiler errors or warnings."
+            "negatedDescription": "Disables the full-screen overlay in the browser when there are compiler errors or warnings."
           }
         },
         {
@@ -96,11 +99,17 @@
           "properties": {
             "errors": {
               "description": "Enables a full-screen overlay in the browser when there are compiler errors.",
-              "type": "boolean"
+              "type": "boolean",
+              "cli": {
+                "negatedDescription": "Disables the full-screen overlay in the browser when there are compiler errors."
+              }
             },
             "warnings": {
               "description": "Enables a full-screen overlay in the browser when there are compiler warnings.",
-              "type": "boolean"
+              "type": "boolean",
+              "cli": {
+                "negatedDescription": "Disables the full-screen overlay in the browser when there are compiler warnings."
+              }
             }
           }
         }
@@ -119,16 +128,16 @@
       "link": "https://webpack.js.org/configuration/dev-server/#reconnect",
       "anyOf": [
         {
-          "type": "boolean"
+          "type": "boolean",
+          "cli": {
+            "negatedDescription": "Tells dev-server to not to try to reconnect the client."
+          }
         },
         {
           "type": "number",
           "minimum": 0
         }
-      ],
-      "cli": {
-        "negatedDescription": "Tells dev-server to not to try to connect the client."
-      }
+      ]
     },
     "ClientWebSocketTransport": {
       "anyOf": [
@@ -448,7 +457,10 @@
     "HistoryApiFallback": {
       "anyOf": [
         {
-          "type": "boolean"
+          "type": "boolean",
+          "cli": {
+            "negatedDescription": "Disallows to proxy requests through a specified index page."
+          }
         },
         {
           "type": "object",
@@ -475,17 +487,17 @@
     "Hot": {
       "anyOf": [
         {
-          "type": "boolean"
+          "type": "boolean",
+          "cli": {
+            "negatedDescription": "Disables Hot Module Replacement."
+          }
         },
         {
           "enum": ["only"]
         }
       ],
       "description": "Enables Hot Module Replacement.",
-      "link": "https://webpack.js.org/configuration/dev-server/#devserverhot",
-      "cli": {
-        "negatedDescription": "Disables Hot Module Replacement."
-      }
+      "link": "https://webpack.js.org/configuration/dev-server/#devserverhot"
     },
     "IPC": {
       "anyOf": [
@@ -731,7 +743,10 @@
         },
         "requestCert": {
           "type": "boolean",
-          "description": "Request for an SSL certificate."
+          "description": "Request for an SSL certificate.",
+          "cli": {
+            "negatedDescription": "Does not request for an SSL certificate."
+          }
         },
         "ca": {
           "anyOf": [
@@ -916,7 +931,10 @@
           }
         },
         {
-          "type": "boolean"
+          "type": "boolean",
+          "cli": {
+            "negatedDescription": "Disallows to configure options for serving static files from directory."
+          }
         },
         {
           "$ref": "#/definitions/StaticString"
@@ -962,7 +980,10 @@
         "serveIndex": {
           "anyOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "cli": {
+                "negatedDescription": "Does not tell dev server to use serveIndex middleware."
+              }
             },
             {
               "type": "object",
@@ -970,15 +991,15 @@
             }
           ],
           "description": "Tells dev server to use serveIndex middleware when enabled.",
-          "cli": {
-            "negatedDescription": "Does not tell dev server to use serveIndex middleware."
-          },
           "link": "https://webpack.js.org/configuration/dev-server/#serveindex"
         },
         "watch": {
           "anyOf": [
             {
-              "type": "boolean"
+              "type": "boolean",
+              "cli": {
+                "negatedDescription": "Does not watch for files in static content directory."
+              }
             },
             {
               "type": "object",
@@ -987,9 +1008,6 @@
             }
           ],
           "description": "Watches for files in static content directory.",
-          "cli": {
-            "negatedDescription": "Does not watch for files in static content directory."
-          },
           "link": "https://webpack.js.org/configuration/dev-server/#watch"
         }
       }
@@ -1082,7 +1100,10 @@
     "WebSocketServerEnum": {
       "anyOf": [
         {
-          "enum": [false]
+          "enum": [false],
+          "cli": {
+            "negatedDescription": "Disallows to set web socket server and options."
+          }
         },
         {
           "$ref": "#/definitions/WebSocketServerType"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webpack-dev-server",
-  "version": "4.7.4",
+  "version": "4.8.0",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
@@ -40,53 +40,53 @@
     "@types/express": "^4.17.13",
     "@types/serve-index": "^1.9.1",
     "@types/sockjs": "^0.3.33",
-    "@types/ws": "^8.2.2",
+    "@types/ws": "^8.5.1",
     "ansi-html-community": "^0.0.8",
-    "bonjour": "^3.5.0",
+    "bonjour-service": "^1.0.11",
     "chokidar": "^3.5.3",
     "colorette": "^2.0.10",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^1.6.0",
     "default-gateway": "^6.0.3",
-    "del": "^6.0.0",
-    "express": "^4.17.1",
+    "express": "^4.17.3",
     "graceful-fs": "^4.2.6",
     "html-entities": "^2.3.2",
-    "http-proxy-middleware": "^2.0.0",
+    "http-proxy-middleware": "^2.0.3",
     "ipaddr.js": "^2.0.1",
     "open": "^8.0.9",
     "p-retry": "^4.5.0",
     "portfinder": "^1.0.28",
+    "rimraf": "^3.0.2",
     "schema-utils": "^4.0.0",
-    "selfsigned": "^2.0.0",
+    "selfsigned": "^2.0.1",
     "serve-index": "^1.9.1",
     "sockjs": "^0.3.21",
     "spdy": "^4.0.2",
-    "strip-ansi": "^7.0.0",
     "webpack-dev-middleware": "^5.3.1",
     "ws": "^8.4.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.5",
-    "@babel/core": "^7.16.10",
-    "@babel/eslint-parser": "^7.14.7",
+    "@babel/cli": "^7.17.3",
+    "@babel/core": "^7.17.5",
+    "@babel/eslint-parser": "^7.17.0",
     "@babel/plugin-transform-object-assign": "^7.14.5",
-    "@babel/plugin-transform-runtime": "^7.14.5",
+    "@babel/plugin-transform-runtime": "^7.17.0",
     "@babel/preset-env": "^7.16.11",
-    "@babel/runtime": "^7.14.5",
-    "@commitlint/cli": "^16.1.0",
-    "@commitlint/config-conventional": "^16.0.0",
+    "@babel/runtime": "^7.17.2",
+    "@commitlint/cli": "^16.2.3",
+    "@commitlint/config-conventional": "^16.2.1",
     "@types/compression": "^1.7.2",
     "@types/default-gateway": "^3.0.1",
+    "@types/rimraf": "^3.0.2",
     "@types/sockjs-client": "^1.5.1",
     "acorn": "^8.2.4",
-    "babel-jest": "^27.4.4",
-    "babel-loader": "^8.2.2",
-    "body-parser": "^1.19.1",
-    "core-js": "^3.21.0",
+    "babel-jest": "^27.5.1",
+    "babel-loader": "^8.2.4",
+    "body-parser": "^1.19.2",
+    "core-js": "^3.21.1",
     "css-loader": "^5.2.4",
-    "eslint": "^8.8.0",
-    "eslint-config-prettier": "^8.3.0",
+    "eslint": "^8.12.0",
+    "eslint-config-prettier": "^8.4.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.23.2",
     "execa": "^5.1.1",
@@ -94,27 +94,27 @@
     "html-webpack-plugin": "^4.5.2",
     "http-proxy": "^1.18.1",
     "husky": "^7.0.0",
-    "jest": "^27.4.4",
+    "jest": "^27.5.1",
     "klona": "^2.0.4",
     "less": "^4.1.1",
     "less-loader": "^7.3.0",
-    "lint-staged": "^12.3.3",
-    "marked": "^3.0.0",
+    "lint-staged": "^12.3.4",
+    "marked": "^4.0.12",
     "memfs": "^3.2.2",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.3.1",
-    "puppeteer": "^13.1.3",
+    "prettier": "^2.6.1",
+    "puppeteer": "^13.4.1",
     "require-from-string": "^2.0.2",
     "rimraf": "^3.0.2",
-    "sockjs-client": "^1.5.1",
+    "sockjs-client": "^1.6.0",
     "standard-version": "^9.3.0",
     "strip-ansi-v6": "npm:strip-ansi@^6.0.0",
     "style-loader": "^2.0.0",
     "supertest": "^6.1.3",
     "tcp-port-used": "^1.0.2",
-    "typescript": "^4.2.4",
+    "typescript": "^4.6.3",
     "url-loader": "^4.1.1",
-    "webpack": "^5.68.0",
+    "webpack": "^5.71.0",
     "webpack-cli": "^4.7.2",
     "webpack-merge": "^5.8.0"
   },

package/types/bin/cli-flags.d.ts

@@ -45,6 +45,7 @@ declare const _exports: {
   client: {
     configs: {
       description: string;
+      negatedDescription: string;
       multiple: boolean;
       path: string;
       type: string;
@@ -83,6 +84,7 @@ declare const _exports: {
       type: string;
       multiple: boolean;
       description: string;
+      negatedDescription: string;
       path: string;
     }[];
     description: string;
@@ -94,6 +96,7 @@ declare const _exports: {
       type: string;
       multiple: boolean;
       description: string;
+      negatedDescription: string;
       path: string;
     }[];
     description: string;
@@ -113,13 +116,21 @@ declare const _exports: {
     multiple: boolean;
   };
   "client-reconnect": {
-    configs: {
-      type: string;
-      multiple: boolean;
-      description: string;
-      negatedDescription: string;
-      path: string;
-    }[];
+    configs: (
+      | {
+          type: string;
+          multiple: boolean;
+          description: string;
+          negatedDescription: string;
+          path: string;
+        }
+      | {
+          type: string;
+          multiple: boolean;
+          description: string;
+          path: string;
+        }
+    )[];
     description: string;
     simpleType: string;
     multiple: boolean;
@@ -247,6 +258,7 @@ declare const _exports: {
       type: string;
       multiple: boolean;
       description: string;
+      negatedDescription: string;
       path: string;
     }[];
     description: string;
@@ -287,7 +299,6 @@ declare const _exports: {
           values: string[];
           multiple: boolean;
           description: string;
-          negatedDescription: string;
           path: string;
         }
     )[];
@@ -770,6 +781,7 @@ declare const _exports: {
   "server-options-request-cert": {
     configs: {
       description: string;
+      negatedDescription: string;
       multiple: boolean;
       path: string;
       type: string;
@@ -791,12 +803,21 @@ declare const _exports: {
     simpleType: string;
   };
   static: {
-    configs: {
-      type: string;
-      multiple: boolean;
-      description: string;
-      path: string;
-    }[];
+    configs: (
+      | {
+          type: string;
+          multiple: boolean;
+          description: string;
+          path: string;
+        }
+      | {
+          type: string;
+          multiple: boolean;
+          description: string;
+          negatedDescription: string;
+          path: string;
+        }
+    )[];
     description: string;
     simpleType: string;
     multiple: boolean;
@@ -895,6 +916,7 @@ declare const _exports: {
     configs: (
       | {
           description: string;
+          negatedDescription: string;
           multiple: boolean;
           path: string;
           type: string;