vinext 0.1.8 → 0.2.0

package/dist/shims/internal/pages-data-target.js

@@ -1,8 +1,9 @@
-import { stripBasePath } from "../../utils/base-path.js";
+import { removeTrailingSlash, stripBasePath } from "../../utils/base-path.js";
+import { isUnknownRecord } from "../../utils/record.js";
 import { getLocalePathPrefix } from "../../utils/domain-locale.js";
 import { buildPagesDataHref, matchPagesPattern } from "./pages-data-url.js";
 import { NEXT_DEPLOYMENT_ID_HEADER, getDeploymentId } from "../../utils/deployment-id.js";
-import { dedupedPagesDataFetch } from "./pages-data-fetch-dedup.js";
+import { fetchCachedPagesData, fetchStaticPagesData } from "./pages-data-fetch-dedup.js";
 //#region src/shims/internal/pages-data-target.ts
 /**
 * Shared decision helper for the Pages Router `/_next/data/<id>/<page>.json`
@@ -13,6 +14,75 @@ import { dedupedPagesDataFetch } from "./pages-data-fetch-dedup.js";
 * module init time — link.tsx and router.ts must remain free of circular
 * imports and SSR-side router-init side effects.
 */
+function hasVinextMiddleware(nextData) {
+	if (!isUnknownRecord(nextData)) return false;
+	const vinext = nextData.__vinext;
+	return isUnknownRecord(vinext) && vinext.hasMiddleware === true;
+}
+function isClientMiddlewareMatcherObject(value) {
+	if (!isUnknownRecord(value)) return false;
+	if (typeof value.source !== "string") return false;
+	if (value.locale !== void 0 && value.locale !== false) return false;
+	if (value.has !== void 0 && !Array.isArray(value.has)) return false;
+	if (value.missing !== void 0 && !Array.isArray(value.missing)) return false;
+	return true;
+}
+function stripLocaleForMiddlewareMatcher(pathname) {
+	const locales = window.__VINEXT_LOCALES__;
+	if (!locales || locales.length === 0 || pathname === "/") return pathname;
+	const firstSegment = pathname.split("/")[1];
+	if (!firstSegment || !locales.includes(firstSegment)) return pathname;
+	return "/" + pathname.split("/").slice(2).join("/");
+}
+function clientMiddlewareSourceMatches(pathname, source) {
+	if (!/[\\():*+?]/.test(source)) return removeTrailingSlash(pathname) === removeTrailingSlash(source);
+	if (source.includes("(") || source.includes("\\")) return true;
+	const sourceParts = source.split("/").filter(Boolean);
+	const pathParts = pathname.split("/").filter(Boolean);
+	let pathIndex = 0;
+	for (const sourcePart of sourceParts) {
+		if (sourcePart.startsWith(":")) {
+			if (sourcePart.endsWith("*")) return true;
+			if (sourcePart.endsWith("+")) return pathIndex < pathParts.length;
+			if (pathIndex >= pathParts.length) return false;
+			pathIndex++;
+			continue;
+		}
+		if (pathParts[pathIndex] !== sourcePart) return false;
+		pathIndex++;
+	}
+	return pathIndex === pathParts.length;
+}
+function clientMiddlewareMatcherMatches(pathname, matcher) {
+	if (matcher === void 0) return true;
+	if (typeof matcher === "string") return clientMiddlewareSourceMatches(stripLocaleForMiddlewareMatcher(pathname), matcher);
+	if (!Array.isArray(matcher)) return true;
+	for (const item of matcher) {
+		if (typeof item === "string") {
+			if (clientMiddlewareSourceMatches(stripLocaleForMiddlewareMatcher(pathname), item)) return true;
+			continue;
+		}
+		if (!isClientMiddlewareMatcherObject(item)) return true;
+		if (clientMiddlewareSourceMatches(item.locale === false ? pathname : stripLocaleForMiddlewareMatcher(pathname), item.source)) return true;
+	}
+	return false;
+}
+function getPagesMiddlewareDataHref(browserUrl, basePath) {
+	const nextData = window.__NEXT_DATA__;
+	if (!nextData || !hasVinextMiddleware(nextData)) return null;
+	const buildId = nextData.buildId;
+	if (typeof buildId !== "string" || buildId.length === 0) return null;
+	let parsed;
+	try {
+		parsed = new URL(browserUrl, window.location.href);
+	} catch {
+		return null;
+	}
+	if (parsed.origin !== window.location.origin) return null;
+	const pathname = stripBasePath(parsed.pathname, basePath);
+	if (!clientMiddlewareMatcherMatches(pathname, window.__VINEXT_MIDDLEWARE_MATCHER__)) return null;
+	return buildPagesDataHref(basePath, buildId, pathname, parsed.search);
+}
 /**
 * Decide whether the JSON data-endpoint navigation path is usable for this
 * browser URL. We require:
@@ -56,11 +126,16 @@ function resolvePagesDataNavigationTarget(browserUrl, basePath) {
 	if (!match) return null;
 	const loader = loaders[match.pattern];
 	if (!loader) return null;
+	const ssgPatterns = window.__VINEXT_PAGES_SSG_PATTERNS__;
+	const sspPatterns = window.__VINEXT_PAGES_SSP_PATTERNS__;
+	const dataKind = ssgPatterns?.includes(match.pattern) ? "static" : sspPatterns?.includes(match.pattern) ? "server" : ssgPatterns === void 0 || sspPatterns === void 0 ? "server" : "none";
 	return {
 		dataHref: buildPagesDataHref(basePath, buildId, pagePath, parsed.search),
 		pattern: match.pattern,
 		params: match.params,
 		loader,
+		dataKind,
+		middlewareDataHref: getPagesMiddlewareDataHref(browserUrl, basePath) ?? void 0,
 		buildId,
 		pagePath,
 		search: parsed.search,
@@ -68,14 +143,12 @@ function resolvePagesDataNavigationTarget(browserUrl, basePath) {
 	};
 }
 /**
-* Prefetch the data JSON and kick off the code-split loader so the chunk is
-* warm by the time the user clicks.
+* Kick off the code-split loader and, for SSG pages, prefetch the data JSON so
+* the chunk and payload are warm by the time the user clicks.
 *
-* Used by both `Router.prefetch()` and `<Link>` hover/viewport prefetch. The
-* JSON request uses `fetch()` rather than `<link rel="prefetch">` so it can
-* carry Next.js's `x-deployment-id` skew-protection header. The in-flight
-* request is shared with a racing navigation; after it settles, the browser's
-* normal HTTP cache remains responsible for reuse.
+* Used by both `Router.prefetch()` and `<Link>` hover/viewport prefetch.
+* Matches Next.js Pages Router prefetch: non-SSG routes only warm the page
+* chunk, while `getStaticProps` routes also fetch `/_next/data`.
 *
 * loader's returned Promise is intentionally discarded — `import()` caches the
 * result, so a subsequent navigation re-invocation hits the cache without
@@ -84,15 +157,21 @@ function resolvePagesDataNavigationTarget(browserUrl, basePath) {
 */
 function prefetchPagesData(target) {
 	if (typeof document === "undefined") return;
+	target.loader().catch(() => {});
+	if (target.dataKind !== "static" && !target.middlewareDataHref) return;
 	const headers = {
 		Accept: "application/json",
 		purpose: "prefetch",
 		"x-nextjs-data": "1"
 	};
+	if (target.middlewareDataHref) headers["x-middleware-prefetch"] = "1";
 	const deploymentId = getDeploymentId();
 	if (deploymentId) headers[NEXT_DEPLOYMENT_ID_HEADER] = deploymentId;
-	dedupedPagesDataFetch(target.dataHref, { headers }).catch(() => {});
-	target.loader().catch(() => {});
+	if (target.dataKind === "static") {
+		fetchStaticPagesData(target.middlewareDataHref ?? target.dataHref, { headers }).catch(() => {});
+		return;
+	}
+	if (target.middlewareDataHref) fetchCachedPagesData(target.middlewareDataHref, { headers }).catch(() => {});
 }
 //#endregion
-export { prefetchPagesData, resolvePagesDataNavigationTarget };
+export { getPagesMiddlewareDataHref, prefetchPagesData, resolvePagesDataNavigationTarget };

package/dist/shims/internal/pages-router-components.d.ts

@@ -0,0 +1,7 @@
+//#region src/shims/internal/pages-router-components.d.ts
+type PagesRouterComponentsMap = Record<string, {
+  __appRouter: true;
+} | Record<string, unknown>>;
+declare function getPagesRouterComponentsMap(): PagesRouterComponentsMap;
+//#endregion
+export { PagesRouterComponentsMap, getPagesRouterComponentsMap };

package/dist/shims/internal/pages-router-components.js

@@ -0,0 +1,13 @@
+//#region src/shims/internal/pages-router-components.ts
+const COMPONENTS_KEY = Symbol.for("vinext.pagesRouter.components");
+function getPagesRouterComponentsMap() {
+	const globalState = globalThis;
+	let components = globalState[COMPONENTS_KEY];
+	if (!components) {
+		components = {};
+		globalState[COMPONENTS_KEY] = components;
+	}
+	return components;
+}
+//#endregion
+export { getPagesRouterComponentsMap };

package/dist/shims/layout-segment-context.d.ts

@@ -2,6 +2,7 @@ import { SegmentMap } from "./navigation-context-state.js";
 import { ReactNode } from "react";
 
 //#region src/shims/layout-segment-context.d.ts
