@sitecore-content-sdk/nextjs 2.1.1 → 2.2.0-canary.20260527110239

package/dist/cjs/cache/sitecore-cache-tags.js

@@ -0,0 +1,130 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SITECORE_CONTENT_CACHE_TAG_PREFIX = void 0;
+exports.sanitizeSitecoreCacheTagSegment = sanitizeSitecoreCacheTagSegment;
+exports.normalizeSitecoreItemIdForCacheTag = normalizeSitecoreItemIdForCacheTag;
+exports.buildSitecoreRouteCacheTag = buildSitecoreRouteCacheTag;
+exports.buildSitecoreItemCacheTag = buildSitecoreItemCacheTag;
+exports.buildSitecoreDictionaryCacheTag = buildSitecoreDictionaryCacheTag;
+exports.buildSitecoreDictionaryCacheTagsFromSites = buildSitecoreDictionaryCacheTagsFromSites;
+exports.buildSitecoreItemCacheTagFromRouteData = buildSitecoreItemCacheTagFromRouteData;
+exports.dedupeSitecoreCacheTags = dedupeSitecoreCacheTags;
+/**
+ * Stable cache tag strings for Sitecore content (Next.js `cacheTag`, `unstable_cache` tags, `revalidateTag`).
+ * Tags are deterministic for the same logical inputs so app code and invalidation webhooks stay aligned.
+ * @internal
+ */
+exports.SITECORE_CONTENT_CACHE_TAG_PREFIX = 'sc';
+/**
+ * Sanitizes a single segment for use inside Sitecore cache tags.
+ * Colons are reserved as delimiters; slashes and whitespace are normalized for stable keys.
+ * @param {string} value - Raw segment (site name, locale, path segment, etc.).
+ * @internal
+ */
+function sanitizeSitecoreCacheTagSegment(value) {
+    return value.trim().toLowerCase().replace(/[/:\s]+/g, '_');
+}
+/**
+ * Normalizes a Sitecore item GUID for use in cache tags (lowercase, no braces).
+ * @param {string} itemId - Sitecore item id or GUID string.
+ * @internal
+ */
+function normalizeSitecoreItemIdForCacheTag(itemId) {
+    return itemId.trim().toLowerCase().replace(/[{}]/g, '');
+}
+/**
+ * Tag for a resolved route (site + language + logical path). Use for URL-level invalidation.
+ * @param {BuildSitecoreRouteCacheTagParams} params - Site, locale, and optional path segments.
+ * @internal
+ */
+function buildSitecoreRouteCacheTag(params) {
+    var _a;
+    const site = sanitizeSitecoreCacheTagSegment(params.site);
+    const locale = sanitizeSitecoreCacheTagSegment(params.locale);
+    const segments = ((_a = params.pathSegments) !== null && _a !== void 0 ? _a : []).map((s) => sanitizeSitecoreCacheTagSegment(s));
+    const pathKey = segments.length > 0 ? segments.join('/') : '_';
+    return `${exports.SITECORE_CONTENT_CACHE_TAG_PREFIX}:route:${site}:${locale}:${pathKey}`;
+}
+/**
+ * Tag for a layout/route item (and anything else keyed the same way). Use for item-level invalidation.
+ * @param {BuildSitecoreItemCacheTagParams} params - Item id, locale, and optional published version.
+ * @internal
+ */
+function buildSitecoreItemCacheTag(params) {
+    const id = normalizeSitecoreItemIdForCacheTag(params.itemId);
+    const locale = sanitizeSitecoreCacheTagSegment(params.locale);
+    const ver = params.version !== undefined && Number.isFinite(params.version)
+        ? `v${Math.trunc(params.version)}`
+        : 'latest';
+    return `${exports.SITECORE_CONTENT_CACHE_TAG_PREFIX}:item:${id}:${locale}:${ver}`;
+}
+/**
+ * Tag for dictionary data scoped to site + locale.
+ * @param {BuildSitecoreDictionaryCacheTagParams} params - Site and locale for the dictionary fetch.
+ * @public
+ */
+function buildSitecoreDictionaryCacheTag(params) {
+    const site = sanitizeSitecoreCacheTagSegment(params.site);
+    const locale = sanitizeSitecoreCacheTagSegment(params.locale);
+    return `${exports.SITECORE_CONTENT_CACHE_TAG_PREFIX}:dict:${site}:${locale}`;
+}
+/**
+ * Builds deduplicated dictionary cache tags from a sites list.
+ * @param {BuildSitecoreDictionaryCacheTagsFromSitesParams} params - Sites list and fallback locale.
+ * @internal
+ */
+function buildSitecoreDictionaryCacheTagsFromSites(params) {
+    var _a;
+    const seen = new Set();
+    const out = [];
+    const push = (tag) => {
+        if (!seen.has(tag)) {
+            seen.add(tag);
+            out.push(tag);
+        }
+    };
+    for (const site of params.sites) {
+        const locale = ((_a = site.language) === null || _a === void 0 ? void 0 : _a.trim()) ? site.language : params.baseLocale;
+        push(buildSitecoreDictionaryCacheTag({ site: site.name, locale }));
+    }
+    return out;
+}
+/**
+ * Builds an item cache tag from Sitecore layout route data when `itemId` is present.
+ * Prefers `itemLanguage` from Sitecore when set; otherwise uses `fallbackLocale`.
+ * Accepts the same `RouteData` shape returned by the layout service (e.g. `page.layout.sitecore.route`,
+ * which is `RouteData | null`) or `undefined` when the page did not resolve.
+ * @param {RouteData | null | undefined} route - Route node from layout (item id, language, version).
+ * @param {string} fallbackLocale - Locale used when `route.itemLanguage` is not set.
+ * @returns `null` when `route` is missing or `route.itemId` is not set.
+ * @internal
+ */
+function buildSitecoreItemCacheTagFromRouteData(route, fallbackLocale) {
+    if (!(route === null || route === void 0 ? void 0 : route.itemId)) {
+        return null;
+    }
+    const locale = route.itemLanguage
+        ? sanitizeSitecoreCacheTagSegment(route.itemLanguage)
+        : sanitizeSitecoreCacheTagSegment(fallbackLocale);
+    const id = normalizeSitecoreItemIdForCacheTag(route.itemId);
+    const ver = route.itemVersion !== undefined && Number.isFinite(route.itemVersion)
+        ? `v${Math.trunc(route.itemVersion)}`
+        : 'latest';
+    return `${exports.SITECORE_CONTENT_CACHE_TAG_PREFIX}:item:${id}:${locale}:${ver}`;
+}
+/**
+ * Deduplicates tag strings while preserving first-seen order.
+ * @param {string[]} tags - Tag strings possibly containing duplicates.
+ * @internal
+ */
+function dedupeSitecoreCacheTags(tags) {
+    const seen = new Set();
+    const out = [];
+    for (const t of tags) {
+        if (!seen.has(t)) {
+            seen.add(t);
+            out.push(t);
+        }
+    }
+    return out;
+}

