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

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

@@ -31,7 +31,7 @@ class SitecoreNextjsClient extends client_1.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 = (0, site_1.getSiteRewriteData)(resolvedPath, this.initOptions.defaultSite);
         return siteData.siteName;
     }

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

@@ -22,7 +22,7 @@ const utils_2 = require("@sitecore-content-sdk/core/utils");
  */
 class FEAASRenderMiddleware extends render_middleware_1.RenderMiddlewareBase {
     /**
-     * @param {EditingRenderMiddlewareConfig} [config] Editing render middleware config
+     * @param {FEAASRenderMiddlewareConfig} [config] FEAAS render middleware config
      */
     constructor(config) {
         var _a;

package/dist/cjs/middleware/index.js

@@ -1,30 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.REDIRECT_TYPE_SERVER_TRANSFER = exports.REDIRECT_TYPE_302 = exports.REDIRECT_TYPE_301 = exports.RedirectsService = exports.PersonalizeService = exports.LocaleMiddleware = exports.RobotsMiddleware = exports.SitemapMiddleware = exports.AppRouterMultisiteMiddleware = exports.MultisiteMiddleware = exports.PersonalizeMiddleware = exports.RedirectsMiddleware = exports.defineMiddleware = exports.Middleware = exports.MiddlewareBase = exports.debug = void 0;
-var core_1 = require("@sitecore-content-sdk/core");
-Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return core_1.debug; } });
-var middleware_1 = require("./middleware");
-Object.defineProperty(exports, "MiddlewareBase", { enumerable: true, get: function () { return middleware_1.MiddlewareBase; } });
-Object.defineProperty(exports, "Middleware", { enumerable: true, get: function () { return middleware_1.Middleware; } });
-Object.defineProperty(exports, "defineMiddleware", { enumerable: true, get: function () { return middleware_1.defineMiddleware; } });
-var redirects_middleware_1 = require("./redirects-middleware");
-Object.defineProperty(exports, "RedirectsMiddleware", { enumerable: true, get: function () { return redirects_middleware_1.RedirectsMiddleware; } });
-var personalize_middleware_1 = require("./personalize-middleware");
-Object.defineProperty(exports, "PersonalizeMiddleware", { enumerable: true, get: function () { return personalize_middleware_1.PersonalizeMiddleware; } });
-var multisite_middleware_1 = require("./multisite-middleware");
-Object.defineProperty(exports, "MultisiteMiddleware", { enumerable: true, get: function () { return multisite_middleware_1.MultisiteMiddleware; } });
-var app_router_multisite_middleware_1 = require("./app-router-multisite-middleware");
-Object.defineProperty(exports, "AppRouterMultisiteMiddleware", { enumerable: true, get: function () { return app_router_multisite_middleware_1.AppRouterMultisiteMiddleware; } });
+exports.RobotsMiddleware = exports.SitemapMiddleware = void 0;
 var sitemap_middleware_1 = require("./sitemap-middleware");
 Object.defineProperty(exports, "SitemapMiddleware", { enumerable: true, get: function () { return sitemap_middleware_1.SitemapMiddleware; } });
 var robots_middleware_1 = require("./robots-middleware");
 Object.defineProperty(exports, "RobotsMiddleware", { enumerable: true, get: function () { return robots_middleware_1.RobotsMiddleware; } });
-var locale_middleware_1 = require("./locale-middleware");
-Object.defineProperty(exports, "LocaleMiddleware", { enumerable: true, get: function () { return locale_middleware_1.LocaleMiddleware; } });
-var personalize_1 = require("@sitecore-content-sdk/core/personalize");
-Object.defineProperty(exports, "PersonalizeService", { enumerable: true, get: function () { return personalize_1.PersonalizeService; } });
-var site_1 = require("@sitecore-content-sdk/core/site");
-Object.defineProperty(exports, "RedirectsService", { enumerable: true, get: function () { return site_1.RedirectsService; } });
-Object.defineProperty(exports, "REDIRECT_TYPE_301", { enumerable: true, get: function () { return site_1.REDIRECT_TYPE_301; } });
-Object.defineProperty(exports, "REDIRECT_TYPE_302", { enumerable: true, get: function () { return site_1.REDIRECT_TYPE_302; } });
-Object.defineProperty(exports, "REDIRECT_TYPE_SERVER_TRANSFER", { enumerable: true, get: function () { return site_1.REDIRECT_TYPE_SERVER_TRANSFER; } });

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

