@sitecore-jss/sitecore-jss-nextjs 21.1.0-canary.64 → 21.1.0-canary.66

package/dist/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.DateField = exports.Text = exports.Image = exports.NextImage = exports.EditingComponentPlaceholder = exports.Placeholder = exports.RichText = exports.Link = exports.getPublicUrl = exports.handleEditorFastRefresh = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.GraphQLRequestClient = exports.GraphQLRobotsService = 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.resolveUrl = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
-exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = void 0;
+exports.File = exports.DateField = exports.Text = 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.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.GraphQLRequestClient = 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.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 = 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; } });
@@ -33,8 +33,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; } });
-var site_1 = require("@sitecore-jss/sitecore-jss/site");
-Object.defineProperty(exports, "GraphQLRobotsService", { enumerable: true, get: function () { return site_1.GraphQLRobotsService; } });
 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");
@@ -43,9 +41,15 @@ var disconnected_sitemap_service_1 = require("./services/disconnected-sitemap-se
 Object.defineProperty(exports, "DisconnectedSitemapService", { enumerable: true, get: function () { return disconnected_sitemap_service_1.DisconnectedSitemapService; } });
 var graphql_sitemap_service_1 = require("./services/graphql-sitemap-service");
 Object.defineProperty(exports, "GraphQLSitemapService", { enumerable: true, get: function () { return graphql_sitemap_service_1.GraphQLSitemapService; } });
-var site_2 = require("@sitecore-jss/sitecore-jss/site");
-Object.defineProperty(exports, "GraphQLSitemapXmlService", { enumerable: true, get: function () { return site_2.GraphQLSitemapXmlService; } });
-Object.defineProperty(exports, "GraphQLErrorPagesService", { enumerable: true, get: function () { return site_2.GraphQLErrorPagesService; } });
+var site_1 = require("@sitecore-jss/sitecore-jss/site");
+Object.defineProperty(exports, "GraphQLSitemapXmlService", { enumerable: true, get: function () { return site_1.GraphQLSitemapXmlService; } });
+Object.defineProperty(exports, "GraphQLErrorPagesService", { enumerable: true, get: function () { return site_1.GraphQLErrorPagesService; } });
+Object.defineProperty(exports, "GraphQLRobotsService", { enumerable: true, get: function () { return site_1.GraphQLRobotsService; } });
+Object.defineProperty(exports, "SiteResolver", { enumerable: true, get: function () { return site_1.SiteResolver; } });
+Object.defineProperty(exports, "GraphQLSiteInfoService", { enumerable: true, get: function () { return site_1.GraphQLSiteInfoService; } });
+Object.defineProperty(exports, "getSiteRewrite", { enumerable: true, get: function () { return site_1.getSiteRewrite; } });
+Object.defineProperty(exports, "getSiteRewriteData", { enumerable: true, get: function () { return site_1.getSiteRewriteData; } });
+Object.defineProperty(exports, "normalizeSiteRewrite", { enumerable: true, get: function () { return site_1.normalizeSiteRewrite; } });
 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; } });

package/dist/cjs/middleware/index.js

@@ -1,7 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PersonalizeMiddleware = exports.RedirectsMiddleware = void 0;
+exports.SiteResolver = exports.MultisiteMiddleware = exports.PersonalizeMiddleware = exports.RedirectsMiddleware = void 0;
 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; } });

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

