Merge pull request webpack#5297 from webpack/bugfix/watch-missing-directories

sokra · web-flow · commit a06496829bb0 · 2017-07-15T14:30:16.000+02:00
watch missing directories
diff --git a/lib/node/NodeWatchFileSystem.js b/lib/node/NodeWatchFileSystem.js
@@ -48,7 +48,7 @@ class NodeWatchFileSystem {
 				changes.filter(file => missing.indexOf(file) >= 0).sort(), times, times);
 		});
 
-		this.watcher.watch(files.concat(missing), dirs, startTime);
+		this.watcher.watch(files.concat(missing), dirs.concat(missing), startTime);
 
 		if(oldWatcher) {
 			oldWatcher.close();
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
     "supports-color": "^3.1.0",
     "tapable": "~0.2.5",
     "uglifyjs-webpack-plugin": "^0.4.6",
-    "watchpack": "^1.3.1",
+    "watchpack": "^1.4.0",
     "webpack-sources": "^1.0.1",
     "yargs": "^6.0.0"
   },
diff --git a/test/WatchTestCases.test.js b/test/WatchTestCases.test.js
@@ -129,8 +129,8 @@ describe("WatchTestCases", () => {
 							const jsonStats = stats.toJson({
 								errorDetails: true
 							});
-							if(checkArrayExpectation(testDirectory, jsonStats, "error", "Error", done)) return;
-							if(checkArrayExpectation(testDirectory, jsonStats, "warning", "Warning", done)) return;
+							if(checkArrayExpectation(path.join(testDirectory, run.name), jsonStats, "error", "Error", done)) return;
+							if(checkArrayExpectation(path.join(testDirectory, run.name), jsonStats, "warning", "Warning", done)) return;
 							let exportedTests = 0;
 
 							function _it(title, fn) {
diff --git a/test/watchCases/recover-from-error/missing-module/0/errors.js b/test/watchCases/recover-from-error/missing-module/0/errors.js
@@ -0,0 +1,3 @@
+module.exports = [
+	[/Module not found/, /Can't resolve 'some-module' /]
+];
diff --git a/test/watchCases/recover-from-error/missing-module/0/index.js b/test/watchCases/recover-from-error/missing-module/0/index.js
@@ -0,0 +1,12 @@
+it("should recover from missing module", function() {
+	switch(WATCH_STEP) {
+		case "0":
+			(function() {
+				require("some-module");
+			}).should.throw();
+			break;
+		case "1":
+			require("some-module").should.be.eql("ok");
+			break;
+	}
+});
diff --git a/test/watchCases/recover-from-error/missing-module/0/node_modules/module/index.js b/test/watchCases/recover-from-error/missing-module/0/node_modules/module/index.js
diff --git a/test/watchCases/recover-from-error/missing-module/1/node_modules/some-module/index.js b/test/watchCases/recover-from-error/missing-module/1/node_modules/some-module/index.js
diff --git a/yarn.lock b/yarn.lock
@@ -508,7 +508,7 @@ character-parser@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/character-parser/-/character-parser-1.2.1.tgz#c0dde4ab182713b919b970959a123ecc1a30fcd6"
 
-chokidar@^1.4.3:
+chokidar@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
   dependencies:
@@ -2088,6 +2088,7 @@ jade@^1.11.0:
     jstransformer "0.0.2"
     mkdirp "~0.5.0"
     transformers "2.1.0"
+    uglify-js "^2.4.19"
     void-elements "~2.0.1"
     with "~4.0.0"
 
@@ -4184,12 +4185,12 @@ void-elements@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
 
-watchpack@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.3.1.tgz#7d8693907b28ce6013e7f3610aa2a1acf07dad87"
+watchpack@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.4.0.tgz#4a1472bcbb952bd0a9bb4036801f954dfb39faac"
   dependencies:
     async "^2.1.2"
-    chokidar "^1.4.3"
+    chokidar "^1.7.0"
     graceful-fs "^4.1.2"
 
 webpack-dev-middleware@^1.9.0:

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+module.exports = [`
	`2`	`+ [/Module not found/, /Can't resolve 'some-module' /]`
	`3`	`+];`