Merge branch 'main' into bundle_serve_static_0316

Author: chenjiahan

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:
-          node-version: 24.14.0
+          node-version: 24.14.1
           package-manager-cache: false
 
       # Update npm to the latest version to enable OIDC

.github/workflows/test.yml

@@ -16,17 +16,16 @@ jobs:
     permissions:
       contents: read
 
-    name: Test - ${{ matrix.os }} - Node v${{ matrix.node }})
+    name: Test - ${{ matrix.os }}
 
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest]
-        node: [20.x]
 
     runs-on: ${{ matrix.os }}
 
     concurrency:
-      group: test-${{ matrix.os }}-v${{ matrix.node }}-${{ github.ref }}
+      group: test-${{ matrix.os }}-${{ github.ref }}
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -41,7 +40,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:
-          node-version: ${{ matrix.node }}
+          node-version: 22.22.2
           package-manager-cache: false
 
       - name: Install Dependencies
@@ -68,7 +67,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6
         with:
-          node-version: 20.20.1
+          node-version: 22.22.2
           package-manager-cache: false
 
       - name: Install Dependencies

.vscode/extensions.json

@@ -1,8 +1,3 @@
 {
-  "recommendations": [
-    "streetsidesoftware.code-spell-checker",
-    "tamasfe.even-better-toml",
-    "rust-lang.rust-analyzer",
-    "fabiospampinato.vscode-debug-launcher"
-  ]
+  "recommendations": ["rstack.rslint", "esbenp.prettier-vscode"]
 }

biome.jsonc

@@ -1,6 +1,5 @@
 import type { FilterTypes } from '@rspack/core';
 
-// biome-ignore lint/suspicious/noExplicitAny: expected any
 export type EXPECTED_ANY = any;
 
 export type FilterFunction = (item: string) => boolean;

client-src/modules/types.ts

@@ -11,7 +11,7 @@
 // The error overlay is inspired (and mostly copied) from Create React App (https://github.com/facebookincubator/create-react-app)
 // They, in turn, got inspired by webpack-hot-middleware (https://github.com/glenjamin/webpack-hot-middleware).
 
-import ansiHTML from './utils/ansiHTML';
+import ansiHTML from './utils/ansiHTML.js';
 
 const getCodePoint = !!String.prototype.codePointAt
   ? (input: string, position: number): number | undefined =>
@@ -422,13 +422,17 @@ type CreateOverlayOptions = {
   catchRuntimeError?: boolean | ((error: Error) => void);
 };
 
+type OverlayTrustedTypePolicy = {
+  createHTML: (value: string) => string;
+};
+
 declare global {
   interface Window {
     trustedTypes?: {
       createPolicy: (
         name: string,
         policy: { createHTML: (value: string) => string },
-      ) => TrustedTypePolicy;
+      ) => OverlayTrustedTypePolicy;
     };
   }
 }
@@ -438,9 +442,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => {
   let containerElement: HTMLDivElement | null | undefined;
   let headerElement: HTMLDivElement | null | undefined;
   let onLoadQueue: ((element: HTMLDivElement) => void)[] = [];
-  let overlayTrustedTypesPolicy:
-    | Omit<TrustedTypePolicy, 'createScript' | 'createScriptURL'>
-    | undefined;
+  let overlayTrustedTypesPolicy: OverlayTrustedTypePolicy | undefined;
 
   type CSSStyleDeclarationKeys = Extract<keyof CSSStyleDeclaration, 'string'>;
 
@@ -645,8 +647,7 @@ const createOverlay = (options: CreateOverlayOptions): StateMachine => {
       const errorObject =
         error instanceof Error
           ? error
-          : // @ts-expect-error error options
-            new Error(error || fallbackMessage, { cause: error });
+          : new Error(error || fallbackMessage, { cause: error });
 
       const shouldDisplay =
         typeof options.catchRuntimeError === 'function'

client-src/overlay.ts

@@ -8,8 +8,8 @@
     "preview": "rspack preview"
   },
   "devDependencies": {
-    "@rspack/cli": "2.0.0-beta.6",
-    "@rspack/core": "2.0.0-beta.6",
+    "@rspack/cli": "2.0.0-beta.7",
+    "@rspack/core": "2.0.0-beta.7",
     "@rspack/dev-server": "workspace:*"
   }
 }

example/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rspack/dev-server",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "description": "Development server for rspack",
   "homepage": "https://rspack.rs",
   "bugs": "https://github.com/rstackjs/rspack-dev-server/issues",
@@ -26,8 +26,8 @@
     "bump": "npx bumpp",
     "dev": "rslib -w",
     "format": "prettier --write .",
-    "lint": "biome check .",
-    "lint:write": "biome check . --write",
+    "lint": "rslint",
+    "lint:write": "rslint --fix",
     "prettier:ci": "prettier --check .",
     "test": "pnpm run test:install && pnpm run build && rstest",
     "test:install": "cross-env ./node_modules/.bin/puppeteer browsers install chrome"
@@ -37,11 +37,11 @@
   },
   "nano-staged": {
     "*.{yaml,yml,json,md,json5}": [
-      "npm rum format"
+      "npm run format"
     ],
     "*.{js,jsx,ts,tsx,mjs,cjs}": [
       "npm run format",
-      "biome lint --write --no-errors-on-unmatched"
+      "rslint --fix"
     ]
   },
   "dependencies": {
@@ -52,15 +52,15 @@
     "connect-next": "^4.0.0",
     "http-proxy-middleware": "^3.0.5",
     "ipaddr.js": "^2.3.0",
-    "ws": "^8.19.0"
+    "ws": "^8.20.0"
   },
   "devDependencies": {
-    "@biomejs/biome": "^1.9.4",
-    "@hono/node-server": "^1.19.11",
-    "@rslib/core": "^0.20.0",
-    "@rspack/core": "2.0.0-beta.6",
+    "@hono/node-server": "^1.19.12",
+    "@rslib/core": "^0.20.2",
+    "@rslint/core": "^0.3.3",
+    "@rspack/core": "2.0.0-beta.7",
     "@rspack/plugin-react-refresh": "1.6.1",
-    "@rstest/core": "^0.9.2",
+    "@rstest/core": "^0.9.5",
     "@types/mime-types": "3.0.1",
     "@types/node": "^24.12.0",
     "@types/serve-static": "^2.2.0",
@@ -69,22 +69,22 @@
     "cross-env": "^10.1.0",
     "css-loader": "^7.1.4",
     "express": "^5.2.1",
-    "hono": "^4.12.5",
+    "hono": "^4.12.9",
     "http-compression": "^1.1.2",
     "http-proxy": "^1.18.1",
-    "launch-editor": "^2.13.1",
+    "launch-editor": "^2.13.2",
     "nano-staged": "^0.9.0",
     "open": "^11.0.0",
     "p-retry": "^7.1.1",
     "prettier": "3.8.1",
-    "puppeteer": "^24.39.0",
+    "puppeteer": "^24.40.0",
     "react-refresh": "0.18.0",
     "require-from-string": "^2.0.2",
     "selfsigned": "^5.5.0",
     "serve-static": "^2.2.1",
     "simple-git-hooks": "^2.13.1",
     "style-loader": "^4.0.0",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "@rspack/core": "^2.0.0-0",
@@ -95,7 +95,7 @@
       "optional": true
     }
   },
-  "packageManager": "pnpm@10.32.1",
+  "packageManager": "pnpm@10.33.0",
   "engines": {
     "node": "^20.19.0 || >=22.12.0"
   },