gt-react 2.0.161 → 2.0.163
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,eAAe,EAAE,iBAAiB,EAAE,aAAa,EACpD,GAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAClC,SAEzB,GAAG,
|
|
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,eAAe,EAAE,iBAAiB,EAAE,aAAa,EACpD,GAAE;IAAE,eAAe,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,EAAE,OAAO,CAAA;CAClC,SAEzB,GAAG,kBAkGzB"}
|
|
@@ -69,6 +69,7 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
69
69
|
const headers = yield (0, imports_1.getNextHeaders)();
|
|
70
70
|
if (!headers)
|
|
71
71
|
return;
|
|
72
|
+
const headerList = headers();
|
|
72
73
|
const res = NextResponse.next();
|
|
73
74
|
if (localeRouting) {
|
|
74
75
|
// Check if there is any supported locale in the pathname
|
|
@@ -82,14 +83,33 @@ function createNextMiddleware({ defaultLanguage, approvedLanguages, localeRoutin
|
|
|
82
83
|
else {
|
|
83
84
|
pathnameHasLocale = (0, generaltranslation_1.getLanguageName)(locale) ? true : false;
|
|
84
85
|
}
|
|
85
|
-
res.cookies.set('generaltranslation-userlanguage', locale);
|
|
86
86
|
}
|
|
87
87
|
if (pathnameHasLocale) {
|
|
88
|
+
res.cookies.set('generaltranslation-userlanguage', locale);
|
|
88
89
|
yield applyNewCookies(req, res);
|
|
89
90
|
return res;
|
|
90
91
|
}
|
|
92
|
+
// If there's no locale, try to get one from the referer
|
|
93
|
+
const referer = headerList.get('referer');
|
|
94
|
+
if (referer && typeof referer === 'string') {
|
|
95
|
+
const refererLocale = extractLocale((_a = (new URL(referer))) === null || _a === void 0 ? void 0 : _a.pathname);
|
|
96
|
+
if (refererLocale) {
|
|
97
|
+
let refererLocaleIsValid = false;
|
|
98
|
+
if (approvedLanguages) {
|
|
99
|
+
refererLocaleIsValid = approvedLanguages === null || approvedLanguages === void 0 ? void 0 : approvedLanguages.some((approvedLanguage) => (0, generaltranslation_1.isSameLanguage)(approvedLanguage, refererLocale));
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
refererLocaleIsValid = (0, generaltranslation_1.getLanguageName)(refererLocale) ? true : false;
|
|
103
|
+
}
|
|
104
|
+
if (refererLocaleIsValid) {
|
|
105
|
+
req.nextUrl.pathname = `/${refererLocale}${pathname}`;
|
|
106
|
+
yield applyNewCookies(req, res);
|
|
107
|
+
return NextResponse.redirect(req.nextUrl);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
91
111
|
}
|
|
92
|
-
const acceptedLanguages = (_b =
|
|
112
|
+
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(); });
|
|
93
113
|
let userLanguage = defaultLanguage;
|
|
94
114
|
if (acceptedLanguages && acceptedLanguages.length > 0) {
|
|
95
115
|
if (approvedLanguages) {
|
|
@@ -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.163",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -75,6 +75,9 @@
|
|
|
75
75
|
],
|
|
76
76
|
"gt-react/client": [
|
|
77
77
|
"/dist/client"
|
|
78
|
+
],
|
|
79
|
+
"gt-react/middleware": [
|
|
80
|
+
"/dist/client"
|
|
78
81
|
]
|
|
79
82
|
}
|
|
80
83
|
},
|