@@ -0,0 +1,102 @@
+"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.MultisiteMiddleware = void 0;
+const server_1 = require("next/server");
+const site_1 = require("@sitecore-jss/sitecore-jss/site");
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+/**
+ * Middleware / handler for multisite support
+ */
+class MultisiteMiddleware {
+    /**
+     * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
+     */
+    constructor(config) {
+        this.config = config;
+        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            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;
+            sitecore_jss_1.debug.multisite('multisite middleware start: %o', {
+                pathname,
+                hostname,
+            });
+            if (!hostHeader) {
+                sitecore_jss_1.debug.multisite(`host header is missing, default ${hostname} is used`);
+            }
+            // Response will be provided if other middleware is run before us
+            let response = res || server_1.NextResponse.next();
+            if (this.excludeRoute(pathname) ||
+                (this.config.excludeRoute && this.config.excludeRoute(pathname))) {
+                sitecore_jss_1.debug.multisite('skipped (route excluded)');
+                return response;
+            }
+            // Site name can be forced by query string parameter or cookie
+            const siteName = req.nextUrl.searchParams.get('sc_site') ||
+                req.cookies.get('sc_site') ||
+                this.config.getSite(hostname).name;
+            // Rewrite to site specific path
+            const rewritePath = 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);
+            // Share site name with the following executed middlewares
+            response.cookies.set('sc_site', siteName);
+            // Share rewrite path with following executed middlewares
+            response.headers.set('x-sc-rewrite', rewritePath);
+            sitecore_jss_1.debug.multisite('multisite middleware end: %o', {
+                rewritePath,
+                siteName,
+                headers: this.extractDebugHeaders(response.headers),
+                cookies: response.cookies,
+            });
+            return response;
+        });
+        this.defaultHostname = config.defaultHostname || 'localhost';
+    }
+    /**
+     * Gets the Next.js middleware handler with error handling
+     * @returns middleware handler
+     */
+    getHandler() {
+        return (req, res) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.handler(req, res);
+            }
+            catch (error) {
+                console.log('Multisite middleware failed:');
+                console.log(error);
+                return res || server_1.NextResponse.next();
+            }
+        });
+    }
+    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;
+    }
+}
+exports.MultisiteMiddleware = MultisiteMiddleware;

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

@@ -23,13 +23,20 @@ class PersonalizeMiddleware {
     constructor(config) {
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            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 = (res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) || this.config.getSite(hostname).name;
             let browserId = this.getBrowserId(req);
             sitecore_jss_1.debug.personalize('personalize middleware start: %o', {
                 pathname,
                 language,
             });
+            if (!hostHeader) {
+                sitecore_jss_1.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 || server_1.NextResponse.next();
             if (this.config.disabled && this.config.disabled(req, response)) {
@@ -44,7 +51,7 @@ class PersonalizeMiddleware {
                 return response;
             }
             // Get personalization info from Experience Edge
-            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language);
+            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, siteName);
             if (!personalizeInfo) {
                 // Likely an invalid route / language
                 sitecore_jss_1.debug.personalize('skipped (personalize info not found)');
@@ -74,8 +81,10 @@ class PersonalizeMiddleware {
                 sitecore_jss_1.debug.personalize('skipped (invalid variant)');
                 return response;
             }
+            // Path can be rewritten by previously executed middleware
+            const basePath = (res === null || res === void 0 ? void 0 : res.headers.get('x-sc-rewrite')) || pathname;
             // Rewrite to persononalized path
-            const rewritePath = personalize_1.getPersonalizedRewrite(pathname, { variantId });
+            const rewritePath = 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;
@@ -83,8 +92,12 @@ class PersonalizeMiddleware {
             // 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('sc_site', siteName);
             sitecore_jss_1.debug.personalize('personalize middleware end: %o', {
                 rewritePath,
                 browserId,
@@ -104,6 +117,7 @@ class PersonalizeMiddleware {
                 });
                 return (url, data) => fetcher.fetch(url, data);
             } }));
+        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js middleware handler with error handling

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

@@ -26,51 +26,60 @@ class RedirectsMiddleware {
      */
     constructor(config) {
         this.config = config;
-        this.handler = (req) => __awaiter(this, void 0, void 0, function* () {
-            if ((this.config.disabled && this.config.disabled(req, server_1.NextResponse.next())) ||
-                this.excludeRoute(req.nextUrl.pathname) ||
-                (this.config.excludeRoute && this.config.excludeRoute(req.nextUrl.pathname))) {
-                return server_1.NextResponse.next();
-            }
-            // Find the redirect from result of RedirectService
-            const existsRedirect = yield this.getExistsRedirect(req);
-            if (!existsRedirect) {
-                return server_1.NextResponse.next();
-            }
-            const url = req.nextUrl.clone();
-            const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
-            if (absoluteUrlRegex.test(existsRedirect.target)) {
-                url.href = existsRedirect.target;
-                url.locale = req.nextUrl.locale;
-            }
-            else {
-                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}`, '');
+        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            const hostname = this.getHostname(req);
+            const siteName = (res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) || this.config.getSite(hostname).name;
+            const createResponse = () => __awaiter(this, void 0, void 0, function* () {
+                if ((this.config.disabled && this.config.disabled(req, server_1.NextResponse.next())) ||
+                    this.excludeRoute(req.nextUrl.pathname) ||
+                    (this.config.excludeRoute && this.config.excludeRoute(req.nextUrl.pathname))) {
+                    return server_1.NextResponse.next();
+                }
+                // Find the redirect from result of RedirectService
+                const existsRedirect = yield this.getExistsRedirect(req, siteName);
+                if (!existsRedirect) {
+                    return server_1.NextResponse.next();
+                }
+                const url = req.nextUrl.clone();
+                const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
+                if (absoluteUrlRegex.test(existsRedirect.target)) {
+                    url.href = existsRedirect.target;
+                    url.locale = req.nextUrl.locale;
                 }
                 else {
-                    url.pathname = existsRedirect.target;
+                    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}`, '');
+                    }
+                    else {
+                        url.pathname = existsRedirect.target;
+                    }
                 }
-            }
-            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);
-                case site_1.REDIRECT_TYPE_302:
-                    return server_1.NextResponse.redirect(redirectUrl, 302);
-                case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
-                    return server_1.NextResponse.rewrite(redirectUrl);
-                default:
-                    return server_1.NextResponse.next();
-            }
+                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);
+                    case site_1.REDIRECT_TYPE_302:
+                        return server_1.NextResponse.redirect(redirectUrl, 302);
+                    case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
+                        return server_1.NextResponse.rewrite(redirectUrl);
+                    default:
+                        return server_1.NextResponse.next();
+                }
+            });
+            const response = yield createResponse();
+            // Share site name with the following executed middlewares
+            response.cookies.set('sc_site', siteName);
+            return response;
         });
         // 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.redirectsService = new site_1.GraphQLRedirectsService(Object.assign(Object.assign({}, config), { fetch: fetch }));
         this.locales = config.locales;
