webpack 5.27.2 → 5.31.0

package/lib/FileSystemInfo.js

@@ -27,11 +27,12 @@ const RBDT_RESOLVE_CJS = 0;
 const RBDT_RESOLVE_ESM = 1;
 const RBDT_RESOLVE_DIRECTORY = 2;
 const RBDT_RESOLVE_CJS_FILE = 3;
-const RBDT_RESOLVE_ESM_FILE = 4;
-const RBDT_DIRECTORY = 5;
-const RBDT_FILE = 6;
-const RBDT_DIRECTORY_DEPENDENCIES = 7;
-const RBDT_FILE_DEPENDENCIES = 8;
+const RBDT_RESOLVE_CJS_FILE_AS_CHILD = 4;
+const RBDT_RESOLVE_ESM_FILE = 5;
+const RBDT_DIRECTORY = 6;
+const RBDT_FILE = 7;
+const RBDT_DIRECTORY_DEPENDENCIES = 8;
+const RBDT_FILE_DEPENDENCIES = 9;
 
 const INVALID = Symbol("invalid");
 
@@ -63,7 +64,7 @@ const INVALID = Symbol("invalid");
  * @property {Set<string>} files list of files
  * @property {Set<string>} directories list of directories
  * @property {Set<string>} missing list of missing entries
- * @property {Map<string, string>} resolveResults stored resolve results
+ * @property {Map<string, string | false>} resolveResults stored resolve results
  * @property {Object} resolveDependencies dependencies of the resolving
  * @property {Set<string>} resolveDependencies.files list of files
  * @property {Set<string>} resolveDependencies.directories list of directories
