next-intl 3.11.2 → 3.11.3

package/dist/development/middleware/resolveLocale.js

@@ -36,6 +36,19 @@ function getAcceptLanguageLocale(requestHeaders, locales, defaultLocale) {
   }
   return locale;
 }
+function getLocaleFromPrefix(pathname, locales) {
+  const pathLocaleCandidate = utils.getFirstPathnameSegment(pathname);
+  return utils.findCaseInsensitiveLocale(pathLocaleCandidate, locales);
+}
+function getLocaleFromCookie(requestCookies, locales) {
+  if (requestCookies.has(constants.COOKIE_LOCALE_NAME)) {
+    var _requestCookies$get;
+    const value = (_requestCookies$get = requestCookies.get(constants.COOKIE_LOCALE_NAME)) === null || _requestCookies$get === void 0 ? void 0 : _requestCookies$get.value;
+    if (value && locales.includes(value)) {
+      return value;
+    }
+  }
+}
 function resolveLocaleFromPrefix(_ref, requestHeaders, requestCookies, pathname) {
   let {
     defaultLocale,
@@ -46,22 +59,12 @@ function resolveLocaleFromPrefix(_ref, requestHeaders, requestCookies, pathname)
 
   // Prio 1: Use route prefix
   if (pathname) {
-    const pathLocaleCandidate = utils.getFirstPathnameSegment(pathname);
-    const matchedLocale = utils.findCaseInsensitiveLocale(pathLocaleCandidate, locales);
-    if (matchedLocale) {
-      locale = matchedLocale;
-    }
+    locale = getLocaleFromPrefix(pathname, locales);
   }
 
   // Prio 2: Use existing cookie
   if (!locale && localeDetection && requestCookies) {
-    if (requestCookies.has(constants.COOKIE_LOCALE_NAME)) {
-      var _requestCookies$get;
-      const value = (_requestCookies$get = requestCookies.get(constants.COOKIE_LOCALE_NAME)) === null || _requestCookies$get === void 0 ? void 0 : _requestCookies$get.value;
-      if (value && locales.includes(value)) {
-        locale = value;
-      }
-    }
+    locale = getLocaleFromCookie(requestCookies, locales);
   }
 
   // Prio 3: Use the `accept-language` header
@@ -76,26 +79,56 @@ function resolveLocaleFromPrefix(_ref, requestHeaders, requestCookies, pathname)
   return locale;
 }
 function resolveLocaleFromDomain(config, requestHeaders, requestCookies, pathname) {
-  const {
-    domains
-  } = config;
-  const localeFromPrefixStrategy = resolveLocaleFromPrefix(config, requestHeaders, requestCookies, pathname);
+  const domains = config.domains;
+  const domain = findDomainFromHost(requestHeaders, domains);
+  if (!domain) {
+    return {
+      locale: resolveLocaleFromPrefix(config, requestHeaders, requestCookies, pathname)
+    };
+  }
+  let locale;
 
-  // Prio 1: Use a domain
-  if (domains) {
-    const domain = findDomainFromHost(requestHeaders, domains);
-    const hasLocalePrefix = pathname && pathname.startsWith("/".concat(localeFromPrefixStrategy));
-    if (domain) {
-      return {
-        locale: utils.isLocaleSupportedOnDomain(localeFromPrefixStrategy, domain) || hasLocalePrefix ? localeFromPrefixStrategy : domain.defaultLocale,
-        domain
-      };
+  // Prio 1: Use route prefix
+  if (pathname) {
+    const prefixLocale = getLocaleFromPrefix(pathname, config.locales);
+    if (prefixLocale) {
+      if (utils.isLocaleSupportedOnDomain(prefixLocale, domain)) {
+        locale = prefixLocale;
+      } else {
+        // Causes a redirect to a domain that supports the locale
+        return {
+          locale: prefixLocale,
+          domain
+        };
+      }
     }
   }
 
-  // Prio 2: Use prefix strategy
+  // Prio 2: Use existing cookie
+  if (!locale && config.localeDetection && requestCookies) {
+    const cookieLocale = getLocaleFromCookie(requestCookies, config.locales);
+    if (cookieLocale) {
+      if (utils.isLocaleSupportedOnDomain(cookieLocale, domain)) {
+        locale = cookieLocale;
+      }
+    }
+  }
+
+  // Prio 3: Use the `accept-language` header
+  if (!locale && config.localeDetection && requestHeaders) {
+    const headerLocale = getAcceptLanguageLocale(requestHeaders, domain.locales || config.locales, domain.defaultLocale);
+    if (headerLocale) {
+      locale = headerLocale;
+    }
+  }
+
+  // Prio 4: Use default locale
+  if (!locale) {
+    locale = domain.defaultLocale;
+  }
   return {
-    locale: localeFromPrefixStrategy
+    locale,
+    domain
   };
 }
 function resolveLocale(config, requestHeaders, requestCookies, pathname) {

package/dist/esm/middleware/resolveLocale.js

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

package/dist/production/middleware/resolveLocale.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@formatjs/intl-localematcher"),t=require("negotiator"),a=require("../shared/constants.js"),n=require("./utils.js");function o(e){return e&&e.__esModule?e:{default:e}}var r=o(t);function c(t,a,n){let o;const c=new r.default({headers:{"accept-language":t.get("accept-language")||void 0}}).languages();try{o=e.match(c,a,n)}catch(e){}return o}function l(e,t,o,r){let l,{defaultLocale:i,localeDetection:u,locales:s}=e;if(r){const e=n.getFirstPathnameSegment(r),t=n.findCaseInsensitiveLocale(e,s);t&&(l=t)}if(!l&&u&&o&&o.has(a.COOKIE_LOCALE_NAME)){var d;const e=null===(d=o.get(a.COOKIE_LOCALE_NAME))||void 0===d?void 0:d.value;e&&s.includes(e)&&(l=e)}return!l&&u&&t&&(l=c(t,s,i)),l||(l=i),l}function i(e,t,a,o){const{domains:r}=e,c=l(e,t,a,o);if(r){const e=function(e,t){var a;let o=n.getHost(e);if(o=null===(a=o)||void 0===a?void 0:a.replace(/:\d+$/,""),o&&t)return t.find((e=>e.domain===o))}(t,r),a=o&&o.startsWith("/".concat(c));if(e)return{locale:n.isLocaleSupportedOnDomain(c,e)||a?c:e.defaultLocale,domain:e}}return{locale:c}}exports.default=function(e,t,a,n){return e.domains?i(e,t,a,n):{locale:l(e,t,a,n)}},exports.getAcceptLanguageLocale=c;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@formatjs/intl-localematcher"),t=require("negotiator"),n=require("../shared/constants.js"),o=require("./utils.js");function a(e){return e&&e.__esModule?e:{default:e}}var l=a(t);function c(t,n,o){let a;const c=new l.default({headers:{"accept-language":t.get("accept-language")||void 0}}).languages();try{a=e.match(c,n,o)}catch(e){}return a}function i(e,t){const n=o.getFirstPathnameSegment(e);return o.findCaseInsensitiveLocale(n,t)}function r(e,t){if(e.has(n.COOKIE_LOCALE_NAME)){var o;const a=null===(o=e.get(n.COOKIE_LOCALE_NAME))||void 0===o?void 0:o.value;if(a&&t.includes(a))return a}}function u(e,t,n,o){let a,{defaultLocale:l,localeDetection:u,locales:s}=e;return o&&(a=i(o,s)),!a&&u&&n&&(a=r(n,s)),!a&&u&&t&&(a=c(t,s,l)),a||(a=l),a}function s(e,t,n,a){const l=function(e,t){var n;let a=o.getHost(e);if(a=null===(n=a)||void 0===n?void 0:n.replace(/:\d+$/,""),a&&t)return t.find((e=>e.domain===a))}(t,e.domains);if(!l)return{locale:u(e,t,n,a)};let s;if(a){const t=i(a,e.locales);if(t){if(!o.isLocaleSupportedOnDomain(t,l))return{locale:t,domain:l};s=t}}if(!s&&e.localeDetection&&n){const t=r(n,e.locales);t&&o.isLocaleSupportedOnDomain(t,l)&&(s=t)}if(!s&&e.localeDetection&&t){const n=c(t,l.locales||e.locales,l.defaultLocale);n&&(s=n)}return s||(s=l.defaultLocale),{locale:s,domain:l}}exports.default=function(e,t,n,o){return e.domains?s(e,t,n,o):{locale:u(e,t,n,o)}},exports.getAcceptLanguageLocale=c;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-intl",
-  "version": "3.11.2",
+  "version": "3.11.3",
   "sideEffects": false,
   "author": "Jan Amann <jan@amann.work>",
   "funding": [
@@ -82,7 +82,7 @@
   "dependencies": {
     "@formatjs/intl-localematcher": "^0.2.32",
     "negotiator": "^0.6.3",
-    "use-intl": "^3.11.2"
+    "use-intl": "^3.11.3"
   },
   "peerDependencies": {
     "next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
@@ -138,8 +138,8 @@
     },
     {
       "path": "dist/production/middleware.js",
-      "limit": "5.95 KB"
+      "limit": "6 KB"
     }
   ],
-  "gitHead": "672eccf549b25116a161f21ebad075fe4ae81bc8"
+  "gitHead": "c4eac9cae1b10254486ab71cbfa35fb1f39e1b05"
 }