@sitecore-jss/sitecore-jss-nextjs 21.1.0-canary.99 → 21.1.0

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

@@ -9,14 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphQLSitemapService = exports.getSiteEmptyError = exports.sitesError = 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");
-const site_1 = require("@sitecore-jss/sitecore-jss/site");
+exports.GraphQLSitemapService = exports.getSiteEmptyError = exports.siteError = exports.languageError = void 0;
+const base_graphql_sitemap_service_1 = require("./base-graphql-sitemap-service");
 /** @private */
 exports.languageError = 'The list of languages cannot be empty';
-exports.sitesError = 'The list of sites cannot be empty';
+exports.siteError = 'The service needs a site name';
 /**
  * @param {string} siteName to inject into error text
  * @private
@@ -25,103 +22,20 @@ function getSiteEmptyError(siteName) {
     return `Site "${siteName}" does not exist or site item tree is missing`;
 }
 exports.getSiteEmptyError = getSiteEmptyError;
-const languageEmptyError = 'The language must be a non-empty string';
-/**
- * GQL query made dynamic based on schema differences between SXP and XM Cloud
- * @param {boolean} usesPersonalize flag to detrmine which variation of a query to run
- * @returns GraphQL query to fetch site paths with
- */
-const defaultQuery = (usesPersonalize) => /* GraphQL */ `
-query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
-  $siteName: String!
-  $language: String!
-  $includedPaths: [String]
-  $excludedPaths: [String]
-  $pageSize: Int = 10
-  $after: String
-) {
-  site {
-    siteInfo(site: $siteName) {
-      routes(
-        language: $language
-        includedPaths: $includedPaths
-        excludedPaths: $excludedPaths
-        first: $pageSize
-        after: $after
-      ){
-        total
-        pageInfo {
-          endCursor
-          hasNext
-        }
-        results {
-          path: routePath
-          ${usesPersonalize
-    ? `
-              route {
-                personalization {
-                  variantIds
-                }
-              }`
-    : ''}
-        }
-      }
-    }
-  }
-}
-`;
 /**
  * Service that fetches the list of site pages using Sitecore's GraphQL API.
+ * Used to handle a single site
  * This list is used for SSG and Export functionality.
  * @mixes SearchQueryService<PageListQueryResult>
  */
