webpack 5.108.4 → 5.109.0

package/lib/asset/WebManifestParser.js

@@ -0,0 +1,130 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Alexander Akait @alexander-akait
+*/
+
+"use strict";
+
+const { parse } = require("acorn");
+const Parser = require("../Parser");
+const HtmlSourceDependency = require("../dependencies/HtmlSourceDependency");
+
+/** @typedef {import("estree").Expression} Expression */
+/** @typedef {import("estree").ObjectExpression} ObjectExpression */
+/** @typedef {import("estree").Program} Program */
+/** @typedef {import("estree").Property} Property */
+/** @typedef {import("../Module").BuildInfo} BuildInfo */
+/** @typedef {import("../Parser").ParserState} ParserState */
+/** @typedef {import("../Parser").PreparsedAst} PreparsedAst */
+
+// acorn decorates every node with numeric source offsets (absent from the estree types).
+/** @typedef {{ start: number, end: number }} Positioned */
+
+// A URL carrying its own scheme (`https:`, `data:`, …) is external; it is only
+// bundled when `experiments.buildHttp` is enabled (like an absolute URL in HTML).
+const ABSOLUTE_URL_SCHEME_REGEXP = /^[a-zA-Z][a-zA-Z\d+\-.]*:/;
+// Manifest members whose array items carry an asset `src` (`icons[].src`,
+// `screenshots[].src`, and `shortcuts[].icons[].src` — the last nests under `icons`).
+const ICON_CONTAINER_KEYS = new Set(["icons", "screenshots"]);
+
+/**
+ * Parses a Web App Manifest (`.webmanifest`) so its icon/screenshot `src`
+ * URLs are bundled as assets. Reuses acorn (JSON is a valid JS expression
+ * literal) to recover the exact source offsets, then emits an
+ * `HtmlSourceDependency` per URL so the generator can rewrite it in place.
+ */
+class WebManifestParser extends Parser {
+	/**
+	 * Parses the provided source and updates the parser state.
+	 * @param {string | Buffer | PreparsedAst} source the source to parse
+	 * @param {ParserState} state the parser state
+	 * @returns {ParserState} the parser state
+	 */
+	parse(source, state) {
+		if (Buffer.isBuffer(source)) {
+			source = source.toString("utf8");
+		} else if (typeof source === "object") {
+			throw new Error("webpackAst is unexpected for the WebManifestParser");
+		}
+		if (source[0] === "") {
+			source = source.slice(1);
+		}
+
+		const module = state.module;
+		// Without `buildHttp` there is no handler to fetch remote icons, so an
+		// absolute URL is left as-is rather than rewritten to an ignored asset.
+		const buildHttp = Boolean(state.options.experiments.buildHttp);
+
+		/** @type {Program | undefined} */
+		let ast;
+		try {
+			// Wrap in parens so the top-level object is an expression, not a block.
+			ast = /** @type {Program} */ (
+				/** @type {unknown} */ (parse(`(${source})`, { ecmaVersion: "latest" }))
+			);
+		} catch (_err) {
+			// Not valid JSON — leave the file untouched (still emitted as-is).
+			ast = undefined;
+		}
+
+		const statement = ast && ast.body[0];
+		if (
+			statement &&
+			statement.type === "ExpressionStatement" &&
+			statement.expression.type === "ObjectExpression"
+		) {
+			/**
+			 * @param {ObjectExpression} obj object expression node
+			 * @param {string | undefined} parentKey key of the array/object this node sits in
+			 */
+			const walk = (obj, parentKey) => {
+				for (const prop of obj.properties) {
+					if (prop.type !== "Property") continue;
+					const key =
+						prop.key.type === "Literal" && typeof prop.key.value === "string"
+							? prop.key.value
+							: prop.key.type === "Identifier"
+								? prop.key.name
+								: undefined;
+					const value = /** @type {Expression} */ (prop.value);
+					if (value.type === "ObjectExpression") {
+						walk(value, key);
+					} else if (value.type === "ArrayExpression") {
+						for (const element of value.elements) {
+							if (element && element.type === "ObjectExpression") {
+								walk(element, key);
+							}
+						}
+					} else if (
+						key === "src" &&
+						value.type === "Literal" &&
+						typeof value.value === "string" &&
+						parentKey !== undefined &&
+						ICON_CONTAINER_KEYS.has(parentKey)
+					) {
+						const url = value.value;
+						// Fragment-only refs aren't assets; absolute URLs need `buildHttp`.
+						if (!url || url.startsWith("#")) continue;
+						if (!buildHttp && ABSOLUTE_URL_SCHEME_REGEXP.test(url)) continue;
+						// acorn offsets are into `(${source})`; the leading `(` and the
+						// opening quote cancel, so the inner span is [start, end - 2].
+						const { start, end } = /** @type {Positioned} */ (
+							/** @type {unknown} */ (value)
+						);
+						const dep = new HtmlSourceDependency(url, [start, end - 2]);
+						module.addDependency(dep);
+						module.addCodeGenerationDependency(dep);
+					}
+				}
+			};
+			walk(statement.expression, undefined);
+		}
+
+		/** @type {BuildInfo} */
+		(state.module.buildInfo).strict = true;
+
+		return state;
+	}
+}
+
+module.exports = WebManifestParser;

