Merge remote-tracking branch 'origin/main' into feat/inject_dev_server_uri

Author: stormslowly

.github/workflows/test.yml

@@ -13,12 +13,15 @@ on:
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   test:
+    permissions:
+      contents: read
+
     name: Test - ${{ matrix.os }} - Node v${{ matrix.node }})
 
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        node: [18.x]
+        node: [20.x]
 
     runs-on: ${{ matrix.os }}
 
@@ -47,3 +50,30 @@ jobs:
 
       - name: Run Test
         run: pnpm run test
+
+  check:
+    name: Check
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Pnpm
+        run: |
+          npm install -g corepack@latest
+          corepack enable
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "pnpm"
+
+      - name: Install Dependencies
+        run: pnpm install
+
+      - name: Prettier
+        run: pnpm run prettier:ci

.prettierrc.js

@@ -8,14 +8,14 @@ module.exports = {
 			files: "*.json",
 			options: {
 				parser: "json",
-				useTabs: false,
-			},
+				useTabs: false
+			}
 		},
 		{
 			files: "*.ts",
 			options: {
-				parser: "typescript",
-			},
-		},
-	],
+				parser: "typescript"
+			}
+		}
+	]
 };

jest.config.js

@@ -4,12 +4,12 @@ const isWin = os.platform() === "win32";
 const config = {
 	preset: "ts-jest",
 	testEnvironmentOptions: {
-		url: "http://localhost/",
+		url: "http://localhost/"
 	},
 	testMatch: [
 		"<rootDir>/tests/*.test.ts",
 		// TODO: enable after migrating to separated repo
-		"<rootDir>/tests/e2e/*.test.js",
+		"<rootDir>/tests/e2e/*.test.js"
 	],
 	testPathIgnorePatterns: [
 		// TODO: check why http proxy server throw error with websocket server
@@ -19,26 +19,26 @@ const config = {
 		// TODO: check why this test throw error when run with other tests
 		"<rootDir>/tests/e2e/watch-files.test.js",
 		// TODO: check why this test timeout
-		"<rootDir>/tests/e2e/web-socket-server-url.test.js",
+		"<rootDir>/tests/e2e/web-socket-server-url.test.js"
 	],
 	cache: false,
 	testTimeout: process.env.CI ? 120000 : 30000,
 	transform: {
 		"(.*)\\.{js,ts}": [
 			"ts-jest",
 			{
-				tsconfig: "<rootDir>/tests/tsconfig.json",
-			},
-		],
+				tsconfig: "<rootDir>/tests/tsconfig.json"
+			}
+		]
 	},
 	// Add this to find out which test timeouts
 	// testSequencer: "<rootDir>/tests/helpers/sequencer.js",
 	snapshotResolver: "<rootDir>/tests/helpers/snapshot-resolver.js",
 	setupFilesAfterEnv: ["<rootDir>/tests/helpers/setup-test.js"],
 	globalSetup: "<rootDir>/tests/helpers/global-setup-test.js",
 	moduleNameMapper: {
-		"^uuid$": require.resolve("uuid"),
-	},
+		"^uuid$": require.resolve("uuid")
+	}
 };
 
 module.exports = config;

package.json

@@ -25,6 +25,7 @@
     "lint": "biome check .",
     "lint:write": "biome check . --write",
     "format": "prettier --write .",
+    "prettier:ci": "prettier --check .",
     "test:install": "cross-env ./node_modules/.bin/puppeteer browsers install chrome",
     "test": "pnpm run test:install && pnpm run build && cross-env NO_COLOR=1 node --expose-gc --max-old-space-size=8192 --experimental-vm-modules ./node_modules/jest-cli/bin/jest --colors",
     "release": "node ./scripts/release.mjs"
@@ -33,8 +34,10 @@
     "pre-commit": "npx nano-staged"
   },
   "nano-staged": {
+    "*.{yaml,yml,json,md,json5}": ["npm rum format"],
     "*.{js,jsx,ts,tsx,mjs,cjs}": [
-      "biome check --write --no-errors-on-unmatched"
+      "npm run format",
+      "biome lint --write --no-errors-on-unmatched"
     ]
   },
   "files": ["dist", "client"],

