@sitecore-content-sdk/nextjs 1.5.0 → 2.0.0-canary.10

package/dist/cjs/route-handler/robots-route-handler.js

@@ -8,11 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRobotsRouteHandler = void 0;
-const site_1 = require("@sitecore-content-sdk/core/site");
-const core_1 = require("@sitecore-content-sdk/core");
+const site_1 = require("@sitecore-content-sdk/content/site");
 const cache_1 = require("next/cache");
+const debug_1 = __importDefault(require("../debug"));
 /**
  * Creates a route handler to serve the robots.txt file.
  * @param {RouteHandlerOptions} options - The options for the route handler.
@@ -31,18 +34,19 @@ const createRobotsRouteHandler = (options) => {
     const GET = (req) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         try {
-            const startTimestamp = Date.now();
             const hostName = req.headers.get('x-forwarded-host') ||
                 ((_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0]) ||
                 'localhost';
             const site = siteResolver.getByHost(hostName);
-            core_1.debug.robots('robots route handler start: %o', {
+            // Access request data first, then capture timestamp for Next.js 16 compatibility
+            const startTimestamp = Date.now();
+            debug_1.default.robots('robots route handler start: %o', {
                 hostName,
                 siteName: site.name,
             });
             const robotsContent = yield getRobots(site.name);
             if (!robotsContent) {
-                core_1.debug.robots('robots route handler end in %dms', Date.now() - startTimestamp);
+                debug_1.default.robots('robots route handler end in %dms', Date.now() - startTimestamp);
                 return new Response('User-agent: *\nDisallow: /', {
                     status: 404,
                     headers: {
@@ -50,7 +54,7 @@ const createRobotsRouteHandler = (options) => {
                     },
                 });
             }
-            core_1.debug.robots('robots route handler end in %dms', Date.now() - startTimestamp);
+            debug_1.default.robots('robots route handler end in %dms', Date.now() - startTimestamp);
             return new Response(robotsContent, {
                 status: 200,
                 headers: {
@@ -59,6 +63,10 @@ const createRobotsRouteHandler = (options) => {
             });
         }
         catch (error) {
+            // Re-throw prerender bail-out errors so Next.js can handle them properly
+            if (error instanceof Error && error.digest === 'NEXT_PRERENDER_INTERRUPTED') {
+                throw error;
+            }
             console.log('Robots route handler failed:');
             console.log(error);
             return new Response('Internal Server Error', {

package/dist/cjs/route-handler/sitemap-route-handler.js

@@ -8,11 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSitemapRouteHandler = createSitemapRouteHandler;
-const site_1 = require("@sitecore-content-sdk/core/site");
-const core_1 = require("@sitecore-content-sdk/core");
+const site_1 = require("@sitecore-content-sdk/content/site");
 const cache_1 = require("next/cache");
+const debug_1 = __importDefault(require("../debug"));
 /**
  * Creates a route handler to serve the sitemap.xml file.
  * @param {RouteHandlerOptions} options - The options for the route handler.
@@ -38,13 +41,14 @@ function createSitemapRouteHandler(options) {
     });
     const GET = (req) => __awaiter(this, void 0, void 0, function* () {
         try {
-            const startTimestamp = Date.now();
             const options = getOptions(req);
-            core_1.debug.sitemap('sitemap route handler start: %o', {
+            // Access request data first, then capture timestamp for Next.js 16 compatibility
+            const startTimestamp = Date.now();
+            debug_1.default.sitemap('sitemap route handler start: %o', {
                 options,
             });
             const xml = yield getSitemap(options);
-            core_1.debug.sitemap('sitemap route handler end in %dms', Date.now() - startTimestamp);
+            debug_1.default.sitemap('sitemap route handler end in %dms', Date.now() - startTimestamp);
             return new Response(xml, {
                 headers: {
                     'Content-Type': 'text/xml;charset=utf-8',
@@ -52,6 +56,10 @@ function createSitemapRouteHandler(options) {
             });
         }
         catch (error) {
+            // Re-throw prerender bail-out errors so Next.js can handle them properly
+            if (error instanceof Error && error.digest === 'NEXT_PRERENDER_INTERRUPTED') {
+                throw error;
+            }
             console.log('Sitemap route handler failed:');
             console.log(error);
             if (error instanceof Error && error.message === 'REDIRECT_404') {

package/dist/cjs/site/index.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SiteResolver = void 0;
-var site_1 = require("@sitecore-content-sdk/core/site");
+var site_1 = require("@sitecore-content-sdk/content/site");
 Object.defineProperty(exports, "SiteResolver", { enumerable: true, get: function () { return site_1.SiteResolver; } });

package/dist/cjs/tools/codegen/import-map.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeImportMap = exports.__mockDependencies = void 0;
-const tools_1 = require("@sitecore-content-sdk/core/tools");
+const node_tools_1 = require("@sitecore-content-sdk/content/node-tools");
 const utils_1 = require("../templating/utils");
-let writeImportMapCore = tools_1.writeImportMap;
+let writeImportMapCore = node_tools_1.writeImportMap;
 const __mockDependencies = (mocks) => {
     if (mocks.writeImportMapCore) {
         writeImportMapCore = mocks.writeImportMapCore;

package/dist/cjs/tools/generate-map.js

@@ -34,7 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateMap = exports.defaultClientMapTemplate = void 0;
-const tools_1 = require("@sitecore-content-sdk/core/tools");
+const tools_1 = require("@sitecore-content-sdk/content/tools");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
 const utils_1 = require("./templating/utils");

package/dist/cjs/tools/index.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.writeImportMap = exports.generateMap = exports.extractFiles = exports.ModuleType = exports.generatePlugins = exports.getComponentList = exports.generateMetadata = exports.generateSites = void 0;
-var tools_1 = require("@sitecore-content-sdk/core/tools");
-Object.defineProperty(exports, "generateSites", { enumerable: true, get: function () { return tools_1.generateSites; } });
-Object.defineProperty(exports, "generateMetadata", { enumerable: true, get: function () { return tools_1.generateMetadata; } });
-Object.defineProperty(exports, "getComponentList", { enumerable: true, get: function () { return tools_1.getComponentList; } });
-Object.defineProperty(exports, "generatePlugins", { enumerable: true, get: function () { return tools_1.generatePlugins; } });
-Object.defineProperty(exports, "ModuleType", { enumerable: true, get: function () { return tools_1.ModuleType; } });
-Object.defineProperty(exports, "extractFiles", { enumerable: true, get: function () { return tools_1.extractFiles; } });
+exports.writeImportMap = exports.generateMap = exports.generateMetadata = exports.extractFiles = exports.getComponentList = exports.generateSites = void 0;
+var node_tools_1 = require("@sitecore-content-sdk/content/node-tools");
+Object.defineProperty(exports, "generateSites", { enumerable: true, get: function () { return node_tools_1.generateSites; } });
+Object.defineProperty(exports, "getComponentList", { enumerable: true, get: function () { return node_tools_1.getComponentList; } });
+Object.defineProperty(exports, "extractFiles", { enumerable: true, get: function () { return node_tools_1.extractFiles; } });
+var node_tools_2 = require("@sitecore-content-sdk/core/node-tools");
+Object.defineProperty(exports, "generateMetadata", { enumerable: true, get: function () { return node_tools_2.generateMetadata; } });
 var generate_map_1 = require("./generate-map");
 Object.defineProperty(exports, "generateMap", { enumerable: true, get: function () { return generate_map_1.generateMap; } });
 var import_map_1 = require("./codegen/import-map");

package/dist/cjs/tools/templating/byoc-component.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.byocTemplate = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const config_1 = require("@sitecore-content-sdk/core/config");
+const config_1 = require("@sitecore-content-sdk/content/config");
 const constants_1 = require("./constants");
 /**
  * Next.js BYOC component boilerplate

package/dist/cjs/tools/templating/default-component.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultTemplate = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const config_1 = require("@sitecore-content-sdk/core/config");
+const config_1 = require("@sitecore-content-sdk/content/config");
 const constants_1 = require("./constants");
 /**
  * Next.js component boilerplate

package/dist/cjs/tools/templating/utils.js

@@ -9,10 +9,9 @@ exports.getComponentListWithTypes = getComponentListWithTypes;
 exports.nextjsClientMapTemplate = nextjsClientMapTemplate;
 exports.nextjsServertMapTemplate = nextjsServertMapTemplate;
 exports.nextjsDefaultMapTemplate = nextjsDefaultMapTemplate;
-const tools_1 = require("@sitecore-content-sdk/core/tools");
+const node_tools_1 = require("@sitecore-content-sdk/content/node-tools");
 const typescript_1 = __importDefault(require("typescript"));
 const fs_1 = __importDefault(require("fs"));
-const tools_2 = require("@sitecore-content-sdk/core/tools");
 /**
  * Detects the Next.js router type (App Router or Pages Router) based on directory structure.
  * @param {string} projectRoot - The project root directory. Defaults to current working directory.
@@ -178,7 +177,7 @@ function detectComponentType(filePath, routerType) {
  * @internal
  */
 function getComponentListWithTypes(paths, exclude, includeVariants, routerType) {
-    const components = (0, tools_1.getComponentList)(paths, exclude, includeVariants);
+    const components = (0, node_tools_1.getComponentList)(paths, exclude, includeVariants);
     const detectedRouterType = routerType || detectRouterType();
     return components.map((component) => (Object.assign(Object.assign({}, component), { componentType: detectComponentType(component.filePath, detectedRouterType) })));
 }
