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

package/dist/cjs/components/NextImage.js

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

package/dist/cjs/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEaaSComponent = 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 = exports.File = void 0;
+exports.Image = exports.NextImage = exports.EditingComponentPlaceholder = exports.Placeholder = exports.RichText = exports.Link = exports.getPublicUrl = exports.handleEditorFastRefresh = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.GraphQLSiteInfoService = exports.SiteResolver = exports.GraphQLRobotsService = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.MultisiteGraphQLSitemapService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.GraphQLRequestClient = exports.PosResolver = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EDITING_COMPONENT_ID = exports.EDITING_COMPONENT_PLACEHOLDER = exports.RenderingType = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.tryParseEnvValue = exports.resolveUrl = exports.resetEditorChromes = exports.isEditorActive = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
+exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.File = exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = 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; } });
@@ -11,6 +11,7 @@ var utils_1 = require("@sitecore-jss/sitecore-jss/utils");
 Object.defineProperty(exports, "isEditorActive", { enumerable: true, get: function () { return utils_1.isEditorActive; } });
 Object.defineProperty(exports, "resetEditorChromes", { enumerable: true, get: function () { return utils_1.resetEditorChromes; } });
 Object.defineProperty(exports, "resolveUrl", { enumerable: true, get: function () { return utils_1.resolveUrl; } });
+Object.defineProperty(exports, "tryParseEnvValue", { enumerable: true, get: function () { return utils_1.tryParseEnvValue; } });
 var layout_1 = require("@sitecore-jss/sitecore-jss/layout");
 Object.defineProperty(exports, "LayoutServicePageState", { enumerable: true, get: function () { return layout_1.LayoutServicePageState; } });
 Object.defineProperty(exports, "GraphQLLayoutService", { enumerable: true, get: function () { return layout_1.GraphQLLayoutService; } });
@@ -33,6 +34,7 @@ Object.defineProperty(exports, "getPersonalizedRewrite", { enumerable: true, get
 Object.defineProperty(exports, "getPersonalizedRewriteData", { enumerable: true, get: function () { return personalize_1.getPersonalizedRewriteData; } });
 Object.defineProperty(exports, "normalizePersonalizedRewrite", { enumerable: true, get: function () { return personalize_1.normalizePersonalizedRewrite; } });
 Object.defineProperty(exports, "CdpHelper", { enumerable: true, get: function () { return personalize_1.CdpHelper; } });
+Object.defineProperty(exports, "PosResolver", { enumerable: true, get: function () { return personalize_1.PosResolver; } });
 var sitecore_jss_2 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "GraphQLRequestClient", { enumerable: true, get: function () { return sitecore_jss_2.GraphQLRequestClient; } });
 var component_props_service_1 = require("./services/component-props-service");
@@ -41,6 +43,8 @@ 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 mutisite_graphql_sitemap_service_1 = require("./services/mutisite-graphql-sitemap-service");
+Object.defineProperty(exports, "MultisiteGraphQLSitemapService", { enumerable: true, get: function () { return mutisite_graphql_sitemap_service_1.MultisiteGraphQLSitemapService; } });
 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; } });
@@ -71,6 +75,7 @@ var sitecore_jss_react_1 = require("@sitecore-jss/sitecore-jss-react");
 Object.defineProperty(exports, "Image", { enumerable: true, get: function () { return sitecore_jss_react_1.Image; } });
 Object.defineProperty(exports, "Text", { enumerable: true, get: function () { return sitecore_jss_react_1.Text; } });
 Object.defineProperty(exports, "DateField", { enumerable: true, get: function () { return sitecore_jss_react_1.DateField; } });
+Object.defineProperty(exports, "EditFrame", { enumerable: true, get: function () { return sitecore_jss_react_1.EditFrame; } });
 Object.defineProperty(exports, "FEaaSComponent", { enumerable: true, get: function () { return sitecore_jss_react_1.FEaaSComponent; } });
 Object.defineProperty(exports, "File", { enumerable: true, get: function () { return sitecore_jss_react_1.File; } });
 Object.defineProperty(exports, "VisitorIdentification", { enumerable: true, get: function () { return sitecore_jss_react_1.VisitorIdentification; } });

