@sitecore-jss/sitecore-jss-nextjs 22.0.0-canary.9 → 22.1.0-canary.1

package/README.md

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

package/context.d.ts

@@ -0,0 +1 @@
+export * from './types/context/index';

package/context.js

@@ -0,0 +1 @@
+module.exports = require('./dist/cjs/context/index');

package/dist/cjs/ComponentBuilder.js

@@ -0,0 +1,63 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ComponentBuilder = void 0;
+/**
+ * Nextjs implementation of component builder class for building components based on the configuration.
+ */
+class ComponentBuilder {
+    constructor(config) {
+        this.config = config;
+        /**
+         * SXA uses custom default export name
+         */
+        this.DEFAULT_EXPORT_NAME = 'Default';
+        this.components = new Map([...config.components]);
+    }
+    /**
+     * Creates a new instance of module factory
+     * Module factory provides a module (file) including all exports.
+     * Module can be imported dynamically or statically.
+     * @returns {ModuleFactory} Module factory implementation
+     */
+    getModuleFactory() {
+        return (componentName) => {
+            const component = this.components.get(componentName);
+            if (!component)
+                return null;
+            // check if module should be imported dynamically
+            if (component.module) {
+                return component.module();
+            }
+            return component;
+        };
+    }
+    /**
+     * Creates a new instance of component factory
+     * Component can be imported dynamically or statically.
+     * @param {Object} [config] Component factory configuration
+     * @param {boolean} [config.isEditing] Indicates if component factory is used in editing mode
+     * @returns {ComponentFactory} Component factory implementation
+     */
+    getComponentFactory({ isEditing } = {}) {
+        return (componentName, exportName) => {
+            const component = this.components.get(componentName);
+            if (!component)
+                return null;
+            // check if component should be imported dynamically
+            if (component.element) {
+                // Editing mode doesn't work well with dynamic components in nextjs: dynamic components are not displayed without refresh after a rendering is added.
+                // This happens beacuse Sitecore editors simply insert updated HTML generated on server side. This conflicts with nextjs dynamic logic as no HTML gets rendered for dynamic component
+                // So we use require() to obtain dynamic components in editing mode while preserving dynamic logic for non-editing scenarios
+                // As we need to be able to seamlessly work with dynamic components in both editing and normal modes, different componentFactory functions will be passed to app
+                return component.element(isEditing);
+            }
+            if (exportName && exportName !== this.DEFAULT_EXPORT_NAME) {
+                return component[exportName];
+            }
+            return (component.Default ||
+                component.default ||
+                component);
+        };
+    }
+}
+exports.ComponentBuilder = ComponentBuilder;

package/dist/cjs/components/BYOCWrapper.js

@@ -0,0 +1,47 @@
+"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.getServerSideProps = exports.getStaticProps = void 0;
+const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+/**
+ * This is a repackaged version of the React BYOCWrapper component with support for
+ * server rendering in Next.js (using component-level data-fetching feature of JSS).
+ */
+/**
+ * Will be called during SSG
+ * @param {ComponentRendering} rendering
+ * @returns {GetStaticPropsContext} context
+ */
+const getStaticProps = (rendering) => __awaiter(void 0, void 0, void 0, function* () {
+    if (process.env.JSS_MODE === sitecore_jss_1.constants.JSS_MODE.DISCONNECTED) {
+        return null;
+    }
+    const params = rendering.params || {};
+    const result = yield (0, sitecore_jss_react_1.fetchBYOCComponentServerProps)(params);
+    return result;
+});
+exports.getStaticProps = getStaticProps;
+/**
+ * Will be called during SSR
+ * @param {ComponentRendering} rendering
+ * @returns {GetStaticPropsContext} context
+ */
+const getServerSideProps = (rendering) => __awaiter(void 0, void 0, void 0, function* () {
+    if (process.env.JSS_MODE === sitecore_jss_1.constants.JSS_MODE.DISCONNECTED) {
+        return null;
+    }
+    const params = rendering.params || {};
+    const result = yield (0, sitecore_jss_react_1.fetchBYOCComponentServerProps)(params);
+    return result;
+});
+exports.getServerSideProps = getServerSideProps;
+exports.default = sitecore_jss_react_1.BYOCWrapper;

