webpack 5.109.0 → 5.109.1

package/lib/InitFragment.js

@@ -28,30 +28,6 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {(fragments: MaybeMergeableInitFragment<GenerateContext>[]) => MaybeMergeableInitFragment<GenerateContext>[]=} mergeAll
  */
 
-/**
- * Extract fragment index.
- * @template T
- * @param {T} fragment the init fragment
- * @param {number} index index
- * @returns {[T, number]} tuple with both
- */
-const extractFragmentIndex = (fragment, index) => [fragment, index];
-
-/**
- * Sorts fragment with index.
- * @template T
- * @param {[MaybeMergeableInitFragment<T>, number]} a first pair
- * @param {[MaybeMergeableInitFragment<T>, number]} b second pair
- * @returns {number} sort value
- */
-const sortFragmentWithIndex = ([a, i], [b, j]) => {
-	const stageCmp = a.stage - b.stage;
-	if (stageCmp !== 0) return stageCmp;
-	const positionCmp = a.position - b.position;
-	if (positionCmp !== 0) return positionCmp;
-	return i - j;
-};
-
 /**
  * Represents InitFragment.
  * @template GenerateContext
@@ -107,16 +83,28 @@ class InitFragment {
 	 */
 	static addToSource(source, initFragments, context) {
 		if (initFragments.length > 0) {
-			// Sort fragments by position. If 2 fragments have the same position,
-			// use their index.
-			const sortedFragments = initFragments
-				.map(extractFragmentIndex)
-				.sort(sortFragmentWithIndex);
+			// Sort fragment indices by (stage, position), falling back to the
+			// original index — one flat number array instead of N [fragment, index]
+			// tuples for a stable-by-index order.
+			const sortedIndices = initFragments.map((_, index) => index);
+			sortedIndices.sort((a, b) => {
+				const fragmentA = initFragments[a];
+				const fragmentB = initFragments[b];
+				const stageCmp = fragmentA.stage - fragmentB.stage;
+				if (stageCmp !== 0) return stageCmp;
+				const positionCmp = fragmentA.position - fragmentB.position;
+				if (positionCmp !== 0) return positionCmp;
+				return a - b;
+			});
 
 			// Deduplicate fragments. If a fragment has no key, it is always included.
-			/** @type {Map<InitFragmentKey | symbol, MaybeMergeableInitFragment<Context> | MaybeMergeableInitFragment<Context>[]>} */
+			// Keyless fragments get a unique numeric key; number keys never collide
+			// with the string `InitFragmentKey`s used for keyed fragments.
+			/** @type {Map<InitFragmentKey | number, MaybeMergeableInitFragment<Context> | MaybeMergeableInitFragment<Context>[]>} */
 			const keyedFragments = new Map();
-			for (const [fragment] of sortedFragments) {
+			let keylessKey = 0;
+			for (const index of sortedIndices) {
+				const fragment = initFragments[index];
 				if (typeof fragment.mergeAll === "function") {
 					if (!fragment.key) {
 						throw new Error(
@@ -142,7 +130,7 @@ class InitFragment {
 						continue;
 					}
 				}
-				keyedFragments.set(fragment.key || Symbol("fragment key"), fragment);
+				keyedFragments.set(fragment.key || keylessKey++, fragment);
 			}
 
 			const concatSource = new ConcatSource();

package/lib/NormalModule.js

@@ -651,6 +651,12 @@ class NormalModule extends Module {
 		 * @type {Source | null}
 		 */
 		this._source = null;
+		// Set at build time; declared here so the instance shape is fixed at construction
+		/**
+		 * @private
+		 * @type {PreparsedAst | null}
+		 */
+		this._ast = null;
 		/**
 		 * @private
 		 * @type {Map<undefined | SourceType, number> | undefined}

package/lib/RuntimePlugin.js

@@ -119,6 +119,33 @@ const TREE_DEPENDENCIES = {
 	[RuntimeGlobals.shareScopeMap]: [RuntimeGlobals.hasOwnProperty]
 };
 
+// Tree runtime requirements whose only effect is attaching a zero-arg runtime
+// module to the chunk. Conditional / argument-taking ones stay as explicit taps.
+/** @type {[string, (new () => import("./RuntimeModule"))][]} */
+const SIMPLE_TREE_RUNTIME_MODULES = [
+	[RuntimeGlobals.definePropertyGetters, DefinePropertyGettersRuntimeModule],
+	[RuntimeGlobals.makeNamespaceObject, MakeNamespaceObjectRuntimeModule],
+	[
+		RuntimeGlobals.createFakeNamespaceObject,
+		CreateFakeNamespaceObjectRuntimeModule
+	],
+	[RuntimeGlobals.hasOwnProperty, HasOwnPropertyRuntimeModule],
+	[RuntimeGlobals.compatGetDefaultExport, CompatGetDefaultExportRuntimeModule],
+	[RuntimeGlobals.commonJsWrap, CommonJsWrapRuntimeModule],
+	[
+		RuntimeGlobals.setAnonymousDefaultName,
+		SetAnonymousDefaultNameRuntimeModule
+	],
+	[RuntimeGlobals.runtimeId, RuntimeIdRuntimeModule],
+	[RuntimeGlobals.global, GlobalRuntimeModule],
+	[RuntimeGlobals.shareScopeMap, ShareRuntimeModule],
+	[RuntimeGlobals.relativeUrl, RelativeUrlRuntimeModule],
+	[RuntimeGlobals.worker, WorkerRuntimeModule],
+	[RuntimeGlobals.onChunksLoaded, OnChunksLoadedRuntimeModule],
+	[RuntimeGlobals.scriptNonce, NonceRuntimeModule],
+	[RuntimeGlobals.toBinary, ToBinaryRuntimeModule]
+];
+
 /**
  * @param {string} template path template
  * @returns {boolean} true when it references the compilation `[fullhash]`/`[hash]`
@@ -198,36 +225,20 @@ class RuntimePlugin {
 						for (const dep of deps) set.add(dep);
 					});
 			}
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.definePropertyGetters)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new DefinePropertyGettersRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.makeNamespaceObject)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new MakeNamespaceObjectRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.createFakeNamespaceObject)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new CreateFakeNamespaceObjectRuntimeModule()
-					);
-					return true;
-				});
+			for (const [
+				runtimeGlobal,
+				RuntimeModule
+			] of SIMPLE_TREE_RUNTIME_MODULES) {
+				compilation.hooks.runtimeRequirementInTree
+					.for(runtimeGlobal)
+					.tap(PLUGIN_NAME, (chunk) => {
+						compilation.addRuntimeModule(chunk, new RuntimeModule());
+						return true;
+					});
+			}
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.makeOptimizedDeferredNamespaceObject)
-				.tap("RuntimePlugin", (chunk, runtimeRequirement) => {
+				.tap(PLUGIN_NAME, (chunk, runtimeRequirement) => {
 					compilation.addRuntimeModule(
 						chunk,
 						new MakeOptimizedDeferredNamespaceObjectRuntimeModule(
@@ -238,7 +249,7 @@ class RuntimePlugin {
 				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.makeDeferredNamespaceObject)
-				.tap("RuntimePlugin", (chunk, runtimeRequirement) => {
+				.tap(PLUGIN_NAME, (chunk, runtimeRequirement) => {
 					compilation.addRuntimeModule(
 						chunk,
 						new MakeDeferredNamespaceObjectRuntimeModule(
@@ -247,45 +258,6 @@ class RuntimePlugin {
 					);
 					return true;
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.hasOwnProperty)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new HasOwnPropertyRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.compatGetDefaultExport)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new CompatGetDefaultExportRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.commonJsWrap)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new CommonJsWrapRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.setAnonymousDefaultName)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new SetAnonymousDefaultNameRuntimeModule()
-					);
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.runtimeId)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new RuntimeIdRuntimeModule());
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.publicPath)
 				.tap(PLUGIN_NAME, (chunk, set) => {
@@ -321,12 +293,6 @@ class RuntimePlugin {
 					}
 					return true;
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.global)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new GlobalRuntimeModule());
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.asyncModule)
 				.tap(PLUGIN_NAME, (chunk) => {
@@ -500,12 +466,6 @@ class RuntimePlugin {
 				.tap(PLUGIN_NAME, (chunk, set) => {
 					set.add(RuntimeGlobals.ensureChunkHandlers);
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.shareScopeMap)
-				.tap(PLUGIN_NAME, (chunk, set) => {
-					compilation.addRuntimeModule(chunk, new ShareRuntimeModule());
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.loadScript)
 				.tap(PLUGIN_NAME, (chunk, set) => {
@@ -552,27 +512,6 @@ class RuntimePlugin {
 					);
 					return true;
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.relativeUrl)
-				.tap(PLUGIN_NAME, (chunk, _set) => {
-					compilation.addRuntimeModule(chunk, new RelativeUrlRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.worker)
-				.tap(PLUGIN_NAME, (chunk, _set) => {
-					compilation.addRuntimeModule(chunk, new WorkerRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.onChunksLoaded)
-				.tap(PLUGIN_NAME, (chunk, _set) => {
-					compilation.addRuntimeModule(
-						chunk,
-						new OnChunksLoadedRuntimeModule()
-					);
-					return true;
-				});
 			compilation.hooks.runtimeRequirementInTree
 				.for(RuntimeGlobals.baseURI)
 				.tap(PLUGIN_NAME, (chunk) => {
@@ -581,18 +520,6 @@ class RuntimePlugin {
 						return true;
 					}
 				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.scriptNonce)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new NonceRuntimeModule());
-					return true;
-				});
-			compilation.hooks.runtimeRequirementInTree
-				.for(RuntimeGlobals.toBinary)
-				.tap(PLUGIN_NAME, (chunk) => {
-					compilation.addRuntimeModule(chunk, new ToBinaryRuntimeModule());
-					return true;
-				});
 			// TODO webpack 6: remove CompatRuntimeModule
 			compilation.hooks.additionalTreeRuntimeRequirements.tap(
 				PLUGIN_NAME,

package/lib/Template.js

@@ -46,6 +46,22 @@ const COMMENT_END_REGEX = /\*\//g;
 const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-z0-9_!§$()=\-^°]+/gi;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
+/**
+ * Decimal digit count of a non-negative integer, without allocating a string.
+ * @param {number} n non-negative integer
+ * @returns {number} number of decimal digits
+ */
+const numberLength = (n) => {
+	if (n < 10) return 1;
+	if (n < 100) return 2;
+	if (n < 1000) return 3;
+	if (n < 10000) return 4;
+	if (n < 100000) return 5;
+	if (n < 1000000) return 6;
+	if (n < 10000000) return 7;
+	return String(n).length;
+};
+
 /**
  * Defines the render manifest options type used by this module.
  * @typedef {object} RenderManifestOptions
@@ -296,11 +312,15 @@ class Template {
 		// start with -1 because the first module needs no comma
 		let objectOverhead = -1;
 		for (const module of modules) {
-			// module id + colon + comma
-			objectOverhead += `${module.id}`.length + 2;
+			// module id digits + colon + comma; ids are non-negative integers here
+			// (non-number ids already returned false above), so count digits
+			// arithmetically instead of allocating a string per module.
+			const id = /** @type {number} */ (module.id);
+			objectOverhead += numberLength(id) + 2;
 		}
 		// number of commas, or when starting non-zero the length of Array(minId).concat()
-		const arrayOverhead = minId === 0 ? maxId : 16 + `${minId}`.length + maxId;
+		const arrayOverhead =
+			minId === 0 ? maxId : 16 + numberLength(minId) + maxId;
 		return arrayOverhead < objectOverhead ? [minId, maxId] : false;
 	}
 

package/lib/container/HoistContainerReferencesPlugin.js

@@ -38,12 +38,13 @@ class HoistContainerReferences {
 			const depsToTrace = new Set();
 			/** @type {Set<Dependency>} */
 			const entryExternalsToHoist = new Set();
-			hooks.addContainerEntryDependency.tap(PLUGIN_NAME, (dep) => {
+			// Both hooks feed the same trace set, so they share one callback.
+			/** @type {(dep: Dependency) => void} */
+			const traceDep = (dep) => {
 				depsToTrace.add(dep);
-			});
-			hooks.addFederationRuntimeDependency.tap(PLUGIN_NAME, (dep) => {
-				depsToTrace.add(dep);
-			});
+			};
+			hooks.addContainerEntryDependency.tap(PLUGIN_NAME, traceDep);
+			hooks.addFederationRuntimeDependency.tap(PLUGIN_NAME, traceDep);
 
 			compilation.hooks.addEntry.tap(PLUGIN_NAME, (entryDep) => {
 				if (entryDep.type === "entry") {
@@ -76,46 +77,26 @@ class HoistContainerReferences {
 	 * @param {Set<Dependency>} entryExternalsToHoist Set of container entry dependencies to hoist.
 	 */
 	hoistModulesInChunks(compilation, depsToTrace, entryExternalsToHoist) {
-		const { chunkGraph, moduleGraph } = compilation;
+		const { moduleGraph } = compilation;
 
-		// loop over entry points
+		// Entry externals: hoist the external modules (e.g. RemoteModule) they reference.
 		for (const dep of entryExternalsToHoist) {
 			const entryModule = moduleGraph.getModule(dep);
 			if (!entryModule) continue;
-			// get all the external module types and hoist them to the runtime chunk, this will get RemoteModule externals
 			const allReferencedModules = getAllReferencedModules(
 				compilation,
 				entryModule,
 				"external",
 				false
 			);
-
-			const containerRuntimes = chunkGraph.getModuleRuntimes(entryModule);
-			/** @type {Set<string>} */
-			const runtimes = new Set();
-
-			for (const runtimeSpec of containerRuntimes) {
-				forEachRuntime(runtimeSpec, (runtimeKey) => {
-					if (runtimeKey) {
-						runtimes.add(runtimeKey);
-					}
-				});
-			}
-
-			for (const runtime of runtimes) {
-				const runtimeChunk = compilation.namedChunks.get(runtime);
-				if (!runtimeChunk) continue;
-
-				for (const module of allReferencedModules) {
-					if (!chunkGraph.isModuleInChunk(module, runtimeChunk)) {
-						chunkGraph.connectChunkAndModule(runtimeChunk, module);
-					}
-				}
-			}
-			this.cleanUpChunks(compilation, allReferencedModules);
+			this.hoistReferencedModules(
+				compilation,
+				entryModule,
+				allReferencedModules
+			);
 		}
 
-		// handle container entry specifically
+		// Container entries: hoist the initial graph plus its external references.
 		for (const dep of depsToTrace) {
 			const containerEntryModule = moduleGraph.getModule(dep);
 			if (!containerEntryModule) continue;
@@ -125,43 +106,54 @@ class HoistContainerReferences {
 				"initial",
 				false
 			);
-
 			const allRemoteReferences = getAllReferencedModules(
 				compilation,
 				containerEntryModule,
 				"external",
 				false
 			);
-
 			for (const remote of allRemoteReferences) {
 				allReferencedModules.add(remote);
 			}
+			this.hoistReferencedModules(
+				compilation,
+				containerEntryModule,
+				allReferencedModules
+			);
+		}
+	}
 
-			const containerRuntimes =
-				chunkGraph.getModuleRuntimes(containerEntryModule);
-			/** @type {Set<string>} */
-			const runtimes = new Set();
-
-			for (const runtimeSpec of containerRuntimes) {
-				forEachRuntime(runtimeSpec, (runtimeKey) => {
-					if (runtimeKey) {
-						runtimes.add(runtimeKey);
-					}
-				});
-			}
+	/**
+	 * Connect `referencedModules` into each runtime chunk of `entryModule`, then
+	 * prune the chunks they were hoisted out of. The two passes above build
+	 * `referencedModules` differently but hoist them identically.
+	 * @param {Compilation} compilation The webpack compilation instance.
+	 * @param {Module} entryModule The module whose runtimes receive the modules.
+	 * @param {Set<Module>} referencedModules The modules to hoist.
+	 */
+	hoistReferencedModules(compilation, entryModule, referencedModules) {
+		const { chunkGraph } = compilation;
+		/** @type {Set<string>} */
+		const runtimes = new Set();
+		for (const runtimeSpec of chunkGraph.getModuleRuntimes(entryModule)) {
+			forEachRuntime(runtimeSpec, (runtimeKey) => {
+				if (runtimeKey) {
+					runtimes.add(runtimeKey);
+				}
+			});
+		}
 
-			for (const runtime of runtimes) {
-				const runtimeChunk = compilation.namedChunks.get(runtime);
-				if (!runtimeChunk) continue;
+		for (const runtime of runtimes) {
+			const runtimeChunk = compilation.namedChunks.get(runtime);
+			if (!runtimeChunk) continue;
 
-				for (const module of allReferencedModules) {
-					if (!chunkGraph.isModuleInChunk(module, runtimeChunk)) {
-						chunkGraph.connectChunkAndModule(runtimeChunk, module);
-					}
+			for (const module of referencedModules) {
+				if (!chunkGraph.isModuleInChunk(module, runtimeChunk)) {
+					chunkGraph.connectChunkAndModule(runtimeChunk, module);
 				}
 			}
-			this.cleanUpChunks(compilation, allReferencedModules);
 		}
+		this.cleanUpChunks(compilation, referencedModules);
 	}
 
 	/**