vinext 0.0.50 → 0.0.52

package/dist/shims/router.js

@@ -1,11 +1,17 @@
 import { stripBasePath } from "../utils/base-path.js";
+import { assertSafeNavigationUrl } from "./url-safety.js";
+import { addQueryParam, appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
+import { matchRoutePattern, routePatternParts } from "../routing/route-pattern.js";
 import { RouterContext } from "./internal/router-context.js";
+import { applyVinextLocaleGlobals, extractVinextNextDataJson, parseVinextNextDataJson } from "../client/vinext-next-data.js";
 import { isValidModulePath } from "../client/validate-module-path.js";
 import { installWindowNext } from "../client/window-next.js";
-import { isHashOnlyBrowserUrlChange, toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
-import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
-import { addQueryParam, appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
-import { createElement, useCallback, useEffect, useMemo, useState } from "react";
+import { isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, normalizePathTrailingSlash, toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
+import { addLocalePrefix, getDomainLocaleUrl, getLocalePathPrefix } from "../utils/domain-locale.js";
+import { scrollToHashTarget } from "./hash-scroll.js";
+import { setPagesRouterPopStateHandler } from "./pages-router-runtime.js";
+import { getCurrentBrowserLocale } from "./client-locale.js";
+import { createElement, useContext, useEffect, useMemo, useState } from "react";
 //#region src/shims/router.ts
 /**
 * next/router shim
@@ -16,6 +22,8 @@ import { createElement, useCallback, useEffect, useMemo, useState } from "react"
 */
 /** basePath from next.config.js, injected by the plugin at build time */
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
+/** trailingSlash from next.config.js, injected by the plugin at build time */
+const __trailingSlash = process.env.__VINEXT_TRAILING_SLASH === "true";
 function createRouterEvents() {
 	const listeners = /* @__PURE__ */ new Map();
 	return {
@@ -51,6 +59,18 @@ function resolveUrl(url) {
 function resolveNavigationTarget(url, as, locale) {
 	return applyNavigationLocale(as ?? resolveUrl(url), locale);
 }
+function getCurrentUrlLocale() {
+	return getCurrentBrowserLocale({
+		basePath: __basePath,
+		domainLocales: getDomainLocales(),
+		hostname: getCurrentHostname()
+	});
+}
+function resolveTransitionLocale(locale) {
+	if (typeof window === "undefined") return void 0;
+	if (locale === false) return window.__VINEXT_DEFAULT_LOCALE__;
+	return locale ?? getCurrentUrlLocale();
+}
 function getDomainLocales() {
 	return window.__NEXT_DATA__?.domainLocales;
 }
@@ -70,14 +90,31 @@ function getDomainLocalePath(url, locale) {
 */
 function applyNavigationLocale(url, locale) {
 	if (!locale || typeof window === "undefined") return url;
-	if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//")) return url;
+	if (isAbsoluteOrProtocolRelativeUrl(url)) return url;
+	if (getLocalePathPrefix(url, window.__VINEXT_LOCALES__)) return url;
 	const domainLocalePath = getDomainLocalePath(url, locale);
 	if (domainLocalePath) return domainLocalePath;
 	return addLocalePrefix(url, locale, window.__VINEXT_DEFAULT_LOCALE__ ?? "");
 }
+function isDefaultLocaleRootNavigation(url, locale) {
+	if (typeof window === "undefined") return false;
+	if (!locale || locale !== window.__VINEXT_DEFAULT_LOCALE__) return false;
+	let parsed;
+	try {
+		parsed = new URL(url, window.location.href);
+	} catch {
+		return false;
+	}
+	return stripBasePath(parsed.pathname, __basePath) === "/";
+}
+function getPagesHtmlFetchUrl(browserUrl, locale) {
+	if (!isDefaultLocaleRootNavigation(browserUrl, locale)) return browserUrl;
+	const parsed = new URL(browserUrl, window.location.href);
+	return normalizePathTrailingSlash(toBrowserNavigationHref(`${normalizePathTrailingSlash(`/${locale}`, __trailingSlash)}${parsed.search}${parsed.hash}`, window.location.href, __basePath), __trailingSlash);
+}
 /** Check if a URL is external (any URL scheme per RFC 3986, or protocol-relative) */
 function isExternalUrl(url) {
-	return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
+	return isAbsoluteOrProtocolRelativeUrl(url);
 }
 /** Resolve a hash URL to a basePath-stripped app URL for event payloads */
 function resolveHashUrl(url) {
@@ -96,15 +133,6 @@ function isHashOnlyChange(href) {
 	if (typeof window === "undefined") return false;
 	return isHashOnlyBrowserUrlChange(href, window.location.href, __basePath);
 }
-/** Scroll to hash target element, or top if no hash */
-function scrollToHash(hash) {
-	if (!hash || hash === "#") {
-		window.scrollTo(0, 0);
-		return;
-	}
-	const el = document.getElementById(hash.slice(1));
-	if (el) el.scrollIntoView({ behavior: "auto" });
-}
 /** Save current scroll position into history state for back/forward restoration */
 function saveScrollPosition() {
 	const state = window.history.state ?? {};
@@ -137,6 +165,60 @@ function _registerRouterStateAccessors(accessors) {
 function setSSRContext(ctx) {
 	_setSSRContextImpl(ctx);
 }
+let _cachedClientPagesNavCtx = null;
+let _cachedClientPagesNavCtxKey = null;
+function _buildClientPagesNavigationContext(routePattern, resolvedPath, searchString) {
+	const cacheKey = `${routePattern}|${resolvedPath}|${searchString}`;
+	if (_cachedClientPagesNavCtxKey === cacheKey && _cachedClientPagesNavCtx) return _cachedClientPagesNavCtx;
+	const ctx = {
+		pathname: resolvedPath,
+		searchParams: new URLSearchParams(searchString),
+		params: routePattern ? extractRouteParamsFromPath(routePattern, resolvedPath) ?? {} : {}
+	};
+	_cachedClientPagesNavCtx = ctx;
+	_cachedClientPagesNavCtxKey = cacheKey;
+	return ctx;
+}
+/**
+* Cross-router compat shim source for `next/navigation` hooks.
+*
+* Returns the current Pages Router state shaped as a navigation context so
+* the App Router hooks (useParams/useSearchParams/usePathname) can act as
+* compat shims when invoked inside a Pages Router render. Mirrors Next.js's
+* `adaptForPathParams` and `adaptForSearchParams` in
+* .nextjs-ref/packages/next/src/shared/lib/router/adapters.tsx, which Next.js
+* uses to populate SearchParamsContext / PathParamsContext for the Pages
+* Router (see packages/next/src/server/render.tsx and
+* packages/next/src/client/index.tsx).
+*
+* Returns `null` when there is no Pages Router state available — e.g. App
+* Router pages, RSC-only renders, or pre-router renders. Callers should
+* treat null as "App Router context, use normal app-router state".
+*/
+function getPagesNavigationContext() {
+	if (typeof window === "undefined") {
+		const ssrCtx = _getSSRContext();
+		if (!ssrCtx) return null;
+		let searchParams;
+		let resolvedPath;
+		try {
+			const url = new URL(ssrCtx.asPath, "http://_");
+			searchParams = url.searchParams;
+			resolvedPath = url.pathname;
+		} catch {
+			searchParams = new URLSearchParams();
+			resolvedPath = ssrCtx.pathname;
+		}
+		const params = extractRouteParamsFromPath(ssrCtx.pathname, resolvedPath) ?? {};
+		return {
+			pathname: resolvedPath,
+			searchParams,
+			params
+		};
+	}
+	const resolvedPath = stripBasePath(window.location.pathname, __basePath);
+	return _buildClientPagesNavigationContext(window.__NEXT_DATA__?.page ?? "", resolvedPath, window.location.search);
+}
 /**
 * Extract param names from a Next.js route pattern.
 * E.g., "/posts/[id]" → ["id"], "/docs/[...slug]" → ["slug"],
@@ -152,6 +234,26 @@ function extractRouteParamNames(pattern) {
 	for (const m of colonMatches) names.push(m[1]);
 	return names;
 }
+function splitPathSegments(pathname) {
+	return pathname.split("/").filter(Boolean);
+}
+function extractRouteParamsFromPath(pattern, pathname) {
+	return matchRoutePattern(splitPathSegments(pathname), routePatternParts(pattern));
+}
+function getRouteQueryFromNextData(nextData, resolvedPath) {
+	const routeQuery = {};
+	if (!nextData?.query || !nextData.page) return routeQuery;
+	const routeParamNames = extractRouteParamNames(nextData.page);
+	if (routeParamNames.length === 0) return routeQuery;
+	const currentRouteParams = extractRouteParamsFromPath(nextData.page, resolvedPath);
+	if (currentRouteParams) return currentRouteParams;
+	for (const key of routeParamNames) {
+		const value = nextData.query[key];
+		if (typeof value === "string") routeQuery[key] = value;
+		else if (Array.isArray(value)) routeQuery[key] = [...value];
+	}
+	return routeQuery;
+}
 function getPathnameAndQuery() {
 	if (typeof window === "undefined") {
 		const _ssrCtx = _getSSRContext();
@@ -172,16 +274,8 @@ function getPathnameAndQuery() {
 	}
 	const resolvedPath = stripBasePath(window.location.pathname, __basePath);
 	const pathname = window.__NEXT_DATA__?.page ?? resolvedPath;
-	const routeQuery = {};
 	const nextData = window.__NEXT_DATA__;
-	if (nextData && nextData.query && nextData.page) {
-		const routeParamNames = extractRouteParamNames(nextData.page);
-		for (const key of routeParamNames) {
-			const value = nextData.query[key];
-			if (typeof value === "string") routeQuery[key] = value;
-			else if (Array.isArray(value)) routeQuery[key] = [...value];
-		}
-	}
+	const routeQuery = getRouteQueryFromNextData(nextData, resolvedPath);
 	const searchQuery = {};
 	const params = new URLSearchParams(window.location.search);
 	for (const [key, value] of params) addQueryParam(searchQuery, key, value);
@@ -243,7 +337,7 @@ function scheduleHardNavigationAndThrow(url, message) {
 * Throws on hard-navigation failures (non-OK response, missing data) so the
 * caller can distinguish success from failure for event emission.
 */
-async function navigateClient(url) {
+async function navigateClient(url, fetchUrl = url) {
 	if (typeof window === "undefined") return;
 	const root = window.__VINEXT_ROOT__;
 	if (!root) {
@@ -261,7 +355,7 @@ async function navigateClient(url) {
 	try {
 		let res;
 		try {
-			res = await fetch(url, {
+			res = await fetch(fetchUrl, {
 				headers: { Accept: "text/html" },
 				signal: controller.signal
 			});
@@ -273,9 +367,9 @@ async function navigateClient(url) {
 		if (!res.ok) scheduleHardNavigationAndThrow(url, `Navigation failed: ${res.status} ${res.statusText}`);
 		const html = await res.text();
 		assertStillCurrent();
-		const match = html.match(/<script>window\.__NEXT_DATA__\s*=\s*(.*?)<\/script>/);
-		if (!match) scheduleHardNavigationAndThrow(url, "Navigation failed: missing __NEXT_DATA__ in response");
-		const nextData = JSON.parse(match[1]);
+		const nextDataJson = extractVinextNextDataJson(html);
+		if (!nextDataJson) scheduleHardNavigationAndThrow(url, "Navigation failed: missing __NEXT_DATA__ in response");
+		const nextData = parseVinextNextDataJson(nextDataJson);
 		const { pageProps } = nextData.props;
 		let pageModuleUrl = nextData.__vinext?.pageModuleUrl;
 		if (!pageModuleUrl) {
@@ -316,6 +410,7 @@ async function navigateClient(url) {
 		else element = React.createElement(PageComponent, pageProps);
 		element = wrapWithRouterContext(element);
 		window.__NEXT_DATA__ = nextData;
+		applyVinextLocaleGlobals(window, nextData);
 		root.render(element);
 	} finally {
 		if (navId === _navigationId) _activeAbortController = null;
@@ -333,9 +428,9 @@ async function navigateClient(url) {
 * - "failed" — genuine error, caller should return false (hard nav is already
 *   scheduled as recovery)
 */
-async function runNavigateClient(fullUrl, resolvedUrl) {
+async function runNavigateClient(fullUrl, resolvedUrl, fetchUrl = fullUrl) {
 	try {
-		await navigateClient(fullUrl);
+		await navigateClient(fullUrl, fetchUrl);
 		return "completed";
 	} catch (err) {
 		routerEvents.emit("routeChangeError", err, resolvedUrl, { shallow: false });
@@ -346,9 +441,8 @@ async function runNavigateClient(fullUrl, resolvedUrl) {
 }
 /**
 * Build the full router value object from the current pathname, query, asPath,
-* and a set of navigation methods.  Shared by useRouter() (which passes
-* hook-derived callbacks) and wrapWithRouterContext() (which passes the Router
-* singleton methods) so the shape stays in sync.
+* 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) {
 	const _ssrState = _getSSRContext();
@@ -369,15 +463,125 @@ function buildRouterValue(pathname, query, asPath, methods) {
 		domainLocales,
 		isReady: true,
 		isPreview: false,
-		isFallback: typeof window !== "undefined" && nextData?.isFallback === true,
+		isFallback: typeof window !== "undefined" ? nextData?.isFallback === true : _ssrState?.isFallback === true,
 		...methods,
 		events: routerEvents
 	};
 }
+/** Extract the hash fragment from a URL, including the leading `#`. */
+function extractHash(url) {
+	const i = url.indexOf("#");
+	return i === -1 ? "" : url.slice(i);
+}
+/** Notify in-page listeners (e.g. useRouter hooks) that navigation occurred. */
+function dispatchNavigateEvent() {
+	window.dispatchEvent(new CustomEvent("vinext:navigate"));
+}
+/**
+* Update history with the new URL and refresh the hash-only-detection tracker.
+* Centralises the `pushState`/`replaceState` branch so callers don't repeat it.
+*/
+function updateHistory(mode, url) {
+	if (mode === "push") window.history.pushState({}, "", url);
+	else window.history.replaceState({}, "", url);
+	_lastPathnameAndSearch = window.location.pathname + window.location.search;
+}
+/**
+* Throw the canonical "no router instance" error used when a Pages Router
+* navigation method (push/replace/back/reload/prefetch/beforePopState) is
+* invoked during SSR or prerendering.
+*
+* Mirrors Next.js's `ServerRouter.push`/`replace`/etc. which all call
+* `noRouter()` in `packages/next/src/server/render.tsx`. The error message
+* matches Next.js verbatim so userland error handling and docs links work
+* unchanged.
+*
+* Ported from Next.js: packages/next/src/server/render.tsx
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/server/render.tsx
+*/
+function throwNoRouterInstance() {
+	throw new Error("No router instance found. you should only use \"next/router\" inside the client side of your app. https://nextjs.org/docs/messages/no-router-instance");
+}
+/**
+* Shared client-side navigation flow used by both `useRouter()` and the
+* `Router` singleton. The only differences between push/replace are the
+* history method (`pushState` vs `replaceState`), the external-URL fallback
+* (`assign` vs `replace`), and the fact that push saves scroll position for
+* back/forward restoration while replace does not.
+*
+* `onStateUpdate` lets the hook trigger a `setState` re-render at the same
+* point that hashChangeComplete/routeChangeComplete fires; the singleton
+* passes no callback.
+*/
+async function performNavigation(url, as, options, mode, onStateUpdate) {
+	if (typeof window === "undefined") throwNoRouterInstance();
+	assertSafeNavigationUrl(resolveUrl(url));
+	if (as !== void 0) assertSafeNavigationUrl(String(as));
+	const navigationLocale = resolveTransitionLocale(options?.locale);
+	let resolved = resolveNavigationTarget(url, as, navigationLocale);
+	if (isExternalUrl(resolved)) {
+		const localPath = toSameOriginAppPath(resolved, __basePath);
+		if (localPath == null) {
+			if (mode === "push") window.location.assign(resolved);
+			else window.location.replace(resolved);
+			return true;
+		}
+		resolved = localPath;
+	}
+	resolved = normalizePathTrailingSlash(resolved, __trailingSlash);
+	const full = normalizePathTrailingSlash(toBrowserNavigationHref(resolved, window.location.href, __basePath), __trailingSlash);
+	const htmlFetchUrl = getPagesHtmlFetchUrl(full, navigationLocale);
+	const shallow = options?.shallow ?? false;
+	const doScroll = options?.scroll !== false;
+	if (isHashOnlyChange(full)) {
+		const eventUrl = resolveHashUrl(full);
+		routerEvents.emit("hashChangeStart", eventUrl, { shallow });
+		updateHistory(mode, resolved.startsWith("#") ? resolved : full);
+		if (doScroll) scrollToHashTarget(extractHash(resolved));
+		onStateUpdate?.();
+		routerEvents.emit("hashChangeComplete", eventUrl, { shallow });
+		dispatchNavigateEvent();
+		return true;
+	}
+	if (mode === "push") saveScrollPosition();
+	routerEvents.emit("routeChangeStart", resolved, { shallow });
+	routerEvents.emit("beforeHistoryChange", resolved, { shallow });
+	updateHistory(mode, full);
+	if (!shallow) {
+		const result = await runNavigateClient(full, resolved, htmlFetchUrl);
+		if (result === "cancelled") return true;
+		if (result === "failed") return false;
+	}
+	onStateUpdate?.();
+	routerEvents.emit("routeChangeComplete", resolved, { shallow });
+	const hash = extractHash(resolved);
+	if (doScroll) if (hash) scrollToHashTarget(hash);
+	else window.scrollTo(0, 0);
+	dispatchNavigateEvent();
+	return true;
+}
+/** Inject a `<link rel="prefetch">` for the target page. */
+async function prefetchUrl(url) {
+	if (typeof document !== "undefined") {
+		const link = document.createElement("link");
+		link.rel = "prefetch";
+		link.href = url;
+		link.as = "document";
+		document.head.appendChild(link);
+	}
+}
 /**
 * useRouter hook - Pages Router compatible.
+*
+* Ported from Next.js: packages/next/src/client/router.ts
+* https://github.com/vercel/next.js/blob/canary/packages/next/src/client/router.ts
 */
 function useRouter() {
+	const router = useContext(RouterContext);
+	if (!router) throw new Error("NextRouter was not mounted. https://nextjs.org/docs/messages/next-router-not-mounted");
+	return router;
+}
+function PagesRouterProvider({ children }) {
 	const [{ pathname, query, asPath }, setState] = useState(getPathnameAndQuery);
 	useEffect(() => {
 		const onNavigate = ((_e) => {
@@ -386,125 +590,23 @@ function useRouter() {
 		window.addEventListener("vinext:navigate", onNavigate);
 		return () => window.removeEventListener("vinext:navigate", onNavigate);
 	}, []);
-	const push = useCallback(async (url, as, options) => {
-		let resolved = resolveNavigationTarget(url, as, options?.locale);
-		if (isExternalUrl(resolved)) {
-			const localPath = toSameOriginAppPath(resolved, __basePath);
-			if (localPath == null) {
-				window.location.assign(resolved);
-				return true;
-			}
-			resolved = localPath;
-		}
-		const full = toBrowserNavigationHref(resolved, window.location.href, __basePath);
-		if (isHashOnlyChange(full)) {
-			const eventUrl = resolveHashUrl(full);
-			routerEvents.emit("hashChangeStart", eventUrl, { shallow: options?.shallow ?? false });
-			const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-			window.history.pushState({}, "", resolved.startsWith("#") ? resolved : full);
-			_lastPathnameAndSearch = window.location.pathname + window.location.search;
-			scrollToHash(hash);
-			setState(getPathnameAndQuery());
-			routerEvents.emit("hashChangeComplete", eventUrl, { shallow: options?.shallow ?? false });
-			window.dispatchEvent(new CustomEvent("vinext:navigate"));
-			return true;
-		}
-		saveScrollPosition();
-		routerEvents.emit("routeChangeStart", resolved, { shallow: options?.shallow ?? false });
-		routerEvents.emit("beforeHistoryChange", resolved, { shallow: options?.shallow ?? false });
-		window.history.pushState({}, "", full);
-		_lastPathnameAndSearch = window.location.pathname + window.location.search;
-		if (!options?.shallow) {
-			const result = await runNavigateClient(full, resolved);
-			if (result === "cancelled") return true;
-			if (result === "failed") return false;
-		}
-		setState(getPathnameAndQuery());
-		routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
-		const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-		if (hash) scrollToHash(hash);
-		else if (options?.scroll !== false) window.scrollTo(0, 0);
-		window.dispatchEvent(new CustomEvent("vinext:navigate"));
-		return true;
-	}, []);
-	const replace = useCallback(async (url, as, options) => {
-		let resolved = resolveNavigationTarget(url, as, options?.locale);
-		if (isExternalUrl(resolved)) {
-			const localPath = toSameOriginAppPath(resolved, __basePath);
-			if (localPath == null) {
-				window.location.replace(resolved);
-				return true;
-			}
-			resolved = localPath;
-		}
-		const full = toBrowserNavigationHref(resolved, window.location.href, __basePath);
-		if (isHashOnlyChange(full)) {
-			const eventUrl = resolveHashUrl(full);
-			routerEvents.emit("hashChangeStart", eventUrl, { shallow: options?.shallow ?? false });
-			const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-			window.history.replaceState({}, "", resolved.startsWith("#") ? resolved : full);
-			_lastPathnameAndSearch = window.location.pathname + window.location.search;
-			scrollToHash(hash);
-			setState(getPathnameAndQuery());
-			routerEvents.emit("hashChangeComplete", eventUrl, { shallow: options?.shallow ?? false });
-			window.dispatchEvent(new CustomEvent("vinext:navigate"));
-			return true;
-		}
-		routerEvents.emit("routeChangeStart", resolved, { shallow: options?.shallow ?? false });
-		routerEvents.emit("beforeHistoryChange", resolved, { shallow: options?.shallow ?? false });
-		window.history.replaceState({}, "", full);
-		_lastPathnameAndSearch = window.location.pathname + window.location.search;
-		if (!options?.shallow) {
-			const result = await runNavigateClient(full, resolved);
-			if (result === "cancelled") return true;
-			if (result === "failed") return false;
-		}
-		setState(getPathnameAndQuery());
-		routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
-		const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-		if (hash) scrollToHash(hash);
-		else if (options?.scroll !== false) window.scrollTo(0, 0);
-		window.dispatchEvent(new CustomEvent("vinext:navigate"));
-		return true;
-	}, []);
-	const back = useCallback(() => {
-		window.history.back();
-	}, []);
-	const reload = useCallback(() => {
-		window.location.reload();
-	}, []);
-	const prefetch = useCallback(async (url) => {
-		if (typeof document !== "undefined") {
-			const link = document.createElement("link");
-			link.rel = "prefetch";
-			link.href = url;
-			link.as = "document";
-			document.head.appendChild(link);
-		}
-	}, []);
-	return useMemo(() => buildRouterValue(pathname, query, asPath, {
-		push,
-		replace,
-		back,
-		reload,
-		prefetch,
-		beforePopState: (cb) => {
-			_beforePopStateCb = cb;
-		}
+	const router = useMemo(() => buildRouterValue(pathname, query, asPath, {
+		push: Router.push,
+		replace: Router.replace,
+		back: Router.back,
+		reload: Router.reload,
+		prefetch: Router.prefetch,
+		beforePopState: Router.beforePopState
 	}), [
 		pathname,
 		query,
-		asPath,
-		push,
-		replace,
-		back,
-		reload,
-		prefetch
+		asPath
 	]);
+	return createElement(RouterContext.Provider, { value: router }, children);
 }
 let _beforePopStateCb;
 let _lastPathnameAndSearch = typeof window !== "undefined" ? window.location.pathname + window.location.search : "";
-if (typeof window !== "undefined") window.addEventListener("popstate", (e) => {
+function handlePagesRouterPopState(e) {
 	const browserUrl = window.location.pathname + window.location.search;
 	const appUrl = stripBasePath(window.location.pathname, __basePath) + window.location.search;
 	const isHashOnly = browserUrl === _lastPathnameAndSearch;
@@ -519,42 +621,33 @@ if (typeof window !== "undefined") window.addEventListener("popstate", (e) => {
 	if (isHashOnly) {
 		const hashUrl = appUrl + window.location.hash;
 		routerEvents.emit("hashChangeStart", hashUrl, { shallow: false });
-		scrollToHash(window.location.hash);
+		scrollToHashTarget(window.location.hash);
 		routerEvents.emit("hashChangeComplete", hashUrl, { shallow: false });
-		window.dispatchEvent(new CustomEvent("vinext:navigate"));
+		dispatchNavigateEvent();
 		return;
 	}
 	const fullAppUrl = appUrl + window.location.hash;
 	routerEvents.emit("routeChangeStart", fullAppUrl, { shallow: false });
 	routerEvents.emit("beforeHistoryChange", fullAppUrl, { shallow: false });
 	(async () => {
-		if (await runNavigateClient(browserUrl, fullAppUrl) === "completed") {
+		if (await runNavigateClient(browserUrl, fullAppUrl, getPagesHtmlFetchUrl(browserUrl, window.__VINEXT_LOCALE__)) === "completed") {
 			routerEvents.emit("routeChangeComplete", fullAppUrl, { shallow: false });
 			restoreScrollPosition(e.state);
-			window.dispatchEvent(new CustomEvent("vinext:navigate"));
+			dispatchNavigateEvent();
 		}
 	})();
-});
+}
+setPagesRouterPopStateHandler(handlePagesRouterPopState);
 /**
 * Wrap a React element in a RouterContext.Provider so that
 * next/compat/router's useRouter() returns the real Pages Router value.
 *
-* This is a plain function, NOT a React component — it builds the router
-* value object directly from the current SSR context (server) or
-* window.location + Router singleton (client), avoiding duplicate state
-* that a hook-based component would create.
+* 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.
 */
 function wrapWithRouterContext(element) {
-	const { pathname, query, asPath } = getPathnameAndQuery();
-	const routerValue = buildRouterValue(pathname, query, asPath, {
-		push: Router.push,
-		replace: Router.replace,
-		back: Router.back,
-		reload: Router.reload,
-		prefetch: Router.prefetch,
-		beforePopState: Router.beforePopState
-	});
-	return createElement(RouterContext.Provider, { value: routerValue }, element);
+	return createElement(PagesRouterProvider, null, element);
 }
 /**
 * Higher-order component that injects the Pages Router `router` instance as
@@ -588,102 +681,114 @@ function withRouter(ComposedComponent) {
 	if (process.env.NODE_ENV !== "production") WithRouterWrapper.displayName = `withRouter(${composed.displayName || composed.name || "Unknown"})`;
 	return WithRouterWrapper;
 }
-const Router = {
-	push: async (url, as, options) => {
-		let resolved = resolveNavigationTarget(url, as, options?.locale);
-		if (isExternalUrl(resolved)) {
-			const localPath = toSameOriginAppPath(resolved, __basePath);
-			if (localPath == null) {
-				window.location.assign(resolved);
-				return true;
-			}
-			resolved = localPath;
+const Router = Object.defineProperties({
+	push: (url, as, options) => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		return performNavigation(url, as, options, "push");
+	},
+	replace: (url, as, options) => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		return performNavigation(url, as, options, "replace");
+	},
+	back: () => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		window.history.back();
+	},
+	reload: () => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		window.location.reload();
+	},
+	prefetch: (url) => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		return prefetchUrl(url);
+	},
+	beforePopState: (cb) => {
+		if (typeof window === "undefined") throwNoRouterInstance();
+		_beforePopStateCb = cb;
+	},
+	events: routerEvents
+}, {
+	pathname: {
+		enumerable: true,
+		get() {
+			return getPathnameAndQuery().pathname;
 		}
-		const full = toBrowserNavigationHref(resolved, window.location.href, __basePath);
-		if (isHashOnlyChange(full)) {
-			const eventUrl = resolveHashUrl(full);
-			routerEvents.emit("hashChangeStart", eventUrl, { shallow: options?.shallow ?? false });
-			const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-			window.history.pushState({}, "", resolved.startsWith("#") ? resolved : full);
-			_lastPathnameAndSearch = window.location.pathname + window.location.search;
-			scrollToHash(hash);
-			routerEvents.emit("hashChangeComplete", eventUrl, { shallow: options?.shallow ?? false });
-			window.dispatchEvent(new CustomEvent("vinext:navigate"));
-			return true;
+	},
+	route: {
+		enumerable: true,
+		get() {
+			const { pathname } = getPathnameAndQuery();
+			if (typeof window === "undefined") return pathname;
+			return window.__NEXT_DATA__?.page ?? pathname;
+		}
+	},
+	query: {
+		enumerable: true,
+		get() {
+			return getPathnameAndQuery().query;
 		}
-		saveScrollPosition();
-		routerEvents.emit("routeChangeStart", resolved, { shallow: options?.shallow ?? false });
-		routerEvents.emit("beforeHistoryChange", resolved, { shallow: options?.shallow ?? false });
-		window.history.pushState({}, "", full);
-		_lastPathnameAndSearch = window.location.pathname + window.location.search;
-		if (!options?.shallow) {
-			const result = await runNavigateClient(full, resolved);
-			if (result === "cancelled") return true;
-			if (result === "failed") return false;
+	},
+	asPath: {
+		enumerable: true,
+		get() {
+			return getPathnameAndQuery().asPath;
 		}
-		routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
-		const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-		if (hash) scrollToHash(hash);
-		else if (options?.scroll !== false) window.scrollTo(0, 0);
-		window.dispatchEvent(new CustomEvent("vinext:navigate"));
-		return true;
 	},
-	replace: async (url, as, options) => {
-		let resolved = resolveNavigationTarget(url, as, options?.locale);
-		if (isExternalUrl(resolved)) {
-			const localPath = toSameOriginAppPath(resolved, __basePath);
-			if (localPath == null) {
-				window.location.replace(resolved);
-				return true;
-			}
-			resolved = localPath;
+	basePath: {
+		enumerable: true,
+		value: __basePath,
+		writable: false
+	},
+	locale: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.locale;
+			return window.__VINEXT_LOCALE__;
 		}
-		const full = toBrowserNavigationHref(resolved, window.location.href, __basePath);
-		if (isHashOnlyChange(full)) {
-			const eventUrl = resolveHashUrl(full);
-			routerEvents.emit("hashChangeStart", eventUrl, { shallow: options?.shallow ?? false });
-			const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-			window.history.replaceState({}, "", resolved.startsWith("#") ? resolved : full);
-			_lastPathnameAndSearch = window.location.pathname + window.location.search;
-			scrollToHash(hash);
-			routerEvents.emit("hashChangeComplete", eventUrl, { shallow: options?.shallow ?? false });
-			window.dispatchEvent(new CustomEvent("vinext:navigate"));
-			return true;
+	},
+	locales: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.locales;
+			return window.__VINEXT_LOCALES__;
 		}
-		routerEvents.emit("routeChangeStart", resolved, { shallow: options?.shallow ?? false });
-		routerEvents.emit("beforeHistoryChange", resolved, { shallow: options?.shallow ?? false });
-		window.history.replaceState({}, "", full);
-		_lastPathnameAndSearch = window.location.pathname + window.location.search;
-		if (!options?.shallow) {
-			const result = await runNavigateClient(full, resolved);
-			if (result === "cancelled") return true;
-			if (result === "failed") return false;
+	},
+	defaultLocale: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.defaultLocale;
+			return window.__VINEXT_DEFAULT_LOCALE__;
 		}
-		routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
-		const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-		if (hash) scrollToHash(hash);
-		else if (options?.scroll !== false) window.scrollTo(0, 0);
-		window.dispatchEvent(new CustomEvent("vinext:navigate"));
-		return true;
 	},
-	back: () => window.history.back(),
-	reload: () => window.location.reload(),
-	prefetch: async (url) => {
-		if (typeof document !== "undefined") {
-			const link = document.createElement("link");
-			link.rel = "prefetch";
-			link.href = url;
-			link.as = "document";
-			document.head.appendChild(link);
+	domainLocales: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.domainLocales;
+			return window.__NEXT_DATA__?.domainLocales;
 		}
 	},
-	beforePopState: (cb) => {
-		_beforePopStateCb = cb;
+	isReady: {
+		enumerable: true,
+		value: true,
+		writable: false
 	},
-	events: routerEvents
-};
+	isPreview: {
+		enumerable: true,
+		value: false,
+		writable: false
+	},
+	isFallback: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.isFallback === true;
+			return window.__NEXT_DATA__?.isFallback === true;
+		}
+	}
+});
 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, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
+export { _registerRouterStateAccessors, applyNavigationLocale, Router as default, getPagesNavigationContext, isExternalUrl, isHashOnlyChange, setSSRContext, useRouter, withRouter, wrapWithRouterContext };
 
 //# sourceMappingURL=router.js.map