package/dist/cjs/cache/sitecore-edge-webhook-revalidation.js

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractSitecoreEdgeContentId = extractSitecoreEdgeContentId;
+exports.collectSitecoreTagsFromEdgeRevalidateRequestBody = collectSitecoreTagsFromEdgeRevalidateRequestBody;
+const sitecore_cache_tags_1 = require("./sitecore-cache-tags");
+/**
+ * Strips Experience Edge style suffixes from an `identifier` so the value can be used as an item id in cache tags.
+ * Handles `{GUID}`, `{GUID}-media`, `{GUID}-layout` style strings.
+ * @param {string} identifier - Raw identifier from a webhook update row.
+ * @internal
+ */
+function extractSitecoreEdgeContentId(identifier) {
+    if (!identifier || typeof identifier !== 'string') {
+        return '';
+    }
+    const trimmed = identifier.trim();
+    return trimmed.replace(/-(?:media|layout)$/i, '');
+}
+const FULL_TAG_PREFIX = `${sitecore_cache_tags_1.SITECORE_CONTENT_CACHE_TAG_PREFIX}:`;
+/**
+ * @param {string} value - Candidate tag string from a webhook body.
+ * @returns True when `value` is already a full `sc:` content cache tag.
+ */
+function isFullSitecoreContentCacheTag(value) {
+    return value.startsWith(FULL_TAG_PREFIX);
+}
+/**
+ * Maps an Experience Edge webhook JSON body to Content SDK cache tag strings used by
+ * {@link collectSitecorePageCacheTags} / {@link buildSitecoreItemCacheTag} (`sc:item:...`), so
+ * `revalidateTag` matches tags registered during cached reads.
+ * **`updates`** rows resolve to **`sc:item:…`** (locale from `entity_culture` or `defaultLocale`). **`tags`**: full `sc:` strings pass through; bare ids become **`sc:item:…`** with `defaultLocale`. Route/variant tags are not inferred.
+ * @param {SitecoreEdgeRevalidateRequestBody | null | undefined} body - Webhook JSON body (tags and/or updates).
+ * @param {CollectSitecoreTagsFromEdgeBodyOptions} options - Default locale when culture is missing on an update or bare tag.
+ * @internal
+ */
+function collectSitecoreTagsFromEdgeRevalidateRequestBody(body, options) {
+    var _a, _b, _c, _d;
+    const { defaultLocale } = options;
+    const out = [];
+    for (const raw of (_a = body === null || body === void 0 ? void 0 : body.tags) !== null && _a !== void 0 ? _a : []) {
+        if (typeof raw !== 'string') {
+            continue;
+        }
+        const s = raw.trim();
+        if (!s) {
+            continue;
+        }
+        if (isFullSitecoreContentCacheTag(s)) {
+            out.push(s);
+        }
+        else {
+            const id = extractSitecoreEdgeContentId(s);
+            if (id) {
+                out.push((0, sitecore_cache_tags_1.buildSitecoreItemCacheTag)({ itemId: id, locale: defaultLocale }));
+            }
+        }
+    }
+    for (const u of (_b = body === null || body === void 0 ? void 0 : body.updates) !== null && _b !== void 0 ? _b : []) {
+        const id = extractSitecoreEdgeContentId((_c = u === null || u === void 0 ? void 0 : u.identifier) !== null && _c !== void 0 ? _c : '');
+        if (!id) {
+            continue;
+        }
+        const locale = ((_d = u === null || u === void 0 ? void 0 : u.entity_culture) === null || _d === void 0 ? void 0 : _d.trim()) || defaultLocale;
+        out.push((0, sitecore_cache_tags_1.buildSitecoreItemCacheTag)({ itemId: id, locale }));
+    }
+    return (0, sitecore_cache_tags_1.dedupeSitecoreCacheTags)(out).filter(Boolean);
+}

