next-intl 3.21.0-canary.0 → 3.21.1

package/dist/development/middleware/middleware.js

@@ -55,7 +55,7 @@ function createMiddleware(routing, options) {
     }
     function redirect(url, redirectDomain) {
       const urlObj = new URL(utils$1.normalizeTrailingSlash(url), request.url);
-      if (domainsConfig.length > 0 && !redirectDomain && domain) {
+      if (domainsConfig.length > 0 && !redirectDomain) {
         const bestMatchingDomain = utils.getBestMatchingDomain(domain, locale, domainsConfig);
         if (bestMatchingDomain) {
           redirectDomain = bestMatchingDomain.domain;
@@ -84,12 +84,11 @@ function createMiddleware(routing, options) {
     let response;
     let internalTemplateName;
     let unprefixedInternalPathname = unprefixedExternalPathname;
-    const pathnames = resolvedRouting.pathnames;
-    if (pathnames) {
+    if ('pathnames' in resolvedRouting) {
       let resolvedTemplateLocale;
-      [resolvedTemplateLocale, internalTemplateName] = utils.getInternalTemplate(pathnames, unprefixedExternalPathname, locale);
+      [resolvedTemplateLocale, internalTemplateName] = utils.getInternalTemplate(resolvedRouting.pathnames, unprefixedExternalPathname, locale);
       if (internalTemplateName) {
-        const pathnameConfig = pathnames[internalTemplateName];
+        const pathnameConfig = resolvedRouting.pathnames[internalTemplateName];
         const localeTemplate = typeof pathnameConfig === 'string' ? pathnameConfig :
         // @ts-expect-error -- This is fine
         pathnameConfig[locale];
@@ -157,9 +156,10 @@ function createMiddleware(routing, options) {
       syncCookie.default(request, response, locale);
     }
     if (resolvedRouting.localePrefix.mode !== 'never' && resolvedOptions.alternateLinks && resolvedRouting.locales.length > 1) {
+      var _resolvedRouting$path;
       response.headers.set('Link', getAlternateLinksHeaderValue.default({
         routing: resolvedRouting,
-        localizedPathnames: internalTemplateName != null && pathnames ? pathnames === null || pathnames === void 0 ? void 0 : pathnames[internalTemplateName] : undefined,
+        localizedPathnames: internalTemplateName != null && 'pathnames' in resolvedRouting ? (_resolvedRouting$path = resolvedRouting.pathnames) === null || _resolvedRouting$path === void 0 ? void 0 : _resolvedRouting$path[internalTemplateName] : undefined,
         request,
         resolvedLocale: locale
       }));

package/dist/development/middleware/resolveLocale.js

@@ -12,7 +12,11 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var Negotiator__default = /*#__PURE__*/_interopDefault(Negotiator);
 
 function findDomainFromHost(requestHeaders, domains) {
-  const host = utils.getHost(requestHeaders);
+  var _host;
+  let host = utils.getHost(requestHeaders);
+
+  // Remove port (easier for local development)
+  host = (_host = host) === null || _host === void 0 ? void 0 : _host.replace(/:\d+$/, '');
   if (host && domains) {
     return domains.find(cur => cur.domain === host);
   }
@@ -135,7 +139,8 @@ function resolveLocaleFromDomain(routing, options, requestHeaders, requestCookie
 }
 function resolveLocale(routing, options, requestHeaders, requestCookies, pathname) {
   if (routing.domains) {
-    return resolveLocaleFromDomain(routing, options, requestHeaders, requestCookies, pathname);
+    const routingWithDomains = routing;
+    return resolveLocaleFromDomain(routingWithDomains, options, requestHeaders, requestCookies, pathname);
   } else {
     return {
       locale: resolveLocaleFromPrefix(routing, options, requestHeaders, requestCookies, pathname)

package/dist/development/navigation/react-client/ClientLink.js

@@ -6,7 +6,7 @@ var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelper
 var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
 var utils = require('../../shared/utils.js');
-var LegacyBaseLink = require('../shared/LegacyBaseLink.js');
+var BaseLink = require('../shared/BaseLink.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
@@ -21,7 +21,7 @@ function ClientLink(_ref, ref) {
   const defaultLocale = useLocale.default();
   const finalLocale = locale || defaultLocale;
   const prefix = utils.getLocalePrefix(finalLocale, localePrefix);
-  return /*#__PURE__*/React__default.default.createElement(LegacyBaseLink.default, _rollupPluginBabelHelpers.extends({
+  return /*#__PURE__*/React__default.default.createElement(BaseLink.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
     locale: finalLocale,
     localePrefixMode: localePrefix.mode,

package/dist/development/navigation/react-client/useBasePathname.js

@@ -1,3 +1,4 @@
+"use client";
 'use strict';
 
 Object.defineProperty(exports, '__esModule', { value: true });
@@ -7,6 +8,19 @@ var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
 var utils = require('../../shared/utils.js');
 
+/**
+ * Returns the pathname without a potential locale prefix.
+ *
+ * @example
+ * ```tsx
+ * 'use client';
+ *
+ * import {usePathname} from 'next-intl/client';
+ *
+ * // When the user is on `/en`, this will be `/`
+ * const pathname = usePathname();
+ * ```
+ */
 function useBasePathname(localePrefix) {
   // The types aren't entirely correct here. Outside of Next.js
   // `useParams` can be called, but the return type is `null`.

package/dist/development/navigation/react-server/ServerLink.js

@@ -5,15 +5,13 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var utils = require('../../shared/utils.js');
-var LegacyBaseLink = require('../shared/LegacyBaseLink.js');
+var BaseLink = require('../shared/BaseLink.js');
 var getLocale = require('../../server/react-server/getLocale.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var React__default = /*#__PURE__*/_interopDefault(React);
 
-// Only used by legacy navigation APIs, can be removed when they are removed
-
 async function ServerLink(_ref) {
   let {
     locale,
@@ -22,7 +20,7 @@ async function ServerLink(_ref) {
   } = _ref;
   const finalLocale = locale || (await getLocale.default());
   const prefix = utils.getLocalePrefix(finalLocale, localePrefix);
-  return /*#__PURE__*/React__default.default.createElement(LegacyBaseLink.default, _rollupPluginBabelHelpers.extends({
+  return /*#__PURE__*/React__default.default.createElement(BaseLink.default, _rollupPluginBabelHelpers.extends({
     locale: finalLocale,
     localePrefixMode: localePrefix.mode,
     prefix: prefix

package/dist/development/navigation/react-server/createLocalizedPathnamesNavigation.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _rollupPluginBabelHelpers = require('../../_virtual/_rollupPluginBabelHelpers.js');
 var React = require('react');
 var config = require('../../routing/config.js');
-var RequestLocaleLegacy = require('../../server/react-server/RequestLocaleLegacy.js');
+var RequestLocale = require('../../server/react-server/RequestLocale.js');
 var utils = require('../shared/utils.js');
 var ServerLink = require('./ServerLink.js');
 var redirects = require('./redirects.js');
@@ -22,7 +22,7 @@ function createLocalizedPathnamesNavigation(routing) {
       locale,
       ...rest
     } = _ref;
-    const defaultLocale = RequestLocaleLegacy.getRequestLocale();
+    const defaultLocale = RequestLocale.getRequestLocale();
     const finalLocale = locale || defaultLocale;
     return /*#__PURE__*/React__default.default.createElement(ServerLink.default, _rollupPluginBabelHelpers.extends({
       href: utils.compileLocalizedPathname({
@@ -38,7 +38,7 @@ function createLocalizedPathnamesNavigation(routing) {
     }, rest));
   }
   function redirect(href) {
-    const locale = RequestLocaleLegacy.getRequestLocale();
+    const locale = RequestLocale.getRequestLocale();
     const pathname = getPathname({
       href,
       locale
@@ -52,7 +52,7 @@ function createLocalizedPathnamesNavigation(routing) {
     }, ...args);
   }
   function permanentRedirect(href) {
-    const locale = RequestLocaleLegacy.getRequestLocale();
+    const locale = RequestLocale.getRequestLocale();
     const pathname = getPathname({
       href,
       locale

package/dist/development/navigation/react-server/redirects.js

@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var RequestLocaleLegacy = require('../../server/react-server/RequestLocaleLegacy.js');
+var RequestLocale = require('../../server/react-server/RequestLocale.js');
 var redirects = require('../shared/redirects.js');
 
 function createRedirectFn(redirectFn) {
   return function serverRedirect(params) {
-    const locale = RequestLocaleLegacy.getRequestLocale();
+    const locale = RequestLocale.getRequestLocale();
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }

package/dist/development/navigation/shared/BaseLink.js

@@ -8,6 +8,7 @@ var NextLink = require('next/link');
 var navigation = require('next/navigation');
 var React = require('react');
 var useLocale = require('../../react-client/useLocale.js');
+var utils = require('../../shared/utils.js');
 var syncLocaleCookie = require('./syncLocaleCookie.js');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -17,37 +18,39 @@ var React__default = /*#__PURE__*/_interopDefault(React);
 
 function BaseLink(_ref, ref) {
   let {
-    defaultLocale,
     href,
     locale,
+    localePrefixMode,
     onClick,
     prefetch,
-    unprefixed,
+    prefix,
     ...rest
   } = _ref;
-  const curLocale = useLocale.default();
-  const isChangingLocale = locale !== curLocale;
-  const linkLocale = locale || curLocale;
-  const host = useHost();
-  const finalHref =
-  // Only after hydration (to avoid mismatches)
-  host &&
-  // If there is an `unprefixed` prop, the
-  // `defaultLocale` might differ by domain
-  unprefixed && (
-  // Unprefix the pathname if a domain matches
-  unprefixed.domains[host] === linkLocale ||
-  // … and handle unknown domains by applying the
-  // global `defaultLocale` (e.g. on localhost)
-  !Object.keys(unprefixed.domains).includes(host) && curLocale === defaultLocale && !locale) ? unprefixed.pathname : href;
-
   // The types aren't entirely correct here. Outside of Next.js
   // `useParams` can be called, but the return type is `null`.
   const pathname = navigation.usePathname();
+  const curLocale = useLocale.default();
+  const isChangingLocale = locale !== curLocale;
+  const [localizedHref, setLocalizedHref] = React.useState(() => utils.isLocalizableHref(href) && (localePrefixMode !== 'never' || isChangingLocale) ?
+  // For the `localePrefix: 'as-needed' strategy, the href shouldn't
+  // be prefixed if the locale is the default locale. To determine this, we
+  // need a) the default locale and b) the information if we use prefixed
+  // routing. The default locale can vary by domain, therefore during the
+  // RSC as well as the SSR render, we can't determine the default locale
+  // statically. Therefore we always prefix the href since this will
+  // always result in a valid URL, even if it might cause a redirect. This
+  // is better than pointing to a non-localized href during the server
+  // render, which would potentially be wrong. The final href is
+  // determined in the effect below.
+  utils.prefixHref(href, prefix) : href);
   function onLinkClick(event) {
     syncLocaleCookie.default(pathname, curLocale, locale);
     if (onClick) onClick(event);
   }
+  React.useEffect(() => {
+    if (!pathname) return;
+    setLocalizedHref(utils.localizeHref(href, locale, curLocale, pathname, prefix));
+  }, [curLocale, href, locale, pathname, prefix]);
   if (isChangingLocale) {
     if (prefetch && "development" !== 'production') {
       console.error('The `prefetch` prop is currently not supported when using the `locale` prop on `Link` to switch the locale.`');
@@ -56,19 +59,13 @@ function BaseLink(_ref, ref) {
   }
   return /*#__PURE__*/React__default.default.createElement(NextLink__default.default, _rollupPluginBabelHelpers.extends({
     ref: ref,
-    href: finalHref,
+    href: localizedHref,
     hrefLang: isChangingLocale ? locale : undefined,
     onClick: onLinkClick,
     prefetch: prefetch
   }, rest));
 }
-function useHost() {
-  const [host, setHost] = React.useState();
-  React.useEffect(() => {
-    setHost(window.location.host);
-  }, []);
-  return host;
-}
-var BaseLink$1 = /*#__PURE__*/React.forwardRef(BaseLink);
+const BaseLinkWithRef = /*#__PURE__*/React.forwardRef(BaseLink);
+BaseLinkWithRef.displayName = 'ClientLink';
 
-exports.default = BaseLink$1;
+exports.default = BaseLinkWithRef;

package/dist/development/navigation/shared/redirects.js

@@ -8,9 +8,6 @@ var utils = require('../../shared/utils.js');
 function createRedirectFn(redirectFn) {
   return function baseRedirect(params) {
     const prefix = utils.getLocalePrefix(params.locale, params.localePrefix);
-
-    // This logic is considered legacy and is replaced by `applyPathnamePrefix`.
-    // We keep it this way for now for backwards compatibility.
     const localizedPathname = params.localePrefix.mode === 'never' || !utils.isLocalizableHref(params.pathname) ? params.pathname : utils.prefixPathname(prefix, params.pathname);
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];

package/dist/development/navigation/shared/utils.js

@@ -7,11 +7,8 @@ var utils = require('../../shared/utils.js');
 // Minor false positive: A route that has both optional and
 // required params will allow optional params.
 
-// For `Link`
-
-// For `getPathname` (hence also its consumers: `redirect`, `useRouter`, …)
-
 function normalizeNameOrNameWithParams(href) {
+  // @ts-expect-error -- `extends string` in the generic unfortunately weakens the type
   return typeof href === 'string' ? {
     pathname: href
   } : href;
@@ -43,7 +40,6 @@ function compileLocalizedPathname(_ref) {
   function getNamedPath(value) {
     let namedPath = pathnames[value];
     if (!namedPath) {
-      // Unknown pathnames
       namedPath = value;
     }
     return namedPath;
@@ -122,44 +118,9 @@ function getBasePath(pathname) {
     return windowPathname.replace(pathname, '');
   }
 }
-function applyPathnamePrefix(pathname, locale, routing, domain, force) {
-  const {
-    mode
-  } = routing.localePrefix;
-  let shouldPrefix;
-  if (force !== undefined) {
-    shouldPrefix = force;
-  } else if (utils.isLocalizableHref(pathname)) {
-    if (mode === 'always') {
-      shouldPrefix = true;
-    } else if (mode === 'as-needed') {
-      let defaultLocale = routing.defaultLocale;
-      if (routing.domains) {
-        const domainConfig = routing.domains.find(cur => cur.domain === domain);
-        if (domainConfig) {
-          defaultLocale = domainConfig.defaultLocale;
-        } else {
-          if (!domain) {
-            console.error("You're using a routing configuration with `localePrefix: 'as-needed'` in combination with `domains`. In order to compute a correct pathname, you need to provide a `domain` parameter.\n\nSee: https://next-intl-docs.vercel.app/docs/routing#domains-localeprefix-asneeded");
-          }
-        }
-      }
-      shouldPrefix = defaultLocale !== locale;
-    }
-  }
-  return shouldPrefix ? utils.prefixPathname(utils.getLocalePrefix(locale, routing.localePrefix), pathname) : pathname;
-}
-function validateReceivedConfig(config) {
-  var _config$localePrefix;
-  if (((_config$localePrefix = config.localePrefix) === null || _config$localePrefix === void 0 ? void 0 : _config$localePrefix.mode) === 'as-needed' && !('defaultLocale' in config)) {
-    throw new Error("`localePrefix: 'as-needed' requires a `defaultLocale`.");
-  }
-}
 
-exports.applyPathnamePrefix = applyPathnamePrefix;
 exports.compileLocalizedPathname = compileLocalizedPathname;
 exports.getBasePath = getBasePath;
 exports.getRoute = getRoute;
 exports.normalizeNameOrNameWithParams = normalizeNameOrNameWithParams;
 exports.serializeSearchParams = serializeSearchParams;
-exports.validateReceivedConfig = validateReceivedConfig;

package/dist/development/navigation.react-client.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var createSharedPathnamesNavigation = require('./navigation/react-client/createSharedPathnamesNavigation.js');
 var createLocalizedPathnamesNavigation = require('./navigation/react-client/createLocalizedPathnamesNavigation.js');
-var createNavigation = require('./navigation/react-client/createNavigation.js');
 
 
 
 exports.createSharedPathnamesNavigation = createSharedPathnamesNavigation.default;
 exports.createLocalizedPathnamesNavigation = createLocalizedPathnamesNavigation.default;
-exports.createNavigation = createNavigation.default;

package/dist/development/navigation.react-server.js

@@ -4,10 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var createSharedPathnamesNavigation = require('./navigation/react-server/createSharedPathnamesNavigation.js');
 var createLocalizedPathnamesNavigation = require('./navigation/react-server/createLocalizedPathnamesNavigation.js');
-var createNavigation = require('./navigation/react-server/createNavigation.js');
 
 
 
 exports.createSharedPathnamesNavigation = createSharedPathnamesNavigation.default;
 exports.createLocalizedPathnamesNavigation = createLocalizedPathnamesNavigation.default;
-exports.createNavigation = createNavigation.default;

package/dist/development/react-client/index.js

@@ -14,6 +14,8 @@ var useIntl = require('use-intl');
  *   supported in all Next.js versions that are supported.
  */
 
+
+// eslint-disable-next-line @typescript-eslint/ban-types
 function callHook(name, hook) {
   return function () {
     try {

package/dist/development/routing/config.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 function receiveRoutingConfig(input) {
   return {
     ...input,
-    localePrefix: receiveLocalePrefixConfig(input === null || input === void 0 ? void 0 : input.localePrefix)
+    localePrefix: receiveLocalePrefixConfig(input.localePrefix)
   };
 }
 function receiveLocalePrefixConfig(localePrefix) {

package/dist/development/server/react-server/RequestLocale.js

@@ -3,37 +3,47 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var headers = require('next/headers');
+var navigation = require('next/navigation');
 var React = require('react');
 var constants = require('../../shared/constants.js');
-var RequestLocaleCache = require('./RequestLocaleCache.js');
 
-async function getHeadersImpl() {
-  const promiseOrValue = headers.headers();
-
-  // Compatibility with Next.js <15
-  return promiseOrValue instanceof Promise ? await promiseOrValue : promiseOrValue;
-}
-const getHeaders = React.cache(getHeadersImpl);
-async function getLocaleFromHeaderImpl() {
+function getLocaleFromHeaderImpl() {
   let locale;
   try {
-    locale = (await getHeaders()).get(constants.HEADER_LOCALE_NAME) || undefined;
+    locale = headers.headers().get(constants.HEADER_LOCALE_NAME);
   } catch (error) {
     if (error instanceof Error && error.digest === 'DYNAMIC_SERVER_USAGE') {
-      const wrappedError = new Error('Usage of next-intl APIs in Server Components currently opts into dynamic rendering. This limitation will eventually be lifted, but as a stopgap solution, you can use the `unstable_setRequestLocale` API to enable static rendering, see https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing#static-rendering', {
+      throw new Error('Usage of next-intl APIs in Server Components currently opts into dynamic rendering. This limitation will eventually be lifted, but as a stopgap solution, you can use the `unstable_setRequestLocale` API to enable static rendering, see https://next-intl-docs.vercel.app/docs/getting-started/app-router/with-i18n-routing#static-rendering', {
         cause: error
       });
-      wrappedError.digest = error.digest;
-      throw wrappedError;
     } else {
       throw error;
     }
   }
+  if (!locale) {
+    {
+      console.error("\nUnable to find `next-intl` locale because the middleware didn't run on this request. See https://next-intl-docs.vercel.app/docs/routing/middleware#unable-to-find-locale. The `notFound()` function will be called as a result.\n");
+    }
+    navigation.notFound();
+  }
   return locale;
 }
 const getLocaleFromHeader = React.cache(getLocaleFromHeaderImpl);
-async function getRequestLocale() {
-  return RequestLocaleCache.getCachedRequestLocale() || (await getLocaleFromHeader());
+
+// Workaround until `createServerContext` is available
+function getCacheImpl() {
+  const value = {
+    locale: undefined
+  };
+  return value;
+}
+const getCache = React.cache(getCacheImpl);
+function setRequestLocale(locale) {
+  getCache().locale = locale;
+}
+function getRequestLocale() {
+  return getCache().locale || getLocaleFromHeader();
 }
 
 exports.getRequestLocale = getRequestLocale;
+exports.setRequestLocale = setRequestLocale;

package/dist/development/server/react-server/getConfig.js

@@ -2,11 +2,9 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var navigation = require('next/navigation');
 var React = require('react');
 var core = require('use-intl/core');
 var RequestLocale = require('./RequestLocale.js');
-var RequestLocaleLegacy = require('./RequestLocaleLegacy.js');
 var getRuntimeConfig = require('next-intl/config');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -29,31 +27,35 @@ async function receiveRuntimeConfigImpl(getConfig, localeOverride) {
   if (typeof getConfig !== 'function') {
     throw new Error("Invalid i18n request configuration detected.\n\nPlease verify that:\n1. In case you've specified a custom location in your Next.js config, make sure that the path is correct.\n2. You have a default export in your i18n request configuration file.\n\nSee also: https://next-intl-docs.vercel.app/docs/usage/configuration#i18n-request\n");
   }
+  let hasReadLocale = false;
+
+  // In case the consumer doesn't read `params.locale` and instead provides the
+  // `locale` (either in a single-language workflow or because the locale is
+  // read from the user settings), don't attempt to read the request locale.
   const params = {
-    // In case the consumer doesn't read `params.locale` and instead provides the
-    // `locale` (either in a single-language workflow or because the locale is
-    // read from the user settings), don't attempt to read the request locale.
     get locale() {
-      return localeOverride || RequestLocaleLegacy.getRequestLocale();
-    },
-    get requestLocale() {
-      return localeOverride ? Promise.resolve(localeOverride) : RequestLocale.getRequestLocale();
+      hasReadLocale = true;
+      return localeOverride || RequestLocale.getRequestLocale();
     }
   };
   let result = getConfig(params);
   if (result instanceof Promise) {
     result = await result;
   }
-  const locale = result.locale || (await params.requestLocale);
-  if (!locale) {
-    {
-      console.error("\nUnable to find `next-intl` locale because the middleware didn't run on this request and no `locale` was returned in `getRequestConfig`. See https://next-intl-docs.vercel.app/docs/routing/middleware#unable-to-find-locale. The `notFound()` function will be called as a result.\n");
+  {
+    if (hasReadLocale) {
+      if (result.locale) {
+        console.error("\nYou've read the `locale` param that was passed to `getRequestConfig` but have also returned one from the function. This is likely an error, please ensure that you're consistently using a setup with or without i18n routing: https://next-intl-docs.vercel.app/docs/getting-started/app-router\n");
+      }
+    } else {
+      if (!result.locale) {
+        console.error("\nYou haven't read the `locale` param that was passed to `getRequestConfig` and also haven't returned one from the function. This is likely an error, please ensure that you're consistently using a setup with or without i18n routing: https://next-intl-docs.vercel.app/docs/getting-started/app-router\n");
+      }
     }
-    navigation.notFound();
   }
   return {
     ...result,
-    locale,
+    locale: result.locale || params.locale,
     now: result.now || getDefaultNow(),
     timeZone: result.timeZone || getDefaultTimeZone()
   };

package/dist/development/server/react-server/getRequestConfig.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 /**
- * Should be called in `i18n/request.ts` to create the configuration for the current request.
+ * Should be called in `i18n.ts` to create the configuration for the current request.
  */
 function getRequestConfig(createRequestConfig) {
   return createRequestConfig;

package/dist/development/server.react-server.js

@@ -9,7 +9,7 @@ var getNow = require('./server/react-server/getNow.js');
 var getTimeZone = require('./server/react-server/getTimeZone.js');
 var getTranslations = require('./server/react-server/getTranslations.js');
 var getLocale = require('./server/react-server/getLocale.js');
-var RequestLocaleCache = require('./server/react-server/RequestLocaleCache.js');
+var RequestLocale = require('./server/react-server/RequestLocale.js');
 
 
 
@@ -20,4 +20,4 @@ exports.getNow = getNow.default;
 exports.getTimeZone = getTimeZone.default;
 exports.getTranslations = getTranslations.default;
 exports.getLocale = getLocale.default;
-exports.unstable_setRequestLocale = RequestLocaleCache.setCachedRequestLocale;
+exports.unstable_setRequestLocale = RequestLocale.setRequestLocale;

package/dist/esm/middleware/middleware.js

@@ -1 +1 @@
-import{NextResponse as e}from"next/server";import{receiveRoutingConfig as l}from"../routing/config.js";import{HEADER_LOCALE_NAME as o}from"../shared/constants.js";import{matchesPathname as t,normalizeTrailingSlash as r,getLocalePrefix as n}from"../shared/utils.js";import a from"./getAlternateLinksHeaderValue.js";import i from"./resolveLocale.js";import s from"./syncCookie.js";import{sanitizePathname as c,isLocaleSupportedOnDomain as d,getNormalizedPathname as f,getPathnameMatch as u,getInternalTemplate as m,formatTemplatePathname as h,formatPathname as x,getBestMatchingDomain as v,applyBasePath as p,getLocaleAsPrefix as U}from"./utils.js";function P(P,L){var g,k,j,w;const b=l(P),y={alternateLinks:null===(g=null!==(k=null==L?void 0:L.alternateLinks)&&void 0!==k?k:P.alternateLinks)||void 0===g||g,localeDetection:null===(j=null!==(w=null==L?void 0:L.localeDetection)&&void 0!==w?w:null==P?void 0:P.localeDetection)||void 0===j||j};return function(l){var P;let L;try{L=decodeURI(l.nextUrl.pathname)}catch(l){return e.next()}const g=c(L),{domain:k,locale:j}=i(b,y,l.headers,l.cookies,g),w=k?k.defaultLocale===j:j===b.defaultLocale,D=(null===(P=b.domains)||void 0===P?void 0:P.filter((e=>d(j,e))))||[],R=null!=b.domains&&!k;function q(t){const r=new URL(t,l.url);l.nextUrl.basePath&&(r.pathname=p(r.pathname,l.nextUrl.basePath));const n=new Headers(l.headers);return n.set(o,j),e.rewrite(r,{request:{headers:n}})}function H(o,t){const n=new URL(r(o),l.url);if(D.length>0&&!t&&k){const e=v(k,j,D);e&&(t=e.domain,e.defaultLocale===j&&"as-needed"===b.localePrefix.mode&&(n.pathname=f(n.pathname,b.locales,b.localePrefix)))}var a,i;t&&(n.host=t,l.headers.get("x-forwarded-host")&&(n.protocol=null!==(a=l.headers.get("x-forwarded-proto"))&&void 0!==a?a:l.nextUrl.protocol,n.port=null!==(i=l.headers.get("x-forwarded-port"))&&void 0!==i?i:""));return l.nextUrl.basePath&&(n.pathname=p(n.pathname,l.nextUrl.basePath)),e.redirect(n.toString())}const z=f(g,b.locales,b.localePrefix),A=u(g,b.locales,b.localePrefix),C=null!=A,I="never"===b.localePrefix.mode||w&&"as-needed"===b.localePrefix.mode;let S,V,B=z;const E=b.pathnames;if(E){let e;if([e,V]=m(E,z,j),V){const o=E[V],r="string"==typeof o?o:o[j];if(t(r,z))B=h(z,r,V);else{let t;t=e?"string"==typeof o?o:o[e]:V;const a=I?void 0:n(j,b.localePrefix),i=h(z,t,r);S=H(x(i,a,l.nextUrl.search))}}}if(!S)if("/"!==B||C){const e=x(B,U(j),l.nextUrl.search);if(C){const o=x(z,A.prefix,l.nextUrl.search);if("never"===b.localePrefix.mode)S=H(x(z,void 0,l.nextUrl.search));else if(A.exact)if(w&&I)S=H(x(z,void 0,l.nextUrl.search));else if(b.domains){const l=v(k,A.locale,D);S=(null==k?void 0:k.domain)===(null==l?void 0:l.domain)||R?q(e):H(o,null==l?void 0:l.domain)}else S=q(e);else S=H(o)}else S=I?q(e):H(x(z,n(j,b.localePrefix),l.nextUrl.search))}else S=I?q(x(B,U(j),l.nextUrl.search)):H(x(z,n(j,b.localePrefix),l.nextUrl.search));return y.localeDetection&&s(l,S,j),"never"!==b.localePrefix.mode&&y.alternateLinks&&b.locales.length>1&&S.headers.set("Link",a({routing:b,localizedPathnames:null!=V&&E?null==E?void 0:E[V]:void 0,request:l,resolvedLocale:j})),S}}export{P as default};
+import{NextResponse as e}from"next/server";import{receiveRoutingConfig as l}from"../routing/config.js";import{HEADER_LOCALE_NAME as o}from"../shared/constants.js";import{matchesPathname as t,normalizeTrailingSlash as a,getLocalePrefix as n}from"../shared/utils.js";import r from"./getAlternateLinksHeaderValue.js";import i from"./resolveLocale.js";import s from"./syncCookie.js";import{sanitizePathname as c,isLocaleSupportedOnDomain as d,getNormalizedPathname as f,getPathnameMatch as m,getInternalTemplate as h,formatTemplatePathname as u,formatPathname as x,getBestMatchingDomain as v,applyBasePath as p,getLocaleAsPrefix as U}from"./utils.js";function P(P,L){var g,k,j,w;const b=l(P),y={alternateLinks:null===(g=null!==(k=null==L?void 0:L.alternateLinks)&&void 0!==k?k:P.alternateLinks)||void 0===g||g,localeDetection:null===(j=null!==(w=null==L?void 0:L.localeDetection)&&void 0!==w?w:null==P?void 0:P.localeDetection)||void 0===j||j};return function(l){var P;let L;try{L=decodeURI(l.nextUrl.pathname)}catch(l){return e.next()}const g=c(L),{domain:k,locale:j}=i(b,y,l.headers,l.cookies,g),w=k?k.defaultLocale===j:j===b.defaultLocale,D=(null===(P=b.domains)||void 0===P?void 0:P.filter((e=>d(j,e))))||[],R=null!=b.domains&&!k;function q(t){const a=new URL(t,l.url);l.nextUrl.basePath&&(a.pathname=p(a.pathname,l.nextUrl.basePath));const n=new Headers(l.headers);return n.set(o,j),e.rewrite(a,{request:{headers:n}})}function H(o,t){const n=new URL(a(o),l.url);if(D.length>0&&!t){const e=v(k,j,D);e&&(t=e.domain,e.defaultLocale===j&&"as-needed"===b.localePrefix.mode&&(n.pathname=f(n.pathname,b.locales,b.localePrefix)))}var r,i;t&&(n.host=t,l.headers.get("x-forwarded-host")&&(n.protocol=null!==(r=l.headers.get("x-forwarded-proto"))&&void 0!==r?r:l.nextUrl.protocol,n.port=null!==(i=l.headers.get("x-forwarded-port"))&&void 0!==i?i:""));return l.nextUrl.basePath&&(n.pathname=p(n.pathname,l.nextUrl.basePath)),e.redirect(n.toString())}const z=f(g,b.locales,b.localePrefix),A=m(g,b.locales,b.localePrefix),C=null!=A,I="never"===b.localePrefix.mode||w&&"as-needed"===b.localePrefix.mode;let S,V,B=z;if("pathnames"in b){let e;if([e,V]=h(b.pathnames,z,j),V){const o=b.pathnames[V],a="string"==typeof o?o:o[j];if(t(a,z))B=u(z,a,V);else{let t;t=e?"string"==typeof o?o:o[e]:V;const r=I?void 0:n(j,b.localePrefix),i=u(z,t,a);S=H(x(i,r,l.nextUrl.search))}}}if(!S)if("/"!==B||C){const e=x(B,U(j),l.nextUrl.search);if(C){const o=x(z,A.prefix,l.nextUrl.search);if("never"===b.localePrefix.mode)S=H(x(z,void 0,l.nextUrl.search));else if(A.exact)if(w&&I)S=H(x(z,void 0,l.nextUrl.search));else if(b.domains){const l=v(k,A.locale,D);S=(null==k?void 0:k.domain)===(null==l?void 0:l.domain)||R?q(e):H(o,null==l?void 0:l.domain)}else S=q(e);else S=H(o)}else S=I?q(e):H(x(z,n(j,b.localePrefix),l.nextUrl.search))}else S=I?q(x(B,U(j),l.nextUrl.search)):H(x(z,n(j,b.localePrefix),l.nextUrl.search));var E;(y.localeDetection&&s(l,S,j),"never"!==b.localePrefix.mode&&y.alternateLinks&&b.locales.length>1)&&S.headers.set("Link",r({routing:b,localizedPathnames:null!=V&&"pathnames"in b?null===(E=b.pathnames)||void 0===E?void 0:E[V]:void 0,request:l,resolvedLocale:j}));return S}}export{P as default};

package/dist/esm/middleware/resolveLocale.js

@@ -1 +1 @@
-import{match as o}from"@formatjs/intl-localematcher";import e from"negotiator";import{COOKIE_LOCALE_NAME as l}from"../shared/constants.js";import{getPathnameMatch as t,isLocaleSupportedOnDomain as n,getHost as a}from"./utils.js";function c(l,t,n){let a;const c=new e({headers:{"accept-language":l.get("accept-language")||void 0}}).languages();try{const e=function(o){return o.slice().sort(((o,e)=>e.length-o.length))}(t);a=o(c,e,n)}catch(o){}return a}function i(o,e){if(o.has(l)){var t;const n=null===(t=o.get(l))||void 0===t?void 0:t.value;if(n&&e.includes(n))return n}}function r(o,e,l,n,a){let r,{defaultLocale:s,localePrefix:u,locales:f}=o,{localeDetection:d}=e;var m;a&&(r=null===(m=t(a,f,u))||void 0===m?void 0:m.locale);return!r&&d&&n&&(r=i(n,f)),!r&&d&&l&&(r=c(l,f,s)),r||(r=s),r}function s(o,e,l,s,u){const f=function(o,e){const l=a(o);if(l&&e)return e.find((o=>o.domain===l))}(l,o.domains);if(!f)return{locale:r(o,e,l,s,u)};let d;if(u){var m;const e=null===(m=t(u,o.locales,o.localePrefix))||void 0===m?void 0:m.locale;if(e){if(!n(e,f))return{locale:e,domain:f};d=e}}if(!d&&e.localeDetection&&s){const e=i(s,o.locales);e&&n(e,f)&&(d=e)}if(!d&&e.localeDetection&&l){const e=c(l,f.locales||o.locales,f.defaultLocale);e&&(d=e)}return d||(d=f.defaultLocale),{locale:d,domain:f}}function u(o,e,l,t,n){return o.domains?s(o,e,l,t,n):{locale:r(o,e,l,t,n)}}export{u as default,c as getAcceptLanguageLocale};
+import{match as e}from"@formatjs/intl-localematcher";import o from"negotiator";import{COOKIE_LOCALE_NAME as l}from"../shared/constants.js";import{getPathnameMatch as t,isLocaleSupportedOnDomain as n,getHost as a}from"./utils.js";function c(l,t,n){let a;const c=new o({headers:{"accept-language":l.get("accept-language")||void 0}}).languages();try{const o=function(e){return e.slice().sort(((e,o)=>o.length-e.length))}(t);a=e(c,o,n)}catch(e){}return a}function i(e,o){if(e.has(l)){var t;const n=null===(t=e.get(l))||void 0===t?void 0:t.value;if(n&&o.includes(n))return n}}function r(e,o,l,n,a){let r,{defaultLocale:u,localePrefix:f,locales:s}=e,{localeDetection:d}=o;var m;a&&(r=null===(m=t(a,s,f))||void 0===m?void 0:m.locale);return!r&&d&&n&&(r=i(n,s)),!r&&d&&l&&(r=c(l,s,u)),r||(r=u),r}function u(e,o,l,u,f){const s=function(e,o){var l;let t=a(e);if(t=null===(l=t)||void 0===l?void 0:l.replace(/:\d+$/,""),t&&o)return o.find((e=>e.domain===t))}(l,e.domains);if(!s)return{locale:r(e,o,l,u,f)};let d;if(f){var m;const o=null===(m=t(f,e.locales,e.localePrefix))||void 0===m?void 0:m.locale;if(o){if(!n(o,s))return{locale:o,domain:s};d=o}}if(!d&&o.localeDetection&&u){const o=i(u,e.locales);o&&n(o,s)&&(d=o)}if(!d&&o.localeDetection&&l){const o=c(l,s.locales||e.locales,s.defaultLocale);o&&(d=o)}return d||(d=s.defaultLocale),{locale:d,domain:s}}function f(e,o,l,t,n){if(e.domains){return u(e,o,l,t,n)}return{locale:r(e,o,l,t,n)}}export{f as default,c as getAcceptLanguageLocale};

package/dist/esm/navigation/react-client/ClientLink.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r,{forwardRef as l}from"react";import o from"../../react-client/useLocale.js";import{getLocalePrefix as t}from"../../shared/utils.js";import a from"../shared/LegacyBaseLink.js";function i(l,i){let{locale:s,localePrefix:c,...m}=l;const n=o(),f=s||n,p=t(f,c);return r.createElement(a,e({ref:i,locale:f,localePrefixMode:c.mode,prefix:p},m))}const s=l(i);s.displayName="ClientLink";export{s as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r,{forwardRef as l}from"react";import o from"../../react-client/useLocale.js";import{getLocalePrefix as t}from"../../shared/utils.js";import a from"../shared/BaseLink.js";function i(l,i){let{locale:s,localePrefix:m,...c}=l;const n=o(),f=s||n,p=t(f,m);return r.createElement(a,e({ref:i,locale:f,localePrefixMode:m.mode,prefix:p},c))}const s=l(i);s.displayName="ClientLink";export{s as default};

package/dist/esm/navigation/react-client/useBasePathname.js

@@ -1 +1,2 @@
+"use client";
 import{usePathname as r}from"next/navigation";import{useMemo as t}from"react";import o from"../../react-client/useLocale.js";import{hasPathnamePrefixed as e,unprefixPathname as n,getLocalePrefix as i}from"../../shared/utils.js";function a(a){const m=r(),s=o();return t((()=>{if(!m)return m;const r=i(s,a);return e(r,m)?n(m,r):m}),[s,a,m])}export{a as default};

package/dist/esm/navigation/react-server/ServerLink.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import{getLocalePrefix as o}from"../../shared/utils.js";import a from"../shared/LegacyBaseLink.js";import t from"../../server/react-server/getLocale.js";async function l(l){let{locale:s,localePrefix:i,...c}=l;const m=s||await t(),f=o(m,i);return r.createElement(a,e({locale:m,localePrefixMode:i.mode,prefix:f},c))}export{l as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import{getLocalePrefix as o}from"../../shared/utils.js";import t from"../shared/BaseLink.js";import a from"../../server/react-server/getLocale.js";async function l(l){let{locale:s,localePrefix:i,...m}=l;const c=s||await a(),f=o(c,i);return r.createElement(t,e({locale:c,localePrefixMode:i.mode,prefix:f},m))}export{l as default};

package/dist/esm/navigation/react-server/createLocalizedPathnamesNavigation.js

@@ -1 +1 @@
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import{receiveRoutingConfig as t}from"../../routing/config.js";import{getRequestLocale as o}from"../../server/react-server/RequestLocaleLegacy.js";import{compileLocalizedPathname as n,normalizeNameOrNameWithParams as a}from"../shared/utils.js";import l from"./ServerLink.js";import{serverRedirect as c,serverPermanentRedirect as i}from"./redirects.js";function s(s){const m=t(s);function f(e){let{href:r,locale:t}=e;return n({...a(r),locale:t,pathnames:m.pathnames})}function u(e){return()=>{throw new Error("`".concat(e,"` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."))}}return{Link:function(t){let{href:a,locale:c,...i}=t;const s=o(),f=c||s;return r.createElement(l,e({href:n({locale:f,pathname:a,params:"object"==typeof a?a.params:void 0,pathnames:m.pathnames}),locale:c,localePrefix:m.localePrefix},i))},redirect:function(e){const r=f({href:e,locale:o()});for(var t=arguments.length,n=new Array(t>1?t-1:0),a=1;a<t;a++)n[a-1]=arguments[a];return c({localePrefix:m.localePrefix,pathname:r},...n)},permanentRedirect:function(e){const r=f({href:e,locale:o()});for(var t=arguments.length,n=new Array(t>1?t-1:0),a=1;a<t;a++)n[a-1]=arguments[a];return i({localePrefix:m.localePrefix,pathname:r},...n)},getPathname:f,usePathname:u("usePathname"),useRouter:u("useRouter")}}export{s as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import r from"react";import{receiveRoutingConfig as t}from"../../routing/config.js";import{getRequestLocale as o}from"../../server/react-server/RequestLocale.js";import{compileLocalizedPathname as n,normalizeNameOrNameWithParams as a}from"../shared/utils.js";import l from"./ServerLink.js";import{serverRedirect as c,serverPermanentRedirect as i}from"./redirects.js";function s(s){const m=t(s);function f(e){let{href:r,locale:t}=e;return n({...a(r),locale:t,pathnames:m.pathnames})}function u(e){return()=>{throw new Error("`".concat(e,"` is not supported in Server Components. You can use this hook if you convert the component to a Client Component."))}}return{Link:function(t){let{href:a,locale:c,...i}=t;const s=o(),f=c||s;return r.createElement(l,e({href:n({locale:f,pathname:a,params:"object"==typeof a?a.params:void 0,pathnames:m.pathnames}),locale:c,localePrefix:m.localePrefix},i))},redirect:function(e){const r=f({href:e,locale:o()});for(var t=arguments.length,n=new Array(t>1?t-1:0),a=1;a<t;a++)n[a-1]=arguments[a];return c({localePrefix:m.localePrefix,pathname:r},...n)},permanentRedirect:function(e){const r=f({href:e,locale:o()});for(var t=arguments.length,n=new Array(t>1?t-1:0),a=1;a<t;a++)n[a-1]=arguments[a];return i({localePrefix:m.localePrefix,pathname:r},...n)},getPathname:f,usePathname:u("usePathname"),useRouter:u("useRouter")}}export{s as default};

package/dist/esm/navigation/react-server/redirects.js

@@ -1 +1 @@
-import{getRequestLocale as r}from"../../server/react-server/RequestLocaleLegacy.js";import{baseRedirect as e,basePermanentRedirect as t}from"../shared/redirects.js";function o(e){return function(t){const o=r();for(var n=arguments.length,c=new Array(n>1?n-1:0),s=1;s<n;s++)c[s-1]=arguments[s];return e({...t,locale:o},...c)}}const n=o(e),c=o(t);export{c as serverPermanentRedirect,n as serverRedirect};
+import{getRequestLocale as r}from"../../server/react-server/RequestLocale.js";import{baseRedirect as e,basePermanentRedirect as t}from"../shared/redirects.js";function o(e){return function(t){const o=r();for(var n=arguments.length,s=new Array(n>1?n-1:0),c=1;c<n;c++)s[c-1]=arguments[c];return e({...t,locale:o},...s)}}const n=o(e),s=o(t);export{s as serverPermanentRedirect,n as serverRedirect};

package/dist/esm/navigation/shared/BaseLink.js

@@ -1,2 +1,2 @@
 "use client";
-import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import o from"next/link";import{usePathname as t}from"next/navigation";import r,{forwardRef as n,useState as i,useEffect as c}from"react";import l from"../../react-client/useLocale.js";import a from"./syncLocaleCookie.js";function s(n,s){let{defaultLocale:p,href:f,locale:m,onClick:u,prefetch:h,unprefixed:d,...k}=n;const x=l(),L=m!==x,g=m||x,j=function(){const[e,o]=i();return c((()=>{o(window.location.host)}),[]),e}(),v=j&&d&&(d.domains[j]===g||!Object.keys(d.domains).includes(j)&&x===p&&!m)?d.pathname:f,w=t();return L&&(h&&console.error("The `prefetch` prop is currently not supported when using the `locale` prop on `Link` to switch the locale.`"),h=!1),r.createElement(o,e({ref:s,href:v,hrefLang:L?m:void 0,onClick:function(e){a(w,x,m),u&&u(e)},prefetch:h},k))}var p=n(s);export{p as default};
+import{extends as e}from"../../_virtual/_rollupPluginBabelHelpers.js";import o from"next/link";import{usePathname as r}from"next/navigation";import t,{forwardRef as n,useState as i,useEffect as l}from"react";import c from"../../react-client/useLocale.js";import{isLocalizableHref as p,prefixHref as a,localizeHref as s}from"../../shared/utils.js";import f from"./syncLocaleCookie.js";function m(n,m){let{href:h,locale:u,localePrefixMode:d,onClick:k,prefetch:x,prefix:L,...g}=n;const j=r(),v=c(),C=u!==v,[y,w]=i((()=>p(h)&&("never"!==d||C)?a(h,L):h));return l((()=>{j&&w(s(h,u,v,j,L))}),[v,h,u,j,L]),C&&(x&&console.error("The `prefetch` prop is currently not supported when using the `locale` prop on `Link` to switch the locale.`"),x=!1),t.createElement(o,e({ref:m,href:y,hrefLang:C?u:void 0,onClick:function(e){f(j,v,u),k&&k(e)},prefetch:x},g))}const h=n(m);h.displayName="ClientLink";export{h as default};