fix: NativeWatchFileSystem should handle inputFileSystem when files change

crates/rspack_fs/src/watcher/disk_watcher.rs

@@ -88,9 +88,16 @@ impl DiskWatcher {
     for pattern in already_watched_paths.difference(&current_should_watch_paths) {
       // If the path is no longer in the patterns to watch, unwatch it
       if let Some(watcher) = &mut self.inner {
-        watcher
-          .unwatch(pattern)
-          .map_err(|e| rspack_error::error!(e))?;
+        // FIXME:
+        // we will unwatch the path is unnecessary, but we don't have a way to check if the path is still in the patterns
+        // notify will remove the watch path when path is removed in it's inner.
+        // If we unwatch the path again, it will return a error.
+        // So we just ignore the error here.
+        if let Err(e) = watcher.unwatch(pattern) {
+          if !matches!(e.kind, notify::ErrorKind::WatchNotFound) {
+            return Err(rspack_error::error!(e));
+          }
+        }
       }
     }
 

crates/rspack_fs/src/watcher/executor.rs

@@ -251,7 +251,7 @@ fn create_execute_aggregate_task(
           let mut files = files.lock().await;
           if files.is_empty() {
             running.store(false, Ordering::Relaxed);
-            return;
+            continue;
           }
           std::mem::take(&mut *files)
         };

packages/rspack/src/NativeWatchFileSystem.ts

@@ -1,6 +1,11 @@
 import binding from "@rspack/binding";
 import type Watchpack from "watchpack";
-import type { FileSystemInfoEntry, Watcher, WatchFileSystem } from "./util/fs";
+import type {
+	FileSystemInfoEntry,
+	InputFileSystem,
+	Watcher,
+	WatchFileSystem
+} from "./util/fs";
 
 /**
  * The following code is modified based on
@@ -36,6 +41,11 @@ const toJsWatcherIgnored = (
 
 export default class NativeWatchFileSystem implements WatchFileSystem {
 	#inner: binding.NativeWatcher | undefined;
+	#inputFileSystem: InputFileSystem;
+
+	constructor(inputFileSystem: InputFileSystem) {
+		this.#inputFileSystem = inputFileSystem;
+	}
 
 	watch(
 		files: Iterable<string> & {
@@ -95,7 +105,23 @@ export default class NativeWatchFileSystem implements WatchFileSystem {
 			[Array.from(directories.added!), Array.from(directories.removed!)],
 			[Array.from(missing.added!), Array.from(missing.removed!)],
 			(err: Error | null, result) => {
-				const { changedFiles, removedFiles } = result;
+				if (!err) {
+					// pause emitting events (avoids clearing aggregated changes and removals on timeout)
+					nativeWatcher.pause();
+				}
+				// !!if there is an error, result maybe a undefined value
+				const changedFiles = result?.changedFiles || [];
+				const removedFiles = result?.removedFiles || [];
+				if (this.#inputFileSystem?.purge) {
+					const fs = this.#inputFileSystem;
+					for (const item of changedFiles) {
+						fs.purge?.(item);
+					}
+					for (const item of removedFiles) {
+						fs.purge?.(item);
+					}
+				}
+
 				// TODO: add fileTimeInfoEntries and contextTimeInfoEntries
 				callback(
 					err,

packages/rspack/src/node/NodeEnvironmentPlugin.ts

@@ -56,7 +56,7 @@ export default class NodeEnvironmentPlugin {
 		compiler.intermediateFileSystem = null;
 
 		if (compiler.options.experiments.nativeWatcher) {
-			compiler.watchFileSystem = new NativeWatchFileSystem();
+			compiler.watchFileSystem = new NativeWatchFileSystem(inputFileSystem);
 		} else {
 			compiler.watchFileSystem = new NodeWatchFileSystem(inputFileSystem);
 		}

tests/webpack-test/NativeWatcherTestCases.longtest.js

@@ -0,0 +1,8 @@
+const { describeCases } = require("./WatchTestCases.template");
+
+describeCases({
+	name: "NativeWatcherTestCases",
+	experiments: {
+		nativeWatcher: true,
+	}
+});

tests/webpack-test/jest.config.js

@@ -100,6 +100,7 @@ module.exports = {
 		// "<rootDir>/WatchDetection.test.js",
 		// "<rootDir>/WatchSuspend.test.js",
 		"<rootDir>/WatchTestCases.longtest.js",
+		"<rootDir>/NativeWatcherTestCases.longtest.js",
 		// "<rootDir>/WatcherEvents.test.js",
 		// "<rootDir>/WebpackError.unittest.js",
 		// "<rootDir>/cleverMerge.unittest.js",