package/dist/cjs/cache/sitecore-page-cache-tags.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.collectSitecorePageCacheTags = collectSitecorePageCacheTags;
+const personalize_1 = require("@sitecore-content-sdk/content/personalize");
+const sitecore_cache_tags_1 = require("./sitecore-cache-tags");
+/** @param {string} pathname - Raw pathname (may omit leading slash). */
+function normalizePathname(pathname) {
+    const trimmed = pathname.trim() || '/';
+    return trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
+}
+/**
+ * Trims leading and trailing `/` from a single path segment without regex (linear time; avoids ReDoS flags on path-derived input).
+ * @param {string} part - One App Router catch-all path segment.
+ */
+function trimSlashes(part) {
+    let start = 0;
+    let end = part.length;
+    while (start < end && part[start] === '/') {
+        start++;
+    }
+    while (end > start && part[end - 1] === '/') {
+        end--;
+    }
+    return part.slice(start, end);
+}
+/**
+ * Normalizes App Router catch-all `path` segments the same way as `SitecoreClient.parsePath` for a
+ * string array (leading slash, trim segments, drop empty `/` parts).
+ * @param {string[]} path - App Router catch-all segments.
+ */
+function personalizedPathnameFromPathSegments(path) {
+    if (path.length === 0) {
+        return '/';
+    }
+    return `/${path
+        .filter((part) => part !== '/')
+        .map((part) => trimSlashes(part))
+        .join('/')}`;
+}
+/**
+ * Route segments after removing personalization rewrite markers, for stable route-level tags.
+ * @param {string} personalizedPathname - Pathname that may include personalization rewrite segments.
+ */
+function routeSegmentsFromPersonalizedPathname(personalizedPathname) {
+    const pathname = normalizePathname(personalizedPathname);
+    const n = (0, personalize_1.normalizePersonalizedRewrite)(pathname);
+    if (!n || n === '/') {
+        return [];
+    }
+    const noLead = n.startsWith('/') ? n.slice(1) : n;
+    return noLead.split('/').filter(Boolean);
+}
+/**
+ * Builds cache tags for a Sitecore page read (`getPage`): the route tag and the route's item tag.
+ * Dictionary data is not part of `getPage`; tag dictionary fetches separately (for example with
+ * `buildSitecoreDictionaryCacheTag` on a dedicated `use cache` helper).
+ *
+ * Registers **`sc:route:…`** and **`sc:item:…`** (when layout has `itemId`). Edge-style webhooks emit
+ * item ids, which the Sitecore revalidate route handler maps to **`sc:item:…`**; route tags are only
+ * invalidated when callers send the full `sc:route:…` strings in the `tags[]` array of the same revalidate request.
+ *
+ * Personalization variants are isolated naturally by URL path (each variant rewrite yields a distinct
+ * Cache Components key) so no `sc:pvv:…` tag is added here. If a personalize-specific webhook is wired
+ * up later, build that tag in the dedicated helper and add it on top of these.
+ * @param {CollectSitecorePageCacheTagsParams} params - Site, locale, path or personalized pathname, and route metadata.
+ * @public
+ */
+function collectSitecorePageCacheTags(params) {
+    var _a, _b;
+    const pathnameInput = params.personalizedPathname !== undefined
+        ? params.personalizedPathname
+        : personalizedPathnameFromPathSegments((_a = params.path) !== null && _a !== void 0 ? _a : []);
+    const pathname = normalizePathname(pathnameInput);
+    const pathSegments = routeSegmentsFromPersonalizedPathname(pathname);
+    return (0, sitecore_cache_tags_1.dedupeSitecoreCacheTags)([
+        (0, sitecore_cache_tags_1.buildSitecoreRouteCacheTag)({
+            site: params.site,
+            locale: params.locale,
+            pathSegments,
+        }),
+        (_b = (0, sitecore_cache_tags_1.buildSitecoreItemCacheTagFromRouteData)(params.route, params.locale)) !== null && _b !== void 0 ? _b : '',
+    ]).filter(Boolean);
+}

