webpack 5.112.0 → 5.112.2

package/lib/html/HtmlGenerator.js

@@ -127,6 +127,7 @@ const metaIsCsp = (attrs) => {
 	return false;
 };
 
+/** @import { BuiltHtmlModule, HtmlNormalModule } from "./HtmlModule" */
 /** @import { Source } from "webpack-sources" */
 /** @import { HtmlGeneratorOptions } from "../../declarations/WebpackOptions" */
 /** @typedef {import("../../declarations/WebpackOptions").OutputHtmlOptions["csp"]} CspOption */
@@ -162,7 +163,6 @@ const metaIsCsp = (attrs) => {
  */
 /** @import ModuleGraph from "../graph/ModuleGraph" */
 /** @import NormalModule from "../module/NormalModule" */
-/** @import { HtmlModuleBuildInfo } from "./HtmlModule" */
 /** @import RuntimeTemplate from "../template/RuntimeTemplate" */
 /** @import Hash from "../util/Hash" */
 /**
@@ -316,6 +316,14 @@ const rebaseCssUrls = (css, fromFile, toFile, outputPath) => {
 	return last === 0 ? css : out + css.slice(last);
 };
 
+/**
+ * The module type the JSDoc inherited from `Generator` names.
+ * @typedef {HtmlNormalModule} TModule
+ */
+
+/**
+ * @extends {Generator<TModule>}
+ */
 class HtmlGenerator extends Generator {
 	/**
 	 * Emit a sentinel for a chunk URL that can't be resolved at code-gen time
@@ -655,7 +663,7 @@ class HtmlGenerator extends Generator {
 	) {
 		if (!content.includes("__WEBPACK_HTML_INLINE__")) return content;
 		const chunksById = getChunksById(compilation);
-		const outputPath = /** @type {string} */ (compilation.outputOptions.path);
+		const outputPath = compilation.outputOptions.path;
 		return content.replace(
 			INLINE_SENTINEL_STATEMENT_REGEXP,
 			(_, hexId, contentHashType, terminator) => {
@@ -1121,7 +1129,7 @@ class HtmlGenerator 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
 	 */
@@ -1141,7 +1149,7 @@ class HtmlGenerator extends Generator {
 	 * `originModule` (the EntryDependency added by `compilation.addEntry`) —
 	 * this covers both HTML-as-entry-point and a linked `type: "html"` page
 	 * (added as its own entry by HtmlModulesPlugin).
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @returns {boolean} true when the module is an entry
 	 */
 	_isEntryModule(module) {
@@ -1158,7 +1166,7 @@ class HtmlGenerator extends Generator {
 	 * when the option is left unspecified, extraction defaults to on for HTML
 	 * modules used as compilation entries — that's the HTML-as-entry-point case
 	 * and a linked `type: "html"` page (which is added as its own entry).
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @returns {boolean} true when the `.html` file should be emitted
 	 */
 	_shouldExtract(module) {
@@ -1172,7 +1180,7 @@ class HtmlGenerator extends Generator {
 	 * Whether this module exposes the `html` source type. Like `_shouldExtract`,
 	 * but `"inline"` also exposes it — the processed HTML is read back into the
 	 * host attribute (e.g. `<iframe srcdoc>`) instead of emitted as a file.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @returns {boolean} true when the `html` source type is available
 	 */
 	_shouldExposeHtmlType(module) {
@@ -1182,7 +1190,7 @@ class HtmlGenerator 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) {
@@ -1206,7 +1214,7 @@ class HtmlGenerator 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
 	 */
@@ -1257,7 +1265,7 @@ class HtmlGenerator extends Generator {
 
 	/**
 	 * Processes the provided module.
-	 * @param {NormalModule} module the module to generate
+	 * @param {TModule} module the module to generate
 	 * @param {InitFragment<GenerateContext>[]} initFragments mutable list of init fragments
 	 * @param {ReplaceSource} source the current replace source which can be modified
 	 * @param {GenerateContext} generateContext the generateContext
@@ -1266,7 +1274,7 @@ class HtmlGenerator extends Generator {
 	sourceModule(module, initFragments, source, generateContext) {
 		// Only `dependency` varies across `template.apply` calls, so one context
 		// (and one lazy `chunkInitFragments` getter) serves the whole module.
-		/** @type {InitFragment<GenerateContext>[] | undefined} */
+		/** @type {InitFragment<import("../javascript/JavascriptModulesPlugin").ChunkRenderContext>[] | undefined} */
 		let chunkInitFragments;
 		/** @type {DependencyTemplateContext} */
 		const templateContext = {
@@ -1321,7 +1329,7 @@ class HtmlGenerator extends Generator {
 	 * `undefined`, the placeholders are preserved so the caller (typically
 	 * `HtmlModulesPlugin#renderManifest`, which only knows the final
 	 * `.html` filename after code generation) can resolve them itself.
-	 * @param {NormalModule} module the module to render
+	 * @param {TModule} module the module to render
 	 * @param {GenerateContext} generateContext the generate context
 	 * @param {string=} undoPath value to substitute for `[webpack/auto]` placeholders
 	 * @returns {string} the rewritten HTML
@@ -1353,14 +1361,14 @@ class HtmlGenerator extends Generator {
 		if (!rawContent.includes(PUBLIC_PATH_AUTO)) return rawContent;
 		// A relative `<base href>` prepends `../`s so the base can't misdirect
 		// the rewritten URLs (see `HtmlParser`).
-		const basePrefix =
-			/** @type {HtmlModuleBuildInfo} */ (module.buildInfo).baseUrlPrefix || "";
+		const { buildInfo } = /** @type {BuiltHtmlModule} */ (module);
+		const basePrefix = buildInfo.baseUrlPrefix || "";
 		return rawContent.split(PUBLIC_PATH_AUTO).join(basePrefix + undoPath);
 	}
 
 	/**
 	 * 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
 	 */
@@ -1457,7 +1465,7 @@ class HtmlGenerator extends Generator {
 	 * express — fine in a dev-server context because the regular
 	 * (non-hot-update) `page.html` chunk is re-emitted on every rebuild,
 	 * so the reloaded page picks up the new head.
-	 * @param {NormalModule} module module
+	 * @param {TModule} module module
 	 * @param {string} html the rewritten HTML content (with placeholders resolved)
 	 * @param {boolean} extracting whether the HTML module is being extracted as a real `.html` file
 	 * @param {RuntimeTemplate} runtimeTemplate runtime template (drives `const`/arrow emission based on environment support)
@@ -1677,7 +1685,7 @@ class HtmlGenerator 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
 	 */
@@ -1704,7 +1712,7 @@ class HtmlGenerator extends Generator {
 	/**
 	 * Updates the hash with the data contributed by this instance.
 	 * @param {Hash} hash hash that will be modified
-	 * @param {UpdateHashContext} updateHashContext context for updating hash
+	 * @param {UpdateHashContext<TModule>} updateHashContext context for updating hash
 	 */
 	updateHash(hash, updateHashContext) {
 		hash.update("html");

package/lib/html/HtmlModule.js

@@ -14,7 +14,7 @@ const makeSerializable = require("../util/makeSerializable");
  * } from "../module/NormalModule"
  */
 /** @import { HtmlEntryInfo } from "./HtmlModulesPlugin" */
-/** @import { ModuleKinds } from "../module/Module" */
+/** @import { BuildMeta, ModuleKinds } from "../module/Module" */
 
 /**
  * Defines the build info properties specific to html modules.
@@ -25,6 +25,16 @@ const makeSerializable = require("../util/makeSerializable");
 
 /** @typedef {NormalModuleBuildInfo & KnownHtmlModuleBuildInfo} HtmlModuleBuildInfo */
 
+/**
+ * An html module before or after its build, typed with its build info.
+ * @typedef {NormalModule & { buildInfo?: HtmlModuleBuildInfo }} HtmlNormalModule
+ */
+
+/**
+ * A built html module, typed with its build info and build meta.
+ * @typedef {NormalModule & { buildInfo: HtmlModuleBuildInfo, buildMeta: BuildMeta }} BuiltHtmlModule
+ */
+
 /**
  * Module class for `html` modules. HTML-specific properties should live here instead of `NormalModule`.
  */

package/lib/html/HtmlModulesPlugin.js

@@ -75,7 +75,7 @@ const getCssModulesPlugin = memoize(() => require("../css/CssModulesPlugin"));
 /** @import Compiler from "../Compiler" */
 /** @import Module from "../module/Module" */
 /** @typedef {import("../Compilation").EntryData} EntryData */
-/** @import { HtmlModuleBuildInfo } from "./HtmlModule" */
+/** @import { BuiltHtmlModule, HtmlModuleBuildInfo } from "./HtmlModule" */
 /** @import HtmlParser from "./HtmlParser" */
 /** @typedef {{ request: string, entryName: string, index: number, type: "script" | "script-module" | "modulepreload" | "stylesheet" | "html" | "preload" | "prefetch", css?: boolean, chunkName?: string }} HtmlEntryInfo */
 /**
@@ -444,8 +444,8 @@ class HtmlModulesPlugin {
 		hash.update(content);
 		return digestNonNumericOnly(
 			hash,
-			/** @type {string} */ (outputOptions.hashDigest),
-			/** @type {number} */ (outputOptions.hashDigestLength)
+			outputOptions.hashDigest,
+			outputOptions.hashDigestLength
 		);
 	}
 
@@ -1249,7 +1249,13 @@ class HtmlModulesPlugin {
 							// render base stay in sync.
 							const parser = /** @type {HtmlParser} */ (module.parser);
 
-							return [parser.applyTemplate(source, module), ...rest];
+							return [
+								parser.applyTemplate(
+									source,
+									/** @type {BuiltHtmlModule} */ (module)
+								),
+								...rest
+							];
 						}
 
 						return result;
@@ -1329,7 +1335,7 @@ class HtmlModulesPlugin {
 							: toTemplateSourceFileName(
 									makePathsRelative(
 										compiler.context,
-										/** @type {string} */ (resource),
+										resource,
 										compiler.root
 									).replace(/^\.\//, ""),
 									compilation
@@ -1434,12 +1440,7 @@ class HtmlModulesPlugin {
 								/** @type {HtmlModuleBuildInfo} */ (normalModule.buildInfo)
 									.baseUrlPrefix || "";
 							const undoPath =
-								basePrefix +
-								getUndoPath(
-									filename,
-									/** @type {string} */ (outputOptions.path),
-									false
-								);
+								basePrefix + getUndoPath(filename, outputOptions.path, false);
 							// Resolve linked-page (`type: "html"`) sentinels to each page's
 							// emitted filename before the undo path, so the href is relative to
 							// this page.

package/lib/html/HtmlParser.js

@@ -59,13 +59,12 @@ const getCommentCompilationWarning = memoize(() =>
 	require("../errors/CommentCompilationWarning")
 );
 
+/** @import { BuiltHtmlModule, HtmlNormalModule } from "./HtmlModule" */
 /** @import { HtmlParserOptions } from "../../declarations/WebpackOptions" */
 /** @import { Range } from "../javascript/JavascriptParser" */
-/** @import Module, { BuildInfo, BuildMeta } from "../module/Module" */
+/** @import Module from "../module/Module" */
 /** @import { FileSystemDependencies } from "../Compilation" */
-/** @import NormalModule from "../module/NormalModule" */
 /** @import { ParserState, PreparsedAst } from "../module/Parser" */
-/** @import { HtmlModuleBuildInfo } from "./HtmlModule" */
 
 /**
  * @typedef {object} HtmlTemplateContext
@@ -718,6 +717,9 @@ const CONTENT_SOURCES = dict({
 	style: { type: "stylesheet-style", filter: styleContentFilter }
 });
 
+/**
+ * @extends {Parser<BuiltHtmlModule>}
+ */
 class HtmlParser extends Parser {
 	/**
 	 * Creates an instance of HtmlParser.
@@ -803,14 +805,14 @@ class HtmlParser extends Parser {
 	 * dependency offsets against it) and the generator (which renders from
 	 * `module.originalSource()`) stay in agreement.
 	 * @param {string | Buffer} source the original source
-	 * @param {NormalModule} module the html module
+	 * @param {HtmlNormalModule} module the html module
 	 * @returns {string | Buffer} the transformed source
 	 */
 	applyTemplate(source, module) {
 		if (!this.template) return source;
 		// `processResult` runs after `_doBuild` has initialized these
 		// dependency sets, so they are always present here.
-		const buildInfo = /** @type {BuildInfo} */ (module.buildInfo);
+		const { buildInfo } = /** @type {BuiltHtmlModule} */ (module);
 		const fileDependencies = /** @type {FileSystemDependencies} */ (
 			buildInfo.fileDependencies
 		);
@@ -876,7 +878,7 @@ class HtmlParser extends Parser {
 
 		const locConverter = new LocConverter(source);
 
-		const module = state.module;
+		const module = /** @type {BuiltHtmlModule} */ (state.module);
 		const compilation = state.compilation;
 		const { hashFunction, module: outputModule } = compilation.outputOptions;
 		const context = compilation.compiler.context;
@@ -2185,7 +2187,7 @@ class HtmlParser extends Parser {
 			}
 		}
 
-		const buildInfo = /** @type {HtmlModuleBuildInfo} */ (module.buildInfo);
+		const buildInfo = module.buildInfo;
 		buildInfo.strict = true;
 		if (baseUrlPrefix !== undefined) buildInfo.baseUrlPrefix = baseUrlPrefix;
 		// WHY: hand the collected entries to HtmlModulesPlugin, which creates the
@@ -2214,8 +2216,7 @@ class HtmlParser extends Parser {
 			};
 		}
 
-		const buildMeta = /** @type {BuildMeta} */ (state.module.buildMeta);
-		buildMeta.exportsType = "default";
+		module.buildMeta.exportsType = "default";
 
 		state.module.addDependency(new StaticExportsDependency(["default"], true));
 

package/lib/html/builtinEmbeddedRenderer.js

@@ -5,9 +5,12 @@
 
 "use strict";
 
+const { SourceProcessor: CssSourceProcessor } = require("../css/syntax");
 const { CSS_TYPE } = require("../module/ModuleSourceTypeConstants");
+const { JSON_TYPE, SVG_TYPE } = require("../util/dataURL");
+const { SourceProcessor: HtmlSourceProcessor } = require("./syntax");
 
-/** @import { CssProcessOptions } from "../css/syntax-parser" */
+/** @import { CssPrintOptions, CssProcessOptions } from "../css/syntax-parser" */
 /** @import { EmbeddedSourceRenderer } from "./syntax-printer" */
 
 /**
@@ -21,15 +24,6 @@ const { CSS_TYPE } = require("../module/ModuleSourceTypeConstants");
  * @property {boolean=} svg minify an SVG `data:` URL as the `.svg` assets are, wherever that is shorter (default false)
  */
 
-// Both are loaded on first render rather than at module load: a document that
-// embeds no CSS and no JSON pays for neither.
-/** @type {typeof import("../css/syntax") | undefined} */
-let _cssSyntax;
-/** @type {typeof import("./syntax-parser") | undefined} */
-let _htmlParser;
-/** @type {typeof import("./syntax") | undefined} */
-let _htmlSyntax;
-
 /**
  * Strip the whitespace between a JSON body's tokens, every literal copied byte
  * for byte. Re-serializing would round numbers, drop a duplicate key and rewrite
@@ -78,21 +72,14 @@ const stripJsonWhitespace = (json) => {
  * @returns {EmbeddedSourceRenderer} the renderer
  */
 const builtinEmbeddedRenderer = (options = {}) => {
-	const { BLOCK_CONTENTS, JSON_TYPE, SVG_TYPE } =
-		_htmlParser || (_htmlParser = require("./syntax-parser"));
-	const { svg, ...cssOptions } = options;
-	const sheet = {
-		mode: /** @type {"minify"} */ ("minify"),
-		...cssOptions,
-		// A stylesheet's own `url(data:image/svg+xml,…)`, which `renderSvg` answers.
-		renderEmbeddedSource: svg
-			? /** @type {EmbeddedSourceRenderer} */ (
-					(source, info) =>
-						info.type === SVG_TYPE ? renderSvg(source) : undefined
-				)
-			: undefined
-	};
-	const block = { ...sheet, as: BLOCK_CONTENTS };
+	const { svg } = options;
+	// Built on first CSS render, so reading `options` (a lazy `transforms`
+	// included) waits until the CSS minifier loads.
+	/** @typedef {CssPrintOptions & { mode: "minify", as?: CssProcessOptions["as"] }} SheetOptions */
+	/** @type {SheetOptions | undefined} */
+	let sheet;
+	/** @type {SheetOptions | undefined} */
+	let block;
 	// A `style=""` repeats across a document far more often than it varies.
 	/** @type {Map<string, string>} */
 	const blocks = new Map();
@@ -104,18 +91,31 @@ const builtinEmbeddedRenderer = (options = {}) => {
 			return svg && info.as === undefined ? renderSvg(source) : undefined;
 		}
 		if (info.type !== CSS_TYPE) return undefined;
-		const isBlock = info.as === BLOCK_CONTENTS;
+		const isBlock = info.as === "block-contents";
 		if (isBlock) {
 			const memoized = blocks.get(source);
 			if (memoized !== undefined) return memoized;
 		}
-		const { SourceProcessor } =
-			_cssSyntax || (_cssSyntax = require("../css/syntax"));
 		let code;
 		try {
-			code = new SourceProcessor().process(
+			if (sheet === undefined) {
+				const { svg: _svg, ...cssOptions } = options;
+				sheet = {
+					mode: /** @type {"minify"} */ ("minify"),
+					...cssOptions,
+					// A stylesheet's own `url(data:image/svg+xml,…)`, which `renderSvg` answers.
+					renderEmbeddedSource: svg
+						? /** @type {EmbeddedSourceRenderer} */ (
+								(source, info) =>
+									info.type === SVG_TYPE ? renderSvg(source) : undefined
+							)
+						: undefined
+				};
+				block = { ...sheet, as: "block-contents" };
+			}
+			code = new CssSourceProcessor().process(
 				source,
-				isBlock ? block : sheet
+				/** @type {SheetOptions} */ (isBlock ? block : sheet)
 			).code;
 		} catch (_err) {
 			// Text the minifier cannot read is left as written, by declining.
@@ -130,12 +130,10 @@ const builtinEmbeddedRenderer = (options = {}) => {
 	 * @returns {string | undefined} it minified, or undefined where that is no shorter or it is not XML
 	 */
 	const renderSvg = (source) => {
-		const { SourceProcessor } =
-			_htmlSyntax || (_htmlSyntax = require("./syntax"));
 		let code;
 		try {
 			// `'` around an attribute, since the URL usually sits in `"` quotes.
-			code = new SourceProcessor().process(source, {
+			code = new HtmlSourceProcessor().process(source, {
 				xml: true,
 				mode: "minify",
 				xmlQuote: "'",

package/lib/html/data.js

@@ -1870,28 +1870,49 @@ const ENUMERATED_KEYWORDS = Object.assign(Object.create(null), {
 const INVALID_VALUE_DEFAULT_DIFFERS = new Set(["track kind"]);
 
 /**
- * Elements `removeEmptyElements` never drops: with no children and no attributes each is still doing its job, so an empty one is not a leftover.
+ * Elements `removeEmptyElements` may drop: with no children and no attributes each renders nothing and is read by nothing; every other element, a custom one included, is kept.
  * @type {Set<string>}
  */
-const EMPTY_ELEMENT_KEPT = new Set([
-	"canvas",
-	"dialog",
-	"meter",
-	"output",
-	"progress",
-	"slot",
-	"template",
-	"textarea",
-	"caption",
-	"col",
-	"colgroup",
-	"table",
-	"tbody",
-	"td",
-	"tfoot",
-	"th",
-	"thead",
-	"tr"
+const EMPTY_ELEMENT_DROPPED = new Set([
+	"a",
+	"abbr",
+	"address",
+	"article",
+	"aside",
+	"b",
+	"bdi",
+	"bdo",
+	"cite",
+	"code",
+	"data",
+	"del",
+	"dfn",
+	"div",
+	"em",
+	"footer",
+	"head",
+	"header",
+	"i",
+	"ins",
+	"kbd",
+	"label",
+	"main",
+	"mark",
+	"nav",
+	"s",
+	"samp",
+	"script",
+	"section",
+	"small",
+	"span",
+	"strong",
+	"style",
+	"sub",
+	"sup",
+	"time",
+	"title",
+	"u",
+	"var"
 ]);
 
 /**
@@ -1992,7 +2013,7 @@ module.exports.CLEAR_TABLE_BODY = CLEAR_TABLE_BODY;
 module.exports.CLEAR_TABLE_ROW = CLEAR_TABLE_ROW;
 module.exports.COMMA_LIST_ATTRIBUTES = COMMA_LIST_ATTRIBUTES;
 module.exports.DOM_TOKEN_LIST_ATTRIBUTES = DOM_TOKEN_LIST_ATTRIBUTES;
-module.exports.EMPTY_ELEMENT_KEPT = EMPTY_ELEMENT_KEPT;
+module.exports.EMPTY_ELEMENT_DROPPED = EMPTY_ELEMENT_DROPPED;
 module.exports.EMPTY_METADATA_ELEMENTS = EMPTY_METADATA_ELEMENTS;
 module.exports.EMPTY_REMOVABLE_ATTRIBUTES = EMPTY_REMOVABLE_ATTRIBUTES;
 module.exports.ENUMERATED_ATTRIBUTE_NAMES = ENUMERATED_ATTRIBUTE_NAMES;

package/lib/html/htmlMinify.js

@@ -95,7 +95,10 @@ const htmlMinify = async (
 		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);
+		},
 		svg
 	});
 	// One set of options, handed to the document pass and to each conditional