feat(watcher): enable rspack native watcher, upgrade to rsbuild 2.1.0-beta.0

stormslowly · stormslowly · commit 0dfdb181349e · 2026-06-20T15:39:14.000+08:00
diff --git a/e2e/dom/fixtures/package.json b/e2e/dom/fixtures/package.json
@@ -12,7 +12,7 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
diff --git a/e2e/package.json b/e2e/package.json
@@ -9,7 +9,7 @@
     "test:threads": "cross-env RSTEST_POOL_TYPE=threads rstest run --pool.type threads"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@rslib/core": "0.23.0",
     "@rstest/browser": "workspace:*",
diff --git a/e2e/projects/fixtures-shard/packages/client-vue/package.json b/e2e/projects/fixtures-shard/packages/client-vue/package.json
@@ -11,7 +11,7 @@
     "vue": "^3.5.38"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-vue": "^1.2.9",
     "@rstest/core": "workspace:*",
     "@vue/compiler-dom": "^3.5.38",
diff --git a/e2e/projects/fixtures-shard/packages/client/package.json b/e2e/projects/fixtures-shard/packages/client/package.json
@@ -12,7 +12,7 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
diff --git a/e2e/projects/fixtures/packages/client-vue/package.json b/e2e/projects/fixtures/packages/client-vue/package.json
@@ -11,7 +11,7 @@
     "vue": "^3.5.38"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-vue": "^1.2.9",
     "@rstest/core": "workspace:*",
     "@vue/compiler-dom": "^3.5.38",
diff --git a/e2e/projects/fixtures/packages/client/package.json b/e2e/projects/fixtures/packages/client/package.json
@@ -12,7 +12,7 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/jest-dom": "^6.9.1",
diff --git a/e2e/vue/fixtures/package.json b/e2e/vue/fixtures/package.json
@@ -11,7 +11,7 @@
     "vue": "^3.5.38"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-babel": "^1.2.1",
     "@rsbuild/plugin-vue": "^1.2.9",
     "@rsbuild/plugin-vue-jsx": "^2.0.1",
diff --git a/e2e/watch/fixtures-dynamic/rstest.config.mts b/e2e/watch/fixtures-dynamic/rstest.config.mts
@@ -1,11 +1,3 @@
 import { defineConfig } from '@rstest/core';
 
-export default defineConfig({
-  tools: {
-    rspack: {
-      watchOptions: {
-        aggregateTimeout: 10,
-      },
-    },
-  },
-});
+export default defineConfig({});
diff --git a/e2e/watch/fixtures-environment-comment/rstest.config.mts b/e2e/watch/fixtures-environment-comment/rstest.config.mts
@@ -1,11 +1,3 @@
 import { defineConfig } from '@rstest/core';
 
-export default defineConfig({
-  tools: {
-    rspack: {
-      watchOptions: {
-        aggregateTimeout: 10,
-      },
-    },
-  },
-});
+export default defineConfig({});
diff --git a/e2e/watch/fixtures-setup/rstest.config.mts b/e2e/watch/fixtures-setup/rstest.config.mts
@@ -4,11 +4,4 @@ export default defineConfig({
   passWithNoTests: true,
   setupFiles: ['./rstest.setup.ts'],
   exclude: ['**/node_modules/**', '**/dist/**'],
-  tools: {
-    rspack: {
-      watchOptions: {
-        aggregateTimeout: 10,
-      },
-    },
-  },
 });
diff --git a/e2e/watch/fixtures-shortcuts/rstest.config.mts b/e2e/watch/fixtures-shortcuts/rstest.config.mts
@@ -6,11 +6,4 @@ process.stdin.setRawMode = () => process.stdin;
 export default defineConfig({
   reporters: ['default'],
   disableConsoleIntercept: true,
-  tools: {
-    rspack: {
-      watchOptions: {
-        aggregateTimeout: 10,
-      },
-    },
-  },
 });
diff --git a/e2e/watch/fixtures/rstest.config.mts b/e2e/watch/fixtures/rstest.config.mts
@@ -1,11 +1,3 @@
 import { defineConfig } from '@rstest/core';
 
-export default defineConfig({
-  tools: {
-    rspack: {
-      watchOptions: {
-        aggregateTimeout: 10,
-      },
-    },
-  },
-});
+export default defineConfig({});
diff --git a/examples/react-rsbuild/package.json b/examples/react-rsbuild/package.json
@@ -14,7 +14,7 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@rstest/adapter-rsbuild": "workspace:*",
     "@testing-library/dom": "^10.4.1",
diff --git a/examples/react-rspack-browser/package.json b/examples/react-rspack-browser/package.json
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@rspack/cli": "~2.0.8",
-    "@rspack/core": "~2.0.8",
+    "@rspack/core": "~2.1.0-beta.0",
     "@rspack/dev-server": "~2.0.3",
     "@rspack/plugin-react-refresh": "~2.0.2",
     "@rstest/adapter-rspack": "workspace:*",
