webpack 5.12.1 → 5.14.0

package/lib/AutomaticPrefetchPlugin.js

@@ -45,7 +45,7 @@ class AutomaticPrefetchPlugin {
 					(m, callback) => {
 						compilation.addModuleChain(
 							m.context || compiler.context,
-							new PrefetchDependency(m.request),
+							new PrefetchDependency(`!!${m.request}`),
 							callback
 						);
 					},

package/lib/ChunkGraph.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const util = require("util");
+const ModuleGraphConnection = require("./ModuleGraphConnection");
 const SortableSet = require("./util/SortableSet");
 const {
 	compareModulesById,
@@ -272,10 +273,19 @@ class ChunkGraph {
 			findGraphRoots(set, module => {
 				/** @type {Set<Module>} */
 				const set = new Set();
-				for (const connection of moduleGraph.getOutgoingConnections(module)) {
-					if (!connection.module) continue;
-					set.add(connection.module);
-				}
+				const addDependencies = module => {
+					for (const connection of moduleGraph.getOutgoingConnections(module)) {
+						if (!connection.module) continue;
+						const activeState = connection.getActiveState(undefined);
+						if (activeState === false) continue;
+						if (activeState === ModuleGraphConnection.TRANSITIVE_ONLY) {
+							addDependencies(connection.module);
+							continue;
+						}
+						set.add(connection.module);
+					}
+				};
+				addDependencies(module);
 				return set;
 			})
 		).sort(compareModulesByIdentifier);

package/lib/Compiler.js

@@ -222,9 +222,9 @@ class Compiler {
 		this.modifiedFiles = undefined;
 		/** @type {Set<string>} */
 		this.removedFiles = undefined;
-		/** @type {Map<string, FileSystemInfoEntry | null>} */
+		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.fileTimestamps = undefined;
-		/** @type {Map<string, FileSystemInfoEntry | null>} */
+		/** @type {Map<string, FileSystemInfoEntry | "ignore" | null>} */
 		this.contextTimestamps = undefined;
 
 		/** @type {ResolverFactory} */
@@ -724,7 +724,10 @@ ${other}`);
 								return this.outputFileSystem.readFile(
 									targetPath,
 									(err, existingContent) => {
-										if (err || !content.equals(existingContent)) {
+										if (
+											err ||
+											!content.equals(/** @type {Buffer} */ (existingContent))
+										) {
 											return doWrite(content);
 										} else {
 											return alreadyWritten();

package/lib/ContextModuleFactory.js

@@ -298,11 +298,13 @@ module.exports = class ContextModuleFactory extends ModuleFactory {
 		const addDirectory = (directory, addSubDirectory, callback) => {
 			fs.readdir(directory, (err, files) => {
 				if (err) return callback(err);
-				files = files.map(file => file.normalize("NFC"));
-				files = cmf.hooks.contextModuleFiles.call(files);
-				if (!files || files.length === 0) return callback(null, []);
+				const processedFiles = cmf.hooks.contextModuleFiles.call(
+					/** @type {string[]} */ (files).map(file => file.normalize("NFC"))
+				);
+				if (!processedFiles || processedFiles.length === 0)
+					return callback(null, []);
 				asyncLib.map(
-					files.filter(p => p.indexOf(".") !== 0),
+					processedFiles.filter(p => p.indexOf(".") !== 0),
 					(segment, callback) => {
 						const subResource = join(fs, directory, segment);
 

package/lib/FileSystemInfo.js

@@ -16,6 +16,8 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./logging/Logger").Logger} Logger */
 /** @typedef {import("./util/fs").InputFileSystem} InputFileSystem */
 
+const supportsEsm = +process.versions.modules >= 83;
+
 const resolveContext = createResolver({
 	resolveToContext: true,
 	exportsFields: []
@@ -880,6 +882,8 @@ class FileSystemInfo {
 		this._cachedDeprecatedFileTimestamps = undefined;
 		this._cachedDeprecatedContextTimestamps = undefined;
 
+		this._warnAboutExperimentalEsmTracking = false;
+
 		this._statCreatedSnapshots = 0;
 		this._statTestedSnapshotsCached = 0;
 		this._statTestedSnapshotsNotCached = 0;
@@ -1171,8 +1175,9 @@ class FileSystemInfo {
 							callback();
 							break;
 						}
-						this.fs.realpath(path, (err, realPath) => {
+						this.fs.realpath(path, (err, _realPath) => {
 							if (err) return callback(err);
+							const realPath = /** @type {string} */ (_realPath);
 							if (realPath !== path) {
 								resolveFiles.add(path);
 							}
@@ -1192,8 +1197,9 @@ class FileSystemInfo {
 							callback();
 							break;
 						}
-						this.fs.realpath(path, (err, realPath) => {
+						this.fs.realpath(path, (err, _realPath) => {
 							if (err) return callback(err);
+							const realPath = /** @type {string} */ (_realPath);
 							if (realPath !== path) {
 								resolveFiles.add(path);
 							}
@@ -1209,7 +1215,12 @@ class FileSystemInfo {
 						break;
 					}
 					case RBDT_FILE_DEPENDENCIES: {
-						// TODO this probably doesn't work correctly with ESM dependencies
+						// Check for known files without dependencies
+						if (/\.json5?$|\.yarn-integrity$|yarn\.lock$|\.ya?ml/.test(path)) {
+							process.nextTick(callback);
+							break;
+						}
+						// Check commonjs cache for the module
 						/** @type {NodeModule} */
 						const module = require.cache[path];
 						if (module && Array.isArray(module.children)) {
@@ -1246,15 +1257,73 @@ class FileSystemInfo {
 									});
 								}
 							}
+						} else if (supportsEsm && /\.m?js$/.test(path)) {
+							if (!this._warnAboutExperimentalEsmTracking) {
+								this.logger.info(
+									"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."
+								);
+								this._warnAboutExperimentalEsmTracking = true;
+							}
+							const lexer = require("es-module-lexer");
+							lexer.init.then(() => {
+								this.fs.readFile(path, (err, content) => {
+									if (err) return callback(err);
+									try {
+										const context = dirname(this.fs, path);
+										const source = content.toString();
+										const [imports] = lexer.parse(source);
+										for (const imp of imports) {
+											try {
+												let dependency;
+												if (imp.d === -1) {
+													// import ... from "..."
+													dependency = JSON.parse(
+														source.substring(imp.s - 1, imp.e + 1)
+													);
+												} else if (imp.d > -1) {
+													// import()
+													let expr = source.substring(imp.s, imp.e).trim();
+													if (expr[0] === "'")
+														expr = `"${expr
+															.slice(1, -1)
+															.replace(/"/g, '\\"')}"`;
+													dependency = JSON.parse(expr);
+												} else {
+													// e.g. import.meta
+													continue;
+												}
+												queue.push({
+													type: RBDT_RESOLVE_FILE,
+													context,
+													path: dependency
+												});
+											} catch (e) {
+												this.logger.warn(
+													`Parsing of ${path} for build dependencies failed at 'import(${source.substring(
+														imp.s,
+														imp.e
+													)})'.\n` +
+														"Build dependencies behind this expression are ignored and might cause incorrect cache invalidation."
+												);
+												this.logger.debug(e.stack);
+											}
+										}
+									} catch (e) {
+										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(e.stack);
+									}
+									process.nextTick(callback);
+								});
+							}, callback);
+							break;
 						} else {
-							// Unable to get dependencies from module system
-							// This may be because of an incomplete require.cache implementation like in jest
-							// Assume requires stay in directory and add the whole directory
-							const directory = dirname(this.fs, path);
-							queue.push({
-								type: RBDT_DIRECTORY,
-								path: directory
-							});
+							this.logger.log(
+								`Assuming ${path} has no dependencies as we were unable to assign it to any module system.`
+							);
 						}
 						process.nextTick(callback);
 						break;