package/dist/cjs/debug.js

@@ -7,5 +7,5 @@ const search_1 = require("@sitecore-content-sdk/react/search");
  * Unified debug object containing all debug namespaces from referenced content-sdk packages.
  * @public
  */
-const debug = Object.assign(Object.assign(Object.assign({}, core_1.debug), content_1.debug), { search: search_1.debug });
+const debug = Object.assign(Object.assign(Object.assign({}, core_1.debug), content_1.debug), { search: search_1.debug, revalidate: (0, core_1.debugModule)(`${core_1.debugNamespace}:revalidate`) });
 exports.default = debug;

package/dist/cjs/editing/utils.js

@@ -133,15 +133,9 @@ exports.getPreviewCookies = getPreviewCookies;
  * @returns {string[]} list of required parameters for validation
  */
 const getRequiredEditingParamsList = (mode) => {
-    const editingRequiredParams = ['sc_site', 'sc_itemid', 'sc_lang', 'route', 'mode'];
-    const componentRequiredParams = [
-        'sc_site',
-        'sc_itemid',
-        'sc_renderingId',
-        'sc_uid',
-        'sc_lang',
-        'mode',
-    ];
+    const baseRequiredParams = ['sc_site', 'sc_itemid', 'sc_lang'];
+    const editingRequiredParams = [...baseRequiredParams, 'route', 'mode'];
+    const componentRequiredParams = [...baseRequiredParams, 'sc_uid', 'mode'];
     return (0, editing_1.isDesignLibraryMode)(mode) ? componentRequiredParams : editingRequiredParams;
 };
 exports.getRequiredEditingParamsList = getRequiredEditingParamsList;