+        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js API route handler
@@ -89,15 +98,21 @@ class RedirectsMiddleware {
         }
         return false;
     }
+    getHostname(req) {
+        var _a;
+        const hostHeader = (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
+        return hostHeader || this.defaultHostname;
+    }
     /**
      * Method returns RedirectInfo when matches
-     * @param {NextRequest} req
+     * @param {NextRequest} req request
+     * @param {string} siteName site name
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    getExistsRedirect(req) {
+    getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const redirects = yield this.redirectsService.fetchRedirects();
+            const redirects = yield this.redirectsService.fetchRedirects(siteName);
             return redirects.length
                 ? redirects.find((redirect) => {
                     return ((regex_parser_1.default(redirect.pattern.toLowerCase()).test(req.nextUrl.pathname.toLowerCase()) ||

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

@@ -9,12 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GraphQLSitemapService = exports.getSiteEmptyError = exports.languageError = void 0;
+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");
 /** @private */
 exports.languageError = 'The list of languages cannot be empty';
+exports.sitesError = 'The list of sites cannot be empty';
 /**
  * @param {string} siteName to inject into error text
  * @private
@@ -53,7 +55,7 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
           hasNext
         }
         results {
-          path: routePath 
+          path: routePath
           ${usesPersonalize
     ? `
               route {
@@ -66,7 +68,7 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
       }
     }
   }
-} 
+}
 `;
 /**
  * Service that fetches the list of site pages using Sitecore's GraphQL API.
@@ -132,43 +134,64 @@ class GraphQLSitemapService {
      */
     fetchSitemap(languages, formatStaticPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            const paths = new Array();
             if (!languages.length) {
                 throw new RangeError(exports.languageError);
             }
-            // Fetch paths using all locales
-            const paths = yield Promise.all(languages.map((language) => {
-                if (language === '') {
-                    throw new RangeError(languageEmptyError);
-                }
-                sitecore_jss_1.debug.sitemap('fetching sitemap data for %s', language);
-                return this.fetchLanguageSitePaths(language).then((results) => this.transformLanguageSitePaths(results, formatStaticPath, language));
-            }));
-            // merge promises results into single result
+            // 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);
+                })));
+            }
             return [].concat(...paths);
         });
     }
-    transformLanguageSitePaths(sitePaths, formatStaticPath, language) {
+    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;
+                var _a, _b, _c, _d, _e, _f;
                 if (!item)
                     return;
-                aggregatedPaths.push(formatPath(item.path));
+                if (!multiSiteName) {
+                    aggregatedPaths.push(formatPath(item.path));
+                }
+                else {
+                    aggregatedPaths.push(formatPath(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) {
-                    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(personalize_1.getPersonalizedRewrite(item.path, { variantId: varId }))));
+                    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(personalize_1.getPersonalizedRewrite(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(personalize_1.getPersonalizedRewrite(item.path, { variantId: varId }))));
                 }
             });
             return aggregatedPaths;
         });
     }
