next-intl 3.20.1-canary.0 → 3.21.0-canary.0

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 RequestLocale = require('../../server/react-server/RequestLocale.js');
+var RequestLocaleLegacy = require('../../server/react-server/RequestLocaleLegacy.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 = RequestLocale.getRequestLocale();
+    const defaultLocale = RequestLocaleLegacy.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 = RequestLocale.getRequestLocale();
+    const locale = RequestLocaleLegacy.getRequestLocale();
     const pathname = getPathname({
       href,
       locale
@@ -52,7 +52,7 @@ function createLocalizedPathnamesNavigation(routing) {
     }, ...args);
   }
   function permanentRedirect(href) {
-    const locale = RequestLocale.getRequestLocale();
+    const locale = RequestLocaleLegacy.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 RequestLocale = require('../../server/react-server/RequestLocale.js');
+var RequestLocaleLegacy = require('../../server/react-server/RequestLocaleLegacy.js');
 var redirects = require('../shared/redirects.js');
 
 function createRedirectFn(redirectFn) {
   return function serverRedirect(params) {
-    const locale = RequestLocale.getRequestLocale();
+    const locale = RequestLocaleLegacy.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/server/react-server/RequestLocale.js

@@ -3,47 +3,37 @@
 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');
 
-function getLocaleFromHeaderImpl() {
+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() {
   let locale;
   try {
-    locale = headers.headers().get(constants.HEADER_LOCALE_NAME);
+    locale = (await getHeaders()).get(constants.HEADER_LOCALE_NAME) || undefined;
   } catch (error) {
     if (error instanceof Error && error.digest === 'DYNAMIC_SERVER_USAGE') {
-      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', {
+      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', {
         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);
-
-// 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();
+async function getRequestLocale() {
+  return RequestLocaleCache.getCachedRequestLocale() || (await getLocaleFromHeader());
 }
 
 exports.getRequestLocale = getRequestLocale;
-exports.setRequestLocale = setRequestLocale;

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

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var React = require('react');
+
+// See https://github.com/vercel/next.js/discussions/58862
+function getCacheImpl() {
+  const value = {
+    locale: undefined
+  };
+  return value;
+}
+const getCache = React.cache(getCacheImpl);
+function getCachedRequestLocale() {
+  return getCache().locale;
+}
+function setCachedRequestLocale(locale) {
+  getCache().locale = locale;
+}
+
+exports.getCachedRequestLocale = getCachedRequestLocale;
+exports.setCachedRequestLocale = setCachedRequestLocale;

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

@@ -0,0 +1,43 @@
+'use strict';
+
+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');
+
+// This was originally built for Next.js <14, where `headers()` was not async.
+// With https://github.com/vercel/next.js/pull/68812, the API became async.
+// This file can be removed once we remove the legacy navigation APIs.
+function getHeaders() {
+  return headers.headers();
+}
+function getLocaleFromHeaderImpl() {
+  let locale;
+  try {
+    locale = getHeaders().get(constants.HEADER_LOCALE_NAME);
+  } catch (error) {
+    if (error instanceof Error && error.digest === 'DYNAMIC_SERVER_USAGE') {
+      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
+      });
+    } 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);
+function getRequestLocale() {
+  return RequestLocaleCache.getCachedRequestLocale() || getLocaleFromHeader();
+}
+
+exports.getRequestLocale = getRequestLocale;

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

@@ -2,9 +2,11 @@
 
 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 }; }
@@ -27,35 +29,31 @@ 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() {
-      hasReadLocale = true;
-      return localeOverride || RequestLocale.getRequestLocale();
+      return localeOverride || RequestLocaleLegacy.getRequestLocale();
+    },
+    get requestLocale() {
+      return localeOverride ? Promise.resolve(localeOverride) : RequestLocale.getRequestLocale();
     }
   };
   let result = getConfig(params);
   if (result instanceof Promise) {
     result = await result;
   }
-  {
-    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");
-      }
+  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");
     }
+    navigation.notFound();
   }
   return {
     ...result,
-    locale: result.locale || params.locale,
+    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.ts` to create the configuration for the current request.
+ * Should be called in `i18n/request.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 RequestLocale = require('./server/react-server/RequestLocale.js');
+var RequestLocaleCache = require('./server/react-server/RequestLocaleCache.js');
 
 
 
@@ -20,4 +20,4 @@ exports.getNow = getNow.default;
 exports.getTimeZone = getTimeZone.default;
 exports.getTranslations = getTranslations.default;
 exports.getLocale = getLocale.default;
-exports.unstable_setRequestLocale = RequestLocale.setRequestLocale;
+exports.unstable_setRequestLocale = RequestLocaleCache.setCachedRequestLocale;

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/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};
+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};

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

