@depup/webpack 5.109.0-depup.0 → 5.109.2-depup.0

package/lib/prefetch/ResourceHintPlugin.js

@@ -100,6 +100,67 @@ const compilationResolvers = new WeakMap();
 // magic comments still work — they route through `applyParsedHints`.
 const DEFAULT_ASSETS_EXCLUDE_REGEXP = /\.(?:webmanifest|pdf|txt)(?:\?.*)?$/i;
 
+// Initial-graph auto hints target JS chunk output files only.
+const JS_CHUNK_FILE_REGEXP = /\.m?jsx?$/i;
+
+/**
+ * True for the URL-referenced-asset deps that can carry resource-hint flags.
+ * Type guard so callers keep the narrowed union without re-listing the classes.
+ * @param {import("../Dependency")} dep dependency
+ * @returns {dep is URLDependency | CssUrlDependency | HtmlSourceDependency} whether it is a URL asset dep
+ */
+const isUrlAssetDep = (dep) =>
+	dep instanceof URLDependency ||
+	dep instanceof CssUrlDependency ||
+	dep instanceof HtmlSourceDependency;
+
+/**
+ * True for the CSS / HTML URL-asset deps whose templates don't run for JS
+ * output — the plugin lifts their hint flags into JS runtime requirements
+ * itself. JS `URLDependency` lifts its own, so it is excluded here.
+ * @param {import("../Dependency")} dep dependency
+ * @returns {dep is CssUrlDependency | HtmlSourceDependency} whether it is a CSS/HTML URL asset dep
+ */
+const isCssOrHtmlUrlAssetDep = (dep) =>
+	dep instanceof CssUrlDependency || dep instanceof HtmlSourceDependency;
+
+/**
+ * Entry chunk name for a hint's `hostChunks` (Vite's `hostId`); the id is a
+ * stable fallback for unnamed chunks.
+ * @param {import("../Chunk")} chunk chunk
+ * @returns {string} name or stringified id
+ */
+const chunkHostName = (chunk) => chunk.name || String(chunk.id);
+
+/**
+ * Walk `chunks` × their modules × dependencies and yield each distinct
+ * URL-asset module carrying a prefetch/preload flag, deduping targets within a
+ * single call. One shared walk for the entrypoint-hint and HTML-hint passes,
+ * which would otherwise each re-implement the same 4-level nesting.
+ * @param {Compilation} compilation compilation
+ * @param {Iterable<import("../Chunk")>} chunks chunks to scan
+ * @returns {IterableIterator<{ dep: URLDependency | CssUrlDependency | HtmlSourceDependency, target: Module, chunk: import("../Chunk") }>} hinted assets
+ */
+function* iterateHintedUrlAssets(compilation, chunks) {
+	const { chunkGraph, moduleGraph } = compilation;
+	/** @type {WeakSet<Module>} */
+	const seen = new WeakSet();
+	for (const chunk of chunks) {
+		for (const module of chunkGraph.getChunkModulesIterable(chunk)) {
+			const deps = module.dependencies;
+			if (!deps) continue;
+			for (const dep of deps) {
+				if (!isUrlAssetDep(dep)) continue;
+				if (!dep.prefetch && !dep.preload) continue;
+				const target = moduleGraph.getModule(dep);
+				if (!target || seen.has(target)) continue;
+				seen.add(target);
+				yield { dep, target, chunk };
+			}
+		}
+	}
+}
+
 /**
  * Merge the matching `UrlHintRule`s for a request. Rules match by
  * `test`/`include`/`exclude` (omit all three → matches everything); later
@@ -238,13 +299,13 @@ const collectEntrypointHints = (compilation, entryName, hints) => {
 		for (const chunk of entrypoint.chunks) {
 			if (chunk === entryChunk) continue;
 			for (const file of chunk.files) {
-				if (!/\.m?jsx?$/i.test(file)) continue;
+				if (!JS_CHUNK_FILE_REGEXP.test(file)) continue;
 				const href = publicPath + file;
 				/** @type {EntrypointHint} */
 				const h = {
 					rel,
 					href,
-					hostChunks: [chunk.name || String(chunk.id)]
+					hostChunks: [chunkHostName(chunk)]
 				};
 				if (rel === "preload") h.as = "script";
 				push(h);
