@sitecore-jss/sitecore-jss-nextjs 22.0.0-canary.8 → 22.0.0

package/dist/cjs/index.js

@@ -1,17 +1,36 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Image = exports.NextImage = exports.EditingComponentPlaceholder = exports.Placeholder = exports.RichText = exports.Link = exports.getPublicUrl = exports.handleEditorFastRefresh = 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.GraphQLRequestClient = exports.PosResolver = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EDITING_COMPONENT_ID = exports.EDITING_COMPONENT_PLACEHOLDER = exports.RenderingType = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.tryParseEnvValue = exports.resolveUrl = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
-exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.getFEAASLibraryStylesheetLinks = exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = void 0;
+exports.DateField = exports.Text = exports.Image = exports.Context = exports.ComponentBuilder = exports.BYOCWrapper = exports.FEaaSWrapper = exports.NextImage = exports.EditingComponentPlaceholder = exports.Placeholder = exports.RichText = exports.Link = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.GraphQLSiteInfoService = exports.SiteResolver = exports.GraphQLRobotsService = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.MultisiteGraphQLSitemapService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.getContentStylesheetLink = exports.EDITING_COMPONENT_ID = exports.EDITING_COMPONENT_PLACEHOLDER = exports.RenderingType = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
+exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.getComponentLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.EditFrame = void 0;
 var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return sitecore_jss_1.constants; } });
 Object.defineProperty(exports, "AxiosDataFetcher", { enumerable: true, get: function () { return sitecore_jss_1.AxiosDataFetcher; } });
 Object.defineProperty(exports, "NativeDataFetcher", { enumerable: true, get: function () { return sitecore_jss_1.NativeDataFetcher; } });
 Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return sitecore_jss_1.enableDebug; } });
-var utils_1 = require("@sitecore-jss/sitecore-jss/utils");
-Object.defineProperty(exports, "isEditorActive", { enumerable: true, get: function () { return utils_1.isEditorActive; } });
-Object.defineProperty(exports, "resetEditorChromes", { enumerable: true, get: function () { return utils_1.resetEditorChromes; } });
-Object.defineProperty(exports, "resolveUrl", { enumerable: true, get: function () { return utils_1.resolveUrl; } });
-Object.defineProperty(exports, "tryParseEnvValue", { enumerable: true, get: function () { return utils_1.tryParseEnvValue; } });
+Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return sitecore_jss_1.debug; } });
 var layout_1 = require("@sitecore-jss/sitecore-jss/layout");
 Object.defineProperty(exports, "LayoutServicePageState", { enumerable: true, get: function () { return layout_1.LayoutServicePageState; } });
 Object.defineProperty(exports, "GraphQLLayoutService", { enumerable: true, get: function () { return layout_1.GraphQLLayoutService; } });
