fix: reuse async entrypoint for same Worker URL within a module (#20345)

xiaoxiaojx · web-flow · commit bf00b7301555 · 2026-01-26T16:10:12.000+03:00
diff --git a/.changeset/fix-worker-reuse-async-entry.md b/.changeset/fix-worker-reuse-async-entry.md
@@ -0,0 +1,5 @@
+---
+"webpack": patch
+---
+
+Reuse the same async entrypoint for the same Worker URL within a module to avoid circular dependency warnings when multiple Workers reference the same resource.
diff --git a/lib/AsyncDependenciesBlock.js b/lib/AsyncDependenciesBlock.js
@@ -16,7 +16,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("./util/Hash")} Hash */
 
-/** @typedef {(ChunkGroupOptions & { entryOptions?: EntryOptions }) | string} GroupOptions */
+/** @typedef {(ChunkGroupOptions & { entryOptions?: EntryOptions } & { key?: string | boolean }) | string} GroupOptions */
 
 class AsyncDependenciesBlock extends DependenciesBlock {
 	/**
@@ -56,6 +56,33 @@ class AsyncDependenciesBlock extends DependenciesBlock {
 		}
 	}
 
+	/**
+	 * @returns {boolean} Whether to deduplicate to avoid circular references
+	 */
+	get circular() {
+		if (this.groupOptions.key) {
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * @returns {string} the identifier of the block
+	 */
+	identifier() {
+		let identifier = `entry-${Boolean(this.groupOptions.entryOptions)}`;
+		if (this.groupOptions.name) {
+			identifier += `|${this.groupOptions.name}`;
+		}
+		if (this.request) {
+			identifier += `|${this.request}`;
+		}
+		if (typeof this.groupOptions.key === "string") {
+			identifier += `|${this.groupOptions.key}`;
+		}
+		return identifier;
+	}
+
 	/**
 	 * @param {Hash} hash the hash used to track dependencies
 	 * @param {UpdateHashContext} context context
diff --git a/lib/buildChunkGraph.js b/lib/buildChunkGraph.js
@@ -50,6 +50,8 @@ const { getEntryRuntime, mergeRuntime } = require("./util/runtime");
  * @property {number} postOrderIndex next post order index
  * @property {boolean} chunkLoading has a chunk loading mechanism
  * @property {boolean} asyncChunks create async chunks
+ * @property {string} blockId is the block key
+ * @property {boolean} circular Whether to deduplicate to avoid circular references
  */
 
 /**
@@ -361,6 +363,9 @@ const visitModules = (
 	/** @type {NamedChunkGroup} */
 	const namedAsyncEntrypoints = new Map();
 
+	/** @type {Map<string, ChunkGroupInfo>} */
+	const idAsyncEntrypoints = new Map();
+
 	/** @type {Set<ChunkGroupInfo>} */
 	const outdatedOrderIndexChunkGroups = new Set();
 
@@ -390,6 +395,8 @@ const visitModules = (
 		);
 		/** @type {ChunkGroupInfo} */
 		const chunkGroupInfo = {
+			blockId: "",
+			circular: false,
 			initialized: false,
 			chunkGroup,
 			runtime,
@@ -502,7 +509,9 @@ const visitModules = (
 		if (cgi === undefined) {
 			const chunkName = (b.groupOptions && b.groupOptions.name) || b.chunkName;
 			if (entryOptions) {
-				cgi = namedAsyncEntrypoints.get(/** @type {string} */ (chunkName));
+				cgi =
+					namedAsyncEntrypoints.get(/** @type {string} */ (chunkName)) ||
+					idAsyncEntrypoints.get(/** @type {string} */ (b.identifier()));
 				if (!cgi) {
 					entrypoint = compilation.addAsyncEntrypoint(
 						entryOptions,
@@ -513,6 +522,8 @@ const visitModules = (
 					maskByChunk.set(entrypoint.chunks[0], ZERO_BIGINT);
 					entrypoint.index = nextChunkGroupIndex++;
 					cgi = {
+						blockId: b.identifier(),
+						circular: b.circular,
 						chunkGroup: entrypoint,
 						initialized: false,
 						runtime:
@@ -550,6 +561,12 @@ const visitModules = (
 							(cgi)
 						);
 					}
+					if (b.circular) {
+						idAsyncEntrypoints.set(
+							b.identifier(),
+							/** @type {ChunkGroupInfo} */ (cgi)
+						);
+					}
 				} else {
 					entrypoint = /** @type {Entrypoint} */ (cgi.chunkGroup);
 					// TODO merge entryOptions
@@ -592,6 +609,8 @@ const visitModules = (
 					maskByChunk.set(c.chunks[0], ZERO_BIGINT);
 					c.index = nextChunkGroupIndex++;
 					cgi = {
+						blockId: b.identifier(),
+						circular: b.circular,
 						initialized: false,
 						chunkGroup: c,
 						runtime: chunkGroupInfo.runtime,
@@ -668,7 +687,10 @@ const visitModules = (
 					chunkGroupInfo: /** @type {ChunkGroupInfo} */ (cgi)
 				}
 			]);
-		} else if (entrypoint !== undefined) {
+		} else if (
+			entrypoint !== undefined &&
+			(chunkGroupInfo.circular || chunkGroupInfo.blockId !== b.identifier())
+		) {
 			chunkGroupInfo.chunkGroup.addAsyncEntrypoint(entrypoint);
 		}
 	};
diff --git a/lib/dependencies/WorkerPlugin.js b/lib/dependencies/WorkerPlugin.js
@@ -387,6 +387,7 @@ class WorkerPlugin {
 
 						const block = new AsyncDependenciesBlock({
 							name: entryOptions.name,
+							key: url,
 							entryOptions: {
 								chunkLoading: this._chunkLoading,
 								wasmLoading: this._wasmLoading,
diff --git a/test/configCases/worker/self-import/warnings.js b/test/configCases/worker/self-import/warnings.js
diff --git a/types.d.ts b/types.d.ts
@@ -461,16 +461,18 @@ declare class AsyncDependenciesBlock extends DependenciesBlock {
 			| string
 			| (RawChunkGroupOptions & { name?: null | string } & {
 					entryOptions?: EntryOptions;
-			  }),
+			  } & { key?: string | boolean }),
 		loc?: null | SyntheticDependencyLocation | RealDependencyLocation,
 		request?: null | string
 	);
 	groupOptions: RawChunkGroupOptions & { name?: null | string } & {
 		entryOptions?: EntryOptions;
-	};
+	} & { key?: string | boolean };
 	loc?: null | SyntheticDependencyLocation | RealDependencyLocation;
 	request?: null | string;
 	chunkName?: null | string;
+	get circular(): boolean;
+	identifier(): string;
 	module: any;
 }
 declare abstract class AsyncQueue<T, K, R> {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"webpack": patch
 +---
++
 +Reuse the same async entrypoint for the same Worker URL within a module to avoid circular dependency warnings when multiple Workers reference the same resource.