gt-react 2.0.164 → 2.0.166
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.
|
@@ -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)();
|
|
@@ -88,7 +88,7 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
88
88
|
}
|
|
89
89
|
}
|
|
90
90
|
else {
|
|
91
|
-
if ((0, generaltranslation_1.
|
|
91
|
+
if ((0, generaltranslation_1.isValidLanguageCode)(locale)) {
|
|
92
92
|
userLanguage = locale;
|
|
93
93
|
pathnameHasLocale = true;
|
|
94
94
|
}
|
|
@@ -115,13 +115,13 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
117
|
else {
|
|
118
|
-
if ((0, generaltranslation_1.
|
|
118
|
+
if ((0, generaltranslation_1.isValidLanguageCode)(refererLocale)) {
|
|
119
119
|
userLanguage = refererLocale;
|
|
120
120
|
refererLocaleIsValid = true;
|
|
121
121
|
}
|
|
122
122
|
}
|
|
123
123
|
if (refererLocaleIsValid) {
|
|
124
|
-
req.nextUrl.pathname = `/${userLanguage}
|
|
124
|
+
req.nextUrl.pathname = `/${userLanguage}/${pathname}`;
|
|
125
125
|
yield applyNewCookies(req, res);
|
|
126
126
|
return NextResponse.redirect(req.nextUrl);
|
|
127
127
|
}
|
|
@@ -132,9 +132,11 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
132
132
|
if (acceptedLanguages && acceptedLanguages.length > 0) {
|
|
133
133
|
if (approvedLanguages) {
|
|
134
134
|
for (const language of acceptedLanguages) {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
135
|
+
for (const approvedLanguage of approvedLanguages) {
|
|
136
|
+
if ((0, generaltranslation_1.isSameLanguage)(language, approvedLanguage)) {
|
|
137
|
+
userLanguage = approvedLanguage;
|
|
138
|
+
break;
|
|
139
|
+
}
|
|
138
140
|
}
|
|
139
141
|
}
|
|
140
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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-react",
|
|
3
|
-
"version": "2.0.
|
|
3
|
+
"version": "2.0.166",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -89,6 +89,6 @@
|
|
|
89
89
|
"i18n"
|
|
90
90
|
],
|
|
91
91
|
"dependencies": {
|
|
92
|
-
"generaltranslation": "^2.0.
|
|
92
|
+
"generaltranslation": "^2.0.13"
|
|
93
93
|
}
|
|
94
94
|
}
|