vinext 0.0.55 → 0.1.1

package/dist/shims/internal/parse-cookie-header.d.ts

@@ -11,5 +11,4 @@
  */
 declare function parseCookieHeader(cookieHeader: string): Map<string, string>;
 //#endregion
-export { parseCookieHeader };
-//# sourceMappingURL=parse-cookie-header.d.ts.map
+export { parseCookieHeader };

package/dist/shims/internal/parse-cookie-header.js

@@ -28,5 +28,3 @@ function parseCookieHeader(cookieHeader) {
 }
 //#endregion
 export { parseCookieHeader };
-
-//# sourceMappingURL=parse-cookie-header.js.map

package/dist/shims/internal/route-pattern-for-warning.d.ts

@@ -0,0 +1,27 @@
+//#region src/shims/internal/route-pattern-for-warning.d.ts
+/**
+ * Side-effect-free accessor for the current render's route pattern, used by
+ * Next.js-parity diagnostics such as the Link shim's
+ * "Invalid href ... in page: '...'" `console.error`.
+ *
+ * Mirrors Next.js's `router.pathname`, which is the *route pattern* (e.g.
+ * `/posts/[id]`), not the resolved URL. During Pages Router SSR the route
+ * pattern lives on the request-scoped SSR context; the server-only
+ * `router-state.ts` publishes an accessor for it under a well-known
+ * `Symbol.for` handle. We read it through that handle rather than importing
+ * `router.ts` directly — importing `router.ts` would pull its browser-only
+ * `installWindowNext()` side effect into every consumer of the Link shim
+ * (including the App Router client bundle), clobbering `window.next.router`.
+ *
+ * On the client (or when no accessor is registered, e.g. App Router) we fall
+ * back to `window.location.pathname`, then to `"/"`.
+ */
+/**
+ * Register the server-side route-pattern accessor. Called once by the
+ * server-only router-state module on import. Idempotent.
+ * @internal
+ */
+declare function registerRoutePatternForWarningAccessor(accessor: () => string | null): void;
+declare function getCurrentRoutePathnameForWarning(): string;
+//#endregion
+export { getCurrentRoutePathnameForWarning, registerRoutePatternForWarningAccessor };

package/dist/shims/internal/route-pattern-for-warning.js

@@ -0,0 +1,40 @@
+//#region src/shims/internal/route-pattern-for-warning.ts
+/**
+* Side-effect-free accessor for the current render's route pattern, used by
+* Next.js-parity diagnostics such as the Link shim's
+* "Invalid href ... in page: '...'" `console.error`.
+*
+* Mirrors Next.js's `router.pathname`, which is the *route pattern* (e.g.
+* `/posts/[id]`), not the resolved URL. During Pages Router SSR the route
+* pattern lives on the request-scoped SSR context; the server-only
+* `router-state.ts` publishes an accessor for it under a well-known
+* `Symbol.for` handle. We read it through that handle rather than importing
+* `router.ts` directly — importing `router.ts` would pull its browser-only
+* `installWindowNext()` side effect into every consumer of the Link shim
+* (including the App Router client bundle), clobbering `window.next.router`.
+*
+* On the client (or when no accessor is registered, e.g. App Router) we fall
+* back to `window.location.pathname`, then to `"/"`.
+*/
+const ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY = Symbol.for("vinext.router.routePatternForWarningAccessor");
+/**
+* Register the server-side route-pattern accessor. Called once by the
+* server-only router-state module on import. Idempotent.
+* @internal
+*/
+function registerRoutePatternForWarningAccessor(accessor) {
+	globalThis[ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY] = accessor;
+}
+function getCurrentRoutePathnameForWarning() {
+	if (typeof window === "undefined") {
+		const accessor = globalThis[ROUTE_PATTERN_FOR_WARNING_ACCESSOR_KEY];
+		if (accessor) try {
+			const pattern = accessor();
+			if (pattern) return pattern;
+		} catch {}
+		return "/";
+	}
+	return window.location?.pathname ?? "/";
+}
+//#endregion
+export { getCurrentRoutePathnameForWarning, registerRoutePatternForWarningAccessor };

