vinext 0.0.51 → 0.0.52

package/dist/shims/root-params.d.ts

@@ -6,6 +6,8 @@ type RootParamsState = {
 declare function pickRootParams(params: RootParams, rootParamNames: readonly string[] | null | undefined): RootParams;
 declare function setRootParams(params: RootParams | null): void;
 declare function getRootParam(name: string): Promise<string | string[] | undefined>;
+declare function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;
+declare function runWithRootParamsScope<T>(params: RootParams, fn: () => T | Promise<T>): T | Promise<T>;
 //#endregion
-export { RootParams, RootParamsState, getRootParam, pickRootParams, setRootParams };
+export { RootParams, RootParamsState, getRootParam, pickRootParams, runWithRootParamsScope, setRootParams };
 //# sourceMappingURL=root-params.d.ts.map

package/dist/shims/root-params.js

@@ -1,11 +1,13 @@
-import { getRequestContext, isInsideUnifiedScope } from "./unified-request-context.js";
+import { getOrCreateAls } from "./internal/als-registry.js";
+import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation } from "./unified-request-context.js";
 //#region src/shims/root-params.ts
 const _FALLBACK_KEY = Symbol.for("vinext.rootParams.fallback");
 const _g = globalThis;
+const _als = getOrCreateAls("vinext.rootParams.als");
 const _fallbackState = _g[_FALLBACK_KEY] ??= { rootParams: null };
 function getState() {
 	if (isInsideUnifiedScope()) return getRequestContext();
-	return _fallbackState;
+	return _als.getStore() ?? _fallbackState;
 }
 function pickRootParams(params, rootParamNames) {
 	const picked = {};
@@ -18,7 +20,13 @@ function setRootParams(params) {
 function getRootParam(name) {
 	return Promise.resolve(getState().rootParams?.[name]);
 }
+function runWithRootParamsScope(params, fn) {
+	if (isInsideUnifiedScope()) return runWithUnifiedStateMutation((ctx) => {
+		ctx.rootParams = params;
+	}, fn);
+	else return _als.run({ rootParams: params }, fn);
+}
 //#endregion
-export { getRootParam, pickRootParams, setRootParams };
+export { getRootParam, pickRootParams, runWithRootParamsScope, setRootParams };
 
 //# sourceMappingURL=root-params.js.map

package/dist/shims/root-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-params.js","names":[],"sources":["../../src/shims/root-params.ts"],"sourcesContent":["import { getRequestContext, isInsideUnifiedScope } from \"./unified-request-context.js\";\n\nexport type RootParams = Record<string, string | string[] | undefined>;\n\nexport type RootParamsState = {\n  rootParams: RootParams | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.rootParams.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  rootParams: null,\n} satisfies RootParamsState) as RootParamsState;\n\nfunction getState(): RootParamsState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _fallbackState;\n}\n\nexport function pickRootParams(\n  params: RootParams,\n  rootParamNames: readonly string[] | null | undefined,\n): RootParams {\n  const picked: RootParams = {};\n  for (const name of rootParamNames ?? []) {\n    picked[name] = params[name];\n  }\n  return picked;\n}\n\nexport function setRootParams(params: RootParams | null): void {\n  getState().rootParams = params;\n}\n\nexport function getRootParam(name: string): Promise<string | string[] | undefined> {\n  return Promise.resolve(getState().rootParams?.[name]);\n}\n"],"mappings":";;AAQA,MAAM,gBAAgB,OAAO,IAAI,6BAA6B;AAC9D,MAAM,KAAK;AAEX,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,WAA4B;CACnC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO;;AAGT,SAAgB,eACd,QACA,gBACY;CACZ,MAAM,SAAqB,EAAE;CAC7B,KAAK,MAAM,QAAQ,kBAAkB,EAAE,EACrC,OAAO,QAAQ,OAAO;CAExB,OAAO;;AAGT,SAAgB,cAAc,QAAiC;CAC7D,UAAU,CAAC,aAAa;;AAG1B,SAAgB,aAAa,MAAsD;CACjF,OAAO,QAAQ,QAAQ,UAAU,CAAC,aAAa,MAAM"}
+{"version":3,"file":"root-params.js","names":[],"sources":["../../src/shims/root-params.ts"],"sourcesContent":["import { getOrCreateAls } from \"./internal/als-registry.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\nexport type RootParams = Record<string, string | string[] | undefined>;\n\nexport type RootParamsState = {\n  rootParams: RootParams | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.rootParams.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<RootParamsState>(\"vinext.rootParams.als\");\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  rootParams: null,\n} satisfies RootParamsState) as RootParamsState;\n\nfunction getState(): RootParamsState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _als.getStore() ?? _fallbackState;\n}\n\nexport function pickRootParams(\n  params: RootParams,\n  rootParamNames: readonly string[] | null | undefined,\n): RootParams {\n  const picked: RootParams = {};\n  for (const name of rootParamNames ?? []) {\n    picked[name] = params[name];\n  }\n  return picked;\n}\n\nexport function setRootParams(params: RootParams | null): void {\n  getState().rootParams = params;\n}\n\nexport function getRootParam(name: string): Promise<string | string[] | undefined> {\n  return Promise.resolve(getState().rootParams?.[name]);\n}\n\nexport function runWithRootParamsScope<T>(params: RootParams, fn: () => Promise<T>): Promise<T>;\nexport function runWithRootParamsScope<T>(\n  params: RootParams,\n  fn: () => T | Promise<T>,\n): T | Promise<T>;\nexport function runWithRootParamsScope<T>(\n  params: RootParams,\n  fn: () => T | Promise<T>,\n): T | Promise<T> {\n  if (isInsideUnifiedScope()) {\n    return runWithUnifiedStateMutation((ctx) => {\n      ctx.rootParams = params;\n    }, fn);\n  } else {\n    return _als.run({ rootParams: params }, fn);\n  }\n}\n"],"mappings":";;;AAaA,MAAM,gBAAgB,OAAO,IAAI,6BAA6B;AAC9D,MAAM,KAAK;AACX,MAAM,OAAO,eAAgC,wBAAwB;AAErE,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,WAA4B;CACnC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO,KAAK,UAAU,IAAI;;AAG5B,SAAgB,eACd,QACA,gBACY;CACZ,MAAM,SAAqB,EAAE;CAC7B,KAAK,MAAM,QAAQ,kBAAkB,EAAE,EACrC,OAAO,QAAQ,OAAO;CAExB,OAAO;;AAGT,SAAgB,cAAc,QAAiC;CAC7D,UAAU,CAAC,aAAa;;AAG1B,SAAgB,aAAa,MAAsD;CACjF,OAAO,QAAQ,QAAQ,UAAU,CAAC,aAAa,MAAM;;AAQvD,SAAgB,uBACd,QACA,IACgB;CAChB,IAAI,sBAAsB,EACxB,OAAO,6BAA6B,QAAQ;EAC1C,IAAI,aAAa;IAChB,GAAG;MAEN,OAAO,KAAK,IAAI,EAAE,YAAY,QAAQ,EAAE,GAAG"}

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

