webpack 5.37.1 → 5.39.1

package/bin/webpack.js

@@ -32,13 +32,28 @@ const runCommand = (command, args) => {
  * @returns {boolean} is the package installed?
  */
 const isInstalled = packageName => {
-	try {
-		require.resolve(packageName);
-
+	if (process.versions.pnp) {
 		return true;
-	} catch (err) {
-		return false;
 	}
+
+	const path = require("path");
+	const fs = require("graceful-fs");
+
+	let dir = __dirname;
+
+	do {
+		try {
+			if (
+				fs.statSync(path.join(dir, "node_modules", packageName)).isDirectory()
+			) {
+				return true;
+			}
+		} catch (_error) {
+			// Nothing
+		}
+	} while (dir !== (dir = path.dirname(dir)));
+
+	return false;
 };
 
 /**

package/lib/AsyncDependencyToInitialChunkError.js

@@ -25,8 +25,6 @@ class AsyncDependencyToInitialChunkError extends WebpackError {
 		this.name = "AsyncDependencyToInitialChunkError";
 		this.module = module;
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/CaseSensitiveModulesWarning.js

@@ -65,8 +65,6 @@ ${modulesList}`);
 
 		this.name = "CaseSensitiveModulesWarning";
 		this.module = sortedModules[0];
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/Chunk.js

@@ -598,8 +598,12 @@ class Chunk {
 	 */
 	getAllInitialChunks() {
 		const chunks = new Set();
-		for (const group of this.groupsIterable) {
-			for (const c of group.chunks) chunks.add(c);
+		const queue = new Set(this.groupsIterable);
+		for (const group of queue) {
+			if (group.isInitial()) {
+				for (const c of group.chunks) chunks.add(c);
+				for (const g of group.childrenIterable) queue.add(g);
+			}
 		}
 		return chunks;
 	}

package/lib/ChunkRenderError.js

@@ -25,8 +25,6 @@ class ChunkRenderError extends WebpackError {
 		this.details = error.stack;
 		this.file = file;
 		this.chunk = chunk;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/CodeGenerationError.js

@@ -23,8 +23,6 @@ class CodeGenerationError extends WebpackError {
 		this.message = error.message;
 		this.details = error.stack;
 		this.module = module;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/CommentCompilationWarning.js

@@ -22,8 +22,6 @@ class CommentCompilationWarning extends WebpackError {
 		this.name = "CommentCompilationWarning";
 
 		this.loc = loc;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/Compilation.js

@@ -337,6 +337,31 @@ const deprecatedNormalModuleLoaderHook = util.deprecate(
 	"DEP_WEBPACK_COMPILATION_NORMAL_MODULE_LOADER_HOOK"
 );
 
+// TODO webpack 6: remove
+const defineRemovedModuleTemplates = moduleTemplates => {
+	Object.defineProperties(moduleTemplates, {
+		asset: {
+			enumerable: false,
+			configurable: false,
+			get: () => {
+				throw new WebpackError(
+					"Compilation.moduleTemplates.asset has been removed"
+				);
+			}
+		},
+		webassembly: {
+			enumerable: false,
+			configurable: false,
+			get: () => {
+				throw new WebpackError(
+					"Compilation.moduleTemplates.webassembly has been removed"
+				);
+			}
+		}
+	});
+	moduleTemplates = undefined;
+};
+
 const byId = compareSelect(
 	/**
 	 * @param {Chunk} c chunk
@@ -861,26 +886,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 		this.moduleTemplates = {
 			javascript: new ModuleTemplate(this.runtimeTemplate, this)
 		};
-		Object.defineProperties(this.moduleTemplates, {
-			asset: {
-				enumerable: false,
-				configurable: false,
-				get() {
-					throw new WebpackError(
-						"Compilation.moduleTemplates.asset has been removed"
-					);
-				}
-			},
-			webassembly: {
-				enumerable: false,
-				configurable: false,
-				get() {
-					throw new WebpackError(
-						"Compilation.moduleTemplates.webassembly has been removed"
-					);
-				}
-			}
-		});
+		defineRemovedModuleTemplates(this.moduleTemplates);
 
 		this.moduleGraph = new ModuleGraph();
 		/** @type {ChunkGraph} */
@@ -1999,6 +2005,7 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	}
 
 	finish(callback) {
+		this.factorizeQueue.clear();
 		if (this.profile) {
 			this.logger.time("finish module profiles");
 			const ParallelismFactorCalculator = require("./util/ParallelismFactorCalculator");
@@ -2233,6 +2240,14 @@ BREAKING CHANGE: Asset processing hooks in Compilation has been merged into a si
 	 * @returns {void}
 	 */
 	seal(callback) {
+		const finalCallback = err => {
+			this.factorizeQueue.clear();
+			this.buildQueue.clear();
+			this.rebuildQueue.clear();
+			this.processDependenciesQueue.clear();
+			this.addModuleQueue.clear();
+			return callback(err);
+		};
 		const chunkGraph = new ChunkGraph(this.moduleGraph);
 		this.chunkGraph = chunkGraph;
 
@@ -2397,7 +2412,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 
 		this.hooks.optimizeTree.callAsync(this.chunks, this.modules, err => {
 			if (err) {
-				return callback(
+				return finalCallback(
 					makeWebpackError(err, "Compilation.hooks.optimizeTree")
 				);
 			}
@@ -2409,7 +2424,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 				this.modules,
 				err => {
 					if (err) {
-						return callback(
+						return finalCallback(
 							makeWebpackError(err, "Compilation.hooks.optimizeChunkModules")
 						);
 					}
@@ -2452,7 +2467,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 					this.hooks.beforeCodeGeneration.call();
 					this.codeGeneration(err => {
 						if (err) {
-							return callback(err);
+							return finalCallback(err);
 						}
 						this.hooks.afterCodeGeneration.call();
 						this.logger.timeEnd("code generation");
@@ -2471,7 +2486,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 
 						this._runCodeGenerationJobs(codeGenerationJobs, err => {
 							if (err) {
-								return callback(err);
+								return finalCallback(err);
 							}
 
 							if (shouldRecord) {
@@ -2491,7 +2506,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 								this.logger.time("process assets");
 								this.hooks.processAssets.callAsync(this.assets, err => {
 									if (err) {
-										return callback(
+										return finalCallback(
 											makeWebpackError(err, "Compilation.hooks.processAssets")
 										);
 									}
@@ -2517,12 +2532,12 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 									}
 									return this.hooks.afterSeal.callAsync(err => {
 										if (err) {
-											return callback(
+											return finalCallback(
 												makeWebpackError(err, "Compilation.hooks.afterSeal")
 											);
 										}
 										this.fileSystemInfo.logStatistics();
-										callback();
+										finalCallback();
 									});
 								});
 							};
@@ -2533,7 +2548,7 @@ Or do you want to use the entrypoints '${name}' and '${runtime}' independently o
 								this.createChunkAssets(err => {
 									this.logger.timeEnd("create chunk assets");
 									if (err) {
-										return callback(err);
+										return finalCallback(err);
 									}
 									cont();
 								});

package/lib/Compiler.js

@@ -230,6 +230,8 @@ class Compiler {
 		this.fileTimestamps = undefined;
 		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.contextTimestamps = undefined;
+		/** @type {number} */
+		this.fsStartTime = undefined;
 
 		/** @type {ResolverFactory} */
 		this.resolverFactory = new ResolverFactory();
@@ -952,6 +954,7 @@ ${other}`);
 		childCompiler.removedFiles = this.removedFiles;
 		childCompiler.fileTimestamps = this.fileTimestamps;
 		childCompiler.contextTimestamps = this.contextTimestamps;
+		childCompiler.fsStartTime = this.fsStartTime;
 		childCompiler.cache = this.cache;
 		childCompiler.compilerPath = `${this.compilerPath}${compilerName}|${compilerIndex}|`;
 

package/lib/ConcurrentCompilationError.js

@@ -14,7 +14,5 @@ module.exports = class ConcurrentCompilationError extends WebpackError {
 		this.name = "ConcurrentCompilationError";
 		this.message =
 			"You ran Webpack twice. Each instance only supports a single concurrent compilation at a time.";
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 };

package/lib/ContextModule.js

@@ -54,6 +54,7 @@ const makeSerializable = require("./util/makeSerializable");
  * @property {RegExp=} include
  * @property {RegExp=} exclude
  * @property {RawChunkGroupOptions=} groupOptions
+ * @property {string=} typePrefix
  * @property {string=} category
  * @property {string[][]=} referencedExports exports referenced from modules (won't be mangled)
  */
@@ -577,7 +578,7 @@ class ContextModule extends Module {
 		fakeMapDataExpression = "fakeMap[id]"
 	) {
 		if (typeof fakeMap === "number") {
-			return `return ${this.getReturn(fakeMap)};`;
+			return `return ${this.getReturn(fakeMap, asyncModule)};`;
 		}
 		return `return ${
 			RuntimeGlobals.createFakeNamespaceObject

package/lib/ContextModuleFactory.js

@@ -273,7 +273,8 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 			include,
 			exclude,
 			referencedExports,
-			category
+			category,
+			typePrefix
 		} = options;
 		if (!regExp || !resource) return callback(null, []);
 
@@ -346,6 +347,7 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 													const dep = new ContextElementDependency(
 														obj.request + resourceQuery + resourceFragment,
 														obj.request,
+														typePrefix,
 														category,
 														referencedExports
 													);

package/lib/DllReferencePlugin.js

@@ -156,8 +156,6 @@ class DllManifestError extends WebpackError {
 
 		this.name = "DllManifestError";
 		this.message = `Dll manifest ${filename}\n${message}`;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/EntryPlugin.js

@@ -41,10 +41,10 @@ class EntryPlugin {
 			}
 		);
 
-		compiler.hooks.make.tapAsync("EntryPlugin", (compilation, callback) => {
-			const { entry, options, context } = this;
+		const { entry, options, context } = this;
+		const dep = EntryPlugin.createDependency(entry, options);
 
-			const dep = EntryPlugin.createDependency(entry, options);
+		compiler.hooks.make.tapAsync("EntryPlugin", (compilation, callback) => {
 			compilation.addEntry(context, dep, options, err => {
 				callback(err);
 			});

package/lib/ExportsInfo.js

@@ -137,18 +137,22 @@ class ExportsInfo {
 
 	_sortExportsMap(exports) {
 		if (exports.size > 1) {
-			const entriesInOrder = Array.from(exports.values());
-			if (
-				entriesInOrder.length !== 2 ||
-				entriesInOrder[0].name > entriesInOrder[1].name
-			) {
-				entriesInOrder.sort((a, b) => {
-					return a.name < b.name ? -1 : 1;
-				});
-				exports.clear();
-				for (const entry of entriesInOrder) {
-					exports.set(entry.name, entry);
-				}
+			const namesInOrder = [];
+			for (const entry of exports.values()) {
+				namesInOrder.push(entry.name);
+			}
+			namesInOrder.sort();
+			let i = 0;
+			for (const entry of exports.values()) {
+				const name = namesInOrder[i];
+				if (entry.name !== name) break;
+				i++;
+			}
+			for (; i < namesInOrder.length; i++) {
+				const name = namesInOrder[i];
+				const correctEntry = exports.get(name);
+				exports.delete(name);
+				exports.set(name, correctEntry);
 			}
 		}
 	}
@@ -722,7 +726,7 @@ class ExportsInfo {
 		const otherCanMangleProvide = this._otherExportsInfo.canMangleProvide;
 		const otherTerminalBinding = this._otherExportsInfo.terminalBinding;
 		const exports = [];
-		for (const exportInfo of this._exports.values()) {
+		for (const exportInfo of this.orderedExports) {
 			if (
 				exportInfo.provided !== otherProvided ||
 				exportInfo.canMangleProvide !== otherCanMangleProvide ||
@@ -754,7 +758,9 @@ class ExportsInfo {
 		otherTerminalBinding,
 		exports
 	}) {
+		let wasEmpty = true;
 		for (const exportInfo of this._exports.values()) {
+			wasEmpty = false;
 			exportInfo.provided = otherProvided;
 			exportInfo.canMangleProvide = otherCanMangleProvide;
 			exportInfo.terminalBinding = otherTerminalBinding;
@@ -772,6 +778,7 @@ class ExportsInfo {
 				exportsInfo.restoreProvided(exp.exportsInfo);
 			}
 		}
+		if (wasEmpty) this._exportsAreOrdered = true;
 	}
 }
 

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 */
@@ -502,7 +503,11 @@ 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));

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

package/lib/NormalModule.js

@@ -164,8 +164,6 @@ class NonErrorEmittedError extends WebpackError {
 
 		this.name = "NonErrorEmittedError";
 		this.message = "(Emitted value instead of an instance of Error) " + error;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 
@@ -219,6 +217,7 @@ class NormalModule extends Module {
 	 * @param {string} options.rawRequest request without resolving
 	 * @param {LoaderItem[]} options.loaders list of loaders
 	 * @param {string} options.resource path + query of the real resource
+	 * @param {Record<string, any>=} options.resourceResolveData resource resolve data
 	 * @param {string | undefined} options.matchResource path + query of the matched resource (virtual)
 	 * @param {Parser} options.parser the parser used
 	 * @param {object} options.parserOptions the options of the parser used
@@ -234,6 +233,7 @@ class NormalModule extends Module {
 		rawRequest,
 		loaders,
 		resource,
+		resourceResolveData,
 		matchResource,
 		parser,
 		parserOptions,
@@ -260,6 +260,7 @@ class NormalModule extends Module {
 		this.generatorOptions = generatorOptions;
 		/** @type {string} */
 		this.resource = resource;
+		this.resourceResolveData = resourceResolveData;
 		/** @type {string | undefined} */
 		this.matchResource = matchResource;
 		/** @type {LoaderItem[]} */
@@ -902,7 +903,7 @@ class NormalModule extends Module {
 			assetsInfo: undefined
 		};
 
-		const startTime = Date.now();
+		const startTime = compilation.compiler.fsStartTime || Date.now();
 
 		return this.doBuild(options, compilation, resolver, fs, err => {
 			// if we have an error mark module as failed and exit

package/lib/NormalModuleFactory.js

@@ -168,6 +168,7 @@ const unsafeCacheData = new WeakMap();
 
 const ruleSetCompiler = new RuleSetCompiler([
 	new BasicMatcherRulePlugin("test", "resource"),
+	new BasicMatcherRulePlugin("scheme"),
 	new BasicMatcherRulePlugin("mimetype"),
 	new BasicMatcherRulePlugin("dependency"),
 	new BasicMatcherRulePlugin("include", "resource"),
@@ -443,6 +444,7 @@ class NormalModuleFactory extends ModuleFactory {
 						realResource: resourceData.path,
 						resourceQuery: resourceDataForRules.query,
 						resourceFragment: resourceDataForRules.fragment,
+						scheme,
 						mimetype: matchResourceData ? "" : resourceData.data.mimetype || "",
 						dependency: dependencyType,
 						descriptionData: matchResourceData

package/lib/UnsupportedFeatureWarning.js

@@ -21,8 +21,6 @@ class UnsupportedFeatureWarning extends WebpackError {
 		this.name = "UnsupportedFeatureWarning";
 		this.loc = loc;
 		this.hideStack = true;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }
 

package/lib/WarnDeprecatedOptionPlugin.js

@@ -48,8 +48,6 @@ class DeprecatedOptionWarning extends WebpackError {
 			"configuration\n" +
 			`The value '${value}' for option '${option}' is deprecated. ` +
 			`Use '${suggestion}' instead.`;
-
-		Error.captureStackTrace(this, this.constructor);
 	}
 }