webpack 5.99.9 → 5.100.1

package/lib/ExportsInfo.js

@@ -159,8 +159,9 @@ class ExportsInfo {
 	 * @returns {ExportInfo} the export info of unlisted exports
 	 */
 	get otherExportsInfo() {
-		if (this._redirectTo !== undefined)
+		if (this._redirectTo !== undefined) {
 			return this._redirectTo.otherExportsInfo;
+		}
 		return this._otherExportsInfo;
 	}
 
@@ -259,8 +260,9 @@ class ExportsInfo {
 	getExportInfo(name) {
 		const info = this._exports.get(name);
 		if (info !== undefined) return info;
-		if (this._redirectTo !== undefined)
+		if (this._redirectTo !== undefined) {
 			return this._redirectTo.getExportInfo(name);
+		}
 		const newInfo = new ExportInfo(name, this._otherExportsInfo);
 		this._exports.set(name, newInfo);
 		this._exportsAreOrdered = false;
@@ -274,8 +276,9 @@ class ExportsInfo {
 	getReadOnlyExportInfo(name) {
 		const info = this._exports.get(name);
 		if (info !== undefined) return info;
-		if (this._redirectTo !== undefined)
+		if (this._redirectTo !== undefined) {
 			return this._redirectTo.getReadOnlyExportInfo(name);
+		}
 		return this._otherExportsInfo;
 	}
 
@@ -494,8 +497,9 @@ class ExportsInfo {
 	 */
 	isModuleUsed(runtime) {
 		if (this.isUsed(runtime)) return true;
-		if (this._sideEffectsOnlyInfo.getUsed(runtime) !== UsageState.Unused)
+		if (this._sideEffectsOnlyInfo.getUsed(runtime) !== UsageState.Unused) {
 			return true;
+		}
 		return false;
 	}
 
@@ -504,17 +508,15 @@ class ExportsInfo {
 	 * @returns {SortableSet<string> | boolean | null} set of used exports, or true (when namespace object is used), or false (when unused), or null (when unknown)
 	 */
 	getUsedExports(runtime) {
-		// eslint-disable-next-line no-constant-binary-expression
-		if (!this._redirectTo !== undefined) {
-			switch (this._otherExportsInfo.getUsed(runtime)) {
-				case UsageState.NoInfo:
-					return null;
-				case UsageState.Unknown:
-				case UsageState.OnlyPropertiesUsed:
-				case UsageState.Used:
-					return true;
-			}
+		switch (this._otherExportsInfo.getUsed(runtime)) {
+			case UsageState.NoInfo:
+				return null;
+			case UsageState.Unknown:
+			case UsageState.OnlyPropertiesUsed:
+			case UsageState.Used:
+				return true;
 		}
+
 		const array = [];
 		if (!this._exportsAreOrdered) this._sortExports();
 		for (const exportInfo of this._exports.values()) {
@@ -553,17 +555,15 @@ class ExportsInfo {
 	 * @returns {null | true | string[]} list of exports when known
 	 */
 	getProvidedExports() {
-		// eslint-disable-next-line no-constant-binary-expression
-		if (!this._redirectTo !== undefined) {
-			switch (this._otherExportsInfo.provided) {
-				case undefined:
-					return null;
-				case null:
-					return true;
-				case true:
-					return true;
-			}
+		switch (this._otherExportsInfo.provided) {
+			case undefined:
+				return null;
+			case null:
+				return true;
+			case true:
+				return true;
 		}
+
 		/** @type {string[]} */
 		const array = [];
 		if (!this._exportsAreOrdered) this._sortExports();
@@ -671,8 +671,9 @@ class ExportsInfo {
 			return false;
 		}
 		for (const exportInfo of this.ownedExports) {
-			if (exportInfo.getUsed(runtimeA) !== exportInfo.getUsed(runtimeB))
+			if (exportInfo.getUsed(runtimeA) !== exportInfo.getUsed(runtimeB)) {
 				return false;
+			}
 		}
 		return true;
 	}
@@ -722,9 +723,9 @@ class ExportsInfo {
 			) {
 				const nested = info.exportsInfo.getUsedName(name.slice(1), runtime);
 				if (!nested) return false;
-				return arr.concat(nested);
+				return [...arr, ...(Array.isArray(nested) ? nested : [nested])];
 			}
-			return arr.concat(name.slice(1));
+			return [...arr, ...name.slice(1)];
 		}
 		const info = this.getReadOnlyExportInfo(name);
 		const usedName = info.getUsedName(name, runtime);
@@ -832,7 +833,7 @@ class ExportsInfo {
 
 /** @typedef {Map<string, RuntimeUsageStateType>} UsedInRuntime */
 
-/** @typedef {{ module: Module, export: string[] }} TargetItemWithoutConnection */
+/** @typedef {{ module: Module, export: string[], deferred: boolean }} TargetItemWithoutConnection */
 
 /** @typedef {{ module: Module, connection: ModuleGraphConnection, export: string[] | undefined }} TargetItemWithConnection */
 
@@ -1245,7 +1246,7 @@ class ExportInfo {
 					}
 				} else if (
 					runtime !== undefined &&
-					Array.from(runtime).every(
+					[...runtime].every(
 						runtime =>
 							!(/** @type {UsedInRuntime} */ (this._usedInRuntime).has(runtime))
 					)
@@ -1294,8 +1295,9 @@ class ExportInfo {
 
 	_getMaxTarget() {
 		if (this._maxTarget !== undefined) return this._maxTarget;
-		if (/** @type {Target} */ (this._target).size <= 1)
+		if (/** @type {Target} */ (this._target).size <= 1) {
 			return (this._maxTarget = this._target);
+		}
 		let maxPriority = -Infinity;
 		let minPriority = Infinity;
 		for (const { priority } of /** @type {Target} */ (this._target).values()) {
@@ -1341,7 +1343,10 @@ class ExportInfo {
 		/** @type {TargetItemWithoutConnection} */
 		let target = {
 			module: rawTarget.connection.module,
-			export: rawTarget.export
+			export: rawTarget.export,
+			deferred: Boolean(
+				rawTarget.connection.dependency && rawTarget.connection.dependency.defer
+			)
 		};
 		for (;;) {
 			if (validTargetModuleFilter(target.module)) return target;
@@ -1360,8 +1365,9 @@ class ExportInfo {
 				target = {
 					module: newTarget.module,
 					export: newTarget.export
-						? newTarget.export.concat(target.export.slice(1))
-						: target.export.slice(1)
+						? [...newTarget.export, ...target.export.slice(1)]
+						: target.export.slice(1),
+					deferred: newTarget.deferred
 				};
 			}
 		}
@@ -1433,10 +1439,11 @@ class ExportInfo {
 						module: newTarget.module,
 						connection: newTarget.connection,
 						export: newTarget.export
-							? newTarget.export.concat(
-									/** @type {NonNullable<TargetItemWithConnection["export"]>} */
+							? [
+									...newTarget.export,
+									.../** @type {NonNullable<TargetItemWithConnection["export"]>} */
 									(target.export).slice(1)
-								)
+								]
 							: /** @type {NonNullable<TargetItemWithConnection["export"]>} */
 								(target.export).slice(1)
 					};
@@ -1468,8 +1475,9 @@ class ExportInfo {
 			if (
 				target.export &&
 				!equals(/** @type {ArrayLike<string>} */ (t.export), target.export)
-			)
+			) {
 				return;
+			}
 			result = values.next();
 		}
 		return target;
@@ -1517,8 +1525,9 @@ class ExportInfo {
 	 * @returns {ExportsInfo} an exports info
 	 */
 	createNestedExportsInfo() {
-		if (this.exportsInfoOwned)
+		if (this.exportsInfoOwned) {
 			return /** @type {ExportsInfo} */ (this.exportsInfo);
+		}
 		this.exportsInfoOwned = true;
 		const oldExportsInfo = this.exportsInfo;
 		this.exportsInfo = new ExportsInfo();
@@ -1671,5 +1680,5 @@ class ExportInfo {
 
 module.exports = ExportsInfo;
 module.exports.ExportInfo = ExportInfo;
-module.exports.UsageState = UsageState;
 module.exports.RestoreProvidedData = RestoreProvidedData;
+module.exports.UsageState = UsageState;

package/lib/ExternalModule.js

@@ -12,9 +12,9 @@ const { UsageState } = require("./ExportsInfo");
 const InitFragment = require("./InitFragment");
 const Module = require("./Module");
 const {
-	JS_TYPES,
+	CSS_IMPORT_TYPES,
 	CSS_URL_TYPES,
-	CSS_IMPORT_TYPES
+	JS_TYPES
 } = require("./ModuleSourceTypesConstants");
 const { JAVASCRIPT_MODULE_TYPE_DYNAMIC } = require("./ModuleTypeConstants");
 const RuntimeGlobals = require("./RuntimeGlobals");
@@ -352,8 +352,9 @@ const getSourceForModuleExternal = (
 	runtimeTemplate,
 	dependencyMeta
 ) => {
-	if (!Array.isArray(moduleAndSpecifiers))
+	if (!Array.isArray(moduleAndSpecifiers)) {
 		moduleAndSpecifiers = [moduleAndSpecifiers];
+	}
 	const initFragment = new ModuleExternalInitFragment(
 		moduleAndSpecifiers[0],
 		undefined,
@@ -587,7 +588,7 @@ class ExternalModule extends Module {
 		this.buildInfo = {
 			strict: true,
 			topLevelDeclarations: new Set(),
-			module: compilation.outputOptions.module
+			javascriptModule: compilation.outputOptions.module
 		};
 		const { request, externalType } = this._getRequestAndExternalType();
 		this.buildMeta.exportsType = "dynamic";
@@ -604,7 +605,7 @@ class ExternalModule extends Module {
 				}
 				break;
 			case "module":
-				if (this.buildInfo.module) {
+				if (this.buildInfo.javascriptModule) {
 					if (!Array.isArray(request) || request.length === 1) {
 						this.buildMeta.exportsType = "namespace";
 						canMangle = true;
@@ -668,7 +669,7 @@ class ExternalModule extends Module {
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
-	getConcatenationBailoutReason({ moduleGraph }) {
+	getConcatenationBailoutReason(context) {
 		switch (this.externalType) {
 			case "amd":
 			case "amd-require":
@@ -683,8 +684,9 @@ class ExternalModule extends Module {
 
 	_getRequestAndExternalType() {
 		let { request, externalType } = this;
-		if (typeof request === "object" && !Array.isArray(request))
+		if (typeof request === "object" && !Array.isArray(request)) {
 			request = request[externalType];
+		}
 		externalType = this._resolveExternalType(externalType);
 		return { request, externalType };
 	}
@@ -758,7 +760,7 @@ class ExternalModule extends Module {
 			case "commonjs-static":
 				return getSourceForCommonJsExternal(request);
 			case "node-commonjs":
-				return /** @type {BuildInfo} */ (this.buildInfo).module
+				return /** @type {BuildInfo} */ (this.buildInfo).javascriptModule
 					? getSourceForCommonJsExternalInNodeModule(
 							request,
 							/** @type {string} */
@@ -790,7 +792,7 @@ class ExternalModule extends Module {
 			case "script":
 				return getSourceForScriptExternal(request, runtimeTemplate);
 			case "module": {
-				if (!(/** @type {BuildInfo} */ (this.buildInfo).module)) {
+				if (!(/** @type {BuildInfo} */ (this.buildInfo).javascriptModule)) {
 					if (!runtimeTemplate.supportsDynamicImport()) {
 						throw new Error(
 							`The target environment doesn't support dynamic import() syntax so it's not possible to use external type 'module' within a script${
@@ -900,8 +902,9 @@ class ExternalModule extends Module {
 				);
 
 				let sourceString = sourceData.expression;
-				if (sourceData.iife)
+				if (sourceData.iife) {
 					sourceString = `(function() { return ${sourceString}; }())`;
+				}
 				if (concatenationScope) {
 					sourceString = `${
 						runtimeTemplate.supportsConst() ? "const" : "var"
@@ -912,8 +915,9 @@ class ExternalModule extends Module {
 				} else {
 					sourceString = `module.exports = ${sourceString};`;
 				}
-				if (sourceData.init)
+				if (sourceData.init) {
 					sourceString = `${sourceData.init}\n${sourceString}`;
+				}
 
 				let data;
 				if (sourceData.chunkInitFragments) {

package/lib/ExternalModuleFactoryPlugin.js

@@ -12,7 +12,7 @@ const CssImportDependency = require("./dependencies/CssImportDependency");
 const CssUrlDependency = require("./dependencies/CssUrlDependency");
 const HarmonyImportDependency = require("./dependencies/HarmonyImportDependency");
 const ImportDependency = require("./dependencies/ImportDependency");
-const { resolveByProperty, cachedSetProperty } = require("./util/cleverMerge");
+const { cachedSetProperty, resolveByProperty } = require("./util/cleverMerge");
 
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemFunctionData} ExternalItemFunctionData */
 /** @typedef {import("../declarations/WebpackOptions").ExternalItemObjectKnown} ExternalItemObjectKnown */
@@ -75,6 +75,8 @@ const resolveLayer = (obj, layer) => {
 /** @typedef {string | string[] | boolean | Record<string, string | string[]>} ExternalValue */
 /** @typedef {string | undefined} ExternalType */
 
+const PLUGIN_NAME = "ExternalModuleFactoryPlugin";
+
 class ExternalModuleFactoryPlugin {
 	/**
 	 * @param {string | undefined} type default external type
@@ -92,7 +94,7 @@ class ExternalModuleFactoryPlugin {
 	apply(normalModuleFactory) {
 		const globalType = this.type;
 		normalModuleFactory.hooks.factorize.tapAsync(
-			"ExternalModuleFactoryPlugin",
+			PLUGIN_NAME,
 			(data, callback) => {
 				const context = data.context;
 				const contextInfo = data.contextInfo;
@@ -335,4 +337,5 @@ class ExternalModuleFactoryPlugin {
 		);
 	}
 }
+
 module.exports = ExternalModuleFactoryPlugin;

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;
 	}
 
@@ -792,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++;
@@ -872,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);
 };
 
@@ -1197,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 =>
@@ -1207,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 =>
@@ -1217,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 =>
@@ -1475,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);
 		});
 	}
@@ -1893,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,
@@ -1929,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);
@@ -1943,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
@@ -1967,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` +
@@ -2025,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));
@@ -2099,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);
@@ -2109,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);
@@ -2119,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);
@@ -2129,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);
@@ -3515,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);
 
@@ -4029,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));
 				}
@@ -4048,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) {
@@ -4059,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) {