Merge pull request #13944 from webpack/bugfix/11594

optional modules will not fail the build when bail is set
webpack · Aug 6, 2021 · f8acab3 · f8acab3
2 parents 9e735a7 + c6856e2
commit f8acab3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/lib/Compilation.js b/lib/Compilation.js
@@ -1574,10 +1574,11 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 				if (err) {
 					if (dependencies.every(d => d.optional)) {
 						this.warnings.push(err);
+						return callback();
 					} else {
 						this.errors.push(err);
+						return callback(err);
 					}
-					return callback(err);
 				}
 
 				if (!newModule) {

diff --git a/test/configCases/parsing/optional/index.js b/test/configCases/parsing/optional/index.js
@@ -0,0 +1,11 @@
+it("should not fail for optional modules with bail", () => {
+	let error;
+	try {
+		require("./not-existing");
+	} catch (e) {
+		error = e;
+	}
+	expect(() => {
+		throw error;
+	}).toThrowError();
+});
diff --git a/test/configCases/parsing/optional/warnings.js b/test/configCases/parsing/optional/warnings.js
@@ -0,0 +1,7 @@
+module.exports = [
+	[
+		/Module not found/,
+		/Can't resolve '\.\/not-existing' /,
+		{ details: /not-existing\.js/ }
+	]
+];
diff --git a/test/configCases/parsing/optional/webpack.config.js b/test/configCases/parsing/optional/webpack.config.js
@@ -0,0 +1,4 @@
+/** @type {import("../../../../").Configuration} */
+module.exports = {
+	bail: true
+};