vinext 1.3.1 → 1.4.0

package/dist/shims/headers.d.ts

@@ -1,5 +1,4 @@
 import { RenderRequestApiKind } from "../server/cache-proof.js";
-import { CacheLifeConfig } from "./cache-request-state.js";
 import { ConnectionProbeResult, HeadersAccessPhase, RenderDynamicLatch, VinextHeadersShimState, createRenderDynamicLatch, getHeadersAccessPhase, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, throwIfInsideCacheScope, throwIfStaticGenerationAccessError } from "./internal/headers-state.js";
 import { ReadonlyRequestCookies } from "@vinext/types/next/upstream/dist/server/web/spec-extension/adapters/request-cookies";
 import { ResponseCookie } from "@vinext/types/next/upstream/dist/compiled/@edge-runtime/cookies/index";
@@ -19,27 +18,11 @@ type HeadersContextFromRequestOptions = {
   draftModeSecret?: string;
 };
 /**
- * Measure dynamic usage in a child async scope without clearing the parent.
- * Concurrent work that already belongs to the request (such as deferred
- * metadata) keeps writing to the parent state and therefore remains visible
- * to the final cache policy.
- */
-export declare function runWithIsolatedDynamicUsage<T>(fn: () => T | Promise<T>): Promise<{
-  result: T;
-  dynamicDetected: boolean;
-}>;
-/**
- * Run a pre-render probe without letting its dynamic API usage classify the
- * request. Next.js has no probe: only the render decides whether a page is
- * dynamic, and the render runs the probed layouts and page again. Returns the
- * probe's own usage and cacheLife for a caller whose probe response replaces
- * the render.
- */
-export declare function runWithDetachedDynamicUsage<T>(fn: () => T | Promise<T>): Promise<{
-  result: T;
-  dynamicDetected: boolean;
-  cacheLife: CacheLifeConfig | null;
-}>;
+ * Run a layout probe without letting its dynamic API usage, fetch tags or
+ * cacheLife reach the request. Next.js has no probe: only the render decides
+ * whether a page is dynamic and how long it is cached.
+ */
+export declare function runWithDetachedDynamicUsage<T>(fn: () => T | Promise<T>): Promise<T>;
 export declare function runWithConnectionProbe<T>(fn: () => T | Promise<T>): Promise<ConnectionProbeResult<T>>;
 export declare function suspendConnectionProbe(): Promise<never> | null;
 export declare function peekRenderRequestApiUsage(): RenderRequestApiKind[];