-class GraphQLSitemapService {
-    /**
-     * Gets the default query used for fetching the list of site pages
-     */
-    get query() {
-        return defaultQuery(this.options.includePersonalizedRoutes);
-    }
+class GraphQLSitemapService extends base_graphql_sitemap_service_1.BaseGraphQLSitemapService {
     /**
      * Creates an instance of graphQL sitemap service with the provided options
      * @param {GraphQLSitemapServiceConfig} options instance
      */
     constructor(options) {
+        super(options);
         this.options = options;
-        this.graphQLClient = this.getGraphQLClient();
-    }
-    /**
-     * Fetch sitemap which could be used for generation of static pages during `next export`.
-     * The `locale` parameter will be used in the item query, but since i18n is not supported,
-     * the output paths will not include a `language` property.
-     * @param {string} locale which application supports
-     * @returns an array of @see StaticPath objects
-     */
-    fetchExportSitemap(locale) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const formatPath = (path) => ({
-                params: {
-                    path,
-                },
-            });
-            return this.fetchSitemap([locale], formatPath);
-        });
-    }
-    /**
-     * Fetch sitemap which could be used for generation of static pages using SSG mode
-     * @param {string[]} locales locales which application supports
-     * @returns an array of @see StaticPath objects
-     */
-    fetchSSGSitemap(locales) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const formatPath = (path, locale) => ({
-                params: {
-                    path,
-                },
-                locale,
-            });
-            return this.fetchSitemap(locales, formatPath);
-        });
     }
     /**
      * Fetch a flat list of all pages that belong to the specificed site and have a
@@ -138,93 +52,13 @@ class GraphQLSitemapService {
             if (!languages.length) {
                 throw new RangeError(exports.languageError);
             }
-            // Get all sites
-            const sites = this.options.sites;
-            if (!sites || !sites.length) {
-                throw new RangeError(exports.sitesError);
-            }
-            // Fetch paths for each site
-            for (let i = 0; i < sites.length; i++) {
-                const siteName = sites[i];
-                const multiSiteName = sites.length > 1 ? siteName : undefined;
-                // Fetch paths using all locales
-                yield Promise.all(languages.map((language) => __awaiter(this, void 0, void 0, function* () {
-                    if (language === '') {
-                        throw new RangeError(languageEmptyError);
-                    }
-                    sitecore_jss_1.debug.sitemap('fetching sitemap data for %s %s', language, siteName);
-                    const results = yield this.fetchLanguageSitePaths(language, siteName);
-                    const transformedPaths = yield this.transformLanguageSitePaths(results, formatStaticPath, language, multiSiteName);
-                    paths.push(...transformedPaths);
-                })));
+            const siteName = this.options.siteName;
+            if (!siteName) {
+                throw new RangeError(exports.siteError);
             }
+            paths.push(...(yield this.getTranformedPaths(siteName, languages, formatStaticPath)));
             return [].concat(...paths);
         });
     }
-    transformLanguageSitePaths(sitePaths, formatStaticPath, language, multiSiteName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const formatPath = (path) => formatStaticPath(path.replace(/^\/|\/$/g, '').split('/'), language);
-            const aggregatedPaths = [];
-            sitePaths.forEach((item) => {
-                var _a, _b, _c, _d, _e, _f;
-                if (!item)
-                    return;
-                if (!multiSiteName) {
-                    aggregatedPaths.push(formatPath(item.path));
-                }
-                else {
-                    aggregatedPaths.push(formatPath((0, site_1.getSiteRewrite)(item.path, { siteName: multiSiteName })));
-                }
-                // check for type safety's sake - personalize may be empty depending on query type
-                if ((_b = (_a = item.route) === null || _a === void 0 ? void 0 : _a.personalization) === null || _b === void 0 ? void 0 : _b.variantIds.length) {
-                    multiSiteName
-                        ? aggregatedPaths.push(...(((_d = (_c = item.route) === null || _c === void 0 ? void 0 : _c.personalization) === null || _d === void 0 ? void 0 : _d.variantIds.map((varId) => formatPath((0, personalize_1.getPersonalizedRewrite)((0, site_1.getSiteRewrite)(item.path, { siteName: multiSiteName }), {
-                            variantId: varId,
-                        })))) || {}))
-                        : aggregatedPaths.push(...(((_f = (_e = item.route) === null || _e === void 0 ? void 0 : _e.personalization) === null || _f === void 0 ? void 0 : _f.variantIds.map((varId) => formatPath((0, personalize_1.getPersonalizedRewrite)(item.path, { variantId: varId })))) || {}));
-                }
-            });
-            return aggregatedPaths;
-        });
-    }
-    fetchLanguageSitePaths(language, siteName) {
-        var _a, _b, _c, _d;
-        return __awaiter(this, void 0, void 0, function* () {
-            const args = {
-                siteName: siteName,
-                language: language,
-                pageSize: this.options.pageSize,
-                includedPaths: this.options.includedPaths,
-                excludedPaths: this.options.excludedPaths,
-            };
-            let results = [];
-            let hasNext = true;
-            let after = '';
-            while (hasNext) {
-                const fetchResponse = yield this.graphQLClient.request(this.query, Object.assign(Object.assign({}, args), { after }));
-                if (!((_a = fetchResponse === null || fetchResponse === void 0 ? void 0 : fetchResponse.site) === null || _a === void 0 ? void 0 : _a.siteInfo)) {
-                    throw new RangeError(getSiteEmptyError(siteName));
-                }
-                else {
-                    results = results.concat((_b = fetchResponse.site.siteInfo.routes) === null || _b === void 0 ? void 0 : _b.results);
-                    hasNext = (_c = fetchResponse.site.siteInfo.routes) === null || _c === void 0 ? void 0 : _c.pageInfo.hasNext;
-                    after = (_d = fetchResponse.site.siteInfo.routes) === null || _d === void 0 ? void 0 : _d.pageInfo.endCursor;
-                }
-            }
-            return results;
-        });
-    }
-    /**
-     * Gets a GraphQL client that can make requests to the API. Uses graphql-request as the default
-     * library for fetching graphql data (@see GraphQLRequestClient). Override this method if you
-     * want to use something else.
-     * @returns {GraphQLClient} implementation
-     */
-    getGraphQLClient() {
-        return new graphql_1.GraphQLRequestClient(this.options.endpoint, {
-            apiKey: this.options.apiKey,
-            debugger: sitecore_jss_1.debug.sitemap,
-        });
-    }
 }
 exports.GraphQLSitemapService = GraphQLSitemapService;

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

