@sitecore-jss/sitecore-jss-nextjs 22.2.0-canary.27 → 22.2.0-canary.28

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.
@@ -43,6 +43,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
43
43
  hostname,
44
44
  });
45
45
  const createResponse = () => __awaiter(this, void 0, void 0, function* () {
46
+ var _a;
46
47
  if (this.config.disabled && this.config.disabled(req, res || server_1.NextResponse.next())) {
47
48
  sitecore_jss_1.debug.redirects('skipped (redirects middleware is disabled)');
48
49
  return res || server_1.NextResponse.next();
@@ -79,11 +80,15 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
79
80
  .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
80
81
  .replace(/^\/\//, '/')
81
82
  .split('?');
82
- if (target[1]) {
83
- const movedSearchParams = existsRedirect.isQueryStringPreserved
84
- ? url.search.replace(/^\?/gi, '&')
85
- : '';
86
- url.search = '?' + new URLSearchParams(`${target[1]}${movedSearchParams}`).toString();
83
+ if (url.search && existsRedirect.isQueryStringPreserved) {
84
+ const targetQueryString = (_a = target[1]) !== null && _a !== void 0 ? _a : '';
85
+ url.search = '?' + new URLSearchParams(`${url.search}&${targetQueryString}`).toString();
86
+ }
87
+ else if (target[1]) {
88
+ url.search = '?' + target[1];
89
+ }
90
+ else {
91
+ url.search = '';
87
92
  }
88
93
  const prepareNewURL = new URL(`${target[0]}${url.search}`, url.origin);
89
94
  url.href = prepareNewURL.href;
@@ -37,6 +37,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
37
37
  hostname,
38
38
  });
39
39
  const createResponse = () => __awaiter(this, void 0, void 0, function* () {
40
+ var _a;
40
41
  if (this.config.disabled && this.config.disabled(req, res || NextResponse.next())) {
41
42
  debug.redirects('skipped (redirects middleware is disabled)');
42
43
  return res || NextResponse.next();
@@ -73,11 +74,15 @@ export class RedirectsMiddleware extends MiddlewareBase {
73
74
  .replace(regexParser(existsRedirect.pattern), existsRedirect.target)
74
75
  .replace(/^\/\//, '/')
75
76
  .split('?');
76
- if (target[1]) {
77
- const movedSearchParams = existsRedirect.isQueryStringPreserved
78
- ? url.search.replace(/^\?/gi, '&')
79
- : '';
80
- url.search = '?' + new URLSearchParams(`${target[1]}${movedSearchParams}`).toString();
77
+ if (url.search && existsRedirect.isQueryStringPreserved) {
78
+ const targetQueryString = (_a = target[1]) !== null && _a !== void 0 ? _a : '';
79
+ url.search = '?' + new URLSearchParams(`${url.search}&${targetQueryString}`).toString();
80
+ }
81
+ else if (target[1]) {
82
+ url.search = '?' + target[1];
83
+ }
84
+ else {
85
+ url.search = '';
81
86
  }
82
87
  const prepareNewURL = new URL(`${target[0]}${url.search}`, url.origin);
83
88
  url.href = prepareNewURL.href;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sitecore-jss/sitecore-jss-nextjs",
3
- "version": "22.2.0-canary.27",
3
+ "version": "22.2.0-canary.28",
4
4
  "main": "dist/cjs/index.js",
5
5
  "module": "dist/esm/index.js",
6
6
  "sideEffects": false,
@@ -72,9 +72,9 @@
72
72
  "react-dom": "^18.2.0"
73
73
  },
74
74
  "dependencies": {
75
- "@sitecore-jss/sitecore-jss": "^22.2.0-canary.27",
76
- "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.27",
77
- "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.27",
75
+ "@sitecore-jss/sitecore-jss": "^22.2.0-canary.28",
76
+ "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.28",
77
+ "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.28",
78
78
  "@vercel/kv": "^0.2.1",
79
79
  "prop-types": "^15.8.1",
80
80
  "regex-parser": "^2.2.11",
@@ -82,7 +82,7 @@
82
82
  },
83
83
  "description": "",
84
84
  "types": "types/index.d.ts",
85
- "gitHead": "ef8d996d653a6efe5cf65ed08be840b9ed0d2e76",
85
+ "gitHead": "10579b9584dafc025150ee6f269d0fbe78dec256",
86
86
  "files": [
87
87
  "dist",
88
88
  "types",