-    fetchLanguageSitePaths(language) {
+    fetchLanguageSitePaths(language, siteName) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const args = {
-                siteName: this.options.siteName,
+                siteName: siteName,
                 language: language,
                 pageSize: this.options.pageSize,
                 includedPaths: this.options.includedPaths,
@@ -180,7 +203,7 @@ class GraphQLSitemapService {
             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(this.options.siteName));
+                    throw new RangeError(getSiteEmptyError(siteName));
                 }
                 else {
                     results = results.concat((_b = fetchResponse.site.siteInfo.routes) === null || _b === void 0 ? void 0 : _b.results);

package/dist/esm/index.js

@@ -5,12 +5,11 @@ 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 { GraphQLRobotsService, } from '@sitecore-jss/sitecore-jss/site';
 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 { GraphQLSitemapXmlService, GraphQLErrorPagesService, } from '@sitecore-jss/sitecore-jss/site';
+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';
 export { Link } from './components/Link';

package/dist/esm/middleware/index.js

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

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

@@ -0,0 +1,98 @@
+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());
+    });
+};
+import { NextResponse } from 'next/server';
+import { getSiteRewrite } from '@sitecore-jss/sitecore-jss/site';
+import { debug } from '@sitecore-jss/sitecore-jss';
+/**
+ * Middleware / handler for multisite support
+ */
+export class MultisiteMiddleware {
+    /**
+     * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
+     */
+    constructor(config) {
+        this.config = config;
+        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            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;
+            debug.multisite('multisite middleware start: %o', {
+                pathname,
+                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)');
+                return response;
+            }
+            // Site name can be forced by query string parameter or cookie
+            const siteName = req.nextUrl.searchParams.get('sc_site') ||
+                req.cookies.get('sc_site') ||
+                this.config.getSite(hostname).name;
+            // Rewrite to site specific path
+            const rewritePath = 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 = NextResponse.rewrite(rewriteUrl);
+            // Share site name with the following executed middlewares
+            response.cookies.set('sc_site', siteName);
+            // Share rewrite path with following executed middlewares
+            response.headers.set('x-sc-rewrite', rewritePath);
+            debug.multisite('multisite middleware end: %o', {
+                rewritePath,
+                siteName,
+                headers: this.extractDebugHeaders(response.headers),
+                cookies: response.cookies,
+            });
+            return response;
+        });
+        this.defaultHostname = config.defaultHostname || 'localhost';
+    }
+    /**
+     * Gets the Next.js middleware handler with error handling
+     * @returns middleware handler
+     */
+    getHandler() {
+        return (req, res) => __awaiter(this, void 0, void 0, function* () {
+            try {
+                return yield this.handler(req, res);
+            }
+            catch (error) {
+                console.log('Multisite middleware failed:');
+                console.log(error);
+                return res || NextResponse.next();
+            }
+        });
+    }
+    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

@@ -20,13 +20,20 @@ export class PersonalizeMiddleware {
     constructor(config) {
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            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 = (res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) || this.config.getSite(hostname).name;
             let browserId = this.getBrowserId(req);
             debug.personalize('personalize middleware start: %o', {
                 pathname,
                 language,
             });
+            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)) {
@@ -41,7 +48,7 @@ export class PersonalizeMiddleware {
                 return response;
             }
             // Get personalization info from Experience Edge
-            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language);
+            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, siteName);
             if (!personalizeInfo) {
                 // Likely an invalid route / language
                 debug.personalize('skipped (personalize info not found)');
@@ -71,8 +78,10 @@ export class PersonalizeMiddleware {
                 debug.personalize('skipped (invalid variant)');
                 return response;
             }
+            // Path can be rewritten by previously executed middleware
+            const basePath = (res === null || res === void 0 ? void 0 : res.headers.get('x-sc-rewrite')) || pathname;
             // Rewrite to persononalized path
-            const rewritePath = getPersonalizedRewrite(pathname, { variantId });
+            const rewritePath = 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;
@@ -80,8 +89,12 @@ export class PersonalizeMiddleware {
             // 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('sc_site', siteName);
             debug.personalize('personalize middleware end: %o', {
                 rewritePath,
                 browserId,
@@ -101,6 +114,7 @@ export class PersonalizeMiddleware {
                 });
                 return (url, data) => fetcher.fetch(url, data);
             } }));
+        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js middleware handler with error handling

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

