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

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

@@ -9,19 +9,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MultisiteMiddleware = 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 editing_1 = require("@sitecore-content-sdk/core/editing");
+exports.MultisiteProxy = void 0;
+const site_1 = require("@sitecore-content-sdk/content/site");
+const proxy_1 = require("./proxy");
+const editing_1 = require("@sitecore-content-sdk/content/editing");
+const debug_1 = __importDefault(require("../debug"));
 /**
- * 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 +32,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', {
+                debug_1.default.multisite('multisite proxy start: %o', {
                     pathname,
                     language,
                     hostname,
@@ -44,7 +47,7 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
                 // Additionally, App Router route structure always requires [site] segment, so disabling multisite
                 // will break regular requests even though Preview/Editing modes will still work.
                 if (this.isPreview(req) && !this.isAppRouter(res)) {
-                    core_1.debug.multisite('skipped (preview)');
+                    debug_1.default.multisite('skipped (preview)');
                     return res;
                 }
                 // Site name preservation is required for Sitecore Preview mode to support navigation between pages
@@ -53,13 +56,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)');
+                            debug_1.default.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)');
+                        debug_1.default.multisite('skipped (multisite proxy is disabled)');
                         return res;
                     }
                 }
@@ -89,9 +92,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, {
+                debug_1.default.multisite('multisite proxy end in %dms: %o', Date.now() - startTimestamp, {
                     rewritePath,
                     siteName,
                     headers: this.extractDebugHeaders(response.headers),
@@ -100,7 +103,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 +122,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 +141,4 @@ class MultisiteMiddleware extends middleware_1.MiddlewareBase {
         });
     }
 }
-exports.MultisiteMiddleware = MultisiteMiddleware;
+exports.MultisiteProxy = MultisiteProxy;

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

@@ -8,20 +8,23 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PersonalizeMiddleware = void 0;
-const personalize_1 = require("@sitecore-content-sdk/core/personalize");
-const core_1 = require("@sitecore-content-sdk/core");
-const middleware_1 = require("./middleware");
+exports.PersonalizeProxy = void 0;
+const personalize_1 = require("@sitecore-content-sdk/content/personalize");
+const proxy_1 = require("./proxy");
 const server_1 = require("@sitecore-cloudsdk/core/server");
 const server_2 = require("@sitecore-cloudsdk/personalize/server");
+const debug_1 = __importDefault(require("../debug"));
 /**
- * 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 +32,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)');
+                debug_1.default.personalize('skipped (personalize proxy is disabled globally)');
                 return res;
             }
             try {
@@ -41,17 +44,17 @@ 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,
+                debug_1.default.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)');
+                    debug_1.default.personalize('skipped (personalize proxy is disabled)');
                     return res;
                 }
                 if (res.redirected || // Don't attempt to personalize a redirect
                     this.isPreview(req) // No need to personalize for preview (layout data is already prepared for preview)
                 ) {
-                    core_1.debug.personalize('skipped (%s)', res.redirected ? 'redirected' : 'preview');
+                    debug_1.default.personalize('skipped (%s)', res.redirected ? 'redirected' : 'preview');
                     return res;
                 }
                 const site = this.getSite(req, res);
@@ -63,20 +66,20 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                 const personalizeInfo = yield this.personalizeService.getPersonalizeInfo(pathname, language, site.name);
                 if (!personalizeInfo) {
                     // Likely an invalid route / language
-                    core_1.debug.personalize('skipped (personalize info not found)');
+                    debug_1.default.personalize('skipped (personalize info not found)');
                     return res;
                 }
                 if (personalizeInfo.variantIds.length === 0) {
-                    core_1.debug.personalize('skipped (no personalization configured)');
+                    debug_1.default.personalize('skipped (no personalization configured)');
                     return res;
                 }
                 if (this.isPrefetch(req)) {
-                    core_1.debug.personalize('skipped (prefetch)');
+                    debug_1.default.personalize('skipped (prefetch)');
                     // 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;
                 }
@@ -94,7 +97,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                     const variantId = personalization.variantId;
                     if (variantId) {
                         if (!execution.variantIds.includes(variantId)) {
-                            core_1.debug.personalize('invalid variant %s', variantId);
+                            debug_1.default.personalize('invalid variant %s', variantId);
                         }
                         else {
                             identifiedVariantIds.push(variantId);
@@ -102,32 +105,32 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
                     }
                 })));
                 if (identifiedVariantIds.length === 0) {
-                    core_1.debug.personalize('skipped (no variant(s) identified)');
+                    debug_1.default.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');
+                debug_1.default.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,9 +156,9 @@ 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)');
+            debug_1.default.personalize('skipped (personalize service not configured - edge config required)');
             return true;
         }
         // ignore files
@@ -188,7 +191,7 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
     personalize(_a, request_1) {
         return __awaiter(this, arguments, void 0, function* ({ params, friendlyId, language, timeout, variantIds, geo, }, request) {
             var _b;
-            core_1.debug.personalize('executing experience for %s %o', friendlyId, params);
+            debug_1.default.personalize('executing experience for %s %o', friendlyId, params);
             return (yield (0, server_2.personalize)(request, Object.assign({ channel: this.config.channel || 'WEB', currency: (_b = this.config.currency) !== null && _b !== void 0 ? _b : 'USD', friendlyId,
                 params,
                 language, pageVariantIds: variantIds }, (geo && { geo })), { timeout }));
@@ -241,4 +244,4 @@ class PersonalizeMiddleware extends middleware_1.MiddlewareBase {
         }, results);
     }
 }
-exports.PersonalizeMiddleware = PersonalizeMiddleware;
+exports.PersonalizeProxy = PersonalizeProxy;

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

@@ -8,26 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defineMiddleware = exports.MiddlewareBase = exports.Middleware = 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");
+exports.defineProxy = exports.ProxyBase = exports.ProxyHandler = exports.LOCALE_HEADER_NAME = exports.REWRITE_HEADER_NAME = void 0;
+const site_1 = require("@sitecore-content-sdk/content/site");
 const server_1 = require("next/server");
-const client_1 = require("@sitecore-content-sdk/core/client");
+const client_1 = require("@sitecore-content-sdk/content/client");
+const debug_1 = __importDefault(require("../debug"));
 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 +67,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 +85,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 +109,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 +163,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');
+            debug_1.default.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));
+            debug_1.default.common('proxy end in %dms', Date.now() - start);
+            return proxyResponse;
         }),
     };
 };
-exports.defineMiddleware = defineMiddleware;
+exports.defineProxy = defineProxy;