@@ -21,6 +40,7 @@ Object.defineProperty(exports, "getFieldValue", { enumerable: true, get: functio
 Object.defineProperty(exports, "RenderingType", { enumerable: true, get: function () { return layout_1.RenderingType; } });
 Object.defineProperty(exports, "EDITING_COMPONENT_PLACEHOLDER", { enumerable: true, get: function () { return layout_1.EDITING_COMPONENT_PLACEHOLDER; } });
 Object.defineProperty(exports, "EDITING_COMPONENT_ID", { enumerable: true, get: function () { return layout_1.EDITING_COMPONENT_ID; } });
+Object.defineProperty(exports, "getContentStylesheetLink", { enumerable: true, get: function () { return layout_1.getContentStylesheetLink; } });
 var media_1 = require("@sitecore-jss/sitecore-jss/media");
 Object.defineProperty(exports, "mediaApi", { enumerable: true, get: function () { return media_1.mediaApi; } });
 var tracking_1 = require("@sitecore-jss/sitecore-jss/tracking");
@@ -34,9 +54,6 @@ Object.defineProperty(exports, "getPersonalizedRewrite", { enumerable: true, get
 Object.defineProperty(exports, "getPersonalizedRewriteData", { enumerable: true, get: function () { return personalize_1.getPersonalizedRewriteData; } });
 Object.defineProperty(exports, "normalizePersonalizedRewrite", { enumerable: true, get: function () { return personalize_1.normalizePersonalizedRewrite; } });
 Object.defineProperty(exports, "CdpHelper", { enumerable: true, get: function () { return personalize_1.CdpHelper; } });
-Object.defineProperty(exports, "PosResolver", { enumerable: true, get: function () { return personalize_1.PosResolver; } });
-var sitecore_jss_2 = require("@sitecore-jss/sitecore-jss");
-Object.defineProperty(exports, "GraphQLRequestClient", { enumerable: true, get: function () { return sitecore_jss_2.GraphQLRequestClient; } });
 var component_props_service_1 = require("./services/component-props-service");
 Object.defineProperty(exports, "ComponentPropsService", { enumerable: true, get: function () { return component_props_service_1.ComponentPropsService; } });
 var disconnected_sitemap_service_1 = require("./services/disconnected-sitemap-service");
@@ -58,9 +75,6 @@ var ComponentPropsContext_1 = require("./components/ComponentPropsContext");
 Object.defineProperty(exports, "ComponentPropsReactContext", { enumerable: true, get: function () { return ComponentPropsContext_1.ComponentPropsReactContext; } });
 Object.defineProperty(exports, "ComponentPropsContext", { enumerable: true, get: function () { return ComponentPropsContext_1.ComponentPropsContext; } });
 Object.defineProperty(exports, "useComponentProps", { enumerable: true, get: function () { return ComponentPropsContext_1.useComponentProps; } });
-var utils_2 = require("./utils");
-Object.defineProperty(exports, "handleEditorFastRefresh", { enumerable: true, get: function () { return utils_2.handleEditorFastRefresh; } });
-Object.defineProperty(exports, "getPublicUrl", { enumerable: true, get: function () { return utils_2.getPublicUrl; } });
 var Link_1 = require("./components/Link");
 Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return Link_1.Link; } });
 var RichText_1 = require("./components/RichText");
@@ -71,13 +85,23 @@ var EditingComponentPlaceholder_1 = require("./components/EditingComponentPlaceh
 Object.defineProperty(exports, "EditingComponentPlaceholder", { enumerable: true, get: function () { return EditingComponentPlaceholder_1.EditingComponentPlaceholder; } });
 var NextImage_1 = require("./components/NextImage");
 Object.defineProperty(exports, "NextImage", { enumerable: true, get: function () { return NextImage_1.NextImage; } });
+const FEaaSWrapper = __importStar(require("./components/FEaaSWrapper"));
+exports.FEaaSWrapper = FEaaSWrapper;
+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; } });
 Object.defineProperty(exports, "DateField", { enumerable: true, get: function () { return sitecore_jss_react_1.DateField; } });
 Object.defineProperty(exports, "EditFrame", { enumerable: true, get: function () { return sitecore_jss_react_1.EditFrame; } });
 Object.defineProperty(exports, "FEaaSComponent", { enumerable: true, get: function () { return sitecore_jss_react_1.FEaaSComponent; } });
-Object.defineProperty(exports, "getFEAASLibraryStylesheetLinks", { enumerable: true, get: function () { return sitecore_jss_react_1.getFEAASLibraryStylesheetLinks; } });
+Object.defineProperty(exports, "fetchFEaaSComponentServerProps", { enumerable: true, get: function () { return sitecore_jss_react_1.fetchFEaaSComponentServerProps; } });
+Object.defineProperty(exports, "BYOCComponent", { enumerable: true, get: function () { return sitecore_jss_react_1.BYOCComponent; } });
+Object.defineProperty(exports, "getComponentLibraryStylesheetLinks", { enumerable: true, get: function () { return sitecore_jss_react_1.getComponentLibraryStylesheetLinks; } });
 Object.defineProperty(exports, "File", { enumerable: true, get: function () { return sitecore_jss_react_1.File; } });
 Object.defineProperty(exports, "VisitorIdentification", { enumerable: true, get: function () { return sitecore_jss_react_1.VisitorIdentification; } });
 Object.defineProperty(exports, "SitecoreContext", { enumerable: true, get: function () { return sitecore_jss_react_1.SitecoreContext; } });

package/dist/cjs/middleware/index.js

