webpack-dev-server 4.3.1 → 4.7.0

package/lib/servers/WebsocketServer.js

@@ -1,19 +1,24 @@
 "use strict";
 
-/* eslint-disable
-  class-methods-use-this
-*/
 const WebSocket = require("ws");
 const BaseServer = require("./BaseServer");
 
+/** @typedef {import("../Server").WebSocketServerConfiguration} WebSocketServerConfiguration */
+/** @typedef {import("../Server").ClientConnection} ClientConnection */
+
 module.exports = class WebsocketServer extends BaseServer {
   static heartbeatInterval = 1000;
 
+  /**
+   * @param {import("../Server")} server
+   */
   constructor(server) {
     super(server);
 
+    /** @type {import("ws").ServerOptions} */
     const options = {
-      ...this.server.options.webSocketServer.options,
+      .../** @type {WebSocketServerConfiguration} */
+      (this.server.options.webSocketServer).options,
       clientTracking: false,
     };
     const isNoServerMode =
@@ -26,46 +31,72 @@ module.exports = class WebsocketServer extends BaseServer {
 
     this.implementation = new WebSocket.Server(options);
 
-    this.server.server.on("upgrade", (req, sock, head) => {
-      if (!this.implementation.shouldHandle(req)) {
-        return;
-      }
-
-      this.implementation.handleUpgrade(req, sock, head, (connection) => {
-        this.implementation.emit("connection", connection, req);
-      });
-    });
+    /** @type {import("http").Server} */
+    (this.server.server).on(
+      "upgrade",
+      /**
+       * @param {import("http").IncomingMessage} req
+       * @param {import("stream").Duplex} sock
+       * @param {Buffer} head
+       */
+      (req, sock, head) => {
+        if (!this.implementation.shouldHandle(req)) {
+          return;
+        }
 
-    this.implementation.on("error", (err) => {
-      this.server.logger.error(err.message);
-    });
+        this.implementation.handleUpgrade(req, sock, head, (connection) => {
+          this.implementation.emit("connection", connection, req);
+        });
+      }
+    );
+
+    this.implementation.on(
+      "error",
+      /**
+       * @param {Error} err
+       */
+      (err) => {
+        this.server.logger.error(err.message);
+      }
+    );
 
     const interval = setInterval(() => {
-      this.clients.forEach((client) => {
-        if (client.isAlive === false) {
-          client.terminate();
-
-          return;
+      this.clients.forEach(
+        /**
+         * @param {ClientConnection} client
+         */
+        (client) => {
+          if (client.isAlive === false) {
+            client.terminate();
+
+            return;
+          }
+
+          client.isAlive = false;
+          client.ping(() => {});
         }
-
-        client.isAlive = false;
-        client.ping(() => {});
-      });
+      );
     }, WebsocketServer.heartbeatInterval);
 
-    this.implementation.on("connection", (client) => {
-      this.clients.push(client);
+    this.implementation.on(
+      "connection",
+      /**
+       * @param {ClientConnection} client
+       */
+      (client) => {
+        this.clients.push(client);
 
-      client.isAlive = true;
-
-      client.on("pong", () => {
         client.isAlive = true;
-      });
 
-      client.on("close", () => {
-        this.clients.splice(this.clients.indexOf(client), 1);
-      });
-    });
+        client.on("pong", () => {
+          client.isAlive = true;
+        });
+
+        client.on("close", () => {
+          this.clients.splice(this.clients.indexOf(client), 1);
+        });
+      }
+    );
 
     this.implementation.on("close", () => {
       clearInterval(interval);

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "webpack-dev-server",
-  "version": "4.3.1",
+  "version": "4.7.0",
   "description": "Serves a webpack app. Updates the browser on changes.",
   "bin": "bin/webpack-dev-server.js",
   "main": "lib/Server.js",
+  "types": "types/lib/Server.d.ts",
   "files": [
     "bin",
     "lib",
-    "client"
+    "client",
+    "types"
   ],
   "engines": {
     "node": ">= 12.13.0"
@@ -15,14 +17,15 @@
   "scripts": {
     "fmt:check": "prettier \"{**/*,*}.{js,json,md,yml,css,ts}\" --list-different",
     "lint:js": "eslint . --cache",
-    "lint:type": "tsc --noEmit",
-    "lint": "npm-run-all lint:js lint:type fmt:check",
+    "lint:types": "tsc --pretty --noEmit",
+    "lint": "npm-run-all -p \"fmt:**\" \"lint:**\"",
     "fmt": "npm run fmt:check -- --write",
     "fix:js": "npm run lint:js -- --fix",
     "fix": "npm-run-all fix:js fmt",
     "commitlint": "commitlint --from=master",
-    "build": "npm-run-all build:client",
     "build:client": "rimraf ./client/* && babel client-src/ --out-dir client/ --ignore \"client-src/webpack.config.js\" --ignore \"client-src/modules\" && webpack --config client-src/webpack.config.js",
+    "build:types": "rimraf ./types/* && tsc --declaration --emitDeclarationOnly --outDir types && node ./scripts/extend-webpack-types.js && prettier \"types/**/*.ts\" --write && prettier \"types/**/*.ts\" --write",
+    "build": "npm-run-all -p \"build:**\"",
     "test:only": "jest",
     "test:coverage": "npm run test:only -- --coverage",
     "test:watch": "npm run test:coverage --watch",
@@ -32,30 +35,35 @@
     "release": "standard-version"
   },
   "dependencies": {
+    "@types/bonjour": "^3.5.9",
+    "@types/connect-history-api-fallback": "^1.3.5",
+    "@types/serve-index": "^1.9.1",
+    "@types/sockjs": "^0.3.33",
+    "@types/ws": "^8.2.2",
     "ansi-html-community": "^0.0.8",
     "bonjour": "^3.5.0",
-    "chokidar": "^3.5.1",
+    "chokidar": "^3.5.2",
     "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",
     "graceful-fs": "^4.2.6",
     "html-entities": "^2.3.2",
     "http-proxy-middleware": "^2.0.0",
-    "internal-ip": "^6.2.0",
     "ipaddr.js": "^2.0.1",
     "open": "^8.0.9",
     "p-retry": "^4.5.0",
     "portfinder": "^1.0.28",
-    "schema-utils": "^3.1.0",
+    "schema-utils": "^4.0.0",
     "selfsigned": "^1.10.11",
     "serve-index": "^1.9.1",
     "sockjs": "^0.3.21",
     "spdy": "^4.0.2",
     "strip-ansi": "^7.0.0",
     "url": "^0.11.0",
-    "webpack-dev-middleware": "^5.2.1",
+    "webpack-dev-middleware": "^5.3.0",
     "ws": "^8.1.0"
   },
   "devDependencies": {
@@ -66,15 +74,17 @@
     "@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": "^15.0.0",
+    "@commitlint/config-conventional": "^15.0.0",
+    "@types/compression": "^1.7.2",
+    "@types/default-gateway": "^3.0.1",
     "acorn": "^8.2.4",
-    "babel-jest": "^27.0.2",
+    "babel-jest": "^27.4.4",
     "babel-loader": "^8.2.2",
-    "body-parser": "^1.19.0",
+    "body-parser": "^1.19.1",
     "core-js": "^3.12.1",
     "css-loader": "^5.2.4",
-    "eslint": "^7.29.0",
+    "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
     "eslint-config-webpack": "^1.2.5",
     "eslint-plugin-import": "^2.23.2",
@@ -83,16 +93,16 @@
     "html-webpack-plugin": "^4.5.2",
     "http-proxy": "^1.18.1",
     "husky": "^7.0.0",
-    "jest": "^27.0.4",
+    "jest": "^27.4.4",
     "klona": "^2.0.4",
     "less": "^4.1.1",
     "less-loader": "^7.3.0",
-    "lint-staged": "^11.0.0",
+    "lint-staged": "^12.0.2",
     "marked": "^3.0.0",
     "memfs": "^3.2.2",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.3.1",
-    "puppeteer": "^10.0.0",
+    "puppeteer": "^13.0.0",
     "require-from-string": "^2.0.2",
     "rimraf": "^3.0.2",
     "sockjs-client": "^1.5.1",
@@ -103,7 +113,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"
   },