webpack 5.90.3 → 5.92.0

package/lib/RuntimeTemplate.js

@@ -13,13 +13,18 @@ const compileBooleanMatcher = require("./util/compileBooleanMatcher");
 const propertyAccess = require("./util/propertyAccess");
 const { forEachRuntime, subtractRuntime } = require("./util/runtime");
 
+/** @typedef {import("../declarations/WebpackOptions").Environment} Environment */
 /** @typedef {import("../declarations/WebpackOptions").OutputNormalized} OutputOptions */
 /** @typedef {import("./AsyncDependenciesBlock")} AsyncDependenciesBlock */
+/** @typedef {import("./Chunk")} Chunk */
 /** @typedef {import("./ChunkGraph")} ChunkGraph */
 /** @typedef {import("./CodeGenerationResults")} CodeGenerationResults */
+/** @typedef {import("./CodeGenerationResults").CodeGenerationResult} CodeGenerationResult */
 /** @typedef {import("./Compilation")} Compilation */
 /** @typedef {import("./Dependency")} Dependency */
 /** @typedef {import("./Module")} Module */
+/** @typedef {import("./Module").BuildMeta} BuildMeta */
+/** @typedef {import("./Module").RuntimeRequirements} RuntimeRequirements */
 /** @typedef {import("./ModuleGraph")} ModuleGraph */
 /** @typedef {import("./RequestShortener")} RequestShortener */
 /** @typedef {import("./util/runtime").RuntimeSpec} RuntimeSpec */
