1 files changed, 99 insertions, 72 deletions
diff --git a/node_modules/webpack/lib/node/NodeWatchFileSystem.js b/node_modules/webpack/lib/node/NodeWatchFileSystem.js
index 1c13a9b29..62d8532cd 100644
--- a/node_modules/webpack/lib/node/NodeWatchFileSystem.js
+++ b/node_modules/webpack/lib/node/NodeWatchFileSystem.js
@@ -1,72 +1,99 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const Watchpack = require("watchpack");
-
-class NodeWatchFileSystem {
-	constructor(inputFileSystem) {
-		this.inputFileSystem = inputFileSystem;
-		this.watcherOptions = {
-			aggregateTimeout: 0
-		};
-		this.watcher = new Watchpack(this.watcherOptions);
-	}
-
-	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
-		if(!Array.isArray(files))
-			throw new Error("Invalid arguments: 'files'");
-		if(!Array.isArray(dirs))
-			throw new Error("Invalid arguments: 'dirs'");
-		if(!Array.isArray(missing))
-			throw new Error("Invalid arguments: 'missing'");
-		if(typeof callback !== "function")
-			throw new Error("Invalid arguments: 'callback'");
-		if(typeof startTime !== "number" && startTime)
-			throw new Error("Invalid arguments: 'startTime'");
-		if(typeof options !== "object")
-			throw new Error("Invalid arguments: 'options'");
-		if(typeof callbackUndelayed !== "function" && callbackUndelayed)
-			throw new Error("Invalid arguments: 'callbackUndelayed'");
-		const oldWatcher = this.watcher;
-		this.watcher = new Watchpack(options);
-
-		if(callbackUndelayed)
-			this.watcher.once("change", callbackUndelayed);
-
-		this.watcher.once("aggregated", (changes, removals) => {
-			changes = changes.concat(removals);
-			if(this.inputFileSystem && this.inputFileSystem.purge) {
-				this.inputFileSystem.purge(changes);
-			}
-			const times = this.watcher.getTimes();
-			callback(null,
-				changes.filter(file => files.indexOf(file) >= 0).sort(),
-				changes.filter(file => dirs.indexOf(file) >= 0).sort(),
-				changes.filter(file => missing.indexOf(file) >= 0).sort(), times, times);
-		});
-
-		this.watcher.watch(files.concat(missing), dirs.concat(missing), startTime);
-
-		if(oldWatcher) {
-			oldWatcher.close();
-		}
-		return {
-			close: () => {
-				if(this.watcher) {
-					this.watcher.close();
-					this.watcher = null;
-				}
-			},
-			pause: () => {
-				if(this.watcher) {
-					this.watcher.pause();
-				}
-			}
-		};
-	}
-}
-
-module.exports = NodeWatchFileSystem;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const Watchpack = require("watchpack");
+const objectToMap = require("../util/objectToMap");
+
+class NodeWatchFileSystem {
+	constructor(inputFileSystem) {
+		this.inputFileSystem = inputFileSystem;
+		this.watcherOptions = {
+			aggregateTimeout: 0
+		};
+		this.watcher = new Watchpack(this.watcherOptions);
+	}
+
+	watch(files, dirs, missing, startTime, options, callback, callbackUndelayed) {
+		if (!Array.isArray(files)) {
+			throw new Error("Invalid arguments: 'files'");
+		}
+		if (!Array.isArray(dirs)) {
+			throw new Error("Invalid arguments: 'dirs'");
+		}
+		if (!Array.isArray(missing)) {
+			throw new Error("Invalid arguments: 'missing'");
+		}
+		if (typeof callback !== "function") {
+			throw new Error("Invalid arguments: 'callback'");
+		}
+		if (typeof startTime !== "number" && startTime) {
+			throw new Error("Invalid arguments: 'startTime'");
+		}
+		if (typeof options !== "object") {
+			throw new Error("Invalid arguments: 'options'");
+		}
+		if (typeof callbackUndelayed !== "function" && callbackUndelayed) {
+			throw new Error("Invalid arguments: 'callbackUndelayed'");
+		}
+		const oldWatcher = this.watcher;
+		this.watcher = new Watchpack(options);
+
+		if (callbackUndelayed) {
+			this.watcher.once("change", callbackUndelayed);
+		}
+
+		this.watcher.once("aggregated", (changes, removals) => {
+			changes = changes.concat(removals);
+			if (this.inputFileSystem && this.inputFileSystem.purge) {
+				this.inputFileSystem.purge(changes);
+			}
+			const times = objectToMap(this.watcher.getTimes());
+			callback(
+				null,
+				changes.filter(file => files.includes(file)).sort(),
+				changes.filter(file => dirs.includes(file)).sort(),
+				changes.filter(file => missing.includes(file)).sort(),
+				times,
+				times
+			);
+		});
+
+		this.watcher.watch(files.concat(missing), dirs.concat(missing), startTime);
+
+		if (oldWatcher) {
+			oldWatcher.close();
+		}
+		return {
+			close: () => {
+				if (this.watcher) {
+					this.watcher.close();
+					this.watcher = null;
+				}
+			},
+			pause: () => {
+				if (this.watcher) {
+					this.watcher.pause();
+				}
+			},
+			getFileTimestamps: () => {
+				if (this.watcher) {
+					return objectToMap(this.watcher.getTimes());
+				} else {
+					return new Map();
+				}
+			},
+			getContextTimestamps: () => {
+				if (this.watcher) {
+					return objectToMap(this.watcher.getTimes());
+				} else {
+					return new Map();
+				}
+			}
+		};
+	}
+}
+
+module.exports = NodeWatchFileSystem;