@sitecore-jss/sitecore-jss-nextjs 22.0.0-canary.20 → 22.0.0-canary.21
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.
|
@@ -121,8 +121,12 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
121
121
|
const redirects = yield this.redirectsService.fetchRedirects(siteName);
|
|
122
122
|
return redirects.length
|
|
123
123
|
? redirects.find((redirect) => {
|
|
124
|
-
|
|
125
|
-
|
|
124
|
+
const pattern = `/^/${redirect.pattern
|
|
125
|
+
.toLowerCase()
|
|
126
|
+
.replace(/^\/|\/$/g, '')
|
|
127
|
+
.replace(/^\^|\$$/g, '')}$/`;
|
|
128
|
+
return (((0, regex_parser_1.default)(pattern).test(req.nextUrl.pathname.toLowerCase()) ||
|
|
129
|
+
(0, regex_parser_1.default)(pattern).test(`/${req.nextUrl.locale}${req.nextUrl.pathname}`.toLowerCase())) &&
|
|
126
130
|
(redirect.locale
|
|
127
131
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
128
132
|
: true));
|
|
@@ -115,8 +115,12 @@ export class RedirectsMiddleware extends MiddlewareBase {
|
|
|
115
115
|
const redirects = yield this.redirectsService.fetchRedirects(siteName);
|
|
116
116
|
return redirects.length
|
|
117
117
|
? redirects.find((redirect) => {
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
const pattern = `/^/${redirect.pattern
|
|
119
|
+
.toLowerCase()
|
|
120
|
+
.replace(/^\/|\/$/g, '')
|
|
121
|
+
.replace(/^\^|\$$/g, '')}$/`;
|
|
122
|
+
return ((regexParser(pattern).test(req.nextUrl.pathname.toLowerCase()) ||
|
|
123
|
+
regexParser(pattern).test(`/${req.nextUrl.locale}${req.nextUrl.pathname}`.toLowerCase())) &&
|
|
120
124
|
(redirect.locale
|
|
121
125
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
122
126
|
: true));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sitecore-jss/sitecore-jss-nextjs",
|
|
3
|
-
"version": "22.0.0-canary.
|
|
3
|
+
"version": "22.0.0-canary.21",
|
|
4
4
|
"main": "dist/cjs/index.js",
|
|
5
5
|
"module": "dist/esm/index.js",
|
|
6
6
|
"sideEffects": false,
|
|
@@ -70,9 +70,9 @@
|
|
|
70
70
|
"react-dom": "^18.2.0"
|
|
71
71
|
},
|
|
72
72
|
"dependencies": {
|
|
73
|
-
"@sitecore-jss/sitecore-jss": "^22.0.0-canary.
|
|
74
|
-
"@sitecore-jss/sitecore-jss-dev-tools": "^22.0.0-canary.
|
|
75
|
-
"@sitecore-jss/sitecore-jss-react": "^22.0.0-canary.
|
|
73
|
+
"@sitecore-jss/sitecore-jss": "^22.0.0-canary.21",
|
|
74
|
+
"@sitecore-jss/sitecore-jss-dev-tools": "^22.0.0-canary.21",
|
|
75
|
+
"@sitecore-jss/sitecore-jss-react": "^22.0.0-canary.21",
|
|
76
76
|
"node-html-parser": "^6.1.4",
|
|
77
77
|
"prop-types": "^15.8.1",
|
|
78
78
|
"regex-parser": "^2.2.11",
|
|
@@ -80,7 +80,7 @@
|
|
|
80
80
|
},
|
|
81
81
|
"description": "",
|
|
82
82
|
"types": "types/index.d.ts",
|
|
83
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "df85a7964c2ad3a1a6bf27619c4686c6c1c13782",
|
|
84
84
|
"files": [
|
|
85
85
|
"dist",
|
|
86
86
|
"types",
|