Merge pull request webpack#5812 from simon-paris/ignore-enoent-in-contextmodulefactory-resolvedependencies

sokra · web-flow · commit 33818bcbe4c8 · 2017-10-13T11:06:11.000+02:00
Fix webpack#5794 by ignoring ENOENT errors in ContextModuleFactory.addDependencies
diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js
@@ -114,7 +114,15 @@ module.exports = class ContextModuleFactory extends Tapable {
 					const subResource = path.join(directory, seqment);
 
 					fs.stat(subResource, (err, stat) => {
-						if(err) return callback(err);
+						if(err) {
+							if(err.code === "ENOENT") {
+								// ENOENT is ok here because the file may have been deleted between
+								// the readdir and stat calls.
+								return callback();
+							} else {
+								return callback(err);
+							}
+						}
 
 						if(stat.isDirectory()) {
 
diff --git a/test/ContextModuleFactory.test.js b/test/ContextModuleFactory.test.js
@@ -0,0 +1,46 @@
+/* globals describe, it, beforeEach */
+"use strict";
+require("should");
+const MemoryFs = require("memory-fs");
+const ContextModuleFactory = require("../lib/ContextModuleFactory");
+
+describe("ContextModuleFactory", function() {
+	describe("resolveDependencies", function() {
+		let factory, memfs;
+		beforeEach(function() {
+			factory = new ContextModuleFactory([]);
+			memfs = new MemoryFs();
+		});
+		it("should not report an error when ENOENT errors happen", function(done) {
+			memfs.readdir = (dir, callback) => {
+				setTimeout(() => callback(null, ["/file"]));
+			};
+			memfs.stat = (file, callback) => {
+				let err = new Error("fake ENOENT error");
+				err.code = "ENOENT";
+				setTimeout(() => callback(err, null));
+			};
+			factory.resolveDependencies(memfs, "/", true, /.*/, (err, res) => {
+				(!!err).should.be.false();
+				res.should.be.an.Array();
+				res.length.should.be.exactly(0);
+				done();
+			});
+		});
+		it("should report an error when non-ENOENT errors happen", function(done) {
+			memfs.readdir = (dir, callback) => {
+				setTimeout(() => callback(null, ["/file"]));
+			};
+			memfs.stat = (file, callback) => {
+				let err = new Error("fake EACCES error");
+				err.code = "EACCES";
+				setTimeout(() => callback(err, null));
+			};
+			factory.resolveDependencies(memfs, "/", true, /.*/, (err, res) => {
+				err.should.be.an.Error();
+				(!!res).should.be.false();
+				done();
+			});
+		});
+	});
+});
