next-intl 4.0.0-beta-4106641 → 4.0.0-beta-021e874

package/dist/esm/development/middleware/middleware.js

@@ -70,7 +70,7 @@ function createMiddleware(routing) {
       return NextResponse.redirect(urlObj.toString());
     }
     const unprefixedExternalPathname = getNormalizedPathname(externalPathname, resolvedRouting.locales, resolvedRouting.localePrefix);
-    const pathnameMatch = getPathnameMatch(externalPathname, resolvedRouting.locales, resolvedRouting.localePrefix);
+    const pathnameMatch = getPathnameMatch(externalPathname, resolvedRouting.locales, resolvedRouting.localePrefix, domain);
     const hasLocalePrefix = pathnameMatch != null;
     const isUnprefixedRouting = resolvedRouting.localePrefix.mode === 'never' || hasMatchedDefaultLocale && resolvedRouting.localePrefix.mode === 'as-needed';
     let response;

package/dist/esm/development/middleware/resolveLocale.js

@@ -72,7 +72,7 @@ function resolveLocaleFromDomain(routing, requestHeaders, requestCookies, pathna
 
   // Prio 1: Use route prefix
   if (pathname) {
-    const prefixLocale = getPathnameMatch(pathname, routing.locales, routing.localePrefix)?.locale;
+    const prefixLocale = getPathnameMatch(pathname, routing.locales, routing.localePrefix, domain)?.locale;
     if (prefixLocale) {
       if (isLocaleSupportedOnDomain(prefixLocale, domain)) {
         locale = prefixLocale;
@@ -98,7 +98,7 @@ function resolveLocaleFromDomain(routing, requestHeaders, requestCookies, pathna
 
   // Prio 3: Use the `accept-language` header
   if (!locale && routing.localeDetection) {
-    const headerLocale = getAcceptLanguageLocale(requestHeaders, domain.locales || routing.locales, domain.defaultLocale);
+    const headerLocale = getAcceptLanguageLocale(requestHeaders, domain.locales, domain.defaultLocale);
     if (headerLocale) {
       locale = headerLocale;
     }

package/dist/esm/development/middleware/utils.js

@@ -76,8 +76,21 @@ function getLocalePrefixes(locales, localePrefix, sort = true) {
   }
   return prefixes;
 }
-function getPathnameMatch(pathname, locales, localePrefix) {
+function getPathnameMatch(pathname, locales, localePrefix, domain) {
   const localePrefixes = getLocalePrefixes(locales, localePrefix);
+
+  // Sort to prioritize domain locales
+  if (domain) {
+    localePrefixes.sort(([localeA], [localeB]) => {
+      if (localeA === domain.defaultLocale) return -1;
+      if (localeB === domain.defaultLocale) return 1;
+      const isLocaleAInDomain = domain.locales.includes(localeA);
+      const isLocaleBInDomain = domain.locales.includes(localeB);
+      if (isLocaleAInDomain && !isLocaleBInDomain) return -1;
+      if (!isLocaleAInDomain && isLocaleBInDomain) return 1;
+      return 0;
+    });
+  }
   for (const [locale, prefix] of localePrefixes) {
     let exact, matches;
     if (pathname === prefix || pathname.startsWith(prefix + '/')) {
@@ -139,7 +152,7 @@ function getHost(requestHeaders) {
   return requestHeaders.get('x-forwarded-host') ?? requestHeaders.get('host') ?? undefined;
 }
 function isLocaleSupportedOnDomain(locale, domain) {
-  return domain.defaultLocale === locale || !domain.locales || domain.locales.includes(locale);
+  return domain.defaultLocale === locale || domain.locales.includes(locale);
 }
 function getBestMatchingDomain(curHostDomain, locale, domainsConfig) {
   let domainConfig;
@@ -154,19 +167,9 @@ function getBestMatchingDomain(curHostDomain, locale, domainsConfig) {
     domainConfig = domainsConfig.find(cur => cur.defaultLocale === locale);
   }
 
-  // Prio 3: Use alternative domain with restricted matching locale
-  if (!domainConfig) {
-    domainConfig = domainsConfig.find(cur => cur.locales?.includes(locale));
-  }
-
-  // Prio 4: Stay on the current domain if it supports all locales
-  if (!domainConfig && curHostDomain?.locales == null) {
-    domainConfig = curHostDomain;
-  }
-
-  // Prio 5: Use alternative domain that supports all locales
+  // Prio 3: Use alternative domain that supports the locale
   if (!domainConfig) {
-    domainConfig = domainsConfig.find(cur => !cur.locales);
+    domainConfig = domainsConfig.find(cur => cur.locales.includes(locale));
   }
   return domainConfig;
 }

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

@@ -37,12 +37,9 @@ function createNavigation(routing) {
             locale: nextLocale,
             ...rest
           } = options || {};
-
-          // @ts-expect-error -- We're passing a domain here just in case
           const pathname = getPathname({
             href,
-            locale: nextLocale || curLocale,
-            domain: window.location.host
+            locale: nextLocale || curLocale
           });
           const args = [pathname];
           if (Object.keys(rest).length > 0) {

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

@@ -1,36 +1,21 @@
 "use client";
 import NextLink from 'next/link';
 import { usePathname } from 'next/navigation';
-import { forwardRef, useState, useEffect } from 'react';
+import { forwardRef } from 'react';
 import { useLocale } from 'use-intl';
 import syncLocaleCookie from './syncLocaleCookie.js';
 import { jsx } from 'react/jsx-runtime';
 
 function BaseLink({
-  defaultLocale,
   href,
   locale,
   localeCookie,
   onClick,
   prefetch,
-  unprefixed,
   ...rest
 }, ref) {
   const curLocale = useLocale();
   const isChangingLocale = locale != null && 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`.
@@ -51,20 +36,13 @@ function BaseLink({
   const Link = NextLink;
   return /*#__PURE__*/jsx(Link, {
     ref: ref,
-    href: finalHref,
+    href: href,
     hrefLang: isChangingLocale ? locale : undefined,
     onClick: onLinkClick,
     prefetch: prefetch,
     ...rest
   });
 }
-function useHost() {
-  const [host, setHost] = useState();
-  useEffect(() => {
-    setHost(window.location.host);
-  }, []);
-  return host;
-}
 var BaseLink$1 = /*#__PURE__*/forwardRef(BaseLink);
 
 export { BaseLink$1 as default };

package/dist/esm/development/navigation/shared/createSharedNavigationFns.js

@@ -16,23 +16,14 @@ function createSharedNavigationFns(getLocale, routing) {
     validateReceivedConfig(config);
   }
   const pathnames = config.pathnames;
-
-  // This combination requires that the current host is known in order to
-  // compute a correct pathname. Since that can only be achieved by reading from
-  // headers, this would break static rendering. Therefore, as a workaround we
-  // always add a prefix in this case to be on the safe side. The downside is
-  // that the user might get redirected again if the middleware detects that the
-  // prefix is not needed.
-  const forcePrefixSsr = config.localePrefix.mode === 'as-needed' && config.domains || undefined;
   function Link({
     href,
     locale,
     ...rest
   }, ref) {
-    let pathname, params, query;
+    let pathname, params;
     if (typeof href === 'object') {
       pathname = href.pathname;
-      query = href.query;
       // @ts-expect-error -- This is ok
       params = href.params;
     } else {
@@ -43,20 +34,16 @@ function createSharedNavigationFns(getLocale, routing) {
     const isLocalizable = isLocalizableHref(href);
     const localePromiseOrValue = getLocale();
     const curLocale = isPromise(localePromiseOrValue) ? use(localePromiseOrValue) : localePromiseOrValue;
-    const finalPathname = isLocalizable ? getPathname(
-    // @ts-expect-error -- This is ok
-    {
+    const finalPathname = isLocalizable ? getPathname({
       locale: locale || curLocale,
+      // @ts-expect-error -- This is ok
       href: pathnames == null ? pathname : {
         pathname,
         params
       }
-    }, locale != null || forcePrefixSsr || undefined) : pathname;
+    }, locale != null || undefined) : pathname;
     return /*#__PURE__*/jsx(BaseLink, {
       ref: ref
-      // @ts-expect-error -- Available after the validation
-      ,
-      defaultLocale: config.defaultLocale
       // @ts-expect-error -- This is ok
       ,
       href: typeof href === 'object' ? {
@@ -64,29 +51,7 @@ function createSharedNavigationFns(getLocale, routing) {
         pathname: finalPathname
       } : finalPathname,
       locale: locale,
-      localeCookie: config.localeCookie
-      // Provide the minimal relevant information to the client side in order
-      // to potentially remove the prefix in case of the `forcePrefixSsr` case
-      ,
-      unprefixed: forcePrefixSsr && isLocalizable ? {
-        domains: config.domains.reduce((acc, domain) => {
-          acc[domain.domain] = domain.defaultLocale;
-          return acc;
-        }, {}),
-        pathname: getPathname(
-        // @ts-expect-error -- This is ok
-        {
-          locale: curLocale,
-          href: pathnames == null ? {
-            pathname,
-            query
-          } : {
-            pathname,
-            query,
-            params
-          }
-        }, false)
-      } : undefined,
+      localeCookie: config.localeCookie,
       ...rest
     });
   }
@@ -116,16 +81,12 @@ function createSharedNavigationFns(getLocale, routing) {
         pathnames: config.pathnames
       });
     }
-    return applyPathnamePrefix(pathname, locale, config,
-    // @ts-expect-error -- This is ok
-    args.domain, _forcePrefix);
+    return applyPathnamePrefix(pathname, locale, config, _forcePrefix);
   }
   function getRedirectFn(fn) {
     /** @see https://next-intl.dev/docs/routing/navigation#redirect */
     return function redirectFn(args, ...rest) {
-      return fn(
-      // @ts-expect-error -- We're forcing the prefix when no domain is provided
-      getPathname(args, args.domain ? undefined : forcePrefixSsr), ...rest);
+      return fn(getPathname(args), ...rest);
     };
   }
   const redirect$1 = getRedirectFn(redirect);

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

@@ -115,7 +115,7 @@ function getBasePath(pathname, windowPathname = window.location.pathname) {
     return windowPathname.replace(pathname, '');
   }
 }
-function applyPathnamePrefix(pathname, locale, routing, domain, force) {
+function applyPathnamePrefix(pathname, locale, routing, force) {
   const {
     mode
   } = routing.localePrefix;
@@ -126,18 +126,10 @@ function applyPathnamePrefix(pathname, locale, routing, domain, force) {
     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.dev/docs/routing#domains-localeprefix-asneeded");
-          }
-        }
-      }
-      shouldPrefix = defaultLocale !== locale;
+      shouldPrefix = routing.domains ?
+      // Since locales are unique per domain, any locale that is a
+      // default locale of a domain doesn't require a prefix
+      !routing.domains.some(cur => cur.defaultLocale === locale) : locale !== routing.defaultLocale;
     }
   }
   return shouldPrefix ? prefixPathname(getLocalePrefix(locale, routing.localePrefix), pathname) : pathname;

package/dist/esm/development/routing/defineRouting.js

@@ -1,5 +1,25 @@
 function defineRouting(config) {
+  if (config.domains) {
+    validateUniqueLocalesPerDomain(config.domains);
+  }
   return config;
 }
+function validateUniqueLocalesPerDomain(domains) {
+  const domainsByLocale = new Map();
+  for (const {
+    domain,
+    locales
+  } of domains) {
+    for (const locale of locales) {
+      const localeDomains = domainsByLocale.get(locale) || new Set();
+      localeDomains.add(domain);
+      domainsByLocale.set(locale, localeDomains);
+    }
+  }
+  const duplicateLocaleMessages = Array.from(domainsByLocale.entries()).filter(([, localeDomains]) => localeDomains.size > 1).map(([locale, localeDomains]) => `- "${locale}" is used by: ${Array.from(localeDomains).join(', ')}`);
+  if (duplicateLocaleMessages.length > 0) {
+    console.warn('Locales are expected to be unique per domain, but found overlap:\n' + duplicateLocaleMessages.join('\n') + '\nPlease see https://next-intl.dev/docs/routing#domains');
+  }
+}
 
 export { defineRouting as default };

package/dist/esm/production/middleware/middleware.js

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

package/dist/esm/production/middleware/resolveLocale.js

@@ -1 +1 @@
-import{match as e}from"@formatjs/intl-localematcher";import o from"negotiator";import{getPathnameMatch as l,isLocaleSupportedOnDomain as t,getHost as a}from"./utils.js";function c(l,t,a){let c;const n=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);c=e(n,o,a)}catch{}return c}function n(e,o){if(e.localeCookie&&o.has(e.localeCookie.name)){const l=o.get(e.localeCookie.name)?.value;if(l&&e.locales.includes(l))return l}}function i(e,o,t,a){let i;return a&&(i=l(a,e.locales,e.localePrefix)?.locale),!i&&e.localeDetection&&(i=n(e,t)),!i&&e.localeDetection&&(i=c(o,e.locales,e.defaultLocale)),i||(i=e.defaultLocale),i}function r(e,o,r,f){const u=function(e,o){const l=a(e);if(l)return o.find((e=>e.domain===l))}(o,e.domains);if(!u)return{locale:i(e,o,r,f)};let s;if(f){const o=l(f,e.locales,e.localePrefix)?.locale;if(o){if(!t(o,u))return{locale:o,domain:u};s=o}}if(!s&&e.localeDetection){const o=n(e,r);o&&t(o,u)&&(s=o)}if(!s&&e.localeDetection){const l=c(o,u.locales||e.locales,u.defaultLocale);l&&(s=l)}return s||(s=u.defaultLocale),{locale:s,domain:u}}function f(e,o,l,t){return e.domains?r(e,o,l,t):{locale:i(e,o,l,t)}}export{f as default,c as getAcceptLanguageLocale};
+import{match as e}from"@formatjs/intl-localematcher";import o from"negotiator";import{getPathnameMatch as l,isLocaleSupportedOnDomain as t,getHost as a}from"./utils.js";function c(l,t,a){let c;const n=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);c=e(n,o,a)}catch{}return c}function n(e,o){if(e.localeCookie&&o.has(e.localeCookie.name)){const l=o.get(e.localeCookie.name)?.value;if(l&&e.locales.includes(l))return l}}function i(e,o,t,a){let i;return a&&(i=l(a,e.locales,e.localePrefix)?.locale),!i&&e.localeDetection&&(i=n(e,t)),!i&&e.localeDetection&&(i=c(o,e.locales,e.defaultLocale)),i||(i=e.defaultLocale),i}function r(e,o,r,f){const u=function(e,o){const l=a(e);if(l)return o.find((e=>e.domain===l))}(o,e.domains);if(!u)return{locale:i(e,o,r,f)};let s;if(f){const o=l(f,e.locales,e.localePrefix,u)?.locale;if(o){if(!t(o,u))return{locale:o,domain:u};s=o}}if(!s&&e.localeDetection){const o=n(e,r);o&&t(o,u)&&(s=o)}if(!s&&e.localeDetection){const e=c(o,u.locales,u.defaultLocale);e&&(s=e)}return s||(s=u.defaultLocale),{locale:s,domain:u}}function f(e,o,l,t){return e.domains?r(e,o,l,t):{locale:i(e,o,l,t)}}export{f as default,c as getAcceptLanguageLocale};

package/dist/esm/production/middleware/utils.js

@@ -1 +1 @@
-import{getSortedPathnames as e,matchesPathname as t,normalizeTrailingSlash as n,getLocalePrefix as r,templateToRegex as o,prefixPathname as c}from"../shared/utils.js";function i(n,r,o){const c=e(Object.keys(n));for(const e of c){const c=n[e];if("string"==typeof c){if(t(c,r))return[void 0,e]}else{const n=Object.entries(c),i=n.findIndex((([e])=>e===o));i>0&&n.unshift(n.splice(i,1)[0]);for(const[o,c]of n)if(t(c,r))return[o,e]}}for(const e of Object.keys(n))if(t(e,r))return[void 0,e];return[void 0,void 0]}function l(e,t,r,o){let c="";return c+=d(r,a(t,e)),c=n(c),c}function f(e,t,r){e.endsWith("/")||(e+="/");const o=s(t,r),c=new RegExp(`^(${o.map((([,e])=>e.replaceAll("/","\\/"))).join("|")})/(.*)`,"i"),i=e.match(c);let l=i?"/"+i[2]:e;return"/"!==l&&(l=n(l)),l}function s(e,t,n=!0){const o=e.map((e=>[e,r(e,t)]));return n&&o.sort(((e,t)=>t[1].length-e[1].length)),o}function u(e,t,n){const r=s(t,n);for(const[t,n]of r){let r,o;if(e===n||e.startsWith(n+"/"))r=o=!0;else{const t=e.toLowerCase(),c=n.toLowerCase();(t===c||t.startsWith(c+"/"))&&(r=!1,o=!0)}if(o)return{locale:t,prefix:n,matchedPrefix:e.slice(0,n.length),exact:r}}}function a(e,t){const r=n(t),c=n(e),i=o(c).exec(r);if(!i)return;const l={};for(let e=1;e<i.length;e++){const t=c.match(/\[([^\]]+)\]/g)?.[e-1].replace(/[[\]]/g,"");t&&(l[t]=i[e])}return l}function d(e,t){if(!t)return e;let n=e=e.replace(/\[\[/g,"[").replace(/\]\]/g,"]");return Object.entries(t).forEach((([e,t])=>{n=n.replace(`[${e}]`,t)})),n}function h(e,t,n){let r=e;return t&&(r=c(t,r)),n&&(r+=n),r}function p(e){return e.get("x-forwarded-host")??e.get("host")??void 0}function g(e,t){return t.defaultLocale===e||!t.locales||t.locales.includes(e)}function x(e,t,n){let r;return e&&g(t,e)&&(r=e),r||(r=n.find((e=>e.defaultLocale===t))),r||(r=n.find((e=>e.locales?.includes(t)))),r||null!=e?.locales||(r=e),r||(r=n.find((e=>!e.locales))),r}function m(e,t){return n(t+e)}function j(e){return`/${e}`}function v(e){return e.replace(/\\/g,"%5C").replace(/\/+/g,"/")}export{m as applyBasePath,h as formatPathname,d as formatPathnameTemplate,l as formatTemplatePathname,x as getBestMatchingDomain,p as getHost,i as getInternalTemplate,j as getLocaleAsPrefix,s as getLocalePrefixes,f as getNormalizedPathname,u as getPathnameMatch,a as getRouteParams,g as isLocaleSupportedOnDomain,v as sanitizePathname};
+import{getSortedPathnames as e,matchesPathname as t,normalizeTrailingSlash as n,getLocalePrefix as r,templateToRegex as o,prefixPathname as c}from"../shared/utils.js";function i(n,r,o){const c=e(Object.keys(n));for(const e of c){const c=n[e];if("string"==typeof c){if(t(c,r))return[void 0,e]}else{const n=Object.entries(c),i=n.findIndex((([e])=>e===o));i>0&&n.unshift(n.splice(i,1)[0]);for(const[o,c]of n)if(t(c,r))return[o,e]}}for(const e of Object.keys(n))if(t(e,r))return[void 0,e];return[void 0,void 0]}function f(e,t,r,o){let c="";return c+=d(r,a(t,e)),c=n(c),c}function l(e,t,r){e.endsWith("/")||(e+="/");const o=s(t,r),c=new RegExp(`^(${o.map((([,e])=>e.replaceAll("/","\\/"))).join("|")})/(.*)`,"i"),i=e.match(c);let f=i?"/"+i[2]:e;return"/"!==f&&(f=n(f)),f}function s(e,t,n=!0){const o=e.map((e=>[e,r(e,t)]));return n&&o.sort(((e,t)=>t[1].length-e[1].length)),o}function u(e,t,n,r){const o=s(t,n);r&&o.sort((([e],[t])=>{if(e===r.defaultLocale)return-1;if(t===r.defaultLocale)return 1;const n=r.locales.includes(e),o=r.locales.includes(t);return n&&!o?-1:!n&&o?1:0}));for(const[t,n]of o){let r,o;if(e===n||e.startsWith(n+"/"))r=o=!0;else{const t=e.toLowerCase(),c=n.toLowerCase();(t===c||t.startsWith(c+"/"))&&(r=!1,o=!0)}if(o)return{locale:t,prefix:n,matchedPrefix:e.slice(0,n.length),exact:r}}}function a(e,t){const r=n(t),c=n(e),i=o(c).exec(r);if(!i)return;const f={};for(let e=1;e<i.length;e++){const t=c.match(/\[([^\]]+)\]/g)?.[e-1].replace(/[[\]]/g,"");t&&(f[t]=i[e])}return f}function d(e,t){if(!t)return e;let n=e=e.replace(/\[\[/g,"[").replace(/\]\]/g,"]");return Object.entries(t).forEach((([e,t])=>{n=n.replace(`[${e}]`,t)})),n}function h(e,t,n){let r=e;return t&&(r=c(t,r)),n&&(r+=n),r}function p(e){return e.get("x-forwarded-host")??e.get("host")??void 0}function g(e,t){return t.defaultLocale===e||t.locales.includes(e)}function x(e,t,n){let r;return e&&g(t,e)&&(r=e),r||(r=n.find((e=>e.defaultLocale===t))),r||(r=n.find((e=>e.locales.includes(t)))),r}function m(e,t){return n(t+e)}function j(e){return`/${e}`}function L(e){return e.replace(/\\/g,"%5C").replace(/\/+/g,"/")}export{m as applyBasePath,h as formatPathname,d as formatPathnameTemplate,f as formatTemplatePathname,x as getBestMatchingDomain,p as getHost,i as getInternalTemplate,j as getLocaleAsPrefix,s as getLocalePrefixes,l as getNormalizedPathname,u as getPathnameMatch,a as getRouteParams,g as isLocaleSupportedOnDomain,L as sanitizePathname};

package/dist/esm/production/navigation/react-client/createNavigation.js

@@ -1 +1 @@
-import{useRouter as e,usePathname as t}from"next/navigation";import{useMemo as o}from"react";import{useLocale as n}from"use-intl";import r from"../shared/createSharedNavigationFns.js";import a from"../shared/syncLocaleCookie.js";import{getRoute as s}from"../shared/utils.js";import i from"./useBasePathname.js";function c(c){const{Link:m,config:u,getPathname:h,...f}=r(n,c);return{...f,Link:m,usePathname:function(){const e=i(u),t=n();return o((()=>e&&u.pathnames?s(t,e,u.pathnames):e),[t,e])},useRouter:function(){const r=e(),s=n(),i=t();return o((()=>{function e(e){return function(t,o){const{locale:n,...r}=o||{},c=[h({href:t,locale:n||s,domain:window.location.host})];Object.keys(r).length>0&&c.push(r),e(...c),a(u.localeCookie,i,s,n)}}return{...r,push:e(r.push),replace:e(r.replace),prefetch:e(r.prefetch)}}),[s,i,r])},getPathname:h}}export{c as default};
+import{useRouter as e,usePathname as t}from"next/navigation";import{useMemo as r}from"react";import{useLocale as n}from"use-intl";import o from"../shared/createSharedNavigationFns.js";import a from"../shared/syncLocaleCookie.js";import{getRoute as s}from"../shared/utils.js";import i from"./useBasePathname.js";function c(c){const{Link:m,config:u,getPathname:f,...h}=o(n,c);return{...h,Link:m,usePathname:function(){const e=i(u),t=n();return r((()=>e&&u.pathnames?s(t,e,u.pathnames):e),[t,e])},useRouter:function(){const o=e(),s=n(),i=t();return r((()=>{function e(e){return function(t,r){const{locale:n,...o}=r||{},c=[f({href:t,locale:n||s})];Object.keys(o).length>0&&c.push(o),e(...c),a(u.localeCookie,i,s,n)}}return{...o,push:e(o.push),replace:e(o.replace),prefetch:e(o.prefetch)}}),[s,i,o])},getPathname:f}}export{c as default};

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

@@ -1,2 +1,2 @@
 "use client";
-import o from"next/link";import{usePathname as e}from"next/navigation";import{forwardRef as n,useState as t,useEffect as r}from"react";import{useLocale as i}from"use-intl";import c from"./syncLocaleCookie.js";import{jsx as a}from"react/jsx-runtime";function f({defaultLocale:n,href:f,locale:l,localeCookie:m,onClick:s,prefetch:u,unprefixed:p,...d},h){const k=i(),j=null!=l&&l!==k,x=l||k,C=function(){const[o,e]=t();return r((()=>{e(window.location.host)}),[]),o}(),v=C&&p&&(p.domains[C]===x||!Object.keys(p.domains).includes(C)&&k===n&&!l)?p.pathname:f,L=e();j&&(u=!1);return a(o,{ref:h,href:v,hrefLang:j?l:void 0,onClick:function(o){c(m,L,k,l),s&&s(o)},prefetch:u,...d})}var l=n(f);export{l as default};
+import o from"next/link";import{usePathname as r}from"next/navigation";import{forwardRef as e}from"react";import{useLocale as t}from"use-intl";import i from"./syncLocaleCookie.js";import{jsx as n}from"react/jsx-runtime";function f({href:e,locale:f,localeCookie:c,onClick:m,prefetch:l,...a},p){const s=t(),u=null!=f&&f!==s,h=r();u&&(l=!1);return n(o,{ref:p,href:e,hrefLang:u?f:void 0,onClick:function(o){i(c,h,s,f),m&&m(o)},prefetch:l,...a})}var c=e(f);export{c as default};

package/dist/esm/production/navigation/shared/createSharedNavigationFns.js

@@ -1 +1 @@
-import{redirect as e,permanentRedirect as o}from"next/navigation";import{forwardRef as a}from"react";import{receiveRoutingConfig as t}from"../../routing/config.js";import n from"../../shared/use.js";import{isLocalizableHref as r,isPromise as i}from"../../shared/utils.js";import m from"./BaseLink.js";import{serializeSearchParams as l,compileLocalizedPathname as c,applyPathnamePrefix as f,normalizeNameOrNameWithParams as u}from"./utils.js";import{jsx as s}from"react/jsx-runtime";function p(p,d){const h=t(d||{}),j=h.pathnames,y="as-needed"===h.localePrefix.mode&&h.domains||void 0;function g({href:e,locale:o,...a},t){let l,c,f;"object"==typeof e?(l=e.pathname,f=e.query,c=e.params):l=e;const u=r(e),d=p(),g=i(d)?n(d):d,q=u?v({locale:o||g,href:null==j?l:{pathname:l,params:c}},null!=o||y||void 0):l;return s(m,{ref:t,defaultLocale:h.defaultLocale,href:"object"==typeof e?{...e,pathname:q}:q,locale:o,localeCookie:h.localeCookie,unprefixed:y&&u?{domains:h.domains.reduce(((e,o)=>(e[o.domain]=o.defaultLocale,e)),{}),pathname:v({locale:g,href:null==j?{pathname:l,query:f}:{pathname:l,query:f,params:c}},!1)}:void 0,...a})}const q=a(g);function v(e,o){const{href:a,locale:t}=e;let n;return null==j?"object"==typeof a?(n=a.pathname,a.query&&(n+=l(a.query))):n=a:n=c({locale:t,...u(a),pathnames:h.pathnames}),f(n,t,h,e.domain,o)}function x(e){return function(o,...a){return e(v(o,o.domain?void 0:y),...a)}}const L=x(e),k=x(o);return{config:h,Link:q,redirect:L,permanentRedirect:k,getPathname:v}}export{p as default};
+import{redirect as e,permanentRedirect as t}from"next/navigation";import{forwardRef as o}from"react";import{receiveRoutingConfig as r}from"../../routing/config.js";import n from"../../shared/use.js";import{isLocalizableHref as a,isPromise as i}from"../../shared/utils.js";import m from"./BaseLink.js";import{serializeSearchParams as c,compileLocalizedPathname as l,applyPathnamePrefix as f,normalizeNameOrNameWithParams as s}from"./utils.js";import{jsx as p}from"react/jsx-runtime";function u(u,h){const j=r(h||{}),d=j.pathnames;function g({href:e,locale:t,...o},r){let c,l;"object"==typeof e?(c=e.pathname,l=e.params):c=e;const f=a(e),s=u(),h=i(s)?n(s):s,g=f?k({locale:t||h,href:null==d?c:{pathname:c,params:l}},null!=t||void 0):c;return p(m,{ref:r,href:"object"==typeof e?{...e,pathname:g}:g,locale:t,localeCookie:j.localeCookie,...o})}const y=o(g);function k(e,t){const{href:o,locale:r}=e;let n;return null==d?"object"==typeof o?(n=o.pathname,o.query&&(n+=c(o.query))):n=o:n=l({locale:r,...s(o),pathnames:j.pathnames}),f(n,r,j,t)}function b(e){return function(t,...o){return e(k(t),...o)}}const x=b(e),q=b(t);return{config:j,Link:y,redirect:x,permanentRedirect:q,getPathname:k}}export{u as default};

package/dist/esm/production/navigation/shared/utils.js

@@ -1 +1 @@
-import{getSortedPathnames as e,matchesPathname as n,isLocalizableHref as t,prefixPathname as r,getLocalePrefix as o,normalizeTrailingSlash as a}from"../../shared/utils.js";function i(e){return"string"==typeof e?{pathname:e}:e}function f(e){function n(e){return String(e)}const t=new URLSearchParams;for(const[r,o]of Object.entries(e))Array.isArray(o)?o.forEach((e=>{t.append(r,n(e))})):t.set(r,n(o));return"?"+t.toString()}function c({pathname:e,locale:n,params:t,pathnames:r,query:o}){function i(e){let n=r[e];return n||(n=e),n}function c(e){let r="string"==typeof e?e:e[n];return t&&Object.entries(t).forEach((([e,n])=>{let t,o;Array.isArray(n)?(t=`(\\[)?\\[...${e}\\](\\])?`,o=n.map((e=>String(e))).join("/")):(t=`\\[${e}\\]`,o=String(n)),r=r.replace(new RegExp(t,"g"),o)})),r=r.replace(/\[\[\.\.\..+\]\]/g,""),r=a(r),o&&(r+=f(o)),r}if("string"==typeof e){return c(i(e))}{const{pathname:n,...t}=e;return{...t,pathname:c(i(n))}}}function s(t,r,o){const a=e(Object.keys(o)),i=decodeURI(r);for(const e of a){const r=o[e];if("string"==typeof r){if(n(r,i))return e}else if(n(r[t],i))return e}return r}function u(e,n=window.location.pathname){return"/"===e?n:n.replace(e,"")}function l(e,n,a,i,f){const{mode:c}=a.localePrefix;let s;if(void 0!==f)s=f;else if(t(e))if("always"===c)s=!0;else if("as-needed"===c){let e=a.defaultLocale;if(a.domains){const n=a.domains.find((e=>e.domain===i));n&&(e=n.defaultLocale)}s=e!==n}return s?r(o(n,a.localePrefix),e):e}export{l as applyPathnamePrefix,c as compileLocalizedPathname,u as getBasePath,s as getRoute,i as normalizeNameOrNameWithParams,f as serializeSearchParams};
+import{getSortedPathnames as e,matchesPathname as t,isLocalizableHref as n,prefixPathname as r,getLocalePrefix as o,normalizeTrailingSlash as a}from"../../shared/utils.js";function i(e){return"string"==typeof e?{pathname:e}:e}function c(e){function t(e){return String(e)}const n=new URLSearchParams;for(const[r,o]of Object.entries(e))Array.isArray(o)?o.forEach((e=>{n.append(r,t(e))})):n.set(r,t(o));return"?"+n.toString()}function s({pathname:e,locale:t,params:n,pathnames:r,query:o}){function i(e){let t=r[e];return t||(t=e),t}function s(e){let r="string"==typeof e?e:e[t];return n&&Object.entries(n).forEach((([e,t])=>{let n,o;Array.isArray(t)?(n=`(\\[)?\\[...${e}\\](\\])?`,o=t.map((e=>String(e))).join("/")):(n=`\\[${e}\\]`,o=String(t)),r=r.replace(new RegExp(n,"g"),o)})),r=r.replace(/\[\[\.\.\..+\]\]/g,""),r=a(r),o&&(r+=c(o)),r}if("string"==typeof e){return s(i(e))}{const{pathname:t,...n}=e;return{...n,pathname:s(i(t))}}}function f(n,r,o){const a=e(Object.keys(o)),i=decodeURI(r);for(const e of a){const r=o[e];if("string"==typeof r){if(t(r,i))return e}else if(t(r[n],i))return e}return r}function u(e,t=window.location.pathname){return"/"===e?t:t.replace(e,"")}function l(e,t,a,i){const{mode:c}=a.localePrefix;let s;return void 0!==i?s=i:n(e)&&("always"===c?s=!0:"as-needed"===c&&(s=a.domains?!a.domains.some((e=>e.defaultLocale===t)):t!==a.defaultLocale)),s?r(o(t,a.localePrefix),e):e}export{l as applyPathnamePrefix,s as compileLocalizedPathname,u as getBasePath,f as getRoute,i as normalizeNameOrNameWithParams,c as serializeSearchParams};

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

@@ -9,7 +9,7 @@ export declare function formatTemplatePathname(sourcePathname: string, sourceTem
 export declare function getNormalizedPathname<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode>(pathname: string, locales: AppLocales, localePrefix: LocalePrefixConfigVerbose<AppLocales, AppLocalePrefixMode>): string;
 export declare function findCaseInsensitiveString(candidate: string, strings: Array<string>): string | undefined;
 export declare function getLocalePrefixes<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode>(locales: AppLocales, localePrefix: LocalePrefixConfigVerbose<AppLocales, AppLocalePrefixMode>, sort?: boolean): Array<[AppLocales[number], string]>;
-export declare function getPathnameMatch<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode>(pathname: string, locales: AppLocales, localePrefix: LocalePrefixConfigVerbose<AppLocales, AppLocalePrefixMode>): {
+export declare function getPathnameMatch<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode>(pathname: string, locales: AppLocales, localePrefix: LocalePrefixConfigVerbose<AppLocales, AppLocalePrefixMode>, domain?: DomainConfig<AppLocales>): {
     locale: AppLocales[number];
     prefix: string;
     matchedPrefix: string;

package/dist/types/navigation/react-client/createNavigation.d.ts

@@ -332,9 +332,7 @@ export default function createNavigation<const AppLocales extends Locales, const
                 query?: import("../shared/utils.js").QueryParams;
             }) : never : never;
             locale: Locale;
-        } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-            domain: AppDomains[number]["domain"];
-        } : {})) => string>[0]["href"], options?: (Partial<import("next/dist/shared/lib/app-router-context.shared-runtime.js").NavigateOptions> & {
+        }) => string>[0]["href"], options?: (Partial<import("next/dist/shared/lib/app-router-context.shared-runtime.js").NavigateOptions> & {
             locale?: Locale;
         }) | undefined) => void;
         /** @see https://next-intl.dev/docs/routing/navigation#userouter */
@@ -358,9 +356,7 @@ export default function createNavigation<const AppLocales extends Locales, const
                 query?: import("../shared/utils.js").QueryParams;
             }) : never : never;
             locale: Locale;
-        } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-            domain: AppDomains[number]["domain"];
-        } : {})) => string>[0]["href"], options?: (Partial<import("next/dist/shared/lib/app-router-context.shared-runtime.js").NavigateOptions> & {
+        }) => string>[0]["href"], options?: (Partial<import("next/dist/shared/lib/app-router-context.shared-runtime.js").NavigateOptions> & {
             locale?: Locale;
         }) | undefined) => void;
         /** @see https://next-intl.dev/docs/routing/navigation#userouter */
@@ -384,9 +380,7 @@ export default function createNavigation<const AppLocales extends Locales, const
                 query?: import("../shared/utils.js").QueryParams;
             }) : never : never;
             locale: Locale;
-        } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-            domain: AppDomains[number]["domain"];
-        } : {})) => string>[0]["href"], options?: (Partial<import("next/dist/shared/lib/app-router-context.shared-runtime.js").PrefetchOptions> & {
+        }) => string>[0]["href"], options?: (Partial<import("next/dist/shared/lib/app-router-context.shared-runtime.js").PrefetchOptions> & {
             locale?: Locale;
         }) | undefined) => void;
         back(): void;
@@ -413,9 +407,7 @@ export default function createNavigation<const AppLocales extends Locales, const
             query?: import("../shared/utils.js").QueryParams;
         }) : never : never;
         locale: Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {})) => string;
+    }) => string;
     redirect: (args: Omit<{
         href: [AppPathnames] extends [never] ? string | {
             pathname: string;
@@ -436,11 +428,7 @@ export default function createNavigation<const AppLocales extends Locales, const
             query?: import("../shared/utils.js").QueryParams;
         }) : never : never;
         locale: Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}), "domain"> & Partial<([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}>, type?: import("next/navigation.js").RedirectType | undefined) => never;
+    }, "domain">, type?: import("next/navigation.js").RedirectType | undefined) => never;
     permanentRedirect: (args: Omit<{
         href: [AppPathnames] extends [never] ? string | {
             pathname: string;
@@ -461,9 +449,5 @@ export default function createNavigation<const AppLocales extends Locales, const
             query?: import("../shared/utils.js").QueryParams;
         }) : never : never;
         locale: Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}), "domain"> & Partial<([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}>, type?: import("next/navigation.js").RedirectType | undefined) => never;
+    }, "domain">, type?: import("next/navigation.js").RedirectType | undefined) => never;
 };

package/dist/types/navigation/react-server/createNavigation.d.ts

@@ -330,11 +330,7 @@ export default function createNavigation<const AppLocales extends Locales, const
             query?: import("../shared/utils.js").QueryParams;
         }) : never : never;
         locale: import("use-intl").Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}), "domain"> & Partial<([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}>, type?: import("next/navigation.js").RedirectType | undefined) => never;
+    }, "domain">, type?: import("next/navigation.js").RedirectType | undefined) => never;
     permanentRedirect: (args: Omit<{
         href: [AppPathnames] extends [never] ? string | {
             pathname: string;
@@ -355,11 +351,7 @@ export default function createNavigation<const AppLocales extends Locales, const
             query?: import("../shared/utils.js").QueryParams;
         }) : never : never;
         locale: import("use-intl").Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}), "domain"> & Partial<([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {}>, type?: import("next/navigation.js").RedirectType | undefined) => never;
+    }, "domain">, type?: import("next/navigation.js").RedirectType | undefined) => never;
     getPathname: (args: {
         href: [AppPathnames] extends [never] ? string | {
             pathname: string;
@@ -380,7 +372,5 @@ export default function createNavigation<const AppLocales extends Locales, const
             query?: import("../shared/utils.js").QueryParams;
         }) : never : never;
         locale: import("use-intl").Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        domain: AppDomains[number]["domain"];
-    } : {})) => string;
+    }) => string;
 };

package/dist/types/navigation/shared/BaseLink.d.ts

@@ -5,15 +5,7 @@ import type { InitializedLocaleCookieConfig } from '../../routing/config.js';
 type NextLinkProps = Omit<ComponentProps<'a'>, keyof LinkProps> & Omit<LinkProps, 'locale'>;
 type Props = NextLinkProps & {
     locale?: Locale;
-    defaultLocale?: Locale;
     localeCookie: InitializedLocaleCookieConfig;
-    /** Special case for `localePrefix: 'as-needed'` and `domains`. */
-    unprefixed?: {
-        domains: {
-            [domain: string]: Locale;
-        };
-        pathname: string;
-    };
 };
 declare const _default: import("react").ForwardRefExoticComponent<Omit<Props, "ref"> & import("react").RefAttributes<HTMLAnchorElement>>;
 export default _default;

package/dist/types/navigation/shared/createSharedNavigationFns.d.ts

@@ -335,19 +335,7 @@ export default function createSharedNavigationFns<const AppLocales extends Local
             query?: QueryParams;
         } : HrefOrHrefWithParams<keyof AppPathnames>;
         locale: Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        /**
-         * In case you're using `localePrefix: 'as-needed'` in combination with `domains`, the `defaultLocale` can differ by domain and therefore the locales that need to be prefixed can differ as well. For this particular case, this parameter should be provided in order to compute the correct pathname. Note that the actual domain is not part of the result, but only the pathname is returned.
-         * @see https://next-intl.dev/docs/routing/navigation#getpathname
-         */
-        domain: AppDomains[number]["domain"];
-    } : {}), _forcePrefix?: boolean) => string>[0], "domain"> & Partial<([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        /**
-         * In case you're using `localePrefix: 'as-needed'` in combination with `domains`, the `defaultLocale` can differ by domain and therefore the locales that need to be prefixed can differ as well. For this particular case, this parameter should be provided in order to compute the correct pathname. Note that the actual domain is not part of the result, but only the pathname is returned.
-         * @see https://next-intl.dev/docs/routing/navigation#getpathname
-         */
-        domain: AppDomains[number]["domain"];
-    } : {}>, type?: import("next/navigation.js").RedirectType | undefined) => never;
+    }, _forcePrefix?: boolean) => string>[0], "domain">, type?: import("next/navigation.js").RedirectType | undefined) => never;
     permanentRedirect: (args: Omit<Parameters<(args: {
         /** @see https://next-intl.dev/docs/routing/navigation#getpathname */
         href: [AppPathnames] extends [never] ? string | {
@@ -355,19 +343,7 @@ export default function createSharedNavigationFns<const AppLocales extends Local
             query?: QueryParams;
         } : HrefOrHrefWithParams<keyof AppPathnames>;
         locale: Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        /**
-         * In case you're using `localePrefix: 'as-needed'` in combination with `domains`, the `defaultLocale` can differ by domain and therefore the locales that need to be prefixed can differ as well. For this particular case, this parameter should be provided in order to compute the correct pathname. Note that the actual domain is not part of the result, but only the pathname is returned.
-         * @see https://next-intl.dev/docs/routing/navigation#getpathname
-         */
-        domain: AppDomains[number]["domain"];
-    } : {}), _forcePrefix?: boolean) => string>[0], "domain"> & Partial<([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        /**
-         * In case you're using `localePrefix: 'as-needed'` in combination with `domains`, the `defaultLocale` can differ by domain and therefore the locales that need to be prefixed can differ as well. For this particular case, this parameter should be provided in order to compute the correct pathname. Note that the actual domain is not part of the result, but only the pathname is returned.
-         * @see https://next-intl.dev/docs/routing/navigation#getpathname
-         */
-        domain: AppDomains[number]["domain"];
-    } : {}>, type?: import("next/navigation.js").RedirectType | undefined) => never;
+    }, _forcePrefix?: boolean) => string>[0], "domain">, type?: import("next/navigation.js").RedirectType | undefined) => never;
     getPathname: (args: Parameters<(args: {
         /** @see https://next-intl.dev/docs/routing/navigation#getpathname */
         href: [AppPathnames] extends [never] ? string | {
@@ -375,12 +351,6 @@ export default function createSharedNavigationFns<const AppLocales extends Local
             query?: QueryParams;
         } : HrefOrHrefWithParams<keyof AppPathnames>;
         locale: Locale;
-    } & (([AppPathnames] extends [never] ? RoutingConfigSharedNavigation<AppLocales, AppLocalePrefixMode, AppDomains> | undefined : RoutingConfigLocalizedNavigation<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>) | undefined extends undefined ? {} : AppLocalePrefixMode extends "as-needed" ? [AppDomains] extends [never] ? {} : {
-        /**
-         * In case you're using `localePrefix: 'as-needed'` in combination with `domains`, the `defaultLocale` can differ by domain and therefore the locales that need to be prefixed can differ as well. For this particular case, this parameter should be provided in order to compute the correct pathname. Note that the actual domain is not part of the result, but only the pathname is returned.
-         * @see https://next-intl.dev/docs/routing/navigation#getpathname
-         */
-        domain: AppDomains[number]["domain"];
-    } : {}), _forcePrefix?: boolean) => string>[0]) => string;
+    }, _forcePrefix?: boolean) => string>[0]) => string;
 };
 export {};

package/dist/types/navigation/shared/utils.d.ts

@@ -49,6 +49,6 @@ export declare function compileLocalizedPathname<AppLocales extends Locales, Pat
 }): UrlObject;
 export declare function getRoute<AppLocales extends Locales>(locale: AppLocales[number], pathname: string, pathnames: Pathnames<AppLocales>): keyof Pathnames<AppLocales>;
 export declare function getBasePath(pathname: string, windowPathname?: string): string;
-export declare function applyPathnamePrefix<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode, AppPathnames extends Pathnames<AppLocales> | undefined, AppDomains extends DomainsConfig<AppLocales> | undefined>(pathname: string, locale: Locales[number], routing: Pick<ResolvedRoutingConfig<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>, 'localePrefix' | 'domains'> & Partial<Pick<ResolvedRoutingConfig<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>, 'defaultLocale'>>, domain?: string, force?: boolean): string;
+export declare function applyPathnamePrefix<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode, AppPathnames extends Pathnames<AppLocales> | undefined, AppDomains extends DomainsConfig<AppLocales> | undefined>(pathname: string, locale: Locales[number], routing: Pick<ResolvedRoutingConfig<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>, 'localePrefix' | 'domains'> & Partial<Pick<ResolvedRoutingConfig<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>, 'defaultLocale'>>, force?: boolean): string;
 export declare function validateReceivedConfig<AppLocales extends Locales, AppLocalePrefixMode extends LocalePrefixMode, AppPathnames extends Pathnames<AppLocales> | undefined, AppDomains extends DomainsConfig<AppLocales> | undefined>(config: Partial<Pick<ResolvedRoutingConfig<AppLocales, AppLocalePrefixMode, AppPathnames, AppDomains>, 'defaultLocale' | 'localePrefix'>>): void;
 export {};

package/dist/types/routing/types.d.ts

@@ -17,8 +17,8 @@ export type DomainConfig<AppLocales extends Locales> = {
     defaultLocale: AppLocales[number];
     /** The domain name (e.g. "example.com", "www.example.com" or "fr.example.com"). Note that the `x-forwarded-host` or alternatively the `host` header will be used to determine the requested domain. */
     domain: string;
-    /** Optionally restrict which locales are available on this domain. */
-    locales?: Array<AppLocales[number]>;
+    /** The locales that are available on this domain. */
+    locales: Array<AppLocales[number]>;
 };
 export type DomainsConfig<AppLocales extends Locales> = Array<DomainConfig<AppLocales>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "4.0.0-beta-4106641",
+  "version": "4.0.0-beta-021e874",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -112,7 +112,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.5.4",
     "negotiator": "^1.0.0",
-    "use-intl": "4.0.0-beta-4106641"
+    "use-intl": "4.0.0-beta-021e874"
   },
   "peerDependencies": {
     "next": "^12.0.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
@@ -124,5 +124,5 @@
       "optional": true
     }
   },
-  "gitHead": "b8eaa58ecd2088f788d5f4b7510493ce7f850176"
+  "gitHead": "83ba4bf6a7655546f78853424e4f7497ed077a53"
 }