webpack 5.59.0 → 5.94.0

package/lib/dependencies/ModuleDependency.js

@@ -7,12 +7,13 @@
 
 const Dependency = require("../Dependency");
 const DependencyTemplate = require("../DependencyTemplate");
-const memoize = require("../util/memoize");
+const RawModule = require("../RawModule");
 
 /** @typedef {import("../Dependency").TRANSITIVE} TRANSITIVE */
 /** @typedef {import("../Module")} Module */
-
-const getRawModule = memoize(() => require("../RawModule"));
+/** @typedef {import("../javascript/JavascriptParser").ImportAttributes} ImportAttributes */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
 class ModuleDependency extends Dependency {
 	/**
@@ -23,16 +24,25 @@ class ModuleDependency extends Dependency {
 		this.request = request;
 		this.userRequest = request;
 		this.range = undefined;
+		// TODO move it to subclasses and rename
 		// assertions must be serialized by subclasses that use it
-		/** @type {Record<string, any> | undefined} */
+		/** @type {ImportAttributes | undefined} */
 		this.assertions = undefined;
+		this._context = undefined;
+	}
+
+	/**
+	 * @returns {string | undefined} a request context
+	 */
+	getContext() {
+		return this._context;
 	}
 
 	/**
 	 * @returns {string | null} an identifier to merge equal requests
 	 */
 	getResourceIdentifier() {
-		let str = `module${this.request}`;
+		let str = `context${this._context || ""}|module${this.request}`;
 		if (this.assertions !== undefined) {
 			str += JSON.stringify(this.assertions);
 		}
@@ -48,10 +58,9 @@ class ModuleDependency extends Dependency {
 
 	/**
 	 * @param {string} context context directory
-	 * @returns {Module} a module
+	 * @returns {Module | null} a module
 	 */
 	createIgnoredModule(context) {
-		const RawModule = getRawModule();
 		return new RawModule(
 			"/* (ignored) */",
 			`ignored|${context}|${this.request}`,
@@ -59,18 +68,26 @@ class ModuleDependency extends Dependency {
 		);
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.request);
 		write(this.userRequest);
+		write(this._context);
 		write(this.range);
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.request = read();
 		this.userRequest = read();
+		this._context = read();
 		this.range = read();
 		super.deserialize(context);
 	}

package/lib/dependencies/ModuleDependencyTemplateAsId.js

@@ -10,6 +10,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../Module")} Module */
 
 class ModuleDependencyTemplateAsId extends ModuleDependency.Template {
 	/**
@@ -22,7 +23,7 @@ class ModuleDependencyTemplateAsId extends ModuleDependency.Template {
 		const dep = /** @type {ModuleDependency} */ (dependency);
 		if (!dep.range) return;
 		const content = runtimeTemplate.moduleId({
-			module: moduleGraph.getModule(dep),
+			module: /** @type {Module} */ (moduleGraph.getModule(dep)),
 			chunkGraph,
 			request: dep.request,
 			weak: dep.weak

package/lib/dependencies/ModuleHotAcceptDependency.js

@@ -9,7 +9,13 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 class ModuleHotAcceptDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 		this.range = range;

package/lib/dependencies/ModuleHotDeclineDependency.js

@@ -9,7 +9,13 @@ const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 const ModuleDependencyTemplateAsId = require("./ModuleDependencyTemplateAsId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 class ModuleHotDeclineDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 * @param {Range} range location in source code
+	 */
 	constructor(request, range) {
 		super(request);
 

package/lib/dependencies/PrefetchDependency.js

@@ -8,6 +8,9 @@
 const ModuleDependency = require("./ModuleDependency");
 
 class PrefetchDependency extends ModuleDependency {
+	/**
+	 * @param {string} request the request string
+	 */
 	constructor(request) {
 		super(request);
 	}

package/lib/dependencies/ProvidedDependency.js

@@ -5,19 +5,25 @@
 
 "use strict";
 
+const Dependency = require("../Dependency");
 const InitFragment = require("../InitFragment");
 const makeSerializable = require("../util/makeSerializable");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
-/** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Dependency").ReferencedExport} ReferencedExport */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../DependencyTemplates")} DependencyTemplates */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
+/** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
 /**
  * @param {string[]|null} path the property path array
@@ -29,10 +35,16 @@ const pathToString = path =>
 		: "";
 
 class ProvidedDependency extends ModuleDependency {
-	constructor(request, identifier, path, range) {
+	/**
+	 * @param {string} request request
+	 * @param {string} identifier identifier
+	 * @param {string[]} ids ids
+	 * @param {Range} range range
+	 */
+	constructor(request, identifier, ids, range) {
 		super(request);
 		this.identifier = identifier;
-		this.path = path;
+		this.ids = ids;
 		this.range = range;
 		this._hashUpdate = undefined;
 	}
@@ -45,6 +57,18 @@ class ProvidedDependency extends ModuleDependency {
 		return "esm";
 	}
 
+	/**
+	 * 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
+	 */
+	getReferencedExports(moduleGraph, runtime) {
+		const ids = this.ids;
+		if (ids.length === 0) return Dependency.EXPORTS_OBJECT_REFERENCED;
+		return [ids];
+	}
+
 	/**
 	 * Update the hash
 	 * @param {Hash} hash hash to be updated
@@ -53,23 +77,28 @@ class ProvidedDependency extends ModuleDependency {
 	 */
 	updateHash(hash, context) {
 		if (this._hashUpdate === undefined) {
-			this._hashUpdate =
-				this.identifier + (this.path ? this.path.join(",") : "null");
+			this._hashUpdate = this.identifier + (this.ids ? this.ids.join(",") : "");
 		}
 		hash.update(this._hashUpdate);
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.identifier);
-		write(this.path);
+		write(this.ids);
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.identifier = read();
-		this.path = read();
+		this.ids = read();
 		super.deserialize(context);
 	}
 }
@@ -90,6 +119,7 @@ class ProvidedDependencyTemplate extends ModuleDependency.Template {
 		dependency,
 		source,
 		{
+			runtime,
 			runtimeTemplate,
 			moduleGraph,
 			chunkGraph,
@@ -98,6 +128,11 @@ class ProvidedDependencyTemplate extends ModuleDependency.Template {
 		}
 	) {
 		const dep = /** @type {ProvidedDependency} */ (dependency);
+		const connection =
+			/** @type {ModuleGraphConnection} */
+			(moduleGraph.getConnection(dep));
+		const exportsInfo = moduleGraph.getExportsInfo(connection.module);
+		const usedName = exportsInfo.getUsedName(dep.ids, runtime);
 		initFragments.push(
 			new InitFragment(
 				`/* provided dependency */ var ${
@@ -107,7 +142,7 @@ class ProvidedDependencyTemplate extends ModuleDependency.Template {
 					chunkGraph,
 					request: dep.request,
 					runtimeRequirements
-				})}${pathToString(dep.path)};\n`,
+				})}${pathToString(/** @type {string[]} */ (usedName))};\n`,
 				InitFragment.STAGE_PROVIDES,
 				1,
 				`provided ${dep.identifier}`

package/lib/dependencies/PureExpressionDependency.js

@@ -7,28 +7,57 @@
 
 const { UsageState } = require("../ExportsInfo");
 const makeSerializable = require("../util/makeSerializable");
-const { filterRuntime } = require("../util/runtime");
+const { filterRuntime, runtimeToString } = require("../util/runtime");
 const NullDependency = require("./NullDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Dependency").RuntimeSpec} RuntimeSpec */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
+/** @typedef {import("../Module")} Module */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 /** @typedef {import("../util/Hash")} Hash */
 
 class PureExpressionDependency extends NullDependency {
 	/**
-	 * @param {[number, number]} range the source range
+	 * @param {Range} range the source range
 	 */
 	constructor(range) {
 		super();
 		this.range = range;
 		/** @type {Set<string> | false} */
 		this.usedByExports = false;
-		this._hashUpdate = undefined;
+	}
+
+	/**
+	 * @param {ModuleGraph} moduleGraph module graph
+	 * @param {RuntimeSpec} runtime current runtimes
+	 * @returns {boolean | RuntimeSpec} runtime condition
+	 */
+	_getRuntimeCondition(moduleGraph, runtime) {
+		const usedByExports = this.usedByExports;
+		if (usedByExports !== false) {
+			const selfModule =
+				/** @type {Module} */
+				(moduleGraph.getParentModule(this));
+			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
+			const runtimeCondition = filterRuntime(runtime, runtime => {
+				for (const exportName of usedByExports) {
+					if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
+						return true;
+					}
+				}
+				return false;
+			});
+			return runtimeCondition;
+		}
+		return false;
 	}
 
 	/**
@@ -38,10 +67,22 @@ class PureExpressionDependency extends NullDependency {
 	 * @returns {void}
 	 */
 	updateHash(hash, context) {
-		if (this._hashUpdate === undefined) {
-			this._hashUpdate = this.range + "";
+		const runtimeCondition = this._getRuntimeCondition(
+			context.chunkGraph.moduleGraph,
+			context.runtime
+		);
+		if (runtimeCondition === true) {
+			return;
+		} else if (runtimeCondition === false) {
+			hash.update("null");
+		} else {
+			hash.update(
+				`${runtimeToString(runtimeCondition)}|${runtimeToString(
+					context.runtime
+				)}`
+			);
 		}
-		hash.update(this._hashUpdate);
+		hash.update(String(this.range));
 	}
 
 	/**
@@ -52,6 +93,9 @@ class PureExpressionDependency extends NullDependency {
 		return false;
 	}
 
+	/**
+	 * @param {ObjectSerializerContext} context context
+	 */
 	serialize(context) {
 		const { write } = context;
 		write(this.range);
@@ -59,6 +103,9 @@ class PureExpressionDependency extends NullDependency {
 		super.serialize(context);
 	}
 
+	/**
+	 * @param {ObjectDeserializerContext} context context
+	 */
 	deserialize(context) {
 		const { read } = context;
 		this.range = read();
@@ -87,41 +134,28 @@ PureExpressionDependency.Template = class PureExpressionDependencyTemplate exten
 		{ chunkGraph, moduleGraph, runtime, runtimeTemplate, runtimeRequirements }
 	) {
 		const dep = /** @type {PureExpressionDependency} */ (dependency);
-
-		const usedByExports = dep.usedByExports;
-		if (usedByExports !== false) {
-			const selfModule = moduleGraph.getParentModule(dep);
-			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
-			const runtimeCondition = filterRuntime(runtime, runtime => {
-				for (const exportName of usedByExports) {
-					if (exportsInfo.getUsed(exportName, runtime) !== UsageState.Unused) {
-						return true;
-					}
-				}
-				return false;
+		const runtimeCondition = dep._getRuntimeCondition(moduleGraph, runtime);
+		if (runtimeCondition === true) {
+			// Do nothing
+		} else if (runtimeCondition === false) {
+			source.insert(
+				dep.range[0],
+				"(/* unused pure expression or super */ null && ("
+			);
+			source.insert(dep.range[1], "))");
+		} else {
+			const condition = runtimeTemplate.runtimeConditionExpression({
+				chunkGraph,
+				runtime,
+				runtimeCondition,
+				runtimeRequirements
 			});
-			if (runtimeCondition === true) return;
-			if (runtimeCondition !== false) {
-				const condition = runtimeTemplate.runtimeConditionExpression({
-					chunkGraph,
-					runtime,
-					runtimeCondition,
-					runtimeRequirements
-				});
-				source.insert(
-					dep.range[0],
-					`(/* runtime-dependent pure expression or super */ ${condition} ? (`
-				);
-				source.insert(dep.range[1], ") : null)");
-				return;
-			}
+			source.insert(
+				dep.range[0],
+				`(/* runtime-dependent pure expression or super */ ${condition} ? (`
+			);
+			source.insert(dep.range[1], ") : null)");
 		}
-
-		source.insert(
-			dep.range[0],
-			`(/* unused pure expression or super */ null && (`
-		);
-		source.insert(dep.range[1], "))");
 	}
 };
 

package/lib/dependencies/RequireContextDependency.js

@@ -9,7 +9,13 @@ const makeSerializable = require("../util/makeSerializable");
 const ContextDependency = require("./ContextDependency");
 const ModuleDependencyTemplateAsRequireId = require("./ModuleDependencyTemplateAsRequireId");
 
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 class RequireContextDependency extends ContextDependency {
+	/**
+	 * @param {TODO} options options
+	 * @param {Range} range range
+	 */
 	constructor(options, range) {
 		super(options);
 
@@ -19,22 +25,6 @@ class RequireContextDependency extends ContextDependency {
 	get type() {
 		return "require.context";
 	}
-
-	serialize(context) {
-		const { write } = context;
-
-		write(this.range);
-
-		super.serialize(context);
-	}
-
-	deserialize(context) {
-		const { read } = context;
-
-		this.range = read();
-
-		super.deserialize(context);
-	}
 }
 
 makeSerializable(

package/lib/dependencies/RequireContextDependencyParserPlugin.js

@@ -7,7 +7,15 @@
 
 const RequireContextDependency = require("./RequireContextDependency");
 
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
+
 module.exports = class RequireContextDependencyParserPlugin {
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		parser.hooks.call
 			.for("require.context")
@@ -19,19 +27,19 @@ module.exports = class RequireContextDependencyParserPlugin {
 					case 4: {
 						const modeExpr = parser.evaluateExpression(expr.arguments[3]);
 						if (!modeExpr.isString()) return;
-						mode = modeExpr.string;
+						mode = /** @type {string} */ (modeExpr.string);
 					}
 					// falls through
 					case 3: {
 						const regExpExpr = parser.evaluateExpression(expr.arguments[2]);
 						if (!regExpExpr.isRegExp()) return;
-						regExp = regExpExpr.regExp;
+						regExp = /** @type {RegExp} */ (regExpExpr.regExp);
 					}
 					// falls through
 					case 2: {
 						const recursiveExpr = parser.evaluateExpression(expr.arguments[1]);
 						if (!recursiveExpr.isBoolean()) return;
-						recursive = recursiveExpr.bool;
+						recursive = /** @type {boolean} */ (recursiveExpr.bool);
 					}
 					// falls through
 					case 1: {
@@ -45,10 +53,10 @@ module.exports = class RequireContextDependencyParserPlugin {
 								mode,
 								category: "commonjs"
 							},
-							expr.range
+							/** @type {Range} */ (expr.range)
 						);
-						dep.loc = expr.loc;
-						dep.optional = !!parser.scope.inTry;
+						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
+						dep.optional = Boolean(parser.scope.inTry);
 						parser.state.current.addDependency(dep);
 						return true;
 					}

package/lib/dependencies/RequireContextPlugin.js

@@ -5,17 +5,25 @@
 
 "use strict";
 
+const {
+	JAVASCRIPT_MODULE_TYPE_AUTO,
+	JAVASCRIPT_MODULE_TYPE_DYNAMIC
+} = require("../ModuleTypeConstants");
 const { cachedSetProperty } = require("../util/cleverMerge");
 const ContextElementDependency = require("./ContextElementDependency");
 const RequireContextDependency = require("./RequireContextDependency");
 const RequireContextDependencyParserPlugin = require("./RequireContextDependencyParserPlugin");
 
+/** @typedef {import("../../declarations/WebpackOptions").JavascriptParserOptions} JavascriptParserOptions */
 /** @typedef {import("../../declarations/WebpackOptions").ResolveOptions} ResolveOptions */
 /** @typedef {import("../Compiler")} Compiler */
+/** @typedef {import("../javascript/JavascriptParser")} Parser */
 
 /** @type {ResolveOptions} */
 const EMPTY_RESOLVE_OPTIONS = {};
 
+const PLUGIN_NAME = "RequireContextPlugin";
+
 class RequireContextPlugin {
 	/**
 	 * Apply the plugin
@@ -24,7 +32,7 @@ class RequireContextPlugin {
 	 */
 	apply(compiler) {
 		compiler.hooks.compilation.tap(
-			"RequireContextPlugin",
+			PLUGIN_NAME,
 			(compilation, { contextModuleFactory, normalModuleFactory }) => {
 				compilation.dependencyFactories.set(
 					RequireContextDependency,
@@ -40,6 +48,11 @@ class RequireContextPlugin {
 					normalModuleFactory
 				);
 
+				/**
+				 * @param {Parser} parser parser parser
+				 * @param {JavascriptParserOptions} parserOptions parserOptions
+				 * @returns {void}
+				 */
 				const handler = (parser, parserOptions) => {
 					if (
 						parserOptions.requireContext !== undefined &&
@@ -51,14 +64,14 @@ class RequireContextPlugin {
 				};
 
 				normalModuleFactory.hooks.parser
-					.for("javascript/auto")
-					.tap("RequireContextPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_AUTO)
+					.tap(PLUGIN_NAME, handler);
 				normalModuleFactory.hooks.parser
-					.for("javascript/dynamic")
-					.tap("RequireContextPlugin", handler);
+					.for(JAVASCRIPT_MODULE_TYPE_DYNAMIC)
+					.tap(PLUGIN_NAME, handler);
 
 				contextModuleFactory.hooks.alternativeRequests.tap(
-					"RequireContextPlugin",
+					PLUGIN_NAME,
 					(items, options) => {
 						if (items.length === 0) return items;
 
@@ -67,7 +80,7 @@ class RequireContextPlugin {
 							cachedSetProperty(
 								options.resolveOptions || EMPTY_RESOLVE_OPTIONS,
 								"dependencyType",
-								options.category
+								/** @type {string} */ (options.category)
 							)
 						).options;
 

package/lib/dependencies/RequireEnsureDependenciesBlock.js

@@ -8,7 +8,14 @@
 const AsyncDependenciesBlock = require("../AsyncDependenciesBlock");
 const makeSerializable = require("../util/makeSerializable");
 
+/** @typedef {import("../ChunkGroup").ChunkGroupOptions} ChunkGroupOptions */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+
 class RequireEnsureDependenciesBlock extends AsyncDependenciesBlock {
+	/**
+	 * @param {ChunkGroupOptions & { entryOptions?: TODO }} chunkName chunk name
+	 * @param {DependencyLocation} loc location info
+	 */
 	constructor(chunkName, loc) {
 		super(chunkName, loc, null);
 	}