diff --git a/examples/react-rspack/package.json b/examples/react-rspack/package.json
@@ -16,7 +16,7 @@
   "devDependencies": {
     "@rsbuild/plugin-react": "^2.0.1",
     "@rspack/cli": "~2.0.8",
-    "@rspack/core": "~2.0.8",
+    "@rspack/core": "~2.1.0-beta.0",
     "@rspack/dev-server": "~2.0.3",
     "@rspack/plugin-react-refresh": "~2.0.2",
     "@rstest/adapter-rspack": "workspace:*",
diff --git a/examples/react/package.json b/examples/react/package.json
@@ -16,7 +16,7 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@rstest/core": "workspace:*",
     "@testing-library/dom": "^10.4.1",
diff --git a/examples/svelte-rsbuild/package.json b/examples/svelte-rsbuild/package.json
@@ -10,7 +10,7 @@
     "test:watch": "rstest --watch"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-svelte": "^2.0.0",
     "@rstest/adapter-rsbuild": "workspace:*",
     "@rstest/core": "workspace:*",
diff --git a/examples/vue/package.json b/examples/vue/package.json
@@ -13,7 +13,7 @@
     "vue": "^3.5.38"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-babel": "^1.2.1",
     "@rsbuild/plugin-vue": "^1.2.9",
     "@rsbuild/plugin-vue-jsx": "^2.0.1",
diff --git a/packages/adapter-rsbuild/package.json b/packages/adapter-rsbuild/package.json
@@ -35,7 +35,7 @@
     "test": "rstest"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rslib/core": "0.23.0",
     "@rstest/core": "workspace:*",
     "@rstest/tsconfig": "workspace:*"
diff --git a/packages/adapter-rspack/package.json b/packages/adapter-rspack/package.json
@@ -37,7 +37,7 @@
   "devDependencies": {
     "@rslib/core": "0.23.0",
     "@rspack/cli": "~2.0.8",
-    "@rspack/core": "~2.0.8",
+    "@rspack/core": "~2.1.0-beta.0",
     "@rstest/core": "workspace:*",
     "@rstest/tsconfig": "workspace:*"
   },
diff --git a/packages/adapter-rspack/src/index.ts b/packages/adapter-rspack/src/index.ts
@@ -222,10 +222,6 @@ const buildRspackToolConfig = (
       };
     }
 
