vinext 0.1.0 → 0.1.1

package/dist/shims/navigation.js

@@ -74,6 +74,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 +88,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 +131,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 +588,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 +616,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 +630,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 +659,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 +667,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;
 }
 /**
@@ -742,15 +776,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 +805,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;
 }
@@ -833,11 +876,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 +890,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) {
@@ -918,6 +964,7 @@ function restoreScrollPosition(state) {
 * Navigate to a URL, handling external URLs, hash-only changes, and RSC navigation.
 */
 async function navigateClientSide(href, mode, scroll, programmaticTransition = false) {
+	getNavigationRuntime()?.functions.notifyLinkNavigationStart?.();
 	let normalizedHref = href;
 	if (isExternalUrl(href)) {
 		const localPath = toSameOriginAppPath(href, __basePath);
@@ -1512,6 +1559,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,11 +1570,17 @@ 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();
+			}
 		};
 	}
 }

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 };

package/dist/shims/router.js

@@ -247,15 +247,19 @@ function _registerRouterStateAccessors(accessors) {
 function setSSRContext(ctx) {
 	_setSSRContextImpl(ctx);
 }
+const PAGES_NAVIGATION_NOTIFY_KEY = Symbol.for("vinext.navigation.pagesNavigationNotify");
 let _cachedClientPagesNavCtx = null;
 let _cachedClientPagesNavCtxKey = null;
-function _buildClientPagesNavigationContext(routePattern, resolvedPath, searchString) {
-	const cacheKey = `${routePattern}|${resolvedPath}|${searchString}`;
+function _buildClientPagesNavigationContext(routePattern, resolvedPath, searchString, isReady, nextData) {
+	const cacheKey = `${isReady ? "1" : "0"}|${routePattern}|${resolvedPath}|${searchString}`;
 	if (_cachedClientPagesNavCtxKey === cacheKey && _cachedClientPagesNavCtx) return _cachedClientPagesNavCtx;
+	const searchParams = isReady ? new URLSearchParams(searchString) : new URLSearchParams();
+	const params = isReady ? extractRouteParamsFromPath(routePattern, resolvedPath) ?? getRouteParamsFromQuery(routePattern, nextData?.query ?? {}) ?? {} : null;
+	const isAutoExportDynamic = nextData?.autoExport === true && extractRouteParamNames(routePattern).length > 0;
 	const ctx = {
-		pathname: resolvedPath,
-		searchParams: new URLSearchParams(searchString),
-		params: routePattern ? extractRouteParamsFromPath(routePattern, resolvedPath) ?? {} : {}
+		pathname: resolvePagesNavigationPathname(resolvedPath, nextData?.isFallback === true, isAutoExportDynamic, isReady),
+		searchParams,
+		params
 	};
 	_cachedClientPagesNavCtx = ctx;
 	_cachedClientPagesNavCtxKey = cacheKey;
@@ -284,27 +288,33 @@ function getPagesNavigationContext() {
 		if (!ssrCtx) return null;
 		const cached = _ssrPagesNavCtxCache.get(ssrCtx);
 		if (cached) return cached;
-		let searchParams;
+		let searchString = "";
 		let resolvedPath;
 		try {
 			const url = new URL(ssrCtx.asPath, "http://_");
-			searchParams = url.searchParams;
+			searchString = url.search;
 			resolvedPath = url.pathname;
 		} catch {
-			searchParams = new URLSearchParams();
 			resolvedPath = ssrCtx.pathname;
 		}
-		const params = extractRouteParamsFromPath(ssrCtx.pathname, resolvedPath) ?? {};
+		const isReady = ssrCtx.navigationIsReady ?? true;
+		const searchParams = isReady ? new URLSearchParams(searchString) : new URLSearchParams();
+		const params = isReady ? extractRouteParamsFromPath(ssrCtx.pathname, resolvedPath) ?? getRouteParamsFromQuery(ssrCtx.pathname, ssrCtx.query) ?? {} : null;
+		const isAutoExportDynamic = ssrCtx.nextData?.autoExport === true && extractRouteParamNames(ssrCtx.pathname).length > 0;
 		const ctx = {
-			pathname: resolvedPath,
+			pathname: resolvePagesNavigationPathname(resolvedPath, ssrCtx.isFallback === true, isAutoExportDynamic, isReady),
 			searchParams,
 			params
 		};
 		_ssrPagesNavCtxCache.set(ssrCtx, ctx);
 		return ctx;
 	}
+	if (!isPagesRouterDocumentActive()) return null;
 	const resolvedPath = stripBasePath(window.location.pathname, __basePath);
-	return _buildClientPagesNavigationContext(window.__NEXT_DATA__?.page ?? "", resolvedPath, window.location.search);
+	const nextData = window.__NEXT_DATA__;
+	const pattern = resolvePagesRoutePatternForPath(nextData?.page, resolvedPath);
+	if (!pattern) return null;
+	return _buildClientPagesNavigationContext(pattern, resolvedPath, window.location.search, isPagesRouterReady(), nextData);
 }
 /**
 * Extract param names from a Next.js route pattern.
@@ -321,9 +331,52 @@ function extractRouteParamNames(pattern) {
 	for (const m of colonMatches) names.push(m[1]);
 	return names;
 }
+/**
+* Resolve the `pathname` snapshot for the Pages Router navigation context.
+* Shared by the client and SSR branches of `getPagesNavigationContext` so both
+* runtimes derive identical null-ness — diverging here would reintroduce a
+* hydration mismatch. Returns `null` for a `getStaticPaths` fallback shell or a
+* pre-ready auto-export dynamic route (the live path is published once the
+* client router becomes ready).
+*/
+function resolvePagesNavigationPathname(resolvedPath, isFallback, isAutoExportDynamic, isReady) {
+	return isFallback || isAutoExportDynamic && !isReady ? null : resolvedPath;
+}
+let _cachedPagesRoutePatternKey = null;
+let _cachedPagesRoutePattern;
+function resolvePagesRoutePatternForPath(nextDataPage, resolvedPath) {
+	if (nextDataPage && extractRouteParamNames(nextDataPage).length > 0) return nextDataPage;
+	const cacheKey = `${nextDataPage ?? ""}|${resolvedPath}`;
+	if (_cachedPagesRoutePatternKey === cacheKey) return _cachedPagesRoutePattern;
+	let resolved = nextDataPage;
+	for (const pattern of window.__VINEXT_PAGE_PATTERNS__ ?? []) if (matchRoutePattern(splitPathSegments(resolvedPath), routePatternParts(pattern))) {
+		resolved = pattern;
+		break;
+	}
+	_cachedPagesRoutePatternKey = cacheKey;
+	_cachedPagesRoutePattern = resolved;
+	return resolved;
+}
 function extractRouteParamsFromPath(pattern, pathname) {
 	return matchRoutePattern(splitPathSegments(pathname), routePatternParts(pattern));
 }
+function getRouteParamsFromQuery(pattern, query) {
+	const names = extractRouteParamNames(pattern);
+	if (names.length === 0) return null;
+	const params = {};
+	let hasParam = false;
+	for (const name of names) {
+		const value = query[name];
+		if (typeof value === "string") {
+			params[name] = value;
+			hasParam = true;
+		} else if (Array.isArray(value)) {
+			params[name] = [...value];
+			hasParam = true;
+		}
+	}
+	return hasParam ? params : null;
+}
 function getRouteQueryFromNextData(nextData, resolvedPath) {
 	const routeQuery = {};
 	if (!nextData?.query || !nextData.page) return routeQuery;
@@ -372,6 +425,47 @@ function getPathnameAndQuery() {
 		asPath: resolvedPath + window.location.search + window.location.hash
 	};
 }
+function getPagesNavigationIsReadyFromSerializedState(routePattern, searchString, nextData) {
+	if (!routePattern) return true;
+	if (nextData?.gssp === true || nextData?.gip === true || nextData?.isExperimentalCompile === true || nextData?.appGip === true && nextData.gsp !== true) return true;
+	const autoExportDynamic = nextData?.autoExport === true && extractRouteParamNames(routePattern).length > 0;
+	const hasSearch = searchString.length > 0;
+	const hasRewrites = nextData?.__vinext?.hasRewrites === true;
+	return !autoExportDynamic && !hasSearch && !hasRewrites;
+}
+function shouldDeferInitialPagesRouterReady() {
+	if (typeof window === "undefined") return false;
+	const nextData = window.__NEXT_DATA__;
+	if (!nextData) return false;
+	return !getPagesNavigationIsReadyFromSerializedState(nextData.page, window.location.search, nextData);
+}
+let _pagesRouterReady = typeof window === "undefined" ? true : !shouldDeferInitialPagesRouterReady();
+function isPagesRouterReady() {
+	return _pagesRouterReady;
+}
+function isPagesRouterDocumentActive() {
+	if (typeof window === "undefined") return true;
+	if (window.__VINEXT_PAGE_LOADERS__) return true;
+	if (window.next?.appDir === true) return false;
+	if (window.next?.router) return true;
+	return Boolean(window.__VINEXT_APP__ || window.__VINEXT_APP_LOADER__);
+}
+function markPagesRouterReady() {
+	if (typeof window === "undefined" || _pagesRouterReady) return false;
+	_pagesRouterReady = true;
+	return true;
+}
+function getRouterSnapshot() {
+	const isReady = typeof window === "undefined" ? _getSSRContext()?.navigationIsReady ?? true : isPagesRouterReady();
+	return {
+		...getPathnameAndQuery(),
+		isReady
+	};
+}
+function notifyNextNavigationPagesContext() {
+	const notify = globalThis[PAGES_NAVIGATION_NOTIFY_KEY];
+	notify?.();
+}
 /**
 * Error thrown when a navigation is superseded by a newer one.
 * Matches Next.js's convention of an Error with `.cancelled = true`.
@@ -779,7 +873,7 @@ async function runNavigateClient(fullUrl, resolvedUrl, fetchUrl = fullUrl, optio
 * and a set of navigation methods. Shared by the Pages Router context provider
 * and tests so the public router shape stays in sync.
 */
-function buildRouterValue(pathname, query, asPath, methods) {
+function buildRouterValue(pathname, query, asPath, isReady, methods) {
 	const _ssrState = _getSSRContext();
 	const nextData = typeof window !== "undefined" ? window.__NEXT_DATA__ : void 0;
 	const locale = typeof window === "undefined" ? _ssrState?.locale : window.__VINEXT_LOCALE__;
@@ -796,7 +890,7 @@ function buildRouterValue(pathname, query, asPath, methods) {
 		locales,
 		defaultLocale,
 		domainLocales,
-		isReady: true,
+		isReady,
 		isPreview: false,
 		isFallback: typeof window !== "undefined" ? nextData?.isFallback === true : _ssrState?.isFallback === true,
 		...methods,
@@ -815,6 +909,7 @@ function stripHash(url) {
 }
 /** Notify in-page listeners (e.g. useRouter hooks) that navigation occurred. */
 function dispatchNavigateEvent() {
+	notifyNextNavigationPagesContext();
 	window.dispatchEvent(new CustomEvent("vinext:navigate"));
 }
 /**
@@ -984,15 +1079,25 @@ function useRouter() {
 	return router;
 }
 function PagesRouterProvider({ children }) {
-	const [{ pathname, query, asPath }, setState] = useState(getPathnameAndQuery);
+	const [{ pathname, query, asPath, isReady }, setState] = useState(getRouterSnapshot);
 	useEffect(() => {
 		const onNavigate = ((_e) => {
-			setState(getPathnameAndQuery());
+			setState(getRouterSnapshot());
 		});
 		window.addEventListener("vinext:navigate", onNavigate);
-		return () => window.removeEventListener("vinext:navigate", onNavigate);
+		let cancelled = false;
+		const readyTimer = window.setTimeout(() => {
+			if (cancelled || !markPagesRouterReady()) return;
+			setState(getRouterSnapshot());
+			notifyNextNavigationPagesContext();
+		}, 0);
+		return () => {
+			cancelled = true;
+			window.clearTimeout(readyTimer);
+			window.removeEventListener("vinext:navigate", onNavigate);
+		};
 	}, []);
-	const router = useMemo(() => buildRouterValue(pathname, query, asPath, {
+	const router = useMemo(() => buildRouterValue(pathname, query, asPath, isReady, {
 		push: Router.push,
 		replace: Router.replace,
 		back: Router.back,
@@ -1002,7 +1107,8 @@ function PagesRouterProvider({ children }) {
 	}), [
 		pathname,
 		query,
-		asPath
+		asPath,
+		isReady
 	]);
 	const appRouter = useMemo(() => ({
 		bfcacheId: "0",
@@ -1215,8 +1321,9 @@ const Router = Object.defineProperties(RouterMethods, {
 	},
 	isReady: {
 		enumerable: true,
-		value: true,
-		writable: false
+		get() {
+			return isPagesRouterReady();
+		}
 	},
 	isPreview: {
 		enumerable: true,
@@ -1235,4 +1342,4 @@ if (typeof window !== "undefined") installWindowNext({ router: Router });
 const _PAGES_NAVIGATION_ACCESSOR_KEY = Symbol.for("vinext.navigation.pagesNavigationContextAccessor");
 globalThis[_PAGES_NAVIGATION_ACCESSOR_KEY] = getPagesNavigationContext;
 //#endregion
-export { _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, getPagesNavigationIsReadyFromSerializedState, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };

package/dist/utils/client-build-manifest.d.ts

@@ -4,11 +4,18 @@ import { BuildManifestChunk } from "./lazy-chunks.js";
 type ClientBuildManifest = Record<string, BuildManifestChunk>;
 declare function readClientBuildManifest(manifestPath: string): ClientBuildManifest | undefined;
 declare function findClientEntryFileFromManifest(buildManifest: ClientBuildManifest, assetBase: string): string | undefined;
+declare function findPagesClientEntryFileFromManifest(buildManifest: ClientBuildManifest, assetBase: string): string | undefined;
 declare function findClientEntryFile(options: {
   buildManifest?: ClientBuildManifest;
   clientDir: string;
   assetsSubdir: string;
   assetBase: string;
 }): string | undefined;
+declare function findPagesClientEntryFile(options: {
+  buildManifest?: ClientBuildManifest;
+  clientDir: string;
+  assetsSubdir: string;
+  assetBase: string;
+}): string | undefined;
 //#endregion
-export { findClientEntryFile, findClientEntryFileFromManifest, readClientBuildManifest };
+export { findClientEntryFile, findClientEntryFileFromManifest, findPagesClientEntryFile, findPagesClientEntryFileFromManifest, readClientBuildManifest };

package/dist/utils/client-build-manifest.js

@@ -3,7 +3,8 @@ import { manifestFileWithBase } from "./manifest-paths.js";
 import fs from "node:fs";
 import path from "node:path";
 //#region src/utils/client-build-manifest.ts
-const CLIENT_ENTRY_MARKERS = ["vinext-client-entry", "vinext-app-browser-entry"];
+const PAGES_CLIENT_ENTRY_MARKERS = ["vinext-client-entry"];
+const CLIENT_ENTRY_MARKERS = [...PAGES_CLIENT_ENTRY_MARKERS, "vinext-app-browser-entry"];
 function readClientBuildManifest(manifestPath) {
 	if (!fs.existsSync(manifestPath)) return void 0;
 	try {
@@ -32,21 +33,45 @@ function readClientBuildManifest(manifestPath) {
 	}
 }
 function findClientEntryFileFromManifest(buildManifest, assetBase) {
+	return findEntryFileFromManifest(buildManifest, assetBase, CLIENT_ENTRY_MARKERS, true);
+}
+function findPagesClientEntryFileFromManifest(buildManifest, assetBase) {
+	return findEntryFileFromManifest(buildManifest, assetBase, PAGES_CLIENT_ENTRY_MARKERS, false);
+}
+function findEntryFileFromManifest(buildManifest, assetBase, markers, fallbackToFirstEntry) {
 	const entries = Object.values(buildManifest).filter((entry) => entry.isEntry && entry.file);
-	const chosen = entries.find((entry) => CLIENT_ENTRY_MARKERS.some((marker) => entry.file.includes(marker))) ?? entries[0];
+	for (const marker of markers) {
+		const markedEntry = entries.find((entry) => entry.file.includes(marker));
+		if (markedEntry) return manifestFileWithBase(markedEntry.file, assetBase);
+	}
+	const chosen = fallbackToFirstEntry ? entries[0] : void 0;
 	return chosen ? manifestFileWithBase(chosen.file, assetBase) : void 0;
 }
 function findClientEntryFileInAssetsDir(options) {
 	const assetsDir = path.join(options.clientDir, options.assetsSubdir);
 	if (!fs.existsSync(assetsDir)) return void 0;
-	const entry = fs.readdirSync(assetsDir).find((file) => CLIENT_ENTRY_MARKERS.some((marker) => file.includes(marker)) && file.endsWith(".js"));
+	const files = fs.readdirSync(assetsDir);
+	let entry;
+	for (const marker of options.markers) {
+		entry = files.find((file) => file.includes(marker) && file.endsWith(".js"));
+		if (entry) break;
+	}
 	return entry ? manifestFileWithBase(`${options.assetsSubdir}/${entry}`, options.assetBase) : void 0;
 }
 function findClientEntryFile(options) {
-	return (options.buildManifest ? findClientEntryFileFromManifest(options.buildManifest, options.assetBase) : void 0) ?? findClientEntryFileInAssetsDir(options);
+	return (options.buildManifest ? findClientEntryFileFromManifest(options.buildManifest, options.assetBase) : void 0) ?? findClientEntryFileInAssetsDir({
+		...options,
+		markers: CLIENT_ENTRY_MARKERS
+	});
+}
+function findPagesClientEntryFile(options) {
+	return (options.buildManifest ? findPagesClientEntryFileFromManifest(options.buildManifest, options.assetBase) : void 0) ?? findClientEntryFileInAssetsDir({
+		...options,
+		markers: PAGES_CLIENT_ENTRY_MARKERS
+	});
 }
 function readStringArray(value) {
 	return Array.isArray(value) && value.every((item) => typeof item === "string") ? value : void 0;
 }
 //#endregion
-export { findClientEntryFile, findClientEntryFileFromManifest, readClientBuildManifest };
+export { findClientEntryFile, findClientEntryFileFromManifest, findPagesClientEntryFile, findPagesClientEntryFileFromManifest, readClientBuildManifest };

package/dist/utils/client-entry-manifest.d.ts

@@ -0,0 +1,11 @@
+//#region src/utils/client-entry-manifest.d.ts
+declare const VINEXT_CLIENT_ENTRY_MANIFEST = "vinext-client-entry-manifest.json";
+type ClientEntryManifest = {
+  pagesClientEntry?: string;
+  appBrowserEntry?: string;
+};
+declare function readClientEntryManifest(clientDir: string): ClientEntryManifest | undefined;
+declare function findClientEntryFileFromVinextManifest(manifest: ClientEntryManifest | undefined, assetBase: string): string | undefined;
+declare function findPagesClientEntryFileFromVinextManifest(manifest: ClientEntryManifest | undefined, assetBase: string): string | undefined;
+//#endregion
+export { ClientEntryManifest, VINEXT_CLIENT_ENTRY_MANIFEST, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest };

package/dist/utils/client-entry-manifest.js

@@ -0,0 +1,29 @@
+import { isUnknownRecord } from "./record.js";
+import { manifestFileWithBase } from "./manifest-paths.js";
+import fs from "node:fs";
+import path from "node:path";
+//#region src/utils/client-entry-manifest.ts
+const VINEXT_CLIENT_ENTRY_MANIFEST = "vinext-client-entry-manifest.json";
+function readClientEntryManifest(clientDir) {
+	const manifestPath = path.join(clientDir, VINEXT_CLIENT_ENTRY_MANIFEST);
+	if (!fs.existsSync(manifestPath)) return void 0;
+	try {
+		const value = JSON.parse(fs.readFileSync(manifestPath, "utf-8"));
+		if (!isUnknownRecord(value)) return void 0;
+		const manifest = {};
+		if (typeof value.pagesClientEntry === "string") manifest.pagesClientEntry = value.pagesClientEntry;
+		if (typeof value.appBrowserEntry === "string") manifest.appBrowserEntry = value.appBrowserEntry;
+		return manifest.pagesClientEntry || manifest.appBrowserEntry ? manifest : void 0;
+	} catch {
+		return;
+	}
+}
+function findClientEntryFileFromVinextManifest(manifest, assetBase) {
+	const entry = manifest?.pagesClientEntry ?? manifest?.appBrowserEntry;
+	return entry ? manifestFileWithBase(entry, assetBase) : void 0;
+}
+function findPagesClientEntryFileFromVinextManifest(manifest, assetBase) {
+	return manifest?.pagesClientEntry ? manifestFileWithBase(manifest.pagesClientEntry, assetBase) : void 0;
+}
+//#endregion
+export { VINEXT_CLIENT_ENTRY_MANIFEST, findClientEntryFileFromVinextManifest, findPagesClientEntryFileFromVinextManifest, readClientEntryManifest };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vinext",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Run Next.js apps on Vite. Drop-in replacement for the next CLI.",
   "license": "MIT",
   "repository": {
@@ -49,6 +49,10 @@
       "types": "./dist/server/request-pipeline.d.ts",
       "import": "./dist/server/request-pipeline.js"
     },
+    "./server/pages-request-pipeline": {
+      "types": "./dist/server/pages-request-pipeline.d.ts",
+      "import": "./dist/server/pages-request-pipeline.js"
+    },
     "./server/app-router-entry": {
       "types": "./dist/server/app-router-entry.d.ts",
       "import": "./dist/server/app-router-entry.js"