gt-next 5.2.9-alpha.2 → 5.2.9-alpha.4
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.d.ts.map +1 -1
- package/dist/config.js +6 -6
- package/dist/config.js.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +17 -9
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +1 -0
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +3 -0
- package/dist/middleware-dir/utils.js.map +1 -1
- package/package.json +1 -1
package/dist/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAarE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,UAAU,GAAE,GAAQ,EACpB,KAAK,GAAE,iBAAsB,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAIA,OAAO,iBAAiB,MAAM,sCAAsC,CAAC;AAarE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqCG;AACH,wBAAgB,YAAY,CAC1B,UAAU,GAAE,GAAQ,EACpB,KAAK,GAAE,iBAAsB,OAmS9B;AAGD,eAAO,MAAM,MAAM,UAAW,iBAAiB,kBAAkB,GAAG,QACnC,CAAC"}
|
package/dist/config.js
CHANGED
|
@@ -144,13 +144,13 @@ function withGTConfig(nextConfig, props) {
|
|
|
144
144
|
: resolveConfigFilepath('routing', ['.ts', '.js']);
|
|
145
145
|
// ----------- LOCALE STANDARDIZATION ----------- //
|
|
146
146
|
// Check if using Services
|
|
147
|
-
var gtRuntimeTranslationEnabled = mergedConfig.runtimeUrl === defaultWithGTConfigProps_1.default.runtimeUrl &&
|
|
147
|
+
var gtRuntimeTranslationEnabled = !!(mergedConfig.runtimeUrl === defaultWithGTConfigProps_1.default.runtimeUrl &&
|
|
148
148
|
((process.env.NODE_ENV === 'production' && mergedConfig.apiKey) ||
|
|
149
|
-
(process.env.NODE_ENV === 'development' && mergedConfig.devApiKey));
|
|
150
|
-
var gtRemoteCacheEnabled = mergedConfig.cacheUrl === defaultWithGTConfigProps_1.default.cacheUrl &&
|
|
151
|
-
mergedConfig.loadTranslationsType === 'remote';
|
|
152
|
-
var gtServicesEnabled = (gtRuntimeTranslationEnabled || gtRemoteCacheEnabled) &&
|
|
153
|
-
mergedConfig.projectId;
|
|
149
|
+
(process.env.NODE_ENV === 'development' && mergedConfig.devApiKey)));
|
|
150
|
+
var gtRemoteCacheEnabled = !!(mergedConfig.cacheUrl === defaultWithGTConfigProps_1.default.cacheUrl &&
|
|
151
|
+
mergedConfig.loadTranslationsType === 'remote');
|
|
152
|
+
var gtServicesEnabled = !!((gtRuntimeTranslationEnabled || gtRemoteCacheEnabled) &&
|
|
153
|
+
mergedConfig.projectId);
|
|
154
154
|
// Standardize locales
|
|
155
155
|
if (mergedConfig.locales && mergedConfig.defaultLocale) {
|
|
156
156
|
mergedConfig.locales.unshift(mergedConfig.defaultLocale);
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAuDA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;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,2BAgLzC"}
|
|
@@ -83,10 +83,11 @@ function createNextMiddleware(_a) {
|
|
|
83
83
|
},
|
|
84
84
|
});
|
|
85
85
|
// ---------- LOCALE DETECTION ---------- //
|
|
86
|
-
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, approvedLocales, localeRouting, gtServicesEnabled), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale;
|
|
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
|
-
|
|
89
|
-
|
|
88
|
+
res.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
89
|
+
if (clearResetCookie) {
|
|
90
|
+
res.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
90
91
|
}
|
|
91
92
|
if (localeRouting) {
|
|
92
93
|
// ---------- GET PATHS ---------- //
|
|
@@ -133,8 +134,9 @@ function createNextMiddleware(_a) {
|
|
|
133
134
|
headers: headerList,
|
|
134
135
|
});
|
|
135
136
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
136
|
-
|
|
137
|
-
|
|
137
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
138
|
+
if (clearResetCookie) {
|
|
139
|
+
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
138
140
|
}
|
|
139
141
|
return response;
|
|
140
142
|
}
|
|
@@ -149,6 +151,10 @@ function createNextMiddleware(_a) {
|
|
|
149
151
|
headers: headerList,
|
|
150
152
|
});
|
|
151
153
|
response.headers.set(internal_1.localeHeaderName, userLocale);
|
|
154
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
155
|
+
if (clearResetCookie) {
|
|
156
|
+
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
157
|
+
}
|
|
152
158
|
return response;
|
|
153
159
|
}
|
|
154
160
|
// REDIRECT CASE: non-i18n path
|
|
@@ -164,8 +170,9 @@ function createNextMiddleware(_a) {
|
|
|
164
170
|
var redirectUrl = new URL(redirectPath, originalUrl);
|
|
165
171
|
redirectUrl.search = originalUrl.search;
|
|
166
172
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
167
|
-
|
|
168
|
-
|
|
173
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
174
|
+
if (clearResetCookie) {
|
|
175
|
+
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
169
176
|
}
|
|
170
177
|
return response;
|
|
171
178
|
}
|
|
@@ -174,8 +181,9 @@ function createNextMiddleware(_a) {
|
|
|
174
181
|
var redirectUrl = new URL(localizedPathWithParameters, originalUrl);
|
|
175
182
|
redirectUrl.search = originalUrl.search;
|
|
176
183
|
var response = server_1.NextResponse.redirect(redirectUrl);
|
|
177
|
-
|
|
178
|
-
|
|
184
|
+
response.cookies.set(constants_1.middlewareLocaleName, userLocale);
|
|
185
|
+
if (clearResetCookie) {
|
|
186
|
+
response.cookies.delete(constants_1.middlewareLocaleResetFlagName);
|
|
179
187
|
}
|
|
180
188
|
return response;
|
|
181
189
|
}
|
|
@@ -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":";;AAoCA,uCA6PC;AAjSD,yDAI4B;AAC5B,wDAGqC;AACrC,uDAAyE;AACzE,sCAAwD;AACxD,gDAG4B;AAC5B,iCAOiB;AAEjB;;;;;;;;;;;GAWG;AACH,SAAwB,oBAAoB,CAAC,EAQ5C;QAPC,qBAAoB,EAApB,aAAa,mBAAG,IAAI,KAAA,EACpB,2BAA2B,EAA3B,mBAAmB,mBAAG,KAAK,KAAA,EAC3B,kBAAe,EAAf,UAAU,mBAAG,EAAE,KAAA;IAMf,cAAc;IACd,IAAI,SAAS,CAAC;IACd,IAAI,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,CAAC;QACvD,IAAI,CAAC;YACH,SAAS,GAAG,IAAI,CAAC,KAAK,CACpB,OAAO,CAAC,GAAG,CAAC,sCAAsC,CACnD,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,IAAM,iBAAiB,GACrB,OAAO,CAAC,GAAG,CAAC,uCAAuC,KAAK,MAAM,CAAC;IAEjE,cAAc;IACd,IAAM,aAAa,GACjB,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,aAAa,KAAI,+BAAoB,CAAC;IACnD,IAAM,OAAO,GAAa,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,KAAI,CAAC,aAAa,CAAC,CAAC;IAEhE,IAAI,CAAC,IAAA,kCAAa,EAAC,aAAa,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,8CAAsC,aAAa,8BAA0B,CAC9E,CAAC;IAEJ,IAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,UAAC,MAAM,IAAK,OAAA,CAAC,IAAA,kCAAa,EAAC,MAAM,CAAC,EAAtB,CAAsB,CAAC,CAAC;IAC1E,IAAI,cAAc,CAAC,MAAM;QACvB,OAAO,CAAC,IAAI,CAAC,IAAA,8CAA+B,EAAC,cAAc,CAAC,CAAC,CAAC;IAEhE,IAAM,eAAe,GAAG,OAAO,CAAC;IAEhC,gDAAgD;IAEhD,+BAA+B;IAC/B,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAC5C,UAAC,GAAG,EAAE,EAA2B;YAA1B,UAAU,QAAA,EAAE,aAAa,QAAA;QAC9B,IAAI,OAAO,aAAa,KAAK,QAAQ,EAAE,CAAC;YACtC,GAAG,CAAC,UAAU,CAAC,GAAG,aAAa,CAAC;QAClC,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,MAAM,CAEnD,UAAC,GAAG,EAAE,EAAuB;oBAAtB,MAAM,QAAA,EAAE,aAAa,QAAA;gBAC7B,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC,IAAA,sCAAiB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;oBACzD,aAAa,CAAC;gBAChB,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CACH,CAAC;IAEF,0BAA0B;IAC1B,IAAM,gBAAgB,GAAG,IAAA,iCAAyB,EAAC,UAAU,CAAC,CAAC;IAC/D;;;;;;;;;;;;OAYG;IACH,SAAS,cAAc,CAAC,GAAgB;QACtC,IAAM,UAAU,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAE5C,IAAM,GAAG,GAAG,qBAAY,CAAC,IAAI,CAAC;YAC5B,OAAO,EAAE;gBACP,sBAAsB;gBACtB,OAAO,EAAE,UAAU;aACpB;SACF,CAAC,CAAC;QAEH,4CAA4C;QAEtC,IAAA,KAKF,IAAA,4BAAoB,EACtB,GAAG,EACH,aAAa,EACb,eAAe,EACf,aAAa,EACb,iBAAiB,CAClB,EAVC,UAAU,gBAAA,EACV,cAAc,oBAAA,EACd,4BAA4B,kCAAA,EAC5B,gBAAgB,sBAOjB,CAAC;QAEF,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,2BAAgB,EAAE,UAAU,CAAC,CAAC;QAE9C,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAoB,EAAE,UAAU,CAAC,CAAC;QAElD,IAAI,gBAAgB,EAAE,CAAC;YACrB,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,yCAA6B,CAAC,CAAC;QACpD,CAAC;QAED,IAAI,aAAa,EAAE,CAAC;YAClB,qCAAqC;YAE7B,IAAA,QAAQ,GAAK,GAAG,CAAC,OAAO,SAAhB,CAAiB;YACjC,8FAA8F;YAC9F,IAAM,kBAAkB,GAAG,cAAc;gBACvC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,YAAK,4BAA4B,CAAE,CAAC,EAAE,EAAE,CAAC;gBACvE,CAAC,CAAC,QAAQ,CAAC;YACb,IAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC;YAEhC,2EAA2E;YAC3E,IAAM,oBAAoB,GACxB,cAAc,IAAI,cAAc,KAAK,4BAA4B;gBAC/D,CAAC,CAAC,QAAQ,CAAC,OAAO,CACd,IAAI,MAAM,CAAC,YAAK,4BAA4B,CAAE,CAAC,EAC/C,WAAI,UAAU,CAAE,CACjB;gBACH,CAAC,CAAC,QAAQ,CAAC;YAEf,kDAAkD;YAClD,IAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;YAEvE,wEAAwE;YACxE,IAAM,aAAa,GACjB,UAAU,IAAI,IAAA,wBAAgB,EAAC,UAAU,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAErE,wGAAwG;YACxG,IAAM,2BAA2B,GAC/B,aAAa;gBACb,IAAA,8BAAsB,EACpB,cAAc;oBACZ,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,WAAI,UAAU,SAAG,oBAAoB,CAAE,EAC3C,aAAa,CACd,CAAC;YAEJ,yCAAyC;YAEzC,8HAA8H;YAC9H,IACE,2BAA2B;gBAC3B,oBAAoB,KAAK,2BAA2B;gBACpD,UAAU,KAAK,aAAa,EAC5B,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC;YAED,8FAA8F;YAC9F,IACE,QAAQ,KAAK,2BAA2B;gBACxC,WAAI,UAAU,SAAG,UAAU,CAAE,KAAK,2BAA2B,EAC7D,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC;YAED,wIAAwI;YACxI,IACE,2BAA2B;gBAC3B,oBAAoB,KAAK,2BAA2B,EACpD,CAAC;gBACD,iDAAiD;gBACjD,IAAM,WAAW,GAAG,IAAA,8BAAsB,EACxC,2BAA2B,EAC3B,WAAI,UAAU,SAAG,UAAU,CAAE,CAC9B,CAAC;gBACF,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBACrD,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;gBACvC,UAAU,CAAC,GAAG,CAAC,2BAAgB,EAAE,UAAU,CAAC,CAAC;gBAC7C,IAAM,QAAQ,GAAG,qBAAY,CAAC,OAAO,CAAC,UAAU,EAAE;oBAChD,OAAO,EAAE,UAAU;iBACpB,CAAC,CAAC;gBACH,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAAgB,EAAE,UAAU,CAAC,CAAC;gBACnD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAoB,EAAE,UAAU,CAAC,CAAC;gBACvD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,yCAA6B,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,iCAAiC;YACjC,IACE,CAAC,cAAc;gBACf,CAAC,mBAAmB;gBACpB,IAAA,kCAAa,EAAC,UAAU,EAAE,aAAa,CAAC,EACxC,CAAC;gBACD,IAAM,WAAW,GAAG,WAAI,UAAU,SAAG,QAAQ,CAAE,CAAC;gBAChD,IAAM,UAAU,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;gBACrD,UAAU,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;gBACvC,IAAM,QAAQ,GAAG,qBAAY,CAAC,OAAO,CAAC,UAAU,EAAE;oBAChD,OAAO,EAAE,UAAU;iBACpB,CAAC,CAAC;gBACH,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,2BAAgB,EAAE,UAAU,CAAC,CAAC;gBACnD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAoB,EAAE,UAAU,CAAC,CAAC;gBACvD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,yCAA6B,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,+BAA+B;YAC/B,oHAAoH;YACpH,2FAA2F;YAC3F,qFAAqF;YACrF,IAAI,4BAA4B,KAAK,UAAU,EAAE,CAAC;gBAChD,0BAA0B;gBAC1B,IAAM,YAAY,GAChB,2BAA2B;oBAC3B,CAAC,cAAc;wBACb,CAAC,CAAC,QAAQ,CAAC,OAAO,CACd,IAAI,MAAM,CAAC,YAAK,4BAA4B,CAAE,CAAC,EAC/C,WAAI,UAAU,CAAE,CACjB;wBACH,CAAC,CAAC,WAAI,UAAU,SAAG,QAAQ,CAAE,CAAC,CAAC;gBACnC,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;gBACvD,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;gBACxC,IAAM,QAAQ,GAAG,qBAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACpD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAoB,EAAE,UAAU,CAAC,CAAC;gBACvD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,yCAA6B,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,sJAAsJ;YACtJ,IAAI,2BAA2B,EAAE,CAAC;gBAChC,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,2BAA2B,EAAE,WAAW,CAAC,CAAC;gBACtE,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;gBACxC,IAAM,QAAQ,GAAG,qBAAY,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBACpD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAoB,EAAE,UAAU,CAAC,CAAC;gBACvD,IAAI,gBAAgB,EAAE,CAAC;oBACrB,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,yCAA6B,CAAC,CAAC;gBACzD,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,YAAY;YACZ,OAAO,GAAG,CAAC;QACb,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC"}
|
|
@@ -39,5 +39,6 @@ export declare function getLocaleFromRequest(req: NextRequest, defaultLocale: st
|
|
|
39
39
|
userLocale: string;
|
|
40
40
|
pathnameLocale: string | undefined;
|
|
41
41
|
unstandardizedPathnameLocale: string | null | undefined;
|
|
42
|
+
clearResetCookie: boolean;
|
|
42
43
|
};
|
|
43
44
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -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;AAiB1C,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,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC1C,MAAM,GAAG,SAAS,CAkBpB;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,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;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAiB1C,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,aAAa,CAC3B,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,GAC1C,MAAM,GAAG,SAAS,CAkBpB;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,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,CA4EA"}
|
|
@@ -115,6 +115,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
115
115
|
var _a, _b, _c;
|
|
116
116
|
var headerList = new Headers(req.headers);
|
|
117
117
|
var candidates = [];
|
|
118
|
+
var clearResetCookie = false;
|
|
118
119
|
// Check pathname locales
|
|
119
120
|
var pathnameLocale, unstandardizedPathnameLocale;
|
|
120
121
|
var pathname = req.nextUrl.pathname;
|
|
@@ -135,6 +136,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
135
136
|
var resetCookie = req.cookies.get(resetCookieName);
|
|
136
137
|
if (resetCookie === null || resetCookie === void 0 ? void 0 : resetCookie.value) {
|
|
137
138
|
candidates.unshift(cookieLocale.value);
|
|
139
|
+
clearResetCookie = true;
|
|
138
140
|
}
|
|
139
141
|
else {
|
|
140
142
|
candidates.push(cookieLocale.value);
|
|
@@ -172,6 +174,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
172
174
|
userLocale: userLocale,
|
|
173
175
|
pathnameLocale: pathnameLocale,
|
|
174
176
|
unstandardizedPathnameLocale: unstandardizedPathnameLocale,
|
|
177
|
+
clearResetCookie: clearResetCookie,
|
|
175
178
|
};
|
|
176
179
|
}
|
|
177
180
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":";;AAwBA,sCAGC;AAKD,sCAqBC;AAKD,oDAiBC;AAKD,wDAYC;AAKD,4CAiBC;AAKD,8DAyBC;AAKD,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|