@@ -15,6 +15,7 @@ type SSRContext = {
   locale?: string;
   locales?: string[];
   defaultLocale?: string;
+  isFallback?: boolean;
 };
 type RouterState = {
   ssrContext: SSRContext | null;

package/dist/shims/router-state.js.map

@@ -1 +1 @@
-{"version":3,"file":"router-state.js","names":[],"sources":["../../src/shims/router-state.ts"],"sourcesContent":["/**\n * Server-only Pages Router state backed by AsyncLocalStorage.\n *\n * Provides request-scoped isolation for SSR context (pathname, query,\n * locale) so concurrent requests on Workers don't share state.\n *\n * This module is server-only — it imports node:async_hooks and must NOT\n * be bundled for the browser.\n */\n\nimport { _registerRouterStateAccessors } from \"./router.js\";\nimport { getOrCreateAls } from \"./internal/als-registry.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\nexport type SSRContext = {\n  pathname: string;\n  query: Record<string, string | string[]>;\n  asPath: string;\n  locale?: string;\n  locales?: string[];\n  defaultLocale?: string;\n};\n\nexport type RouterState = {\n  ssrContext: SSRContext | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<RouterState>(\"vinext.router.als\");\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  ssrContext: null,\n} satisfies RouterState) as RouterState;\n\nfunction _getState(): RouterState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _als.getStore() ?? _fallbackState;\n}\n\n/**\n * Run a function within a router state ALS scope.\n * Ensures per-request isolation for Pages Router SSR context\n * on concurrent runtimes.\n */\nexport function runWithRouterState<T>(fn: () => Promise<T>): Promise<T>;\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T> {\n  if (isInsideUnifiedScope()) {\n    return runWithUnifiedStateMutation((uCtx) => {\n      uCtx.ssrContext = null;\n    }, fn);\n  }\n\n  const state: RouterState = {\n    ssrContext: null,\n  };\n  return _als.run(state, fn);\n}\n\n// ---------------------------------------------------------------------------\n// Register ALS-backed accessors into router.ts\n// ---------------------------------------------------------------------------\n\n_registerRouterStateAccessors({\n  getSSRContext(): SSRContext | null {\n    return _getState().ssrContext;\n  },\n\n  setSSRContext(ctx: SSRContext | null): void {\n    _getState().ssrContext = ctx;\n  },\n});\n"],"mappings":";;;;;;;;;;;;;AAmCA,MAAM,gBAAgB,OAAO,IAAI,yBAAyB;AAC1D,MAAM,KAAK;AACX,MAAM,OAAO,eAA4B,oBAAoB;AAE7D,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,YAAyB;CAChC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO,KAAK,UAAU,IAAI;;AAU5B,SAAgB,mBAAsB,IAA0C;CAC9E,IAAI,sBAAsB,EACxB,OAAO,6BAA6B,SAAS;EAC3C,KAAK,aAAa;IACjB,GAAG;CAMR,OAAO,KAAK,IAAI,EAFd,YAAY,MAEO,EAAE,GAAG;;AAO5B,8BAA8B;CAC5B,gBAAmC;EACjC,OAAO,WAAW,CAAC;;CAGrB,cAAc,KAA8B;EAC1C,WAAW,CAAC,aAAa;;CAE5B,CAAC"}
+{"version":3,"file":"router-state.js","names":[],"sources":["../../src/shims/router-state.ts"],"sourcesContent":["/**\n * Server-only Pages Router state backed by AsyncLocalStorage.\n *\n * Provides request-scoped isolation for SSR context (pathname, query,\n * locale) so concurrent requests on Workers don't share state.\n *\n * This module is server-only — it imports node:async_hooks and must NOT\n * be bundled for the browser.\n */\n\nimport { _registerRouterStateAccessors } from \"./router.js\";\nimport { getOrCreateAls } from \"./internal/als-registry.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\nexport type SSRContext = {\n  pathname: string;\n  query: Record<string, string | string[]>;\n  asPath: string;\n  locale?: string;\n  locales?: string[];\n  defaultLocale?: string;\n  isFallback?: boolean;\n};\n\nexport type RouterState = {\n  ssrContext: SSRContext | null;\n};\n\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = getOrCreateAls<RouterState>(\"vinext.router.als\");\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  ssrContext: null,\n} satisfies RouterState) as RouterState;\n\nfunction _getState(): RouterState {\n  if (isInsideUnifiedScope()) {\n    return getRequestContext();\n  }\n  return _als.getStore() ?? _fallbackState;\n}\n\n/**\n * Run a function within a router state ALS scope.\n * Ensures per-request isolation for Pages Router SSR context\n * on concurrent runtimes.\n */\nexport function runWithRouterState<T>(fn: () => Promise<T>): Promise<T>;\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T>;\nexport function runWithRouterState<T>(fn: () => T | Promise<T>): T | Promise<T> {\n  if (isInsideUnifiedScope()) {\n    return runWithUnifiedStateMutation((uCtx) => {\n      uCtx.ssrContext = null;\n    }, fn);\n  }\n\n  const state: RouterState = {\n    ssrContext: null,\n  };\n  return _als.run(state, fn);\n}\n\n// ---------------------------------------------------------------------------\n// Register ALS-backed accessors into router.ts\n// ---------------------------------------------------------------------------\n\n_registerRouterStateAccessors({\n  getSSRContext(): SSRContext | null {\n    return _getState().ssrContext;\n  },\n\n  setSSRContext(ctx: SSRContext | null): void {\n    _getState().ssrContext = ctx;\n  },\n});\n"],"mappings":";;;;;;;;;;;;;AAoCA,MAAM,gBAAgB,OAAO,IAAI,yBAAyB;AAC1D,MAAM,KAAK;AACX,MAAM,OAAO,eAA4B,oBAAoB;AAE7D,MAAM,iBAAkB,GAAG,mBAAmB,EAC5C,YAAY,MACb;AAED,SAAS,YAAyB;CAChC,IAAI,sBAAsB,EACxB,OAAO,mBAAmB;CAE5B,OAAO,KAAK,UAAU,IAAI;;AAU5B,SAAgB,mBAAsB,IAA0C;CAC9E,IAAI,sBAAsB,EACxB,OAAO,6BAA6B,SAAS;EAC3C,KAAK,aAAa;IACjB,GAAG;CAMR,OAAO,KAAK,IAAI,EAFd,YAAY,MAEO,EAAE,GAAG;;AAO5B,8BAA8B;CAC5B,gBAAmC;EACjC,OAAO,WAAW,CAAC;;CAGrB,cAAc,KAA8B;EAC1C,WAAW,CAAC,aAAa;;CAE5B,CAAC"}

package/dist/shims/router.d.ts

@@ -38,7 +38,7 @@ type UrlObject = {
 type TransitionOptions = {
   shallow?: boolean;
   scroll?: boolean;
-  locale?: string;
+  locale?: string | false;
 };
 type RouterEvents = {
   on(event: string, handler: (...args: unknown[]) => void): void;
@@ -65,6 +65,14 @@ type SSRContext = {
   locales?: string[];
   defaultLocale?: string;
   domainLocales?: VinextNextData["domainLocales"];
+  /**
+   * True when rendering a `getStaticPaths` fallback shell for a path that
+   * hasn't been pre-rendered yet (`fallback: true` + unlisted path). Mirrors
+   * `renderContext.isFallback` in Next.js's `render.tsx`: `getStaticProps`
+   * is skipped, the page renders with empty props, and `useRouter().isFallback`
+   * returns `true` so user code can show a loading state.
+   */
+  isFallback?: boolean;
 };
 /**
  * Register ALS-backed state accessors. Called by router-state.ts on import.
@@ -97,8 +105,6 @@ type PagesNavigationContextShape = {
  * treat null as "App Router context, use normal app-router state".
  */
 declare function getPagesNavigationContext(): PagesNavigationContextShape | null;
-/** Inject a `<link rel="prefetch">` for the target page. */
-declare function prefetchUrl(url: string): Promise<void>;
 /**
  * useRouter hook - Pages Router compatible.
  *
@@ -151,15 +157,16 @@ type ExcludeRouterProps<P> = Pick<P, Exclude<keyof P, keyof WithRouterProps>>;
  *   define `getInitialProps`.
  */
 declare function withRouter<P extends WithRouterProps>(ComposedComponent: ComponentType<P>): ComponentType<ExcludeRouterProps<P>>;
-declare const Router: {
+declare const RouterMethods: {
   push: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
   replace: (url: string | UrlObject, as?: string, options?: TransitionOptions) => Promise<boolean>;
   back: () => void;
   reload: () => void;
-  prefetch: typeof prefetchUrl;
+  prefetch: (url: string) => Promise<void>;
   beforePopState: (cb: BeforePopStateCallback) => void;
   events: RouterEvents;
 };
+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 };
 //# sourceMappingURL=router.d.ts.map

package/dist/shims/router.js

@@ -1,13 +1,16 @@
 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 { isAbsoluteOrProtocolRelativeUrl, isHashOnlyBrowserUrlChange, toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
-import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
-import { addQueryParam, appendSearchParamsToUrl, urlQueryToSearchParams } from "../utils/query.js";
+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
 /**
@@ -19,6 +22,8 @@ import { createElement, useContext, 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 {
@@ -54,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;
 }
@@ -74,10 +91,27 @@ function getDomainLocalePath(url, locale) {
 function applyNavigationLocale(url, locale) {
 	if (!locale || typeof window === "undefined") 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 isAbsoluteOrProtocolRelativeUrl(url);
@@ -303,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) {
@@ -321,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
 			});
@@ -333,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) {
@@ -376,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;
@@ -393,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 });
@@ -428,7 +463,7 @@ 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
 	};
@@ -452,6 +487,22 @@ function updateHistory(mode, 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
@@ -463,7 +514,11 @@ function updateHistory(mode, url) {
 * passes no callback.
 */
 async function performNavigation(url, as, options, mode, onStateUpdate) {
-	let resolved = resolveNavigationTarget(url, as, options?.locale);
+	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) {
@@ -473,7 +528,9 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 		}
 		resolved = localPath;
 	}
-	const full = toBrowserNavigationHref(resolved, window.location.href, __basePath);
+	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)) {
@@ -491,7 +548,7 @@ async function performNavigation(url, as, options, mode, onStateUpdate) {
 	routerEvents.emit("beforeHistoryChange", resolved, { shallow });
 	updateHistory(mode, full);
 	if (!shallow) {
-		const result = await runNavigateClient(full, resolved);
+		const result = await runNavigateClient(full, resolved, htmlFetchUrl);
 		if (result === "cancelled") return true;
 		if (result === "failed") return false;
 	}
@@ -573,7 +630,7 @@ function handlePagesRouterPopState(e) {
 	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);
 			dispatchNavigateEvent();
@@ -624,17 +681,110 @@ function withRouter(ComposedComponent) {
 	if (process.env.NODE_ENV !== "production") WithRouterWrapper.displayName = `withRouter(${composed.displayName || composed.name || "Unknown"})`;
 	return WithRouterWrapper;
 }
-const Router = {
-	push: (url, as, options) => performNavigation(url, as, options, "push"),
-	replace: (url, as, options) => performNavigation(url, as, options, "replace"),
-	back: () => window.history.back(),
-	reload: () => window.location.reload(),
-	prefetch: prefetchUrl,
+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;
+		}
+	},
+	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;
+		}
+	},
+	asPath: {
+		enumerable: true,
+		get() {
+			return getPathnameAndQuery().asPath;
+		}
+	},
+	basePath: {
+		enumerable: true,
+		value: __basePath,
+		writable: false
+	},
+	locale: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.locale;
+			return window.__VINEXT_LOCALE__;
+		}
+	},
+	locales: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.locales;
+			return window.__VINEXT_LOCALES__;
+		}
+	},
+	defaultLocale: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.defaultLocale;
+			return window.__VINEXT_DEFAULT_LOCALE__;
+		}
+	},
+	domainLocales: {
+		enumerable: true,
+		get() {
+			if (typeof window === "undefined") return _getSSRContext()?.domainLocales;
+			return window.__NEXT_DATA__?.domainLocales;
+		}
+	},
+	isReady: {
+		enumerable: true,
+		value: true,
+		writable: false
+	},
+	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;