@@ -1,13 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tryParseEnvValue = exports.SiteResolver = exports.MultisiteMiddleware = exports.PersonalizeMiddleware = exports.RedirectsMiddleware = void 0;
+exports.MultisiteMiddleware = exports.PersonalizeMiddleware = exports.RedirectsMiddleware = exports.debug = void 0;
+var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return sitecore_jss_1.debug; } });
 var redirects_middleware_1 = require("./redirects-middleware");
 Object.defineProperty(exports, "RedirectsMiddleware", { enumerable: true, get: function () { return redirects_middleware_1.RedirectsMiddleware; } });
 var personalize_middleware_1 = require("./personalize-middleware");
 Object.defineProperty(exports, "PersonalizeMiddleware", { enumerable: true, get: function () { return personalize_middleware_1.PersonalizeMiddleware; } });
 var multisite_middleware_1 = require("./multisite-middleware");
 Object.defineProperty(exports, "MultisiteMiddleware", { enumerable: true, get: function () { return multisite_middleware_1.MultisiteMiddleware; } });
-var site_1 = require("@sitecore-jss/sitecore-jss/site");
-Object.defineProperty(exports, "SiteResolver", { enumerable: true, get: function () { return site_1.SiteResolver; } });
-var utils_1 = require("@sitecore-jss/sitecore-jss/utils");
-Object.defineProperty(exports, "tryParseEnvValue", { enumerable: true, get: function () { return utils_1.tryParseEnvValue; } });

