webpack 5.36.0 → 5.37.1

package/lib/ConcatenationScope.js

@@ -7,7 +7,8 @@
 
 /** @typedef {import("./Module")} Module */
 
-const MODULE_REFERENCE_REGEXP = /^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(?:_asiSafe(\d))?__$/;
+const MODULE_REFERENCE_REGEXP =
+	/^__WEBPACK_MODULE_REFERENCE__(\d+)_([\da-f]+|ns)(_call)?(_directImport)?(?:_asiSafe(\d))?__$/;
 
 const DEFAULT_EXPORT = "__WEBPACK_DEFAULT_EXPORT__";
 const NAMESPACE_OBJECT_EXPORT = "__WEBPACK_NAMESPACE_OBJECT__";

package/lib/ContextModule.js

@@ -1016,9 +1016,9 @@ module.exports = webpackEmptyAsyncContext;`;
 			this.getSource(this.getSourceString(this.options.mode, context))
 		);
 		const set = new Set();
-		const allDeps = /** @type {ContextElementDependency[]} */ (this.dependencies.concat(
-			this.blocks.map(b => b.dependencies[0])
-		));
+		const allDeps = /** @type {ContextElementDependency[]} */ (
+			this.dependencies.concat(this.blocks.map(b => b.dependencies[0]))
+		);
 		set.add(RuntimeGlobals.module);
 		set.add(RuntimeGlobals.hasOwnProperty);
 		if (allDeps.length > 0) {

package/lib/ContextReplacementPlugin.js

@@ -104,9 +104,10 @@ class ContextReplacementPlugin {
 						result.regExp = newContentRegExp;
 					}
 					if (typeof newContentCreateContextMap === "function") {
-						result.resolveDependencies = createResolveDependenciesFromContextMap(
-							newContentCreateContextMap
-						);
+						result.resolveDependencies =
+							createResolveDependenciesFromContextMap(
+								newContentCreateContextMap
+							);
 					}
 					if (typeof newContentCallback === "function") {
 						const origResource = result.resource;

package/lib/DefinePlugin.js

@@ -89,9 +89,9 @@ class RuntimeValue {
 			module: parser.state.module,
 			key,
 			get version() {
-				return /** @type {string} */ (valueCacheVersions.get(
-					VALUE_DEP_PREFIX + key
-				));
+				return /** @type {string} */ (
+					valueCacheVersions.get(VALUE_DEP_PREFIX + key)
+				);
 			}
 		});
 	}
@@ -286,11 +286,13 @@ class DefinePlugin {
 				);
 				const { runtimeTemplate } = compilation;
 
-				const mainValue = /** @type {Set<string>} */ (provide(
-					compilation.valueCacheVersions,
-					VALUE_DEP_MAIN,
-					() => new Set()
-				));
+				const mainValue = /** @type {Set<string>} */ (
+					provide(
+						compilation.valueCacheVersions,
+						VALUE_DEP_MAIN,
+						() => new Set()
+					)
+				);
 
 				/**
 				 * Handler
@@ -313,10 +315,12 @@ class DefinePlugin {
 						);
 					};
 
-					const withValueDependency = (key, fn) => (...args) => {
-						addValueDependency(key);
-						return fn(...args);
-					};
+					const withValueDependency =
+						(key, fn) =>
+						(...args) => {
+							addValueDependency(key);
+							return fn(...args);
+						};
 
 					/**
 					 * Walk definitions

package/lib/EntryPlugin.js

@@ -17,7 +17,7 @@ class EntryPlugin {
 	 *
 	 * @param {string} context context path
 	 * @param {string} entry entry path
-	 * @param {EntryOptions | string} options entry options (passing a string is deprecated)
+	 * @param {EntryOptions | string=} options entry options (passing a string is deprecated)
 	 */
 	constructor(context, entry, options) {
 		this.context = context;

package/lib/EvalSourceMapDevToolPlugin.js

@@ -91,7 +91,9 @@ class EvalSourceMapDevToolPlugin {
 						} else if (m instanceof ConcatenatedModule) {
 							const concatModule = /** @type {ConcatenatedModule} */ (m);
 							if (concatModule.rootModule instanceof NormalModule) {
-								const module = /** @type {NormalModule} */ (concatModule.rootModule);
+								const module = /** @type {NormalModule} */ (
+									concatModule.rootModule
+								);
 								if (!matchModule(module.resource)) {
 									return result(source);
 								}

package/lib/FileSystemInfo.js

@@ -1160,12 +1160,8 @@ class FileSystemInfo {
 	 * @returns {void}
 	 */
 	resolveBuildDependencies(context, deps, callback) {
-		const {
-			resolveContext,
-			resolveEsm,
-			resolveCjs,
-			resolveCjsAsChild
-		} = this._createBuildDependenciesResolvers();
+		const { resolveContext, resolveEsm, resolveCjs, resolveCjsAsChild } =
+			this._createBuildDependenciesResolvers();
 
 		/** @type {Set<string>} */
 		const files = new Set();
@@ -1472,7 +1468,7 @@ class FileSystemInfo {
 							}
 						} else if (supportsEsm && /\.m?js$/.test(path)) {
 							if (!this._warnAboutExperimentalEsmTracking) {
-								this.logger.info(
+								this.logger.log(
 									"Node.js doesn't offer a (nice) way to introspect the ESM dependency graph yet.\n" +
 										"Until a full solution is available webpack uses an experimental ESM tracking based on parsing.\n" +
 										"As best effort webpack parses the ESM files to guess dependencies. But this can lead to expensive and incorrect tracking."
@@ -1547,9 +1543,8 @@ class FileSystemInfo {
 						break;
 					}
 					case RBDT_DIRECTORY_DEPENDENCIES: {
-						const match = /(^.+[\\/]node_modules[\\/](?:@[^\\/]+[\\/])?[^\\/]+)/.exec(
-							path
-						);
+						const match =
+							/(^.+[\\/]node_modules[\\/](?:@[^\\/]+[\\/])?[^\\/]+)/.exec(path);
 						const packagePath = match ? match[1] : path;
 						const packageJson = join(this.fs, packagePath, "package.json");
 						this.fs.readFile(packageJson, (err, content) => {
@@ -1637,12 +1632,8 @@ class FileSystemInfo {
 	 * @returns {void}
 	 */
 	checkResolveResultsValid(resolveResults, callback) {
-		const {
-			resolveCjs,
-			resolveCjsAsChild,
-			resolveEsm,
-			resolveContext
-		} = this._createBuildDependenciesResolvers();
+		const { resolveCjs, resolveCjsAsChild, resolveEsm, resolveContext } =
+			this._createBuildDependenciesResolvers();
 		asyncLib.eachLimit(
 			resolveResults,
 			20,
@@ -1844,11 +1835,12 @@ class FileSystemInfo {
 						unsharedManagedFiles
 					);
 				}
-				const unsharedManagedContexts = this._managedContextsOptimization.optimize(
-					managedContexts,
-					undefined,
-					children
-				);
+				const unsharedManagedContexts =
+					this._managedContextsOptimization.optimize(
+						managedContexts,
+						undefined,
+						children
+					);
 				if (managedContexts.size !== 0) {
 					snapshot.setManagedContexts(managedContexts);
 					this._managedContextsOptimization.storeUnsharedSnapshot(
@@ -1856,11 +1848,12 @@ class FileSystemInfo {
 						unsharedManagedContexts
 					);
 				}
-				const unsharedManagedMissing = this._managedMissingOptimization.optimize(
-					managedMissing,
-					undefined,
-					children
-				);
+				const unsharedManagedMissing =
+					this._managedMissingOptimization.optimize(
+						managedMissing,
+						undefined,
+						children
+					);
 				if (managedMissing.size !== 0) {
 					snapshot.setManagedMissing(managedMissing);
 					this._managedMissingOptimization.storeUnsharedSnapshot(
@@ -2064,11 +2057,12 @@ class FileSystemInfo {
 					}
 					break;
 				case 1:
-					unsharedContextTimestamps = this._contextTimestampsOptimization.optimize(
-						capturedDirectories,
-						startTime,
-						children
-					);
+					unsharedContextTimestamps =
+						this._contextTimestampsOptimization.optimize(
+							capturedDirectories,
+							startTime,
+							children
+						);
 					for (const path of capturedDirectories) {
 						const cache = this._contextTimestamps.get(path);
 						if (cache !== undefined) {

package/lib/FlagDependencyExportsPlugin.js

@@ -225,7 +225,8 @@ class FlagDependencyExportsPlugin {
 												}
 
 												if (exports) {
-													const nestedExportsInfo = exportInfo.createNestedExportsInfo();
+													const nestedExportsInfo =
+														exportInfo.createNestedExportsInfo();
 													mergeExports(nestedExportsInfo, exports);
 												}
 
@@ -247,12 +248,12 @@ class FlagDependencyExportsPlugin {
 												const target = exportInfo.getTarget(moduleGraph);
 												let targetExportsInfo = undefined;
 												if (target) {
-													const targetModuleExportsInfo = moduleGraph.getExportsInfo(
-														target.module
-													);
-													targetExportsInfo = targetModuleExportsInfo.getNestedExportsInfo(
-														target.export
-													);
+													const targetModuleExportsInfo =
+														moduleGraph.getExportsInfo(target.module);
+													targetExportsInfo =
+														targetModuleExportsInfo.getNestedExportsInfo(
+															target.export
+														);
 													// add dependency for this module
 													const set = dependencies.get(target.module);
 													if (set === undefined) {

package/lib/FlagDependencyUsagePlugin.js

@@ -201,10 +201,8 @@ class FlagDependencyUsagePlugin {
 								if (oldReferencedExports === EXPORTS_OBJECT_REFERENCED) {
 									continue;
 								}
-								const referencedExports = compilation.getDependencyReferencedExports(
-									dep,
-									runtime
-								);
+								const referencedExports =
+									compilation.getDependencyReferencedExports(dep, runtime);
 								if (
 									oldReferencedExports === undefined ||
 									oldReferencedExports === NO_EXPORTS_REFERENCED ||

package/lib/HotModuleReplacementPlugin.js

@@ -87,10 +87,8 @@ class HotModuleReplacementPlugin {
 		const runtimeRequirements = [RuntimeGlobals.module];
 
 		const createAcceptHandler = (parser, ParamDependency) => {
-			const {
-				hotAcceptCallback,
-				hotAcceptWithoutCallback
-			} = HotModuleReplacementPlugin.getParserHooks(parser);
+			const { hotAcceptCallback, hotAcceptWithoutCallback } =
+				HotModuleReplacementPlugin.getParserHooks(parser);
 
 			return expr => {
 				const module = parser.state.module;
@@ -306,9 +304,7 @@ class HotModuleReplacementPlugin {
 						}
 						records.chunkModuleIds = {};
 						for (const chunk of compilation.chunks) {
-							records.chunkModuleIds[
-								chunk.id
-							] = Array.from(
+							records.chunkModuleIds[chunk.id] = Array.from(
 								chunkGraph.getOrderedChunkModulesIterable(
 									chunk,
 									compareModulesById(chunkGraph)
@@ -341,9 +337,8 @@ class HotModuleReplacementPlugin {
 								return chunkGraph.getModuleHash(module, chunk.runtime);
 							}
 						};
-						const fullHashModulesInThisChunk = chunkGraph.getChunkFullHashModulesSet(
-							chunk
-						);
+						const fullHashModulesInThisChunk =
+							chunkGraph.getChunkFullHashModulesSet(chunk);
 						if (fullHashModulesInThisChunk !== undefined) {
 							for (const module of fullHashModulesInThisChunk) {
 								fullHashModules.add(module, chunk);
@@ -451,16 +446,14 @@ class HotModuleReplacementPlugin {
 							allOldRuntime = mergeRuntimeOwned(allOldRuntime, runtime);
 						}
 						forEachRuntime(allOldRuntime, runtime => {
-							const {
-								path: filename,
-								info: assetInfo
-							} = compilation.getPathWithInfo(
-								compilation.outputOptions.hotUpdateMainFilename,
-								{
-									hash: records.hash,
-									runtime
-								}
-							);
+							const { path: filename, info: assetInfo } =
+								compilation.getPathWithInfo(
+									compilation.outputOptions.hotUpdateMainFilename,
+									{
+										hash: records.hash,
+										runtime
+									}
+								);
 							hotUpdateMainContentByRuntime.set(runtime, {
 								updatedChunkIds: new Set(),
 								removedChunkIds: new Set(),
@@ -516,9 +509,8 @@ class HotModuleReplacementPlugin {
 								newRuntimeModules = Array.from(
 									chunkGraph.getChunkRuntimeModulesIterable(currentChunk)
 								).filter(module => updatedModules.has(module, currentChunk));
-								const fullHashModules = chunkGraph.getChunkFullHashModulesIterable(
-									currentChunk
-								);
+								const fullHashModules =
+									chunkGraph.getChunkFullHashModulesIterable(currentChunk);
 								newFullHashModules =
 									fullHashModules &&
 									Array.from(fullHashModules).filter(module =>
@@ -631,13 +623,11 @@ class HotModuleReplacementPlugin {
 										filename = entry.filename;
 										assetInfo = entry.info;
 									} else {
-										({
-											path: filename,
-											info: assetInfo
-										} = compilation.getPathWithInfo(
-											entry.filenameTemplate,
-											entry.pathOptions
-										));
+										({ path: filename, info: assetInfo } =
+											compilation.getPathWithInfo(
+												entry.filenameTemplate,
+												entry.pathOptions
+											));
 									}
 									const source = entry.render();
 									compilation.additionalChunkAssets.push(filename);

package/lib/InitFragment.js

@@ -73,13 +73,25 @@ class InitFragment {
 			// Deduplicate fragments. If a fragment has no key, it is always included.
 			const keyedFragments = new Map();
 			for (const [fragment] of sortedFragments) {
-				if (typeof fragment.merge === "function") {
+				if (typeof fragment.mergeAll === "function") {
+					if (!fragment.key) {
+						throw new Error(
+							`InitFragment with mergeAll function must have a valid key: ${fragment.constructor.name}`
+						);
+					}
+					const oldValue = keyedFragments.get(fragment.key);
+					if (oldValue === undefined) {
+						keyedFragments.set(fragment.key, fragment);
+					} else if (Array.isArray(oldValue)) {
+						oldValue.push(fragment);
+					} else {
+						keyedFragments.set(fragment.key, [oldValue, fragment]);
+					}
+					continue;
+				} else if (typeof fragment.merge === "function") {
 					const oldValue = keyedFragments.get(fragment.key);
 					if (oldValue !== undefined) {
-						keyedFragments.set(
-							fragment.key || Symbol(),
-							fragment.merge(oldValue)
-						);
+						keyedFragments.set(fragment.key, fragment.merge(oldValue));
 						continue;
 					}
 				}
@@ -88,7 +100,10 @@ class InitFragment {
 
 			const concatSource = new ConcatSource();
 			const endContents = [];
-			for (const fragment of keyedFragments.values()) {
+			for (let fragment of keyedFragments.values()) {
+				if (Array.isArray(fragment)) {
+					fragment = fragment[0].mergeAll(fragment);
+				}
 				concatSource.add(fragment.getContent(generateContext));
 				const endContent = fragment.getEndContent(generateContext);
 				if (endContent) {

package/lib/JavascriptMetaInfoPlugin.js

@@ -34,7 +34,8 @@ class JavascriptMetaInfoPlugin {
 						let topLevelDeclarations =
 							parser.state.module.buildInfo.topLevelDeclarations;
 						if (topLevelDeclarations === undefined) {
-							topLevelDeclarations = parser.state.module.buildInfo.topLevelDeclarations = new Set();
+							topLevelDeclarations =
+								parser.state.module.buildInfo.topLevelDeclarations = new Set();
 						}
 						for (const name of parser.scope.definitions.asSet()) {
 							const freeInfo = parser.getFreeInfoFromVariable(name);

package/lib/MainTemplate.js

@@ -239,9 +239,8 @@ class MainTemplate {
 				"chunkIdExpression"
 			]),
 			get jsonpScript() {
-				const hooks = getLoadScriptRuntimeModule().getCompilationHooks(
-					compilation
-				);
+				const hooks =
+					getLoadScriptRuntimeModule().getCompilationHooks(compilation);
 				return hooks.createScript;
 			},
 			get linkPrefetch() {

package/lib/ModuleFilenameHelpers.js

@@ -12,14 +12,16 @@ const ModuleFilenameHelpers = exports;
 
 // TODO webpack 6: consider removing these
 ModuleFilenameHelpers.ALL_LOADERS_RESOURCE = "[all-loaders][resource]";
-ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE = /\[all-?loaders\]\[resource\]/gi;
+ModuleFilenameHelpers.REGEXP_ALL_LOADERS_RESOURCE =
+	/\[all-?loaders\]\[resource\]/gi;
 ModuleFilenameHelpers.LOADERS_RESOURCE = "[loaders][resource]";
 ModuleFilenameHelpers.REGEXP_LOADERS_RESOURCE = /\[loaders\]\[resource\]/gi;
 ModuleFilenameHelpers.RESOURCE = "[resource]";
 ModuleFilenameHelpers.REGEXP_RESOURCE = /\[resource\]/gi;
 ModuleFilenameHelpers.ABSOLUTE_RESOURCE_PATH = "[absolute-resource-path]";
 // cSpell:words olute
-ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH = /\[abs(olute)?-?resource-?path\]/gi;
+ModuleFilenameHelpers.REGEXP_ABSOLUTE_RESOURCE_PATH =
+	/\[abs(olute)?-?resource-?path\]/gi;
 ModuleFilenameHelpers.RESOURCE_PATH = "[resource-path]";
 ModuleFilenameHelpers.REGEXP_RESOURCE_PATH = /\[resource-?path\]/gi;
 ModuleFilenameHelpers.ALL_LOADERS = "[all-loaders]";

package/lib/ModuleGraph.js

@@ -25,7 +25,7 @@ const WeakTupleMap = require("./util/WeakTupleMap");
  * @returns {string}
  */
 
-const EMPTY_ARRAY = [];
+const EMPTY_SET = new Set();
 
 /**
  * @param {SortableSet<ModuleGraphConnection>} set input
@@ -396,7 +396,7 @@ class ModuleGraph {
 	 */
 	getOutgoingConnections(module) {
 		const connections = this._getModuleGraphModule(module).outgoingConnections;
-		return connections === undefined ? EMPTY_ARRAY : connections;
+		return connections === undefined ? EMPTY_SET : connections;
 	}
 
 	/**

package/lib/ModuleGraphConnection.js

@@ -183,5 +183,9 @@ class ModuleGraphConnection {
 
 module.exports = ModuleGraphConnection;
 module.exports.addConnectionStates = addConnectionStates;
-module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (TRANSITIVE_ONLY);
-module.exports.CIRCULAR_CONNECTION = /** @type {typeof CIRCULAR_CONNECTION} */ (CIRCULAR_CONNECTION);
+module.exports.TRANSITIVE_ONLY = /** @type {typeof TRANSITIVE_ONLY} */ (
+	TRANSITIVE_ONLY
+);
+module.exports.CIRCULAR_CONNECTION = /** @type {typeof CIRCULAR_CONNECTION} */ (
+	CIRCULAR_CONNECTION
+);

package/lib/ModuleInfoHeaderPlugin.js

@@ -222,9 +222,8 @@ class ModuleInfoHeaderPlugin {
 								)}`
 							) + "\n"
 						);
