webpack 5.37.0 → 5.39.0

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();
@@ -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/HarmonyLinkingError.js

@@ -12,7 +12,5 @@ module.exports = class HarmonyLinkingError extends WebpackError {
 		super(message);
 		this.name = "HarmonyLinkingError";
 		this.hideStack = true;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };

package/lib/HookWebpackError.js

@@ -32,7 +32,6 @@ class HookWebpackError extends WebpackError {
 		this.hideStack = true;
 		this.details = `caused by plugins in ${hook}\n${error.stack}`;
 
-		Error.captureStackTrace(this, this.constructor);
 		this.stack += `\n-- inner error --\n${error.stack}`;
 	}
 }

package/lib/HotModuleReplacementPlugin.js

@@ -31,7 +31,8 @@ const {
 	keyToRuntime,
 	forEachRuntime,
 	mergeRuntimeOwned,
-	subtractRuntime
+	subtractRuntime,
+	intersectRuntime
 } = require("./util/runtime");
 
 /** @typedef {import("./Chunk")} Chunk */
@@ -87,10 +88,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 +305,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 +338,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 +447,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(),
@@ -509,16 +503,19 @@ class HotModuleReplacementPlugin {
 							);
 							if (currentChunk) {
 								chunkId = currentChunk.id;
-								newRuntime = currentChunk.runtime;
+								newRuntime = intersectRuntime(
+									currentChunk.runtime,
+									allOldRuntime
+								);
+								if (newRuntime === undefined) continue;
 								newModules = chunkGraph
 									.getChunkModules(currentChunk)
 									.filter(module => updatedModules.has(module, currentChunk));
 								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 +628,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/InvalidDependenciesModuleWarning.js

@@ -33,8 +33,6 @@ ${depsList.slice(0, 3).join("\n")}${
 		this.name = "InvalidDependenciesModuleWarning";
 		this.details = depsList.slice(3).join("\n");
 		this.module = module;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

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/ModuleBuildError.js

@@ -53,8 +53,6 @@ class ModuleBuildError extends WebpackError {
 		this.name = "ModuleBuildError";
 		this.details = details;
 		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 
 	serialize(context) {

package/lib/ModuleDependencyError.js

@@ -30,8 +30,6 @@ class ModuleDependencyError extends WebpackError {
 		/** error is not (de)serialized, so it might be undefined after deserialization */
 		this.error = err;
 
-		Error.captureStackTrace(this, this.constructor);
-
 		if (err && /** @type {any} */ (err).hideStack) {
 			this.stack =
 				err.stack.split("\n").slice(1).join("\n") + "\n\n" + this.stack;

package/lib/ModuleDependencyWarning.js

@@ -30,8 +30,6 @@ class ModuleDependencyWarning extends WebpackError {
 		/** error is not (de)serialized, so it might be undefined after deserialization */
 		this.error = err;
 
-		Error.captureStackTrace(this, this.constructor);
-
 		if (err && /** @type {any} */ (err).hideStack) {
 			this.stack =
 				err.stack.split("\n").slice(1).join("\n") + "\n\n" + this.stack;

package/lib/ModuleError.js

@@ -37,8 +37,6 @@ class ModuleError extends WebpackError {
 			err && typeof err === "object" && err.stack
 				? cleanUp(err.stack, this.message)
 				: undefined;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 
 	serialize(context) {

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/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/ModuleNotFoundError.js

@@ -80,8 +80,6 @@ class ModuleNotFoundError extends WebpackError {
 		this.module = module;
 		this.error = err;
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/ModuleParseError.js

@@ -85,8 +85,6 @@ class ModuleParseError extends WebpackError {
 		this.name = "ModuleParseError";
 		this.loc = loc;
 		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 
 	serialize(context) {

package/lib/ModuleRestoreError.js

@@ -36,8 +36,6 @@ class ModuleRestoreError extends WebpackError {
 		this.details = details;
 		this.module = module;
 		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/ModuleStoreError.js

@@ -36,8 +36,6 @@ class ModuleStoreError extends WebpackError {
 		this.details = details;
 		this.module = module;
 		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/ModuleWarning.js

@@ -37,8 +37,6 @@ class ModuleWarning extends WebpackError {
 			warning && typeof warning === "object" && warning.stack
 				? cleanUp(warning.stack, this.message)
 				: undefined;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 
 	serialize(context) {

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;
 	}
 

package/lib/NoModeWarning.js

@@ -18,7 +18,5 @@ module.exports = class NoModeWarning extends WebpackError {
 			"Set 'mode' option to 'development' or 'production' to enable defaults for each environment.\n" +
 			"You can also set it to 'none' to disable any default behavior. " +
 			"Learn more: https://webpack.js.org/configuration/mode/";
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };