webpack 5.97.1 → 5.104.1

package/lib/dependencies/AMDRequireDependenciesBlockParserPlugin.js

@@ -26,11 +26,12 @@ const getFunctionExpression = require("./getFunctionExpression");
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 /** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
-/** @typedef {import("../Module").BuildInfo} BuildInfo */
 /** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
+const PLUGIN_NAME = "AMDRequireDependenciesBlockParserPlugin";
+
 class AMDRequireDependenciesBlockParserPlugin {
 	/**
 	 * @param {JavascriptParserOptions} options parserOptions
@@ -50,7 +51,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 		if (fnData) {
 			parser.inScope(
 				fnData.fn.params.filter(
-					i =>
+					(i) =>
 						!["require", "module", "exports"].includes(
 							/** @type {Identifier} */ (i).name
 						)
@@ -80,10 +81,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 	apply(parser) {
 		parser.hooks.call
 			.for("require")
-			.tap(
-				"AMDRequireDependenciesBlockParserPlugin",
-				this.processCallRequire.bind(this, parser)
-			);
+			.tap(PLUGIN_NAME, this.processCallRequire.bind(this, parser));
 	}
 
 	/**
@@ -104,7 +102,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 		} else if (param.isConstArray()) {
 			/** @type {(string | LocalModuleDependency | AMDRequireItemDependency)[]} */
 			const deps = [];
-			for (const request of /** @type {any[]} */ (param.array)) {
+			for (const request of /** @type {EXPECTED_ANY[]} */ (param.array)) {
 				let dep;
 				let localModule;
 				if (request === "require") {
@@ -126,7 +124,8 @@ class AMDRequireDependenciesBlockParserPlugin {
 			}
 			const dep = this.newRequireArrayDependency(
 				deps,
-				/** @type {Range} */ (param.range)
+				/** @type {Range} */
+				(param.range)
 			);
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			dep.optional = Boolean(parser.scope.inTry);
@@ -158,34 +157,37 @@ class AMDRequireDependenciesBlockParserPlugin {
 			if (param.string === "require") {
 				dep = new ConstDependency(
 					RuntimeGlobals.require,
-					/** @type {TODO} */ (param.string),
+					/** @type {Range} */
+					(param.range),
 					[RuntimeGlobals.require]
 				);
 			} else if (param.string === "module") {
 				dep = new ConstDependency(
-					/** @type {BuildInfo} */
-					(parser.state.module.buildInfo).moduleArgument,
-					/** @type {Range} */ (param.range),
+					parser.state.module.moduleArgument,
+					/** @type {Range} */
+					(param.range),
 					[RuntimeGlobals.module]
 				);
 			} else if (param.string === "exports") {
 				dep = new ConstDependency(
-					/** @type {BuildInfo} */
-					(parser.state.module.buildInfo).exportsArgument,
-					/** @type {Range} */ (param.range),
+					parser.state.module.exportsArgument,
+					/** @type {Range} */
+					(param.range),
 					[RuntimeGlobals.exports]
 				);
 			} else if (
 				(localModule = getLocalModule(
 					parser.state,
-					/** @type {string} */ (param.string)
+					/** @type {string} */
+					(param.string)
 				))
 			) {
 				localModule.flagUsed();
 				dep = new LocalModuleDependency(localModule, param.range, false);
 			} else {
 				dep = this.newRequireItemDependency(
-					/** @type {string} */ (param.string),
+					/** @type {string} */
+					(param.string),
 					param.range
 				);
 				dep.loc = /** @type {DependencyLocation} */ (expr.loc);
@@ -208,7 +210,8 @@ class AMDRequireDependenciesBlockParserPlugin {
 	processContext(parser, expr, param) {
 		const dep = ContextDependencyHelpers.create(
 			AMDRequireContextDependency,
-			/** @type {Range} */ (param.range),
+			/** @type {Range} */
+			(param.range),
 			param,
 			expr,
 			this.options,
@@ -232,7 +235,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 		if (param.isArray()) {
 			const result =
 				/** @type {BasicEvaluatedExpression[]} */
-				(param.items).map(item => this.processItemForRequestString(item));
+				(param.items).map((item) => this.processItemForRequestString(item));
 			if (result.every(Boolean)) return result.join(" ");
 		} else if (param.isConstArray()) {
 			return /** @type {string[]} */ (param.array).join(" ");
@@ -247,7 +250,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 		if (param.isConditional()) {
 			const result =
 				/** @type {BasicEvaluatedExpression[]} */
-				(param.options).map(item => this.processItemForRequestString(item));
+				(param.options).map((item) => this.processItemForRequestString(item));
 			if (result.every(Boolean)) return result.join("|");
 		} else if (param.isString()) {
 			return param.string;
@@ -292,7 +295,7 @@ class AMDRequireDependenciesBlockParserPlugin {
 			dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 			depBlock.addDependency(dep);
 
-			parser.state.current = /** @type {TODO} */ (depBlock);
+			parser.state.current = /** @type {EXPECTED_ANY} */ (depBlock);
 		}
 
 		if (expr.arguments.length === 1) {
@@ -300,13 +303,15 @@ class AMDRequireDependenciesBlockParserPlugin {
 				result = this.processArray(
 					parser,
 					expr,
-					/** @type {BasicEvaluatedExpression} */ (param)
+					/** @type {BasicEvaluatedExpression} */
+					(param)
 				);
 			});
 			parser.state.current = old;
 			if (!result) return;
 			parser.state.current.addBlock(
-				/** @type {AMDRequireDependenciesBlock} */ (depBlock)
+				/** @type {AMDRequireDependenciesBlock} */
+				(depBlock)
 			);
 			return true;
 		}
@@ -317,13 +322,15 @@ class AMDRequireDependenciesBlockParserPlugin {
 					result = this.processArray(
 						parser,
 						expr,
-						/** @type {BasicEvaluatedExpression} */ (param)
+						/** @type {BasicEvaluatedExpression} */
+						(param)
 					);
 				});
 				if (!result) {
 					const dep = new UnsupportedDependency(
 						"unsupported",
-						/** @type {Range} */ (expr.range)
+						/** @type {Range} */
+						(expr.range)
 					);
 					old.addPresentationalDependency(dep);
 					if (parser.state.module) {
@@ -332,7 +339,8 @@ class AMDRequireDependenciesBlockParserPlugin {
 								`Cannot statically analyse 'require(…, …)' in line ${
 									/** @type {SourceLocation} */ (expr.loc).start.line
 								}`,
-								/** @type {DependencyLocation} */ (expr.loc)
+								/** @type {DependencyLocation} */
+								(expr.loc)
 							)
 						);
 					}
@@ -407,4 +415,5 @@ class AMDRequireDependenciesBlockParserPlugin {
 		return new AMDRequireArrayDependency(depsArray, range);
 	}
 }
+
 module.exports = AMDRequireDependenciesBlockParserPlugin;

package/lib/dependencies/AMDRuntimeModules.js

@@ -8,6 +8,8 @@ const RuntimeGlobals = require("../RuntimeGlobals");
 const RuntimeModule = require("../RuntimeModule");
 const Template = require("../Template");
 
+/** @typedef {import("./AMDPlugin").AmdOptions} AmdOptions */
+
 class AMDDefineRuntimeModule extends RuntimeModule {
 	constructor() {
 		super("amd define");
@@ -27,7 +29,7 @@ class AMDDefineRuntimeModule extends RuntimeModule {
 
 class AMDOptionsRuntimeModule extends RuntimeModule {
 	/**
-	 * @param {Record<string, boolean | number | string>} options the AMD options
+	 * @param {AmdOptions} options the AMD options
 	 */
 	constructor(options) {
 		super("amd options");

package/lib/dependencies/CachedConstDependency.js

@@ -11,13 +11,9 @@ const makeSerializable = require("../util/makeSerializable");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
-/** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
-/** @typedef {import("../DependencyTemplates")} DependencyTemplates */
-/** @typedef {import("../ModuleGraph")} ModuleGraph */
-/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -26,15 +22,22 @@ const NullDependency = require("./NullDependency");
 class CachedConstDependency extends NullDependency {
 	/**
 	 * @param {string} expression expression
-	 * @param {Range} range range
+	 * @param {Range | null} range range
 	 * @param {string} identifier identifier
+	 * @param {number=} place place where we inject the expression
 	 */
-	constructor(expression, range, identifier) {
+	constructor(
+		expression,
+		range,
+		identifier,
+		place = CachedConstDependency.PLACE_MODULE
+	) {
 		super();
 
 		this.expression = expression;
 		this.range = range;
 		this.identifier = identifier;
+		this.place = place;
 		this._hashUpdate = undefined;
 	}
 
@@ -42,7 +45,7 @@ class CachedConstDependency extends NullDependency {
 	 * @returns {string} hash update
 	 */
 	_createHashUpdate() {
-		return `${this.identifier}${this.range}${this.expression}`;
+		return `${this.place}${this.identifier}${this.range}${this.expression}`;
 	}
 
 	/**
@@ -67,6 +70,7 @@ class CachedConstDependency extends NullDependency {
 		write(this.expression);
 		write(this.range);
 		write(this.identifier);
+		write(this.place);
 
 		super.serialize(context);
 	}
@@ -80,11 +84,15 @@ class CachedConstDependency extends NullDependency {
 		this.expression = read();
 		this.range = read();
 		this.identifier = read();
+		this.place = read();
 
 		super.deserialize(context);
 	}
 }
 
+CachedConstDependency.PLACE_MODULE = 10;
+CachedConstDependency.PLACE_CHUNK = 20;
+
 makeSerializable(
 	CachedConstDependency,
 	"webpack/lib/dependencies/CachedConstDependency"
@@ -99,29 +107,27 @@ CachedConstDependency.Template = class CachedConstDependencyTemplate extends (
 	 * @param {DependencyTemplateContext} templateContext the context object
 	 * @returns {void}
 	 */
-	apply(
-		dependency,
-		source,
-		{ runtimeTemplate, dependencyTemplates, initFragments }
-	) {
+	apply(dependency, source, { initFragments, chunkInitFragments }) {
 		const dep = /** @type {CachedConstDependency} */ (dependency);
 
-		initFragments.push(
+		(dep.place === CachedConstDependency.PLACE_MODULE
+			? initFragments
+			: chunkInitFragments
+		).push(
 			new InitFragment(
 				`var ${dep.identifier} = ${dep.expression};\n`,
 				InitFragment.STAGE_CONSTANTS,
-				0,
+				// For a chunk we inject expression after imports
+				dep.place === CachedConstDependency.PLACE_MODULE ? 0 : 10,
 				`const ${dep.identifier}`
 			)
 		);
 
 		if (typeof dep.range === "number") {
 			source.insert(dep.range, dep.identifier);
-
-			return;
+		} else if (dep.range !== null) {
+			source.replace(dep.range[0], dep.range[1] - 1, dep.identifier);
 		}
-
-		source.replace(dep.range[0], dep.range[1] - 1, dep.identifier);
 	}
 };
 

package/lib/dependencies/CommonJsExportRequireDependency.js

@@ -17,11 +17,13 @@ const processExportInfo = require("./processExportInfo");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
-/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
+/** @typedef {import("../Dependency").RawReferencedExports} RawReferencedExports */
+/** @typedef {import("../Dependency").ReferencedExports} ReferencedExports */
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ExportsInfo")} ExportsInfo */
 /** @typedef {import("../ExportsInfo").ExportInfo} ExportInfo */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
@@ -34,14 +36,17 @@ const idsSymbol = Symbol("CommonJsExportRequireDependency.ids");
 
 const EMPTY_OBJECT = {};
 
+/** @typedef {Set<string>} Exports */
+/** @typedef {Set<string>} Checked */
+
 class CommonJsExportRequireDependency extends ModuleDependency {
 	/**
 	 * @param {Range} range range
 	 * @param {Range | null} valueRange value range
 	 * @param {CommonJSDependencyBaseKeywords} base base
-	 * @param {string[]} names names
+	 * @param {ExportInfoName[]} names names
 	 * @param {string} request request
-	 * @param {string[]} ids ids
+	 * @param {ExportInfoName[]} ids ids
 	 * @param {boolean} resultUsed true, when the result is used
 	 */
 	constructor(range, valueRange, base, names, request, ids, resultUsed) {
@@ -68,28 +73,26 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @returns {string[]} the imported id
+	 * @returns {ExportInfoName[]} the imported id
 	 */
 	getIds(moduleGraph) {
-		return (
-			/** @type {TODO} */ (moduleGraph.getMeta(this))[idsSymbol] || this.ids
-		);
+		return moduleGraph.getMeta(this)[idsSymbol] || this.ids;
 	}
 
 	/**
 	 * @param {ModuleGraph} moduleGraph the module graph
-	 * @param {string[]} ids the imported ids
+	 * @param {ExportInfoName[]} ids the imported ids
 	 * @returns {void}
 	 */
 	setIds(moduleGraph, ids) {
-		/** @type {TODO} */ (moduleGraph.getMeta(this))[idsSymbol] = ids;
+		moduleGraph.getMeta(this)[idsSymbol] = ids;
 	}
 
 	/**
 	 * Returns list of exports referenced by this dependency
 	 * @param {ModuleGraph} moduleGraph module graph
 	 * @param {RuntimeSpec} runtime the runtime for which the module is analysed
-	 * @returns {(string[] | ReferencedExport)[]} referenced exports
+	 * @returns {ReferencedExports} referenced exports
 	 */
 	getReferencedExports(moduleGraph, runtime) {
 		const ids = this.getIds(moduleGraph);
@@ -110,9 +113,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
 		for (const name of this.names) {
-			const exportInfo = /** @type {ExportInfo} */ (
-				exportsInfo.getReadOnlyExportInfo(name)
-			);
+			const exportInfo =
+				/** @type {ExportInfo} */
+				(exportsInfo.getReadOnlyExportInfo(name));
 			const used = exportInfo.getUsed(runtime);
 			if (used === UsageState.Unused) return Dependency.NO_EXPORTS_REFERENCED;
 			if (used !== UsageState.OnlyPropertiesUsed) return getFullResult();
@@ -122,18 +125,18 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		if (exportsInfo.otherExportsInfo.getUsed(runtime) !== UsageState.Unused) {
 			return getFullResult();
 		}
-		/** @type {string[][]} */
+		/** @type {RawReferencedExports} */
 		const referencedExports = [];
 		for (const exportInfo of exportsInfo.orderedExports) {
 			processExportInfo(
 				runtime,
 				referencedExports,
-				ids.concat(exportInfo.name),
+				[...ids, exportInfo.name],
 				exportInfo,
 				false
 			);
 		}
-		return referencedExports.map(name => ({
+		return referencedExports.map((name) => ({
 			name,
 			canMangle: false
 		}));
@@ -190,11 +193,12 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		if (reexportInfo) {
 			return {
 				exports: Array.from(
-					/** @type {TODO} */ (reexportInfo).exports,
-					name => ({
+					/** @type {Exports} */
+					(reexportInfo.exports),
+					(name) => ({
 						name,
 						from,
-						export: ids.concat(name),
+						export: [...ids, name],
 						canMangle: !(name in EMPTY_OBJECT) && false
 					})
 				),
@@ -214,7 +218,7 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 	 * @param {ModuleGraph} moduleGraph the module graph
 	 * @param {RuntimeSpec} runtime the runtime
 	 * @param {Module} importedModule the imported module (optional)
-	 * @returns {{exports?: Set<string>, checked?: Set<string>} | undefined} information
+	 * @returns {{ exports?: Exports, checked?: Checked } | undefined} information
 	 */
 	getStarReexports(
 		moduleGraph,
@@ -224,14 +228,16 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		/** @type {ExportsInfo | undefined} */
 		let importedExportsInfo = moduleGraph.getExportsInfo(importedModule);
 		const ids = this.getIds(moduleGraph);
-		if (ids.length > 0)
+		if (ids.length > 0) {
 			importedExportsInfo = importedExportsInfo.getNestedExportsInfo(ids);
+		}
 		/** @type {ExportsInfo | undefined} */
 		let exportsInfo = moduleGraph.getExportsInfo(
 			/** @type {Module} */ (moduleGraph.getParentModule(this))
 		);
-		if (this.names.length > 0)
+		if (this.names.length > 0) {
 			exportsInfo = exportsInfo.getNestedExportsInfo(this.names);
+		}
 
 		const noExtraExports =
 			importedExportsInfo &&
@@ -247,9 +253,9 @@ class CommonJsExportRequireDependency extends ModuleDependency {
 		const isNamespaceImport =
 			importedModule.getExportsType(moduleGraph, false) === "namespace";
 
-		/** @type {Set<string>} */
+		/** @type {Exports} */
 		const exports = new Set();
-		/** @type {Set<string>} */
+		/** @type {Checked} */
 		const checked = new Set();
 
 		if (noExtraImports) {
@@ -402,3 +408,4 @@ CommonJsExportRequireDependency.Template = class CommonJsExportRequireDependency
 };
 
 module.exports = CommonJsExportRequireDependency;
+module.exports.idsSymbol = idsSymbol;

package/lib/dependencies/CommonJsExportsDependency.js

@@ -16,6 +16,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency").ExportsSpec} ExportsSpec */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ExportsInfo").ExportInfoName} ExportInfoName */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
@@ -28,7 +29,7 @@ class CommonJsExportsDependency extends NullDependency {
 	 * @param {Range} range range
 	 * @param {Range | null} valueRange value range
 	 * @param {CommonJSDependencyBaseKeywords} base base
-	 * @param {string[]} names names
+	 * @param {ExportInfoName[]} names names
 	 */
 	constructor(range, valueRange, base, names) {
 		super();