@@ -412,6 +413,14 @@ class SnapshotOptimization {
 		} times referenced)`;
 	}
 
+	clear() {
+		this._map.clear();
+		this._statItemsShared = 0;
+		this._statItemsUnshared = 0;
+		this._statSharedSnapshots = 0;
+		this._statReusedSharedSnapshots = 0;
+	}
+
 	storeUnsharedSnapshot(snapshot, locations) {
 		if (locations === undefined) return;
 		const optimizationEntry = {
@@ -984,6 +993,42 @@ class FileSystemInfo {
 		}
 	}
 
+	clear() {
+		this._remainingLogs = this.logger ? 40 : 0;
+		if (this._loggedPaths !== undefined) this._loggedPaths.clear();
+
+		this._snapshotCache = new WeakMap();
+		this._fileTimestampsOptimization.clear();
+		this._fileHashesOptimization.clear();
+		this._fileTshsOptimization.clear();
+		this._contextTimestampsOptimization.clear();
+		this._contextHashesOptimization.clear();
+		this._contextTshsOptimization.clear();
+		this._missingExistenceOptimization.clear();
+		this._managedItemInfoOptimization.clear();
+		this._managedFilesOptimization.clear();
+		this._managedContextsOptimization.clear();
+		this._managedMissingOptimization.clear();
+		this._fileTimestamps.clear();
+		this._fileHashes.clear();
+		this._fileTshs.clear();
+		this._contextTimestamps.clear();
+		this._contextHashes.clear();
+		this._contextTshs.clear();
+		this._managedItems.clear();
+		this._managedItems.clear();
+
+		this._cachedDeprecatedFileTimestamps = undefined;
+		this._cachedDeprecatedContextTimestamps = undefined;
+
+		this._statCreatedSnapshots = 0;
+		this._statTestedSnapshotsCached = 0;
+		this._statTestedSnapshotsNotCached = 0;
+		this._statTestedChildrenCached = 0;
+		this._statTestedChildrenNotCached = 0;
+		this._statTestedEntries = 0;
+	}
+
 	/**
 	 * @param {Map<string, FileSystemInfoEntry | "ignore" | null>} map timestamps
 	 * @returns {void}
@@ -1059,15 +1104,23 @@ class FileSystemInfo {
 		const resolveCjs = createResolver({
 			extensions: [".js", ".json", ".node"],
 			conditionNames: ["require", "node"],
+			exportsFields: ["exports"],
+			fileSystem: this.fs
+		});
+		const resolveCjsAsChild = createResolver({
+			extensions: [".js", ".json", ".node"],
+			conditionNames: ["require", "node"],
+			exportsFields: [],
 			fileSystem: this.fs
 		});
 		const resolveEsm = createResolver({
 			extensions: [".js", ".json", ".node"],
 			fullySpecified: true,
 			conditionNames: ["import", "node"],
+			exportsFields: ["exports"],
 			fileSystem: this.fs
 		});
-		return { resolveContext, resolveEsm, resolveCjs };
+		return { resolveContext, resolveEsm, resolveCjs, resolveCjsAsChild };
 	}
 
 	/**
@@ -1080,7 +1133,8 @@ class FileSystemInfo {
 		const {
 			resolveContext,
 			resolveEsm,
-			resolveCjs
+			resolveCjs,
+			resolveCjsAsChild
 		} = this._createBuildDependenciesResolvers();
 
 		/** @type {Set<string>} */
@@ -1099,7 +1153,7 @@ class FileSystemInfo {
 		const resolveDirectories = new Set();
 		/** @type {Set<string>} */
 		const resolveMissing = new Set();
-		/** @type {Map<string, string>} */
+		/** @type {Map<string, string | false>} */
 		const resolveResults = new Map();
 		const invalidResolveResults = new Set();
 		const resolverContext = {
@@ -1107,15 +1161,58 @@ class FileSystemInfo {
 			contextDependencies: resolveDirectories,
 			missingDependencies: resolveMissing
 		};
+		const expectedToString = expected => {
+			return expected ? ` (expected ${expected})` : "";
+		};
+		const jobToString = job => {
+			switch (job.type) {
+				case RBDT_RESOLVE_CJS:
+					return `resolve commonjs ${job.path}${expectedToString(
+						job.expected
+					)}`;
+				case RBDT_RESOLVE_ESM:
+					return `resolve esm ${job.path}${expectedToString(job.expected)}`;
+				case RBDT_RESOLVE_DIRECTORY:
+					return `resolve directory ${job.path}`;
+				case RBDT_RESOLVE_CJS_FILE:
+					return `resolve commonjs file ${job.path}${expectedToString(
+						job.expected
+					)}`;
+				case RBDT_RESOLVE_ESM_FILE:
+					return `resolve esm file ${job.path}${expectedToString(
+						job.expected
+					)}`;
+				case RBDT_DIRECTORY:
+					return `directory ${job.path}`;
+				case RBDT_FILE:
+					return `file ${job.path}`;
+				case RBDT_DIRECTORY_DEPENDENCIES:
+					return `directory dependencies ${job.path}`;
+				case RBDT_FILE_DEPENDENCIES:
+					return `file dependencies ${job.path}`;
+			}
+			return `unknown ${job.type} ${job.path}`;
+		};
+		const pathToString = job => {
+			let result = ` at ${jobToString(job)}`;
+			job = job.issuer;
+			while (job !== undefined) {
+				result += `\n at ${jobToString(job)}`;
+				job = job.issuer;
+			}
+			return result;
+		};
 		processAsyncTree(
 			Array.from(deps, dep => ({
 				type: RBDT_RESOLVE_CJS,
 				context,
 				path: dep,
-				expected: undefined
+				expected: undefined,
+				issuer: undefined
 			})),
 			20,
-			({ type, context, path, expected }, push, callback) => {
+			(job, push, callback) => {
+				const { type, context, path, expected } = job;
 				const resolveDirectory = path => {
 					const key = `d\n${context}\n${path}`;
 					if (resolveResults.has(key)) {
@@ -1124,13 +1221,11 @@ class FileSystemInfo {
 					resolveResults.set(key, undefined);
 					resolveContext(context, path, resolverContext, (err, result) => {
 						if (err) {
-							invalidResolveResults.add(key);
-							if (
-								err.code === "ENOENT" ||
-								err.code === "UNDECLARED_DEPENDENCY"
-							) {
+							if (expected === false) {
+								resolveResults.set(key, false);
 								return callback();
 							}
+							invalidResolveResults.add(key);
 							err.message += `\nwhile resolving '${path}' in ${context} to a directory`;
 							return callback(err);
 						}
@@ -1139,7 +1234,8 @@ class FileSystemInfo {
 							type: RBDT_DIRECTORY,
 							context: undefined,
 							path: result,
-							expected: undefined
+							expected: undefined,
+							issuer: job
 						});
 						callback();
 					});
@@ -1151,25 +1247,27 @@ class FileSystemInfo {
 					}
 					resolveResults.set(key, undefined);
 					resolve(context, path, resolverContext, (err, result) => {
-						if (expected) {
+						if (typeof expected === "string") {
 							if (result === expected) {
 								resolveResults.set(key, result);
 							} else {
 								invalidResolveResults.add(key);
-								this.logger.debug(
-									`Resolving '${path}' in ${context} for build dependencies doesn't lead to expected result '${expected}', but to '${result}' instead. Resolving dependencies are ignored for this path.`
+								this.logger.warn(
+									`Resolving '${path}' in ${context} for build dependencies doesn't lead to expected result '${expected}', but to '${result}' instead. Resolving dependencies are ignored for this path.\n${pathToString(
+										job
+									)}`
 								);
 							}
 						} else {
 							if (err) {
-								invalidResolveResults.add(key);
-								if (
-									err.code === "ENOENT" ||
-									err.code === "UNDECLARED_DEPENDENCY"
-								) {
+								if (expected === false) {
+									resolveResults.set(key, false);
 									return callback();
 								}
-								err.message += `\nwhile resolving '${path}' in ${context} as file`;
+								invalidResolveResults.add(key);
+								err.message += `\nwhile resolving '${path}' in ${context} as file\n${pathToString(
+									job
+								)}`;
 								return callback(err);
 							}
 							resolveResults.set(key, result);
@@ -1177,7 +1275,8 @@ class FileSystemInfo {
 								type: RBDT_FILE,
 								context: undefined,
 								path: result,
-								expected: undefined
+								expected: undefined,
+								issuer: job
 							});
 						}
 						callback();
