@sitecore-jss/sitecore-jss-nextjs 21.3.0-canary.9 → 21.3.1-canary.1

package/README.md

@@ -2,9 +2,6 @@
 
 This module is provided as a part of Sitecore JavaScript Rendering SDK. It contains Next.js components and integration for JSS.
 
-<!---
-@TODO: Update to next version docs before release
--->
 [Documentation (Experience Platform)](https://doc.sitecore.com/xp/en/developers/hd/21/sitecore-headless-development/sitecore-javascript-rendering-sdk--jss--for-next-js.html)
 
 [Documentation (XM Cloud)](https://doc.sitecore.com/xmc/en/developers/xm-cloud/sitecore-javascript-rendering-sdk--jss--for-next-js.html)

package/dist/cjs/middleware/middleware.js

@@ -18,8 +18,7 @@ class MiddlewareBase {
     }
     excludeRoute(pathname) {
         var _a, _b;
-        return (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
+        return (pathname.startsWith('/api/') || // Ignore Next.js API calls
             pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
             pathname.startsWith('/_next') || // Ignore next service calls
             (((_a = this.config) === null || _a === void 0 ? void 0 : _a.excludeRoute) && ((_b = this.config) === null || _b === void 0 ? void 0 : _b.excludeRoute(pathname))));

package/dist/cjs/middleware/multisite-middleware.js

@@ -83,5 +83,9 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
             }
         });
     }
+    excludeRoute(pathname) {
+        // ignore files
+        return pathname.includes('.') || super.excludeRoute(pathname);
+    }
 }
 exports.MultisiteMiddleware = MultisiteMiddleware;

package/dist/cjs/middleware/personalize-middleware.js

@@ -158,5 +158,9 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             },
         };
     }
+    excludeRoute(pathname) {
+        // ignore files
+        return pathname.includes('.') || super.excludeRoute(pathname);
+    }
 }
 exports.PersonalizeMiddleware = PersonalizeMiddleware;

package/dist/cjs/middleware/redirects-middleware.js

@@ -71,11 +71,11 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     const urlFirstPart = existsRedirect.target.split('/')[1];
                     if (this.locales.includes(urlFirstPart)) {
                         url.locale = urlFirstPart;
-                        url.pathname = existsRedirect.target.replace(`/${urlFirstPart}`, '');
-                    }
-                    else {
-                        url.pathname = existsRedirect.target;
+                        existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                     }
+                    url.pathname = url.pathname
+                        .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
+                        .replace(/^\/\//, '/');
                 }
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
@@ -137,13 +137,14 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             const targetQS = req.nextUrl.search || '';
             return redirects.length
                 ? redirects.find((redirect) => {
-                    const pattern = `/^/${redirect.pattern
+                    redirect.pattern = `/^\/${redirect.pattern
                         .replace(/^\/|\/$/g, '')
+                        .replace(/^\^\/|\/\$$/g, '')
                         .replace(/^\^|\$$/g, '')}$/gi`;
-                    return (((0, regex_parser_1.default)(pattern).test(tragetURL) ||
-                        (0, regex_parser_1.default)(pattern).test(`${tragetURL}${targetQS}`) ||
-                        (0, regex_parser_1.default)(pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
-                        (0, regex_parser_1.default)(pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
+                    return (((0, regex_parser_1.default)(redirect.pattern).test(tragetURL) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`${tragetURL}${targetQS}`) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
                         (redirect.locale
                             ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
                             : true));

package/dist/cjs/utils/utils.js

@@ -12,8 +12,11 @@ const utils_1 = require("@sitecore-jss/sitecore-jss/utils");
  * This is set to http://localhost:3000 by default.
  * VERCEL_URL is provided by Vercel in case if we are in Preview deployment (deployment based on the custom branch),
  * preview deployment has unique url, we don't know exact url.
+ * Similarly, DEPLOY_URL is provided by Netlify and would give us the deploy URL
  */
 const getPublicUrl = () => {
+    if (process.env.NETLIFY && process.env.DEPLOY_URL)
+        return process.env.DEPLOY_URL;
     if (process.env.VERCEL_URL)
         return `https://${process.env.VERCEL_URL}`;
     let url = process.env.PUBLIC_URL;

package/dist/esm/middleware/middleware.js

@@ -15,8 +15,7 @@ export class MiddlewareBase {
     }
     excludeRoute(pathname) {
         var _a, _b;
-        return (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
+        return (pathname.startsWith('/api/') || // Ignore Next.js API calls
             pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
             pathname.startsWith('/_next') || // Ignore next service calls
             (((_a = this.config) === null || _a === void 0 ? void 0 : _a.excludeRoute) && ((_b = this.config) === null || _b === void 0 ? void 0 : _b.excludeRoute(pathname))));

package/dist/esm/middleware/multisite-middleware.js

@@ -80,4 +80,8 @@ export class MultisiteMiddleware extends MiddlewareBase {
             }
         });
     }
+    excludeRoute(pathname) {
+        // ignore files
+        return pathname.includes('.') || super.excludeRoute(pathname);
+    }
 }

