webpack 5.89.0 → 5.90.1

package/lib/optimize/RemoveParentModulesPlugin.js

@@ -6,12 +6,58 @@
 "use strict";
 
 const { STAGE_BASIC } = require("../OptimizationStages");
-const Queue = require("../util/Queue");
-const { intersect } = require("../util/SetHelpers");
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGroup")} ChunkGroup */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../Module")} Module */
+
+/**
+ * Intersects multiple masks represented as bigints
+ * @param {bigint[]} masks The module masks to intersect
+ * @returns {bigint} The intersection of all masks
+ */
+function intersectMasks(masks) {
+	let result = masks[0];
+	for (let i = masks.length - 1; i >= 1; i--) {
+		result &= masks[i];
+	}
+	return result;
+}
+
+const ZERO_BIGINT = BigInt(0);
+const ONE_BIGINT = BigInt(1);
+const THIRTY_TWO_BIGINT = BigInt(32);
+
+/**
+ * Parses the module mask and returns the modules represented by it
+ * @param {bigint} mask the module mask
+ * @param {Module[]} ordinalModules the modules in the order they were added to the mask (LSB is index 0)
+ * @returns {Generator<Module>} the modules represented by the mask
+ */
+function* getModulesFromMask(mask, ordinalModules) {
+	let offset = 31;
+	while (mask !== ZERO_BIGINT) {
+		// Consider the last 32 bits, since that's what Math.clz32 can handle
+		let last32 = Number(BigInt.asUintN(32, mask));
+		while (last32 > 0) {
+			let last = Math.clz32(last32);
+			// The number of trailing zeros is the number trimmed off the input mask + 31 - the number of leading zeros
+			// The 32 is baked into the initial value of offset
+			const moduleIndex = offset - last;
+			// The number of trailing zeros is the index into the array generated by getOrCreateModuleMask
+			const module = ordinalModules[moduleIndex];
+			yield module;
+			// Remove the matched module from the mask
+			// Since we can only count leading zeros, not trailing, we can't just downshift the mask
+			last32 &= ~(1 << (31 - last));
+		}
+
+		// Remove the processed chunk from the mask
+		mask >>= THIRTY_TWO_BIGINT;
+		offset += 32;
+	}
+}
 
 class RemoveParentModulesPlugin {
 	/**
@@ -26,92 +72,122 @@ class RemoveParentModulesPlugin {
 			 */
 			const handler = (chunks, chunkGroups) => {
 				const chunkGraph = compilation.chunkGraph;
-				const queue = new Queue();
+				const queue = new Set();
 				const availableModulesMap = new WeakMap();
 
+				let nextModuleMask = ONE_BIGINT;
+				const maskByModule = new WeakMap();
+				const ordinalModules = [];
+
+				/**
+				 * Gets or creates a unique mask for a module
+				 * @param {Module} mod the module to get the mask for
+				 * @returns {bigint} the module mask to uniquely identify the module
+				 */
+				const getOrCreateModuleMask = mod => {
+					let id = maskByModule.get(mod);
+					if (id === undefined) {
+						id = nextModuleMask;
+						ordinalModules.push(mod);
+						maskByModule.set(mod, id);
+						nextModuleMask <<= ONE_BIGINT;
+					}
+					return id;
+				};
+
+				// Initialize masks by chunk and by chunk group for quicker comparisons
+				const chunkMasks = new WeakMap();
+				for (const chunk of chunks) {
+					let mask = ZERO_BIGINT;
+					for (const m of chunkGraph.getChunkModulesIterable(chunk)) {
+						const id = getOrCreateModuleMask(m);
+						mask |= id;
+					}
+					chunkMasks.set(chunk, mask);
+				}
+
+				const chunkGroupMasks = new WeakMap();
+				for (const chunkGroup of chunkGroups) {
+					let mask = ZERO_BIGINT;
+					for (const chunk of chunkGroup.chunks) {
+						const chunkMask = chunkMasks.get(chunk);
+						if (chunkMask !== undefined) {
+							mask |= chunkMask;
+						}
+					}
+					chunkGroupMasks.set(chunkGroup, mask);
+				}
+
 				for (const chunkGroup of compilation.entrypoints.values()) {
 					// initialize available modules for chunks without parents
-					availableModulesMap.set(chunkGroup, new Set());
+					availableModulesMap.set(chunkGroup, ZERO_BIGINT);
 					for (const child of chunkGroup.childrenIterable) {
-						queue.enqueue(child);
+						queue.add(child);
 					}
 				}
 				for (const chunkGroup of compilation.asyncEntrypoints) {
 					// initialize available modules for chunks without parents
-					availableModulesMap.set(chunkGroup, new Set());
+					availableModulesMap.set(chunkGroup, ZERO_BIGINT);
 					for (const child of chunkGroup.childrenIterable) {
-						queue.enqueue(child);
+						queue.add(child);
 					}
 				}
 
-				while (queue.length > 0) {
-					const chunkGroup = queue.dequeue();
-					let availableModules = availableModulesMap.get(chunkGroup);
+				for (const chunkGroup of queue) {
+					let availableModulesMask = availableModulesMap.get(chunkGroup);
 					let changed = false;
 					for (const parent of chunkGroup.parentsIterable) {
 						const availableModulesInParent = availableModulesMap.get(parent);
 						if (availableModulesInParent !== undefined) {
+							const parentMask =
+								availableModulesInParent | chunkGroupMasks.get(parent);
 							// If we know the available modules in parent: process these
-							if (availableModules === undefined) {
+							if (availableModulesMask === undefined) {
 								// if we have not own info yet: create new entry
-								availableModules = new Set(availableModulesInParent);
-								for (const chunk of parent.chunks) {
-									for (const m of chunkGraph.getChunkModulesIterable(chunk)) {
-										availableModules.add(m);
-									}
-								}
-								availableModulesMap.set(chunkGroup, availableModules);
+								availableModulesMask = parentMask;
 								changed = true;
 							} else {
-								for (const m of availableModules) {
-									if (
-										!chunkGraph.isModuleInChunkGroup(m, parent) &&
-										!availableModulesInParent.has(m)
-									) {
-										availableModules.delete(m);
-										changed = true;
-									}
+								let newMask = availableModulesMask & parentMask;
+								if (newMask !== availableModulesMask) {
+									changed = true;
+									availableModulesMask = newMask;
 								}
 							}
 						}
 					}
+
 					if (changed) {
+						availableModulesMap.set(chunkGroup, availableModulesMask);
 						// if something changed: enqueue our children
 						for (const child of chunkGroup.childrenIterable) {
-							queue.enqueue(child);
+							// Push the child to the end of the queue
+							queue.delete(child);
+							queue.add(child);
 						}
 					}
 				}
 
 				// now we have available modules for every chunk
 				for (const chunk of chunks) {
+					const chunkMask = chunkMasks.get(chunk);
+					if (chunkMask === undefined) continue; // No info about this chunk
+
 					const availableModulesSets = Array.from(
 						chunk.groupsIterable,
 						chunkGroup => availableModulesMap.get(chunkGroup)
 					);
 					if (availableModulesSets.some(s => s === undefined)) continue; // No info about this chunk group
-					const availableModules =
-						availableModulesSets.length === 1
-							? availableModulesSets[0]
-							: intersect(availableModulesSets);
-					const numberOfModules = chunkGraph.getNumberOfChunkModules(chunk);
-					const toRemove = new Set();
-					if (numberOfModules < availableModules.size) {
-						for (const m of chunkGraph.getChunkModulesIterable(chunk)) {
-							if (availableModules.has(m)) {
-								toRemove.add(m);
-							}
-						}
-					} else {
-						for (const m of availableModules) {
-							if (chunkGraph.isModuleInChunk(m, chunk)) {
-								toRemove.add(m);
-							}
+
+					const availableModulesMask = intersectMasks(availableModulesSets);
+					const toRemoveMask = chunkMask & availableModulesMask;
+					if (toRemoveMask !== ZERO_BIGINT) {
+						for (const module of getModulesFromMask(
+							toRemoveMask,
+							ordinalModules
+						)) {
+							chunkGraph.disconnectChunkAndModule(chunk, module);
 						}
 					}
-					for (const module of toRemove) {
-						chunkGraph.disconnectChunkAndModule(chunk, module);
-					}
 				}
 			};
 			compilation.hooks.optimizeChunks.tap(

package/lib/optimize/SideEffectsFlagPlugin.js

@@ -159,8 +159,8 @@ class SideEffectsFlagPlugin {
 												statement.test
 													? statement.test.range[1]
 													: statement.init
-													? statement.init.range[1]
-													: statement.range[0]
+														? statement.init.range[1]
+														: statement.range[0]
 											)
 										) {
 											sideEffectsStatement = statement;
@@ -243,7 +243,12 @@ class SideEffectsFlagPlugin {
 						);
 
 						logger.time("update dependencies");
-						for (const module of modules) {
+
+						const optimizedModules = new Set();
+
+						const optimizeIncomingConnections = module => {
+							if (optimizedModules.has(module)) return;
+							optimizedModules.add(module);
 							if (module.getSideEffectsConnectionState(moduleGraph) === false) {
 								const exportsInfo = moduleGraph.getExportsInfo(module);
 								for (const connection of moduleGraph.getIncomingConnections(
@@ -258,6 +263,9 @@ class SideEffectsFlagPlugin {
 										(dep instanceof HarmonyImportSpecifierDependency &&
 											!dep.namespaceObjectAsContext)
 									) {
+										if (connection.originModule !== null) {
+											optimizeIncomingConnections(connection.originModule);
+										}
 										// TODO improve for export *
 										if (isReexport && dep.name) {
 											const exportInfo = moduleGraph.getExportInfo(
@@ -314,6 +322,10 @@ class SideEffectsFlagPlugin {
 									}
 								}
 							}
+						};
+
+						for (const module of modules) {
+							optimizeIncomingConnections(module);
 						}
 						logger.timeEnd("update dependencies");
 					}

package/lib/optimize/SplitChunksPlugin.js

@@ -749,20 +749,20 @@ module.exports = class SplitChunksPlugin {
 				cacheGroupSource.minChunks !== undefined
 					? cacheGroupSource.minChunks
 					: cacheGroupSource.enforce
-					? 1
-					: this.options.minChunks,
+						? 1
+						: this.options.minChunks,
 			maxAsyncRequests:
 				cacheGroupSource.maxAsyncRequests !== undefined
 					? cacheGroupSource.maxAsyncRequests
 					: cacheGroupSource.enforce
-					? Infinity
-					: this.options.maxAsyncRequests,
+						? Infinity
+						: this.options.maxAsyncRequests,
 			maxInitialRequests:
 				cacheGroupSource.maxInitialRequests !== undefined
 					? cacheGroupSource.maxInitialRequests
 					: cacheGroupSource.enforce
-					? Infinity
-					: this.options.maxInitialRequests,
+						? Infinity
+						: this.options.maxInitialRequests,
 			getName:
 				cacheGroupSource.getName !== undefined
 					? cacheGroupSource.getName
@@ -1428,13 +1428,13 @@ module.exports = class SplitChunksPlugin {
 									chunk.isOnlyInitial()
 										? item.cacheGroup.maxInitialRequests
 										: chunk.canBeInitial()
-										? Math.min(
-												/** @type {number} */
-												(item.cacheGroup.maxInitialRequests),
-												/** @type {number} */
-												(item.cacheGroup.maxAsyncRequests)
-										  )
-										: item.cacheGroup.maxAsyncRequests
+											? Math.min(
+													/** @type {number} */
+													(item.cacheGroup.maxInitialRequests),
+													/** @type {number} */
+													(item.cacheGroup.maxAsyncRequests)
+												)
+											: item.cacheGroup.maxAsyncRequests
 								);
 								if (
 									isFinite(maxRequests) &&
@@ -1569,21 +1569,21 @@ module.exports = class SplitChunksPlugin {
 											oldMaxSizeSettings.minSize,
 											item.cacheGroup._minSizeForMaxSize,
 											Math.max
-									  )
+										)
 									: item.cacheGroup.minSize,
 								maxAsyncSize: oldMaxSizeSettings
 									? combineSizes(
 											oldMaxSizeSettings.maxAsyncSize,
 											item.cacheGroup.maxAsyncSize,
 											Math.min
-									  )
+										)
 									: item.cacheGroup.maxAsyncSize,
 								maxInitialSize: oldMaxSizeSettings
 									? combineSizes(
 											oldMaxSizeSettings.maxInitialSize,
 											item.cacheGroup.maxInitialSize,
 											Math.min
-									  )
+										)
 									: item.cacheGroup.maxInitialSize,
 								automaticNameDelimiter: item.cacheGroup.automaticNameDelimiter,
 								keys: oldMaxSizeSettings

package/lib/prefetch/ChunkPrefetchStartupRuntimeModule.js

@@ -42,10 +42,10 @@ class ChunkPrefetchStartupRuntimeModule extends RuntimeModule {
 									chunks,
 									c =>
 										`${RuntimeGlobals.prefetchChunk}(${JSON.stringify(c.id)});`
-							  )
+								)
 							: `${JSON.stringify(Array.from(chunks, c => c.id))}.map(${
 									RuntimeGlobals.prefetchChunk
-							  });`
+								});`
 					)}, 5);`
 			)
 		);

package/lib/rules/RuleSetCompiler.js

@@ -272,7 +272,7 @@ class RuleSetCompiler {
 						if (!Array.isArray(value)) {
 							throw this.error(
 								`${path}.or`,
-								condition.and,
+								condition.or,
 								"Expected array of conditions"
 							);
 						}

package/lib/runtime/AutoPublicPathRuntimeModule.js

@@ -63,7 +63,7 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 							"}"
 						]),
 						"}"
-				  ]),
+					]),
 			"// When supporting browsers where an automatic publicPath is not supported you must specify an output.publicPath manually via configuration",
 			'// or pass an empty string ("") and set the __webpack_public_path__ variable from your code to use your own logic.',
 			'if (!scriptUrl) throw new Error("Automatic publicPath is not supported in this browser");',
