@sitecore-content-sdk/nextjs 1.4.0-canary.16 → 1.4.0-canary.17

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

@@ -12,31 +12,30 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedirectsMiddleware = void 0;
+exports.RedirectsProxy = void 0;
 const core_1 = require("@sitecore-content-sdk/core");
 const site_1 = require("@sitecore-content-sdk/core/site");
 const utils_1 = require("@sitecore-content-sdk/core/utils");
 const server_1 = require("next/server");
 const regex_parser_1 = __importDefault(require("regex-parser"));
-const middleware_1 = require("./middleware");
+const proxy_1 = require("./proxy");
 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
  */
-class RedirectsMiddleware extends middleware_1.MiddlewareBase {
+class RedirectsProxy extends proxy_1.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) {
-                core_1.debug.redirects('skipped (redirects middleware is disabled globally)');
+                core_1.debug.redirects('skipped (redirects proxy is disabled globally)');
                 return res;
             }
             try {
@@ -45,13 +44,13 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
                 let site;
                 const startTimestamp = Date.now();
-                core_1.debug.redirects('redirects middleware start: %o', {
+                core_1.debug.redirects('redirects proxy start: %o', {
                     pathname,
                     language,
                     hostname,
                 });
                 if (this.disabled(req, res)) {
-                    core_1.debug.redirects('skipped (redirects middleware is disabled)');
+                    core_1.debug.redirects('skipped (redirects proxy is disabled)');
                     return res;
                 }
                 const isAppRouterRequest = this.isAppRouter(res);
@@ -61,10 +60,10 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                         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)) {
                         core_1.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 false;
                     }
@@ -141,7 +140,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 const redirectedResponse = REGEXP_ABSOLUTE_URL.test(existsRedirect.target)
                     ? processAbsoluteUrlTarget(reqUrl, existsRedirect)
                     : processRelativeUrlTarget(reqUrl, existsRedirect);
-                core_1.debug.redirects('redirects middleware end in %dms: %o', Date.now() - startTimestamp, {
+                core_1.debug.redirects('redirects proxy end in %dms: %o', Date.now() - startTimestamp, {
                     redirected: redirectedResponse.redirected,
                     status: redirectedResponse.status,
                     url: redirectedResponse.url,
@@ -150,17 +149,22 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 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;
@@ -183,16 +187,16 @@ class RedirectsMiddleware extends middleware_1.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 site_1.RedirectsService(Object.assign(Object.assign({}, config), { clientFactory: this.getClientFactory(graphQLOptions), fetch: fetch }));
+        this.redirectsService = new site_1.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) {
             core_1.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
@@ -281,7 +285,7 @@ class RedirectsMiddleware extends middleware_1.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
@@ -333,7 +337,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 }
                 // Check if it has a site prefix
                 // If so, preserve it for the redirect target to maintain proper routing
-                const incomingRewrite = res === null || res === void 0 ? void 0 : res.headers.get(middleware_1.REWRITE_HEADER_NAME);
+                const incomingRewrite = res === null || res === void 0 ? void 0 : res.headers.get(proxy_1.REWRITE_HEADER_NAME);
                 if (incomingRewrite && !isExternal) {
                     // Extract locale from target path
                     const targetPathParts = rewritePath.split('/').filter(Boolean);
@@ -355,7 +359,7 @@ class RedirectsMiddleware extends middleware_1.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.
@@ -363,17 +367,19 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
      * @returns {NextResponse<unknown>} The redirect response.
      */
     createRedirectResponse(url, res, status, statusText) {
-        const redirect = server_1.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 = server_1.NextResponse.redirect(urlString, {
             status,
             statusText,
             headers: res === null || res === void 0 ? void 0 : res.headers,
         });
         if (res === null || res === void 0 ? void 0 : res.headers) {
-            redirect.headers.delete('x-middleware-next');
-            redirect.headers.delete('x-middleware-rewrite');
-            redirect.headers.delete(middleware_1.REWRITE_HEADER_NAME);
+            redirect.headers.delete('x-proxy-next');
+            redirect.headers.delete('x-proxy-rewrite');
+            redirect.headers.delete(proxy_1.REWRITE_HEADER_NAME);
         }
         return redirect;
     }
 }
-exports.RedirectsMiddleware = RedirectsMiddleware;
+exports.RedirectsProxy = RedirectsProxy;

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

@@ -31,11 +31,12 @@ 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();
             core_1.debug.robots('robots route handler start: %o', {
                 hostName,
                 siteName: site.name,
@@ -59,6 +60,10 @@ 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/cjs/route-handler/sitemap-route-handler.js

@@ -38,8 +38,9 @@ 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();
             core_1.debug.sitemap('sitemap route handler start: %o', {
                 options,
             });
@@ -52,6 +53,10 @@ 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/cjs/utils/utils.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseRewriteHeader = exports.isServerSidePropsContext = exports.extractPath = exports.getEditingSecret = exports.handleEditorFastRefresh = void 0;
 const editing_1 = require("@sitecore-content-sdk/core/editing");
-const middleware_1 = require("../middleware/middleware");
+const proxy_1 = require("../proxy/proxy");
 /**
  * Since Sitecore editors do not support Fast Refresh:
  * 1. Subscribe on events provided by webpack.
@@ -73,7 +73,7 @@ exports.isServerSidePropsContext = isServerSidePropsContext;
  * @public
  */
 const parseRewriteHeader = (headers) => {
-    const rewriteHeader = headers.get(middleware_1.REWRITE_HEADER_NAME);
+    const rewriteHeader = headers.get(proxy_1.REWRITE_HEADER_NAME);
     const rewriteSegments = (rewriteHeader === null || rewriteHeader === void 0 ? void 0 : rewriteHeader.split('/').filter((segment) => segment)) || [];
     const site = rewriteSegments[0];
     const locale = rewriteSegments[1];

package/dist/esm/client/sitecore-nextjs-client.js

@@ -28,7 +28,7 @@ export class SitecoreNextjsClient extends SitecoreClient {
      */
     getSiteNameFromPath(path) {
         const resolvedPath = super.parsePath(path);
-        // Get site name (from path rewritten in middleware)
+        // Get site name (from path rewritten in proxy)
         const siteData = getSiteRewriteData(resolvedPath, this.initOptions.defaultSite);
         return siteData.siteName;
     }

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

@@ -19,7 +19,7 @@ import { enforceCors } from '@sitecore-content-sdk/core/utils';
  */
 export class FEAASRenderMiddleware extends RenderMiddlewareBase {
     /**
-     * @param {EditingRenderMiddlewareConfig} [config] Editing render middleware config
+     * @param {FEAASRenderMiddlewareConfig} [config] FEAAS render middleware config
      */
     constructor(config) {
         var _a;

package/dist/esm/middleware/index.js

@@ -1,11 +1,2 @@
-export { debug } from '@sitecore-content-sdk/core';
-export { MiddlewareBase, Middleware, defineMiddleware } from './middleware';
-export { RedirectsMiddleware } from './redirects-middleware';
-export { PersonalizeMiddleware } from './personalize-middleware';
-export { MultisiteMiddleware } from './multisite-middleware';
-export { AppRouterMultisiteMiddleware } from './app-router-multisite-middleware';
 export { SitemapMiddleware } from './sitemap-middleware';
 export { RobotsMiddleware } from './robots-middleware';
-export { LocaleMiddleware } from './locale-middleware';
-export { PersonalizeService, } from '@sitecore-content-sdk/core/personalize';
-export { RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/core/site';

package/dist/esm/{middleware/app-router-multisite-middleware.js → proxy/app-router-multisite-proxy.js}

@@ -1,23 +1,23 @@
-import { MultisiteMiddleware } from './multisite-middleware';
+import { MultisiteProxy } from './multisite-proxy';
 /**
- * Middleware/handler for enabling multisite support in the Next.js App Router.
+ * Proxy/handler for enabling multisite support in the Next.js App Router.
  * @public
  */
-export class AppRouterMultisiteMiddleware extends MultisiteMiddleware {
+export class AppRouterMultisiteProxy extends MultisiteProxy {
     /**
      * Warns when multisite is disabled in App Router.
-     * The middleware will still run to prevent routing errors.
+     * The proxy will still run to prevent routing errors.
      * @param {NextResponse} _res response (unused, kept for method signature compatibility)
      */
     // eslint-disable-next-line no-unused-vars
     shouldWarnWhenDisabled(_res) {
-        console.warn('⚠️ Warning: Multisite is disabled in App Router configuration, but the middleware will continue running. ' +
+        console.warn('⚠️ Warning: Multisite is disabled in App Router configuration, but the proxy will continue running. ' +
             'Disabling multisite in App Router would cause 404 errors for regular page requests because the route structure requires the [site] segment. ' +
             'Preview/Editing modes will still work. ' +
             'For single-site setups, keep multisite enabled and configure only one site.');
     }
     /**
-     * In App Router, we cannot skip the middleware even if enabled is false,
+     * In App Router, we cannot skip the proxy even if enabled is false,
      * because the route structure requires the [site] segment.
      * @returns {boolean} always returns false (never skip) for App Router
      */

package/dist/esm/proxy/index.js

@@ -0,0 +1,9 @@
+export { debug } from '@sitecore-content-sdk/core';
+export { ProxyBase, ProxyHandler, defineProxy } from './proxy';
+export { RedirectsProxy } from './redirects-proxy';
+export { PersonalizeProxy } from './personalize-proxy';
+export { MultisiteProxy } from './multisite-proxy';
+export { AppRouterMultisiteProxy } from './app-router-multisite-proxy';
+export { LocaleProxy } from './locale-proxy';
+export { PersonalizeService, } from '@sitecore-content-sdk/core/personalize';
+export { RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/core/site';

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

@@ -10,16 +10,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { debug } from '@sitecore-content-sdk/core';
 import { getLocaleRewrite } from '@sitecore-content-sdk/core/i18n';
-import { MiddlewareBase, LOCALE_HEADER_NAME } from './middleware';
+import { ProxyBase, LOCALE_HEADER_NAME } from './proxy';
 /**
- * Middleware/handler for handling locale-based routing in the Next.js App Router.
- * This middleware is responsible for extracting the locale from the request path and rewriting it if necessary.
+ * Proxy/handler for handling locale-based routing in the Next.js App Router.
+ * This proxy is responsible for extracting the locale from the request path and rewriting it if necessary.
  * It also sets the locale header in the response.
  * @public
  */
-export class LocaleMiddleware extends MiddlewareBase {
+export class LocaleProxy extends ProxyBase {
     /**
-     * @param {LocaleMiddlewareConfig} config Locale middleware config
+     * @param {LocaleProxyConfig} config Locale proxy config
      */
     constructor(config) {
         super(config);
@@ -29,12 +29,12 @@ export class LocaleMiddleware extends MiddlewareBase {
                 const { pathname } = req.nextUrl;
                 const localeFromPath = this.getLocaleFromPath(pathname);
                 const locale = localeFromPath || this.getLanguage(req, res);
-                debug.locale('locale middleware start: %o', {
+                debug.locale('locale proxy start: %o', {
                     pathname,
                     locale,
                 });
                 if (this.disabled(req, res)) {
-                    debug.locale('skipped (locale middleware is disabled)');
+                    debug.locale('skipped (locale proxy is disabled)');
                     return res;
                 }
                 if (!localeFromPath) {
@@ -42,7 +42,7 @@ export class LocaleMiddleware extends MiddlewareBase {
                     const rewritePath = getLocaleRewrite(pathname, locale);
                     const response = this.rewrite(rewritePath, req, res);
                     this.setLocaleHeader(response, locale);
-                    debug.locale('locale middleware end, with rewrite: %o', {
+                    debug.locale('locale proxy end, with rewrite: %o', {
                         pathname,
                         locale,
                         rewritePath,
@@ -50,14 +50,14 @@ export class LocaleMiddleware extends MiddlewareBase {
                     return response;
                 }
                 this.setLocaleHeader(res, locale);
-                debug.locale('locale middleware end, no rewrite: %o', {
+                debug.locale('locale proxy end, no rewrite: %o', {
                     pathname,
                     locale,
                 });
                 return res;
             }
             catch (error) {
-                console.log('Locale middleware failed:');
+                console.log('Locale proxy failed:');
                 console.log(error);
                 return res;
             }

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

@@ -10,15 +10,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getSiteRewrite, SITE_KEY } from '@sitecore-content-sdk/core/site';
 import { debug } from '@sitecore-content-sdk/core';
-import { MiddlewareBase, REWRITE_HEADER_NAME } from './middleware';
+import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
 import { PREVIEW_KEY } from '@sitecore-content-sdk/core/editing';
 /**
- * Middleware / handler for multisite support
+ * Proxy / handler for multisite support
  * @public
  */
-export class MultisiteMiddleware extends MiddlewareBase {
+export class MultisiteProxy extends ProxyBase {
     /**
-     * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
+     * @param {MultisiteProxyConfig} [config] Multisite proxy config
      */
     constructor(config) {
         super(config);
@@ -26,12 +26,12 @@ export class MultisiteMiddleware extends MiddlewareBase {
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
             var _a, _b, _c;
             try {
-                // Path can be rewritten by previously executed middleware
+                // Path can be rewritten by previously executed proxy
                 const pathname = (res === null || res === void 0 ? void 0 : res.headers.get(REWRITE_HEADER_NAME)) || req.nextUrl.pathname;
                 const language = this.getLanguage(req, res);
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
                 const startTimestamp = Date.now();
-                debug.multisite('multisite middleware start: %o', {
+                debug.multisite('multisite proxy start: %o', {
                     pathname,
                     language,
                     hostname,
@@ -50,13 +50,13 @@ export class MultisiteMiddleware extends MiddlewareBase {
                     if (!this.config.enabled) {
                         this.shouldWarnWhenDisabled(res);
                         if (this.shouldSkipWhenDisabled()) {
-                            debug.multisite('skipped (multisite middleware is disabled globally)');
+                            debug.multisite('skipped (multisite proxy is disabled globally)');
                             return res;
                         }
                         // Continue execution if shouldSkipWhenDisabled returns false (App Router case)
                     }
                     if (this.disabled(req, res)) {
-                        debug.multisite('skipped (multisite middleware is disabled)');
+                        debug.multisite('skipped (multisite proxy is disabled)');
                         return res;
                     }
                 }
@@ -86,9 +86,9 @@ export class MultisiteMiddleware extends MiddlewareBase {
                     httpOnly: true,
                     sameSite: 'none',
                 };
-                // Share site name with the following executed middlewares
+                // Share site name with the following executed proxies
                 response.cookies.set(SITE_KEY, siteName, defaultCookieAttributes);
-                debug.multisite('multisite middleware end in %dms: %o', Date.now() - startTimestamp, {
+                debug.multisite('multisite proxy end in %dms: %o', Date.now() - startTimestamp, {
                     rewritePath,
                     siteName,
                     headers: this.extractDebugHeaders(response.headers),
@@ -97,7 +97,7 @@ export class MultisiteMiddleware extends MiddlewareBase {
                 return response;
             }
             catch (error) {
-                console.log('Multisite middleware failed:');
+                console.log('Multisite proxy failed:');
                 console.log(error);
                 return res;
             }
@@ -116,9 +116,9 @@ export class MultisiteMiddleware extends MiddlewareBase {
         // Base implementation does nothing - subclasses can override to show warnings
     }
     /**
-     * Determines if middleware should be skipped when multisite is disabled.
+     * Determines if proxy should be skipped when multisite is disabled.
      * Override in subclasses to provide router-specific behavior.
-     * @returns {boolean} true if middleware should be skipped when disabled
+     * @returns {boolean} true if proxy should be skipped when disabled
      */
     shouldSkipWhenDisabled() {
         return true; // Base class skips when disabled

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

@@ -9,16 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { PersonalizeService, getPersonalizedRewrite, CdpHelper, DEFAULT_VARIANT, } from '@sitecore-content-sdk/core/personalize';
 import { debug } from '@sitecore-content-sdk/core';
-import { MiddlewareBase, REWRITE_HEADER_NAME } from './middleware';
+import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
 import { CloudSDK } from '@sitecore-cloudsdk/core/server';
 import { personalize } from '@sitecore-cloudsdk/personalize/server';
 /**
- * Middleware / handler to support Sitecore Personalize
+ * Proxy / handler to support Sitecore Personalize
  * @public
  */
-export class PersonalizeMiddleware extends MiddlewareBase {
+export class PersonalizeProxy extends ProxyBase {
     /**
-     * @param {PersonalizeMiddlewareConfig} [config] Personalize middleware config
+     * @param {PersonalizeProxyConfig} [config] Personalize proxy config
      */
     constructor(config) {
         var _a;
@@ -26,7 +26,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
             if (!this.config.enabled) {
-                debug.personalize('skipped (personalize middleware is disabled globally)');
+                debug.personalize('skipped (personalize proxy is disabled globally)');
                 return res;
             }
             try {
@@ -38,11 +38,11 @@ export class PersonalizeMiddleware extends MiddlewareBase {
                 const geo = this.config.extractGeoDataCb
                     ? yield this.config.extractGeoDataCb(req)
                     : undefined;
-                debug.personalize('personalize middleware start: %o', Object.assign(Object.assign({ pathname,
+                debug.personalize('personalize proxy start: %o', Object.assign(Object.assign({ pathname,
                     language,
                     hostname }, (geo && { geo })), { headers: this.extractDebugHeaders(req.headers) }));
                 if (this.disabled(req, res)) {
-                    debug.personalize('skipped (personalize middleware is disabled)');
+                    debug.personalize('skipped (personalize proxy is disabled)');
                     return res;
                 }
                 if (res.redirected || // Don't attempt to personalize a redirect
@@ -72,8 +72,8 @@ export class PersonalizeMiddleware extends MiddlewareBase {
                     // Personalized, but this is a prefetch request.
                     // In this case, don't execute a personalize request; otherwise, the metrics for component A/B experiments would be inaccurate.
                     // Disable preflight caching to force revalidation on client-side navigation (personalization WILL be influenced).
-                    // Note the reason we don't move this any earlier in the middleware is that we would then be sacrificing performance for non-personalized pages.
-                    res.headers.set('x-middleware-cache', 'no-cache');
+                    // Note the reason we don't move this any earlier in the proxy is that we would then be sacrificing performance for non-personalized pages.
+                    res.headers.set('x-proxy-cache', 'no-cache');
                     res.headers.set('Cache-Control', 'no-store, must-revalidate');
                     return res;
                 }
@@ -102,29 +102,29 @@ export class PersonalizeMiddleware extends MiddlewareBase {
                     debug.personalize('skipped (no variant(s) identified)');
                     return res;
                 }
-                // Path can be rewritten by previously executed middleware
+                // Path can be rewritten by previously executed proxy
                 const basePath = (res === null || res === void 0 ? void 0 : res.headers.get(REWRITE_HEADER_NAME)) || pathname;
                 // Rewrite to persononalized path
                 const rewritePath = getPersonalizedRewrite(basePath, identifiedVariantIds);
                 const response = this.rewrite(rewritePath, req, res);
                 // Disable preflight caching to force revalidation on client-side navigation (personalization MAY be influenced).
                 // See https://github.com/vercel/next.js/pull/32767
-                response.headers.set('x-middleware-cache', 'no-cache');
-                debug.personalize('personalize middleware end in %dms: %o', Date.now() - startTimestamp, {
+                response.headers.set('x-proxy-cache', 'no-cache');
+                debug.personalize('personalize proxy end in %dms: %o', Date.now() - startTimestamp, {
                     rewritePath,
                     headers: this.extractDebugHeaders(response.headers),
                 });
                 return response;
             }
             catch (error) {
-                console.log('Personalize middleware failed:');
+                console.log('Personalize proxy failed:');
                 console.log(error);
                 return res;
             }
         });
         // Validate edge config is present - personalize requires Edge platform
         if (!this.config.contextId && !this.config.clientContextId) {
-            console.warn('[PersonalizeMiddleware] Personalize middleware requires Edge configuration (contextId/clientContextId). ' +
+            console.warn('[PersonalizeProxy] Personalize proxy requires Edge configuration (contextId/clientContextId). ' +
                 'Personalize features will be disabled. This is expected in local container development.');
             // Set to null to indicate service is disabled
             this.personalizeService = null;
@@ -150,7 +150,7 @@ export class PersonalizeMiddleware extends MiddlewareBase {
             });
     }
     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.personalizeService) {
             debug.personalize('skipped (personalize service not configured - edge config required)');
             return true;