@sitecore-jss/sitecore-jss-nextjs 22.2.0-canary.80 → 22.2.0-canary.83

package/dist/cjs/components/Link.js

@@ -42,10 +42,6 @@ const react_1 = __importStar(require("react"));
 const prop_types_1 = __importDefault(require("prop-types"));
 const link_1 = __importDefault(require("next/link"));
 const sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
-/**
- * Matches relative URLs that end with a file extension.
- */
-const FILE_EXTENSION_MATCHER = /^\/.*\.\w+$/;
 exports.Link = (0, react_1.forwardRef)((props, ref) => {
     const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, htmlLinkProps = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
     if (!field ||
@@ -63,10 +59,8 @@ exports.Link = (0, react_1.forwardRef)((props, ref) => {
     const isEditing = editable && (field.editable || field.metadata);
     if (href && !isEditing) {
         const text = showLinkTextWithChildrenPresent || !children ? value.text || value.href : null;
-        const isMatching = internalLinkMatcher.test(href);
-        const isFileUrl = FILE_EXTENSION_MATCHER.test(href);
-        // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
-        if (isMatching && !isFileUrl) {
+        // determine if a link is a route or not.
+        if (internalLinkMatcher.test(href)) {
             return (react_1.default.createElement(link_1.default, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class }, htmlLinkProps, { ref: ref }),
                 text,
                 children));

package/dist/cjs/editing/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EDITING_PASS_THROUGH_HEADERS = exports.QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = exports.QUERY_PARAM_VERCEL_PROTECTION_BYPASS = void 0;
+exports.EDITING_ALLOWED_ORIGINS = exports.EDITING_PASS_THROUGH_HEADERS = exports.QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = exports.QUERY_PARAM_VERCEL_PROTECTION_BYPASS = exports.QUERY_PARAM_EDITING_SECRET = void 0;
+exports.QUERY_PARAM_EDITING_SECRET = 'secret';
 exports.QUERY_PARAM_VERCEL_PROTECTION_BYPASS = 'x-vercel-protection-bypass';
 exports.QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = 'x-vercel-set-bypass-cookie';
 /**
@@ -8,3 +9,7 @@ exports.QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = 'x-vercel-set-bypass-cookie';
  * Note these are in lowercase format to match expected `IncomingHttpHeaders`.
  */
 exports.EDITING_PASS_THROUGH_HEADERS = ['authorization', 'cookie'];
+/**
+ * Default allowed origins for editing requests. This is used to enforce CORS, CSP headers.
+ */
+exports.EDITING_ALLOWED_ORIGINS = ['https://pages.sitecorecloud.io'];

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EditingConfigMiddleware = void 0;
-const editing_1 = require("@sitecore-jss/sitecore-jss/editing");
+const constants_1 = require("./constants");
 const utils_1 = require("../utils/utils");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const layout_1 = require("@sitecore-jss/sitecore-jss/layout");
@@ -26,8 +26,8 @@ class EditingConfigMiddleware {
     constructor(config) {
         this.config = config;
         this.handler = (_req, res) => __awaiter(this, void 0, void 0, function* () {
-            const secret = _req.query[editing_1.QUERY_PARAM_EDITING_SECRET];
-            if (!(0, utils_2.enforceCors)(_req, res, editing_1.EDITING_ALLOWED_ORIGINS)) {
+            const secret = _req.query[constants_1.QUERY_PARAM_EDITING_SECRET];
+            if (!(0, utils_2.enforceCors)(_req, res, constants_1.EDITING_ALLOWED_ORIGINS)) {
                 sitecore_jss_1.debug.editing('invalid origin host - set allowed origins in JSS_ALLOWED_ORIGINS environment variable');
                 return res.status(401).json({ message: 'Invalid origin' });
             }

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

@@ -12,7 +12,7 @@ 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_1 = require("@sitecore-jss/sitecore-jss/editing");
+const constants_1 = require("./constants");
 const utils_1 = require("../utils/utils");
 const utils_2 = require("@sitecore-jss/sitecore-jss/utils");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
@@ -28,9 +28,9 @@ 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_1.QUERY_PARAM_EDITING_SECRET];
+            const secret = query[constants_1.QUERY_PARAM_EDITING_SECRET];
             const key = query[this.queryParamKey];
-            if (!(0, utils_2.enforceCors)(req, res, editing_1.EDITING_ALLOWED_ORIGINS)) {
+            if (!(0, utils_2.enforceCors)(req, res, constants_1.EDITING_ALLOWED_ORIGINS)) {
                 sitecore_jss_1.debug.editing('invalid origin host - set allowed origins in JSS_ALLOWED_ORIGINS environment variable');
                 return res.status(401).json({ message: 'Invalid origin' });
             }

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

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.editingDataService = exports.ServerlessEditingDataService = exports.BasicEditingDataService = exports.generateKey = void 0;
-const editing_1 = require("@sitecore-jss/sitecore-jss/editing");
+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/utils");
@@ -137,7 +137,7 @@ class ServerlessEditingDataService {
         //  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(editing_1.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)) {

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

@@ -13,8 +13,8 @@ exports.EditingRenderMiddleware = exports.MetadataHandler = exports.isEditingMet
 const constants_1 = require("next/constants");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const layout_1 = require("@sitecore-jss/sitecore-jss/layout");
-const editing_1 = require("@sitecore-jss/sitecore-jss/editing");
 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");
 const utils_2 = require("@sitecore-jss/sitecore-jss/utils");
@@ -265,7 +265,7 @@ class MetadataHandler {
      * @returns Content-Security-Policy header value
      */
     getSCPHeader() {
-        return `frame-ancestors 'self' ${[(0, utils_2.getAllowedOriginsFromEnv)(), ...editing_1.EDITING_ALLOWED_ORIGINS].join(' ')}`;
+        return `frame-ancestors 'self' ${[(0, utils_2.getAllowedOriginsFromEnv)(), ...constants_2.EDITING_ALLOWED_ORIGINS].join(' ')}`;
     }
 }
 exports.MetadataHandler = MetadataHandler;
@@ -289,14 +289,14 @@ class EditingRenderMiddleware extends render_middleware_1.RenderMiddlewareBase {
                 headers,
                 body,
             });
-            if (!(0, utils_2.enforceCors)(req, res, editing_1.EDITING_ALLOWED_ORIGINS)) {
+            if (!(0, utils_2.enforceCors)(req, res, constants_2.EDITING_ALLOWED_ORIGINS)) {
                 sitecore_jss_1.debug.editing('invalid origin host - set allowed origins in JSS_ALLOWED_ORIGINS environment variable');
                 return res.status(401).json({
                     html: `<html><body>Requests from origin ${(_a = req.headers) === null || _a === void 0 ? void 0 : _a.origin} not allowed</body></html>`,
                 });
             }
             // Validate secret
-            const secret = (_b = query[editing_1.QUERY_PARAM_EDITING_SECRET]) !== null && _b !== void 0 ? _b : body === null || body === void 0 ? void 0 : body.jssEditingSecret;
+            const secret = (_b = query[constants_2.QUERY_PARAM_EDITING_SECRET]) !== null && _b !== void 0 ? _b : 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({

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FEAASRenderMiddleware = void 0;
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
-const editing_1 = require("@sitecore-jss/sitecore-jss/editing");
+const constants_1 = require("./constants");
 const utils_1 = require("../utils/utils");
 const render_middleware_1 = require("./render-middleware");
 const utils_2 = require("@sitecore-jss/sitecore-jss/utils");
@@ -37,7 +37,7 @@ class FEAASRenderMiddleware extends render_middleware_1.RenderMiddlewareBase {
                 query,
                 headers,
             });
-            if (!(0, utils_2.enforceCors)(req, res, editing_1.EDITING_ALLOWED_ORIGINS)) {
+            if (!(0, utils_2.enforceCors)(req, res, constants_1.EDITING_ALLOWED_ORIGINS)) {
                 sitecore_jss_1.debug.editing('invalid origin host - set allowed origins in JSS_ALLOWED_ORIGINS environment variable');
                 return res
                     .status(401)
@@ -49,7 +49,7 @@ class FEAASRenderMiddleware extends render_middleware_1.RenderMiddlewareBase {
                 return res.status(405).send(`<html><body>Invalid request method '${method}'</body></html>`);
             }
             // Validate secret
-            const secret = query[editing_1.QUERY_PARAM_EDITING_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>');

package/dist/cjs/index.js

@@ -23,8 +23,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EditFrame = exports.DateField = exports.Text = exports.Image = exports.Context = exports.ComponentBuilder = exports.BYOCWrapper = exports.FEaaSWrapper = exports.NextImage = 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.getGroomedVariantIds = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EditMode = exports.getContentStylesheetLink = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.MemoryCacheClient = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
-exports.EditingScripts = exports.withEmptyFieldEditingComponent = exports.withFieldMetadata = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.DefaultEmptyFieldEditingComponentText = exports.DefaultEmptyFieldEditingComponentImage = exports.File = exports.getComponentLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = void 0;
+exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = exports.Image = exports.ComponentBuilder = exports.BYOCWrapper = exports.FEaaSWrapper = exports.NextImage = 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.getGroomedVariantIds = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EditMode = exports.getContentStylesheetLink = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.MemoryCacheClient = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
+exports.EditingScripts = exports.withEmptyFieldEditingComponent = exports.withFieldMetadata = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.DefaultEmptyFieldEditingComponentText = exports.DefaultEmptyFieldEditingComponentImage = exports.File = exports.getComponentLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = 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; } });
@@ -89,8 +89,6 @@ const BYOCWrapper = __importStar(require("./components/BYOCWrapper"));
 exports.BYOCWrapper = BYOCWrapper;
 var ComponentBuilder_1 = require("./ComponentBuilder");
 Object.defineProperty(exports, "ComponentBuilder", { enumerable: true, get: function () { return ComponentBuilder_1.ComponentBuilder; } });
-var context_1 = require("./context");
-Object.defineProperty(exports, "Context", { enumerable: true, get: function () { return context_1.Context; } });
 var sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 Object.defineProperty(exports, "Image", { enumerable: true, get: function () { return sitecore_jss_react_1.Image; } });
 Object.defineProperty(exports, "Text", { enumerable: true, get: function () { return sitecore_jss_react_1.Text; } });

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

@@ -14,7 +14,8 @@ const server_1 = require("next/server");
 const personalize_1 = require("@sitecore-jss/sitecore-jss/personalize");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const middleware_1 = require("./middleware");
-const server_2 = require("@sitecore-cloudsdk/personalize/server");
+const server_2 = require("@sitecore-cloudsdk/core/server");
+const server_3 = require("@sitecore-cloudsdk/personalize/server");
 /**
  * Middleware / handler to support Sitecore Personalize
  */
@@ -136,20 +137,22 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
     }
     initPersonalizeServer({ hostname, siteName, request, response, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield (0, server_2.init)(request, response, {
+            yield (0, server_2.CloudSDK)(request, response, {
                 sitecoreEdgeUrl: this.config.cdpConfig.sitecoreEdgeUrl,
                 sitecoreEdgeContextId: this.config.cdpConfig.sitecoreEdgeContextId,
                 siteName,
                 cookieDomain: hostname,
                 enableServerCookie: true,
-            });
+            })
+                .addPersonalize()
+                .initialize();
         });
     }
     personalize({ params, friendlyId, language, timeout, variantIds, }, request) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             sitecore_jss_1.debug.personalize('executing experience for %s %o', friendlyId, params);
-            return (yield (0, server_2.personalize)(request, {
+            return (yield (0, server_3.personalize)(request, {
                 channel: this.config.cdpConfig.channel || 'WEB',
                 currency: (_a = this.config.cdpConfig.currency) !== null && _a !== void 0 ? _a : 'USD',
                 friendlyId,

package/dist/esm/components/Link.js

@@ -13,10 +13,6 @@ import React, { forwardRef } from 'react';
 import PropTypes from 'prop-types';
 import NextLink from 'next/link';
 import { Link as ReactLink, LinkPropTypes, } from '@sitecore-jss/sitecore-jss-react';
-/**
- * Matches relative URLs that end with a file extension.
- */
-const FILE_EXTENSION_MATCHER = /^\/.*\.\w+$/;
 export const Link = forwardRef((props, ref) => {
     const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, htmlLinkProps = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
     if (!field ||
@@ -34,10 +30,8 @@ export const Link = forwardRef((props, ref) => {
     const isEditing = editable && (field.editable || field.metadata);
     if (href && !isEditing) {
         const text = showLinkTextWithChildrenPresent || !children ? value.text || value.href : null;
-        const isMatching = internalLinkMatcher.test(href);
-        const isFileUrl = FILE_EXTENSION_MATCHER.test(href);
-        // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
-        if (isMatching && !isFileUrl) {
+        // determine if a link is a route or not.
+        if (internalLinkMatcher.test(href)) {
             return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false, title: value.title, target: value.target, className: value.class }, htmlLinkProps, { ref: ref }),
                 text,
                 children));

package/dist/esm/editing/constants.js

@@ -1,3 +1,4 @@
+export const QUERY_PARAM_EDITING_SECRET = 'secret';
 export const QUERY_PARAM_VERCEL_PROTECTION_BYPASS = 'x-vercel-protection-bypass';
 export const QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = 'x-vercel-set-bypass-cookie';
 /**
@@ -5,3 +6,7 @@ export const QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = 'x-vercel-set-bypass-cookie'
  * Note these are in lowercase format to match expected `IncomingHttpHeaders`.
  */
 export const EDITING_PASS_THROUGH_HEADERS = ['authorization', 'cookie'];
+/**
+ * Default allowed origins for editing requests. This is used to enforce CORS, CSP headers.
+ */
+export const EDITING_ALLOWED_ORIGINS = ['https://pages.sitecorecloud.io'];

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-jss/sitecore-jss/editing';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET } from './constants';
 import { getJssEditingSecret } from '../utils/utils';
 import { debug } from '@sitecore-jss/sitecore-jss';
 import { EditMode } from '@sitecore-jss/sitecore-jss/layout';

package/dist/esm/editing/editing-data-middleware.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { editingDataDiskCache } from './editing-data-cache';
 import { isEditingData } from './editing-data';
-import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-jss/sitecore-jss/editing';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET } from './constants';
 import { getJssEditingSecret } from '../utils/utils';
 import { enforceCors } from '@sitecore-jss/sitecore-jss/utils';
 import { debug } from '@sitecore-jss/sitecore-jss';

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

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { QUERY_PARAM_EDITING_SECRET } from '@sitecore-jss/sitecore-jss/editing';
+import { QUERY_PARAM_EDITING_SECRET } from './constants';
 import { AxiosDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
 import { editingDataDiskCache } from './editing-data-cache';
 import { getJssEditingSecret } from '../utils/utils';

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

@@ -10,8 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { STATIC_PROPS_ID, SERVER_PROPS_ID } from 'next/constants';
 import { AxiosDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
 import { EditMode } from '@sitecore-jss/sitecore-jss/layout';
-import { QUERY_PARAM_EDITING_SECRET, EDITING_ALLOWED_ORIGINS, } from '@sitecore-jss/sitecore-jss/editing';
 import { editingDataService } from './editing-data-service';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET } from './constants';
 import { getJssEditingSecret } from '../utils/utils';
 import { RenderMiddlewareBase } from './render-middleware';
 import { enforceCors, getAllowedOriginsFromEnv } from '@sitecore-jss/sitecore-jss/utils';

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

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { debug } from '@sitecore-jss/sitecore-jss';
-import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-jss/sitecore-jss/editing';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET } from './constants';
 import { getJssEditingSecret } from '../utils/utils';
 import { RenderMiddlewareBase } from './render-middleware';
 import { enforceCors } from '@sitecore-jss/sitecore-jss/utils';

package/dist/esm/index.js

@@ -19,5 +19,4 @@ import * as BYOCWrapper from './components/BYOCWrapper';
 export { FEaaSWrapper };
 export { BYOCWrapper };
 export { ComponentBuilder } from './ComponentBuilder';
-export { Context } from './context';
 export { Image, Text, DateField, EditFrame, FEaaSComponent, fetchFEaaSComponentServerProps, BYOCComponent, getComponentLibraryStylesheetLinks, File, DefaultEmptyFieldEditingComponentImage, DefaultEmptyFieldEditingComponentText, VisitorIdentification, SitecoreContext, SitecoreContextReactContext, withSitecoreContext, useSitecoreContext, withEditorChromes, withPlaceholder, withDatasourceCheck, withFieldMetadata, withEmptyFieldEditingComponent, EditingScripts, } from '@sitecore-jss/sitecore-jss-react';

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

@@ -11,7 +11,8 @@ import { NextResponse } from 'next/server';
 import { GraphQLPersonalizeService, getPersonalizedRewrite, CdpHelper, DEFAULT_VARIANT, } from '@sitecore-jss/sitecore-jss/personalize';
 import { debug } from '@sitecore-jss/sitecore-jss';
 import { MiddlewareBase } from './middleware';
-import { init, personalize } from '@sitecore-cloudsdk/personalize/server';
+import { CloudSDK } from '@sitecore-cloudsdk/core/server';
+import { personalize } from '@sitecore-cloudsdk/personalize/server';
 /**
  * Middleware / handler to support Sitecore Personalize
  */
@@ -133,13 +134,15 @@ export class PersonalizeMiddleware extends MiddlewareBase {
     }
     initPersonalizeServer({ hostname, siteName, request, response, }) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield init(request, response, {
+            yield CloudSDK(request, response, {
                 sitecoreEdgeUrl: this.config.cdpConfig.sitecoreEdgeUrl,
                 sitecoreEdgeContextId: this.config.cdpConfig.sitecoreEdgeContextId,
                 siteName,
                 cookieDomain: hostname,
                 enableServerCookie: true,
-            });
+            })
+                .addPersonalize()
+                .initialize();
         });
     }
     personalize({ params, friendlyId, language, timeout, variantIds, }, request) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.2.0-canary.80",
+  "version": "22.2.0-canary.83",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -29,7 +29,8 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "devDependencies": {
-    "@sitecore-cloudsdk/personalize": "^0.3.1",
+    "@sitecore-cloudsdk/core": "^0.4.0",
+    "@sitecore-cloudsdk/personalize": "^0.4.0",
     "@types/chai": "^4.3.4",
     "@types/chai-as-promised": "^7.1.5",
     "@types/chai-string": "^1.4.2",
@@ -65,16 +66,16 @@
     "typescript": "~4.9.4"
   },
   "peerDependencies": {
-    "@sitecore-cloudsdk/events": "^0.3.1",
-    "@sitecore-cloudsdk/personalize": "^0.3.1",
+    "@sitecore-cloudsdk/core": "^0.4.0",
+    "@sitecore-cloudsdk/personalize": "^0.4.0",
     "next": "^14.2.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.80",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.80",
-    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.80",
+    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.83",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.83",
+    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.83",
     "@vercel/kv": "^0.2.1",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -82,7 +83,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "0ecca7f10712e929cfe4375ccfbd479020cd30fc",
+  "gitHead": "d56b18ae5aabcf3095dac9d45b9f28959bf10b64",
   "files": [
     "dist",
     "types",

package/types/editing/constants.d.ts

@@ -1,3 +1,4 @@
+export declare const QUERY_PARAM_EDITING_SECRET = "secret";
 export declare const QUERY_PARAM_VERCEL_PROTECTION_BYPASS = "x-vercel-protection-bypass";
 export declare const QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = "x-vercel-set-bypass-cookie";
 /**
@@ -5,3 +6,7 @@ export declare const QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE = "x-vercel-set-bypass
  * Note these are in lowercase format to match expected `IncomingHttpHeaders`.
  */
 export declare const EDITING_PASS_THROUGH_HEADERS: string[];
+/**
+ * Default allowed origins for editing requests. This is used to enforce CORS, CSP headers.
+ */
+export declare const EDITING_ALLOWED_ORIGINS: string[];

package/types/editing/editing-render-middleware.d.ts

@@ -1,7 +1,7 @@
 import { NextApiRequest, NextApiResponse } from 'next';
 import { AxiosDataFetcher } from '@sitecore-jss/sitecore-jss';
 import { EditMode, LayoutServicePageState } from '@sitecore-jss/sitecore-jss/layout';
-import { RenderMetadataQueryParams, LayoutKind } from '@sitecore-jss/sitecore-jss/editing';
+import { LayoutKind } from '@sitecore-jss/sitecore-jss/editing';
 import { EditingDataService } from './editing-data-service';
 import { RenderMiddlewareBase } from './render-middleware';
 /**
@@ -96,11 +96,26 @@ export declare class ChromesHandler extends RenderMiddlewareBase {
  * Configuration for the Editing Metadata Handler.
  */
 export type EditingRenderMiddlewareMetadataConfig = Pick<EditingRenderMiddlewareConfig, 'resolvePageUrl'>;
+/**
+ * Query parameters appended to the page route URL
+ * Appended when XMCloud Pages preview (editing) Metadata Edit Mode is used
+ */
+export type MetadataQueryParams = {
+    secret: string;
+    sc_lang: string;
+    sc_itemid: string;
+    sc_site: string;
+    route: string;
+    mode: Exclude<LayoutServicePageState, 'normal'>;
+    sc_variant?: string;
+    sc_version?: string;
+    sc_layoutKind?: LayoutKind;
+};
 /**
  * Next.js API request with Metadata query parameters.
  */
 type MetadataNextApiRequest = NextApiRequest & {
-    query: RenderMetadataQueryParams;
+    query: MetadataQueryParams;
 };
 /**
  * Data for Next.js Preview (Editing) Metadata Edit Mode.

package/types/index.d.ts

@@ -22,5 +22,4 @@ import * as BYOCWrapper from './components/BYOCWrapper';
 export { FEaaSWrapper };
 export { BYOCWrapper };
 export { ComponentBuilder, ComponentBuilderConfig } from './ComponentBuilder';
-export { Context, ContextConfig, SDK } from './context';
 export { ComponentFactory, Image, ImageField, ImageFieldValue, ImageProps, LinkField, LinkFieldValue, Text, TextField, DateField, EditFrame, FEaaSComponent, FEaaSComponentProps, FEaaSComponentParams, fetchFEaaSComponentServerProps, BYOCComponentParams, BYOCComponent, BYOCComponentProps, getComponentLibraryStylesheetLinks, File, FileField, RichTextField, DefaultEmptyFieldEditingComponentImage, DefaultEmptyFieldEditingComponentText, VisitorIdentification, PlaceholderComponentProps, SitecoreContext, SitecoreContextState, SitecoreContextValue, SitecoreContextReactContext, withSitecoreContext, useSitecoreContext, withEditorChromes, withPlaceholder, withDatasourceCheck, ImageSizeParameters, WithSitecoreContextOptions, WithSitecoreContextProps, WithSitecoreContextHocProps, withFieldMetadata, withEmptyFieldEditingComponent, EditingScripts, } from '@sitecore-jss/sitecore-jss-react';

package/context.d.ts

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

package/context.js

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

package/dist/cjs/context/context.js

@@ -1,83 +0,0 @@
-"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

@@ -1,5 +0,0 @@
-"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/esm/context/context.js

@@ -1,79 +0,0 @@
-import { LayoutServicePageState } from '@sitecore-jss/sitecore-jss-react';
-/**
- * Context instance that is used to initialize the application Context and associated Software Development Kits (SDKs).
- */
-export 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 = 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);
-            });
-        });
-    }
-}

package/dist/esm/context/index.js

@@ -1 +0,0 @@
-export { Context } from './context';

package/types/context/context.d.ts

@@ -1,116 +0,0 @@
-import { LayoutServicePageState } from '@sitecore-jss/sitecore-jss-react';
-/**
- * Software Development Kit (SDK) instance
- */
-export type SDK<SDKType = unknown> = {
-    /**
-     * The Software Development Kit (SDK) library instance
-     */
-    sdk: SDKType;
-    /**
-     * Initializes the Software Development Kit (SDK)
-     */
-    init: (props: InitSDKProps) => Promise<void>;
-};
-/**
- * Software Development Kits (SDKs) to be initialized
- */
-type SDKModulesType = Record<string, SDK>;
-/**
- * Properties that are passed to the Context.
- */
-export interface ContextInitProps {
-    /**
-     * Your Sitecore site name
-     */
-    siteName?: string;
-    /**
-     * Sitecore page state (normal, preview, edit)
-     */
-    pageState?: LayoutServicePageState;
-}
-/**
- * Configuration that is passed to the Context.
- */
-export interface ContextConfig<SDKModules extends SDKModulesType> {
-    /**
-     * Your Sitecore Edge URL
-     */
-    sitecoreEdgeUrl: string;
-    /**
-     * Your Sitecore Edge Context ID
-     */
-    sitecoreEdgeContextId: string;
-    /**
-     * Your Sitecore site name
-     */
-    siteName: string;
-    /**
-     * Software Development Kits (SDKs) to be initialized
-     */
-    sdks: {
-        [module in keyof SDKModules]: SDKModules[module];
-    };
-}
-/**
- * Properties that are passed to the Software Development Kit (SDK) initialization function.
- */
-type InitSDKProps = Omit<ContextConfig<SDKModulesType>, 'sdks'>;
-/**
- * Context instance that is used to initialize the application Context and associated Software Development Kits (SDKs).
- */
-export declare class Context<SDKModules extends SDKModulesType> {
-    protected props: ContextConfig<SDKModules>;
-    /**
-     * Indicates whether the Context and SDK(s) have been initialized
-     */
-    isInitialized: boolean;
-    /**
-     * The Sitecore Edge URL
-     */
-    readonly sitecoreEdgeUrl: string;
-    /**
-     * The Sitecore Edge Context ID
-     */
-    readonly sitecoreEdgeContextId: string;
-    /**
-     * The Sitecore site name
-     */
-    siteName: string;
-    /**
-     * Sitecore page state (normal, preview, edit)
-     */
-    pageState: LayoutServicePageState;
-    /**
-     * Software Development Kits (SDKs) to be initialized
-     */
-    readonly sdks: {
-        [module in keyof SDKModules]?: SDKModules[module]['sdk'];
-    };
-    /**
-     * Promises for the SDKs
-     */
-    protected sdkPromises: {
-        [module in keyof SDKModules]?: Promise<SDKModules[module]['sdk']>;
-    };
-    protected sdkErrors: {
-        [module in keyof SDKModules]?: string;
-    };
-    constructor(props: ContextConfig<SDKModules>);
-    init(props?: ContextInitProps): void;
-    /**
-     * Retrieves the Software Development Kit (SDK) instance, ensuring it is initialized before returning
-     *
-     * @param {string} name SDK name
-     * @returns initialized SDK
-     */
-    getSDK: <T extends keyof SDKModules>(name: T) => Promise<SDKModules[T]["sdk"]>;
-    /**
-     * Initializes the Software Development Kit (SDK)
-     *
-     * @param {T} name SDK name
-     * @returns {void}
-     */
-    protected initSDK<T extends keyof SDKModules>(name: T): void;
-}
-export {};

package/types/context/index.d.ts

@@ -1 +0,0 @@
-export { Context, ContextConfig, SDK } from './context';