@@ -1210,6 +1309,10 @@ class FileSystemInfo {
 						resolveFile(path, "f", resolveCjs);
 						break;
 					}
+					case RBDT_RESOLVE_CJS_FILE_AS_CHILD: {
+						resolveFile(path, "c", resolveCjsAsChild);
+						break;
+					}
 					case RBDT_RESOLVE_ESM_FILE: {
 						resolveFile(path, "e", resolveEsm);
 						break;
@@ -1233,7 +1336,8 @@ class FileSystemInfo {
 								type: RBDT_FILE_DEPENDENCIES,
 								context: undefined,
 								path: realPath,
-								expected: undefined
+								expected: undefined,
+								issuer: job
 							});
 							callback();
 						});
@@ -1258,7 +1362,8 @@ class FileSystemInfo {
 								type: RBDT_DIRECTORY_DEPENDENCIES,
 								context: undefined,
 								path: realPath,
-								expected: undefined
+								expected: undefined,
+								issuer: job
 							});
 							callback();
 						});
@@ -1281,19 +1386,39 @@ class FileSystemInfo {
 										type: RBDT_FILE,
 										context: undefined,
 										path: childPath,
-										expected: undefined
+										expected: undefined,
+										issuer: job
 									});
 									const context = dirname(this.fs, path);
 									for (const modulePath of module.paths) {
 										if (childPath.startsWith(modulePath)) {
-											let request = childPath.slice(modulePath.length + 1);
+											let subPath = childPath.slice(modulePath.length + 1);
+											const packageMatch = /^(@[^\\/]+[\\/])[^\\/]+/.exec(
+												subPath
+											);
+											if (packageMatch) {
+												push({
+													type: RBDT_FILE,
+													context: undefined,
+													path:
+														modulePath +
+														childPath[modulePath.length] +
+														packageMatch[0] +
+														childPath[modulePath.length] +
+														"package.json",
+													expected: false,
+													issuer: job
+												});
+											}
+											let request = subPath.replace(/\\/g, "/");
 											if (request.endsWith(".js"))
 												request = request.slice(0, -3);
 											push({
-												type: RBDT_RESOLVE_CJS_FILE,
+												type: RBDT_RESOLVE_CJS_FILE_AS_CHILD,
 												context,
 												path: request,
-												expected: child.filename
+												expected: child.filename,
+												issuer: job
 											});
 											continue children;
 										}
@@ -1306,7 +1431,8 @@ class FileSystemInfo {
 										type: RBDT_RESOLVE_CJS_FILE,
 										context,
 										path: request,
-										expected: child.filename
+										expected: child.filename,
+										issuer: job
 									});
 								}
 							}
@@ -1351,7 +1477,8 @@ class FileSystemInfo {
 													type: RBDT_RESOLVE_ESM_FILE,
 													context,
 													path: dependency,
-													expected: undefined
+													expected: undefined,
+													issuer: job
 												});
 											} catch (e) {
 												this.logger.warn(
@@ -1361,6 +1488,7 @@ class FileSystemInfo {
 													)})'.\n` +
 														"Build dependencies behind this expression are ignored and might cause incorrect cache invalidation."
 												);
+												this.logger.debug(pathToString(job));
 												this.logger.debug(e.stack);
 											}
 										}
@@ -1368,6 +1496,7 @@ class FileSystemInfo {
 										this.logger.warn(
 											`Parsing of ${path} for build dependencies failed and all dependencies of this file are ignored, which might cause incorrect cache invalidation..`
 										);
+										this.logger.debug(pathToString(job));
 										this.logger.debug(e.stack);
 									}
 									process.nextTick(callback);