@@ -20,51 +20,60 @@ export class RedirectsMiddleware {
      */
     constructor(config) {
         this.config = config;
-        this.handler = (req) => __awaiter(this, void 0, void 0, function* () {
-            if ((this.config.disabled && this.config.disabled(req, NextResponse.next())) ||
-                this.excludeRoute(req.nextUrl.pathname) ||
-                (this.config.excludeRoute && this.config.excludeRoute(req.nextUrl.pathname))) {
-                return NextResponse.next();
-            }
-            // Find the redirect from result of RedirectService
-            const existsRedirect = yield this.getExistsRedirect(req);
-            if (!existsRedirect) {
-                return NextResponse.next();
-            }
-            const url = req.nextUrl.clone();
-            const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
-            if (absoluteUrlRegex.test(existsRedirect.target)) {
-                url.href = existsRedirect.target;
-                url.locale = req.nextUrl.locale;
-            }
-            else {
-                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}`, '');
+        this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
+            const hostname = this.getHostname(req);
+            const siteName = (res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) || this.config.getSite(hostname).name;
+            const createResponse = () => __awaiter(this, void 0, void 0, function* () {
+                if ((this.config.disabled && this.config.disabled(req, NextResponse.next())) ||
+                    this.excludeRoute(req.nextUrl.pathname) ||
+                    (this.config.excludeRoute && this.config.excludeRoute(req.nextUrl.pathname))) {
+                    return NextResponse.next();
+                }
+                // Find the redirect from result of RedirectService
+                const existsRedirect = yield this.getExistsRedirect(req, siteName);
+                if (!existsRedirect) {
+                    return NextResponse.next();
+                }
+                const url = req.nextUrl.clone();
+                const absoluteUrlRegex = new RegExp('^(?:[a-z]+:)?//', 'i');
+                if (absoluteUrlRegex.test(existsRedirect.target)) {
+                    url.href = existsRedirect.target;
+                    url.locale = req.nextUrl.locale;
                 }
                 else {
-                    url.pathname = existsRedirect.target;
+                    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}`, '');
+                    }
+                    else {
+                        url.pathname = existsRedirect.target;
+                    }
                 }
-            }
-            const redirectUrl = decodeURIComponent(url.href);
-            /** return Response redirect with http code of redirect type **/
-            switch (existsRedirect.redirectType) {
-                case REDIRECT_TYPE_301:
-                    return NextResponse.redirect(redirectUrl, 301);
-                case REDIRECT_TYPE_302:
-                    return NextResponse.redirect(redirectUrl, 302);
-                case REDIRECT_TYPE_SERVER_TRANSFER:
-                    return NextResponse.rewrite(redirectUrl);
-                default:
-                    return NextResponse.next();
-            }
+                const redirectUrl = decodeURIComponent(url.href);
+                /** return Response redirect with http code of redirect type **/
+                switch (existsRedirect.redirectType) {
+                    case REDIRECT_TYPE_301:
+                        return NextResponse.redirect(redirectUrl, 301);
+                    case REDIRECT_TYPE_302:
+                        return NextResponse.redirect(redirectUrl, 302);
+                    case REDIRECT_TYPE_SERVER_TRANSFER:
+                        return NextResponse.rewrite(redirectUrl);
+                    default:
+                        return NextResponse.next();
+                }
+            });
+            const response = yield createResponse();
+            // Share site name with the following executed middlewares
+            response.cookies.set('sc_site', siteName);
+            return response;
         });
         // 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.redirectsService = new GraphQLRedirectsService(Object.assign(Object.assign({}, config), { fetch: fetch }));
         this.locales = config.locales;
+        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js API route handler
@@ -83,15 +92,21 @@ export class RedirectsMiddleware {
         }
         return false;
     }
