gt-next 5.2.9-alpha.4 → 5.2.9-alpha.5
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.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +9 -10
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +6 -6
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +38 -35
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +26 -8
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/provider/GTProvider.d.ts.map +1 -1
- package/dist/provider/GTProvider.js +1 -1
- package/dist/provider/GTProvider.js.map +1 -1
- package/dist/utils/constants.d.ts +1 -1
- package/dist/utils/constants.d.ts.map +1 -1
- package/dist/utils/constants.js +2 -2
- package/dist/utils/constants.js.map +1 -1
- package/package.json +2 -2
|
@@ -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,EAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,SAqE8B,WAAW,
|
|
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,EAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,UAAU,CAAC,EAAE,UAAU,CAAC;CACzB,SAqE8B,WAAW,2BA4KzC"}
|
|
@@ -85,24 +85,21 @@ function createNextMiddleware(_a) {
|
|
|
85
85
|
// ---------- LOCALE DETECTION ---------- //
|
|
86
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
87
|
res.headers.set(internal_1.localeHeaderName, userLocale);
|
|
88
|
-
res.cookies.set(constants_1.
|
|
88
|
+
res.cookies.set(constants_1.middlewareLocaleRoutingFlagName, localeRouting.toString());
|
|
89
89
|
if (clearResetCookie) {
|
|
90
90
|
res.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
91
91
|
}
|
|
92
92
|
if (localeRouting) {
|
|
93
93
|
// ---------- GET PATHS ---------- //
|
|
94
|
+
// get pathname
|
|
94
95
|
var pathname = req.nextUrl.pathname;
|
|
95
|
-
// Only strip off the locale if it's a valid locale (/fr/fr-about -> /about), (/blog -> /blog)
|
|
96
|
-
var unprefixedPathname = pathnameLocale
|
|
97
|
-
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), '')
|
|
98
|
-
: pathname;
|
|
99
96
|
var originalUrl = req.nextUrl;
|
|
100
97
|
// standardize pathname (ie, /tg/welcome -> /fil/welcome), (/blog -> /blog)
|
|
101
98
|
var standardizedPathname = pathnameLocale && pathnameLocale !== unstandardizedPathnameLocale
|
|
102
99
|
? pathname.replace(new RegExp("^/".concat(unstandardizedPathnameLocale)), "/".concat(userLocale))
|
|
103
100
|
: pathname;
|
|
104
101
|
// Get the shared path for the unprefixed pathname
|
|
105
|
-
var sharedPath = (0, utils_1.getSharedPath)(
|
|
102
|
+
var sharedPath = (0, utils_1.getSharedPath)(standardizedPathname, pathToSharedPath);
|
|
106
103
|
// Localized path (/en-US/blog, /fr/fr-about, /fr/dashboard/[id]/custom)
|
|
107
104
|
var localizedPath = sharedPath && (0, utils_1.getLocalizedPath)(sharedPath, userLocale, pathConfig);
|
|
108
105
|
// Combine localized path with dynamic parameters (/en-US/blog, /fr/fr-about, /fr/dashboard/1/fr-custom)
|
|
@@ -134,7 +131,7 @@ function createNextMiddleware(_a) {
|
|
|
134
131
|
headers: headerList,
|
|
135
132
|
});
|
|
136
133
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
137
|
-
response.cookies.set(constants_1.
|
|
134
|
+
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
138
135
|
if (clearResetCookie) {
|
|
139
136
|
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
140
137
|
}
|
|
@@ -151,7 +148,7 @@ function createNextMiddleware(_a) {
|
|
|
151
148
|
headers: headerList,
|
|
152
149
|
});
|
|
153
150
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
154
|
-
response.cookies.set(constants_1.
|
|
151
|
+
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
155
152
|
if (clearResetCookie) {
|
|
156
153
|
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
157
154
|
}
|
|
@@ -170,7 +167,8 @@ function createNextMiddleware(_a) {
|
|
|
170
167
|
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
171
168
|
redirectUrl.search = originalUrl.search;
|
|
172
169
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
173
|
-
response.
|
|
170
|
+
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
171
|
+
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
174
172
|
if (clearResetCookie) {
|
|
175
173
|
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
176
174
|
}
|
|
@@ -181,7 +179,8 @@ function createNextMiddleware(_a) {
|
|
|
181
179
|
var redirectUrl = new URL(localizedPathWithParameters, originalUrl);
|
|
182
180
|
redirectUrl.search = originalUrl.search;
|
|
183
181
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
184
|
-
response.
|
|
182
|
+
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
183
|
+
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
185
184
|
if (clearResetCookie) {
|
|
186
185
|
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
187
186
|
}
|
|
@@ -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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"}
|
|
@@ -8,12 +8,6 @@ export type PathConfig = {
|
|
|
8
8
|
* Extracts the locale from the given pathname.
|
|
9
9
|
*/
|
|
10
10
|
export declare function extractLocale(pathname: string): string | null;
|
|
11
|
-
/**
|
|
12
|
-
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
13
|
-
*/
|
|
14
|
-
export declare function getSharedPath(pathname: string, pathToSharedPath: {
|
|
15
|
-
[key: string]: string;
|
|
16
|
-
}): string | undefined;
|
|
17
11
|
/**
|
|
18
12
|
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
19
13
|
*/
|
|
@@ -32,6 +26,12 @@ export declare function getLocalizedPath(sharedPath: string, locale: string, pat
|
|
|
32
26
|
export declare function createPathToSharedPathMap(pathConfig: PathConfig): {
|
|
33
27
|
[key: string]: string;
|
|
34
28
|
};
|
|
29
|
+
/**
|
|
30
|
+
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
31
|
+
*/
|
|
32
|
+
export declare function getSharedPath(pathname: string, pathToSharedPath: {
|
|
33
|
+
[key: string]: string;
|
|
34
|
+
}): string | undefined;
|
|
35
35
|
/**
|
|
36
36
|
* Gets the locale from the request using various sources
|
|
37
37
|
*/
|
|
@@ -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,MAAM,aAAa,CAAC;AAc1C,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,CAAC,UAAU,EAAE,UAAU,GAAG;IACjE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC;CACvB,CAuBA;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;AAED;;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,GACzB;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,CAmEA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.extractLocale = extractLocale;
|
|
4
|
-
exports.getSharedPath = getSharedPath;
|
|
5
4
|
exports.extractDynamicParams = extractDynamicParams;
|
|
6
5
|
exports.replaceDynamicSegments = replaceDynamicSegments;
|
|
7
6
|
exports.getLocalizedPath = getLocalizedPath;
|
|
8
7
|
exports.createPathToSharedPathMap = createPathToSharedPathMap;
|
|
8
|
+
exports.getSharedPath = getSharedPath;
|
|
9
9
|
exports.getLocaleFromRequest = getLocaleFromRequest;
|
|
10
10
|
var generaltranslation_1 = require("generaltranslation");
|
|
11
11
|
var internal_1 = require("generaltranslation/internal");
|
|
@@ -17,27 +17,6 @@ function extractLocale(pathname) {
|
|
|
17
17
|
var matches = pathname.match(/^\/([^\/]+)(?:\/|$)/);
|
|
18
18
|
return matches ? matches[1] : null;
|
|
19
19
|
}
|
|
20
|
-
/**
|
|
21
|
-
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
22
|
-
*/
|
|
23
|
-
function getSharedPath(pathname, pathToSharedPath) {
|
|
24
|
-
// Try exact match first
|
|
25
|
-
if (pathToSharedPath[pathname]) {
|
|
26
|
-
return pathToSharedPath[pathname];
|
|
27
|
-
}
|
|
28
|
-
// Try regex pattern match
|
|
29
|
-
for (var _i = 0, _a = Object.entries(pathToSharedPath); _i < _a.length; _i++) {
|
|
30
|
-
var _b = _a[_i], pattern = _b[0], sharedPath = _b[1];
|
|
31
|
-
if (pattern.includes('[^/]+')) {
|
|
32
|
-
// Convert the pattern to a strict regex that matches the exact path structure
|
|
33
|
-
var regex = new RegExp("^".concat(pattern.replace(/\//g, '\\/'), "$"));
|
|
34
|
-
if (regex.test(pathname)) {
|
|
35
|
-
return sharedPath;
|
|
36
|
-
}
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
return undefined;
|
|
40
|
-
}
|
|
41
20
|
/**
|
|
42
21
|
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
43
22
|
*/
|
|
@@ -98,21 +77,52 @@ function createPathToSharedPathMap(pathConfig) {
|
|
|
98
77
|
acc[sharedPath] = sharedPath;
|
|
99
78
|
}
|
|
100
79
|
if (typeof localizedPath === 'object') {
|
|
101
|
-
Object.
|
|
80
|
+
Object.entries(localizedPath).forEach(function (_a) {
|
|
81
|
+
var locale = _a[0], localizedPath = _a[1];
|
|
102
82
|
// Convert the localized path to a regex pattern
|
|
103
83
|
// Replace [param] with [^/]+ to match any non-slash characters
|
|
104
84
|
var pattern = localizedPath.replace(/\[([^\]]+)\]/g, '[^/]+');
|
|
105
|
-
acc[pattern] = sharedPath;
|
|
85
|
+
acc["/".concat(locale).concat(pattern)] = sharedPath;
|
|
106
86
|
});
|
|
107
87
|
}
|
|
108
88
|
return acc;
|
|
109
89
|
}, {});
|
|
110
90
|
}
|
|
91
|
+
/**
|
|
92
|
+
* Gets the shared path from a given pathname, handling both static and dynamic paths
|
|
93
|
+
*/
|
|
94
|
+
function getSharedPath(pathname, pathToSharedPath) {
|
|
95
|
+
// Try exact match first
|
|
96
|
+
if (pathToSharedPath[pathname]) {
|
|
97
|
+
return pathToSharedPath[pathname];
|
|
98
|
+
}
|
|
99
|
+
// Try with locale prefix replaced by
|
|
100
|
+
var pathnameWithoutLocale = pathname.replace(/^\/[^/]+/, '');
|
|
101
|
+
if (pathToSharedPath[pathnameWithoutLocale]) {
|
|
102
|
+
return pathToSharedPath[pathnameWithoutLocale];
|
|
103
|
+
}
|
|
104
|
+
// Try regex pattern match
|
|
105
|
+
var candidateSharedPath = undefined;
|
|
106
|
+
for (var _i = 0, _a = Object.entries(pathToSharedPath); _i < _a.length; _i++) {
|
|
107
|
+
var _b = _a[_i], pattern = _b[0], sharedPath = _b[1];
|
|
108
|
+
if (pattern.includes('/[^/]+')) {
|
|
109
|
+
// Convert the pattern to a strict regex that matches the exact path structure
|
|
110
|
+
var regex = new RegExp("^".concat(pattern.replace(/\//g, '\\/'), "$"));
|
|
111
|
+
if (regex.test(pathname)) {
|
|
112
|
+
return sharedPath;
|
|
113
|
+
}
|
|
114
|
+
if (!candidateSharedPath && regex.test(pathnameWithoutLocale)) {
|
|
115
|
+
candidateSharedPath = sharedPath;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return candidateSharedPath;
|
|
120
|
+
}
|
|
111
121
|
/**
|
|
112
122
|
* Gets the locale from the request using various sources
|
|
113
123
|
*/
|
|
114
124
|
function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled) {
|
|
115
|
-
var _a, _b
|
|
125
|
+
var _a, _b;
|
|
116
126
|
var headerList = new Headers(req.headers);
|
|
117
127
|
var candidates = [];
|
|
118
128
|
var clearResetCookie = false;
|
|
@@ -132,8 +142,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
132
142
|
// Check cookie locale
|
|
133
143
|
var cookieLocale = req.cookies.get(internal_1.localeCookieName);
|
|
134
144
|
if ((cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value) && (0, generaltranslation_1.isValidLocale)(cookieLocale === null || cookieLocale === void 0 ? void 0 : cookieLocale.value)) {
|
|
135
|
-
var
|
|
136
|
-
var resetCookie = req.cookies.get(resetCookieName);
|
|
145
|
+
var resetCookie = req.cookies.get(constants_1.middlewareLocaleResetFlagName);
|
|
137
146
|
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
138
147
|
candidates.unshift(cookieLocale.value);
|
|
139
148
|
clearResetCookie = true;
|
|
@@ -152,15 +161,9 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
152
161
|
candidates.push(refererLocale || '');
|
|
153
162
|
}
|
|
154
163
|
}
|
|
155
|
-
// Check middleware cookie locale
|
|
156
|
-
var middlewareCookieLocale = !unstandardizedPathnameLocale &&
|
|
157
|
-
((_b = req.cookies.get(constants_1.middlewareLocaleName)) === null || _b === void 0 ? void 0 : _b.value);
|
|
158
|
-
if (middlewareCookieLocale && (0, generaltranslation_1.isValidLocale)(middlewareCookieLocale)) {
|
|
159
|
-
candidates.push(middlewareCookieLocale);
|
|
160
|
-
}
|
|
161
164
|
// Get locales from accept-language header
|
|
162
|
-
var acceptedLocales = ((
|
|
163
|
-
.get('accept-language')) === null ||
|
|
165
|
+
var acceptedLocales = ((_b = headerList
|
|
166
|
+
.get('accept-language')) === null || _b === void 0 ? void 0 : _b.split(',').map(function (item) { var _a; return (_a = item.split(';')) === null || _a === void 0 ? void 0 : _a[0].trim(); })) || [];
|
|
164
167
|
candidates.push.apply(candidates, acceptedLocales);
|
|
165
168
|
// Get default locale
|
|
166
169
|
candidates.push(defaultLocale);
|
|
@@ -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":"ClientProviderWrapper.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ClientProviderWrapper.d.ts","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAUxD,MAAM,CAAC,OAAO,UAAU,cAAc,CACpC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,2CA4CnD"}
|
|
@@ -18,6 +18,8 @@ var client_1 = require("gt-react/client");
|
|
|
18
18
|
var navigation_1 = require("next/navigation");
|
|
19
19
|
var react_1 = require("react");
|
|
20
20
|
var constants_1 = require("../utils/constants");
|
|
21
|
+
var utils_1 = require("../middleware-dir/utils");
|
|
22
|
+
var generaltranslation_1 = require("generaltranslation");
|
|
21
23
|
function ClientProvider(props) {
|
|
22
24
|
// locale change on client, trigger page reload
|
|
23
25
|
var router = (0, navigation_1.useRouter)();
|
|
@@ -30,16 +32,32 @@ function ClientProvider(props) {
|
|
|
30
32
|
var pathname = (0, navigation_1.usePathname)();
|
|
31
33
|
(0, react_1.useEffect)(function () {
|
|
32
34
|
var _a;
|
|
33
|
-
|
|
35
|
+
// Get the cookie value
|
|
36
|
+
var cookieValue = (_a = document.cookie
|
|
34
37
|
.split('; ')
|
|
35
|
-
.find(function (row) { return row.startsWith("".concat(constants_1.
|
|
36
|
-
if (
|
|
37
|
-
//
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
.find(function (row) { return row.startsWith("".concat(constants_1.middlewareLocaleRoutingFlagName, "=")); })) === null || _a === void 0 ? void 0 : _a.split('=')[1];
|
|
39
|
+
if (cookieValue === 'true') {
|
|
40
|
+
// Extract locale from pathname
|
|
41
|
+
var extractedLocale = (0, utils_1.extractLocale)(pathname) || props.defaultLocale;
|
|
42
|
+
var pathLocale = props.gtServicesEnabled
|
|
43
|
+
? (0, generaltranslation_1.standardizeLocale)(extractedLocale)
|
|
44
|
+
: extractedLocale;
|
|
45
|
+
if (pathLocale &&
|
|
46
|
+
props.locales.includes(pathLocale) &&
|
|
47
|
+
pathLocale !== props.locale) {
|
|
48
|
+
// reload server
|
|
49
|
+
router.refresh();
|
|
50
|
+
// reload client
|
|
51
|
+
window.location.reload();
|
|
52
|
+
}
|
|
41
53
|
}
|
|
42
|
-
}, [
|
|
54
|
+
}, [
|
|
55
|
+
pathname, // Re-run when pathname changes
|
|
56
|
+
props.locale,
|
|
57
|
+
props.locales,
|
|
58
|
+
props.defaultLocale,
|
|
59
|
+
props.gtServicesEnabled,
|
|
60
|
+
]);
|
|
43
61
|
return (0, jsx_runtime_1.jsx)(client_1.ClientProvider, __assign({ onLocaleChange: onLocaleChange }, props));
|
|
44
62
|
}
|
|
45
63
|
//# sourceMappingURL=ClientProviderWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClientProviderWrapper.js","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"ClientProviderWrapper.js","sourceRoot":"","sources":["../../src/provider/ClientProviderWrapper.tsx"],"names":[],"mappings":";AAAA,YAAY,CAAC;;;;;;;;;;;;;AAYb,iCA6CC;;AAxDD,0CAAoE;AAEpE,8CAAyD;AACzD,+BAAkC;AAClC,gDAG4B;AAC5B,iDAAwD;AACxD,yDAAuD;AAEvD,SAAwB,cAAc,CACpC,KAAkD;IAElD,+CAA+C;IAC/C,IAAM,MAAM,GAAG,IAAA,sBAAS,GAAE,CAAC;IAC3B,IAAM,cAAc,GAAG;QACrB,QAAQ,CAAC,MAAM,GAAG,UAAG,yCAA6B,iBAAc,CAAC;QACjE,MAAM,CAAC,OAAO,EAAE,CAAC;IACnB,CAAC,CAAC;IAEF,0CAA0C;IAC1C,+FAA+F;IAC/F,IAAM,QAAQ,GAAG,IAAA,wBAAW,GAAE,CAAC;IAC/B,IAAA,iBAAS,EAAC;;QACR,uBAAuB;QACvB,IAAM,WAAW,GAAG,MAAA,QAAQ,CAAC,MAAM;aAChC,KAAK,CAAC,IAAI,CAAC;aACX,IAAI,CAAC,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,UAAU,CAAC,UAAG,2CAA+B,MAAG,CAAC,EAArD,CAAqD,CAAC,0CACnE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAClB,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;YAC3B,+BAA+B;YAC/B,IAAM,eAAe,GAAG,IAAA,qBAAa,EAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,aAAa,CAAC;YACvE,IAAM,UAAU,GAAG,KAAK,CAAC,iBAAiB;gBACxC,CAAC,CAAC,IAAA,sCAAiB,EAAC,eAAe,CAAC;gBACpC,CAAC,CAAC,eAAe,CAAC;YACpB,IACE,UAAU;gBACV,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;gBAClC,UAAU,KAAK,KAAK,CAAC,MAAM,EAC3B,CAAC;gBACD,gBAAgB;gBAChB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,gBAAgB;gBAChB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,EAAE;QACD,QAAQ,EAAE,+BAA+B;QACzC,KAAK,CAAC,MAAM;QACZ,KAAK,CAAC,OAAO;QACb,KAAK,CAAC,aAAa;QACnB,KAAK,CAAC,iBAAiB;KACxB,CAAC,CAAC;IAEH,OAAO,uBAAC,uBAAe,aAAC,cAAc,EAAE,cAAc,IAAM,KAAK,EAAI,CAAC;AACxE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTProvider.d.ts","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,SAAS,EAAE,MAAM,OAAO,CAAC;AAQlD;;;;;;;GAOG;AACH,wBAA8B,UAAU,CAAC,EACvC,QAAQ,EACR,EAAE,EAAE,QAAQ,GACb,EAAE;IACD,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,
|
|
1
|
+
{"version":3,"file":"GTProvider.d.ts","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,SAAS,EAAE,MAAM,OAAO,CAAC;AAQlD;;;;;;;GAOG;AACH,wBAA8B,UAAU,CAAC,EACvC,QAAQ,EACR,EAAE,EAAE,QAAQ,GACb,EAAE;IACD,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,EAAE,CAAC,EAAE,MAAM,CAAC;CACb,oDAmEA"}
|
|
@@ -145,7 +145,7 @@ function GTProvider(_a) {
|
|
|
145
145
|
return [4 /*yield*/, cachedTranslationsPromise];
|
|
146
146
|
case 6:
|
|
147
147
|
translations = _e.sent();
|
|
148
|
-
return [2 /*return*/, ((0, jsx_runtime_1.jsx)(ClientProviderWrapper_1.default, __assign({ dictionary: dictionary, initialTranslations: translations, dictionaryTranslations: dictionaryTranslations, locale: locale, locales: I18NConfig.getLocales(), defaultLocale: defaultLocale, translationRequired: translationRequired, dialectTranslationRequired: dialectTranslationRequired }, I18NConfig.getClientSideConfig(), { children: children })))];
|
|
148
|
+
return [2 /*return*/, ((0, jsx_runtime_1.jsx)(ClientProviderWrapper_1.default, __assign({ dictionary: dictionary, initialTranslations: translations, dictionaryTranslations: dictionaryTranslations, locale: locale, locales: I18NConfig.getLocales(), defaultLocale: defaultLocale, translationRequired: translationRequired, dialectTranslationRequired: dialectTranslationRequired, gtServicesEnabled: process.env._GENERALTRANSLATION_GT_SERVICES_ENABLED === 'true' }, I18NConfig.getClientSideConfig(), { children: children })))];
|
|
149
149
|
}
|
|
150
150
|
});
|
|
151
151
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GTProvider.js","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiBA,
|
|
1
|
+
{"version":3,"file":"GTProvider.js","sourceRoot":"","sources":["../../src/provider/GTProvider.tsx"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAiBA,6BAyEC;;AAzFD,+BAAkD;AAClD,8EAAwD;AACxD,mEAA6C;AAC7C,2EAAgF;AAEhF,uDAAqE;AACrE,kFAAqD;AAErD;;;;;;;GAOG;AACH,SAA8B,UAAU;wDAAC,EAMxC;;YALC,QAAQ,cAAA,EACJ,QAAQ,QAAA;;;;oBAMN,UAAU,GAAG,IAAA,uBAAa,GAAE,CAAC;oBACpB,qBAAM,IAAA,mBAAS,GAAE,EAAA;;oBAA1B,MAAM,GAAG,SAAiB;oBAC1B,aAAa,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;oBAC9C,KACJ,UAAU,CAAC,mBAAmB,CAAC,MAAM,CAAC,EADjC,mBAAmB,QAAA,EAAE,0BAA0B,QAAA,CACb;oBAItC,qBAAM,UAAU,CAAC,yBAAyB,CAAC,MAAM,CAAC,EAAA;;oBAD/C,sBAAsB,GAC1B,CAAC,SAAkD,CAAC,IAAI,EAAE;oBAItD,yBAAyB,GAC7B,mBAAmB;wBACjB,CAAC,CAAC,UAAU,CAAC,qBAAqB,CAAC,MAAM,CAAC;wBAC1C,CAAC,CAAE,EAAU,CAAC;yBAOf,QAAQ,EAAR,wBAAQ;oBAAG,KAAA,IAAA,kCAAkB,EAAC,QAAQ,CAAC,CAAA;;wBAAG,qBAAM,IAAA,uBAAa,GAAE,EAAA;;oBAArB,KAAA,SAAqB,CAAA;;;oBAD9D,UAAU,GACZ,IAAiE,IAAI,EAAE;oBAEzE,+BAA+B;oBAC/B,IACE,IAAA,sBAAc,EAAC,UAAU,CAAC;wBAC1B,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC;wBACzB,OAAO,UAAU,KAAK,QAAQ,EAC9B,CAAC;wBACD,oDAAoD;wBACpD,MAAM,IAAI,KAAK,CACb,IAAA,0CAA2B,EAAC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAE,cAAc,CAAC,CAC5D,CAAC;oBACJ,CAAC;oBAED,gCAAgC;oBAChC,IAAI,QAAQ,EAAE,CAAC;wBACP,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;wBACjD,UAAU,GAAG,UAAU,CAAC,MAAM,CAAa,UAAC,GAAG,EAAE,MAAM;;4BACrD,gBAAS,GAAC,MAAM,IAAG,GAAG,KAAG;wBAC3B,CAAC,EAAE,UAAwB,CAAC,CAAC;oBAC/B,CAAC;oBAGoB,qBAAM,yBAAyB,EAAA;;oBAA9C,YAAY,GAAG,SAA+B;oBAEpD,sBAAO,CACL,uBAAC,+BAAc,aACb,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,YAAY,EACjC,sBAAsB,EAAE,sBAAsB,EAC9C,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,UAAU,CAAC,UAAU,EAAE,EAChC,aAAa,EAAE,aAAa,EAC5B,mBAAmB,EAAE,mBAAmB,EACxC,0BAA0B,EAAE,0BAA0B,EACtD,iBAAiB,EACf,OAAO,CAAC,GAAG,CAAC,uCAAuC,KAAK,MAAM,IAE5D,UAAU,CAAC,mBAAmB,EAAE,cAEnC,QAAQ,IACM,CAClB,EAAC;;;;CACH"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
export declare const
|
|
1
|
+
export declare const middlewareLocaleRoutingFlagName = "generaltranslation.middleware.locale-routing";
|
|
2
2
|
export declare const middlewareLocaleResetFlagName = "generaltranslation.middleware.locale-reset";
|
|
3
3
|
//# sourceMappingURL=constants.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B,iDACI,CAAC;AACjD,eAAO,MAAM,6BAA6B,+CACI,CAAC"}
|
package/dist/utils/constants.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.middlewareLocaleResetFlagName = exports.
|
|
4
|
-
exports.
|
|
3
|
+
exports.middlewareLocaleResetFlagName = exports.middlewareLocaleRoutingFlagName = void 0;
|
|
4
|
+
exports.middlewareLocaleRoutingFlagName = 'generaltranslation.middleware.locale-routing';
|
|
5
5
|
exports.middlewareLocaleResetFlagName = 'generaltranslation.middleware.locale-reset';
|
|
6
6
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,+BAA+B,GAC1C,8CAA8C,CAAC;AACpC,QAAA,6BAA6B,GACxC,4CAA4C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "5.2.9-alpha.
|
|
3
|
+
"version": "5.2.9-alpha.5",
|
|
4
4
|
"description": "A Next.js library for automatic internationalization.",
|
|
5
5
|
"main": "dist/index.server.js",
|
|
6
6
|
"peerDependencies": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@generaltranslation/supported-locales": "^2.0.7-alpha.1",
|
|
13
13
|
"generaltranslation": "^6.2.2-alpha.1",
|
|
14
|
-
"gt-react": "^9.2.7-alpha.
|
|
14
|
+
"gt-react": "^9.2.7-alpha.2"
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"patch": "npm version patch",
|