@@ -1378,6 +1507,7 @@ class FileSystemInfo {
 							this.logger.log(
 								`Assuming ${path} has no dependencies as we were unable to assign it to any module system.`
 							);
+							this.logger.debug(pathToString(job));
 						}
 						process.nextTick(callback);
 						break;
@@ -1398,7 +1528,8 @@ class FileSystemInfo {
 											type: RBDT_DIRECTORY_DEPENDENCIES,
 											context: undefined,
 											path: parent,
-											expected: undefined
+											expected: undefined,
+											issuer: job
 										});
 									}
 									callback();
@@ -1414,16 +1545,32 @@ class FileSystemInfo {
 								return callback(e);
 							}
 							const depsObject = packageData.dependencies;
+							const optionalDepsObject = packageData.optionalDependencies;
+							const allDeps = new Set();
+							const optionalDeps = new Set();
 							if (typeof depsObject === "object" && depsObject) {
 								for (const dep of Object.keys(depsObject)) {
-									push({
-										type: RBDT_RESOLVE_DIRECTORY,
-										context: packagePath,
-										path: dep,
-										expected: undefined
-									});
+									allDeps.add(dep);
+								}
+							}
+							if (
+								typeof optionalDepsObject === "object" &&
+								optionalDepsObject
+							) {
+								for (const dep of Object.keys(optionalDepsObject)) {
+									allDeps.add(dep);
+									optionalDeps.add(dep);
 								}
 							}
+							for (const dep of allDeps) {
+								push({
+									type: RBDT_RESOLVE_DIRECTORY,
+									context: packagePath,
+									path: dep,
+									expected: !optionalDeps.has(dep),
+									issuer: job
+								});
+							}
 							callback();
 						});
 						break;
