vinext 0.0.51 → 0.0.53

package/dist/shims/navigation.js

@@ -1,15 +1,18 @@
 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 { isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
+import { AppElementsWire } from "../server/app-elements-wire.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 { AppElementsWire } from "../server/app-elements-wire.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";
 //#region src/shims/navigation.ts
@@ -143,6 +146,21 @@ function getCurrentInterceptionContext() {
 	if (isServer) return null;
 	return stripBasePath(window.location.pathname, __basePath);
 }
+function getPrefetchInterceptionContext(targetHref) {
+	if (isServer) return null;
+	let targetUrl;
+	try {
+		targetUrl = new URL(targetHref, window.location.href);
+	} catch {
+		return null;
+	}
+	return resolveManifestNavigationInterceptionContext({
+		basePath: __basePath,
+		currentPathname: window.location.pathname,
+		routeManifest: getNavigationRuntime()?.bootstrap.routeManifest ?? null,
+		targetPathname: targetUrl.pathname
+	});
+}
 function getCurrentNextUrl() {
 	if (isServer) return "/";
 	return window.location.pathname + window.location.search;
@@ -243,7 +261,7 @@ function invalidatePrefetchCache() {
 	const prefetched = getPrefetchedUrls();
 	for (const [cacheKey, entry] of cache) deletePrefetchCacheEntry(cache, prefetched, cacheKey, entry, true);
 	prefetched.clear();
-	if (!isServer) window.__VINEXT_PING_VISIBLE_LINKS__?.();
+	if (!isServer) getNavigationRuntime()?.functions.pingVisibleLinks?.();
 }
 /**
 * Store a prefetched RSC response in the cache by snapshotting it to an
@@ -331,13 +349,16 @@ function restoreRscResponse(cached, copy = true) {
 * Enforces a maximum cache size to prevent unbounded memory growth on
 * link-heavy pages.
 */
-function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, mountedSlotsHeader = null, options) {
+function prefetchRscResponse(rscUrl, fetchPromise, interceptionContext = null, mountedSlotsHeader = null, options, behavior = {}) {
 	const cacheKey = AppElementsWire.encodeCacheKey(rscUrl, interceptionContext);
 	const cache = getPrefetchCache();
 	const prefetched = getPrefetchedUrls();
+	const now = Date.now();
 	const entry = {
+		cacheForNavigation: behavior.cacheForNavigation ?? true,
+		optimisticRouteShell: behavior.optimisticRouteShell === true,
 		outcome: "pending",
-		timestamp: Date.now()
+		timestamp: now
 	};
 	addPrefetchInvalidationCallback(entry, options?.onInvalidate);
 	entry.pending = fetchPromise.then(async (response) => {
@@ -369,6 +390,7 @@ function consumePrefetchResponse(rscUrl, interceptionContext = null, mountedSlot
 	const entry = cache.get(cacheKey);
 	if (!entry) return null;
 	if (entry.pending || entry.outcome !== "cache-seeded") return null;
+	if (entry.cacheForNavigation === false) return null;
 	deletePrefetchCacheEntry(cache, getPrefetchedUrls(), cacheKey, entry, false);
 	if (entry.snapshot) {
 		if ((entry.snapshot.mountedSlotsHeader ?? null) !== mountedSlotsHeader) return null;
@@ -680,7 +702,7 @@ function commitClientNavigationState(navId, options) {
 	state.hasPendingNavigationUpdate = false;
 	if (shouldNotify) {
 		notifyNavigationListeners();
-		window.__VINEXT_PING_VISIBLE_LINKS__?.();
+		getNavigationRuntime()?.functions.pingVisibleLinks?.();
 	}
 }
 function pushHistoryStateWithoutNotify(data, unused, url) {
@@ -708,7 +730,7 @@ function saveScrollPosition() {
 	}, "");
 }
 function commitHashOnlyHistoryState(href, mode, scroll) {
-	const commitAppRouterHashNavigation = window.__VINEXT_RSC_COMMIT_HASH_NAVIGATION__;
+	const commitAppRouterHashNavigation = getNavigationRuntime()?.functions.commitHashNavigation;
 	if (commitAppRouterHashNavigation) {
 		commitAppRouterHashNavigation(href, mode, scroll);
 		return;
@@ -716,12 +738,20 @@ function commitHashOnlyHistoryState(href, mode, scroll) {
 	if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", href);
 	else pushHistoryStateWithoutNotify(null, "", href);
 }
+function applyAppRouterScrollFallback(intent) {
+	if (typeof document === "undefined" || typeof window === "undefined") return;
+	if (intent.hash !== null) {
+		scrollToHashTarget(intent.hash);
+		return;
+	}
+	document.documentElement.scrollTop = 0;
+}
 /**
 * Restore scroll position from a history state object (used on popstate).
 *
 * When an RSC navigation is in flight (back/forward triggers both this
-* handler and the browser entry's popstate handler which calls
-* __VINEXT_RSC_NAVIGATE__), we must wait for the new content to render
+* handler and the browser entry's popstate handler which calls the registered
+* navigation runtime), we must wait for the new content to render
 * before scrolling. Otherwise the user sees old content flash at the
 * restored scroll position.
 *
@@ -773,14 +803,24 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 	}
 	const hashIdx = fullHref.indexOf("#");
 	const hash = hashIdx !== -1 ? fullHref.slice(hashIdx) : "";
-	if (typeof window.__VINEXT_RSC_NAVIGATE__ === "function") await window.__VINEXT_RSC_NAVIGATE__(fullHref, 0, "navigate", mode, void 0, programmaticTransition);
-	else {
-		if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", fullHref);
-		else pushHistoryStateWithoutNotify(null, "", fullHref);
-		commitClientNavigationState();
+	const scrollIntent = scroll ? beginAppRouterScrollIntent(hash || null) : null;
+	if (!scroll) clearAppRouterScrollIntent();
+	const appNavigate = getNavigationRuntime()?.functions.navigate;
+	try {
+		if (appNavigate) await appNavigate(fullHref, 0, "navigate", mode, void 0, programmaticTransition);
+		else {
+			if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", fullHref);
+			else pushHistoryStateWithoutNotify(null, "", fullHref);
+			commitClientNavigationState();
+		}
+	} catch (error) {
+		if (scrollIntent) consumeAppRouterScrollIntent(scrollIntent);
+		throw error;
+	}
+	if (scrollIntent) {
+		const fallbackIntent = consumeAppRouterScrollIntent(scrollIntent);
+		if (fallbackIntent) applyAppRouterScrollFallback(fallbackIntent);
 	}
-	if (scroll) if (hash) scrollToHashTarget(hash);
-	else window.scrollTo(0, 0);
 }
 /**
 * Public App Router instance, exposed for the browser entry so it can wire
@@ -815,10 +855,9 @@ const appRouterInstance = {
 	},
 	refresh() {
 		if (isServer) return;
-		const clearCaches = window.__VINEXT_CLEAR_NAV_CACHES__;
-		if (typeof clearCaches === "function") clearCaches();
-		const rscNavigate = window.__VINEXT_RSC_NAVIGATE__;
-		if (typeof rscNavigate === "function") {
+		getNavigationRuntime()?.functions.clearNavigationCaches?.();
+		const rscNavigate = getNavigationRuntime()?.functions.navigate;
+		if (rscNavigate) {
 			const navigate = () => {
 				rscNavigate(window.location.href, 0, "refresh", void 0, void 0, true);
 			};
@@ -828,6 +867,11 @@ const appRouterInstance = {
 	prefetch(href, options) {
 		assertSafeNavigationUrl(href);
 		if (isServer) return;
+		try {
+			new URL(withBasePath(href, __basePath), window.location.href);
+		} catch {
+			throw new Error(`Cannot prefetch '${href}' because it cannot be converted to a URL.`);
+		}
 		(async () => {
 			let prefetchHref = href;
 			if (isAbsoluteOrProtocolRelativeUrl(href)) {
@@ -836,7 +880,7 @@ const appRouterInstance = {
 				prefetchHref = localPath;
 			}
 			const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
-			const interceptionContext = getCurrentInterceptionContext();
+			const interceptionContext = getPrefetchInterceptionContext(fullHref);
 			const mountedSlotsHeader = getMountedSlotsHeader();
 			const headers = createRscRequestHeaders({ interceptionContext });
 			if (mountedSlotsHeader) headers.set(VINEXT_MOUNTED_SLOTS_HEADER, mountedSlotsHeader);
@@ -1219,7 +1263,7 @@ if (!isServer) {
 	if (state && !state.patchInstalled) {
 		state.patchInstalled = true;
 		window.addEventListener("popstate", (event) => {
-			if (typeof window.__VINEXT_RSC_NAVIGATE__ !== "function") {
+			if (!hasAppNavigationRuntime()) {
 				commitClientNavigationState();
 				restoreScrollPosition(event.state);
 			}
@@ -1235,6 +1279,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, 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, 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 };
 
 //# sourceMappingURL=navigation.js.map