@@ -214,7 +197,9 @@ declare class RequestCookies {
   private _cookies;
   private _responseCookies;
   constructor(cookies: Map<string, string>, mutable?: boolean);
-  get(name: string): ResponseCookie | undefined;
+  get(nameOrOptions: string | {
+    name: string;
+  }): ResponseCookie | undefined;
   getAll(nameOrOptions?: string | {
     name: string;
   }): ResponseCookie[];

package/dist/shims/headers.js

@@ -84,78 +84,27 @@ function mergeMiddlewareSetCookies(ctx, rawHeader) {
 	return merged;
 }
 /**
-* Measure dynamic usage in a child async scope without clearing the parent.
-* Concurrent work that already belongs to the request (such as deferred
-* metadata) keeps writing to the parent state and therefore remains visible
-* to the final cache policy.
-*/
-async function runWithIsolatedDynamicUsage(fn) {
-	const runInChildState = async (childState) => {
-		return {
-			result: await fn(),
-			dynamicDetected: childState.dynamicUsageDetected
-		};
-	};
-	if (isInsideUnifiedScope()) {
-		let childState = null;
-		return await runWithUnifiedStateMutation((context) => {
-			context.dynamicUsageDetected = false;
-			childState = context;
-		}, () => {
-			if (!childState) throw new Error("Dynamic usage scope was not initialized");
-			return runInChildState(childState);
-		});
-	}
-	const parentState = getHeadersShimState();
-	const childState = {
-		...parentState,
-		renderDynamicLatch: ensureRenderDynamicLatch(parentState),
-		dynamicUsageDetected: false
-	};
-	return await headersShimAls.run(childState, () => runInChildState(childState));
-}
-/**
-* Run a pre-render probe without letting its dynamic API usage classify the
-* request. Next.js has no probe: only the render decides whether a page is
-* dynamic, and the render runs the probed layouts and page again. Returns the
-* probe's own usage and cacheLife for a caller whose probe response replaces
-* the render.
+* Run a layout probe without letting its dynamic API usage, fetch tags or
+* cacheLife reach the request. Next.js has no probe: only the render decides
+* whether a page is dynamic and how long it is cached.
 */
 async function runWithDetachedDynamicUsage(fn) {
-	const runInChildState = async (childState, cacheLifeSink) => {
-		return {
-			result: await fn(),
-			cacheLife: cacheLifeSink?.cacheLife ?? null,
-			dynamicDetected: childState.dynamicUsageDetected || childState.renderDynamicLatch.dynamic
-		};
-	};
-	if (isInsideUnifiedScope()) {
-		let childState = null;
-		const cacheLifeSink = { cacheLife: null };
-		return await runWithUnifiedStateMutation((context) => {
-			context.cacheLifeSink = cacheLifeSink;
-			context.dynamicUsageDetected = false;
-			context.renderDynamicLatch = createRenderDynamicLatch();
-			context.renderRequestApiUsage = /* @__PURE__ */ new Set();
-			context.requestCache = /* @__PURE__ */ new WeakMap();
-			context.cacheableFetchUrls = /* @__PURE__ */ new Set();
-			context.currentRequestTags = [];
-			context.dynamicFetchUrls = /* @__PURE__ */ new Set();
-			context.requestScopedCacheLife = null;
-			context.unstableCacheObservations = /* @__PURE__ */ new Map();
-			childState = context;
-		}, () => {
-			if (!childState) throw new Error("Dynamic usage scope was not initialized");
-			return runInChildState(childState, cacheLifeSink);
-		});
-	}
+	if (isInsideUnifiedScope()) return await runWithUnifiedStateMutation((context) => {
+		context.dynamicUsageDetected = false;
+		context.renderDynamicLatch = createRenderDynamicLatch();
+		context.renderRequestApiUsage = /* @__PURE__ */ new Set();
+		context.requestCache = /* @__PURE__ */ new WeakMap();
+		context.currentRequestTags = [];
+		context.dynamicFetchUrls = /* @__PURE__ */ new Set();
+		context.requestScopedCacheLife = null;
+	}, fn);
 	const childState = {
 		...getHeadersShimState(),
 		dynamicUsageDetected: false,
 		renderDynamicLatch: createRenderDynamicLatch(),
 		renderRequestApiUsage: /* @__PURE__ */ new Set()
 	};
-	return await headersShimAls.run(childState, () => runInChildState(childState, null));
+	return await headersShimAls.run(childState, fn);
 }
 async function runWithConnectionProbe(fn) {
 	const parentState = getHeadersShimState();
@@ -513,7 +462,7 @@ function _wrapMutableCookies(cookies) {
 }
 function _sealCookies(cookies) {
 	return new Proxy(cookies, { get(target, prop) {
-		if (prop === "set" || prop === "delete") throw new ReadonlyRequestCookiesError();
+		if (prop === "set" || prop === "delete" || prop === "clear") return ReadonlyRequestCookiesError.callable;
 		const value = Reflect.get(target, prop, target);
 		return typeof value === "function" ? value.bind(target) : value;
 	} });
@@ -761,7 +710,8 @@ var RequestCookies = class {
 			value
 		})])) : null;
 	}
-	get(name) {
+	get(nameOrOptions) {
+		const name = typeof nameOrOptions === "string" ? nameOrOptions : nameOrOptions.name;
 		if (this._responseCookies) return this._responseCookies.get(name);
 		const value = this._cookies.get(name);
 		if (value === void 0) return void 0;
@@ -877,4 +827,4 @@ function serializeMutableCookie(cookie) {
 	});
 }
 //#endregion
-export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasDraftModeCookieHeader, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, replaceHeadersContext, restoreDraftModeTransition, runWithConnectionProbe, runWithDetachedDynamicUsage, runWithHeadersContext, runWithIsolatedDynamicUsage, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };
+export { applyEffectiveRequestCookieHeader, applyMiddlewareRequestHeaders, consumeDynamicUsage, consumeInvalidDynamicUsageError, consumeRenderRequestApiUsage, cookies, createRenderDynamicLatch, draftMode, getActiveDraftModeState, getAndClearPendingCookies, getDraftModeCookieHeader, getEffectiveRequestCookieHeader, getHeadersAccessPhase, getHeadersContext, hasDraftModeCookieHeader, hasEffectiveRequestCookieChanges, headers, headersContextFromRequest, isDraftModeEnabled, isDraftModeRequest, isInsideAnyCacheScope, isRenderDynamicLatched, markDynamicUsage, markRenderRequestApiUsage, onRenderDynamicLatched, peekDynamicUsage, peekRenderRequestApiUsage, replaceHeadersContext, restoreDraftModeTransition, runWithConnectionProbe, runWithDetachedDynamicUsage, runWithHeadersContext, setHeadersAccessPhase, setHeadersContext, suspendConnectionProbe, throwIfInsideCacheScope, throwIfStaticGenerationAccessError };

