vinext 1.3.0 → 1.3.1

package/dist/shims/link.js

@@ -11,14 +11,14 @@ import { formatUrlObject, formatUrlObjectWithValidation } from "./internal/forma
 import { normalizeRouterHref, resolvePagesRouterHref } from "./internal/normalize-router-href.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
-import { getNavigationRuntime, hasAppNavigationRuntime, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
+import { NAVIGATION_RUNTIME_KEY, getNavigationRuntime, isNavigationRuntimeFunctions, loadNavigationRuntimeRouteManifest, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
-import { scheduleAppPrefetchFetch } from "./internal/app-prefetch-fetch-queue.js";
+import { cancelQueuedAppPrefetchFetch, getAppPrefetchFetchClaimSequence, isAppPrefetchFetchClaimed, 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 React, { createContext, forwardRef, useCallback, useContext, useEffect, useLayoutEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/shims/link.tsx
 /**
@@ -29,6 +29,7 @@ import { jsx } from "react/jsx-runtime";
 * page swap via the router's navigation system.
 */
 const HAS_PAGES_ROUTER = process.env.__VINEXT_HAS_PAGES_ROUTER !== "false";
+const isServer = typeof window === "undefined";
 const HAS_CLIENT_REWRITES = process.env.__VINEXT_HAS_CLIENT_REWRITES !== "false";
 let loadedNavigationModule = null;
 let navigationModulePromise = null;
@@ -46,6 +47,20 @@ function loadHybridClientRouteOwnerModule() {
 		return module;
 	});
 }
+let appRscCacheBustingModulePromise = null;
+let appPrefetchModulesPromise = null;
+function loadAppRscCacheBustingModule() {
+	return appRscCacheBustingModulePromise ??= import("../server/app-rsc-cache-busting.js");
+}
+function loadAppPrefetchModules() {
+	return appPrefetchModulesPromise ??= Promise.all([
+		import("../server/app-elements.js"),
+		loadAppRscCacheBustingModule(),
+		import("./internal/app-prefetch-rsc-request.js"),
+		import("../server/app-rsc-render-mode.js"),
+		import("../server/headers.js")
+	]);
+}
 const LinkStatusContext = createContext({ pending: false });
 /**
 * useLinkStatus returns the pending state of the enclosing <Link>.
@@ -70,11 +85,11 @@ function resolveHref(href, validate = false) {
 	if (typeof href === "string") return href;
 	return validate ? formatUrlObjectWithValidation(href) : formatUrlObject(href);
 }
-function resolvePagesLinkValue(value, pagesRouter, routePathnameForWarning) {
+function resolvePagesLinkValue(value, pagesRouter) {
 	const formatted = resolveHref(value, pagesRouter !== null);
 	if (pagesRouter === null) return formatted;
 	if (typeof pagesRouter.pathname === "string" && typeof pagesRouter.asPath === "string" && !formatted.startsWith("?") && !formatted.startsWith("#")) return resolvePagesRouterHref(formatted, pagesRouter, __basePath);
-	return normalizeRouterHref(formatted, routePathnameForWarning);
+	return normalizeRouterHref(formatted, getCurrentRoutePathnameForWarning());
 }
 function resolvePagesQueryOnlyHref(href) {
 	if (!HAS_PAGES_ROUTER) return href;
@@ -101,8 +116,35 @@ function resolveLinkPrefetchMode(prefetchProp, isDangerous) {
 	if (prefetchProp === true) return "full";
 	return "auto";
 }
+let validatedNavigationRuntime = null;
+let validatedNavigationRuntimeBootstrap = null;
+let validatedNavigationRuntimeFunctions = null;
+/**
+* `hasAppNavigationRuntime()` for Link, which asks on every render and every
+* prefetch. Full validation walks the whole navigation runtime, including every
+* inline RSC chunk still held by the bootstrap, so skip it while window still
+* holds the runtime that last passed it with the same bootstrap and function
+* table objects. Registering either replaces that object, and a replaced
+* runtime, bootstrap or table falls through to full validation. A table edited
+* in place keeps its identity, so the function table is still checked on every
+* call (it is cheap); chunks streamed into the held bootstrap are not
+* revalidated.
+*/
+function hasLinkAppNavigationRuntime() {
+	if (typeof window === "undefined") return false;
+	const runtime = validatedNavigationRuntime;
+	if (runtime !== null && Reflect.get(window, NAVIGATION_RUNTIME_KEY) === runtime && runtime.bootstrap === validatedNavigationRuntimeBootstrap && runtime.functions === validatedNavigationRuntimeFunctions) {
+		const functions = runtime.functions;
+		return isNavigationRuntimeFunctions(functions) && typeof functions.navigate === "function";
+	}
+	const validated = getNavigationRuntime();
+	validatedNavigationRuntime = validated;
+	validatedNavigationRuntimeBootstrap = validated?.bootstrap ?? null;
+	validatedNavigationRuntimeFunctions = validated?.functions ?? null;
+	return typeof validated?.functions.navigate === "function";
+}
 function getLinkPrefetchRouterMode() {
-	return hasAppNavigationRuntime() ? "app" : "pages";
+	return hasLinkAppNavigationRuntime() ? "app" : "pages";
 }
 /**
 * Prefetch a URL for faster navigation.
@@ -115,8 +157,11 @@ function getLinkPrefetchRouterMode() {
 * App Router and high-priority prefetches start immediately. Low-priority
 * Pages Router fallback prefetches use `requestIdleCallback` (or `setTimeout`
 * fallback) to avoid blocking the main thread during initial page load.
+*
+* `owner` is the visible Link behind a viewport prefetch; see
+* `OwnedLinkPrefetch`.
 */
-function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
+function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner) {
 	if (typeof window === "undefined") return;
 	const navigationEpoch = linkPrefetchNavigationEpoch;
 	const prefetchHref = getLinkPrefetchHref({
@@ -137,21 +182,17 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 	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 (hasLinkAppNavigationRuntime()) {
 				if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
-				const [navigation, { AppElementsWire }, rscCacheBusting, { resolveAppPrefetchRscRequest }, { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule, hybridRouteOwner, routeManifestLoaded] = await Promise.all([
+				const [navigation, [{ AppElementsWire }, rscCacheBusting, { resolveAppPrefetchRscRequest }, { APP_RSC_RENDER_MODE_PREFETCH_DYNAMIC_SHELL, APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule], hybridRouteOwner, routeManifestLoaded] = await Promise.all([
 					loadNavigationModule(),
-					import("../server/app-elements.js"),
-					import("../server/app-rsc-cache-busting.js"),
-					import("./internal/app-prefetch-rsc-request.js"),
-					import("../server/app-rsc-render-mode.js"),
-					import("../server/headers.js"),
+					loadAppPrefetchModules(),
 					HAS_PAGES_ROUTER || HAS_CLIENT_REWRITES ? loadHybridClientRouteOwnerModule() : null,
 					loadNavigationRuntimeRouteManifest()
 				]);
 				if (routeManifestLoaded === false) return;
 				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
-				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, createAppPrefetchRequestHeaders, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, hasFreshLearningOnlyPrefetchCacheEntry, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, prefetchRscResponse, prepareNavigationPrefetchSnapshot, DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL } = navigation;
+				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, createAppPrefetchRequestHeaders, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, hasFreshLearningOnlyPrefetchCacheEntry, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, prefetchRscResponse, prepareNavigationPrefetchSnapshot, promotePrefetchCacheEntryForNavigation, DYNAMIC_NAVIGATION_CACHE_TTL, 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;
@@ -160,16 +201,16 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				const prefetchPolicyHref = rewrittenPrefetchHref ?? prefetchHref;
 				const interceptionContext = getPrefetchInterceptionContext(fullHref);
 				const mountedSlotsHeader = getMountedSlotsHeader();
-				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(prefetchPolicyHref) : resolveFullAppRoutePrefetch();
+				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(prefetchPolicyHref, interceptionContext) : resolveFullAppRoutePrefetch();
 				if (!autoPrefetch.shouldPrefetch) return;
 				const isOptimisticRouteShellPrefetch = !autoPrefetch.cacheForNavigation;
 				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 hasSearchAgnosticShell = isAutomaticSearchParamShell && (autoPrefetch.rendersDynamically === true || hasSearchAgnosticPrefetchShellForRoute(await createRscRequestUrl(fullHref, new Headers()), interceptionContext, mountedSlotsHeader));
 				const headers = createAppPrefetchRequestHeaders({
 					interceptionContext,
 					fetchPriority: priority,
-					prefetchKind: mode === "full" ? "full" : "auto",
+					prefetchKind: mode === "full" || mode === "full-after-shell" ? "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);
@@ -190,9 +231,13 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
 				const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 				const prefetched = getPrefetchedUrls();
-				if (autoPrefetch.cacheForNavigation) discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext);
-				if (!autoPrefetch.cacheForNavigation && hasFreshLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext)) return;
-				const fetchFullRscPayload = () => scheduleAppPrefetchFetch((signal) => fetch(rscUrl, {
+				if (autoPrefetch.dynamicStaleTime !== "full-prefetch" && hasFreshLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext)) {
+					joinOwnedLinkPrefetch(getPrefetchCache().get(cacheKey)?.fetchPromise, owner);
+					return;
+				}
+				if (autoPrefetch.cacheForNavigation) discardLearningOnlyPrefetchCacheEntry(rscUrl, interceptionContext, mountedSlotsHeader);
+				const owned = createOwnedLinkPrefetch(owner);
+				const fetchFullRscPayload = () => scheduleOwnedLinkPrefetch(owned, (signal) => fetch(rscUrl, {
 					headers,
 					credentials: "include",
 					priority,
@@ -208,25 +253,30 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					shellHeaders.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
 					shellHeaders.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "1");
 					if (mountedSlotsHeader) shellHeaders.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
+					const ownerLeaveCount = owner?.leaveCount;
 					const shellRscUrl = await createRscRequestUrl(fullHref, shellHeaders);
+					if (owner && owner.leaveCount !== ownerLeaveCount) return;
 					const shellCacheKey = AppElementsWire.encodeCacheKey(shellRscUrl, interceptionContext);
 					const shellCache = getPrefetchCache();
 					let shellEntry = shellCache.get(shellCacheKey);
 					if (shellEntry === void 0) {
 						getPrefetchedUrls().add(shellCacheKey);
-						prefetchRscResponse(shellRscUrl, scheduleAppPrefetchFetch((signal) => fetch(shellRscUrl, {
+						const shellOwned = createOwnedLinkPrefetch(owner);
+						const shellFetchPromise = scheduleOwnedLinkPrefetch(shellOwned, (signal) => fetch(shellRscUrl, {
 							headers: shellHeaders,
 							credentials: "include",
 							priority,
 							signal,
 							purpose: "prefetch"
-						}), priority), interceptionContext, mountedSlotsHeader, void 0, {
+						}), priority);
+						trackOwnedLinkPrefetch(shellOwned, shellFetchPromise);
+						prefetchRscResponse(shellRscUrl, shellFetchPromise, interceptionContext, mountedSlotsHeader, void 0, {
 							cacheForNavigation: false,
 							optimisticRouteShell: true,
 							prefetchKind: "loading-shell"
 						});
 						shellEntry = shellCache.get(shellCacheKey);
-					}
+					} else joinOwnedLinkPrefetch(shellEntry.fetchPromise, owner);
 					await shellEntry?.pending?.catch(() => {});
 				};
 				const fetchAliasCacheHitProbe = async () => {
@@ -238,7 +288,9 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					probeHeaders.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
 					probeHeaders.set(NEXT_ROUTER_SEGMENT_PREFETCH_HEADER, "1");
 					if (mountedSlotsHeader) probeHeaders.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
+					const ownerLeaveCount = owner?.leaveCount;
 					const probeRscUrl = await createRscRequestUrl(fullHref, probeHeaders);
+					if (owner && owner.leaveCount !== ownerLeaveCount) throw new DOMException("Prefetch is no longer wanted", "AbortError");
 					return fetch(probeRscUrl, {
 						method: "HEAD",
 						headers: probeHeaders,
@@ -247,8 +299,15 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 						purpose: "prefetch"
 					});
 				};
-				const hasExactNavigationCacheEntry = autoPrefetch.cacheForNavigation && hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader);
-				if (hasExactNavigationCacheEntry || autoPrefetch.cacheForNavigation && hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader, { additionalRscUrls })) {
+				const onReuse = (entry, matchedCacheKey) => {
+					joinOwnedLinkPrefetch(entry.fetchPromise, owner);
+					if (autoPrefetch.dynamicStaleTime === "full-prefetch") promotePrefetchCacheEntryForNavigation(matchedCacheKey, entry);
+				};
+				const hasExactNavigationCacheEntry = autoPrefetch.cacheForNavigation && hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader, { onReuse });
+				if (hasExactNavigationCacheEntry || autoPrefetch.cacheForNavigation && hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader, {
+					additionalRscUrls,
+					onReuse
+				})) {
 					if (!hasExactNavigationCacheEntry && !prefetched.has(cacheKey) && additionalRscUrls.length > 0 && autoPrefetch.prefetchShellFirst && mountedSlotsHeader === null) {
 						prefetched.add(cacheKey);
 						fetchAliasCacheHitProbe().then((response) => response.arrayBuffer()).catch(() => {});
@@ -266,7 +325,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 					}
 					return fetchRouteTreeGatedPrefetch({
 						fetchFullRscPayload,
-						fetchRouteTree: (routeTreeRscUrl, routeTreeHeaders) => scheduleAppPrefetchFetch((signal) => fetch(routeTreeRscUrl, {
+						fetchRouteTree: (routeTreeRscUrl, routeTreeHeaders) => scheduleOwnedLinkPrefetch(owned, (signal) => fetch(routeTreeRscUrl, {
 							headers: routeTreeHeaders,
 							credentials: "include",
 							priority,
@@ -279,6 +338,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 						mountedSlotsHeader
 					});
 				})() : fetchFullRscPayload();
+				trackOwnedLinkPrefetch(owned, fetchPromise);
 				if (!__prefetchInlining && mode === "full" && autoPrefetch.cacheForNavigation && autoPrefetch.prefetchShellFirst && mountedSlotsHeader === null && !gateViaExplicitSearchShell) fetchLoadingShellForReuse();
 				prefetchRscResponse(rscUrl, fetchPromise, interceptionContext, mountedSlotsHeader, void 0, {
 					cacheForNavigation: autoPrefetch.cacheForNavigation,
@@ -310,7 +370,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 			console.error("[vinext] RSC prefetch setup error:", error);
 		});
 	};
-	if (priority === "high" || hasAppNavigationRuntime()) {
+	if (priority === "high" || hasLinkAppNavigationRuntime()) {
 		runPrefetch();
 		return;
 	}
@@ -318,18 +378,24 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale) {
 }
 async function promotePrefetchEntriesForNavigation(href) {
 	if (typeof window === "undefined") return;
-	if (!hasAppNavigationRuntime()) return;
-	const [{ getPrefetchCache }, { parseRscRequestPath, stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([loadNavigationModule(), import("../server/app-rsc-cache-busting.js")]);
+	if (!hasLinkAppNavigationRuntime()) return;
+	const [{ getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, promotePrefetchCacheEntryForNavigation }, { parseRscRequestPath, stripRscCacheBustingSearchParam, stripRscSuffix }] = await Promise.all([loadNavigationModule(), loadAppRscCacheBustingModule()]);
 	let target;
+	const fullHref = toCanonicalBrowserNavigationHref(href, window.location.href, __basePath, __trailingSlash);
 	try {
-		target = new URL(toCanonicalBrowserNavigationHref(href, window.location.href, __basePath, __trailingSlash), window.location.href);
+		target = new URL(fullHref, window.location.href);
 	} catch {
 		return;
 	}
+	const interceptionContext = getPrefetchInterceptionContext(fullHref);
+	const mountedSlotsHeader = getMountedSlotsHeader();
 	for (const [cacheKey, entry] of getPrefetchCache()) {
 		if (entry.optimisticRouteShell === true) continue;
 		if (entry.prefetchKind === "route-tree") continue;
-		const [rscUrl] = cacheKey.split("\0", 1);
+		if ((entry.mountedSlotsHeader ?? null) !== mountedSlotsHeader) continue;
+		const separatorIndex = cacheKey.indexOf("\0");
+		const rscUrl = separatorIndex === -1 ? cacheKey : cacheKey.slice(0, separatorIndex);
+		if ((separatorIndex === -1 ? null : cacheKey.slice(separatorIndex + 1)) !== interceptionContext) continue;
 		let cached;
 		try {
 			cached = parseRscRequestPath(rscUrl);
@@ -337,7 +403,7 @@ async function promotePrefetchEntriesForNavigation(href) {
 			continue;
 		}
 		stripRscCacheBustingSearchParam(cached);
-		if (stripRscSuffix(cached.pathname) === target.pathname && cached.search === target.search) entry.cacheForNavigation = true;
+		if (stripRscSuffix(cached.pathname) === target.pathname && cached.search === target.search) promotePrefetchCacheEntryForNavigation(cacheKey, entry);
 	}
 }
 /**
@@ -349,6 +415,66 @@ const observedLinkPrefetches = /* @__PURE__ */ new WeakMap();
 const visibleLinkPrefetches = /* @__PURE__ */ new Set();
 const visibleAppPrefetchQueue = [];
 let visibleAppPrefetchDrainScheduled = false;
+const ownedLinkPrefetches = /* @__PURE__ */ new WeakMap();
+function createOwnedLinkPrefetch(owner) {
+	if (owner === void 0) return void 0;
+	return {
+		owners: /* @__PURE__ */ new Set([owner]),
+		requests: []
+	};
+}
+function hasVisibleOwner(owned) {
+	for (const owner of owned.owners) if (owner.isVisible) return true;
+	return false;
+}
+function isOwnedLinkPrefetchWanted(owned) {
+	if (owned.droppedAt !== void 0) return isAppPrefetchFetchClaimed(owned.claimable, owned.droppedAt);
+	return isAppPrefetchFetchClaimed(owned.claimable) || hasVisibleOwner(owned);
+}
+function scheduleOwnedLinkPrefetch(owned, fetcher, priority) {
+	if (owned && !isOwnedLinkPrefetchWanted(owned)) return Promise.reject(new DOMException("Prefetch is no longer wanted", "AbortError"));
+	const request = scheduleAppPrefetchFetch(fetcher, priority, owned && (() => isOwnedLinkPrefetchWanted(owned)));
+	owned?.requests.push(request);
+	return request;
+}
+/**
+* Registers the promise cached for `owned`, which reusing Links join. Owners
+* are registered here, not in `createOwnedLinkPrefetch`, since a cache hit
+* returns before sending anything.
+*/
+function trackOwnedLinkPrefetch(owned, fetchPromise) {
+	if (owned === void 0) return;
+	for (const owner of owned.owners) owner.ownedPrefetches.add(owned);
+	owned.claimable = fetchPromise;
+	ownedLinkPrefetches.set(fetchPromise, owned);
+	const settle = (failed) => {
+		ownedLinkPrefetches.delete(fetchPromise);
+		for (const owner of owned.owners) {
+			owner.ownedPrefetches.delete(owned);
+			if (failed && owned.droppedAt !== void 0 && owner.isVisible) scheduleVisibleAppPrefetch(owner);
+		}
+		owned.owners.clear();
+	};
+	fetchPromise.then(() => settle(false), () => settle(true));
+}
+function joinOwnedLinkPrefetch(fetchPromise, owner) {
+	const owned = fetchPromise && ownedLinkPrefetches.get(fetchPromise);
+	if (!owned || owner === void 0) return;
+	owned.owners.add(owner);
+	owner.ownedPrefetches.add(owned);
+}
+/** Called when a Link leaves the viewport or unmounts. */
+function releaseOwnedLinkPrefetches(instance) {
+	instance.leaveCount += 1;
+	for (const owned of instance.ownedPrefetches) {
+		owned.owners.delete(instance);
+		if (owned.droppedAt !== void 0 || hasVisibleOwner(owned)) continue;
+		owned.droppedAt = getAppPrefetchFetchClaimSequence();
+		if (isAppPrefetchFetchClaimed(owned.claimable)) continue;
+		for (const request of owned.requests) cancelQueuedAppPrefetchFetch(request);
+	}
+	instance.ownedPrefetches.clear();
+}
 function drainVisibleAppPrefetchQueue() {
 	visibleAppPrefetchDrainScheduled = false;
 	while (true) {
@@ -356,7 +482,7 @@ function drainVisibleAppPrefetchQueue() {
 		if (!instance) return;
 		instance.queuedViewportPrefetch = false;
 		if (!instance.isVisible || instance.routerMode !== "app") continue;
-		prefetchUrl(instance.href, instance.mode, "low", instance.pagesRouteHref);
+		prefetchUrl(instance.href, instance.mode, "low", instance.pagesRouteHref, void 0, instance);
 	}
 }
 function scheduleVisibleAppPrefetch(instance) {
@@ -375,11 +501,17 @@ function setVisibleLinkPrefetch(instance, isVisible) {
 		if (instance.routerMode === "app") scheduleVisibleAppPrefetch(instance);
 		else prefetchUrl(instance.href, instance.mode, "low", instance.pagesRouteHref, instance.locale);
 		instance.viewportPrefetched = true;
-	} else visibleLinkPrefetches.delete(instance);
+	} else {
+		visibleLinkPrefetches.delete(instance);
+		releaseOwnedLinkPrefetches(instance);
+	}
 }
+let visibleLinkPingRuntime = null;
 function registerVisibleLinkPing() {
 	if (typeof window === "undefined") return;
-	registerNavigationRuntimeFunctions({ pingVisibleLinks: pingVisibleLinkPrefetches });
+	const functions = visibleLinkPingRuntime?.functions;
+	if (visibleLinkPingRuntime !== null && Reflect.get(window, NAVIGATION_RUNTIME_KEY) === visibleLinkPingRuntime && typeof functions === "object" && functions !== null && Reflect.get(functions, "pingVisibleLinks") === pingVisibleLinkPrefetches) return;
+	visibleLinkPingRuntime = registerNavigationRuntimeFunctions({ pingVisibleLinks: pingVisibleLinkPrefetches });
 }
 function pingVisibleLinkPrefetches() {
 	for (const instance of visibleLinkPrefetches) if (instance.isVisible && instance.routerMode === "app") scheduleVisibleAppPrefetch(instance);
@@ -401,11 +533,14 @@ function getDefaultLocale() {
 	return getI18nContext()?.defaultLocale;
 }
 function getCurrentLocale() {
-	if (typeof window !== "undefined") return getCurrentBrowserLocale({
-		basePath: __basePath,
-		domainLocales: getDomainLocales(),
-		hostname: getCurrentHostname()
-	});
+	if (typeof window !== "undefined") {
+		const domainLocales = getDomainLocales();
+		return getCurrentBrowserLocale({
+			basePath: __basePath,
+			domainLocales,
+			hostname: domainLocales?.length ? getCurrentHostname() : void 0
+		});
+	}
 	return getI18nContext()?.locale;
 }
 function getDomainLocales() {
@@ -459,19 +594,17 @@ function resolveConcreteRouteHref(href, as) {
 	if (typeof as !== "string") return null;
 	return interpolateDynamicRouteHref(href, as)?.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 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, locale, ...anchorProps }, forwardedRef) {
 	const pagesRouter = useContext(RouterContext);
-	const routePathnameForWarning = getCurrentRoutePathnameForWarning();
-	const hrefStr = resolvePagesLinkValue(href, pagesRouter, routePathnameForWarning);
-	const asHref = as === void 0 ? void 0 : resolvePagesLinkValue(as, pagesRouter, routePathnameForWarning);
-	const { locale, ...restWithoutLocale } = rest;
+	const hrefStr = resolvePagesLinkValue(href, pagesRouter);
+	const asHref = as === void 0 ? void 0 : resolvePagesLinkValue(as, pagesRouter);
 	let children = childrenProp;
 	if (legacyBehavior && (typeof childrenProp === "string" || typeof childrenProp === "number")) children = React.createElement("a", null, childrenProp);
 	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 pagesAsHref = asHref ?? implicitDynamicRouteHref?.as;
 	const unresolvedHref = pagesAsHref ?? hrefStr;
-	const resolvedHref = unresolvedHref.startsWith("#") && !getNavigationRuntime()?.functions.navigate ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
+	const resolvedHref = unresolvedHref.startsWith("#") && !hasLinkAppNavigationRuntime() ? resolvePagesQueryOnlyHref(unresolvedHref) : unresolvedHref;
 	const concreteRouteHref = HAS_PAGES_ROUTER ? resolveConcreteRouteHref(hrefForImplicitInterpolation ?? hrefStr, pagesAsHref) : null;
 	const routeHrefRaw = hrefStr;
 	const prefetchRouteHrefRaw = concreteRouteHref ?? routeHrefRaw;
@@ -483,6 +616,14 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	const normalizedHref = normalizePathTrailingSlash(localizedHref, __trailingSlash);
 	const normalizedRouteHref = hasPagesHrefAsPair ? normalizePathTrailingSlash(applyLocaleToHref(isRouteDangerous ? "/" : prefetchRouteHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
+	if (isServer && !legacyBehavior && !isDangerous) return /* @__PURE__ */ jsx(LinkStatusContext.Provider, {
+		value: { pending: false },
+		children: /* @__PURE__ */ jsx("a", {
+			href: fullHref,
+			...anchorProps,
+			children
+		})
+	});
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
 	const pendingPagesIntentPrefetchRef = useRef(null);
@@ -514,15 +655,15 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		if (typeof forwardedRef === "function") forwardedRef(node);
 		else if (forwardedRef) forwardedRef.current = node;
 	}, [forwardedRef]);
-	useEffect(() => {
+	useLayoutEffect(() => {
 		if (!shouldViewportPrefetch || typeof window === "undefined") return;
 		const node = internalRef.current;
 		if (!node) return;
-		const hrefToPrefetch = getLinkPrefetchHref({
+		const hrefToPrefetch = isAbsoluteOrProtocolRelativeUrl(normalizedHref) ? getLinkPrefetchHref({
 			href: normalizedHref,
 			basePath: __basePath,
 			currentOrigin: window.location.origin
-		});
+		}) : normalizedHref;
 		if (hrefToPrefetch == null) return;
 		const observer = getSharedObserver();
 		if (!observer) return;
@@ -532,6 +673,8 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			isVisible: false,
 			locale,
 			mode: prefetchMode,
+			ownedPrefetches: /* @__PURE__ */ new Set(),
+			leaveCount: 0,
 			pagesRouteHref: normalizedRouteHref === normalizedHref ? void 0 : getLinkPrefetchHref({
 				href: normalizedRouteHref,
 				basePath: __basePath,
@@ -548,6 +691,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			observedLinkPrefetches.delete(node);
 			visibleLinkPrefetches.delete(instance);
 			instance.isVisible = false;
+			releaseOwnedLinkPrefetches(instance);
 		};
 	}, [
 		shouldViewportPrefetch,
@@ -623,7 +767,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			navigateHref = localPath;
 		}
 		e.preventDefault();
-		const hasAppNavigationRuntime = Boolean(getNavigationRuntime()?.functions.navigate);
+		const hasAppNavigationRuntime = hasLinkAppNavigationRuntime();
 		const pagesNavigateHref = HAS_PAGES_ROUTER && resolvedHref.startsWith("?") ? resolvePagesLinkNavigationHref(resolvedHref, locale) : navigateHref;
 		const pagesAsForLink = hasPagesHrefAsPair ? pagesNavigateHref : void 0;
 		const pagesHrefForLink = pagesAsForLink === void 0 ? pagesNavigateHref : routeHrefRaw;
@@ -681,7 +825,6 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		} else if (replace) window.location.replace(absoluteFullHref);
 		else window.location.assign(absoluteFullHref);
 	};
-	const anchorProps = restWithoutLocale;
 	const linkStatusValue = React.useMemo(() => ({ pending }), [pending]);
 	if (isDangerous) {
 		if (process.env.NODE_ENV !== "production") console.warn(`<Link> blocked dangerous href: ${resolvedHref}`);

package/dist/shims/metadata.d.ts

@@ -24,7 +24,7 @@ export declare function ViewportHead({ viewport }: {
 export type Metadata = {
   title?: string | {
     default?: string;
-    template?: string;
+    template?: string | null;
     absolute?: string;
   };
   description?: string;
@@ -57,15 +57,13 @@ export type Metadata = {
     url?: string | URL;
     siteName?: string;
     images?: string | URL | SocialImageDescriptor | Array<string | URL | SocialImageDescriptor>;
-    videos?: Array<{
-      url: string | URL;
-      width?: number;
-      height?: number;
-    }>;
-    audio?: Array<{
-      url: string | URL;
-    }>;
+    videos?: OGVideo | OGVideo[];
+    audio?: OGAudio | OGAudio[];
+    emails?: string | string[];
+    phoneNumbers?: string | string[];
+    faxNumbers?: string | string[];
     locale?: string;
+    alternateLocale?: string | string[];
     type?: string;
     publishedTime?: string;
     modifiedTime?: string;
@@ -169,6 +167,20 @@ type TwitterAppDescriptor = {
   };
   name?: string;
 };
+type OGVideoDescriptor = {
+  url: string | URL;
+  secureUrl?: string | URL;
+  type?: string;
+  width?: string | number;
+  height?: string | number;
+};
+type OGVideo = string | URL | OGVideoDescriptor;
+type OGAudioDescriptor = {
+  url: string | URL;
+  secureUrl?: string | URL;
+  type?: string;
+};
+type OGAudio = string | URL | OGAudioDescriptor;
 type SocialImageDescriptor = {
   url: string | URL;
   alt?: string;
@@ -194,7 +206,6 @@ type IconsMap = {
 };
 type IconsMetadata = IconInput | IconInput[] | IconsMap;
 export type MetadataMergeEntry = {
-  contributesTitle?: boolean;
   isPage?: boolean;
   metadata: Metadata;
 };
@@ -236,6 +247,15 @@ export declare function postProcessMetadata(merged: Metadata): Metadata;
  * tags are the exception: Next.js merges those across segments.
  */
 export declare function mergeMetadataEntries(entries: readonly MetadataMergeEntry[]): Metadata;
+/**
+ * Merge metadata into the `parent` a later segment's resolver receives. Like
+ * {@link mergeMetadataEntries}, except the title stays resolved as Next.js's
+ * `{ absolute, template }`, so `(await parent).title?.absolute` reads the
+ * title so far. `template` is the one the next title gets, so merging this
+ * parent with later entries resolves their titles as the full merge does.
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/metadata/resolvers/resolve-title.ts
+ */
+export declare function mergeParentMetadataEntries(entries: readonly MetadataMergeEntry[]): Metadata;
 /**
  * Resolve metadata from a module. Handles both static `metadata` export
  * and async `generateMetadata()` function.
@@ -258,4 +278,5 @@ export declare function renderMetadataToHtml(metadata: Metadata, pathname?: stri
   streamedIconKey?: string;
 }): string;
 export declare function MetadataHead({ metadata, pathname, trailingSlash, streamedIconKey }: MetadataHeadProps): React.JSX.Element;
-//#endregion
+//#endregion
+export {};