@@ -52,8 +57,8 @@ Module has these incoming connections: ${Array.from(
 };
 
 /**
- * @param {string|undefined} definition global object definition
- * @returns {string} save to use global object
+ * @param {string | undefined} definition global object definition
+ * @returns {string | undefined} save to use global object
  */
 function getGlobalObject(definition) {
 	if (!definition) return definition;
@@ -82,8 +87,13 @@ class RuntimeTemplate {
 		this.compilation = compilation;
 		this.outputOptions = outputOptions || {};
 		this.requestShortener = requestShortener;
-		this.globalObject = getGlobalObject(outputOptions.globalObject);
-		this.contentHashReplacement = "X".repeat(outputOptions.hashDigestLength);
+		this.globalObject =
+			/** @type {string} */
+			(getGlobalObject(outputOptions.globalObject));
+		this.contentHashReplacement = "X".repeat(
+			/** @type {NonNullable<OutputOptions["hashDigestLength"]>} */
+			(outputOptions.hashDigestLength)
+		);
 	}
 
 	isIIFE() {
@@ -95,51 +105,73 @@ class RuntimeTemplate {
 	}
 
 	supportsConst() {
-		return this.outputOptions.environment.const;
+		return /** @type {Environment} */ (this.outputOptions.environment).const;
 	}
 
 	supportsArrowFunction() {
-		return this.outputOptions.environment.arrowFunction;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.arrowFunction;
 	}
 
 	supportsAsyncFunction() {
-		return this.outputOptions.environment.asyncFunction;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.asyncFunction;
 	}
 
 	supportsOptionalChaining() {
-		return this.outputOptions.environment.optionalChaining;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.optionalChaining;
 	}
 
 	supportsForOf() {
-		return this.outputOptions.environment.forOf;
+		return /** @type {Environment} */ (this.outputOptions.environment).forOf;
 	}
 
 	supportsDestructuring() {
-		return this.outputOptions.environment.destructuring;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.destructuring;
 	}
 
 	supportsBigIntLiteral() {
-		return this.outputOptions.environment.bigIntLiteral;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.bigIntLiteral;
 	}
 
 	supportsDynamicImport() {
-		return this.outputOptions.environment.dynamicImport;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.dynamicImport;
 	}
 
 	supportsEcmaScriptModuleSyntax() {
-		return this.outputOptions.environment.module;
+		return /** @type {Environment} */ (this.outputOptions.environment).module;
 	}
 
 	supportTemplateLiteral() {
-		return this.outputOptions.environment.templateLiteral;
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.templateLiteral;
+	}
+
+	supportNodePrefixForCoreModules() {
+		return /** @type {Environment} */ (this.outputOptions.environment)
+			.nodePrefixForCoreModules;
 	}
 
+	/**
+	 * @param {string} returnValue return value
+	 * @param {string} args arguments
+	 * @returns {string} returning function
+	 */
 	returningFunction(returnValue, args = "") {
 		return this.supportsArrowFunction()
 			? `(${args}) => (${returnValue})`
 			: `function(${args}) { return ${returnValue}; }`;
 	}
 
+	/**
+	 * @param {string} args arguments
+	 * @param {string | string[]} body body
+	 * @returns {string} basic function
+	 */
 	basicFunction(args, body) {
 		return this.supportsArrowFunction()
 			? `(${args}) => {\n${Template.indent(body)}\n}`
@@ -211,16 +243,29 @@ class RuntimeTemplate {
 			: str;
 	}
 
+	/**
+	 * @param {string} expression expression
+	 * @param {string} args arguments
+	 * @returns {string} expression function code
+	 */
 	expressionFunction(expression, args = "") {
 		return this.supportsArrowFunction()
 			? `(${args}) => (${expression})`
 			: `function(${args}) { ${expression}; }`;
 	}
 
+	/**
+	 * @returns {string} empty function code
+	 */
 	emptyFunction() {
 		return this.supportsArrowFunction() ? "x => {}" : "function() {}";
 	}
 
+	/**
+	 * @param {string[]} items items
+	 * @param {string} value value
+	 * @returns {string} destructure array code
+	 */
 	destructureArray(items, value) {
 		return this.supportsDestructuring()
 			? `var [${items.join(", ")}] = ${value};`
@@ -229,6 +274,11 @@ class RuntimeTemplate {
 				);
 	}
 
+	/**
+	 * @param {string[]} items items
+	 * @param {string} value value
+	 * @returns {string} destructure object code
+	 */
 	destructureObject(items, value) {
 		return this.supportsDestructuring()
 			? `var {${items.join(", ")}} = ${value};`
@@ -237,10 +287,21 @@ class RuntimeTemplate {
 				);
 	}
 
+	/**
+	 * @param {string} args arguments
+	 * @param {string} body body
+	 * @returns {string} IIFE code
+	 */
 	iife(args, body) {
 		return `(${this.basicFunction(args, body)})()`;
 	}
 
+	/**
+	 * @param {string} variable variable
+	 * @param {string} array array
+	 * @param {string | string[]} body body
+	 * @returns {string} for each code
+	 */
 	forEach(variable, array, body) {
 		return this.supportsForOf()
 			? `for(const ${variable} of ${array}) {\n${Template.indent(body)}\n}`
@@ -333,10 +394,10 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {Module} options.module the module
-	 * @param {string} options.request the request that should be printed as comment
+	 * @param {string=} options.request the request that should be printed as comment
 	 * @param {string=} options.idExpr expression to use as id expression
 	 * @param {"expression" | "promise" | "statements"} options.type which kind of code should be returned
 	 * @returns {string} the code
@@ -370,10 +431,10 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
-	 * @param {string} options.request the request that should be printed as comment
+	 * @param {string=} options.request the request that should be printed as comment
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
 	 * @returns {string} the expression
 	 */
@@ -399,12 +460,12 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module | null} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
-	 * @param {string} options.request the request that should be printed as comment
+	 * @param {string=} options.request the request that should be printed as comment
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} the expression
 	 */
 	moduleRaw({ module, chunkGraph, request, weak, runtimeRequirements }) {
@@ -442,12 +503,12 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module | null} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string} options.request the request that should be printed as comment
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} the expression
 	 */
 	moduleExports({ module, chunkGraph, request, weak, runtimeRequirements }) {
@@ -461,13 +522,13 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {string} options.request the request that should be printed as comment
 	 * @param {boolean=} options.strict if the current module is in strict esm mode
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} the expression
 	 */
 	moduleNamespace({
@@ -530,7 +591,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {AsyncDependenciesBlock=} options.block the current dependencies block
 	 * @param {Module} options.module the module
@@ -538,7 +599,7 @@ class RuntimeTemplate {
 	 * @param {string} options.message a message for the comment
 	 * @param {boolean=} options.strict if the current module is in strict esm mode
 	 * @param {boolean=} options.weak if the dependency is weak (will create a nice error message)
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} the promise expression
 	 */
 	moduleNamespacePromise({
@@ -680,11 +741,11 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
 	 * @param {RuntimeSpec=} options.runtime runtime for which this code will be generated
 	 * @param {RuntimeSpec | boolean=} options.runtimeCondition only execute the statement in some runtimes
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} expression
 	 */
 	runtimeConditionExpression({
@@ -698,12 +759,16 @@ class RuntimeTemplate {
 		/** @type {Set<string>} */
 		const positiveRuntimeIds = new Set();
 		forEachRuntime(runtimeCondition, runtime =>
-			positiveRuntimeIds.add(`${chunkGraph.getRuntimeId(runtime)}`)
+			positiveRuntimeIds.add(
+				`${chunkGraph.getRuntimeId(/** @type {string} */ (runtime))}`
+			)
 		);
 		/** @type {Set<string>} */
 		const negativeRuntimeIds = new Set();
 		forEachRuntime(subtractRuntime(runtime, runtimeCondition), runtime =>
-			negativeRuntimeIds.add(`${chunkGraph.getRuntimeId(runtime)}`)
+			negativeRuntimeIds.add(
+				`${chunkGraph.getRuntimeId(/** @type {string} */ (runtime))}`
+			)
 		);
 		runtimeRequirements.add(RuntimeGlobals.runtimeId);
 		return compileBooleanMatcher.fromLists(
@@ -714,7 +779,7 @@ class RuntimeTemplate {
 
 	/**
 	 *
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {boolean=} options.update whether a new variable should be created or the existing one updated
 	 * @param {Module} options.module the module
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
@@ -722,7 +787,7 @@ class RuntimeTemplate {
 	 * @param {string} options.importVar name of the import variable
 	 * @param {Module} options.originModule module in which the statement is emitted
 	 * @param {boolean=} options.weak true, if this is a weak dependency
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {[string, string]} the import statement and the compat statement
 	 */
 	importStatement({
@@ -774,7 +839,8 @@ class RuntimeTemplate {
 
 		const exportsType = module.getExportsType(
 			chunkGraph.moduleGraph,
-			originModule.buildMeta.strictHarmonyModule
+			/** @type {BuildMeta} */
+			(originModule.buildMeta).strictHarmonyModule
 		);
 		runtimeRequirements.add(RuntimeGlobals.require);
 		const importContent = `/* harmony import */ ${optDeclaration}${importVar} = ${RuntimeGlobals.require}(${moduleId});\n`;
@@ -790,7 +856,7 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {ModuleGraph} options.moduleGraph the module graph
 	 * @param {Module} options.module the module
 	 * @param {string} options.request the request
@@ -803,7 +869,7 @@ class RuntimeTemplate {
 	 * @param {string} options.importVar the identifier name of the import variable
 	 * @param {InitFragment<TODO>[]} options.initFragments init fragments will be added here
 	 * @param {RuntimeSpec} options.runtime runtime for which this code will be generated
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} expression
 	 */
 	exportFromImport({
@@ -831,7 +897,8 @@ class RuntimeTemplate {
 		}
 		const exportsType = module.getExportsType(
 			moduleGraph,
-			originModule.buildMeta.strictHarmonyModule
+			/** @type {BuildMeta} */
+			(originModule.buildMeta).strictHarmonyModule
 		);
 
 		if (defaultInterop) {
@@ -912,11 +979,11 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
-	 * @param {AsyncDependenciesBlock} options.block the async block
+	 * @param {object} options options
+	 * @param {AsyncDependenciesBlock | undefined} options.block the async block
 	 * @param {string} options.message the message
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} expression
 	 */
 	blockPromise({ block, message, chunkGraph, runtimeRequirements }) {
@@ -962,6 +1029,10 @@ class RuntimeTemplate {
 				runtimeRequirements.add(RuntimeGlobals.hasFetchPriority);
 			}
 
+			/**
+			 * @param {Chunk} chunk chunk
+			 * @returns {string} require chunk id code
+			 */
 			const requireChunkId = chunk =>
 				`${RuntimeGlobals.ensureChunk}(${JSON.stringify(chunk.id)}${
 					fetchPriority ? `, ${JSON.stringify(fetchPriority)}` : ""
@@ -975,10 +1046,10 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {AsyncDependenciesBlock} options.block the async block
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @param {string=} options.request request string used originally
 	 * @returns {string} expression
 	 */
@@ -1007,10 +1078,10 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {Dependency} options.dependency the dependency
 	 * @param {ChunkGraph} options.chunkGraph the chunk graph
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @param {string=} options.request request string used originally
 	 * @returns {string} expression
 	 */
@@ -1028,9 +1099,9 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options
+	 * @param {object} options options
 	 * @param {string} options.exportsArgument the name of the exports object
-	 * @param {Set<string>} options.runtimeRequirements if set, will be filled with runtime requirements
+	 * @param {RuntimeRequirements} options.runtimeRequirements if set, will be filled with runtime requirements
 	 * @returns {string} statement
 	 */
 	defineEsModuleFlagStatement({ exportsArgument, runtimeRequirements }) {
@@ -1040,23 +1111,24 @@ class RuntimeTemplate {
 	}
 
 	/**
-	 * @param {Object} options options object
+	 * @param {object} options options object
 	 * @param {Module} options.module the module
-	 * @param {string} options.publicPath the public path
 	 * @param {RuntimeSpec=} options.runtime runtime
 	 * @param {CodeGenerationResults} options.codeGenerationResults the code generation results
 	 * @returns {string} the url of the asset
 	 */
-	assetUrl({ publicPath, runtime, module, codeGenerationResults }) {
+	assetUrl({ runtime, module, codeGenerationResults }) {
 		if (!module) {
 			return "data:,";
 		}
 		const codeGen = codeGenerationResults.get(module, runtime);
-		const { data } = codeGen;
+		const data = /** @type {NonNullable<CodeGenerationResult["data"]>} */ (
+			codeGen.data
+		);
 		const url = data.get("url");
 		if (url) return url.toString();
-		const filename = data.get("filename");
-		return publicPath + filename;
+		const assetPath = data.get("assetPathForCss");
+		return assetPath;
 	}
 }
 

package/lib/SourceMapDevToolPlugin.js

@@ -29,6 +29,7 @@ const { makePathsAbsolute } = require("./util/identifier");
 /** @typedef {import("./Module")} Module */
 /** @typedef {import("./NormalModule").SourceMap} SourceMap */
 /** @typedef {import("./util/Hash")} Hash */
+/** @typedef {import("./util/fs").OutputFileSystem} OutputFileSystem */
 
 const validate = createSchemaValidation(
 	require("../schemas/plugins/SourceMapDevToolPlugin.check.js"),
@@ -165,7 +166,9 @@ class SourceMapDevToolPlugin {
 	 * @returns {void}
 	 */
 	apply(compiler) {
-		const outputFs = compiler.outputFileSystem;
+		const outputFs = /** @type {OutputFileSystem} */ (
+			compiler.outputFileSystem
+		);
 		const sourceMapFilename = this.sourceMapFilename;
 		const sourceMappingURLComment = this.sourceMappingURLComment;
 		const moduleFilenameTemplate = this.moduleFilenameTemplate;

package/lib/Stats.js

@@ -7,6 +7,7 @@
 
 /** @typedef {import("../declarations/WebpackOptions").StatsOptions} StatsOptions */
 /** @typedef {import("./Compilation")} Compilation */
+/** @typedef {import("./Compilation").NormalizedStatsOptions} NormalizedStatsOptions */
 /** @typedef {import("./stats/DefaultStatsFactoryPlugin").StatsCompilation} StatsCompilation */
 
 class Stats {
@@ -34,7 +35,7 @@ class Stats {
 	 */
 	hasWarnings() {
 		return (
-			this.compilation.warnings.length > 0 ||
+			this.compilation.getWarnings().length > 0 ||
 			this.compilation.children.some(child => child.getStats().hasWarnings())
 		);
 	}
@@ -58,7 +59,9 @@ class Stats {
 			forToString: false
 		});
 
-		const statsFactory = this.compilation.createStatsFactory(options);
+		const statsFactory = this.compilation.createStatsFactory(
+			/** @type {NormalizedStatsOptions} */ (options)
+		);
 
 		return statsFactory.create("compilation", this.compilation, {
 			compilation: this.compilation
@@ -74,8 +77,12 @@ class Stats {
 			forToString: true
 		});
 
-		const statsFactory = this.compilation.createStatsFactory(options);
-		const statsPrinter = this.compilation.createStatsPrinter(options);
+		const statsFactory = this.compilation.createStatsFactory(
+			/** @type {NormalizedStatsOptions} */ (options)
+		);
+		const statsPrinter = this.compilation.createStatsPrinter(
+			/** @type {NormalizedStatsOptions} */ (options)
+		);
 
 		const data = statsFactory.create("compilation", this.compilation, {
 			compilation: this.compilation

package/lib/Template.js

@@ -41,7 +41,7 @@ const PATH_NAME_NORMALIZE_REPLACE_REGEX = /[^a-zA-Z0-9_!§$()=\-^°]+/g;
 const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 
 /**
- * @typedef {Object} RenderManifestOptions
+ * @typedef {object} RenderManifestOptions
  * @property {Chunk} chunk the chunk used to render
  * @property {string} hash
  * @property {string} fullHash
@@ -57,7 +57,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
 /** @typedef {RenderManifestEntryTemplated | RenderManifestEntryStatic} RenderManifestEntry */
 
 /**
- * @typedef {Object} RenderManifestEntryTemplated
+ * @typedef {object} RenderManifestEntryTemplated
  * @property {function(): Source} render
  * @property {string | function(PathData, AssetInfo=): string} filenameTemplate
  * @property {PathData=} pathOptions
@@ -68,7 +68,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {Object} RenderManifestEntryStatic
+ * @typedef {object} RenderManifestEntryStatic
  * @property {function(): Source} render
  * @property {string} filename
  * @property {AssetInfo} info
@@ -78,7 +78,7 @@ const MATCH_PADDED_HYPHENS_REPLACE_REGEX = /^-|-$/g;
  */
 
 /**
- * @typedef {Object} HasId
+ * @typedef {object} HasId
  * @property {number | string} id
  */
 
@@ -252,7 +252,7 @@ class Template {
 	}
 
 	/**
-	 * @typedef {Object} WithId
+	 * @typedef {object} WithId
 	 * @property {string|number} id
 	 */