@@ -212,7 +206,9 @@ const getEditingRequestHtml = async (requestUrl, propagatedQsParams, propagatedH
         // We need to handle not found error provided by Vercel
         // for `fallback: false` pages
         // Or preview content is not found or access is denied
-        if (err.response.status === 404 || err.response.status === 403) {
+        if (err.response.status === 404 ||
+            err.response.status === 403 ||
+            err.response.status === 500) {
             return err.response;
         }
         throw err;

package/dist/cjs/index.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BYOCWrapper = exports.FEaaSWrapper = exports.BYOCServerWrapper = exports.BYOCClientWrapper = exports.FEaaSServerWrapper = exports.FEaaSClientWrapper = exports.NextImage = exports.Placeholder = exports.RichText = exports.Link = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.ComponentPropsService = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.SiteInfoService = exports.SiteResolver = exports.RobotsService = exports.ErrorPagesService = exports.SitemapXmlService = exports.REDIRECT_TYPE_SERVER_TRANSFER = exports.REDIRECT_TYPE_302 = exports.REDIRECT_TYPE_301 = exports.RedirectsService = exports.SitePathService = exports.PersonalizeService = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getGroomedVariantIds = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.DictionaryService = exports.mediaApi = exports.ComponentLayoutService = exports.ErrorPage = exports.RenderingType = exports.EditMode = exports.getContentStylesheetLink = exports.getFieldValue = exports.getChildPlaceholder = exports.LayoutService = exports.LayoutServicePageState = exports.MemoryCacheClient = exports.enableDebug = exports.NativeDataFetcher = exports.constants = exports.debug = void 0;
-exports.setCachedPageParams = exports.getCachedPageParams = exports.DesignLibraryApp = exports.analyticsProxyAdapter = exports.personalizeProxyAdapter = exports.initContentSdk = exports.renderEmptyPlaceholder = exports.AppPlaceholder = exports.ClientEditingChromesUpdate = exports.Form = exports.EditingScripts = exports.withEmptyFieldEditingComponent = exports.withFieldMetadata = exports.withDatasourceCheck = exports.withPlaceholder = exports.withAppPlaceholder = exports.withEditorChromes = exports.useSitecore = exports.withSitecore = exports.SitecoreProviderReactContext = exports.SitecoreProvider = exports.DefaultEmptyFieldEditingComponentText = exports.DefaultEmptyFieldEditingComponentImage = exports.DesignLibrary = exports.File = exports.getDesignLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.DateField = exports.Text = exports.Image = void 0;
+exports.collectSitecorePageCacheTags = exports.buildSitecoreDictionaryCacheTag = exports.setCachedPageParams = exports.getCachedPageParams = exports.DesignLibraryApp = exports.analyticsProxyAdapter = exports.personalizeProxyAdapter = exports.initContentSdk = exports.renderEmptyPlaceholder = exports.AppPlaceholder = exports.ClientEditingChromesUpdate = exports.Form = exports.EditingScripts = exports.withEmptyFieldEditingComponent = exports.withFieldMetadata = exports.withDatasourceCheck = exports.withPlaceholder = exports.withAppPlaceholder = exports.withEditorChromes = exports.useSitecore = exports.withSitecore = exports.SitecoreProviderReactContext = exports.SitecoreProvider = exports.DefaultEmptyFieldEditingComponentText = exports.DefaultEmptyFieldEditingComponentImage = exports.DesignLibrary = exports.File = exports.getDesignLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.DateField = exports.Text = exports.Image = void 0;
 var debug_1 = require("./debug");
 Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return __importDefault(debug_1).default; } });
 var core_1 = require("@sitecore-content-sdk/core");
