@sitecore-jss/sitecore-jss-nextjs 21.7.0-canary.7 → 21.7.0-canary.71

package/dist/cjs/components/NextImage.js

@@ -14,19 +14,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NextImage = exports.sitecoreLoader = void 0;
+exports.NextImage = void 0;
 const media_1 = require("@sitecore-jss/sitecore-jss/media");
 const prop_types_1 = __importDefault(require("prop-types"));
 const react_1 = __importDefault(require("react"));
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 const image_1 = __importDefault(require("next/image"));
-const sitecoreLoader = ({ src, width }) => {
-    const [root, paramString] = src.split('?');
-    const params = new URLSearchParams(paramString);
-    params.set('mw', width.toString());
-    return `${root}?${params}`;
-};
-exports.sitecoreLoader = sitecoreLoader;
 const NextImage = (_a) => {
     var { editable, imageParams, field, mediaUrlPrefix, fill, priority } = _a, otherProps = __rest(_a, ["editable", "imageParams", "field", "mediaUrlPrefix", "fill", "priority"]);
     // next handles src and we use a custom loader,
@@ -62,9 +55,8 @@ const NextImage = (_a) => {
         delete imageProps.width;
         delete imageProps.height;
     }
-    const loader = (otherProps.loader ? otherProps.loader : exports.sitecoreLoader);
     if (attrs) {
-        return react_1.default.createElement(image_1.default, Object.assign({ alt: "", loader: loader }, imageProps));
+        return react_1.default.createElement(image_1.default, Object.assign({ alt: "" }, imageProps));
     }
     return null; // we can't handle the truth
 };

package/dist/cjs/components/RichText.js