@@ -189,7 +188,7 @@ function getComponentListWithTypes(paths, exclude, includeVariants, routerType)
  */
 function nextjsClientMapTemplate(indexedImportMap) {
     return `'use client';
-  ${(0, tools_2.defaultImportMapTemplate)(indexedImportMap, 'nextjs')}`;
+  ${(0, node_tools_1.defaultImportMapTemplate)(indexedImportMap, 'nextjs')}`;
 }
 /**
  * React-specific import map template for server side imports only. Used in App Router.
@@ -197,7 +196,7 @@ function nextjsClientMapTemplate(indexedImportMap) {
  * @returns {string} contents for resulting import map file
  */
 function nextjsServertMapTemplate(indexedImportMap) {
-    return (0, tools_2.defaultImportMapTemplate)(indexedImportMap, 'nextjs', 'defaultServerImportEntries');
+    return (0, node_tools_1.defaultImportMapTemplate)(indexedImportMap, 'nextjs', 'defaultServerImportEntries');
 }
 /**
  * React-specific import map template. Used in Pages Router.
@@ -205,5 +204,5 @@ function nextjsServertMapTemplate(indexedImportMap) {
  * @returns {string} contents for resulting import map file
  */
 function nextjsDefaultMapTemplate(indexedImportMap) {
-    return (0, tools_2.defaultImportMapTemplate)(indexedImportMap, 'nextjs');
+    return (0, node_tools_1.defaultImportMapTemplate)(indexedImportMap, 'nextjs');
 }

package/dist/cjs/utils/index.js

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resetEditorChromes = exports.isEditorActive = exports.resolveUrl = exports.tryParseEnvValue = exports.parseRewriteHeader = exports.isServerSidePropsContext = exports.extractPath = exports.handleEditorFastRefresh = void 0;
+exports.resetEditorChromes = exports.isEditorActive = exports.resolveUrl = exports.parseRewriteHeader = exports.isServerSidePropsContext = exports.extractPath = exports.handleEditorFastRefresh = void 0;
 var utils_1 = require("./utils");
 Object.defineProperty(exports, "handleEditorFastRefresh", { enumerable: true, get: function () { return utils_1.handleEditorFastRefresh; } });
 Object.defineProperty(exports, "extractPath", { enumerable: true, get: function () { return utils_1.extractPath; } });
 Object.defineProperty(exports, "isServerSidePropsContext", { enumerable: true, get: function () { return utils_1.isServerSidePropsContext; } });
 Object.defineProperty(exports, "parseRewriteHeader", { enumerable: true, get: function () { return utils_1.parseRewriteHeader; } });
-var utils_2 = require("@sitecore-content-sdk/core/utils");
-Object.defineProperty(exports, "tryParseEnvValue", { enumerable: true, get: function () { return utils_2.tryParseEnvValue; } });
-Object.defineProperty(exports, "resolveUrl", { enumerable: true, get: function () { return utils_2.resolveUrl; } });
-var editing_1 = require("@sitecore-content-sdk/core/editing");
+var tools_1 = require("@sitecore-content-sdk/core/tools");
+Object.defineProperty(exports, "resolveUrl", { enumerable: true, get: function () { return tools_1.resolveUrl; } });
+var editing_1 = require("@sitecore-content-sdk/content/editing");
 Object.defineProperty(exports, "isEditorActive", { enumerable: true, get: function () { return editing_1.isEditorActive; } });
 Object.defineProperty(exports, "resetEditorChromes", { enumerable: true, get: function () { return editing_1.resetEditorChromes; } });

package/dist/cjs/utils/utils.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRewriteHeader = exports.isServerSidePropsContext = exports.extractPath = exports.getEditingSecret = exports.handleEditorFastRefresh = void 0;
-const editing_1 = require("@sitecore-content-sdk/core/editing");
-const middleware_1 = require("../middleware/middleware");
+const editing_1 = require("@sitecore-content-sdk/content/editing");
+const proxy_1 = require("../proxy/proxy");
 /**
  * Since Sitecore editors do not support Fast Refresh:
  * 1. Subscribe on events provided by webpack.
@@ -73,7 +73,7 @@ exports.isServerSidePropsContext = isServerSidePropsContext;
  * @public
  */
 const parseRewriteHeader = (headers) => {
-    const rewriteHeader = headers.get(middleware_1.REWRITE_HEADER_NAME);
+    const rewriteHeader = headers.get(proxy_1.REWRITE_HEADER_NAME);
     const rewriteSegments = (rewriteHeader === null || rewriteHeader === void 0 ? void 0 : rewriteHeader.split('/').filter((segment) => segment)) || [];
     const site = rewriteSegments[0];
     const locale = rewriteSegments[1];

package/dist/esm/client/index.js

@@ -1,2 +1,2 @@
-export { DefaultRetryStrategy, GraphQLRequestClient, getEdgeProxyContentUrl, createGraphQLClientFactory, } from '@sitecore-content-sdk/core/client';
+export { DefaultRetryStrategy, GraphQLRequestClient, getEdgeProxyContentUrl, createGraphQLClientFactory, } from '@sitecore-content-sdk/content/client';
 export { SitecoreNextjsClient as SitecoreClient } from './sitecore-nextjs-client';

package/dist/esm/client/sitecore-nextjs-client.js

@@ -7,10 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SitecoreClient, } from '@sitecore-content-sdk/core/client';
+import { SitecoreClient, } from '@sitecore-content-sdk/content/client';
 import { ComponentPropsService } from '../services/component-props-service';
-import { getSiteRewriteData, normalizeSiteRewrite } from '@sitecore-content-sdk/core/site';
-import { getPersonalizedRewriteData, normalizePersonalizedRewrite, } from '@sitecore-content-sdk/core/personalize';
+import { getSiteRewriteData, normalizeSiteRewrite } from '@sitecore-content-sdk/content/site';
+import { getPersonalizedRewriteData, normalizePersonalizedRewrite, } from '@sitecore-content-sdk/content/personalize';
 /**
  * The SitecoreNextjsClient class extends the SitecoreClient class to provide additional functionality for Next.js.
  * @public
@@ -28,7 +28,7 @@ export class SitecoreNextjsClient extends SitecoreClient {
      */
     getSiteNameFromPath(path) {
         const resolvedPath = super.parsePath(path);
-        // Get site name (from path rewritten in middleware)
+        // Get site name (from path rewritten in proxy)
         const siteData = getSiteRewriteData(resolvedPath, this.initOptions.defaultSite);
         return siteData.siteName;
     }

package/dist/esm/components/BYOCWrapper.js

@@ -8,11 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { BYOCWrapper, fetchBYOCComponentServerProps, } from '@sitecore-content-sdk/react';
-/**
- * TODO: remove when framework agnostic forms implemented
- * 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 Content SDK).
- */
 /**
  * Will be called during SSG or SSR
  * @param {ComponentRendering} rendering

package/dist/esm/components/FEaaSWrapper.js

@@ -8,11 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { FEaaSWrapper, fetchFEaaSComponentServerProps, LayoutServicePageState, } from '@sitecore-content-sdk/react';
-/**
- * TODO: remove when framework agnostic forms implemented
- * 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 Content SDK).
- */
 /**
  * Will be called during SSG or SSR
  * @param {ComponentRendering} rendering

package/dist/esm/components/NextImage.js

@@ -11,11 +11,11 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 /* eslint-disable no-unused-vars */
-import { mediaApi } from '@sitecore-content-sdk/core/media';
+import { mediaApi } from '@sitecore-content-sdk/content/media';
 import React from 'react';
 import { withFieldMetadata, SitecoreProviderReactContext, DefaultEmptyFieldEditingComponentImage, withEmptyFieldEditingComponent, } from '@sitecore-content-sdk/react';
 import Image from 'next/image';
-import { isFieldValueEmpty } from '@sitecore-content-sdk/core/layout';
+import { isFieldValueEmpty } from '@sitecore-content-sdk/content/layout';
 /**
  * Next.js specific Image component implementation.
  * @public

package/dist/esm/config/define-config.js

@@ -1,14 +1,17 @@
-import { defineConfig as defineConfigCore, } from '@sitecore-content-sdk/core/config';
+import { defineConfig as defineConfigCore, } from '@sitecore-content-sdk/content/config';
+import { resolveEdgeUrl } from '@sitecore-content-sdk/core/tools';
+/** Next.js env var for Edge hostname; exposed to the browser so client code can use it. */
+const NEXT_PUBLIC_SITECORE_EDGE_PLATFORM_HOSTNAME_ENV = 'NEXT_PUBLIC_SITECORE_EDGE_PLATFORM_HOSTNAME';
 /**
  * Provides default NextJs initial values from env variables for SitecoreConfig
  * @param {SitecoreConfigInput} config optional override values to be written over default config settings
  * @returns default nextjs input config
  */
 export const getNextFallbackConfig = (config) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
-    return Object.assign(Object.assign({}, config), { api: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.api), { edge: Object.assign(Object.assign({}, (_a = config === null || config === void 0 ? void 0 : config.api) === null || _a === void 0 ? void 0 : _a.edge), { contextId: ((_c = (_b = config === null || config === void 0 ? void 0 : config.api) === null || _b === void 0 ? void 0 : _b.edge) === null || _c === void 0 ? void 0 : _c.contextId) || '', clientContextId: ((_e = (_d = config === null || config === void 0 ? void 0 : config.api) === null || _d === void 0 ? void 0 : _d.edge) === null || _e === void 0 ? void 0 : _e.clientContextId) || process.env.NEXT_PUBLIC_SITECORE_EDGE_CONTEXT_ID, edgeUrl: ((_g = (_f = config === null || config === void 0 ? void 0 : config.api) === null || _f === void 0 ? void 0 : _f.edge) === null || _g === void 0 ? void 0 : _g.edgeUrl) || process.env.NEXT_PUBLIC_SITECORE_EDGE_URL }), local: Object.assign(Object.assign({}, (_h = config === null || config === void 0 ? void 0 : config.api) === null || _h === void 0 ? void 0 : _h.local), { apiKey: ((_k = (_j = config === null || config === void 0 ? void 0 : config.api) === null || _j === void 0 ? void 0 : _j.local) === null || _k === void 0 ? void 0 : _k.apiKey) || process.env.NEXT_PUBLIC_SITECORE_API_KEY || '', apiHost: ((_m = (_l = config === null || config === void 0 ? void 0 : config.api) === null || _l === void 0 ? void 0 : _l.local) === null || _m === void 0 ? void 0 : _m.apiHost) || process.env.NEXT_PUBLIC_SITECORE_API_HOST || '' }) }), defaultSite: (config === null || config === void 0 ? void 0 : config.defaultSite) || process.env.NEXT_PUBLIC_DEFAULT_SITE_NAME || '', defaultLanguage: (config === null || config === void 0 ? void 0 : config.defaultLanguage) || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || 'en', multisite: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.multisite), { useCookieResolution: (_p = (_o = config === null || config === void 0 ? void 0 : config.multisite) === null || _o === void 0 ? void 0 : _o.useCookieResolution) !== null && _p !== void 0 ? _p : (() => process.env.VERCEL_ENV === 'preview') }), personalize: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.personalize), { scope: ((_q = config === null || config === void 0 ? void 0 : config.personalize) === null || _q === void 0 ? void 0 : _q.scope) || process.env.NEXT_PUBLIC_PERSONALIZE_SCOPE }), generateStaticPaths: process.env.GENERATE_STATIC_PATHS !== undefined
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
+    return Object.assign(Object.assign({}, config), { api: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.api), { edge: Object.assign(Object.assign({}, (_a = config === null || config === void 0 ? void 0 : config.api) === null || _a === void 0 ? void 0 : _a.edge), { contextId: ((_c = (_b = config === null || config === void 0 ? void 0 : config.api) === null || _b === void 0 ? void 0 : _b.edge) === null || _c === void 0 ? void 0 : _c.contextId) || '', clientContextId: ((_e = (_d = config === null || config === void 0 ? void 0 : config.api) === null || _d === void 0 ? void 0 : _d.edge) === null || _e === void 0 ? void 0 : _e.clientContextId) || process.env.NEXT_PUBLIC_SITECORE_EDGE_CONTEXT_ID, edgeUrl: resolveEdgeUrl((_h = (_g = (_f = config === null || config === void 0 ? void 0 : config.api) === null || _f === void 0 ? void 0 : _f.edge) === null || _g === void 0 ? void 0 : _g.edgeUrl) !== null && _h !== void 0 ? _h : process.env[NEXT_PUBLIC_SITECORE_EDGE_PLATFORM_HOSTNAME_ENV]) }), local: Object.assign(Object.assign({}, (_j = config === null || config === void 0 ? void 0 : config.api) === null || _j === void 0 ? void 0 : _j.local), { apiKey: ((_l = (_k = config === null || config === void 0 ? void 0 : config.api) === null || _k === void 0 ? void 0 : _k.local) === null || _l === void 0 ? void 0 : _l.apiKey) || process.env.NEXT_PUBLIC_SITECORE_API_KEY || '', apiHost: ((_o = (_m = config === null || config === void 0 ? void 0 : config.api) === null || _m === void 0 ? void 0 : _m.local) === null || _o === void 0 ? void 0 : _o.apiHost) || process.env.NEXT_PUBLIC_SITECORE_API_HOST || '' }) }), defaultSite: (config === null || config === void 0 ? void 0 : config.defaultSite) || process.env.NEXT_PUBLIC_DEFAULT_SITE_NAME || '', defaultLanguage: (config === null || config === void 0 ? void 0 : config.defaultLanguage) || process.env.NEXT_PUBLIC_DEFAULT_LANGUAGE || 'en', multisite: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.multisite), { useCookieResolution: (_q = (_p = config === null || config === void 0 ? void 0 : config.multisite) === null || _p === void 0 ? void 0 : _p.useCookieResolution) !== null && _q !== void 0 ? _q : (() => process.env.VERCEL_ENV === 'preview') }), personalize: Object.assign(Object.assign({}, config === null || config === void 0 ? void 0 : config.personalize), { scope: ((_r = config === null || config === void 0 ? void 0 : config.personalize) === null || _r === void 0 ? void 0 : _r.scope) || process.env.NEXT_PUBLIC_PERSONALIZE_SCOPE }), generateStaticPaths: process.env.GENERATE_STATIC_PATHS !== undefined
             ? process.env.GENERATE_STATIC_PATHS.toLowerCase() === 'true'
-            : (_r = config === null || config === void 0 ? void 0 : config.generateStaticPaths) !== null && _r !== void 0 ? _r : true, sitecoreInternalEditingHostUrl: (config === null || config === void 0 ? void 0 : config.sitecoreInternalEditingHostUrl) || process.env.SITECORE_INTERNAL_EDITING_HOST_URL });
+            : (_s = config === null || config === void 0 ? void 0 : config.generateStaticPaths) !== null && _s !== void 0 ? _s : true, sitecoreInternalEditingHostUrl: (config === null || config === void 0 ? void 0 : config.sitecoreInternalEditingHostUrl) || process.env.SITECORE_INTERNAL_EDITING_HOST_URL });
 };
 /**
  * Accepts a SitecoreConfigInput object and returns full sitecore configuration

package/dist/esm/config-cli/define-cli-config.js

@@ -1,4 +1,4 @@
-import { defineCliConfig as defineCliConfigCore } from '@sitecore-content-sdk/core/config-cli';
+import { defineCliConfig as defineCliConfigCore } from '@sitecore-content-sdk/content/config-cli';
 import { byocTemplate } from '../tools/templating/byoc-component';
 import { defaultTemplate } from '../tools/templating/default-component';
 import { generateMap } from '../tools/generate-map';

package/dist/esm/debug.js

@@ -0,0 +1,9 @@
+import { debug as coreDebug } from '@sitecore-content-sdk/core';
+import { debug as contentDebug } from '@sitecore-content-sdk/content';
+import { debug as searchDebug } from '@sitecore-content-sdk/react/search';
+/**
+ * Unified debug object containing all debug namespaces from referenced content-sdk packages.
+ * @public
+ */
+const debug = Object.assign(Object.assign(Object.assign({}, coreDebug), contentDebug), { search: searchDebug });
+export default debug;

package/dist/esm/editing/codegen/import-map-server.js

@@ -1,5 +1,5 @@
 import React, { Children, Fragment, createElement, cloneElement, isValidElement, useCallback, useId, useMemo, forwardRef, lazy, memo, Suspense, } from 'react';
-import { CdpHelper } from '@sitecore-content-sdk/core/personalize';
+import { CdpHelper } from '@sitecore-content-sdk/content/personalize';
 import { Link, Text, RichText, NextImage, Placeholder, Image, File, withDatasourceCheck, } from '../..';
 /**
  * The default import entries for the import map.

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

@@ -7,10 +7,10 @@ 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-content-sdk/core/editing';
-import { debug } from '@sitecore-content-sdk/core';
-import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/utils';
-import { EditMode } from '@sitecore-content-sdk/core/layout';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-content-sdk/content/editing';
+import debug from '../debug';
+import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/tools';
+import { EditMode } from '@sitecore-content-sdk/content/layout';
 import { getEditingSecret } from '../utils/utils';
 /**
  * Middleware / handler used in the editing config API route in xmcloud add on (e.g. '/api/editing/config')
@@ -45,7 +45,6 @@ export class EditingConfigMiddleware {
             // Handle preflight request
             if (_req.method === 'OPTIONS') {
                 debug.editing('preflight request');
-                // CORS headers are set by enforceCors
                 return res.status(204).send(null);
             }
             const components = Array.from(this.config.components.keys());

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

@@ -7,13 +7,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { debug, NativeDataFetcher } from '@sitecore-content-sdk/core';
-import { QUERY_PARAM_EDITING_SECRET, INVALID_SECRET_HTML_MESSAGE, EDITING_ALLOWED_ORIGINS, } from '@sitecore-content-sdk/core/editing';
-import { LayoutServicePageState } from '@sitecore-content-sdk/core/layout';
+import { NativeDataFetcher } from '@sitecore-content-sdk/core';
+import { QUERY_PARAM_EDITING_SECRET, INVALID_SECRET_HTML_MESSAGE, EDITING_ALLOWED_ORIGINS, } from '@sitecore-content-sdk/content/editing';
+import { LayoutServicePageState } from '@sitecore-content-sdk/content/layout';
 import { getEditingSecret } from '../utils/utils';
 import { RenderMiddlewareBase } from './render-middleware';
-import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/utils';
-import { getPreviewCookies, getRequiredEditingParamsList, mapEditingParams, cleanupNextPreviewCookies, getQueryParamsForPropagation, getHeadersForPropagation, getEditingRequestHtml, getCSPHeader, resolveServerUrl, } from './utils';
+import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/tools';
+import debug from '../debug';
+import { getPreviewCookies, getRequiredEditingParamsList, mapEditingParams, cleanupNextPreviewCookies, getQueryParamsForPropagation, getHeadersForPropagation, getEditingRequestHtml, getCSPHeader, resolveServerUrl, getAllowedQueryParams, } from './utils';
 /**
  * Middleware / handler for use in the editing render Next.js API route (e.g. '/api/editing/render')
  * which is required for Sitecore editing support.
@@ -27,7 +28,7 @@ export class EditingRenderMiddleware extends RenderMiddlewareBase {
         super();
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f;
             const { body, method, headers, query } = req;
             debug.editing('editing render middleware start: %o', {
                 method,
@@ -60,7 +61,7 @@ export class EditingRenderMiddleware extends RenderMiddlewareBase {
             }
             if (req.method === 'OPTIONS') {
                 debug.editing('preflight request');
-                // CORS headers are set by enforceCors
+                // CORS headers are set by getEnforcedCorsHeaders
                 return res.status(204).send(null);
             }
             if (req.method !== 'GET') {
@@ -74,15 +75,22 @@ export class EditingRenderMiddleware extends RenderMiddlewareBase {
             const mode = query.mode;
             const requiredQueryParams = getRequiredEditingParamsList(mode);
             const missingQueryParams = requiredQueryParams.filter((param) => !query[param]);
+            const { allowedQueryParams, missingAllowedParams } = getAllowedQueryParams(query, (_b = this.config) === null || _b === void 0 ? void 0 : _b.allowedQueryParams);
             // Validate query parameters
-            if (missingQueryParams.length) {
-                debug.editing('missing required query parameters: %o', missingQueryParams);
+            if (missingQueryParams.length || missingAllowedParams.length) {
+                debug.editing('missing required query parameters: %o', [
+                    ...missingQueryParams,
+                    ...missingAllowedParams,
+                ]);
                 return res.status(400).json({
-                    html: `<html><body>Missing required query parameters: ${missingQueryParams.join(', ')}</body></html>`,
+                    html: `<html><body>Missing required query parameters: ${[
+                        ...missingQueryParams,
+                        ...missingAllowedParams,
+                    ].join(', ')}</body></html>`,
                 });
             }
             const previewDataParams = mapEditingParams(query);
-            res.setPreviewData(Object.assign(Object.assign({}, previewDataParams), { variantIds: (_b = previewDataParams.variantIds) === null || _b === void 0 ? void 0 : _b.split(',') }), {
+            res.setPreviewData(Object.assign(Object.assign(Object.assign({}, previewDataParams), allowedQueryParams), { variantIds: (_c = previewDataParams.variantIds) === null || _c === void 0 ? void 0 : _c.split(',') }), {
                 maxAge: 3,
             });
             // Set Preview mode identifier cookie, if the page is rendered in Sitecore Preview mode
@@ -94,8 +102,8 @@ export class EditingRenderMiddleware extends RenderMiddlewareBase {
             // Restrict the page to be rendered only within the allowed origins
             res.setHeader('Content-Security-Policy', getCSPHeader());
             const encodedRoute = encodeURI(query.route);
-            const route = ((_d = (_c = this.config) === null || _c === void 0 ? void 0 : _c.resolvePageUrl) === null || _d === void 0 ? void 0 : _d.call(_c, encodedRoute)) || encodedRoute;
-            const base = ((_e = this.config) === null || _e === void 0 ? void 0 : _e.sitecoreInternalEditingHostUrl) || resolveServerUrl(req);
+            const route = ((_e = (_d = this.config) === null || _d === void 0 ? void 0 : _d.resolvePageUrl) === null || _e === void 0 ? void 0 : _e.call(_d, encodedRoute)) || encodedRoute;
+            const base = ((_f = this.config) === null || _f === void 0 ? void 0 : _f.sitecoreInternalEditingHostUrl) || resolveServerUrl(req);
             const requestUrl = new URL(route, base);
             const cookies = res.getHeader('Set-Cookie');
             // Make actual render request for page route, passing on preview cookies as well as any approved query string parameters.
@@ -116,6 +124,7 @@ export class EditingRenderMiddleware extends RenderMiddlewareBase {
                     status: 200,
                     route,
                 });
+                res.setHeader('Content-Type', 'text/html; charset=utf-8');
                 res.status(200).send(html);
             }
             catch (err) {

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

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { debug } from '@sitecore-content-sdk/core';
-import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, INVALID_SECRET_HTML_MESSAGE, } from '@sitecore-content-sdk/core/editing';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, INVALID_SECRET_HTML_MESSAGE, } from '@sitecore-content-sdk/content/editing';
 import { getEditingSecret } from '../utils/utils';
 import { RenderMiddlewareBase } from './render-middleware';
-import { enforceCors } from '@sitecore-content-sdk/core/utils';
+import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/tools';
+import debug from '../debug';
 /**
  * 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.
@@ -19,7 +19,7 @@ import { enforceCors } from '@sitecore-content-sdk/core/utils';
  */
 export class FEAASRenderMiddleware extends RenderMiddlewareBase {
     /**
-     * @param {EditingRenderMiddlewareConfig} [config] Editing render middleware config
+     * @param {FEAASRenderMiddlewareConfig} [config] FEAAS render middleware config
      */
     constructor(config) {
         var _a;
@@ -35,12 +35,21 @@ export class FEAASRenderMiddleware extends RenderMiddlewareBase {
                 query,
                 headers,
             });
-            if (!enforceCors(req, res, EDITING_ALLOWED_ORIGINS)) {
+            const corsHeaders = getEnforcedCorsHeaders({
+                requestMethod: method,
+                headers: headers,
+                presetCorsHeader: headers['Access-Control-Allow-Origin'],
+                allowedOrigins: EDITING_ALLOWED_ORIGINS,
+            });
+            if (!corsHeaders) {
                 debug.editing('invalid origin host - set allowed origins in JSS_ALLOWED_ORIGINS environment variable');
                 return res
                     .status(401)
                     .send(`<html><body>Requests from origin ${(_a = req.headers) === null || _a === void 0 ? void 0 : _a.origin} are not allowed</body></html>`);
             }
+            Object.keys(corsHeaders).forEach((key) => {
+                res.setHeader(key, corsHeaders[key]);
+            });
             if (!method || !['GET', 'OPTIONS'].includes(method)) {
                 debug.editing('invalid method - sent %s expected GET,OPTIONS', method);
                 res.setHeader('Allow', 'GET, OPTIONS');
@@ -55,7 +64,6 @@ export class FEAASRenderMiddleware extends RenderMiddlewareBase {
             // Handle preflight request
             if (method === 'OPTIONS') {
                 debug.editing('preflight request');
-                // CORS headers are set by enforceCors
                 return res.status(204).send(null);
             }
             try {

package/dist/esm/editing/index.js

@@ -1,6 +1,6 @@
-export { EditingService } from '@sitecore-content-sdk/core/editing';
+export { EditingService } from '@sitecore-content-sdk/content/editing';
 export { EditingRenderMiddleware, } from './editing-render-middleware';
 export { isDesignLibraryPreviewData, getQueryParamsForPropagation, getHeadersForPropagation, } from './utils';
 export { FEAASRenderMiddleware } from './feaas-render-middleware';
 export { EditingConfigMiddleware, } from './editing-config-middleware';
-export { RenderingType, EDITING_COMPONENT_PLACEHOLDER, EDITING_COMPONENT_ID, } from '@sitecore-content-sdk/core/layout';
+export { RenderingType, EDITING_COMPONENT_PLACEHOLDER, EDITING_COMPONENT_ID, } from '@sitecore-content-sdk/content/layout';

package/dist/esm/editing/types.js

@@ -0,0 +1 @@
+export {};