webpack 5.97.1 → 5.104.1

package/lib/dependencies/processExportInfo.js

@@ -7,14 +7,13 @@
 
 const { UsageState } = require("../ExportsInfo");
 
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
-/** @typedef {string[][]} ReferencedExports */
-
 /**
  * @param {RuntimeSpec} runtime the runtime
- * @param {ReferencedExports} referencedExports list of referenced exports, will be added to
+ * @param {RawReferencedExports} referencedExports list of referenced exports, will be added to
  * @param {string[]} prefix export prefix
  * @param {ExportInfo=} exportInfo the export info
  * @param {boolean} defaultPointsToSelf when true, using default will reference itself
@@ -56,7 +55,7 @@ const processExportInfo = (
 			referencedExports,
 			defaultPointsToSelf && exportInfo.name === "default"
 				? prefix
-				: prefix.concat(exportInfo.name),
+				: [...prefix, exportInfo.name],
 			exportInfo,
 			false,
 			alreadyVisited
@@ -64,4 +63,5 @@ const processExportInfo = (
 	}
 	alreadyVisited.delete(exportInfo);
 };
+
 module.exports = processExportInfo;

package/lib/esm/ExportWebpackRequireRuntimeModule.js

@@ -23,7 +23,7 @@ class ExportWebpackRequireRuntimeModule extends RuntimeModule {
 	 * @returns {string | null} runtime code
 	 */
 	generate() {
-		return `export default ${RuntimeGlobals.require};`;
+		return `export { ${RuntimeGlobals.require} };`;
 	}
 }
 

package/lib/esm/ModuleChunkFormatPlugin.js

@@ -6,22 +6,91 @@
 "use strict";
 
 const { ConcatSource } = require("webpack-sources");
-const { RuntimeGlobals } = require("..");
-const HotUpdateChunk = require("../HotUpdateChunk");
+const { HotUpdateChunk, RuntimeGlobals } = require("..");
+const { JAVASCRIPT_TYPE } = require("../ModuleSourceTypeConstants");
 const Template = require("../Template");
+const {
+	createChunkHashHandler,
+	getChunkInfo
+} = require("../javascript/ChunkFormatHelpers");
 const { getAllChunks } = require("../javascript/ChunkHelpers");
 const {
 	chunkHasJs,
-	getCompilationHooks,
-	getChunkFilenameTemplate
+	getChunkFilenameTemplate,
+	getCompilationHooks
 } = require("../javascript/JavascriptModulesPlugin");
-const { updateHashForEntryStartup } = require("../javascript/StartupHelpers");
 const { getUndoPath } = require("../util/identifier");
 
+/** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../Chunk")} Chunk */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Entrypoint")} Entrypoint */
 