@@ -0,0 +1,81 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MultisiteGraphQLSitemapService = exports.sitesError = void 0;
+const site_1 = require("@sitecore-jss/sitecore-jss/site");
+const base_graphql_sitemap_service_1 = require("./base-graphql-sitemap-service");
+exports.sitesError = 'The list of sites cannot be empty';
+/**
+ * Service that fetches the list of site pages using Sitecore's GraphQL API.
+ * Used to handle multiple sites
+ * This list is used for SSG and Export functionality.
+ * @mixes SearchQueryService<PageListQueryResult>
+ */
+class MultisiteGraphQLSitemapService extends base_graphql_sitemap_service_1.BaseGraphQLSitemapService {
+    /**
+     * Creates an instance of graphQL sitemap service with the provided options
+     * @param {MultisiteGraphQLSitemapServiceConfig} options instance
+     */
+    constructor(options) {
+        super(options);
+        this.options = options;
+    }
+    /**
+     * Fetch a flat list of all pages that belong to all the requested sites and have a
+     * version in the specified language(s).
+     * @param {string[]} languages Fetch pages that have versions in this language(s).
+     * @param {Function} formatStaticPath Function for transforming the raw search results into (@see StaticPath) types.
+     * @returns list of pages
+     * @throws {RangeError} if the list of languages is empty.
+     * @throws {RangeError} if the any of the languages is an empty string.
+     */
+    fetchSitemap(languages, formatStaticPath) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const paths = new Array();
+            if (!languages.length) {
+                throw new RangeError(base_graphql_sitemap_service_1.languageError);
+            }
+            // Get all sites
+            const sites = this.options.sites;
+            if (!sites || !sites.length) {
+                throw new RangeError(exports.sitesError);
+            }
+            // Fetch paths for each site
+            for (let i = 0; i < sites.length; i++) {
+                const siteName = sites[i];
+                // Fetch paths using all locales
+                paths.push(...(yield this.getTranformedPaths(siteName, languages, formatStaticPath)));
+            }
+            return [].concat(...paths);
+        });
+    }
+    /**
+     * Fetch and return site paths for multisite implementation, with prefixes included
+     * @param {string} language path language
+     * @param {string} siteName site name
+     * @returns modified paths
+     */
+    fetchLanguageSitePaths(language, siteName) {
+        const _super = Object.create(null, {
+            fetchLanguageSitePaths: { get: () => super.fetchLanguageSitePaths }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const results = yield _super.fetchLanguageSitePaths.call(this, language, siteName);
+            results.forEach((item) => {
+                if (item) {
+                    item.path = (0, site_1.getSiteRewrite)(item.path, { siteName: siteName });
+                }
+            });
+            return results;
+        });
+    }
+}
+exports.MultisiteGraphQLSitemapService = MultisiteGraphQLSitemapService;

package/dist/esm/components/NextImage.js

