@sitecore-jss/sitecore-jss-nextjs 21.2.1 → 21.2.2-canary.0
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.
|
@@ -71,11 +71,11 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
71
71
|
const urlFirstPart = existsRedirect.target.split('/')[1];
|
|
72
72
|
if (this.locales.includes(urlFirstPart)) {
|
|
73
73
|
url.locale = urlFirstPart;
|
|
74
|
-
|
|
75
|
-
}
|
|
76
|
-
else {
|
|
77
|
-
url.pathname = existsRedirect.target;
|
|
74
|
+
existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
|
|
78
75
|
}
|
|
76
|
+
url.pathname = url.pathname
|
|
77
|
+
.replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
|
|
78
|
+
.replace(/^\/\//, '/');
|
|
79
79
|
}
|
|
80
80
|
const redirectUrl = decodeURIComponent(url.href);
|
|
81
81
|
/** return Response redirect with http code of redirect type **/
|
|
@@ -137,13 +137,14 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
|
|
|
137
137
|
const targetQS = req.nextUrl.search || '';
|
|
138
138
|
return redirects.length
|
|
139
139
|
? redirects.find((redirect) => {
|
|
140
|
-
|
|
140
|
+
redirect.pattern = `/^\/${redirect.pattern
|
|
141
141
|
.replace(/^\/|\/$/g, '')
|
|
142
|
+
.replace(/^\^\/|\/\$$/g, '')
|
|
142
143
|
.replace(/^\^|\$$/g, '')}$/gi`;
|
|
143
|
-
return (((0, regex_parser_1.default)(pattern).test(tragetURL) ||
|
|
144
|
-
(0, regex_parser_1.default)(pattern).test(`${tragetURL}${targetQS}`) ||
|
|
145
|
-
(0, regex_parser_1.default)(pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
|
|
146
|
-
(0, regex_parser_1.default)(pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
|
|
144
|
+
return (((0, regex_parser_1.default)(redirect.pattern).test(tragetURL) ||
|
|
145
|
+
(0, regex_parser_1.default)(redirect.pattern).test(`${tragetURL}${targetQS}`) ||
|
|
146
|
+
(0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
|
|
147
|
+
(0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
|
|
147
148
|
(redirect.locale
|
|
148
149
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
149
150
|
: true));
|
|
@@ -65,11 +65,11 @@ export class RedirectsMiddleware extends MiddlewareBase {
|
|
|
65
65
|
const urlFirstPart = existsRedirect.target.split('/')[1];
|
|
66
66
|
if (this.locales.includes(urlFirstPart)) {
|
|
67
67
|
url.locale = urlFirstPart;
|
|
68
|
-
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
url.pathname = existsRedirect.target;
|
|
68
|
+
existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
|
|
72
69
|
}
|
|
70
|
+
url.pathname = url.pathname
|
|
71
|
+
.replace(regexParser(existsRedirect.pattern), existsRedirect.target)
|
|
72
|
+
.replace(/^\/\//, '/');
|
|
73
73
|
}
|
|
74
74
|
const redirectUrl = decodeURIComponent(url.href);
|
|
75
75
|
/** return Response redirect with http code of redirect type **/
|
|
@@ -131,13 +131,14 @@ export class RedirectsMiddleware extends MiddlewareBase {
|
|
|
131
131
|
const targetQS = req.nextUrl.search || '';
|
|
132
132
|
return redirects.length
|
|
133
133
|
? redirects.find((redirect) => {
|
|
134
|
-
|
|
134
|
+
redirect.pattern = `/^\/${redirect.pattern
|
|
135
135
|
.replace(/^\/|\/$/g, '')
|
|
136
|
+
.replace(/^\^\/|\/\$$/g, '')
|
|
136
137
|
.replace(/^\^|\$$/g, '')}$/gi`;
|
|
137
|
-
return ((regexParser(pattern).test(tragetURL) ||
|
|
138
|
-
regexParser(pattern).test(`${tragetURL}${targetQS}`) ||
|
|
139
|
-
regexParser(pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
|
|
140
|
-
regexParser(pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
|
|
138
|
+
return ((regexParser(redirect.pattern).test(tragetURL) ||
|
|
139
|
+
regexParser(redirect.pattern).test(`${tragetURL}${targetQS}`) ||
|
|
140
|
+
regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
|
|
141
|
+
regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
|
|
141
142
|
(redirect.locale
|
|
142
143
|
? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
|
|
143
144
|
: true));
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sitecore-jss/sitecore-jss-nextjs",
|
|
3
|
-
"version": "21.2.
|
|
3
|
+
"version": "21.2.2-canary.0",
|
|
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": "21.2.
|
|
74
|
-
"@sitecore-jss/sitecore-jss-dev-tools": "21.2.
|
|
75
|
-
"@sitecore-jss/sitecore-jss-react": "21.2.
|
|
73
|
+
"@sitecore-jss/sitecore-jss": "^21.2.2-canary.0",
|
|
74
|
+
"@sitecore-jss/sitecore-jss-dev-tools": "^21.2.2-canary.0",
|
|
75
|
+
"@sitecore-jss/sitecore-jss-react": "^21.2.2-canary.0",
|
|
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": "b3f77811212bd935a97e28bda4d81b23e5bc397a",
|
|
84
84
|
"files": [
|
|
85
85
|
"dist",
|
|
86
86
|
"types",
|