@@ -72,7 +72,7 @@ class AutoPublicPathRuntimeModule extends RuntimeModule {
 				? `${RuntimeGlobals.publicPath} = scriptUrl;`
 				: `${RuntimeGlobals.publicPath} = scriptUrl + ${JSON.stringify(
 						undoPath
-				  )};`
+					)};`
 		]);
 	}
 }

package/lib/runtime/GetChunkFilenameRuntimeModule.js

@@ -152,7 +152,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 								chunk: c,
 								contentHashType: contentType
 							})
-					  )
+						)
 					: JSON.stringify(chunkFilename);
 			const staticChunkFilename = compilation.getPath(chunkFilenameValue, {
 				hash: `" + ${RuntimeGlobals.getFullHash}() + "`,
@@ -219,7 +219,7 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 				return useId
 					? `(chunkId === ${JSON.stringify(lastKey)} ? ${JSON.stringify(
 							obj[/** @type {number | string} */ (lastKey)]
-					  )} : chunkId)`
+						)} : chunkId)`
 					: JSON.stringify(obj[/** @type {number | string} */ (lastKey)]);
 			}
 			return useId
@@ -285,13 +285,13 @@ class GetChunkFilenameRuntimeModule extends RuntimeModule {
 											: `{${Array.from(
 													ids,
 													id => `${JSON.stringify(id)}:1`
-											  ).join(",")}}[chunkId]`;
+												).join(",")}}[chunkId]`;
 									return `if (${condition}) return ${url};`;
 								})
 							),
 							"// return url for filenames based on template",
 							`return ${url};`
-					  ]
+						]
 					: ["// return url for filenames based on template", `return ${url};`]
 			)};`
 		]);

