webpack 5.90.2 → 5.91.0

package/lib/dependencies/ImportWeakDependency.js

@@ -15,6 +15,7 @@ const ImportDependency = require("./ImportDependency");
 /** @typedef {import("../Module")} Module */
 /** @typedef {import("../Module").BuildMeta} BuildMeta */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 class ImportWeakDependency extends ImportDependency {
@@ -22,9 +23,10 @@ class ImportWeakDependency extends ImportDependency {
 	 * @param {string} request the request
 	 * @param {Range} range expression range
 	 * @param {(string[][] | null)=} referencedExports list of referenced exports
+	 * @param {Attributes=} attributes assertions
 	 */
-	constructor(request, range, referencedExports) {
-		super(request, range, referencedExports);
+	constructor(request, range, referencedExports, attributes) {
+		super(request, range, referencedExports, attributes);
 		this.weak = true;
 	}
 

package/lib/dependencies/LoaderDependency.js

@@ -7,6 +7,7 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -30,7 +31,7 @@ class LoaderDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return false;

package/lib/dependencies/LoaderImportDependency.js

@@ -7,6 +7,7 @@
 
 const ModuleDependency = require("./ModuleDependency");
 
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../ModuleGraphConnection")} ModuleGraphConnection */
 /** @typedef {import("../ModuleGraphConnection").ConnectionState} ConnectionState */
@@ -31,7 +32,7 @@ class LoaderImportDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return false;

package/lib/dependencies/ModuleDependency.js

@@ -7,15 +7,14 @@
 
 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 */
+/** @typedef {import("../javascript/JavascriptParser").Attributes} Attributes */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext} ObjectDeserializerContext */
 /** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext} ObjectSerializerContext */
 
-const getRawModule = memoize(() => require("../RawModule"));
-
 class ModuleDependency extends Dependency {
 	/**
 	 * @param {string} request request path which needs resolving
@@ -25,8 +24,9 @@ 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 {Attributes | undefined} */
 		this.assertions = undefined;
 		this._context = undefined;
 	}
@@ -61,7 +61,6 @@ class ModuleDependency extends Dependency {
 	 * @returns {Module | null} a module
 	 */
 	createIgnoredModule(context) {
-		const RawModule = getRawModule();
 		return new RawModule(
 			"/* (ignored) */",
 			`ignored|${context}|${this.request}`,

package/lib/dependencies/PureExpressionDependency.js

@@ -15,6 +15,7 @@ const NullDependency = require("./NullDependency");
 /** @typedef {import("../Dependency")} Dependency */
 /** @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 */
@@ -106,7 +107,9 @@ PureExpressionDependency.Template = class PureExpressionDependencyTemplate exten
 
 		const usedByExports = dep.usedByExports;
 		if (usedByExports !== false) {
-			const selfModule = moduleGraph.getParentModule(dep);
+			const selfModule =
+				/** @type {Module} */
+				(moduleGraph.getParentModule(dep));
 			const exportsInfo = moduleGraph.getExportsInfo(selfModule);
 			const merged = deepMergeRuntime(runtimes, runtime);
 			const runtimeCondition = filterRuntime(merged, runtime => {

package/lib/dependencies/RequireContextPlugin.js

@@ -80,7 +80,7 @@ class RequireContextPlugin {
 							cachedSetProperty(
 								options.resolveOptions || EMPTY_RESOLVE_OPTIONS,
 								"dependencyType",
-								options.category
+								/** @type {string} */ (options.category)
 							)
 						).options;
 

package/lib/dependencies/RequireEnsureDependenciesBlockParserPlugin.js

@@ -11,9 +11,16 @@ const RequireEnsureItemDependency = require("./RequireEnsureItemDependency");
 const getFunctionExpression = require("./getFunctionExpression");
 
 /** @typedef {import("../ChunkGroup").ChunkGroupOptions} ChunkGroupOptions */
+/** @typedef {import("../Dependency").DependencyLocation} DependencyLocation */
+/** @typedef {import("../javascript/BasicEvaluatedExpression")} BasicEvaluatedExpression */
 /** @typedef {import("../javascript/JavascriptParser")} JavascriptParser */
+/** @typedef {import("../javascript/JavascriptParser").Range} Range */
 
 module.exports = class RequireEnsureDependenciesBlockParserPlugin {
+	/**
+	 * @param {JavascriptParser} parser the parser
+	 * @returns {void}
+	 */
 	apply(parser) {
 		parser.hooks.call
 			.for("require.ensure")
@@ -45,9 +52,12 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 						const dependenciesExpr = parser.evaluateExpression(
 							expr.arguments[0]
 						);
-						const dependenciesItems = dependenciesExpr.isArray()
-							? dependenciesExpr.items
-							: [dependenciesExpr];
+						const dependenciesItems =
+							/** @type {BasicEvaluatedExpression[]} */ (
+								dependenciesExpr.isArray()
+									? dependenciesExpr.items
+									: [dependenciesExpr]
+							);
 						const successExpressionArg = expr.arguments[1];
 						const successExpression =
 							getFunctionExpression(successExpressionArg);
@@ -60,32 +70,34 @@ module.exports = class RequireEnsureDependenciesBlockParserPlugin {
 						}
 
 						const depBlock = new RequireEnsureDependenciesBlock(
-							/** @type {ChunkGroupOptions & { entryOptions?: TODO }} */ (
-								chunkName
-							),
-							expr.loc
+							/** @type {ChunkGroupOptions & { entryOptions?: TODO }} */
+							(chunkName),
+							/** @type {DependencyLocation} */ (expr.loc)
 						);
 						const errorCallbackExists =
 							expr.arguments.length === 4 ||
 							(!chunkName && expr.arguments.length === 3);
 						const dep = new RequireEnsureDependency(
-							expr.range,
-							expr.arguments[1].range,
-							errorCallbackExists && expr.arguments[2].range
+							/** @type {Range} */ (expr.range),
+							/** @type {Range} */ (expr.arguments[1].range),
+							errorCallbackExists &&
+								/** @type {Range} */ (expr.arguments[2].range)
 						);
-						dep.loc = expr.loc;
+						dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 						depBlock.addDependency(dep);
 						const old = parser.state.current;
-						parser.state.current = depBlock;
+						parser.state.current = /** @type {TODO} */ (depBlock);
 						try {
 							let failed = false;
 							parser.inScope([], () => {
 								for (const ee of dependenciesItems) {
 									if (ee.isString()) {
 										const ensureDependency = new RequireEnsureItemDependency(
-											ee.string
+											/** @type {string} */ (ee.string)
 										);
-										ensureDependency.loc = ee.loc || expr.loc;
+										ensureDependency.loc =
+											/** @type {DependencyLocation} */
+											(expr.loc);
 										depBlock.addDependency(ensureDependency);
 									} else {
 										failed = true;

package/lib/dependencies/RequireEnsureDependency.js

@@ -21,7 +21,7 @@ class RequireEnsureDependency extends NullDependency {
 	/**
 	 * @param {Range} range range
 	 * @param {Range} contentRange content range
-	 * @param {Range} errorHandlerRange error handler range
+	 * @param {Range | false} errorHandlerRange error handler range
 	 */
 	constructor(range, contentRange, errorHandlerRange) {
 		super();

package/lib/dependencies/URLDependency.js

@@ -6,6 +6,7 @@
 "use strict";
 
 const RuntimeGlobals = require("../RuntimeGlobals");
+const RawDataUrlModule = require("../asset/RawDataUrlModule");
 const {
 	getDependencyUsedByExportsCondition
 } = require("../optimize/InnerGraph");
@@ -16,6 +17,7 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
 /** @typedef {import("../Dependency")} Dependency */
+/** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../Dependency").UpdateHashContext} UpdateHashContext */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
 /** @typedef {import("../Module")} Module */
@@ -28,7 +30,9 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../util/Hash")} Hash */
 /** @typedef {import("../util/runtime").RuntimeSpec} RuntimeSpec */
 
-const getRawDataUrlModule = memoize(() => require("../asset/RawDataUrlModule"));
+const getIgnoredRawDataUrlModule = memoize(() => {
+	return new RawDataUrlModule("data:,", `ignored-asset`, `(ignored asset)`);
+});
 
 class URLDependency extends ModuleDependency {
 	/**
@@ -56,7 +60,7 @@ class URLDependency extends ModuleDependency {
 
 	/**
 	 * @param {ModuleGraph} moduleGraph module graph
-	 * @returns {null | false | function(ModuleGraphConnection, RuntimeSpec): ConnectionState} function to determine if the connection is active
+	 * @returns {null | false | GetConditionFn} function to determine if the connection is active
 	 */
 	getCondition(moduleGraph) {
 		return getDependencyUsedByExportsCondition(
@@ -71,8 +75,7 @@ class URLDependency extends ModuleDependency {
 	 * @returns {Module | null} a module
 	 */
 	createIgnoredModule(context) {
-		const RawDataUrlModule = getRawDataUrlModule();
-		return new RawDataUrlModule("data:,", `ignored-asset`, `(ignored asset)`);
+		return getIgnoredRawDataUrlModule();
 	}
 
 	/**

package/lib/dependencies/WorkerDependency.js

@@ -29,7 +29,7 @@ class WorkerDependency extends ModuleDependency {
 	 * @param {string} request request
 	 * @param {Range} range range
 	 * @param {Object} workerDependencyOptions options
-	 * @param {string} workerDependencyOptions.publicPath public path for the worker
+	 * @param {string=} workerDependencyOptions.publicPath public path for the worker
 	 */
 	constructor(request, range, workerDependencyOptions) {
 		super(request);

package/lib/dependencies/WorkerPlugin.js

@@ -71,10 +71,10 @@ const PLUGIN_NAME = "WorkerPlugin";
 
 class WorkerPlugin {
 	/**
-	 * @param {ChunkLoading} chunkLoading chunk loading
-	 * @param {WasmLoading} wasmLoading wasm loading
-	 * @param {OutputModule} module output module
-	 * @param {WorkerPublicPath} workerPublicPath worker public path
+	 * @param {ChunkLoading=} chunkLoading chunk loading
+	 * @param {WasmLoading=} wasmLoading wasm loading
+	 * @param {OutputModule=} module output module
+	 * @param {WorkerPublicPath=} workerPublicPath worker public path
 	 */
 	constructor(chunkLoading, wasmLoading, module, workerPublicPath) {
 		this._chunkLoading = chunkLoading;
@@ -369,7 +369,8 @@ class WorkerPlugin {
 								);
 								dep.loc = /** @type {DependencyLocation} */ (expr.loc);
 								parser.state.module.addPresentationalDependency(dep);
-								expressions.type = undefined;
+								/** @type {TODO} */
+								(expressions).type = undefined;
 							}
 						} else if (insertType === "comma") {
 							if (this._module || hasSpreadInOptions) {

package/lib/dependencies/getFunctionExpression.js

@@ -5,12 +5,14 @@
 
 "use strict";
 
+/** @typedef {import("estree").ArrowFunctionExpression} ArrowFunctionExpression */
 /** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").FunctionExpression} FunctionExpression */
 /** @typedef {import("estree").SpreadElement} SpreadElement */
 
 /**
  * @param {Expression | SpreadElement} expr expressions
- * @returns {{fn: TODO, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
+ * @returns {{fn: FunctionExpression | ArrowFunctionExpression, expressions: (Expression | SpreadElement)[], needThis: boolean | undefined } | undefined} function expression with additional information
  */
 module.exports = expr => {
 	// <FunctionExpression>

package/lib/esm/ModuleChunkLoadingRuntimeModule.js

@@ -19,6 +19,7 @@ const { getUndoPath } = require("../util/identifier");
 
 /** @typedef {import("../Chunk")} Chunk */
 /** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Module").ReadOnlyRuntimeRequirements} ReadOnlyRuntimeRequirements */
 
 /**
  * @typedef {Object} JsonpCompilationPluginHooks
@@ -52,7 +53,7 @@ class ModuleChunkLoadingRuntimeModule extends RuntimeModule {
 	}
 
 	/**
-	 * @param {ReadonlySet<string>} runtimeRequirements runtime requirements
+	 * @param {ReadOnlyRuntimeRequirements} runtimeRequirements runtime requirements
 	 */
 	constructor(runtimeRequirements) {
 		super("import chunk loading", RuntimeModule.STAGE_ATTACH);

package/lib/hmr/LazyCompilationPlugin.js

@@ -27,6 +27,7 @@ const { registerNotSerializable } = require("../util/serialization");
 /** @typedef {import("../Module").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("../Module").LibIdentOptions} LibIdentOptions */
 /** @typedef {import("../Module").NeedBuildContext} NeedBuildContext */
+/** @typedef {import("../Module").SourceTypes} SourceTypes */
 /** @typedef {import("../ModuleFactory").ModuleFactoryCreateData} ModuleFactoryCreateData */
 /** @typedef {import("../ModuleFactory").ModuleFactoryResult} ModuleFactoryResult */
 /** @typedef {import("../RequestShortener")} RequestShortener */
@@ -190,7 +191,7 @@ class LazyCompilationProxyModule extends Module {
 	}
 
 	/**
-	 * @returns {Set<string>} types available (do not mutate)
+	 * @returns {SourceTypes} types available (do not mutate)
 	 */
 	getSourceTypes() {
 		return TYPES;

package/lib/javascript/BasicEvaluatedExpression.js

@@ -27,7 +27,7 @@ const TypeBigInt = 13;
 class BasicEvaluatedExpression {
 	constructor() {
 		this.type = TypeUnknown;
-		/** @type {[number, number] | undefined} */
+		/** @type {Range | undefined} */
 		this.range = undefined;
 		/** @type {boolean} */
 		this.falsy = false;
@@ -420,7 +420,7 @@ class BasicEvaluatedExpression {
 	 *
 	 * @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[]} innerExpressions Expressions to be wrapped
+	 * @param {BasicEvaluatedExpression[] | undefined} innerExpressions Expressions to be wrapped
 	 * @returns {this} this
 	 */
 	setWrapped(prefix, postfix, innerExpressions) {

package/lib/javascript/ChunkHelpers.js

@@ -11,8 +11,8 @@ const Entrypoint = require("../Entrypoint");
 
 /**
  * @param {Entrypoint} entrypoint a chunk group
- * @param {Chunk=} excludedChunk1 current chunk which is excluded
- * @param {Chunk=} excludedChunk2 runtime chunk which is excluded
+ * @param {(Chunk | null)=} excludedChunk1 current chunk which is excluded
+ * @param {(Chunk | null)=} excludedChunk2 runtime chunk which is excluded
  * @returns {Set<Chunk>} chunks
  */
 const getAllChunks = (entrypoint, excludedChunk1, excludedChunk2) => {