gt-next 5.2.23-alpha.2 → 5.2.24-alpha.1
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/middleware-dir/createNextMiddleware.d.ts +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +139 -106
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +14 -6
- package/dist/middleware-dir/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -16,5 +16,5 @@ export default function createNextMiddleware({ localeRouting, prefixDefaultLocal
|
|
|
16
16
|
localeRouting?: boolean;
|
|
17
17
|
prefixDefaultLocale?: boolean;
|
|
18
18
|
pathConfig?: PathConfig;
|
|
19
|
-
}): (req: NextRequest) => import("next/server").NextResponse<unknown
|
|
19
|
+
}): (req: NextRequest) => Promise<import("next/server").NextResponse<unknown>>;
|
|
20
20
|
//# sourceMappingURL=createNextMiddleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO1C,OAAO,EACL,UAAU,EAOX,MAAM,SAAS,CAAC;AAGjB;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAoB,EACpB,mBAA2B,EAC3B,UAAe,GAChB,GAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CACpB,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAO1C,OAAO,EACL,UAAU,EAOX,MAAM,SAAS,CAAC;AAGjB;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAoB,EACpB,mBAA2B,EAC3B,UAAe,GAChB,GAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CACpB,SAyF2B,WAAW,0DAkM3C"}
|
|
@@ -10,6 +10,42 @@ var __assign = (this && this.__assign) || function () {
|
|
|
10
10
|
};
|
|
11
11
|
return __assign.apply(this, arguments);
|
|
12
12
|
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
24
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
13
49
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
14
50
|
exports.default = createNextMiddleware;
|
|
15
51
|
var generaltranslation_1 = require("generaltranslation");
|
|
@@ -95,118 +131,115 @@ function createNextMiddleware(_a) {
|
|
|
95
131
|
* @param {NextRequest} req - The incoming request object, containing URL and headers.
|
|
96
132
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
97
133
|
*/
|
|
98
|
-
function
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
134
|
+
function middleware(req) {
|
|
135
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
136
|
+
var _a, userLocale, pathnameLocale, unstandardizedPathnameLocale, clearResetCookie, headerList, responseConfig, getRewriteResponse, getRedirectResponse, getNextResponse, pathname, standardizedPathname, sharedPath, sharedPathWithParameters, localizedPath, localizedPathWithParameters;
|
|
137
|
+
return __generator(this, function (_b) {
|
|
138
|
+
_a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled, prefixDefaultLocale, defaultLocalePaths, referrerLocaleCookieName, localeCookieName, resetLocaleCookieName), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale, clearResetCookie = _a.clearResetCookie;
|
|
139
|
+
headerList = new Headers(req.headers);
|
|
140
|
+
responseConfig = {
|
|
141
|
+
originalUrl: req.nextUrl,
|
|
142
|
+
headerList: headerList,
|
|
143
|
+
userLocale: userLocale,
|
|
144
|
+
clearResetCookie: clearResetCookie,
|
|
145
|
+
localeRouting: localeRouting,
|
|
146
|
+
localeRoutingEnabledCookieName: localeRoutingEnabledCookieName,
|
|
147
|
+
localeCookieName: localeCookieName,
|
|
148
|
+
resetLocaleCookieName: resetLocaleCookieName,
|
|
149
|
+
localeHeaderName: localeHeaderName,
|
|
150
|
+
};
|
|
151
|
+
getRewriteResponse = function (responsePath) {
|
|
152
|
+
return (0, utils_1.getResponse)(__assign({ responsePath: responsePath, type: 'rewrite' }, responseConfig));
|
|
153
|
+
};
|
|
154
|
+
getRedirectResponse = function (responsePath) {
|
|
155
|
+
return (0, utils_1.getResponse)(__assign({ responsePath: responsePath, type: 'redirect' }, responseConfig));
|
|
156
|
+
};
|
|
157
|
+
getNextResponse = function () {
|
|
158
|
+
return (0, utils_1.getResponse)(__assign({ type: 'next' }, responseConfig));
|
|
159
|
+
};
|
|
160
|
+
if (localeRouting) {
|
|
161
|
+
pathname = req.nextUrl.pathname;
|
|
162
|
+
standardizedPathname = pathnameLocale && pathnameLocale !== unstandardizedPathnameLocale
|
|
163
|
+
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale))
|
|
164
|
+
: pathname;
|
|
165
|
+
sharedPath = (0, utils_1.getSharedPath)(standardizedPathname, pathToSharedPath, pathnameLocale);
|
|
166
|
+
sharedPathWithParameters = sharedPath !== undefined
|
|
167
|
+
? (0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
168
|
+
? standardizedPathname
|
|
169
|
+
: "/".concat(userLocale).concat(standardizedPathname), "/".concat(userLocale).concat(sharedPath))
|
|
170
|
+
: undefined;
|
|
171
|
+
localizedPath = sharedPath !== undefined
|
|
172
|
+
? (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig)
|
|
173
|
+
: undefined;
|
|
174
|
+
localizedPathWithParameters = localizedPath !== undefined
|
|
175
|
+
? (0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
176
|
+
? standardizedPathname
|
|
177
|
+
: "/".concat(userLocale).concat(standardizedPathname), localizedPath)
|
|
178
|
+
: undefined;
|
|
179
|
+
// ---------- ROUTING LOGIC ---------- //
|
|
180
|
+
// ----- CASE: no localized path exists ----- //
|
|
181
|
+
if (localizedPathWithParameters === undefined) {
|
|
182
|
+
// --- CASE: remove defaultLocale prefix --- //
|
|
183
|
+
if (!prefixDefaultLocale && (0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
184
|
+
if (pathnameLocale) {
|
|
185
|
+
// REDIRECT CASE: used setLocale (/fr/customers -> /customers) (/en/customers -> /customers)
|
|
186
|
+
if (clearResetCookie) {
|
|
187
|
+
return [2 /*return*/, getRedirectResponse(pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "") || '/')];
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
else {
|
|
191
|
+
// REWRITE CASE: no pathnameLocale (/customers -> /en/customers)
|
|
192
|
+
return [2 /*return*/, getRewriteResponse("/".concat(userLocale).concat(pathname))];
|
|
193
|
+
}
|
|
194
|
+
}
|
|
195
|
+
// --- CASE: defaultLocale prefix --- //
|
|
196
|
+
// REDIRECT CASE: no pathnameLocale (ie, /customers -> /fr/customers)
|
|
197
|
+
else if (!pathnameLocale) {
|
|
198
|
+
return [2 /*return*/, getRedirectResponse("/".concat(userLocale).concat(pathname))];
|
|
157
199
|
}
|
|
200
|
+
// REDIRECT CASE: wrong pathnameLocale (ie, /fr/customers -> /en/customers) (this usually happens after a locale switch)
|
|
201
|
+
if (pathnameLocale && userLocale !== unstandardizedPathnameLocale) {
|
|
202
|
+
return [2 /*return*/, getRedirectResponse(pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale)))];
|
|
203
|
+
}
|
|
204
|
+
// BASE CASE: has pathnameLocale and it's correct
|
|
205
|
+
return [2 /*return*/, getNextResponse()];
|
|
158
206
|
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
207
|
+
// ----- CASE: localized path exists ----- //
|
|
208
|
+
if (!prefixDefaultLocale && (0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
209
|
+
// --- CASE: remove defaultLocale prefix --- //
|
|
210
|
+
if (pathnameLocale) {
|
|
211
|
+
// REDIRECT CASE: remove locale prefix when setLocale is used (/en/blog -> /blog) (/fr/fr-about -> /en-about)
|
|
212
|
+
if (clearResetCookie) {
|
|
213
|
+
return [2 /*return*/, getRedirectResponse(localizedPathWithParameters.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "") || '/')];
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
else {
|
|
217
|
+
// REDIRECT CASE: unprefixed pathname is wrong (/about -> /en-about)
|
|
218
|
+
if (!pathnameLocale &&
|
|
219
|
+
localizedPathWithParameters !== "/".concat(userLocale).concat(pathname)) {
|
|
220
|
+
return [2 /*return*/, getRedirectResponse(localizedPathWithParameters.replace(new RegExp("^/".concat(userLocale)), '') || '/')];
|
|
221
|
+
}
|
|
222
|
+
// REWRITE CASE: displaying correct path (/blog -> /en/blog)
|
|
223
|
+
return [2 /*return*/, getRewriteResponse(sharedPathWithParameters)];
|
|
224
|
+
}
|
|
162
225
|
}
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
return getRedirectResponse("/".concat(userLocale).concat(pathname));
|
|
168
|
-
}
|
|
169
|
-
// REDIRECT CASE: wrong pathnameLocale (ie, /fr/customers -> /en/customers) (this usually happens after a locale switch)
|
|
170
|
-
if (pathnameLocale && userLocale !== unstandardizedPathnameLocale) {
|
|
171
|
-
return getRedirectResponse(pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale)));
|
|
172
|
-
}
|
|
173
|
-
// BASE CASE: has pathnameLocale and it's correct
|
|
174
|
-
return getNextResponse();
|
|
175
|
-
}
|
|
176
|
-
// ----- CASE: localized path exists ----- //
|
|
177
|
-
if (!prefixDefaultLocale && (0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
178
|
-
// --- CASE: remove defaultLocale prefix --- //
|
|
179
|
-
if (pathnameLocale) {
|
|
180
|
-
// REDIRECT CASE: remove locale prefix when setLocale is used (/en/blog -> /blog) (/fr/fr-about -> /en-about)
|
|
181
|
-
if (clearResetCookie) {
|
|
182
|
-
return getRedirectResponse(localizedPathWithParameters.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "") || '/');
|
|
226
|
+
// --- CASE: add defaultLocale prefix --- //
|
|
227
|
+
// REDIRECT CASE: incorrect pathnameLocale
|
|
228
|
+
if (pathname !== localizedPathWithParameters) {
|
|
229
|
+
return [2 /*return*/, getRedirectResponse(localizedPathWithParameters)];
|
|
183
230
|
}
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
return getRedirectResponse(localizedPathWithParameters.replace(new RegExp("^/".concat(userLocale)), '') || '/');
|
|
231
|
+
// REWRITE CASE: displaying correct localized path, which is the same as the shared path (/fil/blog => /fil/blog) (/fr/fr-dashboard/1/fr-custom => /fr/dashboard/1/custom)
|
|
232
|
+
if (standardizedPathname !== sharedPathWithParameters // no rewrite needed if it's already the shared path
|
|
233
|
+
) {
|
|
234
|
+
// convert to shared path with dynamic parameters
|
|
235
|
+
return [2 /*return*/, getRewriteResponse(sharedPathWithParameters)];
|
|
190
236
|
}
|
|
191
|
-
// REWRITE CASE: displaying correct path (/blog -> /en/blog)
|
|
192
|
-
return getRewriteResponse(sharedPathWithParameters);
|
|
193
237
|
}
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
return getRedirectResponse(localizedPathWithParameters);
|
|
199
|
-
}
|
|
200
|
-
// REWRITE CASE: displaying correct localized path, which is the same as the shared path (/fil/blog => /fil/blog) (/fr/fr-dashboard/1/fr-custom => /fr/dashboard/1/custom)
|
|
201
|
-
if (standardizedPathname !== sharedPathWithParameters // no rewrite needed if it's already the shared path
|
|
202
|
-
) {
|
|
203
|
-
// convert to shared path with dynamic parameters
|
|
204
|
-
return getRewriteResponse(sharedPathWithParameters);
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
|
-
// BASE CASE
|
|
208
|
-
return getNextResponse();
|
|
238
|
+
// BASE CASE
|
|
239
|
+
return [2 /*return*/, getNextResponse()];
|
|
240
|
+
});
|
|
241
|
+
});
|
|
209
242
|
}
|
|
210
|
-
return
|
|
243
|
+
return middleware;
|
|
211
244
|
}
|
|
212
245
|
//# sourceMappingURL=createNextMiddleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMxD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,8BAA8B,EAAE,MAAM,CAAC;IACvC,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,WAAW,EACX,YAAmC,EACnC,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,8BAA8B,EAC9B,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,GACjB,EAAE,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,CAkCxC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG7D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GACnB,MAAM,CASR;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAapB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,MAAM,GACpB;IACD,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5C,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CA+BA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,oBAAoB,EAAE,MAAM,EAC5B,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC3C,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAqCpB;AA8BD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,WAAW,EAChB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,OAAO,EACtB,iBAAiB,EAAE,OAAO,EAC1B,mBAAmB,EAAE,OAAO,EAC5B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,wBAAwB,EAAE,MAAM,EAChC,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,GAC5B;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,4BAA4B,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMxD,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,MAAM,MAAM,UAAU,GAAG;IACvB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAAC;IACtC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,UAAU,EAAE,OAAO,CAAC;IACpB,aAAa,EAAE,OAAO,CAAC;IACvB,8BAA8B,EAAE,MAAM,CAAC;IACvC,gBAAgB,EAAE,MAAM,CAAC;IACzB,qBAAqB,EAAE,MAAM,CAAC;IAC9B,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,WAAW,EACX,YAAmC,EACnC,UAAU,EACV,gBAAgB,EAChB,UAAU,EACV,aAAa,EACb,8BAA8B,EAC9B,gBAAgB,EAChB,qBAAqB,EACrB,gBAAgB,GACjB,EAAE,cAAc,GAAG,YAAY,CAAC,OAAO,CAAC,CAkCxC;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG7D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,MAAM,GACX,MAAM,EAAE,CAcV;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,MAAM,EACZ,YAAY,EAAE,MAAM,GACnB,MAAM,CASR;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,GACrB,MAAM,GAAG,SAAS,CAapB;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,OAAO,EAC5B,aAAa,EAAE,MAAM,GACpB;IACD,gBAAgB,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IAC5C,kBAAkB,EAAE,MAAM,EAAE,CAAC;CAC9B,CA+BA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,oBAAoB,EAAE,MAAM,EAC5B,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,EAC3C,cAAc,EAAE,MAAM,GAAG,SAAS,GACjC,MAAM,GAAG,SAAS,CAqCpB;AA8BD;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,WAAW,EAChB,aAAa,EAAE,MAAM,EACrB,eAAe,EAAE,MAAM,EAAE,EACzB,aAAa,EAAE,OAAO,EACtB,iBAAiB,EAAE,OAAO,EAC1B,mBAAmB,EAAE,OAAO,EAC5B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,wBAAwB,EAAE,MAAM,EAChC,gBAAgB,EAAE,MAAM,EACxB,qBAAqB,EAAE,MAAM,GAC5B;IACD,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,4BAA4B,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CA8FA"}
|
|
@@ -206,8 +206,12 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
206
206
|
if (extractedLocale &&
|
|
207
207
|
(0, generaltranslation_1.isValidLocale)(extractedLocale) &&
|
|
208
208
|
(0, generaltranslation_1.determineLocale)([extractedLocale], approvedLocales)) {
|
|
209
|
-
|
|
210
|
-
|
|
209
|
+
// NOTICE HERE: we are checking extractedLocale agains the list of approved locales
|
|
210
|
+
var determinedLocale = (0, generaltranslation_1.determineLocale)([extractedLocale], approvedLocales);
|
|
211
|
+
if (determinedLocale) {
|
|
212
|
+
pathnameLocale = determinedLocale;
|
|
213
|
+
candidates.push(pathnameLocale);
|
|
214
|
+
}
|
|
211
215
|
}
|
|
212
216
|
}
|
|
213
217
|
// Check pathname for a customized unprefixed default locale path (e.g. /en-about , /en-dashboard/1/en-custom)
|
|
@@ -230,11 +234,15 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
230
234
|
}
|
|
231
235
|
}
|
|
232
236
|
// Check referrer locale
|
|
233
|
-
var
|
|
234
|
-
if ((
|
|
235
|
-
(0, generaltranslation_1.isValidLocale)(
|
|
237
|
+
var referrerLocaleCookie = req.cookies.get(referrerLocaleCookieName);
|
|
238
|
+
if ((referrerLocaleCookie === null || referrerLocaleCookie === void 0 ? void 0 : referrerLocaleCookie.value) &&
|
|
239
|
+
(0, generaltranslation_1.isValidLocale)(referrerLocaleCookie.value) &&
|
|
236
240
|
!clearResetCookie) {
|
|
237
|
-
|
|
241
|
+
var referrerLocale = referrerLocaleCookie.value;
|
|
242
|
+
// NOTICE HERE: we are checking referrerLocale agains the list of approved locales
|
|
243
|
+
if ((0, generaltranslation_1.determineLocale)([referrerLocale], approvedLocales)) {
|
|
244
|
+
candidates.push(referrerLocale);
|
|
245
|
+
}
|
|
238
246
|
}
|
|
239
247
|
// Get locales from accept-language header
|
|
240
248
|
if (process.env._GENERALTRANSLATION_IGNORE_BROWSER_LOCALES === 'false') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":";;AA0BA,kCA8CC;AAKD,sCAGC;AAKD,oDAiBC;AAKD,wDAYC;AAKD,4CAiBC;AAKD,8DAsCC;AAKD,sCAyCC;AAiCD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|