package/dist/shims/internal/router-context.d.ts

@@ -1,8 +1,6 @@
 import { NextRouter } from "../router.js";
-import * as _$react from "react";
 
 //#region src/shims/internal/router-context.d.ts
-declare const RouterContext: _$react.Context<NextRouter | null>;
+declare const RouterContext: import("react").Context<NextRouter | null>;
 //#endregion
-export { RouterContext };
-//# sourceMappingURL=router-context.d.ts.map
+export { RouterContext };

package/dist/shims/internal/router-context.js

@@ -9,5 +9,3 @@ import { createContext } from "react";
 const RouterContext = createContext(null);
 //#endregion
 export { RouterContext };
-
-//# sourceMappingURL=router-context.js.map

package/dist/shims/internal/utils.d.ts

@@ -21,6 +21,7 @@ type NEXT_DATA = {
     statusCode: number;
     name?: string;
   };
+  isExperimentalCompile?: boolean;
   gsp?: boolean;
   gssp?: boolean;
   customServer?: boolean;
@@ -48,5 +49,4 @@ declare function getURL(): string;
 declare const SP: boolean;
 declare const ST: boolean;
 //#endregion
-export { NEXT_DATA, SP, ST, execOnce, getLocationOrigin, getURL };
-//# sourceMappingURL=utils.d.ts.map
+export { NEXT_DATA, SP, ST, execOnce, getLocationOrigin, getURL };

package/dist/shims/internal/utils.js

@@ -25,5 +25,3 @@ const SP = typeof performance !== "undefined";
 const ST = SP && typeof performance.mark === "function";
 //#endregion
 export { SP, ST, execOnce, getLocationOrigin, getURL };
-
-//# sourceMappingURL=utils.js.map

package/dist/shims/internal/work-unit-async-storage.d.ts

@@ -27,5 +27,4 @@ type WorkUnitAsyncStorage = AsyncLocalStorage<WorkUnitStore>;
 declare const workUnitAsyncStorage: WorkUnitAsyncStorage;
 declare const requestAsyncStorage: WorkUnitAsyncStorage;
 //#endregion
-export { CacheStore, GenerateStaticParamsStore, PrerenderLegacyStore, PrerenderStore, RequestStore, WorkUnitAsyncStorage, WorkUnitStore, requestAsyncStorage, workUnitAsyncStorage };
-//# sourceMappingURL=work-unit-async-storage.d.ts.map
+export { CacheStore, GenerateStaticParamsStore, PrerenderLegacyStore, PrerenderStore, RequestStore, WorkUnitAsyncStorage, WorkUnitStore, requestAsyncStorage, workUnitAsyncStorage };

package/dist/shims/internal/work-unit-async-storage.js

@@ -15,5 +15,3 @@ const workUnitAsyncStorage = new AsyncLocalStorage();
 const requestAsyncStorage = workUnitAsyncStorage;
 //#endregion
 export { requestAsyncStorage, workUnitAsyncStorage };
-
-//# sourceMappingURL=work-unit-async-storage.js.map

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

@@ -1,5 +1,4 @@
 import { SegmentMap } from "./navigation.js";
-import * as _$react from "react";
 import { ReactNode } from "react";
 
 //#region src/shims/layout-segment-context.d.ts
@@ -20,7 +19,6 @@ declare function LayoutSegmentProvider({
 }: {
   segmentMap: SegmentMap;
   children: ReactNode;
-}): string | number | bigint | boolean | _$react.ReactElement<unknown, string | _$react.JSXElementConstructor<any>> | Iterable<ReactNode> | Promise<string | number | bigint | boolean | _$react.ReactPortal | _$react.ReactElement<unknown, string | _$react.JSXElementConstructor<any>> | Iterable<ReactNode> | null | undefined> | _$react.FunctionComponentElement<_$react.ProviderProps<SegmentMap>> | null | undefined;
+}): 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 };
-//# sourceMappingURL=layout-segment-context.d.ts.map
+export { LayoutSegmentProvider };

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