package/dist/cjs/middleware/middleware.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MiddlewareBase = void 0;
+const server_1 = require("next/server");
 class MiddlewareBase {
     constructor(config) {
         this.config = config;
         this.SITE_SYMBOL = 'sc_site';
+        this.REWRITE_HEADER_NAME = 'x-sc-rewrite';
         this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
@@ -18,8 +20,7 @@ class MiddlewareBase {
     }
     excludeRoute(pathname) {
         var _a, _b;
-        return (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
+        return (pathname.startsWith('/api/') || // Ignore Next.js API calls
             pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
             pathname.startsWith('/_next') || // Ignore next service calls
             (((_a = this.config) === null || _a === void 0 ? void 0 : _a.excludeRoute) && ((_b = this.config) === null || _b === void 0 ? void 0 : _b.excludeRoute(pathname))));
@@ -66,5 +67,20 @@ class MiddlewareBase {
         const hostname = this.getHostHeader(req) || this.defaultHostname;
         return this.config.siteResolver.getByHost(hostname);
     }
+    /**
+     * Create a rewrite response
+     * @param {string} rewritePath the destionation path
+     * @param {NextRequest} req the current request
+     * @param {NextResponse} res the current response
+     */
+    rewrite(rewritePath, req, res) {
+        // Note an absolute URL is required: https://nextjs.org/docs/messages/middleware-relative-urls
+        const rewriteUrl = req.nextUrl.clone();
+        rewriteUrl.pathname = rewritePath;
+        const response = server_1.NextResponse.rewrite(rewriteUrl, res);
+        // Share rewrite path with following executed middlewares
+        response.headers.set(this.REWRITE_HEADER_NAME, rewritePath);
+        return response;
+    }
 }
 exports.MiddlewareBase = MiddlewareBase;

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

@@ -29,6 +29,7 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
             const pathname = req.nextUrl.pathname;
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
+            const startTimestamp = Date.now();
             sitecore_jss_1.debug.multisite('multisite middleware start: %o', {
                 pathname,
                 language,
@@ -50,15 +51,16 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
             const rewritePath = (0, site_1.getSiteRewrite)(pathname, {
                 siteName,
             });
-            // Note an absolute URL is required: https://nextjs.org/docs/messages/middleware-relative-urls
-            const rewriteUrl = req.nextUrl.clone();
-            rewriteUrl.pathname = rewritePath;
-            response = server_1.NextResponse.rewrite(rewriteUrl);
+            response = this.rewrite(rewritePath, req, response);
+            // default site cookie attributes
+            const defaultCookieAttributes = {
+                secure: true,
+                httpOnly: true,
+                sameSite: 'none',
+            };
             // Share site name with the following executed middlewares
-            response.cookies.set(this.SITE_SYMBOL, siteName);
-            // Share rewrite path with following executed middlewares
-            response.headers.set('x-sc-rewrite', rewritePath);
-            sitecore_jss_1.debug.multisite('multisite middleware end: %o', {
+            response.cookies.set(this.SITE_SYMBOL, siteName, defaultCookieAttributes);
+            sitecore_jss_1.debug.multisite('multisite middleware end in %dms: %o', Date.now() - startTimestamp, {
                 rewritePath,
                 siteName,
                 headers: this.extractDebugHeaders(response.headers),
@@ -83,5 +85,9 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
             }
         });
     }
+    excludeRoute(pathname) {
+        // ignore files
+        return pathname.includes('.') || super.excludeRoute(pathname);
+    }
 }
 exports.MultisiteMiddleware = MultisiteMiddleware;

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

@@ -14,6 +14,7 @@ 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");
 /**
  * Middleware / handler to support Sitecore Personalize
  */
@@ -28,15 +29,16 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             const pathname = req.nextUrl.pathname;
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
-            let browserId = this.getBrowserId(req);
+            const startTimestamp = Date.now();
+            const timeout = this.config.cdpConfig.timeout;
+            // Response will be provided if other middleware is run before us (e.g. redirects)
+            let response = res || server_1.NextResponse.next();
             sitecore_jss_1.debug.personalize('personalize middleware start: %o', {
                 pathname,
                 language,
                 hostname,
-                browserId,
+                headers: this.extractDebugHeaders(req.headers),
             });
-            // Response will be provided if other middleware is run before us (e.g. redirects)
-            let response = res || server_1.NextResponse.next();
             if (this.config.disabled && this.config.disabled(req, response)) {
                 sitecore_jss_1.debug.personalize('skipped (personalize middleware is disabled)');
                 return response;
@@ -47,7 +49,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 sitecore_jss_1.debug.personalize('skipped (%s)', response.redirected ? 'redirected' : this.isPreview(req) ? 'preview' : 'route excluded');
                 return response;
             }
-            const site = this.getSite(req, res);
+            const site = this.getSite(req, response);
             // Get personalization info from Experience Edge
             const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, site.name);
             if (!personalizeInfo) {
@@ -59,20 +61,24 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 sitecore_jss_1.debug.personalize('skipped (no personalization configured)');
                 return response;
             }
-            if (!browserId) {
-                browserId = yield this.cdpService.generateBrowserId();
-                if (!browserId) {
-                    sitecore_jss_1.debug.personalize('skipped (browser id generation failed)');
-                    return response;
-                }
-            }
-            // Execute targeted experience in CDP
-            const { ua } = (0, server_1.userAgent)(req);
+            yield this.initPersonalizeServer({
+                hostname,
+                siteName: site.name,
+                request: req,
+                response,
+            });
             const params = this.getExperienceParams(req);
-            const pointOfSale = this.config.getPointOfSale
-                ? this.config.getPointOfSale(site, language)
-                : personalize_1.PosResolver.resolve(site, language);
-            const variantId = yield this.cdpService.executeExperience(personalizeInfo.contentId, browserId, ua, pointOfSale, params);
+            sitecore_jss_1.debug.personalize('executing experience for %s %o', personalizeInfo.contentId, params);
+            let variantId;
+            // Execute targeted experience in Personalize SDK
+            // eslint-disable-next-line no-useless-catch
+            try {
+                const personalization = yield this.personalize({ personalizeInfo, params, language, timeout }, req);
+                variantId = personalization.variantId;
+            }
+            catch (error) {
+                throw error;
+            }
             if (!variantId) {
                 sitecore_jss_1.debug.personalize('skipped (no variant identified)');
                 return response;
@@ -85,22 +91,12 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             const basePath = (res === null || res === void 0 ? void 0 : res.headers.get('x-sc-rewrite')) || pathname;
             // Rewrite to persononalized path
             const rewritePath = (0, personalize_1.getPersonalizedRewrite)(basePath, { variantId });
-            // Note an absolute URL is required: https://nextjs.org/docs/messages/middleware-relative-urls
-            const rewriteUrl = req.nextUrl.clone();
-            rewriteUrl.pathname = rewritePath;
-            response = server_1.NextResponse.rewrite(rewriteUrl);
+            response = this.rewrite(rewritePath, req, response);
             // Disable preflight caching to force revalidation on client-side navigation (personalization may be influenced)
             // See https://github.com/vercel/next.js/issues/32727
             response.headers.set('x-middleware-cache', 'no-cache');
-            // Share rewrite path with following executed middlewares
-            response.headers.set('x-sc-rewrite', rewritePath);
-            // Set browserId cookie on the response
-            this.setBrowserId(response, browserId);
-            // Share site name with the following executed middlewares
-            response.cookies.set(this.SITE_SYMBOL, site.name);
-            sitecore_jss_1.debug.personalize('personalize middleware end: %o', {
+            sitecore_jss_1.debug.personalize('personalize middleware end in %dms: %o', Date.now() - startTimestamp, {
                 rewritePath,
-                browserId,
                 headers: this.extractDebugHeaders(response.headers),
             });
             return response;
@@ -108,15 +104,6 @@ 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 }));
-        // NOTE: same here, we provide NativeDataFetcher for compatibility on Next.js Edge Runtime
-        this.cdpService = new personalize_1.CdpService(Object.assign(Object.assign({}, config.cdpConfig), { dataFetcherResolver: ({ timeout, headers, }) => {
-                const fetcher = new sitecore_jss_1.NativeDataFetcher({
-                    debugger: sitecore_jss_1.debug.personalize,
-                    timeout,
-                    headers,
-                });
-                return (url, data) => fetcher.fetch(url, data);
-            } }));
     }
     /**
      * Gets the Next.js middleware handler with error handling
@@ -134,29 +121,48 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
             }
         });
     }
-    get browserIdCookieName() {
-        // Each user should have saved identifier to connect between session, CDP uses bid cookies + local storage
-        return `BID_${this.config.cdpConfig.clientKey}`;
+    initPersonalizeServer({ hostname, siteName, request, response, }) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield (0, server_2.init)(request, response, {
+                sitecoreEdgeUrl: this.config.cdpConfig.sitecoreEdgeUrl,
+                sitecoreEdgeContextId: this.config.cdpConfig.sitecoreEdgeContextId,
+                siteName,
+                cookieDomain: hostname,
+                enableServerCookie: true,
+            });
+        });
     }
-    getBrowserId(req) {
+    personalize({ params, personalizeInfo, language, timeout, }, request) {
         var _a;
-        return ((_a = req.cookies.get(this.browserIdCookieName)) === null || _a === void 0 ? void 0 : _a.value) || undefined;
-    }
-    setBrowserId(res, browserId) {
-        const expiryDate = new Date(new Date().setFullYear(new Date().getFullYear() + 2));
-        const options = { expires: expiryDate, secure: true };
-        res.cookies.set(this.browserIdCookieName, browserId, options);
+        return __awaiter(this, void 0, void 0, function* () {
+            const personalizationData = {
+                channel: this.config.cdpConfig.channel || 'WEB',
+                currency: (_a = this.config.cdpConfig.currency) !== null && _a !== void 0 ? _a : 'USD',
+                friendlyId: personalizeInfo.contentId,
+                params,
+                language,
+            };
+            return (yield (0, server_2.personalize)(request, personalizationData, { timeout }));
+        });
     }
     getExperienceParams(req) {
+        const utm = {
+            campaign: req.nextUrl.searchParams.get('utm_campaign') || undefined,
+            content: req.nextUrl.searchParams.get('utm_content') || undefined,
+            medium: req.nextUrl.searchParams.get('utm_medium') || undefined,
+            source: req.nextUrl.searchParams.get('utm_source') || undefined,
+        };
         return {
-            referrer: req.referrer,
-            utm: {
-                campaign: req.nextUrl.searchParams.get('utm_campaign'),
-                content: req.nextUrl.searchParams.get('utm_content'),
-                medium: req.nextUrl.searchParams.get('utm_medium'),
-                source: req.nextUrl.searchParams.get('utm_source'),
-            },
+            // It's expected that the header name "referer" is actually a misspelling of the word "referrer"
+            // req.referrer is used during fetching to determine the value of the Referer header of the request being made,
+            // used as a fallback
+            referrer: req.headers.get('referer') || req.referrer,
+            utm: utm,
         };
     }
+    excludeRoute(pathname) {
+        // ignore files
+        return pathname.includes('.') || super.excludeRoute(pathname);
+    }
 }
 exports.PersonalizeMiddleware = PersonalizeMiddleware;

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

@@ -18,6 +18,8 @@ const server_1 = require("next/server");
 const site_1 = require("@sitecore-jss/sitecore-jss/site");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const middleware_1 = require("./middleware");
+const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
+const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
 /**
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
  * compares with current url and redirects to target url
@@ -34,13 +36,14 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             const language = this.getLanguage(req);
             const hostname = this.getHostHeader(req) || this.defaultHostname;
             let site;
+            const startTimestamp = Date.now();
             sitecore_jss_1.debug.redirects('redirects middleware start: %o', {
                 pathname,
                 language,
                 hostname,
             });
             const createResponse = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.config.disabled && this.config.disabled(req, server_1.NextResponse.next())) {
+                if (this.config.disabled && this.config.disabled(req, res || server_1.NextResponse.next())) {
                     sitecore_jss_1.debug.redirects('skipped (redirects middleware is disabled)');
                     return res || server_1.NextResponse.next();
                 }
@@ -55,41 +58,59 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     sitecore_jss_1.debug.redirects('skipped (redirect does not exist)');
                     return res || server_1.NextResponse.next();
                 }
+                // Find context site language and replace token
+                if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
+                    !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
+                        existsRedirect.target.includes(hostname))) {
+                    existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
+                }
                 const url = req.nextUrl.clone();
-                const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
-                if (absoluteUrlRegex.test(existsRedirect.target)) {
+                if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
                     url.href = existsRedirect.target;
-                    url.locale = req.nextUrl.locale;
                 }
                 else {
+                    const source = `${url.pathname}${url.search}`;
                     url.search = existsRedirect.isQueryStringPreserved ? url.search : '';
                     const urlFirstPart = existsRedirect.target.split('/')[1];
                     if (this.locales.includes(urlFirstPart)) {
                         url.locale = urlFirstPart;
-                        url.pathname = existsRedirect.target.replace(`/${urlFirstPart}`, '');
+                        existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                     }
-                    else {
-                        url.pathname = existsRedirect.target;
+                    const target = source
+                        .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
+                        .replace(/^\/\//, '/')
+                        .split('?');
+                    url.pathname = target[0];
+                    if (target[1]) {
+                        const newParams = new URLSearchParams(target[1]);
+                        for (const [key, val] of newParams.entries()) {
+                            url.searchParams.append(key, val);
+                        }
                     }
                 }
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
                     case site_1.REDIRECT_TYPE_301:
-                        return server_1.NextResponse.redirect(redirectUrl, 301);
+                        return server_1.NextResponse.redirect(redirectUrl, {
+                            status: 301,
+                            statusText: 'Moved Permanently',
+                            headers: res === null || res === void 0 ? void 0 : res.headers,
+                        });
                     case site_1.REDIRECT_TYPE_302:
-                        return server_1.NextResponse.redirect(redirectUrl, 302);
+                        return server_1.NextResponse.redirect(redirectUrl, {
+                            status: 302,
+                            statusText: 'Found',
+                            headers: res === null || res === void 0 ? void 0 : res.headers,
+                        });
                     case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
-                        return server_1.NextResponse.rewrite(redirectUrl);
+                        return server_1.NextResponse.rewrite(redirectUrl, res);
                     default:
-                        return server_1.NextResponse.next();
+                        return res || server_1.NextResponse.next();
                 }
             });
             const response = yield createResponse();
-            // Share site name with the following executed middlewares
-            // Don't need to set when middleware is disabled
-            site && response.cookies.set(this.SITE_SYMBOL, site.name);
-            sitecore_jss_1.debug.redirects('redirects middleware end: %o', {
+            sitecore_jss_1.debug.redirects('redirects middleware end in %dms: %o', Date.now() - startTimestamp, {
                 redirected: response.redirected,
                 status: response.status,
                 url: response.url,
@@ -103,11 +124,20 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
         this.locales = config.locales;
     }
     /**
-     * Gets the Next.js API route handler
+     * Gets the Next.js middleware handler with error handling
      * @returns route handler
      */
     getHandler() {
-        return this.handler;
+        return (req, res) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.handler(req, res);
+            }
+            catch (error) {
+                console.log('Redirect middleware failed:');
+                console.log(error);
+                return res || server_1.NextResponse.next();
+            }
+        });
     }
     /**
      * Method returns RedirectInfo when matches
@@ -119,10 +149,23 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
     getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
             const redirects = yield this.redirectsService.fetchRedirects(siteName);
-            return redirects.length
-                ? redirects.find((redirect) => {
-                    return (((0, regex_parser_1.default)(redirect.pattern.toLowerCase()).test(req.nextUrl.pathname.toLowerCase()) ||
-                        (0, regex_parser_1.default)(redirect.pattern.toLowerCase()).test(`/${req.nextUrl.locale}${req.nextUrl.pathname}`.toLowerCase())) &&
+            const tragetURL = req.nextUrl.pathname;
+            const targetQS = req.nextUrl.search || '';
+            const language = this.getLanguage(req);
+            const modifyRedirects = structuredClone(redirects);
+            return modifyRedirects.length
+                ? modifyRedirects.find((redirect) => {
+                    redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
+                    redirect.pattern = `/^\/${redirect.pattern
+                        .replace(/^\/|\/$/g, '')
+                        .replace(/^\^\/|\/\$$/g, '')
+                        .replace(/^\^|\$$/g, '')
+                        .replace(/(?<!\\)\?/g, '\\?')
+                        .replace(/\$\/gi$/g, '')}[\/]?$/gi`;
+                    return (((0, regex_parser_1.default)(redirect.pattern).test(tragetURL) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`${tragetURL}${targetQS}`) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}`) ||
+                        (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${tragetURL}${targetQS}`)) &&
                         (redirect.locale
                             ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
                             : true));

package/dist/cjs/services/base-graphql-sitemap-service.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseGraphQLSitemapService = exports.getSiteEmptyError = exports.siteError = exports.languageError = void 0;
-const graphql_1 = require("@sitecore-jss/sitecore-jss/graphql");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 const personalize_1 = require("@sitecore-jss/sitecore-jss/personalize");
 /** @private */
