chore: merge origin main

.github/actions/env/action.yml

@@ -8,10 +8,21 @@ runs:
     - name: Setup node
       uses: actions/setup-node@v3
       with:
-        node-version: 18
+        node-version: 20
     - name: Activate corepack
       shell: bash
-      run: corepack enable
+      run: |
+        # corepack > 0.24.1 will use native fetch
+        # and native fetch not support HTTP_PROXY
+        # https://github.com/nodejs/undici/issues/1650
+        npm install -g [email protected]
+        corepack enable
     - name: Install dependencies with pnpm
       shell: bash
       run: pnpm install
+    - name: Set Rspack Dir
+      shell: bash
+      run: |
+        if [[ ! -z "$PNPM_CACHE" ]]; then
+          echo "RSPACK_DIR=$PNPM_CACHE/rspack" >> $GITHUB_ENV
+        fi

.github/workflows/bench_rspack_commit.yml

@@ -10,8 +10,7 @@ on:
 
 jobs:
   run-bench:
-    runs-on: [self-hosted, rspack-bench]
-    timeout-minutes: 30
+    runs-on: [self-hosted, benchmark]
     outputs:
       diff-result: ${{ steps.print-results.outputs.diff-result }}
     steps:

.github/workflows/bench_rspack_pr.yml

@@ -32,8 +32,7 @@ jobs:
             return comment.id
 
   run-bench:
-    runs-on: [self-hosted, rspack-bench]
-    timeout-minutes: 30
+    runs-on: [self-hosted, benchmark]
     needs: create-comment
     outputs:
       diff-result: ${{ steps.print-results.outputs.diff-result }}

.github/workflows/ci.yml

@@ -26,7 +26,7 @@ jobs:
 
   ci:
     needs: prepare-binding
-    runs-on: [self-hosted, rspack-bench]
+    runs-on: [self-hosted, benchmark]
     timeout-minutes: 30
     strategy:
       matrix:

.github/workflows/scheduled_bench.yml

@@ -6,8 +6,7 @@ on:
   workflow_dispatch:
 jobs:
   bench:
-    runs-on: [self-hosted, rspack-bench]
-    timeout-minutes: 30
+    runs-on: [self-hosted, benchmark]
     steps:
       - name: Checkout
         uses: actions/checkout@v2

README.md

@@ -8,7 +8,7 @@ You can use the scripts in the `bin` directory to prepare and run benchmark.
 
 * `node bin/build-rspack.js [remote] [branch]`
 