@@ -1604,7 +1673,7 @@ class FileSystemInfo {
 								if (err) {
 									if (this.logger) {
 										this.logger.debug(
-											`Error snapshotting file timestamp hash combination of ${path}: ${err}`
+											`Error snapshotting file timestamp hash combination of ${path}: ${err.stack}`
 										);
 									}
 									jobError();
@@ -1632,7 +1701,7 @@ class FileSystemInfo {
 								if (err) {
 									if (this.logger) {
 										this.logger.debug(
-											`Error snapshotting file hash of ${path}: ${err}`
+											`Error snapshotting file hash of ${path}: ${err.stack}`
 										);
 									}
 									jobError();
@@ -1662,7 +1731,7 @@ class FileSystemInfo {
 								if (err) {
 									if (this.logger) {
 										this.logger.debug(
-											`Error snapshotting file timestamp of ${path}: ${err}`
+											`Error snapshotting file timestamp of ${path}: ${err.stack}`
 										);
 									}
 									jobError();
@@ -1698,7 +1767,7 @@ class FileSystemInfo {
 								if (err) {
 									if (this.logger) {
 										this.logger.debug(
-											`Error snapshotting context timestamp hash combination of ${path}: ${err}`
+											`Error snapshotting context timestamp hash combination of ${path}: ${err.stack}`
 										);
 									}
 									jobError();
@@ -1726,7 +1795,7 @@ class FileSystemInfo {
 								if (err) {
 									if (this.logger) {
 										this.logger.debug(
-											`Error snapshotting context hash of ${path}: ${err}`
+											`Error snapshotting context hash of ${path}: ${err.stack}`
 										);
 									}
 									jobError();
@@ -1756,7 +1825,7 @@ class FileSystemInfo {
 								if (err) {
 									if (this.logger) {
 										this.logger.debug(
-											`Error snapshotting context timestamp of ${path}: ${err}`
+											`Error snapshotting context timestamp of ${path}: ${err.stack}`
 										);
 									}
 									jobError();
@@ -1789,7 +1858,7 @@ class FileSystemInfo {
 						if (err) {
 							if (this.logger) {
 								this.logger.debug(
-									`Error snapshotting missing timestamp of ${path}: ${err}`
+									`Error snapshotting missing timestamp of ${path}: ${err.stack}`
 								);
 							}
 							jobError();
@@ -1816,7 +1885,7 @@ class FileSystemInfo {
 					if (err) {
 						if (this.logger) {
 							this.logger.debug(
-								`Error snapshotting managed item ${path}: ${err}`
+								`Error snapshotting managed item ${path}: ${err.stack}`
 							);
 						}
 						jobError();
@@ -2346,6 +2415,11 @@ class FileSystemInfo {
 					this._fileHashes.set(path, null);
 					return callback(null, null);
 				}
+				if (err.code === "ERR_FS_FILE_TOO_LARGE") {
+					this.logger.warn(`Ignoring ${path} for hashing as it's very large`);
+					this._fileHashes.set(path, "too large");
+					return callback(null, "too large");
+				}
 				return callback(err);
 			}
 
@@ -2405,7 +2479,7 @@ class FileSystemInfo {
 	}
 
 	_readContextTimestamp(path, callback) {
-		this.fs.readdir(path, (err, files) => {
+		this.fs.readdir(path, (err, _files) => {
 			if (err) {
 				if (err.code === "ENOENT") {
 					this._contextTimestamps.set(path, null);
@@ -2414,7 +2488,7 @@ class FileSystemInfo {
 				}
 				return callback(err);
 			}
-			files = files
+			const files = /** @type {string[]} */ (_files)
 				.map(file => file.normalize("NFC"))
 				.filter(file => !/^\./.test(file))
 				.sort();
@@ -2501,7 +2575,7 @@ class FileSystemInfo {
 	}
 
 	_readContextHash(path, callback) {
-		this.fs.readdir(path, (err, files) => {
+		this.fs.readdir(path, (err, _files) => {
 			if (err) {
 				if (err.code === "ENOENT") {
 					this._contextHashes.set(path, null);
@@ -2509,7 +2583,7 @@ class FileSystemInfo {
 				}
 				return callback(err);
 			}
-			files = files
+			const files = /** @type {string[]} */ (_files)
 				.map(file => file.normalize("NFC"))
 				.filter(file => !/^\./.test(file))
 				.sort();
@@ -2624,7 +2698,9 @@ class FileSystemInfo {
 				return callback(err);
 			}
 			const set = new Set(
-				elements.map(element => join(this.fs, path, element))
+				/** @type {string[]} */ (elements).map(element =>
+					join(this.fs, path, element)
+				)
 			);
 			callback(null, set);
 		});

package/lib/MultiCompiler.js

@@ -226,6 +226,7 @@ module.exports = class MultiCompiler {
 				}
 			}
 		}
+		/** @type {string[]} */
 		const errors = missing.map(m => `Compiler dependency \`${m}\` not found.`);
 		const stack = this.compilers.filter(c => !targetFound(c));
 		while (stack.length > 0) {
@@ -241,6 +242,7 @@ module.exports = class MultiCompiler {
 			}
 		}
 		if (edges.size > 0) {
+			/** @type {string[]} */
 			const lines = Array.from(edges)
 				.sort(sortEdges)
 				.map(edge => `${edge.source.name} -> ${edge.target.name}`);

package/lib/WatchIgnorePlugin.js

@@ -10,10 +10,15 @@ const schema = require("../schemas/plugins/WatchIgnorePlugin.json");
 
 /** @typedef {import("../declarations/plugins/WatchIgnorePlugin").WatchIgnorePluginOptions} WatchIgnorePluginOptions */
 /** @typedef {import("./Compiler")} Compiler */
+/** @typedef {import("./util/fs").WatchFileSystem} WatchFileSystem */
 
 const IGNORE_TIME_ENTRY = "ignore";
 
 class IgnoringWatchFileSystem {
+	/**
+	 * @param {WatchFileSystem} wfs original file system
+	 * @param {(string|RegExp)[]} paths ignored paths
+	 */
 	constructor(wfs, paths) {
 		this.wfs = wfs;
 		this.paths = paths;
@@ -63,7 +68,7 @@ class IgnoringWatchFileSystem {
 			close: () => watcher.close(),
 			pause: () => watcher.pause(),
 			getContextTimeInfoEntries: () => {
-				const dirTimestamps = watcher.getContextInfoEntries();
+				const dirTimestamps = watcher.getContextTimeInfoEntries();
 				for (const path of ignoredDirs) {
 					dirTimestamps.set(path, IGNORE_TIME_ENTRY);
 				}

package/lib/cache/PackFileCacheStrategy.js

@@ -1072,18 +1072,18 @@ class PackFileCacheStrategy {
 				return promise.then(() => {
 					if (reportProgress) reportProgress(0.8, "serialize pack");
 					this.logger.time(`store pack`);
+					const updatedBuildDependencies = new Set(this.buildDependencies);
+					for (const dep of newBuildDependencies) {
+						updatedBuildDependencies.add(dep);
+					}
 					const content = new PackContainer(
 						pack,
 						this.version,
 						this.buildSnapshot,
-						this.buildDependencies,
+						updatedBuildDependencies,
 						this.resolveResults,
 						this.resolveBuildDependenciesSnapshot
 					);
-					// You might think this breaks all access to the existing pack
-					// which are still referenced, but serializing the pack memorizes
-					// all data in the pack and makes it no longer need the backing file
-					// So it's safe to replace the pack file
 					return this.fileSerializer
 						.serialize(content, {
 							filename: `${this.cacheLocation}/index.pack`,

package/lib/ids/IdHelpers.js

@@ -77,9 +77,14 @@ const shortenLongString = (string, delimiter) => {
  * @returns {string} short module name
  */
 const getShortModuleName = (module, context, associatedObjectForCache) => {
-	return avoidNumber(
-		module.libIdent({ context, associatedObjectForCache }) || ""
-	);
+	const libIdent = module.libIdent({ context, associatedObjectForCache });
+	if (libIdent) return avoidNumber(libIdent);
+	const nameForCondition = module.nameForCondition();
+	if (nameForCondition)
+		return avoidNumber(
+			makePathsRelative(context, nameForCondition, associatedObjectForCache)
+		);
+	return "";
 };
 exports.getShortModuleName = getShortModuleName;
 

package/lib/serialization/FileMiddleware.js

@@ -441,7 +441,7 @@ class FileMiddleware extends SerializerMiddleware {
 						reject(err);
 						return;
 					}
-					let remaining = stats.size;
+					let remaining = /** @type {number} */ (stats.size);
 					let currentBuffer;
 					let currentBufferUsed;
 					const buf = [];

package/lib/stats/DefaultStatsPrinterPlugin.js

@@ -11,6 +11,12 @@
 
 const plural = (n, singular, plural) => (n === 1 ? singular : plural);
 
+/**
+ * @param {Record<string, number>} sizes sizes by source type
+ * @param {Object} options options
+ * @param {(number) => string=} options.formatSize size formatter
+ * @returns {string} text
+ */
 const printSizes = (sizes, { formatSize = n => `${n}` }) => {
 	const keys = Object.keys(sizes);
 	if (keys.length > 1) {

package/lib/util/fs.js

@@ -7,25 +7,65 @@
 
 const path = require("path");
 
-/** @typedef {import("fs").Stats} NodeFsStats */
 /** @typedef {import("../../declarations/WebpackOptions").WatchOptions} WatchOptions */
 /** @typedef {import("../FileSystemInfo").FileSystemInfoEntry} FileSystemInfoEntry */
 
+/**
+ * @typedef {Object} IStats
+ * @property {() => boolean} isFile
+ * @property {() => boolean} isDirectory
+ * @property {() => boolean} isBlockDevice
+ * @property {() => boolean} isCharacterDevice
+ * @property {() => boolean} isSymbolicLink
+ * @property {() => boolean} isFIFO
+ * @property {() => boolean} isSocket
+ * @property {number | bigint} dev
+ * @property {number | bigint} ino
+ * @property {number | bigint} mode
+ * @property {number | bigint} nlink
+ * @property {number | bigint} uid
+ * @property {number | bigint} gid
+ * @property {number | bigint} rdev
+ * @property {number | bigint} size
+ * @property {number | bigint} blksize
+ * @property {number | bigint} blocks
+ * @property {number | bigint} atimeMs
+ * @property {number | bigint} mtimeMs
+ * @property {number | bigint} ctimeMs
+ * @property {number | bigint} birthtimeMs
+ * @property {Date} atime
+ * @property {Date} mtime
+ * @property {Date} ctime
+ * @property {Date} birthtime
+ */
+
+/**
+ * @typedef {Object} IDirent
+ * @property {() => boolean} isFile
+ * @property {() => boolean} isDirectory
+ * @property {() => boolean} isBlockDevice
+ * @property {() => boolean} isCharacterDevice
+ * @property {() => boolean} isSymbolicLink
+ * @property {() => boolean} isFIFO
+ * @property {() => boolean} isSocket
+ * @property {string | Buffer} name
+ */
+
 /** @typedef {function(NodeJS.ErrnoException=): void} Callback */
 /** @typedef {function(NodeJS.ErrnoException=, Buffer=): void} BufferCallback */
 /** @typedef {function(NodeJS.ErrnoException=, Buffer|string=): void} BufferOrStringCallback */
-/** @typedef {function(NodeJS.ErrnoException=, string[]=): void} StringArrayCallback */
+/** @typedef {function(NodeJS.ErrnoException=, (string | Buffer)[] | IDirent[]=): void} DirentArrayCallback */
 /** @typedef {function(NodeJS.ErrnoException=, string=): void} StringCallback */
 /** @typedef {function(NodeJS.ErrnoException=, number=): void} NumberCallback */
-/** @typedef {function(NodeJS.ErrnoException=, NodeFsStats=): void} StatsCallback */
+/** @typedef {function(NodeJS.ErrnoException=, IStats=): void} StatsCallback */
 /** @typedef {function((NodeJS.ErrnoException | Error)=, any=): void} ReadJsonCallback */
 
 /**
  * @typedef {Object} Watcher
  * @property {function(): void} close closes the watcher and all underlying file watchers
  * @property {function(): void} pause closes the watcher, but keeps underlying file watchers alive until the next watch call
- * @property {function(): Map<string, FileSystemInfoEntry>} getFileTimeInfoEntries get info about files
- * @property {function(): Map<string, FileSystemInfoEntry>} getContextTimeInfoEntries get info about directories
+ * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getFileTimeInfoEntries get info about files
+ * @property {function(): Map<string, FileSystemInfoEntry | "ignore">} getContextTimeInfoEntries get info about directories
  */
 
 /**
@@ -35,7 +75,7 @@ const path = require("path");
  * @param {Iterable<string>} missing watched exitance entries
  * @param {number} startTime timestamp of start time
  * @param {WatchOptions} options options object
- * @param {function(Error=, Map<string, FileSystemInfoEntry>, Map<string, FileSystemInfoEntry>, Set<string>, Set<string>): void} callback aggregated callback
+ * @param {function(Error=, Map<string, FileSystemInfoEntry | "ignore">, Map<string, FileSystemInfoEntry | "ignore">, Set<string>, Set<string>): void} callback aggregated callback
  * @param {function(string, number): void} callbackUndelayed callback when the first change was detected
  * @returns {Watcher} a watcher
  */
@@ -45,7 +85,7 @@ const path = require("path");
  * @property {function(string, Buffer|string, Callback): void} writeFile
  * @property {function(string, Callback): void} mkdir
  * @property {function(string, StatsCallback): void} stat
- * @property {function(string, BufferCallback): void} readFile
+ * @property {function(string, BufferOrStringCallback): void} readFile
  * @property {(function(string, string): string)=} join
  * @property {(function(string, string): string)=} relative
  * @property {(function(string): string)=} dirname
@@ -53,12 +93,12 @@ const path = require("path");
 
 /**
  * @typedef {Object} InputFileSystem
- * @property {function(string, BufferCallback): void} readFile
+ * @property {function(string, BufferOrStringCallback): void} readFile
  * @property {(function(string, ReadJsonCallback): void)=} readJson
  * @property {function(string, BufferOrStringCallback): void} readlink
- * @property {function(string, StringArrayCallback): void} readdir
+ * @property {function(string, DirentArrayCallback): void} readdir
  * @property {function(string, StatsCallback): void} stat
- * @property {(function(string, StringCallback): void)=} realpath
+ * @property {(function(string, BufferOrStringCallback): void)=} realpath
  * @property {(function(string=): void)=} purge
  * @property {(function(string, string): string)=} join
  * @property {(function(string, string): string)=} relative
@@ -73,7 +113,7 @@ const path = require("path");
 /**
  * @typedef {Object} IntermediateFileSystemExtras
  * @property {function(string): void} mkdirSync
- * @property {function(string): import("fs").WriteStream} createWriteStream
+ * @property {function(string): NodeJS.WritableStream} createWriteStream
  * @property {function(string, string, NumberCallback): void} open
  * @property {function(number, Buffer, number, number, number, NumberCallback): void} read
  * @property {function(number, Callback): void} close

package/lib/wasm-sync/WebAssemblyGenerator.js

@@ -10,9 +10,7 @@ const Generator = require("../Generator");
 const WebAssemblyUtils = require("./WebAssemblyUtils");
 
 const t = require("@webassemblyjs/ast");
-const {
-	moduleContextFromModuleAST
-} = require("@webassemblyjs/helper-module-context");
+const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { editWithAST, addWithAST } = require("@webassemblyjs/wasm-edit");
 const { decode } = require("@webassemblyjs/wasm-parser");
 

package/lib/wasm-sync/WebAssemblyParser.js

@@ -6,9 +6,7 @@
 "use strict";
 
 const t = require("@webassemblyjs/ast");
-const {
-	moduleContextFromModuleAST
-} = require("@webassemblyjs/helper-module-context");
+const { moduleContextFromModuleAST } = require("@webassemblyjs/ast");
 const { decode } = require("@webassemblyjs/wasm-parser");
 const Parser = require("../Parser");
 const StaticExportsDependency = require("../dependencies/StaticExportsDependency");