webpack 5.110.2 → 5.111.0

package/lib/html/HtmlParser.js

@@ -868,6 +868,7 @@ class HtmlParser extends Parser {
 		 * @typedef {object} HtmlEntryInfo
 		 * @property {string} request
 		 * @property {string} entryName
+		 * @property {number} index position in the document, across all groups — the order the emitted files are named in
 		 * @property {"script" | "script-module" | "modulepreload" | "stylesheet" | "html" | "preload" | "prefetch"} type
 		 * @property {boolean=} css entry emits a CSS chunk (`<link rel="preload" as="style">`), so it needs the CSS filename template
 		 */
@@ -1478,7 +1479,8 @@ class HtmlParser extends Parser {
 										const scriptType =
 											/** @type {"script" | "script-module"} */ (type);
 										const request = dataUri("text/javascript", value);
-										const entryName = `__html_${moduleHash}_${nextEntryIndex++}`;
+										const index = nextEntryIndex++;
+										const entryName = `__html_${moduleHash}_${index}`;
 										const dep = new HtmlInlineScriptDependency(
 											request,
 											nameEnd,
@@ -1501,6 +1503,7 @@ class HtmlParser extends Parser {
 										).push({
 											request,
 											entryName,
+											index,
 											type: scriptType
 										});
 										break;
@@ -1581,7 +1584,8 @@ class HtmlParser extends Parser {
 										// kind rewrites to the page's filename and emits no sibling tags.
 										// Recorded as an independent entry (no `dependOn`), like an entry point.
 										if (type === "html") {
-											const entryName = `__html_${moduleHash}_${nextEntryIndex++}`;
+											const index = nextEntryIndex++;
+											const entryName = `__html_${moduleHash}_${index}`;
 											const dep = new HtmlEntryDependency(
 												request,
 												[s, e],
@@ -1591,7 +1595,7 @@ class HtmlParser extends Parser {
 											);
 											setLoc(dep, s, e);
 											module.addPresentationalDependency(dep);
-											htmlLinkEntries.push({ request, entryName, type });
+											htmlLinkEntries.push({ request, entryName, index, type });
 											continue;
 										}
 										// `rel="preload"/"prefetch"` of a bundled resource: an
@@ -1603,7 +1607,8 @@ class HtmlParser extends Parser {
 											const asStyle = as
 												? as.trim().toLowerCase() === "style"
 												: false;
-											const entryName = `__html_${moduleHash}_${nextEntryIndex++}`;
+											const index = nextEntryIndex++;
+											const entryName = `__html_${moduleHash}_${index}`;
 											// Tag metadata so the template can mirror `crossorigin`/
 											// `integrity` onto a native `preload` `<link>` (integrity-
 											// eligible per the SRI spec). `prefetch` gets none — the spec
@@ -1635,6 +1640,7 @@ class HtmlParser extends Parser {
 											).push({
 												request,
 												entryName,
+												index,
 												type,
 												css: asStyle
 											});
@@ -1649,7 +1655,8 @@ class HtmlParser extends Parser {
 											type === "modulepreload" ||
 											type === "stylesheet"
 										) {
-											const entryName = `__html_${moduleHash}_${nextEntryIndex++}`;
+											const index = nextEntryIndex++;
+											const entryName = `__html_${moduleHash}_${index}`;
 											const willBeModuleScript =
 												type === "script-module" ||
 												(outputModule && type === "script");
@@ -1777,7 +1784,7 @@ class HtmlParser extends Parser {
 													: type === "stylesheet"
 														? stylesheetEntries
 														: modulePreloadEntries
-											).push({ request, entryName, type });
+											).push({ request, entryName, index, type });
 										} else {
 											const dep = new HtmlSourceDependency(request, [s, e]);
 											ResourceHintPlugin.applyDefaults(

package/lib/html/builtinEmbeddedRenderer.js

@@ -0,0 +1,107 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const { CSS_TYPE } = require("../ModuleSourceTypeConstants");
+
+/** @import { CssProcessOptions } from "../css/syntax" */
+/** @import { EmbeddedSourceRenderer } from "./syntax" */
+
+/**
+ * What this minifies inline CSS with: the CSS minifier's own options, so an
+ * inline declaration is held to the rules a `.css` asset is.
+ * @typedef {Pick<CssProcessOptions, "environment" | "convertLengthUnits" | "rewriteCustomProperties" | "transforms" | "unusedSymbols" | "pseudoClasses">} BuiltinEmbeddedRendererOptions
+ */
+
+// 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") | 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
+ * the escapes that keep a string from closing the `<script>` early.
+ * @param {string} json a `<script>` body
+ * @returns {string} the stripped body, or the body as written where it is not JSON
+ */
+const stripJsonWhitespace = (json) => {
+	try {
+		JSON.parse(json);
+	} catch (_err) {
+		// Not JSON after all (a template, a placeholder) — not ours to touch.
+		return json;
+	}
+	let out = "";
+	let inString = false;
+	let escaped = false;
+	for (let i = 0; i < json.length; i++) {
+		const c = json.charCodeAt(i);
+		if (inString) {
+			out += json[i];
+			if (escaped) escaped = false;
+			else if (c === 0x5c) escaped = true;
+			else if (c === 0x22) inString = false;
+			continue;
+		}
+		if (c === 0x22) {
+			inString = true;
+			out += json[i];
+			continue;
+		}
+		// JSON whitespace (RFC 8259): tab, LF, CR, space.
+		if (c === 0x09 || c === 0x0a || c === 0x0d || c === 0x20) continue;
+		out += json[i];
+	}
+	return out;
+};
+
+/**
+ * The renderer webpack ships for what a document embeds: its own CSS minifier
+ * for a `<style>` or `style=""` and `stripJsonWhitespace` for JSON, declining
+ * every other language. A caller passes it where it has no renderer of its own,
+ * or behind one for the languages that one declines — the HTML printer minifies
+ * none of this itself.
+ * @param {BuiltinEmbeddedRendererOptions=} options the CSS minifier's options, so an inline declaration is minified as the `.css` assets are
+ * @returns {EmbeddedSourceRenderer} the renderer
+ */
+const builtinEmbeddedRenderer = (options = {}) => {
+	const { BLOCK_CONTENTS, JSON_TYPE } =
+		_htmlSyntax || (_htmlSyntax = require("./syntax"));
+	const sheet = { mode: /** @type {"minify"} */ ("minify"), ...options };
+	const block = { ...sheet, as: BLOCK_CONTENTS };
+	// A `style=""` repeats across a document far more often than it varies.
+	/** @type {Map<string, string>} */
+	const blocks = new Map();
+	return (source, info) => {
+		if (info.type === JSON_TYPE) return stripJsonWhitespace(source);
+		if (info.type !== CSS_TYPE) return undefined;
+		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(
+				source,
+				isBlock ? block : sheet
+			).code;
+		} catch (_err) {
+			// Text the minifier cannot read is left as written, by declining.
+			return undefined;
+		}
+		if (isBlock) blocks.set(source, code);
+		return code;
+	};
+};
+
+module.exports.builtinEmbeddedRenderer = builtinEmbeddedRenderer;
+module.exports.stripJsonWhitespace = stripJsonWhitespace;

package/lib/html/data.js

@@ -6,7 +6,7 @@
 "use strict";
 
 // GENERATED by tooling/generate-html-data.js — do not edit.
-// cspell:ignore advasoft altglyph altglyphdef altglyphitem animatecolor animatemotion animatetransform arcrole aswedit attributename attributetype basefrequency baseprofile bgsound calcmode clippathunits contenteditable diffuseconstant enterkeyhint fedropshadow filterunits formenctype formmethod formtarget glyphref gradienttransform gradientunits hotjava hotmetal inputmode jscript kernelmatrix kernelunitlength keypoints keysplines keytimes limitingconeangle livescript markerheight markerwidth maskcontentunits maskunits metrius mtext numoctaves pathlength patterncontentunits patterntransform patternunits pointsatx pointsaty pointsatz preservealpha primitiveunits refx refy repeatcount repeatdur requiredextensions requiredfeatures silmaril softquad specularconstant specularexponent startoffset stddeviation stitchtiles surfacescale systemlanguage tablevalues targetx targety textlength viewbox viewtarget webtechs writingsuggestions xchannelselector ychannelselector
+// cspell:ignore advasoft altglyph altglyphdef altglyphitem animatecolor animatemotion animatetransform arcrole aswedit attributename attributetype basefrequency baseprofile bgsound calcmode clippathunits contenteditable diffuseconstant enterkeyhint fedropshadow filterunits formenctype formmethod formtarget glyphref gradienttransform gradientunits hotjava hotmetal inputmode jscript kernelmatrix kernelunitlength keypoints keysplines keytimes limitingconeangle livescript markerheight markerwidth maskcontentunits maskunits metrius mtext numoctaves pathlength patterncontentunits patterntransform patternunits pointsatx pointsaty pointsatz preservealpha primitiveunits refx refy repeatcount repeatdur requiredextensions requiredfeatures silmaril softquad specularconstant specularexponent startoffset stddeviation stitchtiles surfacescale systemlanguage tablevalues targetx targety textlength viewbox viewtarget webtechs writingsuggestions xchannelselector ychannelselector onabort onafterprint onauxclick onbeforeinput onbeforematch onbeforeprint onbeforetoggle onbeforeunload onblur oncancel oncanplay oncanplaythrough onchange onclick onclose oncommand oncontextlost oncontextmenu oncontextrestored oncopy oncuechange oncut ondblclick ondrag ondragend ondragenter ondragleave ondragover ondragstart ondrop ondurationchange onemptied onended onerror onfocus onformdata onhashchange oninput oninvalid onkeydown onkeypress onkeyup onlanguagechange onload onloadeddata onloadedmetadata onloadstart onmessage onmessageerror onmousedown onmouseenter onmouseleave onmousemove onmouseout onmouseover onmouseup onoffline ononline onpagehide onpagereveal onpageshow onpageswap onpaste onpause onplay onplaying onpopstate onprogress onratechange onrejectionhandled onreset onresize onscroll onscrollend onsecuritypolicyviolation onseeked onseeking onselect onslotchange onstalled onstorage onsubmit onsuspend ontimeupdate ontoggle onunhandledrejection onunload onvolumechange onwaiting onwebkitanimationend onwebkitanimationiteration onwebkitanimationstart onwebkittransitionend onwheel
 // Reflected-attribute tables from webref's extraction of the HTML IDL (see tooling/generate-html-data.js); everything else is the
 // generator's SUPPLEMENT, which carries the spec facts no dataset states.
 
@@ -178,6 +178,8 @@ const REWRITABLE_ATTRIBUTES = new Set([
 	"rowspan",
 	"sandbox",
 	"scope",
+	"scrollamount",
+	"scrolldelay",
 	"size",
 	"sizes",
 	"span",
@@ -330,7 +332,7 @@ const BOOLEAN_ATTRIBUTES = new Map([
 	["autofocus", null],
 	["autoplay", new Set(["audio", "video"])],
 	["checked", new Set(["input"])],
-	["compact", new Set(["dl", "menu", "ol", "ul"])],
+	["compact", new Set(["dir", "dl", "menu", "ol", "ul"])],
 	["controls", new Set(["audio", "img", "video"])],
 	["declare", new Set(["object"])],
 	["default", new Set(["track"])],
@@ -358,6 +360,7 @@ const BOOLEAN_ATTRIBUTES = new Map([
 	["muted", new Set(["audio", "video"])],
 	["nohref", new Set(["area"])],
 	["nomodule", new Set(["script"])],
+	["noresize", new Set(["frame"])],
 	["noshade", new Set(["hr"])],
 	["novalidate", new Set(["form"])],
 	["nowrap", new Set(["td", "th"])],
@@ -369,7 +372,8 @@ const BOOLEAN_ATTRIBUTES = new Map([
 	["selected", new Set(["option"])],
 	["shadowrootclonable", new Set(["template"])],
 	["shadowrootdelegatesfocus", new Set(["template"])],
-	["shadowrootserializable", new Set(["template"])]
+	["shadowrootserializable", new Set(["template"])],
+	["truespeed", new Set(["marquee"])]
 ]);
 
 /**
@@ -435,7 +439,7 @@ const URL_ATTRIBUTES = new Map([
 	["data", new Set(["object"])],
 	["formaction", new Set(["button", "input"])],
 	["href", new Set(["a", "area", "base", "link"])],
-	["longdesc", new Set(["iframe", "img"])],
+	["longdesc", new Set(["frame", "iframe", "img"])],
 	["lowsrc", new Set(["img"])],
 	["manifest", new Set(["html"])],
 	["poster", new Set(["video"])],
@@ -444,6 +448,7 @@ const URL_ATTRIBUTES = new Map([
 		new Set([
 			"audio",
 			"embed",
+			"frame",
 			"iframe",
 			"img",
 			"input",
@@ -480,17 +485,19 @@ const INTEGER_ATTRIBUTES = new Map([
 			"video"
 		])
 	],
-	["hspace", new Set(["img", "object"])],
+	["hspace", new Set(["img", "marquee", "object"])],
 	["maxlength", new Set(["input", "textarea"])],
 	["minlength", new Set(["input", "textarea"])],
 	["rows", new Set(["textarea"])],
 	["rowspan", new Set(["td", "th"])],
+	["scrollamount", new Set(["marquee"])],
+	["scrolldelay", new Set(["marquee"])],
 	["size", new Set(["input", "select"])],
 	["span", new Set(["col", "colgroup"])],
 	["start", new Set(["ol"])],
 	["tabindex", null],
 	["value", new Set(["li"])],
-	["vspace", new Set(["img", "object"])],
+	["vspace", new Set(["img", "marquee", "object"])],
 	[
 		"width",
 		new Set([
@@ -499,10 +506,12 @@ const INTEGER_ATTRIBUTES = new Map([
 			"iframe",
 			"img",
 			"input",
+			"listing",
 			"object",
 			"pre",
 			"source",
-			"video"
+			"video",
+			"xmp"
 		])
 	]
 ]);
@@ -524,6 +533,110 @@ const SIGNED_INTEGER_ATTRIBUTES = new Set(["start", "tabindex", "value"]);
  */
 const COMMA_LIST_ATTRIBUTES = new Set(["accept", "coords", "sizes"]);
 
+/**
+ * Event handler content attributes, mapped to the elements each is one on
+ * (`null` = a global attribute). Elsewhere the same name is an ordinary
+ * attribute holding text — `onunload` is a handler on `<body>` and data on a
+ * `<div>` — so the value is only read as JavaScript where the table says it is.
+ * @type {Map<string, Set<string> | null>}
+ */
+const EVENT_HANDLER_ATTRIBUTES = new Map([
+	["onabort", null],
+	["onafterprint", new Set(["body", "frameset"])],
+	["onauxclick", null],
+	["onbeforeinput", null],
+	["onbeforematch", null],
+	["onbeforeprint", new Set(["body", "frameset"])],
+	["onbeforetoggle", null],
+	["onbeforeunload", new Set(["body", "frameset"])],
+	["onblur", null],
+	["oncancel", null],
+	["oncanplay", null],
+	["oncanplaythrough", null],
+	["onchange", null],
+	["onclick", null],
+	["onclose", null],
+	["oncommand", null],
+	["oncontextlost", null],
+	["oncontextmenu", null],
+	["oncontextrestored", null],
+	["oncopy", null],
+	["oncuechange", null],
+	["oncut", null],
+	["ondblclick", null],
+	["ondrag", null],
+	["ondragend", null],
+	["ondragenter", null],
+	["ondragleave", null],
+	["ondragover", null],
+	["ondragstart", null],
+	["ondrop", null],
+	["ondurationchange", null],
+	["onemptied", null],
+	["onended", null],
+	["onerror", null],
+	["onfocus", null],
+	["onformdata", null],
+	["onhashchange", new Set(["body", "frameset"])],
+	["oninput", null],
+	["oninvalid", null],
+	["onkeydown", null],
+	["onkeypress", null],
+	["onkeyup", null],
+	["onlanguagechange", new Set(["body", "frameset"])],
+	["onload", null],
+	["onloadeddata", null],
+	["onloadedmetadata", null],
+	["onloadstart", null],
+	["onmessage", new Set(["body", "frameset"])],
+	["onmessageerror", new Set(["body", "frameset"])],
+	["onmousedown", null],
+	["onmouseenter", null],
+	["onmouseleave", null],
+	["onmousemove", null],
+	["onmouseout", null],
+	["onmouseover", null],
+	["onmouseup", null],
+	["onoffline", new Set(["body", "frameset"])],
+	["ononline", new Set(["body", "frameset"])],
+	["onpagehide", new Set(["body", "frameset"])],
+	["onpagereveal", new Set(["body", "frameset"])],
+	["onpageshow", new Set(["body", "frameset"])],
+	["onpageswap", new Set(["body", "frameset"])],
+	["onpaste", null],
+	["onpause", null],
+	["onplay", null],
+	["onplaying", null],
+	["onpopstate", new Set(["body", "frameset"])],
+	["onprogress", null],
+	["onratechange", null],
+	["onrejectionhandled", new Set(["body", "frameset"])],
+	["onreset", null],
+	["onresize", null],
+	["onscroll", null],
+	["onscrollend", null],
+	["onsecuritypolicyviolation", null],
+	["onseeked", null],
+	["onseeking", null],
+	["onselect", null],
+	["onslotchange", null],
+	["onstalled", null],
+	["onstorage", new Set(["body", "frameset"])],
+	["onsubmit", null],
+	["onsuspend", null],
+	["ontimeupdate", null],
+	["ontoggle", null],
+	["onunhandledrejection", new Set(["body", "frameset"])],
+	["onunload", new Set(["body", "frameset"])],
+	["onvolumechange", null],
+	["onwaiting", null],
+	["onwebkitanimationend", null],
+	["onwebkitanimationiteration", null],
+	["onwebkitanimationstart", null],
+	["onwebkittransitionend", null],
+	["onwheel", null]
+]);
+
 /**
  * §13.1.2 void elements: no end tag, and no children to close one over.
  * @type {Set<string>}
@@ -1863,6 +1976,7 @@ module.exports.EMPTY_METADATA_ELEMENTS = EMPTY_METADATA_ELEMENTS;
 module.exports.EMPTY_REMOVABLE_ATTRIBUTES = EMPTY_REMOVABLE_ATTRIBUTES;
 module.exports.ENUMERATED_ATTRIBUTE_NAMES = ENUMERATED_ATTRIBUTE_NAMES;
 module.exports.ENUMERATED_KEYWORDS = ENUMERATED_KEYWORDS;
+module.exports.EVENT_HANDLER_ATTRIBUTES = EVENT_HANDLER_ATTRIBUTES;
 module.exports.FONT_BREAKOUT_ATTRS = FONT_BREAKOUT_ATTRS;
 module.exports.FOREIGN_ATTR_NS = FOREIGN_ATTR_NS;
 module.exports.FOREIGN_BREAKOUT = FOREIGN_BREAKOUT;