@@ -146,3 +146,11 @@ Object.defineProperty(exports, "DesignLibraryApp", { enumerable: true, get: func
 var page_params_1 = require("./cache/page-params");
 Object.defineProperty(exports, "getCachedPageParams", { enumerable: true, get: function () { return page_params_1.getCachedPageParams; } });
 Object.defineProperty(exports, "setCachedPageParams", { enumerable: true, get: function () { return page_params_1.setCachedPageParams; } });
+// Sitecore cache-tag public surface. Kept intentionally small: the cache helpers in the template
+// (`getSitecorePage`, `getSitecoreErrorPage`, `getSitecoreDictionary`) and the `createSitecoreRevalidateRouteHandler`
+// already cover the end-to-end Sitecore tag flow. Lower-level tag builders and webhook-body parsers remain
+// internal so callers don't hand-build Sitecore cache tag strings or duplicate the route handler's logic.
+var sitecore_cache_tags_1 = require("./cache/sitecore-cache-tags");
+Object.defineProperty(exports, "buildSitecoreDictionaryCacheTag", { enumerable: true, get: function () { return sitecore_cache_tags_1.buildSitecoreDictionaryCacheTag; } });
+var sitecore_page_cache_tags_1 = require("./cache/sitecore-page-cache-tags");
+Object.defineProperty(exports, "collectSitecorePageCacheTags", { enumerable: true, get: function () { return sitecore_page_cache_tags_1.collectSitecorePageCacheTags; } });

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

@@ -7,7 +7,6 @@ exports.RedirectsProxy = void 0;
 const site_1 = require("@sitecore-content-sdk/content/site");
 const tools_1 = require("@sitecore-content-sdk/core/tools");
 const server_1 = require("next/server");
-const regex_parser_1 = __importDefault(require("regex-parser"));
 const proxy_1 = require("./proxy");
 const debug_1 = __importDefault(require("../debug"));
 const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
@@ -126,9 +125,9 @@ class RedirectsProxy extends proxy_1.ProxyBase {
                 existsRedirect.target = existsRedirect.target.replace(REGEXP_CONTEXT_SITE_LANG, site.language);
                 const reqUrl = this.normalizeUrl(req.nextUrl.clone());
                 // Apply regex replacements to the target URL if the pattern is a regex
-                const matched = reqUrl.pathname
-                    .replace(/\/*$/gi, '')
-                    .match((0, regex_parser_1.default)(existsRedirect.pattern));
+                const sourcePath = existsRedirect.matchedPath || reqUrl.pathname;
+                const pathForCaptureMatch = sourcePath.replace(/\/*$/gi, '') || '/';
+                const matched = pathForCaptureMatch.match(this.getRedirectPatternRegex(existsRedirect.pattern));
                 if (matched) {
                     existsRedirect.target = existsRedirect.target.replace(/\$(\d+)/g, (_, index) => {
                         return matched[parseInt(index, 10)] || '';
@@ -199,6 +198,7 @@ class RedirectsProxy extends proxy_1.ProxyBase {
      * Method returns RedirectInfo when matches
      * @param {NextRequest} req request
      * @param {string} siteName site name
+     * @param {string} requestLocale locale used for locale redirect matching
      * @returns Promise<RedirectInfo | undefined>
      * @private
      */
@@ -253,28 +253,28 @@ class RedirectsProxy extends proxy_1.ProxyBase {
                             (0, tools_1.areURLSearchParamsEqual)(new URLSearchParams(patternQS), new URLSearchParams(incomingQS))));
                 }
                 // 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(`^[^]?/${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(/\$\/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}`),
-                    (0, regex_parser_1.default)(redirect.pattern).test(`${normalizedPath}${incomingQS}`),
-                ].some(Boolean)
-                    ? incomingQS
+                const regex = this.getRedirectPatternRegex(redirect.pattern);
+                const testRegex = (value) => {
+                    regex.lastIndex = 0;
+                    return regex.test(value);
+                };
+                const localeStrippedIncoming = this.getLocaleStrippedPath(incomingURL, urlLocale);
+                const localeStrippedNormalized = this.getLocaleStrippedPath(normalizedPath, urlLocale);
+                const pathCandidates = [
+                    incomingURL,
+                    normalizedPath,
+                    localeStrippedIncoming,
+                    localeStrippedNormalized,
+                ].filter((candidate, index, array) => array.indexOf(candidate) === index);
+                const matchedPath = pathCandidates.find((candidate) => testRegex(candidate));
+                const matchedPathWithQuery = incomingQS
+                    ? pathCandidates.find((candidate) => testRegex(`${candidate}${incomingQS}`))
                     : undefined;
+                matchedQueryString = matchedPathWithQuery ? incomingQS : undefined;
                 // Save the matched query string (if found) into the redirect object
                 redirect.matchedQueryString = matchedQueryString || '';
-                return (!!((0, regex_parser_1.default)(redirect.pattern).test(`/${urlLocale}${incomingURL}`) ||
-                    (0, regex_parser_1.default)(redirect.pattern).test(incomingURL) ||
-                    matchedQueryString) &&
+                redirect.matchedPath = matchedPath || matchedPathWithQuery || '';
+                return (!!(matchedPath || matchedQueryString) &&
                     (redirect.locale ? redirect.locale.toLowerCase() === urlLocale.toLowerCase() : true));
             })
             : undefined;
@@ -420,5 +420,37 @@ class RedirectsProxy extends proxy_1.ProxyBase {
         }
         return redirect;
     }
+    /**
+     * Converts a redirect pattern string into a RegExp.
+     * Supports both JS literal form (`/pattern/i`) and plain regex source (`^/path$`).
+     * @param {string} pattern redirect pattern from redirect map
+     * @returns {RegExp} normalized regex instance
+     * @private
+     */
+    getRedirectPatternRegex(pattern) {
+        const normalizedPattern = (0, tools_1.escapeNonSpecialQuestionMarks)(pattern);
+        const literalMatch = normalizedPattern.match(/^\/(.+)\/([a-z]*)$/i);
+        if (literalMatch) {
+            const [, source, flags] = literalMatch;
+            const safeFlags = flags || 'i';
+            return new RegExp(source, safeFlags);
+        }
+        return new RegExp(normalizedPattern, 'i');
+    }
+    /**
+     * Strips locale prefix from path when present.
+     * @param {string} path incoming request path
+     * @param {string} urlLocale locale from Next.js URL
+     * @returns {string} locale-stripped path
+     * @private
+     */
+    getLocaleStrippedPath(path, urlLocale) {
+        if (!urlLocale) {
+            return path;
+        }
+        const localePrefixRegex = new RegExp(`^/${urlLocale}(?=/|$)`, 'i');
+        const strippedPath = path.replace(localePrefixRegex, '') || '/';
+        return strippedPath.startsWith('/') ? strippedPath : `/${strippedPath}`;
+    }
 }
 exports.RedirectsProxy = RedirectsProxy;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createEditingRenderRouteHandlers = exports.createEditingConfigRouteHandler = exports.createRobotsRouteHandler = exports.createSitemapRouteHandler = void 0;
