intor 2.3.28 → 2.3.30

package/dist/core/src/core/messages/load-remote-messages/fetch-remote-resource.js

@@ -12,7 +12,7 @@ import { isValidMessages } from '../utils/is-valid-messages.js';
  * - Validating the returned message structure
  * - Handling abort and network errors
  */
-async function fetchRemoteResource({ url, headers, signal, loggerOptions, }) {
+async function fetchRemoteResource({ fetch, url, headers, signal, loggerOptions, }) {
     const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "fetch-locale-messages" });
     try {

package/dist/core/src/core/messages/load-remote-messages/load-remote-messages.js

@@ -18,7 +18,7 @@ import { resolveRemoteResources } from './resolve-remote-resources.js';
  *
  * Network requests and response validation are delegated to lower-level utilities.
  */
-const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, url: baseUrl, headers, signal, loggerOptions, }) => {
+const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, fetch, url: baseUrl, headers, signal, loggerOptions, }) => {
     const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "load-remote-messages" });
     // Abort early if the request has already been cancelled
@@ -49,7 +49,7 @@ const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurr
             // -----------------------------------------------------------------
             // Fetch all message chunks in parallel
             // -----------------------------------------------------------------
-            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions });
+            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions, fetch });
             const results = await Promise.all(resources.map(({ url }) => limit ? limit(() => fetchUrl(url)) : fetchUrl(url)));
             // Guard: no valid remote resources
             if (!results.some(Boolean))

package/dist/core/src/routing/pathname/canonicalize-pathname.js

@@ -1,3 +1,4 @@
+import { PREFIX_PLACEHOLDER } from '../../core/constants/prefix-placeholder.js';
 import '../../core/error/intor-error.js';
 import { normalizePathname } from '../../core/utils/normalizers/normalize-pathname.js';
 import 'logry';
@@ -6,6 +7,8 @@ import 'p-limit';
 /**
  * Returns a canonical, locale-agnostic pathname.
  *
+ * Accepts `{locale}` as a locale placeholder segment.
+ *
  * @example
  * ```ts
  * // config.supportedLocales: ["en-US"]
@@ -18,9 +21,8 @@ import 'p-limit';
 function canonicalizePathname(rawPathname, config) {
     const { routing, supportedLocales } = config;
     const { basePath } = routing;
-    // 1. Normalize pathname
     const normalizedPathname = normalizePathname(rawPathname);
-    // 2. Strip basePath
+    // Strip basePath
     let prefixedPathname = normalizedPathname;
     if (basePath && normalizedPathname === basePath) {
         prefixedPathname = "/";
@@ -28,12 +30,14 @@ function canonicalizePathname(rawPathname, config) {
     else if (basePath && normalizedPathname.startsWith(basePath + "/")) {
         prefixedPathname = normalizedPathname.slice(basePath.length);
     }
-    // 3. Detect locale segment
+    // Detect locale segment
     const firstSegment = prefixedPathname.split("/").find(Boolean);
-    const locale = firstSegment && supportedLocales.includes(firstSegment)
-        ? firstSegment
-        : undefined;
-    // 4. Strip locale segment
+    const locale = firstSegment === PREFIX_PLACEHOLDER
+        ? PREFIX_PLACEHOLDER
+        : firstSegment && supportedLocales.includes(firstSegment)
+            ? firstSegment
+            : undefined;
+    // Strip locale segment
     return locale
         ? prefixedPathname.slice(locale.length + 1) || "/"
         : prefixedPathname;

package/dist/core/src/server/helpers/get-translator.js

@@ -2,12 +2,12 @@ import { initTranslator } from '../translator/init-translator.js';
 
 // Implementation
 async function getTranslator(config, params) {
-    const { readers, allowCacheWrite, preKey, handlers, plugins } = params;
-    const locale = params.locale;
+    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
         readers,
         allowCacheWrite,
+        fetch: fetch || globalThis.fetch,
         preKey,
         plugins,
         handlers,

package/dist/core/src/server/intor/intor.js

@@ -9,21 +9,16 @@ import { initTranslator } from '../translator/init-translator.js';
  * Produces a server-side snapshot for SSR and
  * full-stack rendering environments.
  */