+    getHostname(req) {
+        var _a;
+        const hostHeader = (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
+        return hostHeader || this.defaultHostname;
+    }
     /**
      * Method returns RedirectInfo when matches
-     * @param {NextRequest} req
+     * @param {NextRequest} req request
+     * @param {string} siteName site name
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    getExistsRedirect(req) {
+    getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const redirects = yield this.redirectsService.fetchRedirects();
+            const redirects = yield this.redirectsService.fetchRedirects(siteName);
             return redirects.length
                 ? redirects.find((redirect) => {
                     return ((regexParser(redirect.pattern.toLowerCase()).test(req.nextUrl.pathname.toLowerCase()) ||

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

@@ -10,8 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { GraphQLRequestClient } from '@sitecore-jss/sitecore-jss/graphql';
 import { debug } from '@sitecore-jss/sitecore-jss';
 import { getPersonalizedRewrite } from '@sitecore-jss/sitecore-jss/personalize';
+import { getSiteRewrite } from '@sitecore-jss/sitecore-jss/site';
 /** @private */
 export const languageError = 'The list of languages cannot be empty';
+export const sitesError = 'The list of sites cannot be empty';
 /**
  * @param {string} siteName to inject into error text
  * @private
@@ -49,7 +51,7 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
           hasNext
         }
         results {
-          path: routePath 
+          path: routePath
           ${usesPersonalize
     ? `
               route {
@@ -62,7 +64,7 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
       }
     }
   }
-} 
+}
 `;
 /**
  * Service that fetches the list of site pages using Sitecore's GraphQL API.
@@ -128,43 +130,64 @@ export class GraphQLSitemapService {
      */
     fetchSitemap(languages, formatStaticPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            const paths = new Array();
             if (!languages.length) {
                 throw new RangeError(languageError);
             }
-            // Fetch paths using all locales
-            const paths = yield Promise.all(languages.map((language) => {
-                if (language === '') {
-                    throw new RangeError(languageEmptyError);
-                }
-                debug.sitemap('fetching sitemap data for %s', language);
-                return this.fetchLanguageSitePaths(language).then((results) => this.transformLanguageSitePaths(results, formatStaticPath, language));
-            }));
-            // merge promises results into single result
+            // Get all sites
+            const sites = this.options.sites;
+            if (!sites || !sites.length) {
+                throw new RangeError(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);
+                    }
+                    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);
+                })));
+            }
             return [].concat(...paths);
         });
     }
-    transformLanguageSitePaths(sitePaths, formatStaticPath, language) {
+    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;
+                var _a, _b, _c, _d, _e, _f;
                 if (!item)
                     return;
-                aggregatedPaths.push(formatPath(item.path));
+                if (!multiSiteName) {
+                    aggregatedPaths.push(formatPath(item.path));
+                }
+                else {
+                    aggregatedPaths.push(formatPath(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) {
-                    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(getPersonalizedRewrite(item.path, { variantId: varId }))));
+                    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(getPersonalizedRewrite(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(getPersonalizedRewrite(item.path, { variantId: varId }))));
                 }
             });
             return aggregatedPaths;
         });
     }
-    fetchLanguageSitePaths(language) {
+    fetchLanguageSitePaths(language, siteName) {
         var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             const args = {
-                siteName: this.options.siteName,
+                siteName: siteName,
                 language: language,
                 pageSize: this.options.pageSize,
                 includedPaths: this.options.includedPaths,
@@ -176,7 +199,7 @@ export class GraphQLSitemapService {
             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(this.options.siteName));
+                    throw new RangeError(getSiteEmptyError(siteName));
                 }
                 else {
                     results = results.concat((_b = fetchResponse.site.siteInfo.routes) === null || _b === void 0 ? void 0 : _b.results);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "21.1.0-canary.64",
+  "version": "21.1.0-canary.66",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -70,9 +70,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^21.1.0-canary.64",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^21.1.0-canary.64",
-    "@sitecore-jss/sitecore-jss-react": "^21.1.0-canary.64",
+    "@sitecore-jss/sitecore-jss": "^21.1.0-canary.66",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^21.1.0-canary.66",
+    "@sitecore-jss/sitecore-jss-react": "^21.1.0-canary.66",
     "node-html-parser": "^6.0.0",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -80,7 +80,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "b0aa7675eacfa5b9a08a82258833da29e01e010c",
+  "gitHead": "11af0c7e9a04340df6c0829735ac9fb0b8a771da",
   "files": [
     "dist",
     "types",

package/types/index.d.ts

@@ -5,14 +5,13 @@ export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { trackingApi, TrackingRequestOptions, CampaignInstance, GoalInstance, OutcomeInstance, EventInstance, PageViewInstance, } from '@sitecore-jss/sitecore-jss/tracking';
 export { DictionaryPhrases, DictionaryService, GraphQLDictionaryService, GraphQLDictionaryServiceConfig, RestDictionaryService, RestDictionaryServiceConfig, } from '@sitecore-jss/sitecore-jss/i18n';
 export { personalizeLayout, getPersonalizedRewrite, getPersonalizedRewriteData, normalizePersonalizedRewrite, CdpHelper, } from '@sitecore-jss/sitecore-jss/personalize';
-export { RobotsQueryResult, GraphQLRobotsService, GraphQLRobotsServiceConfig, } from '@sitecore-jss/sitecore-jss/site';
 export { GraphQLRequestClient } from '@sitecore-jss/sitecore-jss';
 export { ComponentPropsCollection, GetStaticComponentProps, GetServerSideComponentProps, } from './sharedTypes/component-props';
 export { ComponentModule } from './sharedTypes/component-module';
 export { ComponentPropsService } from './services/component-props-service';
 export { DisconnectedSitemapService } from './services/disconnected-sitemap-service';
 export { GraphQLSitemapService, GraphQLSitemapServiceConfig, } from './services/graphql-sitemap-service';
-export { GraphQLSitemapXmlService, GraphQLSitemapXmlServiceConfig, GraphQLErrorPagesService, GraphQLErrorPagesServiceConfig, ErrorPages, } from '@sitecore-jss/sitecore-jss/site';
+export { GraphQLSitemapXmlService, GraphQLSitemapXmlServiceConfig, GraphQLErrorPagesService, GraphQLErrorPagesServiceConfig, RobotsQueryResult, GraphQLRobotsService, GraphQLRobotsServiceConfig, ErrorPages, SiteInfo, SiteResolver, GraphQLSiteInfoService, GraphQLSiteInfoServiceConfig, getSiteRewrite, getSiteRewriteData, normalizeSiteRewrite, } from '@sitecore-jss/sitecore-jss/site';
 export { StaticPath } from './services/graphql-sitemap-service';
 export { ComponentPropsReactContext, ComponentPropsContextProps, ComponentPropsContext, useComponentProps, } from './components/ComponentPropsContext';
 export { handleEditorFastRefresh, getPublicUrl } from './utils';

package/types/middleware/index.d.ts

@@ -1,2 +1,4 @@
 export { RedirectsMiddleware, RedirectsMiddlewareConfig } from './redirects-middleware';
 export { PersonalizeMiddleware, PersonalizeMiddlewareConfig } from './personalize-middleware';
+export { MultisiteMiddleware, MultisiteMiddlewareConfig } from './multisite-middleware';
+export { SiteResolver, SiteInfo } from '@sitecore-jss/sitecore-jss/site';

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

@@ -0,0 +1,42 @@
+import { NextResponse, NextRequest } from 'next/server';
+import { SiteInfo } from '@sitecore-jss/sitecore-jss/site';
+export declare type MultisiteMiddlewareConfig = {
+    /**
+     * Function used to determine if route should be excluded during execution.
+     * By default, files (pathname.includes('.')), Next.js API routes (pathname.startsWith('/api/')), and Sitecore API routes (pathname.startsWith('/sitecore/')) are ignored.
+     * This is an important performance consideration since Next.js Edge middleware runs on every request.
+     * @param {string} pathname The pathname
+     * @returns {boolean} Whether to exclude the route
+     */
+    excludeRoute?: (pathname: string) => boolean;
+    /**
+     * function used to resolve site for given hostname
+     */
+    getSite: (hostname: string) => SiteInfo;
+    /**
+     * Fallback hostname in case `host` header is not present
+     * @default localhost
+     */
+    defaultHostname?: string;
+};
+/**
+ * Middleware / handler for multisite support
+ */
+export declare class MultisiteMiddleware {
+    protected config: MultisiteMiddlewareConfig;
+    private defaultHostname;
+    /**
+     * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
+     */
+    constructor(config: MultisiteMiddlewareConfig);
+    /**
+     * Gets the Next.js middleware handler with error handling
+     * @returns middleware handler
+     */
+    getHandler(): (req: NextRequest, res?: NextResponse) => Promise<NextResponse>;
+    protected excludeRoute(pathname: string): boolean;
+    protected extractDebugHeaders(incomingHeaders: Headers): {
+        [key: string]: string;
+    };
+    private handler;
+}

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

@@ -1,5 +1,6 @@
 import { NextResponse, NextRequest } from 'next/server';
 import { GraphQLPersonalizeServiceConfig, CdpServiceConfig, ExperienceParams } from '@sitecore-jss/sitecore-jss/personalize';
+import { SiteInfo } from '@sitecore-jss/sitecore-jss/site';
 export declare type PersonalizeMiddlewareConfig = {
     /**
      * Function used to determine if route should be excluded from personalization.
@@ -29,6 +30,15 @@ export declare type PersonalizeMiddlewareConfig = {
      * @returns {boolean} false by default
      */
     disabled?: (req?: NextRequest, res?: NextResponse) => boolean;
+    /**
+     * function used to resolve site for given hostname
+     */
+    getSite: (hostname: string) => SiteInfo;
+    /**
+     * fallback hostname in case `host` header is not present
+     * @default localhost
+     */
+    defaultHostname?: string;
 };
 /**
  * Middleware / handler to support Sitecore Personalize
@@ -37,6 +47,7 @@ export declare class PersonalizeMiddleware {
     protected config: PersonalizeMiddlewareConfig;
     private personalizeService;
     private cdpService;
+    private defaultHostname;
     /**
      * @param {PersonalizeMiddlewareConfig} [config] Personalize middleware config
      */

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

@@ -1,5 +1,5 @@
 import { NextResponse, NextRequest } from 'next/server';
-import { GraphQLRedirectsServiceConfig } from '@sitecore-jss/sitecore-jss/site';
+import { GraphQLRedirectsServiceConfig, SiteInfo } from '@sitecore-jss/sitecore-jss/site';
 /**
  * extended RedirectsMiddlewareConfig config type for RedirectsMiddleware
  */
@@ -20,6 +20,15 @@ export declare type RedirectsMiddlewareConfig = Omit<GraphQLRedirectsServiceConf
      * @returns {boolean} false by default
      */
     disabled?: (req?: NextRequest, res?: NextResponse) => boolean;
+    /**
+     * function used to resolve site for given hostname
+     */
+    getSite: (hostname: string) => SiteInfo;
+    /**
+     * fallback hostname in case `host` header is not present
+     * @default localhost
+     */
+    defaultHostname?: string;
 };
 /**
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
@@ -29,6 +38,7 @@ export declare class RedirectsMiddleware {
     protected config: RedirectsMiddlewareConfig;
     private redirectsService;
     private locales;
+    private defaultHostname;
     /**
      * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
      */
@@ -37,12 +47,14 @@ export declare class RedirectsMiddleware {
      * Gets the Next.js API route handler
      * @returns route handler
      */
-    getHandler(): (req: NextRequest) => Promise<NextResponse>;
+    getHandler(): (req: NextRequest, res?: NextResponse) => Promise<NextResponse>;
     protected excludeRoute(pathname: string): boolean;
+    protected getHostname(req: NextRequest): string;
     private handler;
     /**
      * Method returns RedirectInfo when matches
-     * @param {NextRequest} req
+     * @param {NextRequest} req request
+     * @param {string} siteName site name
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */

package/types/services/graphql-sitemap-service.d.ts

@@ -1,6 +1,7 @@
 import { GraphQLClient, PageInfo } from '@sitecore-jss/sitecore-jss/graphql';
 /** @private */
 export declare const languageError = "The list of languages cannot be empty";
+export declare const sitesError = "The list of sites cannot be empty";
 /**
  * @param {string} siteName to inject into error text
  * @private
@@ -64,7 +65,7 @@ export declare type RouteListQueryResult = {
 /**
  * Configuration options for @see GraphQLSitemapService instances
  */
-export interface GraphQLSitemapServiceConfig extends Omit<SiteRouteQueryVariables, 'language'> {
+export interface GraphQLSitemapServiceConfig extends Omit<SiteRouteQueryVariables, 'language' | 'siteName'> {
     /**
      * Your Graphql endpoint
      */
@@ -73,6 +74,10 @@ export interface GraphQLSitemapServiceConfig extends Omit<SiteRouteQueryVariable
      * The API key to use for authentication.
      */
     apiKey: string;
+    /**
+     * Names of the configured sites
+     */
+    sites: string[];
     /**
      * A flag for whether to include personalized routes in service output - only works on XM Cloud
      * turned off by default
@@ -129,8 +134,8 @@ export declare class GraphQLSitemapService {
      * @throws {RangeError} if the any of the languages is an empty string.
      */
     protected fetchSitemap(languages: string[], formatStaticPath: (path: string[], language: string) => StaticPath): Promise<StaticPath[]>;
-    protected transformLanguageSitePaths(sitePaths: RouteListQueryResult[], formatStaticPath: (path: string[], language: string) => StaticPath, language: string): Promise<StaticPath[]>;
-    protected fetchLanguageSitePaths(language: string): Promise<RouteListQueryResult[]>;
+    protected transformLanguageSitePaths(sitePaths: RouteListQueryResult[], formatStaticPath: (path: string[], language: string) => StaticPath, language: string, multiSiteName?: string): Promise<StaticPath[]>;
+    protected fetchLanguageSitePaths(language: string, siteName: string): Promise<RouteListQueryResult[]>;
     /**
      * 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