@rspack/dev-server 1.0.0-alpha.4 → 1.0.0-beta.0

package/dist/ansiHTML.d.ts

@@ -1,19 +1,20 @@
-export = ansiHTML;
+interface AnsiHtmlTags {
+    open: typeof _openTags;
+    close: typeof _closeTags;
+}
+type Option<T> = T | null | undefined;
+type Match = {
+    advance: (n: number) => void;
+} & Array<string>;
+declare var _openTags: Record<string, string | ((m: Match) => Option<string>)>;
+declare var _closeTags: Record<string, string | ((ansiCodes: Option<Array<string>>) => string)>;
 /**
  * Converts text with ANSI color codes to HTML markup.
- * @param {String} text
- * @returns {*}
  */
-declare function ansiHTML(text: string): any;
+declare function ansiHTML(text: string): string;
 declare namespace ansiHTML {
-    /**
-     * Customize colors.
-     * @param {Object} colors reference to _defColors
-     */
-    function setColors(colors: Object): void;
-    /**
-     * Reset colors.
-     */
-    function reset(): void;
-    const tags: Object;
+    var setColors: (colors: Record<string, string | string[]>) => void;
+    var reset: () => void;
+    var tags: AnsiHtmlTags;
 }
+export default ansiHTML;

package/dist/ansiHTML.js

@@ -1,5 +1,3 @@
-/* eslint-disable */
-// @ts-nocheck
 /**
  * The following code is modified based on
  * https://github.com/mahdyar/ansi-html-community/blob/b86cc3f1fa1d118477877352f0eafe1a70fd20ab/index.js
@@ -12,7 +10,7 @@
  * https://github.com/mahdyar/ansi-html-community/blob/master/LICENSE
  */
 "use strict";