-    if (restConfig.snapshot !== undefined) {
-      nextConfig.snapshot = restConfig.snapshot;
-    }
-
     if (restConfig.externalsPresets) {
       nextConfig.externalsPresets = {
         ...(config.externalsPresets || {}),
diff --git a/packages/browser-ui/package.json b/packages/browser-ui/package.json
@@ -33,7 +33,7 @@
     "react-dom": "^19.2.7"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rsbuild/plugin-react": "^2.0.1",
     "@rsbuild/plugin-svgr": "^2.0.4",
     "@tailwindcss/postcss": "^4.3.1",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -68,7 +68,7 @@
     "test": "npx rstest --globals"
   },
   "dependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@types/chai": "^5.2.3"
   },
   "devDependencies": {
diff --git a/packages/core/src/cli/commands.ts b/packages/core/src/cli/commands.ts
@@ -909,7 +909,7 @@ export const runRest = async ({
         process.off('unhandledRejection', unexpectedlyExitHandler);
       });
 
-      watchFilesForRestart({
+      await watchFilesForRestart({
         rstest,
         options,
         filters,
diff --git a/packages/core/src/core/plugins/entry.ts b/packages/core/src/core/plugins/entry.ts
@@ -56,8 +56,14 @@ export const pluginEntryWatch: (params: {
         };
 
         config.watchOptions ??= {};
-        // FIXME: Temporarily default to 5 to debounce rerun in watch mode.
-        config.watchOptions.aggregateTimeout = 5;
+        // Default aggregate window for watch-mode rerun debouncing. On macOS
+        // with the rspack native watcher this also needs to be long enough
+        // for the FSEvent → vnode cache invalidation cycle to complete before
+        // rspack stats the changed file (otherwise the rebuild reads stale
+        // content and rstest reports "No test files need re-run"). 100 ms is
+        // the minimum value that survives macos-14 GHA runners. User configs
+        // can override via `tools.rspack.watchOptions`.
+        config.watchOptions.aggregateTimeout = 100;
         // TODO: rspack should support `(string | RegExp)[]` type
         // https://github.com/web-infra-dev/rspack/issues/10596
         config.watchOptions.ignored = castArray(
@@ -79,6 +85,9 @@ export const pluginEntryWatch: (params: {
           '**/*.snap',
         );
 
+        config.experiments ??= {};
+        config.experiments.nativeWatcher = true;
+
         const configFilePath = context.projects.find(
           (project) => project.environmentName === environment.name,
         )?.configFilePath;
diff --git a/packages/core/src/core/restart.ts b/packages/core/src/core/restart.ts
@@ -93,6 +93,12 @@ export async function watchFilesForRestart({
     ignoreInitial: true,
     // If watching fails due to read permissions, the errors will be suppressed silently.
     ignorePermissionErrors: true,
+    // chokidar v5 dropped fsevents and relies on Node's fs.watch(), which is
+    // unreliable for single-file watching on macOS (kqueue silently drops
+    // change events). Poll the small set of config files instead — 100ms is
+    // fast enough for restarts while adding negligible CPU.
+    usePolling: true,
+    interval: 100,
     ...watchOptions,
   });
 
diff --git a/packages/core/src/utils/watchFiles.ts b/packages/core/src/utils/watchFiles.ts
@@ -35,5 +35,10 @@ export async function createChokidar(
     }
   }
 
-  return chokidar.watch(Array.from(watchFiles), options);
+  const watcher = chokidar.watch(Array.from(watchFiles), options);
+  // Await the initial scan so callers can rely on events being emitted for
+  // subsequent modifications — chokidar may drop events before 'ready',
+  // especially on macOS where FSEvents setup is async.
+  await new Promise<void>((resolve) => watcher.once('ready', () => resolve()));
+  return watcher;
 }
diff --git a/packages/core/tests/core/__snapshots__/rsbuild.test.ts.snap b/packages/core/tests/core/__snapshots__/rsbuild.test.ts.snap
@@ -5,6 +5,9 @@ exports[`prepareRsbuild > should generate rspack config correctly (esm output) 1
   "context": "<ROOT>/packages/core",
   "devtool": "nosources-source-map",
   "entry": {},
+  "experiments": {
+    "sourceImport": true,
+  },
   "externals": [
     [Function],
     {
@@ -590,6 +593,9 @@ exports[`prepareRsbuild > should generate rspack config correctly (jsdom) 1`] =
   "context": "<ROOT>/packages/core",
   "devtool": "nosources-source-map",
   "entry": {},
+  "experiments": {
+    "sourceImport": true,
+  },
   "externals": [
     [Function],
     {
@@ -1160,6 +1166,9 @@ exports[`prepareRsbuild > should generate rspack config correctly (node) 1`] = `
   "context": "<ROOT>/packages/core",
   "devtool": "nosources-source-map",
   "entry": {},
+  "experiments": {
+    "sourceImport": true,
+  },
   "externals": [
     [Function],
     {
@@ -1729,6 +1738,10 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
   "context": "<ROOT>/packages/core",
   "devtool": "nosources-source-map",
   "entry": [Function],
+  "experiments": {
+    "nativeWatcher": true,
+    "sourceImport": true,
+  },
   "externals": [
     [Function],
     {
@@ -2289,7 +2302,7 @@ exports[`prepareRsbuild > should generate rspack config correctly in watch mode
   },
   "target": "node",
   "watchOptions": {
-    "aggregateTimeout": 5,
+    "aggregateTimeout": 100,
     "ignored": [
       "**/.git",
       "**/node_modules",
@@ -2633,6 +2646,9 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
   "context": "<ROOT>/packages/core",
   "devtool": "nosources-source-map",
   "entry": {},
+  "experiments": {
+    "sourceImport": true,
+  },
   "externals": [
     [Function],
     {
@@ -3203,6 +3219,9 @@ exports[`prepareRsbuild > should generate rspack config correctly with projects
   "context": "<ROOT>/packages/core",
   "devtool": "nosources-source-map",
   "entry": {},
+  "experiments": {
+    "sourceImport": true,
+  },
   "externals": [
     [Function],
     {
diff --git a/packages/coverage-v8/package.json b/packages/coverage-v8/package.json
@@ -41,7 +41,7 @@
     "v8-to-istanbul": "^9.3.0"
   },
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rslib/core": "0.23.0",
     "@rstest/core": "workspace:*",
     "@rstest/tsconfig": "workspace:*",
diff --git a/packages/vscode/package.json b/packages/vscode/package.json
@@ -104,7 +104,7 @@
     "workspaceContains:**/*rstest.{workspace,projects}*.{ts,js,mjs,cjs,cts,mts,json}"
   ],
   "devDependencies": {
-    "@rsbuild/core": "~2.0.15",
+    "@rsbuild/core": "~2.1.0-beta.0",
     "@rslib/core": "0.23.0",
     "@rstest/core": "workspace:*",
     "@swc/core": "^1.15.41",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