@@ -1 +1 @@
-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};
+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};

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

@@ -1 +1 @@
-import{headers as e}from"next/headers";import{notFound as t}from"next/navigation";import{cache as n}from"react";import{HEADER_LOCALE_NAME as o}from"../../shared/constants.js";const r=n((function(){let n;try{n=e().get(o)}catch(e){throw e instanceof Error&&"DYNAMIC_SERVER_USAGE"===e.digest?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:e}):e}return n||(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"),t()),n}));const i=n((function(){return{locale:void 0}}));function a(e){i().locale=e}function l(){return i().locale||r()}export{l as getRequestLocale,a as setRequestLocale};
+import{headers as t}from"next/headers";import{cache as e}from"react";import{HEADER_LOCALE_NAME as n}from"../../shared/constants.js";import{getCachedRequestLocale as r}from"./RequestLocaleCache.js";const o=e((async function(){const e=t();return e instanceof Promise?await e:e}));const s=e((async function(){let t;try{t=(await o()).get(n)||void 0}catch(t){if(t instanceof Error&&"DYNAMIC_SERVER_USAGE"===t.digest){const e=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:t});throw e.digest=t.digest,e}throw t}return t}));async function i(){return r()||await s()}export{i as getRequestLocale};

package/dist/esm/server/react-server/RequestLocaleCache.js

@@ -0,0 +1 @@
+import{cache as o}from"react";const n=o((function(){return{locale:void 0}}));function t(){return n().locale}function c(o){n().locale=o}export{t as getCachedRequestLocale,c as setCachedRequestLocale};

package/dist/esm/server/react-server/RequestLocaleLegacy.js

@@ -0,0 +1 @@
+import{headers as e}from"next/headers";import{notFound as t}from"next/navigation";import{cache as n}from"react";import{HEADER_LOCALE_NAME as o}from"../../shared/constants.js";import{getCachedRequestLocale as r}from"./RequestLocaleCache.js";const i=n((function(){let n;try{n=e().get(o)}catch(e){throw e instanceof Error&&"DYNAMIC_SERVER_USAGE"===e.digest?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:e}):e}return n||(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"),t()),n}));function s(){return r()||i()}export{s as getRequestLocale};

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

@@ -1 +1 @@
-import{cache as e}from"react";import{_createIntlFormatters as t,_createCache as o,initializeConfig as n}from"use-intl/core";import{getRequestLocale as r}from"./RequestLocale.js";import a from"next-intl/config";const i=e((function(){return new Date}));const s=e((function(){return Intl.DateTimeFormat().resolvedOptions().timeZone}));const c=e((async function(e,t){if("function"!=typeof e)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 o=!1;const n={get locale(){return o=!0,t||r()}};let a=e(n);return a instanceof Promise&&(a=await a),o?a.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"):a.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"),{...a,locale:a.locale||n.locale,now:a.now||i(),timeZone:a.timeZone||s()}})),u=e(t),l=e(o);const p=e((async function(e){const t=await c(a,e);return{...n(t),_formatters:u(l())}}));export{p as default};
+import{notFound as e}from"next/navigation";import{cache as t}from"react";import{_createIntlFormatters as n,_createCache as o,initializeConfig as r}from"use-intl/core";import{getRequestLocale as i}from"./RequestLocale.js";import{getRequestLocale as a}from"./RequestLocaleLegacy.js";import s from"next-intl/config";const c=t((function(){return new Date}));const l=t((function(){return Intl.DateTimeFormat().resolvedOptions().timeZone}));const u=t((async function(t,n){if("function"!=typeof t)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");const o={get locale(){return n||a()},get requestLocale(){return n?Promise.resolve(n):i()}};let r=t(o);r instanceof Promise&&(r=await r);const s=r.locale||await o.requestLocale;return s||(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"),e()),{...r,locale:s,now:r.now||c(),timeZone:r.timeZone||l()}})),f=t(n),m=t(o);const d=t((async function(e){const t=await u(s,e);return{...r(t),_formatters:f(m())}}));export{d as default};

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

