webpack 5.108.3 → 5.109.0

package/lib/dependencies/URLDependency.js

@@ -5,16 +5,23 @@
 
 "use strict";
 
+const {
+	ASSET_URL_TYPE,
+	JAVASCRIPT_TYPE
+} = require("../ModuleSourceTypeConstants");
 const RuntimeGlobals = require("../RuntimeGlobals");
 const RawDataUrlModule = require("../asset/RawDataUrlModule");
 const {
 	getDependencyUsedByExportsCondition
 } = require("../optimize/InnerGraph");
+const { toJsStringLiteral } = require("../util/identifier");
 const makeSerializable = require("../util/makeSerializable");
 const memoize = require("../util/memoize");
 const ModuleDependency = require("./ModuleDependency");
 
 /** @typedef {import("webpack-sources").ReplaceSource} ReplaceSource */
+/** @typedef {import("../ChunkGraph")} ChunkGraph */
+/** @typedef {import("../Compilation")} Compilation */
 /** @typedef {import("../Dependency")} Dependency */
 /** @typedef {import("../Dependency").GetConditionFn} GetConditionFn */
 /** @typedef {import("../DependencyTemplate").DependencyTemplateContext} DependencyTemplateContext */
@@ -22,13 +29,71 @@ const ModuleDependency = require("./ModuleDependency");
 /** @typedef {import("../ModuleGraph")} ModuleGraph */
 /** @typedef {import("../javascript/JavascriptParser").Range} Range */
 /** @typedef {import("../optimize/InnerGraph").UsedByExports} UsedByExports */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, boolean, UsedByExports | undefined]>} ObjectDeserializerContext */