@@ -21,7 +21,7 @@ export const sitecoreLoader = ({ src, width }) => {
     return `${root}?${params}`;
 };
 export const NextImage = (_a) => {
-    var { editable, imageParams, field, mediaUrlPrefix } = _a, otherProps = __rest(_a, ["editable", "imageParams", "field", "mediaUrlPrefix"]);
+    var { editable, imageParams, field, mediaUrlPrefix, fill, priority } = _a, otherProps = __rest(_a, ["editable", "imageParams", "field", "mediaUrlPrefix", "fill", "priority"]);
     // next handles src and we use a custom loader,
     // throw error if these are present
     if (otherProps.src) {
@@ -44,11 +44,17 @@ export const NextImage = (_a) => {
     if (!img) {
         return null;
     }
-    const attrs = Object.assign(Object.assign(Object.assign({}, img), otherProps), { src: mediaApi.updateImageUrl(img.src, imageParams, mediaUrlPrefix) });
+    const attrs = Object.assign(Object.assign(Object.assign({}, img), otherProps), { fill,
+        priority, src: mediaApi.updateImageUrl(img.src, imageParams, mediaUrlPrefix) });
     const imageProps = Object.assign(Object.assign({}, attrs), { 
         // force replace /media with /jssmedia in src since we _know_ we will be adding a 'mw' query string parameter
         // this is required for Sitecore media API resizing to work properly
         src: mediaApi.replaceMediaUrlPrefix(attrs.src, mediaUrlPrefix) });
+    // Exclude `width`, `height` in case image is responsive, `fill` is used
+    if (imageProps.fill) {
+        delete imageProps.width;
+        delete imageProps.height;
+    }
     const loader = (otherProps.loader ? otherProps.loader : sitecoreLoader);
     if (attrs) {
         return React.createElement(Image, Object.assign({ alt: "", loader: loader }, imageProps));

package/dist/esm/index.js

@@ -1,14 +1,15 @@
 export { constants, AxiosDataFetcher, NativeDataFetcher, enableDebug, } from '@sitecore-jss/sitecore-jss';
-export { isEditorActive, resetEditorChromes, resolveUrl } from '@sitecore-jss/sitecore-jss/utils';
+export { isEditorActive, resetEditorChromes, resolveUrl, tryParseEnvValue, } from '@sitecore-jss/sitecore-jss/utils';
 export { LayoutServicePageState, GraphQLLayoutService, RestLayoutService, getChildPlaceholder, getFieldValue, RenderingType, EDITING_COMPONENT_PLACEHOLDER, EDITING_COMPONENT_ID, } from '@sitecore-jss/sitecore-jss/layout';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { trackingApi, } from '@sitecore-jss/sitecore-jss/tracking';
 export { GraphQLDictionaryService, RestDictionaryService, } from '@sitecore-jss/sitecore-jss/i18n';
-export { personalizeLayout, getPersonalizedRewrite, getPersonalizedRewriteData, normalizePersonalizedRewrite, CdpHelper, } from '@sitecore-jss/sitecore-jss/personalize';
+export { personalizeLayout, getPersonalizedRewrite, getPersonalizedRewriteData, normalizePersonalizedRewrite, CdpHelper, PosResolver, } from '@sitecore-jss/sitecore-jss/personalize';
 export { GraphQLRequestClient } from '@sitecore-jss/sitecore-jss';
 export { ComponentPropsService } from './services/component-props-service';
 export { DisconnectedSitemapService } from './services/disconnected-sitemap-service';
 export { GraphQLSitemapService, } from './services/graphql-sitemap-service';
+export { MultisiteGraphQLSitemapService, } from './services/mutisite-graphql-sitemap-service';
 export { GraphQLSitemapXmlService, GraphQLErrorPagesService, GraphQLRobotsService, SiteResolver, GraphQLSiteInfoService, getSiteRewrite, getSiteRewriteData, normalizeSiteRewrite, } from '@sitecore-jss/sitecore-jss/site';
 export { ComponentPropsReactContext, ComponentPropsContext, useComponentProps, } from './components/ComponentPropsContext';
 export { handleEditorFastRefresh, getPublicUrl } from './utils';
@@ -17,4 +18,4 @@ export { RichText } from './components/RichText';
 export { Placeholder } from './components/Placeholder';
 export { EditingComponentPlaceholder } from './components/EditingComponentPlaceholder';
 export { NextImage } from './components/NextImage';
-export { Image, Text, DateField, FEaaSComponent, File, VisitorIdentification, SitecoreContext, SitecoreContextReactContext, withSitecoreContext, useSitecoreContext, withEditorChromes, withPlaceholder, withDatasourceCheck, } from '@sitecore-jss/sitecore-jss-react';
+export { Image, Text, DateField, EditFrame, FEaaSComponent, File, VisitorIdentification, SitecoreContext, SitecoreContextReactContext, withSitecoreContext, useSitecoreContext, withEditorChromes, withPlaceholder, withDatasourceCheck, } from '@sitecore-jss/sitecore-jss-react';

package/dist/esm/middleware/index.js

@@ -2,3 +2,4 @@ export { RedirectsMiddleware } from './redirects-middleware';
 export { PersonalizeMiddleware } from './personalize-middleware';
 export { MultisiteMiddleware } from './multisite-middleware';
 export { SiteResolver } from '@sitecore-jss/sitecore-jss/site';
+export { tryParseEnvValue } from '@sitecore-jss/sitecore-jss/utils';

package/dist/esm/middleware/middleware.js

@@ -0,0 +1,66 @@
+export class MiddlewareBase {
+    constructor(config) {
+        this.config = config;
+        this.SITE_SYMBOL = 'sc_site';
+        this.defaultHostname = config.defaultHostname || 'localhost';
+    }
+    /**
+     * Determines if mode is preview
+     * @param {NextRequest} req request
+     * @returns {boolean} is preview
+     */
+    isPreview(req) {
+        var _a, _b;
+        return !!(((_a = req.cookies.get('__prerender_bypass')) === null || _a === void 0 ? void 0 : _a.value) || ((_b = req.cookies.get('__next_preview_data')) === null || _b === void 0 ? void 0 : _b.value));
+    }
+    excludeRoute(pathname) {
+        var _a, _b;
+        return (pathname.includes('.') || // Ignore files
+            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))));
+    }
+    /**
+     * Safely extract all headers for debug logging
+     * Necessary to avoid middleware issue https://github.com/vercel/next.js/issues/39765
+     * @param {Headers} incomingHeaders Incoming headers
+     * @returns Object with headers as key/value pairs
+     */
+    extractDebugHeaders(incomingHeaders) {
+        const headers = {};
+        incomingHeaders.forEach((value, key) => (headers[key] = value));
+        return headers;
+    }
+    /**
+     * Provides used language
+     * @param {NextRequest} req request
+     * @returns {string} language
+     */
+    getLanguage(req) {
+        return req.nextUrl.locale || req.nextUrl.defaultLocale || 'en';
+    }
+    /**
+     * Extract 'host' header
+     * @param {NextRequest} req request
+     */
+    getHostHeader(req) {
+        var _a;
+        return (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
+    }
+    /**
+     * Get site information.
+     * Can not be used in **Preview** mode, since site will not be resolved
+     * @param {NextRequest} req request
+     * @param {NextResponse} [res] response
+     * @returns {SiteInfo} site information
+     */
+    getSite(req, res) {
+        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);
+        const hostname = this.getHostHeader(req) || this.defaultHostname;
+        return this.config.siteResolver.getByHost(hostname);
+    }
+}

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

@@ -10,40 +10,39 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { NextResponse } from 'next/server';
 import { getSiteRewrite } from '@sitecore-jss/sitecore-jss/site';
 import { debug } from '@sitecore-jss/sitecore-jss';
+import { MiddlewareBase } from './middleware';
 /**
  * Middleware / handler for multisite support
  */
-export class MultisiteMiddleware {
+export class MultisiteMiddleware extends MiddlewareBase {
     /**
      * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
      */
     constructor(config) {
+        super(config);
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             const pathname = req.nextUrl.pathname;
-            const hostHeader = (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
-            const hostname = hostHeader || this.defaultHostname;
+            const language = this.getLanguage(req);
+            const hostname = this.getHostHeader(req) || this.defaultHostname;
             debug.multisite('multisite middleware start: %o', {
                 pathname,
+                language,
                 hostname,
             });
-            if (!hostHeader) {
-                debug.multisite(`host header is missing, default ${hostname} is used`);
-            }
             // Response will be provided if other middleware is run before us
             let response = res || NextResponse.next();
-            if (this.excludeRoute(pathname) ||
-                (this.config.excludeRoute && this.config.excludeRoute(pathname))) {
-                debug.multisite('skipped (route excluded)');
+            if (this.isPreview(req) || this.excludeRoute(pathname)) {
+                debug.multisite('skipped (%s)', this.isPreview(req) ? 'preview' : 'route excluded');
                 return response;
             }
             // Site name can be forced by query string parameter or cookie
-            const siteName = req.nextUrl.searchParams.get('sc_site') ||
+            const siteName = req.nextUrl.searchParams.get(this.SITE_SYMBOL) ||
                 (this.config.useCookieResolution &&
                     this.config.useCookieResolution(req) &&
-                    ((_b = req.cookies.get('sc_site')) === null || _b === void 0 ? void 0 : _b.value)) ||
-                this.config.getSite(hostname).name;
+                    ((_a = req.cookies.get(this.SITE_SYMBOL)) === null || _a === void 0 ? void 0 : _a.value)) ||
+                this.config.siteResolver.getByHost(hostname).name;
             // Rewrite to site specific path
             const rewritePath = getSiteRewrite(pathname, {
                 siteName,
@@ -53,7 +52,7 @@ export class MultisiteMiddleware {
             rewriteUrl.pathname = rewritePath;
             response = NextResponse.rewrite(rewriteUrl);
             // Share site name with the following executed middlewares
-            response.cookies.set('sc_site', siteName);
+            response.cookies.set(this.SITE_SYMBOL, siteName);
             // Share rewrite path with following executed middlewares
             response.headers.set('x-sc-rewrite', rewritePath);
             debug.multisite('multisite middleware end: %o', {
@@ -64,7 +63,6 @@ export class MultisiteMiddleware {
             });
             return response;
         });
-        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js middleware handler with error handling
@@ -82,19 +80,4 @@ export class MultisiteMiddleware {
             }
         });
     }
-    excludeRoute(pathname) {
-        if (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
-            pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
-            pathname.startsWith('/_next') // Ignore next service calls
-        ) {
-            return true;
-        }
-        return false;
-    }
-    extractDebugHeaders(incomingHeaders) {
-        const headers = {};
-        incomingHeaders.forEach((value, key) => (headers[key] = value));
-        return headers;
-    }
 }

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

@@ -8,32 +8,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { NextResponse, userAgent } from 'next/server';
-import { GraphQLPersonalizeService, CdpService, getPersonalizedRewrite, } from '@sitecore-jss/sitecore-jss/personalize';
+import { GraphQLPersonalizeService, CdpService, getPersonalizedRewrite, PosResolver, } from '@sitecore-jss/sitecore-jss/personalize';
 import { debug, NativeDataFetcher } from '@sitecore-jss/sitecore-jss';
+import { MiddlewareBase } from './middleware';
 /**
  * Middleware / handler to support Sitecore Personalize
  */
-export class PersonalizeMiddleware {
+export class PersonalizeMiddleware extends MiddlewareBase {
     /**
      * @param {PersonalizeMiddlewareConfig} [config] Personalize middleware config
      */
     constructor(config) {
+        super(config);
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const hostHeader = (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
-            const hostname = hostHeader || this.defaultHostname;
             const pathname = req.nextUrl.pathname;
-            const language = req.nextUrl.locale || req.nextUrl.defaultLocale || 'en';
-            const siteName = ((_b = res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) === null || _b === void 0 ? void 0 : _b.value) || this.config.getSite(hostname).name;
+            const language = this.getLanguage(req);
+            const hostname = this.getHostHeader(req) || this.defaultHostname;
             let browserId = this.getBrowserId(req);
             debug.personalize('personalize middleware start: %o', {
                 pathname,
                 language,
+                hostname,
+                browserId,
             });
-            if (!hostHeader) {
-                debug.personalize(`host header is missing, default ${hostname} is used`);
-            }
             // Response will be provided if other middleware is run before us (e.g. redirects)
             let response = res || NextResponse.next();
             if (this.config.disabled && this.config.disabled(req, response)) {
@@ -42,13 +40,13 @@ export class PersonalizeMiddleware {
             }
             if (response.redirected || // Don't attempt to personalize a redirect
                 this.isPreview(req) || // No need to personalize for preview (layout data is already prepared for preview)
-                this.excludeRoute(pathname) ||
-                (this.config.excludeRoute && this.config.excludeRoute(pathname))) {
+                this.excludeRoute(pathname)) {
                 debug.personalize('skipped (%s)', response.redirected ? 'redirected' : this.isPreview(req) ? 'preview' : 'route excluded');
                 return response;
             }
+            const site = this.getSite(req, res);
             // Get personalization info from Experience Edge
-            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, siteName);
+            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, site.name);
             if (!personalizeInfo) {
                 // Likely an invalid route / language
                 debug.personalize('skipped (personalize info not found)');
@@ -68,7 +66,9 @@ export class PersonalizeMiddleware {
             // Execute targeted experience in CDP
             const { ua } = userAgent(req);
             const params = this.getExperienceParams(req);
-            const pointOfSale = this.config.getPointOfSale(language);
+            const pointOfSale = this.config.getPointOfSale
+                ? this.config.getPointOfSale(site, language)
+                : PosResolver.resolve(site, language);
             const variantId = yield this.cdpService.executeExperience(personalizeInfo.contentId, browserId, ua, pointOfSale, params);
             if (!variantId) {
                 debug.personalize('skipped (no variant identified)');
@@ -94,7 +94,7 @@ export class PersonalizeMiddleware {
             // Set browserId cookie on the response
             this.setBrowserId(response, browserId);
             // Share site name with the following executed middlewares
-            response.cookies.set('sc_site', siteName);
+            response.cookies.set(this.SITE_SYMBOL, site.name);
             debug.personalize('personalize middleware end: %o', {
                 rewritePath,
                 browserId,
@@ -114,7 +114,6 @@ export class PersonalizeMiddleware {
                 });
                 return (url, data) => fetcher.fetch(url, data);
             } }));
-        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js middleware handler with error handling
@@ -156,29 +155,4 @@ export class PersonalizeMiddleware {
             },
         };
     }
-    excludeRoute(pathname) {
-        if (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
-            pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
-            pathname.startsWith('/_next') // Ignore next service calls
-        ) {
-            return true;
-        }
-        return false;
-    }
-    isPreview(req) {
-        var _a, _b;
-        return (((_a = req.cookies.get('__prerender_bypass')) === null || _a === void 0 ? void 0 : _a.value) || ((_b = req.cookies.get('__next_preview_data')) === null || _b === void 0 ? void 0 : _b.value));
-    }
-    /**
-     * Safely extract all headers for debug logging
-     * Necessary to avoid middleware issue https://github.com/vercel/next.js/issues/39765
-     * @param {Headers} incomingHeaders Incoming headers
-     * @returns Object with headers as key/value pairs
-     */
-    extractDebugHeaders(incomingHeaders) {
-        const headers = {};
-        incomingHeaders.forEach((value, key) => (headers[key] = value));
-        return headers;
-    }
 }