@@ -1 +1 @@
-export{default as getRequestConfig}from"./server/react-server/getRequestConfig.js";export{default as getFormatter}from"./server/react-server/getFormatter.js";export{default as getMessages}from"./server/react-server/getMessages.js";export{default as getNow}from"./server/react-server/getNow.js";export{default as getTimeZone}from"./server/react-server/getTimeZone.js";export{default as getTranslations}from"./server/react-server/getTranslations.js";export{default as getLocale}from"./server/react-server/getLocale.js";export{setRequestLocale as unstable_setRequestLocale}from"./server/react-server/RequestLocale.js";
+export{default as getRequestConfig}from"./server/react-server/getRequestConfig.js";export{default as getFormatter}from"./server/react-server/getFormatter.js";export{default as getMessages}from"./server/react-server/getMessages.js";export{default as getNow}from"./server/react-server/getNow.js";export{default as getTimeZone}from"./server/react-server/getTimeZone.js";export{default as getTranslations}from"./server/react-server/getTranslations.js";export{default as getLocale}from"./server/react-server/getLocale.js";export{setCachedRequestLocale as unstable_setRequestLocale}from"./server/react-server/RequestLocaleCache.js";

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../../routing/config.js"),a=require("../../server/react-server/RequestLocale.js"),n=require("../shared/utils.js"),o=require("./ServerLink.js"),l=require("./redirects.js");function c(e){return e&&e.__esModule?e:{default:e}}var i=c(r);exports.default=function(r){const c=t.receiveRoutingConfig(r);function u(e){let{href:r,locale:t}=e;return n.compileLocalizedPathname({...n.normalizeNameOrNameWithParams(r),locale:t,pathnames:c.pathnames})}function s(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(r){let{href:t,locale:l,...u}=r;const s=a.getRequestLocale(),f=l||s;return i.default.createElement(o.default,e.extends({href:n.compileLocalizedPathname({locale:f,pathname:t,params:"object"==typeof t?t.params:void 0,pathnames:c.pathnames}),locale:l,localePrefix:c.localePrefix},u))},redirect:function(e){const r=u({href:e,locale:a.getRequestLocale()});for(var t=arguments.length,n=new Array(t>1?t-1:0),o=1;o<t;o++)n[o-1]=arguments[o];return l.serverRedirect({localePrefix:c.localePrefix,pathname:r},...n)},permanentRedirect:function(e){const r=u({href:e,locale:a.getRequestLocale()});for(var t=arguments.length,n=new Array(t>1?t-1:0),o=1;o<t;o++)n[o-1]=arguments[o];return l.serverPermanentRedirect({localePrefix:c.localePrefix,pathname:r},...n)},getPathname:u,usePathname:s("usePathname"),useRouter:s("useRouter")}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../_virtual/_rollupPluginBabelHelpers.js"),r=require("react"),t=require("../../routing/config.js"),a=require("../../server/react-server/RequestLocaleLegacy.js"),n=require("../shared/utils.js"),o=require("./ServerLink.js"),l=require("./redirects.js");function c(e){return e&&e.__esModule?e:{default:e}}var i=c(r);exports.default=function(r){const c=t.receiveRoutingConfig(r);function u(e){let{href:r,locale:t}=e;return n.compileLocalizedPathname({...n.normalizeNameOrNameWithParams(r),locale:t,pathnames:c.pathnames})}function s(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(r){let{href:t,locale:l,...u}=r;const s=a.getRequestLocale(),f=l||s;return i.default.createElement(o.default,e.extends({href:n.compileLocalizedPathname({locale:f,pathname:t,params:"object"==typeof t?t.params:void 0,pathnames:c.pathnames}),locale:l,localePrefix:c.localePrefix},u))},redirect:function(e){const r=u({href:e,locale:a.getRequestLocale()});for(var t=arguments.length,n=new Array(t>1?t-1:0),o=1;o<t;o++)n[o-1]=arguments[o];return l.serverRedirect({localePrefix:c.localePrefix,pathname:r},...n)},permanentRedirect:function(e){const r=u({href:e,locale:a.getRequestLocale()});for(var t=arguments.length,n=new Array(t>1?t-1:0),o=1;o<t;o++)n[o-1]=arguments[o];return l.serverPermanentRedirect({localePrefix:c.localePrefix,pathname:r},...n)},getPathname:u,usePathname:s("usePathname"),useRouter:s("useRouter")}};

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../server/react-server/RequestLocale.js"),r=require("../shared/redirects.js");function t(r){return function(t){const s=e.getRequestLocale();for(var c=arguments.length,n=new Array(c>1?c-1:0),a=1;a<c;a++)n[a-1]=arguments[a];return r({...t,locale:s},...n)}}const s=t(r.baseRedirect),c=t(r.basePermanentRedirect);exports.serverPermanentRedirect=c,exports.serverRedirect=s;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../../server/react-server/RequestLocaleLegacy.js"),r=require("../shared/redirects.js");function t(r){return function(t){const s=e.getRequestLocale();for(var c=arguments.length,n=new Array(c>1?c-1:0),a=1;a<c;a++)n[a-1]=arguments[a];return r({...t,locale:s},...n)}}const s=t(r.baseRedirect),c=t(r.basePermanentRedirect);exports.serverPermanentRedirect=c,exports.serverRedirect=s;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/headers"),t=require("next/navigation"),n=require("react"),r=require("../../shared/constants.js");const o=n.cache((function(){let n;try{n=e.headers().get(r.HEADER_LOCALE_NAME)}catch(e){throw e instanceof Error&&"DYNAMIC_SERVER_USAGE"===e.digest?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:e}):e}return n||t.notFound(),n}));const s=n.cache((function(){return{locale:void 0}}));exports.getRequestLocale=function(){return s().locale||o()},exports.setRequestLocale=function(e){s().locale=e};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/headers"),t=require("react"),n=require("../../shared/constants.js"),r=require("./RequestLocaleCache.js");const s=t.cache((async function(){const t=e.headers();return t instanceof Promise?await t:t}));const a=t.cache((async function(){let e;try{e=(await s()).get(n.HEADER_LOCALE_NAME)||void 0}catch(e){if(e instanceof Error&&"DYNAMIC_SERVER_USAGE"===e.digest){const t=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:e});throw t.digest=e.digest,t}throw e}return e}));exports.getRequestLocale=async function(){return r.getCachedRequestLocale()||await a()};