@@ -256,45 +317,30 @@ const collectEntrypointHints = (compilation, entryName, hints) => {
 	// runtime via `dynamicImportPrefetch/Preload` parser options).
 	/** @type {Set<import("../Chunk")>} */
 	const chunkSet = new Set(entrypoint.chunks);
-	const rt = entrypoint.getRuntimeChunk();
-	if (rt) chunkSet.add(rt);
-	/** @type {WeakSet<Module>} */
-	const seenAssets = new WeakSet();
-	for (const chunk of chunkSet) {
-		for (const m of compilation.chunkGraph.getChunkModulesIterable(chunk)) {
-			if (!m.dependencies) continue;
-			for (const d of m.dependencies) {
-				if (
-					!(d instanceof URLDependency) &&
-					!(d instanceof CssUrlDependency) &&
-					!(d instanceof HtmlSourceDependency)
-				) {
-					continue;
-				}
-				if (!d.prefetch && !d.preload) continue;
-				const t = compilation.moduleGraph.getModule(d);
-				if (!t || seenAssets.has(t)) continue;
-				seenAssets.add(t);
-				const buildInfo =
-					/** @type {{ filename?: string }} */
-					(t.buildInfo);
-				if (!buildInfo || !buildInfo.filename) continue;
-				const asAttr =
-					d.asAttribute ||
-					ResourceHintRuntimeModule.guessAsAttribute(d.request);
-				/** @type {EntrypointHint} */
-				const h = {
-					rel: d.preload ? "preload" : "prefetch",
-					href: publicPath + buildInfo.filename,
-					hostChunks: [chunk.name || String(chunk.id)]
-				};
-				if (asAttr) h.as = asAttr;
-				if (d.typeAttribute) h.type = d.typeAttribute;
-				if (d.mediaAttribute) h.media = d.mediaAttribute;
-				if (d.fetchPriority) h.fetchPriority = d.fetchPriority;
-				push(h);
-			}
-		}
+	const runtimeChunk = entrypoint.getRuntimeChunk();
+	if (runtimeChunk) chunkSet.add(runtimeChunk);
+	for (const { dep, target, chunk } of iterateHintedUrlAssets(
+		compilation,
+		chunkSet
+	)) {
+		const buildInfo =
+			/** @type {{ filename?: string }} */
+			(target.buildInfo);
+		if (!buildInfo || !buildInfo.filename) continue;
+		const asAttribute =
+			dep.asAttribute ||
+			ResourceHintRuntimeModule.guessAsAttribute(dep.request);
+		/** @type {EntrypointHint} */
+		const h = {
+			rel: dep.preload ? "preload" : "prefetch",
+			href: publicPath + buildInfo.filename,
+			hostChunks: [chunkHostName(chunk)]
+		};
+		if (asAttribute) h.as = asAttribute;
+		if (dep.typeAttribute) h.type = dep.typeAttribute;
+		if (dep.mediaAttribute) h.media = dep.mediaAttribute;
+		if (dep.fetchPriority) h.fetchPriority = dep.fetchPriority;
+		push(h);
 	}
 	// `hostType`: `"html"` iff the entrypoint has an extracted HTML page
 	// (any `HtmlEntryDependency` with elementKind `script`/`script-module` on
@@ -493,33 +539,16 @@ class ResourceHintPlugin {
 						const chunks = new Set(entrypoint.chunks);
 						const entry = entrypoint.getEntrypointChunk();
 						if (entry) chunks.add(entry);
-						const rt = entrypoint.getRuntimeChunk();
-						if (rt) chunks.add(rt);
+						const runtimeChunk = entrypoint.getRuntimeChunk();
+						if (runtimeChunk) chunks.add(runtimeChunk);
 						/** @type {HtmlHintedAsset[]} */
 						const hinted = [];
-						/** @type {WeakSet<Module>} */
-						const seen = new WeakSet();
-						for (const c of chunks) {
-							for (const m of compilation.chunkGraph.getChunkModulesIterable(
-								c
-							)) {
-								if (!m.dependencies) continue;
-								for (const d of m.dependencies) {
-									if (
-										!(d instanceof URLDependency) &&
-										!(d instanceof CssUrlDependency) &&
-										!(d instanceof HtmlSourceDependency)
-									) {
-										continue;
-									}
-									if (!d.prefetch && !d.preload) continue;
-									const t = compilation.moduleGraph.getModule(d);
-									if (!t || seen.has(t)) continue;
-									seen.add(t);
-									anyHtmlHinted.add(t);
-									hinted.push({ module: t, dep: d });
-								}
-							}
+						for (const { dep: assetDep, target } of iterateHintedUrlAssets(
+							compilation,
+							chunks
+						)) {
+							anyHtmlHinted.add(target);
+							hinted.push({ module: target, dep: assetDep });
 						}
 						// Multiple HtmlEntryDeps may share an entryName (e.g. a
 						// `<script>` and a `<link rel="modulepreload">` for the
@@ -571,12 +600,7 @@ class ResourceHintPlugin {
 							(module).dependencies;
 						if (!deps) continue;
 						for (const dep of deps) {
-							if (
-								!(dep instanceof CssUrlDependency) &&
-								!(dep instanceof HtmlSourceDependency)
-							) {
-								continue;
-							}
+							if (!isCssOrHtmlUrlAssetDep(dep)) continue;
 							if (dep.prefetch) hasPrefetch = true;
 							if (dep.preload) hasPreload = true;
 							if (hasPrefetch && hasPreload) break;