gt-next 6.6.2 → 6.6.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/CHANGELOG.md +6 -0
- package/dist/middleware-dir/createNextMiddleware.d.ts.map +1 -1
- package/dist/middleware-dir/createNextMiddleware.js +6 -2
- package/dist/middleware-dir/createNextMiddleware.js.map +1 -1
- package/dist/middleware-dir/utils.d.ts +1 -1
- package/dist/middleware-dir/utils.d.ts.map +1 -1
- package/dist/middleware-dir/utils.js +4 -4
- package/dist/middleware-dir/utils.js.map +1 -1
- package/dist/next/getNextLocale.d.ts.map +1 -1
- package/dist/next/getNextLocale.js.map +1 -1
- package/dist/provider/ClientProviderWrapper.d.ts.map +1 -1
- package/dist/provider/ClientProviderWrapper.js +5 -2
- package/dist/provider/ClientProviderWrapper.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,11 @@
|
|
|
1
1
|
# gt-next
|
|
2
2
|
|
|
3
|
+
## 6.6.3
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#692](https://github.com/generaltranslation/gt/pull/692) [`c86fc88`](https://github.com/generaltranslation/gt/commit/c86fc882b92c875b93328178e9211ec414d69011) Thanks [@ErnestM1234](https://github.com/ErnestM1234)! - fix: canonical locale issues in middleware
|
|
8
|
+
|
|
3
9
|
## 6.6.2
|
|
4
10
|
|
|
5
11
|
### Patch Changes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOxD,OAAO,EACL,UAAU,EAOX,MAAM,SAAS,CAAC;AAKjB;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAoB,EACpB,mBAA2B,EAC3B,gBAAuB,EACvB,UAAe,GAChB,GAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;CACpB,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAOxD,OAAO,EACL,UAAU,EAOX,MAAM,SAAS,CAAC;AAKjB;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,oBAAoB,CAAC,EAC3C,aAAoB,EACpB,mBAA2B,EAC3B,gBAAuB,EACvB,UAAe,GAChB,GAAE;IACD,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAC9B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,UAAU,CAAC,EAAE,UAAU,CAAC;CACpB,SAoGqB,WAAW,2BA2MrC"}
|
|
@@ -57,6 +57,11 @@ function createNextMiddleware(_a) {
|
|
|
57
57
|
// i18n config
|
|
58
58
|
var defaultLocale = (envParams === null || envParams === void 0 ? void 0 : envParams.defaultLocale) || internal_1.libraryDefaultLocale;
|
|
59
59
|
var locales = (envParams === null || envParams === void 0 ? void 0 : envParams.locales) || [defaultLocale];
|
|
60
|
+
// add canonical locales
|
|
61
|
+
var canonicalLocales = Object.values(((envParams === null || envParams === void 0 ? void 0 : envParams.customMapping) || {}))
|
|
62
|
+
.filter(function (locale) { return locale.code; })
|
|
63
|
+
.map(function (locale) { return locale.code; });
|
|
64
|
+
locales.push.apply(locales, canonicalLocales);
|
|
60
65
|
// cookies and header names
|
|
61
66
|
var headersAndCookies = (envParams === null || envParams === void 0 ? void 0 : envParams.headersAndCookies) || {};
|
|
62
67
|
var localeRoutingEnabledCookieName = (headersAndCookies === null || headersAndCookies === void 0 ? void 0 : headersAndCookies.localeRoutingEnabledCookieName) ||
|
|
@@ -71,7 +76,6 @@ function createNextMiddleware(_a) {
|
|
|
71
76
|
var warningLocales = locales.filter(function (locale) { return !gt.isValidLocale(locale); });
|
|
72
77
|
if (warningLocales.length)
|
|
73
78
|
console.warn((0, createErrors_1.createUnsupportedLocalesWarning)(warningLocales));
|
|
74
|
-
var approvedLocales = locales;
|
|
75
79
|
// ---------- PRE-PROCESSING PATHS ---------- //
|
|
76
80
|
// Standardize pathConfig paths
|
|
77
81
|
pathConfig = Object.entries(pathConfig).reduce(function (acc, _a) {
|
|
@@ -111,7 +115,7 @@ function createNextMiddleware(_a) {
|
|
|
111
115
|
return server_1.NextResponse.next();
|
|
112
116
|
}
|
|
113
117
|
// ---------- LOCALE DETECTION ---------- //
|
|
114
|
-
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale,
|
|
118
|
+
var _a = (0, utils_1.getLocaleFromRequest)(req, defaultLocale, locales, localeRouting, gtServicesEnabled, prefixDefaultLocale, defaultLocalePaths, referrerLocaleCookieName, localeCookieName, resetLocaleCookieName, gt), userLocale = _a.userLocale, pathnameLocale = _a.pathnameLocale, unstandardizedPathnameLocale = _a.unstandardizedPathnameLocale, clearResetCookie = _a.clearResetCookie;
|
|
115
119
|
var headerList = new Headers(req.headers);
|
|
116
120
|
var responseConfig = {
|
|
117
121
|
originalUrl: req.nextUrl,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAsCA,
|
|
1
|
+
{"version":3,"file":"createNextMiddleware.js","sourceRoot":"","sources":["../../src/middleware-dir/createNextMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,7 +23,7 @@ export declare function getResponse({ type, originalUrl, responsePath, userLocal
|
|
|
23
23
|
/**
|
|
24
24
|
* Extracts the locale from the given pathname.
|
|
25
25
|
*/
|
|
26
|
-
export declare function extractLocale(pathname: string
|
|
26
|
+
export declare function extractLocale(pathname: string): string | null;
|
|
27
27
|
/**
|
|
28
28
|
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
29
29
|
*/
|
|
@@ -1 +1 @@
|
|
|
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;AACxD,OAAO,EAAmB,EAAE,EAAqB,MAAM,oBAAoB,CAAC;AAC5E,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,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,9 +46,9 @@ function getResponse(_a) {
|
|
|
46
46
|
/**
|
|
47
47
|
* Extracts the locale from the given pathname.
|
|
48
48
|
*/
|
|
49
|
-
function extractLocale(pathname
|
|
49
|
+
function extractLocale(pathname) {
|
|
50
50
|
var matches = pathname.match(/^\/([^\/]+)(?:\/|$)/);
|
|
51
|
-
return matches ?
|
|
51
|
+
return matches ? matches[1] : null;
|
|
52
52
|
}
|
|
53
53
|
/**
|
|
54
54
|
* Extracts dynamic parameters from a path based on a shared path pattern
|
|
@@ -199,7 +199,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
199
199
|
// Check pathname locales
|
|
200
200
|
var pathnameLocale, unstandardizedPathnameLocale;
|
|
201
201
|
if (localeRouting) {
|
|
202
|
-
unstandardizedPathnameLocale = extractLocale(pathname
|
|
202
|
+
unstandardizedPathnameLocale = extractLocale(pathname);
|
|
203
203
|
var extractedLocale = gtServicesEnabled
|
|
204
204
|
? (0, generaltranslation_1.standardizeLocale)(unstandardizedPathnameLocale || '')
|
|
205
205
|
: unstandardizedPathnameLocale;
|
|
@@ -208,7 +208,7 @@ function getLocaleFromRequest(req, defaultLocale, approvedLocales, localeRouting
|
|
|
208
208
|
gt.determineLocale([extractedLocale], approvedLocales)) {
|
|
209
209
|
var determinedLocale = gt.determineLocale([extractedLocale], approvedLocales);
|
|
210
210
|
if (determinedLocale) {
|
|
211
|
-
pathnameLocale = determinedLocale;
|
|
211
|
+
pathnameLocale = gt.resolveAliasLocale(determinedLocale);
|
|
212
212
|
candidates.push(pathnameLocale);
|
|
213
213
|
}
|
|
214
214
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/middleware-dir/utils.ts"],"names":[],"mappings":";;AAsBA,kCA8CC;AAKD,sCAGC;AAKD,oDAiBC;AAKD,wDAYC;AAKD,4CAiBC;AAKD,8DAsCC;AAKD,sCAyCC;AAiCD,oDAmHC;AAtXD,sCAAwD;AACxD,yDAA4E;AAqB5E,SAAgB,WAAW,CAAC,EAYX;QAXf,IAAI,UAAA,EACJ,WAAW,iBAAA,EACX,oBAAmC,EAAnC,YAAY,mBAAG,WAAW,CAAC,QAAQ,KAAA,EACnC,UAAU,gBAAA,EACV,gBAAgB,sBAAA,EAChB,UAAU,gBAAA,EACV,aAAa,mBAAA,EACb,8BAA8B,oCAAA,EAC9B,gBAAgB,sBAAA,EAChB,qBAAqB,2BAAA,EACrB,gBAAgB,sBAAA;IAEhB,eAAe;IACf,IAAI,QAAQ,CAAC;IACb,IAAI,IAAI,KAAK,MAAM,EAAE,CAAC;QACpB,QAAQ,GAAG,qBAAY,CAAC,IAAI,CAAC;YAC3B,OAAO,EAAE;gBACP,OAAO,EAAE,UAAU;aACpB;SACF,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,IAAM,WAAW,GAAG,IAAI,GAAG,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QACvD,WAAW,CAAC,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC;QACxC,QAAQ;YACN,IAAI,KAAK,SAAS;gBAChB,CAAC,CAAC,qBAAY,CAAC,OAAO,CAAC,WAAW,EAAE;oBAChC,OAAO,EAAE,UAAU;iBACpB,CAAC;gBACJ,CAAC,CAAC,qBAAY,CAAC,QAAQ,CAAC,WAAW,EAAE;oBACjC,OAAO,EAAE,UAAU;iBACpB,CAAC,CAAC;IACX,CAAC;IAED,wBAAwB;IACxB,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,UAAU,CAAC,CAAC;IACnD,QAAQ,CAAC,OAAO,CAAC,GAAG,CAClB,8BAA8B,EAC9B,aAAa,CAAC,QAAQ,EAAE,CACzB,CAAC;IACF,0BAA0B;IAC1B,IAAI,gBAAgB,IAAI,IAAI,KAAK,UAAU,EAAE,CAAC;QAC5C,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC/C,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAgB,aAAa,CAAC,QAAgB
|
|
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":"AAIA;;;;;;;;GAQG;AACH,wBAAsB,aAAa,CACjC,aAAa,EAAE,MAAM,YAAK,EAC1B,OAAO,EAAE,MAAM,EAAE,EACjB,eAAe,CAAC,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,CAAC,CAyDjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNextLocale.js","sourceRoot":"","sources":["../../src/next/getNextLocale.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"getNextLocale.js","sourceRoot":"","sources":["../../src/next/getNextLocale.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,mBAAmB,GAAG;IAC3B,8BAA8B,EAAE,MAAM,CAAC;IACvC,wBAAwB,EAAE,MAAM,CAAC;CAClC,2CAgFF"}
|
|
@@ -17,8 +17,11 @@ var jsx_runtime_1 = require("react/jsx-runtime");
|
|
|
17
17
|
var client_1 = require("gt-react/client");
|
|
18
18
|
var navigation_1 = require("next/navigation");
|
|
19
19
|
var react_1 = require("react");
|
|
20
|
-
var utils_1 = require("../middleware-dir/utils");
|
|
21
20
|
var generaltranslation_1 = require("generaltranslation");
|
|
21
|
+
function extractLocale(pathname, gt) {
|
|
22
|
+
var matches = pathname.match(/^\/([^\/]+)(?:\/|$)/);
|
|
23
|
+
return matches ? gt.resolveAliasLocale(matches[1]) : null;
|
|
24
|
+
}
|
|
22
25
|
function ClientProvider(props) {
|
|
23
26
|
var locale = props.locale, locales = props.locales, defaultLocale = props.defaultLocale, gtServicesEnabled = props.gtServicesEnabled, referrerLocaleCookieName = props.referrerLocaleCookieName, localeRoutingEnabledCookieName = props.localeRoutingEnabledCookieName, devApiKey = props.devApiKey, projectId = props.projectId, runtimeUrl = props.runtimeUrl, customMapping = props.customMapping;
|
|
24
27
|
var gt = (0, react_1.useMemo)(function () {
|
|
@@ -48,7 +51,7 @@ function ClientProvider(props) {
|
|
|
48
51
|
.find(function (row) { return row.startsWith("".concat(localeRoutingEnabledCookieName, "=")); })) === null || _a === void 0 ? void 0 : _a.split('=')[1]) === 'true';
|
|
49
52
|
if (middlewareEnabled) {
|
|
50
53
|
// Extract locale from pathname
|
|
51
|
-
var extractedLocale =
|
|
54
|
+
var extractedLocale = extractLocale(pathname, gt) || defaultLocale;
|
|
52
55
|
var pathLocale = gt.determineLocale([
|
|
53
56
|
gtServicesEnabled
|
|
54
57
|
? (0, generaltranslation_1.standardizeLocale)(extractedLocale)
|
|
@@ -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":"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"}
|