@@ -36,7 +35,7 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
   $language: String!
   $includedPaths: [String]
   $excludedPaths: [String]
-  $pageSize: Int = 10
+  $pageSize: Int = 100
   $after: String
 ) {
   site {
@@ -132,7 +131,7 @@ class BaseGraphQLSitemapService {
     getTranformedPaths(siteName, languages, formatStaticPath) {
         return __awaiter(this, void 0, void 0, function* () {
             const paths = new Array();
-            yield Promise.all(languages.map((language) => __awaiter(this, void 0, void 0, function* () {
+            for (const language of languages) {
                 if (language === '') {
                     throw new RangeError(languageEmptyError);
                 }
@@ -140,7 +139,7 @@ class BaseGraphQLSitemapService {
                 const results = yield this.fetchLanguageSitePaths(language, siteName);
                 const transformedPaths = yield this.transformLanguageSitePaths(results, formatStaticPath, language);
                 paths.push(...transformedPaths);
-            })));
+            }
             return paths;
         });
     }
@@ -195,8 +194,10 @@ class BaseGraphQLSitemapService {
      * @returns {GraphQLClient} implementation
      */
     getGraphQLClient() {
-        return new graphql_1.GraphQLRequestClient(this.options.endpoint, {
-            apiKey: this.options.apiKey,
+        if (!this.options.clientFactory) {
+            throw new Error('clientFactory needs to be provided when initializing GraphQL client.');
+        }
+        return this.options.clientFactory({
             debugger: sitecore_jss_1.debug.sitemap,
         });
     }

package/dist/cjs/services/component-props-service.js

@@ -23,9 +23,9 @@ class ComponentPropsService {
      */
     fetchServerSideComponentProps(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { componentModule, layoutData, context } = params;
+            const { moduleFactory, layoutData, context } = params;
             const fetchFunctionFactory = (componentName) => __awaiter(this, void 0, void 0, function* () {
-                const module = yield componentModule(componentName);
+                const module = yield moduleFactory(componentName);
                 return module === null || module === void 0 ? void 0 : module.getServerSideProps;
             });
             return this.fetchComponentProps(fetchFunctionFactory, layoutData, context);
@@ -39,9 +39,9 @@ class ComponentPropsService {
      */
     fetchStaticComponentProps(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { componentModule, layoutData, context } = params;
+            const { moduleFactory, layoutData, context } = params;
             const fetchFunctionFactory = (componentName) => __awaiter(this, void 0, void 0, function* () {
-                const module = yield componentModule(componentName);
+                const module = yield moduleFactory(componentName);
                 return module === null || module === void 0 ? void 0 : module.getStaticProps;
             });
             return this.fetchComponentProps(fetchFunctionFactory, layoutData, context);
@@ -128,11 +128,11 @@ class ComponentPropsService {
                     componentProps[uid] = result;
                 })
                     .catch((error) => {
-                    const errLog = `Error during preload data for component ${uid}: ${error.message ||
-                        error}`;
+                    const errLog = `Error during preload data for component ${req.rendering.componentName} (${uid}): ${error.message || error}`;
                     console.error(chalk_1.default.red(errLog));
                     componentProps[uid] = {
                         error: error.message || errLog,
+                        componentName: req.rendering.componentName,
                     };
                 });
             });

package/dist/cjs/site/index.js

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