package/dist/esm/middleware/personalize-middleware.js

@@ -155,4 +155,8 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             },
         };
     }
+    excludeRoute(pathname) {
+        // ignore files
+        return pathname.includes('.') || super.excludeRoute(pathname);
+    }
 }

package/dist/esm/middleware/redirects-middleware.js

@@ -65,11 +65,11 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     const urlFirstPart = existsRedirect.target.split('/')[1];
                     if (this.locales.includes(urlFirstPart)) {
                         url.locale = urlFirstPart;
-                        url.pathname = existsRedirect.target.replace(`/${urlFirstPart}`, '');
-                    }
-                    else {
-                        url.pathname = existsRedirect.target;
+                        existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                     }
+                    url.pathname = url.pathname
+                        .replace(regexParser(existsRedirect.pattern), existsRedirect.target)
+                        .replace(/^\/\//, '/');
                 }
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
@@ -131,13 +131,14 @@ export class RedirectsMiddleware extends MiddlewareBase {
             const targetQS = req.nextUrl.search || '';
             return redirects.length
                 ? redirects.find((redirect) => {
-                    const pattern = `/^/${redirect.pattern
+                    redirect.pattern = `/^\/${redirect.pattern
                         .replace(/^\/|\/$/g, '')
+                        .replace(/^\^\/|\/\$$/g, '')
                         .replace(/^\^|\$$/g, '')}$/gi`;
-                    return ((regexParser(pattern).test(tragetURL) ||
-                        regexParser(pattern).test(`${tragetURL}${targetQS}`) ||
-                        regexParser(pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
-                        regexParser(pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
+                    return ((regexParser(redirect.pattern).test(tragetURL) ||
+                        regexParser(redirect.pattern).test(`${tragetURL}${targetQS}`) ||
+                        regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
+                        regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
                         (redirect.locale
                             ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
                             : true));

package/dist/esm/utils/utils.js

@@ -6,8 +6,11 @@ import { isEditorActive, resetEditorChromes } from '@sitecore-jss/sitecore-jss/u
  * This is set to http://localhost:3000 by default.
  * VERCEL_URL is provided by Vercel in case if we are in Preview deployment (deployment based on the custom branch),
  * preview deployment has unique url, we don't know exact url.
+ * Similarly, DEPLOY_URL is provided by Netlify and would give us the deploy URL
  */
 export const getPublicUrl = () => {
+    if (process.env.NETLIFY && process.env.DEPLOY_URL)
+        return process.env.DEPLOY_URL;
     if (process.env.VERCEL_URL)
         return `https://${process.env.VERCEL_URL}`;
     let url = process.env.PUBLIC_URL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "21.3.0-canary.9",
+  "version": "21.3.1-canary.1",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -70,9 +70,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^21.3.0-canary.9",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^21.3.0-canary.9",
-    "@sitecore-jss/sitecore-jss-react": "^21.3.0-canary.9",
+    "@sitecore-jss/sitecore-jss": "^21.3.1-canary.1",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^21.3.1-canary.1",
+    "@sitecore-jss/sitecore-jss-react": "^21.3.1-canary.1",
     "node-html-parser": "^6.1.4",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -80,7 +80,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "142054b1019df1816dd3251f8b0149f65ee20fe6",
+  "gitHead": "974a723f1e614b859a150b6c8dcd2b9ff68c3e7c",
   "files": [
     "dist",
     "types",

package/types/middleware/multisite-middleware.d.ts

@@ -20,5 +20,6 @@ export declare class MultisiteMiddleware extends MiddlewareBase {
      * @returns middleware handler
      */
     getHandler(): (req: NextRequest, res?: NextResponse) => Promise<NextResponse>;
+    protected excludeRoute(pathname: string): boolean | undefined;
     private handler;
 }

package/types/middleware/personalize-middleware.d.ts

@@ -39,5 +39,6 @@ export declare class PersonalizeMiddleware extends MiddlewareBase {
     protected getBrowserId(req: NextRequest): string | undefined;
     protected setBrowserId(res: NextResponse, browserId: string): void;
     protected getExperienceParams(req: NextRequest): ExperienceParams;
+    protected excludeRoute(pathname: string): boolean | undefined;
     private handler;
 }

package/types/utils/utils.d.ts

@@ -4,6 +4,7 @@
  * This is set to http://localhost:3000 by default.
  * VERCEL_URL is provided by Vercel in case if we are in Preview deployment (deployment based on the custom branch),
  * preview deployment has unique url, we don't know exact url.
+ * Similarly, DEPLOY_URL is provided by Netlify and would give us the deploy URL
  */
 export declare const getPublicUrl: () => string;
 /**