+exports.createSitecoreRevalidateRouteHandler = exports.createEditingRenderRouteHandlers = exports.createEditingConfigRouteHandler = exports.createRobotsRouteHandler = exports.createSitemapRouteHandler = void 0;
 var sitemap_route_handler_1 = require("./sitemap-route-handler");
 Object.defineProperty(exports, "createSitemapRouteHandler", { enumerable: true, get: function () { return sitemap_route_handler_1.createSitemapRouteHandler; } });
 var robots_route_handler_1 = require("./robots-route-handler");
@@ -9,3 +9,5 @@ var editing_config_route_handler_1 = require("./editing-config-route-handler");
 Object.defineProperty(exports, "createEditingConfigRouteHandler", { enumerable: true, get: function () { return editing_config_route_handler_1.createEditingConfigRouteHandler; } });
 var editing_render_route_handler_1 = require("./editing-render-route-handler");
 Object.defineProperty(exports, "createEditingRenderRouteHandlers", { enumerable: true, get: function () { return editing_render_route_handler_1.createEditingRenderRouteHandlers; } });
+var sitecore_revalidate_route_handler_1 = require("./sitecore-revalidate-route-handler");
+Object.defineProperty(exports, "createSitecoreRevalidateRouteHandler", { enumerable: true, get: function () { return sitecore_revalidate_route_handler_1.createSitecoreRevalidateRouteHandler; } });

package/dist/cjs/route-handler/sitecore-revalidate-route-handler.js