@@ -1,26 +1,26 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppRouterMultisiteMiddleware = void 0;
-const multisite_middleware_1 = require("./multisite-middleware");
+exports.AppRouterMultisiteProxy = void 0;
+const multisite_proxy_1 = require("./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
  */
-class AppRouterMultisiteMiddleware extends multisite_middleware_1.MultisiteMiddleware {
+class AppRouterMultisiteProxy extends multisite_proxy_1.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
      */
@@ -38,4 +38,4 @@ class AppRouterMultisiteMiddleware extends multisite_middleware_1.MultisiteMiddl
         return `/${siteName}${path}`;
     }
 }
-exports.AppRouterMultisiteMiddleware = AppRouterMultisiteMiddleware;
+exports.AppRouterMultisiteProxy = AppRouterMultisiteProxy;

package/dist/cjs/proxy/index.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.REDIRECT_TYPE_SERVER_TRANSFER = exports.REDIRECT_TYPE_302 = exports.REDIRECT_TYPE_301 = exports.RedirectsService = exports.PersonalizeService = exports.LocaleProxy = exports.AppRouterMultisiteProxy = exports.MultisiteProxy = exports.PersonalizeProxy = exports.RedirectsProxy = exports.defineProxy = exports.ProxyHandler = exports.ProxyBase = exports.debug = void 0;
+var core_1 = require("@sitecore-content-sdk/core");
+Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return core_1.debug; } });
+var proxy_1 = require("./proxy");
+Object.defineProperty(exports, "ProxyBase", { enumerable: true, get: function () { return proxy_1.ProxyBase; } });
+Object.defineProperty(exports, "ProxyHandler", { enumerable: true, get: function () { return proxy_1.ProxyHandler; } });
+Object.defineProperty(exports, "defineProxy", { enumerable: true, get: function () { return proxy_1.defineProxy; } });
+var redirects_proxy_1 = require("./redirects-proxy");
+Object.defineProperty(exports, "RedirectsProxy", { enumerable: true, get: function () { return redirects_proxy_1.RedirectsProxy; } });
+var personalize_proxy_1 = require("./personalize-proxy");
+Object.defineProperty(exports, "PersonalizeProxy", { enumerable: true, get: function () { return personalize_proxy_1.PersonalizeProxy; } });
+var multisite_proxy_1 = require("./multisite-proxy");
+Object.defineProperty(exports, "MultisiteProxy", { enumerable: true, get: function () { return multisite_proxy_1.MultisiteProxy; } });
+var app_router_multisite_proxy_1 = require("./app-router-multisite-proxy");
+Object.defineProperty(exports, "AppRouterMultisiteProxy", { enumerable: true, get: function () { return app_router_multisite_proxy_1.AppRouterMultisiteProxy; } });
+var locale_proxy_1 = require("./locale-proxy");
+Object.defineProperty(exports, "LocaleProxy", { enumerable: true, get: function () { return locale_proxy_1.LocaleProxy; } });
+var personalize_1 = require("@sitecore-content-sdk/core/personalize");
+Object.defineProperty(exports, "PersonalizeService", { enumerable: true, get: function () { return personalize_1.PersonalizeService; } });
+var site_1 = require("@sitecore-content-sdk/core/site");
+Object.defineProperty(exports, "RedirectsService", { enumerable: true, get: function () { return site_1.RedirectsService; } });
+Object.defineProperty(exports, "REDIRECT_TYPE_301", { enumerable: true, get: function () { return site_1.REDIRECT_TYPE_301; } });
+Object.defineProperty(exports, "REDIRECT_TYPE_302", { enumerable: true, get: function () { return site_1.REDIRECT_TYPE_302; } });
+Object.defineProperty(exports, "REDIRECT_TYPE_SERVER_TRANSFER", { enumerable: true, get: function () { return site_1.REDIRECT_TYPE_SERVER_TRANSFER; } });

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

