gt-next 5.2.19 → 5.2.20
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-dir/I18NConfiguration.d.ts +14 -1
- package/dist/config-dir/I18NConfiguration.d.ts.map +1 -1
- package/dist/config-dir/I18NConfiguration.js +28 -2
- package/dist/config-dir/I18NConfiguration.js.map +1 -1
- package/dist/config-dir/props/defaultWithGTConfigProps.d.ts +7 -0
- package/dist/config-dir/props/defaultWithGTConfigProps.d.ts.map +1 -1
- package/dist/config-dir/props/defaultWithGTConfigProps.js +9 -0
- package/dist/config-dir/props/defaultWithGTConfigProps.js.map +1 -1
- package/dist/config-dir/props/withGTConfigProps.d.ts +8 -0
- package/dist/config-dir/props/withGTConfigProps.d.ts.map +1 -1
- package/dist/config.d.ts +1 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +4 -1
- package/dist/config.js.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts +2 -2
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +104 -133
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +19 -4
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +68 -28
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/next/getNextLocale.d.ts.map +1 -1
- package/dist/next/getNextLocale.js +13 -5
- package/dist/next/getNextLocale.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts +4 -1
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +27 -18
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/utils/cookies.d.ts +13 -0
- package/dist/utils/cookies.d.ts.map +1 -0
- package/dist/utils/cookies.js +16 -0
- package/dist/utils/cookies.js.map +1 -0
- package/dist/utils/headers.d.ts +5 -0
- package/dist/utils/headers.d.ts.map +1 -0
- package/dist/utils/headers.js +8 -0
- package/dist/utils/headers.js.map +1 -0
- package/package.json +2 -2
- package/dist/utils/constants.d.ts +0 -2
- package/dist/utils/constants.d.ts.map +0 -1
- package/dist/utils/constants.js +0 -5
- package/dist/utils/constants.js.map +0 -1
|
@@ -1,13 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
14
|
exports.default = createNextMiddleware;
|
|
4
15
|
var generaltranslation_1 = require("generaltranslation");
|
|
5
16
|
var internal_1 = require("generaltranslation/internal");
|
|
6
17
|
var createErrors_1 = require("../errors/createErrors");
|
|
7
|
-
var
|
|
8
|
-
var constants_1 = require("../utils/constants");
|
|
18
|
+
var cookies_1 = require("../utils/cookies");
|
|
9
19
|
var internal_2 = require("gt-react/internal");
|
|
10
20
|
var utils_1 = require("./utils");
|
|
21
|
+
var headers_1 = require("../utils/headers");
|
|
11
22
|
/**
|
|
12
23
|
* Middleware factory to create a Next.js middleware for i18n routing and locale detection.
|
|
13
24
|
*
|
|
@@ -37,6 +48,15 @@ function createNextMiddleware(_a) {
|
|
|
37
48
|
// i18n config
|
|
38
49
|
var defaultLocale = (envParams === null || envParams === void 0 ? void 0 : envParams.defaultLocale) || internal_1.libraryDefaultLocale;
|
|
39
50
|
var locales = (envParams === null || envParams === void 0 ? void 0 : envParams.locales) || [defaultLocale];
|
|
51
|
+
// cookies and header names
|
|
52
|
+
var headersAndCookies = (envParams === null || envParams === void 0 ? void 0 : envParams.headersAndCookies) || {};
|
|
53
|
+
var localeRoutingEnabledCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.localeRoutingEnabledCookieName) ||
|
|
54
|
+
cookies_1.defaultLocaleRoutingEnabledCookieName;
|
|
55
|
+
var referrerLocaleCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.referrerLocaleCookieName) ||
|
|
56
|
+
cookies_1.defaultReferrerLocaleCookieName;
|
|
57
|
+
var localeCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.localeCookieName) || internal_2.defaultLocaleCookieName;
|
|
58
|
+
var resetLocaleCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.resetLocaleCookieName) || cookies_1.defaultResetLocaleCookieName;
|
|
59
|
+
var localeHeaderName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.localeHeaderName) || headers_1.defaultLocaleHeaderName;
|
|
40
60
|
if (!(0, generaltranslation_1.isValidLocale)(defaultLocale))
|
|
41
61
|
throw new Error("gt-next middleware: defaultLocale \"".concat(defaultLocale, "\" is not a valid locale."));
|
|
42
62
|
var warningLocales = locales.filter(function (locale) { return !(0, generaltranslation_1.isValidLocale)(locale); });
|
|
@@ -76,165 +96,116 @@ function createNextMiddleware(_a) {
|
|
|
76
96
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
77
97
|
*/
|
|
78
98
|
function nextMiddleware(req) {
|
|
79
|
-
var headerList = new Headers(req.headers);
|
|
80
|
-
var res = server_1.NextResponse.next({
|
|
81
|
-
request: {
|
|
82
|
-
// New request headers
|
|
83
|
-
headers: headerList,
|
|
84
|
-
},
|
|
85
|
-
});
|
|
86
99
|
// ---------- LOCALE DETECTION ---------- //
|
|
87
|
-
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled, prefixDefaultLocale, defaultLocalePaths), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale, clearResetCookie = _a.clearResetCookie;
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
100
|
+
var _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;
|
|
101
|
+
var headerList = new Headers(req.headers);
|
|
102
|
+
var responseConfig = {
|
|
103
|
+
originalUrl: req.nextUrl,
|
|
104
|
+
headerList: headerList,
|
|
105
|
+
userLocale: userLocale,
|
|
106
|
+
clearResetCookie: clearResetCookie,
|
|
107
|
+
localeRouting: localeRouting,
|
|
108
|
+
localeRoutingEnabledCookieName: localeRoutingEnabledCookieName,
|
|
109
|
+
localeCookieName: localeCookieName,
|
|
110
|
+
resetLocaleCookieName: resetLocaleCookieName,
|
|
111
|
+
localeHeaderName: localeHeaderName,
|
|
112
|
+
};
|
|
113
|
+
var getRewriteResponse = function (responsePath) {
|
|
114
|
+
return (0, utils_1.getResponse)(__assign({ responsePath: responsePath, type: 'rewrite' }, responseConfig));
|
|
115
|
+
};
|
|
116
|
+
var getRedirectResponse = function (responsePath) {
|
|
117
|
+
return (0, utils_1.getResponse)(__assign({ responsePath: responsePath, type: 'redirect' }, responseConfig));
|
|
118
|
+
};
|
|
119
|
+
var getNextResponse = function () {
|
|
120
|
+
return (0, utils_1.getResponse)(__assign({ type: 'next' }, responseConfig));
|
|
121
|
+
};
|
|
93
122
|
if (localeRouting) {
|
|
94
123
|
// ---------- GET PATHS ---------- //
|
|
95
124
|
// get pathname
|
|
96
125
|
var pathname = req.nextUrl.pathname;
|
|
97
|
-
var originalUrl = req.nextUrl;
|
|
98
126
|
// standardize pathname (ie, /tg/welcome -> /fil/welcome), (/blog -> /blog)
|
|
99
127
|
var standardizedPathname = pathnameLocale && pathnameLocale !== unstandardizedPathnameLocale
|
|
100
128
|
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale))
|
|
101
129
|
: pathname;
|
|
102
130
|
// Get the shared path for the unprefixed pathname
|
|
103
|
-
var sharedPath = (0, utils_1.getSharedPath)(standardizedPathname, pathToSharedPath);
|
|
104
|
-
// Get shared path with parameters (/en/dashboard/1/custom)
|
|
105
|
-
var sharedPathWithParameters =
|
|
106
|
-
?
|
|
107
|
-
: "/".concat(userLocale).concat(standardizedPathname), "/".concat(userLocale).concat(sharedPath));
|
|
108
|
-
// Localized path (/en-US/blog, /fr/fr-about, /fr/dashboard/[id]/custom)
|
|
109
|
-
var localizedPath = sharedPath && (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig);
|
|
110
|
-
// Combine localized path with dynamic parameters (/en-US/blog, /fr/fr-about, /fr/dashboard/1/fr-custom)
|
|
111
|
-
var localizedPathWithParameters = localizedPath &&
|
|
112
|
-
(0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
131
|
+
var sharedPath = (0, utils_1.getSharedPath)(standardizedPathname, pathToSharedPath, pathnameLocale);
|
|
132
|
+
// Get shared path with parameters (/en/dashboard/1/custom), for rewriting localized paths
|
|
133
|
+
var sharedPathWithParameters = sharedPath !== undefined
|
|
134
|
+
? (0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
113
135
|
? standardizedPathname
|
|
114
|
-
: "/".concat(userLocale).concat(standardizedPathname),
|
|
136
|
+
: "/".concat(userLocale).concat(standardizedPathname), "/".concat(userLocale).concat(sharedPath))
|
|
137
|
+
: undefined;
|
|
138
|
+
// Localized path (/en/blog, /fr/fr-about, /fr/dashboard/[id]/custom)
|
|
139
|
+
var localizedPath = sharedPath !== undefined
|
|
140
|
+
? (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig)
|
|
141
|
+
: undefined;
|
|
142
|
+
// Combine localized path with dynamic parameters (/en/blog, /fr/fr-about, /fr/dashboard/1/fr-custom)
|
|
143
|
+
var localizedPathWithParameters = localizedPath !== undefined
|
|
144
|
+
? (0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
145
|
+
? standardizedPathname
|
|
146
|
+
: "/".concat(userLocale).concat(standardizedPathname), localizedPath)
|
|
147
|
+
: undefined;
|
|
115
148
|
// ---------- ROUTING LOGIC ---------- //
|
|
116
|
-
// CASE: no localized path exists
|
|
117
|
-
if (
|
|
118
|
-
// CASE:
|
|
119
|
-
if (
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
149
|
+
// ----- CASE: no localized path exists ----- //
|
|
150
|
+
if (localizedPathWithParameters === undefined) {
|
|
151
|
+
// --- CASE: remove defaultLocale prefix --- //
|
|
152
|
+
if (!prefixDefaultLocale && (0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
153
|
+
if (pathnameLocale) {
|
|
154
|
+
// REDIRECT CASE: used setLocale (/fr/customers -> /customers) (/en/customers -> /customers)
|
|
155
|
+
if (clearResetCookie) {
|
|
156
|
+
return getRedirectResponse(pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "") || '/');
|
|
157
|
+
}
|
|
123
158
|
}
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
redirectUrl_1.search = originalUrl.search;
|
|
128
|
-
var response_1 = server_1.NextResponse.redirect(redirectUrl_1);
|
|
129
|
-
response_1.headers.set(internal_1.localeHeaderName, userLocale);
|
|
130
|
-
response_1.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
131
|
-
if (clearResetCookie) {
|
|
132
|
-
response_1.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
159
|
+
else {
|
|
160
|
+
// REWRITE CASE: no pathnameLocale (/customers -> /en/customers)
|
|
161
|
+
return getRewriteResponse("/".concat(userLocale).concat(pathname));
|
|
133
162
|
}
|
|
134
|
-
return response_1;
|
|
135
163
|
}
|
|
136
|
-
//
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
(
|
|
140
|
-
var rewritePath = "/".concat(defaultLocale).concat(pathname);
|
|
141
|
-
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
142
|
-
rewriteUrl.search = originalUrl.search;
|
|
143
|
-
var response_2 = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
144
|
-
headers: headerList,
|
|
145
|
-
});
|
|
146
|
-
response_2.headers.set(internal_1.localeHeaderName, userLocale);
|
|
147
|
-
response_2.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
148
|
-
if (clearResetCookie) {
|
|
149
|
-
response_2.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
150
|
-
}
|
|
151
|
-
return response_2;
|
|
164
|
+
// --- CASE: defaultLocale prefix --- //
|
|
165
|
+
// REDIRECT CASE: no pathnameLocale (ie, /customers -> /fr/customers)
|
|
166
|
+
else if (!pathnameLocale) {
|
|
167
|
+
return getRedirectResponse("/".concat(userLocale).concat(pathname));
|
|
152
168
|
}
|
|
153
|
-
// REDIRECT CASE:
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
redirectUrl.search = originalUrl.search;
|
|
157
|
-
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
158
|
-
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
159
|
-
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
160
|
-
if (clearResetCookie) {
|
|
161
|
-
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
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)));
|
|
162
172
|
}
|
|
163
|
-
|
|
173
|
+
// BASE CASE: has pathnameLocale and it's correct
|
|
174
|
+
return getNextResponse();
|
|
164
175
|
}
|
|
165
|
-
// CASE:
|
|
166
|
-
if (!
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
if (localizedPathWithParameters !== "/".concat(defaultLocale).concat(pathname)) {
|
|
171
|
-
// remove locale prefix
|
|
172
|
-
var redirectPath = localizedPathWithParameters.replace(new RegExp("^/".concat(userLocale)), '');
|
|
173
|
-
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
174
|
-
redirectUrl.search = originalUrl.search;
|
|
175
|
-
var response_3 = server_1.NextResponse.redirect(redirectUrl);
|
|
176
|
-
response_3.headers.set(internal_1.localeHeaderName, userLocale);
|
|
177
|
-
response_3.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
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)
|
|
178
181
|
if (clearResetCookie) {
|
|
179
|
-
|
|
182
|
+
return getRedirectResponse(localizedPathWithParameters.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "") || '/');
|
|
180
183
|
}
|
|
181
|
-
return response_3;
|
|
182
184
|
}
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
headers: headerList,
|
|
192
|
-
});
|
|
193
|
-
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
194
|
-
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
195
|
-
if (clearResetCookie) {
|
|
196
|
-
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
185
|
+
else {
|
|
186
|
+
// REDIRECT CASE: unprefixed pathname is wrong (/about -> /en-about)
|
|
187
|
+
if (!pathnameLocale &&
|
|
188
|
+
localizedPathWithParameters !== "/".concat(userLocale).concat(pathname)) {
|
|
189
|
+
return getRedirectResponse(localizedPathWithParameters.replace(new RegExp("^/".concat(userLocale)), '') || '/');
|
|
190
|
+
}
|
|
191
|
+
// REWRITE CASE: displaying correct path (/blog -> /en/blog)
|
|
192
|
+
return getRewriteResponse(sharedPathWithParameters);
|
|
197
193
|
}
|
|
198
|
-
return response;
|
|
199
194
|
}
|
|
200
|
-
//
|
|
201
|
-
// REDIRECT CASE:
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
unstandardizedPathnameLocale !== userLocale ||
|
|
205
|
-
localizedPathWithParameters !== standardizedPathname) {
|
|
206
|
-
var redirectPath = localizedPathWithParameters;
|
|
207
|
-
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
208
|
-
redirectUrl.search = originalUrl.search;
|
|
209
|
-
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
210
|
-
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
211
|
-
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
212
|
-
if (clearResetCookie) {
|
|
213
|
-
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
214
|
-
}
|
|
215
|
-
return response;
|
|
195
|
+
// --- CASE: add defaultLocale prefix --- //
|
|
196
|
+
// REDIRECT CASE: incorrect pathnameLocale
|
|
197
|
+
if (pathname !== localizedPathWithParameters) {
|
|
198
|
+
return getRedirectResponse(localizedPathWithParameters);
|
|
216
199
|
}
|
|
217
|
-
// REWRITE CASE: displaying correct
|
|
218
|
-
if (standardizedPathname
|
|
219
|
-
standardizedPathname !== sharedPathWithParameters // no rewrite needed if it's already the shared path
|
|
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
|
|
220
202
|
) {
|
|
221
203
|
// convert to shared path with dynamic parameters
|
|
222
|
-
|
|
223
|
-
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
224
|
-
rewriteUrl.search = originalUrl.search;
|
|
225
|
-
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
226
|
-
headers: headerList,
|
|
227
|
-
});
|
|
228
|
-
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
229
|
-
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
230
|
-
if (clearResetCookie) {
|
|
231
|
-
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
232
|
-
}
|
|
233
|
-
return response;
|
|
204
|
+
return getRewriteResponse(sharedPathWithParameters);
|
|
234
205
|
}
|
|
235
|
-
// BASE CASE
|
|
236
206
|
}
|
|
237
|
-
|
|
207
|
+
// BASE CASE
|
|
208
|
+
return getNextResponse();
|
|
238
209
|
}
|
|
239
210
|
return nextMiddleware;
|
|
240
211
|
}
|
|
@@ -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,9 +1,24 @@
|
|
|
1
|
-
import { NextRequest } from 'next/server';
|
|
1
|
+
import { NextRequest, NextResponse } from 'next/server';
|
|
2
|
+
import { NextURL } from 'next/dist/server/web/next-url';
|
|
2
3
|
export type PathConfig = {
|
|
3
4
|
[key: string]: string | {
|
|
4
5
|
[key: string]: string;
|
|
5
6
|
};
|
|
6
7
|
};
|
|
8
|
+
export type ResponseConfig = {
|
|
9
|
+
type: 'next' | 'rewrite' | 'redirect';
|
|
10
|
+
responsePath?: string;
|
|
11
|
+
originalUrl: NextURL;
|
|
12
|
+
userLocale: string;
|
|
13
|
+
clearResetCookie: boolean;
|
|
14
|
+
headerList: Headers;
|
|
15
|
+
localeRouting: boolean;
|
|
16
|
+
localeRoutingEnabledCookieName: string;
|
|
17
|
+
localeCookieName: string;
|
|
18
|
+
resetLocaleCookieName: string;
|
|
19
|
+
localeHeaderName: string;
|
|
20
|
+
};
|
|
21
|
+
export declare function getResponse({ type, originalUrl, responsePath, userLocale, clearResetCookie, headerList, localeRouting, localeRoutingEnabledCookieName, localeCookieName, resetLocaleCookieName, localeHeaderName, }: ResponseConfig): NextResponse<unknown>;
|
|
7
22
|
/**
|
|
8
23
|
* Extracts the locale from the given pathname.
|
|
9
24
|
*/
|
|
@@ -32,13 +47,13 @@ export declare function createPathToSharedPathMap(pathConfig: PathConfig, prefix
|
|
|
32
47
|
/**
|
|
33
48
|
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
34
49
|
*/
|
|
35
|
-
export declare function getSharedPath(
|
|
50
|
+
export declare function getSharedPath(standardizedPathname: string, pathToSharedPath: {
|
|
36
51
|
[key: string]: string;
|
|
37
|
-
}): string | undefined;
|
|
52
|
+
}, pathnameLocale: string | undefined): string | undefined;
|
|
38
53
|
/**
|
|
39
54
|
* Gets the locale from the request using various sources
|
|
40
55
|
*/
|
|
41
|
-
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean, gtServicesEnabled: boolean, prefixDefaultLocale: boolean, defaultLocalePaths: string[]): {
|
|
56
|
+
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean, gtServicesEnabled: boolean, prefixDefaultLocale: boolean, defaultLocalePaths: string[], referrerLocaleCookieName: string, localeCookieName: string, resetLocaleCookieName: string): {
|
|
42
57
|
userLocale: string;
|
|
43
58
|
pathnameLocale: string | undefined;
|
|
44
59
|
unstandardizedPathnameLocale: string | null | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
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,CA8EA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getResponse = getResponse;
|
|
3
4
|
exports.extractLocale = extractLocale;
|
|
4
5
|
exports.extractDynamicParams = extractDynamicParams;
|
|
5
6
|
exports.replaceDynamicSegments = replaceDynamicSegments;
|
|
@@ -7,9 +8,41 @@ exports.getLocalizedPath = getLocalizedPath;
|
|
|
7
8
|
exports.createPathToSharedPathMap = createPathToSharedPathMap;
|
|
8
9
|
exports.getSharedPath = getSharedPath;
|
|
9
10
|
exports.getLocaleFromRequest = getLocaleFromRequest;
|
|
11
|
+
var server_1 = require("next/server");
|
|
10
12
|
var generaltranslation_1 = require("generaltranslation");
|
|
11
|
-
|
|
12
|
-
var
|
|
13
|
+
function getResponse(_a) {
|
|
14
|
+
var type = _a.type, originalUrl = _a.originalUrl, _b = _a.responsePath, responsePath = _b === void 0 ? originalUrl.pathname : _b, userLocale = _a.userLocale, clearResetCookie = _a.clearResetCookie, headerList = _a.headerList, localeRouting = _a.localeRouting, localeRoutingEnabledCookieName = _a.localeRoutingEnabledCookieName, localeCookieName = _a.localeCookieName, resetLocaleCookieName = _a.resetLocaleCookieName, localeHeaderName = _a.localeHeaderName;
|
|
15
|
+
// Get Response
|
|
16
|
+
var response;
|
|
17
|
+
if (type === 'next') {
|
|
18
|
+
response = server_1.NextResponse.next({
|
|
19
|
+
request: {
|
|
20
|
+
headers: headerList,
|
|
21
|
+
},
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
else {
|
|
25
|
+
var responseUrl = new URL(responsePath, originalUrl);
|
|
26
|
+
responseUrl.search = originalUrl.search;
|
|
27
|
+
response =
|
|
28
|
+
type === 'rewrite'
|
|
29
|
+
? server_1.NextResponse.rewrite(responseUrl, {
|
|
30
|
+
headers: headerList,
|
|
31
|
+
})
|
|
32
|
+
: server_1.NextResponse.redirect(responseUrl, {
|
|
33
|
+
headers: headerList,
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
// Set Headers & Cookies
|
|
37
|
+
response.headers.set(localeHeaderName, userLocale);
|
|
38
|
+
response.cookies.set(localeRoutingEnabledCookieName, localeRouting.toString());
|
|
39
|
+
// Clear setLocale cookies
|
|
40
|
+
if (clearResetCookie && type !== 'redirect') {
|
|
41
|
+
response.cookies.delete(resetLocaleCookieName);
|
|
42
|
+
response.cookies.delete(localeCookieName);
|
|
43
|
+
}
|
|
44
|
+
return response;
|
|
45
|
+
}
|
|
13
46
|
/**
|
|
14
47
|
* Extracts the locale from the given pathname.
|
|
15
48
|
*/
|
|
@@ -96,15 +129,19 @@ function createPathToSharedPathMap(pathConfig, prefixDefaultLocale, defaultLocal
|
|
|
96
129
|
/**
|
|
97
130
|
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
98
131
|
*/
|
|
99
|
-
function getSharedPath(
|
|
132
|
+
function getSharedPath(standardizedPathname, pathToSharedPath, pathnameLocale) {
|
|
100
133
|
// Try exact match first
|
|
101
|
-
if (pathToSharedPath[
|
|
102
|
-
return pathToSharedPath[
|
|
134
|
+
if (pathToSharedPath[standardizedPathname]) {
|
|
135
|
+
return pathToSharedPath[standardizedPathname];
|
|
103
136
|
}
|
|
104
137
|
// Without locale prefix
|
|
105
|
-
var pathnameWithoutLocale =
|
|
106
|
-
if
|
|
107
|
-
|
|
138
|
+
var pathnameWithoutLocale = undefined;
|
|
139
|
+
// Only remove locale prefix if the locale prefix is valid
|
|
140
|
+
if (pathnameLocale) {
|
|
141
|
+
pathnameWithoutLocale = standardizedPathname.replace(/^\/[^/]+/, '');
|
|
142
|
+
if (pathToSharedPath[pathnameWithoutLocale]) {
|
|
143
|
+
return pathToSharedPath[pathnameWithoutLocale];
|
|
144
|
+
}
|
|
108
145
|
}
|
|
109
146
|
// Try regex pattern match
|
|
110
147
|
var candidateSharedPath = undefined;
|
|
@@ -113,10 +150,14 @@ function getSharedPath(pathname, pathToSharedPath) {
|
|
|
113
150
|
if (pattern.includes('/[^/]+')) {
|
|
114
151
|
// Convert the pattern to a strict regex that matches the exact path structure
|
|
115
152
|
var regex = new RegExp("^".concat(pattern.replace(/\//g, '\\/'), "$"));
|
|
116
|
-
|
|
153
|
+
// Exact match
|
|
154
|
+
if (regex.test(standardizedPathname)) {
|
|
117
155
|
return sharedPath;
|
|
118
156
|
}
|
|
119
|
-
|
|
157
|
+
// Without locale prefix
|
|
158
|
+
if (!candidateSharedPath &&
|
|
159
|
+
pathnameLocale &&
|
|
160
|
+
regex.test(pathnameWithoutLocale)) {
|
|
120
161
|
candidateSharedPath = sharedPath;
|
|
121
162
|
}
|
|
122
163
|
}
|
|
@@ -124,8 +165,10 @@ function getSharedPath(pathname, pathToSharedPath) {
|
|
|
124
165
|
return candidateSharedPath;
|
|
125
166
|
}
|
|
126
167
|
/**
|
|
127
|
-
*
|
|
128
|
-
* @
|
|
168
|
+
* Checks if the pathname is in the default locale paths
|
|
169
|
+
* @param pathname - The pathname to check
|
|
170
|
+
* @param defaultLocalePaths - The default locale paths
|
|
171
|
+
* @returns true if the pathname is in the default locale paths, false otherwise
|
|
129
172
|
*/
|
|
130
173
|
function inDefaultLocalePaths(pathname, defaultLocalePaths) {
|
|
131
174
|
// Try exact match first
|
|
@@ -147,8 +190,8 @@ function inDefaultLocalePaths(pathname, defaultLocalePaths) {
|
|
|
147
190
|
/**
|
|
148
191
|
* Gets the locale from the request using various sources
|
|
149
192
|
*/
|
|
150
|
-
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled, prefixDefaultLocale, defaultLocalePaths) {
|
|
151
|
-
var _a
|
|
193
|
+
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled, prefixDefaultLocale, defaultLocalePaths, referrerLocaleCookieName, localeCookieName, resetLocaleCookieName) {
|
|
194
|
+
var _a;
|
|
152
195
|
var headerList = new Headers(req.headers);
|
|
153
196
|
var candidates = [];
|
|
154
197
|
var clearResetCookie = false;
|
|
@@ -160,7 +203,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
160
203
|
var extractedLocale = gtServicesEnabled
|
|
161
204
|
? (0, generaltranslation_1.standardizeLocale)(unstandardizedPathnameLocale || '')
|
|
162
205
|
: unstandardizedPathnameLocale;
|
|
163
|
-
if (extractedLocale &&
|
|
206
|
+
if (extractedLocale && approvedLocales.includes(extractedLocale)) {
|
|
164
207
|
pathnameLocale = extractedLocale;
|
|
165
208
|
candidates.push(pathnameLocale);
|
|
166
209
|
}
|
|
@@ -173,9 +216,9 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
173
216
|
candidates.push(defaultLocale); // will override other candidates
|
|
174
217
|
}
|
|
175
218
|
// Check cookie locale
|
|
176
|
-
var cookieLocale = req.cookies.get(
|
|
219
|
+
var cookieLocale = req.cookies.get(localeCookieName);
|
|
177
220
|
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && (0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
178
|
-
var resetCookie = req.cookies.get(
|
|
221
|
+
var resetCookie = req.cookies.get(resetLocaleCookieName);
|
|
179
222
|
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
180
223
|
candidates.unshift(cookieLocale.value);
|
|
181
224
|
clearResetCookie = true;
|
|
@@ -184,20 +227,17 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
184
227
|
candidates.push(cookieLocale.value);
|
|
185
228
|
}
|
|
186
229
|
}
|
|
187
|
-
// Check
|
|
188
|
-
var
|
|
189
|
-
if (
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
if ((0, generaltranslation_1.isValidLocale)(refererLocale || ''))
|
|
194
|
-
candidates.push(refererLocale || '');
|
|
195
|
-
}
|
|
230
|
+
// Check referrer locale
|
|
231
|
+
var referrerLocale = req.cookies.get(referrerLocaleCookieName);
|
|
232
|
+
if ((referrerLocale === null || referrerLocale === void 0 ? void 0 : referrerLocale.value) &&
|
|
233
|
+
(0, generaltranslation_1.isValidLocale)(referrerLocale === null || referrerLocale === void 0 ? void 0 : referrerLocale.value) &&
|
|
234
|
+
!clearResetCookie) {
|
|
235
|
+
candidates.push(referrerLocale.value);
|
|
196
236
|
}
|
|
197
237
|
// Get locales from accept-language header
|
|
198
238
|
if (process.env._GENERALTRANSLATION_IGNORE_BROWSER_LOCALES === 'false') {
|
|
199
|
-
var acceptedLocales = ((
|
|
200
|
-
.get('accept-language')) === null ||
|
|
239
|
+
var acceptedLocales = ((_a = headerList
|
|
240
|
+
.get('accept-language')) === null || _a === void 0 ? void 0 : _a.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); })) || [];
|
|
201
241
|
if (acceptedLocales)
|
|
202
242
|
candidates.push.apply(candidates, acceptedLocales);
|
|
203
243
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNextLocale.d.ts","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getNextLocale.d.ts","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":"AAQA;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,YAAK,EAC1B,OAAO,EAAE,MAAM,EAAE,GAChB,OAAO,CAAC,MAAM,CAAC,CAmCjB"}
|