vinext 0.1.0 → 0.1.2

package/dist/shims/navigation.d.ts

@@ -1,4 +1,5 @@
-import { NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
+import { NavigationRuntimeVisibleCommitMode } from "../client/navigation-runtime.js";
+import { AppRouterInstance, NavigateOptions, PrefetchOptions as PrefetchOptions$1 } from "./internal/app-router-context.js";
 import { ReadonlyURLSearchParams } from "./readonly-url-search-params.js";
 import { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
 import * as React$1 from "react";
@@ -205,6 +206,7 @@ type ClientNavigationRenderSnapshot = {
 };
 declare function getClientNavigationRenderContext(): React$1.Context<ClientNavigationRenderSnapshot | null> | null;
 declare function createClientNavigationRenderSnapshot(href: string, params: Record<string, string | string[]>): ClientNavigationRenderSnapshot;
+declare function createSnapshotPathAndSearch(snapshot: ClientNavigationRenderSnapshot): string;
 declare function setClientParams(params: Record<string, string | string[]>): void;
 declare function replaceClientParamsWithoutNotify(params: Record<string, string | string[]>): void;
 /** Get the current client params (for testing referential stability). */
@@ -225,7 +227,7 @@ declare function clearPendingPathname(navId: number): void;
  * Returns the current pathname.
  * Server: from request context. Client: from window.location.
  */
-declare function usePathname(): string;
+declare function usePathname(): string | null;
 /**
  * Returns the current search params as a read-only URLSearchParams.
  */
@@ -233,7 +235,7 @@ declare function useSearchParams(): ReadonlyURLSearchParams;
 /**
  * Returns the dynamic params for the current route.
  */
-declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T;
+declare function useParams<T extends Record<string, string | string[]> = Record<string, string | string[]>>(): T | null;
 /**
  * Commit pending client navigation state to committed snapshots.
  *
@@ -256,7 +258,7 @@ declare function saveScrollPosition(): void;
 /**
  * Navigate to a URL, handling external URLs, hash-only changes, and RSC navigation.
  */
-declare function navigateClientSide(href: string, mode: "push" | "replace", scroll: boolean, programmaticTransition?: boolean): Promise<void>;
+declare function navigateClientSide(href: string, mode: "push" | "replace", scroll: boolean, programmaticTransition?: boolean, visibleCommitMode?: NavigationRuntimeVisibleCommitMode): Promise<void>;
 /**
  * Public App Router instance, exposed for the browser entry so it can wire
  * `window.next.router` to the same singleton returned from `useRouter()`.
@@ -264,19 +266,7 @@ declare function navigateClientSide(href: string, mode: "push" | "replace", scro
  * Mirrors `publicAppRouterInstance` from Next.js's
  * `packages/next/src/client/components/app-router-instance.ts` (line 392).
  */
-declare const appRouterInstance: {
-  bfcacheId: string;
-  push(href: string, options?: {
-    scroll?: boolean;
-  }): void;
-  replace(href: string, options?: {
-    scroll?: boolean;
-  }): void;
-  back(): void;
-  forward(): void;
-  refresh(): void;
-  prefetch(href: string, options?: PrefetchOptions): void;
-};
+declare const appRouterInstance: AppRouterInstance;
 /**
  * App Router's useRouter — returns push/replace/back/forward/refresh.
  * Different from Pages Router's useRouter (next/router).
@@ -292,6 +282,7 @@ declare function useRouter(): {
   push(href: string, options?: NavigateOptions): void;
   replace(href: string, options?: NavigateOptions): void;
   prefetch(href: string, options?: PrefetchOptions$1): void;
+  experimental_gesturePush?(href: string, options?: NavigateOptions): void;
 };
 /**
  * Returns the active child segment one level below the layout where it's called.
@@ -574,4 +565,4 @@ declare function isDynamicServerError(error: unknown): error is DynamicServerErr
  */
 declare function unstable_rethrow(error: unknown): void;
 //#endregion
-export { BailoutToCSRError, CachedRscResponse, ClientNavigationRenderSnapshot, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, NavigationContext, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, SegmentMap, 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, CachedRscResponse, ClientNavigationRenderSnapshot, DynamicServerError, GLOBAL_ACCESSORS_KEY, HTTP_ERROR_FALLBACK_ERROR_CODE, MAX_PREFETCH_CACHE_SIZE, NavigationContext, PREFETCH_CACHE_TTL, PrefetchCacheEntry, PrefetchOptions, ReadonlyURLSearchParams, RedirectType, SegmentMap, ServerInsertedHTMLContext, UnrecognizedActionError, __basePath, _registerStateAccessors, activateNavigationSnapshot, appRouterInstance, 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, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/navigation.js

@@ -4,7 +4,7 @@ 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 { 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";
@@ -13,6 +13,7 @@ import { resolveManifestNavigationInterceptionContext } from "../server/app-brow
 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 { UnrecognizedActionError, unstable_isUnrecognizedActionError } from "./unrecognized-action-error.js";
@@ -74,6 +75,7 @@ function useChildSegments(parallelRoutesKey = "children") {
 }
 const _READONLY_SEARCH_PARAMS = Symbol("vinext.navigation.readonlySearchParams");
 const _READONLY_SEARCH_PARAMS_SOURCE = Symbol("vinext.navigation.readonlySearchParamsSource");
+const _READONLY_SEARCH_PARAMS_SOURCE_KEY = Symbol("vinext.navigation.readonlySearchParamsSourceKey");
 const GLOBAL_ACCESSORS_KEY = Symbol.for("vinext.navigation.globalAccessors");
 const _GLOBAL_ACCESSORS_KEY = GLOBAL_ACCESSORS_KEY;
 const _GLOBAL_HYDRATION_CONTEXT_KEY = Symbol.for("vinext.navigation.clientHydrationContext");
@@ -87,6 +89,9 @@ function _getClientHydrationContext() {
 function _setClientHydrationContext(ctx) {
 	globalThis[_GLOBAL_HYDRATION_CONTEXT_KEY] = ctx;
 }
+function clearClientHydrationContext() {
+	if (typeof window !== "undefined") _setClientHydrationContext(null);
+}
 let _serverContext = null;
 let _serverInsertedHTMLCallbacks = [];
 let _getServerContext = () => {
@@ -127,6 +132,7 @@ function _registerStateAccessors(accessors) {
 	_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;
@@ -583,7 +589,25 @@ function notifyNavigationListeners() {
 	if (!state) return;
 	for (const fn of state.listeners) fn();
 }
+if (!isServer) globalThis[PAGES_NAVIGATION_NOTIFY_KEY] = notifyNavigationListeners;
 let _cachedEmptyServerSearchParams = null;
+const _readonlyPagesSearchParamsCache = /* @__PURE__ */ new WeakMap();
+let _cachedReadonlyPagesSearchParamsKey = null;
+let _cachedReadonlyPagesSearchParams = null;
+function getReadonlyPagesSearchParams(searchParams) {
+	const cached = _readonlyPagesSearchParamsCache.get(searchParams);
+	if (cached) return cached;
+	const key = searchParams.toString();
+	if (_cachedReadonlyPagesSearchParamsKey === key && _cachedReadonlyPagesSearchParams) {
+		_readonlyPagesSearchParamsCache.set(searchParams, _cachedReadonlyPagesSearchParams);
+		return _cachedReadonlyPagesSearchParams;
+	}
+	const readonly = new ReadonlyURLSearchParams(searchParams);
+	_readonlyPagesSearchParamsCache.set(searchParams, readonly);
+	_cachedReadonlyPagesSearchParamsKey = key;
+	_cachedReadonlyPagesSearchParams = readonly;
+	return readonly;
+}
 /**
 * Get cached pathname snapshot for useSyncExternalStore.
 * Note: Returns cached value from ClientNavigationState, not live window.location.
@@ -593,6 +617,8 @@ let _cachedEmptyServerSearchParams = null;
 * be visible until the next commit.
 */
 function getPathnameSnapshot() {
+	const pagesCtx = _getPagesNavigationContext();
+	if (pagesCtx) return pagesCtx.pathname;
 	return getClientNavigationState()?.cachedPathname ?? "/";
 }
 let _cachedEmptyClientSearchParams = null;
@@ -605,6 +631,9 @@ let _cachedEmptyClientSearchParams = null;
 * be visible until the next commit.
 */
 function getSearchParamsSnapshot() {
+	if (_getServerContext()) return getServerSearchParamsSnapshot();
+	const pagesCtx = _getPagesNavigationContext();
+	if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 	const cached = getClientNavigationState()?.cachedReadonlySearchParams;
 	if (cached) return cached;
 	if (_cachedEmptyClientSearchParams === null) _cachedEmptyClientSearchParams = new ReadonlyURLSearchParams();
@@ -631,7 +660,7 @@ function getServerSearchParamsSnapshot() {
 	const ctx = _getServerContext();
 	if (!ctx) {
 		const pagesCtx = _getPagesNavigationContext();
-		if (pagesCtx) return new ReadonlyURLSearchParams(pagesCtx.searchParams);
+		if (pagesCtx) return getReadonlyPagesSearchParams(pagesCtx.searchParams);
 		if (_cachedEmptyServerSearchParams === null) _cachedEmptyServerSearchParams = new ReadonlyURLSearchParams();
 		return _cachedEmptyServerSearchParams;
 	}
@@ -639,9 +668,15 @@ function getServerSearchParamsSnapshot() {
 	const cached = ctx[_READONLY_SEARCH_PARAMS];
 	const cachedSource = ctx[_READONLY_SEARCH_PARAMS_SOURCE];
 	if (cached && cachedSource === source) return cached;
+	const sourceKey = source.toString();
+	if (cached && ctx[_READONLY_SEARCH_PARAMS_SOURCE_KEY] === sourceKey) {
+		ctx[_READONLY_SEARCH_PARAMS_SOURCE] = source;
+		return cached;
+	}
 	const readonly = new ReadonlyURLSearchParams(source);
 	ctx[_READONLY_SEARCH_PARAMS] = readonly;
 	ctx[_READONLY_SEARCH_PARAMS_SOURCE] = source;
+	ctx[_READONLY_SEARCH_PARAMS_SOURCE_KEY] = sourceKey;
 	return readonly;
 }
 /**
@@ -681,6 +716,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) {
@@ -742,15 +781,18 @@ function clearPendingPathname(navId) {
 }
 function getClientParamsSnapshot() {
 	const state = getClientNavigationState();
+	const ctx = _getServerContext();
+	if (ctx) return ctx.params;
 	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() {
 	const ctx = _getServerContext();
 	if (ctx) return ctx.params;
-	return _getPagesNavigationContext()?.params ?? _EMPTY_PARAMS;
+	const pagesCtx = _getPagesNavigationContext();
+	if (pagesCtx) return pagesCtx.params;
+	return _EMPTY_PARAMS;
 }
 function subscribeToNavigation(cb) {
 	const state = getClientNavigationState();
@@ -768,10 +810,16 @@ function usePathname() {
 	if (isServer) {
 		const ctx = _getServerContext();
 		if (ctx) return ctx.pathname;
-		return _getPagesNavigationContext()?.pathname ?? "/";
+		const pagesCtx = _getPagesNavigationContext();
+		return pagesCtx ? pagesCtx.pathname : "/";
 	}
 	const renderSnapshot = useClientNavigationRenderSnapshot();
-	const pathname = React$1.useSyncExternalStore(subscribeToNavigation, getPathnameSnapshot, () => _getServerContext()?.pathname ?? _getPagesNavigationContext()?.pathname ?? "/");
+	const pathname = React$1.useSyncExternalStore(subscribeToNavigation, getPathnameSnapshot, () => {
+		const ctx = _getServerContext();
+		if (ctx) return ctx.pathname;
+		const pagesCtx = _getPagesNavigationContext();
+		return pagesCtx ? pagesCtx.pathname : "/";
+	});
 	if (renderSnapshot && (getClientNavigationState()?.navigationSnapshotActiveCount ?? 0) > 0) return renderSnapshot.pathname;
 	return pathname;
 }
@@ -801,14 +849,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();
@@ -833,11 +873,13 @@ function commitClientNavigationState(navId, options) {
 	if (!state) return;
 	if ((navId !== void 0 || options?.releaseSnapshot === true) && state.navigationSnapshotActiveCount > 0) state.navigationSnapshotActiveCount -= 1;
 	const urlChanged = syncCommittedUrlStateFromLocation();
+	let paramsChanged = false;
 	if (state.pendingClientParams !== null && state.pendingClientParamsJson !== null) {
 		state.clientParams = state.pendingClientParams;
 		state.clientParamsJson = state.pendingClientParamsJson;
 		state.pendingClientParams = null;
 		state.pendingClientParamsJson = null;
+		paramsChanged = true;
 	}
 	if (state.pendingPathnameNavId === null || navId !== void 0 && state.pendingPathnameNavId === navId) {
 		state.pendingPathname = null;
@@ -845,6 +887,7 @@ function commitClientNavigationState(navId, options) {
 	}
 	const shouldNotify = urlChanged || state.hasPendingNavigationUpdate;
 	state.hasPendingNavigationUpdate = false;
+	if (urlChanged || paramsChanged) clearClientHydrationContext();
 	if (shouldNotify) notifyNavigationListeners();
 }
 function pushHistoryStateWithoutNotify(data, unused, url) {
@@ -917,7 +960,8 @@ function restoreScrollPosition(state) {
 /**
 * 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)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
@@ -938,11 +982,17 @@ async function navigateClientSide(href, mode, scroll, programmaticTransition = f
 	const fullHref = toBrowserNavigationHref(normalizedHref, window.location.href, __basePath);
 	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") {
+		commitHashOnlyHistoryState(fullHref, earlyIntent.mode, earlyIntent.scroll);
 		commitClientNavigationState();
-		if (scroll) scrollToHashTarget(hash);
+		if (earlyIntent.scroll) scrollToHashTarget(earlyIntent.hash);
 		return;
 	}
 	if (hasPendingAppRouterPageRedirect(typeof document === "undefined" ? void 0 : document)) {
@@ -962,7 +1012,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);
@@ -1090,6 +1140,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;
@@ -1512,6 +1576,9 @@ if (!isServer) {
 	const state = getClientNavigationState();
 	if (state && !state.patchInstalled) {
 		state.patchInstalled = true;
+		window.addEventListener("popstate", () => {
+			getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
+		});
 		window.addEventListener("popstate", (event) => {
 			if (!hasAppNavigationRuntime()) {
 				commitClientNavigationState();
@@ -1520,13 +1587,19 @@ if (!isServer) {
 		});
 		window.history.pushState = function patchedPushState(data, unused, url) {
 			state.originalPushState.call(window.history, createExternalHistoryStatePreservingMetadata(data, window.history.state), unused, url);
-			if (state.suppressUrlNotifyCount === 0) commitClientNavigationState();
+			if (state.suppressUrlNotifyCount === 0) {
+				getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
+				commitClientNavigationState();
+			}
 		};
 		window.history.replaceState = function patchedReplaceState(data, unused, url) {
 			state.originalReplaceState.call(window.history, createExternalHistoryStatePreservingMetadata(data, window.history.state), unused, url);
-			if (state.suppressUrlNotifyCount === 0) commitClientNavigationState();
+			if (state.suppressUrlNotifyCount === 0) {
+				getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
+				commitClientNavigationState();
+			}
 		};
 	}
 }
 //#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, 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, useParams, usePathname, useRouter, useSearchParams, useSelectedLayoutSegment, useSelectedLayoutSegments, useServerInsertedHTML };

package/dist/shims/router-state.d.ts

@@ -12,6 +12,7 @@ type SSRContext = {
   pathname: string;
   query: Record<string, string | string[]>;
   asPath: string;
+  navigationIsReady?: boolean;
   locale?: string;
   locales?: string[];
   defaultLocale?: string;

package/dist/shims/router-state.js

@@ -1,6 +1,7 @@
 import { getOrCreateAls } from "./internal/als-registry.js";
 import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 import { _registerRouterStateAccessors } from "./router.js";
+import { registerRoutePatternForWarningAccessor } from "./internal/route-pattern-for-warning.js";
 //#region src/shims/router-state.ts
 /**
 * Server-only Pages Router state backed by AsyncLocalStorage.
@@ -33,5 +34,6 @@ _registerRouterStateAccessors({
 		_getState().ssrContext = ctx;
 	}
 });
+registerRoutePatternForWarningAccessor(() => _getState().ssrContext?.pathname ?? null);
 //#endregion
 export { runWithRouterState };

package/dist/shims/router.d.ts

@@ -61,6 +61,8 @@ type SSRContext = {
   pathname: string;
   query: Record<string, string | string[]>;
   asPath: string;
+  navigationIsReady?: boolean;
+  nextData?: VinextNextData;
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
@@ -84,9 +86,9 @@ declare function _registerRouterStateAccessors(accessors: {
 }): void;
 declare function setSSRContext(ctx: SSRContext | null): void;
 type PagesNavigationContextShape = {
-  pathname: string;
+  pathname: string | null;
   searchParams: URLSearchParams;
-  params: Record<string, string | string[]>;
+  params: Record<string, string | string[]> | null;
 };
 /**
  * Cross-router compat shim source for `next/navigation` hooks.
@@ -105,6 +107,7 @@ type PagesNavigationContextShape = {
  * treat null as "App Router context, use normal app-router state".
  */
 declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
+declare function getPagesNavigationIsReadyFromSerializedState(routePattern: string | undefined, searchString: string, nextData?: VinextNextData): boolean;
 /**
  * useRouter hook - Pages Router compatible.
  *
@@ -173,4 +176,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, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { ExcludeRouterProps, NextRouter, WithRouterProps, _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };