vinext 1.0.0-beta.2 → 1.0.0-beta.4

package/dist/shims/link.js

@@ -2,12 +2,13 @@
 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 { 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";
 import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
-import { interpolateDynamicRouteHref } from "./internal/interpolate-as.js";
+import { interpolateDynamicRouteHref, resolveDynamicRouteHref } from "./internal/interpolate-as.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 import { isBotUserAgent } from "../utils/html-limited-bots.js";
@@ -29,6 +30,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>.
@@ -147,6 +164,8 @@ function getLinkPrefetchRouterMode() {
 function resolveMatchedAutoAppRoutePrefetch(route) {
 	return {
 		cacheForNavigation: !route.canPrefetchLoadingShell && route.requiresDynamicNavigationRequest !== true,
+		fallbackTtl: "static",
+		minimumTtlMs: route.isDynamic ? 0 : void 0,
 		prefetchShellFirst: !route.isDynamic,
 		shouldPrefetch: true
 	};
@@ -163,24 +182,32 @@ function canAutoPrefetchFullAppRoute(href) {
 function resolveAutoAppRoutePrefetch(href) {
 	if (typeof window === "undefined") return {
 		cacheForNavigation: false,
+		fallbackTtl: "static",
+		minimumTtlMs: void 0,
 		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
 	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
 	if (!routes) return {
 		cacheForNavigation: false,
+		fallbackTtl: "static",
+		minimumTtlMs: void 0,
 		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
 	const routeHref = toSameOriginRouteHref(href);
 	if (routeHref === null) return {
 		cacheForNavigation: false,
+		fallbackTtl: "static",
+		minimumTtlMs: void 0,
 		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
 	const match = matchRouteWithTrie(routeHref, routes, linkPrefetchRouteTrieCache);
 	if (!match) return {
 		cacheForNavigation: false,
+		fallbackTtl: "static",
+		minimumTtlMs: void 0,
 		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
@@ -195,6 +222,8 @@ function resolveAutoAppRoutePrefetch(href) {
 function resolveFullAppRoutePrefetch() {
 	return {
 		cacheForNavigation: true,
+		fallbackTtl: "static",
+		minimumTtlMs: void 0,
 		prefetchShellFirst: true,
 		shouldPrefetch: true
 	};
@@ -228,27 +257,30 @@ 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, 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,
+					fallbackTtl: "static",
+					minimumTtlMs: void 0,
 					prefetchShellFirst: true,
 					shouldPrefetch: true
 				} : resolveFullAppRoutePrefetch();
@@ -258,15 +290,16 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				const isOptimisticRouteShellPrefetch = !autoPrefetch.cacheForNavigation;
 				const hasSearchParams = new URL(fullHref, window.location.href).search !== "";
 				const isAutomaticSearchParamShell = mode === "auto" && isOptimisticRouteShellPrefetch && hasSearchParams;
-				if (isOptimisticRouteShellPrefetch && interceptionContext !== null) return;
 				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,10 +310,9 @@ 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, {
 					headers,
@@ -289,8 +321,9 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					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");
@@ -317,8 +350,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 +384,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");
@@ -389,12 +424,18 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 						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,
+					minimumTtlMs: autoPrefetch.minimumTtlMs,
 					optimisticRouteShell: isOptimisticRouteShellPrefetch,
 					prefetchKind: isOptimisticRouteShellPrefetch ? "loading-shell" : "navigation",
+					prepareSnapshot: autoPrefetch.cacheForNavigation ? async (snapshot) => {
+						const preparePrefetchResponse = getNavigationRuntime()?.functions.preparePrefetchResponse;
+						if (!preparePrefetchResponse) throw new Error("App Router prefetch preparation is unavailable");
+						return await preparePrefetchResponse(restoreRscResponse(snapshot));
+					} : void 0,
 					searchAgnosticShell: isAutomaticSearchParamShell && !hasSearchAgnosticShell
 				});
 			} else if (HAS_PAGES_ROUTER && window.__NEXT_DATA__) {
@@ -427,7 +468,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);
@@ -581,17 +622,29 @@ function resolveConcreteRouteHref(href, as) {
 	return interpolateDynamicRouteHref(typeof href === "string" ? href : resolveHref(href), as, typeof href === "string" || !href.query || typeof href.query === "string" ? void 0 : href.query)?.href || null;
 }
 const Link = forwardRef(function Link({ href, as, replace = false, prefetch: prefetchProp, scroll = true, shallow = false, children: childrenProp, onClick, onMouseEnter, onTouchStart, onNavigate, unstable_dynamicOnHover = false, legacyBehavior = false, passHref = false, transitionTypes: _transitionTypes, ...rest }, forwardedRef) {
+	const pagesRouter = useContext(RouterContext);
 	const asHref = as === void 0 ? void 0 : resolveHref(as);
+	const hrefStr = resolveHref(href);
 	const { locale, ...restWithoutLocale } = rest;
 	let children = childrenProp;
 	if (legacyBehavior && (typeof childrenProp === "string" || typeof childrenProp === "number")) children = React.createElement("a", null, childrenProp);
-	const unresolvedHref = asHref ?? resolveHref(href);
-	const rawResolvedHref = typeof unresolvedHref === "string" && unresolvedHref.startsWith("#") ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
-	const routeHrefRaw = (HAS_PAGES_ROUTER ? resolveConcreteRouteHref(href, asHref) : null) ?? (typeof href === "string" ? href : resolveHref(href));
+	const hrefForImplicitInterpolation = isAbsoluteOrProtocolRelativeUrl(hrefStr) ? hrefStr.startsWith("//") ? null : toSameOriginAppPath(hrefStr, __basePath) : hrefStr;
+	const implicitDynamicRouteHref = HAS_PAGES_ROUTER && pagesRouter !== null && asHref === void 0 && hrefForImplicitInterpolation !== null ? resolveDynamicRouteHref(hrefForImplicitInterpolation) : null;
+	const dynamicRouteHref = implicitDynamicRouteHref ? {
+		...implicitDynamicRouteHref,
+		href: hrefStr
+	} : null;
+	const pagesAsHref = asHref ?? dynamicRouteHref?.as;
+	const unresolvedHref = pagesAsHref ?? hrefStr;
+	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;
+	const hasPagesHrefAsPair = HAS_PAGES_ROUTER && typeof pagesAsHref === "string" && typeof routeHrefRaw === "string" && pagesAsHref !== routeHrefRaw;
 	const resolvedHref = typeof rawResolvedHref === "string" ? warnAndNormalizeRepeatedSlashesInHref(rawResolvedHref) : rawResolvedHref;
 	const isDangerous = typeof resolvedHref === "string" && isDangerousScheme(resolvedHref);
 	const normalizedHref = normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : resolvedHref, locale), __trailingSlash);
-	const normalizedRouteHref = HAS_PAGES_ROUTER && typeof asHref === "string" && typeof routeHrefRaw === "string" && asHref !== routeHrefRaw ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : routeHrefRaw, locale), __trailingSlash) : normalizedHref;
+	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
@@ -713,7 +766,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		e.preventDefault();
 		const hasAppNavigationRuntime = Boolean(getNavigationRuntime()?.functions.navigate);
 		const pagesNavigateHref = HAS_PAGES_ROUTER && resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
-		const pagesAsForLink = HAS_PAGES_ROUTER && typeof asHref === "string" && typeof routeHrefRaw === "string" && asHref !== routeHrefRaw ? pagesNavigateHref : void 0;
+		const pagesAsForLink = hasPagesHrefAsPair ? pagesNavigateHref : void 0;
 		const pagesHrefForLink = pagesAsForLink === void 0 ? pagesNavigateHref : routeHrefRaw;
 		const absoluteFullHref = toBrowserNavigationHref(hasAppNavigationRuntime ? navigateHref : pagesNavigateHref, window.location.href, __basePath);
 		if (onNavigate) try {
@@ -731,19 +784,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,31 +1,21 @@
 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 width (default: "device-width") */width?: string | number; /** Viewport height */
-  height?: string | number; /** Initial scale */
-  initialScale?: number; /** Minimum scale */
-  minimumScale?: number; /** Maximum scale */
-  maximumScale?: number; /** Whether user can scale */
-  userScalable?: boolean; /** Theme color — single color or array of { media, color } */
-  themeColor?: string | Array<{
-    media?: string;
-    color: string;
-  }>; /** Color scheme: 'light' | 'dark' | 'light dark' | 'normal' */
-  colorScheme?: string;
-};
+type Viewport = Viewport$1;
+type ResolvedViewport = ResolvedViewport$1;
 /**
  * Resolve viewport config from a module. Handles both static `viewport` export
  * and async `generateViewport()` function.
  */
-declare function resolveModuleViewport(mod: Record<string, unknown>, params: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
+declare function resolveModuleViewport(mod: Record<string, unknown>, params?: Record<string, string | string[]>, searchParams?: Record<string, string | string[]>, parent?: Promise<ResolvedViewport>, searchParamsObserver?: ThenableParamsObserver): Promise<Viewport | null>;
 /**
  * Merge viewport configs from multiple sources (layouts + page).
  * Later entries override earlier ones.
  */
-declare const DEFAULT_VIEWPORT: Viewport;
-declare function mergeViewport(viewportList: Viewport[]): Viewport;
+declare const DEFAULT_VIEWPORT: ResolvedViewport;
+declare function mergeViewport(viewportList: readonly Viewport[]): ResolvedViewport;
 /**
  * React component that renders viewport meta tags into <head>.
  */
@@ -191,28 +181,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 = {
@@ -273,14 +254,17 @@ 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
+  trailingSlash,
+  streamedIconKey
 }: MetadataHeadProps): React.JSX.Element;
 //#endregion
-export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };
+export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, ResolvedViewport, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/metadata.js

@@ -9,18 +9,20 @@ import { Fragment as Fragment$1, jsx } from "react/jsx-runtime";
 * Handles `export const metadata` and `export async function generateMetadata()`.
 * Resolves metadata from layouts and pages (pages override layouts).
 */
+const USE_CACHE_FUNCTION_SYMBOL = Symbol.for("vinext.useCacheFunction");
+const USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL = Symbol.for("vinext.useCacheAcceptsSecondArgument");
 /**
 * Resolve viewport config from a module. Handles both static `viewport` export
 * and async `generateViewport()` function.
 */
-async function resolveModuleViewport(mod, params, searchParams, searchParamsObserver) {
+async function resolveModuleViewport(mod, params = {}, searchParams, parent = Promise.resolve(mergeViewport([])), searchParamsObserver) {
 	if (typeof mod.generateViewport === "function") {
 		const asyncParams = makeThenableParams(params);
 		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		};
-		return await mod.generateViewport(props);
+		return await mod.generateViewport(props, parent);
 	}
 	if (mod.viewport && typeof mod.viewport === "object") return mod.viewport;
 	return null;
@@ -31,47 +33,92 @@ async function resolveModuleViewport(mod, params, searchParams, searchParamsObse
 */
 const DEFAULT_VIEWPORT = {
 	width: "device-width",
-	initialScale: 1
+	initialScale: 1,
+	themeColor: null,
+	colorScheme: null
 };
 function mergeViewport(viewportList) {
 	const merged = { ...DEFAULT_VIEWPORT };
-	for (const vp of viewportList) Object.assign(merged, vp);
+	for (const viewport of viewportList) for (const viewportKey in viewport) switch (viewportKey) {
+		case "themeColor":
+			merged.themeColor = resolveThemeColor(viewport.themeColor);
+			break;
+		case "colorScheme":
+			merged.colorScheme = viewport.colorScheme || null;
+			break;
+		case "width":
+			merged.width = viewport.width;
+			break;
+		case "height":
+			merged.height = viewport.height;
+			break;
+		case "initialScale":
+			merged.initialScale = viewport.initialScale;
+			break;
+		case "minimumScale":
+			merged.minimumScale = viewport.minimumScale;
+			break;
+		case "maximumScale":
+			merged.maximumScale = viewport.maximumScale;
+			break;
+		case "userScalable":
+			merged.userScalable = viewport.userScalable;
+			break;
+		case "viewportFit":
+			merged.viewportFit = viewport.viewportFit;
+			break;
+		case "interactiveWidget":
+			merged.interactiveWidget = viewport.interactiveWidget;
+			break;
+		default:
+	}
 	return merged;
 }
+const VIEWPORT_META_NAMES = {
+	width: "width",
+	height: "height",
+	initialScale: "initial-scale",
+	minimumScale: "minimum-scale",
+	maximumScale: "maximum-scale",
+	userScalable: "user-scalable",
+	viewportFit: "viewport-fit",
+	interactiveWidget: "interactive-widget"
+};
 /**
 * React component that renders viewport meta tags into <head>.
 */
 function ViewportHead({ viewport }) {
+	const resolvedViewport = mergeViewport([viewport]);
 	const elements = [];
 	let key = 0;
 	const parts = [];
-	if (viewport.width !== void 0) parts.push(`width=${viewport.width}`);
-	if (viewport.height !== void 0) parts.push(`height=${viewport.height}`);
-	if (viewport.initialScale !== void 0) parts.push(`initial-scale=${viewport.initialScale}`);
-	if (viewport.minimumScale !== void 0) parts.push(`minimum-scale=${viewport.minimumScale}`);
-	if (viewport.maximumScale !== void 0) parts.push(`maximum-scale=${viewport.maximumScale}`);
-	if (viewport.userScalable !== void 0) parts.push(`user-scalable=${viewport.userScalable ? "yes" : "no"}`);
+	for (const key of Object.keys(VIEWPORT_META_NAMES)) {
+		const value = resolvedViewport[key];
+		if (value == null) continue;
+		parts.push(`${VIEWPORT_META_NAMES[key]}=${key === "userScalable" ? value ? "yes" : "no" : value}`);
+	}
 	if (parts.length > 0) elements.push(/* @__PURE__ */ jsx("meta", {
 		name: "viewport",
 		content: parts.join(", ")
 	}, key++));
-	if (viewport.themeColor) {
-		if (typeof viewport.themeColor === "string") elements.push(/* @__PURE__ */ jsx("meta", {
-			name: "theme-color",
-			content: viewport.themeColor
-		}, key++));
-		else if (Array.isArray(viewport.themeColor)) for (const entry of viewport.themeColor) elements.push(/* @__PURE__ */ jsx("meta", {
-			name: "theme-color",
-			content: entry.color,
-			...entry.media ? { media: entry.media } : {}
-		}, key++));
-	}
-	if (viewport.colorScheme) elements.push(/* @__PURE__ */ jsx("meta", {
+	if (resolvedViewport.themeColor) for (const entry of resolvedViewport.themeColor) elements.push(/* @__PURE__ */ jsx("meta", {
+		name: "theme-color",
+		content: entry.color,
+		...entry.media ? { media: entry.media } : {}
+	}, key++));
+	if (resolvedViewport.colorScheme) elements.push(/* @__PURE__ */ jsx("meta", {
 		name: "color-scheme",
-		content: viewport.colorScheme
+		content: resolvedViewport.colorScheme
 	}, key++));
 	return /* @__PURE__ */ jsx(Fragment$1, { children: elements });
 }
+function resolveThemeColor(themeColor) {
+	if (!themeColor) return null;
+	return (Array.isArray(themeColor) ? themeColor : [themeColor]).map((descriptor) => typeof descriptor === "string" ? { color: descriptor } : {
+		color: descriptor.color,
+		media: descriptor.media
+	});
+}
 /**
 * Merge metadata from multiple sources (layouts + page).
 *
@@ -219,12 +266,15 @@ function mergeMetadataEntries(entries) {
 */
 async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Promise.resolve({}), searchParamsObserver) {
 	if (typeof mod.generateMetadata === "function") {
+		const generateMetadata = mod.generateMetadata;
 		const asyncParams = makeThenableParams(params);
 		const props = searchParams === void 0 ? { params: asyncParams } : {
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams, searchParamsObserver)
 		};
-		return await (mod.generateMetadata.length >= 2 ? mod.generateMetadata(props, parent) : mod.generateMetadata(props));
+		const isUseCacheFunction = Reflect.get(generateMetadata, USE_CACHE_FUNCTION_SYMBOL) === true;
+		const acceptsSecondArgument = Reflect.get(generateMetadata, USE_CACHE_ACCEPTS_SECOND_ARGUMENT_SYMBOL);
+		return await (!isUseCacheFunction || (typeof acceptsSecondArgument === "boolean" ? acceptsSecondArgument : generateMetadata.length >= 2) ? generateMetadata(props, parent) : generateMetadata(props));
 	}
 	if (mod.metadata && typeof mod.metadata === "object") return mod.metadata;
 	return null;
@@ -370,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 "";
 	}
@@ -384,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;
@@ -675,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)
+		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 (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 } : {}
-			}, 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",