webpack 5.99.8 → 5.100.0

package/lib/FileSystemInfo.js

@@ -5,15 +5,15 @@
 
 "use strict";
 
-const { create: createResolver } = require("enhanced-resolve");
 const nodeModule = require("module");
-const asyncLib = require("neo-async");
 const { isAbsolute } = require("path");
+const { create: createResolver } = require("enhanced-resolve");
+const asyncLib = require("neo-async");
 const { DEFAULTS } = require("./config/defaults");
 const AsyncQueue = require("./util/AsyncQueue");
 const StackedCacheMap = require("./util/StackedCacheMap");
 const createHash = require("./util/createHash");
-const { join, dirname, relative, lstatReadlinkAbsolute } = require("./util/fs");
+const { dirname, join, lstatReadlinkAbsolute, relative } = require("./util/fs");
 const makeSerializable = require("./util/makeSerializable");
 const processAsyncTree = require("./util/processAsyncTree");
 
@@ -313,7 +313,7 @@ class Snapshot {
 	 * @param {number} value start value
 	 */
 	setStartTime(value) {
-		this._flags = this._flags | 1;
+		this._flags |= 1;
 		this.startTime = value;
 	}
 
@@ -350,7 +350,7 @@ class Snapshot {
 	 * @param {FileTimestamps} value file timestamps
 	 */
 	setFileTimestamps(value) {
-		this._flags = this._flags | 2;
+		this._flags |= 2;
 		this.fileTimestamps = value;
 	}
 
@@ -362,7 +362,7 @@ class Snapshot {
 	 * @param {FileHashes} value file hashes
 	 */
 	setFileHashes(value) {
-		this._flags = this._flags | 4;
+		this._flags |= 4;
 		this.fileHashes = value;
 	}
 
@@ -374,7 +374,7 @@ class Snapshot {
 	 * @param {FileTshs} value file tshs
 	 */
 	setFileTshs(value) {
-		this._flags = this._flags | 8;
+		this._flags |= 8;
 		this.fileTshs = value;
 	}
 
@@ -386,7 +386,7 @@ class Snapshot {
 	 * @param {ContextTimestamps} value context timestamps
 	 */
 	setContextTimestamps(value) {
-		this._flags = this._flags | 0x10;
+		this._flags |= 0x10;
 		this.contextTimestamps = value;
 	}
 
@@ -398,7 +398,7 @@ class Snapshot {
 	 * @param {ContextHashes} value context hashes
 	 */
 	setContextHashes(value) {
-		this._flags = this._flags | 0x20;
+		this._flags |= 0x20;
 		this.contextHashes = value;
 	}
 
@@ -410,7 +410,7 @@ class Snapshot {
 	 * @param {ContextTshs} value context tshs
 	 */
 	setContextTshs(value) {
-		this._flags = this._flags | 0x40;
+		this._flags |= 0x40;
 		this.contextTshs = value;
 	}
 
@@ -422,7 +422,7 @@ class Snapshot {
 	 * @param {MissingExistence} value context tshs
 	 */
 	setMissingExistence(value) {
-		this._flags = this._flags | 0x80;
+		this._flags |= 0x80;
 		this.missingExistence = value;
 	}
 
@@ -434,7 +434,7 @@ class Snapshot {
 	 * @param {ManagedItemInfo} value managed item info
 	 */
 	setManagedItemInfo(value) {
-		this._flags = this._flags | 0x100;
+		this._flags |= 0x100;
 		this.managedItemInfo = value;
 	}
 
@@ -446,7 +446,7 @@ class Snapshot {
 	 * @param {ManagedFiles} value managed files
 	 */
 	setManagedFiles(value) {
-		this._flags = this._flags | 0x200;
+		this._flags |= 0x200;
 		this.managedFiles = value;
 	}
 
@@ -458,7 +458,7 @@ class Snapshot {
 	 * @param {ManagedContexts} value managed contexts
 	 */
 	setManagedContexts(value) {
-		this._flags = this._flags | 0x400;
+		this._flags |= 0x400;
 		this.managedContexts = value;
 	}
 
@@ -470,7 +470,7 @@ class Snapshot {
 	 * @param {ManagedMissing} value managed missing
 	 */
 	setManagedMissing(value) {
-		this._flags = this._flags | 0x800;
+		this._flags |= 0x800;
 		this.managedMissing = value;
 	}
 
@@ -482,7 +482,7 @@ class Snapshot {
 	 * @param {Children} value children
 	 */
 	setChildren(value) {
-		this._flags = this._flags | 0x1000;
+		this._flags |= 0x1000;
 		this.children = value;
 	}
 
@@ -708,7 +708,6 @@ class SnapshotOptimization {
 					};
 				}
 				this._map.set(path, newOptimizationEntry);
-				continue;
 			} else {
 				optimizationEntries.add(optimizationEntry);
 			}
@@ -742,7 +741,6 @@ class SnapshotOptimization {
 							continue optimizationEntriesLabel;
 						}
 						nonSharedFiles.add(path);
-						continue;
 					}
 				}
 				if (nonSharedFiles.size === 0) {
@@ -794,8 +792,9 @@ class SnapshotOptimization {
 						snapshotContent: new Set(commonMap.keys()),
 						children: undefined
 					};
-					if (optimizationEntry.children === undefined)
+					if (optimizationEntry.children === undefined) {
 						optimizationEntry.children = new Set();
+					}
 					optimizationEntry.children.add(newEntry);
 					storeOptimizationEntry(newEntry);
 					this._statSharedSnapshots++;
@@ -874,8 +873,9 @@ class SnapshotOptimization {
  * @returns {string} result
  */
 const parseString = str => {
-	if (str[0] === "'" || str[0] === "`")
+	if (str[0] === "'" || str[0] === "`") {
 		str = `"${str.slice(1, -1).replace(/"/g, '\\"')}"`;
+	}
 	return JSON.parse(str);
 };
 
@@ -1199,7 +1199,7 @@ class FileSystemInfo {
 			parallelism: 10,
 			processor: this._getManagedItemDirectoryInfo.bind(this)
 		});
-		const _unmanagedPaths = Array.from(unmanagedPaths);
+		const _unmanagedPaths = [...unmanagedPaths];
 		this.unmanagedPathsWithSlash =
 			/** @type {string[]} */
 			(_unmanagedPaths.filter(p => typeof p === "string")).map(p =>
@@ -1209,7 +1209,7 @@ class FileSystemInfo {
 			/** @type {RegExp[]} */
 			(_unmanagedPaths.filter(p => typeof p !== "string"));
 
-		this.managedPaths = Array.from(managedPaths);
+		this.managedPaths = [...managedPaths];
 		this.managedPathsWithSlash =
 			/** @type {string[]} */
 			(this.managedPaths.filter(p => typeof p === "string")).map(p =>
@@ -1219,7 +1219,7 @@ class FileSystemInfo {
 		this.managedPathsRegExps =
 			/** @type {RegExp[]} */
 			(this.managedPaths.filter(p => typeof p !== "string"));
-		this.immutablePaths = Array.from(immutablePaths);
+		this.immutablePaths = [...immutablePaths];
 		this.immutablePathsWithSlash =
 			/** @type {string[]} */
 			(this.immutablePaths.filter(p => typeof p === "string")).map(p =>
@@ -1477,16 +1477,18 @@ class FileSystemInfo {
 		const cache = this._contextHashes.get(path);
 		if (cache !== undefined) {
 			const resolved = getResolvedHash(cache);
-			if (resolved !== undefined)
+			if (resolved !== undefined) {
 				return callback(null, /** @type {string} */ (resolved));
+			}
 			return this._resolveContextHash(cache, callback);
 		}
 		this.contextHashQueue.add(path, (err, _entry) => {
 			if (err) return callback(err);
 			const entry = /** @type {ContextHash} */ (_entry);
 			const resolved = getResolvedHash(entry);
-			if (resolved !== undefined)
+			if (resolved !== undefined) {
 				return callback(null, /** @type {string} */ (resolved));
+			}
 			this._resolveContextHash(entry, callback);
 		});
 	}
@@ -1895,8 +1897,9 @@ class FileSystemInfo {
 												});
 											}
 											let request = subPath.replace(/\\/g, "/");
-											if (request.endsWith(".js"))
+											if (request.endsWith(".js")) {
 												request = request.slice(0, -3);
+											}
 											push({
 												type: RBDT_RESOLVE_CJS_FILE_AS_CHILD,
 												context,
@@ -1931,7 +1934,9 @@ class FileSystemInfo {
 								);
 								this._warnAboutExperimentalEsmTracking = true;
 							}
+
 							const lexer = require("es-module-lexer");
+
 							lexer.init.then(() => {
 								this.fs.readFile(path, (err, content) => {
 									if (err) return callback(err);
@@ -1945,11 +1950,11 @@ class FileSystemInfo {
 												if (imp.d === -1) {
 													// import ... from "..."
 													dependency = parseString(
-														source.substring(imp.s - 1, imp.e + 1)
+														source.slice(imp.s - 1, imp.e + 1)
 													);
 												} else if (imp.d > -1) {
 													// import()
-													const expr = source.substring(imp.s, imp.e).trim();
+													const expr = source.slice(imp.s, imp.e).trim();
 													dependency = parseString(expr);
 												} else {
 													// e.g. import.meta
@@ -1969,7 +1974,7 @@ class FileSystemInfo {
 												});
 											} catch (err1) {
 												logger.warn(
-													`Parsing of ${path} for build dependencies failed at 'import(${source.substring(
+													`Parsing of ${path} for build dependencies failed at 'import(${source.slice(
 														imp.s,
 														imp.e
 													)})'.\n` +
@@ -2027,7 +2032,8 @@ class FileSystemInfo {
 							let packageData;
 							try {
 								packageData = JSON.parse(
-									/** @type {Buffer} */ (content).toString("utf-8")
+									/** @type {Buffer} */
+									(content).toString("utf8")
 								);
 							} catch (parseErr) {
 								return callback(/** @type {Error} */ (parseErr));
@@ -2101,8 +2107,9 @@ class FileSystemInfo {
 				switch (type) {
 					case "d":
 						resolveContext(context, path, {}, (err, _, result) => {
-							if (expectedResult === false)
+							if (expectedResult === false) {
 								return callback(err ? undefined : INVALID);
+							}
 							if (err) return callback(err);
 							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
@@ -2111,8 +2118,9 @@ class FileSystemInfo {
 						break;
 					case "f":
 						resolveCjs(context, path, {}, (err, _, result) => {
-							if (expectedResult === false)
+							if (expectedResult === false) {
 								return callback(err ? undefined : INVALID);
+							}
 							if (err) return callback(err);
 							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
@@ -2121,8 +2129,9 @@ class FileSystemInfo {
 						break;
 					case "c":
 						resolveCjsAsChild(context, path, {}, (err, _, result) => {
-							if (expectedResult === false)
+							if (expectedResult === false) {
 								return callback(err ? undefined : INVALID);
+							}
 							if (err) return callback(err);
 							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
@@ -2131,8 +2140,9 @@ class FileSystemInfo {
 						break;
 					case "e":
 						resolveEsm(context, path, {}, (err, _, result) => {
-							if (expectedResult === false)
+							if (expectedResult === false) {
 								return callback(err ? undefined : INVALID);
+							}
 							if (err) return callback(err);
 							const resultPath = /** @type {ResolveRequest} */ (result).path;
 							if (resultPath !== expectedResult) return callback(INVALID);
@@ -3517,8 +3527,9 @@ class FileSystemInfo {
 				fromFile: (file, stat, callback) => {
 					// Prefer the cached value over our new stat to report consistent results
 					const cache = this._fileTimestamps.get(file);
-					if (cache !== undefined)
+					if (cache !== undefined) {
 						return callback(null, cache === "ignore" ? null : cache);
+					}
 
 					const mtime = Number(stat.mtime);
 
@@ -4031,7 +4042,7 @@ class FileSystemInfo {
 				}
 				let data;
 				try {
-					data = JSON.parse(/** @type {Buffer} */ (content).toString("utf-8"));
+					data = JSON.parse(/** @type {Buffer} */ (content).toString("utf8"));
 				} catch (parseErr) {
 					return callback(/** @type {WebpackError} */ (parseErr));
 				}
@@ -4050,8 +4061,9 @@ class FileSystemInfo {
 	}
 
 	getDeprecatedFileTimestamps() {
-		if (this._cachedDeprecatedFileTimestamps !== undefined)
+		if (this._cachedDeprecatedFileTimestamps !== undefined) {
 			return this._cachedDeprecatedFileTimestamps;
+		}
 		/** @type {Map<string, number | null>} */
 		const map = new Map();
 		for (const [path, info] of this._fileTimestamps) {
@@ -4061,8 +4073,9 @@ class FileSystemInfo {
 	}
 
 	getDeprecatedContextTimestamps() {
-		if (this._cachedDeprecatedContextTimestamps !== undefined)
+		if (this._cachedDeprecatedContextTimestamps !== undefined) {
 			return this._cachedDeprecatedContextTimestamps;
+		}
 		/** @type {Map<string, number | null>} */
 		const map = new Map();
 		for (const [path, info] of this._contextTimestamps) {

package/lib/FlagDependencyExportsPlugin.js

@@ -200,20 +200,27 @@ class FlagDependencyExportsPlugin {
 												name = exportNameOrSpec;
 											} else {
 												name = exportNameOrSpec.name;
-												if (exportNameOrSpec.canMangle !== undefined)
+												if (exportNameOrSpec.canMangle !== undefined) {
 													canMangle = exportNameOrSpec.canMangle;
-												if (exportNameOrSpec.export !== undefined)
+												}
+												if (exportNameOrSpec.export !== undefined) {
 													fromExport = exportNameOrSpec.export;
-												if (exportNameOrSpec.exports !== undefined)
+												}
+												if (exportNameOrSpec.exports !== undefined) {
 													exports = exportNameOrSpec.exports;
-												if (exportNameOrSpec.from !== undefined)
+												}
+												if (exportNameOrSpec.from !== undefined) {
 													from = exportNameOrSpec.from;
-												if (exportNameOrSpec.priority !== undefined)
+												}
+												if (exportNameOrSpec.priority !== undefined) {
 													priority = exportNameOrSpec.priority;
-												if (exportNameOrSpec.terminalBinding !== undefined)
+												}
+												if (exportNameOrSpec.terminalBinding !== undefined) {
 													terminalBinding = exportNameOrSpec.terminalBinding;
-												if (exportNameOrSpec.hidden !== undefined)
+												}
+												if (exportNameOrSpec.hidden !== undefined) {
 													hidden = exportNameOrSpec.hidden;
+												}
 											}
 											const exportInfo = exportsInfo.getExportInfo(name);
 

package/lib/FlagDependencyUsagePlugin.js

@@ -274,7 +274,7 @@ class FlagDependencyUsagePlugin {
 							} else {
 								processReferencedModule(
 									module,
-									Array.from(referencedExports.values()),
+									[...referencedExports.values()],
 									runtime,
 									forceSideEffects
 								);

package/lib/Generator.js

@@ -9,6 +9,7 @@
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
 /** @typedef {import("./Compilation")} Compilation */
+/** @typedef {import("./Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("./ConcatenationScope")} ConcatenationScope */
 /** @typedef {import("./DependencyTemplate")} DependencyTemplate */
 /** @typedef {import("./DependencyTemplates")} DependencyTemplates */
@@ -21,6 +22,15 @@
 /** @typedef {import("./util/Hash")} Hash */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
 
+/**
+ * @template T
+ * @typedef {import("./InitFragment")<T>} InitFragment
+ */
+
+/** @typedef {Map<"url", { [key: string]: string }> & Map<"fullContentHash", string> & Map<"contentHash", string> & Map<"filename", string> & Map<"assetInfo", AssetInfo> & Map<"chunkInitFragments", InitFragment<GenerateContext>[]>} KnownGenerateContextData */
+
+/** @typedef {KnownGenerateContextData & Record<string, EXPECTED_ANY>} GenerateContextData */
+
 /**
  * @typedef {object} GenerateContext
  * @property {DependencyTemplates} dependencyTemplates mapping from dependencies to templates
@@ -32,7 +42,7 @@
  * @property {ConcatenationScope=} concatenationScope when in concatenated module, information about other concatenated modules
  * @property {CodeGenerationResults=} codeGenerationResults code generation results of other modules (need to have a codeGenerationDependency to use that)
  * @property {string} type which kind of code should be generated
- * @property {() => Map<string, TODO>=} getData get access to the code generation data
+ * @property {() => GenerateContextData=} getData get access to the code generation data
  */
 
 /**
@@ -68,6 +78,7 @@ class Generator {
 	 */
 	getTypes(module) {
 		const AbstractMethodError = require("./AbstractMethodError");
+
 		throw new AbstractMethodError();
 	}
 
@@ -80,6 +91,7 @@ class Generator {
 	 */
 	getSize(module, type) {
 		const AbstractMethodError = require("./AbstractMethodError");
+
 		throw new AbstractMethodError();
 	}
 
@@ -95,6 +107,7 @@ class Generator {
 		{ dependencyTemplates, runtimeTemplate, moduleGraph, type }
 	) {
 		const AbstractMethodError = require("./AbstractMethodError");
+
 		throw new AbstractMethodError();
 	}
 

package/lib/HookWebpackError.js

@@ -47,6 +47,7 @@ const makeWebpackError = (error, hook) => {
 	if (error instanceof WebpackError) return error;
 	return new HookWebpackError(error, hook);
 };
+
 module.exports.makeWebpackError = makeWebpackError;
 
 /**