@sitecore-content-sdk/nextjs 2.0.2 → 2.1.0-canary.10

package/dist/cjs/proxy/personalize-proxy.js

@@ -5,13 +5,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PersonalizeProxy = void 0;
 const personalize_1 = require("@sitecore-content-sdk/content/personalize");
-const proxy_1 = require("./proxy");
+const internal_1 = require("@sitecore-content-sdk/analytics-core/internal");
 const core_1 = require("@sitecore-content-sdk/core");
 const personalize_2 = require("@sitecore-content-sdk/personalize");
-const debug_1 = __importDefault(require("../debug"));
 const analytics_core_1 = require("@sitecore-content-sdk/analytics-core");
-const analytics_adapter_1 = require("../initialization/proxy/analytics-adapter");
 const personalize_3 = require("@sitecore-content-sdk/personalize");
+const analytics_adapter_1 = require("../initialization/proxy/analytics-adapter");
+const proxy_1 = require("./proxy");
+const debug_1 = __importDefault(require("../debug"));
 const personalize_adapter_1 = require("../initialization/proxy/personalize-adapter");
 /**
  * Proxy / handler to support Sitecore Personalize
@@ -26,11 +27,13 @@ class PersonalizeProxy extends proxy_1.ProxyBase {
         super(config);
         this.config = config;
         this.handle = async (req, res) => {
+            var _a, _b;
             if (!this.config.enabled) {
                 debug_1.default.personalize('skipped (personalize proxy is disabled globally)');
                 return res;
             }
             try {
+                const skipForBot = (_a = this.config.skipForBot) !== null && _a !== void 0 ? _a : true;
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req, res);
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
@@ -52,6 +55,10 @@ class PersonalizeProxy extends proxy_1.ProxyBase {
                     debug_1.default.personalize('skipped (%s)', res.redirected ? 'redirected' : 'preview');
                     return res;
                 }
+                if (skipForBot && ((_b = req.cookies.get(internal_1.BOT_DETECTION_COOKIE)) === null || _b === void 0 ? void 0 : _b.value)) {
+                    debug_1.default.personalize('skipped (bot request)');
+                    return res;
+                }
                 const site = this.getSite(req, res);
                 // Get personalization info from Experience Edge
                 // personalizeService is guaranteed to be non-null here because disabled() check passed

package/dist/cjs/proxy/proxy.js

@@ -17,6 +17,37 @@ exports.LOCALE_HEADER_NAME = 'x-sc-locale';
 class ProxyHandler {
 }
 exports.ProxyHandler = ProxyHandler;
+/**
+ * Hostname from a `Host` or `x-forwarded-host` value, without port.
+ * - `[::1]:3000` → `::1`
+ * - `127.0.0.1:3000` → `127.0.0.1`
+ * - `example.com:443` → `example.com`
+ * - `::1` → `::1` (does not treat `:1` as a port)
+ * @param {string} host - Raw header value
+ */
+function getHostnameFromHostHeader(host) {
+    const trimmed = host.trim();
+    // Bracketed IPv6: "[...]:port" or "[...]"
+    if (trimmed.startsWith('[')) {
+        const end = trimmed.indexOf(']');
+        if (end !== -1) {
+            return trimmed.slice(1, end).toLowerCase();
+        }
+    }
+    // Unbracketed IPv6 (e.g. ::1, 2001:db8::1) — never strip on last ":digits"
+    if (trimmed.includes('::')) {
+        return trimmed.toLowerCase();
+    }
+    // IPv4 or DNS name with ":port" (port = decimal digits only)
+    const lastColon = trimmed.lastIndexOf(':');
+    if (lastColon > 0) {
+        const after = trimmed.slice(lastColon + 1);
+        if (/^\d+$/.test(after)) {
+            return trimmed.slice(0, lastColon).toLowerCase();
+        }
+    }
+    return trimmed.toLowerCase();
+}
 /**
  * Base proxy class with common methods
  * @public
@@ -113,8 +144,7 @@ class ProxyBase extends ProxyHandler {
      * @param {NextRequest} req request
      */
     getHostHeader(req) {
-        var _a;
-        return req.headers.get('x-forwarded-host') || ((_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0]);
+        return getHostnameFromHostHeader(req.headers.get('x-forwarded-host') || req.headers.get('host') || '');
     }
     /**
      * Get site information. If site name is stored in cookie, use it, otherwise resolve by hostname

package/dist/cjs/proxy/redirects-proxy.js

@@ -65,7 +65,7 @@ class RedirectsProxy extends proxy_1.ProxyBase {
                 }
                 site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
-                const existsRedirect = await this.getExistsRedirect(req, site.name);
+                const existsRedirect = await this.getExistsRedirect(req, site.name, language);
                 if (!existsRedirect) {
                     debug_1.default.redirects('skipped (redirect does not exist)');
                     return res;
@@ -202,19 +202,38 @@ class RedirectsProxy extends proxy_1.ProxyBase {
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    async getExistsRedirect(req, siteName) {
+    async getExistsRedirect(req, siteName, requestLocale) {
         if (!this.redirectsService) {
             return undefined;
         }
         const { pathname: incomingURL, search: incomingQS = '' } = this.normalizeUrl(req.nextUrl.clone());
-        const locale = this.getLanguage(req);
         const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
         const redirects = await this.redirectsService.fetchRedirects(siteName);
-        const modifyRedirects = structuredClone(redirects);
+        // using locale of current request (from URL, headers or otherwise), used to match versioned redirect rules
+        const matchedLocaleRedirect = this.matchRedirectItemRedirect(redirects, requestLocale, normalizedPath);
+        if (matchedLocaleRedirect) {
+            return matchedLocaleRedirect;
+        }
+        // locale of the url - if present in the url, used for redirect map matching
+        const urlLocale = req.nextUrl.locale;
+        return this.matchFromRedirectMapRedirect(redirects, urlLocale, incomingURL, incomingQS);
+    }
+    /**
+     * Matches redirect-map rules without a `locale` field against the incoming URL (static or regex patterns).
+     * @param {RedirectResult[]} redirects All redirects from the service (non-locale entries are filtered inside).
+     * @param {string} urlLocale Locale segment from the request URL (`nextUrl.locale`).
+     * @param {string} incomingURL Original pathname used for regex tests.
+     * @param {string} incomingQS Query string including leading `?` if present.
+     * @returns {RedirectResult | undefined} First matching redirect or undefined.
+     * @private
+     */
+    matchFromRedirectMapRedirect(redirects, urlLocale, incomingURL, incomingQS) {
+        const nonLocaleRedirects = redirects.filter((redirect) => !redirect.locale);
         let matchedQueryString;
-        const localePath = `/${locale.toLowerCase()}${normalizedPath}`;
-        return modifyRedirects.length
-            ? modifyRedirects.find((redirect) => {
+        const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
+        const localePath = `/${urlLocale.toLowerCase()}${normalizedPath}`;
+        return nonLocaleRedirects.length
+            ? nonLocaleRedirects.find((redirect) => {
                 // process static URL (non-regex) rules
                 if ((0, tools_1.isRegexOrUrl)(redirect.pattern) === 'url') {
                     const urlArray = redirect.pattern.endsWith('/')
@@ -236,14 +255,14 @@ class RedirectsProxy extends proxy_1.ProxyBase {
                 // process regex rules
                 // Modify the redirect pattern to ignore the language prefix in the path
                 // And escapes non-special "?" characters in a string or regex.
-                redirect.pattern = (0, tools_1.escapeNonSpecialQuestionMarks)('^' + redirect.pattern.replace(new RegExp(`^[^]?/${locale}/`, 'gi'), '') // ensure function thinks input is regex
+                redirect.pattern = (0, tools_1.escapeNonSpecialQuestionMarks)('^' + redirect.pattern.replace(new RegExp(`^[^]?/${urlLocale}/`, 'gi'), '') // ensure function thinks input is regex
                 );
                 // Prepare the redirect pattern as a regular expression, making it more flexible for matching URLs
                 redirect.pattern = `/^\/${redirect.pattern
                     .replace(/^\/|\/$/g, '') // Removes leading and trailing slashes
                     .replace(/^\^\/|\/\$$/g, '') // Removes unnecessary start (^) and end ($) anchors
                     .replace(/^\^|\$$/g, '') // Further cleans up anchors
-                    .replace(/\$\/gi$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
+                    .replace(/\$\/g$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
                 // Redirect pattern matches the full incoming URL with query string present
                 matchedQueryString = [
                     (0, regex_parser_1.default)(redirect.pattern).test(`/${localePath}${incomingQS}`),
@@ -253,9 +272,28 @@ class RedirectsProxy extends proxy_1.ProxyBase {
                     : undefined;
                 // Save the matched query string (if found) into the redirect object
                 redirect.matchedQueryString = matchedQueryString || '';
-                return (!!((0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${incomingURL}`) ||
+                return (!!((0, regex_parser_1.default)(redirect.pattern).test(`/${urlLocale}${incomingURL}`) ||
                     (0, regex_parser_1.default)(redirect.pattern).test(incomingURL) ||
-                    matchedQueryString) && (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
+                    matchedQueryString) &&
+                    (redirect.locale ? redirect.locale.toLowerCase() === urlLocale.toLowerCase() : true));
+            })
+            : undefined;
+    }
+    /**
+     * Processes redirect rules from redirect items (language-versioned)
+     * @param {RedirectResult[]} redirects redirect entries from Edge
+     * @param {string} locale current request locale
+     * @param {string} currentPath current request path
+     * @returns {RedirectResult | undefined} matched redirect item redirect result or undefined
+     * @private
+     */
+    matchRedirectItemRedirect(redirects, locale, currentPath) {
+        const nonLocalePath = currentPath.replace(new RegExp(`^\/?${locale}\/`, 'i'), '/');
+        return redirects.length
+            ? redirects.find((redirect) => {
+                const patternPath = redirect.pattern.replace(/\/*$/g, '').toLowerCase();
+                // locale rules are easy and nice
+                return redirect.locale === locale && patternPath === nonLocalePath;
             })
             : undefined;
     }

package/dist/esm/components/Link.js

@@ -13,6 +13,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 import React, { forwardRef } from 'react';
 import NextLink from 'next/link';
 import { Link as ReactLink, } from '@sitecore-content-sdk/react';
+import { useRouter as usePageRouter } from 'next/compat/router';
 /**
  * The list of NextLink props to be supported by the Link component.
  */
@@ -34,6 +35,7 @@ const FILE_EXTENSION_MATCHER = /^\/.*\.\w+$/;
  * @public
  */
 export const Link = forwardRef((props, ref) => {
+    const pageRouter = usePageRouter();
     const { field, editable = true, children, internalLinkMatcher = /^\//g, showLinkTextWithChildrenPresent } = props, rest = __rest(props, ["field", "editable", "children", "internalLinkMatcher", "showLinkTextWithChildrenPresent"]);
     if (!field || (!field.value && !field.href && !field.metadata)) {
         return null;
@@ -48,10 +50,13 @@ export const Link = forwardRef((props, ref) => {
         const isFileUrl = FILE_EXTENSION_MATCHER.test(href);
         // determine if a link is a route or not. File extensions are not routes and should not be pre-fetched.
         if (isMatching && !isFileUrl) {
-            return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", title: value.title, target: value.target, className: value.class }, rest, { locale: false, ref: ref }, (process.env.TEST
+            return (React.createElement(NextLink, Object.assign({ href: { pathname: href, query: querystring, hash: anchor }, key: "link", title: value.title, target: value.target, className: value.class }, rest, { 
+                // locale prop is supported only in Pages Router
+                locale: pageRouter ? false : undefined, ref: ref }, (process.env.TEST
                 ? {
                     'data-nextjs-link': true,
                     'data-nextjs-prefetch': props.prefetch,
+                    'data-nextjs-locale': pageRouter ? false : undefined,
                 }
                 : {})),
                 text,

package/dist/esm/initialization/proxy/analytics-adapter.js

@@ -1,5 +1,4 @@
-import { COOKIE_NAME_PREFIX, fetchClientIdFromEdgeProxy, getDefaultCookieAttributes, } from '@sitecore-content-sdk/analytics-core/internal';
-import { getAnalyticsPlugin, } from '@sitecore-content-sdk/analytics-core/internal';
+import { COOKIE_NAME_PREFIX, fetchClientIdFromEdgeProxy, getBotCookieServerSide, getDefaultCookieAttributes, getAnalyticsPlugin, isBot, } from '@sitecore-content-sdk/analytics-core/internal';
 import { getCoreContext } from '@sitecore-content-sdk/core';
 /**
  * Creates a proxy-based analytics adapter that reads and writes the visitor ID
@@ -13,6 +12,10 @@ import { getCoreContext } from '@sitecore-content-sdk/core';
 export function analyticsProxyAdapter(request, response) {
     return {
         type: 'proxy',
+        isBot: () => {
+            const botCookie = getBotCookieServerSide(request.cookies.toString());
+            return !!botCookie || isBot(request.headers.get('user-agent'));
+        },
         getClientId: () => {
             return getClientId(request);
         },

package/dist/esm/proxy/bot-tracking-proxy.js

@@ -0,0 +1,120 @@
+import { initContentSdk } from '@sitecore-content-sdk/core';
+import { analyticsPlugin } from '@sitecore-content-sdk/analytics-core';
+import { eventsPlugin, botPageView } from '@sitecore-content-sdk/events';
+import { isBot, BOT_DETECTION_COOKIE } from '@sitecore-content-sdk/analytics-core/internal';
+import { ProxyBase } from './proxy';
+import debug from '../debug';
+import { analyticsProxyAdapter } from '../initialization/proxy/analytics-adapter';
+/**
+ * Next.js proxy that runs bot detection once per request and sets the bot cookie.
+ * Run first in the proxy chain to ensure that the bot cookie is set before other proxies run.
+ * @public
+ */
+export class BotTrackingProxy extends ProxyBase {
+    constructor(config) {
+        super(config);
+        this.config = config;
+        this.handle = async (req, res) => {
+            try {
+                const isDisabled = (this.config.skip && this.config.skip(req, res)) || false;
+                debug.common('bot tracking proxy start: %o', {
+                    pathname: req.nextUrl.pathname,
+                    headers: this.extractDebugHeaders(req.headers),
+                });
+                if (isDisabled) {
+                    debug.common('bot tracking proxy skipped (disabled)');
+                    return res;
+                }
+                if (this.isPreview(req)) {
+                    debug.common('bot tracking proxy skipped (preview)');
+                    return res;
+                }
+                if (this.shouldSkipForLocalEnvironment(req)) {
+                    debug.common('bot tracking proxy skipped (local environment)');
+                    return res;
+                }
+                const userAgent = req.headers.get('user-agent');
+                if (!userAgent) {
+                    debug.common('bot tracking proxy skipped (no user-agent)');
+                    return res;
+                }
+                if (!isBot(userAgent)) {
+                    debug.common('bot tracking proxy skipped (not a bot)');
+                    return res;
+                }
+                if (this.isPrefetch(req)) {
+                    debug.common('bot tracking proxy skipped (prefetch)');
+                    return res;
+                }
+                const site = this.getSite(req, res);
+                const language = this.getLanguage(req, res);
+                const botTracking = async () => {
+                    await initContentSdk({
+                        config: {
+                            contextId: this.config.contextId,
+                            edgeUrl: this.config.edgeUrl,
+                            siteName: site.name,
+                        },
+                        plugins: [
+                            analyticsPlugin({
+                                options: {
+                                    enableCookie: false,
+                                },
+                                adapter: analyticsProxyAdapter(req, res),
+                            }),
+                            eventsPlugin(),
+                        ],
+                    });
+                    await botPageView({
+                        page: req.nextUrl.pathname,
+                        language: language,
+                        userAgent,
+                    });
+                };
+                res.cookies.set(BOT_DETECTION_COOKIE, '1', {
+                    secure: true,
+                    sameSite: 'lax',
+                    path: '/',
+                });
+                debug.common('bot tracking proxy (visitor is a bot)');
+                if (this.config.fetchEvent) {
+                    this.config.fetchEvent.waitUntil(botTracking());
+                }
+                else {
+                    await botTracking();
+                }
+                debug.common('bot tracking proxy end: %o', {
+                    pathname: req.nextUrl.pathname,
+                    cookies: res.cookies,
+                });
+                return res;
+            }
+            catch (error) {
+                debug.common('bot tracking proxy error: %o', error);
+                return res;
+            }
+        };
+    }
+    /**
+     * @param {NextRequest} req - Incoming request
+     * @returns True when bot tracking should be skipped for a local / dev environment.
+     * @internal
+     */
+    shouldSkipForLocalEnvironment(req) {
+        // Allow bot tracking in local environment for development purposes
+        if (process.env.SITECORE_ENABLE_BOT_TRACKING === 'true') {
+            return false;
+        }
+        if (process.env.NODE_ENV === 'development') {
+            return true;
+        }
+        const hostName = (this.getHostHeader(req) ||
+            req.nextUrl.hostname ||
+            this.defaultHostname ||
+            '').toLowerCase();
+        return (hostName === 'localhost' ||
+            hostName === '127.0.0.1' ||
+            hostName === '::1' ||
+            hostName === '[::1]');
+    }
+}

package/dist/esm/proxy/index.js

@@ -5,5 +5,6 @@ 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 { BotTrackingProxy } from './bot-tracking-proxy';
 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/proxy/personalize-proxy.js

@@ -1,11 +1,12 @@
 import { PersonalizeService, getPersonalizedRewrite, CdpHelper, DEFAULT_VARIANT, } from '@sitecore-content-sdk/content/personalize';
-import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
+import { BOT_DETECTION_COOKIE } from '@sitecore-content-sdk/analytics-core/internal';
 import { initContentSdk } from '@sitecore-content-sdk/core';
 import { personalize } from '@sitecore-content-sdk/personalize';
-import debug from '../debug';
 import { analyticsPlugin } from '@sitecore-content-sdk/analytics-core';
-import { analyticsProxyAdapter } from '../initialization/proxy/analytics-adapter';
 import { personalizeServerPlugin } from '@sitecore-content-sdk/personalize';
+import { analyticsProxyAdapter } from '../initialization/proxy/analytics-adapter';
+import { ProxyBase, REWRITE_HEADER_NAME } from './proxy';
+import debug from '../debug';
 import { personalizeProxyAdapter } from '../initialization/proxy/personalize-adapter';
 /**
  * Proxy / handler to support Sitecore Personalize
@@ -20,11 +21,13 @@ export class PersonalizeProxy extends ProxyBase {
         super(config);
         this.config = config;
         this.handle = async (req, res) => {
+            var _a, _b;
             if (!this.config.enabled) {
                 debug.personalize('skipped (personalize proxy is disabled globally)');
                 return res;
             }
             try {
+                const skipForBot = (_a = this.config.skipForBot) !== null && _a !== void 0 ? _a : true;
                 const pathname = req.nextUrl.pathname;
                 const language = this.getLanguage(req, res);
                 const hostname = this.getHostHeader(req) || this.defaultHostname;
@@ -46,6 +49,10 @@ export class PersonalizeProxy extends ProxyBase {
                     debug.personalize('skipped (%s)', res.redirected ? 'redirected' : 'preview');
                     return res;
                 }
+                if (skipForBot && ((_b = req.cookies.get(BOT_DETECTION_COOKIE)) === null || _b === void 0 ? void 0 : _b.value)) {
+                    debug.personalize('skipped (bot request)');
+                    return res;
+                }
                 const site = this.getSite(req, res);
                 // Get personalization info from Experience Edge
                 // personalizeService is guaranteed to be non-null here because disabled() check passed

package/dist/esm/proxy/proxy.js

@@ -10,6 +10,37 @@ export const LOCALE_HEADER_NAME = 'x-sc-locale';
  */
 export class ProxyHandler {
 }
+/**
+ * Hostname from a `Host` or `x-forwarded-host` value, without port.
+ * - `[::1]:3000` → `::1`
+ * - `127.0.0.1:3000` → `127.0.0.1`
+ * - `example.com:443` → `example.com`
+ * - `::1` → `::1` (does not treat `:1` as a port)
+ * @param {string} host - Raw header value
+ */
+function getHostnameFromHostHeader(host) {
+    const trimmed = host.trim();
+    // Bracketed IPv6: "[...]:port" or "[...]"
+    if (trimmed.startsWith('[')) {
+        const end = trimmed.indexOf(']');
+        if (end !== -1) {
+            return trimmed.slice(1, end).toLowerCase();
+        }
+    }
+    // Unbracketed IPv6 (e.g. ::1, 2001:db8::1) — never strip on last ":digits"
+    if (trimmed.includes('::')) {
+        return trimmed.toLowerCase();
+    }
+    // IPv4 or DNS name with ":port" (port = decimal digits only)
+    const lastColon = trimmed.lastIndexOf(':');
+    if (lastColon > 0) {
+        const after = trimmed.slice(lastColon + 1);
+        if (/^\d+$/.test(after)) {
+            return trimmed.slice(0, lastColon).toLowerCase();
+        }
+    }
+    return trimmed.toLowerCase();
+}
 /**
  * Base proxy class with common methods
  * @public
@@ -106,8 +137,7 @@ export class ProxyBase extends ProxyHandler {
      * @param {NextRequest} req request
      */
     getHostHeader(req) {
-        var _a;
-        return req.headers.get('x-forwarded-host') || ((_a = req.headers.get('host')) === null || _a === void 0 ? void 0 : _a.split(':')[0]);
+        return getHostnameFromHostHeader(req.headers.get('x-forwarded-host') || req.headers.get('host') || '');
     }
     /**
      * Get site information. If site name is stored in cookie, use it, otherwise resolve by hostname

package/dist/esm/proxy/redirects-proxy.js

@@ -59,7 +59,7 @@ export class RedirectsProxy extends ProxyBase {
                 }
                 site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
-                const existsRedirect = await this.getExistsRedirect(req, site.name);
+                const existsRedirect = await this.getExistsRedirect(req, site.name, language);
                 if (!existsRedirect) {
                     debug.redirects('skipped (redirect does not exist)');
                     return res;
@@ -196,19 +196,38 @@ export class RedirectsProxy extends ProxyBase {
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
-    async getExistsRedirect(req, siteName) {
+    async getExistsRedirect(req, siteName, requestLocale) {
         if (!this.redirectsService) {
             return undefined;
         }
         const { pathname: incomingURL, search: incomingQS = '' } = this.normalizeUrl(req.nextUrl.clone());
-        const locale = this.getLanguage(req);
         const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
         const redirects = await this.redirectsService.fetchRedirects(siteName);
-        const modifyRedirects = structuredClone(redirects);
+        // using locale of current request (from URL, headers or otherwise), used to match versioned redirect rules
+        const matchedLocaleRedirect = this.matchRedirectItemRedirect(redirects, requestLocale, normalizedPath);
+        if (matchedLocaleRedirect) {
+            return matchedLocaleRedirect;
+        }
+        // locale of the url - if present in the url, used for redirect map matching
+        const urlLocale = req.nextUrl.locale;
+        return this.matchFromRedirectMapRedirect(redirects, urlLocale, incomingURL, incomingQS);
+    }
+    /**
+     * Matches redirect-map rules without a `locale` field against the incoming URL (static or regex patterns).
+     * @param {RedirectResult[]} redirects All redirects from the service (non-locale entries are filtered inside).
+     * @param {string} urlLocale Locale segment from the request URL (`nextUrl.locale`).
+     * @param {string} incomingURL Original pathname used for regex tests.
+     * @param {string} incomingQS Query string including leading `?` if present.
+     * @returns {RedirectResult | undefined} First matching redirect or undefined.
+     * @private
+     */
+    matchFromRedirectMapRedirect(redirects, urlLocale, incomingURL, incomingQS) {
+        const nonLocaleRedirects = redirects.filter((redirect) => !redirect.locale);
         let matchedQueryString;
-        const localePath = `/${locale.toLowerCase()}${normalizedPath}`;
-        return modifyRedirects.length
-            ? modifyRedirects.find((redirect) => {
+        const normalizedPath = incomingURL.replace(/\/*$/gi, '').toLowerCase();
+        const localePath = `/${urlLocale.toLowerCase()}${normalizedPath}`;
+        return nonLocaleRedirects.length
+            ? nonLocaleRedirects.find((redirect) => {
                 // process static URL (non-regex) rules
                 if (isRegexOrUrl(redirect.pattern) === 'url') {
                     const urlArray = redirect.pattern.endsWith('/')
@@ -230,14 +249,14 @@ export class RedirectsProxy extends ProxyBase {
                 // process regex rules
                 // Modify the redirect pattern to ignore the language prefix in the path
                 // And escapes non-special "?" characters in a string or regex.
-                redirect.pattern = escapeNonSpecialQuestionMarks('^' + redirect.pattern.replace(new RegExp(`^[^]?/${locale}/`, 'gi'), '') // ensure function thinks input is regex
+                redirect.pattern = escapeNonSpecialQuestionMarks('^' + redirect.pattern.replace(new RegExp(`^[^]?/${urlLocale}/`, 'gi'), '') // ensure function thinks input is regex
                 );
                 // Prepare the redirect pattern as a regular expression, making it more flexible for matching URLs
                 redirect.pattern = `/^\/${redirect.pattern
                     .replace(/^\/|\/$/g, '') // Removes leading and trailing slashes
                     .replace(/^\^\/|\/\$$/g, '') // Removes unnecessary start (^) and end ($) anchors
                     .replace(/^\^|\$$/g, '') // Further cleans up anchors
-                    .replace(/\$\/gi$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
+                    .replace(/\$\/g$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
                 // Redirect pattern matches the full incoming URL with query string present
                 matchedQueryString = [
                     regexParser(redirect.pattern).test(`/${localePath}${incomingQS}`),
@@ -247,9 +266,28 @@ export class RedirectsProxy extends ProxyBase {
                     : undefined;
                 // Save the matched query string (if found) into the redirect object
                 redirect.matchedQueryString = matchedQueryString || '';
-                return (!!(regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${incomingURL}`) ||
+                return (!!(regexParser(redirect.pattern).test(`/${urlLocale}${incomingURL}`) ||
                     regexParser(redirect.pattern).test(incomingURL) ||
-                    matchedQueryString) && (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
+                    matchedQueryString) &&
+                    (redirect.locale ? redirect.locale.toLowerCase() === urlLocale.toLowerCase() : true));
+            })
+            : undefined;
+    }
+    /**
+     * Processes redirect rules from redirect items (language-versioned)
+     * @param {RedirectResult[]} redirects redirect entries from Edge
+     * @param {string} locale current request locale
+     * @param {string} currentPath current request path
+     * @returns {RedirectResult | undefined} matched redirect item redirect result or undefined
+     * @private
+     */
+    matchRedirectItemRedirect(redirects, locale, currentPath) {
+        const nonLocalePath = currentPath.replace(new RegExp(`^\/?${locale}\/`, 'i'), '/');
+        return redirects.length
+            ? redirects.find((redirect) => {
+                const patternPath = redirect.pattern.replace(/\/*$/g, '').toLowerCase();
+                // locale rules are easy and nice
+                return redirect.locale === locale && patternPath === nonLocalePath;
             })
             : undefined;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-content-sdk/nextjs",
-  "version": "2.0.2",
+  "version": "2.1.0-canary.10",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -32,8 +32,8 @@
     "url": "https://github.com/sitecore/content-sdk/issues"
   },
   "devDependencies": {
-    "@sitecore-content-sdk/analytics-core": "^2.0.2",
-    "@sitecore-content-sdk/personalize": "^2.0.2",
+    "@sitecore-content-sdk/analytics-core": "2.1.0-canary.10",
+    "@sitecore-content-sdk/personalize": "2.1.0-canary.10",
     "@stylistic/eslint-plugin": "^5.2.2",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.3.0",
@@ -63,7 +63,7 @@
     "glob": "^11.0.2",
     "jsdom": "^26.1.0",
     "mocha": "^11.2.2",
-    "next": "^16.1.1",
+    "next": "^16.2.0",
     "nock": "14.0.0-beta.7",
     "nyc": "^17.1.0",
     "prettier": "^2.8.0",
@@ -76,10 +76,10 @@
     "typescript": "~5.8.3"
   },
   "peerDependencies": {
-    "@sitecore-content-sdk/analytics-core": "^2.0.2",
-    "@sitecore-content-sdk/events": "^2.0.2",
-    "@sitecore-content-sdk/personalize": "^2.0.2",
-    "next": "^16.1.1",
+    "@sitecore-content-sdk/analytics-core": "^2.1.0-canary.3",
+    "@sitecore-content-sdk/events": "^2.1.0-canary.3",
+    "@sitecore-content-sdk/personalize": "^2.1.0-canary.3",
+    "next": "^16.2.0",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
     "typescript": "^5.4.0"
@@ -91,9 +91,10 @@
   },
   "dependencies": {
     "@babel/parser": "^7.27.2",
-    "@sitecore-content-sdk/content": "^2.0.2",
-    "@sitecore-content-sdk/core": "^2.0.2",
-    "@sitecore-content-sdk/react": "^2.0.2",
+    "@sitecore-content-sdk/content": "2.1.0-canary.10",
+    "@sitecore-content-sdk/core": "2.1.0-canary.10",
+    "@sitecore-content-sdk/events": "2.1.0-canary.10",
+    "@sitecore-content-sdk/react": "2.1.0-canary.10",
     "recast": "^0.23.11",
     "regex-parser": "^2.3.1",
     "sync-disk-cache": "^2.1.0"
@@ -177,7 +178,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "b76e6169344e65141a96238321b74ef92202b436",
+  "gitHead": "f4f6bb8a4ac09e5d721e8a4a361c8ad980997e6c",
   "files": [
     "dist",
     "types",

package/types/components/Link.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/components/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAA0B,MAAM,OAAO,CAAC;AAC/C,OAAiB,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAIL,SAAS,IAAI,cAAc,EAC5B,MAAM,6BAA6B,CAAC;AAErC;;GAEG;AACH,QAAA,MAAM,sBAAsB,uFAQlB,CAAC;AAEX;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG;IACvC;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAOjE;;;GAGG;AACH,eAAO,MAAM,IAAI,kGAiEhB,CAAC"}
+{"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/components/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAA0B,MAAM,OAAO,CAAC;AAC/C,OAAiB,EAAE,SAAS,IAAI,aAAa,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,EAIL,SAAS,IAAI,cAAc,EAC5B,MAAM,6BAA6B,CAAC;AAGrC;;GAEG;AACH,QAAA,MAAM,sBAAsB,uFAQlB,CAAC;AAEX;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG;IACvC;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,OAAO,sBAAsB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AAOjE;;;GAGG;AACH,eAAO,MAAM,IAAI,kGAqEhB,CAAC"}

package/types/initialization/proxy/analytics-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analytics-adapter.d.ts","sourceRoot":"","sources":["../../../src/initialization/proxy/analytics-adapter.ts"],"names":[],"mappings":"AAKA,OAAO,EAEL,gBAAgB,EACjB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD;;;GAGG;AACH,MAAM,WAAW,qBAAsB,SAAQ,gBAAgB;IAC7D;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,YAAY,GACrB,qBAAqB,CA2DvB;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,WAAW,KAAG,MAAM,GAAG,IAI3D,CAAC"}
+{"version":3,"file":"analytics-adapter.d.ts","sourceRoot":"","sources":["../../../src/initialization/proxy/analytics-adapter.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,gBAAgB,EAEjB,MAAM,+CAA+C,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD;;;GAGG;AACH,MAAM,WAAW,qBAAsB,SAAQ,gBAAgB;IAC7D;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;CACf;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,YAAY,GACrB,qBAAqB,CA+DvB;AAED;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GAAI,SAAS,WAAW,KAAG,MAAM,GAAG,IAI3D,CAAC"}