package/lib/runtime/GetTrustedTypesPolicyRuntimeModule.js

@@ -46,7 +46,7 @@ class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 											"script",
 											"script"
 										)}`
-								  ]
+									]
 								: []),
 							...(this.runtimeRequirements.has(RuntimeGlobals.createScriptUrl)
 								? [
@@ -54,7 +54,7 @@ class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 											"url",
 											"url"
 										)}`
-								  ]
+									]
 								: [])
 						].join(",\n")
 					),
@@ -80,11 +80,11 @@ class GetTrustedTypesPolicyRuntimeModule extends HelperRuntimeModule {
 													)}');`
 												]),
 												"}"
-										  ]
+											]
 										: [])
 								]),
 								"}"
-						  ]
+							]
 						: [])
 				]),
 				"}",

package/lib/runtime/LoadScriptRuntimeModule.js

@@ -90,7 +90,7 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 							'script.setAttribute("fetchpriority", fetchPriority);'
 						),
 						"}"
-				  ])
+					])
 				: "",
 			`script.src = ${
 				this._withCreateScriptUrl
@@ -106,7 +106,7 @@ class LoadScriptRuntimeModule extends HelperRuntimeModule {
 								`script.crossOrigin = ${JSON.stringify(crossOriginLoading)};`
 							),
 							"}"
-					  ])
+						])
 				: ""
 		]);
 

package/lib/runtime/StartupChunkDependenciesRuntimeModule.js

@@ -46,28 +46,29 @@ class StartupChunkDependenciesRuntimeModule extends RuntimeModule {
 							)
 							.concat("return next();")
 					: chunkIds.length === 1
-					? `return ${RuntimeGlobals.ensureChunk}(${JSON.stringify(
-							chunkIds[0]
-					  )}).then(next);`
-					: chunkIds.length > 2
-					? [
-							// using map is shorter for 3 or more chunks
-							`return Promise.all(${JSON.stringify(chunkIds)}.map(${
-								RuntimeGlobals.ensureChunk
-							}, ${RuntimeGlobals.require})).then(next);`
-					  ]
-					: [
-							// calling ensureChunk directly is shorter for 0 - 2 chunks
-							"return Promise.all([",
-							Template.indent(
-								chunkIds
-									.map(
-										id => `${RuntimeGlobals.ensureChunk}(${JSON.stringify(id)})`
-									)
-									.join(",\n")
-							),
-							"]).then(next);"
-					  ]
+						? `return ${RuntimeGlobals.ensureChunk}(${JSON.stringify(
+								chunkIds[0]
+							)}).then(next);`
+						: chunkIds.length > 2
+							? [
+									// using map is shorter for 3 or more chunks
+									`return Promise.all(${JSON.stringify(chunkIds)}.map(${
+										RuntimeGlobals.ensureChunk
+									}, ${RuntimeGlobals.require})).then(next);`
+								]
+							: [
+									// calling ensureChunk directly is shorter for 0 - 2 chunks
+									"return Promise.all([",
+									Template.indent(
+										chunkIds
+											.map(
+												id =>
+													`${RuntimeGlobals.ensureChunk}(${JSON.stringify(id)})`
+											)
+											.join(",\n")
+									),
+									"]).then(next);"
+								]
 			)};`
 		]);
 	}

