@sitecore-jss/sitecore-jss-nextjs 21.1.0-canary.8 → 21.1.0-canary.81

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,
@@ -93,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';

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.
@@ -70,6 +72,12 @@ query ${usesPersonalize ? 'PersonalizeSitemapQuery' : 'DefaultSitemapQuery'}(
  * @mixes SearchQueryService<PageListQueryResult>
  */
 export class GraphQLSitemapService {
+    /**
+     * Gets the default query used for fetching the list of site pages
+     */
+    get query() {
+        return defaultQuery(this.options.includePersonalizedRoutes);
+    }
     /**
      * Creates an instance of graphQL sitemap service with the provided options
      * @param {GraphQLSitemapServiceConfig} options instance
@@ -78,12 +86,6 @@ export class GraphQLSitemapService {
         this.options = options;
         this.graphQLClient = this.getGraphQLClient();
     }
-    /**
-     * Gets the default query used for fetching the list of site pages
-     */
-    get query() {
-        return defaultQuery(this.options.includePersonalizedRoutes);
-    }
     /**
      * Fetch sitemap which could be used for generation of static pages during `next export`.
      * The `locale` parameter will be used in the item query, but since i18n is not supported,
@@ -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/monitoring.d.ts

@@ -0,0 +1 @@
+export * from './types/monitoring/index';

package/monitoring.js

@@ -0,0 +1 @@
+module.exports = require('./dist/cjs/monitoring/index');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "21.1.0-canary.8",
+  "version": "21.1.0-canary.81",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -11,7 +11,7 @@
     "test": "mocha --require ./test/setup.js \"./src/**/*.test.ts\" \"./src/**/*.test.tsx\" --exit",
     "prepublishOnly": "npm run build",
     "coverage": "nyc npm test",
-    "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --readme none --out ../../ref-docs/sitecore-jss-nextjs --entryPoints src/index.ts --entryPoints src/editing/index.ts --entryPoints src/middleware/index.ts --githubPages false"
+    "generate-docs": "npx typedoc --plugin typedoc-plugin-markdown --readme none --out ../../ref-docs/sitecore-jss-nextjs --entryPoints src/index.ts --entryPoints src/monitoring/index.ts --entryPoints src/editing/index.ts --entryPoints src/middleware/index.ts --githubPages false"
   },
   "engines": {
     "node": ">=12",
@@ -30,56 +30,57 @@
     "url": "https://github.com/sitecore/jss/issues"
   },
   "devDependencies": {
-    "@types/chai": "^4.2.2",
-    "@types/chai-as-promised": "^7.1.3",
+    "@types/chai": "^4.3.4",
+    "@types/chai-as-promised": "^7.1.5",
     "@types/chai-string": "^1.4.2",
     "@types/enzyme": "^3.10.12",
-    "@types/mocha": "^9.0.0",
-    "@types/node": "17.0.40",
-    "@types/prop-types": "^15.7.4",
-    "@types/react": "^18.0.12",
-    "@types/react-dom": "^18.0.5",
-    "@types/sinon": "^7.5.0",
-    "@types/sinon-chai": "^3.2.5",
-    "@wojtekmaj/enzyme-adapter-react-17": "^0.6.7",
-    "chai": "^4.2.0",
+    "@types/mocha": "^10.0.1",
+    "@types/node": "~18.11.18",
+    "@types/prop-types": "^15.7.5",
+    "@types/react": "^18.0.27",
+    "@types/react-dom": "^18.0.10",
+    "@types/sinon": "^10.0.13",
+    "@types/sinon-chai": "^3.2.9",
+    "@wojtekmaj/enzyme-adapter-react-17": "^0.8.0",
+    "chai": "^4.3.7",
     "chai-as-promised": "^7.1.1",
     "chai-string": "^1.5.0",
     "chalk": "^4.1.2",
-    "cheerio": "1.0.0-rc.10",
+    "cheerio": "1.0.0-rc.12",
     "cross-fetch": "^3.1.5",
     "del-cli": "^5.0.0",
     "enzyme": "^3.11.0",
-    "eslint": "^7.15.0",
-    "eslint-plugin-react": "^7.21.5",
-    "jsdom": "^15.1.1",
-    "mocha": "^9.1.3",
-    "next": "^12.2.5",
-    "nock": "^13.0.5",
+    "eslint": "^8.32.0",
+    "eslint-plugin-react": "^7.32.1",
+    "jsdom": "^21.1.0",
+    "mocha": "^10.2.0",
+    "next": "^12.3.4",
+    "nock": "^13.3.0",
     "nyc": "^15.1.0",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0",
-    "sinon": "^7.5.0",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "sinon": "^15.0.1",
     "sinon-chai": "^3.7.0",
-    "ts-node": "^9.0.0",
-    "typescript": "~4.3.5"
+    "ts-node": "^10.9.1",
+    "typescript": "~4.9.4"
   },
   "peerDependencies": {
-    "next": "^12.2.5",
-    "react": "^18.1.0",
-    "react-dom": "^18.1.0"
+    "next": "^12.3.4",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^21.1.0-canary.8",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^21.1.0-canary.8",
-    "@sitecore-jss/sitecore-jss-react": "^21.1.0-canary.8",
-    "prop-types": "^15.7.2",
+    "@sitecore-jss/sitecore-jss": "^21.1.0-canary.81",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^21.1.0-canary.81",
+    "@sitecore-jss/sitecore-jss-react": "^21.1.0-canary.81",
+    "node-html-parser": "^6.1.4",
+    "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "41c19ef473b5efa0f7e990cbd6c8d02bfcb89443",
+  "gitHead": "2a66e2cfea9750997d213b657ddeea17979a1d9f",
   "files": [
     "dist",
     "types",

package/types/components/ComponentPropsContext.d.ts

@@ -11,7 +11,7 @@ export declare const ComponentPropsReactContext: React.Context<ComponentPropsCol
  * @returns {ComponentData | undefined} component props
  */
 export declare function useComponentProps<ComponentData>(componentUid: string | undefined): ComponentData | undefined;
-export declare type ComponentPropsContextProps = {
+export type ComponentPropsContextProps = {
     children: ReactNode;
     value: ComponentPropsCollection;
 };

package/types/components/EditingComponentPlaceholder.d.ts

@@ -0,0 +1,4 @@
+import { RouteData } from '@sitecore-jss/sitecore-jss/layout';
+export declare const EditingComponentPlaceholder: ({ rendering, }: {
+    rendering: RouteData;
+}) => JSX.Element;

package/types/components/Link.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { LinkProps as ReactLinkProps } from '@sitecore-jss/sitecore-jss-react';
-export declare type LinkProps = ReactLinkProps & {
+export type LinkProps = ReactLinkProps & {
     /**
      * If `href` match with `internalLinkMatcher` regexp, then it's internal link and NextLink will be rendered
      * @default /^\//g

package/types/components/NextImage.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { ImageProps } from '@sitecore-jss/sitecore-jss-react';
 import { ImageLoader, ImageProps as NextImageProperties } from 'next/image';
-declare type NextImageProps = Omit<ImageProps, 'media'> & Partial<NextImageProperties>;
+type NextImageProps = Omit<ImageProps, 'media'> & Partial<NextImageProperties>;
 export declare const sitecoreLoader: ImageLoader;
 export declare const NextImage: React.FC<NextImageProps>;
 export {};

package/types/components/RichText.d.ts

@@ -1,6 +1,6 @@
 import PropTypes from 'prop-types';
 import { RichTextProps as ReactRichTextProps } from '@sitecore-jss/sitecore-jss-react';
-export declare type RichTextProps = ReactRichTextProps & {
+export type RichTextProps = ReactRichTextProps & {
     /**
      * Selector which should be used in order to prefetch it and attach event listeners
      * @default 'a[href^="/"]'

package/types/editing/editing-data-cache.d.ts

@@ -3,8 +3,8 @@ import { EditingData } from './editing-data';
  * Defines an editing data cache implementation
  */
 export interface EditingDataCache {
-    set(key: string, editingData: EditingData): void;
-    get(key: string): EditingData | undefined;
+    set(key: string, editingData: EditingData): Promise<void>;
+    get(key: string): Promise<EditingData | undefined>;
 }
 /**
  * A disk-based editing data cache implementation (required for hosting on Vercel via Serverless Functions)
@@ -16,8 +16,8 @@ export declare class EditingDataDiskCache implements EditingDataCache {
      * @param {string} [tmpDir] Temp directory to use. Default is the OS temp directory (os.tmpdir()).
      */
     constructor(tmpDir?: string);
-    set(key: string, editingData: EditingData): void;
-    get(key: string): EditingData | undefined;
+    set(key: string, editingData: EditingData): Promise<void>;
+    get(key: string): Promise<EditingData | undefined>;
 }
 /** EditingDataDiskCache singleton */
 export declare const editingDataDiskCache: EditingDataDiskCache;

package/types/editing/editing-data.d.ts

@@ -3,7 +3,7 @@ import { DictionaryPhrases } from '@sitecore-jss/sitecore-jss/i18n';
 /**
  * Data sent from Sitecore editors
  */
-export declare type EditingData = {
+export type EditingData = {
     path: string;
     language: string;
     layoutData: LayoutServiceData;

package/types/index.d.ts

@@ -1,23 +1,23 @@
-export { constants, HttpDataFetcher, HttpResponse, AxiosDataFetcher, AxiosDataFetcherConfig, NativeDataFetcher, NativeDataFetcherConfig, enableDebug, } from '@sitecore-jss/sitecore-jss';
+export { constants, HttpDataFetcher, HttpResponse, AxiosResponse, AxiosDataFetcher, AxiosDataFetcherConfig, NativeDataFetcher, NativeDataFetcherConfig, enableDebug, } from '@sitecore-jss/sitecore-jss';
 export { isEditorActive, resetEditorChromes, resolveUrl } from '@sitecore-jss/sitecore-jss/utils';
-export { LayoutService, LayoutServiceData, LayoutServicePageState, LayoutServiceContext, LayoutServiceContextData, GraphQLLayoutService, GraphQLLayoutServiceConfig, RestLayoutService, RestLayoutServiceConfig, PlaceholderData, PlaceholdersData, RouteData, Field, Item, HtmlElementRendering, getChildPlaceholder, getFieldValue, ComponentRendering, ComponentFields, ComponentParams, } from '@sitecore-jss/sitecore-jss/layout';
+export { LayoutService, LayoutServiceData, LayoutServicePageState, LayoutServiceContext, LayoutServiceContextData, GraphQLLayoutService, GraphQLLayoutServiceConfig, RestLayoutService, RestLayoutServiceConfig, PlaceholderData, PlaceholdersData, RouteData, Field, Item, HtmlElementRendering, getChildPlaceholder, getFieldValue, ComponentRendering, ComponentFields, ComponentParams, RenderingType, EDITING_COMPONENT_PLACEHOLDER, EDITING_COMPONENT_ID, } from '@sitecore-jss/sitecore-jss/layout';
 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';
 export { Link, LinkProps } from './components/Link';
 export { RichText, RichTextProps } from './components/RichText';
 export { Placeholder } from './components/Placeholder';
+export { EditingComponentPlaceholder } from './components/EditingComponentPlaceholder';
 export { NextImage } from './components/NextImage';
 export { ComponentFactory, Image, ImageField, ImageFieldValue, ImageProps, LinkField, LinkFieldValue, Text, TextField, DateField, File, FileField, RichTextField, VisitorIdentification, PlaceholderComponentProps, SitecoreContext, SitecoreContextState, SitecoreContextValue, SitecoreContextReactContext, withSitecoreContext, useSitecoreContext, withEditorChromes, withPlaceholder, withDatasourceCheck, ImageSizeParameters, ComponentConsumerProps, WithSitecoreContextOptions, WithSitecoreContextProps, } from '@sitecore-jss/sitecore-jss-react';

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';