webpack 5.99.9 → 5.100.1

package/lib/asset/AssetModulesPlugin.js

@@ -6,9 +6,9 @@
 "use strict";
 
 const {
-	ASSET_MODULE_TYPE_RESOURCE,
-	ASSET_MODULE_TYPE_INLINE,
 	ASSET_MODULE_TYPE,
+	ASSET_MODULE_TYPE_INLINE,
+	ASSET_MODULE_TYPE_RESOURCE,
 	ASSET_MODULE_TYPE_SOURCE
 } = require("../ModuleTypeConstants");
 const { cleverMerge } = require("../util/cleverMerge");
@@ -18,6 +18,7 @@ const memoize = require("../util/memoize");
 
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../../declarations/WebpackOptions").AssetParserOptions} AssetParserOptions */
+/** @typedef {import("schema-utils").Schema} Schema */
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../Compilation").AssetInfo} AssetInfo */
 /** @typedef {import("../Compiler")} Compiler */
@@ -28,10 +29,11 @@ const memoize = require("../util/memoize");
 
 /**
  * @param {string} name name of definitions
- * @returns {TODO} definition
+ * @returns {Schema} definition
  */
 const getSchema = name => {
 	const { definitions } = require("../../schemas/WebpackOptions.json");
+
 	return {
 		definitions,
 		oneOf: [{ $ref: `#/definitions/${name}` }]
@@ -44,24 +46,24 @@ const generatorValidationOptions = {
 };
 const validateGeneratorOptions = {
 	asset: createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetGeneratorOptions.check.js"),
+		require("../../schemas/plugins/asset/AssetGeneratorOptions.check"),
 		() => getSchema("AssetGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"asset/resource": createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetResourceGeneratorOptions.check.js"),
+		require("../../schemas/plugins/asset/AssetResourceGeneratorOptions.check"),
 		() => getSchema("AssetResourceGeneratorOptions"),
 		generatorValidationOptions
 	),
 	"asset/inline": createSchemaValidation(
-		require("../../schemas/plugins/asset/AssetInlineGeneratorOptions.check.js"),
+		require("../../schemas/plugins/asset/AssetInlineGeneratorOptions.check"),
 		() => getSchema("AssetInlineGeneratorOptions"),
 		generatorValidationOptions
 	)
 };
 
 const validateParserOptions = createSchemaValidation(
-	require("../../schemas/plugins/asset/AssetParserOptions.check.js"),
+	require("../../schemas/plugins/asset/AssetParserOptions.check"),
 	() => getSchema("AssetParserOptions"),
 	{
 		name: "Asset Modules Plugin",
@@ -77,7 +79,7 @@ const getAssetSourceGenerator = memoize(() =>
 );
 
 const type = ASSET_MODULE_TYPE;
-const plugin = "AssetModulesPlugin";
+const PLUGIN_NAME = "AssetModulesPlugin";
 
 class AssetModulesPlugin {
 	/**
@@ -87,11 +89,11 @@ class AssetModulesPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			plugin,
+			PLUGIN_NAME,
 			(compilation, { normalModuleFactory }) => {
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE)
-					.tap(plugin, parserOptions => {
+					.tap(PLUGIN_NAME, parserOptions => {
 						validateParserOptions(parserOptions);
 						parserOptions = cleverMerge(
 							/** @type {AssetParserOptions} */
@@ -113,21 +115,21 @@ class AssetModulesPlugin {
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_INLINE)
-					.tap(plugin, _parserOptions => {
+					.tap(PLUGIN_NAME, _parserOptions => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(true);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_RESOURCE)
-					.tap(plugin, _parserOptions => {
+					.tap(PLUGIN_NAME, _parserOptions => {
 						const AssetParser = getAssetParser();
 
 						return new AssetParser(false);
 					});
 				normalModuleFactory.hooks.createParser
 					.for(ASSET_MODULE_TYPE_SOURCE)
-					.tap(plugin, _parserOptions => {
+					.tap(PLUGIN_NAME, _parserOptions => {
 						const AssetSourceParser = getAssetSourceParser();
 
 						return new AssetSourceParser();
@@ -140,7 +142,7 @@ class AssetModulesPlugin {
 				]) {
 					normalModuleFactory.hooks.createGenerator
 						.for(type)
-						.tap(plugin, generatorOptions => {
+						.tap(PLUGIN_NAME, generatorOptions => {
 							validateGeneratorOptions[type](generatorOptions);
 
 							let dataUrl;
@@ -178,13 +180,13 @@ class AssetModulesPlugin {
 				}
 				normalModuleFactory.hooks.createGenerator
 					.for(ASSET_MODULE_TYPE_SOURCE)
-					.tap(plugin, () => {
+					.tap(PLUGIN_NAME, () => {
 						const AssetSourceGenerator = getAssetSourceGenerator();
 
 						return new AssetSourceGenerator(compilation.moduleGraph);
 					});
 
-				compilation.hooks.renderManifest.tap(plugin, (result, options) => {
+				compilation.hooks.renderManifest.tap(PLUGIN_NAME, (result, options) => {
 					const { chunkGraph } = compilation;
 					const { chunk, codeGenerationResults, runtimeTemplate } = options;
 
@@ -270,7 +272,7 @@ class AssetModulesPlugin {
 				});
 
 				compilation.hooks.prepareModuleExecution.tap(
-					"AssetModulesPlugin",
+					PLUGIN_NAME,
 					(options, context) => {
 						const { codeGenerationResult } = options;
 						const source = codeGenerationResult.sources.get(ASSET_MODULE_TYPE);

package/lib/asset/AssetSourceGenerator.js

@@ -9,10 +9,10 @@ const { RawSource } = require("webpack-sources");
 const ConcatenationScope = require("../ConcatenationScope");
 const Generator = require("../Generator");
 const {
-	NO_TYPES,
 	CSS_URL_TYPES,
+	JS_AND_CSS_URL_TYPES,
 	JS_TYPES,
-	JS_AND_CSS_URL_TYPES
+	NO_TYPES
 } = require("../ModuleSourceTypesConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 
@@ -53,7 +53,7 @@ class AssetSourceGenerator extends Generator {
 
 				const content = originalSource.source();
 				const encodedSource =
-					typeof content === "string" ? content : content.toString("utf-8");
+					typeof content === "string" ? content : content.toString("utf8");
 
 				let sourceContent;
 				if (concatenationScope) {
@@ -78,7 +78,7 @@ class AssetSourceGenerator extends Generator {
 
 				const content = originalSource.source();
 				const encodedSource =
-					typeof content === "string" ? content : content.toString("utf-8");
+					typeof content === "string" ? content : content.toString("utf8");
 
 				if (data) {
 					data.set("url", { [type]: encodedSource });

package/lib/asset/RawDataUrlModule.js

@@ -62,8 +62,9 @@ class RawDataUrlModule extends Module {
 	 * @returns {number} the estimated size of the module (must be non-zero)
 	 */
 	size(type) {
-		if (this.url === undefined)
+		if (this.url === undefined) {
 			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
+		}
 		return Math.max(1, this.url.length);
 	}
 
@@ -107,8 +108,9 @@ class RawDataUrlModule extends Module {
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
-		if (this.url === undefined)
+		if (this.url === undefined) {
 			this.url = /** @type {Buffer} */ (this.urlBuffer).toString();
+		}
 		const sources = new Map();
 		sources.set(
 			"javascript",

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -59,7 +59,7 @@ class AwaitDependenciesInitFragment extends InitFragment {
 				""
 			]);
 		}
-		const sepPromises = Array.from(promises).join(", ");
+		const sepPromises = [...promises].join(", ");
 		// TODO check if destructuring is supported
 		return Template.asString([
 			`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${sepPromises}]);`,

package/lib/buildChunkGraph.js

@@ -315,8 +315,9 @@ const visitModules = (
 					return map;
 				}
 			);
-			for (const [block, blockModules] of map)
+			for (const [block, blockModules] of map) {
 				blockModulesMap.set(block, blockModules);
+			}
 			return map.get(block);
 		}
 		logger.time("visitModules: prepare");
@@ -892,8 +893,9 @@ const visitModules = (
 	 * @returns {bigint} The mask of available modules after the chunk group
 	 */
 	const calculateResultingAvailableModules = chunkGroupInfo => {
-		if (chunkGroupInfo.resultingAvailableModules !== undefined)
+		if (chunkGroupInfo.resultingAvailableModules !== undefined) {
 			return chunkGroupInfo.resultingAvailableModules;
+		}
 
 		let resultingAvailableModules = /** @type {bigint} */ (
 			chunkGroupInfo.minAvailableModules
@@ -1345,8 +1347,9 @@ const buildChunkGraph = (compilation, inputEntrypointsAndModules) => {
 	logger.timeEnd("connectChunkGroups");
 
 	for (const [chunkGroup, chunkGroupInfo] of chunkGroupInfoMap) {
-		for (const chunk of chunkGroup.chunks)
+		for (const chunk of chunkGroup.chunks) {
 			chunk.runtime = mergeRuntime(chunk.runtime, chunkGroupInfo.runtime);
+		}
 	}
 
 	// Cleanup work

package/lib/cache/AddBuildDependenciesPlugin.js

@@ -7,6 +7,8 @@
 
 /** @typedef {import("../Compiler")} Compiler */
 
+const PLUGIN_NAME = "AddBuildDependenciesPlugin";
+
 class AddBuildDependenciesPlugin {
 	/**
 	 * @param {Iterable<string>} buildDependencies list of build dependencies
@@ -21,12 +23,9 @@ class AddBuildDependenciesPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		compiler.hooks.compilation.tap(
-			"AddBuildDependenciesPlugin",
-			compilation => {
-				compilation.buildDependencies.addAll(this.buildDependencies);
-			}
-		);
+		compiler.hooks.compilation.tap(PLUGIN_NAME, compilation => {
+			compilation.buildDependencies.addAll(this.buildDependencies);
+		});
 	}
 }
 

package/lib/cache/IdleFileCachePlugin.js

@@ -52,7 +52,7 @@ class IdleFileCachePlugin {
 		let timeSpendInStore = 0;
 		let avgTimeSpendInStore = 0;
 
-		/** @type {Map<string | typeof BUILD_DEPENDENCIES_KEY, () => Promise<void>>} */
+		/** @type {Map<string | typeof BUILD_DEPENDENCIES_KEY, () => Promise<void | void[]>>} */
 		const pendingIdleTasks = new Map();
 
 		compiler.cache.hooks.store.tap(
@@ -111,7 +111,7 @@ class IdleFileCachePlugin {
 				}
 				isIdle = false;
 				const reportProgress = ProgressPlugin.getReporter(compiler);
-				const jobs = Array.from(pendingIdleTasks.values());
+				const jobs = [...pendingIdleTasks.values()];
 				if (reportProgress) reportProgress(0, "process pending cache items");
 				const promises = jobs.map(fn => fn());
 				pendingIdleTasks.clear();
@@ -130,7 +130,7 @@ class IdleFileCachePlugin {
 			}
 		);
 
-		/** @type {Promise<TODO>} */
+		/** @type {Promise<void | void[]>} */
 		let currentIdlePromise = resolvedPromise;
 		let isIdle = false;
 		let isInitialStore = true;
@@ -146,7 +146,10 @@ class IdleFileCachePlugin {
 						promises.push(factory());
 						if (maxCount-- <= 0 || Date.now() > maxTime) break;
 					}
-					currentIdlePromise = Promise.all(promises);
+					currentIdlePromise = Promise.all(
+						/** @type {Promise<void>[]} */
+						(promises)
+					);
 					currentIdlePromise.then(() => {
 						timeSpendInStore += Date.now() - startTime;
 						// Allow to exit the process between

package/lib/cache/MemoryCachePlugin.js

@@ -55,4 +55,5 @@ class MemoryCachePlugin {
 		);
 	}
 }
+
 module.exports = MemoryCachePlugin;

package/lib/cache/MemoryWithGcCachePlugin.js

@@ -139,4 +139,5 @@ class MemoryWithGcCachePlugin {
 		);
 	}
 }
+
 module.exports = MemoryWithGcCachePlugin;

package/lib/cache/PackFileCacheStrategy.js

@@ -13,8 +13,8 @@ const LazySet = require("../util/LazySet");
 const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 const {
-	createFileSerializer,
-	NOT_SERIALIZABLE
+	NOT_SERIALIZABLE,
+	createFileSerializer
 } = require("../util/serialization");
 
 /** @typedef {import("../../declarations/WebpackOptions").SnapshotOptions} SnapshotOptions */
@@ -292,8 +292,9 @@ class Pack {
 				return pack;
 			};
 			let pack = createNextPack();
-			if (this.requestsTimeout !== undefined)
+			if (this.requestsTimeout !== undefined) {
 				clearTimeout(this.requestsTimeout);
+			}
 			for (const identifier of this.requests) {
 				if (identifier === undefined) {
 					if (ignoreNextTimeTick) {
@@ -379,7 +380,9 @@ class Pack {
 			smallUnusedContentSize > MIN_CONTENT_SIZE
 		) {
 			mergedIndices = smallUnusedContents;
-		} else return;
+		} else {
+			return;
+		}
 
 		/** @type {PackContent[] } */
 		const mergedContent = [];
@@ -690,15 +693,17 @@ class PackContentItems {
 					const durationHr = process.hrtime(start);
 					const duration = durationHr[0] * 1000 + durationHr[1] / 1e6;
 					if (duration > 1) {
-						if (duration > 500)
+						if (duration > 500) {
 							logger.error(`Serialization of '${key}': ${duration} ms`);
-						else if (duration > 50)
+						} else if (duration > 50) {
 							logger.warn(`Serialization of '${key}': ${duration} ms`);
-						else if (duration > 10)
+						} else if (duration > 10) {
 							logger.info(`Serialization of '${key}': ${duration} ms`);
-						else if (duration > 5)
+						} else if (duration > 5) {
 							logger.log(`Serialization of '${key}': ${duration} ms`);
-						else logger.debug(`Serialization of '${key}': ${duration} ms`);
+						} else {
+							logger.debug(`Serialization of '${key}': ${duration} ms`);
+						}
 					}
 				} catch (err) {
 					rollback(s);
@@ -765,15 +770,17 @@ class PackContentItems {
 				const durationHr = process.hrtime(start);
 				const duration = durationHr[0] * 1000 + durationHr[1] / 1e6;
 				if (duration > 1) {
-					if (duration > 100)
+					if (duration > 100) {
 						logger.error(`Deserialization of '${key}': ${duration} ms`);
-					else if (duration > 20)
+					} else if (duration > 20) {
 						logger.warn(`Deserialization of '${key}': ${duration} ms`);
-					else if (duration > 5)
+					} else if (duration > 5) {
 						logger.info(`Deserialization of '${key}': ${duration} ms`);
-					else if (duration > 2)
+					} else if (duration > 2) {
 						logger.log(`Deserialization of '${key}': ${duration} ms`);
-					else logger.debug(`Deserialization of '${key}': ${duration} ms`);
+					} else {
+						logger.debug(`Deserialization of '${key}': ${duration} ms`);
+					}
 				}
 				map.set(key, value);
 				key = read();
@@ -1202,7 +1209,7 @@ class PackFileCacheStrategy {
 				}
 				logger.time("check build dependencies");
 				return Promise.all([
-					new Promise((resolve, reject) => {
+					new Promise((resolve, _reject) => {
 						this.fileSystemInfo.checkSnapshotValid(
 							packContainer.buildSnapshot,
 							(err, valid) => {
@@ -1224,7 +1231,7 @@ class PackFileCacheStrategy {
 							}
 						);
 					}),
-					new Promise((resolve, reject) => {
+					new Promise((resolve, _reject) => {
 						this.fileSystemInfo.checkSnapshotValid(
 							packContainer.resolveBuildDependenciesSnapshot,
 							(err, valid) => {
@@ -1290,8 +1297,9 @@ class PackFileCacheStrategy {
 					pack.maxAge = this.maxAge;
 					this.buildSnapshot = buildSnapshot;
 					if (buildDependencies) this.buildDependencies = buildDependencies;
-					if (newBuildDependencies)
+					if (newBuildDependencies) {
 						this.newBuildDependencies.addAll(newBuildDependencies);
+					}
 					this.resolveResults = resolveResults;
 					this.resolveBuildDependenciesSnapshot =
 						resolveBuildDependenciesSnapshot;
@@ -1370,9 +1378,7 @@ class PackFileCacheStrategy {
 				if (newBuildDependencies.size > 0 || !this.buildSnapshot) {
 					if (reportProgress) reportProgress(0.5, "resolve build dependencies");
 					this.logger.debug(
-						`Capturing build dependencies... (${Array.from(
-							newBuildDependencies
-						).join(", ")})`
+						`Capturing build dependencies... (${[...newBuildDependencies].join(", ")})`
 					);
 					promise = new Promise(
 						/**

package/lib/cache/ResolverCachePlugin.js

@@ -219,15 +219,18 @@ class ResolverCachePlugin {
 							const resolveResult = withYield ? yieldResult : result;
 							// since we intercept resolve hook
 							// we still can get result in callback
-							if (withYield && result)
-								/** @type {ResolveRequest[]} */ (yieldResult).push(result);
+							if (withYield && result) {
+								/** @type {ResolveRequest[]} */
+								(yieldResult).push(result);
+							}
 							if (!snapshot) {
-								if (resolveResult)
+								if (resolveResult) {
 									return callback(
 										null,
 										/** @type {ResolveRequest} */
 										(resolveResult)
 									);
+								}
 								return callback();
 							}
 							itemCache.store(
@@ -238,12 +241,13 @@ class ResolverCachePlugin {
 								),
 								storeErr => {
 									if (storeErr) return callback(storeErr);
-									if (resolveResult)
+									if (resolveResult) {
 										return callback(
 											null,
 											/** @type {ResolveRequest} */
 											(resolveResult)
 										);
+									}
 									callback();
 								}
 							);
@@ -266,8 +270,9 @@ class ResolverCachePlugin {
 					if (
 						/** @type {ResolveOptions & { cache: boolean }} */
 						(options).cache !== true
-					)
+					) {
 						return;
+					}
 					const optionsIdent = objectToString(userOptions, false);
 					const cacheWithContext =
 						options.cacheWithContext !== undefined
@@ -323,13 +328,14 @@ class ResolverCachePlugin {
 											if (err) {
 												callback(err);
 											} else {
-												if (result)
+												if (result) {
 													for (const r of /** @type {ResolveRequest[]} */ (
 														result
 													)) {
 														/** @type {Yield} */
 														(resolveContext.yield)(r);
 													}
+												}
 												callback(null, null);
 											}
 											yields = undefined;
@@ -345,11 +351,13 @@ class ResolverCachePlugin {
 												for (let i = 0; i < definedCallbacks.length; i++) {
 													const cb = definedCallbacks[i];
 													const yield_ = /** @type {Yield[]} */ (yields)[i];
-													if (result)
+													if (result) {
 														for (const r of /** @type {ResolveRequest[]} */ (
 															result
-														))
+														)) {
 															yield_(r);
+														}
+													}
 													cb(null, null);
 												}
 											}

package/lib/cli.js

@@ -68,6 +68,8 @@ const webpackSchema = require("../schemas/WebpackOptions.json");
 
 /** @typedef {Record<string, Argument>} Flags */
 
+/** @typedef {Record<string, EXPECTED_ANY>} ObjectConfiguration */
+
 /**
  * @param {Schema=} schema a json schema to create arguments for (by default webpack schema is used)
  * @returns {Flags} object of arguments
@@ -429,10 +431,10 @@ const cliAddedItems = new WeakMap();
 /** @typedef {string | number} Property */
 
 /**
- * @param {Configuration} config configuration
+ * @param {ObjectConfiguration} config configuration
  * @param {string} schemaPath path in the config
  * @param {number | undefined} index index of value when multiple values are provided, otherwise undefined
- * @returns {{ problem?: LocalProblem, object?: TODO, property?: Property, value?: EXPECTED_OBJECT | EXPECTED_ANY[] }} problem or object with property and value
+ * @returns {{ problem?: LocalProblem, object?: ObjectConfiguration, property?: Property, value?: EXPECTED_OBJECT | EXPECTED_ANY[] }} problem or object with property and value
  */
 const getObjectAndProperty = (config, schemaPath, index = 0) => {
 	if (!schemaPath) return { value: config };
@@ -529,7 +531,7 @@ const getObjectAndProperty = (config, schemaPath, index = 0) => {
 };
 
 /**
- * @param {Configuration} config configuration
+ * @param {ObjectConfiguration} config configuration
  * @param {string} schemaPath path in the config
  * @param {ParsedValue} value parsed value
  * @param {number | undefined} index index of value when multiple values are provided, otherwise undefined
@@ -542,13 +544,14 @@ const setValue = (config, schemaPath, value, index) => {
 		index
 	);
 	if (problem) return problem;
-	object[/** @type {Property} */ (property)] = value;
+	/** @type {ObjectConfiguration} */
+	(object)[/** @type {Property} */ (property)] = value;
 	return null;
 };
 
 /**
  * @param {ArgumentConfig} argConfig processing instructions
- * @param {Configuration} config configuration
+ * @param {ObjectConfiguration} config configuration
  * @param {Value} value the value
  * @param {number | undefined} index the index if multiple values provided
  * @returns {LocalProblem | null} a problem if any
@@ -632,16 +635,18 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 			if (typeof value === "string") {
 				// cspell:word yugi
 				const match = /^\/(.*)\/([yugi]*)$/.exec(value);
-				if (match && !/[^\\]\//.test(match[1]))
+				if (match && !/[^\\]\//.test(match[1])) {
 					return new RegExp(match[1], match[2]);
+				}
 			}
 			break;
 		case "enum": {
 			const values =
 				/** @type {EnumValue[]} */
 				(argConfig.values);
-			if (values.includes(/** @type {Exclude<Value, RegExp>} */ (value)))
+			if (values.includes(/** @type {Exclude<Value, RegExp>} */ (value))) {
 				return value;
+			}
 			for (const item of values) {
 				if (`${item}` === value) return item;
 			}
@@ -653,12 +658,12 @@ const parseValueForArgumentConfig = (argConfig, value) => {
 	}
 };
 
-/** @typedef {TODO} Configuration */
+/** @typedef {Record<string, Value[]>} Values */
 
 /**
  * @param {Flags} args object of arguments
- * @param {Configuration} config configuration
- * @param {Record<string, Value[]>} values object with values
+ * @param {ObjectConfiguration} config configuration
+ * @param {Values} values object with values
  * @returns {Problem[] | null} problems or null for success
  */
 const processArguments = (args, config, values) => {

package/lib/config/browserslistTargetHandler.js

@@ -5,8 +5,8 @@
 
 "use strict";
 
-const browserslist = require("browserslist");
 const path = require("path");
+const browserslist = require("browserslist");
 
 /** @typedef {import("./target").ApiTargetProperties} ApiTargetProperties */
 /** @typedef {import("./target").EcmaTargetProperties} EcmaTargetProperties */
@@ -358,6 +358,6 @@ const resolve = browsers => {
 };
 
 module.exports = {
-	resolve,
-	load
+	load,
+	resolve
 };