gt-next 5.2.14 → 5.2.15-alpha.0
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/branches/Plural.d.ts +2 -2
- package/dist/branches/Plural.js +2 -2
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +56 -45
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +6 -3
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +45 -10
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/server-dir/buildtime/T.d.ts +3 -3
- package/dist/server-dir/buildtime/T.js +3 -3
- package/dist/server-dir/runtime/_Tx.d.ts +3 -3
- package/dist/server-dir/runtime/_Tx.js +3 -3
- package/package.json +1 -1
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
* ```jsx
|
|
9
9
|
* <Plural
|
|
10
10
|
* n={n}
|
|
11
|
-
* one={<>There is <Num
|
|
12
|
-
* other={<>There are <Num
|
|
11
|
+
* one={<>There is <Num children={n}/> item.</>}
|
|
12
|
+
* other={<>There are <Num children={n}/> items.</>}
|
|
13
13
|
* />
|
|
14
14
|
* ```
|
|
15
15
|
* In this example, if `n` is 1, it renders `"There is 1 item"`. If `n` is a different number, it renders
|
package/dist/branches/Plural.js
CHANGED
|
@@ -63,8 +63,8 @@ var getI18NConfig_1 = __importDefault(require("../config-dir/getI18NConfig"));
|
|
|
63
63
|
* ```jsx
|
|
64
64
|
* <Plural
|
|
65
65
|
* n={n}
|
|
66
|
-
* one={<>There is <Num
|
|
67
|
-
* other={<>There are <Num
|
|
66
|
+
* one={<>There is <Num children={n}/> item.</>}
|
|
67
|
+
* other={<>There are <Num children={n}/> items.</>}
|
|
68
68
|
* />
|
|
69
69
|
* ```
|
|
70
70
|
* In this example, if `n` is 1, it renders `"There is 1 item"`. If `n` is a different number, it renders
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKxD,OAAO,EACL,UAAU,EAMX,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;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":"AAUA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAKxD,OAAO,EACL,UAAU,EAMX,MAAM,SAAS,CAAC;AAEjB;;;;;;;;;;;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,SA2EyB,WAAW,2BAyLzC"}
|
|
@@ -60,7 +60,8 @@ function createNextMiddleware(_a) {
|
|
|
60
60
|
return acc;
|
|
61
61
|
}, {});
|
|
62
62
|
// Create the path mapping
|
|
63
|
-
var
|
|
63
|
+
var _f = (0, utils_1.createPathToSharedPathMap)(pathConfig, prefixDefaultLocale, defaultLocale), pathToSharedPath = _f.pathToSharedPath, defaultLocalePaths = _f.defaultLocalePaths;
|
|
64
|
+
// List of paths that are customized unprefixed default locale paths (e.g. /en-about , /en-dashboard/1/en-custom)
|
|
64
65
|
/**
|
|
65
66
|
* Processes the incoming request to determine the user's locale and sets a locale cookie.
|
|
66
67
|
* Optionally redirects the user based on the locale if locale-based routing is enabled.
|
|
@@ -83,7 +84,7 @@ function createNextMiddleware(_a) {
|
|
|
83
84
|
},
|
|
84
85
|
});
|
|
85
86
|
// ---------- LOCALE DETECTION ---------- //
|
|
86
|
-
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale, clearResetCookie = _a.clearResetCookie;
|
|
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;
|
|
87
88
|
res.headers.set(internal_1.localeHeaderName, userLocale);
|
|
88
89
|
res.cookies.set(constants_1.middlewareLocaleRoutingFlagName, localeRouting.toString());
|
|
89
90
|
if (clearResetCookie) {
|
|
@@ -100,6 +101,10 @@ function createNextMiddleware(_a) {
|
|
|
100
101
|
: pathname;
|
|
101
102
|
// Get the shared path for the unprefixed pathname
|
|
102
103
|
var sharedPath = (0, utils_1.getSharedPath)(standardizedPathname, pathToSharedPath);
|
|
104
|
+
// Get shared path with parameters (/en/dashboard/1/custom)
|
|
105
|
+
var sharedPathWithParameters = (0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
106
|
+
? standardizedPathname
|
|
107
|
+
: "/".concat(userLocale).concat(standardizedPathname), "/".concat(userLocale).concat(sharedPath));
|
|
103
108
|
// Localized path (/en-US/blog, /fr/fr-about, /fr/dashboard/[id]/custom)
|
|
104
109
|
var localizedPath = sharedPath && (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig);
|
|
105
110
|
// Combine localized path with dynamic parameters (/en-US/blog, /fr/fr-about, /fr/dashboard/1/fr-custom)
|
|
@@ -108,40 +113,44 @@ function createNextMiddleware(_a) {
|
|
|
108
113
|
? standardizedPathname
|
|
109
114
|
: "/".concat(userLocale).concat(standardizedPathname), localizedPath);
|
|
110
115
|
// ---------- ROUTING LOGIC ---------- //
|
|
111
|
-
//
|
|
112
|
-
if (localizedPathWithParameters
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
// REWRITE CASE: proxies a localized path, same locale (/fr/fr-about => /fr/about) (/fr/dashboard/1/fr-custom => /fr/dashboard/1/custom)
|
|
123
|
-
if (localizedPathWithParameters &&
|
|
124
|
-
standardizedPathname === localizedPathWithParameters) {
|
|
125
|
-
// convert to shared path with dynamic parameters
|
|
126
|
-
var rewritePath = (0, utils_1.replaceDynamicSegments)(localizedPathWithParameters, "/".concat(userLocale).concat(sharedPath));
|
|
127
|
-
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
128
|
-
rewriteUrl.search = originalUrl.search;
|
|
129
|
-
headerList.set(internal_1.localeHeaderName, userLocale);
|
|
130
|
-
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
131
|
-
headers: headerList,
|
|
132
|
-
});
|
|
116
|
+
// CASE: no localized path exists
|
|
117
|
+
if (!localizedPathWithParameters) {
|
|
118
|
+
// BASE CASE: no localized path exists, so no change
|
|
119
|
+
if (pathnameLocale && pathnameLocale === unstandardizedPathnameLocale) {
|
|
120
|
+
return res;
|
|
121
|
+
}
|
|
122
|
+
// REDIRECT CASE: no/invalide pathnameLocale, add a default locale prefix
|
|
123
|
+
var redirectPath = "/".concat(userLocale).concat(pathname);
|
|
124
|
+
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
125
|
+
redirectUrl.search = originalUrl.search;
|
|
126
|
+
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
133
127
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
134
128
|
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
135
|
-
if (clearResetCookie) {
|
|
136
|
-
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
137
|
-
}
|
|
138
129
|
return response;
|
|
139
130
|
}
|
|
140
|
-
//
|
|
131
|
+
// CASE: remove default locale prefix
|
|
141
132
|
if (!pathnameLocale &&
|
|
142
133
|
!prefixDefaultLocale &&
|
|
143
134
|
(0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
144
|
-
|
|
135
|
+
// REDIRECT CASE: displaying wrong path, convert to non-prefixed localized path (/about -> /en-about) (/dashboard/1/custom -> /en-dashboard/1/en-custom)
|
|
136
|
+
if (localizedPathWithParameters !== "/".concat(userLocale).concat(pathname)) {
|
|
137
|
+
// remove locale prefix
|
|
138
|
+
var redirectPath = localizedPathWithParameters.replace(new RegExp("^/".concat(userLocale)), '');
|
|
139
|
+
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
140
|
+
redirectUrl.search = originalUrl.search;
|
|
141
|
+
var response_1 = server_1.NextResponse.redirect(redirectUrl);
|
|
142
|
+
response_1.headers.set(internal_1.localeHeaderName, userLocale);
|
|
143
|
+
response_1.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
144
|
+
if (clearResetCookie) {
|
|
145
|
+
response_1.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
146
|
+
}
|
|
147
|
+
return response_1;
|
|
148
|
+
}
|
|
149
|
+
// REWRITE CASE: displaying correct path (/blog -> /en/blog) (/en-dashboard/1/en-custom -> /en/dashboard/1/custom) (/en-about -> /en/about)
|
|
150
|
+
// shared path with dynamic parameters
|
|
151
|
+
var rewritePath = (0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
152
|
+
? standardizedPathname
|
|
153
|
+
: "/".concat(userLocale).concat(standardizedPathname), "/".concat(userLocale).concat(sharedPath));
|
|
145
154
|
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
146
155
|
rewriteUrl.search = originalUrl.search;
|
|
147
156
|
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
@@ -154,16 +163,13 @@ function createNextMiddleware(_a) {
|
|
|
154
163
|
}
|
|
155
164
|
return response;
|
|
156
165
|
}
|
|
157
|
-
// REDIRECT CASE:
|
|
158
|
-
//
|
|
159
|
-
//
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
var redirectPath = localizedPathWithParameters
|
|
164
|
-
(pathnameLocale
|
|
165
|
-
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale))
|
|
166
|
-
: "/".concat(userLocale).concat(pathname));
|
|
166
|
+
// REDIRECT CASE: no localization prefix (invalid path), redirect to a localized path (ie, /blog -> /en-US/blog) (/dashboard -> /fr/fr-dashboard)
|
|
167
|
+
// REDIRECT CASE: locale prefix mismatch userLocale (invalid path), redirect to a localized path (ie, /en-US/blog -> /fr/blog) (/tl/dashboard -> /fil/tl-dashboard)
|
|
168
|
+
// REDIRECT CASE: displayed path doesnt match localized path (invalid path) (/fr/about -> /fr/fr-about)
|
|
169
|
+
if (!pathnameLocale ||
|
|
170
|
+
unstandardizedPathnameLocale !== userLocale ||
|
|
171
|
+
localizedPathWithParameters !== standardizedPathname) {
|
|
172
|
+
var redirectPath = localizedPathWithParameters;
|
|
167
173
|
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
168
174
|
redirectUrl.search = originalUrl.search;
|
|
169
175
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
@@ -174,11 +180,17 @@ function createNextMiddleware(_a) {
|
|
|
174
180
|
}
|
|
175
181
|
return response;
|
|
176
182
|
}
|
|
177
|
-
//
|
|
178
|
-
if (localizedPathWithParameters
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
183
|
+
// REWRITE CASE: displaying correct path at localized path, which is the same as the shared path (/fil/blog => /fil/blog) (/fr/fr-dashboard/1/fr-custom => /fr/dashboard/1/custom)
|
|
184
|
+
if (standardizedPathname === localizedPathWithParameters && // we are displaying the correct path
|
|
185
|
+
standardizedPathname !== sharedPathWithParameters // no rewrite needed if it's already the shared path
|
|
186
|
+
) {
|
|
187
|
+
// convert to shared path with dynamic parameters
|
|
188
|
+
var rewritePath = sharedPathWithParameters;
|
|
189
|
+
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
190
|
+
rewriteUrl.search = originalUrl.search;
|
|
191
|
+
var response = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
192
|
+
headers: headerList,
|
|
193
|
+
});
|
|
182
194
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
183
195
|
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
184
196
|
if (clearResetCookie) {
|
|
@@ -187,7 +199,6 @@ function createNextMiddleware(_a) {
|
|
|
187
199
|
return response;
|
|
188
200
|
}
|
|
189
201
|
// BASE CASE
|
|
190
|
-
return res;
|
|
191
202
|
}
|
|
192
203
|
return res;
|
|
193
204
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":";;AAoCA,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,11 @@ export declare function getLocalizedPath(sharedPath: string, locale: string, pat
|
|
|
23
23
|
/**
|
|
24
24
|
* Creates a map of localized paths to shared paths using regex patterns
|
|
25
25
|
*/
|
|
26
|
-
export declare function createPathToSharedPathMap(pathConfig: PathConfig): {
|
|
27
|
-
|
|
26
|
+
export declare function createPathToSharedPathMap(pathConfig: PathConfig, prefixDefaultLocale: boolean, defaultLocale: string): {
|
|
27
|
+
pathToSharedPath: {
|
|
28
|
+
[key: string]: string;
|
|
29
|
+
};
|
|
30
|
+
defaultLocalePaths: string[];
|
|
28
31
|
};
|
|
29
32
|
/**
|
|
30
33
|
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
@@ -35,7 +38,7 @@ export declare function getSharedPath(pathname: string, pathToSharedPath: {
|
|
|
35
38
|
/**
|
|
36
39
|
* Gets the locale from the request using various sources
|
|
37
40
|
*/
|
|
38
|
-
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean, gtServicesEnabled: boolean): {
|
|
41
|
+
export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: string, approvedLocales: string[], localeRouting: boolean, gtServicesEnabled: boolean, prefixDefaultLocale: boolean, defaultLocalePaths: string[]): {
|
|
39
42
|
userLocale: string;
|
|
40
43
|
pathnameLocale: string | undefined;
|
|
41
44
|
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;AAS1C,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;;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,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C,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;;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,CAiCA;AAED;;GAEG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC1C,MAAM,GAAG,SAAS,CA2BpB;AA4BD;;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,GAC3B;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,CA+EA"}
|
|
@@ -65,28 +65,35 @@ function getLocalizedPath(sharedPath, locale, pathConfig) {
|
|
|
65
65
|
/**
|
|
66
66
|
* Creates a map of localized paths to shared paths using regex patterns
|
|
67
67
|
*/
|
|
68
|
-
function createPathToSharedPathMap(pathConfig) {
|
|
68
|
+
function createPathToSharedPathMap(pathConfig, prefixDefaultLocale, defaultLocale) {
|
|
69
69
|
return Object.entries(pathConfig).reduce(function (acc, _a) {
|
|
70
|
-
var sharedPath = _a[0],
|
|
70
|
+
var sharedPath = _a[0], localizedPaths = _a[1];
|
|
71
|
+
var pathToSharedPath = acc.pathToSharedPath, defaultLocalePaths = acc.defaultLocalePaths;
|
|
71
72
|
// Add the shared path itself, converting to regex pattern if it has dynamic segments
|
|
72
73
|
if (sharedPath.includes('[')) {
|
|
73
74
|
var pattern = sharedPath.replace(/\[([^\]]+)\]/g, '[^/]+');
|
|
74
|
-
|
|
75
|
+
pathToSharedPath[pattern] = sharedPath;
|
|
75
76
|
}
|
|
76
77
|
else {
|
|
77
|
-
|
|
78
|
+
pathToSharedPath[sharedPath] = sharedPath;
|
|
78
79
|
}
|
|
79
|
-
if (typeof
|
|
80
|
-
Object.entries(
|
|
80
|
+
if (typeof localizedPaths === 'object') {
|
|
81
|
+
Object.entries(localizedPaths).forEach(function (_a) {
|
|
81
82
|
var locale = _a[0], localizedPath = _a[1];
|
|
82
83
|
// Convert the localized path to a regex pattern
|
|
83
84
|
// Replace [param] with [^/]+ to match any non-slash characters
|
|
84
85
|
var pattern = localizedPath.replace(/\[([^\]]+)\]/g, '[^/]+');
|
|
85
|
-
|
|
86
|
+
pathToSharedPath["/".concat(locale).concat(pattern)] = sharedPath;
|
|
87
|
+
if (!prefixDefaultLocale) {
|
|
88
|
+
pathToSharedPath[pattern] = sharedPath;
|
|
89
|
+
if (locale === defaultLocale) {
|
|
90
|
+
defaultLocalePaths.push(pattern);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
86
93
|
});
|
|
87
94
|
}
|
|
88
95
|
return acc;
|
|
89
|
-
}, {});
|
|
96
|
+
}, { pathToSharedPath: {}, defaultLocalePaths: [] });
|
|
90
97
|
}
|
|
91
98
|
/**
|
|
92
99
|
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
@@ -118,17 +125,38 @@ function getSharedPath(pathname, pathToSharedPath) {
|
|
|
118
125
|
}
|
|
119
126
|
return candidateSharedPath;
|
|
120
127
|
}
|
|
128
|
+
/**
|
|
129
|
+
*
|
|
130
|
+
* @returns
|
|
131
|
+
*/
|
|
132
|
+
function inDefaultLocalePaths(pathname, defaultLocalePaths) {
|
|
133
|
+
// Try exact match first
|
|
134
|
+
if (defaultLocalePaths.includes(pathname)) {
|
|
135
|
+
return true;
|
|
136
|
+
}
|
|
137
|
+
// Try regex pattern match
|
|
138
|
+
for (var _i = 0, defaultLocalePaths_1 = defaultLocalePaths; _i < defaultLocalePaths_1.length; _i++) {
|
|
139
|
+
var path = defaultLocalePaths_1[_i];
|
|
140
|
+
if (path.includes('/[^/]+')) {
|
|
141
|
+
var regex = new RegExp("^".concat(path.replace(/\//g, '\\/'), "$"));
|
|
142
|
+
if (regex.test(pathname)) {
|
|
143
|
+
return true;
|
|
144
|
+
}
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
return false;
|
|
148
|
+
}
|
|
121
149
|
/**
|
|
122
150
|
* Gets the locale from the request using various sources
|
|
123
151
|
*/
|
|
124
|
-
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled) {
|
|
152
|
+
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled, prefixDefaultLocale, defaultLocalePaths) {
|
|
125
153
|
var _a, _b;
|
|
126
154
|
var headerList = new Headers(req.headers);
|
|
127
155
|
var candidates = [];
|
|
128
156
|
var clearResetCookie = false;
|
|
157
|
+
var pathname = req.nextUrl.pathname;
|
|
129
158
|
// Check pathname locales
|
|
130
159
|
var pathnameLocale, unstandardizedPathnameLocale;
|
|
131
|
-
var pathname = req.nextUrl.pathname;
|
|
132
160
|
if (localeRouting) {
|
|
133
161
|
unstandardizedPathnameLocale = extractLocale(pathname);
|
|
134
162
|
var extractedLocale = gtServicesEnabled
|
|
@@ -139,6 +167,13 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
139
167
|
candidates.push(pathnameLocale);
|
|
140
168
|
}
|
|
141
169
|
}
|
|
170
|
+
// Check pathname for a customized unprefixed default locale path (e.g. /en-about , /en-dashboard/1/en-custom)
|
|
171
|
+
if (localeRouting &&
|
|
172
|
+
!prefixDefaultLocale &&
|
|
173
|
+
!pathnameLocale &&
|
|
174
|
+
inDefaultLocalePaths(pathname, defaultLocalePaths)) {
|
|
175
|
+
candidates.push(defaultLocale); // will override other candidates
|
|
176
|
+
}
|
|
142
177
|
// Check cookie locale
|
|
143
178
|
var cookieLocale = req.cookies.get(internal_1.localeCookieName);
|
|
144
179
|
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && (0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":";;AAgBA,sCAGC;AAKD,oDAiBC;AAKD,wDAYC;AAKD,4CAiBC;AAKD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* ```jsx
|
|
6
6
|
* // Basic usage:
|
|
7
7
|
* <T id="welcome_message">
|
|
8
|
-
* Hello, <Var
|
|
8
|
+
* Hello, <Var>{name}</Var>!
|
|
9
9
|
* </T>
|
|
10
10
|
* ```
|
|
11
11
|
*
|
|
@@ -13,8 +13,8 @@
|
|
|
13
13
|
* ```jsx
|
|
14
14
|
* // Translating a plural
|
|
15
15
|
* <T id="item_count">
|
|
16
|
-
* <Plural n={3} singular={<>You have <Num
|
|
17
|
-
* You have <Num
|
|
16
|
+
* <Plural n={3} singular={<>You have <Num children={n}/> item.</>}>
|
|
17
|
+
* You have <Num children={n}/> items.
|
|
18
18
|
* </Plural>
|
|
19
19
|
* </T>
|
|
20
20
|
* ```
|
|
@@ -75,7 +75,7 @@ function Resolver(_a) {
|
|
|
75
75
|
* ```jsx
|
|
76
76
|
* // Basic usage:
|
|
77
77
|
* <T id="welcome_message">
|
|
78
|
-
* Hello, <Var
|
|
78
|
+
* Hello, <Var>{name}</Var>!
|
|
79
79
|
* </T>
|
|
80
80
|
* ```
|
|
81
81
|
*
|
|
@@ -83,8 +83,8 @@ function Resolver(_a) {
|
|
|
83
83
|
* ```jsx
|
|
84
84
|
* // Translating a plural
|
|
85
85
|
* <T id="item_count">
|
|
86
|
-
* <Plural n={3} singular={<>You have <Num
|
|
87
|
-
* You have <Num
|
|
86
|
+
* <Plural n={3} singular={<>You have <Num children={n}/> item.</>}>
|
|
87
|
+
* You have <Num children={n}/> items.
|
|
88
88
|
* </Plural>
|
|
89
89
|
* </T>
|
|
90
90
|
* ```
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
* ```jsx
|
|
7
7
|
* // Basic usage:
|
|
8
8
|
* <Tx id="welcome_message">
|
|
9
|
-
* Hello, <Var
|
|
9
|
+
* Hello, <Var>{name}</Var>!
|
|
10
10
|
* </Tx>
|
|
11
11
|
* ```
|
|
12
12
|
*
|
|
@@ -14,8 +14,8 @@
|
|
|
14
14
|
* ```jsx
|
|
15
15
|
* // Translating a plural
|
|
16
16
|
* <T id="item_count">
|
|
17
|
-
* <Plural n={3} singular={<>You have <Num
|
|
18
|
-
* You have <Num
|
|
17
|
+
* <Plural n={3} singular={<>You have <Num children={n}/> item.</>}>
|
|
18
|
+
* You have <Num children={n}/> items.
|
|
19
19
|
* </Plural>
|
|
20
20
|
* </T>
|
|
21
21
|
* ```
|
|
@@ -76,7 +76,7 @@ function Resolver(_a) {
|
|
|
76
76
|
* ```jsx
|
|
77
77
|
* // Basic usage:
|
|
78
78
|
* <Tx id="welcome_message">
|
|
79
|
-
* Hello, <Var
|
|
79
|
+
* Hello, <Var>{name}</Var>!
|
|
80
80
|
* </Tx>
|
|
81
81
|
* ```
|
|
82
82
|
*
|
|
@@ -84,8 +84,8 @@ function Resolver(_a) {
|
|
|
84
84
|
* ```jsx
|
|
85
85
|
* // Translating a plural
|
|
86
86
|
* <T id="item_count">
|
|
87
|
-
* <Plural n={3} singular={<>You have <Num
|
|
88
|
-
* You have <Num
|
|
87
|
+
* <Plural n={3} singular={<>You have <Num children={n}/> item.</>}>
|
|
88
|
+
* You have <Num children={n}/> items.
|
|
89
89
|
* </Plural>
|
|
90
90
|
* </T>
|
|
91
91
|
* ```
|