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

package/dist/esm/editing/utils.js

@@ -7,12 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { EDITING_ALLOWED_ORIGINS, isDesignLibraryMode, PREVIEW_KEY, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-content-sdk/core/editing';
-import { DEFAULT_VARIANT } from '@sitecore-content-sdk/core/personalize';
-import { SITE_KEY } from '@sitecore-content-sdk/core/site';
+import { EDITING_ALLOWED_ORIGINS, isDesignLibraryMode, PREVIEW_KEY, QUERY_PARAM_EDITING_SECRET, } from '@sitecore-content-sdk/content/editing';
+import { DEFAULT_VARIANT } from '@sitecore-content-sdk/content/personalize';
+import { SITE_KEY } from '@sitecore-content-sdk/content/site';
 import { EDITING_PASS_THROUGH_HEADERS, QUERY_PARAM_VERCEL_PROTECTION_BYPASS, QUERY_PARAM_VERCEL_SET_BYPASS_COOKIE, } from './constants';
 import { SERVER_PROPS_ID, STATIC_PROPS_ID } from 'next/constants';
-import { getAllowedOriginsFromEnv } from '@sitecore-content-sdk/core/utils';
+import { getAllowedOriginsFromEnv } from '@sitecore-content-sdk/core/tools';
 /**
  * Gets editing secret value from request
  * @param {NextApiRequest | NextRequest} req incoming request
@@ -64,6 +64,34 @@ export const mapEditingParams = (query) => {
         };
     return params;
 };
+/**
+ * Parses the query parameters based on the provided allowed parameters or a resolver function, to extract additional parameters that should be allowed.
+ * @param {{ [key: string]: string | undefined }} queryParams Object of query parameters from incoming URL.
+ * @param {AllowedQueryParams} allowedParams Allowed parameters to map.
+ * @returns Object containing the list of missing required parameters and the allowed query parameters that were extracted.
+ * @internal
+ */
+export const getAllowedQueryParams = (queryParams, allowedParams) => {
+    const allowedQueryParamsList = typeof allowedParams === 'function'
+        ? allowedParams(Object.keys(queryParams))
+        : Array.isArray(allowedParams)
+            ? allowedParams
+            : [];
+    if (!allowedQueryParamsList.length)
+        return { missingAllowedParams: [], allowedQueryParams: {} };
+    return allowedQueryParamsList.reduce((acc, param) => {
+        const name = typeof param === 'string' ? param : param.name;
+        const required = typeof param === 'string' ? false : param.required;
+        const value = queryParams[name];
+        if (value !== undefined) {
+            acc.allowedQueryParams[name] = value;
+            return acc;
+        }
+        if (required)
+            acc.missingAllowedParams.push(name);
+        return acc;
+    }, { missingAllowedParams: [], allowedQueryParams: {} });
+};
 /**
  * Filters out Next.js preview cookies from a cookie string or array
  * @param {string | string[] | null} cookies cookie header value

package/dist/esm/index.js

@@ -1,14 +1,15 @@
+export { default as debug } from './debug';
 export { constants, 
 // generic data access
-NativeDataFetcher, enableDebug, debug, MemoryCacheClient, } from '@sitecore-content-sdk/core';
-export { LayoutServicePageState, LayoutService, getChildPlaceholder, getFieldValue, getContentStylesheetLink, EditMode, RenderingType, } from '@sitecore-content-sdk/core/layout';
-export { ErrorPage } from '@sitecore-content-sdk/core/client';
-export { ComponentLayoutService } from '@sitecore-content-sdk/core/editing';
-export { mediaApi } from '@sitecore-content-sdk/core/media';
-export { DictionaryService, } from '@sitecore-content-sdk/core/i18n';
-export { personalizeLayout, getPersonalizedRewrite, getPersonalizedRewriteData, getGroomedVariantIds, normalizePersonalizedRewrite, CdpHelper, PersonalizeService, } from '@sitecore-content-sdk/core/personalize';
-export { SitePathService, RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/core/site';
-export { SitemapXmlService, ErrorPagesService, RobotsService, SiteResolver, SiteInfoService, getSiteRewrite, getSiteRewriteData, normalizeSiteRewrite, } from '@sitecore-content-sdk/core/site';
+NativeDataFetcher, enableDebug, MemoryCacheClient, } from '@sitecore-content-sdk/core';
+export { LayoutServicePageState, LayoutService, getChildPlaceholder, getFieldValue, getContentStylesheetLink, EditMode, RenderingType, } from '@sitecore-content-sdk/content/layout';
+export { ErrorPage } from '@sitecore-content-sdk/content/client';
+export { ComponentLayoutService } from '@sitecore-content-sdk/content/editing';
+export { mediaApi } from '@sitecore-content-sdk/content/media';
+export { DictionaryService, } from '@sitecore-content-sdk/content/i18n';
+export { personalizeLayout, getPersonalizedRewrite, getPersonalizedRewriteData, getGroomedVariantIds, normalizePersonalizedRewrite, CdpHelper, PersonalizeService, } from '@sitecore-content-sdk/content/personalize';
+export { SitePathService, RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/content/site';
+export { SitemapXmlService, ErrorPagesService, RobotsService, SiteResolver, SiteInfoService, getSiteRewrite, getSiteRewriteData, normalizeSiteRewrite, } from '@sitecore-content-sdk/content/site';
 export { ComponentPropsService } from './services/component-props-service';
 export { ComponentPropsReactContext, ComponentPropsContext, useComponentProps, } from './components/ComponentPropsContext';
 export { Link } from './components/Link';
@@ -18,8 +19,6 @@ export { NextImage } from './components/NextImage';
 import * as FEaaSWrapper from './components/FEaaSWrapper';
 import * as BYOCWrapper from './components/BYOCWrapper';
 export { FEaaSClientWrapper, FEaaSServerWrapper, BYOCClientWrapper, BYOCServerWrapper, } from '@sitecore-content-sdk/react';
-// Preserving original FEaaSWrapper export name for backward compatibility
-// TODO: remove in future major release
 export { FEaaSWrapper };
 export { BYOCWrapper };
-export { Image, Text, DateField, FEaaSComponent, fetchFEaaSComponentServerProps, BYOCComponent, getDesignLibraryStylesheetLinks, File, DesignLibrary, DesignLibraryApp, DefaultEmptyFieldEditingComponentImage, DefaultEmptyFieldEditingComponentText, SitecoreProvider, SitecoreProviderReactContext, withSitecore, useSitecore, withEditorChromes, withPlaceholder, withDatasourceCheck, withFieldMetadata, withEmptyFieldEditingComponent, EditingScripts, Form, ClientEditingChromesUpdate, AppPlaceholder, } from '@sitecore-content-sdk/react';
+export { Image, Text, DateField, FEaaSComponent, fetchFEaaSComponentServerProps, BYOCComponent, getDesignLibraryStylesheetLinks, File, DesignLibrary, DesignLibraryApp, DefaultEmptyFieldEditingComponentImage, DefaultEmptyFieldEditingComponentText, SitecoreProvider, SitecoreProviderReactContext, withSitecore, useSitecore, withEditorChromes, withAppPlaceholder, withPlaceholder, withDatasourceCheck, withFieldMetadata, withEmptyFieldEditingComponent, EditingScripts, Form, ClientEditingChromesUpdate, AppPlaceholder, renderEmptyPlaceholder, } from '@sitecore-content-sdk/react';

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 { 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/content/personalize';
+export { RedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-content-sdk/content/site';
+export { default as debug } from '../debug';

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

@@ -8,18 +8,18 @@ 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 { getLocaleRewrite } from '@sitecore-content-sdk/core/i18n';
-import { MiddlewareBase, LOCALE_HEADER_NAME } from './middleware';
+import { getLocaleRewrite } from '@sitecore-content-sdk/content/i18n';
+import { ProxyBase, LOCALE_HEADER_NAME } from './proxy';
+import debug from '../debug';
 /**
- * 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}

@@ -8,17 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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 { PREVIEW_KEY } from '@sitecore-content-sdk/core/editing';
+import { getSiteRewrite, SITE_KEY } from '@sitecore-content-sdk/content/site';
+import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
+import { PREVIEW_KEY } from '@sitecore-content-sdk/content/editing';
+import debug from '../debug';
 /**
- * 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}

@@ -7,18 +7,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-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 { PersonalizeService, getPersonalizedRewrite, CdpHelper, DEFAULT_VARIANT, } from '@sitecore-content-sdk/content/personalize';
+import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
 import { CloudSDK } from '@sitecore-cloudsdk/core/server';
 import { personalize } from '@sitecore-cloudsdk/personalize/server';
+import debug from '../debug';
 /**
- * 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;

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

@@ -7,23 +7,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { SITE_KEY, SiteResolver } from '@sitecore-content-sdk/core/site';
-import { debug } from '@sitecore-content-sdk/core';
+import { SITE_KEY, SiteResolver } from '@sitecore-content-sdk/content/site';
 import { NextResponse } from 'next/server';
-import { createGraphQLClientFactory, } from '@sitecore-content-sdk/core/client';
+import { createGraphQLClientFactory, } from '@sitecore-content-sdk/content/client';
+import debug from '../debug';
 export const REWRITE_HEADER_NAME = 'x-sc-rewrite';
 export const 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
  */
-export class Middleware {
+export class ProxyHandler {
 }
 /**
- * Base middleware class with common methods
+ * Base proxy class with common methods
  * @public
  */
-export class MiddlewareBase extends Middleware {
+export class ProxyBase extends ProxyHandler {
     constructor(config) {
         super();
         this.config = config;
@@ -60,14 +60,14 @@ export 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;
@@ -78,7 +78,7 @@ export 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
      */
@@ -102,7 +102,7 @@ export 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
      */
@@ -156,8 +156,9 @@ export 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 = NextResponse.rewrite(rewriteUrl, res);
-        // Share rewrite path with following executed middlewares
+        // NextResponse.rewrite requires a string URL, not a NextURL object
+        const response = NextResponse.rewrite(rewriteUrl.href, res);
+        // Share rewrite path with following executed proxies
         if (!skipHeader) {
             response.headers.set(REWRITE_HEADER_NAME, rewritePath);
         }
@@ -165,25 +166,24 @@ export class MiddlewareBase extends Middleware {
     }
 }
 /**
- * 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
  */
-export const defineMiddleware = (...middlewares) => {
+export 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 || NextResponse.next();
-            debug.common('middleware start');
+            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));
-            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));
+            debug.common('proxy end in %dms', Date.now() - start);
+            return proxyResponse;
         }),
     };
 };