vinext 0.0.53 → 0.0.54

package/dist/shims/navigation.d.ts

@@ -53,8 +53,7 @@ declare function setNavigationContext(ctx: NavigationContext | null): void;
 declare const __basePath: string;
 /** Maximum number of entries in the RSC prefetch cache. */
 declare const MAX_PREFETCH_CACHE_SIZE = 50;
-/** TTL for prefetch cache entries in ms (matches Next.js static prefetch TTL). */
-declare const PREFETCH_CACHE_TTL = 30000;
+declare const PREFETCH_CACHE_TTL: number;
 /** A buffered RSC response stored as an ArrayBuffer for replay. */
 type CachedRscResponse = {
   compatibilityIdHeader?: string | null;

package/dist/shims/navigation.js

@@ -2,11 +2,11 @@ import { stripBasePath } from "../utils/base-path.js";
 import { VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
 import { AppElementsWire } from "../server/app-elements-wire.js";
+import "../server/app-elements.js";
 import { isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
 import { scrollToHashTarget } from "./hash-scroll.js";
 import { getNavigationRuntime, hasAppNavigationRuntime } from "../client/navigation-runtime.js";
 import { notifyAppRouterTransitionStart } from "../client/instrumentation-client-state.js";
-import "../server/app-elements.js";
 import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
 import { createExternalHistoryStatePreservingMetadata } from "../server/app-history-state.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl } from "../server/app-rsc-cache-busting.js";
@@ -140,8 +140,28 @@ const isServer = typeof window === "undefined";
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
 /** Maximum number of entries in the RSC prefetch cache. */
 const MAX_PREFETCH_CACHE_SIZE = 50;
-/** TTL for prefetch cache entries in ms (matches Next.js static prefetch TTL). */
-const PREFETCH_CACHE_TTL = 3e4;
+/**
+* TTL for prefetch cache entries in ms.
+*
+* Mirrors Next.js' `STATIC_STALETIME_MS` derivation. The plugin injects
+* `process.env.__NEXT_CLIENT_ROUTER_STATIC_STALETIME` from
+* `experimental.staleTimes.static` (in seconds) at build time; we convert
+* to ms here.
+*
+* Falls back to vinext's historical default of 30s when the env var is
+* absent (e.g. unit tests that import this module without going through
+* the plugin's `define` pipeline). When the plugin is active and the user
+* 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;
+	const seconds = Number(raw);
+	if (!Number.isFinite(seconds) || seconds < 0) return 3e4;
+	return seconds * 1e3;
+}
+const PREFETCH_CACHE_TTL = resolvePrefetchCacheTtl();
 function getCurrentInterceptionContext() {
 	if (isServer) return null;
 	return stripBasePath(window.location.pathname, __basePath);
@@ -189,7 +209,7 @@ function evictPrefetchCacheIfNeeded() {
 	if (cache.size < 50) return;
 	const now = Date.now();
 	const prefetched = getPrefetchedUrls();
-	for (const [key, entry] of cache) if (now - entry.timestamp >= 3e4) deletePrefetchCacheEntry(cache, prefetched, key, entry, true);
+	for (const [key, entry] of cache) if (now - entry.timestamp >= PREFETCH_CACHE_TTL) deletePrefetchCacheEntry(cache, prefetched, key, entry, true);
 	while (cache.size >= 50) {
 		const oldest = cache.keys().next().value;
 		if (oldest !== void 0) {
@@ -394,7 +414,7 @@ function consumePrefetchResponse(rscUrl, interceptionContext = null, mountedSlot
 	deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, entry, false);
 	if (entry.snapshot) {
 		if ((entry.snapshot.mountedSlotsHeader ?? null) !== mountedSlotsHeader) return null;
-		if (Date.now() - entry.timestamp >= 3e4) return null;
+		if (Date.now() - entry.timestamp >= PREFETCH_CACHE_TTL) return null;
 		return entry.snapshot;
 	}
 	return null;
@@ -807,7 +827,7 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 	if (!scroll) clearAppRouterScrollIntent();
 	const appNavigate = getNavigationRuntime()?.functions.navigate;
 	try {
-		if (appNavigate) await appNavigate(fullHref, 0, "navigate", mode, void 0, programmaticTransition);
+		if (appNavigate) await appNavigate(fullHref, 0, "navigate", mode, void 0, programmaticTransition, void 0, scrollIntent);
 		else {
 			if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", fullHref);
 			else pushHistoryStateWithoutNotify(null, "", fullHref);
@@ -822,6 +842,22 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 		if (fallbackIntent) applyAppRouterScrollFallback(fallbackIntent);
 	}
 }
+let scheduledAppRouterNavigationCount = 0;
+function trackScheduledAppRouterNavigation() {
+	scheduledAppRouterNavigationCount += 1;
+	let released = false;
+	return () => {
+		if (released) return;
+		released = true;
+		scheduledAppRouterNavigationCount = Math.max(0, scheduledAppRouterNavigationCount - 1);
+	};
+}
+function hasScheduledAppRouterNavigation() {
+	return scheduledAppRouterNavigationCount > 0;
+}
+function releaseScheduledAppRouterNavigationAfterCurrentTask(release) {
+	queueMicrotask(release);
+}
 /**
 * Public App Router instance, exposed for the browser entry so it can wire
 * `window.next.router` to the same singleton returned from `useRouter()`.
@@ -834,16 +870,30 @@ const appRouterInstance = {
 	push(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
-		React$1.startTransition(() => {
-			navigateClientSide(href, "push", options?.scroll !== false, true);
-		});
+		const releaseNavigation = trackScheduledAppRouterNavigation();
+		try {
+			React$1.startTransition(() => {
+				navigateClientSide(href, "push", options?.scroll !== false, true);
+			});
+		} catch (error) {
+			releaseNavigation();
+			throw error;
+		}
+		releaseScheduledAppRouterNavigationAfterCurrentTask(releaseNavigation);
 	},
 	replace(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
-		React$1.startTransition(() => {
-			navigateClientSide(href, "replace", options?.scroll !== false, true);
-		});
+		const releaseNavigation = trackScheduledAppRouterNavigation();
+		try {
+			React$1.startTransition(() => {
+				navigateClientSide(href, "replace", options?.scroll !== false, true);
+			});
+		} catch (error) {
+			releaseNavigation();
+			throw error;
+		}
+		releaseScheduledAppRouterNavigationAfterCurrentTask(releaseNavigation);
 	},
 	back() {
 		if (isServer) return;
@@ -856,6 +906,7 @@ const appRouterInstance = {
 	refresh() {
 		if (isServer) return;
 		getNavigationRuntime()?.functions.clearNavigationCaches?.();
+		if (hasScheduledAppRouterNavigation()) return;
 		const rscNavigate = getNavigationRuntime()?.functions.navigate;
 		if (rscNavigate) {
 			const navigate = () => {