@@ -0,0 +1,124 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createSitecoreRevalidateRouteHandler = createSitecoreRevalidateRouteHandler;
+const sitecore_edge_webhook_revalidation_1 = require("../cache/sitecore-edge-webhook-revalidation");
+const sitecore_cache_tags_1 = require("../cache/sitecore-cache-tags");
+const debug_1 = __importDefault(require("../debug"));
+const cache_1 = require("next/cache");
+const server_1 = require("next/server");
+const DEFAULT_SECRET_ENV_VAR = 'SITECORE_REVALIDATE_SECRET';
+const DEFAULT_SECRET_HEADER = 'x-revalidate-secret';
+/**
+ * Returns a non-empty trimmed secret, or `undefined` when unset or whitespace-only.
+ * @param {string | undefined} secretOption - Explicit secret from handler options.
+ * @param {string | undefined} envValue - Secret from `process.env` (e.g. `SITECORE_REVALIDATE_SECRET`).
+ */
+function resolveConfiguredRevalidateSecret(secretOption, envValue) {
+    const raw = secretOption !== undefined ? secretOption : envValue;
+    const trimmed = raw === null || raw === void 0 ? void 0 : raw.trim();
+    return trimmed || undefined;
+}
+/**
+ * Creates a single `POST` handler for `/api/revalidate` that consumes Sitecore Experience Edge / Content
+ * Operations webhook bodies (and equivalent ad-hoc calls that reuse the same body shape).
+ *
+ * The body is expected to be a JSON object that resolves to at least one Sitecore cache tag:
+ *
+ * - **`updates[]`** — Sitecore publish-event rows. Each row's `identifier` (with `-media` / `-layout`
+ *   suffix stripped) maps to an `sc:item:<id>:<locale>:latest` tag, using `entity_culture` for locale
+ *   (falling back to the handler's `defaultLocale`).
+ * - **`tags[]`** — pass-through and convenience array:
+ *   - Strings already starting with `sc:` are used verbatim (e.g. `sc:route:...`, `sc:item:...`, `sc:dict:...`).
+ *   - Bare values are treated as Sitecore item ids and mapped to `sc:item:<id>:<defaultLocale>:latest`.
+ *
+ * When **`sites`** is configured, the handler also appends one `sc:dict:<site>:<locale>` tag per
+ * site so dictionary updates flow through the same call.
+ *
+ * Auth (optional): when `SITECORE_REVALIDATE_SECRET` (or the `secret` option) is non-empty, callers must
+ * send the same value in the **`x-revalidate-secret`** header. When unset or blank, no header is required.
+ * @param {SitecoreRevalidateRouteHandlerOptions} [options] - Optional inline `secret`, `cacheProfile`, locale, sites, and dictionary options.
+ * @public
+ */
+function createSitecoreRevalidateRouteHandler(options = {}) {
+    const { defaultLocale = 'en', sites, secret, cacheProfile = 'max' } = options;
+    const dictionaryTags = sites !== undefined
+        ? (0, sitecore_cache_tags_1.buildSitecoreDictionaryCacheTagsFromSites)({
+            sites,
+            baseLocale: defaultLocale,
+        })
+        : [];
+    const POST = async (req) => {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const startTimestamp = Date.now();
+        try {
+            const configuredSecret = resolveConfiguredRevalidateSecret(secret, process.env[DEFAULT_SECRET_ENV_VAR]);
+            if (configuredSecret) {
+                const providedSecret = req.headers.get(DEFAULT_SECRET_HEADER);
+                if (providedSecret !== configuredSecret) {
+                    debug_1.default.revalidate('sitecore revalidate: unauthorized (secret mismatch or missing header)');
+                    return server_1.NextResponse.json({ error: 'Unauthorized.' }, { status: 401 });
+                }
+            }
+            else {
+                debug_1.default.revalidate('sitecore revalidate: no secret configured, skipping auth');
+            }
+            let body;
+            try {
+                body = await req.json();
+            }
+            catch (_j) {
+                debug_1.default.revalidate('sitecore revalidate: invalid JSON body');
+                return server_1.NextResponse.json({ error: 'Request body must be valid JSON.' }, { status: 400 });
+            }
+            if (typeof body !== 'object' || body === null || Array.isArray(body)) {
+                debug_1.default.revalidate('sitecore revalidate: body must be a JSON object');
+                return server_1.NextResponse.json({ error: 'Request body must be a JSON object.' }, { status: 400 });
+            }
+            const webhookBody = body;
+            debug_1.default.revalidate('sitecore revalidate start: %o', {
+                invocation_id: (_a = webhookBody.invocation_id) !== null && _a !== void 0 ? _a : null,
+                continues: (_b = webhookBody.continues) !== null && _b !== void 0 ? _b : false,
+                updatesCount: (_d = (_c = webhookBody.updates) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0,
+                tagsCount: Array.isArray(webhookBody.tags) ? webhookBody.tags.length : 0,
+                dictionaryTagsCount: dictionaryTags.length,
+                defaultLocale,
+            });
+            const tags = (0, sitecore_cache_tags_1.dedupeSitecoreCacheTags)([
+                ...(0, sitecore_edge_webhook_revalidation_1.collectSitecoreTagsFromEdgeRevalidateRequestBody)(webhookBody, { defaultLocale }),
+                ...dictionaryTags,
+            ]);
+            if (tags.length === 0) {
+                debug_1.default.revalidate('sitecore revalidate: no tags resolved in %dms', Date.now() - startTimestamp);
+                return server_1.NextResponse.json({
+                    error: 'Provide non-empty `updates` (with identifiers) and/or `tags` that resolve to at least one cache tag.',
+                }, { status: 400 });
+            }
+            for (const tag of tags) {
+                (0, cache_1.revalidateTag)(tag, cacheProfile);
+            }
+            debug_1.default.revalidate('sitecore revalidate end in %dms: %o', Date.now() - startTimestamp, {
+                tagsCount: tags.length,
+                invocation_id: (_e = webhookBody.invocation_id) !== null && _e !== void 0 ? _e : null,
+                continues: (_f = webhookBody.continues) !== null && _f !== void 0 ? _f : false,
+            });
+            return server_1.NextResponse.json({
+                revalidated: true,
+                tagsCount: tags.length,
+                invocation_id: (_g = webhookBody.invocation_id) !== null && _g !== void 0 ? _g : null,
+                continues: (_h = webhookBody.continues) !== null && _h !== void 0 ? _h : false,
+            });
+        }
+        catch (error) {
+            if (error instanceof Error && error.digest === 'NEXT_PRERENDER_INTERRUPTED') {
+                throw error;
+            }
+            console.log('Sitecore revalidate route handler failed:');
+            console.log(error);
+            return server_1.NextResponse.json({ error: 'Internal Server Error.' }, { status: 500 });
+        }
+    };
+    return { POST };
+}