package/dist/production/server/react-server/RequestLocaleCache.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});const e=require("react").cache((function(){return{locale:void 0}}));exports.getCachedRequestLocale=function(){return e().locale},exports.setCachedRequestLocale=function(t){e().locale=t};

package/dist/production/server/react-server/RequestLocaleLegacy.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/headers"),t=require("next/navigation"),r=require("react"),n=require("../../shared/constants.js"),s=require("./RequestLocaleCache.js");const a=r.cache((function(){let r;try{r=e.headers().get(n.HEADER_LOCALE_NAME)}catch(e){throw e instanceof Error&&"DYNAMIC_SERVER_USAGE"===e.digest?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:e}):e}return r||t.notFound(),r}));exports.getRequestLocale=function(){return s.getCachedRequestLocale()||a()};

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("react"),t=require("use-intl/core"),n=require("./RequestLocale.js");function c(e){return e&&e.__esModule?e:{default:e}}var r=c(require("next-intl/config"));const o=e.cache((function(){return new Date}));const a=e.cache((function(){return Intl.DateTimeFormat().resolvedOptions().timeZone}));const i=e.cache((async function(e,t){const c={get locale(){return t||n.getRequestLocale()}};let r=e(c);return r instanceof Promise&&(r=await r),{...r,locale:r.locale||c.locale,now:r.now||o(),timeZone:r.timeZone||a()}})),u=e.cache(t._createIntlFormatters),s=e.cache(t._createCache);const l=e.cache((async function(e){const n=await i(r.default,e);return{...t.initializeConfig(n),_formatters:u(s())}}));exports.default=l;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/navigation"),t=require("react"),n=require("use-intl/core"),r=require("./RequestLocale.js"),o=require("./RequestLocaleLegacy.js");function c(e){return e&&e.__esModule?e:{default:e}}var a=c(require("next-intl/config"));const i=t.cache((function(){return new Date}));const u=t.cache((function(){return Intl.DateTimeFormat().resolvedOptions().timeZone}));const s=t.cache((async function(t,n){const c={get locale(){return n||o.getRequestLocale()},get requestLocale(){return n?Promise.resolve(n):r.getRequestLocale()}};let a=t(c);a instanceof Promise&&(a=await a);const s=a.locale||await c.requestLocale;return s||e.notFound(),{...a,locale:s,now:a.now||i(),timeZone:a.timeZone||u()}})),l=t.cache(n._createIntlFormatters),f=t.cache(n._createCache);const q=t.cache((async function(e){const t=await s(a.default,e);return{...n.initializeConfig(t),_formatters:l(f())}}));exports.default=q;

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./server/react-server/getRequestConfig.js"),r=require("./server/react-server/getFormatter.js"),t=require("./server/react-server/getMessages.js"),s=require("./server/react-server/getNow.js"),a=require("./server/react-server/getTimeZone.js"),o=require("./server/react-server/getTranslations.js"),u=require("./server/react-server/getLocale.js"),g=require("./server/react-server/RequestLocale.js");exports.getRequestConfig=e.default,exports.getFormatter=r.default,exports.getMessages=t.default,exports.getNow=s.default,exports.getTimeZone=a.default,exports.getTranslations=o.default,exports.getLocale=u.default,exports.unstable_setRequestLocale=g.setRequestLocale;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("./server/react-server/getRequestConfig.js"),r=require("./server/react-server/getFormatter.js"),t=require("./server/react-server/getMessages.js"),s=require("./server/react-server/getNow.js"),a=require("./server/react-server/getTimeZone.js"),o=require("./server/react-server/getTranslations.js"),u=require("./server/react-server/getLocale.js"),g=require("./server/react-server/RequestLocaleCache.js");exports.getRequestConfig=e.default,exports.getFormatter=r.default,exports.getMessages=t.default,exports.getNow=s.default,exports.getTimeZone=a.default,exports.getTranslations=o.default,exports.getLocale=u.default,exports.unstable_setRequestLocale=g.setCachedRequestLocale;