+/**
+ * @param {Compilation} compilation the compilation instance
+ * @param {Chunk} chunk the chunk
+ * @param {Chunk} runtimeChunk the runtime chunk
+ * @returns {string} the relative path
+ */
+const getRelativePath = (compilation, chunk, runtimeChunk) => {
+	const currentOutputName = compilation
+		.getPath(
+			getChunkFilenameTemplate(runtimeChunk, compilation.outputOptions),
+			{
+				chunk: runtimeChunk,
+				contentHashType: "javascript"
+			}
+		)
+		.replace(/^\/+/g, "")
+		.split("/");
+	const baseOutputName = [...currentOutputName];
+	const chunkOutputName = compilation
+		.getPath(getChunkFilenameTemplate(chunk, compilation.outputOptions), {
+			chunk,
+			contentHashType: "javascript"
+		})
+		.replace(/^\/+/g, "")
+		.split("/");
+
+	// remove common parts except filename
+	while (
+		baseOutputName.length > 1 &&
+		chunkOutputName.length > 1 &&
+		baseOutputName[0] === chunkOutputName[0]
+	) {
+		baseOutputName.shift();
+		chunkOutputName.shift();
+	}
+	const last = chunkOutputName.join("/");
+	// create final path
+	return getUndoPath(baseOutputName.join("/"), last, true) + last;
+};
+
+/**
+ * @param {Compilation} compilation the compilation instance
+ * @param {Chunk} chunk the chunk to render the import for
+ * @param {string=} namedImport the named import to use for the import
+ * @param {Chunk=} runtimeChunk the runtime chunk
+ * @returns {string} the import source
+ */
+function renderChunkImport(compilation, chunk, namedImport, runtimeChunk) {
+	return `import ${namedImport ? `* as ${namedImport}` : `{ ${RuntimeGlobals.require} }`} from ${JSON.stringify(
+		getRelativePath(compilation, chunk, runtimeChunk || chunk)
+	)};\n`;
+}
+
+/**
+ * @param {number} index the index of the chunk
+ * @returns {string} the named import to use for the import
+ */
+function getChunkNamedImport(index) {
+	return `__webpack_chunk_${index}__`;
+}
+
+const PLUGIN_NAME = "ModuleChunkFormatPlugin";
+
 class ModuleChunkFormatPlugin {
 	/**
 	 * Apply the plugin
@@ -29,189 +98,173 @@ class ModuleChunkFormatPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"ModuleChunkFormatPlugin",
-			compilation => {
-				compilation.hooks.additionalChunkRuntimeRequirements.tap(
-					"ModuleChunkFormatPlugin",
-					(chunk, set) => {
-						if (chunk.hasRuntime()) return;
-						if (compilation.chunkGraph.getNumberOfEntryModules(chunk) > 0) {
-							set.add(RuntimeGlobals.require);
-							set.add(RuntimeGlobals.startupEntrypoint);
-							set.add(RuntimeGlobals.externalInstallChunk);
-						}
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			compilation.hooks.additionalChunkRuntimeRequirements.tap(
+				PLUGIN_NAME,
+				(chunk, set) => {
+					if (chunk.hasRuntime()) return;
+					if (compilation.chunkGraph.getNumberOfEntryModules(chunk) > 0) {
+						set.add(RuntimeGlobals.require);
+						set.add(RuntimeGlobals.externalInstallChunk);
 					}
-				);
-				const hooks = getCompilationHooks(compilation);
-				hooks.renderChunk.tap(
-					"ModuleChunkFormatPlugin",
-					(modules, renderContext) => {
-						const { chunk, chunkGraph, runtimeTemplate } = renderContext;
-						const hotUpdateChunk =
-							chunk instanceof HotUpdateChunk ? chunk : null;
-						const source = new ConcatSource();
-						if (hotUpdateChunk) {
-							throw new Error(
-								"HMR is not implemented for module chunk format yet"
-							);
-						} else {
-							source.add(
-								`export const __webpack_id__ = ${JSON.stringify(chunk.id)};\n`
-							);
-							source.add(
-								`export const __webpack_ids__ = ${JSON.stringify(chunk.ids)};\n`
-							);
-							source.add("export const __webpack_modules__ = ");
-							source.add(modules);
-							source.add(";\n");
-							const runtimeModules =
-								chunkGraph.getChunkRuntimeModulesInOrder(chunk);
-							if (runtimeModules.length > 0) {
-								source.add("export const __webpack_runtime__ =\n");
-								source.add(
-									Template.renderChunkRuntimeModules(
-										runtimeModules,
-										renderContext
-									)
-								);
-							}
-							const entries = Array.from(
-								chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
-							);
-							if (entries.length > 0) {
-								const runtimeChunk =
-									/** @type {Entrypoint[][]} */
-									(entries)[0][1].getRuntimeChunk();
-								const currentOutputName = compilation
-									.getPath(
-										getChunkFilenameTemplate(chunk, compilation.outputOptions),
-										{
-											chunk,
-											contentHashType: "javascript"
-										}
-									)
-									.replace(/^\/+/g, "")
-									.split("/");
-
-								/**
-								 * @param {Chunk} chunk the chunk
-								 * @returns {string} the relative path
-								 */
-								const getRelativePath = chunk => {
-									const baseOutputName = currentOutputName.slice();
-									const chunkOutputName = compilation
-										.getPath(
-											getChunkFilenameTemplate(
-												chunk,
-												compilation.outputOptions
-											),
-											{
-												chunk,
-												contentHashType: "javascript"
-											}
-										)
-										.replace(/^\/+/g, "")
-										.split("/");
+				}
+			);
+			const hooks = getCompilationHooks(compilation);
+			/**
+			 * @param {Iterable<Chunk>} chunks the chunks to render
+			 * @param {ChunkGraph} chunkGraph the chunk graph
+			 * @param {Chunk=} runtimeChunk the runtime chunk
+			 * @returns {Source | undefined} the source
+			 */
+			const withDependentChunks = (chunks, chunkGraph, runtimeChunk) => {
+				if (/** @type {Set<Chunk>} */ (chunks).size > 0) {
+					const source = new ConcatSource();
+					let index = 0;
 
-									// remove common parts except filename
-									while (
-										baseOutputName.length > 1 &&
-										chunkOutputName.length > 1 &&
-										baseOutputName[0] === chunkOutputName[0]
-									) {
-										baseOutputName.shift();
-										chunkOutputName.shift();
-									}
-									const last = chunkOutputName.join("/");
-									// create final path
-									return (
-										getUndoPath(baseOutputName.join("/"), last, true) + last
-									);
-								};
+					for (const chunk of chunks) {
+						index++;
 
-								const entrySource = new ConcatSource();
-								entrySource.add(source);
-								entrySource.add(";\n\n// load runtime\n");
-								entrySource.add(
-									`import ${RuntimeGlobals.require} from ${JSON.stringify(
-										getRelativePath(/** @type {Chunk} */ (runtimeChunk))
-									)};\n`
-								);
-
-								const startupSource = new ConcatSource();
-								startupSource.add(
-									`var __webpack_exec__ = ${runtimeTemplate.returningFunction(
-										`${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`,
-										"moduleId"
-									)}\n`
-								);
-
-								const loadedChunks = new Set();
-								let index = 0;
-								for (let i = 0; i < entries.length; i++) {
-									const [module, entrypoint] = entries[i];
-									const final = i + 1 === entries.length;
-									const moduleId = chunkGraph.getModuleId(module);
-									const chunks = getAllChunks(
-										/** @type {Entrypoint} */ (entrypoint),
-										/** @type {Chunk} */ (runtimeChunk),
-										undefined
-									);
-									for (const chunk of chunks) {
-										if (
-											loadedChunks.has(chunk) ||
-											!chunkHasJs(chunk, chunkGraph)
-										)
-											continue;
-										loadedChunks.add(chunk);
-										startupSource.add(
-											`import * as __webpack_chunk_${index}__ from ${JSON.stringify(
-												getRelativePath(chunk)
-											)};\n`
-										);
-										startupSource.add(
-											`${RuntimeGlobals.externalInstallChunk}(__webpack_chunk_${index}__);\n`
-										);
-										index++;
-									}
-									startupSource.add(
-										`${
-											final ? `var ${RuntimeGlobals.exports} = ` : ""
-										}__webpack_exec__(${JSON.stringify(moduleId)});\n`
-									);
-								}
-
-								entrySource.add(
-									hooks.renderStartup.call(
-										startupSource,
-										entries[entries.length - 1][0],
-										{
-											...renderContext,
-											inlined: false
-										}
-									)
-								);
-								return entrySource;
-							}
+						if (!chunkHasJs(chunk, chunkGraph)) {
+							continue;
 						}
+						const namedImport = getChunkNamedImport(index);
+						source.add(
+							renderChunkImport(
+								compilation,
+								chunk,
+								namedImport,
+								runtimeChunk || chunk
+							)
+						);
+						source.add(
+							`${RuntimeGlobals.externalInstallChunk}(${namedImport});\n`
+						);
+					}
+					return source;
+				}
+			};
+			hooks.renderStartup.tap(
+				PLUGIN_NAME,
+				(modules, _lastModule, renderContext) => {
+					const { chunk, chunkGraph } = renderContext;
+					if (
+						chunkGraph.getNumberOfEntryModules(chunk) > 0 &&
+						chunk.hasRuntime()
+					) {
+						const entryDependentChunks =
+							chunkGraph.getChunkEntryDependentChunksIterable(chunk);
+						const sourceWithDependentChunks = withDependentChunks(
+							entryDependentChunks,
+							chunkGraph,
+							chunk
+						);
+						if (!sourceWithDependentChunks) {
+							return modules;
+						}
+						if (modules.size() === 0) {
+							return sourceWithDependentChunks;
+						}
+						const source = new ConcatSource();
+						source.add(sourceWithDependentChunks);
+						source.add("\n");
+						source.add(modules);
 						return source;
 					}
+					return modules;
+				}
+			);
+			hooks.renderChunk.tap(PLUGIN_NAME, (modules, renderContext) => {
+				const { chunk, chunkGraph, runtimeTemplate } = renderContext;
+				const hotUpdateChunk = chunk instanceof HotUpdateChunk ? chunk : null;
+				const source = new ConcatSource();
+				source.add(
+					`export const ${RuntimeGlobals.esmId} = ${JSON.stringify(chunk.id)};\n`
+				);
+				source.add(
+					`export const ${RuntimeGlobals.esmIds} = ${JSON.stringify(chunk.ids)};\n`
 				);
-				hooks.chunkHash.tap(
-					"ModuleChunkFormatPlugin",
-					(chunk, hash, { chunkGraph, runtimeTemplate }) => {
-						if (chunk.hasRuntime()) return;
-						hash.update("ModuleChunkFormatPlugin");
-						hash.update("1");
-						const entries = Array.from(
-							chunkGraph.getChunkEntryModulesWithChunkGroupIterable(chunk)
+				source.add(`export const ${RuntimeGlobals.esmModules} = `);
+				source.add(modules);
+				source.add(";\n");
+				const runtimeModules = chunkGraph.getChunkRuntimeModulesInOrder(chunk);
+				if (runtimeModules.length > 0) {
+					source.add(`export const ${RuntimeGlobals.esmRuntime} =\n`);
+					source.add(
+						Template.renderChunkRuntimeModules(runtimeModules, renderContext)
+					);
+				}
+				if (hotUpdateChunk) {
+					return source;
+				}
+				const { entries, runtimeChunk } = getChunkInfo(chunk, chunkGraph);
+				if (runtimeChunk) {
+					const entrySource = new ConcatSource();
+					entrySource.add(source);
+					entrySource.add(";\n\n// load runtime\n");
+					entrySource.add(
+						renderChunkImport(compilation, runtimeChunk, "", chunk)
+					);
+					const startupSource = new ConcatSource();
+					startupSource.add(
+						`var __webpack_exec__ = ${runtimeTemplate.returningFunction(
+							`${RuntimeGlobals.require}(${RuntimeGlobals.entryModuleId} = moduleId)`,
+							"moduleId"
+						)}\n`
+					);
+
+					const loadedChunks = new Set();
+					for (let i = 0; i < entries.length; i++) {
+						const [module, entrypoint] = entries[i];
+						if (!chunkGraph.getModuleSourceTypes(module).has(JAVASCRIPT_TYPE)) {
+							continue;
+						}
+						const final = i + 1 === entries.length;
+						const moduleId = chunkGraph.getModuleId(module);
+						const chunks = getAllChunks(
+							/** @type {Entrypoint} */ (entrypoint),
+							/** @type {Chunk} */ (runtimeChunk),
+							undefined
+						);
+						const processChunks = new Set();
+						for (const _chunk of chunks) {
+							if (loadedChunks.has(_chunk)) {
+								continue;
+							}
+							loadedChunks.add(_chunk);
+							processChunks.add(_chunk);
+						}
+						const sourceWithDependentChunks = withDependentChunks(
+							processChunks,
+							chunkGraph,
+							chunk
+						);
+						if (sourceWithDependentChunks) {
+							startupSource.add("\n");
+							startupSource.add(sourceWithDependentChunks);
+						}
+						startupSource.add(
+							`${
+								final ? `var ${RuntimeGlobals.exports} = ` : ""
+							}__webpack_exec__(${JSON.stringify(moduleId)});\n`
 						);
-						updateHashForEntryStartup(hash, chunkGraph, entries, chunk);
 					}
-				);
-			}
-		);
+
+					entrySource.add(
+						hooks.renderStartup.call(
+							startupSource,
+							entries[entries.length - 1][0],
+							{
+								...renderContext,
+								inlined: false
+							}
+						)
+					);
+					return entrySource;
+				}
+				return source;
+			});
+			hooks.chunkHash.tap(PLUGIN_NAME, createChunkHashHandler(PLUGIN_NAME));
+		});
 	}
 }
 

