@sitecore-jss/sitecore-jss-nextjs 21.1.0-canary.7 → 21.1.0-canary.71

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/components/EditingComponentPlaceholder.js

@@ -0,0 +1,5 @@
+import React from 'react';
+import { EDITING_COMPONENT_ID, EDITING_COMPONENT_PLACEHOLDER, } from '@sitecore-jss/sitecore-jss/layout';
+import { Placeholder } from './Placeholder';
+export const EditingComponentPlaceholder = ({ rendering, }) => (React.createElement("div", { id: EDITING_COMPONENT_ID },
+    React.createElement(Placeholder, { name: EDITING_COMPONENT_PLACEHOLDER, rendering: rendering })));

package/dist/esm/components/Link.js

@@ -18,13 +18,13 @@ export const Link = forwardRef((props, ref) => {
     const value = (field.href
         ? field
         : field.value);
-    const { href, querystring } = value;
+    const { href, querystring, anchor } = value;
     const isEditing = editable && field.editable;
     if (href && !isEditing) {
         const text = showLinkTextWithChildrenPresent || !children ? value.text || value.href : null;
         // determine if a link is a route or not.
         if (internalLinkMatcher.test(href)) {
-            return (React.createElement(NextLink, { href: { pathname: href, query: querystring }, key: "link", locale: false },
+            return (React.createElement(NextLink, { href: { pathname: href, query: querystring, hash: anchor }, key: "link", locale: false },
                 React.createElement("a", Object.assign({ title: value.title, target: value.target, className: value.class }, htmlLinkProps, { ref: ref }),
                     text,
                     children)));

package/dist/esm/editing/editing-data-cache.js

@@ -16,19 +16,24 @@ export class EditingDataDiskCache {
     }
     set(key, editingData) {
         const filePath = this.cache.set(key, JSON.stringify(editingData));
-        if (!filePath || filePath.length === 0) {
-            throw new Error(`Editing data cache not set for key ${key} at ${this.cache.root}`);
-        }
+        return new Promise((resolve, reject) => {
+            if (!filePath || filePath.length === 0) {
+                reject(new Error(`Editing data cache not set for key ${key} at ${this.cache.root}`));
+            }
+            resolve();
+        });
     }
     get(key) {
         const entry = this.cache.get(key);
-        if (!entry.isCached) {
-            console.warn(`Editing data cache miss for key ${key} at ${this.cache.root}`);
-            return undefined;
-        }
-        // Remove to preserve disk-space (as a macrotask so as not to block current execution)
-        setTimeout(() => this.cache.remove(key));
-        return JSON.parse(entry.value);
+        return new Promise((resolve) => {
+            if (!entry.isCached) {
+                console.warn(`Editing data cache miss for key ${key} at ${this.cache.root}`);
+                resolve(undefined);
+            }
+            // Remove to preserve disk-space (as a macrotask so as not to block current execution)
+            setTimeout(() => this.cache.remove(key));
+            resolve(JSON.parse(entry.value));
+        });
     }
 }
 /** EditingDataDiskCache singleton */

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

@@ -33,7 +33,7 @@ export class EditingDataMiddleware {
             switch (method) {
                 case 'GET': {
                     // Get cache value
-                    const data = this.editingDataCache.get(key);
+                    const data = yield this.editingDataCache.get(key);
                     res.status(200).json(data);
                     break;
                 }
@@ -43,7 +43,7 @@ export class EditingDataMiddleware {
                     }
                     else {
                         // Set cache value
-                        this.editingDataCache.set(key, body);
+                        yield this.editingDataCache.set(key, body);
                         res.status(200).end();
                     }
                     break;

package/dist/esm/editing/editing-data-service.js

@@ -52,7 +52,7 @@ export class BasicEditingDataService {
                 key,
             };
             debug.editing('storing editing data for %o: %o', previewData, data);
-            this.editingDataCache.set(key, data);
+            yield this.editingDataCache.set(key, data);
             return { key };
         });
     }
@@ -65,7 +65,7 @@ export class BasicEditingDataService {
         return __awaiter(this, void 0, void 0, function* () {
             const editingPreviewData = previewData;
             debug.editing('retrieving editing data for %o', previewData);
-            return this.editingDataCache.get(editingPreviewData.key);
+            return yield this.editingDataCache.get(editingPreviewData.key);
         });
     }
 }

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

@@ -9,6 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { STATIC_PROPS_ID, SERVER_PROPS_ID } from 'next/constants';
 import { AxiosDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
+import { EDITING_COMPONENT_ID, RenderingType } from '@sitecore-jss/sitecore-jss/layout';
+import { parse } from 'node-html-parser';
 import { editingDataService, QUERY_PARAM_EDITING_SECRET, } from './editing-data-service';
 import { getJssEditingSecret } from '../utils';
 /**
@@ -22,7 +24,7 @@ export class EditingRenderMiddleware {
     constructor(config) {
         var _a, _b, _c, _d;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _e;
+            var _e, _f;
             const { method, query, body, headers } = req;
             debug.editing('editing render middleware start: %o', {
                 method,
@@ -91,6 +93,12 @@ export class EditingRenderMiddleware {
                 // certain route configurations (e.g. multiple catch-all routes).
                 // The following line will trick it into thinking we're SSR, thus avoiding any router.replace.
                 html = html.replace(STATIC_PROPS_ID, SERVER_PROPS_ID);
+                if (editingData.layoutData.sitecore.context.renderingType === RenderingType.Component) {
+                    // Handle component rendering. Extract component markup only
+                    html = (_f = parse(html).getElementById(EDITING_COMPONENT_ID)) === null || _f === void 0 ? void 0 : _f.innerHTML;
+                    if (!html)
+                        throw new Error(`Failed to render component for ${requestUrl}`);
+                }
                 const body = { html };
                 // Return expected JSON result
                 debug.editing('editing render middleware end: %o', { status: 200, body });

package/dist/esm/index.js

@@ -1,20 +1,20 @@
 export { constants, AxiosDataFetcher, NativeDataFetcher, enableDebug, } from '@sitecore-jss/sitecore-jss';
 export { isEditorActive, resetEditorChromes, resolveUrl } from '@sitecore-jss/sitecore-jss/utils';
-export { LayoutServicePageState, GraphQLLayoutService, RestLayoutService, getChildPlaceholder, getFieldValue, } from '@sitecore-jss/sitecore-jss/layout';
+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 { 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';
 export { RichText } from './components/RichText';
 export { Placeholder } from './components/Placeholder';
+export { EditingComponentPlaceholder } from './components/EditingComponentPlaceholder';
 export { NextImage } from './components/NextImage';
 export { Image, Text, DateField, File, VisitorIdentification, SitecoreContext, SitecoreContextReactContext, withSitecoreContext, useSitecoreContext, withEditorChromes, withPlaceholder, withDatasourceCheck, } from '@sitecore-jss/sitecore-jss-react';

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)) {
@@ -35,12 +42,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.config.excludeRoute || this.excludeRoute)(pathname)) {
+                this.excludeRoute(pathname) ||
+                (this.config.excludeRoute && this.config.excludeRoute(pathname))) {
                 debug.personalize('skipped (%s)', response.redirected ? 'redirected' : this.isPreview(req) ? 'preview' : 'route excluded');
                 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)');
@@ -70,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;
@@ -79,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,
@@ -92,13 +106,15 @@ export class PersonalizeMiddleware {
         // (underlying default 'cross-fetch' is not currently compatible: https://github.com/lquixada/cross-fetch/issues/78)
         this.personalizeService = new GraphQLPersonalizeService(Object.assign(Object.assign({}, config.edgeConfig), { fetch: fetch }));
         // NOTE: same here, we provide NativeDataFetcher for compatibility on Next.js Edge Runtime
-        this.cdpService = new CdpService(Object.assign(Object.assign({}, config.cdpConfig), { dataFetcherResolver: ({ timeout }) => {
+        this.cdpService = new CdpService(Object.assign(Object.assign({}, config.cdpConfig), { dataFetcherResolver: ({ timeout, headers, }) => {
                 const fetcher = new NativeDataFetcher({
                     debugger: debug.personalize,
                     timeout,
+                    headers,
                 });
                 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

@@ -19,46 +19,61 @@ export class RedirectsMiddleware {
      * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
      */
     constructor(config) {
-        this.handler = (req) => __awaiter(this, void 0, void 0, function* () {
-            // 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.config = config;
+        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 res || NextResponse.next();
+                }
+                // Find the redirect from result of RedirectService
+                const existsRedirect = yield this.getExistsRedirect(req, siteName);
+                if (!existsRedirect) {
+                    return res || 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
@@ -67,22 +82,40 @@ export class RedirectsMiddleware {
     getHandler() {
         return this.handler;
     }
+    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;
+    }
+    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();
-            return redirects.find((redirect) => {
-                return ((regexParser(redirect.pattern.toLowerCase()).test(req.nextUrl.pathname.toLowerCase()) ||
-                    regexParser(redirect.pattern.toLowerCase()).test(`/${req.nextUrl.locale}${req.nextUrl.pathname}`.toLowerCase())) &&
-                    (redirect.locale
-                        ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
-                        : true));
-            });
+            const redirects = yield this.redirectsService.fetchRedirects(siteName);
+            return redirects.length
+                ? redirects.find((redirect) => {
+                    return ((regexParser(redirect.pattern.toLowerCase()).test(req.nextUrl.pathname.toLowerCase()) ||
+                        regexParser(redirect.pattern.toLowerCase()).test(`/${req.nextUrl.locale}${req.nextUrl.pathname}`.toLowerCase())) &&
+                        (redirect.locale
+                            ? redirect.locale.toLowerCase() === req.nextUrl.locale.toLowerCase()
+                            : true));
+                })
+                : undefined;
         });
     }
 }

package/dist/esm/monitoring/healthcheck-middleware.js

@@ -0,0 +1,26 @@
+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());
+    });
+};
+/**
+ * Middleware / handler for use in healthcheck Next.js API route (e.g. '/api/healthz').
+ */
+export class HealthcheckMiddleware {
+    constructor() {
+        this.handler = (_req, res) => __awaiter(this, void 0, void 0, function* () {
+            res.status(200).send('Healthy');
+        });
+    }
+    /**
+     * Gets the Next.js API route handler
+     * @returns route handler
+     */
+    getHandler() {
+        return this.handler;
+    }
+}

package/dist/esm/monitoring/index.js

@@ -0,0 +1 @@
+export { HealthcheckMiddleware } from './healthcheck-middleware';