next-intl 3.17.3 → 3.17.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -22,6 +22,10 @@ function findDomainFromHost(requestHeaders, domains) {
|
|
|
22
22
|
}
|
|
23
23
|
return undefined;
|
|
24
24
|
}
|
|
25
|
+
function orderLocales(locales) {
|
|
26
|
+
// Workaround for https://github.com/formatjs/formatjs/issues/4469
|
|
27
|
+
return locales.slice().sort((a, b) => b.length - a.length);
|
|
28
|
+
}
|
|
25
29
|
function getAcceptLanguageLocale(requestHeaders, locales, defaultLocale) {
|
|
26
30
|
let locale;
|
|
27
31
|
const languages = new Negotiator__default.default({
|
|
@@ -30,7 +34,8 @@ function getAcceptLanguageLocale(requestHeaders, locales, defaultLocale) {
|
|
|
30
34
|
}
|
|
31
35
|
}).languages();
|
|
32
36
|
try {
|
|
33
|
-
|
|
37
|
+
const orderedLocales = orderLocales(locales);
|
|
38
|
+
locale = intlLocalematcher.match(languages, orderedLocales, defaultLocale);
|
|
34
39
|
} catch (e) {
|
|
35
40
|
// Invalid language
|
|
36
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
import{match as e}from"@formatjs/intl-localematcher";import o from"negotiator";import{COOKIE_LOCALE_NAME as l}from"../shared/constants.js";import{getPathnameMatch as t,isLocaleSupportedOnDomain as
|
|
1
|
+
import{match as e}from"@formatjs/intl-localematcher";import o from"negotiator";import{COOKIE_LOCALE_NAME as l}from"../shared/constants.js";import{getPathnameMatch as t,isLocaleSupportedOnDomain as n,getHost as a}from"./utils.js";function c(l,t,n){let a;const c=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);a=e(c,o,n)}catch(e){}return a}function i(e,o){if(e.has(l)){var t;const n=null===(t=e.get(l))||void 0===t?void 0:t.value;if(n&&o.includes(n))return n}}function r(e,o,l,n){let a,{defaultLocale:r,localeDetection:u,localePrefix:f,locales:s}=e;var d;n&&(a=null===(d=t(n,s,f))||void 0===d?void 0:d.locale);return!a&&u&&l&&(a=i(l,s)),!a&&u&&o&&(a=c(o,s,r)),a||(a=r),a}function u(e,o,l,u){const f=function(e,o){var l;let t=a(e);if(t=null===(l=t)||void 0===l?void 0:l.replace(/:\d+$/,""),t&&o)return o.find((e=>e.domain===t))}(o,e.domains);if(!f)return{locale:r(e,o,l,u)};let s;if(u){var d;const o=null===(d=t(u,e.locales,e.localePrefix))||void 0===d?void 0:d.locale;if(o){if(!n(o,f))return{locale:o,domain:f};s=o}}if(!s&&e.localeDetection&&l){const o=i(l,e.locales);o&&n(o,f)&&(s=o)}if(!s&&e.localeDetection&&o){const l=c(o,f.locales||e.locales,f.defaultLocale);l&&(s=l)}return s||(s=f.defaultLocale),{locale:s,domain:f}}function f(e,o,l,t){return e.domains?u(e,o,l,t):{locale:r(e,o,l,t)}}export{f as default,c as getAcceptLanguageLocale};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@formatjs/intl-localematcher"),t=require("negotiator"),
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var e=require("@formatjs/intl-localematcher"),t=require("negotiator"),l=require("../shared/constants.js"),o=require("./utils.js");function a(e){return e&&e.__esModule?e:{default:e}}var n=a(t);function c(t,l,o){let a;const c=new n.default({headers:{"accept-language":t.get("accept-language")||void 0}}).languages();try{const t=function(e){return e.slice().sort(((e,t)=>t.length-e.length))}(l);a=e.match(c,t,o)}catch(e){}return a}function i(e,t){if(e.has(l.COOKIE_LOCALE_NAME)){var o;const a=null===(o=e.get(l.COOKIE_LOCALE_NAME))||void 0===o?void 0:o.value;if(a&&t.includes(a))return a}}function r(e,t,l,a){let n,{defaultLocale:r,localeDetection:u,localePrefix:s,locales:d}=e;var f;a&&(n=null===(f=o.getPathnameMatch(a,d,s))||void 0===f?void 0:f.locale);return!n&&u&&l&&(n=i(l,d)),!n&&u&&t&&(n=c(t,d,r)),n||(n=r),n}function u(e,t,l,a){const n=function(e,t){var l;let a=o.getHost(e);if(a=null===(l=a)||void 0===l?void 0:l.replace(/:\d+$/,""),a&&t)return t.find((e=>e.domain===a))}(t,e.domains);if(!n)return{locale:r(e,t,l,a)};let u;if(a){var s;const t=null===(s=o.getPathnameMatch(a,e.locales,e.localePrefix))||void 0===s?void 0:s.locale;if(t){if(!o.isLocaleSupportedOnDomain(t,n))return{locale:t,domain:n};u=t}}if(!u&&e.localeDetection&&l){const t=i(l,e.locales);t&&o.isLocaleSupportedOnDomain(t,n)&&(u=t)}if(!u&&e.localeDetection&&t){const l=c(t,n.locales||e.locales,n.defaultLocale);l&&(u=l)}return u||(u=n.defaultLocale),{locale:u,domain:n}}exports.default=function(e,t,l,o){return e.domains?u(e,t,l,o):{locale:r(e,t,l,o)}},exports.getAcceptLanguageLocale=c;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "next-intl",
|
|
3
|
-
"version": "3.17.
|
|
3
|
+
"version": "3.17.4",
|
|
4
4
|
"sideEffects": false,
|
|
5
5
|
"author": "Jan Amann <jan@amann.work>",
|
|
6
6
|
"funding": [
|
|
@@ -85,9 +85,9 @@
|
|
|
85
85
|
"next.js"
|
|
86
86
|
],
|
|
87
87
|
"dependencies": {
|
|
88
|
-
"@formatjs/intl-localematcher": "^0.
|
|
88
|
+
"@formatjs/intl-localematcher": "^0.5.4",
|
|
89
89
|
"negotiator": "^0.6.3",
|
|
90
|
-
"use-intl": "^3.17.
|
|
90
|
+
"use-intl": "^3.17.4"
|
|
91
91
|
},
|
|
92
92
|
"peerDependencies": {
|
|
93
93
|
"next": "^10.0.0 || ^11.0.0 || ^12.0.0 || ^13.0.0 || ^14.0.0",
|
|
@@ -120,12 +120,12 @@
|
|
|
120
120
|
},
|
|
121
121
|
{
|
|
122
122
|
"path": "dist/production/middleware.js",
|
|
123
|
-
"limit": "
|
|
123
|
+
"limit": "11.515 KB"
|
|
124
124
|
},
|
|
125
125
|
{
|
|
126
126
|
"path": "dist/production/routing.js",
|
|
127
127
|
"limit": "0 KB"
|
|
128
128
|
}
|
|
129
129
|
],
|
|
130
|
-
"gitHead": "
|
|
130
|
+
"gitHead": "720c254b5f1b189adfd5406e501793ad4d4cc8a6"
|
|
131
131
|
}
|