package/dist/cjs/middleware/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SiteResolver = exports.MultisiteMiddleware = exports.PersonalizeMiddleware = exports.RedirectsMiddleware = void 0;
+exports.tryParseEnvValue = 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");
@@ -9,3 +9,5 @@ var multisite_middleware_1 = require("./multisite-middleware");
 Object.defineProperty(exports, "MultisiteMiddleware", { enumerable: true, get: function () { return multisite_middleware_1.MultisiteMiddleware; } });
 var site_1 = require("@sitecore-jss/sitecore-jss/site");
 Object.defineProperty(exports, "SiteResolver", { enumerable: true, get: function () { return site_1.SiteResolver; } });
+var utils_1 = require("@sitecore-jss/sitecore-jss/utils");
+Object.defineProperty(exports, "tryParseEnvValue", { enumerable: true, get: function () { return utils_1.tryParseEnvValue; } });

package/dist/cjs/middleware/middleware.js

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

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

@@ -13,40 +13,39 @@ 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");
+const middleware_1 = require("./middleware");
 /**
  * Middleware / handler for multisite support
  */
-class MultisiteMiddleware {
+class MultisiteMiddleware extends middleware_1.MiddlewareBase {
     /**
      * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
      */
     constructor(config) {
+        super(config);
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a;
             const pathname = req.nextUrl.pathname;
-            const hostHeader = (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
-            const hostname = hostHeader || this.defaultHostname;
+            const language = this.getLanguage(req);
+            const hostname = this.getHostHeader(req) || this.defaultHostname;
             sitecore_jss_1.debug.multisite('multisite middleware start: %o', {
                 pathname,
+                language,
                 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)');
+            if (this.isPreview(req) || this.excludeRoute(pathname)) {
+                sitecore_jss_1.debug.multisite('skipped (%s)', this.isPreview(req) ? 'preview' : 'route excluded');
                 return response;
             }
             // Site name can be forced by query string parameter or cookie
-            const siteName = req.nextUrl.searchParams.get('sc_site') ||
+            const siteName = req.nextUrl.searchParams.get(this.SITE_SYMBOL) ||
                 (this.config.useCookieResolution &&
                     this.config.useCookieResolution(req) &&
-                    ((_b = req.cookies.get('sc_site')) === null || _b === void 0 ? void 0 : _b.value)) ||
-                this.config.getSite(hostname).name;
+                    ((_a = req.cookies.get(this.SITE_SYMBOL)) === null || _a === void 0 ? void 0 : _a.value)) ||
+                this.config.siteResolver.getByHost(hostname).name;
             // Rewrite to site specific path
             const rewritePath = (0, site_1.getSiteRewrite)(pathname, {
                 siteName,
@@ -56,7 +55,7 @@ class MultisiteMiddleware {
             rewriteUrl.pathname = rewritePath;
             response = server_1.NextResponse.rewrite(rewriteUrl);
             // Share site name with the following executed middlewares
-            response.cookies.set('sc_site', siteName);
+            response.cookies.set(this.SITE_SYMBOL, siteName);
             // Share rewrite path with following executed middlewares
             response.headers.set('x-sc-rewrite', rewritePath);
             sitecore_jss_1.debug.multisite('multisite middleware end: %o', {
@@ -67,7 +66,6 @@ class MultisiteMiddleware {
             });
             return response;
         });
-        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js middleware handler with error handling
@@ -85,20 +83,5 @@ class MultisiteMiddleware {
             }
         });
     }
-    excludeRoute(pathname) {
-        if (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
-            pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
-            pathname.startsWith('/_next') // Ignore next service calls
-        ) {
-            return true;
-        }
-        return false;
-    }
-    extractDebugHeaders(incomingHeaders) {
-        const headers = {};
-        incomingHeaders.forEach((value, key) => (headers[key] = value));
-        return headers;
-    }
 }
 exports.MultisiteMiddleware = MultisiteMiddleware;

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

@@ -13,30 +13,28 @@ exports.PersonalizeMiddleware = void 0;
 const server_1 = require("next/server");
 const personalize_1 = require("@sitecore-jss/sitecore-jss/personalize");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+const middleware_1 = require("./middleware");
 /**
  * Middleware / handler to support Sitecore Personalize
  */
-class PersonalizeMiddleware {
+class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
     /**
      * @param {PersonalizeMiddlewareConfig} [config] Personalize middleware config
      */
     constructor(config) {
+        super(config);
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            const hostHeader = (_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0];
-            const hostname = hostHeader || this.defaultHostname;
             const pathname = req.nextUrl.pathname;
-            const language = req.nextUrl.locale || req.nextUrl.defaultLocale || 'en';
-            const siteName = ((_b = res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) === null || _b === void 0 ? void 0 : _b.value) || this.config.getSite(hostname).name;
+            const language = this.getLanguage(req);
+            const hostname = this.getHostHeader(req) || this.defaultHostname;
             let browserId = this.getBrowserId(req);
             sitecore_jss_1.debug.personalize('personalize middleware start: %o', {
                 pathname,
                 language,
+                hostname,
+                browserId,
             });
-            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)) {
@@ -45,13 +43,13 @@ class PersonalizeMiddleware {
             }
             if (response.redirected || // Don't attempt to personalize a redirect
                 this.isPreview(req) || // No need to personalize for preview (layout data is already prepared for preview)
-                this.excludeRoute(pathname) ||
-                (this.config.excludeRoute && this.config.excludeRoute(pathname))) {
+                this.excludeRoute(pathname)) {
                 sitecore_jss_1.debug.personalize('skipped (%s)', response.redirected ? 'redirected' : this.isPreview(req) ? 'preview' : 'route excluded');
                 return response;
             }
+            const site = this.getSite(req, res);
             // Get personalization info from Experience Edge
-            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, siteName);
+            const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, site.name);
             if (!personalizeInfo) {
                 // Likely an invalid route / language
                 sitecore_jss_1.debug.personalize('skipped (personalize info not found)');
@@ -71,7 +69,9 @@ class PersonalizeMiddleware {
             // Execute targeted experience in CDP
             const { ua } = (0, server_1.userAgent)(req);
             const params = this.getExperienceParams(req);
-            const pointOfSale = this.config.getPointOfSale(language);
+            const pointOfSale = this.config.getPointOfSale
+                ? this.config.getPointOfSale(site, language)
+                : personalize_1.PosResolver.resolve(site, language);
             const variantId = yield this.cdpService.executeExperience(personalizeInfo.contentId, browserId, ua, pointOfSale, params);
             if (!variantId) {
                 sitecore_jss_1.debug.personalize('skipped (no variant identified)');
@@ -97,7 +97,7 @@ class PersonalizeMiddleware {
             // Set browserId cookie on the response
             this.setBrowserId(response, browserId);
             // Share site name with the following executed middlewares
-            response.cookies.set('sc_site', siteName);
+            response.cookies.set(this.SITE_SYMBOL, site.name);
             sitecore_jss_1.debug.personalize('personalize middleware end: %o', {
                 rewritePath,
                 browserId,
@@ -117,7 +117,6 @@ class PersonalizeMiddleware {
                 });
                 return (url, data) => fetcher.fetch(url, data);
             } }));
-        this.defaultHostname = config.defaultHostname || 'localhost';
     }
     /**
      * Gets the Next.js middleware handler with error handling
@@ -159,30 +158,5 @@ class PersonalizeMiddleware {
             },
         };
     }
-    excludeRoute(pathname) {
-        if (pathname.includes('.') || // Ignore files
-            pathname.startsWith('/api/') || // Ignore Next.js API calls
-            pathname.startsWith('/sitecore/') || // Ignore Sitecore API calls
-            pathname.startsWith('/_next') // Ignore next service calls
-        ) {
-            return true;
-        }
-        return false;
-    }
-    isPreview(req) {
-        var _a, _b;
-        return (((_a = req.cookies.get('__prerender_bypass')) === null || _a === void 0 ? void 0 : _a.value) || ((_b = req.cookies.get('__next_preview_data')) === null || _b === void 0 ? void 0 : _b.value));
-    }
-    /**
-     * Safely extract all headers for debug logging
-     * Necessary to avoid middleware issue https://github.com/vercel/next.js/issues/39765
-     * @param {Headers} incomingHeaders Incoming headers
-     * @returns Object with headers as key/value pairs
-     */
-    extractDebugHeaders(incomingHeaders) {
-        const headers = {};
-        incomingHeaders.forEach((value, key) => (headers[key] = value));
-        return headers;
-    }
 }
 exports.PersonalizeMiddleware = PersonalizeMiddleware;

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