-async function intor(config, localeOrResolver, options) {
+async function intor(config, locale, options) {
     const baseLogger = getLogger(config.logger);
     const logger = baseLogger.child({ scope: "intor" });
     logger.info("Start Intor initialization.");
-    // Resolve locale
-    const isLocaleFunction = typeof localeOrResolver === "function";
-    const locale = isLocaleFunction
-        ? await localeOrResolver(config)
-        : localeOrResolver || config.defaultLocale;
-    const source = typeof localeOrResolver === "function" ? "resolver" : "static";
-    logger.debug(`Initial locale resolved as "${locale}" via "${source}".`);
+    logger.debug(`Initializing Intor with locale "${locale}".`);
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
         readers: options?.readers,
         allowCacheWrite: options?.allowCacheWrite,
+        fetch: options?.fetch || globalThis.fetch,
     });
     logger.info("Intor initialized.");
     return {

package/dist/core/src/server/messages/load-messages.js

@@ -17,7 +17,7 @@ import { loadLocalMessages } from './load-local-messages/load-local-messages.js'
  * Message traversal, parsing, fallback resolution, and caching logic
  * are delegated to the selected loader.
  */
-const loadMessages = async ({ config, locale, readers, allowCacheWrite = false, }) => {
+const loadMessages = async ({ config, locale, readers, allowCacheWrite = false, fetch, }) => {
     const baseLogger = getLogger(config.logger);
     const logger = baseLogger.child({ scope: "load-messages" });
     // ---------------------------------------------------------------------------
@@ -61,6 +61,7 @@ const loadMessages = async ({ config, locale, readers, allowCacheWrite = false,
             fallbackLocales,
             namespaces,
             concurrency,
+            fetch,
             url: loader.url,
             headers: loader.headers,
             loggerOptions: config.logger,

package/dist/core/src/server/translator/init-translator.js

@@ -14,13 +14,19 @@ import { createTranslator } from './create-translator.js';
  * - Returns an immutable translator snapshot.
  */
 async function initTranslator(config, locale, options) {
-    const { readers, allowCacheWrite = false, preKey, handlers, plugins, } = options || {};
+    const { readers, allowCacheWrite = false, fetch, preKey, handlers, plugins, } = options;
     const loader = resolveLoaderOptions(config, "server");
     // Load messages
     let messages = {};
     if (loader) {
-        messages =
-            (await loadMessages({ config, locale, readers, allowCacheWrite })) || {};
+        const loaded = await loadMessages({
+            config,
+            locale,
+            readers,
+            allowCacheWrite,
+            fetch,
+        });
+        messages = loaded || {};
     }
     // Create immutable translator snapshot
     return createTranslator({

package/dist/express/src/core/messages/load-remote-messages/fetch-remote-resource.js

@@ -12,7 +12,7 @@ import { isValidMessages } from '../utils/is-valid-messages.js';
  * - Validating the returned message structure
  * - Handling abort and network errors
  */
-async function fetchRemoteResource({ url, headers, signal, loggerOptions, }) {
+async function fetchRemoteResource({ fetch, url, headers, signal, loggerOptions, }) {
     const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "fetch-locale-messages" });
     try {

package/dist/express/src/core/messages/load-remote-messages/load-remote-messages.js

@@ -18,7 +18,7 @@ import { resolveRemoteResources } from './resolve-remote-resources.js';
  *
  * Network requests and response validation are delegated to lower-level utilities.
  */
-const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, url: baseUrl, headers, signal, loggerOptions, }) => {
+const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, fetch, url: baseUrl, headers, signal, loggerOptions, }) => {
     const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "load-remote-messages" });
     // Abort early if the request has already been cancelled
@@ -49,7 +49,7 @@ const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurr
             // -----------------------------------------------------------------
             // Fetch all message chunks in parallel
             // -----------------------------------------------------------------
-            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions });
+            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions, fetch });
             const results = await Promise.all(resources.map(({ url }) => limit ? limit(() => fetchUrl(url)) : fetchUrl(url)));
             // Guard: no valid remote resources
             if (!results.some(Boolean))

package/dist/express/src/routing/pathname/canonicalize-pathname.js

@@ -1,3 +1,4 @@
+import { PREFIX_PLACEHOLDER } from '../../core/constants/prefix-placeholder.js';
 import '../../core/error/intor-error.js';
 import { normalizePathname } from '../../core/utils/normalizers/normalize-pathname.js';
 import 'logry';
@@ -6,6 +7,8 @@ import 'p-limit';
 /**
  * Returns a canonical, locale-agnostic pathname.
  *
+ * Accepts `{locale}` as a locale placeholder segment.
+ *
  * @example
  * ```ts
  * // config.supportedLocales: ["en-US"]
@@ -18,9 +21,8 @@ import 'p-limit';
 function canonicalizePathname(rawPathname, config) {
     const { routing, supportedLocales } = config;
     const { basePath } = routing;
-    // 1. Normalize pathname
     const normalizedPathname = normalizePathname(rawPathname);
-    // 2. Strip basePath
+    // Strip basePath
     let prefixedPathname = normalizedPathname;
     if (basePath && normalizedPathname === basePath) {
         prefixedPathname = "/";
@@ -28,12 +30,14 @@ function canonicalizePathname(rawPathname, config) {
     else if (basePath && normalizedPathname.startsWith(basePath + "/")) {
         prefixedPathname = normalizedPathname.slice(basePath.length);
     }
-    // 3. Detect locale segment
+    // Detect locale segment
     const firstSegment = prefixedPathname.split("/").find(Boolean);
-    const locale = firstSegment && supportedLocales.includes(firstSegment)
-        ? firstSegment
-        : undefined;
-    // 4. Strip locale segment
+    const locale = firstSegment === PREFIX_PLACEHOLDER
+        ? PREFIX_PLACEHOLDER
+        : firstSegment && supportedLocales.includes(firstSegment)
+            ? firstSegment
+            : undefined;
+    // Strip locale segment
     return locale
         ? prefixedPathname.slice(locale.length + 1) || "/"
         : prefixedPathname;

package/dist/express/src/server/helpers/get-translator.js

@@ -2,12 +2,12 @@ import { initTranslator } from '../translator/init-translator.js';
 
 // Implementation
 async function getTranslator(config, params) {
-    const { readers, allowCacheWrite, preKey, handlers, plugins } = params;
-    const locale = params.locale;
+    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
         readers,
         allowCacheWrite,
+        fetch: fetch || globalThis.fetch,
         preKey,
         plugins,
         handlers,

package/dist/express/src/server/messages/load-messages.js

@@ -17,7 +17,7 @@ import { loadLocalMessages } from './load-local-messages/load-local-messages.js'
  * Message traversal, parsing, fallback resolution, and caching logic
  * are delegated to the selected loader.
  */
-const loadMessages = async ({ config, locale, readers, allowCacheWrite = false, }) => {
+const loadMessages = async ({ config, locale, readers, allowCacheWrite = false, fetch, }) => {
     const baseLogger = getLogger(config.logger);
     const logger = baseLogger.child({ scope: "load-messages" });
     // ---------------------------------------------------------------------------
@@ -61,6 +61,7 @@ const loadMessages = async ({ config, locale, readers, allowCacheWrite = false,
             fallbackLocales,
             namespaces,
             concurrency,
+            fetch,
             url: loader.url,
             headers: loader.headers,
             loggerOptions: config.logger,

package/dist/express/src/server/translator/init-translator.js

@@ -14,13 +14,19 @@ import { createTranslator } from './create-translator.js';
  * - Returns an immutable translator snapshot.
  */
 async function initTranslator(config, locale, options) {
-    const { readers, allowCacheWrite = false, preKey, handlers, plugins, } = options || {};
+    const { readers, allowCacheWrite = false, fetch, preKey, handlers, plugins, } = options;
     const loader = resolveLoaderOptions(config);
     // Load messages
     let messages = {};
     if (loader) {
-        messages =
-            (await loadMessages({ config, locale, readers, allowCacheWrite })) || {};
+        const loaded = await loadMessages({
+            config,
+            locale,
+            readers,
+            allowCacheWrite,
+            fetch,
+        });
+        messages = loaded || {};
     }
     // Create immutable translator snapshot
     return createTranslator({

package/dist/next/export/next/index.js

@@ -1,4 +1,3 @@
 export { Link } from '../../src/adapters/next/navigation/link.js';
-export { usePathname } from '../../src/adapters/next/navigation/use-pathname.js';
 export { useRouter } from '../../src/adapters/next/navigation/use-router.js';
 export { redirect } from '../../src/adapters/next/navigation/redirect.js';

package/dist/next/export/next/server/index.js

@@ -1,4 +1,3 @@
 export { intor } from '../../../src/adapters/next/server/intor.js';
 export { getLocale } from '../../../src/adapters/next/server/get-locale.js';
-export { getPathname } from '../../../src/adapters/next/server/get-pathname.js';
 export { getTranslator } from '../../../src/adapters/next/server/get-translator.js';

package/dist/next/src/adapters/next/navigation/link.js

@@ -2,9 +2,14 @@
 import { jsx } from 'react/jsx-runtime';
 import { formatUrl } from 'next/dist/shared/lib/router/utils/format-url';
 import NextLink from 'next/link';
+import { usePathname } from 'next/navigation';
 import 'react';
-import { useResolveNavigation, useExecuteNavigation } from 'intor/react';
-import { usePathname } from './use-pathname.js';
+import { executeNavigation } from '../../../client/shared/navigation/execute-navigation.js';
+import { useIntorContext } from 'intor/react';
+import '../../../core/error/intor-error.js';
+import 'logry';
+import 'p-limit';
+import { resolveNavigation } from '../../../routing/navigation/resolve-navigation.js';
 
 /**
  * Render a locale-aware link for the current execution context.
@@ -15,16 +20,12 @@ import { usePathname } from './use-pathname.js';
  * @platform Next.js
  */
 const Link = ({ href, locale, children, onClick, ...props }) => {
-    const { pathname } = usePathname();
-    const resolveNavigation = useResolveNavigation();
-    const executeNavigation = useExecuteNavigation();
+    const { config, locale: currentLocale, setLocale } = useIntorContext();
+    const currentPathname = usePathname();
     // Normalize href into a string destination
     const rawDestination = typeof href === "string" ? href : href ? formatUrl(href) : undefined;
     // Resolve navigation result for this link
-    const navigationResult = resolveNavigation(pathname, {
-        destination: rawDestination,
-        locale,
-    });
+    const navigationResult = resolveNavigation(config, currentLocale, currentPathname, { destination: rawDestination, locale });
     // --------------------------------------------------
     // Execute navigation on user interaction
     // --------------------------------------------------
@@ -32,7 +33,7 @@ const Link = ({ href, locale, children, onClick, ...props }) => {
         onClick?.(e);
         if (e.defaultPrevented)
             return;
-        executeNavigation(navigationResult, e);
+        executeNavigation(navigationResult, { config, currentLocale, setLocale }, e);
     };
     return (jsx(NextLink, { href: navigationResult.destination, onClick: handleClick, ...props, children: children }));
 };

package/dist/next/src/adapters/next/navigation/use-router.js

@@ -1,6 +1,10 @@
-import { useRouter as useRouter$1 } from 'next/navigation';
-import { useResolveNavigation, useExecuteNavigation } from 'intor/react';
-import { usePathname } from './use-pathname.js';
+import { usePathname, useRouter as useRouter$1 } from 'next/navigation';
+import { executeNavigation } from '../../../client/shared/navigation/execute-navigation.js';
+import { useIntorContext } from 'intor/react';
+import '../../../core/error/intor-error.js';
+import 'logry';
+import 'p-limit';
+import { resolveNavigation } from '../../../routing/navigation/resolve-navigation.js';
 
 /**
  * Locale-aware router hook for the current execution context.
@@ -11,40 +15,30 @@ import { usePathname } from './use-pathname.js';
  * @platform Next.js
  */
 const useRouter = () => {
+    const { config, locale: currentLocale, setLocale } = useIntorContext();
+    const currentPathname = usePathname();
     const { push: nextRouterPush, replace: nextRouterReplace, prefetch: nextRouterPrefetch, ...rest } = useRouter$1();
-    const { pathname } = usePathname();
-    const resolveNavigation = useResolveNavigation();
-    const executeNavigation = useExecuteNavigation();
     // --------------------------------------------------
     // push
     // --------------------------------------------------
     const push = (href, options) => {
-        const navigationResult = resolveNavigation(pathname, {
-            destination: href,
-            locale: options?.locale,
-        });
-        executeNavigation(navigationResult);
+        const navigationResult = resolveNavigation(config, currentLocale, currentPathname, { destination: href, locale: options?.locale });
+        executeNavigation(navigationResult, { config, currentLocale, setLocale });
         nextRouterPush(navigationResult.destination, options);
     };
     // --------------------------------------------------
     // replace
     // --------------------------------------------------
     const replace = (href, options) => {
-        const navigationResult = resolveNavigation(pathname, {
-            destination: href,
-            locale: options?.locale,
-        });
-        executeNavigation(navigationResult);
+        const navigationResult = resolveNavigation(config, currentLocale, currentPathname, { destination: href, locale: options?.locale });
+        executeNavigation(navigationResult, { config, currentLocale, setLocale });
         nextRouterReplace(navigationResult.destination, options);
     };
     // --------------------------------------------------
     // prefetch
     // --------------------------------------------------
     const prefetch = (href, options) => {
-        const { kind, destination } = resolveNavigation(pathname, {
-            destination: href,
-            locale: options?.locale,
-        });
+        const { kind, destination } = resolveNavigation(config, currentLocale, currentPathname, { destination: href, locale: options?.locale });
         if (kind !== "client")
             return; // Prefetch only makes sense for client-side navigation
         nextRouterPrefetch(destination, options);

package/dist/next/src/adapters/next/server/get-locale.js

@@ -1,6 +1,7 @@
 import { headers, cookies } from 'next/headers';
 import { INTOR_HEADERS } from '../../../core/constants/headers.js';
 import '../../../core/error/intor-error.js';
+import { normalizeLocale } from '../../../core/utils/normalizers/normalize-locale.js';
 import 'logry';
 import 'p-limit';
 
@@ -21,7 +22,9 @@ const getLocale = async (config) => {
     const cookieStore = await cookies();
     const cookieLocale = cookieStore.get(config.cookie.name)?.value;
     if (cookieLocale) {
-        return cookieLocale;
+        const resolved = normalizeLocale(cookieLocale, config.supportedLocales);
+        if (resolved)
+            return resolved;
     }
     // Explicit default
     return config.defaultLocale;

package/dist/next/src/adapters/next/server/intor.js

@@ -15,7 +15,7 @@ import { getLocale } from './get-locale.js';
  * @platform Next.js
  */
 async function intor(config, options) {
-    return await intor$1(config, getLocale, {
+    return await intor$1(config, await getLocale(config), {
         readers: options?.readers,
         allowCacheWrite: options?.allowCacheWrite ?? true,
     });

package/dist/next/src/client/shared/navigation/execute-navigation.js

@@ -0,0 +1,50 @@
+import '../../../core/error/intor-error.js';
+import 'logry';
+import 'p-limit';
+import { shouldSyncLocale } from '../../../policies/should-sync-locale.js';
+import { setLocaleCookie } from '../utils/locale/set-locale-cookie.js';
+
+/**
+ * Executes a resolved navigation result.
+ *
+ * Applies all imperative side effects required to complete navigation,
+ * including locale synchronization, cookie persistence, and full reloads.
+ *
+ * This function must be called after `resolveNavigation`.
+ */
+function executeNavigation(navigationResult, context, e) {
+    const { config, currentLocale, setLocale } = context;
+    const { cookie } = config;
+    const { destination, kind, locale } = navigationResult;
+    // ------------------------------------------------------
+    // External navigation: let browser handle it
+    // ------------------------------------------------------
+    if (kind === "external") {
+        return;
+    }
+    // ------------------------------------------------------
+    // Full reload: commit locale side effects, then perform document reload
+    // ------------------------------------------------------
+    if (kind === "reload") {
+        e?.preventDefault();
+        if (shouldSyncLocale(locale, currentLocale)) {
+            if (cookie.persist) {
+                setLocaleCookie(cookie, locale);
+            }
+        }
+        globalThis.location.href = destination;
+        return;
+    }
+    // ------------------------------------------------------
+    // Client-side navigation only
+    // ------------------------------------------------------
+    if (shouldSyncLocale(locale, currentLocale)) {
+        // Eagerly persist locale to avoid stale cookie during client-side navigation.
+        if (cookie.persist) {
+            setLocaleCookie(cookie, locale);
+        }
+        setLocale(locale);
+    }
+}
+
+export { executeNavigation };

package/dist/next/src/client/shared/utils/build-cookie-string.js

@@ -0,0 +1,30 @@
+/**
+ * Build a serialized cookie string.
+ */
+const buildCookieString = (cookieOptions, value) => {
+    const { name, maxAge, path, domain, sameSite, secure } = cookieOptions;
+    // Cookie name and encoded value
+    const parts = [`${name}=${encodeURIComponent(value)}`];
+    // Add expiration and max-age if provided
+    if (maxAge) {
+        const expires = new Date(Date.now() + maxAge * 1000).toUTCString();
+        parts.push(`expires=${expires}`, `max-age=${maxAge}`);
+    }
+    // Set path (default to "/")
+    parts.push(`path=${path ?? "/"}`);
+    // Add domain if specified
+    if (domain) {
+        parts.push(`domain=${domain}`);
+    }
+    // Add SameSite policy (e.g., Lax, Strict)
+    if (sameSite) {
+        parts.push(`SameSite=${sameSite[0].toUpperCase()}${sameSite.slice(1).toLowerCase()}`);
+    }
+    // Add Secure flag if not explicitly disabled
+    if (secure !== false) {
+        parts.push(`Secure`);
+    }
+    return parts.join("; ");
+};
+
+export { buildCookieString };

package/dist/next/src/client/shared/utils/locale/set-locale-cookie.js

@@ -0,0 +1,15 @@
+import { buildCookieString } from '../build-cookie-string.js';
+
+/**
+ * Persist locale to a cookie.
+ *
+ * This function relies on `document.cookie`.
+ */
+const setLocaleCookie = (cookieOptions, locale) => {
+    if (typeof document === "undefined")
+        return;
+    // Build and apply the cookie string
+    document.cookie = buildCookieString(cookieOptions, locale);
+};
+
+export { setLocaleCookie };

package/dist/next/src/core/messages/load-remote-messages/fetch-remote-resource.js

@@ -12,7 +12,7 @@ import { isValidMessages } from '../utils/is-valid-messages.js';
  * - Validating the returned message structure
  * - Handling abort and network errors
  */
-async function fetchRemoteResource({ url, headers, signal, loggerOptions, }) {
+async function fetchRemoteResource({ fetch, url, headers, signal, loggerOptions, }) {
     const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "fetch-locale-messages" });
     try {

package/dist/next/src/core/messages/load-remote-messages/load-remote-messages.js

@@ -18,7 +18,7 @@ import { resolveRemoteResources } from './resolve-remote-resources.js';
  *
  * Network requests and response validation are delegated to lower-level utilities.
  */
-const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, url: baseUrl, headers, signal, loggerOptions, }) => {
+const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurrency, fetch, url: baseUrl, headers, signal, loggerOptions, }) => {
     const baseLogger = getLogger(loggerOptions);
     const logger = baseLogger.child({ scope: "load-remote-messages" });
     // Abort early if the request has already been cancelled
@@ -49,7 +49,7 @@ const loadRemoteMessages = async ({ locale, fallbackLocales, namespaces, concurr
             // -----------------------------------------------------------------
             // Fetch all message chunks in parallel
             // -----------------------------------------------------------------
-            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions });
+            const fetchUrl = (url) => fetchRemoteResource({ url, headers, signal, loggerOptions, fetch });
             const results = await Promise.all(resources.map(({ url }) => limit ? limit(() => fetchUrl(url)) : fetchUrl(url)));
             // Guard: no valid remote resources
             if (!results.some(Boolean))

package/dist/next/src/routing/pathname/canonicalize-pathname.js

@@ -1,3 +1,4 @@
+import { PREFIX_PLACEHOLDER } from '../../core/constants/prefix-placeholder.js';
 import '../../core/error/intor-error.js';
 import { normalizePathname } from '../../core/utils/normalizers/normalize-pathname.js';
 import 'logry';
@@ -6,6 +7,8 @@ import 'p-limit';
 /**
  * Returns a canonical, locale-agnostic pathname.
  *
+ * Accepts `{locale}` as a locale placeholder segment.
+ *
  * @example
  * ```ts
  * // config.supportedLocales: ["en-US"]
@@ -18,9 +21,8 @@ import 'p-limit';
 function canonicalizePathname(rawPathname, config) {
     const { routing, supportedLocales } = config;
     const { basePath } = routing;
-    // 1. Normalize pathname
     const normalizedPathname = normalizePathname(rawPathname);
-    // 2. Strip basePath
+    // Strip basePath
     let prefixedPathname = normalizedPathname;
     if (basePath && normalizedPathname === basePath) {
         prefixedPathname = "/";
@@ -28,12 +30,14 @@ function canonicalizePathname(rawPathname, config) {
     else if (basePath && normalizedPathname.startsWith(basePath + "/")) {
         prefixedPathname = normalizedPathname.slice(basePath.length);
     }
-    // 3. Detect locale segment
+    // Detect locale segment
     const firstSegment = prefixedPathname.split("/").find(Boolean);
-    const locale = firstSegment && supportedLocales.includes(firstSegment)
-        ? firstSegment
-        : undefined;
-    // 4. Strip locale segment
+    const locale = firstSegment === PREFIX_PLACEHOLDER
+        ? PREFIX_PLACEHOLDER
+        : firstSegment && supportedLocales.includes(firstSegment)
+            ? firstSegment
+            : undefined;
+    // Strip locale segment
     return locale
         ? prefixedPathname.slice(locale.length + 1) || "/"
         : prefixedPathname;

package/dist/next/src/server/helpers/get-translator.js

@@ -2,12 +2,12 @@ import { initTranslator } from '../translator/init-translator.js';
 
 // Implementation
 async function getTranslator(config, params) {
-    const { readers, allowCacheWrite, preKey, handlers, plugins } = params;
-    const locale = params.locale;
+    const { locale, readers, allowCacheWrite, fetch, preKey, handlers, plugins } = params;
     // Initialize a locale-bound translator snapshot with messages loaded
     const translator = await initTranslator(config, locale, {
         readers,
         allowCacheWrite,
+        fetch: fetch || globalThis.fetch,
         preKey,
         plugins,
         handlers,