refactor: import dependency generation for defer module with async dependencies (#19691)

hai-x · web-flow · commit e25189162aaf · 2025-07-14T14:01:55.000+03:00
diff --git a/lib/RuntimeTemplate.js b/lib/RuntimeTemplate.js
@@ -8,6 +8,9 @@
 const InitFragment = require("./InitFragment");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const Template = require("./Template");
+const {
+	getOutgoingAsyncModules
+} = require("./async-modules/AsyncModuleHelpers");
 const {
 	getMakeDeferredNamespaceModeFromExportsType,
 	getOptimizedDeferredModule
@@ -814,27 +817,12 @@ class RuntimeTemplate {
 			];
 		}
 
-		/** @type {Set<Module>} */
-		const innerAsyncDependencies = new Set();
 		defer = defer && (module.buildMeta ? !module.buildMeta.async : true);
 
-		if (this.compilation.options.experiments.deferImport && defer) {
-			const seen = new Set();
-			(function gatherInnerAsyncDependencies(mod) {
-				if (!moduleGraph.isAsync(mod) || seen.has(mod)) return;
-				seen.add(mod);
-				if (mod.buildMeta && mod.buildMeta.async) {
-					innerAsyncDependencies.add(mod);
-				} else {
-					for (const dep of mod.dependencies) {
-						const module = moduleGraph.getModule(dep);
-						if (module) {
-							gatherInnerAsyncDependencies(module);
-						}
-					}
-				}
-			})(module);
-		}
+		/** @type {Set<Module>} */
+		const outgoingAsyncModules = defer
+			? getOutgoingAsyncModules(moduleGraph, module)
+			: new Set();
 
 		if (chunkGraph.getModuleId(module) === null) {
 			if (weak) {
@@ -877,13 +865,14 @@ class RuntimeTemplate {
 				this,
 				exportsType,
 				moduleId,
-				Array.from(innerAsyncDependencies, mod => chunkGraph.getModuleId(mod))
+				Array.from(outgoingAsyncModules, mod => chunkGraph.getModuleId(mod))
 			)};\n`;
-		} else {
-			importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`;
+
+			return [importContent, ""];
 		}
+		importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`;
 
-		if (exportsType === "dynamic" && !defer) {
+		if (exportsType === "dynamic") {
 			runtimeRequirements.add(RuntimeGlobals.compatGetDefaultExport);
 			return [
 				importContent,
diff --git a/lib/async-modules/AsyncModuleHelpers.js b/lib/async-modules/AsyncModuleHelpers.js
@@ -0,0 +1,50 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Haijie Xie @hai-x
+*/
+
+"use strict";
+
+const HarmonyImportDependency = require("../dependencies/HarmonyImportDependency");
+
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../Module")} Module */
+
+/**
+ * @param {ModuleGraph} moduleGraph module graph
+ * @param {Module} module module
+ * @returns {Set<Module>} set of modules
+ */
+const getOutgoingAsyncModules = (moduleGraph, module) => {
+	/** @type {Set<Module>} */
+	const set = new Set();
+	/** @type {Set<Module>} */
+	const seen = new Set();
+	(function g(/** @type {Module} */ module) {
+		if (!moduleGraph.isAsync(module) || seen.has(module)) return;
+		seen.add(module);
+		if (module.buildMeta && module.buildMeta.async) {
+			set.add(module);
+		} else {
+			const outgoingConnectionMap =
+				moduleGraph.getOutgoingConnectionsByModule(module);
+			if (outgoingConnectionMap) {
+				for (const [module, connections] of outgoingConnectionMap) {
+					if (
+						connections.some(
+							c =>
+								c.dependency instanceof HarmonyImportDependency &&
+								c.isTargetActive(undefined)
+						) &&
+						module
+					) {
+						g(module);
+					}
+				}
+			}
+		}
+	})(module);
+	return set;
+};
+
+module.exports.getOutgoingAsyncModules = getOutgoingAsyncModules;
