@rspack/dev-server 1.0.3 → 1.0.5

package/client/index.js

@@ -16,19 +16,19 @@ function _objectSpread(target) {
 		i % 2
 			? ownKeys(Object(source), !0).forEach(function (key) {
 					_defineProperty(target, key, source[key]);
-			  })
+				})
 			: Object.getOwnPropertyDescriptors
-			? Object.defineProperties(
-					target,
-					Object.getOwnPropertyDescriptors(source)
-			  )
-			: ownKeys(Object(source)).forEach(function (key) {
-					Object.defineProperty(
+				? Object.defineProperties(
 						target,
-						key,
-						Object.getOwnPropertyDescriptor(source, key)
-					);
-			  });
+						Object.getOwnPropertyDescriptors(source)
+					)
+				: ownKeys(Object(source)).forEach(function (key) {
+						Object.defineProperty(
+							target,
+							key,
+							Object.getOwnPropertyDescriptor(source, key)
+						);
+					});
 	}
 	return target;
 }
@@ -106,6 +106,28 @@ var status = {
 	currentHash: typeof __webpack_hash__ !== "undefined" ? __webpack_hash__ : ""
 };
 
+var decodeOverlayOptions = function decodeOverlayOptions(overlayOptions) {
+	if (typeof overlayOptions === "object") {
+		["warnings", "errors", "runtimeErrors"].forEach(function (property) {
+			if (typeof overlayOptions[property] === "string") {
+				var overlayFilterFunctionString = decodeURIComponent(
+					overlayOptions[property]
+				);
+
+				// eslint-disable-next-line no-new-func
+				var overlayFilterFunction = new Function(
+					"message",
+					"var callback = ".concat(
+						overlayFilterFunctionString,
+						"\n        return callback(message)"
+					)
+				);
+				overlayOptions[property] = overlayFilterFunction;
+			}
+		});
+	}
+};
+
 /** @type {Options} */
 var options = {
 	hot: false,
@@ -132,6 +154,7 @@ if (parsedResourceQuery.progress === "true") {
 	options.progress = true;
 	enabledFeatures.Progress = true;
 }
+
 if (parsedResourceQuery.overlay) {
 	try {
 		options.overlay = JSON.parse(parsedResourceQuery.overlay);
@@ -149,6 +172,7 @@ if (parsedResourceQuery.overlay) {
 			},
 			options.overlay
 		);
+		decodeOverlayOptions(options.overlay);
 	}
 	enabledFeatures.Overlay = true;
 }