package/dist/cjs/components/FEaaSWrapper.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.getServerSideProps = exports.getStaticProps = void 0;
+const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+/**
+ * This is a repackaged version of the React FEaaSWrapper component with support for
+ * server rendering in Next.js (using component-level data-fetching feature of JSS).
+ */
+/**
+ * Will be called during SSG
+ * @param {ComponentRendering} rendering
+ * @param {LayoutServiceData} layoutData
+ * @returns {GetStaticPropsContext} context
+ */
+const getStaticProps = (rendering, layoutData) => __awaiter(void 0, void 0, void 0, function* () {
+    if (process.env.JSS_MODE === sitecore_jss_1.constants.JSS_MODE.DISCONNECTED) {
+        return null;
+    }
+    const params = rendering.params || {};
+    const result = yield (0, sitecore_jss_react_1.fetchFEaaSComponentServerProps)(params, layoutData.sitecore.context.pageState);
+    return result;
+});
+exports.getStaticProps = getStaticProps;
+/**
+ * Will be called during SSR
+ * @param {ComponentRendering} rendering
+ * @param {LayoutServiceData} layoutData
+ * @returns {GetStaticPropsContext} context
+ */
+const getServerSideProps = (rendering, layoutData) => __awaiter(void 0, void 0, void 0, function* () {
+    if (process.env.JSS_MODE === sitecore_jss_1.constants.JSS_MODE.DISCONNECTED) {
+        return null;
+    }
+    const params = rendering.params || {};
+    const result = yield (0, sitecore_jss_react_1.fetchFEaaSComponentServerProps)(params, layoutData.sitecore.context.pageState);
+    return result;
+});
+exports.getServerSideProps = getServerSideProps;
+exports.default = sitecore_jss_react_1.FEaaSWrapper;

package/dist/cjs/components/Link.js

