@sitecore-jss/sitecore-jss-nextjs 22.4.0-canary.2 → 22.4.0-canary.21

package/dist/cjs/editing/editing-data-service.js

@@ -90,7 +90,7 @@ class ServerlessEditingDataService {
         if (!this.apiRoute.includes('[key]')) {
             throw new Error(`The specified apiRoute '${this.apiRoute}' is missing '[key]'.`);
         }
-        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new sitecore_jss_1.AxiosDataFetcher({ debugger: sitecore_jss_1.debug.editing });
+        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new sitecore_jss_1.NativeDataFetcher({ debugger: sitecore_jss_1.debug.editing });
     }
     /**
      * Stores Sitecore editor payload data for later retrieval by key

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

@@ -52,7 +52,7 @@ class ChromesHandler extends render_middleware_1.RenderMiddlewareBase {
             return `${process.env.VERCEL ? 'https' : 'http'}://${req.headers.host}`;
         };
         this.editingDataService = (_a = config === null || config === void 0 ? void 0 : config.editingDataService) !== null && _a !== void 0 ? _a : editing_data_service_1.editingDataService;
-        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new sitecore_jss_1.AxiosDataFetcher({ debugger: sitecore_jss_1.debug.editing });
+        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new sitecore_jss_1.NativeDataFetcher({ debugger: sitecore_jss_1.debug.editing });
         this.resolvePageUrl = (_c = config === null || config === void 0 ? void 0 : config.resolvePageUrl) !== null && _c !== void 0 ? _c : this.defaultResolvePageUrl;
         this.resolveServerUrl = (_d = config === null || config === void 0 ? void 0 : config.resolveServerUrl) !== null && _d !== void 0 ? _d : this.defaultResolveServerUrl;
     }
@@ -79,7 +79,7 @@ class ChromesHandler extends render_middleware_1.RenderMiddlewareBase {
                 const cookies = res.getHeader('Set-Cookie');
                 headers.cookie = `${headers.cookie ? headers.cookie + ';' : ''}${cookies.join(';')}`;
                 // Make actual render request for page route, passing on preview cookies as well as any approved query string parameters.
-                // Note timestamp effectively disables caching the request in Axios (no amount of cache headers seemed to do it)
+                // Note timestamp effectively disables caching the request (no amount of cache headers seemed to do it)
                 sitecore_jss_1.debug.editing('fetching page route for %s', editingData.path);
                 const requestUrl = new URL(this.resolvePageUrl({ serverUrl, itemPath: editingData.path }));
                 for (const key in params) {
@@ -125,8 +125,7 @@ class ChromesHandler extends render_middleware_1.RenderMiddlewareBase {
             catch (err) {
                 const error = err;
                 console.error(error);
-                if (error.response || error.request) {
-                    // Axios error, which could mean the server or page URL isn't quite right, so provide a more helpful hint
+                if (error.response) {
                     console.info(
                     // eslint-disable-next-line quotes
                     "Hint: for non-standard server or Next.js route configurations, you may need to override the 'resolveServerUrl' or 'resolvePageUrl' available on the 'EditingRenderMiddleware' config.");

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

@@ -28,13 +28,15 @@ class RenderMiddlewareBase {
          * @returns Object of approved headers
          */
         this.getHeadersForPropagation = (headers) => {
-            const result = {};
-            constants_1.EDITING_PASS_THROUGH_HEADERS.forEach((header) => {
-                if (headers[header]) {
-                    result[header] = headers[header];
+            // Filter and normalize headers
+            const filteredHeaders = constants_1.EDITING_PASS_THROUGH_HEADERS.reduce((acc, header) => {
+                const value = headers[header];
+                if (value) {
+                    acc[header] = Array.isArray(value) ? value.join(', ') : value;
                 }
-            });
-            return result;
+                return acc;
+            }, {});
+            return filteredHeaders;
         };
     }
 }

package/dist/cjs/index.js

