@sitecore-content-sdk/nextjs 0.1.0-beta.7 → 0.1.0-beta.8

package/config.d.ts

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

package/config.js

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

package/dist/cjs/config/index.js

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

package/dist/cjs/middleware/middleware.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defineMiddleware = exports.MiddlewareBase = exports.Middleware = void 0;
+const site_1 = require("@sitecore-content-sdk/core/site");
 const core_1 = require("@sitecore-content-sdk/core");
 const server_1 = require("next/server");
 /**
@@ -27,6 +28,7 @@ class MiddlewareBase extends Middleware {
         this.config = config;
         this.SITE_SYMBOL = 'sc_site';
         this.REWRITE_HEADER_NAME = 'x-sc-rewrite';
+        this.siteResolver = new site_1.SiteResolver(config.sites);
         this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
@@ -94,9 +96,9 @@ class MiddlewareBase extends Middleware {
         var _a;
         const siteNameCookie = (_a = res === null || res === void 0 ? void 0 : res.cookies.get(this.SITE_SYMBOL)) === null || _a === void 0 ? void 0 : _a.value;
         if (siteNameCookie)
-            return this.config.siteResolver.getByName(siteNameCookie);
+            return this.siteResolver.getByName(siteNameCookie);
         const hostname = this.getHostHeader(req) || this.defaultHostname;
-        return this.config.siteResolver.getByHost(hostname);
+        return this.siteResolver.getByHost(hostname);
     }
     /**
      * Create a rewrite response

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

@@ -25,6 +25,10 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
             var _a;
+            if (!this.config.enabled) {
+                core_1.debug.multisite('skipped (multisite middleware is disabled globally)');
+                return res;
+            }
             try {
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req);
@@ -48,7 +52,7 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
                     (this.config.useCookieResolution &&
                         this.config.useCookieResolution(req) &&
                         ((_a = req.cookies.get(this.SITE_SYMBOL)) === null || _a === void 0 ? void 0 : _a.value)) ||
-                    this.config.siteResolver.getByHost(hostname).name;
+                    this.siteResolver.getByHost(hostname).name;
                 // Rewrite to site specific path
                 const rewritePath = (0, site_1.getSiteRewrite)(pathname, {
                     siteName,

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

@@ -26,12 +26,16 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
         super(config);
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            if (!this.config.enabled) {
+                core_1.debug.personalize('skipped (personalize middleware is disabled globally)');
+                return res;
+            }
             try {
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req);
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
                 const startTimestamp = Date.now();
-                const timeout = this.config.cdpConfig.timeout;
+                const timeout = this.config.cdpTimeout;
                 core_1.debug.personalize('personalize middleware start: %o', {
                     pathname,
                     language,
@@ -121,13 +125,18 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
         });
         // NOTE: we provide native fetch for compatibility on Next.js Edge Runtime
         // (underlying default 'cross-fetch' is not currently compatible: https://github.com/lquixada/cross-fetch/issues/78)
-        this.personalizeService = new personalize_1.GraphQLPersonalizeService(Object.assign(Object.assign({}, config.edgeConfig), { fetch: fetch }));
+        this.personalizeService = new personalize_1.GraphQLPersonalizeService({
+            clientFactory: this.config.clientFactory,
+            timeout: this.config.edgeTimeout,
+            scope: this.config.scope,
+            fetch: fetch,
+        });
     }
     initPersonalizeServer(_a) {
         return __awaiter(this, arguments, void 0, function* ({ hostname, siteName, request, response, }) {
             yield (0, server_1.CloudSDK)(request, response, {
-                sitecoreEdgeUrl: this.config.cdpConfig.sitecoreEdgeUrl,
-                sitecoreEdgeContextId: this.config.cdpConfig.sitecoreEdgeContextId,
+                sitecoreEdgeUrl: this.config.edgeUrl,
+                sitecoreEdgeContextId: this.config.contextId,
                 siteName,
                 cookieDomain: hostname,
                 enableServerCookie: true,
@@ -141,8 +150,8 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             var _b;
             core_1.debug.personalize('executing experience for %s %o', friendlyId, params);
             return (yield (0, server_2.personalize)(request, {
-                channel: this.config.cdpConfig.channel || 'WEB',
-                currency: (_b = this.config.cdpConfig.currency) !== null && _b !== void 0 ? _b : 'USD',
+                channel: this.config.channel || 'WEB',
+                currency: (_b = this.config.currency) !== null && _b !== void 0 ? _b : 'USD',
                 friendlyId,
                 params,
                 language,
@@ -184,7 +193,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             if (variantId.includes('_')) {
                 // Component-level personalization in format "<ComponentID>_<VariantID>"
                 const componentId = variantId.split('_')[0];
-                const friendlyId = personalize_1.CdpHelper.getComponentFriendlyId(personalizeInfo.pageId, componentId, language, this.config.scope || this.config.edgeConfig.scope);
+                const friendlyId = personalize_1.CdpHelper.getComponentFriendlyId(personalizeInfo.pageId, componentId, language, this.config.scope);
                 const execution = results.find((x) => x.friendlyId === friendlyId);
                 if (execution) {
                     execution.variantIds.push(variantId);
@@ -200,7 +209,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             }
             else {
                 // Embedded (page-level) personalization in format "<VariantID>"
-                const friendlyId = personalize_1.CdpHelper.getPageFriendlyId(personalizeInfo.pageId, language, this.config.scope || this.config.edgeConfig.scope);
+                const friendlyId = personalize_1.CdpHelper.getPageFriendlyId(personalizeInfo.pageId, language, this.config.scope);
                 const execution = results.find((x) => x.friendlyId === friendlyId);
                 if (execution) {
                     execution.variantIds.push(variantId);

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

@@ -33,6 +33,10 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
         super(config);
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            if (!this.config.enabled) {
+                core_1.debug.redirects('skipped (redirects middleware is disabled globally)');
+                return res;
+            }
             try {
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req);
@@ -44,12 +48,12 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     language,
                     hostname,
                 });
+                if (this.disabled(req, res)) {
+                    core_1.debug.redirects('skipped (redirects middleware is disabled)');
+                    return res;
+                }
                 const createResponse = () => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    if (this.disabled(req, res)) {
-                        core_1.debug.redirects('skipped (redirects middleware is disabled)');
-                        return res;
-                    }
                     if (this.isPreview(req)) {
                         core_1.debug.redirects('skipped (preview)');
                         return res;

package/dist/esm/config/index.js

@@ -0,0 +1 @@
+export { defineConfig, } from '@sitecore-content-sdk/core/config';

package/dist/esm/middleware/middleware.js

@@ -7,6 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+import { SiteResolver } from '@sitecore-content-sdk/core/site';
 import { debug } from '@sitecore-content-sdk/core';
 import { NextResponse } from 'next/server';
 /**
@@ -23,6 +24,7 @@ export class MiddlewareBase extends Middleware {
         this.config = config;
         this.SITE_SYMBOL = 'sc_site';
         this.REWRITE_HEADER_NAME = 'x-sc-rewrite';
+        this.siteResolver = new SiteResolver(config.sites);
         this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
@@ -90,9 +92,9 @@ export class MiddlewareBase extends Middleware {
         var _a;
         const siteNameCookie = (_a = res === null || res === void 0 ? void 0 : res.cookies.get(this.SITE_SYMBOL)) === null || _a === void 0 ? void 0 : _a.value;
         if (siteNameCookie)
-            return this.config.siteResolver.getByName(siteNameCookie);
+            return this.siteResolver.getByName(siteNameCookie);
         const hostname = this.getHostHeader(req) || this.defaultHostname;
-        return this.config.siteResolver.getByHost(hostname);
+        return this.siteResolver.getByHost(hostname);
     }
     /**
      * Create a rewrite response

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

@@ -22,6 +22,10 @@ export class MultisiteMiddleware extends MiddlewareBase {
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
             var _a;
+            if (!this.config.enabled) {
+                debug.multisite('skipped (multisite middleware is disabled globally)');
+                return res;
+            }
             try {
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req);
@@ -45,7 +49,7 @@ export class MultisiteMiddleware extends MiddlewareBase {
                     (this.config.useCookieResolution &&
                         this.config.useCookieResolution(req) &&
                         ((_a = req.cookies.get(this.SITE_SYMBOL)) === null || _a === void 0 ? void 0 : _a.value)) ||
-                    this.config.siteResolver.getByHost(hostname).name;
+                    this.siteResolver.getByHost(hostname).name;
                 // Rewrite to site specific path
                 const rewritePath = getSiteRewrite(pathname, {
                     siteName,

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

@@ -23,12 +23,16 @@ export class PersonalizeMiddleware extends MiddlewareBase {
         super(config);
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            if (!this.config.enabled) {
+                debug.personalize('skipped (personalize middleware is disabled globally)');
+                return res;
+            }
             try {
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req);
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
                 const startTimestamp = Date.now();
-                const timeout = this.config.cdpConfig.timeout;
+                const timeout = this.config.cdpTimeout;
                 debug.personalize('personalize middleware start: %o', {
                     pathname,
                     language,
@@ -118,13 +122,18 @@ export class PersonalizeMiddleware extends MiddlewareBase {
         });
         // NOTE: we provide native fetch for compatibility on Next.js Edge Runtime
         // (underlying default 'cross-fetch' is not currently compatible: https://github.com/lquixada/cross-fetch/issues/78)
-        this.personalizeService = new GraphQLPersonalizeService(Object.assign(Object.assign({}, config.edgeConfig), { fetch: fetch }));
+        this.personalizeService = new GraphQLPersonalizeService({
+            clientFactory: this.config.clientFactory,
+            timeout: this.config.edgeTimeout,
+            scope: this.config.scope,
+            fetch: fetch,
+        });
     }
     initPersonalizeServer(_a) {
         return __awaiter(this, arguments, void 0, function* ({ hostname, siteName, request, response, }) {
             yield CloudSDK(request, response, {
-                sitecoreEdgeUrl: this.config.cdpConfig.sitecoreEdgeUrl,
-                sitecoreEdgeContextId: this.config.cdpConfig.sitecoreEdgeContextId,
+                sitecoreEdgeUrl: this.config.edgeUrl,
+                sitecoreEdgeContextId: this.config.contextId,
                 siteName,
                 cookieDomain: hostname,
                 enableServerCookie: true,
@@ -138,8 +147,8 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             var _b;
             debug.personalize('executing experience for %s %o', friendlyId, params);
             return (yield personalize(request, {
-                channel: this.config.cdpConfig.channel || 'WEB',
-                currency: (_b = this.config.cdpConfig.currency) !== null && _b !== void 0 ? _b : 'USD',
+                channel: this.config.channel || 'WEB',
+                currency: (_b = this.config.currency) !== null && _b !== void 0 ? _b : 'USD',
                 friendlyId,
                 params,
                 language,
@@ -181,7 +190,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             if (variantId.includes('_')) {
                 // Component-level personalization in format "<ComponentID>_<VariantID>"
                 const componentId = variantId.split('_')[0];
-                const friendlyId = CdpHelper.getComponentFriendlyId(personalizeInfo.pageId, componentId, language, this.config.scope || this.config.edgeConfig.scope);
+                const friendlyId = CdpHelper.getComponentFriendlyId(personalizeInfo.pageId, componentId, language, this.config.scope);
                 const execution = results.find((x) => x.friendlyId === friendlyId);
                 if (execution) {
                     execution.variantIds.push(variantId);
@@ -197,7 +206,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             }
             else {
                 // Embedded (page-level) personalization in format "<VariantID>"
-                const friendlyId = CdpHelper.getPageFriendlyId(personalizeInfo.pageId, language, this.config.scope || this.config.edgeConfig.scope);
+                const friendlyId = CdpHelper.getPageFriendlyId(personalizeInfo.pageId, language, this.config.scope);
                 const execution = results.find((x) => x.friendlyId === friendlyId);
                 if (execution) {
                     execution.variantIds.push(variantId);

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

@@ -27,6 +27,10 @@ export class RedirectsMiddleware extends MiddlewareBase {
         super(config);
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            if (!this.config.enabled) {
+                debug.redirects('skipped (redirects middleware is disabled globally)');
+                return res;
+            }
             try {
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req);
@@ -38,12 +42,12 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     language,
                     hostname,
                 });
+                if (this.disabled(req, res)) {
+                    debug.redirects('skipped (redirects middleware is disabled)');
+                    return res;
+                }
                 const createResponse = () => __awaiter(this, void 0, void 0, function* () {
                     var _a;
-                    if (this.disabled(req, res)) {
-                        debug.redirects('skipped (redirects middleware is disabled)');
-                        return res;
-                    }
                     if (this.isPreview(req)) {
                         debug.redirects('skipped (preview)');
                         return res;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "0.1.0-beta.7",
+  "version": "0.1.0-beta.8",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -72,9 +72,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-content-sdk/core": "0.1.0-beta.7",
-    "@sitecore-content-sdk/dev-tools": "0.1.0-beta.7",
-    "@sitecore-content-sdk/react": "0.1.0-beta.7",
+    "@sitecore-content-sdk/core": "0.1.0-beta.8",
+    "@sitecore-content-sdk/dev-tools": "0.1.0-beta.8",
+    "@sitecore-content-sdk/react": "0.1.0-beta.8",
     "@vercel/kv": "^3.0.0",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.3.0",
@@ -82,7 +82,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "3f6ba86e77d257b8d8c898db124e75120497698c",
+  "gitHead": "53fbb6772abec34c970f67e623e28cba99628d7c",
   "files": [
     "dist",
     "types",

package/types/config/index.d.ts

@@ -0,0 +1 @@
+export { defineConfig, SitecoreConfigInput, SitecoreConfig, } from '@sitecore-content-sdk/core/config';

package/types/middleware/middleware.d.ts

@@ -15,7 +15,7 @@ export type MiddlewareBaseConfig = {
     /**
      * Site resolution implementation by name/hostname
      */
