vinext 1.0.0-beta.3 → 1.0.0-beta.5

package/dist/shims/link.js

@@ -1,9 +1,7 @@
 "use client";
-import { stripBasePath } from "../utils/base-path.js";
-import { createRouteTrieCache, matchRouteWithTrie } from "../routing/route-matching.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
-import { RouterContext } from "./internal/router-context.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
+import { RouterContext } from "./internal/router-context.js";
 import { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
 import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.js";
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
@@ -17,6 +15,7 @@ import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref }
 import { scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
 import { getI18nContext } from "./i18n-context.js";
 import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
+import { canAutoPrefetchFullAppRoute, resolveAutoAppRoutePrefetch, resolveFullAppRoutePrefetch } from "./internal/app-route-prefetch-policy.js";
 import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
 import React, { createContext, forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
@@ -30,6 +29,22 @@ import { jsx } from "react/jsx-runtime";
 */
 const HAS_PAGES_ROUTER = process.env.__VINEXT_HAS_PAGES_ROUTER !== "false";
 const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
+let loadedNavigationModule = null;
+let navigationModulePromise = null;
+let loadedHybridClientRouteOwnerModule = null;
+let hybridClientRouteOwnerModulePromise = null;
+function loadNavigationModule() {
+	return navigationModulePromise ??= import("./navigation.js").then((module) => {
+		loadedNavigationModule = module;
+		return module;
+	});
+}
+function loadHybridClientRouteOwnerModule() {
+	return hybridClientRouteOwnerModulePromise ??= import("./internal/hybrid-client-route-owner.js").then((module) => {
+		loadedHybridClientRouteOwnerModule = module;
+		return module;
+	});
+}
 const LinkStatusContext = createContext({ pending: false });
 /**
 * useLinkStatus returns the pending state of the enclosing <Link>.
@@ -50,7 +65,6 @@ const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** trailingSlash from next.config.js, injected by the plugin at build time */
 const __trailingSlash = process.env.__VINEXT_TRAILING_SLASH === "true";
 const __prefetchInlining = process.env.__VINEXT_PREFETCH_INLINING === "true";
-const linkPrefetchRouteTrieCache = createRouteTrieCache();
 function resolveHref(href) {
 	if (typeof href === "string") return href;
 	let url = href.pathname ?? "";
@@ -131,75 +145,9 @@ function resolveLinkPrefetchMode(prefetchProp, isDangerous) {
 	if (prefetchProp === true) return "full";
 	return "auto";
 }
-function toSameOriginRouteHref(href) {
-	if (typeof window === "undefined") return null;
-	let url;
-	try {
-		url = new URL(href, window.location.href);
-	} catch {
-		return null;
-	}
-	if (url.origin !== window.location.origin) return null;
-	return `${stripBasePath(url.pathname, __basePath)}${url.search}`;
-}
 function getLinkPrefetchRouterMode() {
 	return hasAppNavigationRuntime() ? "app" : "pages";
 }
-function resolveMatchedAutoAppRoutePrefetch(route) {
-	return {
-		cacheForNavigation: !route.canPrefetchLoadingShell && route.requiresDynamicNavigationRequest !== true,
-		prefetchShellFirst: !route.isDynamic,
-		shouldPrefetch: true
-	};
-}
-function canAutoPrefetchFullAppRoute(href) {
-	if (typeof window === "undefined") return false;
-	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
-	if (!routes) return false;
-	const routeHref = toSameOriginRouteHref(href);
-	if (routeHref === null) return false;
-	if (!matchRouteWithTrie(routeHref, routes, linkPrefetchRouteTrieCache)) return false;
-	return resolveAutoAppRoutePrefetch(href).cacheForNavigation;
-}
-function resolveAutoAppRoutePrefetch(href) {
-	if (typeof window === "undefined") return {
-		cacheForNavigation: false,
-		prefetchShellFirst: false,
-		shouldPrefetch: false
-	};
-	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
-	if (!routes) return {
-		cacheForNavigation: false,
-		prefetchShellFirst: false,
-		shouldPrefetch: false
-	};
-	const routeHref = toSameOriginRouteHref(href);
-	if (routeHref === null) return {
-		cacheForNavigation: false,
-		prefetchShellFirst: false,
-		shouldPrefetch: false
-	};
-	const match = matchRouteWithTrie(routeHref, routes, linkPrefetchRouteTrieCache);
-	if (!match) return {
-		cacheForNavigation: false,
-		prefetchShellFirst: false,
-		shouldPrefetch: false
-	};
-	const prefetch = resolveMatchedAutoAppRoutePrefetch(match.route);
-	if (new URL(routeHref, "http://vinext.local").search !== "") return {
-		...prefetch,
-		cacheForNavigation: false,
-		prefetchShellFirst: true
-	};
-	return prefetch;
-}
-function resolveFullAppRoutePrefetch() {
-	return {
-		cacheForNavigation: true,
-		prefetchShellFirst: true,
-		shouldPrefetch: true
-	};
-}
 /**
 * Prefetch a URL for faster navigation.
 *
@@ -229,30 +177,27 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 	}) ?? prefetchHref, window.location.href, __basePath);
 	const target = new URL(fullHref, window.location.href);
 	if (target.origin === window.location.origin && target.pathname === window.location.pathname && target.search === window.location.search) return;
+	if (mode === "auto" && priority === "low" && target.origin === window.location.origin && target.pathname === window.location.pathname && target.search !== window.location.search && target.hash !== "") return;
 	const runPrefetch = () => {
 		(async () => {
 			if (hasAppNavigationRuntime()) {
 				if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
 				const [navigation, { AppElementsWire }, rscCacheBusting, { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule, hybridRouteOwner] = await Promise.all([
-					import("./navigation.js"),
+					loadNavigationModule(),
 					import("../server/app-elements.js"),
 					import("../server/app-rsc-cache-busting.js"),
 					import("../server/app-rsc-render-mode.js"),
 					import("../server/headers.js"),
-					HAS_PAGES_ROUTER || HAS_CLIENT_REWRITES ? import("./internal/hybrid-client-route-owner.js") : null
+					HAS_PAGES_ROUTER || HAS_CLIENT_REWRITES ? loadHybridClientRouteOwnerModule() : null
 				]);
 				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
-				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, peekPrefetchResponseForNavigation, prefetchRscResponse, restoreRscResponse, PREFETCH_CACHE_TTL } = navigation;
-				const { createRscRequestHeaders, createRscRequestUrl } = rscCacheBusting;
+				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, createAppPrefetchRequestHeaders, discardLearningOnlyPrefetchCacheEntry, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, peekPrefetchResponseForNavigation, prefetchRscResponse, prepareNavigationPrefetchSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, restoreRscResponse, PREFETCH_CACHE_TTL } = navigation;
+				const { createRscRequestUrl } = rscCacheBusting;
 				const { NEXT_ROUTER_PREFETCH_HEADER, NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } = headersModule;
 				const hybridOwner = HAS_PAGES_ROUTER ? hybridRouteOwner.resolveHybridClientRouteOwner(prefetchHref, __basePath) : null;
 				if (hybridOwner === "pages" || hybridOwner === "document") return;
 				const rewrittenPrefetchHref = HAS_CLIENT_REWRITES ? hybridRouteOwner.resolveHybridClientRewriteHref(fullHref, __basePath) : null;
-				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(rewrittenPrefetchHref ?? prefetchHref) : mode === "full-after-shell" ? {
-					cacheForNavigation: true,
-					prefetchShellFirst: true,
-					shouldPrefetch: true
-				} : resolveFullAppRoutePrefetch();
+				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(rewrittenPrefetchHref ?? prefetchHref) : resolveFullAppRoutePrefetch();
 				if (!autoPrefetch.shouldPrefetch) return;
 				const interceptionContext = getPrefetchInterceptionContext(fullHref);
 				const mountedSlotsHeader = getMountedSlotsHeader();
@@ -260,13 +205,15 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				const hasSearchParams = new URL(fullHref, window.location.href).search !== "";
 				const isAutomaticSearchParamShell = mode === "auto" && isOptimisticRouteShellPrefetch && hasSearchParams;
 				const hasSearchAgnosticShell = isAutomaticSearchParamShell && hasSearchAgnosticPrefetchShellForRoute(await createRscRequestUrl(fullHref, new Headers()), interceptionContext, mountedSlotsHeader);
-				const headers = createRscRequestHeaders({
+				const headers = createAppPrefetchRequestHeaders({
 					interceptionContext,
+					fetchPriority: priority,
+					prefetchKind: mode === "full" ? "full" : "auto",
 					renderMode: isOptimisticRouteShellPrefetch ? hasSearchAgnosticShell ? APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL : isAutomaticSearchParamShell ? APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL : APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL : void 0
 				});
 				if (mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
 				const shouldSendSegmentPrefetchHeaders = isOptimisticRouteShellPrefetch || mode === "auto";
-				if (__prefetchInlining && autoPrefetch.cacheForNavigation) {
+				if (__prefetchInlining && mode === "auto" && autoPrefetch.cacheForNavigation) {
 					headers.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
 					headers.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "/__PAGE__");
 				} else if (shouldSendSegmentPrefetchHeaders) {
@@ -277,20 +224,21 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				const additionalRscUrls = rewrittenPrefetchHref && rewrittenPrefetchHref !== fullHref ? [await createRscRequestUrl(rewrittenPrefetchHref, headers)] : [];
 				const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 				const prefetched = getPrefetchedUrls();
+				if (autoPrefetch.cacheForNavigation) discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext);
 				if (prefetched.has(cacheKey)) {
 					if (!autoPrefetch.cacheForNavigation) return;
-					const existing = getPrefetchCache().get(cacheKey);
-					if (existing?.cacheForNavigation === false) existing.cacheForNavigation = true;
 				}
-				const fetchFullRscPayload = () => scheduleAppPrefetchFetch(() => fetch(rscUrl, {
+				const fetchFullRscPayload = () => scheduleAppPrefetchFetch((signal) => fetch(rscUrl, {
 					headers,
 					credentials: "include",
 					priority,
+					signal,
 					purpose: "prefetch"
 				}), priority);
 				const fetchLoadingShellForReuse = async () => {
-					const shellHeaders = createRscRequestHeaders({
+					const shellHeaders = createAppPrefetchRequestHeaders({
 						interceptionContext,
+						fetchPriority: priority,
 						renderMode: APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL
 					});
 					shellHeaders.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
@@ -302,10 +250,11 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					let shellEntry = shellCache.get(shellCacheKey);
 					if (shellEntry === void 0) {
 						getPrefetchedUrls().add(shellCacheKey);
-						prefetchRscResponse(shellRscUrl, scheduleAppPrefetchFetch(() => fetch(shellRscUrl, {
+						prefetchRscResponse(shellRscUrl, scheduleAppPrefetchFetch((signal) => fetch(shellRscUrl, {
 							headers: shellHeaders,
 							credentials: "include",
 							priority,
+							signal,
 							purpose: "prefetch"
 						}), priority), interceptionContext, mountedSlotsHeader, void 0, {
 							cacheForNavigation: false,
@@ -317,8 +266,9 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					await shellEntry?.pending?.catch(() => {});
 				};
 				const fetchAliasCacheHitProbe = async () => {
-					const probeHeaders = createRscRequestHeaders({
+					const probeHeaders = createAppPrefetchRequestHeaders({
 						interceptionContext,
+						fetchPriority: priority,
 						renderMode: APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL
 					});
 					probeHeaders.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
@@ -350,8 +300,9 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 						await fetchLoadingShellForReuse();
 						return fetchFullRscPayload();
 					}
-					const shellHeaders = createRscRequestHeaders({
+					const shellHeaders = createAppPrefetchRequestHeaders({
 						interceptionContext,
+						fetchPriority: priority,
 						renderMode: void 0
 					});
 					shellHeaders.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
@@ -363,10 +314,11 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					let shellEntry = shellCache.get(shellCacheKey);
 					if (shellEntry === void 0) {
 						getPrefetchedUrls().add(shellCacheKey);
-						prefetchRscResponse(shellRscUrl, scheduleAppPrefetchFetch(() => fetch(shellRscUrl, {
+						prefetchRscResponse(shellRscUrl, scheduleAppPrefetchFetch((signal) => fetch(shellRscUrl, {
 							headers: shellHeaders,
 							credentials: "include",
 							priority,
+							signal,
 							purpose: "prefetch"
 						}), priority), interceptionContext, mountedSlotsHeader, void 0, {
 							cacheForNavigation: false,
@@ -382,19 +334,22 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 						const cachedRenderedResponse = peekPrefetchResponseForNavigation(renderedRscUrl, interceptionContext, mountedSlotsHeader);
 						if (cachedRenderedResponse) return restoreRscResponse(cachedRenderedResponse);
 					}
-					return scheduleAppPrefetchFetch(() => fetch(rscUrl, {
+					return scheduleAppPrefetchFetch((signal) => fetch(rscUrl, {
 						headers,
 						credentials: "include",
 						priority,
+						signal,
 						purpose: "prefetch"
 					}), priority);
 				})() : fetchFullRscPayload();
-				if (mode === "full" && autoPrefetch.cacheForNavigation && autoPrefetch.prefetchShellFirst && mountedSlotsHeader === null && !gateViaExplicitSearchShell) fetchLoadingShellForReuse();
+				if (!__prefetchInlining && mode === "full" && autoPrefetch.cacheForNavigation && autoPrefetch.prefetchShellFirst && mountedSlotsHeader === null && !gateViaExplicitSearchShell) fetchLoadingShellForReuse();
 				prefetchRscResponse(rscUrl, fetchPromise, interceptionContext, mountedSlotsHeader, void 0, {
 					cacheForNavigation: autoPrefetch.cacheForNavigation,
-					fallbackTtlMs: PREFETCH_CACHE_TTL,
+					fallbackTtlMs: autoPrefetch.fallbackTtl === "dynamic" ? DYNAMIC_NAVIGATION_CACHE_TTL : PREFETCH_CACHE_TTL,
+					honorDynamicStaleTime: autoPrefetch.honorDynamicStaleTime,
 					optimisticRouteShell: isOptimisticRouteShellPrefetch,
 					prefetchKind: isOptimisticRouteShellPrefetch ? "loading-shell" : "navigation",
+					prepareSnapshot: autoPrefetch.cacheForNavigation ? prepareNavigationPrefetchSnapshot : void 0,
 					searchAgnosticShell: isAutomaticSearchParamShell && !hasSearchAgnosticShell
 				});
 			} else if (HAS_PAGES_ROUTER && window.__NEXT_DATA__) {
@@ -427,7 +382,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 async function promotePrefetchEntriesForNavigation(href) {
 	if (typeof window === "undefined") return;
 	if (!hasAppNavigationRuntime()) return;
-	const [{ getPrefetchCache }, { stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([import("./navigation.js"), import("../server/app-rsc-cache-busting.js")]);
+	const [{ getPrefetchCache }, { stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([loadNavigationModule(), import("../server/app-rsc-cache-busting.js")]);
 	let target;
 	try {
 		target = new URL(toBrowserNavigationHref(href, window.location.href, __basePath), window.location.href);
@@ -595,7 +550,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	} : null;
 	const pagesAsHref = asHref ?? dynamicRouteHref?.as;
 	const unresolvedHref = pagesAsHref ?? hrefStr;
-	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
+	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") && !getNavigationRuntime()?.functions.navigate ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
 	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(dynamicRouteHref ? hrefForImplicitInterpolation ?? href : href, pagesAsHref) : null;
 	const routeHrefRaw = dynamicRouteHref?.href ?? concreteRouteHref ?? hrefStr;
 	const prefetchRouteHrefRaw = concreteRouteHref ?? routeHrefRaw;
@@ -743,19 +698,19 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onNavigate(navEvent);
 			if (navEvent.defaultPrevented) return;
 		} catch {}
-		const hybridOwner = HAS_PAGES_ROUTER && hasAppNavigationRuntime ? (await import("./internal/hybrid-client-route-owner.js")).resolveHybridClientRouteOwner(navigateHref, __basePath) : null;
+		const hybridOwner = (HAS_PAGES_ROUTER && hasAppNavigationRuntime ? loadedHybridClientRouteOwnerModule ?? await loadHybridClientRouteOwnerModule() : null)?.resolveHybridClientRouteOwner(navigateHref, __basePath);
 		if (HAS_PAGES_ROUTER && hasAppNavigationRuntime && ["pages", "document"].includes(hybridOwner ?? "")) {
 			if (replace) window.location.replace(absoluteFullHref);
 			else window.location.assign(absoluteFullHref);
 			return;
 		}
 		if (hasAppNavigationRuntime) {
-			const { navigateClientSide } = await import("./navigation.js");
+			const { navigateClientSide } = loadedNavigationModule ?? await loadNavigationModule();
 			const setter = setPendingRef.current;
 			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
 			React.startTransition(() => {
-				navigateClientSide(navigateHref, replace ? "replace" : "push", scroll, true).finally(() => {
+				navigateClientSide(navigateHref, replace ? "replace" : "push", scroll, false).finally(() => {
 					if (mountedRef.current) setPending(false);
 					if (setter) clearLinkForCurrentNavigation(setter);
 				});

package/dist/shims/metadata.d.ts

@@ -1,7 +1,6 @@
 import { ThenableParamsObserver } from "./thenable-params.js";
 import React from "react";
 import { ResolvedViewport as ResolvedViewport$1, Viewport as Viewport$1 } from "@vinext/types/next/upstream/dist/lib/metadata/types/metadata-interface";
-
 //#region src/shims/metadata.d.ts
 type Viewport = Viewport$1;
 type ResolvedViewport = ResolvedViewport$1;
@@ -19,9 +18,7 @@ declare function mergeViewport(viewportList: readonly Viewport[]): ResolvedViewp
 /**
  * React component that renders viewport meta tags into <head>.
  */
-declare function ViewportHead({
-  viewport
-}: {
+declare function ViewportHead({ viewport }: {
   viewport: Viewport;
 }): React.JSX.Element;
 type Metadata = {
@@ -181,28 +178,19 @@ type SocialImageDescriptor = {
 };
 type IconDescriptor = {
   url: string | URL;
-  sizes?: string;
   type?: string;
-  media?: string;
-};
-type AppleIconDescriptor = {
-  url: string | URL;
   sizes?: string;
-  type?: string;
+  color?: string;
+  rel?: string;
+  media?: string;
+  fetchPriority?: "high" | "low" | "auto";
 };
 type IconInput = string | URL | IconDescriptor;
-type AppleIconInput = string | URL | AppleIconDescriptor;
-type OtherIconDescriptor = {
-  rel: string;
-  url: string | URL;
-  sizes?: string;
-  type?: string;
-};
 type IconsMap = {
   icon?: IconInput | IconInput[];
-  shortcut?: string | URL | Array<string | URL>;
-  apple?: AppleIconInput | AppleIconInput[];
-  other?: OtherIconDescriptor | OtherIconDescriptor[];
+  shortcut?: IconInput | IconInput[];
+  apple?: IconInput | IconInput[];
+  other?: IconDescriptor | IconDescriptor[];
 };
 type IconsMetadata = IconInput | IconInput[] | IconsMap;
 type MetadataMergeEntry = {
@@ -263,14 +251,12 @@ type MetadataHeadProps = {
   metadata: Metadata;
   pathname?: string;
   trailingSlash?: boolean;
+  streamedIconKey?: string;
 };
 declare function renderMetadataToHtml(metadata: Metadata, pathname?: string, options?: {
   trailingSlash?: boolean;
+  streamedIconKey?: string;
 }): string;
-declare function MetadataHead({
-  metadata,
-  pathname,
-  trailingSlash
-}: MetadataHeadProps): React.JSX.Element;
+declare function MetadataHead({ metadata, pathname, trailingSlash, streamedIconKey }: MetadataHeadProps): React.JSX.Element;
 //#endregion
 export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, ResolvedViewport, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/metadata.js

@@ -420,12 +420,15 @@ function renderMetadataElementToHtml(node) {
 			"content"
 		])}>`;
 		case "link": return `<link${renderMetadataAttributes(props, [
+			"data-vinext-streamed-icon",
 			"rel",
 			"href",
 			"hrefLang",
-			"media",
 			"type",
-			"sizes"
+			"sizes",
+			"color",
+			"media",
+			"fetchPriority"
 		])}>`;
 		default: return "";
 	}
@@ -434,10 +437,11 @@ function renderMetadataToHtml(metadata, pathname = "/", options) {
 	return renderMetadataElementToHtml(MetadataHead({
 		metadata,
 		pathname,
-		trailingSlash: options?.trailingSlash
+		trailingSlash: options?.trailingSlash,
+		streamedIconKey: options?.streamedIconKey
 	}));
 }
-function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
+function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey }) {
 	const elements = [];
 	let key = 0;
 	const base = metadata.metadataBase;
@@ -725,35 +729,23 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash }) {
 	}
 	if (metadata.icons) {
 		const iconEntries = isIconsMap(metadata.icons) ? normalizeUrlDescriptorEntries(metadata.icons.icon, (url) => ({ url })) : normalizeUrlDescriptorEntries(metadata.icons, (url) => ({ url }));
-		if (isIconsMap(metadata.icons) && metadata.icons.shortcut) {
-			const shortcuts = Array.isArray(metadata.icons.shortcut) ? metadata.icons.shortcut : [metadata.icons.shortcut];
-			for (const s of shortcuts) elements.push(/* @__PURE__ */ jsx("link", {
-				rel: "shortcut icon",
-				href: stringifyUrl(s)
-			}, key++));
-		}
-		if (iconEntries.length > 0) for (const i of iconEntries) elements.push(/* @__PURE__ */ jsx("link", {
-			rel: "icon",
-			href: stringifyUrl(i.url),
-			...i.sizes ? { sizes: i.sizes } : {},
-			...i.type ? { type: i.type } : {},
-			...i.media ? { media: i.media } : {}
-		}, key++));
-		if (isIconsMap(metadata.icons) && metadata.icons.apple) for (const a of normalizeUrlDescriptorEntries(metadata.icons.apple, (url) => ({ url }))) elements.push(/* @__PURE__ */ jsx("link", {
-			rel: "apple-touch-icon",
-			href: stringifyUrl(a.url),
-			...a.sizes ? { sizes: a.sizes } : {},
-			...a.type ? { type: a.type } : {}
-		}, key++));
-		if (isIconsMap(metadata.icons) && metadata.icons.other) {
-			const others = Array.isArray(metadata.icons.other) ? metadata.icons.other : [metadata.icons.other];
-			for (const o of others) elements.push(/* @__PURE__ */ jsx("link", {
-				rel: o.rel,
-				href: stringifyUrl(o.url),
-				...o.sizes ? { sizes: o.sizes } : {},
-				...o.type ? { type: o.type } : {}
+		let streamedIconOrder = 0;
+		const appendIcons = (entries, defaultRel) => {
+			for (const { url, rel, type, sizes, color, media, fetchPriority } of entries) elements.push(/* @__PURE__ */ jsx("link", {
+				"data-vinext-streamed-icon": streamedIconKey ? `${streamedIconKey}:${streamedIconOrder++}` : void 0,
+				rel: rel || defaultRel,
+				href: stringifyUrl(url),
+				type,
+				sizes,
+				color,
+				media,
+				fetchPriority
 			}, key++));
-		}
+		};
+		if (isIconsMap(metadata.icons) && metadata.icons.shortcut) appendIcons(normalizeUrlDescriptorEntries(metadata.icons.shortcut, (url) => ({ url })), "shortcut icon");
+		if (iconEntries.length > 0) appendIcons(iconEntries, "icon");
+		if (isIconsMap(metadata.icons) && metadata.icons.apple) appendIcons(normalizeUrlDescriptorEntries(metadata.icons.apple, (url) => ({ url })), "apple-touch-icon");
+		if (isIconsMap(metadata.icons) && metadata.icons.other) appendIcons(normalizeUrlDescriptorEntries(metadata.icons.other, (url) => ({ url })), "icon");
 	}
 	if (metadata.manifest) elements.push(/* @__PURE__ */ jsx("link", {
 		rel: "manifest",

package/dist/shims/navigation-context-state.d.ts

@@ -1,5 +1,4 @@
 import * as React$1 from "react";
-
 //#region src/shims/navigation-context-state.d.ts
 /**
  * Map of parallel route key to child segments below the current layout.

package/dist/shims/navigation-state.d.ts

@@ -1,4 +1,5 @@
 import { NavigationContext } from "./navigation-context-state.js";
+import "./navigation-server.js";
 //#region src/shims/navigation-state.d.ts
 type NavigationState = {
   serverContext: NavigationContext | null;

package/dist/shims/navigation.d.ts

@@ -1,13 +1,15 @@
 import { AppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
+import { AppElements } from "../server/app-elements-wire.js";
+import "../server/app-elements.js";
 import { AppRouterInstance, NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+import { AppRscRenderMode } from "../server/app-rsc-render-mode.js";
 import { GLOBAL_ACCESSORS_KEY, NavigationContext, NavigationStateAccessors, SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
 import { Params } from "@vinext/types/next/upstream/dist/server/request/params";
-
 //#region src/shims/navigation.d.ts
 /** Load rewrite-aware hybrid route ownership before navigation becomes interactive. */
 declare function preloadHybridClientRouteOwner(): Promise<void>;
@@ -18,16 +20,37 @@ declare const __basePath: string;
 declare const MAX_PREFETCH_CACHE_SIZE: number;
 declare const DYNAMIC_NAVIGATION_CACHE_TTL: number;
 declare const PREFETCH_CACHE_TTL: number;
+/**
+ * The render's `cacheLife` claim about client reuse. The wire treats the two
+ * variants as mutually exclusive — a response carries either the resolved
+ * bound (`NEXT_ROUTER_STALE_TIME_HEADER`) or the pending marker
+ * (`VINEXT_STALE_TIME_PENDING_HEADER`), never both — so the cached form
+ * encodes that rather than trusting every producer to keep them apart.
+ */
+type ServerStaleTime =
+/** Cacheable render streamed before its `cacheLife` resolved; reuse is bounded at the 30s floor. */
+{
+  kind: "pending";
+} |
+/** Resolved reuse bound, min-combined with the config-derived `dynamicStaleTimeSeconds`. */
+{
+  kind: "resolved";
+  seconds: number;
+};
 /** A buffered RSC response stored as an ArrayBuffer for replay. */
 type CachedRscResponse = {
   compatibilityIdHeader?: string | null;
   buffer: ArrayBuffer;
+  /** Dynamic bound observed after the RSC stream completed. */
+  completedDynamicStaleTimeSeconds?: number;
   contentType: string;
   dynamicStaleTimeSeconds?: number;
   expiresAt?: number;
   mountedSlotsHeader?: string | null;
   paramsHeader: string | null;
+  preparedElements?: AppElements;
   renderedPathAndSearch: string | null;
+  serverStaleTime?: ServerStaleTime;
   url: string;
 };
 type PrefetchOptions = {
@@ -45,7 +68,10 @@ type PrefetchCacheEntry = {
   outcome: "pending" | "cache-seeded";
   snapshot?: CachedRscResponse;
   cacheKeys?: Set<string>;
+  /** The queue-scheduled request, so a consuming navigation can promote it. */
+  fetchPromise?: Promise<Response>;
   pending?: Promise<void>;
+  preparedElements?: AppElements;
   prefetchKind?: PrefetchCacheKind;
   searchAgnosticShell?: boolean;
   size?: number;
@@ -54,6 +80,13 @@ type PrefetchCacheEntry = {
 declare function getCurrentInterceptionContext(): string | null;
 declare function getPrefetchInterceptionContext(targetHref: string): string | null;
 declare function getCurrentNextUrl(): string;
+declare function createAppPrefetchRequestHeaders(options: {
+  fetchPriority: "auto" | "high" | "low";
+  interceptionContext?: string | null;
+  mountedSlotsHeader?: string | null;
+  prefetchKind?: "auto" | "full";
+  renderMode?: AppRscRenderMode;
+}): Headers;
 /** Get or create the shared in-memory RSC prefetch cache on window. */
 declare function getPrefetchCache(): Map<string, PrefetchCacheEntry>;
 /**
@@ -61,14 +94,16 @@ declare function getPrefetchCache(): Map<string, PrefetchCacheEntry>;
  * Keyed by interception-aware cache key so distinct source routes do not alias.
  */
 declare function getPrefetchedUrls(): Set<string>;
-declare function resolveCachedRscResponseTtlMs(cached: Pick<CachedRscResponse, "dynamicStaleTimeSeconds">, fallbackTtlMs: number): number;
-declare function resolveCachedRscResponseExpiresAt(timestamp: number, cached: Pick<CachedRscResponse, "dynamicStaleTimeSeconds" | "expiresAt">, fallbackTtlMs: number): number;
+declare function resolveCachedRscResponseTtlMs(cached: Pick<CachedRscResponse, "dynamicStaleTimeSeconds" | "serverStaleTime">, fallbackTtlMs: number): number;
+declare function resolveCachedRscResponseExpiresAt(timestamp: number, cached: Pick<CachedRscResponse, "dynamicStaleTimeSeconds" | "expiresAt" | "serverStaleTime">, fallbackTtlMs: number): number;
 declare function resolvePrefetchCacheEntryMountedSlotsHeader(entry: PrefetchCacheEntry): string | null;
 declare function hasPrefetchCacheEntryForNavigation(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: {
   additionalRscUrls?: readonly string[];
   notifyInvalidation?: boolean;
+  onInvalidate?: () => void;
 }): boolean;
 declare function hasSearchAgnosticPrefetchShellForRoute(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): boolean;
+declare function discardLearningOnlyPrefetchCacheEntry(rscUrl: string, interceptionContext?: string | null): boolean;
 declare function invalidatePrefetchCache(): void;
 declare function seedPrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null, mountedSlotsHeader?: string | null, fallbackTtlMs?: number): void;
 declare function deletePrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null): void;
@@ -111,6 +146,13 @@ declare function snapshotRscResponse(response: Response): Promise<CachedRscRespo
  *   that are deleted after consumption) to avoid the extra allocation.
  */
 declare function restoreRscResponse(cached: CachedRscResponse, copy?: boolean): Response;
+/**
+ * `prefetchRscResponse`'s `prepareSnapshot` for navigation-reusable entries:
+ * decode the cached payload through the App Router runtime so a later
+ * navigation can commit it without re-parsing. Shared by `<Link>` and
+ * `router.prefetch()`.
+ */
+declare function prepareNavigationPrefetchSnapshot(snapshot: CachedRscResponse): Promise<AppElements>;
 /**
  * Prefetch an RSC response and snapshot it for later consumption.
  * Stores the in-flight promise so immediate clicks can await it instead
@@ -121,17 +163,23 @@ declare function restoreRscResponse(cached: CachedRscResponse, copy?: boolean):
 declare function prefetchRscResponse(rscUrl: string, fetchPromise: Promise<Response>, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: PrefetchOptions, behavior?: {
   cacheForNavigation?: boolean;
   fallbackTtlMs?: number;
+  honorDynamicStaleTime?: boolean;
   optimisticRouteShell?: boolean;
   prefetchKind?: PrefetchCacheKind;
+  prepareSnapshot?: (snapshot: CachedRscResponse) => Promise<AppElements>;
   searchAgnosticShell?: boolean;
 }): void;
-declare function peekPrefetchResponseForNavigation(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): CachedRscResponse | null;
+declare function peekPrefetchResponseForNavigation(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: {
+  additionalRscUrls?: readonly string[];
+}): CachedRscResponse | null;
 /**
  * Consume a prefetched response for a given rscUrl.
  * Only returns settled (non-pending) snapshots synchronously.
  * Returns null if the entry is still in flight or doesn't exist.
  */
-declare function consumePrefetchResponse(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): CachedRscResponse | null;
+declare function consumePrefetchResponse(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null, options?: {
+  additionalRscUrls?: readonly string[];
+}): CachedRscResponse | null;
 /**
  * Consume a prefetched response for navigation. Unlike the synchronous cache
  * read above, this waits for an already-started prefetch snapshot before
@@ -303,4 +351,4 @@ declare function useSelectedLayoutSegments(parallelRoutesKey?: string): string[]
  */
 declare function useServerInsertedHTML(callback: () => unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchCacheKind, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, ServerStaleTime, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createAppPrefetchRequestHeaders, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, deletePrefetchResponseSnapshot, discardLearningOnlyPrefetchCacheEntry, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, hasSearchAgnosticPrefetchShellForRoute, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, peekPrefetchResponseForNavigation, permanentRedirect, prefetchRscResponse, preloadHybridClientRouteOwner, prepareNavigationPrefetchSnapshot, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolveLoadedHybridClientRewriteHref, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };