@sitecore-content-sdk/nextjs 1.5.0 → 2.0.0-canary.10

package/dist/esm/{middleware/redirects-middleware.js → proxy/redirects-proxy.js}

@@ -7,30 +7,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { debug } from '@sitecore-content-sdk/core';
-import { RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/core/site';
-import { areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, isRegexOrUrl, mergeURLSearchParams, } from '@sitecore-content-sdk/core/utils';
+import { RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/content/site';
+import { areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, isRegexOrUrl, mergeURLSearchParams, } from '@sitecore-content-sdk/core/tools';
 import { NextResponse } from 'next/server';
 import regexParser from 'regex-parser';
-import { MiddlewareBase, REWRITE_HEADER_NAME } from './middleware';
+import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
+import debug from '../debug';
 const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
 const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
 /**
- * Middleware / handler fetches all redirects from Sitecore instance by grapqhl service
+ * Proxy / handler fetches all redirects from Sitecore instance by grapqhl service
  * compares with current url and redirects to target url
  * @public
  */
-export class RedirectsMiddleware extends MiddlewareBase {
+export class RedirectsProxy extends ProxyBase {
     /**
-     * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
+     * @param {RedirectsProxyConfig} [config] redirects proxy config
      */
     constructor(config) {
-        var _a;
         super(config);
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
             if (!this.config.enabled) {
-                debug.redirects('skipped (redirects middleware is disabled globally)');
+                debug.redirects('skipped (redirects proxy is disabled globally)');
                 return res;
             }
             try {
@@ -39,124 +38,133 @@ export class RedirectsMiddleware extends MiddlewareBase {
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
                 let site;
                 const startTimestamp = Date.now();
-                debug.redirects('redirects middleware start: %o', {
+                debug.redirects('redirects proxy start: %o', {
                     pathname,
                     language,
                     hostname,
                 });
                 if (this.disabled(req, res)) {
-                    debug.redirects('skipped (redirects middleware is disabled)');
+                    debug.redirects('skipped (redirects proxy is disabled)');
                     return res;
                 }
                 const isAppRouterRequest = this.isAppRouter(res);
-                const createResponse = () => __awaiter(this, void 0, void 0, function* () {
-                    var _a;
+                const validateRequest = () => {
                     if (this.isPreview(req)) {
                         debug.redirects('skipped (preview)');
-                        return res;
+                        return false;
                     }
                     // Skip prefetch requests from Next.js, which are not original client requests
-                    // as they load unnecessary requests that burden the redirects middleware with meaningless traffic
+                    // as they load unnecessary requests that burden the redirects proxy with meaningless traffic
                     if (this.isPrefetch(req)) {
                         debug.redirects('skipped (prefetch)');
-                        res.headers.set('x-middleware-cache', 'no-cache');
+                        res.headers.set('x-proxy-cache', 'no-cache');
                         res.headers.set('Cache-Control', 'no-store, must-revalidate');
-                        return res;
+                        return false;
+                    }
+                    return true;
+                };
+                if (!validateRequest()) {
+                    return res;
+                }
+                site = this.getSite(req, res);
+                // Find the redirect from result of RedirectService
+                const existsRedirect = yield this.getExistsRedirect(req, site.name);
+                if (!existsRedirect) {
+                    debug.redirects('skipped (redirect does not exist)');
+                    return res;
+                }
+                debug.redirects('Matched redirect rule: %o', { existsRedirect });
+                const processAbsoluteUrlTarget = (url, existsRedirect) => {
+                    var _a;
+                    // Redirect logic for absolute (external or not) URLS. To avoid locale stripping: use plain string for external URLs to prevent Next.js rewriting.
+                    let targetUrl = existsRedirect.target;
+                    if (url.search && existsRedirect.isQueryStringPreserved) {
+                        const incomingQS = new URLSearchParams((_a = url.search) !== null && _a !== void 0 ? _a : '');
+                        const [targetMainUrl, targetQS] = targetUrl.split('?');
+                        const mergedQueryString = mergeURLSearchParams(incomingQS, new URLSearchParams(targetQS || ''));
+                        targetUrl = `${targetMainUrl}?${mergedQueryString}`;
                     }
-                    site = this.getSite(req, res);
-                    // Find the redirect from result of RedirectService
-                    const existsRedirect = yield this.getExistsRedirect(req, site.name);
-                    if (!existsRedirect) {
-                        debug.redirects('skipped (redirect does not exist)');
-                        return res;
+                    return this.dispatchRedirect(targetUrl, existsRedirect.redirectType, req, res, true);
+                };
+                const processRelativeUrlTarget = (url, existsRedirect) => {
+                    var _a;
+                    let targetUrl = existsRedirect.target;
+                    const possiblyLocalePrefix = targetUrl.split('/')[1];
+                    let targetLocale = '';
+                    if (this.locales.includes(possiblyLocalePrefix)) {
+                        targetLocale = possiblyLocalePrefix;
+                        targetUrl = targetUrl.replace(`/${possiblyLocalePrefix}`, '');
                     }
-                    debug.redirects('Matched redirect rule: %o', { existsRedirect });
-                    // Find context site language and replace token
-                    if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
-                        !(REGEXP_ABSOLUTE_URL.test(existsRedirect.target) &&
-                            existsRedirect.target.includes(hostname))) {
-                        existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
-                        if (!isAppRouterRequest) {
-                            req.nextUrl.locale = site.language;
-                        }
+                    else if (existsRedirect.isLanguagePreserved) {
+                        targetLocale = language;
                     }
-                    const url = this.normalizeUrl(req.nextUrl.clone());
-                    // Redirect logic for external (absolute) URLS. To avoid locale stripping: use plain string for external URLs to prevent Next.js rewriting.
-                    if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
-                        // Perform variable substitution for absolute URLs
-                        let finalTarget = existsRedirect.target;
-                        if (isRegexOrUrl(existsRedirect.pattern) === 'regex') {
-                            const matched = url.pathname
-                                .replace(/\/*$/gi, '')
-                                .match(regexParser(existsRedirect.pattern));
-                            if (matched) {
-                                finalTarget = existsRedirect.target.replace(/\$(\d+)/g, (_, index) => {
-                                    return matched[parseInt(index, 10)] || '';
-                                });
-                            }
-                        }
-                        return this.dispatchRedirect(finalTarget, existsRedirect.redirectType, req, res, true);
+                    let [targetMainUrl, targetQS] = targetUrl.split('?');
+                    if (url.search && existsRedirect.isQueryStringPreserved) {
+                        const incomingQS = new URLSearchParams((_a = url.search) !== null && _a !== void 0 ? _a : '');
+                        targetQS = mergeURLSearchParams(incomingQS, new URLSearchParams(targetQS || ''));
+                    }
+                    const prepareNewURL = new URL(`${targetMainUrl}${targetQS ? '?' + targetQS : ''}`, url.origin);
+                    const basePath = url.basePath; // setting NextUrl.href overrides basePath, so we need to store it
+                    url.href = prepareNewURL.href;
+                    url.pathname = prepareNewURL.pathname;
+                    url.search = prepareNewURL.search;
+                    // NextUrl setter sets '/' by default if basePath is empty
+                    // this causes issues when basePath is not configured so we need to set it only if exists
+                    if (basePath) {
+                        url.basePath = basePath;
+                    }
+                    if (!isAppRouterRequest) {
+                        // for pages router i18n implementation, apply default locale as backup
+                        url.locale = targetLocale || req.nextUrl.defaultLocale || 'en';
                     }
                     else {
-                        const isUrl = isRegexOrUrl(existsRedirect.pattern) === 'url';
-                        const targetParts = existsRedirect.target.split('/');
-                        const urlFirstPart = targetParts[1];
-                        if (this.locales.includes(urlFirstPart)) {
-                            if (!isAppRouterRequest) {
-                                req.nextUrl.locale = urlFirstPart;
-                            }
-                            existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
-                        }
-                        const targetSegments = isUrl
-                            ? existsRedirect.target.split('?')
-                            : url.pathname.replace(/\/*$/gi, '') + existsRedirect.matchedQueryString;
-                        const [targetPath, targetQueryString] = isUrl
-                            ? targetSegments
-                            : targetSegments
-                                .replace(regexParser(existsRedirect.pattern), existsRedirect.target)
-                                .replace(/^\/\//, '/')
-                                .split('?');
-                        const mergedQueryString = existsRedirect.isQueryStringPreserved
-                            ? mergeURLSearchParams(new URLSearchParams((_a = url.search) !== null && _a !== void 0 ? _a : ''), new URLSearchParams(targetQueryString || ''))
-                            : targetQueryString || '';
-                        const prepareNewURL = new URL(`${targetPath}${mergedQueryString ? '?' + mergedQueryString : ''}`, url.origin);
-                        const basePath = url.basePath; // setting NextUrl.href overrides basePath, so we need to store it
-                        url.href = prepareNewURL.href;
-                        url.pathname = prepareNewURL.pathname;
-                        url.search = prepareNewURL.search;
-                        // NextUrl setter sets '/' by default if basePath is empty
-                        // this causes issues when basePath is not configured so we need to set it only if exists
-                        if (basePath) {
-                            url.basePath = basePath;
-                        }
-                        if (!isAppRouterRequest) {
-                            url.locale = req.nextUrl.locale;
-                        }
+                        // In App Router, we need to set the locale in the pathname, if present
+                        if (targetLocale)
+                            url.pathname = `/${targetLocale}${url.pathname}`;
                     }
                     /** return Response redirect with http code of redirect type */
-                    return this.dispatchRedirect(url, existsRedirect.redirectType, req, res, false);
-                });
-                const response = yield createResponse();
-                debug.redirects('redirects middleware end in %dms: %o', Date.now() - startTimestamp, {
-                    redirected: response.redirected,
-                    status: response.status,
-                    url: response.url,
-                    headers: this.extractDebugHeaders(response.headers),
+                    return this.dispatchRedirect(this.normalizeUrl(url), existsRedirect.redirectType, req, res, false);
+                };
+                // replace $siteLang token in target if exists
+                existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
+                const reqUrl = this.normalizeUrl(req.nextUrl.clone());
+                // Apply regex replacements to the target URL if the pattern is a regex
+                const matched = reqUrl.pathname
+                    .replace(/\/*$/gi, '')
+                    .match(regexParser(existsRedirect.pattern));
+                if (matched) {
+                    existsRedirect.target = existsRedirect.target.replace(/\$(\d+)/g, (_, index) => {
+                        return matched[parseInt(index, 10)] || '';
+                    });
+                }
+                const redirectedResponse = REGEXP_ABSOLUTE_URL.test(existsRedirect.target)
+                    ? processAbsoluteUrlTarget(reqUrl, existsRedirect)
+                    : processRelativeUrlTarget(reqUrl, existsRedirect);
+                debug.redirects('redirects proxy end in %dms: %o', Date.now() - startTimestamp, {
+                    redirected: redirectedResponse.redirected,
+                    status: redirectedResponse.status,
+                    url: redirectedResponse.url,
+                    headers: this.extractDebugHeaders(redirectedResponse.headers),
                 });
-                return response;
+                return redirectedResponse;
             }
             catch (error) {
-                console.log('Redirect middleware failed:');
+                console.log('Redirect proxy failed:');
                 console.log(error);
                 return res;
             }
         });
         this.locales = config.locales;
+        // If redirectsService is provided directly (e.g., for testing), use it
+        if (this.config.redirectsService) {
+            this.redirectsService = this.config.redirectsService;
+            return;
+        }
         // Validate API config is present - redirects requires either Edge or local API configuration
         const hasEdgeConfig = !!(this.config.contextId || this.config.clientContextId);
         const hasLocalConfig = !!(this.config.apiHost && this.config.apiKey);
         if (!hasEdgeConfig && !hasLocalConfig) {
-            console.warn('[RedirectsMiddleware] Redirects middleware requires either Edge configuration (contextId/clientContextId) or local API configuration (apiHost/apiKey). ' +
+            console.warn('[RedirectsProxy] Redirects proxy requires either Edge configuration (contextId/clientContextId) or local API configuration (apiHost/apiKey). ' +
                 'Redirects features will be disabled. This is expected when API configuration is not available.');
             // Set to null to indicate service is disabled
             this.redirectsService = null;
@@ -179,16 +187,16 @@ export class RedirectsMiddleware extends MiddlewareBase {
         };
         // 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 =
-            (_a = this.config.redirectsService) !== null && _a !== void 0 ? _a : new RedirectsService(Object.assign(Object.assign({}, config), { clientFactory: this.getClientFactory(graphQLOptions), fetch: fetch }));
+        this.redirectsService = new RedirectsService(Object.assign(Object.assign({}, config), { clientFactory: this.getClientFactory(graphQLOptions), fetch: fetch }));
     }
     disabled(req, res) {
-        // Check if API config is missing - if so, disable the middleware
+        // Check if API config is missing - if so, disable the proxy
         if (!this.redirectsService) {
             debug.redirects('skipped (redirects service not configured - API config required)');
             return true;
         }
-        return super.disabled(req, res);
+        // ignore files
+        return req.nextUrl.pathname.includes('.') || super.disabled(req, res);
     }
     /**
      * Method returns RedirectInfo when matches
@@ -206,7 +214,6 @@ export class RedirectsMiddleware extends MiddlewareBase {
             const locale = this.getLanguage(req);
             const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
             const redirects = yield this.redirectsService.fetchRedirects(siteName);
-            const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
             let matchedQueryString;
             const localePath = `/${locale.toLowerCase()}${normalizedPath}`;
@@ -233,7 +240,8 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     // process regex rules
                     // Modify the redirect pattern to ignore the language prefix in the path
                     // And escapes non-special "?" characters in a string or regex.
-                    redirect.pattern = escapeNonSpecialQuestionMarks(redirect.pattern.replace(new RegExp(`^[^]?/${language}/`, 'gi'), ''));
+                    redirect.pattern = escapeNonSpecialQuestionMarks('^' + redirect.pattern.replace(new RegExp(`^[^]?/${locale}/`, 'gi'), '') // ensure function thinks input is regex
+                    );
                     // Prepare the redirect pattern as a regular expression, making it more flexible for matching URLs
                     redirect.pattern = `/^\/${redirect.pattern
                         .replace(/^\/|\/$/g, '') // Removes leading and trailing slashes
@@ -277,7 +285,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
         /**
          * Remove special parameters(Next.JS)
          * Example: /about/contact/us
-         * When a user clicks on this link, Next.js should generate a link for the middleware, formatted like this:
+         * When a user clicks on this link, Next.js should generate a link for the proxy, formatted like this:
          * http://host/about/contact/us?path=about&path=contact&path=us
          */
         const newQueryString = url.search
@@ -357,7 +365,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
         }
     }
     /**
-     * Helper function to create a redirect response and remove the x-middleware-next header.
+     * Helper function to create a redirect response and remove the x-proxy-next header.
      * @param {NextURL | string} url The URL to redirect to.
      * @param {Response} res The response object.
      * @param {number} status The HTTP status code of the redirect.
@@ -365,7 +373,9 @@ export class RedirectsMiddleware extends MiddlewareBase {
      * @returns {NextResponse<unknown>} The redirect response.
      */
     createRedirectResponse(url, res, status, statusText) {
-        const redirect = NextResponse.redirect(url, {
+        // Convert NextURL to string if needed - NextResponse.redirect requires a string URL
+        const urlString = typeof url === 'string' ? url : url.href;
+        const redirect = NextResponse.redirect(urlString, {
             status,
             statusText,
             headers: res === null || res === void 0 ? void 0 : res.headers,

package/dist/esm/route-handler/editing-config-route-handler.js

@@ -7,11 +7,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-content-sdk/core/editing';
-import { debug } from '@sitecore-content-sdk/core';
-import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/utils';
-import { EditMode } from '@sitecore-content-sdk/core/layout';
+import { EDITING_ALLOWED_ORIGINS, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-content-sdk/content/editing';
+import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/tools';
+import { EditMode } from '@sitecore-content-sdk/content/layout';
 import { getEditingSecret } from '../utils/utils';
+import debug from '../debug';
 /**
  * Creates a route handler for the editing config API route (e.g. '/api/editing/config')
  * Provides configuration information to determine feature compatibility on Pages side.

package/dist/esm/route-handler/editing-render-route-handler.js

@@ -7,14 +7,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { debug, NativeDataFetcher } from '@sitecore-content-sdk/core';
-import { EDITING_ALLOWED_ORIGINS, PREVIEW_KEY, QUERY_PARAM_EDITING_SECRET, INVALID_SECRET_HTML_MESSAGE, } from '@sitecore-content-sdk/core/editing';
-import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/utils';
-import { LayoutServicePageState } from '@sitecore-content-sdk/core/layout';
+import { NativeDataFetcher } from '@sitecore-content-sdk/core';
+import { EDITING_ALLOWED_ORIGINS, PREVIEW_KEY, QUERY_PARAM_EDITING_SECRET, INVALID_SECRET_HTML_MESSAGE, } from '@sitecore-content-sdk/content/editing';
+import { getEnforcedCorsHeaders } from '@sitecore-content-sdk/core/tools';
+import { LayoutServicePageState } from '@sitecore-content-sdk/content/layout';
 import { getEditingSecret } from '../utils/utils';
 import { draftMode, cookies as nextCokies } from 'next/headers';
-import { mapEditingParams, getEditingRequestHtml, cleanupNextPreviewCookies, getHeadersForPropagation, getQueryParamsForPropagation, getRequiredEditingParamsList, getCSPHeader, resolveServerUrl, } from '../editing/utils';
-import { SITE_KEY } from '@sitecore-content-sdk/core/site';
+import { mapEditingParams, getEditingRequestHtml, cleanupNextPreviewCookies, getHeadersForPropagation, getQueryParamsForPropagation, getRequiredEditingParamsList, getCSPHeader, resolveServerUrl, getAllowedQueryParams, } from '../editing/utils';
+import { SITE_KEY } from '@sitecore-content-sdk/content/site';
+import debug from '../debug';
 /**
  * Helper function to handle cookie operations - can be mocked for testing
  * @returns {Promise<NextCookies>} Next cookies
@@ -108,11 +109,18 @@ export const createEditingRenderRouteHandlers = (options) => {
         const mode = query.mode;
         const requiredQueryParams = getRequiredEditingParamsList(mode);
         const missingQueryParams = requiredQueryParams.filter((param) => !query[param]);
+        const { allowedQueryParams, missingAllowedParams } = getAllowedQueryParams(query, options.allowedQueryParams);
         // Validate query parameters
-        if (missingQueryParams.length) {
-            debug.editing('missing required query parameters: %o', missingQueryParams);
+        if (missingQueryParams.length || missingAllowedParams.length) {
+            debug.editing('missing required query parameters: %o', [
+                ...missingQueryParams,
+                ...missingAllowedParams,
+            ]);
             return Response.json({
-                html: `<html><body>Missing required query parameters: ${missingQueryParams.join(', ')}</body></html>`,
+                html: `<html><body>Missing required query parameters: ${[
+                    ...missingQueryParams,
+                    ...missingAllowedParams,
+                ].join(', ')}</body></html>`,
             }, { status: 400, headers: responseHeaders });
         }
         const encodedRoute = encodeURI(query.route);
@@ -148,7 +156,7 @@ export const createEditingRenderRouteHandlers = (options) => {
             debug.editing('fetching page route for %s', query.route);
             // Get query string parameters to propagate on subsequent requests (e.g. for deployment protection bypass)
             // Additionally ,in app router preview data is passed through query string instead of preview data cookie
-            const propagatedQsParams = Object.assign(Object.assign({}, getQueryParamsForPropagation(query)), mapEditingParams(query));
+            const propagatedQsParams = Object.assign(Object.assign(Object.assign({}, getQueryParamsForPropagation(query)), mapEditingParams(query)), allowedQueryParams);
             // Get headers to propagate on subsequent requests
             const propagatedHeaders = getHeadersForPropagation(headers);
             const html = yield getEditingRequestHtml(requestUrl, propagatedQsParams, propagatedHeaders, convertedCookies, dataFetcher);
@@ -207,7 +215,7 @@ export const createEditingRenderRouteHandlers = (options) => {
         req.nextUrl.searchParams.forEach((value, key) => {
             query[key] = value;
         });
-        const propagatedQsParams = Object.assign(Object.assign({}, getQueryParamsForPropagation(query)), mapEditingParams(query));
+        const propagatedQsParams = Object.assign(Object.assign(Object.assign({}, getQueryParamsForPropagation(query)), mapEditingParams(query)), getAllowedQueryParams(query, options.allowedQueryParams).allowedQueryParams);
         const base = resolveServerUrl(req);
         const targetUrl = new URL('/', base);
         for (const key in propagatedQsParams) {

package/dist/esm/route-handler/robots-route-handler.js

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SiteResolver } from '@sitecore-content-sdk/core/site';
-import { debug } from '@sitecore-content-sdk/core';
+import { SiteResolver } from '@sitecore-content-sdk/content/site';
 import { unstable_cache } from 'next/cache';
+import debug from '../debug';
 /**
  * Creates a route handler to serve the robots.txt file.
  * @param {RouteHandlerOptions} options - The options for the route handler.
@@ -28,11 +28,12 @@ export const createRobotsRouteHandler = (options) => {
     const GET = (req) => __awaiter(void 0, void 0, void 0, function* () {
         var _a;
         try {
-            const startTimestamp = Date.now();
             const hostName = req.headers.get('x-forwarded-host') ||
                 ((_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0]) ||
                 'localhost';
             const site = siteResolver.getByHost(hostName);
+            // Access request data first, then capture timestamp for Next.js 16 compatibility
+            const startTimestamp = Date.now();
             debug.robots('robots route handler start: %o', {
                 hostName,
                 siteName: site.name,
@@ -56,6 +57,10 @@ export const createRobotsRouteHandler = (options) => {
             });
         }
         catch (error) {
+            // Re-throw prerender bail-out errors so Next.js can handle them properly
+            if (error instanceof Error && error.digest === 'NEXT_PRERENDER_INTERRUPTED') {
+                throw error;
+            }
             console.log('Robots route handler failed:');
             console.log(error);
             return new Response('Internal Server Error', {

package/dist/esm/route-handler/sitemap-route-handler.js

@@ -7,9 +7,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SiteResolver } from '@sitecore-content-sdk/core/site';
-import { debug } from '@sitecore-content-sdk/core';
+import { SiteResolver } from '@sitecore-content-sdk/content/site';
 import { unstable_cache } from 'next/cache';
+import debug from '../debug';
 /**
  * Creates a route handler to serve the sitemap.xml file.
  * @param {RouteHandlerOptions} options - The options for the route handler.
@@ -35,8 +35,9 @@ export function createSitemapRouteHandler(options) {
     });
     const GET = (req) => __awaiter(this, void 0, void 0, function* () {
         try {
-            const startTimestamp = Date.now();
             const options = getOptions(req);
+            // Access request data first, then capture timestamp for Next.js 16 compatibility
+            const startTimestamp = Date.now();
             debug.sitemap('sitemap route handler start: %o', {
                 options,
             });
@@ -49,6 +50,10 @@ export function createSitemapRouteHandler(options) {
             });
         }
         catch (error) {
+            // Re-throw prerender bail-out errors so Next.js can handle them properly
+            if (error instanceof Error && error.digest === 'NEXT_PRERENDER_INTERRUPTED') {
+                throw error;
+            }
             console.log('Sitemap route handler failed:');
             console.log(error);
             if (error instanceof Error && error.message === 'REDIRECT_404') {

package/dist/esm/site/index.js

@@ -1 +1 @@
-export { SiteResolver } from '@sitecore-content-sdk/core/site';
+export { SiteResolver } from '@sitecore-content-sdk/content/site';

package/dist/esm/tools/codegen/import-map.js

@@ -1,4 +1,4 @@
-import { writeImportMap as writeImportMapCoreImpl, } from '@sitecore-content-sdk/core/tools';
+import { writeImportMap as writeImportMapCoreImpl, } from '@sitecore-content-sdk/content/node-tools';
 import { detectRouterType, nextjsClientMapTemplate, nextjsServertMapTemplate, nextjsDefaultMapTemplate, } from '../templating/utils';
 let writeImportMapCore = writeImportMapCoreImpl;
 export const __mockDependencies = (mocks) => {

package/dist/esm/tools/generate-map.js

@@ -1,4 +1,4 @@
-import { filterComponentsByType, } from '@sitecore-content-sdk/core/tools';
+import { filterComponentsByType, } from '@sitecore-content-sdk/content/tools';
 import * as path from 'path';
 import * as fs from 'fs';
 import { detectRouterType, getComponentListWithTypes } from './templating/utils';

package/dist/esm/tools/index.js

@@ -1,3 +1,4 @@
-export { generateSites, generateMetadata, getComponentList, generatePlugins, ModuleType, extractFiles, } from '@sitecore-content-sdk/core/tools';
+export { generateSites, getComponentList, extractFiles, } from '@sitecore-content-sdk/content/node-tools';
+export { generateMetadata } from '@sitecore-content-sdk/core/node-tools';
 export { generateMap } from './generate-map';
 export { writeImportMap } from './codegen/import-map';

package/dist/esm/tools/templating/byoc-component.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { ComponentTemplateType } from '@sitecore-content-sdk/core/config';
+import { ComponentTemplateType } from '@sitecore-content-sdk/content/config';
 import { COMPONENT_FILE_EXTENSION } from './constants';
 /**
  * Next.js BYOC component boilerplate

package/dist/esm/tools/templating/default-component.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { ComponentTemplateType } from '@sitecore-content-sdk/core/config';
+import { ComponentTemplateType } from '@sitecore-content-sdk/content/config';
 import { COMPONENT_FILE_EXTENSION } from './constants';
 /**
  * Next.js component boilerplate

package/dist/esm/tools/templating/utils.js

@@ -1,7 +1,6 @@
-import { getComponentList, } from '@sitecore-content-sdk/core/tools';
+import { getComponentList, defaultImportMapTemplate, } from '@sitecore-content-sdk/content/node-tools';
 import ts from 'typescript';
 import fs from 'fs';
-import { defaultImportMapTemplate } from '@sitecore-content-sdk/core/tools';
 /**
  * Detects the Next.js router type (App Router or Pages Router) based on directory structure.
  * @param {string} projectRoot - The project root directory. Defaults to current working directory.

package/dist/esm/utils/index.js

@@ -1,3 +1,3 @@
 export { handleEditorFastRefresh, extractPath, isServerSidePropsContext, parseRewriteHeader, } from './utils';
-export { tryParseEnvValue, resolveUrl } from '@sitecore-content-sdk/core/utils';
-export { isEditorActive, resetEditorChromes } from '@sitecore-content-sdk/core/editing';
+export { resolveUrl } from '@sitecore-content-sdk/core/tools';
+export { isEditorActive, resetEditorChromes } from '@sitecore-content-sdk/content/editing';

package/dist/esm/utils/utils.js

@@ -1,5 +1,5 @@
-import { isEditorActive, resetEditorChromes } from '@sitecore-content-sdk/core/editing';
-import { REWRITE_HEADER_NAME } from '../middleware/middleware';
+import { isEditorActive, resetEditorChromes } from '@sitecore-content-sdk/content/editing';
+import { REWRITE_HEADER_NAME } from '../proxy/proxy';
 /**
  * Since Sitecore editors do not support Fast Refresh:
  * 1. Subscribe on events provided by webpack.