scripts/release.mjs

@@ -15,7 +15,7 @@ const currentVersion = pkg.version;
 const nextVersion = inc(currentVersion, RELEASE_VERSION_TYPE);
 if (!nextVersion) {
 	throw new Error(
-		`Failed to generate next version from "${currentVersion}" with type "${RELEASE_VERSION_TYPE}"`,
+		`Failed to generate next version from "${currentVersion}" with type "${RELEASE_VERSION_TYPE}"`
 	);
 }
 

src/server.ts

@@ -40,7 +40,7 @@ const getFreePort = async function getFreePort(port: string, host: string) {
 			: 3;
 
 	return pRetry(() => getPort(basePort, host), {
-		retries: defaultPortRetry,
+		retries: defaultPortRetry
 	});
 };
 
@@ -85,15 +85,15 @@ export class RspackDevServer extends WebpackDevServer {
 				if (mode === "production") {
 					this.logger.warn(
 						"Hot Module Replacement (HMR) is enabled for the production build. \n" +
-							"Make sure to disable HMR for production by setting `devServer.hot` to `false` in the configuration.",
+							"Make sure to disable HMR for production by setting `devServer.hot` to `false` in the configuration."
 					);
 				}
 
 				compiler.options.resolve.alias = {
 					"ansi-html-community": require.resolve(
-						"@rspack/dev-server/client/utils/ansiHTML",
+						"@rspack/dev-server/client/utils/ansiHTML"
 					),
-					...compiler.options.resolve.alias,
+					...compiler.options.resolve.alias
 				};
 			}
 		}

tests/ansiHTML.test.ts

@@ -3,28 +3,28 @@ import ansiHTML from "../client-src/utils/ansiHTML";
 describe("ansi-html", () => {
 	it("should transform 24-bit rgb ansi colors", () => {
 		expect(ansiHTML("\u001b[38;2;255;30;30m×\u001b[0m")).toMatchInlineSnapshot(
-			`"<span style="color: rgb(255,30,30);">×</span><span style="font-weight:normal;opacity:1;color:#fff;background:#000;"></span>"`,
+			`"<span style="color: rgb(255,30,30);">×</span><span style="font-weight:normal;opacity:1;color:#fff;background:#000;"></span>"`
 		);
 	});
 
 	it("should transform 24-bit rgb ansi colors with additional properties", () => {
 		expect(
-			ansiHTML("[\u001b[38;2;92;157;255;1;4m/root/index.js\u001b[0m:1:1]"),
+			ansiHTML("[\u001b[38;2;92;157;255;1;4m/root/index.js\u001b[0m:1:1]")
 		).toMatchInlineSnapshot(
-			`"[<span style="color: rgb(92,157,255);"><span style="font-weight:bold;"><u>/root/index.js</u></span></span><span style="font-weight:normal;opacity:1;color:#fff;background:#000;">:1:1]</span>"`,
+			`"[<span style="color: rgb(92,157,255);"><span style="font-weight:bold;"><u>/root/index.js</u></span></span><span style="font-weight:normal;opacity:1;color:#fff;background:#000;">:1:1]</span>"`
 		);
 	});
 
 	it("should transform basic ansi colors", () => {
 		expect(ansiHTML("\u001b[0mcontent")).toMatchInlineSnapshot(
-			`"<span style="font-weight:normal;opacity:1;color:#fff;background:#000;">content</span>"`,
+			`"<span style="font-weight:normal;opacity:1;color:#fff;background:#000;">content</span>"`
 		);
 		expect(
 			ansiHTML(
-				"\u001b[33m<\u001b[39m\u001b[33mheader\u001b[39m\u001b[33m>\u001b[39m",
-			),
+				"\u001b[33m<\u001b[39m\u001b[33mheader\u001b[39m\u001b[33m>\u001b[39m"
+			)
 		).toMatchInlineSnapshot(
-			`"<span style="color:#e8bf03;"><</span><span style="color:#e8bf03;">header</span><span style="color:#e8bf03;">></span>"`,
+			`"<span style="color:#e8bf03;"><</span><span style="color:#e8bf03;">header</span><span style="color:#e8bf03;">></span>"`
 		);
 	});
 });