fix incorrectly reported changes when attaching to an already watched…

… directory
webpack · Oct 30, 2020 · 128bcd4 · 128bcd4
1 parent c42f625
commit 128bcd4
Show file tree

Hide file tree

Showing 3 changed files with 74 additions and 48 deletions.
diff --git a/lib/DirectoryWatcher.js b/lib/DirectoryWatcher.js
@@ -349,7 +349,22 @@ class DirectoryWatcher extends EventEmitter {
 			if (safeTime >= startTime) {
 				process.nextTick(() => {
 					if (this.closed) return;
-					watcher.emit("change", safeTime);
+					if (filePath === this.path) {
+						watcher.emit(
+							"change",
+							filePath,
+							safeTime,
+							"watch (outdated on attach)",
+							true
+						);
+					} else {
+						watcher.emit(
+							"change",
+							safeTime,
+							"watch (outdated on attach)",
+							true
+						);
+					}
 				});
 			}
 		} else if (this.initialScan) {

diff --git a/lib/watchpack.js b/lib/watchpack.js
@@ -302,46 +302,6 @@ class Watchpack extends EventEmitter {
 		return map;
 	}
 
-	_missingWatcher(file, watcher) {
-		if (watcher) {
-			watcher.on("change", (mtime, type) => {
-				this._onChange(file, mtime, file, type);
-			});
-			watcher.on("remove", type => {
-				this._onRemove(file, file, type);
-			});
-		}
-		return watcher;
-	}
-
-	_fileWatcher(file, watcher) {
-		if (watcher) {
-			watcher.on("initial-missing", type => {
-				this._onRemove(file, file, type);
-			});
-			watcher.on("change", (mtime, type) => {
-				this._onChange(file, mtime, file, type);
-			});
-			watcher.on("remove", type => {
-				this._onRemove(file, file, type);
-			});
-		}
-		return watcher;
-	}
-
-	_dirWatcher(item, watcher) {
-		watcher.on("initial-missing", type => {
-			this._onRemove(item, item, type);
-		});
-		watcher.on("change", (file, mtime, type) => {
-			this._onChange(item, mtime, file, type);
-		});
-		watcher.on("remove", type => {
-			this._onRemove(item, item, type);
-		});
-		return watcher;
-	}
-
 	_onChange(item, mtime, file, type) {
 		file = file || item;
 		if (this.paused) return;

diff --git a/test/Watchpack.js b/test/Watchpack.js
@@ -809,7 +809,7 @@ describe("Watchpack", function() {
 
 	it("should not report changes in initial scan when no start time is provided", function(done) {
 		var w = new Watchpack({
-			aggregateTimeout: 1000
+			aggregateTimeout: 100
 		});
 		w.on("aggregated", () => {
 			done(new Error("should not fire"));
@@ -818,18 +818,69 @@ describe("Watchpack", function() {
 		testHelper.dir("dir/b");
 		testHelper.dir("dir/b/sub");
 		testHelper.file("dir/b/sub/file");
+		testHelper.dir("dir/b/sub/sub");
+		testHelper.file("dir/b/sub/sub/file");
 		testHelper.file("dir/b/file");
 		testHelper.file("dir/a");
-		testHelper.tick(() => {
+		testHelper.tick(1000, () => {
 			w.watch({
-				files: [path.join(fixtures, "dir", "a")],
-				directories: [path.join(fixtures, "dir", "b")],
-				missing: [path.join(fixtures, "dir", "c")]
+				directories: [path.join(fixtures, "dir", "b", "sub")]
 			});
 			testHelper.tick(2000, () => {
 				// no event fired
-				w.close();
-				done();
+				w.watch({
+					files: [path.join(fixtures, "dir", "a")],
+					directories: [
+						path.join(fixtures, "dir", "b", "sub"),
+						path.join(fixtures, "dir", "b")
+					],
+					missing: [path.join(fixtures, "dir", "c")]
+				});
+				testHelper.tick(2000, () => {
+					// no event fired
+					w.close();
+					done();
+				});
+			});
+		});
+	});
+
+	it("should not report changes in initial scan when start time is provided", function(done) {
+		var w = new Watchpack({
+			aggregateTimeout: 100
+		});
+		w.on("aggregated", () => {
+			done(new Error("should not fire"));
+		});
+		testHelper.dir("dir");
+		testHelper.dir("dir/b");
+		testHelper.dir("dir/b/sub");
+		testHelper.file("dir/b/sub/file");
+		testHelper.dir("dir/b/sub/sub");
+		testHelper.file("dir/b/sub/sub/file");
+		testHelper.file("dir/b/file");
+		testHelper.file("dir/a");
+		testHelper.tick(1000, () => {
+			w.watch({
+				directories: [path.join(fixtures, "dir", "b", "sub")],
+				startTime: Date.now()
+			});
+			testHelper.tick(2000, () => {
+				// no event fired
+				w.watch({
+					files: [path.join(fixtures, "dir", "a")],
+					directories: [
+						path.join(fixtures, "dir", "b", "sub"),
+						path.join(fixtures, "dir", "b")
+					],
+					missing: [path.join(fixtures, "dir", "c")],
+					startTime: Date.now()
+				});
+				testHelper.tick(2000, () => {
+					// no event fired
+					w.close();
+					done();
+				});
 			});
 		});
 	});