package/dist/types/src/server/react-server/RequestLocale.d.ts

@@ -1,2 +1 @@
-export declare function setRequestLocale(locale: string): void;
-export declare function getRequestLocale(): string;
+export declare function getRequestLocale(): Promise<string | undefined>;

package/dist/types/src/server/react-server/RequestLocaleCache.d.ts

@@ -0,0 +1,2 @@
+export declare function getCachedRequestLocale(): string | undefined;
+export declare function setCachedRequestLocale(locale: string): void;

package/dist/types/src/server/react-server/RequestLocaleLegacy.d.ts

@@ -0,0 +1 @@
+export declare function getRequestLocale(): string;

package/dist/types/src/server/react-server/createRequestConfig.d.ts

@@ -1,4 +1,3 @@
-import type { IntlConfig } from 'use-intl/core';
-import type { GetRequestConfigParams } from './getRequestConfig';
-declare const _default: (params: GetRequestConfigParams) => IntlConfig | Promise<IntlConfig>;
+import type { GetRequestConfigParams, RequestConfig } from './getRequestConfig';
+declare const _default: (params: GetRequestConfigParams) => RequestConfig | Promise<RequestConfig>;
 export default _default;

package/dist/types/src/server/react-server/getRequestConfig.d.ts

@@ -1,20 +1,46 @@
 import type { IntlConfig } from 'use-intl/core';