@@ -36,5 +36,3 @@ function LayoutSegmentProvider({ segmentMap, children }) {
 }
 //#endregion
 export { LayoutSegmentProvider };
-
-//# sourceMappingURL=layout-segment-context.js.map

package/dist/shims/legacy-image.d.ts

@@ -38,5 +38,4 @@ type LegacyImageProps = {
 };
 declare const LegacyImage: React.ForwardRefExoticComponent<LegacyImageProps & React.RefAttributes<HTMLImageElement>>;
 //#endregion
-export { LegacyImage as default };
-//# sourceMappingURL=legacy-image.d.ts.map
+export { LegacyImage as default };

package/dist/shims/legacy-image.js

@@ -47,5 +47,3 @@ const LegacyImage = forwardRef(function LegacyImage(props, ref) {
 });
 //#endregion
 export { LegacyImage as default };
-
-//# sourceMappingURL=legacy-image.js.map

package/dist/shims/link-prefetch.d.ts

@@ -38,5 +38,4 @@ declare function getLinkPrefetchHref(input: {
   currentOrigin: string | undefined;
 }): string | null;
 //#endregion
-export { LinkPrefetchDecision, LinkPrefetchIntent, LinkPrefetchPriority, LinkPrefetchRouterMode, canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchDecision, getLinkPrefetchHref };
-//# sourceMappingURL=link-prefetch.d.ts.map
+export { LinkPrefetchDecision, LinkPrefetchIntent, LinkPrefetchPriority, LinkPrefetchRouterMode, canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchDecision, getLinkPrefetchHref };

package/dist/shims/link-prefetch.js

@@ -41,5 +41,3 @@ function getLinkPrefetchHref(input) {
 }
 //#endregion
 export { canLinkIntentPrefetch, canLinkPrefetch, getLinkPrefetchDecision, getLinkPrefetchHref };
-
-//# sourceMappingURL=link-prefetch.js.map

package/dist/shims/link.d.ts

@@ -61,6 +61,7 @@ declare function resolveLinkPrefetchMode(prefetchProp: LinkProps["prefetch"], is
 declare function canAutoPrefetchFullAppRoute(href: string): boolean;
 declare function resolveAutoAppRoutePrefetch(href: string): {
   cacheForNavigation: boolean;
+  prefetchShellFirst: boolean;
   shouldPrefetch: boolean;
 };
 declare const Link: React.ForwardRefExoticComponent<{
@@ -98,5 +99,4 @@ declare const Link: React.ForwardRefExoticComponent<{
   children?: React.ReactNode;
 } & Omit<React.AnchorHTMLAttributes<HTMLAnchorElement>, "href"> & React.RefAttributes<HTMLAnchorElement>>;
 //#endregion
-export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };
-//# sourceMappingURL=link.d.ts.map
+export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };

package/dist/shims/link.js

