Fixed polling

Calling stats synchronously seemed to do the trick Also fixed some formatting in watchEventSource.js because lint told me to
webpack · Mar 16, 2024 · 6072f3b · 6072f3b
1 parent fa835be
commit 6072f3b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 20 deletions.
diff --git a/lib/DirectoryWatcher.js b/lib/DirectoryWatcher.js
@@ -106,7 +106,6 @@ class DirectoryWatcher extends EventEmitter {
 						}
 					}
 				};
-				this.watcher.on("change", this.onWatchEvent.bind(this));
 			} else {
 				if (IS_OSX) {
 					this.watchInParentDirectory();
@@ -628,21 +627,34 @@ class DirectoryWatcher extends EventEmitter {
 					}
 				});
 				for (const itemPath of itemPaths) {
-					const handleStats = (err2, stats) => {
+					const handleStatsError = err2 => {
+						if (
+							err2.code === "ENOENT" ||
+							err2.code === "EPERM" ||
+							err2.code === "EACCES" ||
+							err2.code === "EBUSY"
+						) {
+							this.setMissing(itemPath, initial, "scan (" + err2.code + ")");
+						} else {
+							this.onScanError(err2);
+						}
+						itemFinished();
+						return;
+					};
+					fs.lstat(itemPath, (err2, stats) => {
 						if (this.closed) return;
 						if (err2) {
-							if (
-								err2.code === "ENOENT" ||
-								err2.code === "EPERM" ||
-								err2.code === "EACCES" ||
-								err2.code === "EBUSY"
-							) {
-								this.setMissing(itemPath, initial, "scan (" + err2.code + ")");
-							} else {
-								this.onScanError(err2);
+							handleStatsError(err2);
+						}
+						if (
+							stats.isSymbolicLink() &&
+							this.watcherManager.options.followSymlinks
+						) {
+							try {
+								stats = fs.statSync(itemPath);
+							} catch (err3) {
+								handleStatsError(err3);
 							}
-							itemFinished();
-							return;
 						}
 						if (stats.isFile() || stats.isSymbolicLink()) {
 							if (stats.mtime) {
@@ -665,12 +677,7 @@ class DirectoryWatcher extends EventEmitter {
 								);
 						}
 						itemFinished();
-					};
-					if (this.watcherManager.options.followSymlinks) {
-						fs.stat(itemPath, handleStats);
-					} else {
-						fs.lstat(itemPath, handleStats);
-					}
+					});
 				}
 				itemFinished();
 			});

diff --git a/lib/watchEventSource.js b/lib/watchEventSource.js
@@ -98,7 +98,9 @@ class RecursiveWatcher {
 				if (!filename) {
 					if (recursiveWatcherLogging) {
 						process.stderr.write(
-							`[watchpack] dispatch ${type} event in recursive watcher (${this.rootPath}) to all watchers\n`
+							`[watchpack] dispatch ${type} event in recursive watcher (${
+								this.rootPath
+							}) to all watchers\n`
 						);
 					}
 					for (const w of this.mapWatcherToPath.keys()) {