package/lib/runtime/StartupEntrypointRuntimeModule.js

@@ -41,12 +41,12 @@ class StartupEntrypointRuntimeModule extends RuntimeModule {
 							"var r = fn();",
 							"return r === undefined ? result : r;"
 						])})`
-				  ]
+					]
 				: [
 						`chunkIds.map(${RuntimeGlobals.ensureChunk}, ${RuntimeGlobals.require})`,
 						"var r = fn();",
 						"return r === undefined ? result : r;"
-				  ])
+					])
 		])}`;
 	}
 }

package/lib/schemes/HttpUriPlugin.js

@@ -200,7 +200,7 @@ class Lockfile {
 					: {
 							resolved: key,
 							...entry
-					  }
+						}
 			);
 		}
 		return lockfile;

package/lib/serialization/FileMiddleware.js

@@ -60,23 +60,23 @@ const DECOMPRESSION_CHUNK_SIZE = 100 * 1024 * 1024;
 const writeUInt64LE = Buffer.prototype.writeBigUInt64LE
 	? (buf, value, offset) => {
 			buf.writeBigUInt64LE(BigInt(value), offset);
-	  }
+		}
 	: (buf, value, offset) => {
 			const low = value % 0x100000000;
 			const high = (value - low) / 0x100000000;
 			buf.writeUInt32LE(low, offset);
 			buf.writeUInt32LE(high, offset + 4);
-	  };
+		};
 
 const readUInt64LE = Buffer.prototype.readBigUInt64LE
 	? (buf, offset) => {
 			return Number(buf.readBigUInt64LE(offset));
-	  }
+		}
 	: (buf, offset) => {
 			const low = buf.readUInt32LE(offset);
 			const high = buf.readUInt32LE(offset + 4);
 			return high * 0x100000000 + low;
-	  };
+		};
 
 /**
  * @typedef {Object} SerializeResult

package/lib/serialization/ObjectMiddleware.js

@@ -718,10 +718,10 @@ class ObjectMiddleware extends SerializerMiddleware {
 						const name = !serializerEntry
 							? "unknown"
 							: !serializerEntry[1].request
-							? serializerEntry[0].name
-							: serializerEntry[1].name
-							? `${serializerEntry[1].request} ${serializerEntry[1].name}`
-							: serializerEntry[1].request;
+								? serializerEntry[0].name
+								: serializerEntry[1].name
+									? `${serializerEntry[1].request} ${serializerEntry[1].name}`
+									: serializerEntry[1].request;
 						err.message += `\n(during deserialization of ${name})`;
 						throw err;
 					}

package/lib/sharing/ConsumeSharedPlugin.js

@@ -60,7 +60,7 @@ class ConsumeSharedPlugin {
 				let result =
 					item === key || !isRequiredVersion(item)
 						? // item is a request/key
-						  {
+							{
 								import: key,
 								shareScope: options.shareScope || "default",
 								shareKey: key,
@@ -69,10 +69,10 @@ class ConsumeSharedPlugin {
 								strictVersion: false,
 								singleton: false,
 								eager: false
-						  }
+							}
 						: // key is a request/key
-						  // item is a version
-						  {
+							// item is a version
+							{
 								import: key,
 								shareScope: options.shareScope || "default",
 								shareKey: key,
@@ -81,7 +81,7 @@ class ConsumeSharedPlugin {
 								packageName: undefined,
 								singleton: false,
 								eager: false
-						  };
+							};
 				return result;
 			},
 			(item, key) => ({