-Clone and build [rspack](https://github.com/web-infra-dev/rspack) in `.rspack` folder. You can set target branch with the parameter. eg.
+Clone and build [rspack](https://github.com/web-infra-dev/rspack) in the folder which defined by the environment variable of `RSPACK_DIR` or `<project_root>/.rspack`. You can set target branch with the parameter. eg.
 
 ``` bash
 node bin/build-rspack.js # use the main branch to build
@@ -28,7 +28,7 @@ RSPACK_DIR=<your-rspack-path> node bin/bench.js 10000_development-mode_hmr # set
 
 * `node bin/compare-bench.js <baseDate> <currentDate>`
 
-Compare and print the difference between `<baseDate>` and `<currentDate>`. The parameter have three types, `current` will use the data from `output` folder. `latest` will use the latest data from `data` branch. A date string like `YYYY-MM-DD` will use the data of that day from `data` branch. eg.
+Compare and print the difference between `<baseDate>` and `<currentDate>`. The parameter has three types, `current` will use the data from `output` folder. `latest` will use the latest data from `data` branch. A date string like `YYYY-MM-DD` will use the data of that day from `data` branch. eg.
 
 ``` bash
 node bin/compare-bench.js current latest # use output data as base, and latest data as current

bin/upload.js

@@ -12,7 +12,7 @@ const repoUrl = `https://${GITHUB_ACTOR}:${token}@github.com/web-infra-dev/rspac
 const rootDir = resolve(fileURLToPath(import.meta.url), "../..");
 const dataDir = resolve(rootDir, ".data");
 const outputDir = resolve(rootDir, "output");
-const rspackDir = resolve(rootDir, ".rspack");
+const rspackDir = process.env.RSPACK_DIR || resolve(rootDir, ".rspack");
 const dateDir = resolve(dataDir, date);
 
 async function getCommitSHA() {
@@ -29,9 +29,11 @@ async function getCommitSHA() {
 async function appendRspackBuildInfo() {
 	const commitSHA = await getCommitSHA();
 	const buildInfoFile = join(dataDir, "build-info.json");
-	const buildInfo = existsSync(buildInfoFile) ? JSON.parse(await readFile(buildInfoFile, "utf-8")) : {};
+	const buildInfo = existsSync(buildInfoFile)
+		? JSON.parse(await readFile(buildInfoFile, "utf-8"))
+		: {};
 	buildInfo[date] = {
-		commitSHA,
+		commitSHA
 	};
 	await writeFile(buildInfoFile, JSON.stringify(buildInfo, null, 2));
 }
@@ -80,7 +82,12 @@ async function appendRspackBuildInfo() {
 	process.chdir(dataDir);
 
 	console.log("== commit ==");
-	await runCommand("git", ["add", `${date}/*.json`, "index.txt", "build-info.json"]);
+	await runCommand("git", [
+		"add",
+		`${date}/*.json`,
+		"index.txt",
+		"build-info.json"
+	]);
 	try {
 		await runCommand("git", ["commit", "-m", `"add ${date} results"`]);
 	} catch {}

cases/arco-pro/rspack.config.js

@@ -160,6 +160,7 @@ module.exports = {
 				loader: "builtin:swc-loader",
 				exclude: [/[\\/]node_modules[\\/]/],
 				options: {
+					sourceMaps: true,
 					jsc: {
 						parser: {
 							syntax: "typescript",

lib/rspack.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from "url";
 import { runCommand, dirExist } from "./utils.js";
 
 const rootDir = resolve(fileURLToPath(import.meta.url), "../..");
-const rspackDir = resolve(rootDir, ".rspack");
+const rspackDir = process.env.RSPACK_DIR || resolve(rootDir, ".rspack");
 const repoUrl = `https://github.com/web-infra-dev/rspack.git`;
 
 async function switchToBranch(remote, branch) {
@@ -30,8 +30,8 @@ async function switchToBranch(remote, branch) {
 
 export async function buildRspack(remote, branch) {
 	if (!(await dirExist(rspackDir))) {
-		console.log(`git clone ${repoUrl} .rspack`);
-		await runCommand("git", ["clone", repoUrl, ".rspack"]);
+		console.log(`git clone ${repoUrl} ${rspackDir}`);
+		await runCommand("git", ["clone", repoUrl, rspackDir]);
 	}
 	process.chdir(rspackDir);
 

lib/services.js

@@ -1,14 +1,20 @@
-import * as path from 'path';
+import { ProxyAgent, setGlobalDispatcher } from "undici";
 
-const fetchPrefix = "https://raw.githubusercontent.com/web-infra-dev/rspack-ecosystem-benchmark/data";
+if (process.env.http_proxy) {
+	const agent = new ProxyAgent(process.env.http_proxy);
+	setGlobalDispatcher(agent);
+}
+
+const fetchPrefix =
+	"https://raw.githubusercontent.com/web-infra-dev/rspack-ecosystem-benchmark/data";
 
 /**
  * Fetch the build information from a JSON file.
  *
  * @returns {Promise<Object.<string, {commitSHA: string}>>}
  */
 export async function fetchBuildInfo() {
-	return fetch(`${fetchPrefix}/build-info.json`).then(res => res.json())
+	return fetch(`${fetchPrefix}/build-info.json`).then(res => res.json());
 }
 
 /**
@@ -43,6 +49,7 @@ export async function fetchIndex() {
  * @param {string} file - The specific file to fetch data from.
  * @returns {Promise<{[key: string]: Object.<string, number>}>} A promise that resolves to the benchmark result data.
  */
-export function fetchBenchmarkResult(date, file) {
-	return fetch(`${fetchPrefix}/${date}/${file}`).then(res => res.json());
+export async function fetchBenchmarkResult(date, file) {
+	const res = await fetch(`${fetchPrefix}/${date}/${file}`);
+	return await res.json();
 }

package.json

@@ -5,7 +5,8 @@
     "@icon-park/react": "^1.4.2",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-refresh": "^0.14.0"
+    "react-refresh": "^0.14.0",
+    "undici": "^6.11.0"
   },
   "packageManager": "[email protected]"
 }