gt-react 2.0.163 → 2.0.165
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.
- package/dist/config/I18NConfig.d.ts.map +1 -1
- package/dist/config/I18NConfig.js +4 -2
- package/dist/config/I18NConfig.js.map +1 -1
- package/dist/middleware/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware/createNextMiddleware.js +31 -11
- package/dist/middleware/createNextMiddleware.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18NConfig.d.ts","sourceRoot":"","sources":["../../src/config/I18NConfig.ts"],"names":[],"mappings":"AAGA,OAAO,aAAa,CAAA;AAEpB,OAAO,EAAsB,MAAM,oBAAoB,CAAC;AAOxD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAc1C,KAAK,uBAAuB,GAAG;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACxC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACtB,CAAA;AAED,cAAM,iBAAiB;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;IACxC,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACvC,EAAE,EAAE,EAAE,CAAC;IACP,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC9B,YAAY,EAAE,YAAY,CAAC;IAC3B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;gBAEZ,EACR,MAAwC,EACxC,SAA8C,EAC9C,eAAsB,EACtB,iBAAiB,EACjB,qBAAyB,EACzB,aAAoB,EACpB,QAAkC,EAClC,OAAgC,EAChC,YAAwB,EAAE,mBAAmB;IAC7C,YAAmB,EACnB,WAAgB,EAChB,cAAmB,EACnB,GAAG,QAAQ,EACd,GAAE,uBAA4B;IA4B/B;;;OAGG;IACH,kBAAkB,IAAI,MAAM;IAI5B;;;OAGG;IACH,eAAe,CAAC,YAAY,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM;
|
|
1
|
+
{"version":3,"file":"I18NConfig.d.ts","sourceRoot":"","sources":["../../src/config/I18NConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -115,8 +115,10 @@ class I18NConfiguration {
|
|
|
115
115
|
if (!this.approvedLanguages)
|
|
116
116
|
return languageList[0];
|
|
117
117
|
for (const language of languageList) {
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
for (const approvedLanguage of this.approvedLanguages) {
|
|
119
|
+
if ((0, generaltranslation_1.isSameLanguage)(language, approvedLanguage)) {
|
|
120
|
+
return approvedLanguage;
|
|
121
|
+
}
|
|
120
122
|
}
|
|
121
123
|
}
|
|
122
124
|
return this.defaultLanguage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"I18NConfig.js","sourceRoot":"","sources":["../../src/config/I18NConfig.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"I18NConfig.js","sourceRoot":"","sources":["../../src/config/I18NConfig.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"AAmDA;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EACzC,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"AAmDA;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EACzC,eAAsB,EAAE,iBAAiB,EAAE,aAAoB,EAClE,GAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAClC,SAEzB,GAAG,kBAkHzB"}
|
|
@@ -60,7 +60,7 @@ function applyNewCookies(req, res) {
|
|
|
60
60
|
* Middleware to set a cookie based on the locale.
|
|
61
61
|
* @param {NextRequest} req - The incoming request object.
|
|
62
62
|
*/
|
|
63
|
-
function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRouting } = { defaultLanguage: 'en', localeRouting: true }) {
|
|
63
|
+
function createNextMiddleware({ defaultLanguage = 'en', approvedLanguages, localeRouting = true } = { defaultLanguage: 'en', localeRouting: true }) {
|
|
64
64
|
return (req) => __awaiter(this, void 0, void 0, function* () {
|
|
65
65
|
var _a, _b;
|
|
66
66
|
const NextResponse = yield (0, imports_1.getNextResponse)();
|
|
@@ -71,6 +71,7 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
71
71
|
return;
|
|
72
72
|
const headerList = headers();
|
|
73
73
|
const res = NextResponse.next();
|
|
74
|
+
let userLanguage = defaultLanguage;
|
|
74
75
|
if (localeRouting) {
|
|
75
76
|
// Check if there is any supported locale in the pathname
|
|
76
77
|
const { pathname } = req.nextUrl;
|
|
@@ -78,14 +79,23 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
78
79
|
let pathnameHasLocale = false;
|
|
79
80
|
if (locale) {
|
|
80
81
|
if (approvedLanguages) {
|
|
81
|
-
|
|
82
|
+
for (const approvedLanguage of approvedLanguages) {
|
|
83
|
+
if ((0, generaltranslation_1.isSameLanguage)(approvedLanguage, locale)) {
|
|
84
|
+
userLanguage = approvedLanguage;
|
|
85
|
+
pathnameHasLocale = true;
|
|
86
|
+
break;
|
|
87
|
+
}
|
|
88
|
+
}
|
|
82
89
|
}
|
|
83
90
|
else {
|
|
84
|
-
|
|
91
|
+
if ((0, generaltranslation_1.getLanguageName)(locale)) {
|
|
92
|
+
userLanguage = locale;
|
|
93
|
+
pathnameHasLocale = true;
|
|
94
|
+
}
|
|
85
95
|
}
|
|
86
96
|
}
|
|
87
97
|
if (pathnameHasLocale) {
|
|
88
|
-
res.cookies.set('generaltranslation-userlanguage',
|
|
98
|
+
res.cookies.set('generaltranslation-userlanguage', userLanguage);
|
|
89
99
|
yield applyNewCookies(req, res);
|
|
90
100
|
return res;
|
|
91
101
|
}
|
|
@@ -96,13 +106,22 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
96
106
|
if (refererLocale) {
|
|
97
107
|
let refererLocaleIsValid = false;
|
|
98
108
|
if (approvedLanguages) {
|
|
99
|
-
|
|
109
|
+
for (const approvedLanguage of approvedLanguages) {
|
|
110
|
+
if ((0, generaltranslation_1.isSameLanguage)(approvedLanguage, refererLocale)) {
|
|
111
|
+
userLanguage = approvedLanguage;
|
|
112
|
+
refererLocaleIsValid = true;
|
|
113
|
+
break;
|
|
114
|
+
}
|
|
115
|
+
}
|
|
100
116
|
}
|
|
101
117
|
else {
|
|
102
|
-
|
|
118
|
+
if ((0, generaltranslation_1.getLanguageName)(refererLocale)) {
|
|
119
|
+
userLanguage = refererLocale;
|
|
120
|
+
refererLocaleIsValid = true;
|
|
121
|
+
}
|
|
103
122
|
}
|
|
104
123
|
if (refererLocaleIsValid) {
|
|
105
|
-
req.nextUrl.pathname = `/${
|
|
124
|
+
req.nextUrl.pathname = `/${userLanguage}${pathname}`;
|
|
106
125
|
yield applyNewCookies(req, res);
|
|
107
126
|
return NextResponse.redirect(req.nextUrl);
|
|
108
127
|
}
|
|
@@ -110,13 +129,14 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
110
129
|
}
|
|
111
130
|
}
|
|
112
131
|
const acceptedLanguages = (_b = headerList.get('accept-language')) === null || _b === void 0 ? void 0 : _b.split(',').map(item => { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); });
|
|
113
|
-
let userLanguage = defaultLanguage;
|
|
114
132
|
if (acceptedLanguages && acceptedLanguages.length > 0) {
|
|
115
133
|
if (approvedLanguages) {
|
|
116
134
|
for (const language of acceptedLanguages) {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
135
|
+
for (const approvedLanguage of approvedLanguages) {
|
|
136
|
+
if ((0, generaltranslation_1.isSameLanguage)(language, approvedLanguage)) {
|
|
137
|
+
userLanguage = approvedLanguage;
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
120
140
|
}
|
|
121
141
|
}
|
|
122
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;AAuDA,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|