Merge pull request #140 from webpack/deps/remove

remove neo-async dependency
webpack · Jan 15, 2020 · 21ddd81 · 21ddd81
2 parents a71712f + f62da68
commit 21ddd81
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 68 deletions.
diff --git a/lib/DirectoryWatcher.js b/lib/DirectoryWatcher.js
@@ -5,7 +5,6 @@
 "use strict";
 
 const EventEmitter = require("events").EventEmitter;
-const async = require("neo-async");
 const fs = require("graceful-fs");
 const path = require("path");
 
@@ -24,6 +23,14 @@ function withoutCase(str) {
 	return str.toLowerCase();
 }
 
+function needCalls(times, callback) {
+	return function() {
+		if (--times === 0) {
+			return callback();
+		}
+	};
+}
+
 class Watcher extends EventEmitter {
 	constructor(directoryWatcher, filePath, startTime) {
 		super();
@@ -547,77 +554,75 @@ class DirectoryWatcher extends EventEmitter {
 				this.doScan(initial);
 				return;
 			}
-			async.forEach(
-				itemPaths,
-				(itemPath, callback) => {
-					fs.lstat(itemPath, (err2, stats) => {
-						if (this.closed) return;
-						if (err2) {
-							if (
-								err2.code === "ENOENT" ||
-								err2.code === "EPERM" ||
-								err2.code === "EBUSY"
-							) {
-								this.setMissing(itemPath, initial, "scan (" + err2.code + ")");
-							} else {
-								this.onScanError(err2);
+			const itemFinished = needCalls(itemPaths.size + 1, () => {
+				if (this.closed) return;
+				this.initialScan = false;
+				this.initialScanRemoved = null;
+				this.initialScanFinished = Date.now();
+				if (initial) {
+					const missingWatchers = new Map(this.watchers);
+					missingWatchers.delete(withoutCase(this.path));
+					for (const item of itemPaths) {
+						missingWatchers.delete(withoutCase(item));
+					}
+					for (const watchers of missingWatchers.values()) {
+						for (const watcher of watchers) {
+							if (watcher.checkStartTime(this.initialScanFinished, false)) {
+								watcher.emit(
+									"initial-missing",
+									"scan (missing in initial scan)"
+								);
 							}
-							callback();
-							return;
 						}
-						if (stats.isFile() || stats.isSymbolicLink()) {
-							if (stats.mtime) {
-								ensureFsAccuracy(stats.mtime);
-							}
-							this.setFileTime(
+					}
+				}
+				if (this.scanAgain) {
+					this.scanAgain = false;
+					this.doScan(this.scanAgainInitial);
+				} else {
+					this.scanning = false;
+				}
+			});
+			for (const itemPath of itemPaths) {
+				fs.lstat(itemPath, (err2, stats) => {
+					if (this.closed) return;
+					if (err2) {
+						if (
+							err2.code === "ENOENT" ||
+							err2.code === "EPERM" ||
+							err2.code === "EBUSY"
+						) {
+							this.setMissing(itemPath, initial, "scan (" + err2.code + ")");
+						} else {
+							this.onScanError(err2);
+						}
+						itemFinished();
+						return;
+					}
+					if (stats.isFile() || stats.isSymbolicLink()) {
+						if (stats.mtime) {
+							ensureFsAccuracy(stats.mtime);
+						}
+						this.setFileTime(
+							itemPath,
+							+stats.mtime || +stats.ctime || 1,
+							initial,
+							true,
+							"scan (file)"
+						);
+					} else if (stats.isDirectory()) {
+						if (!initial || !this.directories.has(itemPath))
+							this.setDirectory(
 								itemPath,
 								+stats.mtime || +stats.ctime || 1,
 								initial,
-								true,
-								"scan (file)"
+								"scan (dir)"
 							);
-						} else if (stats.isDirectory()) {
-							if (!initial || !this.directories.has(itemPath))
-								this.setDirectory(
-									itemPath,
-									+stats.mtime || +stats.ctime || 1,
-									initial,
-									"scan (dir)"
-								);
-						}
-						callback();
-					});
-				},
-				() => {
-					if (this.closed) return;
-					this.initialScan = false;
-					this.initialScanRemoved = null;
-					this.initialScanFinished = Date.now();
-					if (initial) {
-						const missingWatchers = new Map(this.watchers);
-						missingWatchers.delete(withoutCase(this.path));
-						for (const item of itemPaths) {
-							missingWatchers.delete(withoutCase(item));
-						}
-						for (const watchers of missingWatchers.values()) {
-							for (const watcher of watchers) {
-								if (watcher.checkStartTime(this.initialScanFinished, false)) {
-									watcher.emit(
-										"initial-missing",
-										"scan (missing in initial scan)"
-									);
-								}
-							}
-						}
-					}
-					if (this.scanAgain) {
-						this.scanAgain = false;
-						this.doScan(this.scanAgainInitial);
-					} else {
-						this.scanning = false;
 					}
-				}
-			);
+					itemFinished();
+				});
+			}
+			itemFinished();
 		});
 	}
 

diff --git a/package.json b/package.json
@@ -41,8 +41,7 @@
   },
   "dependencies": {
     "glob-to-regexp": "^0.4.1",
-    "graceful-fs": "^4.1.2",
-    "neo-async": "^2.5.0"
+    "graceful-fs": "^4.1.2"
   },
   "engines": {
     "node": ">=10.13.0"

diff --git a/yarn.lock b/yarn.lock
@@ -903,7 +903,7 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-neo-async@^2.5.0, neo-async@^2.6.0:
+neo-async@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==