@@ -44,6 +44,10 @@ const link_1 = __importDefault(require("next/link"));
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 exports.Link = (0, react_1.forwardRef)((props, ref) => {
     const { field, editable, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, htmlLinkProps = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
+    if (!field ||
+        (!field.editable && !field.value && !field.href)) {
+        return null;
+    }
     const value = (field.href
         ? field
         : field.value);

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

@@ -44,7 +44,7 @@ const router_1 = require("next/router");
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 const prefetched = {};
 const RichText = (props) => {
-    const { internalLinksSelector = 'a[href^="/"]' } = props, rest = __rest(props, ["internalLinksSelector"]);
+    const { internalLinksSelector = 'a[href^="/"]', prefetchLinks = true } = props, rest = __rest(props, ["internalLinksSelector", "prefetchLinks"]);
     const hasText = props.field && props.field.value;
     const isEditing = props.editable && props.field && props.field.editable;
     const router = (0, router_1.useRouter)();
@@ -54,12 +54,12 @@ const RichText = (props) => {
         if (hasText && !isEditing) {
             initializeLinks();
         }
-    }, []);
+    }, [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 = () => {
@@ -69,13 +69,13 @@ const RichText = (props) => {
         if (!internalLinks || !internalLinks.length)
             return;
         internalLinks.forEach((link) => {
-            if (link.target !== '_blank') {
-                if (!prefetched[link.pathname]) {
-                    router.prefetch(link.pathname, undefined, { locale: false });
-                    prefetched[link.pathname] = true;
-                }
-                link.addEventListener('click', routeHandler, false);
+            if (link.target === '_blank')
+                return;
+            if (prefetchLinks && !prefetched[link.pathname]) {
+                router.prefetch(link.pathname, undefined, { locale: false });
+                prefetched[link.pathname] = true;
             }
+            link.addEventListener('click', routeHandler, false);
         });
     };
     return react_1.default.createElement(sitecore_jss_react_1.RichText, Object.assign({ ref: richTextRef }, rest));

package/dist/cjs/context/context.js

@@ -0,0 +1,83 @@
+"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).
+ */
+class Context {
+    constructor(props) {
+        this.props = props;
+        /**
+         * Indicates whether the Context and SDK(s) have been initialized
+         */
+        this.isInitialized = false;
+        /**
+         * Software Development Kits (SDKs) to be initialized
+         */
+        this.sdks = {};
+        /**
+         * 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
+        if (this.isInitialized)
+            return;
+        this.isInitialized = true;
+        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);
+        }
+    }
+    /**
+     * Initializes the Software Development Kit (SDK)
+     *
+     * @param {T} name SDK name
+     * @returns {void}
+     */
+    initSDK(name) {
+        this.sdkPromises[name] = new Promise((resolve) => {
+            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);
+            });
+        });
+    }
+}
+exports.Context = Context;

package/dist/cjs/context/index.js

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

package/dist/cjs/editing/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QUERY_PARAM_PROTECTION_BYPASS_VERCEL = exports.QUERY_PARAM_PROTECTION_BYPASS_SITECORE = exports.QUERY_PARAM_EDITING_SECRET = void 0;
+exports.QUERY_PARAM_EDITING_SECRET = 'secret';
+exports.QUERY_PARAM_PROTECTION_BYPASS_SITECORE = 'x-sitecore-protection-bypass';
+exports.QUERY_PARAM_PROTECTION_BYPASS_VERCEL = 'x-vercel-protection-bypass';

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-data-middleware.js

@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditingDataMiddleware = void 0;
 const editing_data_cache_1 = require("./editing-data-cache");
 const editing_data_1 = require("./editing-data");
-const editing_data_service_1 = require("./editing-data-service");
-const utils_1 = require("../utils");
+const constants_1 = require("./constants");
+const utils_1 = require("../utils/utils");
 /**
  * Middleware / handler for use in the editing data Next.js API dynamic route (e.g. '/api/editing/data/[key]')
  * which is required for Sitecore editing support.
@@ -26,7 +26,7 @@ class EditingDataMiddleware {
         var _a, _b;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
             const { method, query, body } = req;
-            const secret = query[editing_data_service_1.QUERY_PARAM_EDITING_SECRET];
+            const secret = query[constants_1.QUERY_PARAM_EDITING_SECRET];
             const key = query[this.queryParamKey];
             // Validate secret
             if (secret !== (0, utils_1.getJssEditingSecret)()) {

package/dist/cjs/editing/editing-data-service.js

@@ -9,11 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.editingDataService = exports.ServerlessEditingDataService = exports.BasicEditingDataService = exports.generateKey = exports.QUERY_PARAM_EDITING_SECRET = void 0;
+exports.editingDataService = exports.ServerlessEditingDataService = exports.BasicEditingDataService = exports.generateKey = void 0;
+const constants_1 = require("./constants");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const editing_data_cache_1 = require("./editing-data-cache");
-const utils_1 = require("../utils");
-exports.QUERY_PARAM_EDITING_SECRET = 'secret';
+const utils_1 = require("../utils/utils");
 /**
  * Unique key generator.
  * Need more than just the item GUID since requests are made "live" during editing in EE.
@@ -98,13 +98,14 @@ class ServerlessEditingDataService {
      * @param {string} serverUrl The server url to use for subsequent data API requests
      * @returns {Promise} The {@link EditingPreviewData} containing the generated key and serverUrl to use for retrieval
      */
-    setEditingData(data, serverUrl) {
+    setEditingData(data, serverUrl, params) {
         return __awaiter(this, void 0, void 0, function* () {
             const key = this.generateKey(data);
-            const url = this.getUrl(serverUrl, key);
+            const url = this.getUrl(serverUrl, key, params);
             const previewData = {
                 key,
                 serverUrl,
+                params,
             };
             sitecore_jss_1.debug.editing('storing editing data for %o: %o', previewData, data);
             return this.dataFetcher.put(url, data).then(() => {
@@ -123,20 +124,27 @@ class ServerlessEditingDataService {
             if (!(editingPreviewData === null || editingPreviewData === void 0 ? void 0 : editingPreviewData.serverUrl)) {
                 return undefined;
             }
-            const url = this.getUrl(editingPreviewData.serverUrl, editingPreviewData.key);
+            const url = this.getUrl(editingPreviewData.serverUrl, editingPreviewData.key, editingPreviewData.params);
             sitecore_jss_1.debug.editing('retrieving editing data for %o', previewData);
             return this.dataFetcher.get(url).then((response) => {
                 return response.data;
             });
         });
     }
-    getUrl(serverUrl, key) {
+    getUrl(serverUrl, key, params) {
         var _a;
         // Example URL format:
         //  http://localhost:3000/api/editing/data/52961eea-bafd-5287-a532-a72e36bd8a36-qkb4e3fv5x?secret=1234secret
         const apiRoute = (_a = this.apiRoute) === null || _a === void 0 ? void 0 : _a.replace('[key]', key);
         const url = new URL(apiRoute, serverUrl);
-        url.searchParams.append(exports.QUERY_PARAM_EDITING_SECRET, (0, utils_1.getJssEditingSecret)());
+        url.searchParams.append(constants_1.QUERY_PARAM_EDITING_SECRET, (0, utils_1.getJssEditingSecret)());
+        if (params) {
+            for (const key in params) {
+                if ({}.hasOwnProperty.call(params, key)) {
+                    url.searchParams.append(key, params[key]);
+                }
+            }
+        }
         return url.toString();
     }
 }

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

@@ -15,20 +15,24 @@ const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const layout_1 = require("@sitecore-jss/sitecore-jss/layout");
 const node_html_parser_1 = require("node-html-parser");
 const editing_data_service_1 = require("./editing-data-service");
-const utils_1 = require("../utils");
+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;
+        super();
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
             var _e, _f;
             const { method, query, body, headers } = req;
+            const startTimestamp = Date.now();
             sitecore_jss_1.debug.editing('editing render middleware start: %o', {
                 method,
                 query,
@@ -43,7 +47,7 @@ class EditingRenderMiddleware {
                 });
             }
             // Validate secret
-            const secret = (_e = query[editing_data_service_1.QUERY_PARAM_EDITING_SECRET]) !== null && _e !== void 0 ? _e : body === null || body === void 0 ? void 0 : body.jssEditingSecret;
+            const secret = (_e = query[constants_2.QUERY_PARAM_EDITING_SECRET]) !== null && _e !== void 0 ? _e : body === null || body === void 0 ? void 0 : body.jssEditingSecret;
             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({
@@ -55,21 +59,28 @@ class EditingRenderMiddleware {
                 const editingData = extractEditingData(req);
                 // Resolve server URL
                 const serverUrl = this.resolveServerUrl(req);
+                // Get query string parameters to propagate on subsequent requests (e.g. for deployment protection bypass)
+                const params = this.getQueryParamsForPropagation(query);
                 // Stash for use later on (i.e. within getStatic/ServerSideProps).
                 // Note we can't set this directly in setPreviewData since it's stored as a cookie (2KB limit)
                 // https://nextjs.org/docs/advanced-features/preview-mode#previewdata-size-limits)
-                const previewData = yield this.editingDataService.setEditingData(editingData, serverUrl);
+                const previewData = yield this.editingDataService.setEditingData(editingData, serverUrl, params);
                 // Enable Next.js Preview Mode, passing our preview data (i.e. editingData cache key)
                 res.setPreviewData(previewData);
                 // Grab the Next.js preview cookies to send on to the render request
                 const cookies = res.getHeader('Set-Cookie');
-                // Make actual render request for page route, passing on preview cookies.
+                // Make actual render request for page route, passing on preview cookies as well as any approved query string parameters.
                 // Note timestamp effectively disables caching the request in Axios (no amount of cache headers seemed to do it)
-                const requestUrl = this.resolvePageUrl(serverUrl, editingData.path);
                 sitecore_jss_1.debug.editing('fetching page route for %s', editingData.path);
-                const queryStringCharacter = requestUrl.indexOf('?') === -1 ? '?' : '&';
+                const requestUrl = new URL(this.resolvePageUrl(serverUrl, editingData.path));
+                for (const key in params) {
+                    if ({}.hasOwnProperty.call(params, key)) {
+                        requestUrl.searchParams.append(key, params[key]);
+                    }
+                }
+                requestUrl.searchParams.append('timestamp', Date.now().toString());
                 const pageRes = yield this.dataFetcher
-                    .get(`${requestUrl}${queryStringCharacter}timestamp=${Date.now()}`, {
+                    .get(requestUrl.toString(), {
                     headers: {
                         Cookie: cookies.join(';'),
                     },
@@ -84,7 +95,7 @@ class EditingRenderMiddleware {
                 });
                 let html = pageRes.data;
                 if (!html || html.length === 0) {
-                    throw new Error(`Failed to render html for ${requestUrl}`);
+                    throw new Error(`Failed to render html for ${editingData.path}`);
                 }
                 // replace phkey attribute with key attribute so that newly added renderings
                 // show correct placeholders, so save and refresh won't be needed after adding each rendering
@@ -100,11 +111,14 @@ class EditingRenderMiddleware {
                     // Handle component rendering. Extract component markup only
                     html = (_f = (0, node_html_parser_1.parse)(html).getElementById(layout_1.EDITING_COMPONENT_ID)) === null || _f === void 0 ? void 0 : _f.innerHTML;
                     if (!html)
-                        throw new Error(`Failed to render component for ${requestUrl}`);
+                        throw new Error(`Failed to render component for ${editingData.path}`);
                 }
                 const body = { html };
                 // Return expected JSON result
-                sitecore_jss_1.debug.editing('editing render middleware end: %o', { status: 200, body });
+                sitecore_jss_1.debug.editing('editing render middleware end in %dms: %o', Date.now() - startTimestamp, {
+                    status: 200,
+                    body,
+                });
                 res.status(200).json(body);
             }
             catch (err) {