webpack 5.112.0 → 5.112.1

package/lib/html/syntax-parser.js

@@ -33,7 +33,7 @@ const {
 	CLEAR_TABLE_ROW,
 	COMMA_LIST_ATTRIBUTES,
 	DOM_TOKEN_LIST_ATTRIBUTES,
-	EMPTY_ELEMENT_KEPT,
+	EMPTY_ELEMENT_DROPPED,
 	EMPTY_METADATA_ELEMENTS,
 	EMPTY_REMOVABLE_ATTRIBUTES,
 	ENUMERATED_ATTRIBUTE_NAMES,
@@ -6042,8 +6042,7 @@ const EMPTY_SKIP = Object.freeze({});
  * @param {string} name raw SVG tag name
  * @returns {string} case-adjusted SVG tag name
  */
-const adjustSvgTag = (name) =>
-	/** @type {Record<string, string>} */ (SVG_TAG_ADJUST)[name] || name;
+const adjustSvgTag = (name) => SVG_TAG_ADJUST[name] || name;
 
 /**
  * @param {string} name doctype name
@@ -6297,15 +6296,10 @@ const htmlIntegrationPoint = (el) => {
 const adjustForeignAttrs = (run, ns) => {
 	for (let i = run.start; i < run.start + run.count; i++) {
 		const name = _attrNames[i];
-		if (
-			ns === NS_SVG &&
-			/** @type {Record<string, string>} */ (SVG_ATTR_ADJUST)[name]
-		) {
-			_attrNames[i] = /** @type {Record<string, string>} */ (SVG_ATTR_ADJUST)[
-				name
-			];
+		if (ns === NS_SVG && SVG_ATTR_ADJUST[name]) {
+			_attrNames[i] = SVG_ATTR_ADJUST[name];
 		}
-		if (/** @type {Record<string, string>} */ (FOREIGN_ATTR_NS)[name]) {
+		if (FOREIGN_ATTR_NS[name]) {
 			_attrFlags[i] |= 1;
 		}
 	}
@@ -7676,8 +7670,7 @@ const adoptionAgency = (subject, pos) => {
 		}
 		if (furthestIdx === -1) {
 			while (open.length > openIdx) {
-				_nodeEnds[/** @type {HtmlElement} */ (open[open.length - 1])] =
-					tokenEnd;
+				_nodeEnds[open[open.length - 1]] = tokenEnd;
 				popOpen();
 			}
 			afeRemoveAt(fmtIdx);
@@ -8124,7 +8117,7 @@ modes.afterHead = (t) => {
 			return;
 		}
 		if (HEAD_ELEMENTS.has(t.name)) {
-			const headEl = /** @type {HtmlElement} */ (_S.head);
+			const headEl = _S.head;
 			open.push(headEl);
 			modes.inHead(t);
 			const idx = open.indexOf(headEl);
@@ -8676,7 +8669,7 @@ modes.text = (t) => {
 			return;
 		}
 		// span the close tag, like every other explicit-close pop
-		_nodeEnds[/** @type {HtmlElement} */ (popOpen())] = tokenEnd;
+		_nodeEnds[popOpen()] = tokenEnd;
 		mode = originalMode;
 	}
 };
@@ -9154,7 +9147,7 @@ modes.afterAfterFrameset = (t) => {
 };
 
 const dispatch = () => {
-	process(/** @type {Token} */ (/** @type {unknown} */ (tok)));
+	process(/** @type {Token} */ (/** @type {Token | MutableToken} */ (tok)));
 	// One boolean per token: only a stack change can complete a subtree.
 	if (_streamEligible && (_openStackChanged || _openSpliced)) {
 		_openStackChanged = false;
@@ -9338,7 +9331,9 @@ const handleCommentToken = (input, start, end, dataStart, dataEnd) => {
 		const data = input.slice(dataStart, dataEnd).replace(/\r\n?/g, "\n");
 		if (data !== "") {
 			tok.type = TOKEN_CHAR;
-			tok.data = inputHasNul ? data.replace(/\0/g, "�") : data;
+			// A NUL stays a NUL: foreign content replaces it without clearing
+			// frameset-ok, and an HTML integration point drops it (§13.2.5.69).
+			tok.data = data;
 			tok.start = start;
 			tok.end = end;
 			dispatch();
@@ -9567,7 +9562,7 @@ const PARSE_CALLBACKS = {
 };
 
 const dispatchXml = () => {
-	processXml(/** @type {Token} */ (/** @type {unknown} */ (tok)));
+	processXml(/** @type {Token} */ (/** @type {Token | MutableToken} */ (tok)));
 };
 
 // A reference in the same shape as `XML_REFERENCE_REGEXP`, matched in place.
@@ -10327,10 +10322,10 @@ const _endsOutsideLineBox = (path, node, parent) => {
 
 /**
  * Whether a node prints nothing at all, so what follows it in the output is its
- * next sibling. The two that can: a comment the inert-comment rule drops, and a
- * whitespace-only text node the active `collapseWhitespace` tier deletes — the
- * same two questions the printer asks when it reaches them, asked here so the
- * §13.1.2.4 tests below read the output rather than the tree.
+ * next sibling. The three that can: a comment the inert-comment rule drops, an
+ * element `removeEmptyElements` drops, and a whitespace-only text node the
+ * active `collapseWhitespace` tier deletes — the same questions the printer asks
+ * when it reaches them, asked here so the §13.1.2.4 tests read the output.
  * @param {HtmlPath} path the accessor
  * @param {HtmlNodeRef} node the node
  * @returns {boolean} true when it contributes no output
@@ -10343,6 +10338,9 @@ const _printsNothing = (path, node) => {
 			!_keepComment(_dataOf(node), path.source(node), _startOf(node))
 		);
 	}
+	if (type === NodeType.Element) {
+		return _isRemovableEmptyElement(path, node);
+	}
 	if (type !== NodeType.Text) return false;
 	const data = _dataOf(node);
 	if (!isAllAsciiWhitespace(data)) return false;
@@ -10421,9 +10419,7 @@ const _headLeftBefore = (path, node, parent, parentName) => {
 	// Under `<html>` the whitespace stands after the whole head, so all of it counts.
 	const inHead = parentName === "head";
 	for (
-		let child = _firstChild(
-			inHead ? parent : /** @type {HtmlElement} */ (_S.head)
-		);
+		let child = _firstChild(inHead ? parent : _S.head);
 		child !== 0 && child !== (inHead ? node : 0);
 		child = _nextSibling(child)
 	) {
@@ -11815,12 +11811,10 @@ const _isRemovableEmptyElement = (path, element) => {
 	const answer =
 		_templateContentOf(element) === 0 &&
 		_namespaceOf(element) === NS_HTML &&
-		// Void is otherwise disqualifying — a `<br>` is childless and still
-		// renders. A void element that belongs in the head is the exception: with
-		// no attributes it states nothing.
-		(!VOID.has(_tagNameOf(element)) ||
+		// Only a name known to render nothing empty: a void element that belongs
+		// in the head, with no attributes, states nothing either.
+		(EMPTY_ELEMENT_DROPPED.has(_tagNameOf(element)) ||
 			EMPTY_METADATA_ELEMENTS.has(_tagNameOf(element))) &&
-		!EMPTY_ELEMENT_KEPT.has(_tagNameOf(element)) &&
 		(_childrenPrintNothing(path, element) ||
 			(_tagNameOf(element) === "style" && _sheetPrintsNothing(path, element)));
 	_emptyElements.set(element, answer);
@@ -11844,7 +11838,7 @@ const _childrenPrintNothing = (path, element) => {
 	) {
 		if (
 			path.type(child) === NodeType.Element
-				? !_isRemovableEmptyElement(path, /** @type {HtmlElement} */ (child))
+				? !_isRemovableEmptyElement(path, child)
 				: !_printsNothing(path, child)
 		) {
 			return false;
@@ -13571,7 +13565,8 @@ const _streamTags = (path, minify) => {
 			_streamImplied = shell && !opensOutside ? name : "";
 		} else {
 			_streamOpen = _synthesizeOpenTag(path);
-			_streamClose = `</${name}>`;
+			_streamClose =
+				minify && _canOmitEndTag(path, name, path.node) ? "" : `</${name}>`;
 		}
 		return true;
 	}
@@ -14920,7 +14915,7 @@ const parseSrcset = (input) => {
 				lastChar === SMALL_LETTER_W
 			) {
 				// If width and density are not both absent, then let error be yes.
-				if (width || density) {
+				if (width !== undefined || density !== undefined) {
 					pError = true;
 				}
 
@@ -14943,7 +14938,11 @@ const parseSrcset = (input) => {
 			) {
 				// If width, density and future-compat-h are not all absent, then let error
 				// be yes.
-				if (width || density || height) {
+				if (
+					width !== undefined ||
+					density !== undefined ||
+					height !== undefined
+				) {
 					pError = true;
 				}
 
@@ -14965,7 +14964,7 @@ const parseSrcset = (input) => {
 				lastChar === SMALL_LETTER_H
 			) {
 				// If height and density are not both absent, then let error be yes.
-				if (height || density) {
+				if (height !== undefined || density !== undefined) {
 					pError = true;
 				}
 

package/lib/html/syntax-printer.js

@@ -133,7 +133,7 @@ const CLASSIC_SCRIPT = "script";
  * @property {HtmlTransformOptions=} transforms which of the meaning-preserving rewrites the minifying print makes; each is on unless it is `false`
  * @property {(boolean | "conservative" | "smart" | "all")=} collapseWhitespace collapse each run of whitespace in text to a single space, except where an ancestor renders it verbatim; `"smart"` also drops what sits against a block edge and `"all"` drops every edge (default false)
  * @property {boolean=} removeEmptyAttributes drop an attribute whose empty value leaves it in the state its absence gives (default false)
- * @property {boolean=} removeEmptyElements drop an element with no children and no attributes, unless its bare form is meaningful (default false)
+ * @property {boolean=} removeEmptyElements drop an element with no children and no attributes where its bare form renders nothing and nothing reads it (default false)
  * @property {boolean=} mergeStyles print a run of adjacent `<style>` elements as one sheet, which removes elements (default false)
  * @property {boolean=} mergeScripts print a run of adjacent bare `<script>` elements whose bodies this print writes itself as one, which removes elements, hoists a later body's declarations into the ones before it, and lets a failing body end the whole run (default false)
  * @property {boolean=} sortAttributes print an HTML or XML element's attributes commonest name first, ties by name (default false)
@@ -628,8 +628,7 @@ const _mergedScriptRun = (path, element, js) => {
 	if (!_scriptEndsClean(js) || _opensAScript(js)) return js;
 	let out = js;
 	for (let next = first; next !== 0; next = _mergeableScriptAfter(path, next)) {
-		const body =
-			_nodeStrings[/** @type {HtmlNodeRef} */ (_onlyTextChild(next))];
+		const body = _nodeStrings[_onlyTextChild(next)];
 		if (
 			!_scriptEndsClean(body) ||
 			_opensAScript(body) ||

package/lib/html/xmlMinify.js

@@ -37,7 +37,10 @@ const xmlMinify = async (input, sourceMap, minimizerOptions = {}) => {
 		rewriteCustomProperties: css.rewriteCustomProperties,
 		unusedSymbols: css.unusedSymbols,
 		pseudoClasses: css.pseudoClasses,
-		transforms: webpack.css.syntax.parser.pickTransforms(css)
+		// Picked on first CSS render, which loads the CSS parser anyway.
+		get transforms() {
+			return webpack.css.syntax.parser.pickTransforms(css);
+		}
 	});
 	return {
 		code: new webpack.html.syntax.SourceProcessor().process(code, {

package/lib/ids/HashedModuleIdsPlugin.js

@@ -102,7 +102,7 @@ class HashedModuleIdsPlugin {
 					const hashId = hash.digest(this.options.hashDigest || "base64");
 					let len = this.options.hashDigestLength || 4;
 					while (usedIds.has(hashId.slice(0, len))) {
-						/** @type {number} */ (len)++;
+						len++;
 					}
 					const moduleId = hashId.slice(0, len);
 					chunkGraph.setModuleId(module, moduleId);

package/lib/index.js

@@ -92,7 +92,10 @@ const getCli = memoize(() => ({
 /** @typedef {import("./stats/MultiStats")} MultiStats */
 /** @typedef {import("./stats/MultiStats").MultiStatsOptions} MultiStatsOptions */
 /** @typedef {import("./module/NormalModuleFactory").ResolveData} ResolveData */
-/** @typedef {import("./module/Parser").ParserState} ParserState */
+/**
+ * @template {import("./module/NormalModule")} [TModule=import("./module/NormalModule")]
+ * @typedef {import("./module/Parser").ParserState<TModule>} ParserState
+ */
 /** @typedef {import("./resolve/ResolverFactory").ResolvePluginInstance} ResolvePluginInstance */
 /** @typedef {import("./resolve/ResolverFactory").Resolver} Resolver */
 /** @typedef {import("./template/Template").RenderManifestEntry} RenderManifestEntry */
@@ -126,21 +129,19 @@ const getCli = memoize(() => ({
 
 /**
  * Returns function.
- * @template {(...args: EXPECTED_ANY[]) => EXPECTED_ANY} T
+ * @template {(...args: never[]) => void} T
  * @param {() => T} factory factory function
  * @returns {T} function
  */
 const lazyFunction = (factory) => {
 	const fac = memoize(factory);
-	const f = /** @type {unknown} */ (
-		/**
-		 * Handles the callback logic for this hook.
-		 * @param {Parameters<T>} args args
-		 * @returns {ReturnType<T>} result
-		 */
-		(...args) => fac()(...args)
-	);
-	return /** @type {T} */ (f);
+	/**
+	 * Handles the callback logic for this hook.
+	 * @param {Parameters<T>} args args
+	 * @returns {ReturnType<T>} result
+	 */
+	const f = (...args) => /** @type {ReturnType<T>} */ (fac()(...args));
+	return /** @type {T} */ (/** @type {T | typeof f} */ (f));
 };
 
 /**
@@ -229,7 +230,7 @@ module.exports = mergeExports(fn, {
 		return validateSchema;
 	},
 	get version() {
-		return /** @type {string} */ (require("../package.json").version);
+		return require("../package.json").version;
 	},
 
 	get cli() {

package/lib/javascript/APIPlugin.js

@@ -34,7 +34,7 @@ const getConcatenatedModule = memoize(() =>
 );
 
 /** @import Compiler from "../Compiler" */
-/** @import Module, { BuildInfo } from "../module/Module" */
+/** @import Module from "../module/Module" */
 /**
  * @import {
  * 	JavascriptModuleBuildInfo
@@ -342,8 +342,7 @@ class APIPlugin {
 							declarator.id.type === "Identifier" &&
 							declarator.id.name === "module"
 						) {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleArgument =
+							parser.state.module.buildInfo.moduleArgument =
 								"__webpack_module__";
 						}
 					});
@@ -359,8 +358,7 @@ class APIPlugin {
 							statement.id &&
 							statement.id.name === "module"
 						) {
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo).moduleArgument =
+							parser.state.module.buildInfo.moduleArgument =
 								"__webpack_module__";
 						}
 					};
@@ -378,8 +376,7 @@ class APIPlugin {
 
 							if (key === "__non_webpack_require__" && moduleOutput) {
 								if (nodeTarget) {
-									/** @type {JavascriptModuleBuildInfo} */
-									(parser.state.module.buildInfo).needCreateRequire = true;
+									parser.state.module.buildInfo.needCreateRequire = true;
 								} else {
 									const warning = new WebpackError(
 										`${PLUGIN_NAME}\n__non_webpack_require__ is only allowed in target node`
@@ -405,8 +402,7 @@ class APIPlugin {
 								RuntimeGlobals.requireScope
 							]);
 							parser.hooks.assign.for(key).tap(PLUGIN_NAME, (expr) => {
-								/** @type {JavascriptModuleBuildInfo} */
-								(parser.state.module.buildInfo).usingPublicPathOverride = true;
+								parser.state.module.buildInfo.usingPublicPathOverride = true;
 								addRuntimePublicPathOverride(compilation, parser.state.module);
 								// A destructuring target is no expression to replace; the read
 								// handler still spells the global, with a read's requirement.
@@ -455,8 +451,7 @@ class APIPlugin {
 					parser.hooks.expression
 						.for("__webpack_module__.id")
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {JavascriptModuleBuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								"__webpack_module__.id";
 							const moduleArgument = parser.state.module.moduleArgument;
 							if (moduleArgument === "__webpack_module__") {
@@ -486,8 +481,7 @@ class APIPlugin {
 					parser.hooks.expression
 						.for("__webpack_module__")
 						.tap(PLUGIN_NAME, (expr) => {
-							/** @type {JavascriptModuleBuildInfo} */
-							(parser.state.module.buildInfo).moduleConcatenationBailout =
+							parser.state.module.buildInfo.moduleConcatenationBailout =
 								"__webpack_module__";
 							const moduleArgument = parser.state.module.moduleArgument;
 							if (moduleArgument === "__webpack_module__") {

package/lib/javascript/BasicEvaluatedExpression.js

@@ -58,15 +58,15 @@ class BasicEvaluatedExpression {
 		this.expression = undefined;
 		// _v1..._v5 hold the scalar type-specific fields, the accessors narrow
 		// them by type; expression-valued fields get typed slots below
-		/** @type {unknown} */
+		/** @type {boolean | number | bigint | RegExp | string | string[] | InstanceType<VariableInfo> | undefined} */
 		this._v1 = undefined;
-		/** @type {unknown} */
+		/** @type {string | InstanceType<VariableInfo> | undefined} */
 		this._v2 = undefined;
-		/** @type {unknown} */
+		/** @type {"cooked" | "raw" | GetMembers | undefined} */
 		this._v3 = undefined;
-		/** @type {unknown} */
+		/** @type {GetMembersOptionals | undefined} */
 		this._v4 = undefined;
-		/** @type {unknown} */
+		/** @type {GetMemberRanges | undefined} */
 		this._v5 = undefined;
 		// expression-valued fields stay plain data properties: a type that
 		// references the class inside one of its own accessors makes tsc fork

package/lib/javascript/CommonJsChunkFormatPlugin.js

@@ -19,7 +19,6 @@ const {
 	generateEntryStartup
 } = require("./StartupHelpers");
 
-/** @import Chunk from "../graph/Chunk" */
 /** @import Compiler from "../Compiler" */
 
 const PLUGIN_NAME = "CommonJsChunkFormatPlugin";
@@ -76,13 +75,9 @@ class CommonJsChunkFormatPlugin {
 						.split("/");
 					const runtimeOutputName = compilation
 						.getPath(
-							getChunkFilenameTemplate(
-								/** @type {Chunk} */
-								(runtimeChunk),
-								compilation.outputOptions
-							),
+							getChunkFilenameTemplate(runtimeChunk, compilation.outputOptions),
 							{
-								chunk: /** @type {Chunk} */ (runtimeChunk),
+								chunk: runtimeChunk,
 								contentHashType: "javascript"
 							}
 						)

package/lib/javascript/ConstPlugin.js

@@ -124,7 +124,7 @@ const getHoistedDeclarations = (branch, includeFunctionDeclarations) => {
 				break;
 			case "FunctionDeclaration":
 				if (includeFunctionDeclarations) {
-					collectDeclaration(declarations, /** @type {Identifier} */ (node.id));
+					collectDeclaration(declarations, node.id);
 				}
 				break;
 			case "VariableDeclaration":

package/lib/javascript/JavascriptGenerator.js

@@ -14,6 +14,7 @@ const { JAVASCRIPT_TYPES } = require("../module/ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../runtime/RuntimeGlobals");
 const InitFragment = require("../template/InitFragment");
 
+/** @import { JavascriptNormalModule } from "./JavascriptModule" */
 /** @import { Source } from "webpack-sources" */
 /** @import { DependencyConstructor } from "../Compilation" */
 /** @import DependenciesBlock from "../graph/DependenciesBlock" */
@@ -31,8 +32,6 @@ const InitFragment = require("../template/InitFragment");
  * 	SourceTypes
  * } from "../module/Module"
  */
-/** @import { JavascriptModuleBuildInfo } from "./JavascriptModule" */
-/** @import NormalModule from "../module/NormalModule" */
 
 const DEFAULT_SOURCE = {
 	source() {
@@ -77,10 +76,18 @@ const deprecatedGetInitFragments = util.deprecate(
 	"DEP_WEBPACK_JAVASCRIPT_GENERATOR_GET_INIT_FRAGMENTS"
 );
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {JavascriptNormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class JavascriptGenerator extends Generator {
 	/**
 	 * Returns the source types available for this module.
-	 * @param {NormalModule} module fresh module
+	 * @param {TModule} module fresh module
 	 * @returns {SourceTypes} available types (do not mutate)
 	 */
 	getTypes(module) {
@@ -89,7 +96,7 @@ class JavascriptGenerator extends Generator {
 
 	/**
 	 * Returns the estimated size for the requested source type.
-	 * @param {NormalModule} module the module
+	 * @param {TModule} module the module
 	 * @param {SourceType=} type source type
 	 * @returns {number} estimate size of the module
 	 */
@@ -103,15 +110,13 @@ class JavascriptGenerator extends Generator {
 
 	/**
 	 * Returns the reason this module cannot be concatenated, when one exists.
-	 * @param {NormalModule} module module for which the bailout reason should be determined
+	 * @param {TModule} module module for which the bailout reason should be determined
 	 * @param {ConcatenationBailoutReasonContext} context context
 	 * @returns {string | undefined} reason why this module can't be concatenated, undefined when it can be concatenated
 	 */
 	getConcatenationBailoutReason(module, context) {
 		const buildMeta = module.buildMeta;
-		const buildInfo = /** @type {JavascriptModuleBuildInfo | undefined} */ (
-			module.buildInfo
-		);
+		const buildInfo = module.buildInfo;
 		const presentationalDependencies = module.presentationalDependencies;
 		// An ESM is a "namespace" module carrying the interop flag the harmony
 		// parser emits; anything else is treated as CommonJS below
@@ -238,7 +243,7 @@ class JavascriptGenerator extends Generator {
 	 * @returns {void}
 	 */
 	sourceModule(module, initFragments, source, generateContext) {
-		/** @type {InitFragment<GenerateContext>[] | undefined} */
+		/** @type {InitFragment<import("./JavascriptModulesPlugin").ChunkRenderContext>[] | undefined} */
 		let chunkInitFragments;
 
 		// one template context for all dependencies of the module (hot path)
@@ -306,7 +311,7 @@ class JavascriptGenerator extends Generator {
 
 	/**
 	 * Generates generated code for this runtime module.
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */
@@ -328,7 +333,7 @@ class JavascriptGenerator extends Generator {
 	/**
 	 * Generates fallback output for the provided error condition.
 	 * @param {Error} error the error
-	 * @param {NormalModule} module module for which the code should be generated
+	 * @param {TModule} module module for which the code should be generated
 	 * @param {GenerateContext} generateContext context for generate
 	 * @returns {Source | null} generated code
 	 */

package/lib/javascript/JavascriptMetaInfoPlugin.js

@@ -14,12 +14,6 @@ const { getInnerGraphUtils } = require("../optimize/InnerGraph");
 const { recordOptimizationBailout } = require("../util/buildDiagnostics");
 
 /** @import Compiler from "../Compiler" */
-/** @import { BuildInfo } from "../module/Module" */
-/**
- * @import {
- * 	JavascriptModuleBuildInfo
- * } from "../javascript/JavascriptModule"
- */
 /** @import JavascriptParser from "../javascript/JavascriptParser" */
 
 const PLUGIN_NAME = "JavascriptMetaInfoPlugin";
@@ -52,9 +46,7 @@ class JavascriptMetaInfoPlugin {
 										statement.kind === "await using")
 							)
 						) {
-							const buildInfo =
-								/** @type {JavascriptModuleBuildInfo} */
-								(parser.state.module.buildInfo);
+							const buildInfo = parser.state.module.buildInfo;
 							buildInfo.usesTopLevelUsingDeclaration = true;
 							// Concatenation would defer disposal to the enclosing scope.
 							buildInfo.moduleConcatenationBailout =
@@ -62,9 +54,7 @@ class JavascriptMetaInfoPlugin {
 						}
 					});
 					parser.hooks.call.for("eval").tap(PLUGIN_NAME, () => {
-						const buildInfo =
-							/** @type {JavascriptModuleBuildInfo} */
-							(parser.state.module.buildInfo);
+						const buildInfo = parser.state.module.buildInfo;
 						buildInfo.moduleConcatenationBailout = "eval()";
 						const currentSymbol = innerGraph.getTopLevelSymbol(parser.state);
 						if (currentSymbol) {
@@ -82,9 +72,7 @@ class JavascriptMetaInfoPlugin {
 						}
 					});
 					parser.hooks.finish.tap(PLUGIN_NAME, () => {
-						const buildInfo =
-							/** @type {BuildInfo} */
-							(parser.state.module.buildInfo);
+						const buildInfo = parser.state.module.buildInfo;
 						let topLevelDeclarations = buildInfo.topLevelDeclarations;
 						if (topLevelDeclarations === undefined) {
 							topLevelDeclarations = buildInfo.topLevelDeclarations = new Set();

package/lib/javascript/JavascriptModule.js

@@ -39,6 +39,16 @@ const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {BuildMeta & KnownJavascriptModuleBuildMeta} JavascriptModuleBuildMeta */
 
+/**
+ * A javascript module before or after its build, typed with its build info and build meta.
+ * @typedef {NormalModule & { buildInfo?: JavascriptModuleBuildInfo, buildMeta?: JavascriptModuleBuildMeta }} JavascriptNormalModule
+ */
+
+/**
+ * A built javascript module, typed with its build info and build meta.
+ * @typedef {NormalModule & { buildInfo: JavascriptModuleBuildInfo, buildMeta: JavascriptModuleBuildMeta }} BuiltJavascriptModule
+ */
+
 /**
  * Module class for all `javascript/*` modules. JavaScript-specific properties should live here instead of `NormalModule`.
  */

package/lib/javascript/JavascriptModulesPlugin.js

@@ -1329,9 +1329,7 @@ class JavascriptModulesPlugin {
 		const chunkModules = Template.renderChunkModules(
 			chunkRenderContext,
 			inlinedModules
-				? allModules.filter(
-						(m) => !(/** @type {Set<Module>} */ (inlinedModules).has(m))
-					)
+				? allModules.filter((m) => !inlinedModules.has(m))
 				: allModules,
 			(module, renderInObject) =>
 				this.renderModule(
@@ -2027,7 +2025,7 @@ class JavascriptModulesPlugin {
 				// whichever one provides each name.
 				if (merge) {
 					const { exports, namespace } = getMergedExports(
-						/** @type {Module[]} */ (mergedModules),
+						mergedModules,
 						moduleGraph,
 						chunk.runtime
 					);