gt-next 5.2.15-alpha.0 → 5.2.15-alpha.1
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 +1 -2
- 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 +3 -5
- package/dist/middleware-dir/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -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,SA0EyB,WAAW,2BAyLzC"}
|
|
@@ -61,7 +61,6 @@ function createNextMiddleware(_a) {
|
|
|
61
61
|
}, {});
|
|
62
62
|
// Create the path mapping
|
|
63
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)
|
|
65
64
|
/**
|
|
66
65
|
* Processes the incoming request to determine the user's locale and sets a locale cookie.
|
|
67
66
|
* Optionally redirects the user based on the locale if locale-based routing is enabled.
|
|
@@ -165,7 +164,7 @@ function createNextMiddleware(_a) {
|
|
|
165
164
|
}
|
|
166
165
|
// REDIRECT CASE: no localization prefix (invalid path), redirect to a localized path (ie, /blog -> /en-US/blog) (/dashboard -> /fr/fr-dashboard)
|
|
167
166
|
// 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)
|
|
167
|
+
// REDIRECT CASE: displayed path doesnt match localized path (invalid path) (/fr/about -> /fr/fr-about) (NOT: /en/fr-about -> /en/en-about, /en/fr-about should 404)
|
|
169
168
|
if (!pathnameLocale ||
|
|
170
169
|
unstandardizedPathnameLocale !== userLocale ||
|
|
171
170
|
localizedPathWithParameters !== standardizedPathname) {
|
|
@@ -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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"}
|
|
@@ -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,
|
|
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"}
|
|
@@ -84,11 +84,9 @@ function createPathToSharedPathMap(pathConfig, prefixDefaultLocale, defaultLocal
|
|
|
84
84
|
// Replace [param] with [^/]+ to match any non-slash characters
|
|
85
85
|
var pattern = localizedPath.replace(/\[([^\]]+)\]/g, '[^/]+');
|
|
86
86
|
pathToSharedPath["/".concat(locale).concat(pattern)] = sharedPath;
|
|
87
|
-
if (!prefixDefaultLocale) {
|
|
87
|
+
if (!prefixDefaultLocale && locale === defaultLocale) {
|
|
88
88
|
pathToSharedPath[pattern] = sharedPath;
|
|
89
|
-
|
|
90
|
-
defaultLocalePaths.push(pattern);
|
|
91
|
-
}
|
|
89
|
+
defaultLocalePaths.push(pattern);
|
|
92
90
|
}
|
|
93
91
|
});
|
|
94
92
|
}
|
|
@@ -103,7 +101,7 @@ function getSharedPath(pathname, pathToSharedPath) {
|
|
|
103
101
|
if (pathToSharedPath[pathname]) {
|
|
104
102
|
return pathToSharedPath[pathname];
|
|
105
103
|
}
|
|
106
|
-
//
|
|
104
|
+
// Without locale prefix
|
|
107
105
|
var pathnameWithoutLocale = pathname.replace(/^\/[^/]+/, '');
|
|
108
106
|
if (pathToSharedPath[pathnameWithoutLocale]) {
|
|
109
107
|
return pathToSharedPath[pathnameWithoutLocale];
|
|
@@ -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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"}
|