handle error/callback result in ResolverCachePlugin with yield

vankop · vankop · commit 8d1e46e5234c · 2022-02-22T21:21:39.000+03:00
diff --git a/lib/ContextModule.js b/lib/ContextModule.js
@@ -61,7 +61,7 @@ const makeSerializable = require("./util/makeSerializable");
 
 /**
  * @typedef {Object} ContextModuleOptionsExtras
- * @property {string|string[]} resource
+ * @property {false|string|string[]} resource
  * @property {string=} resourceQuery
  * @property {string=} resourceFragment
  * @property {TODO} resolveOptions
@@ -170,8 +170,9 @@ class ContextModule extends Module {
 	_createIdentifier() {
 		let identifier =
 			this.context ||
-			(typeof this.options.resource === "string"
-				? this.options.resource
+			(typeof this.options.resource === "string" ||
+			this.options.resource === false
+				? `${this.options.resource}`
 				: this.options.resource.join("|"));
 		if (this.options.resourceQuery) {
 			identifier += `|${this.options.resourceQuery}`;
@@ -240,8 +241,11 @@ class ContextModule extends Module {
 		let identifier;
 		if (this.context) {
 			identifier = requestShortener.shorten(this.context) + "/";
-		} else if (typeof this.options.resource === "string") {
-			identifier = requestShortener.shorten(this.options.resource) + "/";
+		} else if (
+			typeof this.options.resource === "string" ||
+			this.options.resource === false
+		) {
+			identifier = requestShortener.shorten(`${this.options.resource}`) + "/";
 		} else {
 			identifier = this.options.resource
 				.map(r => requestShortener.shorten(r) + "/")
@@ -310,6 +314,8 @@ class ContextModule extends Module {
 				this.options.resource,
 				options.associatedObjectForCache
 			);
+		} else if (this.options.resource === false) {
+			identifier = "false";
 		} else {
 			const arr = [];
 			for (const res of this.options.resource) {
@@ -484,14 +490,16 @@ class ContextModule extends Module {
 				);
 				return;
 			}
+			if (!this.context || !this.options.resource) return callback();
+
 			compilation.fileSystemInfo.createSnapshot(
 				startTime,
 				null,
 				this.context
 					? [this.context]
 					: typeof this.options.resource === "string"
 					? [this.options.resource]
-					: this.options.resource,
+					: /** @type {string[]} */ (this.options.resource),
 				null,
 				SNAPSHOT_OPTIONS,
 				(err, snapshot) => {
@@ -519,6 +527,8 @@ class ContextModule extends Module {
 			contextDependencies.add(this.context);
 		} else if (typeof this.options.resource === "string") {
 			contextDependencies.add(this.options.resource);
+		} else if (this.options.resource === false) {
+			return;
 		} else {
 			for (const res of this.options.resource) contextDependencies.add(res);
 		}
diff --git a/lib/ContextModuleFactory.js b/lib/ContextModuleFactory.js
@@ -217,7 +217,12 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 								contextDependencies
 							});
 						}
-						const [contextResult, loaderResult] = result;
+						let [contextResult, loaderResult] = result;
+						if (contextResult.length > 1) {
+							const first = contextResult[0];
+							contextResult = contextResult.filter(r => r.path);
+							if (contextResult.length === 0) contextResult.push(first);
+						}
 						this.hooks.afterResolve.callAsync(
 							{
 								addon:
diff --git a/lib/cache/ResolverCachePlugin.js b/lib/cache/ResolverCachePlugin.js
@@ -129,8 +129,10 @@ class ResolverCachePlugin {
 				contextDependencies: new LazySet()
 			};
 			let yieldResult;
+			let withYield = false;
 			if (typeof newResolveContext.yield === "function") {
 				yieldResult = [];
+				withYield = true;
 				newResolveContext.yield = obj => yieldResult.push(obj);
 			}
 			const propagate = key => {
@@ -160,7 +162,10 @@ class ResolverCachePlugin {
 						snapshotOptions,
 						(err, snapshot) => {
 							if (err) return callback(err);
-							const resolveResult = result || yieldResult;
+							const resolveResult = withYield ? yieldResult : result;
+							// since we intercept resolve hook
+							// we still can get result in callback
+							if (withYield && result) yieldResult.push(result);
 							if (!snapshot) {
 								if (resolveResult) return callback(null, resolveResult);
 								return callback();
@@ -242,11 +247,15 @@ class ResolverCachePlugin {
 												yields = undefined;
 												callbacks = false;
 											} else {
-												for (let i = 0; i < callbacks.length; i++) {
-													const cb = callbacks[i];
-													const yield_ = yields[i];
-													if (result) for (const r of result) yield_(r);
-													cb(null, null);
+												if (err) {
+													for (const cb of callbacks) cb(err);
+												} else {
+													for (let i = 0; i < callbacks.length; i++) {
+														const cb = callbacks[i];
+														const yield_ = yields[i];
+														if (result) for (const r of result) yield_(r);
+														cb(null, null);
+													}
 												}
 												activeRequestsWithYield.delete(identifier);
 												yields = undefined;
diff --git a/test/configCases/resolve/empty-context-module/index.js b/test/configCases/resolve/empty-context-module/index.js
@@ -0,0 +1,7 @@
+const id = () => Math.random();
+
+it("should compile", () => {
+	expect(/* webpackMode: "lazy" */ import(`foo/${id()}`)).rejects.toBeTruthy();
+	expect(/* webpackMode: "lazy" */ import(`foo/${id()}`)).rejects.toBeTruthy();
+	expect(/* webpackMode: "lazy" */ import(`foo/${id()}`)).rejects.toBeTruthy();
+});
diff --git a/test/configCases/resolve/empty-context-module/webpack.config.js b/test/configCases/resolve/empty-context-module/webpack.config.js
@@ -0,0 +1,20 @@
+/** @type {import("../../../../").Configuration[]} */
+module.exports = [
+	{
+		cache: true,
+		resolve: {
+			alias: {
+				foo: false
+			},
+			unsafeCache: true
+		}
+	},
+	{
+		resolve: {
+			alias: {
+				foo: false
+			},
+			unsafeCache: true
+		}
+	}
+];

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,12 @@ module.exports = class ContextModuleFactory extends ModuleFactory {`
`217`	`217`	`contextDependencies`
`218`	`218`	`});`
`219`	`219`	`}`
`220`		`- const [contextResult, loaderResult] = result;`
	`220`	`+ let [contextResult, loaderResult] = result;`
	`221`	`+ if (contextResult.length > 1) {`
	`222`	`+ const first = contextResult[0];`
	`223`	`+ contextResult = contextResult.filter(r => r.path);`
	`224`	`+ if (contextResult.length === 0) contextResult.push(first);`
	`225`	`+ }`
`221`	`226`	`this.hooks.afterResolve.callAsync(`
`222`	`227`	`{`
`223`	`228`	`addon:`