-    siteResolver: SiteResolver;
+    sites: SiteInfo[];
 };
 /**
  * Middleware class to be extended by all middleware implementations
@@ -37,6 +37,7 @@ export declare abstract class MiddlewareBase extends Middleware {
     protected SITE_SYMBOL: string;
     protected REWRITE_HEADER_NAME: string;
     protected defaultHostname: string;
+    protected siteResolver: SiteResolver;
     constructor(config: MiddlewareBaseConfig);
     /**
      * Determines if mode is preview

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

@@ -1,5 +1,6 @@
 import { NextResponse, NextRequest } from 'next/server';
 import { MiddlewareBase, MiddlewareBaseConfig } from './middleware';
+import { SitecoreConfig } from '../config';
 export type CookieAttributes = {
     /**
      * the Secure attribute of the site cookie
@@ -14,12 +15,7 @@ export type CookieAttributes = {
      */
     sameSite?: true | false | 'lax' | 'strict' | 'none' | undefined;
 };
-export type MultisiteMiddlewareConfig = MiddlewareBaseConfig & {
-    /**
-     * Function used to determine if site should be resolved from sc_site cookie when present
-     */
-    useCookieResolution?: (req: NextRequest) => boolean;
-};
+export type MultisiteMiddlewareConfig = MiddlewareBaseConfig & SitecoreConfig['multisite'];
 /**
  * Middleware / handler for multisite support
  */

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

