next-intl 3.15.3 → 3.15.4

package/dist/development/middleware/middleware.js

@@ -22,7 +22,7 @@ function createMiddleware(input) {
       locale
     } = resolveLocale.default(config$1, request.headers, request.cookies, externalPathname);
     const hasMatchedDefaultLocale = domain ? domain.defaultLocale === locale : locale === config$1.defaultLocale;
-    const domainConfigs = ((_config$domains = config$1.domains) === null || _config$domains === void 0 ? void 0 : _config$domains.filter(curDomain => utils.isLocaleSupportedOnDomain(locale, curDomain))) || [];
+    const domainsConfig = ((_config$domains = config$1.domains) === null || _config$domains === void 0 ? void 0 : _config$domains.filter(curDomain => utils.isLocaleSupportedOnDomain(locale, curDomain))) || [];
     const hasUnknownHost = config$1.domains != null && !domain;
     function rewrite(url) {
       const urlObj = new URL(url, request.url);
@@ -39,8 +39,8 @@ function createMiddleware(input) {
     }
     function redirect(url, redirectDomain) {
       const urlObj = new URL(utils.normalizeTrailingSlash(url), request.url);
-      if (domainConfigs.length > 0 && !redirectDomain) {
-        const bestMatchingDomain = utils.getBestMatchingDomain(domain, locale, domainConfigs);
+      if (domainsConfig.length > 0 && !redirectDomain) {
+        const bestMatchingDomain = utils.getBestMatchingDomain(domain, locale, domainsConfig);
         if (bestMatchingDomain) {
           redirectDomain = bestMatchingDomain.domain;
           if (bestMatchingDomain.defaultLocale === locale && config$1.localePrefix.mode === 'as-needed') {
@@ -114,7 +114,7 @@ function createMiddleware(input) {
               response = redirect(utils.formatPathname(unprefixedExternalPathname, undefined, request.nextUrl.search));
             } else {
               if (config$1.domains) {
-                const pathDomain = utils.getBestMatchingDomain(domain, pathnameMatch.locale, domainConfigs);
+                const pathDomain = utils.getBestMatchingDomain(domain, pathnameMatch.locale, domainsConfig);
                 if ((domain === null || domain === void 0 ? void 0 : domain.domain) !== (pathDomain === null || pathDomain === void 0 ? void 0 : pathDomain.domain) && !hasUnknownHost) {
                   response = redirect(externalHref, pathDomain === null || pathDomain === void 0 ? void 0 : pathDomain.domain);
                 } else {

package/dist/development/middleware/utils.js

@@ -143,7 +143,7 @@ function getHost(requestHeaders) {
 function isLocaleSupportedOnDomain(locale, domain) {
   return domain.defaultLocale === locale || !domain.locales || domain.locales.includes(locale);
 }
-function getBestMatchingDomain(curHostDomain, locale, domainConfigs) {
+function getBestMatchingDomain(curHostDomain, locale, domainsConfig) {
   let domainConfig;
 
   // Prio 1: Stay on current domain
@@ -153,12 +153,12 @@ function getBestMatchingDomain(curHostDomain, locale, domainConfigs) {
 
   // Prio 2: Use alternative domain with matching default locale
   if (!domainConfig) {
-    domainConfig = domainConfigs.find(cur => cur.defaultLocale === locale);
+    domainConfig = domainsConfig.find(cur => cur.defaultLocale === locale);
   }
 
   // Prio 3: Use alternative domain with restricted matching locale
   if (!domainConfig) {
-    domainConfig = domainConfigs.find(cur => cur.locales != null && cur.locales.includes(locale));
+    domainConfig = domainsConfig.find(cur => cur.locales != null && cur.locales.includes(locale));
   }
 
   // Prio 4: Stay on the current domain if it supports all locales
@@ -168,7 +168,7 @@ function getBestMatchingDomain(curHostDomain, locale, domainConfigs) {
 
   // Prio 5: Use alternative domain that supports all locales
   if (!domainConfig) {
-    domainConfig = domainConfigs.find(cur => !cur.locales);
+    domainConfig = domainsConfig.find(cur => !cur.locales);
   }
   return domainConfig;
 }

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

@@ -1,5 +1,5 @@
 import { RequestCookies } from 'next/dist/server/web/spec-extension/cookies';
-import { Locales, DomainConfig, Pathnames } from '../routing/types';
+import { Locales, Pathnames, DomainConfig } from '../routing/types';
 import { MiddlewareRoutingConfig } from './config';
 export declare function getAcceptLanguageLocale<AppLocales extends Locales>(requestHeaders: Headers, locales: AppLocales, defaultLocale: string): string | undefined;
 export default function resolveLocale<AppLocales extends Locales, AppPathnames extends Pathnames<AppLocales>>(config: MiddlewareRoutingConfig<AppLocales, AppPathnames>, requestHeaders: Headers, requestCookies: RequestCookies, pathname: string): {

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

@@ -1,4 +1,4 @@
-import { Locales, LocalePrefixConfigVerbose, DomainConfig, Pathnames } from '../routing/types';
+import { Locales, LocalePrefixConfigVerbose, DomainConfig, Pathnames, DomainsConfig } from '../routing/types';
 export declare function getFirstPathnameSegment(pathname: string): string;
 export declare function getInternalTemplate<AppLocales extends Locales, AppPathnames extends Pathnames<AppLocales>>(pathnames: AppPathnames, pathname: string, locale: AppLocales[number]): [AppLocales[number] | undefined, keyof AppPathnames | undefined];
 export declare function formatTemplatePathname(sourcePathname: string, sourceTemplate: string, targetTemplate: string, prefix?: string): string;
@@ -19,7 +19,7 @@ export declare function formatPathnameTemplate(template: string, params?: object
 export declare function formatPathname(pathname: string, prefix: string | undefined, search: string | undefined): string;
 export declare function getHost(requestHeaders: Headers): string | undefined;
 export declare function isLocaleSupportedOnDomain<AppLocales extends Locales>(locale: string, domain: DomainConfig<AppLocales>): boolean;
-export declare function getBestMatchingDomain<AppLocales extends Locales>(curHostDomain: DomainConfig<AppLocales> | undefined, locale: string, domainConfigs: Array<DomainConfig<AppLocales>>): DomainConfig<AppLocales> | undefined;
+export declare function getBestMatchingDomain<AppLocales extends Locales>(curHostDomain: DomainConfig<AppLocales> | undefined, locale: string, domainsConfig: DomainsConfig<AppLocales>): DomainConfig<AppLocales> | undefined;
 export declare function applyBasePath(pathname: string, basePath: string): string;
 export declare function normalizeTrailingSlash(pathname: string): string;
 export declare function getLocaleAsPrefix<AppLocales extends Locales>(locale: AppLocales[number]): string;

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

@@ -1,4 +1,4 @@
-import { Locales, DomainConfig, LocalePrefix, LocalePrefixConfigVerbose } from './types';
+import { Locales, LocalePrefix, LocalePrefixConfigVerbose, DomainsConfig } from './types';
 /**
  * Maintainer note: The config that is accepted by the middleware, the shared
  * and the localized pathnames navigation factory function is slightly
@@ -9,6 +9,6 @@ export type RoutingBaseConfigInput<AppLocales extends Locales> = {
     /** @see https://next-intl-docs.vercel.app/docs/routing#locale-prefix */
     localePrefix?: LocalePrefix<AppLocales>;
     /** Can be used to change the locale handling per domain. */
-    domains?: Array<DomainConfig<AppLocales>>;
+    domains?: DomainsConfig<AppLocales>;
 };
 export declare function receiveLocalePrefixConfig<AppLocales extends Locales>(localePrefix?: LocalePrefix<AppLocales>): LocalePrefixConfigVerbose<AppLocales>;

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

@@ -1,2 +1 @@
-export type { LocalePrefix } from './types';
-export type { Pathnames } from './types';
+export type { Pathnames, LocalePrefix, DomainsConfig } from './types';

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

@@ -18,6 +18,7 @@ export type DomainConfig<AppLocales extends Locales> = {
     /** 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?: AppLocales;
+    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": "3.15.3",
+  "version": "3.15.4",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -87,7 +87,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.15.3"
+    "use-intl": "^3.15.4"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -127,5 +127,5 @@
       "limit": "0 KB"
     }
   ],
-  "gitHead": "5596ae873df9b558a564f7b73da64105da7fb2bb"
+  "gitHead": "cb005a5680d06a6d78cef974b9b9e4deec3d2488"
 }