@sitecore-jss/sitecore-jss-nextjs 22.0.0-canary.35 → 22.0.0-canary.37
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.
|
@@ -119,14 +119,17 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
119
119
|
getExistsRedirect(req, siteName) {
|
|
120
120
|
return __awaiter(this, void 0, void 0, function* () {
|
|
121
121
|
const redirects = yield this.redirectsService.fetchRedirects(siteName);
|
|
122
|
+
const tragetURL = `${req.nextUrl.pathname}`.toLowerCase();
|
|
123
|
+
const targetQS = `?${req.nextUrl.search || ''}`.toLowerCase();
|
|
122
124
|
return redirects.length
|
|
123
125
|
? redirects.find((redirect) => {
|
|
124
126
|
const pattern = `/^/${redirect.pattern
|
|
125
127
|
.toLowerCase()
|
|
126
128
|
.replace(/^\/|\/$/g, '')
|
|
127
129
|
.replace(/^\^|\$$/g, '')}$/`;
|
|
128
|
-
return (((0, regex_parser_1.default)(pattern).test(
|
|
129
|
-
(0, regex_parser_1.default)(pattern).test(
|
|
130
|
+
return (((0, regex_parser_1.default)(pattern).test(tragetURL) ||
|
|
131
|
+
(0, regex_parser_1.default)(pattern).test(`${tragetURL}${targetQS}`) ||
|
|
132
|
+
(0, regex_parser_1.default)(pattern).test(`/${req.nextUrl.locale}${tragetURL}`.toLowerCase())) &&
|
|
130
133
|
(redirect.locale
|
|
131
134
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
132
135
|
: true));
|
|
@@ -113,14 +113,17 @@ export class RedirectsMiddleware extends MiddlewareBase {
|
|
|
113
113
|
getExistsRedirect(req, siteName) {
|
|
114
114
|
return __awaiter(this, void 0, void 0, function* () {
|
|
115
115
|
const redirects = yield this.redirectsService.fetchRedirects(siteName);
|
|
116
|
+
const tragetURL = `${req.nextUrl.pathname}`.toLowerCase();
|
|
117
|
+
const targetQS = `?${req.nextUrl.search || ''}`.toLowerCase();
|
|
116
118
|
return redirects.length
|
|
117
119
|
? redirects.find((redirect) => {
|
|
118
120
|
const pattern = `/^/${redirect.pattern
|
|
119
121
|
.toLowerCase()
|
|
120
122
|
.replace(/^\/|\/$/g, '')
|
|
121
123
|
.replace(/^\^|\$$/g, '')}$/`;
|
|
122
|
-
return ((regexParser(pattern).test(
|
|
123
|
-
regexParser(pattern).test(
|
|
124
|
+
return ((regexParser(pattern).test(tragetURL) ||
|
|
125
|
+
regexParser(pattern).test(`${tragetURL}${targetQS}`) ||
|
|
126
|
+
regexParser(pattern).test(`/${req.nextUrl.locale}${tragetURL}`.toLowerCase())) &&
|
|
124
127
|
(redirect.locale
|
|
125
128
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
126
129
|
: 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.37",
|
|
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.37",
|
|
74
|
+
"@sitecore-jss/sitecore-jss-dev-tools": "^22.0.0-canary.37",
|
|
75
|
+
"@sitecore-jss/sitecore-jss-react": "^22.0.0-canary.37",
|
|
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": "b90f16a0dd687cf2ac426fb9955bd23903ddd402",
|
|
84
84
|
"files": [
|
|
85
85
|
"dist",
|
|
86
86
|
"types",
|