@@ -56,10 +56,10 @@ const RichText = (props) => {
         }
     }, [hasText]);
     const routeHandler = (ev) => {
-        if (!ev.target)
+        if (!ev.currentTarget)
             return;
         ev.preventDefault();
-        const pathname = ev.target.href;
+        const pathname = ev.currentTarget.href;
         router.push(pathname, pathname, { locale: false });
     };
     const initializeLinks = () => {

package/dist/cjs/context/context.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Context = void 0;
+const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 /**
  * Context instance that is used to initialize the application Context and associated Software Development Kits (SDKs).
  */
@@ -19,9 +20,27 @@ class Context {
          * Promises for the SDKs
          */
         this.sdkPromises = {};
+        this.sdkErrors = {};
+        /**
+         * Retrieves the Software Development Kit (SDK) instance, ensuring it is initialized before returning
+         *
+         * @param {string} name SDK name
+         * @returns initialized SDK
+         */
+        this.getSDK = (name) => {
+            if (!this.sdkPromises[name]) {
+                return Promise.reject(`Unknown SDK '${String(name)}'`);
+            }
+            else {
+                return this.sdkPromises[name].then((result) => {
+                    return ((this.sdkErrors[name] && Promise.reject(this.sdkErrors[name])) || Promise.resolve(result));
+                });
+            }
+        };
         this.sitecoreEdgeUrl = props.sitecoreEdgeUrl;
         this.sitecoreEdgeContextId = props.sitecoreEdgeContextId;
         this.siteName = props.siteName;
+        this.pageState = sitecore_jss_react_1.LayoutServicePageState.Normal;
     }
     init(props = {}) {
         // Context and SDKs are initialized only once
@@ -31,20 +50,14 @@ class Context {
         if (props.siteName) {
             this.siteName = props.siteName;
         }
+        if (props.pageState) {
+            this.pageState = props.pageState;
+        }
         // iterate over the SDKs and initialize them
         for (const sdkName of Object.keys(this.props.sdks)) {
             this.initSDK(sdkName);
         }
     }
-    /**
-     * Retrieves the Software Development Kit (SDK) instance, ensuring it is initialized before returning
-     *
-     * @param {string} name SDK name
-     * @returns initialized SDK
-     */
-    getSDK(name) {
-        return this.sdkPromises[name];
-    }
     /**
      * Initializes the Software Development Kit (SDK)
      *
@@ -53,9 +66,16 @@ class Context {
      */
     initSDK(name) {
         this.sdkPromises[name] = new Promise((resolve) => {
-            this.props.sdks[name].init(this).then(() => {
+            this.props.sdks[name]
+                .init(this)
+                .then(() => {
                 this.sdks[name] = this.props.sdks[name].sdk;
                 resolve(this.sdks[name]);
+            })
+                .catch((e) => {
+                // if init rejects, we mark SDK as failed - so getSDK call would reject with a reason
+                this.sdkErrors[name] = e;
+                resolve(undefined);
             });
         });
     }

package/dist/cjs/editing/editing-config-middleware.js

@@ -0,0 +1,49 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EditingConfigMiddleware = void 0;
+const constants_1 = require("./constants");
+const utils_1 = require("../utils/utils");
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+/**
+ * Middleware / handler used in the editing config API route in xmcloud add on (e.g. '/api/editing/config')
+ * provides configuration information to determine feature compatibility on Pages side.
+ */
+class EditingConfigMiddleware {
+    /**
+     * @param {EditingConfigMiddlewareConfig} [config] Editing configuration middleware config
+     */
+    constructor(config) {
+        this.config = config;
+        this.handler = (_req, res) => __awaiter(this, void 0, void 0, function* () {
+            const secret = _req.query[constants_1.QUERY_PARAM_EDITING_SECRET];
+            if (secret !== (0, utils_1.getJssEditingSecret)()) {
+                sitecore_jss_1.debug.editing('invalid editing secret - sent "%s" expected "%s"', secret, (0, utils_1.getJssEditingSecret)());
+                return res.status(401).json({ message: 'Missing or invalid editing secret' });
+            }
+            const components = Array.isArray(this.config.components)
+                ? this.config.components
+                : Array.from(this.config.components.keys());
+            return res.status(200).json({
+                components,
+                packages: this.config.metadata.packages,
+            });
+        });
+    }
+    /**
+     * Gets the Next.js API route handler
+     * @returns middleware handler
+     */
+    getHandler() {
+        return this.handler;
+    }
+}
+exports.EditingConfigMiddleware = EditingConfigMiddleware;

package/dist/cjs/editing/editing-render-middleware.js

@@ -17,31 +17,18 @@ const node_html_parser_1 = require("node-html-parser");
 const editing_data_service_1 = require("./editing-data-service");
 const constants_2 = require("./constants");
 const utils_1 = require("../utils/utils");
+const render_middleware_1 = require("./render-middleware");
 /**
  * Middleware / handler for use in the editing render Next.js API route (e.g. '/api/editing/render')
  * which is required for Sitecore editing support.
  */
-class EditingRenderMiddleware {
+class EditingRenderMiddleware extends render_middleware_1.RenderMiddlewareBase {
     /**
      * @param {EditingRenderMiddlewareConfig} [config] Editing render middleware config
      */
     constructor(config) {
         var _a, _b, _c, _d;
-        /**
-         * Gets query parameters that should be passed along to subsequent requests
-         * @param query Object of query parameters from incoming URL
-         * @returns Object of approved query parameters
-         */
-        this.getQueryParamsForPropagation = (query) => {
-            const params = {};
-            if (query[constants_2.QUERY_PARAM_PROTECTION_BYPASS_SITECORE]) {
-                params[constants_2.QUERY_PARAM_PROTECTION_BYPASS_SITECORE] = query[constants_2.QUERY_PARAM_PROTECTION_BYPASS_SITECORE];
-            }
-            if (query[constants_2.QUERY_PARAM_PROTECTION_BYPASS_VERCEL]) {
-                params[constants_2.QUERY_PARAM_PROTECTION_BYPASS_VERCEL] = query[constants_2.QUERY_PARAM_PROTECTION_BYPASS_VERCEL];
-            }
-            return params;
-        };
+        super();
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
             var _e, _f;
             const { method, query, body, headers } = req;

package/dist/cjs/editing/feaas-render-middleware.js

@@ -0,0 +1,87 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FEAASRenderMiddleware = void 0;
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+const constants_1 = require("./constants");
+const utils_1 = require("../utils/utils");
+const render_middleware_1 = require("./render-middleware");
+/**
+ * Middleware / handler for use in the feaas render Next.js API route (e.g. '/api/editing/feaas/render')
+ * which is required for Sitecore editing support.
+ */
+class FEAASRenderMiddleware extends render_middleware_1.RenderMiddlewareBase {
+    /**
+     * @param {EditingRenderMiddlewareConfig} [config] Editing render middleware config
+     */
+    constructor(config) {
+        var _a;
+        super();
+        this.config = config;
+        this.defaultPageUrl = '/feaas/render';
+        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            const { method, query, headers } = req;
+            const startTimestamp = Date.now();
+            sitecore_jss_1.debug.editing('feaas render middleware start: %o', {
+                method,
+                query,
+                headers,
+            });
+            if (method !== 'GET') {
+                sitecore_jss_1.debug.editing('invalid method - sent %s expected GET', method);
+                res.setHeader('Allow', 'GET');
+                return res.status(405).send(`<html><body>Invalid request method '${method}'</body></html>`);
+            }
+            // Validate secret
+            const secret = query[constants_1.QUERY_PARAM_EDITING_SECRET];
+            if (secret !== (0, utils_1.getJssEditingSecret)()) {
+                sitecore_jss_1.debug.editing('invalid editing secret - sent "%s" expected "%s"', secret, (0, utils_1.getJssEditingSecret)());
+                return res.status(401).send('<html><body>Missing or invalid secret</body></html>');
+            }
+            try {
+                // Get query string parameters to propagate on subsequent requests (e.g. for deployment protection bypass)
+                const params = this.getQueryParamsForPropagation(query);
+                // Enable Next.js Preview Mode
+                res.setPreviewData({});
+                const queryParams = new URLSearchParams();
+                for (const key in params) {
+                    if ({}.hasOwnProperty.call(params, key)) {
+                        queryParams.append(key, params[key]);
+                    }
+                }
+                // Pass "feaasSrc" in case a FEAASComponent is being requested
+                if (query.feaasSrc) {
+                    queryParams.append('feaasSrc', query.feaasSrc);
+                }
+                const redirectUrl = this.pageUrl + (queryParams.toString() ? `?${queryParams.toString()}` : '');
+                sitecore_jss_1.debug.editing('redirecting to page route %s', redirectUrl);
+                sitecore_jss_1.debug.editing('feaas render middleware end in %dms', Date.now() - startTimestamp);
+                res.redirect(redirectUrl);
+            }
+            catch (err) {
+                const error = err;
+                console.info(
+                // eslint-disable-next-line quotes
+                "Hint: for non-standard server or Next.js route configurations, you may need to override the 'pageUrl' available on the 'FEAASRenderMiddleware' config.");
+                res.status(500).send(`<html><body>${error}</body></html>`);
+            }
+        });
+        this.pageUrl = (_a = config === null || config === void 0 ? void 0 : config.pageUrl) !== null && _a !== void 0 ? _a : this.defaultPageUrl;
+    }
+    /**
+     * Gets the Next.js API route handler
+     * @returns route handler
+     */
+    getHandler() {
+        return this.handler;
+    }
+}
+exports.FEAASRenderMiddleware = FEAASRenderMiddleware;

package/dist/cjs/editing/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VercelEditingDataCache = exports.editingDataService = exports.ServerlessEditingDataService = exports.BasicEditingDataService = exports.EditingRenderMiddleware = exports.EditingDataMiddleware = exports.EditingDataDiskCache = void 0;
+exports.EditingConfigMiddleware = exports.FEAASRenderMiddleware = exports.VercelEditingDataCache = exports.editingDataService = exports.ServerlessEditingDataService = exports.BasicEditingDataService = exports.EditingRenderMiddleware = exports.EditingDataMiddleware = exports.EditingDataDiskCache = void 0;
 var editing_data_cache_1 = require("./editing-data-cache");
 Object.defineProperty(exports, "EditingDataDiskCache", { enumerable: true, get: function () { return editing_data_cache_1.EditingDataDiskCache; } });
 var editing_data_middleware_1 = require("./editing-data-middleware");
@@ -13,3 +13,7 @@ Object.defineProperty(exports, "ServerlessEditingDataService", { enumerable: tru
 Object.defineProperty(exports, "editingDataService", { enumerable: true, get: function () { return editing_data_service_1.editingDataService; } });
 var vercel_editing_data_cache_1 = require("./vercel-editing-data-cache");
 Object.defineProperty(exports, "VercelEditingDataCache", { enumerable: true, get: function () { return vercel_editing_data_cache_1.VercelEditingDataCache; } });
+var feaas_render_middleware_1 = require("./feaas-render-middleware");
+Object.defineProperty(exports, "FEAASRenderMiddleware", { enumerable: true, get: function () { return feaas_render_middleware_1.FEAASRenderMiddleware; } });
+var editing_config_middleware_1 = require("./editing-config-middleware");
+Object.defineProperty(exports, "EditingConfigMiddleware", { enumerable: true, get: function () { return editing_config_middleware_1.EditingConfigMiddleware; } });

package/dist/cjs/editing/render-middleware.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RenderMiddlewareBase = void 0;
+const constants_1 = require("./constants");
+/**
+ * Base class for middleware that handles pages and components rendering in Sitecore Editors.
+ */
+class RenderMiddlewareBase {
+    constructor() {
+        /**
+         * Gets query parameters that should be passed along to subsequent requests (e.g. for deployment protection bypass)
+         * @param {Object} query Object of query parameters from incoming URL
+         * @returns Object of approved query parameters
+         */
+        this.getQueryParamsForPropagation = (query) => {
+            const params = {};
+            if (query[constants_1.QUERY_PARAM_PROTECTION_BYPASS_SITECORE]) {
+                params[constants_1.QUERY_PARAM_PROTECTION_BYPASS_SITECORE] = query[constants_1.QUERY_PARAM_PROTECTION_BYPASS_SITECORE];
+            }
+            if (query[constants_1.QUERY_PARAM_PROTECTION_BYPASS_VERCEL]) {
+                params[constants_1.QUERY_PARAM_PROTECTION_BYPASS_VERCEL] = query[constants_1.QUERY_PARAM_PROTECTION_BYPASS_VERCEL];
+            }
+            return params;
+        };
+    }
+}
+exports.RenderMiddlewareBase = RenderMiddlewareBase;

package/dist/cjs/graphql/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEdgeProxyContentUrl = exports.GraphQLRequestClient = void 0;
+exports.getEdgeProxyContentUrl = exports.GraphQLRequestClient = exports.DefaultRetryStrategy = void 0;
 var graphql_1 = require("@sitecore-jss/sitecore-jss/graphql");
+Object.defineProperty(exports, "DefaultRetryStrategy", { enumerable: true, get: function () { return graphql_1.DefaultRetryStrategy; } });
 Object.defineProperty(exports, "GraphQLRequestClient", { enumerable: true, get: function () { return graphql_1.GraphQLRequestClient; } });
 Object.defineProperty(exports, "getEdgeProxyContentUrl", { enumerable: true, get: function () { return graphql_1.getEdgeProxyContentUrl; } });

package/dist/cjs/index.js

@@ -23,11 +23,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEaaSWrapper = exports.NextImage = exports.EditingComponentPlaceholder = exports.Placeholder = exports.RichText = exports.Link = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.GraphQLSiteInfoService = exports.SiteResolver = exports.GraphQLRobotsService = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.MultisiteGraphQLSitemapService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EDITING_COMPONENT_ID = exports.EDITING_COMPONENT_PLACEHOLDER = exports.RenderingType = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.tryParseEnvValue = exports.resolveUrl = exports.resetEditorChromes = exports.isEditorActive = exports.getPublicUrl = exports.handleEditorFastRefresh = exports.GraphQLRequestClient = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
-exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.getFEAASLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = exports.Image = exports.Context = exports.ComponentBuilder = exports.BYOCWrapper = void 0;
+exports.EditingComponentPlaceholder = exports.Placeholder = exports.RichText = exports.Link = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.GraphQLSiteInfoService = exports.SiteResolver = exports.GraphQLRobotsService = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.MultisiteGraphQLSitemapService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.getContentStylesheetLink = exports.EDITING_COMPONENT_ID = exports.EDITING_COMPONENT_PLACEHOLDER = exports.RenderingType = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.tryParseEnvValue = exports.resolveUrl = exports.resetEditorChromes = exports.isEditorActive = exports.getPublicUrl = exports.handleEditorFastRefresh = exports.GraphQLRequestClient = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.ClientError = exports.AxiosDataFetcher = exports.constants = void 0;
+exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.getComponentLibraryStylesheetLinks = exports.getFEAASLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = exports.Image = exports.Context = exports.ComponentBuilder = exports.BYOCWrapper = exports.FEaaSWrapper = exports.NextImage = void 0;
 var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return sitecore_jss_1.constants; } });
 Object.defineProperty(exports, "AxiosDataFetcher", { enumerable: true, get: function () { return sitecore_jss_1.AxiosDataFetcher; } });
+Object.defineProperty(exports, "ClientError", { enumerable: true, get: function () { return sitecore_jss_1.ClientError; } });
 Object.defineProperty(exports, "NativeDataFetcher", { enumerable: true, get: function () { return sitecore_jss_1.NativeDataFetcher; } });
 Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return sitecore_jss_1.enableDebug; } });
 Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return sitecore_jss_1.debug; } });