@@ -16,29 +16,43 @@ exports.RedirectsMiddleware = void 0;
 const regex_parser_1 = __importDefault(require("regex-parser"));
 const server_1 = require("next/server");
 const site_1 = require("@sitecore-jss/sitecore-jss/site");
+const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+const middleware_1 = require("./middleware");
 /**
  * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
  * compares with current url and redirects to target url
  */
-class RedirectsMiddleware {
+class RedirectsMiddleware extends middleware_1.MiddlewareBase {
     /**
      * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
      */
     constructor(config) {
+        super(config);
         this.config = config;
         this.handler = (req, res) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const hostname = this.getHostname(req);
-            const siteName = ((_a = res === null || res === void 0 ? void 0 : res.cookies.get('sc_site')) === null || _a === void 0 ? void 0 : _a.value) || this.config.getSite(hostname).name;
+            const pathname = req.nextUrl.pathname;
+            const language = this.getLanguage(req);
+            const hostname = this.getHostHeader(req) || this.defaultHostname;
+            let site;
+            sitecore_jss_1.debug.redirects('redirects middleware start: %o', {
+                pathname,
+                language,
+                hostname,
+            });
             const createResponse = () => __awaiter(this, void 0, void 0, function* () {
-                if ((this.config.disabled && this.config.disabled(req, server_1.NextResponse.next())) ||
-                    this.excludeRoute(req.nextUrl.pathname) ||
-                    (this.config.excludeRoute && this.config.excludeRoute(req.nextUrl.pathname))) {
+                if (this.config.disabled && this.config.disabled(req, server_1.NextResponse.next())) {
+                    sitecore_jss_1.debug.redirects('skipped (redirects middleware is disabled)');
+                    return res || server_1.NextResponse.next();
+                }
+                if (this.isPreview(req) || this.excludeRoute(pathname)) {
+                    sitecore_jss_1.debug.redirects('skipped (%s)', this.isPreview(req) ? 'preview' : 'route excluded');
                     return res || server_1.NextResponse.next();
                 }
+                site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
-                const existsRedirect = yield this.getExistsRedirect(req, siteName);
+                const existsRedirect = yield this.getExistsRedirect(req, site.name);
                 if (!existsRedirect) {
+                    sitecore_jss_1.debug.redirects('skipped (redirect does not exist)');
                     return res || server_1.NextResponse.next();
                 }
                 const url = req.nextUrl.clone();
@@ -73,14 +87,20 @@ class RedirectsMiddleware {
             });
             const response = yield createResponse();
             // Share site name with the following executed middlewares
-            response.cookies.set('sc_site', siteName);
+            // Don't need to set when middleware is disabled
+            site && response.cookies.set(this.SITE_SYMBOL, site.name);
+            sitecore_jss_1.debug.redirects('redirects middleware end: %o', {
+                redirected: response.redirected,
+                status: response.status,
+                url: response.url,
+                headers: this.extractDebugHeaders(response.headers),
+            });
             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,21 +109,6 @@ 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 request