gt-next 1.3.6 → 1.3.7
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":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA2C3C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EACzC,aAA+C,EAAE,OAAO,EAAE,aAAoB,EACjF,GAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACE,SAexC,GAAG,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA2C3C;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EACzC,aAA+C,EAAE,OAAO,EAAE,aAAoB,EACjF,GAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACE,SAexC,GAAG,2BA0HnC"}
|
|
@@ -69,7 +69,7 @@ function createNextMiddleware(_a) {
|
|
|
69
69
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
70
70
|
*/
|
|
71
71
|
function nextMiddleware(req) {
|
|
72
|
-
var _a, _b, _c;
|
|
72
|
+
var _a, _b, _c, _d;
|
|
73
73
|
var headerList = (0, headers_1.headers)();
|
|
74
74
|
var res = server_1.NextResponse.next();
|
|
75
75
|
var userLocale = defaultLocale;
|
|
@@ -92,37 +92,34 @@ function createNextMiddleware(_a) {
|
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
if (pathnameHasLocale) {
|
|
95
|
-
res.cookies.set(internal_1.primitives.localeCookieName, userLocale);
|
|
96
|
-
applyNewCookies(req, res);
|
|
97
95
|
return res;
|
|
98
96
|
}
|
|
99
|
-
|
|
100
|
-
const cookieLocale = req.cookies.get(primitives.localeCookieName)?.value;
|
|
97
|
+
var cookieLocale = (_a = req.cookies.get(internal_1.primitives.localeCookieName)) === null || _a === void 0 ? void 0 : _a.value;
|
|
101
98
|
if (cookieLocale && typeof cookieLocale === 'string') {
|
|
102
|
-
|
|
99
|
+
var cookieLocaleIsValid = false;
|
|
103
100
|
if (locales) {
|
|
104
|
-
|
|
101
|
+
var approvedLocale = (0, generaltranslation_1.determineLanguage)(cookieLocale, locales);
|
|
105
102
|
if (approvedLocale) {
|
|
106
103
|
userLocale = approvedLocale;
|
|
107
104
|
cookieLocaleIsValid = true;
|
|
108
105
|
}
|
|
109
|
-
}
|
|
110
|
-
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
if ((0, generaltranslation_1.isValidLanguageCode)(cookieLocale)) {
|
|
111
109
|
userLocale = cookieLocale;
|
|
112
110
|
cookieLocaleIsValid = true;
|
|
113
111
|
}
|
|
114
112
|
}
|
|
115
113
|
if (cookieLocaleIsValid) {
|
|
116
|
-
req.nextUrl.pathname =
|
|
114
|
+
req.nextUrl.pathname = "/".concat(userLocale, "/").concat(pathname);
|
|
117
115
|
applyNewCookies(req, res);
|
|
118
|
-
return NextResponse.redirect(req.nextUrl)
|
|
116
|
+
return server_1.NextResponse.redirect(req.nextUrl);
|
|
119
117
|
}
|
|
120
118
|
}
|
|
121
|
-
*/
|
|
122
119
|
// If there's no locale, try to get one from the referer
|
|
123
120
|
var referer = headerList.get('referer');
|
|
124
121
|
if (referer && typeof referer === 'string') {
|
|
125
|
-
var refererLocale = extractLocale((
|
|
122
|
+
var refererLocale = extractLocale((_b = (new URL(referer))) === null || _b === void 0 ? void 0 : _b.pathname);
|
|
126
123
|
if (refererLocale) {
|
|
127
124
|
var refererLocaleIsValid = false;
|
|
128
125
|
if (locales) {
|
|
@@ -146,7 +143,7 @@ function createNextMiddleware(_a) {
|
|
|
146
143
|
}
|
|
147
144
|
}
|
|
148
145
|
}
|
|
149
|
-
var acceptedLocales = (
|
|
146
|
+
var acceptedLocales = (_d = (_c = headerList.get('accept-language')) === null || _c === void 0 ? void 0 : _c.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); })) === null || _d === void 0 ? void 0 : _d.filter(function (code) { return (0, generaltranslation_1.isValidLanguageCode)(code); });
|
|
150
147
|
if (acceptedLocales && acceptedLocales.length > 0) {
|
|
151
148
|
if (locales) {
|
|
152
149
|
var approvedLocale = (0, generaltranslation_1.determineLanguage)(acceptedLocales, locales);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":";;AA2DA,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.7",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
7
|
-
"generaltranslation": "^3.
|
|
7
|
+
"generaltranslation": "^3.3.0",
|
|
8
8
|
"next": ">=13.0.0",
|
|
9
9
|
"react": ">=16.8.0",
|
|
10
10
|
"react-dom": ">=16.8.0"
|
|
@@ -120,6 +120,6 @@
|
|
|
120
120
|
"i18n"
|
|
121
121
|
],
|
|
122
122
|
"dependencies": {
|
|
123
|
-
"gt-react": "^5.3.
|
|
123
|
+
"gt-react": "^5.3.5"
|
|
124
124
|
}
|
|
125
125
|
}
|