@@ -65,6 +66,7 @@ Object.defineProperty(exports, "getFieldValue", { enumerable: true, get: functio
 Object.defineProperty(exports, "RenderingType", { enumerable: true, get: function () { return layout_1.RenderingType; } });
 Object.defineProperty(exports, "EDITING_COMPONENT_PLACEHOLDER", { enumerable: true, get: function () { return layout_1.EDITING_COMPONENT_PLACEHOLDER; } });
 Object.defineProperty(exports, "EDITING_COMPONENT_ID", { enumerable: true, get: function () { return layout_1.EDITING_COMPONENT_ID; } });
+Object.defineProperty(exports, "getContentStylesheetLink", { enumerable: true, get: function () { return layout_1.getContentStylesheetLink; } });
 var media_1 = require("@sitecore-jss/sitecore-jss/media");
 Object.defineProperty(exports, "mediaApi", { enumerable: true, get: function () { return media_1.mediaApi; } });
 var tracking_1 = require("@sitecore-jss/sitecore-jss/tracking");
@@ -126,6 +128,7 @@ Object.defineProperty(exports, "FEaaSComponent", { enumerable: true, get: functi
 Object.defineProperty(exports, "fetchFEaaSComponentServerProps", { enumerable: true, get: function () { return sitecore_jss_react_1.fetchFEaaSComponentServerProps; } });
 Object.defineProperty(exports, "BYOCComponent", { enumerable: true, get: function () { return sitecore_jss_react_1.BYOCComponent; } });
 Object.defineProperty(exports, "getFEAASLibraryStylesheetLinks", { enumerable: true, get: function () { return sitecore_jss_react_1.getFEAASLibraryStylesheetLinks; } });
+Object.defineProperty(exports, "getComponentLibraryStylesheetLinks", { enumerable: true, get: function () { return sitecore_jss_react_1.getComponentLibraryStylesheetLinks; } });
 Object.defineProperty(exports, "File", { enumerable: true, get: function () { return sitecore_jss_react_1.File; } });
 Object.defineProperty(exports, "VisitorIdentification", { enumerable: true, get: function () { return sitecore_jss_react_1.VisitorIdentification; } });
 Object.defineProperty(exports, "SitecoreContext", { enumerable: true, get: function () { return sitecore_jss_react_1.SitecoreContext; } });

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

@@ -68,7 +68,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 response,
             });
             const params = this.getExperienceParams(req);
-            sitecore_jss_1.debug.personalize('executing experience for %s %s %o', personalizeInfo.contentId, params);
+            sitecore_jss_1.debug.personalize('executing experience for %s %o', personalizeInfo.contentId, params);
             let variantId;
             // Execute targeted experience in Personalize SDK
             // eslint-disable-next-line no-useless-catch

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

@@ -18,7 +18,8 @@ const server_1 = require("next/server");
 const site_1 = require("@sitecore-jss/sitecore-jss/site");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const middleware_1 = require("./middleware");
-const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'gi');
+const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
+const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
 /**
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
  * compares with current url and redirects to target url
@@ -58,25 +59,34 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     return res || server_1.NextResponse.next();
                 }
                 // Find context site language and replace token
-                if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target)) {
+                if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
+                    !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
+                        existsRedirect.target.includes(hostname))) {
                     existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
                 }
                 const url = req.nextUrl.clone();
-                const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
-                if (absoluteUrlRegex.test(existsRedirect.target)) {
+                if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
                     url.href = existsRedirect.target;
-                    url.locale = req.nextUrl.locale;
                 }
                 else {
+                    const source = `${url.pathname}${url.search}`;
                     url.search = existsRedirect.isQueryStringPreserved ? url.search : '';
                     const urlFirstPart = existsRedirect.target.split('/')[1];
                     if (this.locales.includes(urlFirstPart)) {
                         url.locale = urlFirstPart;
                         existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                     }
-                    url.pathname = url.pathname
+                    const target = source
                         .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
-                        .replace(/^\/\//, '/');
+                        .replace(/^\/\//, '/')
+                        .split('?');
+                    url.pathname = target[0];
+                    if (target[1]) {
+                        const newParams = new URLSearchParams(target[1]);
+                        for (const [key, val] of newParams.entries()) {
+                            url.searchParams.append(key, val);
+                        }
+                    }
                 }
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
@@ -141,13 +151,17 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             const redirects = yield this.redirectsService.fetchRedirects(siteName);
             const tragetURL = req.nextUrl.pathname;
             const targetQS = req.nextUrl.search || '';
-            return redirects.length
-                ? redirects.find((redirect) => {
+            const language = this.getLanguage(req);
+            const modifyRedirects = structuredClone(redirects);
+            return modifyRedirects.length
+                ? modifyRedirects.find((redirect) => {
+                    redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
                     redirect.pattern = `/^\/${redirect.pattern
                         .replace(/^\/|\/$/g, '')
                         .replace(/^\^\/|\/\$$/g, '')
                         .replace(/^\^|\$$/g, '')
-                        .replace(/\$\/gi$/g, '')}$/gi`;
+                        .replace(/(?<!\\)\?/g, '\\?')
+                        .replace(/\$\/gi$/g, '')}[\/]?$/gi`;
                     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}`) ||

package/dist/cjs/revalidate/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RevalidateMiddleware = void 0;
+var revalidate_middleware_1 = require("./revalidate-middleware");
+Object.defineProperty(exports, "RevalidateMiddleware", { enumerable: true, get: function () { return revalidate_middleware_1.RevalidateMiddleware; } });