package/dist/shims/internal/navigation-untracked.js

@@ -1,5 +1,5 @@
-import { getNavigationContext } from "../navigation-context-state.js";
 import { getPagesNavigationContext } from "./pages-router-accessor.js";
+import { getNavigationContext } from "../navigation-context-state.js";
 import { getClientNavigationState, useClientNavigationRenderSnapshot } from "../navigation.js";
 //#region src/shims/internal/navigation-untracked.ts
 /**

package/dist/shims/link.js

@@ -192,7 +192,7 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 				]);
 				if (routeManifestLoaded === false) return;
 				if (navigationEpoch !== linkPrefetchNavigationEpoch) return;
-				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, createAppPrefetchRequestHeaders, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, hasFreshLearningOnlyPrefetchCacheEntry, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, prefetchRscResponse, prepareNavigationPrefetchSnapshot, promotePrefetchCacheEntryForNavigation, DYNAMIC_NAVIGATION_CACHE_TTL, PREFETCH_CACHE_TTL } = navigation;
+				const { getPrefetchInterceptionContext, getPrefetchCache, getPrefetchedUrls, getMountedSlotsHeader, createAppPrefetchRequestHeaders, discardLearningOnlyPrefetchCacheEntry, fetchRouteTreeGatedPrefetch, hasFreshLearningOnlyPrefetchCacheEntry, hasSearchAgnosticPrefetchShellForRoute, hasPrefetchCacheEntryForNavigation, prefetchRscResponse, prepareNavigationPrefetchSnapshot, promotePrefetchCacheEntryForNavigation, seedFullPrefetchFromVisitedResponse, hasNavigationFreshVisitedResponse, 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;
@@ -314,6 +314,8 @@ function prefetchUrl(href, mode, priority = "low", pagesRouteHref, locale, owner
 					}
 					return;
 				}
+				if (autoPrefetch.dynamicStaleTime === "full-prefetch" && seedFullPrefetchFromVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, additionalRscUrls)) return;
+				if (autoPrefetch.dynamicStaleTime !== "full-prefetch" && hasNavigationFreshVisitedResponse(rscUrl, interceptionContext, mountedSlotsHeader, additionalRscUrls)) return;
 				prefetched.add(cacheKey);
 				const gateViaRouteTree = (__prefetchInlining || requiresRouteTreePrefetch) && mode === "auto" && autoPrefetch.prefetchShellFirst;
 				const gateViaExplicitSearchShell = mode === "full" && hasSearchParams && autoPrefetch.prefetchShellFirst && mountedSlotsHeader === null;

package/dist/shims/metadata.d.ts

@@ -21,12 +21,13 @@ export declare function mergeViewport(viewportList: readonly Viewport[]): Resolv
 export declare function ViewportHead({ viewport }: {
   viewport: Viewport;
 }): React.JSX.Element;
+type MetadataTitle = string | {
+  default?: string;
+  template?: string | null;
+  absolute?: string;
+};
 export type Metadata = {
-  title?: string | {
-    default?: string;
-    template?: string | null;
-    absolute?: string;
-  };
+  title?: MetadataTitle;
   description?: string;
   generator?: string;
   applicationName?: string;
@@ -52,7 +53,7 @@ export type Metadata = {
     [key: string]: unknown;
   };
   openGraph?: {
-    title?: string;
+    title?: MetadataTitle;
     description?: string;
     url?: string | URL;
     siteName?: string;
@@ -68,19 +69,19 @@ export type Metadata = {
     publishedTime?: string;
     modifiedTime?: string;
     authors?: string[];
-  };
+  } | null;
   twitter?: {
     card?: string;
     site?: string;
     siteId?: string;
-    title?: string;
+    title?: MetadataTitle;
     description?: string;
     images?: string | URL | SocialImageDescriptor | Array<string | URL | SocialImageDescriptor>;
     creator?: string;
     creatorId?: string;
     players?: TwitterPlayerDescriptor | TwitterPlayerDescriptor[];
     app?: TwitterAppDescriptor;
-  };
+  } | null;
   icons?: IconsMetadata;
   manifest?: string | URL;
   alternates?: {
@@ -206,17 +207,15 @@ type IconsMap = {
 };
 type IconsMetadata = IconInput | IconInput[] | IconsMap;
 export type MetadataMergeEntry = {
+  /** Passes on the title template it received rather than its own. */
   isPage?: boolean;
   metadata: Metadata;
 };
 /**
  * Merge metadata from multiple sources (layouts + page).
  *
- * The list is ordered [rootLayout, nestedLayout, ..., page].
- * Title template from layouts applies to the page title but NOT to
- * the segment that defines the template itself. `title.absolute`
- * skips all templates. `title.default` is the fallback when no
- * child provides a title.
+ * The list is ordered [rootLayout, nestedLayout, ..., page], with titles
+ * resolved as {@link mergeMetadataEntries} does.
  *
  * Shallow merge: later entries override earlier ones (per Next.js docs).
  */
