webpack 5.104.1 → 5.105.0

package/lib/ContextModuleFactory.js

@@ -97,6 +97,7 @@ class ContextModuleFactory extends ModuleFactory {
 			),
 			alternativeRequests
 		});
+		/** @type {ResolverFactory} */
 		this.resolverFactory = resolverFactory;
 	}
 
@@ -110,8 +111,11 @@ class ContextModuleFactory extends ModuleFactory {
 		const dependencies = /** @type {ContextDependency[]} */ (data.dependencies);
 		const resolveOptions = data.resolveOptions;
 		const dependency = dependencies[0];
+		/** @type {FileSystemDependencies} */
 		const fileDependencies = new LazySet();
+		/** @type {FileSystemDependencies} */
 		const missingDependencies = new LazySet();
+		/** @type {FileSystemDependencies} */
 		const contextDependencies = new LazySet();
 		this.hooks.beforeResolve.callAsync(
 			{
@@ -154,6 +158,7 @@ class ContextModuleFactory extends ModuleFactory {
 				const idx = request.lastIndexOf("!");
 				if (idx >= 0) {
 					let loadersRequest = request.slice(0, idx + 1);
+					/** @type {number} */
 					let i;
 					for (
 						i = 0;
@@ -165,7 +170,7 @@ class ContextModuleFactory extends ModuleFactory {
 					loadersRequest = loadersRequest
 						.slice(i)
 						.replace(/!+$/, "")
-						.replace(/!!+/g, "!");
+						.replace(/!{2,}/g, "!");
 					loaders = loadersRequest === "" ? [] : loadersRequest.split("!");
 					resource = request.slice(idx + 1);
 				} else {
@@ -439,6 +444,7 @@ class ContextModuleFactory extends ModuleFactory {
 
 						if (!result) return callback(null, []);
 
+						/** @type {ContextElementDependency[]} */
 						const flattenedResult = [];
 
 						for (const item of result) {
@@ -466,7 +472,13 @@ class ContextModuleFactory extends ModuleFactory {
 		 */
 		const visitResource = (resource, callback) => {
 			if (typeof fs.realpath === "function") {
-				addDirectoryChecked(resource, resource, new Set(), callback);
+				addDirectoryChecked(
+					resource,
+					resource,
+					/** @type {Set<string>} */
+					new Set(),
+					callback
+				);
 			} else {
 				addDirectory(resource, resource, addSubDirectory, callback);
 			}

package/lib/DefinePlugin.js

@@ -138,7 +138,7 @@ function getObjKeys(properties) {
 /** @typedef {boolean | undefined | null} AsiSafe */
 
 /**
- * @param {EXPECTED_ANY[] | {[k: string]: EXPECTED_ANY}} obj obj
+ * @param {EXPECTED_ANY[] | { [k: string]: EXPECTED_ANY }} obj obj
  * @param {JavascriptParser} parser Parser
  * @param {ValueCacheVersions} valueCacheVersions valueCacheVersions
  * @param {string} key the defined key
@@ -158,6 +158,7 @@ const stringifyObj = (
 	asiSafe,
 	objKeys
 ) => {
+	/** @type {string} */
 	let code;
 	const arr = Array.isArray(obj);
 	if (arr) {
@@ -418,6 +419,7 @@ class DefinePlugin {
 				 * @returns {void}
 				 */
 				const handler = (parser) => {
+					/** @type {Set<string>} */
 					const hooked = new Set();
 					const mainValue =
 						/** @type {ValueCacheVersion} */

package/lib/DelegatedModule.js

@@ -32,6 +32,8 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Module").LibIdent} LibIdent */
 /** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("./Module").Sources} Sources */
+/** @typedef {import("./Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -76,6 +78,7 @@ class DelegatedModule extends Module {
 		this.delegateData = data;
 
 		// Build info
+		/** @type {undefined | DelegatedSourceDependency} */
 		this.delegatedSourceDependency = undefined;
 	}
 
@@ -152,6 +155,7 @@ class DelegatedModule extends Module {
 	codeGeneration({ runtimeTemplate, moduleGraph, chunkGraph }) {
 		const dep = /** @type {DelegatedSourceDependency} */ (this.dependencies[0]);
 		const sourceModule = moduleGraph.getModule(dep);
+		/** @type {string} */
 		let str;
 
 		if (!sourceModule) {
@@ -163,6 +167,7 @@ class DelegatedModule extends Module {
 				module: sourceModule,
 				chunkGraph,
 				request: dep.request,
+				/** @type {RuntimeRequirements} */
 				runtimeRequirements: new Set()
 			})})`;
 
@@ -178,6 +183,7 @@ class DelegatedModule extends Module {
 			str += ";";
 		}
 
+		/** @type {Sources} */
 		const sources = new Map();
 		if (this.useSourceMap || this.useSimpleSourceMap) {
 			sources.set(JAVASCRIPT_TYPE, new OriginalSource(str, this.identifier()));

package/lib/DelegatedModuleFactoryPlugin.js

@@ -9,6 +9,7 @@ const DelegatedModule = require("./DelegatedModule");
 
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptions} DllReferencePluginOptions */
 /** @typedef {import("../declarations/plugins/DllReferencePlugin").DllReferencePluginOptionsContent} DllReferencePluginOptionsContent */
+/** @typedef {import("./DelegatedModule").DelegatedModuleData} DelegatedModuleData */
 /** @typedef {import("./DelegatedModule").DelegatedModuleSourceRequest} DelegatedModuleSourceRequest */
 /** @typedef {import("./DelegatedModule").DelegatedModuleType} DelegatedModuleType */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
@@ -51,6 +52,7 @@ class DelegatedModuleFactoryPlugin {
 					const { request } = dependency;
 					if (request && request.startsWith(`${scope}/`)) {
 						const innerRequest = `.${request.slice(scope.length)}`;
+						/** @type {undefined | DelegatedModuleData} */
 						let resolved;
 						if (innerRequest in this.options.content) {
 							resolved = this.options.content[innerRequest];

package/lib/Dependency.js

@@ -48,9 +48,11 @@ const memoize = require("./util/memoize");
 
 /** @typedef {SyntheticDependencyLocation | RealDependencyLocation} DependencyLocation */
 
+/** @typedef {string} ExportInfoName */
+
 /**
  * @typedef {object} ExportSpec
- * @property {string} name the name of the export
+ * @property {ExportInfoName} name the name of the export
  * @property {boolean=} canMangle can the export be renamed (defaults to true)
  * @property {boolean=} terminalBinding is the export a terminal binding that should be checked for export star conflicts
  * @property {(string | ExportSpec)[]=} exports nested exports
@@ -113,8 +115,11 @@ class Dependency {
 		this._locSC = 0;
 		this._locEL = 0;
 		this._locEC = 0;
+		/** @type {undefined | number} */
 		this._locI = undefined;
+		/** @type {undefined | string} */
 		this._locN = undefined;
+		/** @type {undefined | DependencyLocation} */
 		this._loc = undefined;
 	}
 

package/lib/DependencyTemplates.js

@@ -10,17 +10,18 @@ const createHash = require("./util/createHash");
 
 /** @typedef {import("./Compilation").DependencyConstructor} DependencyConstructor */
 /** @typedef {import("./DependencyTemplate")} DependencyTemplate */
-/** @typedef {typeof import("./util/Hash")} Hash */
+/** @typedef {import("./util/Hash").HashFunction} HashFunction */
 
 class DependencyTemplates {
 	/**
-	 * @param {string | Hash} hashFunction the hash function to use
+	 * @param {HashFunction} hashFunction the hash function to use
 	 */
 	constructor(hashFunction = DEFAULTS.HASH_FUNCTION) {
 		/** @type {Map<DependencyConstructor, DependencyTemplate>} */
 		this._map = new Map();
 		/** @type {string} */
 		this._hash = "31d6cfe0d16ae931b73c59d7e0c089c0";
+		/** @type {HashFunction} */
 		this._hashFunction = hashFunction;
 	}
 

package/lib/DllModule.js

@@ -25,6 +25,7 @@ const makeSerializable = require("./util/makeSerializable");
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("./Module").Sources} Sources */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./ResolverFactory").ResolverWithOptions} ResolverWithOptions */
 /** @typedef {import("./serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
@@ -93,6 +94,7 @@ class DllModule extends Module {
 	 * @returns {CodeGenerationResult} result
 	 */
 	codeGeneration(context) {
+		/** @type {Sources} */
 		const sources = new Map();
 		sources.set(
 			JAVASCRIPT_TYPE,

package/lib/DllReferencePlugin.js

@@ -109,6 +109,7 @@ class DllReferencePlugin {
 				"content" in this.options ? this.options.content : undefined;
 			if ("manifest" in this.options) {
 				const manifestParameter = this.options.manifest;
+				/** @type {undefined | DllReferencePluginOptionsManifest} */
 				let manifest;
 				if (typeof manifestParameter === "string") {
 					const data =

package/lib/DotenvPlugin.js

@@ -25,9 +25,9 @@ const DEFAULT_OPTIONS = {
 };
 
 // Regex for parsing .env files
-// ported from https://github.com/motdotla/dotenv/blob/master/lib/main.js#L32
+// ported from https://github.com/motdotla/dotenv/blob/master/lib/main.js#L49
 const LINE =
-	/(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/gm;
+	/^\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?$/gm;
 
 const PLUGIN_NAME = "DotenvPlugin";
 
@@ -60,9 +60,11 @@ function parse(src) {
 	let lines = src.toString();
 
 	// Convert line breaks to same format
-	lines = lines.replace(/\r\n?/gm, "\n");
+	lines = lines.replace(/\r\n?/g, "\n");
 
+	/** @type {null | RegExpExecArray} */
 	let match;
+
 	while ((match = LINE.exec(lines)) !== null) {
 		const key = match[1];
 
@@ -112,10 +114,12 @@ function _resolveEscapeSequences(value) {
 function expandValue(value, processEnv, runningParsed) {
 	const env = { ...runningParsed, ...processEnv }; // process.env wins
 
-	const regex = /(?<!\\)\$\{([^{}]+)\}|(?<!\\)\$([A-Za-z_][A-Za-z0-9_]*)/g;
+	const regex = /(?<!\\)\$\{([^{}]+)\}|(?<!\\)\$([a-z_]\w*)/gi;
 
 	let result = value;
+	/** @type {null | RegExpExecArray} */
 	let match;
+	/** @type {Set<string>} */
 	const seen = new Set(); // self-referential checker
 
 	while ((match = regex.exec(result)) !== null) {
@@ -133,7 +137,9 @@ function expandValue(value, processEnv, runningParsed) {
 		const r = expression.split(/** @type {string} */ (splitter));
 		// const r = splitter ? expression.split(splitter) : [expression];
 
+		/** @type {string} */
 		let defaultValue;
+		/** @type {undefined | null | string} */
 		let value;
 
 		const key = r.shift();
@@ -303,7 +309,7 @@ class DotenvPlugin {
 	 * @param {InputFileSystem} fs input file system
 	 * @param {string} dir dir to load `.env` files
 	 * @param {string} mode mode
-	 * @returns {Promise<{parsed: Env, fileDependencies: string[], missingDependencies: string[]}>} parsed env variables and dependencies
+	 * @returns {Promise<{ parsed: Env, fileDependencies: string[], missingDependencies: string[] }>} parsed env variables and dependencies
 	 */
 	async _getParsed(fs, dir, mode) {
 		/** @type {string[]} */

package/lib/DynamicEntryPlugin.js

@@ -44,6 +44,7 @@ class DynamicEntryPlugin {
 		compiler.hooks.make.tapPromise(PLUGIN_NAME, (compilation) =>
 			Promise.resolve(this.entry())
 				.then((entry) => {
+					/** @type {Promise<void>[]} */
 					const promises = [];
 					for (const name of Object.keys(entry)) {
 						const desc = entry[name];

package/lib/EnvironmentNotSupportAsyncWarning.js

@@ -24,6 +24,7 @@ However, your target environment does not appear to support 'async/await'.
 As a result, the code may not run as expected or may cause runtime errors.`;
 		super(message);
 
+		/** @type {string} */
 		this.name = "EnvironmentNotSupportAsyncWarning";
 		this.module = module;
 	}

package/lib/EvalSourceMapDevToolPlugin.js

@@ -119,6 +119,7 @@ class EvalSourceMapDevToolPlugin {
 					});
 					/** @type {RawSourceMap} */
 					let sourceMap;
+					/** @type {string | Buffer} */
 					let content;
 					if (source.sourceAndMap) {
 						const sourceAndMap = source.sourceAndMap(options);
@@ -164,20 +165,23 @@ class EvalSourceMapDevToolPlugin {
 						}
 					);
 					sourceMap.sources = moduleFilenames;
-					sourceMap.ignoreList = options.ignoreList
-						? sourceMap.sources.reduce(
-								/** @type {(acc: number[], sourceName: string, idx: number) => number[]} */ (
-									(acc, sourceName, idx) => {
-										const rule = /** @type {Rules} */ (options.ignoreList);
-										if (ModuleFilenameHelpers.matchPart(sourceName, rule)) {
-											acc.push(idx);
-										}
-										return acc;
+					if (options.ignoreList) {
+						const ignoreList = sourceMap.sources.reduce(
+							/** @type {(acc: number[], sourceName: string, idx: number) => number[]} */ (
+								(acc, sourceName, idx) => {
+									const rule = /** @type {Rules} */ (options.ignoreList);
+									if (ModuleFilenameHelpers.matchPart(sourceName, rule)) {
+										acc.push(idx);
 									}
-								),
-								[]
-							)
-						: [];
+									return acc;
+								}
+							),
+							[]
+						);
+						if (ignoreList.length > 0) {
+							sourceMap.ignoreList = ignoreList;
+						}
+					}
 
 					if (options.noSources) {
 						sourceMap.sourcesContent = undefined;

package/lib/ExportsInfo.js

@@ -13,6 +13,7 @@ const { forEachRuntime } = require("./util/runtime");
 
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Dependency").RuntimeSpec} RuntimeSpec */
+/** @typedef {import("./Dependency").ExportInfoName} ExportInfoName */
 /** @typedef {import("./Dependency").ExportsSpecExcludeExports} ExportsSpecExcludeExports */
 /** @typedef {import("./dependencies/HarmonyImportDependency")} HarmonyImportDependency */
 /** @typedef {import("./Module")} Module */
@@ -25,8 +26,6 @@ const { forEachRuntime } = require("./util/runtime");
 /** @typedef {typeof UsageState.OnlyPropertiesUsed | typeof UsageState.NoInfo | typeof UsageState.Unknown | typeof UsageState.Used} RuntimeUsageStateType */
 /** @typedef {typeof UsageState.Unused | RuntimeUsageStateType} UsageStateType */
 
-/** @typedef {string} ExportInfoName */
-
 /** @typedef {Map<string, RuntimeUsageStateType>} UsedInRuntime */
 /** @typedef {{ module: Module, export: ExportInfoName[], deferred: boolean }} TargetItemWithoutConnection */
 /** @typedef {{ module: Module, connection: ModuleGraphConnection, export: ExportInfoName[] | undefined }} TargetItemWithConnection */
@@ -111,8 +110,11 @@ class ExportsInfo {
 	constructor() {
 		/** @type {Exports} */
 		this._exports = new Map();
+		/** @type {ExportInfo} */
 		this._otherExportsInfo = new ExportInfo(null);
+		/** @type {ExportInfo} */
 		this._sideEffectsOnlyInfo = new ExportInfo("*side effects only*");
+		/** @type {boolean} */
 		this._exportsAreOrdered = false;
 		/** @type {ExportsInfo=} */
 		this._redirectTo = undefined;
@@ -613,6 +615,7 @@ class ExportsInfo {
 	 * @returns {ExportInfo[]} exports that are relevant (not unused and potential provided)
 	 */
 	getRelevantExports(runtime) {
+		/** @type {ExportInfo[]} */
 		const list = [];
 		for (const exportInfo of this._exports.values()) {
 			const used = exportInfo.getUsed(runtime);
@@ -655,6 +658,7 @@ class ExportsInfo {
 	 * @returns {string} key representing the usage
 	 */
 	getUsageKey(runtime) {
+		/** @type {(string | number)[]} */
 		const key = [];
 		if (this._redirectTo !== undefined) {
 			key.push(this._redirectTo.getUsageKey(runtime));
@@ -916,7 +920,7 @@ class ExportInfo {
 		/** @type {Target | undefined} */
 		this._target = undefined;
 		if (initFrom && initFrom._target) {
-			this._target = new Map();
+			this._target = /** @type {Target} */ (new Map());
 			for (const [key, value] of initFrom._target) {
 				this._target.set(key, {
 					connection: value.connection,
@@ -1155,7 +1159,7 @@ class ExportInfo {
 	setTarget(key, connection, exportName, priority = 0) {
 		if (exportName) exportName = [...exportName];
 		if (!this._target) {
-			this._target = new Map();
+			this._target = /** @type {Target} */ (new Map());
 			this._target.set(key, {
 				connection,
 				export: /** @type {ExportInfoName[]} */ (exportName),

package/lib/ExternalModule.js

@@ -45,12 +45,15 @@ const { register } = require("./util/serialization");
 /** @typedef {import("./Module").BuildInfo} BuildInfo */
 /** @typedef {import("./Module").CodeGenerationContext} CodeGenerationContext */
 /** @typedef {import("./Module").CodeGenerationResult} CodeGenerationResult */
+/** @typedef {import("./Module").CodeGenerationResultData} CodeGenerationResultData */
 /** @typedef {import("./Module").ConcatenationBailoutReasonContext} ConcatenationBailoutReasonContext */
 /** @typedef {import("./Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("./Module").LibIdent} LibIdent */
 /** @typedef {import("./Module").NeedBuildCallback} NeedBuildCallback */
 /** @typedef {import("./Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("./Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("./Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
+/** @typedef {import("./Module").Sources} Sources */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./NormalModuleFactory")} NormalModuleFactory */
 /** @typedef {import("./RequestShortener")} RequestShortener */
@@ -82,11 +85,15 @@ const { register } = require("./util/serialization");
 
 /** @typedef {true | [string, string][]} Imported */
 
+/** @type {RuntimeRequirements} */
 const RUNTIME_REQUIREMENTS = new Set([RuntimeGlobals.module]);
+/** @type {RuntimeRequirements} */
 const RUNTIME_REQUIREMENTS_FOR_SCRIPT = new Set([RuntimeGlobals.loadScript]);
+/** @type {RuntimeRequirements} */
 const RUNTIME_REQUIREMENTS_FOR_MODULE = new Set([
 	RuntimeGlobals.definePropertyGetters
 ]);
+/** @type {RuntimeRequirements} */
 const EMPTY_RUNTIME_REQUIREMENTS = new Set();
 
 /**
@@ -400,6 +407,7 @@ const generateModuleRemapping = (
 	runtimeTemplate
 ) => {
 	if (exportsInfo.otherExportsInfo.getUsed(runtime) === UsageState.Unused) {
+		/** @type {string[]} */
 		const properties = [];
 		for (const exportInfo of exportsInfo.orderedExports) {
 			const used = exportInfo.getUsedName(exportInfo.name, runtime);
@@ -488,6 +496,7 @@ const getSourceForModuleExternal = (
 	let expression = baseAccess;
 
 	const useNamespace = imported === true;
+	/** @type {undefined | string} */
 	let moduleRemapping;
 	if (useNamespace) {
 		moduleRemapping = generateModuleRemapping(
@@ -978,22 +987,27 @@ class ExternalModule extends Module {
 		const { request, externalType } = this._getRequestAndExternalType();
 		switch (externalType) {
 			case "asset": {
+				/** @type {Sources} */
 				const sources = new Map();
 				sources.set(
 					JAVASCRIPT_TYPE,
 					new RawSource(`module.exports = ${JSON.stringify(request)};`)
 				);
+				/** @type {CodeGenerationResultData} */
 				const data = new Map();
 				data.set("url", { javascript: request });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
 			case "css-url": {
+				/** @type {Sources} */
 				const sources = new Map();
+				/** @type {CodeGenerationResultData} */
 				const data = new Map();
 				data.set("url", { "css-url": request });
 				return { sources, runtimeRequirements: RUNTIME_REQUIREMENTS, data };
 			}
 			case "css-import": {
+				/** @type {Sources} */
 				const sources = new Map();
 				const dependencyMeta = /** @type {CssImportDependencyMeta} */ (
 					this.dependencyMeta
@@ -1056,12 +1070,14 @@ class ExternalModule extends Module {
 					sourceString = `${sourceData.init}\n${sourceString}`;
 				}
 
+				/** @type {undefined | CodeGenerationResultData} */
 				let data;
 				if (sourceData.chunkInitFragments) {
 					data = new Map();
 					data.set("chunkInitFragments", sourceData.chunkInitFragments);
 				}
 
+				/** @type {Sources} */
 				const sources = new Map();
 				if (this.useSourceMap || this.useSimpleSourceMap) {
 					sources.set(

package/lib/FalseIIFEUmdWarning.js

@@ -10,6 +10,7 @@ const WebpackError = require("./WebpackError");
 class FalseIIFEUmdWarning extends WebpackError {
 	constructor() {
 		super();
+		/** @type {string} */
 		this.name = "FalseIIFEUmdWarning";
 		this.message =
 			"Configuration:\nSetting 'output.iife' to 'false' is incompatible with 'output.library.type' set to 'umd'. This configuration may cause unexpected behavior, as UMD libraries are expected to use an IIFE (Immediately Invoked Function Expression) to support various module formats. Consider setting 'output.iife' to 'true' or choosing a different 'library.type' to ensure compatibility.\nLearn more: https://webpack.js.org/configuration/output/";