-type RequestConfig = Omit<IntlConfig, 'locale'> & {
+export type RequestConfig = Omit<IntlConfig, 'locale'> & {
     /**
-     * Instead of reading a `locale` from the argument that's passed to the
+     * Instead of reading a `requestLocale` from the argument that's passed to the
      * function within `getRequestConfig`, you can include a locale as part of the
      * returned request configuration.
      *
-     * This is helpful for apps that only support a single language and for apps
-     * where the locale should be read from user settings instead of the pathname.
+     * This can be helpful for the following use cases:
+     * - Apps that only support a single language
+     * - Apps where the locale should be read from user settings instead of the pathname
+     * - Providing a fallback locale in case the locale was not matched by the middleware
      **/
     locale?: IntlConfig['locale'];
 };
 export type GetRequestConfigParams = {
+    /**
+     * Deprecated in favor of `requestLocale` (see https://github.com/amannn/next-intl/pull/1383).
+     *
+     * The locale that was matched by the `[locale]` path segment. Note however
+     * that this can be overridden in async APIs when the `locale` is explicitly
+     * passed (e.g. `getTranslations({locale: 'en'})`).
+     *
+     * @deprecated
+     */
     locale: string;
+    /**
+     * Typically corresponds to the `[locale]` segment that was matched by the middleware.
+     *
+     * However, there are three special cases to consider:
+     * 1. **Overrides**: When an explicit `locale` is passed to awaitable functions
+     *    like `getTranslations({locale: 'en'})`, then this value will be used
+     *    instead of the segment.
+     * 2. **`undefined`**: The value can be `undefined` when a page outside of the
+     *    `[locale]` segment renders (e.g. a language selection page at `app/page.tsx`).
+     * 3. **Invalid values**: Since the `[locale]` segment effectively acts like a
+     *    catch-all for unknown routes (e.g. `/unknown.txt`), invalid values should
+     *    be replaced with a valid locale.
+     *
+     * @see https://next-intl-docs.vercel.app/docs/usage/configuration#i18n-request
+     */
+    requestLocale: Promise<string | undefined>;
 };
 /**
- * Should be called in `i18n.ts` to create the configuration for the current request.
+ * Should be called in `i18n/request.ts` to create the configuration for the current request.
  */
 export default function getRequestConfig(createRequestConfig: (params: GetRequestConfigParams) => RequestConfig | Promise<RequestConfig>): (params: GetRequestConfigParams) => RequestConfig | Promise<RequestConfig>;
-export {};

package/dist/types/src/server/react-server/index.d.ts

@@ -8,4 +8,4 @@ export { default as getTimeZone } from './getTimeZone';
 export { default as getTranslations } from './getTranslations';
 export { default as getMessages } from './getMessages';
 export { default as getLocale } from './getLocale';
-export { setRequestLocale as unstable_setRequestLocale } from './RequestLocale';
+export { setCachedRequestLocale as unstable_setRequestLocale } from './RequestLocaleCache';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.20.1-canary.0",
+  "version": "3.21.0-canary.0",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -87,11 +87,11 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.4",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.20.1-canary.0"
+    "use-intl": "^3.21.0-canary.0"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
-  "gitHead": "35e42dd87ee3cc5ec4c57494942ca897844076e7"
+  "gitHead": "3105da4fefa30e07be10849ca72e515034e5fe9b"
 }