-module.exports = ansiHTML;
+Object.defineProperty(exports, "__esModule", { value: true });
 // Reference to https://github.com/sindresorhus/ansi-regex
 var _regANSI = /(?:(?:\u001b\[)|\u009b)(?:(?:[0-9]{1,3})?(?:(?:;[0-9]{0,3})*)?[A-M|f-m])|\u001b[A-M]/;
 var _defColors = {
@@ -47,7 +45,7 @@ var _openTags = {
     4: "<u>",
     8: "display:none",
     9: "<del>",
-    38: match => {
+    38: (match) => {
         // color
         var mode = _colorMode[match[0]];
         if (mode === "rgb") {
@@ -59,7 +57,7 @@ var _openTags = {
             return "color: rgb(" + r + "," + g + "," + b + ")";
         }
     },
-    48: match => {
+    48: (match) => {
         // background color
         var mode = _colorMode[match[0]];
         if (mode === "rgb") {
@@ -98,13 +96,11 @@ var _closeTags = {
     24: "</u>",
     29: "</del>" // reset delete
 };
-[21, 22, 27, 28, 39, 49].forEach(n => {
+for (const n of [21, 22, 27, 28, 39, 49]) {
     _closeTags[n] = "</span>";
-});
+}
 /**
  * Normalize ';<seq>' | '<seq>' -> '<seq>'
- * @param {string | null} seq
- * @returns {null | string}
  */
 function normalizeSeq(seq) {
     if (seq === null || seq === undefined)
@@ -116,8 +112,6 @@ function normalizeSeq(seq) {
 }
 /**
  * Converts text with ANSI color codes to HTML markup.
- * @param {String} text
- * @returns {*}
  */
 function ansiHTML(text) {
     // Returns the text if the string has no ANSI escape code.
@@ -127,8 +121,9 @@ function ansiHTML(text) {
     // Cache opened sequence.
     var ansiCodes = [];
     // Replace with markup.
+    //@ts-ignore TS1487 error
     var ret = text.replace(/\033\[(?:[0-9]{1,3})?(?:(?:;[0-9]{0,3})*)?m/g, m => {
-        var match = m.match(/(;?\d+)/g).map(normalizeSeq);
+        var match = m.match(/(;?\d+)/g)?.map(normalizeSeq);
         Object.defineProperty(match, "advance", {
             value: function (count) {
                 this.splice(0, count);
@@ -163,7 +158,7 @@ function ansiHTML(text) {
             if (typeof ct === "function") {
                 return ct(ansiCodes);
             }
-            else if (ct) {
+            if (ct) {
                 // Pop sequence
                 ansiCodes.pop();
                 return ct;
@@ -176,11 +171,12 @@ function ansiHTML(text) {
     l > 0 && (ret += Array(l + 1).join("</span>"));
     return ret;
 }
+exports.default = ansiHTML;
 /**
  * Customize colors.
  * @param {Object} colors reference to _defColors
  */
-ansiHTML.setColors = colors => {
+ansiHTML.setColors = (colors) => {
     if (typeof colors !== "object") {
         throw new Error("`colors` parameter must be an Object.");
     }
@@ -258,8 +254,8 @@ function _setTags(colors) {
         var color = _styles[code];
         var oriColor = colors[color] || "000";
         _openTags[code] = "color:#" + oriColor;
-        code = Number.parseInt(code);
-        _openTags[(code + 10).toString()] = "background:#" + oriColor;
+        const codeInt = Number.parseInt(code);
+        _openTags[(codeInt + 10).toString()] = "background:#" + oriColor;
     }
 }
 ansiHTML.reset();

package/dist/middleware.js

@@ -4,19 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRspackMemoryAssets = void 0;
-const crypto_1 = __importDefault(require("crypto"));
-const path_1 = require("path");
-const url_1 = require("url");
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const node_path_1 = require("node:path");
+const node_url_1 = require("node:url");
 const mime_types_1 = __importDefault(require("mime-types"));
 function etag(buf) {
-    const hash = crypto_1.default.createHash("sha256").update(buf).digest("hex");
+    const hash = node_crypto_1.default.createHash("sha256").update(buf).digest("hex");
     const etag = hash;
     return etag;
 }
+function createPublicPathGetter(compiler) {
+    const raw = compiler.options.output.publicPath || "/";
+    if (typeof raw === "function") {
+        return (compilation) => compilation ? compilation.getPath(raw) : raw({ hash: "XXXX" }, undefined);
+    }
+    if (/\[(hash|fullhash)[:\]]/.test(raw)) {
+        return (compilation) => compilation ? compilation.getPath(raw) : raw.replace(/\/$/, "") + "/";
+    }
+    return () => raw.replace(/\/$/, "") + "/";
+}
 function getRspackMemoryAssets(compiler, rdm) {
-    const publicPath = compiler.options.output.publicPath
-        ? compiler.options.output.publicPath.replace(/\/$/, "") + "/"
-        : "/";
+    const getPublicPath = createPublicPathGetter(compiler);
     return (req, res, next) => {
         const { method, url } = req;
         if (method !== "GET") {
@@ -24,7 +32,8 @@ function getRspackMemoryAssets(compiler, rdm) {
         }
         // css hmr will append query string, so here need to remove query string
         // @ts-expect-error
-        const path = (0, url_1.parse)(url).pathname;
+        const path = (0, node_url_1.parse)(url).pathname;
+        const publicPath = getPublicPath(compiler._lastCompilation);
         // asset name is not start with /, so path need to slice 1
         // @ts-expect-error
         const filename = path.startsWith(publicPath)
@@ -50,7 +59,7 @@ function getRspackMemoryAssets(compiler, rdm) {
         else {
             contentType =
                 // @ts-expect-error
-                mime_types_1.default.contentType((0, path_1.extname)(path)) || "text/plain; charset=utf-8";
+                mime_types_1.default.contentType((0, node_path_1.extname)(path)) || "text/plain; charset=utf-8";
         }
         const calcEtag = etag(buffer);
         const oldEtag = req.headers["if-none-match"];

package/dist/server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
-import type { Server } from "http";
-import type { Socket } from "net";
+import type { Server } from "node:http";
+import type { Socket } from "node:net";
 import { type Compiler, MultiCompiler } from "@rspack/core";
 import type { FSWatcher } from "chokidar";
 import WebpackDevServer from "webpack-dev-server";

package/dist/server.js

@@ -81,7 +81,7 @@ class RspackDevServer extends webpack_dev_server_1.default {
         const compilers = this.compiler instanceof core_1.MultiCompiler
             ? this.compiler.compilers
             : [this.compiler];
-        compilers.forEach(compiler => {
+        for (const compiler of compilers) {
             const mode = compiler.options.mode || process.env.NODE_ENV;
             if (this.options.hot) {
                 if (mode === "production") {
@@ -103,14 +103,14 @@ class RspackDevServer extends webpack_dev_server_1.default {
                     ...compiler.options.resolve.alias
                 };
             }
-        });
+        }
         if (this.options.webSocketServer) {
-            compilers.forEach(compiler => {
+            for (const compiler of compilers) {
                 this.addAdditionalEntries(compiler);
                 new compiler.webpack.ProvidePlugin({
                     __webpack_dev_server_client__: this.getClientTransport()
                 }).apply(compiler);
-            });
+            }
         }
         // @ts-expect-error: `setupHooks` is private function in base class.
         this.setupHooks();
@@ -131,7 +131,7 @@ class RspackDevServer extends webpack_dev_server_1.default {
         if (this.options.setupExitSignals) {
             const signals = ["SIGINT", "SIGTERM"];
             let needForceShutdown = false;
-            signals.forEach(signal => {
+            for (const signal of signals) {
                 const listener = () => {
                     if (needForceShutdown) {
                         process.exit();
@@ -152,14 +152,14 @@ class RspackDevServer extends webpack_dev_server_1.default {
                 // @ts-expect-error: `listeners` is private function in base class.
                 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
         // @ts-expect-error: `webSocketProxies` is private function in base class.
-        this.webSocketProxies.forEach(webSocketProxy => {
+        for (const webSocketProxy of this.webSocketProxies) {
             this.server.on("upgrade", webSocketProxy.upgrade);
-        }, this);
+        }
     }
     setupDevMiddleware() {
         // @ts-expect-error
@@ -167,7 +167,7 @@ class RspackDevServer extends webpack_dev_server_1.default {
     }
     setupMiddlewares() {
         const middlewares = [];
-        middlewares.forEach(middleware => {
+        for (const middleware of middlewares) {
             if (typeof middleware === "function") {
                 // @ts-expect-error
                 this.app.use(middleware);
@@ -180,7 +180,7 @@ class RspackDevServer extends webpack_dev_server_1.default {
                 // @ts-expect-error
                 this.app.use(middleware.middleware);
             }
-        });
+        }
         // @ts-expect-error
         super.setupMiddlewares();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-beta.0",
   "license": "MIT",
   "description": "Development server for rspack",
   "main": "./dist/index.js",
@@ -29,23 +29,25 @@
     "directory": "packages/rspack-dev-server"
   },
   "devDependencies": {
+    "jest-serializer-path": "^0.1.15",
+    "typescript": "5.0.2",
     "@types/connect-history-api-fallback": "1.5.4",
     "@types/express": "4.17.21",
     "@types/mime-types": "2.1.4",
     "@types/ws": "8.5.10",
-    "@rspack/core": "1.0.0-alpha.4",
-    "@rspack/dev-server": "1.0.0-alpha.4",
-    "@rspack/plugin-react-refresh": "1.0.0-alpha.4"
+    "@rspack/core": "1.0.0-beta.0",
+    "@rspack/dev-server": "1.0.0-beta.0",
+    "@rspack/plugin-react-refresh": "1.0.0-beta.0"
   },
   "dependencies": {
-    "chokidar": "3.6.0",
-    "connect-history-api-fallback": "2.0.0",
-    "express": "4.19.2",
-    "http-proxy-middleware": "2.0.6",
-    "mime-types": "2.1.35",
-    "webpack-dev-middleware": "6.1.2",
-    "webpack-dev-server": "4.13.1",
-    "ws": "8.8.1"
+    "chokidar": "^3.6.0",
+    "connect-history-api-fallback": "^2.0.0",
+    "express": "^4.19.2",
+    "http-proxy-middleware": "^2.0.6",
+    "mime-types": "^2.1.35",
+    "webpack-dev-middleware": "^7.3.0",
+    "webpack-dev-server": "^5.0.4",
+    "ws": "^8.16.0"
   },
   "peerDependencies": {
     "@rspack/core": "*"
@@ -53,7 +55,7 @@
   "scripts": {
     "build": "tsc -b ./tsconfig.build.json",
     "dev": "tsc -w -b ./tsconfig.build.json",
-    "test": "rimraf .test-temp && jest --runInBand --colors",
+    "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",
     "api-extractor": "api-extractor run --verbose",
     "api-extractor:ci": "api-extractor run --verbose || diff temp/api.md etc/api.md"
   }