@sitecore-jss/sitecore-jss-nextjs 21.7.0-canary.58 → 21.7.0-canary.59

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.
Files changed (3) hide show
  1. package/dist/cjs/middleware/redirects-middleware.js +6 -4
  2. package/dist/esm/middleware/redirects-middleware.js +6 -4
  3. package/package.json +5 -5
package/dist/cjs/middleware/redirects-middleware.js CHANGED
@@ -18,7 +18,8 @@ const server_1 = require("next/server");
18
18
  const site_1 = require("@sitecore-jss/sitecore-jss/site");
19
19
  const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
20
20
  const middleware_1 = require("./middleware");
21
- const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'gi');
21
+ const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
22
+ const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
22
23
  /**
23
24
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
24
25
  * compares with current url and redirects to target url
@@ -58,12 +59,13 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
58
59
  return res || server_1.NextResponse.next();
59
60
  }
60
61
  // Find context site language and replace token
61
- if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target)) {
62
+ if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
63
+ !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
64
+ existsRedirect.target.includes(hostname))) {
62
65
  existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
63
66
  }
64
67
  const url = req.nextUrl.clone();
65
- const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
66
- if (absoluteUrlRegex.test(existsRedirect.target)) {
68
+ if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
67
69
  url.href = existsRedirect.target;
68
70
  url.locale = req.nextUrl.locale;
69
71
  }
package/dist/esm/middleware/redirects-middleware.js CHANGED
@@ -12,7 +12,8 @@ import { NextResponse } from 'next/server';
12
12
  import { GraphQLRedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-jss/sitecore-jss/site';
13
13
  import { debug } from '@sitecore-jss/sitecore-jss';
14
14
  import { MiddlewareBase } from './middleware';
15
- const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'gi');
15
+ const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
16
+ const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
16
17
  /**
17
18
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
18
19
  * compares with current url and redirects to target url
@@ -52,12 +53,13 @@ export class RedirectsMiddleware extends MiddlewareBase {
52
53
  return res || NextResponse.next();
53
54
  }
54
55
  // Find context site language and replace token
55
- if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target)) {
56
+ if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
57
+ !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
58
+ existsRedirect.target.includes(hostname))) {
56
59
  existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
57
60
  }
58
61
  const url = req.nextUrl.clone();
59
- const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
60
- if (absoluteUrlRegex.test(existsRedirect.target)) {
62
+ if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
61
63
  url.href = existsRedirect.target;
62
64
  url.locale = req.nextUrl.locale;
63
65
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sitecore-jss/sitecore-jss-nextjs",
3
- "version": "21.7.0-canary.58",
3
+ "version": "21.7.0-canary.59",
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": "^21.7.0-canary.58",
76
- "@sitecore-jss/sitecore-jss-dev-tools": "^21.7.0-canary.58",
77
- "@sitecore-jss/sitecore-jss-react": "^21.7.0-canary.58",
75
+ "@sitecore-jss/sitecore-jss": "^21.7.0-canary.59",
76
+ "@sitecore-jss/sitecore-jss-dev-tools": "^21.7.0-canary.59",
77
+ "@sitecore-jss/sitecore-jss-react": "^21.7.0-canary.59",
78
78
  "@vercel/kv": "^0.2.1",
79
79
  "node-html-parser": "^6.1.4",
80
80
  "prop-types": "^15.8.1",
@@ -83,7 +83,7 @@
83
83
  },
84
84
  "description": "",
85
85
  "types": "types/index.d.ts",
86
- "gitHead": "c7bbfe5c5e1ea3ee34590af2323917df27969e67",
86
+ "gitHead": "7905a71067fd07cd21dcd6f9dc1a63abcccd4abb",
87
87
  "files": [
88
88
  "dist",
89
89
  "types",