vinext 0.0.53 → 0.0.55

package/dist/shims/navigation.js

@@ -2,16 +2,16 @@ 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 { AppRouterContext } from "./internal/app-router-context.js";
 import { isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.js";
-import { scrollToHashTarget } from "./hash-scroll.js";
+import { retryScrollTo, 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";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { AppRouterContext } from "./internal/app-router-context.js";
 import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "./app-router-scroll-state.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
@@ -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,11 +414,24 @@ 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;
 }
+async function consumePrefetchResponseForNavigation(rscUrl, interceptionContext = null, mountedSlotsHeader = null, options) {
+	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
+	const cache = getPrefetchCache();
+	const entry = cache.get(cacheKey);
+	if (!entry) return null;
+	if (entry.cacheForNavigation === false) return null;
+	if (entry.pending !== void 0) {
+		await entry.pending.catch(() => {});
+		if (cache.get(cacheKey) !== entry) return null;
+	}
+	if (options?.shouldConsume?.() === false) return null;
+	return consumePrefetchResponse(rscUrl, interceptionContext, mountedSlotsHeader);
+}
 const _CLIENT_NAV_STATE_KEY = Symbol.for("vinext.clientNavigationState");
 const _MOUNTED_SLOTS_HEADER_KEY = Symbol.for("vinext.mountedSlotsHeader");
 function setMountedSlotsHeader(header) {
@@ -597,9 +630,9 @@ function clearPendingPathname(navId) {
 }
 function getClientParamsSnapshot() {
 	const state = getClientNavigationState();
-	if (state && Object.keys(state.clientParams).length > 0) return state.clientParams;
 	const pagesCtx = _getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.params;
+	if (state && Object.keys(state.clientParams).length > 0) return state.clientParams;
 	return state?.clientParams ?? _EMPTY_PARAMS;
 }
 function getServerParamsSnapshot() {
@@ -766,14 +799,8 @@ function restoreScrollPosition(state) {
 		const { __vinext_scrollX: x, __vinext_scrollY: y } = state;
 		Promise.resolve().then(() => {
 			const pending = window.__VINEXT_RSC_PENDING__ ?? null;
-			if (pending) pending.then(() => {
-				requestAnimationFrame(() => {
-					window.scrollTo(x, y);
-				});
-			});
-			else requestAnimationFrame(() => {
-				window.scrollTo(x, y);
-			});
+			if (pending) pending.then(() => retryScrollTo(x, y));
+			else retryScrollTo(x, y);
 		});
 	}
 }
@@ -785,8 +812,15 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 	if (isExternalUrl(href)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
 		if (localPath == null) {
+			notifyAppRouterTransitionStart(href, mode);
+			const externalNavigate = getNavigationRuntime()?.functions.navigateExternal;
+			if (externalNavigate) {
+				await externalNavigate(href, mode);
+				return;
+			}
 			if (mode === "replace") window.location.replace(href);
 			else window.location.assign(href);
+			await new Promise(() => {});
 			return;
 		}
 		normalizedHref = localPath;
@@ -807,7 +841,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 +856,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 +884,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 +920,7 @@ const appRouterInstance = {
 	refresh() {
 		if (isServer) return;
 		getNavigationRuntime()?.functions.clearNavigationCaches?.();
+		if (hasScheduledAppRouterNavigation()) return;
 		const rscNavigate = getNavigationRuntime()?.functions.navigate;
 		if (rscNavigate) {
 			const navigate = () => {
@@ -1135,10 +1200,44 @@ function unauthorized() {
 * `shims/error-boundary.tsx`.
 */
 function isRedirectError(error) {
-	if (!error || typeof error !== "object" || !("digest" in error) || typeof error.digest !== "string") return false;
+	if (!error || typeof error !== "object") return false;
+	if (!("digest" in error)) return false;
+	if (typeof error.digest !== "string") return false;
 	return error.digest.startsWith("NEXT_REDIRECT;");
 }
 /**
+* Parse a redirect error digest into its URL and type components.
+*
+* Supports two formats:
+*   - vinext's 3-part: `NEXT_REDIRECT;{type};{encoded-url}`
+*   - Next.js's 5-part: `NEXT_REDIRECT;{type};{url};{status};{isClient}`
+*
+* The URL segment is always percent-encoded on the write side
+* (encodeURIComponent is used), so re-joining with ";" for the 5-part
+* format is defensive — it correctly handles any unencoded ";" that
+* might appear in an externally-sourced digest.
+*
+* Returns null for malformed digests that have an empty URL segment, or
+* when the URL contains invalid percent-encoding.
+*/
+function decodeRedirectError(digest) {
+	if (!digest.startsWith("NEXT_REDIRECT;")) return null;
+	const parts = digest.split(";");
+	const encodedTarget = parts.length >= 5 ? parts.slice(2, -2).join(";") : parts[2];
+	if (!encodedTarget) return null;
+	let url;
+	try {
+		url = decodeURIComponent(encodedTarget);
+	} catch {
+		return null;
+	}
+	const type = parts[1] === "push" ? "push" : "replace";
+	return {
+		url,
+		type
+	};
+}
+/**
 * Returns true if the error is a Next.js navigation signal — either a redirect
 * or an HTTP access fallback (notFound / forbidden / unauthorized).
 *
@@ -1279,6 +1378,6 @@ 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, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, 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, setClientParams, setMountedSlotsHeader, setNavigationContext, setPendingPathname, snapshotRscResponse, storePrefetchResponse, unauthorized, unstable_isUnrecognizedActionError, unstable_rethrow, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };
+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, 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.js.map