@@ -23,11 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = exports.Image = exports.ComponentBuilder = exports.BYOCWrapper = exports.FEaaSWrapper = exports.NextImage = exports.Placeholder = exports.RichText = exports.Link = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.GraphQLSiteInfoService = exports.SiteResolver = exports.GraphQLRobotsService = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.MultisiteGraphQLSitemapService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getGroomedVariantIds = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EditMode = exports.getContentStylesheetLink = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.MemoryCacheClient = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.AxiosDataFetcher = exports.constants = void 0;
-exports.EditingScripts = exports.withEmptyFieldEditingComponent = exports.withFieldMetadata = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.DefaultEmptyFieldEditingComponentText = exports.DefaultEmptyFieldEditingComponentImage = exports.File = exports.getComponentLibraryStylesheetLinks = exports.BYOCComponent = exports.fetchFEaaSComponentServerProps = void 0;
+exports.fetchFEaaSComponentServerProps = exports.FEaaSComponent = exports.EditFrame = exports.DateField = exports.Text = exports.Image = exports.ComponentBuilder = exports.BYOCWrapper = exports.FEaaSWrapper = exports.NextImage = exports.Placeholder = exports.RichText = exports.Link = exports.useComponentProps = exports.ComponentPropsContext = exports.ComponentPropsReactContext = exports.normalizeSiteRewrite = exports.getSiteRewriteData = exports.getSiteRewrite = exports.GraphQLSiteInfoService = exports.SiteResolver = exports.GraphQLRobotsService = exports.GraphQLErrorPagesService = exports.GraphQLSitemapXmlService = exports.MultisiteGraphQLSitemapService = exports.GraphQLSitemapService = exports.DisconnectedSitemapService = exports.ComponentPropsService = exports.CdpHelper = exports.normalizePersonalizedRewrite = exports.getGroomedVariantIds = exports.getPersonalizedRewriteData = exports.getPersonalizedRewrite = exports.personalizeLayout = exports.RestDictionaryService = exports.GraphQLDictionaryService = exports.trackingApi = exports.mediaApi = exports.EditMode = exports.getContentStylesheetLink = exports.getFieldValue = exports.getChildPlaceholder = exports.RestLayoutService = exports.GraphQLLayoutService = exports.LayoutServicePageState = exports.MemoryCacheClient = exports.debug = exports.enableDebug = exports.NativeDataFetcher = exports.constants = void 0;
+exports.EditingScripts = exports.withEmptyFieldEditingComponent = exports.withFieldMetadata = exports.withDatasourceCheck = exports.withPlaceholder = exports.withEditorChromes = exports.useSitecoreContext = exports.withSitecoreContext = exports.SitecoreContextReactContext = exports.SitecoreContext = exports.VisitorIdentification = exports.DefaultEmptyFieldEditingComponentText = exports.DefaultEmptyFieldEditingComponentImage = exports.File = exports.getComponentLibraryStylesheetLinks = exports.BYOCComponent = void 0;
 var sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
 Object.defineProperty(exports, "constants", { enumerable: true, get: function () { return sitecore_jss_1.constants; } });
-Object.defineProperty(exports, "AxiosDataFetcher", { enumerable: true, get: function () { return sitecore_jss_1.AxiosDataFetcher; } });
 Object.defineProperty(exports, "NativeDataFetcher", { enumerable: true, get: function () { return sitecore_jss_1.NativeDataFetcher; } });
 Object.defineProperty(exports, "enableDebug", { enumerable: true, get: function () { return sitecore_jss_1.enableDebug; } });
 Object.defineProperty(exports, "debug", { enumerable: true, get: function () { return sitecore_jss_1.debug; } });

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

