vinext 0.0.28 → 0.0.30

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

@@ -1 +1 @@
-{"version":3,"file":"router-state.d.ts","sourceRoot":"","sources":["../../src/shims/router-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAoCH;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAK9E"}
+{"version":3,"file":"router-state.d.ts","sourceRoot":"","sources":["../../src/shims/router-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAcH,MAAM,WAAW,UAAU;IACzB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,UAAU,EAAE,UAAU,GAAG,IAAI,CAAC;CAC/B;AAmBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAW9E"}

package/dist/shims/router-state.js

@@ -9,6 +9,7 @@
  */
 import { AsyncLocalStorage } from "node:async_hooks";
 import { _registerRouterStateAccessors } from "./router.js";
+import { getRequestContext, isInsideUnifiedScope, runWithUnifiedStateMutation, } from "./unified-request-context.js";
 const _ALS_KEY = Symbol.for("vinext.router.als");
 const _FALLBACK_KEY = Symbol.for("vinext.router.fallback");
 const _g = globalThis;
@@ -18,6 +19,9 @@ const _fallbackState = (_g[_FALLBACK_KEY] ??= {
     ssrContext: null,
 });
 function _getState() {
+    if (isInsideUnifiedScope()) {
+        return getRequestContext();
+    }
     return _als.getStore() ?? _fallbackState;
 }
 /**
@@ -26,6 +30,11 @@ function _getState() {
  * on concurrent runtimes.
  */
 export function runWithRouterState(fn) {
+    if (isInsideUnifiedScope()) {
+        return runWithUnifiedStateMutation((uCtx) => {
+            uCtx.ssrContext = null;
+        }, fn);
+    }
     const state = {
         ssrContext: null,
     };
@@ -39,14 +48,7 @@ _registerRouterStateAccessors({
         return _getState().ssrContext;
     },
     setSSRContext(ctx) {
-        const state = _als.getStore();
-        if (state) {
-            state.ssrContext = ctx;
-        }
-        else {
-            // No ALS scope — fallback for environments without als.run() wrapping.
-            _fallbackState.ssrContext = ctx;
-        }
+        _getState().ssrContext = ctx;
     },
 });
 //# sourceMappingURL=router-state.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"router-state.js","sourceRoot":"","sources":["../../src/shims/router-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AAmB5D,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACjD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AAC3D,MAAM,EAAE,GAAG,UAAqD,CAAC;AACjE,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;IACxB,IAAI,iBAAiB,EAAe,CAAmC,CAAC;AAE1E,MAAM,cAAc,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK;IAC5C,UAAU,EAAE,IAAI;CACK,CAAgB,CAAC;AAExC,SAAS,SAAS;IAChB,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAI,EAAwB;IAC5D,MAAM,KAAK,GAAgB;QACzB,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,8EAA8E;AAC9E,+CAA+C;AAC/C,8EAA8E;AAE9E,6BAA6B,CAAC;IAC5B,aAAa;QACX,OAAO,SAAS,EAAE,CAAC,UAAU,CAAC;IAChC,CAAC;IAED,aAAa,CAAC,GAAsB;QAClC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;QAC9B,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,uEAAuE;YACvE,cAAc,CAAC,UAAU,GAAG,GAAG,CAAC;QAClC,CAAC;IACH,CAAC;CACF,CAAC,CAAC","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 { AsyncLocalStorage } from \"node:async_hooks\";\nimport { _registerRouterStateAccessors } from \"./router.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\ninterface SSRContext {\n  pathname: string;\n  query: Record<string, string | string[]>;\n  asPath: string;\n  locale?: string;\n  locales?: string[];\n  defaultLocale?: string;\n}\n\ninterface RouterState {\n  ssrContext: SSRContext | null;\n}\n\nconst _ALS_KEY = Symbol.for(\"vinext.router.als\");\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = (_g[_ALS_KEY] ??=\n  new AsyncLocalStorage<RouterState>()) as AsyncLocalStorage<RouterState>;\n\nconst _fallbackState = (_g[_FALLBACK_KEY] ??= {\n  ssrContext: null,\n} satisfies RouterState) as RouterState;\n\nfunction _getState(): RouterState {\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: () => T | Promise<T>): T | Promise<T> {\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    const state = _als.getStore();\n    if (state) {\n      state.ssrContext = ctx;\n    } else {\n      // No ALS scope — fallback for environments without als.run() wrapping.\n      _fallbackState.ssrContext = ctx;\n    }\n  },\n});\n"]}
+{"version":3,"file":"router-state.js","sourceRoot":"","sources":["../../src/shims/router-state.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,6BAA6B,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,2BAA2B,GAC5B,MAAM,8BAA8B,CAAC;AAmBtC,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC;AACjD,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAC;AAC3D,MAAM,EAAE,GAAG,UAAqD,CAAC;AACjE,MAAM,IAAI,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC;IACxB,IAAI,iBAAiB,EAAe,CAAmC,CAAC;AAE1E,MAAM,cAAc,GAAG,CAAC,EAAE,CAAC,aAAa,CAAC,KAAK;IAC5C,UAAU,EAAE,IAAI;CACK,CAAgB,CAAC;AAExC,SAAS,SAAS;IAChB,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAC3B,OAAO,iBAAiB,EAAE,CAAC;IAC7B,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,cAAc,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAI,EAAwB;IAC5D,IAAI,oBAAoB,EAAE,EAAE,CAAC;QAC3B,OAAO,2BAA2B,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1C,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC,EAAE,EAAE,CAAC,CAAC;IACT,CAAC;IAED,MAAM,KAAK,GAAgB;QACzB,UAAU,EAAE,IAAI;KACjB,CAAC;IACF,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAC7B,CAAC;AAED,8EAA8E;AAC9E,+CAA+C;AAC/C,8EAA8E;AAE9E,6BAA6B,CAAC;IAC5B,aAAa;QACX,OAAO,SAAS,EAAE,CAAC,UAAU,CAAC;IAChC,CAAC;IAED,aAAa,CAAC,GAAsB;QAClC,SAAS,EAAE,CAAC,UAAU,GAAG,GAAG,CAAC;IAC/B,CAAC;CACF,CAAC,CAAC","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 { AsyncLocalStorage } from \"node:async_hooks\";\nimport { _registerRouterStateAccessors } from \"./router.js\";\nimport {\n  getRequestContext,\n  isInsideUnifiedScope,\n  runWithUnifiedStateMutation,\n} from \"./unified-request-context.js\";\n\n// ---------------------------------------------------------------------------\n// ALS setup\n// ---------------------------------------------------------------------------\n\nexport interface 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 interface RouterState {\n  ssrContext: SSRContext | null;\n}\n\nconst _ALS_KEY = Symbol.for(\"vinext.router.als\");\nconst _FALLBACK_KEY = Symbol.for(\"vinext.router.fallback\");\nconst _g = globalThis as unknown as Record<PropertyKey, unknown>;\nconst _als = (_g[_ALS_KEY] ??=\n  new AsyncLocalStorage<RouterState>()) as AsyncLocalStorage<RouterState>;\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: () => 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"]}

package/dist/shims/router.d.ts

@@ -6,6 +6,7 @@
  * by fetching new page data and re-rendering the React root.
  */
 import { type ReactElement } from "react";
+import type { VinextNextData } from "../client/vinext-next-data.js";
 import { type UrlQuery } from "../utils/query.js";
 type BeforePopStateCallback = (state: {
     url: string;
@@ -31,6 +32,8 @@ interface NextRouter {
     locales?: string[];
     /** Default locale */
     defaultLocale?: string;
+    /** Configured domain locales */
+    domainLocales?: VinextNextData["domainLocales"];
     /** Whether the router is ready */
     isReady: boolean;
     /** Whether this is a preview */
@@ -85,6 +88,7 @@ interface SSRContext {
     locale?: string;
     locales?: string[];
     defaultLocale?: string;
+    domainLocales?: VinextNextData["domainLocales"];
 }
 /**
  * Register ALS-backed state accessors. Called by router-state.ts on import.

package/dist/shims/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/shims/router.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/shims/router.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,OAAO,EAA4D,KAAK,YAAY,EAAE,MAAM,OAAO,CAAC;AAEpG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAKpE,OAAO,EAGL,KAAK,QAAQ,EAEd,MAAM,mBAAmB,CAAC;AAK3B,KAAK,sBAAsB,GAAG,CAAC,KAAK,EAAE;IACpC,GAAG,EAAE,MAAM,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE;QAAE,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;CAC/B,KAAK,OAAO,CAAC;AAEd,UAAU,UAAU;IAClB,uBAAuB;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,KAAK,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACzC,sCAAsC;IACtC,MAAM,EAAE,MAAM,CAAC;IACf,gBAAgB;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,qBAAqB;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,wBAAwB;IACxB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,qBAAqB;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gCAAgC;IAChC,aAAa,CAAC,EAAE,cAAc,CAAC,eAAe,CAAC,CAAC;IAChD,kCAAkC;IAClC,OAAO,EAAE,OAAO,CAAC;IACjB,gCAAgC;IAChC,SAAS,EAAE,OAAO,CAAC;IACnB,sCAAsC;IACtC,UAAU,EAAE,OAAO,CAAC;IAEpB,4BAA4B;IAC5B,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC1F,0BAA0B;IAC1B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7F,cAAc;IACd,IAAI,IAAI,IAAI,CAAC;IACb,sBAAsB;IACtB,MAAM,IAAI,IAAI,CAAC;IACf,sDAAsD;IACtD,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,4DAA4D;IAC5D,cAAc,CAAC,EAAE,EAAE,sBAAsB,GAAG,IAAI,CAAC;IACjD,+BAA+B;IAC/B,MAAM,EAAE,YAAY,CAAC;CACtB;AAED,UAAU,SAAS;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAED,UAAU,iBAAiB;IACzB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,YAAY;IACpB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/D,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,GAAG,IAAI,CAAC;IAChE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;CAC/C;AA+DD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAY1E;AAED,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAElD;AAgBD,wEAAwE;AACxE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAUtD;AAgCD;;GAEG;AACH,UAAU,UAAU;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,cAAc,CAAC,eAAe,CAAC,CAAC;CACjD;AAeD;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,SAAS,EAAE;IACvD,aAAa,EAAE,MAAM,UAAU,GAAG,IAAI,CAAC;IACvC,aAAa,EAAE,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,KAAK,IAAI,CAAC;CACjD,GAAG,IAAI,CAGP;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI,CAE1D;AAgPD;;GAEG;AACH,wBAAgB,SAAS,IAAI,UAAU,CAmKtC;AAgED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,YAAY,GAAG,YAAY,CAazE;AAGD,QAAA,MAAM,MAAM;gBACQ,MAAM,GAAG,SAAS,OAAO,MAAM,YAAY,iBAAiB;mBAmDzD,MAAM,GAAG,SAAS,OAAO,MAAM,YAAY,iBAAiB;;;oBAoD3D,MAAM;yBASP,sBAAsB;;CAI5C,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/dist/shims/router.js

@@ -8,17 +8,12 @@
 import { useState, useEffect, useCallback, useMemo, createElement } from "react";
 import { RouterContext } from "./internal/router-context.js";
 import { isValidModulePath } from "../client/validate-module-path.js";
-import { toSameOriginPath } from "./url-utils.js";
+import { toBrowserNavigationHref, toSameOriginAppPath } from "./url-utils.js";
 import { stripBasePath } from "../utils/base-path.js";
+import { addLocalePrefix, getDomainLocaleUrl } from "../utils/domain-locale.js";
 import { addQueryParam, appendSearchParamsToUrl, urlQueryToSearchParams, } from "../utils/query.js";
 /** basePath from next.config.js, injected by the plugin at build time */
 const __basePath = process.env.__NEXT_ROUTER_BASEPATH ?? "";
-/** Prepend basePath to a path for browser URLs / fetches */
-function withBasePath(p) {
-    if (!__basePath)
-        return p;
-    return __basePath + p;
-}
 function createRouterEvents() {
     const listeners = new Map();
     return {
@@ -57,6 +52,19 @@ function resolveUrl(url) {
 function resolveNavigationTarget(url, as, locale) {
     return applyNavigationLocale(as ?? resolveUrl(url), locale);
 }
+function getDomainLocales() {
+    return window.__NEXT_DATA__?.domainLocales;
+}
+function getCurrentHostname() {
+    return window.location?.hostname;
+}
+function getDomainLocalePath(url, locale) {
+    return getDomainLocaleUrl(url, locale, {
+        basePath: __basePath,
+        currentHostname: getCurrentHostname(),
+        domainItems: getDomainLocales(),
+    });
+}
 /**
  * Apply locale prefix to a URL for client-side navigation.
  * Same logic as Link's applyLocaleToHref but reads from window globals.
@@ -69,19 +77,30 @@ export function applyNavigationLocale(url, locale) {
     if (url.startsWith("http://") || url.startsWith("https://") || url.startsWith("//")) {
         return url;
     }
-    const defaultLocale = window.__VINEXT_DEFAULT_LOCALE__;
-    // Default locale doesn't get a prefix
-    if (locale === defaultLocale)
-        return url;
-    // Don't double-prefix
-    if (url.startsWith(`/${locale}/`) || url === `/${locale}`)
-        return url;
-    return `/${locale}${url.startsWith("/") ? url : `/${url}`}`;
+    const domainLocalePath = getDomainLocalePath(url, locale);
+    if (domainLocalePath)
+        return domainLocalePath;
+    return addLocalePrefix(url, locale, window.__VINEXT_DEFAULT_LOCALE__ ?? "");
 }
 /** Check if a URL is external (any URL scheme per RFC 3986, or protocol-relative) */
 export function isExternalUrl(url) {
     return /^[a-z][a-z0-9+.-]*:/i.test(url) || url.startsWith("//");
 }
+/** Resolve a hash URL to a basePath-stripped app URL for event payloads */
+function resolveHashUrl(url) {
+    if (typeof window === "undefined")
+        return url;
+    if (url.startsWith("#"))
+        return stripBasePath(window.location.pathname, __basePath) + window.location.search + url;
+    // Full-path hash URL — strip basePath for consistency with other events
+    try {
+        const parsed = new URL(url, window.location.href);
+        return stripBasePath(parsed.pathname, __basePath) + parsed.search + parsed.hash;
+    }
+    catch {
+        return url;
+    }
+}
 /** Check if a href is only a hash change relative to the current URL */
 export function isHashOnlyChange(href) {
     if (href.startsWith("#"))
@@ -304,7 +323,7 @@ async function navigateClient(url) {
     }
     catch (err) {
         console.error("[vinext] Client navigation failed:", err);
-        routerEvents.emit("routeChangeError", err, url);
+        routerEvents.emit("routeChangeError", err, url, { shallow: false });
         window.location.href = url;
     }
     finally {
@@ -319,10 +338,14 @@ async function navigateClient(url) {
  */
 function buildRouterValue(pathname, query, asPath, methods) {
     const _ssrState = _getSSRContext();
+    const nextData = typeof window !== "undefined"
+        ? window.__NEXT_DATA__
+        : undefined;
     const locale = typeof window === "undefined" ? _ssrState?.locale : window.__VINEXT_LOCALE__;
     const locales = typeof window === "undefined" ? _ssrState?.locales : window.__VINEXT_LOCALES__;
     const defaultLocale = typeof window === "undefined" ? _ssrState?.defaultLocale : window.__VINEXT_DEFAULT_LOCALE__;
-    const route = typeof window !== "undefined" ? (window.__NEXT_DATA__?.page ?? pathname) : pathname;
+    const domainLocales = typeof window === "undefined" ? _ssrState?.domainLocales : nextData?.domainLocales;
+    const route = typeof window !== "undefined" ? (nextData?.page ?? pathname) : pathname;
     return {
         pathname,
         route,
@@ -332,9 +355,10 @@ function buildRouterValue(pathname, query, asPath, methods) {
         locale,
         locales,
         defaultLocale,
+        domainLocales,
         isReady: true,
         isPreview: false,
-        isFallback: typeof window !== "undefined" && window.__NEXT_DATA__?.isFallback === true,
+        isFallback: typeof window !== "undefined" && nextData?.isFallback === true,
         ...methods,
         events: routerEvents,
     };
@@ -357,31 +381,41 @@ export function useRouter() {
         let resolved = resolveNavigationTarget(url, as, options?.locale);
         // External URLs — delegate to browser (unless same-origin)
         if (isExternalUrl(resolved)) {
-            const localPath = toSameOriginPath(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);
         // Hash-only change — no page fetch needed
         if (isHashOnlyChange(resolved)) {
+            const eventUrl = resolveHashUrl(resolved);
+            routerEvents.emit("hashChangeStart", eventUrl, {
+                shallow: options?.shallow ?? false,
+            });
             const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-            window.history.pushState({}, "", resolved.startsWith("#") ? resolved : withBasePath(resolved));
+            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();
-        const full = withBasePath(resolved);
-        routerEvents.emit("routeChangeStart", resolved);
+        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) {
             await navigateClient(full);
         }
         setState(getPathnameAndQuery());
-        routerEvents.emit("routeChangeComplete", resolved);
+        routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
         // Scroll: handle hash target, else scroll to top unless scroll:false
         const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
         if (hash) {
@@ -397,30 +431,40 @@ export function useRouter() {
         let resolved = resolveNavigationTarget(url, as, options?.locale);
         // External URLs — delegate to browser (unless same-origin)
         if (isExternalUrl(resolved)) {
-            const localPath = toSameOriginPath(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);
         // Hash-only change — no page fetch needed
         if (isHashOnlyChange(resolved)) {
+            const eventUrl = resolveHashUrl(resolved);
+            routerEvents.emit("hashChangeStart", eventUrl, {
+                shallow: options?.shallow ?? false,
+            });
             const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-            window.history.replaceState({}, "", resolved.startsWith("#") ? resolved : withBasePath(resolved));
+            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;
         }
-        const full = withBasePath(resolved);
-        routerEvents.emit("routeChangeStart", resolved);
+        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) {
             await navigateClient(full);
         }
         setState(getPathnameAndQuery());
-        routerEvents.emit("routeChangeComplete", resolved);
+        routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
         // Scroll: handle hash target, else scroll to top unless scroll:false
         const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
         if (hash) {
@@ -463,6 +507,10 @@ export function useRouter() {
 // beforePopState callback: called before handling browser back/forward.
 // If it returns false, the navigation is cancelled.
 let _beforePopStateCb;
+// Track pathname+search for detecting hash-only back/forward in the popstate
+// handler. Updated after every pushState/replaceState so that popstate can
+// compare the previous value with the (already-changed) window.location.
+let _lastPathnameAndSearch = typeof window !== "undefined" ? window.location.pathname + window.location.search : "";
 // Module-level popstate listener: handles browser back/forward by re-rendering
 // the React root with the page at the new URL. This runs regardless of whether
 // any component calls useRouter().
@@ -470,6 +518,8 @@ if (typeof window !== "undefined") {
     window.addEventListener("popstate", (e) => {
         const browserUrl = window.location.pathname + window.location.search;
         const appUrl = stripBasePath(window.location.pathname, __basePath) + window.location.search;
+        // Detect hash-only back/forward: pathname+search unchanged, only hash differs.
+        const isHashOnly = browserUrl === _lastPathnameAndSearch;
         // Check beforePopState callback
         if (_beforePopStateCb !== undefined) {
             const shouldContinue = _beforePopStateCb({
@@ -480,9 +530,29 @@ if (typeof window !== "undefined") {
             if (!shouldContinue)
                 return;
         }
-        routerEvents.emit("routeChangeStart", appUrl);
+        // Update tracker only after beforePopState confirms navigation proceeds.
+        // If beforePopState cancels, the tracker must retain the previous value
+        // so the next popstate compares against the correct baseline.
+        _lastPathnameAndSearch = browserUrl;
+        if (isHashOnly) {
+            // Hash-only back/forward — no page fetch needed
+            const hashUrl = appUrl + window.location.hash;
+            routerEvents.emit("hashChangeStart", hashUrl, { shallow: false });
+            scrollToHash(window.location.hash);
+            routerEvents.emit("hashChangeComplete", hashUrl, { shallow: false });
+            window.dispatchEvent(new CustomEvent("vinext:navigate"));
+            return;
+        }
+        const fullAppUrl = appUrl + window.location.hash;
+        routerEvents.emit("routeChangeStart", fullAppUrl, { shallow: false });
+        // Note: The browser has already updated window.location by the time popstate
+        // fires, so this is not truly "before" the URL change. In Next.js the popstate
+        // handler calls replaceState to store history metadata — beforeHistoryChange
+        // precedes that call, not the URL change itself. We emit it here for API
+        // compatibility.
+        routerEvents.emit("beforeHistoryChange", fullAppUrl, { shallow: false });
         void navigateClient(browserUrl).then(() => {
-            routerEvents.emit("routeChangeComplete", appUrl);
+            routerEvents.emit("routeChangeComplete", fullAppUrl, { shallow: false });
             restoreScrollPosition(e.state);
             window.dispatchEvent(new CustomEvent("vinext:navigate"));
         });
@@ -515,29 +585,39 @@ const Router = {
         let resolved = resolveNavigationTarget(url, as, options?.locale);
         // External URLs (unless same-origin)
         if (isExternalUrl(resolved)) {
-            const localPath = toSameOriginPath(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);
         // Hash-only change
         if (isHashOnlyChange(resolved)) {
+            const eventUrl = resolveHashUrl(resolved);
+            routerEvents.emit("hashChangeStart", eventUrl, {
+                shallow: options?.shallow ?? false,
+            });
             const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-            window.history.pushState({}, "", resolved.startsWith("#") ? resolved : withBasePath(resolved));
+            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;
         }
         saveScrollPosition();
-        const full = withBasePath(resolved);
-        routerEvents.emit("routeChangeStart", resolved);
+        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) {
             await navigateClient(full);
         }
-        routerEvents.emit("routeChangeComplete", resolved);
+        routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
         const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
         if (hash) {
             scrollToHash(hash);
@@ -552,28 +632,38 @@ const Router = {
         let resolved = resolveNavigationTarget(url, as, options?.locale);
         // External URLs (unless same-origin)
         if (isExternalUrl(resolved)) {
-            const localPath = toSameOriginPath(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);
         // Hash-only change
         if (isHashOnlyChange(resolved)) {
+            const eventUrl = resolveHashUrl(resolved);
+            routerEvents.emit("hashChangeStart", eventUrl, {
+                shallow: options?.shallow ?? false,
+            });
             const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
-            window.history.replaceState({}, "", resolved.startsWith("#") ? resolved : withBasePath(resolved));
+            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;
         }
-        const full = withBasePath(resolved);
-        routerEvents.emit("routeChangeStart", resolved);
+        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) {
             await navigateClient(full);
         }
-        routerEvents.emit("routeChangeComplete", resolved);
+        routerEvents.emit("routeChangeComplete", resolved, { shallow: options?.shallow ?? false });
         const hash = resolved.includes("#") ? resolved.slice(resolved.indexOf("#")) : "";
         if (hash) {
             scrollToHash(hash);