@@ -1,6 +1,8 @@
 import { NextResponse, NextRequest } from 'next/server';
-import { GraphQLPersonalizeServiceConfig, PersonalizeInfo } from '@sitecore-content-sdk/core/personalize';
+import { PersonalizeInfo } from '@sitecore-content-sdk/core/personalize';
+import { GraphQLRequestClientFactory } from '@sitecore-content-sdk/core';
 import { MiddlewareBase, MiddlewareBaseConfig } from './middleware';
+import { SitecoreConfig } from '../config';
 export type CdpServiceConfig = {
     /**
      * Your Sitecore Edge Platform endpoint
@@ -24,19 +26,8 @@ export type CdpServiceConfig = {
      */
     timeout?: number;
 };
-export type PersonalizeMiddlewareConfig = MiddlewareBaseConfig & {
-    /**
-     * Configuration for your Sitecore Experience Edge endpoint
-     */
-    edgeConfig: Omit<GraphQLPersonalizeServiceConfig, 'fetch'>;
-    /**
-     * Configuration for your Sitecore CDP endpoint
-     */
-    cdpConfig: CdpServiceConfig;
-    /**
-     * Optional Sitecore Personalize scope identifier allowing you to isolate your personalization data between XM Cloud environments
-     */
-    scope?: string;
+export type PersonalizeMiddlewareConfig = MiddlewareBaseConfig & SitecoreConfig['api']['edge'] & SitecoreConfig['personalize'] & {
+    clientFactory: GraphQLRequestClientFactory;
 };
 /**
  * Object model of Experience Context data

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

@@ -1,16 +1,11 @@
 import { GraphQLRedirectsServiceConfig } from '@sitecore-content-sdk/core/site';
 import { NextRequest, NextResponse } from 'next/server';
 import { MiddlewareBase, MiddlewareBaseConfig } from './middleware';
+import { SitecoreConfig } from '../config';
 /**
  * extended RedirectsMiddlewareConfig config type for RedirectsMiddleware
  */
-export type RedirectsMiddlewareConfig = Omit<GraphQLRedirectsServiceConfig, 'fetch'> & MiddlewareBaseConfig & {
-    /**
-     * These are all the locales you support in your application.
-     * These should match those in your next.config.js (i18n.locales).
-     */
-    locales: string[];
-};
+export type RedirectsMiddlewareConfig = Omit<GraphQLRedirectsServiceConfig, 'fetch'> & MiddlewareBaseConfig & SitecoreConfig['redirects'];
 /**
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
  * compares with current url and redirects to target url