@@ -1451,13 +1598,14 @@ class FileSystemInfo {
 	}
 
 	/**
-	 * @param {Map<string, string>} resolveResults results from resolving
+	 * @param {Map<string, string | false>} resolveResults results from resolving
 	 * @param {function(Error=, boolean=): void} callback callback with true when resolveResults resolve the same way
 	 * @returns {void}
 	 */
 	checkResolveResultsValid(resolveResults, callback) {
 		const {
 			resolveCjs,
+			resolveCjsAsChild,
 			resolveEsm,
 			resolveContext
 		} = this._createBuildDependenciesResolvers();
@@ -1469,6 +1617,8 @@ class FileSystemInfo {
 				switch (type) {
 					case "d":
 						resolveContext(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
 							if (result !== expectedResult) return callback(INVALID);
 							callback();
@@ -1476,6 +1626,17 @@ class FileSystemInfo {
 						break;
 					case "f":
 						resolveCjs(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
+							if (err) return callback(err);
+							if (result !== expectedResult) return callback(INVALID);
+							callback();
+						});
+						break;
+					case "c":
+						resolveCjsAsChild(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
 							if (result !== expectedResult) return callback(INVALID);
 							callback();
@@ -1483,6 +1644,8 @@ class FileSystemInfo {
 						break;
 					case "e":
 						resolveEsm(context, path, {}, (err, result) => {
+							if (expectedResult === false)
+								return callback(err ? undefined : INVALID);
 							if (err) return callback(err);
 							if (result !== expectedResult) return callback(INVALID);
 							callback();

package/lib/FlagDependencyExportsPlugin.js

@@ -119,6 +119,7 @@ class FlagDependencyExportsPlugin {
 									const exports = exportDesc.exports;
 									const globalCanMangle = exportDesc.canMangle;
 									const globalFrom = exportDesc.from;
+									const globalPriority = exportDesc.priority;
 									const globalTerminalBinding =
 										exportDesc.terminalBinding || false;
 									const exportDeps = exportDesc.dependencies;
@@ -135,7 +136,8 @@ class FlagDependencyExportsPlugin {
 												globalCanMangle,
 												exportDesc.excludeExports,
 												globalFrom && dep,
-												globalFrom
+												globalFrom,
+												globalPriority
 											)
 										) {
 											changed = true;
@@ -154,6 +156,7 @@ class FlagDependencyExportsPlugin {
 												let exports = undefined;
 												let from = globalFrom;
 												let fromExport = undefined;
+												let priority = globalPriority;
 												let hidden = false;
 												if (typeof exportNameOrSpec === "string") {
 													name = exportNameOrSpec;
@@ -167,6 +170,8 @@ class FlagDependencyExportsPlugin {
 														exports = exportNameOrSpec.exports;
 													if (exportNameOrSpec.from !== undefined)
 														from = exportNameOrSpec.from;
+													if (exportNameOrSpec.priority !== undefined)
+														priority = exportNameOrSpec.priority;
 													if (exportNameOrSpec.terminalBinding !== undefined)
 														terminalBinding = exportNameOrSpec.terminalBinding;
 													if (exportNameOrSpec.hidden !== undefined)
@@ -174,7 +179,10 @@ class FlagDependencyExportsPlugin {
 												}
 												const exportInfo = exportsInfo.getExportInfo(name);
 
-												if (exportInfo.provided === false) {
+												if (
+													exportInfo.provided === false ||
+													exportInfo.provided === null
+												) {
 													exportInfo.provided = true;
 													changed = true;
 												}
@@ -204,7 +212,8 @@ class FlagDependencyExportsPlugin {
 														: exportInfo.setTarget(
 																dep,
 																from,
-																fromExport === undefined ? [name] : fromExport
+																fromExport === undefined ? [name] : fromExport,
+																priority
 														  ))
 												) {
 													changed = true;

package/lib/NormalModule.js

@@ -367,6 +367,7 @@ class NormalModule extends Module {
 	 * @param {NormalModuleFactory} normalModuleFactory the normal module factory handling the unsafe caching
 	 */
 	_restoreFromUnsafeCache(unsafeCacheData, normalModuleFactory) {
+		super._restoreFromUnsafeCache(unsafeCacheData, normalModuleFactory);
 		this.parserOptions = unsafeCacheData.parserOptions;
 		this.parser = normalModuleFactory.getParser(this.type, this.parserOptions);
 		this.generatorOptions = unsafeCacheData.generatorOptions;
@@ -748,6 +749,9 @@ class NormalModule extends Module {
 				}
 			},
 			(err, result) => {
+				// Cleanup loaderContext to avoid leaking memory in ICs
+				loaderContext._compilation = loaderContext._compiler = loaderContext._module = loaderContext.fs = undefined;
+
 				if (!result) {
 					return processResult(
 						err || new Error("No result from loader-runner processing"),

package/lib/WebpackOptionsApply.js

@@ -521,9 +521,17 @@ class WebpackOptionsApply extends OptionsApply {
 			const cacheOptions = options.cache;
 			switch (cacheOptions.type) {
 				case "memory": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-					const MemoryCachePlugin = require("./cache/MemoryCachePlugin");
-					new MemoryCachePlugin().apply(compiler);
+					if (isFinite(cacheOptions.maxGenerations)) {
+						//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+						const MemoryWithGcCachePlugin = require("./cache/MemoryWithGcCachePlugin");
+						new MemoryWithGcCachePlugin({
+							maxGenerations: cacheOptions.maxGenerations
+						}).apply(compiler);
+					} else {
+						//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+						const MemoryCachePlugin = require("./cache/MemoryCachePlugin");
+						new MemoryCachePlugin().apply(compiler);
+					}
 					break;
 				}
 				case "filesystem": {
@@ -532,9 +540,17 @@ class WebpackOptionsApply extends OptionsApply {
 						const list = cacheOptions.buildDependencies[key];
 						new AddBuildDependenciesPlugin(list).apply(compiler);
 					}
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
-					const MemoryCachePlugin = require("./cache/MemoryCachePlugin");
-					new MemoryCachePlugin().apply(compiler);
+					if (!isFinite(cacheOptions.maxMemoryGenerations)) {
+						//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+						const MemoryCachePlugin = require("./cache/MemoryCachePlugin");
+						new MemoryCachePlugin().apply(compiler);
+					} else if (cacheOptions.maxMemoryGenerations !== 0) {
+						//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+						const MemoryWithGcCachePlugin = require("./cache/MemoryWithGcCachePlugin");
+						new MemoryWithGcCachePlugin({
+							maxGenerations: cacheOptions.maxMemoryGenerations
+						}).apply(compiler);
+					}
 					switch (cacheOptions.store) {
 						case "pack": {
 							const IdleFileCachePlugin = require("./cache/IdleFileCachePlugin");
@@ -549,7 +565,8 @@ class WebpackOptionsApply extends OptionsApply {
 									logger: compiler.getInfrastructureLogger(
 										"webpack.cache.PackFileCacheStrategy"
 									),
-									snapshot: options.snapshot
+									snapshot: options.snapshot,
+									maxAge: cacheOptions.maxAge
 								}),
 								cacheOptions.idleTimeout,
 								cacheOptions.idleTimeoutForInitialStore