package/lib/async-modules/AwaitDependenciesInitFragment.js

@@ -22,8 +22,9 @@ class AwaitDependenciesInitFragment extends InitFragment {
 	/**
 	 * Creates an instance of AwaitDependenciesInitFragment.
 	 * @param {Dependencies} dependencies maps an import var to an async module that needs to be awaited
+	 * @param {boolean=} generatorLowered module is emitted as a generator, so use `yield` instead of `await`
 	 */
-	constructor(dependencies) {
+	constructor(dependencies, generatorLowered = false) {
 		super(
 			undefined,
 			InitFragment.STAGE_ASYNC_DEPENDENCIES,
@@ -32,6 +33,8 @@ class AwaitDependenciesInitFragment extends InitFragment {
 		);
 		/** @type {Dependencies} */
 		this.dependencies = dependencies;
+		/** @type {boolean} */
+		this.generatorLowered = generatorLowered;
 	}
 
 	/**
@@ -44,7 +47,10 @@ class AwaitDependenciesInitFragment extends InitFragment {
 		for (const [key, value] of this.dependencies) {
 			dependencies.set(key, value);
 		}
-		return new AwaitDependenciesInitFragment(dependencies);
+		return new AwaitDependenciesInitFragment(
+			dependencies,
+			this.generatorLowered || other.generatorLowered
+		);
 	}
 
 	/**
@@ -61,6 +67,10 @@ class AwaitDependenciesInitFragment extends InitFragment {
 		const importVars = [...this.dependencies.keys()];
 		const asyncModuleValues = [...this.dependencies.values()].join(", ");
 
+		// In a generator-lowered module (no `async`/`await`, but generators) the
+		// dependency `await` becomes `yield`; the body stays a single scope.
+		const suspend = this.generatorLowered ? "yield" : "await";
+
 		const templateInput = [
 			`var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([${asyncModuleValues}]);`
 		];
@@ -70,7 +80,7 @@ class AwaitDependenciesInitFragment extends InitFragment {
 			!runtimeTemplate.supportsDestructuring()
 		) {
 			templateInput.push(
-				"var __webpack_async_dependencies_result__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);"
+				`var __webpack_async_dependencies_result__ = (__webpack_async_dependencies__.then ? (${suspend} __webpack_async_dependencies__)() : __webpack_async_dependencies__);`
 			);
 			for (const [index, importVar] of importVars.entries()) {
 				templateInput.push(
@@ -81,7 +91,7 @@ class AwaitDependenciesInitFragment extends InitFragment {
 			const importVarsStr = importVars.join(", ");
 
 			templateInput.push(
-				`([${importVarsStr}] = __webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__);`
+				`([${importVarsStr}] = __webpack_async_dependencies__.then ? (${suspend} __webpack_async_dependencies__)() : __webpack_async_dependencies__);`
 			);
 		}
 

package/lib/async-modules/isGeneratorLowered.js

@@ -0,0 +1,26 @@
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+*/
+
+"use strict";
+
+/** @typedef {import("../Module")} Module */
+/** @typedef {import("../ModuleGraph")} ModuleGraph */
+/** @typedef {import("../RuntimeTemplate")} RuntimeTemplate */
+
+/**
+ * Whether an async module is lowered to a generator: the target has no
+ * `async`/`await` but supports generators, and the module contains no
+ * top-level `for await…of` (which generators can't express).
+ * @param {Module} module module
+ * @param {ModuleGraph} moduleGraph module graph
+ * @param {RuntimeTemplate} runtimeTemplate runtime template
+ * @returns {boolean} true when the module should be emitted as a generator
+ */
+const isGeneratorLowered = (module, moduleGraph, runtimeTemplate) =>
+	moduleGraph.isAsync(module) &&
+	!runtimeTemplate.supportsAsyncFunction() &&
+	Boolean(runtimeTemplate.supportsGenerator()) &&
+	!(module.buildInfo && module.buildInfo.usesTopLevelAwaitForOf);
+
+module.exports = isGeneratorLowered;

package/lib/cache/PackFileCacheStrategy.js

@@ -1134,7 +1134,7 @@ class PackFileCacheStrategy {
 	 * @param {number} options.maxAge max age of cache items
 	 * @param {boolean=} options.profile track and log detailed timing information for individual cache items
 	 * @param {boolean=} options.allowCollectingMemory allow to collect unused memory created during deserialization
-	 * @param {false | "gzip" | "brotli"=} options.compression compression used
+	 * @param {false | "gzip" | "brotli" | "zstd"=} options.compression compression used
 	 * @param {boolean=} options.readonly disable storing cache into filesystem
 	 */
 	constructor({
@@ -1182,15 +1182,21 @@ class PackFileCacheStrategy {
 		this.readonly = readonly;
 		/** @type {boolean | undefined} */
 		this.allowCollectingMemory = allowCollectingMemory;
-		/** @type {false | "gzip" | "brotli" | undefined} */
+		/** @type {false | "gzip" | "brotli" | "zstd" | undefined} */
 		this.compression = compression;
+		// eslint-disable-next-line n/no-unsupported-features/node-builtins
+		if (compression === "zstd" && !require("zlib").createZstdCompress) {
+			throw new Error("cache.compression: 'zstd' requires Node.js >= 22.15.0");
+		}
 		/** @type {string} */
 		this._extension =
 			compression === "brotli"
 				? ".pack.br"
 				: compression === "gzip"
 					? ".pack.gz"
-					: ".pack";
+					: compression === "zstd"
+						? ".pack.zst"
+						: ".pack";
 		/** @type {SnapshotOptions} */
 		this.snapshot = snapshot;
 		/** @type {BuildDependencies} */

package/lib/config/browserslistTargetHandler.js

@@ -449,6 +449,25 @@ const resolve = (browsers) => {
 			kaios: 3,
 			node: [7, 6]
 		}),
+		generator: rawChecker({
+			chrome: 39,
+			and_chr: 39,
+			edge: 13,
+			firefox: 26,
+			and_ff: 26,
+			// ie: Not supported,
+			opera: 26,
+			op_mob: 26,
+			safari: 10,
+			ios_saf: 10,
+			samsung: [3, 4],
+			android: 39,
+			and_qq: [10, 4],
+			baidu: [7, 12],
+			and_uc: [12, 12],
+			kaios: [2, 5],
+			node: 4
+		}),
 		/* eslint-enable camelcase */
 		browser: browserProperty,
 		electron: false,
@@ -458,6 +477,27 @@ const resolve = (browsers) => {
 		webworker: false,
 
 		document: browserProperty,
+		modulePreload:
+			browserProperty &&
+			/* eslint-disable camelcase */
+			rawChecker({
+				chrome: 66,
+				and_chr: 66,
+				edge: 79,
+				firefox: 115,
+				and_ff: 115,
+				opera: 53,
+				op_mob: 47,
+				safari: 17,
+				ios_saf: 17,
+				samsung: [9, 0],
+				android: 66,
+				and_qq: [13, 1],
+				baidu: [13, 18],
+				and_uc: [15, 5],
+				kaios: [3, 1]
+			}),
+		/* eslint-enable camelcase */
 		fetchWasm: browserProperty,
 		global: nodeProperty,
 		importScripts: false,