vinext 0.1.1 → 0.1.3

package/dist/shims/navigation.js

@@ -1,20 +1,25 @@
 import { stripBasePath } from "../utils/base-path.js";
 import { VINEXT_DYNAMIC_STALE_TIME_HEADER, VINEXT_MOUNTED_SLOTS_HEADER, VINEXT_PARAMS_HEADER } from "../server/headers.js";
 import { assertSafeNavigationUrl } from "./url-safety.js";
+import { markPprFallbackShellDynamicBoundary } from "./ppr-fallback-shell.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 { resolveHybridClientRouteOwner } from "./internal/hybrid-client-route-owner.js";
+import { isAbsoluteOrProtocolRelativeUrl, toBrowserNavigationHref, toSameOriginAppPath, withBasePath } from "./url-utils.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 { clearAppNavigationFailureTarget, stageAppNavigationFailureTarget } from "../client/app-nav-failure-handler.js";
 import { PUBLIC_INITIAL_BFCACHE_ID } from "../server/app-bfcache-id.js";
 import { resolveManifestNavigationInterceptionContext } from "../server/app-browser-interception-context.js";
 import { createExternalHistoryStatePreservingMetadata, createHashOnlyHistoryStatePreservingNavigationMetadata } from "../server/app-history-state.js";
 import { VINEXT_RSC_COMPATIBILITY_ID_HEADER, createRscRequestHeaders, createRscRequestUrl, stripRscCacheBustingSearchParam } from "../server/app-rsc-cache-busting.js";
 import { hasPendingAppRouterPageRedirect } from "../server/app-browser-mpa-navigation.js";
+import { navigationPlanner } from "../server/navigation-planner.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
-import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent } from "./app-router-scroll-state.js";
+import { getPagesNavigationContext } from "./internal/pages-router-accessor.js";
+import { beginAppRouterScrollIntent, clearAppRouterScrollIntent, consumeAppRouterScrollIntent, getPendingAppRouterScrollIntent } 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
@@ -130,17 +135,7 @@ function _registerStateAccessors(accessors) {
 	_getInsertedHTMLCallbacks = accessors.getInsertedHTMLCallbacks;
 	_clearInsertedHTMLCallbacks = accessors.clearInsertedHTMLCallbacks;
 }
-const PAGES_NAVIGATION_ACCESSOR_KEY = Symbol.for("vinext.navigation.pagesNavigationContextAccessor");
 const PAGES_NAVIGATION_NOTIFY_KEY = Symbol.for("vinext.navigation.pagesNavigationNotify");
-function _getPagesNavigationContext() {
-	const accessor = globalThis[PAGES_NAVIGATION_ACCESSOR_KEY];
-	if (!accessor) return null;
-	try {
-		return accessor();
-	} catch {
-		return null;
-	}
-}
 /**
 * Get the navigation context for the current SSR/RSC render.
 * Reads from AsyncLocalStorage when available (concurrent-safe),
@@ -298,12 +293,12 @@ function findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mounte
 	}
 	return null;
 }
-function hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext = null, mountedSlotsHeader = null) {
+function hasPrefetchCacheEntryForNavigation(rscUrl, interceptionContext = null, mountedSlotsHeader = null, options = {}) {
 	const match = findPrefetchCacheEntryForNavigation(rscUrl, interceptionContext, mountedSlotsHeader);
 	if (match === null) return false;
 	if (match.entry.pending !== void 0) return true;
 	if (resolvePrefetchCacheEntryExpiresAt(match.entry) > Date.now()) return true;
-	deletePrefetchCacheEntry(getPrefetchCache(), getPrefetchedUrls(), match.cacheKey, match.entry, true);
+	deletePrefetchCacheEntry(getPrefetchCache(), getPrefetchedUrls(), match.cacheKey, match.entry, options.notifyInvalidation ?? true);
 	return false;
 }
 /**
@@ -616,7 +611,7 @@ function getReadonlyPagesSearchParams(searchParams) {
 * be visible until the next commit.
 */
 function getPathnameSnapshot() {
-	const pagesCtx = _getPagesNavigationContext();
+	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.pathname;
 	return getClientNavigationState()?.cachedPathname ?? "/";
 }