+declare function mergeLayoutSegmentMap(previous: SegmentMap | null, next: SegmentMap): SegmentMap;
 /**
  * Wraps children with the layout segment context.
  *
@@ -14,11 +15,13 @@ import { ReactNode } from "react";
  * to read the segments for a specific parallel route.
  */
 declare function LayoutSegmentProvider({
+  providerId,
   segmentMap,
   children
 }: {
+  providerId?: string;
   segmentMap: SegmentMap;
   children: ReactNode;
 }): string | number | bigint | boolean | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | Promise<string | number | bigint | boolean | import("react").ReactPortal | import("react").ReactElement<unknown, string | import("react").JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | import("react").FunctionComponentElement<import("react").ProviderProps<SegmentMap>> | null | undefined;
 //#endregion
-export { LayoutSegmentProvider };
+export { LayoutSegmentProvider, mergeLayoutSegmentMap };

package/dist/shims/layout-segment-context.js

@@ -1,7 +1,7 @@
 "use client";
 import { getLayoutSegmentContext } from "./navigation-context-state.js";
 import "./navigation-server.js";
-import { createElement } from "react";
+import { createElement, useEffect, useRef } from "react";
 //#region src/shims/layout-segment-context.tsx
 /**
 * Layout segment context provider.
@@ -19,6 +19,14 @@ import { createElement } from "react";
 * The context is shared with navigation.ts via getLayoutSegmentContext()
 * to avoid creating separate contexts in different modules.
 */
+const committedSegmentMapsByProviderId = /* @__PURE__ */ new Map();
+function mergeLayoutSegmentMap(previous, next) {
+	if (!previous) return next;
+	return {
+		...previous,
+		...next
+	};
+}
 /**
 * Wraps children with the layout segment context.
 *
@@ -30,10 +38,16 @@ import { createElement } from "react";
 * Components inside the provider call useSelectedLayoutSegments(parallelRoutesKey)
 * to read the segments for a specific parallel route.
 */