@@ -10,19 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LocaleMiddleware = void 0;
+exports.LocaleProxy = void 0;
 const core_1 = require("@sitecore-content-sdk/core");
 const i18n_1 = require("@sitecore-content-sdk/core/i18n");
-const middleware_1 = require("./middleware");
+const proxy_1 = require("./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
  */
-class LocaleMiddleware extends middleware_1.MiddlewareBase {
+class LocaleProxy extends proxy_1.ProxyBase {
     /**
-     * @param {LocaleMiddlewareConfig} config Locale middleware config
+     * @param {LocaleProxyConfig} config Locale proxy config
      */
     constructor(config) {
         super(config);
@@ -32,12 +32,12 @@ class LocaleMiddleware extends middleware_1.MiddlewareBase {
                 const { pathname } = req.nextUrl;
                 const localeFromPath = this.getLocaleFromPath(pathname);
                 const locale = localeFromPath || this.getLanguage(req, res);
-                core_1.debug.locale('locale middleware start: %o', {
+                core_1.debug.locale('locale proxy start: %o', {
                     pathname,
                     locale,
                 });
                 if (this.disabled(req, res)) {
-                    core_1.debug.locale('skipped (locale middleware is disabled)');
+                    core_1.debug.locale('skipped (locale proxy is disabled)');
                     return res;
                 }
                 if (!localeFromPath) {
@@ -45,7 +45,7 @@ class LocaleMiddleware extends middleware_1.MiddlewareBase {
                     const rewritePath = (0, i18n_1.getLocaleRewrite)(pathname, locale);
                     const response = this.rewrite(rewritePath, req, res);
                     this.setLocaleHeader(response, locale);
-                    core_1.debug.locale('locale middleware end, with rewrite: %o', {
+                    core_1.debug.locale('locale proxy end, with rewrite: %o', {
                         pathname,
                         locale,
                         rewritePath,
@@ -53,14 +53,14 @@ class LocaleMiddleware extends middleware_1.MiddlewareBase {
                     return response;
                 }
                 this.setLocaleHeader(res, locale);
-                core_1.debug.locale('locale middleware end, no rewrite: %o', {
+                core_1.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;
             }
@@ -79,7 +79,7 @@ class LocaleMiddleware extends middleware_1.MiddlewareBase {
         return this.config.locales.find((locale) => path.includes(`/${locale}/`) || path.endsWith(`/${locale}`));
     }
     setLocaleHeader(res, locale) {
-        res.headers.set(middleware_1.LOCALE_HEADER_NAME, locale);
+        res.headers.set(proxy_1.LOCALE_HEADER_NAME, locale);
     }
 }
-exports.LocaleMiddleware = LocaleMiddleware;
+exports.LocaleProxy = LocaleProxy;

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

@@ -10,18 +10,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultisiteMiddleware = void 0;
+exports.MultisiteProxy = void 0;
 const site_1 = require("@sitecore-content-sdk/core/site");
 const core_1 = require("@sitecore-content-sdk/core");
-const middleware_1 = require("./middleware");
+const proxy_1 = require("./proxy");
 const editing_1 = require("@sitecore-content-sdk/core/editing");
 /**
- * Middleware / handler for multisite support
+ * Proxy / handler for multisite support
  * @public
  */
-class MultisiteMiddleware extends middleware_1.MiddlewareBase {
+class MultisiteProxy extends proxy_1.ProxyBase {
     /**
-     * @param {MultisiteMiddlewareConfig} [config] Multisite middleware config
+     * @param {MultisiteProxyConfig} [config] Multisite proxy config
      */
     constructor(config) {
         super(config);
@@ -29,12 +29,12 @@ class MultisiteMiddleware extends middleware_1.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
-                const pathname = (res === null || res === void 0 ? void 0 : res.headers.get(middleware_1.REWRITE_HEADER_NAME)) || req.nextUrl.pathname;
+                // Path can be rewritten by previously executed proxy
+                const pathname = (res === null || res === void 0 ? void 0 : res.headers.get(proxy_1.REWRITE_HEADER_NAME)) || req.nextUrl.pathname;
                 const language = this.getLanguage(req, res);
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
                 const startTimestamp = Date.now();
-                core_1.debug.multisite('multisite middleware start: %o', {
+                core_1.debug.multisite('multisite proxy start: %o', {
                     pathname,
                     language,
                     hostname,
@@ -53,13 +53,13 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
                     if (!this.config.enabled) {
                         this.shouldWarnWhenDisabled(res);
                         if (this.shouldSkipWhenDisabled()) {
-                            core_1.debug.multisite('skipped (multisite middleware is disabled globally)');
+                            core_1.debug.multisite('skipped (multisite proxy is disabled globally)');
                             return res;
                         }
                         // Continue execution if shouldSkipWhenDisabled returns false (App Router case)
                     }
                     if (this.disabled(req, res)) {
-                        core_1.debug.multisite('skipped (multisite middleware is disabled)');
+                        core_1.debug.multisite('skipped (multisite proxy is disabled)');
                         return res;
                     }
                 }
@@ -89,9 +89,9 @@ class MultisiteMiddleware extends middleware_1.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_1.SITE_KEY, siteName, defaultCookieAttributes);
-                core_1.debug.multisite('multisite middleware end in %dms: %o', Date.now() - startTimestamp, {
+                core_1.debug.multisite('multisite proxy end in %dms: %o', Date.now() - startTimestamp, {
                     rewritePath,
                     siteName,
                     headers: this.extractDebugHeaders(response.headers),
@@ -100,7 +100,7 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
                 return response;
             }
             catch (error) {
-                console.log('Multisite middleware failed:');
+                console.log('Multisite proxy failed:');
                 console.log(error);
                 return res;
             }
@@ -119,9 +119,9 @@ class MultisiteMiddleware extends middleware_1.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
@@ -138,4 +138,4 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
         });
     }
 }
-exports.MultisiteMiddleware = MultisiteMiddleware;
+exports.MultisiteProxy = MultisiteProxy;

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

@@ -9,19 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PersonalizeMiddleware = void 0;
+exports.PersonalizeProxy = void 0;
 const personalize_1 = require("@sitecore-content-sdk/core/personalize");
 const core_1 = require("@sitecore-content-sdk/core");
-const middleware_1 = require("./middleware");
-const server_1 = require("@sitecore-cloudsdk/core/server");
-const server_2 = require("@sitecore-cloudsdk/personalize/server");
+const proxy_1 = require("./proxy");
+const server_1 = require("@sitecore-content-sdk/analytics-core/server");
+const server_2 = require("@sitecore-content-sdk/personalize/server");
 /**
- * Middleware / handler to support Sitecore Personalize
+ * Proxy / handler to support Sitecore Personalize
  * @public
  */
-class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
+class PersonalizeProxy extends proxy_1.ProxyBase {
     /**
-     * @param {PersonalizeMiddlewareConfig} [config] Personalize middleware config
+     * @param {PersonalizeProxyConfig} [config] Personalize proxy config
      */
     constructor(config) {
         var _a;
@@ -29,7 +29,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
         this.config = config;
         this.handle = (req, res) => __awaiter(this, void 0, void 0, function* () {
             if (!this.config.enabled) {
-                core_1.debug.personalize('skipped (personalize middleware is disabled globally)');
+                core_1.debug.personalize('skipped (personalize proxy is disabled globally)');
                 return res;
             }
             try {
@@ -41,11 +41,11 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 const geo = this.config.extractGeoDataCb
                     ? yield this.config.extractGeoDataCb(req)
                     : undefined;
-                core_1.debug.personalize('personalize middleware start: %o', Object.assign(Object.assign({ pathname,
+                core_1.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)) {
-                    core_1.debug.personalize('skipped (personalize middleware is disabled)');
+                    core_1.debug.personalize('skipped (personalize proxy is disabled)');
                     return res;
                 }
                 if (res.redirected || // Don't attempt to personalize a redirect
@@ -75,8 +75,8 @@ class PersonalizeMiddleware extends middleware_1.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;
                 }
@@ -105,29 +105,29 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                     core_1.debug.personalize('skipped (no variant(s) identified)');
                     return res;
                 }
-                // Path can be rewritten by previously executed middleware
-                const basePath = (res === null || res === void 0 ? void 0 : res.headers.get(middleware_1.REWRITE_HEADER_NAME)) || pathname;
+                // Path can be rewritten by previously executed proxy
+                const basePath = (res === null || res === void 0 ? void 0 : res.headers.get(proxy_1.REWRITE_HEADER_NAME)) || pathname;
                 // Rewrite to persononalized path
                 const rewritePath = (0, personalize_1.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');
-                core_1.debug.personalize('personalize middleware end in %dms: %o', Date.now() - startTimestamp, {
+                response.headers.set('x-proxy-cache', 'no-cache');
+                core_1.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;
@@ -153,7 +153,7 @@ class PersonalizeMiddleware extends middleware_1.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) {
             core_1.debug.personalize('skipped (personalize service not configured - edge config required)');
             return true;
@@ -241,4 +241,4 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
         }, results);
     }
 }
-exports.PersonalizeMiddleware = PersonalizeMiddleware;
+exports.PersonalizeProxy = PersonalizeProxy;

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineMiddleware = exports.MiddlewareBase = exports.Middleware = exports.LOCALE_HEADER_NAME = exports.REWRITE_HEADER_NAME = void 0;
+exports.defineProxy = exports.ProxyBase = exports.ProxyHandler = exports.LOCALE_HEADER_NAME = exports.REWRITE_HEADER_NAME = void 0;
 const site_1 = require("@sitecore-content-sdk/core/site");
 const core_1 = require("@sitecore-content-sdk/core");
 const server_1 = require("next/server");
@@ -17,17 +17,17 @@ const client_1 = require("@sitecore-content-sdk/core/client");
 exports.REWRITE_HEADER_NAME = 'x-sc-rewrite';
 exports.LOCALE_HEADER_NAME = 'x-sc-locale';
 /**
- * Middleware class to be extended by all middleware implementations
+ * Proxy handler class to be extended by all proxy implementations
  * @public
  */
-class Middleware {
+class ProxyHandler {
 }
-exports.Middleware = Middleware;
+exports.ProxyHandler = ProxyHandler;
 /**
- * Base middleware class with common methods
+ * Base proxy class with common methods
  * @public
  */
-class MiddlewareBase extends Middleware {
+class ProxyBase extends ProxyHandler {
     constructor(config) {
         super();
         this.config = config;
@@ -64,14 +64,14 @@ class MiddlewareBase extends Middleware {
         const isKnownDevice = isMobile || isKnownPlatform;
         const purpose = req.headers.get('purpose');
         const nextRouterPrefetch = req.headers.get('Next-Router-Prefetch');
-        const middlewarePrefetch = req.headers.get('x-middleware-prefetch');
+        const proxyPrefetch = req.headers.get('x-middleware-prefetch');
         // Some real navigations on different devices may incorrectly include 'prefetch' headers.
         // To avoid skipping personalization in such cases, we treat 'x-middleware-prefetch' as a more reliable signal of true prefetch behavior.
-        if (isKnownDevice && middlewarePrefetch === '1') {
+        if (isKnownDevice && proxyPrefetch === '1') {
             return false;
         }
         // Otherwise, standard prefetch detection
-        return purpose === 'prefetch' || nextRouterPrefetch === '1' || middlewarePrefetch === '1';
+        return purpose === 'prefetch' || nextRouterPrefetch === '1' || proxyPrefetch === '1';
     }
     disabled(req, res) {
         const { pathname } = req.nextUrl;
@@ -82,7 +82,7 @@ class MiddlewareBase extends Middleware {
     }
     /**
      * Safely extract all headers for debug logging
-     * Necessary to avoid middleware issue https://github.com/vercel/next.js/issues/39765
+     * Necessary to avoid proxy issue https://github.com/vercel/next.js/issues/39765
      * @param {Headers} incomingHeaders Incoming headers
      * @returns Object with headers as key/value pairs
      */
@@ -106,7 +106,7 @@ class MiddlewareBase extends Middleware {
     }
     /**
      * Extract language from locale header of the response
-     * set by LocaleMiddleware for app router application
+     * set by LocaleProxy for app router application
      * @param {NextResponse} res response
      * @returns {string | undefined} language or undefined if not found
      */
@@ -160,36 +160,36 @@ class MiddlewareBase extends Middleware {
         // Note an absolute URL is required: https://nextjs.org/docs/messages/middleware-relative-urls
         const rewriteUrl = req.nextUrl.clone();
         rewriteUrl.pathname = rewritePath;
-        const response = server_1.NextResponse.rewrite(rewriteUrl, res);
-        // Share rewrite path with following executed middlewares
+        // NextResponse.rewrite requires a string URL, not a NextURL object
+        const response = server_1.NextResponse.rewrite(rewriteUrl.href, res);
+        // Share rewrite path with following executed proxies
         if (!skipHeader) {
             response.headers.set(exports.REWRITE_HEADER_NAME, rewritePath);
         }
         return response;
     }
 }
-exports.MiddlewareBase = MiddlewareBase;
+exports.ProxyBase = ProxyBase;
 /**
- * Define a middleware with a list of middlewares
- * @param {Middleware[]} middlewares List of middlewares to execute
+ * Define a proxy with a list of proxy handlers
+ * @param {ProxyHandler[]} proxies List of proxy handlers to execute
  * @public
  */
-const defineMiddleware = (...middlewares) => {
+const defineProxy = (...proxies) => {
     return {
         /**
-         * Execute all middlewares
+         * Execute all proxies
          * @param {NextRequest} req request
-         * @param {NextFetchEvent} ev fetch event
          * @param {NextResponse} [res] response
          */
-        exec: (req, ev, res) => __awaiter(void 0, void 0, void 0, function* () {
+        exec: (req, res) => __awaiter(void 0, void 0, void 0, function* () {
             const response = res || server_1.NextResponse.next();
-            core_1.debug.common('middleware start');
+            core_1.debug.common('proxy start');
             const start = Date.now();
-            const middlewareResponse = yield middlewares.reduce((p, middleware) => p.then((res) => middleware.handle(req, res, ev)), Promise.resolve(response));
-            core_1.debug.common('middleware end in %dms', Date.now() - start);
-            return middlewareResponse;
+            const proxyResponse = yield proxies.reduce((p, proxy) => p.then((res) => proxy.handle(req, res)), Promise.resolve(response));
+            core_1.debug.common('proxy end in %dms', Date.now() - start);
+            return proxyResponse;
         }),
     };
 };
-exports.defineMiddleware = defineMiddleware;
+exports.defineProxy = defineProxy;