webpack 5.92.1 → 5.94.0

package/lib/ids/IdHelpers.js

@@ -43,7 +43,7 @@ const avoidNumber = str => {
 	} else if (firstChar > 57) {
 		return str;
 	}
-	if (str === +str + "") {
+	if (str === String(Number(str))) {
 		return `_${str}`;
 	}
 	return str;
@@ -53,12 +53,9 @@ const avoidNumber = str => {
  * @param {string} request the request
  * @returns {string} id representation
  */
-const requestToId = request => {
-	return request
-		.replace(/^(\.\.?\/)+/, "")
-		.replace(/(^[.-]|[^a-zA-Z0-9_-])+/g, "_");
-};
-exports.requestToId = requestToId;
+const requestToId = request =>
+	request.replace(/^(\.\.?\/)+/, "").replace(/(^[.-]|[^a-zA-Z0-9_-])+/g, "_");
+module.exports.requestToId = requestToId;
 
 /**
  * @param {string} string the string
@@ -91,7 +88,7 @@ const getShortModuleName = (module, context, associatedObjectForCache) => {
 		);
 	return "";
 };
-exports.getShortModuleName = getShortModuleName;
+module.exports.getShortModuleName = getShortModuleName;
 
 /**
  * @param {string} shortName the short name
@@ -111,7 +108,7 @@ const getLongModuleName = (
 	const fullName = getFullModuleName(module, context, associatedObjectForCache);
 	return `${shortName}?${getHash(fullName, 4, hashFunction)}`;
 };
-exports.getLongModuleName = getLongModuleName;
+module.exports.getLongModuleName = getLongModuleName;
 
 /**
  * @param {Module} module the module
@@ -119,14 +116,9 @@ exports.getLongModuleName = getLongModuleName;
  * @param {object=} associatedObjectForCache an object to which the cache will be attached
  * @returns {string} full module name
  */
-const getFullModuleName = (module, context, associatedObjectForCache) => {
-	return makePathsRelative(
-		context,
-		module.identifier(),
-		associatedObjectForCache
-	);
-};
-exports.getFullModuleName = getFullModuleName;
+const getFullModuleName = (module, context, associatedObjectForCache) =>
+	makePathsRelative(context, module.identifier(), associatedObjectForCache);
+module.exports.getFullModuleName = getFullModuleName;
 
 /**
  * @param {Chunk} chunk the chunk
@@ -156,7 +148,7 @@ const getShortChunkName = (
 		.join(delimiter);
 	return shortenLongString(chunkName, delimiter, hashFunction);
 };
-exports.getShortChunkName = getShortChunkName;
+module.exports.getShortChunkName = getShortChunkName;
 
 /**
  * @param {Chunk} chunk the chunk
@@ -191,7 +183,7 @@ const getLongChunkName = (
 		.join(delimiter);
 	return shortenLongString(chunkName, delimiter, hashFunction);
 };
-exports.getLongChunkName = getLongChunkName;
+module.exports.getLongChunkName = getLongChunkName;
 
 /**
  * @param {Chunk} chunk the chunk
@@ -213,7 +205,7 @@ const getFullChunkName = (
 	);
 	return fullModuleNames.join();
 };
-exports.getFullChunkName = getFullChunkName;
+module.exports.getFullChunkName = getFullChunkName;
 
 /**
  * @template K
@@ -246,7 +238,7 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
 	const usedIds = new Set();
 	if (compilation.usedModuleIds) {
 		for (const id of compilation.usedModuleIds) {
-			usedIds.add(id + "");
+			usedIds.add(String(id));
 		}
 	}
 
@@ -254,20 +246,18 @@ const getUsedModuleIdsAndModules = (compilation, filter) => {
 		if (!module.needId) continue;
 		const moduleId = chunkGraph.getModuleId(module);
 		if (moduleId !== null) {
-			usedIds.add(moduleId + "");
-		} else {
-			if (
-				(!filter || filter(module)) &&
-				chunkGraph.getNumberOfModuleChunks(module) !== 0
-			) {
-				modules.push(module);
-			}
+			usedIds.add(String(moduleId));
+		} else if (
+			(!filter || filter(module)) &&
+			chunkGraph.getNumberOfModuleChunks(module) !== 0
+		) {
+			modules.push(module);
 		}
 	}
 
 	return [usedIds, modules];
 };
-exports.getUsedModuleIdsAndModules = getUsedModuleIdsAndModules;
+module.exports.getUsedModuleIdsAndModules = getUsedModuleIdsAndModules;
 
 /**
  * @param {Compilation} compilation the compilation
@@ -278,20 +268,20 @@ const getUsedChunkIds = compilation => {
 	const usedIds = new Set();
 	if (compilation.usedChunkIds) {
 		for (const id of compilation.usedChunkIds) {
-			usedIds.add(id + "");
+			usedIds.add(String(id));
 		}
 	}
 
 	for (const chunk of compilation.chunks) {
 		const chunkId = chunk.id;
 		if (chunkId !== null) {
-			usedIds.add(chunkId + "");
+			usedIds.add(String(chunkId));
 		}
 	}
 
 	return usedIds;
 };
-exports.getUsedChunkIds = getUsedChunkIds;
+module.exports.getUsedChunkIds = getUsedChunkIds;
 
 /**
  * @template T
@@ -359,7 +349,7 @@ const assignNames = (
 	unnamedItems.sort(comparator);
 	return unnamedItems;
 };
-exports.assignNames = assignNames;
+module.exports.assignNames = assignNames;
 
 /**
  * @template T
@@ -413,7 +403,7 @@ const assignDeterministicIds = (
 		} while (!assignId(item, id));
 	}
 };
-exports.assignDeterministicIds = assignDeterministicIds;
+module.exports.assignDeterministicIds = assignDeterministicIds;
 
 /**
  * @param {Set<string>} usedIds used ids
@@ -432,7 +422,7 @@ const assignAscendingModuleIds = (usedIds, modules, compilation) => {
 		 */
 		assignId = module => {
 			if (chunkGraph.getModuleId(module) === null) {
-				while (usedIds.has(nextId + "")) nextId++;
+				while (usedIds.has(String(nextId))) nextId++;
 				chunkGraph.setModuleId(module, nextId++);
 			}
 		};
@@ -450,7 +440,7 @@ const assignAscendingModuleIds = (usedIds, modules, compilation) => {
 		assignId(module);
 	}
 };
-exports.assignAscendingModuleIds = assignAscendingModuleIds;
+module.exports.assignAscendingModuleIds = assignAscendingModuleIds;
 
 /**
  * @param {Iterable<Chunk>} chunks the chunks
@@ -464,7 +454,7 @@ const assignAscendingChunkIds = (chunks, compilation) => {
 	if (usedIds.size > 0) {
 		for (const chunk of chunks) {
 			if (chunk.id === null) {
-				while (usedIds.has(nextId + "")) nextId++;
+				while (usedIds.has(String(nextId))) nextId++;
 				chunk.id = nextId;
 				chunk.ids = [nextId];
 				nextId++;
@@ -480,4 +470,4 @@ const assignAscendingChunkIds = (chunks, compilation) => {
 		}
 	}
 };
-exports.assignAscendingChunkIds = assignAscendingChunkIds;
+module.exports.assignAscendingChunkIds = assignAscendingChunkIds;

package/lib/ids/SyncModuleIdsPlugin.js

@@ -10,6 +10,7 @@ const { getUsedModuleIdsAndModules } = require("./IdHelpers");
 
 /** @typedef {import("../Compiler")} Compiler */
 /** @typedef {import("../Module")} Module */
+/** @typedef {import("../util/fs").IntermediateFileSystem} IntermediateFileSystem */
 
 const plugin = "SyncModuleIdsPlugin";
 
@@ -42,7 +43,9 @@ class SyncModuleIdsPlugin {
 		let dataChanged = false;
 		if (this._read) {
 			compiler.hooks.readRecords.tapAsync(plugin, callback => {
-				const fs = compiler.intermediateFileSystem;
+				const fs =
+					/** @type {IntermediateFileSystem} */
+					(compiler.intermediateFileSystem);
 				fs.readFile(this._path, (err, buffer) => {
 					if (err) {
 						if (err.code !== "ENOENT") {
@@ -69,7 +72,9 @@ class SyncModuleIdsPlugin {
 				for (const [key, value] of sorted) {
 					json[key] = value;
 				}
-				const fs = compiler.intermediateFileSystem;
+				const fs =
+					/** @type {IntermediateFileSystem} */
+					(compiler.intermediateFileSystem);
 				fs.writeFile(this._path, JSON.stringify(json), callback);
 			});
 		}

package/lib/index.js

@@ -70,11 +70,7 @@ const memoize = require("./util/memoize");
  */
 const lazyFunction = factory => {
 	const fac = memoize(factory);
-	const f = /** @type {any} */ (
-		(...args) => {
-			return fac()(...args);
-		}
-	);
+	const f = /** @type {any} */ ((...args) => fac()(...args));
 	return /** @type {T} */ (f);
 };
 

package/lib/javascript/ArrayPushCallbackChunkFormatPlugin.js

@@ -33,6 +33,7 @@ class ArrayPushCallbackChunkFormatPlugin {
 						if (chunk.hasRuntime()) return;
 						if (chunkGraph.getNumberOfEntryModules(chunk) > 0) {
 							set.add(RuntimeGlobals.onChunksLoaded);
+							set.add(RuntimeGlobals.exports);
 							set.add(RuntimeGlobals.require);
 						}
 						set.add(RuntimeGlobals.chunkCallback);
@@ -83,10 +84,11 @@ class ArrayPushCallbackChunkFormatPlugin {
 							);
 							if (runtimeModules.length > 0 || entries.length > 0) {
 								const runtime = new ConcatSource(
-									(runtimeTemplate.supportsArrowFunction()
-										? `${RuntimeGlobals.require} =>`
-										: `function(${RuntimeGlobals.require})`) +
-										" { // webpackRuntimeModules\n"
+									`${
+										runtimeTemplate.supportsArrowFunction()
+											? `${RuntimeGlobals.require} =>`
+											: `function(${RuntimeGlobals.require})`
+									} { // webpackRuntimeModules\n`
 								);
 								if (runtimeModules.length > 0) {
 									runtime.add(

package/lib/javascript/BasicEvaluatedExpression.js

@@ -184,7 +184,7 @@ class BasicEvaluatedExpression {
 	asCompileTimeValue() {
 		switch (this.type) {
 			case TypeUndefined:
-				return undefined;
+				return;
 			case TypeNull:
 				return null;
 			case TypeString:
@@ -252,7 +252,6 @@ class BasicEvaluatedExpression {
 			const str = this.asString();
 			if (typeof str === "string") return str !== "";
 		}
-		return undefined;
 	}
 
 	/**
@@ -275,8 +274,6 @@ class BasicEvaluatedExpression {
 		if (this.isConstArray()) return false;
 		if (this.isTemplateString()) return false;
 		if (this.isRegExp()) return false;
-
-		return undefined;
 	}
 
 	/**
@@ -292,12 +289,12 @@ class BasicEvaluatedExpression {
 		if (this.isBigInt()) return `${this.bigint}`;
 		if (this.isRegExp()) return `${this.regExp}`;
 		if (this.isArray()) {
-			let array = [];
+			const array = [];
 			for (const item of /** @type {BasicEvaluatedExpression[]} */ (
 				this.items
 			)) {
 				const itemStr = item.asString();
-				if (itemStr === undefined) return undefined;
+				if (itemStr === undefined) return;
 				array.push(itemStr);
 			}
 			return `${array}`;
@@ -309,12 +306,11 @@ class BasicEvaluatedExpression {
 				this.parts
 			)) {
 				const partStr = part.asString();
-				if (partStr === undefined) return undefined;
+				if (partStr === undefined) return;
 				str += partStr;
 			}
 			return str;
 		}
-		return undefined;
 	}
 
 	/**
@@ -390,7 +386,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the value of this expression to a particular identifier and its members.
-	 *
 	 * @param {string | VariableInfoInterface} identifier identifier to set
 	 * @param {string | VariableInfoInterface} rootInfo root info
 	 * @param {() => string[]} getMembers members
@@ -417,7 +412,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Wraps an array of expressions with a prefix and postfix expression.
-	 *
 	 * @param {BasicEvaluatedExpression | null | undefined} prefix Expression to be added before the innerExpressions
 	 * @param {BasicEvaluatedExpression | null | undefined} postfix Expression to be added after the innerExpressions
 	 * @param {BasicEvaluatedExpression[] | undefined} innerExpressions Expressions to be wrapped
@@ -434,7 +428,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Stores the options of a conditional expression.
-	 *
 	 * @param {BasicEvaluatedExpression[]} options optional (consequent/alternate) expressions to be set
 	 * @returns {this} this
 	 */
@@ -447,7 +440,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Adds options to a conditional expression.
-	 *
 	 * @param {BasicEvaluatedExpression[]} options optional (consequent/alternate) expressions to be added
 	 * @returns {this} this
 	 */
@@ -465,7 +457,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the value of this expression to an array of expressions.
-	 *
 	 * @param {BasicEvaluatedExpression[]} items expressions to set
 	 * @returns {this} this
 	 */
@@ -478,7 +469,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the value of this expression to an array of strings.
-	 *
 	 * @param {string[]} array array to set
 	 * @returns {this} this
 	 */
@@ -492,7 +482,6 @@ class BasicEvaluatedExpression {
 	/**
 	 * Set's the value of this expression to a processed/unprocessed template string. Used
 	 * for evaluating TemplateLiteral expressions in the JavaScript Parser.
-	 *
 	 * @param {BasicEvaluatedExpression[]} quasis template string quasis
 	 * @param {BasicEvaluatedExpression[]} parts template string parts
 	 * @param {"cooked" | "raw"} kind template string kind
@@ -522,7 +511,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the value of the expression to nullish.
-	 *
 	 * @param {boolean} value true, if the expression is nullish
 	 * @returns {this} this
 	 */
@@ -536,7 +524,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set's the range for the expression.
-	 *
 	 * @param {[number, number]} range range to set
 	 * @returns {this} this
 	 */
@@ -547,7 +534,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set whether or not the expression has side effects.
-	 *
 	 * @param {boolean} sideEffects true, if the expression has side effects
 	 * @returns {this} this
 	 */
@@ -558,7 +544,6 @@ class BasicEvaluatedExpression {
 
 	/**
 	 * Set the expression node for the expression.
-	 *
 	 * @param {Node | undefined} expression expression
 	 * @returns {this} this
 	 */

package/lib/javascript/ChunkHelpers.js

@@ -30,4 +30,4 @@ const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {
 	}
 	return chunks;
 };
-exports.getAllChunks = getAllChunks;
+module.exports.getAllChunks = getAllChunks;

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -8,6 +8,7 @@
 const { ConcatSource, RawSource } = require("webpack-sources");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const Template = require("../Template");
+const { getUndoPath } = require("../util/identifier");
 const {
 	getChunkFilenameTemplate,
 	getCompilationHooks
@@ -50,7 +51,7 @@ class CommonJsChunkFormatPlugin {
 						const source = new ConcatSource();
 						source.add(`exports.id = ${JSON.stringify(chunk.id)};\n`);
 						source.add(`exports.ids = ${JSON.stringify(chunk.ids)};\n`);
-						source.add(`exports.modules = `);
+						source.add("exports.modules = ");
 						source.add(modules);
 						source.add(";\n");
 						const runtimeModules =
@@ -79,11 +80,13 @@ class CommonJsChunkFormatPlugin {
 										contentHashType: "javascript"
 									}
 								)
+								.replace(/^\/+/g, "")
 								.split("/");
 							const runtimeOutputName = compilation
 								.getPath(
 									getChunkFilenameTemplate(
-										runtimeChunk,
+										/** @type {Chunk} */
+										(runtimeChunk),
 										compilation.outputOptions
 									),
 									{
@@ -91,26 +94,22 @@ class CommonJsChunkFormatPlugin {
 										contentHashType: "javascript"
 									}
 								)
+								.replace(/^\/+/g, "")
 								.split("/");
 
-							// remove filename, we only need the directory
-							currentOutputName.pop();
-
 							// remove common parts
 							while (
-								currentOutputName.length > 0 &&
-								runtimeOutputName.length > 0 &&
+								currentOutputName.length > 1 &&
+								runtimeOutputName.length > 1 &&
 								currentOutputName[0] === runtimeOutputName[0]
 							) {
 								currentOutputName.shift();
 								runtimeOutputName.shift();
 							}
-
+							const last = runtimeOutputName.join("/");
 							// create final path
 							const runtimePath =
-								(currentOutputName.length > 0
-									? "../".repeat(currentOutputName.length)
-									: "./") + runtimeOutputName.join("/");
+								getUndoPath(currentOutputName.join("/"), last, true) + last;
 
 							const entrySource = new ConcatSource();
 							entrySource.add(

package/lib/javascript/EnableChunkLoadingPlugin.js

@@ -51,10 +51,11 @@ class EnableChunkLoadingPlugin {
 			throw new Error(
 				`Chunk loading type "${type}" is not enabled. ` +
 					"EnableChunkLoadingPlugin need to be used to enable this type of chunk loading. " +
-					'This usually happens through the "output.enabledChunkLoadingTypes" option. ' +
-					'If you are using a function as entry which sets "chunkLoading", you need to add all potential chunk loading types to "output.enabledChunkLoadingTypes". ' +
-					"These types are enabled: " +
-					Array.from(getEnabledTypes(compiler)).join(", ")
+					`This usually happens through the "output.enabledChunkLoadingTypes" option. ` +
+					`If you are using a function as entry which sets "chunkLoading", you need to add all potential chunk loading types to "output.enabledChunkLoadingTypes". ` +
+					`These types are enabled: ${Array.from(
+						getEnabledTypes(compiler)
+					).join(", ")}`
 			);
 		}
 	}
@@ -85,7 +86,7 @@ class EnableChunkLoadingPlugin {
 					break;
 				}
 				case "require": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const CommonJsChunkLoadingPlugin = require("../node/CommonJsChunkLoadingPlugin");
 					new CommonJsChunkLoadingPlugin({
 						asyncChunkLoading: false
@@ -93,7 +94,7 @@ class EnableChunkLoadingPlugin {
 					break;
 				}
 				case "async-node": {
-					//@ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
+					// @ts-expect-error https://github.com/microsoft/TypeScript/issues/41697
 					const CommonJsChunkLoadingPlugin = require("../node/CommonJsChunkLoadingPlugin");
 					new CommonJsChunkLoadingPlugin({
 						asyncChunkLoading: true

package/lib/javascript/JavascriptGenerator.js

@@ -14,6 +14,8 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 /** @typedef {import("webpack-sources").Source} Source */
 /** @typedef {import("../DependenciesBlock")} DependenciesBlock */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../DependencyTemplate")} DependencyTemplate */
+/** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../Generator").GenerateContext} GenerateContext */
 /** @typedef {import("../Module")} Module */
@@ -25,8 +27,15 @@ const HarmonyCompatibilityDependency = require("../dependencies/HarmonyCompatibi
 // replace with newer constructs
 
 const deprecatedGetInitFragments = util.deprecate(
+	/**
+	 * @param {DependencyTemplate} template template
+	 * @param {Dependency} dependency dependency
+	 * @param {DependencyTemplateContext} templateContext template context
+	 * @returns {InitFragment<GenerateContext>[]} init fragments
+	 */
 	(template, dependency, templateContext) =>
-		template.getInitFragments(dependency, templateContext),
+		/** @type {DependencyTemplate & { getInitFragments: function(Dependency, DependencyTemplateContext): InitFragment<GenerateContext>[] }} */
+		(template).getInitFragments(dependency, templateContext),
 	"DependencyTemplate.getInitFragment is deprecated (use apply(dep, source, { initFragments }) instead)",
 	"DEP_WEBPACK_JAVASCRIPT_GENERATOR_GET_INIT_FRAGMENTS"
 );
@@ -93,6 +102,7 @@ class JavascriptGenerator extends Generator {
 		}
 
 		const source = new ReplaceSource(originalSource);
+		/** @type {InitFragment<GenerateContext>[]} */
 		const initFragments = [];
 
 		this.sourceModule(module, initFragments, source, generateContext);
@@ -102,7 +112,7 @@ class JavascriptGenerator extends Generator {
 
 	/**
 	 * @param {Module} module the module to generate
-	 * @param {InitFragment[]} initFragments mutable list of init fragments
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the generateContext
 	 * @returns {void}
@@ -144,7 +154,7 @@ class JavascriptGenerator extends Generator {
 	/**
 	 * @param {Module} module the module to generate
 	 * @param {DependenciesBlock} block the dependencies block which will be processed
-	 * @param {InitFragment[]} initFragments mutable list of init fragments
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the generateContext
 	 * @returns {void}
@@ -174,7 +184,7 @@ class JavascriptGenerator extends Generator {
 	/**
 	 * @param {Module} module the current module
 	 * @param {Dependency} dependency the dependency to generate
-	 * @param {InitFragment[]} initFragments mutable list of init fragments
+	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the render context
 	 * @returns {void}
@@ -186,12 +196,14 @@ class JavascriptGenerator extends Generator {
 		const template = generateContext.dependencyTemplates.get(constructor);
 		if (!template) {
 			throw new Error(
-				"No template for dependency: " + dependency.constructor.name
+				`No template for dependency: ${dependency.constructor.name}`
 			);
 		}
 
+		/** @type {InitFragment<GenerateContext>[] | undefined} */
 		let chunkInitFragments;
 
+		/** @type {DependencyTemplateContext} */
 		const templateContext = {
 			runtimeTemplate: generateContext.runtimeTemplate,
 			dependencyTemplates: generateContext.dependencyTemplates,
@@ -201,11 +213,15 @@ class JavascriptGenerator extends Generator {
 			runtime: generateContext.runtime,
 			runtimeRequirements: generateContext.runtimeRequirements,
 			concatenationScope: generateContext.concatenationScope,
-			codeGenerationResults: generateContext.codeGenerationResults,
+			codeGenerationResults:
+				/** @type {NonNullable<GenerateContext["codeGenerationResults"]>} */
+				(generateContext.codeGenerationResults),
 			initFragments,
 			get chunkInitFragments() {
 				if (!chunkInitFragments) {
-					const data = generateContext.getData();
+					const data =
+						/** @type {NonNullable<GenerateContext["getData"]>} */
+						(generateContext.getData)();
 					chunkInitFragments = data.get("chunkInitFragments");
 					if (!chunkInitFragments) {
 						chunkInitFragments = [];