gt-next 5.2.19-alpha.1 → 5.2.19-alpha.3
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 +17 -34
- 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 +2 -8
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +2 -12
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/dist/utils/constants.d.ts +0 -1
- package/dist/utils/constants.d.ts.map +1 -1
- package/dist/utils/constants.js +1 -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;
|
|
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;AAGxD,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,SA0EyB,WAAW,2BAiOzC"}
|
|
@@ -6,6 +6,7 @@ var internal_1 = require("generaltranslation/internal");
|
|
|
6
6
|
var createErrors_1 = require("../errors/createErrors");
|
|
7
7
|
var server_1 = require("next/server");
|
|
8
8
|
var constants_1 = require("../utils/constants");
|
|
9
|
+
var internal_2 = require("gt-react/internal");
|
|
9
10
|
var utils_1 = require("./utils");
|
|
10
11
|
/**
|
|
11
12
|
* Middleware factory to create a Next.js middleware for i18n routing and locale detection.
|
|
@@ -75,7 +76,6 @@ function createNextMiddleware(_a) {
|
|
|
75
76
|
* @returns {NextResponse} - The Next.js response, either continuing the request or redirecting to the localized URL.
|
|
76
77
|
*/
|
|
77
78
|
function nextMiddleware(req) {
|
|
78
|
-
console.log('--------------------------------');
|
|
79
79
|
var headerList = new Headers(req.headers);
|
|
80
80
|
var res = server_1.NextResponse.next({
|
|
81
81
|
request: {
|
|
@@ -88,7 +88,7 @@ function createNextMiddleware(_a) {
|
|
|
88
88
|
res.headers.set(internal_1.localeHeaderName, userLocale);
|
|
89
89
|
res.cookies.set(constants_1.middlewareLocaleRoutingFlagName, localeRouting.toString());
|
|
90
90
|
if (clearResetCookie) {
|
|
91
|
-
res.cookies.delete(
|
|
91
|
+
res.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
92
92
|
}
|
|
93
93
|
if (localeRouting) {
|
|
94
94
|
// ---------- GET PATHS ---------- //
|
|
@@ -112,14 +112,6 @@ function createNextMiddleware(_a) {
|
|
|
112
112
|
(0, utils_1.replaceDynamicSegments)(pathnameLocale
|
|
113
113
|
? standardizedPathname
|
|
114
114
|
: "/".concat(userLocale).concat(standardizedPathname), localizedPath);
|
|
115
|
-
console.log('........');
|
|
116
|
-
console.log('[MIDDLEWARE] userLocale', userLocale);
|
|
117
|
-
console.log('[MIDDLEWARE] pathnameLocale', pathnameLocale);
|
|
118
|
-
console.log('[MIDDLEWARE] unstandardizedPathnameLocale', unstandardizedPathnameLocale);
|
|
119
|
-
console.log('........');
|
|
120
|
-
console.log('[MIDDLEWARE] pathname', pathname);
|
|
121
|
-
console.log('[MIDDLEWARE] localizedPathWithParameters', localizedPathWithParameters);
|
|
122
|
-
console.log('........');
|
|
123
115
|
// ---------- ROUTING LOGIC ---------- //
|
|
124
116
|
// CASE: no localized path exists
|
|
125
117
|
if (!localizedPathWithParameters) {
|
|
@@ -127,7 +119,6 @@ function createNextMiddleware(_a) {
|
|
|
127
119
|
if (pathnameLocale) {
|
|
128
120
|
// BASE CASE: no localized path exists, so no change
|
|
129
121
|
if (userLocale === unstandardizedPathnameLocale) {
|
|
130
|
-
console.log("[MIDDLEWARE] BASE CASE: no localized path exists, so no change: ".concat(pathname));
|
|
131
122
|
return res;
|
|
132
123
|
}
|
|
133
124
|
// REDIRECT CASE: wrong pathname locale (/fr -> /en)
|
|
@@ -137,17 +128,16 @@ function createNextMiddleware(_a) {
|
|
|
137
128
|
var response_1 = server_1.NextResponse.redirect(redirectUrl_1);
|
|
138
129
|
response_1.headers.set(internal_1.localeHeaderName, userLocale);
|
|
139
130
|
response_1.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
console.log("[MIDDLEWARE] REDIRECT CASE: wrong pathname locale: ".concat(pathname, " -> ").concat(redirectPath_1));
|
|
131
|
+
if (clearResetCookie) {
|
|
132
|
+
response_1.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
133
|
+
}
|
|
144
134
|
return response_1;
|
|
145
135
|
}
|
|
146
136
|
// REWRITE: no default locale prefix (/customers -> /en/customers)
|
|
147
137
|
if (!pathnameLocale &&
|
|
148
138
|
!prefixDefaultLocale &&
|
|
149
139
|
(0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
150
|
-
var rewritePath = "/".concat(
|
|
140
|
+
var rewritePath = "/".concat(defaultLocale).concat(pathname);
|
|
151
141
|
var rewriteUrl = new URL(rewritePath, originalUrl);
|
|
152
142
|
rewriteUrl.search = originalUrl.search;
|
|
153
143
|
var response_2 = server_1.NextResponse.rewrite(rewriteUrl, {
|
|
@@ -155,10 +145,9 @@ function createNextMiddleware(_a) {
|
|
|
155
145
|
});
|
|
156
146
|
response_2.headers.set(internal_1.localeHeaderName, userLocale);
|
|
157
147
|
response_2.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
console.log("[MIDDLEWARE] REWRITE CASE: no default locale prefix: ".concat(pathname, " -> ").concat(rewritePath));
|
|
148
|
+
if (clearResetCookie) {
|
|
149
|
+
response_2.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
150
|
+
}
|
|
162
151
|
return response_2;
|
|
163
152
|
}
|
|
164
153
|
// REDIRECT CASE: no/invalid pathnameLocale, add a default locale prefix
|
|
@@ -168,10 +157,9 @@ function createNextMiddleware(_a) {
|
|
|
168
157
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
169
158
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
170
159
|
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
console.log("[MIDDLEWARE] REDIRECT CASE: no/invalid pathnameLocale, add a default locale prefix: ".concat(pathname, " -> ").concat(redirectPath));
|
|
160
|
+
if (clearResetCookie) {
|
|
161
|
+
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
162
|
+
}
|
|
175
163
|
return response;
|
|
176
164
|
}
|
|
177
165
|
// CASE: remove default locale prefix
|
|
@@ -179,7 +167,7 @@ function createNextMiddleware(_a) {
|
|
|
179
167
|
!prefixDefaultLocale &&
|
|
180
168
|
(0, generaltranslation_1.isSameDialect)(userLocale, defaultLocale)) {
|
|
181
169
|
// REDIRECT CASE: displaying wrong path, convert to non-prefixed localized path (/about -> /en-about) (/dashboard/1/custom -> /en-dashboard/1/en-custom)
|
|
182
|
-
if (localizedPathWithParameters !== "/".concat(
|
|
170
|
+
if (localizedPathWithParameters !== "/".concat(defaultLocale).concat(pathname)) {
|
|
183
171
|
// remove locale prefix
|
|
184
172
|
var redirectPath = localizedPathWithParameters.replace(new RegExp("^/".concat(userLocale)), '');
|
|
185
173
|
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
@@ -188,9 +176,8 @@ function createNextMiddleware(_a) {
|
|
|
188
176
|
response_3.headers.set(internal_1.localeHeaderName, userLocale);
|
|
189
177
|
response_3.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
190
178
|
if (clearResetCookie) {
|
|
191
|
-
response_3.cookies.delete(
|
|
179
|
+
response_3.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
192
180
|
}
|
|
193
|
-
console.log("[MIDDLEWARE] REDIRECT CASE: displaying wrong path, convert to non-prefixed localized path: ".concat(pathname, " -> ").concat(redirectPath));
|
|
194
181
|
return response_3;
|
|
195
182
|
}
|
|
196
183
|
// REWRITE CASE: displaying correct path (/blog -> /en/blog) (/en-dashboard/1/en-custom -> /en/dashboard/1/custom) (/en-about -> /en/about)
|
|
@@ -206,9 +193,8 @@ function createNextMiddleware(_a) {
|
|
|
206
193
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
207
194
|
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
208
195
|
if (clearResetCookie) {
|
|
209
|
-
response.cookies.delete(
|
|
196
|
+
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
210
197
|
}
|
|
211
|
-
console.log("[MIDDLEWARE] REWRITE CASE: displaying correct path: ".concat(pathname, " -> ").concat(rewritePath));
|
|
212
198
|
return response;
|
|
213
199
|
}
|
|
214
200
|
// REDIRECT CASE: no localization prefix (invalid path), redirect to a localized path (ie, /blog -> /en-US/blog) (/dashboard -> /fr/fr-dashboard)
|
|
@@ -224,9 +210,8 @@ function createNextMiddleware(_a) {
|
|
|
224
210
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
225
211
|
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
226
212
|
if (clearResetCookie) {
|
|
227
|
-
response.cookies.delete(
|
|
213
|
+
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
228
214
|
}
|
|
229
|
-
console.log("[MIDDLEWARE] REDIRECT CASE: no localization prefix (invalid path), redirect to a localized path: ".concat(pathname, " -> ").concat(redirectPath));
|
|
230
215
|
return response;
|
|
231
216
|
}
|
|
232
217
|
// 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)
|
|
@@ -243,13 +228,11 @@ function createNextMiddleware(_a) {
|
|
|
243
228
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
244
229
|
response.cookies.set(constants_1.middlewareLocaleRoutingFlagName, 'true');
|
|
245
230
|
if (clearResetCookie) {
|
|
246
|
-
response.cookies.delete(
|
|
231
|
+
response.cookies.delete(internal_2.middlewareLocaleResetFlagName);
|
|
247
232
|
}
|
|
248
|
-
console.log("[MIDDLEWARE] REWRITE CASE: displaying correct path at localized path, which is the same as the shared path: ".concat(pathname, " -> ").concat(rewritePath));
|
|
249
233
|
return response;
|
|
250
234
|
}
|
|
251
235
|
// BASE CASE
|
|
252
|
-
console.log('[MIDDLEWARE] BASE CASE: no change', pathname);
|
|
253
236
|
}
|
|
254
237
|
return res;
|
|
255
238
|
}
|
|
@@ -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,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,CA+BA;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,
|
|
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,CA+BA;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"}
|
|
@@ -9,7 +9,7 @@ exports.getSharedPath = getSharedPath;
|
|
|
9
9
|
exports.getLocaleFromRequest = getLocaleFromRequest;
|
|
10
10
|
var generaltranslation_1 = require("generaltranslation");
|
|
11
11
|
var internal_1 = require("generaltranslation/internal");
|
|
12
|
-
var
|
|
12
|
+
var internal_2 = require("gt-react/internal");
|
|
13
13
|
/**
|
|
14
14
|
* Extracts the locale from the given pathname.
|
|
15
15
|
*/
|
|
@@ -175,10 +175,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
175
175
|
// Check cookie locale
|
|
176
176
|
var cookieLocale = req.cookies.get(internal_1.localeCookieName);
|
|
177
177
|
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(
|
|
179
|
-
console.log('........');
|
|
180
|
-
console.log('[MIDDLEWARE] resetCookie', resetCookie);
|
|
181
|
-
console.log('[MIDDLEWARE] cookieLocale', cookieLocale);
|
|
178
|
+
var resetCookie = req.cookies.get(internal_2.middlewareLocaleResetFlagName);
|
|
182
179
|
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
183
180
|
candidates.unshift(cookieLocale.value);
|
|
184
181
|
clearResetCookie = true;
|
|
@@ -191,11 +188,8 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
191
188
|
var refererLocale;
|
|
192
189
|
if (localeRouting) {
|
|
193
190
|
var referer = headerList.get('referer');
|
|
194
|
-
console.log('........');
|
|
195
|
-
console.log('[MIDDLEWARE] referer', referer);
|
|
196
191
|
if (referer && typeof referer === 'string') {
|
|
197
192
|
refererLocale = extractLocale((_a = new URL(referer)) === null || _a === void 0 ? void 0 : _a.pathname);
|
|
198
|
-
console.log('[MIDDLEWARE] refererLocale', refererLocale);
|
|
199
193
|
if ((0, generaltranslation_1.isValidLocale)(refererLocale || ''))
|
|
200
194
|
candidates.push(refererLocale || '');
|
|
201
195
|
}
|
|
@@ -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,8DAsCC;AAKD,sCA8BC;AA+BD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { ClientProviderProps } from 'gt-react/internal';
|
|
2
|
-
export default function ClientProvider(props:
|
|
2
|
+
export default function ClientProvider(props: ClientProviderProps): import("react/jsx-runtime").JSX.Element;
|
|
3
3
|
//# sourceMappingURL=ClientProviderWrapper.d.ts.map
|
|
@@ -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;AAOxD,MAAM,CAAC,OAAO,UAAU,cAAc,CAAC,KAAK,EAAE,mBAAmB,2CAqChE"}
|
|
@@ -21,13 +21,6 @@ var constants_1 = require("../utils/constants");
|
|
|
21
21
|
var utils_1 = require("../middleware-dir/utils");
|
|
22
22
|
var generaltranslation_1 = require("generaltranslation");
|
|
23
23
|
function ClientProvider(props) {
|
|
24
|
-
// locale change on client, trigger page reload
|
|
25
|
-
var router = (0, navigation_1.useRouter)();
|
|
26
|
-
var onLocaleChange = function () {
|
|
27
|
-
console.log('[CLIENT] Prioritize locale cookie and refresh server pages');
|
|
28
|
-
document.cookie = "".concat(constants_1.middlewareLocaleResetFlagName, "=true;path=/");
|
|
29
|
-
router.refresh();
|
|
30
|
-
};
|
|
31
24
|
// Trigger page reload when locale changes
|
|
32
25
|
// When nav to same route but in diff locale, client components were cached and not re-rendered
|
|
33
26
|
var pathname = (0, navigation_1.usePathname)();
|
|
@@ -48,10 +41,7 @@ function ClientProvider(props) {
|
|
|
48
41
|
pathLocale !== props.locale) {
|
|
49
42
|
// clear cookie (avoids infinite loop when there is no middleware)
|
|
50
43
|
document.cookie = "".concat(constants_1.middlewareLocaleRoutingFlagName, "=;path=/");
|
|
51
|
-
|
|
52
|
-
// reload server
|
|
53
|
-
router.refresh();
|
|
54
|
-
// reload client
|
|
44
|
+
// reload page
|
|
55
45
|
window.location.reload();
|
|
56
46
|
}
|
|
57
47
|
}
|
|
@@ -62,6 +52,6 @@ function ClientProvider(props) {
|
|
|
62
52
|
props.defaultLocale,
|
|
63
53
|
props.gtServicesEnabled,
|
|
64
54
|
]);
|
|
65
|
-
return (0, jsx_runtime_1.jsx)(client_1.ClientProvider, __assign({
|
|
55
|
+
return (0, jsx_runtime_1.jsx)(client_1.ClientProvider, __assign({}, props));
|
|
66
56
|
}
|
|
67
57
|
//# 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;;;;;;;;;;;;;AASb,iCAqCC;;AA7CD,0CAAoE;AAEpE,8CAA8C;AAC9C,+BAAkC;AAClC,gDAAqE;AACrE,iDAAwD;AACxD,yDAAuD;AAEvD,SAAwB,cAAc,CAAC,KAA0B;IAC/D,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,kEAAkE;gBAClE,QAAQ,CAAC,MAAM,GAAG,UAAG,2CAA+B,aAAU,CAAC;gBAE/D,cAAc;gBACd,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,eAAK,KAAK,EAAI,CAAC;AACxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B,iDACI,CAAC
|
|
1
|
+
{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,+BAA+B,iDACI,CAAC"}
|
package/dist/utils/constants.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.middlewareLocaleRoutingFlagName = void 0;
|
|
4
4
|
exports.middlewareLocaleRoutingFlagName = 'generaltranslation.middleware.locale-routing';
|
|
5
|
-
exports.middlewareLocaleResetFlagName = 'generaltranslation.middleware.locale-reset';
|
|
6
5
|
//# sourceMappingURL=constants.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,+BAA+B,GAC1C,8CAA8C,CAAC
|
|
1
|
+
{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/utils/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,+BAA+B,GAC1C,8CAA8C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "gt-next",
|
|
3
|
-
"version": "5.2.19-alpha.
|
|
3
|
+
"version": "5.2.19-alpha.3",
|
|
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",
|
|
13
13
|
"generaltranslation": "^6.2.2",
|
|
14
|
-
"gt-react": "^9.2.14-alpha.
|
|
14
|
+
"gt-react": "^9.2.14-alpha.3"
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"patch": "npm version patch",
|