-						const optimizationBailout = moduleGraph.getOptimizationBailout(
-							module
-						);
+						const optimizationBailout =
+							moduleGraph.getOptimizationBailout(module);
 						if (optimizationBailout) {
 							for (const text of optimizationBailout) {
 								let code;

package/lib/MultiCompiler.js

@@ -318,16 +318,17 @@ module.exports = class MultiCompiler {
 	 * @returns {SetupResult[]} result of setup
 	 */
 	_runGraph(setup, run, callback) {
-		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
+		/** @typedef {{ compiler: Compiler, result: Stats, state: "pending" | "blocked" | "queued" | "starting" | "running" | "running-outdated" | "done", children: Node[], parents: Node[] }} Node */
 
 		// State transitions for nodes:
 		// -> blocked (initial)
-		// blocked -> queued [add to queue] (when all parents done)
-		// queued -> running [running++] (when processing the queue)
+		// blocked -> starting [running++] (when all parents done)
+		// queued -> starting [running++] (when processing the queue)
+		// starting -> running (when run has been called)
 		// running -> done [running--] (when compilation is done)
 		// done -> pending (when invalidated from file change)
-		// pending -> blocked (when invalidated from aggregated changes)
-		// done -> blocked (when invalidated, from parent invalidation)
+		// pending -> blocked [add to queue] (when invalidated from aggregated changes)
+		// done -> blocked [add to queue] (when invalidated, from parent invalidation)
 		// running -> running-outdated (when invalidated, either from change or parent invalidation)
 		// running-outdated -> blocked [running--] (when compilation is done)
 
@@ -351,6 +352,7 @@ module.exports = class MultiCompiler {
 				parent.children.push(node);
 			}
 		}
+		/** @type {ArrayQueue<Node>} */
 		const queue = new ArrayQueue();
 		for (const node of nodes) {
 			if (node.parents.length === 0) {
@@ -388,13 +390,13 @@ module.exports = class MultiCompiler {
 			if (node.state === "running") {
 				node.state = "done";
 				for (const child of node.children) {
-					checkUnblocked(child);
+					if (child.state === "blocked") queue.enqueue(child);
 				}
 			} else if (node.state === "running-outdated") {
 				node.state = "blocked";
-				checkUnblocked(node);
+				queue.enqueue(node);
 			}
-			process.nextTick(processQueue);
+			processQueue();
 		};
 		/**
 		 * @param {Node} node node
@@ -433,20 +435,9 @@ module.exports = class MultiCompiler {
 			if (node.state === "pending") {
 				node.state = "blocked";
 			}
-			checkUnblocked(node);
-			processQueue();
-		};
-		/**
-		 * @param {Node} node node
-		 * @returns {void}
-		 */
-		const checkUnblocked = node => {
-			if (
-				node.state === "blocked" &&
-				node.parents.every(p => p.state === "done")
-			) {
-				node.state = "queued";
+			if (node.state === "blocked") {
 				queue.enqueue(node);
+				processQueue();
 			}
 		};
 
@@ -457,20 +448,33 @@ module.exports = class MultiCompiler {
 					node.compiler,
 					i,
 					nodeDone.bind(null, node),
-					() => node.state !== "done" && node.state !== "running",
+					() => node.state !== "starting" && node.state !== "running",
 					() => nodeChange(node),
 					() => nodeInvalid(node)
 				)
 			);
 		});
+		let processing = true;
 		const processQueue = () => {
+			if (processing) return;
+			processing = true;
+			process.nextTick(processQueueWorker);
+		};
+		const processQueueWorker = () => {
 			while (running < parallelism && queue.length > 0 && !errored) {
 				const node = queue.dequeue();
-				if (node.state !== "queued") continue;
-				running++;
-				node.state = "running";
-				run(node.compiler, nodeDone.bind(null, node));
+				if (
+					node.state === "queued" ||
+					(node.state === "blocked" &&
+						node.parents.every(p => p.state === "done"))
+				) {
+					running++;
+					node.state = "starting";
+					run(node.compiler, nodeDone.bind(null, node));
+					node.state = "running";
+				}
 			}
+			processing = false;
 			if (
 				!errored &&
 				running === 0 &&
@@ -489,7 +493,7 @@ module.exports = class MultiCompiler {
 				}
 			}
 		};
-		processQueue();
+		processQueueWorker();
 		return setupResults;
 	}