-/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, boolean, UsedByExports | undefined]>} ObjectSerializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectDeserializerContext<[Range, boolean, UsedByExports | undefined, true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectDeserializerContext */
+/** @typedef {import("../serialization/ObjectMiddleware").ObjectSerializerContext<[Range, boolean, UsedByExports | undefined, true | undefined, true | undefined, ("high" | "low" | "auto" | undefined), string | undefined, string | undefined, string | undefined]>} ObjectSerializerContext */
 
 const getIgnoredRawDataUrlModule = memoize(
 	() => new RawDataUrlModule("data:,", "ignored-asset", "(ignored asset)")
 );
 
+/**
+ * Resolves the static literal specifier (already quoted) for `new URL(<here>, import.meta.url)`,
+ * or `null` when the asset url can't be determined statically (e.g. a runtime/dynamic publicPath).
+ * @param {URLDependency} dep the dependency
+ * @param {DependencyTemplateContext} templateContext the template context
+ * @returns {string | null} a JS string literal, or `null` to fall back to the runtime form
+ */
+const getAnalyzableUrlSpecifier = (dep, templateContext) => {
+	const {
+		module: consumingModule,
+		moduleGraph,
+		chunkGraph,
+		runtime,
+		codeGenerationResults,
+		runtimeTemplate
+	} = templateContext;
+	const assetModule = moduleGraph.getModule(dep);
+	if (!assetModule || !codeGenerationResults.has(assetModule, runtime)) {
+		return null;
+	}
+	const urlData = codeGenerationResults.getData(assetModule, runtime, "url");
+	if (!urlData) return null;
+
+	const jsUrl = urlData[JAVASCRIPT_TYPE];
+	if (typeof jsUrl === "string") {
+		// The asset concatenates the runtime publicPath; rebuild a literal from the
+		// resolved filename. The base is the consuming chunk (`import.meta.url`).
+		if (jsUrl.includes(RuntimeGlobals.require)) {
+			const filename = codeGenerationResults.getData(
+				assetModule,
+				runtime,
+				"filename"
+			);
+			if (typeof filename !== "string") return null;
+			const { publicPath } = runtimeTemplate.outputOptions;
+			if (publicPath === "auto") {
+				const undo = runtimeTemplate._getModuleUndoPath(
+					consumingModule,
+					chunkGraph
+				);
+				return undo === null ? null : toJsStringLiteral(undo + filename);
+			}
+			if (typeof publicPath === "string" && !publicPath.includes("[")) {
+				return toJsStringLiteral(publicPath + filename);
+			}
+			return null;
+		}
+		// An already-quoted literal (generator `publicPath` / data: url) is used as-is;
+		// a raw value (external asset) is normalized to a quoted string.
+		return jsUrl.startsWith('"') ? jsUrl : toJsStringLiteral(jsUrl);
+	}
+
+	// Wrapper dropped: the asset is consumed as `asset-url` (absolute publicPath),
+	// so its resolved url is already a chunk-independent literal.
+	const assetUrl = urlData[ASSET_URL_TYPE];
+	return typeof assetUrl === "string" ? toJsStringLiteral(assetUrl) : null;
+};
+
 class URLDependency extends ModuleDependency {
 	/**
 	 * Creates an instance of URLDependency.
@@ -45,6 +110,18 @@ class URLDependency extends ModuleDependency {
 		this.relative = relative || false;
 		/** @type {UsedByExports | undefined} */
 		this.usedByExports = undefined;
+		/** @type {true | undefined} */
+		this.prefetch = undefined;
+		/** @type {true | undefined} */
+		this.preload = undefined;
+		/** @type {"high" | "low" | "auto" | undefined} */
+		this.fetchPriority = undefined;
+		/** @type {string | undefined} */
+		this.asAttribute = undefined;
+		/** @type {string | undefined} */
+		this.typeAttribute = undefined;
+		/** @type {string | undefined} */
+		this.mediaAttribute = undefined;
 	}
 
 	get type() {
@@ -81,7 +158,13 @@ class URLDependency extends ModuleDependency {
 		context
 			.write(this.outerRange)
 			.write(this.relative)
-			.write(this.usedByExports);
+			.write(this.usedByExports)
+			.write(this.prefetch)
+			.write(this.preload)
+			.write(this.fetchPriority)
+			.write(this.asAttribute)
+			.write(this.typeAttribute)
+			.write(this.mediaAttribute);
 		super.serialize(context);
 	}
 
@@ -95,7 +178,19 @@ class URLDependency extends ModuleDependency {
 		this.relative = c1.read();
 		const c2 = c1.rest;
 		this.usedByExports = c2.read();
-		super.deserialize(c2.rest);
+		const c3 = c2.rest;
+		this.prefetch = c3.read();
+		const c4 = c3.rest;
+		this.preload = c4.read();
+		const c5 = c4.rest;
+		this.fetchPriority = c5.read();
+		const c6 = c5.rest;
+		this.asAttribute = c6.read();
+		const c7 = c6.rest;
+		this.typeAttribute = c7.read();
+		const c8 = c7.rest;
+		this.mediaAttribute = c8.read();
+		super.deserialize(c8.rest);
 	}
 }
 
@@ -129,36 +224,61 @@ URLDependency.Template = class URLDependencyTemplate extends (
 			return;
 		}
 
+		// For ESM module output, emit the analyzable `new URL("./asset", import.meta.url)`
+		// form (literal specifier, no runtime helpers) so other bundlers and webpack itself
+		// can statically follow the asset. `url: "relative"` and prefetch/preload hints
+		// (which need the runtime asset reference) keep the runtime form.
+		if (
+			!dep.relative &&
+			!dep.prefetch &&
+			!dep.preload &&
+			runtimeTemplate.supportsAnalyzableEsm()
+		) {
+			const specifier = getAnalyzableUrlSpecifier(dep, templateContext);
+			if (specifier !== null) {
+				source.replace(
+					dep.range[0],
+					dep.range[1] - 1,
+					`/* asset import */ ${specifier}, ${runtimeTemplate.outputOptions.importMetaName}.url`
+				);
+				return;
+			}
+		}
+
 		runtimeRequirements.add(RuntimeGlobals.require);
 
+		const module = moduleGraph.getModule(dep);
+		const moduleRaw = runtimeTemplate.moduleRaw({
+			chunkGraph,
+			module,
+			request: dep.request,
+			runtimeRequirements,
+			weak: false
+		});
+
+		// Resource hints fire eagerly at chunk startup via the marker
+		// requirement / `StartupAssetHintRuntimeModule`; the call site stays
+		// a plain URL expression, so the browser is already prefetching by
+		// the time user code reaches this line.
+		if (dep.prefetch || dep.preload) {
+			runtimeRequirements.add(RuntimeGlobals.startupAssetHints);
+			if (dep.prefetch) runtimeRequirements.add(RuntimeGlobals.prefetchAsset);
+			if (dep.preload) runtimeRequirements.add(RuntimeGlobals.preloadAsset);
+		}
+
 		if (dep.relative) {
 			runtimeRequirements.add(RuntimeGlobals.relativeUrl);
 			source.replace(
 				dep.outerRange[0],
 				dep.outerRange[1] - 1,
-				`/* asset import */ new ${
-					RuntimeGlobals.relativeUrl
-				}(${runtimeTemplate.moduleRaw({
-					chunkGraph,
-					module: moduleGraph.getModule(dep),
-					request: dep.request,
-					runtimeRequirements,
-					weak: false
-				})})`
+				`/* asset import */ new ${RuntimeGlobals.relativeUrl}(${moduleRaw})`
 			);
 		} else {
 			runtimeRequirements.add(RuntimeGlobals.baseURI);
-
 			source.replace(
 				dep.range[0],
 				dep.range[1] - 1,
-				`/* asset import */ ${runtimeTemplate.moduleRaw({
-					chunkGraph,
-					module: moduleGraph.getModule(dep),
-					request: dep.request,
-					runtimeRequirements,
-					weak: false
-				})}, ${RuntimeGlobals.baseURI}`
+				`/* asset import */ ${moduleRaw}, ${RuntimeGlobals.baseURI}`
 			);
 		}
 	}