@@ -183,15 +207,15 @@ var overlay =
 					? {
 							trustedTypesPolicyName: options.overlay.trustedTypesPolicyName,
 							catchRuntimeError: options.overlay.runtimeErrors
-					  }
+						}
 					: {
 							trustedTypesPolicyName: false,
 							catchRuntimeError: options.overlay
-					  }
-		  )
+						}
+			)
 		: {
 				send: function send() {}
-		  };
+			};
 var onSocketMessage = {
 	hot: function hot() {
 		if (parsedResourceQuery.hot === "false") {
@@ -232,6 +256,7 @@ var onSocketMessage = {
 			return;
 		}
 		options.overlay = value;
+		decodeOverlayOptions(options.overlay);
 	},
 	/**
 	 * @param {number} value
@@ -321,16 +346,22 @@ var onSocketMessage = {
 		for (var i = 0; i < printableWarnings.length; i++) {
 			log.warn(printableWarnings[i]);
 		}
-		var needShowOverlayForWarnings =
+		var overlayWarningsSetting =
 			typeof options.overlay === "boolean"
 				? options.overlay
 				: options.overlay && options.overlay.warnings;
-		if (needShowOverlayForWarnings) {
-			overlay.send({
-				type: "BUILD_ERROR",
-				level: "warning",
-				messages: _warnings
-			});
+		if (overlayWarningsSetting) {
+			var warningsToDisplay =
+				typeof overlayWarningsSetting === "function"
+					? _warnings.filter(overlayWarningsSetting)
+					: _warnings;
+			if (warningsToDisplay.length) {
+				overlay.send({
+					type: "BUILD_ERROR",
+					level: "warning",
+					messages: _warnings
+				});
+			}
 		}
 		if (params && params.preventReloading) {
 			return;
@@ -352,16 +383,22 @@ var onSocketMessage = {
 		for (var i = 0; i < printableErrors.length; i++) {
 			log.error(printableErrors[i]);
 		}
-		var needShowOverlayForErrors =
+		var overlayErrorsSettings =
 			typeof options.overlay === "boolean"
 				? options.overlay
 				: options.overlay && options.overlay.errors;
-		if (needShowOverlayForErrors) {
-			overlay.send({
-				type: "BUILD_ERROR",
-				level: "error",
-				messages: _errors
-			});
+		if (overlayErrorsSettings) {
+			var errorsToDisplay =
+				typeof overlayErrorsSettings === "function"
+					? _errors.filter(overlayErrorsSettings)
+					: _errors;
+			if (errorsToDisplay.length) {
+				overlay.send({
+					type: "BUILD_ERROR",
+					level: "error",
+					messages: _errors
+				});
+			}
 		}
 	},
 	/**

package/dist/ansiHTML.js

@@ -117,8 +117,8 @@ function ansiHTML(text) {
                 this.splice(0, count);
             }
         });
-        let seq;
         let rep = "";
+        let seq;
         while ((seq = match[0])) {
             match.advance(1);
             rep += applySeq(seq);

package/dist/server.d.ts

@@ -7,6 +7,7 @@ import type { FSWatcher } from "chokidar";
 import WebpackDevServer from "webpack-dev-server";
 import type { DevServer, ResolvedDevServer } from "./config";
 export declare class RspackDevServer extends WebpackDevServer {
+    static getFreePort: (port: string, host: string) => Promise<any>;
     /**
      * resolved after `normalizedOptions`
      */

package/dist/server.js

@@ -21,6 +21,28 @@ const webpack_dev_server_1 = __importDefault(require("webpack-dev-server"));
 const package_json_1 = require("../package.json");
 const patch_1 = require("./patch");
 (0, patch_1.applyDevServerPatch)();
+const encodeOverlaySettings = (setting) => typeof setting === "function"
+    ? encodeURIComponent(setting.toString())
+    : setting;
+const getFreePort = async function getFreePort(port, host) {
+    if (typeof port !== "undefined" && port !== null && port !== "auto") {
+        return port;
+    }
+    const pRetry = require("p-retry");
+    const getPort = require("webpack-dev-server/lib/getPort");
+    const basePort = typeof process.env.WEBPACK_DEV_SERVER_BASE_PORT !== "undefined"
+        ? Number.parseInt(process.env.WEBPACK_DEV_SERVER_BASE_PORT, 10)
+        : 8080;
+    // Try to find unused port and listen on it for 3 times,
+    // if port is not specified in options.
+    const defaultPortRetry = typeof process.env.WEBPACK_DEV_SERVER_PORT_RETRY !== "undefined"
+        ? Number.parseInt(process.env.WEBPACK_DEV_SERVER_PORT_RETRY, 10)
+        : 3;
+    return pRetry(() => getPort(basePort, host), {
+        retries: defaultPortRetry
+    });
+};
+webpack_dev_server_1.default.getFreePort = getFreePort;
 class RspackDevServer extends webpack_dev_server_1.default {
     constructor(options, compiler) {
         super(options, compiler);
@@ -279,9 +301,15 @@ class RspackDevServer extends webpack_dev_server_1.default {
                     searchParams.set("progress", String(client.progress));
                 }
                 if (typeof client.overlay !== "undefined") {
-                    searchParams.set("overlay", typeof client.overlay === "boolean"
+                    const overlayString = typeof client.overlay === "boolean"
                         ? String(client.overlay)
-                        : JSON.stringify(client.overlay));
+                        : JSON.stringify({
+                            ...client.overlay,
+                            errors: encodeOverlaySettings(client.overlay.errors),
+                            warnings: encodeOverlaySettings(client.overlay.warnings),
+                            runtimeErrors: encodeOverlaySettings(client.overlay.runtimeErrors)
+                        });
+                    searchParams.set("overlay", overlayString);
                 }
                 if (typeof client.reconnect !== "undefined") {
                     searchParams.set("reconnect", typeof client.reconnect === "number"
@@ -312,5 +340,6 @@ class RspackDevServer extends webpack_dev_server_1.default {
         }
     }
 }
+RspackDevServer.getFreePort = getFreePort;
 RspackDevServer.version = package_json_1.version;
 exports.RspackDevServer = RspackDevServer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "license": "MIT",
   "description": "Development server for rspack",
   "main": "./dist/index.js",
@@ -29,15 +29,27 @@
     "directory": "packages/rspack-dev-server"
   },
   "devDependencies": {
+    "@jest/test-sequencer": "^29.7.0",
     "@rspack/plugin-react-refresh": "1.0.0",
     "@types/connect-history-api-fallback": "1.5.4",
     "@types/express": "4.17.21",
     "@types/mime-types": "2.1.4",
     "@types/ws": "8.5.10",
+    "css-loader": "^6.11.0",
+    "graceful-fs": "4.2.10",
+    "http-proxy": "^1.18.1",
     "jest-serializer-path": "^0.1.15",
+    "prettier": "3.2.5",
+    "puppeteer": "^23.2.2",
+    "require-from-string": "^2.0.2",
+    "sockjs-client": "^1.6.1",
+    "style-loader": "^3.3.3",
+    "supertest": "^6.1.3",
+    "tcp-port-used": "^1.0.2",
     "typescript": "5.0.2",
-    "@rspack/dev-server": "1.0.3",
-    "@rspack/core": "1.0.3"
+    "wait-for-expect": "^3.0.2",
+    "@rspack/dev-server": "1.0.5",
+    "@rspack/core": "1.0.5"
   },
   "dependencies": {
     "chokidar": "^3.6.0",
@@ -45,6 +57,7 @@
     "express": "^4.19.2",
     "http-proxy-middleware": "^2.0.6",
     "mime-types": "^2.1.35",
+    "p-retry": "4.6.2",
     "webpack-dev-middleware": "^7.4.2",
     "webpack-dev-server": "5.0.4",
     "ws": "^8.16.0"
@@ -55,7 +68,8 @@
   "scripts": {
     "build": "tsc -b ./tsconfig.build.json",
     "dev": "tsc -w -b ./tsconfig.build.json",
-    "test": "rimraf .test-temp && cross-env NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --colors",
+    "test:install": "cross-env ./node_modules/.bin/puppeteer browsers install chrome",
+    "test": "pnpm run test:install && cross-env NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ../../node_modules/jest-cli/bin/jest --colors",
     "api-extractor": "api-extractor run --verbose",
     "api-extractor:ci": "api-extractor run --verbose || diff temp/api.md etc/api.md"
   }