@@ -237,22 +236,25 @@ export declare function postProcessMetadata(merged: Metadata): Metadata;
 /**
  * Merge metadata from multiple sources (layouts + page).
  *
- * The list is ordered [rootLayout, nestedLayout, ..., page].
- * Title template from layouts applies to the page title but NOT to
- * the segment that defines the template itself. `title.absolute`
- * skips all templates. `title.default` is the fallback when no
- * child provides a title.
+ * The list is ordered [rootLayout, nestedLayout, ..., page]. Like Next.js's
+ * accumulateMetadata, each title resolves with the template of the title
+ * before it: a `title.template` wraps later titles, not its own entry's
+ * `title.default`, and a plain-string title, or one without a template,
+ * clears it. An `isPage` entry passes on the template it received.
+ * `title.absolute` skips all templates.
  *
  * For top-level keys, later entries override earlier ones. `other` custom meta
  * tags are the exception: Next.js merges those across segments.
+ * https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/metadata/resolve-metadata.ts (accumulateMetadata)
  */
 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.
+ * title so far. `template` is the last title's own, 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;

package/dist/shims/metadata.js

@@ -131,11 +131,8 @@ function resolveThemeColor(themeColor) {
 /**
 * Merge metadata from multiple sources (layouts + page).
 *
-* The list is ordered [rootLayout, nestedLayout, ..., page].
-* Title template from layouts applies to the page title but NOT to
-* the segment that defines the template itself. `title.absolute`
-* skips all templates. `title.default` is the fallback when no
-* child provides a title.
+* The list is ordered [rootLayout, nestedLayout, ..., page], with titles
+* resolved as {@link mergeMetadataEntries} does.
 *
 * Shallow merge: later entries override earlier ones (per Next.js docs).
 */
@@ -162,6 +159,10 @@ function resolveStringTitle(title) {
 	if (typeof title === "string") return title;
 	if (title && typeof title === "object") return title.absolute ?? title.default ?? void 0;
 }
+/** The text a social title renders, a raw `{ default }` title's default if it is not resolved. */
+function renderedTitle(title) {
+	return title && typeof title === "object" ? title.absolute || title.default : title;
+}
 function applyTitleTemplate(template, title) {
 	return template ? template.replace(/%s/g, title) : title;
 }
@@ -233,14 +234,16 @@ function postProcessMetadata(merged) {
 /**
 * Merge metadata from multiple sources (layouts + page).
 *
-* The list is ordered [rootLayout, nestedLayout, ..., page].
-* Title template from layouts applies to the page title but NOT to
-* the segment that defines the template itself. `title.absolute`
-* skips all templates. `title.default` is the fallback when no
-* child provides a title.
+* The list is ordered [rootLayout, nestedLayout, ..., page]. Like Next.js's
+* accumulateMetadata, each title resolves with the template of the title
+* before it: a `title.template` wraps later titles, not its own entry's
+* `title.default`, and a plain-string title, or one without a template,
+* clears it. An `isPage` entry passes on the template it received.
+* `title.absolute` skips all templates.
 *
 * For top-level keys, later entries override earlier ones. `other` custom meta
 * tags are the exception: Next.js merges those across segments.
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/lib/metadata/resolve-metadata.ts (accumulateMetadata)
 */
 function mergeMetadataEntries(entries) {
 	return mergeEntries(entries, false);
@@ -249,20 +252,29 @@ function mergeMetadataEntries(entries) {
 * 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.
+* title so far. `template` is the last title's own, 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
 */
 function mergeParentMetadataEntries(entries) {
 	return mergeEntries(entries, true);
 }
+const SOCIAL_TITLE_KEYS = ["openGraph", "twitter"];
+function titleTemplateOf(title) {
+	return typeof title === "object" && title ? title.template ?? null : null;
+}
 function mergeEntries(entries, resolvedTitle) {
 	if (entries.length === 0) return {};
 	const merged = {};
-	let parentTemplate;
+	const titleTemplates = {
+		title: null,
+		openGraph: null,
+		twitter: null
+	};
+	let stashedTemplates = { ...titleTemplates };
 	for (const entry of entries) {
 		const meta = entry.metadata;
-		const isPage = Boolean(entry.isPage);
 		for (const key of Object.keys(meta)) {
 			if (key === "title") continue;
 			const incoming = meta[key];
@@ -273,13 +285,37 @@ function mergeEntries(entries, resolvedTitle) {
 			};
 			else merged[key] = incoming;
 		}
-		if (meta.title !== void 0) merged.title = resolveTitle(meta.title, parentTemplate);
-		if (!isPage && meta.title && typeof meta.title === "object" && meta.title.template) parentTemplate = meta.title.template;
+		if (meta.title !== void 0) {
+			merged.title = resolveTitle(meta.title, stashedTemplates.title ?? void 0);
+			titleTemplates.title = titleTemplateOf(meta.title);
+		}
+		for (const key of SOCIAL_TITLE_KEYS) {
+			if (!Object.hasOwn(meta, key)) continue;
+			const social = meta[key];
+			titleTemplates[key] = titleTemplateOf(social?.title);
+			merged[key] = social ? {
+				...social,
+				title: resolveTitle(social.title, stashedTemplates[key] ?? void 0)
+			} : null;
+		}
+		if (!entry.isPage) stashedTemplates = { ...titleTemplates };
+	}
+	if (resolvedTitle) {
+		if (Object.hasOwn(merged, "title")) merged.title = {
+			absolute: resolveStringTitle(merged.title) ?? "",
+			template: titleTemplates.title
+		};
+		for (const key of SOCIAL_TITLE_KEYS) {
+			const social = merged[key];
+			if (social) merged[key] = {
+				...social,
+				title: {
+					absolute: resolveStringTitle(social.title) ?? "",
+					template: titleTemplates[key]
+				}
+			};
+		}
 	}
-	if (resolvedTitle && Object.hasOwn(merged, "title")) merged.title = {
-		absolute: resolveStringTitle(merged.title) ?? "",
-		template: parentTemplate ?? null
-	};
 	return merged;
 }
 /**
@@ -569,9 +605,10 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey
 	}
 	if (metadata.openGraph) {
 		const og = metadata.openGraph;
-		if (og.title) elements.push(/* @__PURE__ */ jsx("meta", {
+		const ogTitle = renderedTitle(og.title);
+		if (ogTitle) elements.push(/* @__PURE__ */ jsx("meta", {
 			property: "og:title",
-			content: og.title
+			content: ogTitle
 		}, key++));
 		if (og.description) elements.push(/* @__PURE__ */ jsx("meta", {
 			property: "og:description",
@@ -702,9 +739,10 @@ function MetadataHead({ metadata, pathname = "/", trailingSlash, streamedIconKey
 			name: "twitter:site:id",
 			content: tw.siteId
 		}, key++));
-		if (tw.title) elements.push(/* @__PURE__ */ jsx("meta", {
+		const twTitle = renderedTitle(tw.title);
+		if (twTitle) elements.push(/* @__PURE__ */ jsx("meta", {
 			name: "twitter:title",
-			content: tw.title
+			content: twTitle
 		}, key++));
 		if (tw.description) elements.push(/* @__PURE__ */ jsx("meta", {
 			name: "twitter:description",

package/dist/shims/navigation-server.js

@@ -1,3 +1,3 @@
-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 { GLOBAL_ACCESSORS_KEY, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 export { BailoutToCSRError, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, ServerInsertedHTMLContext, _registerStateAccessors, clearClientHydrationContext, clearServerInsertedHTML, decodeRedirectError, flushServerInsertedHTML, forbidden, getAccessFallbackHTTPStatus, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, registerServerInsertedHTMLCallback, renderServerInsertedHTML, setNavigationContext, unauthorized, unstable_rethrow };

package/dist/shims/navigation.d.ts

@@ -1,14 +1,14 @@
 import { AppRouterScrollIntent } from "./app-router-scroll-state.js";
-import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
-import { AppElements } from "../server/app-elements-wire.js";
-import "../server/app-elements.js";
 import { AppRouterInstance, NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
 import { AppRoutePrefetchPolicy } from "./internal/app-route-prefetch-policy.js";
+import { AppElements } from "../server/app-elements-wire.js";
+import "../server/app-elements.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { AppRscRenderMode } from "../server/app-rsc-render-mode.js";
 import { GLOBAL_ACCESSORS_KEY, NavigationContext, NavigationStateAccessors, SegmentMap, ServerInsertedHTMLContext, _registerStateAccessors, clearServerInsertedHTML, flushServerInsertedHTML, getBfcacheIdMapContext, getBfcacheSegmentIdContext, getLayoutSegmentContext, getNavigationContext, renderServerInsertedHTML, setNavigationContext } from "./navigation-context-state.js";
 import { BailoutToCSRError, DynamicServerError, HTTP_ERROR_FALLBACK_ERROR_CODE, RedirectType, decodeRedirectError, forbidden, getAccessFallbackHTTPStatus, isBailoutToCSRError, isDynamicServerError, isHTTPAccessFallbackError, isNextRouterError, isRedirectError, notFound, permanentRedirect, redirect, unauthorized, unstable_rethrow } from "./navigation-errors.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
+import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
 import * as React$1 from "react";
 import { Params } from "@vinext/types/next/upstream/dist/server/request/params";
 //#region src/shims/navigation.d.ts
@@ -50,6 +50,12 @@ export type CachedRscResponse = {
   mountedSlotsHeader?: string | null;
   paramsHeader: string | null;
   preparedElements?: AppElements;
+  /**
+   * When the payload arrived from the server. A navigation that commits a
+   * prefetched payload keeps the prefetch's time, so a later full prefetch
+   * judges the data by its age, not by the navigation that reused it.
+   */
+  receivedAt?: number;
   /**
    * Streamed `redirect()` side-channel headers. A replayed snapshot must keep
    * them so the navigation follows the redirect instead of decoding the
@@ -145,7 +151,26 @@ export declare function discardLearningOnlyPrefetchCacheEntry(rscUrl: string, in
  * page reflects the cookies and headers at hover time.
  */
 export declare function promotePrefetchCacheEntryForNavigation(cacheKey: string, entry: PrefetchCacheEntry): void;
-export declare function invalidatePrefetchCache(): void;
+export type InvalidatePrefetchCacheOptions = {
+  /** Prefetch the visible links again right away. Defaults to true. */
+  pingVisibleLinks?: boolean;
+};
+export declare function invalidatePrefetchCache(options?: InvalidatePrefetchCacheOptions): void;
+/**
+ * Evict the prefetch entries that may hold dynamic data, for a Server Action
+ * that called `refresh()`. Like Next.js's dynamic-only revalidation, which
+ * evicts its BFCache but keeps its prefetch cache, this keeps route trees,
+ * static prefetches and full prefetches. It drops navigation responses, and
+ * automatic prefetches whose page rendered dynamically or hasn't finished
+ * rendering, including those only kept to learn a route: Next.js's automatic
+ * prefetches never hold dynamic data.
+ */
+export declare function invalidateDynamicPrefetchCache(): void;
+/**
+ * Notify the prefetches that stood in for a visited response (see
+ * `hasNavigationFreshVisitedResponse`), as the visited responses are cleared.
+ */
+export declare function invalidateVisitedResponsePrefetches(): void;
 /**
  * Prevent completed navigation responses from becoming authoritative again
  * after restoring a history snapshot. Explicit Link/router prefetches remain
@@ -153,7 +178,21 @@ export declare function invalidatePrefetchCache(): void;
  * responses retain the cache reuse licensed by Next's segment cache.
  */
 export declare function disableNavigationResponsePrefetchCacheReuse(): void;
-export declare function seedPrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null, mountedSlotsHeader?: string | null, fallbackTtlMs?: number, reuseAfterHistoryRestore?: boolean): void;
+export declare function seedPrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null, mountedSlotsHeader?: string | null, fallbackTtlMs?: number, reuseAfterHistoryRestore?: boolean, expiresAt?: number): void;
+/**
+ * Fulfill a full prefetch from the visited response of an earlier navigation,
+ * as Next.js does from its BFCache, instead of issuing a request. The data is
+ * fresh for the static stale time from the navigation, not the dynamic one
+ * (`attemptToFulfillDynamicSegmentFromBFCache`).
+ */
+export declare function seedFullPrefetchFromVisitedResponse(rscUrl: string, interceptionContext: string | null, mountedSlotsHeader: string | null, additionalRscUrls?: readonly string[], onInvalidate?: () => void): boolean;
+/**
+ * Whether a navigation to the URL would reuse the response of an earlier one,
+ * so a prefetch has nothing to fetch. Like Next.js, whose navigation keeps the
+ * route and its segments for `staleTimes.dynamic`. `onInvalidate` fires when
+ * that reuse ends.
+ */
+export declare function hasNavigationFreshVisitedResponse(rscUrl: string, interceptionContext: string | null, mountedSlotsHeader: string | null, additionalRscUrls?: readonly string[], onInvalidate?: () => void): boolean;
 export declare function deletePrefetchResponseSnapshot(rscUrl: string, snapshot: CachedRscResponse, interceptionContext?: string | null): void;
 /**
  * Store a prefetched RSC response in the cache by snapshotting it to an
@@ -271,10 +310,33 @@ type ClientNavigationState = {
   originalPushState: typeof window.history.pushState;
   originalReplaceState: typeof window.history.replaceState;
   patchInstalled: boolean;
+  routerHistoryWriteDepth: number;
+  routerHistoryWrite: RouterHistoryWrite | null;
   hasPendingNavigationUpdate: boolean;
   suppressUrlNotifyCount: number;
   navigationSnapshotActiveCount: number;
 };
+type RouterHistoryWrite = {
+  method: "pushState" | "replaceState";
+  data: unknown;
+  url: string | URL;
+  href: string;
+  land: RouterHistoryWriteLanding | undefined;
+  threw: boolean;
+  landed: boolean;
+};
+/**
+ * Runs as a router history write lands, after any writes a history wrapper
+ * installed after boot made before forwarding it. Returns the data to write
+ * (re-stamped when those writes moved the traversal indices) and a commit to
+ * run once the write succeeds, before any write the wrapper makes after it. A
+ * wrapper installed before boot is the original method called after `land`, so
+ * writes it makes through the live methods are not accounted for.
+ */
+export type RouterHistoryWriteLanding = (data: unknown) => {
+  data: unknown;
+  commit: () => void;
+};
 type CommitClientNavigationStateOptions = {
   releaseSnapshot?: boolean;
 };
@@ -348,8 +410,8 @@ export declare function useParams<T extends Params = Params>(): T | null;
  * must opt in explicitly if they also own an activated render snapshot.
  */
 export declare function commitClientNavigationState(navId?: number, options?: CommitClientNavigationStateOptions): void;
-export declare function pushHistoryStateWithoutNotify(data: unknown, unused: string, url?: string | URL | null): void;
-export declare function replaceHistoryStateWithoutNotify(data: unknown, unused: string, url?: string | URL | null): void;
+export declare function pushHistoryStateWithoutNotify(data: unknown, unused: string, url?: string | URL | null, land?: RouterHistoryWriteLanding): void;
+export declare function replaceHistoryStateWithoutNotify(data: unknown, unused: string, url?: string | URL | null, land?: RouterHistoryWriteLanding): void;
 /**
  * Save the current scroll position into the current history state.
  * Called before every navigation to enable scroll restoration on back/forward.
@@ -363,6 +425,11 @@ export declare function applyAppRouterScrollFallback(intent: AppRouterScrollInte
  * Navigate to a URL, handling external URLs, hash-only changes, and RSC navigation.
  */
 export declare function navigateClientSide(href: string, mode: "push" | "replace", scroll: boolean, programmaticTransition?: boolean, visibleCommitMode?: NavigationRuntimeVisibleCommitMode): Promise<void>;
+/**
+ * Called by the App Router browser entry for each RSC navigation it runs.
+ * Returns a release callback for the navigation's settlement.
+ */
+export declare function trackAppRouterNavigationInFlight(): () => void;
 /**
  * Public App Router instance, exposed for the browser entry so it can wire
  * `window.next.router` to the same singleton returned from `useRouter()`.