@@ -631,7 +626,7 @@ let _cachedEmptyClientSearchParams = null;
 */
 function getSearchParamsSnapshot() {
 	if (_getServerContext()) return getServerSearchParamsSnapshot();
-	const pagesCtx = _getPagesNavigationContext();
+	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 	const cached = getClientNavigationState()?.cachedReadonlySearchParams;
 	if (cached) return cached;
@@ -658,7 +653,7 @@ function syncCommittedUrlStateFromLocation() {
 function getServerSearchParamsSnapshot() {
 	const ctx = _getServerContext();
 	if (!ctx) {
-		const pagesCtx = _getPagesNavigationContext();
+		const pagesCtx = getPagesNavigationContext();
 		if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 		if (_cachedEmptyServerSearchParams === null) _cachedEmptyServerSearchParams = new ReadonlyURLSearchParams();
 		return _cachedEmptyServerSearchParams;
@@ -697,6 +692,7 @@ function getClientNavigationRenderContext() {
 	if (!globalState[_CLIENT_NAV_RENDER_CTX_KEY]) globalState[_CLIENT_NAV_RENDER_CTX_KEY] = React$1.createContext(null);
 	return globalState[_CLIENT_NAV_RENDER_CTX_KEY] ?? null;
 }
+/** @internal */
 function useClientNavigationRenderSnapshot() {
 	const ctx = getClientNavigationRenderContext();
 	if (!ctx || typeof React$1.useContext !== "function") return null;
@@ -715,6 +711,10 @@ function createClientNavigationRenderSnapshot(href, params) {
 		params
 	};
 }
+function createSnapshotPathAndSearch(snapshot) {
+	const query = snapshot.searchParams.toString();
+	return query === "" ? snapshot.pathname : `${snapshot.pathname}?${query}`;
+}
 let _fallbackClientParams = _EMPTY_PARAMS;
 let _fallbackClientParamsJson = "{}";
 function setClientParams(params) {
@@ -778,14 +778,14 @@ function getClientParamsSnapshot() {
 	const state = getClientNavigationState();
 	const ctx = _getServerContext();
 	if (ctx) return ctx.params;
-	const pagesCtx = _getPagesNavigationContext();
+	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.params;
 	return state?.clientParams ?? _EMPTY_PARAMS;
 }
 function getServerParamsSnapshot() {
 	const ctx = _getServerContext();
 	if (ctx) return ctx.params;
-	const pagesCtx = _getPagesNavigationContext();
+	const pagesCtx = getPagesNavigationContext();
 	if (pagesCtx) return pagesCtx.params;
 	return _EMPTY_PARAMS;
 }
@@ -803,16 +803,17 @@ function subscribeToNavigation(cb) {
 */
 function usePathname() {
 	if (isServer) {
+		markPprFallbackShellDynamicBoundary();
 		const ctx = _getServerContext();
 		if (ctx) return ctx.pathname;
-		const pagesCtx = _getPagesNavigationContext();
+		const pagesCtx = getPagesNavigationContext();
 		return pagesCtx ? pagesCtx.pathname : "/";
 	}
 	const renderSnapshot = useClientNavigationRenderSnapshot();
 	const pathname = React$1.useSyncExternalStore(subscribeToNavigation, getPathnameSnapshot, () => {
 		const ctx = _getServerContext();
 		if (ctx) return ctx.pathname;
-		const pagesCtx = _getPagesNavigationContext();
+		const pagesCtx = getPagesNavigationContext();
 		return pagesCtx ? pagesCtx.pathname : "/";
 	});
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.pathname;
@@ -822,7 +823,10 @@ function usePathname() {
 * Returns the current search params as a read-only URLSearchParams.
 */
 function useSearchParams() {
-	if (isServer) return getServerSearchParamsSnapshot();
+	if (isServer) {
+		markPprFallbackShellDynamicBoundary();
+		return getServerSearchParamsSnapshot();
+	}
 	const renderSnapshot = useClientNavigationRenderSnapshot();
 	const searchParams = React$1.useSyncExternalStore(subscribeToNavigation, getSearchParamsSnapshot, getServerSearchParamsSnapshot);
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.searchParams;
@@ -832,7 +836,10 @@ function useSearchParams() {
 * Returns the dynamic params for the current route.
 */
 function useParams() {
-	if (isServer) return getServerParamsSnapshot();
+	if (isServer) {
+		markPprFallbackShellDynamicBoundary();
+		return getServerParamsSnapshot();
+	}
 	const renderSnapshot = useClientNavigationRenderSnapshot();
 	const params = React$1.useSyncExternalStore(subscribeToNavigation, getClientParamsSnapshot, getServerParamsSnapshot);
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.params;
@@ -844,14 +851,6 @@ function useParams() {
 function isExternalUrl(href) {
 	return isAbsoluteOrProtocolRelativeUrl(href);
 }
-/**
-* Check if a href is only a hash change relative to the current URL.
-*/
-function isHashOnlyChange(href) {
-	if (typeof window === "undefined") return false;
-	if (href.startsWith("#")) return true;
-	return isHashOnlyBrowserUrlChange(href, window.location.href, __basePath);
-}
 function withSuppressedUrlNotifications(fn) {
 	const state = getClientNavigationState();
 	if (!state) return fn();
@@ -933,8 +932,17 @@ function applyAppRouterScrollFallback(intent) {
 		scrollToHashTarget(intent.hash);
 		return;
 	}
+	if (intent.targetHoistedInHead) return;
 	document.documentElement.scrollTop = 0;
 }
+function scheduleAppRouterScrollFallback(intent) {
+	queueMicrotask(() => {
+		const pendingIntent = getPendingAppRouterScrollIntent();
+		if (pendingIntent === null || pendingIntent.id !== intent.id) return;
+		const fallbackIntent = consumeAppRouterScrollIntent(intent);
+		if (fallbackIntent) applyAppRouterScrollFallback(fallbackIntent);
+	});
+}
 /**
 * Restore scroll position from a history state object (used on popstate).
 *
@@ -961,9 +969,18 @@ function restoreScrollPosition(state) {
 	}
 }
 /**
+* Hard-navigate to a URL via `window.location`, preserving push/replace
+* semantics. Used for URLs the App Router cannot serve (Pages-owned
+* targets in a hybrid build) and for catch-all RSC failures.
+*/
+function hardNavigateTo(fullHref, mode) {
+	if (mode === "replace") window.location.replace(fullHref);
+	else window.location.assign(fullHref);
+}
+/**
 * Navigate to a URL, handling external URLs, hash-only changes, and RSC navigation.
 */
-async function navigateClientSide(href, mode, scroll, programmaticTransition = false) {
+async function navigateClientSide(href, mode, scroll, programmaticTransition = false, visibleCommitMode = "transition") {
 	getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 	let normalizedHref = href;
 	if (isExternalUrl(href)) {
@@ -975,21 +992,38 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 				await externalNavigate(href, mode);
 				return;
 			}
-			if (mode === "replace") window.location.replace(href);
-			else window.location.assign(href);
+			hardNavigateTo(href, mode);
 			await new Promise(() => {});
 			return;
 		}
 		normalizedHref = localPath;
 	}
+	const hybridOwner = resolveHybridClientRouteOwner(normalizedHref, __basePath);
+	if (hybridOwner === "pages" || hybridOwner === "document") {
+		const fullHref = toBrowserNavigationHref(normalizedHref, window.location.href, __basePath);
+		notifyAppRouterTransitionStart(fullHref, mode);
+		if (mode === "push") saveScrollPosition();
+		hardNavigateTo(fullHref, mode);
+		await new Promise(() => {});
+		return;
+	}
 	const fullHref = toBrowserNavigationHref(normalizedHref, window.location.href, __basePath);
+	stageAppNavigationFailureTarget(fullHref);
 	notifyAppRouterTransitionStart(fullHref, mode);
 	if (mode === "push") saveScrollPosition();
-	if (isHashOnlyChange(fullHref)) {
-		const hash = fullHref.includes("#") ? fullHref.slice(fullHref.indexOf("#")) : "";
-		commitHashOnlyHistoryState(fullHref, mode, scroll);
+	const earlyIntent = navigationPlanner.classifyEarlyNavigationIntent({
+		basePath: __basePath,
+		currentHref: window.location.href,
+		mode,
+		scroll,
+		targetHref: fullHref
+	});
+	if (earlyIntent.kind === "sameDocumentScroll") {
+		clearAppRouterScrollIntent();
+		commitHashOnlyHistoryState(fullHref, earlyIntent.mode, earlyIntent.scroll);
+		clearAppNavigationFailureTarget(fullHref);
 		commitClientNavigationState();
-		if (scroll) scrollToHashTarget(hash);
+		if (earlyIntent.scroll) scrollToHashTarget(earlyIntent.hash);
 		return;
 	}
 	if (hasPendingAppRouterPageRedirect(typeof document === "undefined" ? void 0 : document)) {
@@ -998,8 +1032,7 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 			await mpaNavigate(fullHref, mode);
 			return;
 		}
-		if (mode === "replace") window.location.replace(fullHref);
-		else window.location.assign(fullHref);
+		hardNavigateTo(fullHref, mode);
 		await new Promise(() => {});
 		return;
 	}
@@ -1009,7 +1042,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, void 0, scrollIntent);
+		if (appNavigate) await appNavigate(fullHref, 0, "navigate", mode, void 0, programmaticTransition, void 0, scrollIntent, visibleCommitMode);
 		else {
 			if (mode === "replace") replaceHistoryStateWithoutNotify(null, "", fullHref);
 			else pushHistoryStateWithoutNotify(null, "", fullHref);
@@ -1019,10 +1052,7 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 		if (scrollIntent) consumeAppRouterScrollIntent(scrollIntent);
 		throw error;
 	}
-	if (scrollIntent) {
-		const fallbackIntent = consumeAppRouterScrollIntent(scrollIntent);
-		if (fallbackIntent) applyAppRouterScrollFallback(fallbackIntent);
-	}
+	if (scrollIntent) scheduleAppRouterScrollFallback(scrollIntent);
 }
 let scheduledAppRouterNavigationCount = 0;
 function trackScheduledAppRouterNavigation() {
@@ -1114,6 +1144,8 @@ const _appRouter = {
 				if (localPath == null) return;
 				prefetchHref = localPath;
 			}
+			const hybridOwner = resolveHybridClientRouteOwner(prefetchHref, __basePath);
+			if (hybridOwner === "pages" || hybridOwner === "document") return;
 			const fullHref = toBrowserNavigationHref(prefetchHref, window.location.href, __basePath);
 			const interceptionContext = getPrefetchInterceptionContext(fullHref);
 			const mountedSlotsHeader = getMountedSlotsHeader();
@@ -1137,6 +1169,20 @@ const _appRouter = {
 		});
 	}
 };
+if (process.env.__NEXT_GESTURE_TRANSITION) _appRouter.experimental_gesturePush = (href, options) => {
+	assertSafeNavigationUrl(href);
+	if (isServer) return;
+	if (!getNavigationRuntime()?.functions.navigate) return;
+	let appHref = href;
+	if (isAbsoluteOrProtocolRelativeUrl(href)) {
+		const localPath = toSameOriginAppPath(href, __basePath);
+		if (localPath === null) return;
+		appHref = localPath;
+	}
+	const releaseNavigation = trackScheduledAppRouterNavigation();
+	navigateClientSide(appHref, "push", options?.scroll !== false, false, "synchronous");
+	releaseScheduledAppRouterNavigationAfterCurrentTask(releaseNavigation);
+};
 function formatPublicBfcacheId(value) {
 	if (!value || value === "0") return PUBLIC_INITIAL_BFCACHE_ID;
 	return value;
@@ -1203,6 +1249,7 @@ function useSelectedLayoutSegment(parallelRoutesKey) {
 * @param parallelRoutesKey - Which parallel route to read (default: "children")
 */
 function useSelectedLayoutSegments(parallelRoutesKey) {
+	if (isServer) markPprFallbackShellDynamicBoundary();
 	return useChildSegments(parallelRoutesKey);
 }
 /**
@@ -1585,4 +1632,4 @@ 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, 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 };
+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, applyAppRouterScrollFallback, clearPendingPathname, clearServerInsertedHTML, commitClientNavigationState, consumePrefetchResponse, consumePrefetchResponseForNavigation, createCachedRscResponseSnapshot, createClientNavigationRenderSnapshot, createSnapshotPathAndSearch, 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, useClientNavigationRenderSnapshot, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/ppr-fallback-shell.d.ts

@@ -1,10 +1,12 @@
 //#region src/shims/ppr-fallback-shell.d.ts
 type PprFallbackShellState = {
   abortController: AbortController;
+  reactAbortController: AbortController;
   cacheEpoch: number;
   cacheReadyResolvers: Array<() => void>;
   fallbackParamNames: ReadonlySet<string>;
   hasDynamicBoundary: boolean;
+  isFinalRenderStarted: boolean;
   isAbortScheduled: boolean;
   pendingAbortCleanup: (() => void) | null;
   pendingCacheReadyCleanup: (() => void) | null;
@@ -21,9 +23,11 @@ declare function runWithPprFallbackShellState<T>(state: PprFallbackShellState, f
 declare function getPprFallbackShellState(): PprFallbackShellState | null;
 declare function trackPprFallbackShellCacheTask<T>(fn: () => Promise<T>, cacheVariant: string): Promise<T>;
 declare function createPprFallbackShellSuspensePromiseForState<T>(state: PprFallbackShellState, expression: string): Promise<T>;
+declare function markPprFallbackShellDynamicBoundary(): void;
 declare function createPprFallbackShellSuspensePromise<T>(expression: string): Promise<T> | null;
 declare function waitForPprFallbackShellCacheReady(state: PprFallbackShellState): Promise<void>;
 declare function preparePprFallbackShellFinalRender(state: PprFallbackShellState): void;
+declare function beginPprFallbackShellFinalRender(state: PprFallbackShellState): void;
 declare function isPprFallbackShellAbortError(error: unknown): boolean;
 //#endregion
-export { PprFallbackShellState, createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };
+export { PprFallbackShellState, beginPprFallbackShellFinalRender, createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, markPprFallbackShellDynamicBoundary, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };

package/dist/shims/ppr-fallback-shell.js

@@ -43,12 +43,15 @@ function scheduleCacheReadyIfSettled(state) {
 	});
 }
 function scheduleAbortIfReady(state) {
-	if (state.phase !== "final" || !state.hasDynamicBoundary || state.pendingCacheTasks > 0 || state.pendingCacheReadyCleanup !== null || state.isAbortScheduled) return;
+	if (state.phase !== "final" || !state.isFinalRenderStarted || !state.hasDynamicBoundary || state.pendingCacheTasks > 0 || state.pendingCacheReadyCleanup !== null || state.isAbortScheduled) return;
 	state.isAbortScheduled = true;
 	state.pendingAbortCleanup = scheduleAfterTask(() => {
 		state.pendingAbortCleanup = null;
 		state.isAbortScheduled = false;
-		if (state.phase === "final" && state.hasDynamicBoundary && state.pendingCacheTasks === 0 && state.pendingCacheReadyCleanup === null && !state.abortController.signal.aborted) state.abortController.abort();
+		if (state.phase === "final" && state.hasDynamicBoundary && state.pendingCacheTasks === 0 && state.pendingCacheReadyCleanup === null && !state.reactAbortController.signal.aborted) {
+			state.reactAbortController.abort();
+			state.abortController.abort();
+		}
 	});
 }
 function completeCacheTask(state, task) {
@@ -64,12 +67,15 @@ function ignoreCacheTask(state, task) {
 	completeCacheTask(state, task);
 }
 function createPprFallbackShellState(options) {
+	const abortController = new AbortController();
 	return {
-		abortController: new AbortController(),
+		abortController,
+		reactAbortController: abortController,
 		cacheEpoch: 0,
 		cacheReadyResolvers: [],
 		fallbackParamNames: new Set(options.fallbackParamNames),
 		hasDynamicBoundary: false,
+		isFinalRenderStarted: false,
 		isAbortScheduled: false,
 		pendingAbortCleanup: null,
 		pendingCacheReadyCleanup: null,
@@ -107,14 +113,22 @@ function trackPprFallbackShellCacheTask(fn, cacheVariant) {
 	});
 }
 function createPprFallbackShellSuspensePromiseForState(state, expression) {
-	state.hasDynamicBoundary = true;
-	for (const task of pprFallbackShellCacheTaskStackAls.getStore() ?? []) ignoreCacheTask(state, task);
-	scheduleCacheReadyIfSettled(state);
+	markPprFallbackShellDynamicBoundaryForState(state);
 	if (state.phase === "final") scheduleAbortIfReady(state);
 	const promise = makeHangingPromise(state.abortController.signal, state.routePattern, expression);
 	promise.catch(noop);
 	return promise;
 }
+function markPprFallbackShellDynamicBoundaryForState(state) {
+	state.hasDynamicBoundary = true;
+	for (const task of pprFallbackShellCacheTaskStackAls.getStore() ?? []) ignoreCacheTask(state, task);
+	scheduleCacheReadyIfSettled(state);
+}
+function markPprFallbackShellDynamicBoundary() {
+	const state = getPprFallbackShellState();
+	if (state === null || state.fallbackParamNames.size === 0) return;
+	markPprFallbackShellDynamicBoundaryForState(state);
+}
 function createPprFallbackShellSuspensePromise(expression) {
 	const state = getPprFallbackShellState();
 	if (state === null) return null;
@@ -134,16 +148,23 @@ function preparePprFallbackShellFinalRender(state) {
 		state.pendingAbortCleanup = null;
 	}
 	state.abortController = new AbortController();
+	state.reactAbortController = new AbortController();
 	state.cacheEpoch++;
 	state.cacheReadyResolvers.length = 0;
 	state.hasDynamicBoundary = false;
+	state.isFinalRenderStarted = false;
 	state.isAbortScheduled = false;
 	state.pendingCacheTasks = 0;
 	state.phase = "final";
 }
+function beginPprFallbackShellFinalRender(state) {
+	if (state.phase !== "final") return;
+	state.isFinalRenderStarted = true;
+	scheduleAbortIfReady(state);
+}
 function isPprFallbackShellAbortError(error) {
 	if (typeof DOMException !== "undefined" && error instanceof DOMException && error.name === "AbortError") return true;
 	return error instanceof Error && error.name === "HangingPromiseRejectionError";
 }
 //#endregion
-export { createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };
+export { beginPprFallbackShellFinalRender, createPprFallbackShellState, createPprFallbackShellSuspensePromise, createPprFallbackShellSuspensePromiseForState, getPprFallbackShellState, isPprFallbackShellAbortError, markPprFallbackShellDynamicBoundary, preparePprFallbackShellFinalRender, runWithPprFallbackShellState, trackPprFallbackShellCacheTask, waitForPprFallbackShellCacheReady };

package/dist/shims/router.d.ts

@@ -36,6 +36,7 @@ type UrlObject = {
   query?: UrlQuery;
 };
 type TransitionOptions = {
+  _h?: 1;
   shallow?: boolean;
   scroll?: boolean;
   locale?: string | false;
@@ -108,6 +109,7 @@ type PagesNavigationContextShape = {
  */
 declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
 declare function getPagesNavigationIsReadyFromSerializedState(routePattern: string | undefined, searchString: string, nextData?: VinextNextData): boolean;
+declare function markPagesRouterReady(): boolean;
 /**
  * useRouter hook - Pages Router compatible.
  *
@@ -122,8 +124,17 @@ declare function useRouter(): NextRouter;
  * The provider owns the reactive Pages Router snapshot so next/router and
  * next/compat/router consumers share one context value instead of each hook
  * installing its own global URL-change listener.
+ *
+ * The PagesRouterCommitBoundary exists for client navigations: its layout
+ * callback runs scroll restoration at commit time and resolves the navigation
+ * at the same root-commit boundary Next.js awaits before routeChangeComplete.
+ * Its onError rejection drives the hard-navigation fallback in runNavigateClient.
+ * The same boundary intentionally also wraps SSR and initial hydration, where
+ * callbacks default to noopCommit: a hydration-time render error is caught
+ * here (React still console.error's it) instead of propagating, matching the
+ * navigation-path containment.
  */
-declare function wrapWithRouterContext(element: ReactElement): ReactElement;
+declare function wrapWithRouterContext(element: ReactElement, onCommit?: () => void, onError?: (error: Error) => void): ReactElement;
 /**
  * Props injected by `withRouter` into the wrapped component.
  *
@@ -176,4 +187,4 @@ declare const RouterMethods: {
 };
 declare const Router: typeof RouterMethods & Omit<NextRouter, keyof typeof RouterMethods>;
 //#endregion
-export { ExcludeRouterProps, NextRouter, WithRouterProps, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, WithRouterProps, markPagesRouterReady as _markPagesRouterReady, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };