next-intl 3.2.3 → 3.2.5

package/README.md

@@ -24,7 +24,7 @@ Internationalization is an essential part of the user experience. next-intl give
 - 🌟 **ICU message syntax**: Localize your messages with interpolation, cardinal & ordinal plurals, enum-based label selection and rich text.
 - 📅 **Dates, times & numbers**: Apply appropriate formatting without worrying about server/client differences like time zones.
 - ✅ **Type-safe**: Speed up development with autocompletion for message keys and catch typos early with compile-time checks.
-- 💡 **Hooks-only API**: Learn a single API that can be used across your code base to turn translations into plain strings or rich text.
+- 💡 **Hooks-based API**: Learn a single API that can be used across your code base to turn translations into plain strings or rich text.
 - 🚀 **Next.js-native and performance-obsessed**: App Router, Server Components, static rendering—pick the right tool for the right job, next-intl works everywhere.
 - ⚔️ **Internationalized routing**: Provide unique pathnames per language and optionally localize pathnames for search engine optimization.
 

package/dist/development/middleware/middleware.js

@@ -51,8 +51,8 @@ function createMiddleware(config) {
           const bestMatchingDomain = utils.getBestMatchingDomain(domain, locale, domainConfigs);
           if (bestMatchingDomain) {
             redirectDomain = bestMatchingDomain.domain;
-            if (bestMatchingDomain.defaultLocale === locale && configWithDefaults.localePrefix === 'as-needed') {
-              urlObj.pathname = urlObj.pathname.replace("/".concat(locale), '');
+            if (bestMatchingDomain.defaultLocale === locale && configWithDefaults.localePrefix === 'as-needed' && urlObj.pathname.startsWith("/".concat(locale))) {
+              urlObj.pathname = utils.getNormalizedPathname(urlObj.pathname, configWithDefaults.locales);
             }
           }
         }
@@ -96,7 +96,7 @@ function createMiddleware(config) {
       } else {
         const internalPathWithSearch = utils.getPathWithSearch(pathname, request.nextUrl.search);
         if (hasLocalePrefix) {
-          const basePath = utils.getBasePath(utils.getPathWithSearch(normalizedPathname, request.nextUrl.search), pathLocale);
+          const basePath = utils.getNormalizedPathname(utils.getPathWithSearch(normalizedPathname, request.nextUrl.search), configWithDefaults.locales);
           if (configWithDefaults.localePrefix === 'never') {
             response = redirect(basePath);
           } else if (pathLocale === locale) {

package/dist/development/middleware/utils.js

@@ -46,8 +46,8 @@ function getNormalizedPathname(pathname, locales) {
   if (!pathname.endsWith('/')) {
     pathname += '/';
   }
-  const match = pathname.match("^/(".concat(locales.join('|'), ")(.*)"));
-  let result = match ? match[2] : pathname;
+  const match = pathname.match("^/(".concat(locales.join('|'), ")/(.*)"));
+  let result = match ? '/' + match[2] : pathname;
 
   // Remove trailing slash
   if (result.endsWith('/') && result !== '/') {
@@ -60,13 +60,6 @@ function getKnownLocaleFromPathname(pathname, locales) {
   const pathLocale = locales.includes(pathLocaleCandidate) ? pathLocaleCandidate : undefined;
   return pathLocale;
 }
-function getBasePath(pathname, pathLocale) {
-  let result = pathname.replace("/".concat(pathLocale), '');
-  if (!result.startsWith('/')) {
-    result = "/".concat(result);
-  }
-  return result;
-}
 function getRouteParams(template, pathname) {
   const regex = utils.templateToRegex(template);
   const match = regex.exec(pathname);
@@ -138,7 +131,6 @@ function getBestMatchingDomain(curHostDomain, locale, domainConfigs) {
 
 exports.formatPathname = formatPathname;
 exports.formatTemplatePathname = formatTemplatePathname;
-exports.getBasePath = getBasePath;
 exports.getBestMatchingDomain = getBestMatchingDomain;
 exports.getHost = getHost;
 exports.getInternalTemplate = getInternalTemplate;

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

@@ -21,9 +21,13 @@ function getRequestConfig() {
 const getFormatter = notSupported('getFormatter');
 const getNow = notSupported('getNow');
 const getTimeZone = notSupported('getTimeZone');
-const getTranslations = notSupported('getTranslations');
 const getMessages = notSupported('getMessages');
 const getLocale = notSupported('getLocale');
+
+// The type of `getTranslations` is not assigned here because it
+// causes a type error. The types use the `react-server` entry
+// anyway, therefore this is irrelevant.
+const getTranslations = notSupported('getTranslations');
 const unstable_setRequestLocale = notSupported('unstable_setRequestLocale');
 
 exports.getFormatter = getFormatter;

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

@@ -8,7 +8,6 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var getRuntimeConfig__default = /*#__PURE__*/_interopDefault(getRuntimeConfig);
 
-// @ts-expect-error
 // eslint-disable-next-line import/no-extraneous-dependencies
 
 Object.defineProperty(exports, 'default', {

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

@@ -10,6 +10,10 @@ var getLocale = require('./getLocale.js');
 // Maintainer note: `getTranslations` has two different call signatures.
 // We need to define these with function overloads, otherwise TypeScript
 // messes up the return type.
+
+// CALL SIGNATURE 1: `getTranslations(namespace)`
+// CALL SIGNATURE 2: `getTranslations({locale, namespace})`
+// IMPLEMENTATION
 async function getTranslations(namespaceOrOpts) {
   let namespace;
   let locale;

package/dist/esm/middleware/middleware.js

@@ -1 +1 @@
-import{NextResponse as e}from"next/server";import{COOKIE_LOCALE_NAME as o,HEADER_LOCALE_NAME as l}from"../shared/constants.js";import{matchesPathname as n}from"../shared/utils.js";import t from"./getAlternateLinksHeaderValue.js";import a from"./resolveLocale.js";import{isLocaleSupportedOnDomain as r,getNormalizedPathname as i,getKnownLocaleFromPathname as s,getInternalTemplate as c,formatTemplatePathname as d,getPathWithSearch as f,getBasePath as u,getBestMatchingDomain as m}from"./utils.js";function v(v){const h=function(e){var o,l,n;return{...e,alternateLinks:null===(o=e.alternateLinks)||void 0===o||o,localePrefix:null!==(l=e.localePrefix)&&void 0!==l?l:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(v);return function(v){var p,x;const{domain:L,locale:P}=a(h,v.headers,v.cookies,v.nextUrl.pathname),U=h.localeDetection&&(null===(p=v.cookies.get(o))||void 0===p?void 0:p.value)!==P,g=L?L.defaultLocale===P:P===h.defaultLocale,k=(null===(x=h.domains)||void 0===x?void 0:x.filter((e=>r(P,e))))||[],w=null!=h.domains&&!L;function j(o){return e.rewrite(new URL(o,v.url),function(){const e=new Headers(v.headers);return e.set(l,P),{request:{headers:e}}}())}function y(o,l){const n=new URL(o,v.url);if(k.length>0&&!l){const e=m(L,P,k);e&&(l=e.domain,e.defaultLocale===P&&"as-needed"===h.localePrefix&&(n.pathname=n.pathname.replace("/".concat(P),"")))}var t;l&&(n.protocol=null!==(t=v.headers.get("x-forwarded-proto"))&&void 0!==t?t:v.nextUrl.protocol,n.port="",n.host=l);return e.redirect(n.toString())}const D=i(v.nextUrl.pathname,h.locales),q=s(v.nextUrl.pathname,h.locales),A=null!=q;let H,R,S=v.nextUrl.pathname;if(h.pathnames){let e;if([e=P,R]=c(h.pathnames,D),R){const o=h.pathnames[R],l="string"==typeof o?o:o[P];if(n(l,D))S=d(D,l,R,q);else{const n=h.defaultLocale===P||(null==L?void 0:L.defaultLocale)===P;H=y(f(d(D,"string"==typeof o?o:o[e],l,q||!n?P:void 0),v.nextUrl.search))}}}if(!H)if("/"===S){const e=f("/".concat(P),v.nextUrl.search);H="never"===h.localePrefix||g&&"as-needed"===h.localePrefix?j(e):y(e)}else{const e=f(S,v.nextUrl.search);if(A){const o=u(f(D,v.nextUrl.search),q);if("never"===h.localePrefix)H=y(o);else if(q===P)if(g&&"as-needed"===h.localePrefix)H=y(o);else if(h.domains){const l=m(L,q,k);H=(null==L?void 0:L.domain)===(null==l?void 0:l.domain)||w?j(e):y(o,null==l?void 0:l.domain)}else H=j(e);else H=y("/".concat(P).concat(o))}else H="never"===h.localePrefix||g&&("as-needed"===h.localePrefix||h.domains)?j("/".concat(P).concat(e)):y("/".concat(P).concat(e))}var z;(U&&H.cookies.set(o,P,{sameSite:"strict",maxAge:31536e3}),"never"!==h.localePrefix&&h.alternateLinks&&h.locales.length>1)&&H.headers.set("Link",t({config:h,localizedPathnames:null!=R?null===(z=h.pathnames)||void 0===z?void 0:z[R]:void 0,request:v,resolvedLocale:P}));return H}}export{v as default};
+import{NextResponse as e}from"next/server";import{COOKIE_LOCALE_NAME as o,HEADER_LOCALE_NAME as l}from"../shared/constants.js";import{matchesPathname as t}from"../shared/utils.js";import n from"./getAlternateLinksHeaderValue.js";import a from"./resolveLocale.js";import{isLocaleSupportedOnDomain as r,getNormalizedPathname as i,getKnownLocaleFromPathname as s,getInternalTemplate as c,formatTemplatePathname as d,getPathWithSearch as f,getBestMatchingDomain as u}from"./utils.js";function m(m){const v=function(e){var o,l,t;return{...e,alternateLinks:null===(o=e.alternateLinks)||void 0===o||o,localePrefix:null!==(l=e.localePrefix)&&void 0!==l?l:"always",localeDetection:null===(t=e.localeDetection)||void 0===t||t}}(m);return function(m){var h,p;const{domain:x,locale:L}=a(v,m.headers,m.cookies,m.nextUrl.pathname),P=v.localeDetection&&(null===(h=m.cookies.get(o))||void 0===h?void 0:h.value)!==L,U=x?x.defaultLocale===L:L===v.defaultLocale,g=(null===(p=v.domains)||void 0===p?void 0:p.filter((e=>r(L,e))))||[],k=null!=v.domains&&!x;function w(o){return e.rewrite(new URL(o,m.url),function(){const e=new Headers(m.headers);return e.set(l,L),{request:{headers:e}}}())}function j(o,l){const t=new URL(o,m.url);if(g.length>0&&!l){const e=u(x,L,g);e&&(l=e.domain,e.defaultLocale===L&&"as-needed"===v.localePrefix&&t.pathname.startsWith("/".concat(L))&&(t.pathname=i(t.pathname,v.locales)))}var n;l&&(t.protocol=null!==(n=m.headers.get("x-forwarded-proto"))&&void 0!==n?n:m.nextUrl.protocol,t.port="",t.host=l);return e.redirect(t.toString())}const y=i(m.nextUrl.pathname,v.locales),D=s(m.nextUrl.pathname,v.locales),q=null!=D;let A,H,R=m.nextUrl.pathname;if(v.pathnames){let e;if([e=L,H]=c(v.pathnames,y),H){const o=v.pathnames[H],l="string"==typeof o?o:o[L];if(t(l,y))R=d(y,l,H,D);else{const t=v.defaultLocale===L||(null==x?void 0:x.defaultLocale)===L;A=j(f(d(y,"string"==typeof o?o:o[e],l,D||!t?L:void 0),m.nextUrl.search))}}}if(!A)if("/"===R){const e=f("/".concat(L),m.nextUrl.search);A="never"===v.localePrefix||U&&"as-needed"===v.localePrefix?w(e):j(e)}else{const e=f(R,m.nextUrl.search);if(q){const o=i(f(y,m.nextUrl.search),v.locales);if("never"===v.localePrefix)A=j(o);else if(D===L)if(U&&"as-needed"===v.localePrefix)A=j(o);else if(v.domains){const l=u(x,D,g);A=(null==x?void 0:x.domain)===(null==l?void 0:l.domain)||k?w(e):j(o,null==l?void 0:l.domain)}else A=w(e);else A=j("/".concat(L).concat(o))}else A="never"===v.localePrefix||U&&("as-needed"===v.localePrefix||v.domains)?w("/".concat(L).concat(e)):j("/".concat(L).concat(e))}var S;(P&&A.cookies.set(o,L,{sameSite:"strict",maxAge:31536e3}),"never"!==v.localePrefix&&v.alternateLinks&&v.locales.length>1)&&A.headers.set("Link",n({config:v,localizedPathnames:null!=H?null===(S=v.pathnames)||void 0===S?void 0:S[H]:void 0,request:m,resolvedLocale:L}));return A}}export{m as default};

package/dist/esm/middleware/utils.js

@@ -1 +1 @@
-import{matchesPathname as t,templateToRegex as n}from"../shared/utils.js";function e(t){return t.split("/")[1]}function o(n,e){for(const[o,c]of Object.entries(n))if("string"==typeof c){if(t(c,e))return[void 0,o]}else for(const[n,l]of Object.entries(c))if(t(l,e))return[n,o];return[void 0,void 0]}function c(t,n,e,o){const c=u(n,t);let l="";return o&&(l="/".concat(o)),l+=s(e,c),l.endsWith("/")&&(l=l.slice(0,-1)),l}function l(t,n){t.endsWith("/")||(t+="/");const e=t.match("^/(".concat(n.join("|"),")(.*)"));let o=e?e[2]:t;return o.endsWith("/")&&"/"!==o&&(o=o.slice(0,-1)),o}function r(t,n){const o=e(t);return n.includes(o)?o:void 0}function i(t,n){let e=t.replace("/".concat(n),"");return e.startsWith("/")||(e="/".concat(e)),e}function u(t,e){const o=n(t).exec(e);if(!o)return;const c={};for(let n=1;n<o.length;n++){var l;const e=null===(l=t.match(/\[([^\]]+)\]/g))||void 0===l?void 0:l[n-1].replace(/[[\]]/g,"");e&&(c[e]=o[n])}return c}function s(t,n){if(!n)return t;let e=t=t.replaceAll("[[","[").replaceAll("]]","]");return Object.entries(n).forEach((t=>{let[n,o]=t;e=e.replace("[".concat(n,"]"),o)})),e}function f(t,n){let e=t;return n&&(e+=n),e}function a(t){var n,e;return null!==(n=null!==(e=t.get("x-forwarded-host"))&&void 0!==e?e:t.get("host"))&&void 0!==n?n:void 0}function d(t,n){return n.defaultLocale===t||!n.locales||n.locales.includes(t)}function v(t,n,e){let o;return t&&d(n,t)&&(o=t),o||(o=e.find((t=>t.defaultLocale===n))),o||(o=e.find((t=>null!=t.locales&&t.locales.includes(n)))),o||null!=(null==t?void 0:t.locales)||(o=t),o||(o=e.find((t=>!t.locales))),o}export{s as formatPathname,c as formatTemplatePathname,i as getBasePath,v as getBestMatchingDomain,a as getHost,o as getInternalTemplate,r as getKnownLocaleFromPathname,e as getLocaleFromPathname,l as getNormalizedPathname,f as getPathWithSearch,u as getRouteParams,d as isLocaleSupportedOnDomain};
+import{matchesPathname as n,templateToRegex as e}from"../shared/utils.js";function t(n){return n.split("/")[1]}function o(e,t){for(const[o,l]of Object.entries(e))if("string"==typeof l){if(n(l,t))return[void 0,o]}else for(const[e,r]of Object.entries(l))if(n(r,t))return[e,o];return[void 0,void 0]}function l(n,e,t,o){const l=i(e,n);let r="";return o&&(r="/".concat(o)),r+=u(t,l),r.endsWith("/")&&(r=r.slice(0,-1)),r}function r(n,e){n.endsWith("/")||(n+="/");const t=n.match("^/(".concat(e.join("|"),")/(.*)"));let o=t?"/"+t[2]:n;return o.endsWith("/")&&"/"!==o&&(o=o.slice(0,-1)),o}function c(n,e){const o=t(n);return e.includes(o)?o:void 0}function i(n,t){const o=e(n).exec(t);if(!o)return;const l={};for(let e=1;e<o.length;e++){var r;const t=null===(r=n.match(/\[([^\]]+)\]/g))||void 0===r?void 0:r[e-1].replace(/[[\]]/g,"");t&&(l[t]=o[e])}return l}function u(n,e){if(!e)return n;let t=n=n.replaceAll("[[","[").replaceAll("]]","]");return Object.entries(e).forEach((n=>{let[e,o]=n;t=t.replace("[".concat(e,"]"),o)})),t}function s(n,e){let t=n;return e&&(t+=e),t}function f(n){var e,t;return null!==(e=null!==(t=n.get("x-forwarded-host"))&&void 0!==t?t:n.get("host"))&&void 0!==e?e:void 0}function a(n,e){return e.defaultLocale===n||!e.locales||e.locales.includes(n)}function d(n,e,t){let o;return n&&a(e,n)&&(o=n),o||(o=t.find((n=>n.defaultLocale===e))),o||(o=t.find((n=>null!=n.locales&&n.locales.includes(e)))),o||null!=(null==n?void 0:n.locales)||(o=n),o||(o=t.find((n=>!n.locales))),o}export{u as formatPathname,l as formatTemplatePathname,d as getBestMatchingDomain,f as getHost,o as getInternalTemplate,c as getKnownLocaleFromPathname,t as getLocaleFromPathname,r as getNormalizedPathname,s as getPathWithSearch,i as getRouteParams,a as isLocaleSupportedOnDomain};

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

@@ -1 +1 @@
-function e(e){return()=>{throw new Error("`".concat(e,"` is not supported in Client Components."))}}function t(){return e("getRequestConfig")}const n=e("getFormatter"),o=e("getNow"),r=e("getTimeZone"),s=e("getTranslations"),g=e("getMessages"),a=e("getLocale"),i=e("unstable_setRequestLocale");export{n as getFormatter,a as getLocale,g as getMessages,o as getNow,t as getRequestConfig,r as getTimeZone,s as getTranslations,i as unstable_setRequestLocale};
+function e(e){return()=>{throw new Error("`".concat(e,"` is not supported in Client Components."))}}function t(){return e("getRequestConfig")}const n=e("getFormatter"),o=e("getNow"),r=e("getTimeZone"),s=e("getMessages"),g=e("getLocale"),a=e("getTranslations"),i=e("unstable_setRequestLocale");export{n as getFormatter,g as getLocale,s as getMessages,o as getNow,t as getRequestConfig,r as getTimeZone,a as getTranslations,i as unstable_setRequestLocale};

package/dist/production/middleware/middleware.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/server"),t=require("../shared/constants.js"),a=require("../shared/utils.js"),n=require("./getAlternateLinksHeaderValue.js"),l=require("./resolveLocale.js"),o=require("./utils.js");exports.default=function(r){const i=function(e){var t,a,n;return{...e,alternateLinks:null===(t=e.alternateLinks)||void 0===t||t,localePrefix:null!==(a=e.localePrefix)&&void 0!==a?a:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(r);return function(r){var s,c;const{domain:d,locale:u}=l.default(i,r.headers,r.cookies,r.nextUrl.pathname),h=i.localeDetection&&(null===(s=r.cookies.get(t.COOKIE_LOCALE_NAME))||void 0===s?void 0:s.value)!==u,f=d?d.defaultLocale===u:u===i.defaultLocale,m=(null===(c=i.domains)||void 0===c?void 0:c.filter((e=>o.isLocaleSupportedOnDomain(u,e))))||[],v=null!=i.domains&&!d;function p(a){return e.NextResponse.rewrite(new URL(a,r.url),function(){const e=new Headers(r.headers);return e.set(t.HEADER_LOCALE_NAME,u),{request:{headers:e}}}())}function x(t,a){const n=new URL(t,r.url);if(m.length>0&&!a){const e=o.getBestMatchingDomain(d,u,m);e&&(a=e.domain,e.defaultLocale===u&&"as-needed"===i.localePrefix&&(n.pathname=n.pathname.replace("/".concat(u),"")))}var l;a&&(n.protocol=null!==(l=r.headers.get("x-forwarded-proto"))&&void 0!==l?l:r.nextUrl.protocol,n.port="",n.host=a);return e.NextResponse.redirect(n.toString())}const g=o.getNormalizedPathname(r.nextUrl.pathname,i.locales),L=o.getKnownLocaleFromPathname(r.nextUrl.pathname,i.locales),P=null!=L;let U,E,A=r.nextUrl.pathname;if(i.pathnames){let e;if([e=u,E]=o.getInternalTemplate(i.pathnames,g),E){const t=i.pathnames[E],n="string"==typeof t?t:t[u];if(a.matchesPathname(n,g))A=o.formatTemplatePathname(g,n,E,L);else{const a=i.defaultLocale===u||(null==d?void 0:d.defaultLocale)===u;U=x(o.getPathWithSearch(o.formatTemplatePathname(g,"string"==typeof t?t:t[e],n,L||!a?u:void 0),r.nextUrl.search))}}}if(!U)if("/"===A){const e=o.getPathWithSearch("/".concat(u),r.nextUrl.search);U="never"===i.localePrefix||f&&"as-needed"===i.localePrefix?p(e):x(e)}else{const e=o.getPathWithSearch(A,r.nextUrl.search);if(P){const t=o.getBasePath(o.getPathWithSearch(g,r.nextUrl.search),L);if("never"===i.localePrefix)U=x(t);else if(L===u)if(f&&"as-needed"===i.localePrefix)U=x(t);else if(i.domains){const a=o.getBestMatchingDomain(d,L,m);U=(null==d?void 0:d.domain)===(null==a?void 0:a.domain)||v?p(e):x(t,null==a?void 0:a.domain)}else U=p(e);else U=x("/".concat(u).concat(t))}else U="never"===i.localePrefix||f&&("as-needed"===i.localePrefix||i.domains)?p("/".concat(u).concat(e)):x("/".concat(u).concat(e))}var O;(h&&U.cookies.set(t.COOKIE_LOCALE_NAME,u,{sameSite:"strict",maxAge:31536e3}),"never"!==i.localePrefix&&i.alternateLinks&&i.locales.length>1)&&U.headers.set("Link",n.default({config:i,localizedPathnames:null!=E?null===(O=i.pathnames)||void 0===O?void 0:O[E]:void 0,request:r,resolvedLocale:u}));return U}};
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("next/server"),t=require("../shared/constants.js"),a=require("../shared/utils.js"),n=require("./getAlternateLinksHeaderValue.js"),l=require("./resolveLocale.js"),o=require("./utils.js");exports.default=function(r){const i=function(e){var t,a,n;return{...e,alternateLinks:null===(t=e.alternateLinks)||void 0===t||t,localePrefix:null!==(a=e.localePrefix)&&void 0!==a?a:"always",localeDetection:null===(n=e.localeDetection)||void 0===n||n}}(r);return function(r){var s,c;const{domain:d,locale:u}=l.default(i,r.headers,r.cookies,r.nextUrl.pathname),h=i.localeDetection&&(null===(s=r.cookies.get(t.COOKIE_LOCALE_NAME))||void 0===s?void 0:s.value)!==u,f=d?d.defaultLocale===u:u===i.defaultLocale,m=(null===(c=i.domains)||void 0===c?void 0:c.filter((e=>o.isLocaleSupportedOnDomain(u,e))))||[],v=null!=i.domains&&!d;function p(a){return e.NextResponse.rewrite(new URL(a,r.url),function(){const e=new Headers(r.headers);return e.set(t.HEADER_LOCALE_NAME,u),{request:{headers:e}}}())}function x(t,a){const n=new URL(t,r.url);if(m.length>0&&!a){const e=o.getBestMatchingDomain(d,u,m);e&&(a=e.domain,e.defaultLocale===u&&"as-needed"===i.localePrefix&&n.pathname.startsWith("/".concat(u))&&(n.pathname=o.getNormalizedPathname(n.pathname,i.locales)))}var l;a&&(n.protocol=null!==(l=r.headers.get("x-forwarded-proto"))&&void 0!==l?l:r.nextUrl.protocol,n.port="",n.host=a);return e.NextResponse.redirect(n.toString())}const g=o.getNormalizedPathname(r.nextUrl.pathname,i.locales),P=o.getKnownLocaleFromPathname(r.nextUrl.pathname,i.locales),L=null!=P;let U,E,A=r.nextUrl.pathname;if(i.pathnames){let e;if([e=u,E]=o.getInternalTemplate(i.pathnames,g),E){const t=i.pathnames[E],n="string"==typeof t?t:t[u];if(a.matchesPathname(n,g))A=o.formatTemplatePathname(g,n,E,P);else{const a=i.defaultLocale===u||(null==d?void 0:d.defaultLocale)===u;U=x(o.getPathWithSearch(o.formatTemplatePathname(g,"string"==typeof t?t:t[e],n,P||!a?u:void 0),r.nextUrl.search))}}}if(!U)if("/"===A){const e=o.getPathWithSearch("/".concat(u),r.nextUrl.search);U="never"===i.localePrefix||f&&"as-needed"===i.localePrefix?p(e):x(e)}else{const e=o.getPathWithSearch(A,r.nextUrl.search);if(L){const t=o.getNormalizedPathname(o.getPathWithSearch(g,r.nextUrl.search),i.locales);if("never"===i.localePrefix)U=x(t);else if(P===u)if(f&&"as-needed"===i.localePrefix)U=x(t);else if(i.domains){const a=o.getBestMatchingDomain(d,P,m);U=(null==d?void 0:d.domain)===(null==a?void 0:a.domain)||v?p(e):x(t,null==a?void 0:a.domain)}else U=p(e);else U=x("/".concat(u).concat(t))}else U="never"===i.localePrefix||f&&("as-needed"===i.localePrefix||i.domains)?p("/".concat(u).concat(e)):x("/".concat(u).concat(e))}var O;(h&&U.cookies.set(t.COOKIE_LOCALE_NAME,u,{sameSite:"strict",maxAge:31536e3}),"never"!==i.localePrefix&&i.alternateLinks&&i.locales.length>1)&&U.headers.set("Link",n.default({config:i,localizedPathnames:null!=E?null===(O=i.pathnames)||void 0===O?void 0:O[E]:void 0,request:r,resolvedLocale:u}));return U}};

package/dist/production/middleware/utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../shared/utils.js");function t(e){return e.split("/")[1]}function n(t,n){const o=e.templateToRegex(t).exec(n);if(!o)return;const r={};for(let e=1;e<o.length;e++){var a;const n=null===(a=t.match(/\[([^\]]+)\]/g))||void 0===a?void 0:a[e-1].replace(/[[\]]/g,"");n&&(r[n]=o[e])}return r}function o(e,t){if(!t)return e;let n=e=e.replaceAll("[[","[").replaceAll("]]","]");return Object.entries(t).forEach((e=>{let[t,o]=e;n=n.replace("[".concat(t,"]"),o)})),n}function r(e,t){return t.defaultLocale===e||!t.locales||t.locales.includes(e)}exports.formatPathname=o,exports.formatTemplatePathname=function(e,t,r,a){const c=n(t,e);let l="";return a&&(l="/".concat(a)),l+=o(r,c),l.endsWith("/")&&(l=l.slice(0,-1)),l},exports.getBasePath=function(e,t){let n=e.replace("/".concat(t),"");return n.startsWith("/")||(n="/".concat(n)),n},exports.getBestMatchingDomain=function(e,t,n){let o;return e&&r(t,e)&&(o=e),o||(o=n.find((e=>e.defaultLocale===t))),o||(o=n.find((e=>null!=e.locales&&e.locales.includes(t)))),o||null!=(null==e?void 0:e.locales)||(o=e),o||(o=n.find((e=>!e.locales))),o},exports.getHost=function(e){var t,n;return null!==(t=null!==(n=e.get("x-forwarded-host"))&&void 0!==n?n:e.get("host"))&&void 0!==t?t:void 0},exports.getInternalTemplate=function(t,n){for(const[o,r]of Object.entries(t))if("string"==typeof r){const t=r;if(e.matchesPathname(t,n))return[void 0,o]}else for(const[t,a]of Object.entries(r))if(e.matchesPathname(a,n))return[t,o];return[void 0,void 0]},exports.getKnownLocaleFromPathname=function(e,n){const o=t(e);return n.includes(o)?o:void 0},exports.getLocaleFromPathname=t,exports.getNormalizedPathname=function(e,t){e.endsWith("/")||(e+="/");const n=e.match("^/(".concat(t.join("|"),")(.*)"));let o=n?n[2]:e;return o.endsWith("/")&&"/"!==o&&(o=o.slice(0,-1)),o},exports.getPathWithSearch=function(e,t){let n=e;return t&&(n+=t),n},exports.getRouteParams=n,exports.isLocaleSupportedOnDomain=r;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("../shared/utils.js");function t(e){return e.split("/")[1]}function n(t,n){const o=e.templateToRegex(t).exec(n);if(!o)return;const r={};for(let e=1;e<o.length;e++){var l;const n=null===(l=t.match(/\[([^\]]+)\]/g))||void 0===l?void 0:l[e-1].replace(/[[\]]/g,"");n&&(r[n]=o[e])}return r}function o(e,t){if(!t)return e;let n=e=e.replaceAll("[[","[").replaceAll("]]","]");return Object.entries(t).forEach((e=>{let[t,o]=e;n=n.replace("[".concat(t,"]"),o)})),n}function r(e,t){return t.defaultLocale===e||!t.locales||t.locales.includes(e)}exports.formatPathname=o,exports.formatTemplatePathname=function(e,t,r,l){const a=n(t,e);let c="";return l&&(c="/".concat(l)),c+=o(r,a),c.endsWith("/")&&(c=c.slice(0,-1)),c},exports.getBestMatchingDomain=function(e,t,n){let o;return e&&r(t,e)&&(o=e),o||(o=n.find((e=>e.defaultLocale===t))),o||(o=n.find((e=>null!=e.locales&&e.locales.includes(t)))),o||null!=(null==e?void 0:e.locales)||(o=e),o||(o=n.find((e=>!e.locales))),o},exports.getHost=function(e){var t,n;return null!==(t=null!==(n=e.get("x-forwarded-host"))&&void 0!==n?n:e.get("host"))&&void 0!==t?t:void 0},exports.getInternalTemplate=function(t,n){for(const[o,r]of Object.entries(t))if("string"==typeof r){const t=r;if(e.matchesPathname(t,n))return[void 0,o]}else for(const[t,l]of Object.entries(r))if(e.matchesPathname(l,n))return[t,o];return[void 0,void 0]},exports.getKnownLocaleFromPathname=function(e,n){const o=t(e);return n.includes(o)?o:void 0},exports.getLocaleFromPathname=t,exports.getNormalizedPathname=function(e,t){e.endsWith("/")||(e+="/");const n=e.match("^/(".concat(t.join("|"),")/(.*)"));let o=n?"/"+n[2]:e;return o.endsWith("/")&&"/"!==o&&(o=o.slice(0,-1)),o},exports.getPathWithSearch=function(e,t){let n=e;return t&&(n+=t),n},exports.getRouteParams=n,exports.isLocaleSupportedOnDomain=r;

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

@@ -1 +1 @@
-"use strict";function e(e){return()=>{throw new Error("`".concat(e,"` is not supported in Client Components."))}}Object.defineProperty(exports,"__esModule",{value:!0});const t=e("getFormatter"),o=e("getNow"),s=e("getTimeZone"),r=e("getTranslations"),n=e("getMessages"),g=e("getLocale"),a=e("unstable_setRequestLocale");exports.getFormatter=t,exports.getLocale=g,exports.getMessages=n,exports.getNow=o,exports.getRequestConfig=function(){return e("getRequestConfig")},exports.getTimeZone=s,exports.getTranslations=r,exports.unstable_setRequestLocale=a;
+"use strict";function e(e){return()=>{throw new Error("`".concat(e,"` is not supported in Client Components."))}}Object.defineProperty(exports,"__esModule",{value:!0});const t=e("getFormatter"),o=e("getNow"),s=e("getTimeZone"),r=e("getMessages"),n=e("getLocale"),g=e("getTranslations"),a=e("unstable_setRequestLocale");exports.getFormatter=t,exports.getLocale=n,exports.getMessages=r,exports.getNow=o,exports.getRequestConfig=function(){return e("getRequestConfig")},exports.getTimeZone=s,exports.getTranslations=g,exports.unstable_setRequestLocale=a;

package/dist/types/src/middleware/utils.d.ts

@@ -8,7 +8,6 @@ export declare function formatTemplatePathname(sourcePathname: string, sourceTem
  */
 export declare function getNormalizedPathname<Locales extends AllLocales>(pathname: string, locales: Locales): string;
 export declare function getKnownLocaleFromPathname<Locales extends AllLocales>(pathname: string, locales: Locales): Locales[number] | undefined;
-export declare function getBasePath(pathname: string, pathLocale: string): string;
 export declare function getRouteParams(template: string, pathname: string): Record<string, string> | undefined;
 export declare function formatPathname(template: string, params?: object): string;
 export declare function getPathWithSearch(pathname: string, search: string | undefined): string;

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

@@ -1,58 +1,9 @@
-/// <reference types="react" />
 import type { getRequestConfig as getRequestConfig_type, getFormatter as getFormatter_type, getNow as getNow_type, getTimeZone as getTimeZone_type, getMessages as getMessages_type, getLocale as getLocale_type, unstable_setRequestLocale as unstable_setRequestLocale_type } from '../react-server';
 export declare function getRequestConfig(...args: Parameters<typeof getRequestConfig_type>): ReturnType<typeof getRequestConfig_type>;
 export declare const getFormatter: typeof getFormatter_type;
 export declare const getNow: typeof getNow_type;
 export declare const getTimeZone: typeof getTimeZone_type;
-export declare const getTranslations: {
-    <NestedKey extends string = never>(namespace?: NestedKey | undefined): Promise<{
-        <TargetKey extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: [TargetKey] extends [never] ? string : TargetKey, values?: import("use-intl/dist/types/src/core/TranslationValues").default | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        rich<TargetKey_1 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: [TargetKey_1] extends [never] ? string : TargetKey_1, values?: import("use-intl").RichTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray;
-        markup<TargetKey_2 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: [TargetKey_2] extends [never] ? string : TargetKey_2, values?: import("use-intl").MarkupTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        raw<TargetKey_3 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey] extends [never] ? "!" : `!.${NestedKey}`>>>>(key: [TargetKey_3] extends [never] ? string : TargetKey_3): any;
-    }>;
-    <NestedKey_1 extends string = never>(opts?: {
-        locale: string;
-        namespace?: NestedKey_1 | undefined;
-    } | undefined): Promise<{
-        <TargetKey_4 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_4, values?: import("use-intl/dist/types/src/core/TranslationValues").default | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        rich<TargetKey_5 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_5, values?: import("use-intl").RichTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string | import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>> | import("react").ReactNodeArray;
-        markup<TargetKey_6 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_6, values?: import("use-intl").MarkupTranslationValues | undefined, formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined): string;
-        raw<TargetKey_7 extends import("use-intl/dist/types/src/core/utils/MessageKeys").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>, import("use-intl/dist/types/src/core/utils/NestedKeyOf").default<import("use-intl/dist/types/src/core/utils/NestedValueOf").default<{
-            '!': IntlMessages;
-        }, [NestedKey_1] extends [never] ? "!" : `!.${NestedKey_1}`>>>>(key: TargetKey_7): any;
-    }>;
-};
 export declare const getMessages: typeof getMessages_type;
 export declare const getLocale: typeof getLocale_type;
+export declare const getTranslations: () => never;
 export declare const unstable_setRequestLocale: typeof unstable_setRequestLocale_type;

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

@@ -1,23 +1,8 @@
-declare const getConfig: (locale: string) => Promise<Omit<{
-    locale: string;
-    now: Date;
-    timeZone: string;
-    formats?: Partial<import("use-intl/dist/types/src/core/Formats").default> | undefined;
-    onError?: ((error: import("use-intl/core").IntlError) => void) | undefined;
-    getMessageFallback?: ((info: {
-        error: import("use-intl/core").IntlError;
-        key: string;
-        namespace?: string | undefined;
-    }) => string) | undefined;
-    messages?: import("use-intl/dist/types/src/core/AbstractIntlMessages").default | undefined;
-    defaultTranslationValues?: import("use-intl/core").RichTranslationValues | undefined;
-}, "onError" | "getMessageFallback" | "messages"> & {
-    messages: import("use-intl/dist/types/src/core/AbstractIntlMessages").default | undefined;
-    onError: typeof import("use-intl/dist/types/src/core/defaults").defaultOnError;
-    getMessageFallback: (info: {
-        error: import("use-intl/core").IntlError;
-        key: string;
-        namespace?: string | undefined;
-    }) => string;
+import { IntlConfig } from 'use-intl/core';
+declare const getConfig: (locale: string) => Promise<IntlConfig & {
+    getMessageFallback: NonNullable<IntlConfig['getMessageFallback']>;
+    now: NonNullable<IntlConfig['now']>;
+    onError: NonNullable<IntlConfig['onError']>;
+    timeZone: NonNullable<IntlConfig['timeZone']>;
 }>;
 export default getConfig;

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

@@ -1,3 +1,4 @@
+import { createFormatter } from 'use-intl/core';
 /**
  * Returns a formatter based on the given locale.
  *
@@ -6,9 +7,4 @@
  */
 export default function getFormatter(opts?: {
     locale?: string;
-}): Promise<{
-    dateTime: (value: number | Date, formatOrOptions?: string | import("use-intl/dist/types/src/core/DateTimeFormatOptions").default | undefined) => string;
-    number: (value: number | bigint, formatOrOptions?: string | import("use-intl/core").NumberFormatOptions | undefined) => string;
-    relativeTime: (date: number | Date, nowOrOptions?: number | Date | import("use-intl/dist/types/src/core/RelativeTimeFormatOptions").default | undefined) => string;
-    list: (value: Iterable<string>, formatOrOptions?: string | Intl.ListFormatOptions | undefined) => string;
-}>;
+}): Promise<ReturnType<typeof createFormatter>>;

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

@@ -1,3 +1,4 @@
+import type { AbstractIntlMessages } from 'use-intl';
 export default function getMessages(opts?: {
     locale?: string;
-}): Promise<import("use-intl/dist/types/src/core/AbstractIntlMessages").default>;
+}): Promise<AbstractIntlMessages>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.2.3",
+  "version": "3.2.5",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -80,7 +80,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.2.3"
+    "use-intl": "^3.2.5"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -137,5 +137,5 @@
       "limit": "5.72 KB"
     }
   ],
-  "gitHead": "1782e9a56db0a7ee6e67dd4ea12a5f527439fa5e"
+  "gitHead": "bbeec3b77313eba54b526a0e6452a2331f6aae06"
 }