@@ -45,20 +45,28 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
             });
             const createResponse = () => __awaiter(this, void 0, void 0, function* () {
                 var _a;
+                const response = res || server_1.NextResponse.next();
                 if (this.config.disabled && this.config.disabled(req, res || server_1.NextResponse.next())) {
                     sitecore_jss_1.debug.redirects('skipped (redirects middleware is disabled)');
-                    return res || server_1.NextResponse.next();
+                    return response;
                 }
                 if (this.isPreview(req) || this.excludeRoute(pathname)) {
                     sitecore_jss_1.debug.redirects('skipped (%s)', this.isPreview(req) ? 'preview' : 'route excluded');
-                    return res || server_1.NextResponse.next();
+                    return response;
+                }
+                // Skip prefetch requests from Next.js, which are not original client requests
+                // as they load unnecessary requests that burden the redirects middleware with meaningless traffic
+                if (this.isPrefetch(req)) {
+                    sitecore_jss_1.debug.redirects('skipped (prefetch)');
+                    response.headers.set('x-middleware-cache', 'no-cache');
+                    return response;
                 }
                 site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
                 const existsRedirect = yield this.getExistsRedirect(req, site.name);
                 if (!existsRedirect) {
                     sitecore_jss_1.debug.redirects('skipped (redirect does not exist)');
-                    return res || server_1.NextResponse.next();
+                    return response;
                 }
                 // Find context site language and replace token
                 if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
@@ -72,27 +80,26 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     url.href = existsRedirect.target;
                 }
                 else {
-                    const source = `${url.pathname.replace(/\/*$/gi, '')}${existsRedirect.matchedQueryString}`;
-                    const urlFirstPart = existsRedirect.target.split('/')[1];
+                    const isUrl = (0, utils_1.isRegexOrUrl)(existsRedirect.pattern) === 'url';
+                    const targetParts = existsRedirect.target.split('/');
+                    const urlFirstPart = targetParts[1];
                     if (this.locales.includes(urlFirstPart)) {
                         req.nextUrl.locale = urlFirstPart;
                         existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                     }
-                    const target = source
-                        .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
-                        .replace(/^\/\//, '/')
-                        .split('?');
-                    if (url.search && existsRedirect.isQueryStringPreserved) {
-                        const targetQueryString = (_a = target[1]) !== null && _a !== void 0 ? _a : '';
-                        url.search = '?' + new URLSearchParams(`${url.search}&${targetQueryString}`).toString();
-                    }
-                    else if (target[1]) {
-                        url.search = '?' + target[1];
-                    }
-                    else {
-                        url.search = '';
-                    }
-                    const prepareNewURL = new URL(`${target[0]}${url.search}`, url.origin);
+                    const targetSegments = isUrl
+                        ? existsRedirect.target.split('?')
+                        : url.pathname.replace(/\/*$/gi, '') + existsRedirect.matchedQueryString;
+                    const [targetPath, targetQueryString] = isUrl
+                        ? targetSegments
+                        : targetSegments
+                            .replace((0, regex_parser_1.default)(existsRedirect.pattern), existsRedirect.target)
+                            .replace(/^\/\//, '/')
+                            .split('?');
+                    const mergedQueryString = existsRedirect.isQueryStringPreserved
+                        ? (0, utils_1.mergeURLSearchParams)(new URLSearchParams((_a = url.search) !== null && _a !== void 0 ? _a : ''), new URLSearchParams(targetQueryString || ''))
+                        : targetQueryString || '';
+                    const prepareNewURL = new URL(`${targetPath}${mergedQueryString ? '?' + mergedQueryString : ''}`, url.origin);
                     url.href = prepareNewURL.href;
                     url.pathname = prepareNewURL.pathname;
                     url.search = prepareNewURL.search;
@@ -101,16 +108,16 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 /** return Response redirect with http code of redirect type */
                 switch (existsRedirect.redirectType) {
                     case site_1.REDIRECT_TYPE_301: {
-                        return this.createRedirectResponse(url, res, 301, 'Moved Permanently');
+                        return this.createRedirectResponse(url, response, 301, 'Moved Permanently');
                     }
                     case site_1.REDIRECT_TYPE_302: {
-                        return this.createRedirectResponse(url, res, 302, 'Found');
+                        return this.createRedirectResponse(url, response, 302, 'Found');
                     }
                     case site_1.REDIRECT_TYPE_SERVER_TRANSFER: {
-                        return this.rewrite(url.href, req, res || server_1.NextResponse.next());
+                        return this.rewrite(url.href, req, response);
                     }
                     default:
-                        return res || server_1.NextResponse.next();
+                        return response;
                 }
             });
             const response = yield createResponse();
@@ -152,59 +159,43 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
      */
     getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const redirects = yield this.redirectsService.fetchRedirects(siteName);
             const { pathname: targetURL, search: targetQS = '', locale } = this.normalizeUrl(req.nextUrl.clone());
+            const normalizedPath = targetURL.replace(/\/*$/gi, '');
+            const redirects = yield this.redirectsService.fetchRedirects(siteName);
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
+            let matchedQueryString;
             return modifyRedirects.length
                 ? modifyRedirects.find((redirect) => {
+                    var _a;
+                    if ((0, utils_1.isRegexOrUrl)(redirect.pattern) === 'url') {
+                        const parseUrlPattern = redirect.pattern.endsWith('/')
+                            ? redirect.pattern.slice(0, -1).split('?')
+                            : redirect.pattern.split('?');
+                        return ((parseUrlPattern[0] === normalizedPath ||
+                            parseUrlPattern[0] === `/${locale}${normalizedPath}`) &&
+                            (0, utils_1.areURLSearchParamsEqual)(new URLSearchParams((_a = parseUrlPattern[1]) !== null && _a !== void 0 ? _a : ''), new URLSearchParams(targetQS)));
+                    }
                     // Modify the redirect pattern to ignore the language prefix in the path
-                    redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
+                    // And escapes non-special "?" characters in a string or regex.
+                    redirect.pattern = (0, utils_1.escapeNonSpecialQuestionMarks)(redirect.pattern.replace(new RegExp(`^[^]?/${language}/`, 'gi'), ''));
                     // 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, '\\?') // Escapes question marks in the pattern
                         .replace(/\$\/gi$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
-                    /**
-                     * This line checks whether the current URL query string (and all its possible permutations)
-                     * matches the redirect pattern.
-                     *
-                     * Query parameters in URLs can come in different orders, but logically they represent the
-                     * same information (e.g., "key1=value1&key2=value2" is the same as "key2=value2&key1=value1").
-                     * To account for this, the method `isPermutedQueryMatch` generates all possible permutations
-                     * of the query parameters and checks if any of those permutations match the regex pattern for the redirect.
-                     *
-                     * NOTE: This fix is specifically implemented for Netlify, where query parameters are sometimes
-                     * automatically sorted, which can cause issues with matching redirects if the order of query
-                     * parameters is important. By checking every possible permutation, we ensure that redirects
-                     * work correctly on Netlify despite this behavior.
-                     *
-                     * It passes several pieces of information to the function:
-                     * 1. `pathname`: The normalized URL path without query parameters (e.g., '/about').
-                     * 2. `queryString`: The current query string from the URL, which will be permuted and matched (e.g., '?key1=value1&key2=value2').
-                     * 3. `pattern`: The regex pattern for the redirect that we are trying to match against the URL (e.g., '/about?key1=value1').
-                     * 4. `locale`: The locale part of the URL (if any), which helps support multilingual URLs.
-                     *
-                     * If one of the permutations of the query string matches the redirect pattern, the function
-                     * returns the matched query string, which is stored in `matchedQueryString`. If no match is found,
-                     * it returns `undefined`. The `matchedQueryString` is later used to indicate whether the query
-                     * string contributed to a successful redirect match.
-                     */
-                    const matchedQueryString = this.isPermutedQueryMatch({
-                        pathname: targetURL,
-                        queryString: targetQS,
-                        pattern: redirect.pattern,
-                        locale,
-                    });
+                    matchedQueryString = [
+                        (0, regex_parser_1.default)(redirect.pattern).test(`${normalizedPath}${targetQS}`),
+                        (0, regex_parser_1.default)(redirect.pattern).test(`/${locale}${normalizedPath}${targetQS}`),
+                    ].some(Boolean)
+                        ? targetQS
+                        : undefined;
                     // Save the matched query string (if found) into the redirect object
                     redirect.matchedQueryString = matchedQueryString || '';
-                    // Return the redirect if the URL path or any query string permutation matches the pattern
-                    return (((0, regex_parser_1.default)(redirect.pattern).test(targetURL) ||
+                    return (!!((0, regex_parser_1.default)(redirect.pattern).test(targetURL) ||
                         (0, regex_parser_1.default)(redirect.pattern).test(`/${req.nextUrl.locale}${targetURL}`) ||
-                        matchedQueryString) &&
-                        (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
+                        matchedQueryString) && (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
                 })
                 : undefined;
         });
@@ -269,24 +260,5 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
         }
         return redirect;
     }
-    /**
-     * Checks if the current URL query matches the provided pattern, considering all permutations of query parameters.
-     * It constructs all possible query parameter permutations and tests them against the pattern.
-     * @param {object} params - The parameters for the URL match.
-     * @param {string} params.pathname - The current URL pathname.
-     * @param {string} params.queryString - The current URL query string.
-     * @param {string} params.pattern - The regex pattern to test the constructed URLs against.
-     * @param {string} [params.locale] - The locale prefix to include in the URL if present.
-     * @returns {string | undefined} - return query string if any of the query permutations match the provided pattern, undefined otherwise.
-     */
-    isPermutedQueryMatch({ pathname, queryString, pattern, locale, }) {
-        const paramsArray = Array.from(new URLSearchParams(queryString).entries());
-        const listOfPermuted = (0, utils_1.getPermutations)(paramsArray).map((permutation) => '?' + permutation.map(([key, value]) => `${key}=${value}`).join('&'));
-        const normalizedPath = pathname.replace(/\/*$/gi, '');
-        return listOfPermuted.find((query) => [
-            (0, regex_parser_1.default)(pattern).test(`${normalizedPath}${query}`),
-            (0, regex_parser_1.default)(pattern).test(`/${locale}${normalizedPath}${query}`),
-        ].some(Boolean));
-    }
 }
 exports.RedirectsMiddleware = RedirectsMiddleware;

package/dist/esm/editing/editing-data-service.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { QUERY_PARAM_EDITING_SECRET } from '@sitecore-jss/sitecore-jss/editing';
-import { AxiosDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
+import { NativeDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
 import { editingDataDiskCache } from './editing-data-cache';
 import { getJssEditingSecret } from '../utils/utils';
 /**
@@ -85,7 +85,7 @@ export class ServerlessEditingDataService {
         if (!this.apiRoute.includes('[key]')) {
             throw new Error(`The specified apiRoute '${this.apiRoute}' is missing '[key]'.`);
         }
-        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new AxiosDataFetcher({ debugger: debug.editing });
+        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new NativeDataFetcher({ debugger: debug.editing });
     }
     /**
      * Stores Sitecore editor payload data for later retrieval by key

package/dist/esm/editing/editing-render-middleware.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { STATIC_PROPS_ID, SERVER_PROPS_ID } from 'next/constants';
-import { AxiosDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
+import { NativeDataFetcher, debug } from '@sitecore-jss/sitecore-jss';
 import { EditMode } from '@sitecore-jss/sitecore-jss/layout';
 import { QUERY_PARAM_EDITING_SECRET, EDITING_ALLOWED_ORIGINS, } from '@sitecore-jss/sitecore-jss/editing';
 import { editingDataService } from './editing-data-service';
@@ -49,7 +49,7 @@ export class ChromesHandler extends RenderMiddlewareBase {
             return `${process.env.VERCEL ? 'https' : 'http'}://${req.headers.host}`;
         };
         this.editingDataService = (_a = config === null || config === void 0 ? void 0 : config.editingDataService) !== null && _a !== void 0 ? _a : editingDataService;
-        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new AxiosDataFetcher({ debugger: debug.editing });
+        this.dataFetcher = (_b = config === null || config === void 0 ? void 0 : config.dataFetcher) !== null && _b !== void 0 ? _b : new NativeDataFetcher({ debugger: debug.editing });
         this.resolvePageUrl = (_c = config === null || config === void 0 ? void 0 : config.resolvePageUrl) !== null && _c !== void 0 ? _c : this.defaultResolvePageUrl;
         this.resolveServerUrl = (_d = config === null || config === void 0 ? void 0 : config.resolveServerUrl) !== null && _d !== void 0 ? _d : this.defaultResolveServerUrl;
     }
@@ -76,7 +76,7 @@ export class ChromesHandler extends RenderMiddlewareBase {
                 const cookies = res.getHeader('Set-Cookie');
                 headers.cookie = `${headers.cookie ? headers.cookie + ';' : ''}${cookies.join(';')}`;
                 // Make actual render request for page route, passing on preview cookies as well as any approved query string parameters.
-                // Note timestamp effectively disables caching the request in Axios (no amount of cache headers seemed to do it)
+                // Note timestamp effectively disables caching the request (no amount of cache headers seemed to do it)
                 debug.editing('fetching page route for %s', editingData.path);
                 const requestUrl = new URL(this.resolvePageUrl({ serverUrl, itemPath: editingData.path }));
                 for (const key in params) {
@@ -122,8 +122,7 @@ export class ChromesHandler extends RenderMiddlewareBase {
             catch (err) {
                 const error = err;
                 console.error(error);
-                if (error.response || error.request) {
-                    // Axios error, which could mean the server or page URL isn't quite right, so provide a more helpful hint
+                if (error.response) {
                     console.info(
                     // eslint-disable-next-line quotes
                     "Hint: for non-standard server or Next.js route configurations, you may need to override the 'resolveServerUrl' or 'resolvePageUrl' available on the 'EditingRenderMiddleware' config.");

package/dist/esm/editing/render-middleware.js

@@ -25,13 +25,15 @@ export class RenderMiddlewareBase {
          * @returns Object of approved headers
          */
         this.getHeadersForPropagation = (headers) => {
-            const result = {};
-            EDITING_PASS_THROUGH_HEADERS.forEach((header) => {
-                if (headers[header]) {
-                    result[header] = headers[header];
+            // Filter and normalize headers
+            const filteredHeaders = EDITING_PASS_THROUGH_HEADERS.reduce((acc, header) => {
+                const value = headers[header];
+                if (value) {
+                    acc[header] = Array.isArray(value) ? value.join(', ') : value;
                 }
-            });
-            return result;
+                return acc;
+            }, {});
+            return filteredHeaders;
         };
     }
 }

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-export { constants, AxiosDataFetcher, NativeDataFetcher, enableDebug, debug, MemoryCacheClient, } from '@sitecore-jss/sitecore-jss';
+export { constants, NativeDataFetcher, enableDebug, debug, MemoryCacheClient, } from '@sitecore-jss/sitecore-jss';
 export { LayoutServicePageState, GraphQLLayoutService, RestLayoutService, getChildPlaceholder, getFieldValue, getContentStylesheetLink, EditMode, } from '@sitecore-jss/sitecore-jss/layout';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { trackingApi, } from '@sitecore-jss/sitecore-jss/tracking';

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { debug } from '@sitecore-jss/sitecore-jss';
 import { GraphQLRedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-jss/sitecore-jss/site';
-import { getPermutations } from '@sitecore-jss/sitecore-jss/utils';
+import { areURLSearchParamsEqual, escapeNonSpecialQuestionMarks, isRegexOrUrl, mergeURLSearchParams, } from '@sitecore-jss/sitecore-jss/utils';
 import { NextResponse } from 'next/server';
 import regexParser from 'regex-parser';
 import { MiddlewareBase } from './middleware';
@@ -39,20 +39,28 @@ export class RedirectsMiddleware extends MiddlewareBase {
             });
             const createResponse = () => __awaiter(this, void 0, void 0, function* () {
                 var _a;
+                const response = res || NextResponse.next();
                 if (this.config.disabled && this.config.disabled(req, res || NextResponse.next())) {
                     debug.redirects('skipped (redirects middleware is disabled)');
-                    return res || NextResponse.next();
+                    return response;
                 }
                 if (this.isPreview(req) || this.excludeRoute(pathname)) {
                     debug.redirects('skipped (%s)', this.isPreview(req) ? 'preview' : 'route excluded');
-                    return res || NextResponse.next();
+                    return response;
+                }
+                // Skip prefetch requests from Next.js, which are not original client requests
+                // as they load unnecessary requests that burden the redirects middleware with meaningless traffic
+                if (this.isPrefetch(req)) {
+                    debug.redirects('skipped (prefetch)');
+                    response.headers.set('x-middleware-cache', 'no-cache');
+                    return response;
                 }
                 site = this.getSite(req, res);
                 // Find the redirect from result of RedirectService
                 const existsRedirect = yield this.getExistsRedirect(req, site.name);
                 if (!existsRedirect) {
                     debug.redirects('skipped (redirect does not exist)');
-                    return res || NextResponse.next();
+                    return response;
                 }
                 // Find context site language and replace token
                 if (REGEXP_CONTEXT_SITE_LANG.test(existsRedirect.target) &&
@@ -66,27 +74,26 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     url.href = existsRedirect.target;
                 }
                 else {
-                    const source = `${url.pathname.replace(/\/*$/gi, '')}${existsRedirect.matchedQueryString}`;
-                    const urlFirstPart = existsRedirect.target.split('/')[1];
+                    const isUrl = isRegexOrUrl(existsRedirect.pattern) === 'url';
+                    const targetParts = existsRedirect.target.split('/');
+                    const urlFirstPart = targetParts[1];
                     if (this.locales.includes(urlFirstPart)) {
                         req.nextUrl.locale = urlFirstPart;
                         existsRedirect.target = existsRedirect.target.replace(`/${urlFirstPart}`, '');
                     }
-                    const target = source
-                        .replace(regexParser(existsRedirect.pattern), existsRedirect.target)
-                        .replace(/^\/\//, '/')
-                        .split('?');
-                    if (url.search && existsRedirect.isQueryStringPreserved) {
-                        const targetQueryString = (_a = target[1]) !== null && _a !== void 0 ? _a : '';
-                        url.search = '?' + new URLSearchParams(`${url.search}&${targetQueryString}`).toString();
-                    }
-                    else if (target[1]) {
-                        url.search = '?' + target[1];
-                    }
-                    else {
-                        url.search = '';
-                    }
-                    const prepareNewURL = new URL(`${target[0]}${url.search}`, url.origin);
+                    const targetSegments = isUrl
+                        ? existsRedirect.target.split('?')
+                        : url.pathname.replace(/\/*$/gi, '') + existsRedirect.matchedQueryString;
+                    const [targetPath, targetQueryString] = isUrl
+                        ? targetSegments
+                        : targetSegments
+                            .replace(regexParser(existsRedirect.pattern), existsRedirect.target)
+                            .replace(/^\/\//, '/')
+                            .split('?');
+                    const mergedQueryString = existsRedirect.isQueryStringPreserved
+                        ? mergeURLSearchParams(new URLSearchParams((_a = url.search) !== null && _a !== void 0 ? _a : ''), new URLSearchParams(targetQueryString || ''))
+                        : targetQueryString || '';
+                    const prepareNewURL = new URL(`${targetPath}${mergedQueryString ? '?' + mergedQueryString : ''}`, url.origin);
                     url.href = prepareNewURL.href;
                     url.pathname = prepareNewURL.pathname;
                     url.search = prepareNewURL.search;
@@ -95,16 +102,16 @@ export class RedirectsMiddleware extends MiddlewareBase {
                 /** return Response redirect with http code of redirect type */
                 switch (existsRedirect.redirectType) {
                     case REDIRECT_TYPE_301: {
-                        return this.createRedirectResponse(url, res, 301, 'Moved Permanently');
+                        return this.createRedirectResponse(url, response, 301, 'Moved Permanently');
                     }
                     case REDIRECT_TYPE_302: {
-                        return this.createRedirectResponse(url, res, 302, 'Found');
+                        return this.createRedirectResponse(url, response, 302, 'Found');
                     }
                     case REDIRECT_TYPE_SERVER_TRANSFER: {
-                        return this.rewrite(url.href, req, res || NextResponse.next());
+                        return this.rewrite(url.href, req, response);
                     }
                     default:
-                        return res || NextResponse.next();
+                        return response;
                 }
             });
             const response = yield createResponse();
@@ -146,59 +153,43 @@ export class RedirectsMiddleware extends MiddlewareBase {
      */
     getExistsRedirect(req, siteName) {
         return __awaiter(this, void 0, void 0, function* () {
-            const redirects = yield this.redirectsService.fetchRedirects(siteName);
             const { pathname: targetURL, search: targetQS = '', locale } = this.normalizeUrl(req.nextUrl.clone());
+            const normalizedPath = targetURL.replace(/\/*$/gi, '');
+            const redirects = yield this.redirectsService.fetchRedirects(siteName);
             const language = this.getLanguage(req);
             const modifyRedirects = structuredClone(redirects);
+            let matchedQueryString;
             return modifyRedirects.length
                 ? modifyRedirects.find((redirect) => {
+                    var _a;
+                    if (isRegexOrUrl(redirect.pattern) === 'url') {
+                        const parseUrlPattern = redirect.pattern.endsWith('/')
+                            ? redirect.pattern.slice(0, -1).split('?')
+                            : redirect.pattern.split('?');
+                        return ((parseUrlPattern[0] === normalizedPath ||
+                            parseUrlPattern[0] === `/${locale}${normalizedPath}`) &&
+                            areURLSearchParamsEqual(new URLSearchParams((_a = parseUrlPattern[1]) !== null && _a !== void 0 ? _a : ''), new URLSearchParams(targetQS)));
+                    }
                     // Modify the redirect pattern to ignore the language prefix in the path
-                    redirect.pattern = redirect.pattern.replace(RegExp(`^[^]?/${language}/`, 'gi'), '');
+                    // And escapes non-special "?" characters in a string or regex.
+                    redirect.pattern = escapeNonSpecialQuestionMarks(redirect.pattern.replace(new RegExp(`^[^]?/${language}/`, 'gi'), ''));
                     // 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, '\\?') // Escapes question marks in the pattern
                         .replace(/\$\/gi$/g, '')}[\/]?$/i`; // Ensures the pattern allows an optional trailing slash
-                    /**
-                     * This line checks whether the current URL query string (and all its possible permutations)
-                     * matches the redirect pattern.
-                     *
-                     * Query parameters in URLs can come in different orders, but logically they represent the
-                     * same information (e.g., "key1=value1&key2=value2" is the same as "key2=value2&key1=value1").
-                     * To account for this, the method `isPermutedQueryMatch` generates all possible permutations
-                     * of the query parameters and checks if any of those permutations match the regex pattern for the redirect.
-                     *
-                     * NOTE: This fix is specifically implemented for Netlify, where query parameters are sometimes
-                     * automatically sorted, which can cause issues with matching redirects if the order of query
-                     * parameters is important. By checking every possible permutation, we ensure that redirects
-                     * work correctly on Netlify despite this behavior.
-                     *
-                     * It passes several pieces of information to the function:
-                     * 1. `pathname`: The normalized URL path without query parameters (e.g., '/about').
-                     * 2. `queryString`: The current query string from the URL, which will be permuted and matched (e.g., '?key1=value1&key2=value2').
-                     * 3. `pattern`: The regex pattern for the redirect that we are trying to match against the URL (e.g., '/about?key1=value1').
-                     * 4. `locale`: The locale part of the URL (if any), which helps support multilingual URLs.
-                     *
-                     * If one of the permutations of the query string matches the redirect pattern, the function
-                     * returns the matched query string, which is stored in `matchedQueryString`. If no match is found,
-                     * it returns `undefined`. The `matchedQueryString` is later used to indicate whether the query
-                     * string contributed to a successful redirect match.
-                     */
-                    const matchedQueryString = this.isPermutedQueryMatch({
-                        pathname: targetURL,
-                        queryString: targetQS,
-                        pattern: redirect.pattern,
-                        locale,
-                    });
+                    matchedQueryString = [
+                        regexParser(redirect.pattern).test(`${normalizedPath}${targetQS}`),
+                        regexParser(redirect.pattern).test(`/${locale}${normalizedPath}${targetQS}`),
+                    ].some(Boolean)
+                        ? targetQS
+                        : undefined;
                     // Save the matched query string (if found) into the redirect object
                     redirect.matchedQueryString = matchedQueryString || '';
-                    // Return the redirect if the URL path or any query string permutation matches the pattern
-                    return ((regexParser(redirect.pattern).test(targetURL) ||
+                    return (!!(regexParser(redirect.pattern).test(targetURL) ||
                         regexParser(redirect.pattern).test(`/${req.nextUrl.locale}${targetURL}`) ||
-                        matchedQueryString) &&
-                        (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
+                        matchedQueryString) && (redirect.locale ? redirect.locale.toLowerCase() === locale.toLowerCase() : true));
                 })
                 : undefined;
         });
@@ -263,23 +254,4 @@ export class RedirectsMiddleware extends MiddlewareBase {
         }
         return redirect;
     }
-    /**
-     * Checks if the current URL query matches the provided pattern, considering all permutations of query parameters.
-     * It constructs all possible query parameter permutations and tests them against the pattern.
-     * @param {object} params - The parameters for the URL match.
-     * @param {string} params.pathname - The current URL pathname.
-     * @param {string} params.queryString - The current URL query string.
-     * @param {string} params.pattern - The regex pattern to test the constructed URLs against.
-     * @param {string} [params.locale] - The locale prefix to include in the URL if present.
-     * @returns {string | undefined} - return query string if any of the query permutations match the provided pattern, undefined otherwise.
-     */
-    isPermutedQueryMatch({ pathname, queryString, pattern, locale, }) {
-        const paramsArray = Array.from(new URLSearchParams(queryString).entries());
-        const listOfPermuted = getPermutations(paramsArray).map((permutation) => '?' + permutation.map(([key, value]) => `${key}=${value}`).join('&'));
-        const normalizedPath = pathname.replace(/\/*$/gi, '');
-        return listOfPermuted.find((query) => [
-            regexParser(pattern).test(`${normalizedPath}${query}`),
-            regexParser(pattern).test(`/${locale}${normalizedPath}${query}`),
-        ].some(Boolean));
-    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.4.0-canary.2",
+  "version": "22.4.0-canary.21",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -73,9 +73,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.2",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.4.0-canary.2",
-    "@sitecore-jss/sitecore-jss-react": "^22.4.0-canary.2",
+    "@sitecore-jss/sitecore-jss": "^22.4.0-canary.21",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.4.0-canary.21",
+    "@sitecore-jss/sitecore-jss-react": "^22.4.0-canary.21",
     "@vercel/kv": "^0.2.1",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -83,7 +83,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "df94d89c4aaf6dabcb64b46f622888e8912494b5",
+  "gitHead": "f0cf339eadfbdd0f56e58b1c4c83c0b1ccd7d8a6",
   "files": [
     "dist",
     "types",

package/types/editing/editing-data-service.d.ts

@@ -1,4 +1,4 @@
-import { AxiosDataFetcher } from '@sitecore-jss/sitecore-jss';
+import { NativeDataFetcher } from '@sitecore-jss/sitecore-jss';
 import { EditingData } from './editing-data';
 import { EditingDataCache } from './editing-data-cache';
 import { PreviewData } from 'next';
@@ -87,11 +87,11 @@ export interface ServerlessEditingDataServiceConfig {
      */
     apiRoute?: string;
     /**
-     * The `AxiosDataFetcher` instance to use for API requests.
-     * @default new AxiosDataFetcher()
-     * @see AxiosDataFetcher
+     * The `NativeDataFetcher` instance to use for API requests.
+     * @default new NativeDataFetcher()
+     * @see NativeDataFetcher
      */
-    dataFetcher?: AxiosDataFetcher;
+    dataFetcher?: NativeDataFetcher;
 }
 /**
  * Service responsible for maintaining Sitecore editor data between requests

package/types/editing/editing-render-middleware.d.ts

@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
-import { AxiosDataFetcher } from '@sitecore-jss/sitecore-jss';
+import { NativeDataFetcher } from '@sitecore-jss/sitecore-jss';
 import { EditMode, LayoutServicePageState } from '@sitecore-jss/sitecore-jss/layout';
 import { RenderMetadataQueryParams, LayoutKind } from '@sitecore-jss/sitecore-jss/editing';
 import { EditingDataService } from './editing-data-service';
@@ -11,11 +11,11 @@ export type EditingRenderMiddlewareConfig = {
     /**
      * -- Edit Mode Chromes --
      *
-     * The `AxiosDataFetcher` instance to use for API requests.
-     * @default new AxiosDataFetcher()
-     * @see AxiosDataFetcher
+     * The `NativeDataFetcher` instance to use for API requests.
+     * @default new NativeDataFetcher()
+     * @see NativeDataFetcher
      */
-    dataFetcher?: AxiosDataFetcher;
+    dataFetcher?: NativeDataFetcher;
     /**
      * -- Edit Mode Chromes --
      *

package/types/editing/render-middleware.d.ts

@@ -20,6 +20,6 @@ export declare abstract class RenderMiddlewareBase {
      * @returns Object of approved headers
      */
     protected getHeadersForPropagation: (headers: IncomingHttpHeaders) => {
-        [key: string]: string | string[];
+        [key: string]: string;
     };
 }

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export { constants, HttpDataFetcher, HttpResponse, AxiosResponse, AxiosDataFetcher, AxiosDataFetcherConfig, NativeDataFetcher, NativeDataFetcherConfig, HTMLLink, enableDebug, debug, CacheClient, CacheOptions, MemoryCacheClient, } from '@sitecore-jss/sitecore-jss';
+export { constants, HttpDataFetcher, NativeDataFetcher, NativeDataFetcherConfig, NativeDataFetcherResponse, NativeDataFetcherError, HTMLLink, enableDebug, debug, CacheClient, CacheOptions, MemoryCacheClient, } from '@sitecore-jss/sitecore-jss';
 export { LayoutService, LayoutServiceData, LayoutServicePageState, LayoutServiceContext, LayoutServiceContextData, GraphQLLayoutService, GraphQLLayoutServiceConfig, RestLayoutService, RestLayoutServiceConfig, PlaceholderData, PlaceholdersData, RouteData, Field, Item, HtmlElementRendering, getChildPlaceholder, getFieldValue, ComponentRendering, ComponentFields, ComponentParams, getContentStylesheetLink, EditMode, } from '@sitecore-jss/sitecore-jss/layout';
 export { mediaApi } from '@sitecore-jss/sitecore-jss/media';
 export { trackingApi, TrackingRequestOptions, CampaignInstance, GoalInstance, OutcomeInstance, EventInstance, PageViewInstance, } from '@sitecore-jss/sitecore-jss/tracking';

package/types/middleware/redirects-middleware.d.ts

@@ -54,15 +54,4 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * @returns {NextResponse<unknown>} The redirect response.
      */
     private createRedirectResponse;
-    /**
-     * Checks if the current URL query matches the provided pattern, considering all permutations of query parameters.
-     * It constructs all possible query parameter permutations and tests them against the pattern.
-     * @param {object} params - The parameters for the URL match.
-     * @param {string} params.pathname - The current URL pathname.
-     * @param {string} params.queryString - The current URL query string.
-     * @param {string} params.pattern - The regex pattern to test the constructed URLs against.
-     * @param {string} [params.locale] - The locale prefix to include in the URL if present.
-     * @returns {string | undefined} - return query string if any of the query permutations match the provided pattern, undefined otherwise.
-     */
-    private isPermutedQueryMatch;
 }