-function LayoutSegmentProvider({ segmentMap, children }) {
+function LayoutSegmentProvider({ providerId, segmentMap, children }) {
+	const previousSegmentMap = useRef(null);
 	const ctx = getLayoutSegmentContext();
+	const mergedSegmentMap = mergeLayoutSegmentMap(previousSegmentMap.current ?? (providerId ? committedSegmentMapsByProviderId.get(providerId) ?? null : null), segmentMap);
+	useEffect(() => {
+		previousSegmentMap.current = mergedSegmentMap;
+		if (providerId) committedSegmentMapsByProviderId.set(providerId, mergedSegmentMap);
+	}, [mergedSegmentMap, providerId]);
 	if (!ctx) return children;
-	return createElement(ctx.Provider, { value: segmentMap }, children);
+	return createElement(ctx.Provider, { value: mergedSegmentMap }, children);
 }
 //#endregion
-export { LayoutSegmentProvider };
+export { LayoutSegmentProvider, mergeLayoutSegmentMap };

package/dist/shims/link.js

@@ -1,24 +1,18 @@
 "use client";
 import { stripBasePath } from "../utils/base-path.js";
 import { createRouteTrieCache, matchRouteWithTrie } from "../routing/route-matching.js";
-import { VINEXT_MOUNTED_SLOTS_HEADER } from "../server/headers.js";
 import { isDangerousScheme, reportBlockedDangerousNavigation } from "./url-safety.js";
-import { AppElementsWire } from "../server/app-elements-wire.js";
-import { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL } from "../server/app-rsc-render-mode.js";
-import "../server/app-elements.js";
 import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
-import { prefetchPagesData, resolvePagesDataNavigationTarget } from "./internal/pages-data-target.js";
-import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.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 { getCurrentBrowserLocale } from "./client-locale.js";
 import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
-import { createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
+import { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { navigatePagesRouterLinkWithFallback, resolvePagesRouterQueryOnlyHref } from "../client/pages-router-link-navigation.js";
-import { getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
 import { getI18nContext } from "./i18n-context.js";
 import { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchHref } from "./link-prefetch.js";
 import { clearLinkForCurrentNavigation, notifyLinkNavigationStart, setLinkForCurrentNavigation } from "./internal/link-status-registry.js";
@@ -190,12 +184,13 @@ function resolveAutoAppRoutePrefetch(href) {
 *
 * For App Router (RSC): fetches the .rsc payload in the background and
 * stores it in an in-memory cache for instant use during navigation.
-* For Pages Router: injects a <link rel="prefetch"> for the page module.
+* For Pages Router: warms the page chunk, prefetches data only for SSG pages,
+* and falls back to a document prefetch hint when no page loader matches.
 *
 * Uses `requestIdleCallback` (or `setTimeout` fallback) to avoid blocking
 * the main thread during initial page load.
 */
-function prefetchUrl(href, mode, priority = "low") {
+function prefetchUrl(href, mode, priority = "low", pagesRouteHref) {
 	if (typeof window === "undefined") return;
 	const prefetchHref = getLinkPrefetchHref({
 		href,
@@ -204,6 +199,11 @@ function prefetchUrl(href, mode, priority = "low") {
 	});
 	if (prefetchHref == null) return;
 	const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
+	const fullRouteHref = toBrowserNavigationHref(pagesRouteHref === void 0 ? prefetchHref : getLinkPrefetchHref({
+		href: pagesRouteHref,
+		basePath: __basePath,
+		currentOrigin: window.location.origin
+	}) ?? 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;
 	(priority === "high" ? (fn) => {
@@ -211,6 +211,18 @@ function prefetchUrl(href, mode, priority = "low") {
 	} : window.requestIdleCallback ?? ((fn) => setTimeout(fn, 100)))(() => {
 		(async () => {
 			if (hasAppNavigationRuntime()) {
+				if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
+				const [navigation, { AppElementsWire }, rscCacheBusting, { APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL }, headersModule, { resolveHybridClientRouteOwner }] = await Promise.all([
+					import("./navigation.js"),
+					import("../server/app-elements.js"),
+					import("../server/app-rsc-cache-busting.js"),
+					import("../server/app-rsc-render-mode.js"),
+					import("../server/headers.js"),
+					import("./internal/hybrid-client-route-owner.js")
+				]);
+				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, hasPrefetchCacheEntryForNavigation, prefetchRscResponse, PREFETCH_CACHE_TTL } = navigation;
+				const { createRscRequestHeaders, createRscRequestUrl } = rscCacheBusting;
+				const { NEXT_ROUTER_PREFETCH_HEADER, VINEXT_MOUNTED_SLOTS_HEADER } = headersModule;
 				const hybridOwner = resolveHybridClientRouteOwner(prefetchHref, __basePath);
 				if (hybridOwner === "pages" || hybridOwner === "document") return;
 				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(prefetchHref) : {
@@ -228,6 +240,7 @@ function prefetchUrl(href, mode, priority = "low") {
 					renderMode: isOptimisticRouteShellPrefetch ? APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL : void 0
 				});
 				if (mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
+				if (isOptimisticRouteShellPrefetch) headers.set(NEXT_ROUTER_PREFETCH_HEADER, "1");
 				const rscUrl = await createRscRequestUrl(fullHref, headers);
 				const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 				const prefetched = getPrefetchedUrls();
@@ -266,13 +279,19 @@ function prefetchUrl(href, mode, priority = "low") {
 					purpose: "prefetch"
 				}), interceptionContext, mountedSlotsHeader, void 0, {
 					cacheForNavigation: autoPrefetch.cacheForNavigation,
+					fallbackTtlMs: PREFETCH_CACHE_TTL,
 					optimisticRouteShell: isOptimisticRouteShellPrefetch
 				});
 			} else if (HAS_PAGES_ROUTER && window.__NEXT_DATA__) {
-				const dataTarget = resolvePagesDataNavigationTarget(fullHref, __basePath);
-				if (dataTarget) prefetchPagesData(dataTarget);
-				else {
-					markAppRouteDetectedOnPrefetch(fullHref, __basePath);
+				const dataTarget = resolvePagesDataNavigationTarget(fullRouteHref, __basePath);
+				if (dataTarget) {
+					const middlewareDataHref = fullRouteHref === fullHref ? dataTarget.middlewareDataHref : getPagesMiddlewareDataHref(fullHref, __basePath) ?? void 0;
+					prefetchPagesData({
+						...dataTarget,
+						middlewareDataHref
+					});
+				} else {
+					await markAppRouteDetectedOnPrefetch(fullHref, __basePath);
 					const link = document.createElement("link");
 					link.rel = "prefetch";
 					link.href = fullHref;
@@ -285,8 +304,10 @@ function prefetchUrl(href, mode, priority = "low") {
 		});
 	});
 }
-function promotePrefetchEntriesForNavigation(href) {
+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")]);
 	let target;
 	try {
 		target = new URL(toBrowserNavigationHref(href, window.location.href, __basePath), window.location.href);
@@ -318,7 +339,7 @@ function setVisibleLinkPrefetch(instance, isVisible) {
 	if (isVisible) {
 		visibleLinkPrefetches.add(instance);
 		if (instance.routerMode === "pages" && instance.viewportPrefetched) return;
-		prefetchUrl(instance.href, instance.mode, "low");
+		prefetchUrl(instance.href, instance.mode, "low", instance.pagesRouteHref);
 		instance.viewportPrefetched = true;
 	} else visibleLinkPrefetches.delete(instance);
 }
@@ -327,7 +348,7 @@ function registerVisibleLinkPing() {
 	registerNavigationRuntimeFunctions({ pingVisibleLinks: pingVisibleLinkPrefetches });
 }
 function pingVisibleLinkPrefetches() {
-	for (const instance of visibleLinkPrefetches) if (instance.isVisible && instance.routerMode === "app") prefetchUrl(instance.href, instance.mode, "low");
+	for (const instance of visibleLinkPrefetches) if (instance.isVisible && instance.routerMode === "app") prefetchUrl(instance.href, instance.mode, "low", instance.pagesRouteHref);
 }
 function getSharedObserver() {
 	if (typeof window === "undefined" || typeof IntersectionObserver === "undefined") return null;
@@ -426,6 +447,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	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 as === "string" && typeof routeHrefRaw === "string" && as !== routeHrefRaw ? normalizePathTrailingSlash(applyLocaleToHref(isDangerous ? "/" : routeHrefRaw, locale), __trailingSlash) : normalizedHref;
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
@@ -470,6 +492,11 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			href: hrefToPrefetch,
 			isVisible: false,
 			mode: prefetchMode,
+			pagesRouteHref: normalizedRouteHref === normalizedHref ? void 0 : getLinkPrefetchHref({
+				href: normalizedRouteHref,
+				basePath: __basePath,
+				currentOrigin: window.location.origin
+			}) ?? void 0,
 			routerMode: getLinkPrefetchRouterMode(),
 			viewportPrefetched: false
 		};
@@ -483,7 +510,8 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	}, [
 		shouldViewportPrefetch,
 		prefetchMode,
-		normalizedHref
+		normalizedHref,
+		normalizedRouteHref
 	]);
 	const prefetchOnIntent = useCallback(() => {
 		if (!canLinkIntentPrefetch({
@@ -498,12 +526,13 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			if (instance) instance.mode = "full";
 			promotePrefetchEntriesForNavigation(normalizedHref);
 		}
-		prefetchUrl(normalizedHref, intentMode, "high");
+		prefetchUrl(normalizedHref, intentMode, "high", normalizedRouteHref === normalizedHref ? void 0 : normalizedRouteHref);
 	}, [
 		prefetchProp,
 		isDangerous,
 		prefetchMode,
 		normalizedHref,
+		normalizedRouteHref,
 		unstable_dynamicOnHover
 	]);
 	const handleMouseEnter = useCallback((e) => {
@@ -553,12 +582,14 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onNavigate(navEvent);
 			if (navEvent.defaultPrevented) return;
 		} catch {}
-		if (HAS_PAGES_ROUTER && hasAppNavigationRuntime && ["pages", "document"].includes(resolveHybridClientRouteOwner(navigateHref, __basePath) ?? "")) {
+		const hybridOwner = HAS_PAGES_ROUTER && hasAppNavigationRuntime ? (await import("./internal/hybrid-client-route-owner.js")).resolveHybridClientRouteOwner(navigateHref, __basePath) : null;
+		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 setter = setPendingRef.current;
 			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
@@ -573,7 +604,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			const Router = window.next?.appDir === true ? void 0 : window.next?.router;
 			await navigatePagesRouterLinkWithFallback({
 				router: Router && "reload" in Router ? Router : void 0,
-				loadRouter: async () => (await import("next/router.js")).default,
+				loadRouter: async () => (await import("next/router")).default,
 				navigation: {
 					href: pagesHrefForLink,
 					as: pagesAsForLink,
@@ -651,7 +682,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			onClick: (event) => {
 				if (childOnClick) childOnClick(event);
 				if (event.defaultPrevented) return;
-				handleClick(event, { skipLinkOnClick: true });
+				return handleClick(event, { skipLinkOnClick: true });
 			},
 			onMouseEnter: (event) => {
 				if (childOnMouseEnter) childOnMouseEnter(event);
@@ -673,9 +704,7 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 		children: /* @__PURE__ */ jsx("a", {
 			ref: setRefs,
 			href: fullHref,
-			onClick: (event) => {
-				handleClick(event);
-			},
+			onClick: handleClick,
 			onMouseEnter: handleMouseEnter,
 			onTouchStart: handleTouchStart,
 			...anchorProps,

package/dist/shims/navigation.d.ts

@@ -12,6 +12,7 @@ import * as React$1 from "react";
 declare const __basePath: string;
 /** Maximum number of entries in the RSC prefetch cache. */
 declare const MAX_PREFETCH_CACHE_SIZE = 50;
+declare const DYNAMIC_NAVIGATION_CACHE_TTL: number;
 declare const PREFETCH_CACHE_TTL: number;
 /** A buffered RSC response stored as an ArrayBuffer for replay. */
 type CachedRscResponse = {
@@ -57,6 +58,8 @@ declare function hasPrefetchCacheEntryForNavigation(rscUrl: string, interception
   notifyInvalidation?: boolean;
 }): 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;
 /**
  * Store a prefetched RSC response in the cache by snapshotting it to an
  * ArrayBuffer.  The snapshot completes asynchronously; during that window
@@ -105,6 +108,7 @@ 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;
   optimisticRouteShell?: boolean;
 }): void;
 /**
@@ -283,4 +287,4 @@ declare function useSelectedLayoutSegments(parallelRoutesKey?: string): string[]
  */
 declare function useServerInsertedHTML(callback: () => unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, type NavigationContext, type NavigationStateAccessors, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, type SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, 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, 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, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.js

@@ -5,11 +5,11 @@ import { AppElementsWire } from "../server/app-elements-wire.js";
 import "../server/app-elements.js";
 import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.js";
 import { AppRouterContext } from "./internal/app-router-context.js";
-import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { isAbsoluteOrProtocolRelativeUrl, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { retryScrollTo, scrollToHashTarget } from "./hash-scroll.js";
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, 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 { isBotUserAgent } from "../utils/html-limited-bots.js";
 import { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam } from "../server/app-rsc-cache-busting.js";
@@ -22,6 +22,7 @@ import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navig
 import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
+import { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
 //#region src/shims/navigation.ts
@@ -41,7 +42,7 @@ function useChildSegments(parallelRoutesKey = "children") {
 	const ctx = getLayoutSegmentContext();
 	if (!ctx) return [];
 	try {
-		return React$1.useContext(ctx)[parallelRoutesKey] ?? [];
+		return (React$1.useContext(ctx)[parallelRoutesKey] ?? []).filter((segment) => !segment.startsWith("__PAGE__"));
 	} catch {
 		return [];
 	}
@@ -69,14 +70,15 @@ const MAX_PREFETCH_CACHE_SIZE = 50;
 * has not set `experimental.staleTimes`, Next.js' 300s default applies
 * (see `resolveStaleTimes` in `config/next-config.ts`).
 */
-function resolvePrefetchCacheTtl() {
-	const raw = process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME;
-	if (raw === void 0 || raw === "") return 3e4;
+function resolveClientRouterStaleTime(raw, fallbackMs) {
+	if (raw === void 0 || raw === "") return fallbackMs;
 	const seconds = Number(raw);
-	if (!Number.isFinite(seconds) || seconds < 0) return 3e4;
+	if (!Number.isFinite(seconds) || seconds < 0) return fallbackMs;
 	return seconds * 1e3;
 }
-const PREFETCH_CACHE_TTL = resolvePrefetchCacheTtl();
+const DYNAMIC_NAVIGATION_CACHE_TTL = resolveClientRouterStaleTime(process.env.__NEXT_CLIENT_ROUTER_DYNAMIC_STALETIME, 3e4);
+const PREFETCH_CACHE_TTL = resolveClientRouterStaleTime(process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME, 3e4);
+const MIN_PREFETCH_STALE_TIME_MS = 3e4;
 function getCurrentInterceptionContext() {
 	if (isServer) return null;
 	return stripBasePath(window.location.pathname, __basePath);
@@ -135,6 +137,12 @@ function resolveCachedRscResponseExpiresAt(timestamp, cached, fallbackTtlMs) {
 	if (isCacheExpiresAt(cached.expiresAt)) return cached.expiresAt;
 	return timestamp + resolveCachedRscResponseTtlMs(cached, fallbackTtlMs);
 }
+function resolvePrefetchedRscResponseExpiresAt(timestamp, cached, fallbackTtlMs) {
+	if (isCacheExpiresAt(cached.expiresAt)) return cached.expiresAt;
+	const seconds = cached.dynamicStaleTimeSeconds;
+	if (!isDynamicStaleTimeSeconds(seconds)) return timestamp + Math.max(fallbackTtlMs, MIN_PREFETCH_STALE_TIME_MS);
+	return timestamp + Math.max(seconds * 1e3, MIN_PREFETCH_STALE_TIME_MS);
+}
 function resolvePrefetchCacheEntryExpiresAt(entry) {
 	if (entry.expiresAt !== void 0) return entry.expiresAt;
 	if (entry.snapshot) return resolveCachedRscResponseExpiresAt(entry.timestamp, entry.snapshot, PREFETCH_CACHE_TTL);
@@ -282,6 +290,32 @@ function invalidatePrefetchCache() {
 	prefetched.clear();
 	if (!isServer) getNavigationRuntime()?.functions.pingVisibleLinks?.();
 }
+function seedPrefetchResponseSnapshot(rscUrl, snapshot, interceptionContext = null, mountedSlotsHeader = null, fallbackTtlMs = DYNAMIC_NAVIGATION_CACHE_TTL) {
+	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
+	const cache = getPrefetchCache();
+	const existing = cache.get(cacheKey);
+	if (existing) deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, existing, false);
+	evictPrefetchCacheIfNeeded();
+	const timestamp = Date.now();
+	const entry = {
+		cacheForNavigation: true,
+		expiresAt: resolveCachedRscResponseExpiresAt(timestamp, snapshot, fallbackTtlMs),
+		mountedSlotsHeader,
+		outcome: "cache-seeded",
+		snapshot,
+		timestamp
+	};
+	cache.set(cacheKey, entry);
+	getPrefetchedUrls().add(cacheKey);
+	schedulePrefetchInvalidation(cacheKey, entry);
+}
+function deletePrefetchResponseSnapshot(rscUrl, snapshot, interceptionContext = null) {
+	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
+	const cache = getPrefetchCache();
+	const entry = cache.get(cacheKey);
+	if (entry?.snapshot !== snapshot) return;
+	deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, entry, false);
+}
 /**
 * Store a prefetched RSC response in the cache by snapshotting it to an
 * ArrayBuffer.  The snapshot completes asynchronously; during that window
@@ -390,7 +424,7 @@ function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, m
 	entry.pending = fetchPromise.then(async (response) => {
 		if (response.ok) {
 			entry.snapshot = await snapshotRscResponse(response);
-			entry.expiresAt = resolveCachedRscResponseExpiresAt(entry.timestamp, entry.snapshot, PREFETCH_CACHE_TTL);
+			entry.expiresAt = resolvePrefetchedRscResponseExpiresAt(entry.timestamp, entry.snapshot, behavior.fallbackTtlMs ?? PREFETCH_CACHE_TTL);
 		} else deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
 	}).catch(() => {
 		deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, false);
@@ -772,7 +806,7 @@ function commitClientNavigationState(navId, options) {
 	if (isServer) return;
 	const state = getClientNavigationState();
 	if (!state) return;
-	if ((navId !== void 0 || options?.releaseSnapshot === true) && state.navigationSnapshotActiveCount > 0) state.navigationSnapshotActiveCount -= 1;
+	if ((options?.releaseSnapshot ?? navId !== void 0) && state.navigationSnapshotActiveCount > 0) state.navigationSnapshotActiveCount -= 1;
 	const urlChanged = syncCommittedUrlStateFromLocation();
 	let paramsChanged = false;
 	if (state.pendingClientParams !== null && state.pendingClientParamsJson !== null) {
@@ -1033,6 +1067,7 @@ const _appRouter = {
 	prefetch(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
+		if (isBotUserAgent(window.navigator?.userAgent ?? "")) return;
 		try {
 			new URL(withBasePath(href, __basePath), window.location.href);
 		} catch {
@@ -1203,4 +1238,4 @@ if (!isServer) {
 	}
 }
 //#endregion
-export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+export { BailoutToCSRError, DYNAMIC_NAVIGATION_CACHE_TTL, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, PREFETCH_CACHE_TTL, ReadonlyURLSearchParams, RedirectType, 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, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, resolveCachedRscResponseExpiresAt, resolveCachedRscResponseTtlMs, resolvePrefetchCacheEntryMountedSlotsHeader, restoreRscResponse, saveScrollPosition, seedPrefetchResponseSnapshot, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.react-server.js

@@ -1,8 +1,8 @@
 import { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import "./navigation-server.js";
-import { throwClientHookError } from "./client-hook-error.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
+import { throwClientHookError } from "./client-hook-error.js";
 //#region src/shims/navigation.react-server.ts
 function usePathname() {
 	throwClientHookError("usePathname()");