package/lib/esm/ModuleChunkLoadingPlugin.js

@@ -11,6 +11,9 @@ const ModuleChunkLoadingRuntimeModule = require("./ModuleChunkLoadingRuntimeModu
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module").RuntimeRequirements} RuntimeRequirements */
+
+const PLUGIN_NAME = "ModuleChunkLoadingPlugin";
 
 class ModuleChunkLoadingPlugin {
 	/**
@@ -19,68 +22,120 @@ class ModuleChunkLoadingPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.thisCompilation.tap(
-			"ModuleChunkLoadingPlugin",
-			compilation => {
-				const globalChunkLoading = compilation.outputOptions.chunkLoading;
-				/**
-				 * @param {Chunk} chunk chunk to check
-				 * @returns {boolean} true, when the plugin is enabled for the chunk
-				 */
-				const isEnabledForChunk = chunk => {
-					const options = chunk.getEntryOptions();
-					const chunkLoading =
-						options && options.chunkLoading !== undefined
-							? options.chunkLoading
-							: globalChunkLoading;
-					return chunkLoading === "import";
-				};
-				const onceForChunkSet = new WeakSet();
-				/**
-				 * @param {Chunk} chunk chunk to check
-				 * @param {Set<string>} set runtime requirements
-				 */
-				const handler = (chunk, set) => {
-					if (onceForChunkSet.has(chunk)) return;
-					onceForChunkSet.add(chunk);
+		compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
+			const globalChunkLoading = compilation.outputOptions.chunkLoading;
+			/**
+			 * @param {Chunk} chunk chunk to check
+			 * @returns {boolean} true, when the plugin is enabled for the chunk
+			 */
+			const isEnabledForChunk = (chunk) => {
+				const options = chunk.getEntryOptions();
+				const chunkLoading =
+					options && options.chunkLoading !== undefined
+						? options.chunkLoading
+						: globalChunkLoading;
+				return chunkLoading === "import";
+			};
+			const onceForChunkSet = new WeakSet();
+			/**
+			 * @param {Chunk} chunk chunk to check
+			 * @param {RuntimeRequirements} set runtime requirements
+			 */
+			const handler = (chunk, set) => {
+				if (onceForChunkSet.has(chunk)) return;
+				onceForChunkSet.add(chunk);
+				if (!isEnabledForChunk(chunk)) return;
+				set.add(RuntimeGlobals.moduleFactoriesAddOnly);
+				set.add(RuntimeGlobals.hasOwnProperty);
+				compilation.addRuntimeModule(
+					chunk,
+					new ModuleChunkLoadingRuntimeModule(set)
+				);
+			};
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.ensureChunkHandlers)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.baseURI)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.externalInstallChunk)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.onChunksLoaded)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadManifest)
+				.tap(PLUGIN_NAME, handler);
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.externalInstallChunk)
+				.tap(PLUGIN_NAME, (chunk) => {
 					if (!isEnabledForChunk(chunk)) return;
-					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
-					set.add(RuntimeGlobals.hasOwnProperty);
 					compilation.addRuntimeModule(
 						chunk,
-						new ModuleChunkLoadingRuntimeModule(set)
+						new ExportWebpackRequireRuntimeModule()
 					);
-				};
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("ModuleChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.baseURI)
-					.tap("ModuleChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.externalInstallChunk)
-					.tap("ModuleChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.onChunksLoaded)
-					.tap("ModuleChunkLoadingPlugin", handler);
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.externalInstallChunk)
-					.tap("ModuleChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						compilation.addRuntimeModule(
-							chunk,
-							new ExportWebpackRequireRuntimeModule()
-						);
-					});
+				});
+
+			// We need public path only when we prefetch/preload chunk or public path is not `auto`
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.prefetchChunkHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+				});
+
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.preloadChunkHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+				});
+
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.ensureChunkHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+
+					if (compilation.outputOptions.publicPath !== "auto") {
+						set.add(RuntimeGlobals.publicPath);
+					}
+
+					set.add(RuntimeGlobals.getChunkScriptFilename);
+				});
+
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadUpdateHandlers)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+					set.add(RuntimeGlobals.loadScript);
+					set.add(RuntimeGlobals.getChunkUpdateScriptFilename);
+					set.add(RuntimeGlobals.moduleCache);
+					set.add(RuntimeGlobals.hmrModuleData);
+					set.add(RuntimeGlobals.moduleFactoriesAddOnly);
+				});
+
+			compilation.hooks.runtimeRequirementInTree
+				.for(RuntimeGlobals.hmrDownloadManifest)
+				.tap(PLUGIN_NAME, (chunk, set) => {
+					if (!isEnabledForChunk(chunk)) return;
+					set.add(RuntimeGlobals.publicPath);
+					set.add(RuntimeGlobals.getUpdateManifestFilename);
+				});
 
-				compilation.hooks.runtimeRequirementInTree
-					.for(RuntimeGlobals.ensureChunkHandlers)
-					.tap("ModuleChunkLoadingPlugin", (chunk, set) => {
-						if (!isEnabledForChunk(chunk)) return;
-						set.add(RuntimeGlobals.getChunkScriptFilename);
-					});
-			}
-		);
+			compilation.hooks.additionalTreeRuntimeRequirements.tap(
+				PLUGIN_NAME,
+				(chunk, set, { chunkGraph }) => {
+					if (chunkGraph.hasChunkEntryDependentChunks(chunk)) {
+						set.add(RuntimeGlobals.externalInstallChunk);
+					}
+				}
+			);
+		});
 	}
 }