@@ -12,12 +12,14 @@ import { markAppRouteDetectedOnPrefetch } from "./internal/app-route-detection.j
 import { isAbsoluteOrProtocolRelativeUrl, normalizePathTrailingSlash, resolveRelativeHref, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
 import { getCurrentBrowserLocale } from "./client-locale.js";
+import { getCurrentRoutePathnameForWarning } from "./internal/route-pattern-for-warning.js";
 import { getNavigationRuntime, hasAppNavigationRuntime, registerNavigationRuntimeFunctions } from "../client/navigation-runtime.js";
 import { createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam, stripRscSuffix } from "../server/app-rsc-cache-busting.js";
-import { getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, navigateClientSide, prefetchRscResponse } from "./navigation.js";
+import { getMountedSlotsHeader, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, hasPrefetchCacheEntryForNavigation, navigateClientSide, prefetchRscResponse } from "./navigation.js";
 import { navigatePagesRouterLink } from "../client/pages-router-link-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";
 import React, { createContext, forwardRef, useCallback, useContext, useEffect, useRef, useState } from "react";
 import { jsx } from "react/jsx-runtime";
 //#region src/shims/link.tsx
@@ -37,6 +39,7 @@ const LinkStatusContext = createContext({ pending: false });
 function useLinkStatus() {
 	return useContext(LinkStatusContext);
 }
+if (typeof window !== "undefined") registerNavigationRuntimeFunctions({ notifyLinkNavigationStart });
 /** basePath from next.config.js, injected by the plugin at build time */
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** trailingSlash from next.config.js, injected by the plugin at build time */
@@ -45,7 +48,7 @@ const __prefetchInlining = process.env.__VINEXT_PREFETCH_INLINING === "true";
 const linkPrefetchRouteTrieCache = createRouteTrieCache();
 function resolveHref(href) {
 	if (typeof href === "string") return href;
-	let url = href.pathname ?? "/";
+	let url = href.pathname ?? "";
 	if (href.query) {
 		const params = urlQueryToSearchParams(href.query);
 		url = appendSearchParamsToUrl(url, params);
@@ -81,17 +84,19 @@ function normalizeRepeatedSlashes(url) {
 * `resolveHref`. We mirror that behaviour (no dedup) for exact parity.
 *
 * Note: Next.js uses `router.pathname` (the route pattern, e.g.
-* `/posts/[id]`) for the "in page" segment of the message. We do not have
-* cheap access to the route pattern from inside the Link shim, so we
-* fall back to `window.location.pathname` (or `"/"` during SSR). The text
-* is cosmetic and is not asserted by the Next.js compat test.
+* `/posts/[id]`) for the "in page" segment of the message. The Next.js
+* compat test asserts this exact text (`in page: '/my/path/[name]'`), so we
+* source it from the current render's route pattern via
+* `getCurrentRoutePathnameForWarning()`: the Pages Router SSR context's route
+* pattern on the server, `window.location.pathname` on the client, falling
+* back to `"/"`.
 */
 function warnAndNormalizeRepeatedSlashesInHref(urlAsString) {
 	if (urlAsString.startsWith("//")) return urlAsString;
 	const urlProtoMatch = urlAsString.match(/^[a-z][a-z0-9+.-]*:\/\//i);
 	const urlAsStringNoProto = urlProtoMatch ? urlAsString.slice(urlProtoMatch[0].length) : urlAsString;
 	if (!(urlAsStringNoProto.split("?", 1)[0] || "").match(/(\/\/|\\)/)) return urlAsString;
-	const pathname = typeof window !== "undefined" && window.location ? window.location.pathname : "/";
+	const pathname = getCurrentRoutePathnameForWarning();
 	console.error(`Invalid href '${urlAsString}' passed to next/router in page: '${pathname}'. Repeated forward-slashes (//) or backslashes \\ are not valid in the href.`);
 	const normalizedNoProto = normalizeRepeatedSlashes(urlAsStringNoProto);
 	return (urlProtoMatch ? urlProtoMatch[0] : "") + normalizedNoProto;
@@ -115,6 +120,13 @@ function toSameOriginRouteHref(href) {
 function getLinkPrefetchRouterMode() {
 	return hasAppNavigationRuntime() ? "app" : "pages";
 }
+function resolveMatchedAutoAppRoutePrefetch(route) {
+	return {
+		cacheForNavigation: !(route.isDynamic && route.canPrefetchLoadingShell),
+		prefetchShellFirst: !route.isDynamic,
+		shouldPrefetch: true
+	};
+}
 function canAutoPrefetchFullAppRoute(href) {
 	if (typeof window === "undefined") return false;
 	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
@@ -123,32 +135,33 @@ function canAutoPrefetchFullAppRoute(href) {
 	if (routeHref === null) return false;
 	const match = matchRouteWithTrie(routeHref, routes, linkPrefetchRouteTrieCache);
 	if (!match) return false;
-	return !match.route.isDynamic;
+	return resolveMatchedAutoAppRoutePrefetch(match.route).cacheForNavigation;
 }
 function resolveAutoAppRoutePrefetch(href) {
 	if (typeof window === "undefined") return {
 		cacheForNavigation: false,
+		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
 	const routes = window.__VINEXT_LINK_PREFETCH_ROUTES__;
 	if (!routes) return {
 		cacheForNavigation: false,
+		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
 	const routeHref = toSameOriginRouteHref(href);
 	if (routeHref === null) return {
 		cacheForNavigation: false,
+		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
 	const match = matchRouteWithTrie(routeHref, routes, linkPrefetchRouteTrieCache);
 	if (!match) return {
 		cacheForNavigation: false,
+		prefetchShellFirst: false,
 		shouldPrefetch: false
 	};
-	return {
-		cacheForNavigation: !match.route.isDynamic,
-		shouldPrefetch: !match.route.isDynamic || match.route.canPrefetchLoadingShell
-	};
+	return resolveMatchedAutoAppRoutePrefetch(match.route);
 }
 /**
 * Prefetch a URL for faster navigation.
@@ -178,6 +191,7 @@ function prefetchUrl(href, mode, priority = "low") {
 			if (hasAppNavigationRuntime()) {
 				const autoPrefetch = mode === "auto" ? resolveAutoAppRoutePrefetch(prefetchHref) : {
 					cacheForNavigation: true,
+					prefetchShellFirst: true,
 					shouldPrefetch: true
 				};
 				if (!autoPrefetch.shouldPrefetch) return;
@@ -194,14 +208,13 @@ function prefetchUrl(href, mode, priority = "low") {
 				const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 				const prefetched = getPrefetchedUrls();
 				if (prefetched.has(cacheKey)) {
-					if (autoPrefetch.cacheForNavigation) {
-						const existing = getPrefetchCache().get(cacheKey);
-						if (existing?.cacheForNavigation === false) existing.cacheForNavigation = true;
-					}
-					return;
+					if (!autoPrefetch.cacheForNavigation) return;
+					const existing = getPrefetchCache().get(cacheKey);
+					if (existing?.cacheForNavigation === false) existing.cacheForNavigation = true;
 				}
+				if (autoPrefetch.cacheForNavigation && hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader)) return;
 				prefetched.add(cacheKey);
-				prefetchRscResponse(rscUrl, __prefetchInlining && autoPrefetch.cacheForNavigation ? (async () => {
+				prefetchRscResponse(rscUrl, __prefetchInlining && autoPrefetch.cacheForNavigation && autoPrefetch.prefetchShellFirst ? (async () => {
 					const shellHeaders = createRscRequestHeaders({
 						interceptionContext,
 						renderMode: APP_RSC_RENDER_MODE_PREFETCH_LOADING_SHELL
@@ -373,10 +386,16 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 	const fullHref = normalizePathTrailingSlash(withBasePath(normalizedHref, __basePath), __trailingSlash);
 	const [pending, setPending] = useState(false);
 	const mountedRef = useRef(true);
+	const setPendingRef = useRef(null);
+	if (setPendingRef.current === null) setPendingRef.current = (next) => {
+		if (mountedRef.current) setPending(next);
+	};
 	useEffect(() => {
 		mountedRef.current = true;
+		const setter = setPendingRef.current;
 		return () => {
 			mountedRef.current = false;
+			if (setter) clearLinkForCurrentNavigation(setter);
 		};
 	}, []);
 	const internalRef = useRef(null);
@@ -489,10 +508,13 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 			if (navEvent.defaultPrevented) return;
 		} catch {}
 		if (getNavigationRuntime()?.functions.navigate) {
+			const setter = setPendingRef.current;
+			if (setter) setLinkForCurrentNavigation(setter);
 			setPending(true);
 			React.startTransition(() => {
 				navigateClientSide(navigateHref, replace ? "replace" : "push", scroll, true).finally(() => {
 					if (mountedRef.current) setPending(false);
+					if (setter) clearLinkForCurrentNavigation(setter);
 				});
 			});
 			return;
@@ -608,5 +630,3 @@ const Link = forwardRef(function Link({ href, as, replace = false, prefetch: pre
 });
 //#endregion
 export { canAutoPrefetchFullAppRoute, Link as default, resolveAutoAppRoutePrefetch, resolveLinkPrefetchMode, useLinkStatus };
-
-//# sourceMappingURL=link.js.map

package/dist/shims/metadata.d.ts

@@ -1,4 +1,4 @@
-import * as _$react_jsx_runtime0 from "react/jsx-runtime";
+import React from "react";
 
 //#region src/shims/metadata.d.ts
 type Viewport = {
@@ -32,7 +32,7 @@ declare function ViewportHead({
   viewport
 }: {
   viewport: Viewport;
-}): _$react_jsx_runtime0.JSX.Element;
+}): React.JSX.Element;
 type Metadata = {
   title?: string | {
     default?: string;
@@ -276,7 +276,6 @@ declare function renderMetadataToHtml(metadata: Metadata, pathname?: string): st
 declare function MetadataHead({
   metadata,
   pathname
-}: MetadataHeadProps): _$react_jsx_runtime0.JSX.Element;
+}: MetadataHeadProps): React.JSX.Element;
 //#endregion
-export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };
-//# sourceMappingURL=metadata.d.ts.map
+export { DEFAULT_VIEWPORT, Metadata, MetadataHead, MetadataMergeEntry, Viewport, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };

package/dist/shims/metadata.js

@@ -220,7 +220,7 @@ async function resolveModuleMetadata(mod, params = {}, searchParams, parent = Pr
 			params: asyncParams,
 			searchParams: makeThenableParams(searchParams)
 		};
-		return await mod.generateMetadata(props, parent);
+		return await (mod.generateMetadata.length >= 2 ? mod.generateMetadata(props, parent) : mod.generateMetadata(props));
 	}
 	if (mod.metadata && typeof mod.metadata === "object") return mod.metadata;
 	return null;
@@ -800,5 +800,3 @@ function MetadataHead({ metadata, pathname = "/" }) {
 }
 //#endregion
 export { DEFAULT_VIEWPORT, MetadataHead, ViewportHead, mergeMetadata, mergeMetadataEntries, mergeViewport, postProcessMetadata, renderMetadataToHtml, resolveModuleMetadata, resolveModuleViewport };
-
-//# sourceMappingURL=metadata.js.map

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

@@ -23,5 +23,4 @@ declare function runWithNavigationContext<T>(fn: () => T | Promise<T>): T | Prom
 declare function runWithServerInsertedHTMLState<T>(fn: () => Promise<T>): Promise<T>;
 declare function runWithServerInsertedHTMLState<T>(fn: () => T | Promise<T>): T | Promise<T>;
 //#endregion
-export { NavigationState, runWithNavigationContext, runWithServerInsertedHTMLState };
-//# sourceMappingURL=navigation-state.d.ts.map
+export { NavigationState, runWithNavigationContext, runWithServerInsertedHTMLState };

package/dist/shims/navigation-state.js

@@ -63,5 +63,3 @@ _registerStateAccessors(_accessors);
 globalThis[GLOBAL_ACCESSORS_KEY] = _accessors;
 //#endregion
 export { runWithNavigationContext, runWithServerInsertedHTMLState };
-
-//# sourceMappingURL=navigation-state.js.map

package/dist/shims/navigation.d.ts

@@ -1,4 +1,4 @@
-import { AppRouterInstance } from "./internal/app-router-context.js";
+import { NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
@@ -21,6 +21,8 @@ declare const ServerInsertedHTMLContext: React$1.Context<((callback: () => unkno
  * Returns null in the RSC environment (createContext unavailable).
  */
 declare function getLayoutSegmentContext(): React$1.Context<SegmentMap> | null;
+declare function getBfcacheIdMapContext(): React$1.Context<Readonly<Record<string, string>> | null> | null;
+declare function getBfcacheSegmentIdContext(): React$1.Context<string | null> | null;
 type NavigationContext = {
   pathname: string;
   searchParams: URLSearchParams;
@@ -59,6 +61,8 @@ type CachedRscResponse = {
   compatibilityIdHeader?: string | null;
   buffer: ArrayBuffer;
   contentType: string;
+  dynamicStaleTimeSeconds?: number;
+  expiresAt?: number;
   mountedSlotsHeader?: string | null;
   paramsHeader: string | null;
   url: string;
@@ -69,7 +73,9 @@ type PrefetchOptions = {
 };
 type PrefetchCacheEntry = {
   cacheForNavigation?: boolean;
+  expiresAt?: number;
   invalidationTimer?: ReturnType<typeof setTimeout>;
+  mountedSlotsHeader?: string | null;
   onInvalidateCallbacks?: Set<() => void>;
   optimisticRouteShell?: boolean;
   outcome: "pending" | "cache-seeded";
@@ -87,6 +93,10 @@ declare function getPrefetchCache(): Map<string, PrefetchCacheEntry>;
  * Keyed by interception-aware cache key so distinct source routes do not alias.
  */
 declare function getPrefetchedUrls(): Set<string>;
+declare function resolveCachedRscResponseTtlMs(cached: Pick<CachedRscResponse, "dynamicStaleTimeSeconds">, fallbackTtlMs: number): number;
+declare function resolveCachedRscResponseExpiresAt(timestamp: number, cached: Pick<CachedRscResponse, "dynamicStaleTimeSeconds" | "expiresAt">, fallbackTtlMs: number): number;
+declare function resolvePrefetchCacheEntryMountedSlotsHeader(entry: PrefetchCacheEntry): string | null;
+declare function hasPrefetchCacheEntryForNavigation(rscUrl: string, interceptionContext?: string | null, mountedSlotsHeader?: string | null): boolean;
 declare function invalidatePrefetchCache(): void;
 /**
  * Store a prefetched RSC response in the cache by snapshotting it to an
@@ -215,7 +225,7 @@ declare function clearPendingPathname(navId: number): void;
  * Returns the current pathname.
  * Server: from request context. Client: from window.location.
  */
-declare function usePathname(): string;
+declare function usePathname(): string | null;
 /**
  * Returns the current search params as a read-only URLSearchParams.
  */
@@ -223,7 +233,7 @@ declare function useSearchParams(): ReadonlyURLSearchParams;
 /**
  * Returns the dynamic params for the current route.
  */
-declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T;
+declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T | null;
 /**
  * Commit pending client navigation state to committed snapshots.
  *
@@ -271,11 +281,18 @@ declare const appRouterInstance: {
  * App Router's useRouter — returns push/replace/back/forward/refresh.
  * Different from Pages Router's useRouter (next/router).
  *
- * Returns a stable singleton: the same object reference on every call,
- * matching Next.js behavior so components using referential equality
- * (e.g. useMemo / useEffect deps, React.memo) don't re-render unnecessarily.
+ * Preserves the mounted AppRouterContext router as the authority for methods
+ * and layers the nearest segment's contextual `bfcacheId` on top.
  */
-declare function useRouter(): AppRouterInstance;
+declare function useRouter(): {
+  bfcacheId: string;
+  back(): void;
+  forward(): void;
+  refresh(): void;
+  push(href: string, options?: NavigateOptions): void;
+  replace(href: string, options?: NavigateOptions): void;
+  prefetch(href: string, options?: PrefetchOptions$1): void;
+};
 /**
  * Returns the active child segment one level below the layout where it's called.
  *
@@ -557,5 +574,4 @@ declare function isDynamicServerError(error: unknown): error is DynamicServerErr
  */
 declare function unstable_rethrow(error: unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, NavigationContext, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getClientNavigationRenderContext, getClientNavigationState, getClientParams, getCurrentInterceptionContext, getCurrentNextUrl, getLayoutSegmentContext, getMountedSlotsHeader, getNavigationContext, getPrefetchCache, getPrefetchInterceptionContext, getPrefetchedUrls, invalidatePrefetchCache, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, navigateClientSide, notFound, permanentRedirect, prefetchRscResponse, pushHistoryStateWithoutNotify, redirect, renderServerInsertedHTML, replaceClientParamsWithoutNotify, replaceHistoryStateWithoutNotify, restoreRscResponse, saveScrollPosition, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
-//# sourceMappingURL=navigation.d.ts.map
+export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, NavigationContext, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, 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, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };