@sitecore-jss/sitecore-jss-nextjs 22.10.0-canary.1 → 22.10.0-canary.10

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

@@ -26,9 +26,6 @@ const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
  * compares with current url and redirects to target url
  */
 class RedirectsMiddleware extends middleware_1.MiddlewareBase {
-    /**
-     * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
-     */
     constructor(config) {
         super(config);
         this.config = config;
@@ -136,7 +133,7 @@ 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())) {
+                if (this.config.disabled && this.config.disabled(req, response)) {
                     sitecore_jss_1.debug.redirects('skipped (redirects middleware is disabled)');
                     return response;
                 }
@@ -152,7 +149,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     response.headers.set('Cache-Control', 'no-store, must-revalidate');
                     return response;
                 }
-                site = this.getSite(req, res);
+                site = this.getSite(req, response);
                 // Find the redirect from result of RedirectService
                 const existsRedirect = yield this.getExistsRedirect(req, site.name);
                 if (!existsRedirect) {
@@ -169,7 +166,19 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 }
                 const url = this.normalizeUrl(req.nextUrl.clone());
                 if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
-                    url.href = existsRedirect.target;
+                    // Perform variable substitution for absolute URLs
+                    let finalTarget = existsRedirect.target;
+                    if ((0, utils_1.isRegexOrUrl)(existsRedirect.pattern) === 'regex') {
+                        const matched = url.pathname
+                            .replace(/\/*$/gi, '')
+                            .match((0, regex_parser_1.default)(existsRedirect.pattern));
+                        if (matched) {
+                            finalTarget = existsRedirect.target.replace(/\$(\d+)/g, (_, index) => {
+                                return matched[parseInt(index, 10)] || '';
+                            });
+                        }
+                    }
+                    return this.dispatchRedirect(finalTarget, existsRedirect.redirectType, req, response, true);
                 }
                 else {
                     const isUrl = (0, utils_1.isRegexOrUrl)(existsRedirect.pattern) === 'url';
@@ -191,25 +200,12 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                     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);
+                    const prepareNewURL = new URL(`${targetPath}${mergedQueryString ? `?${mergedQueryString}` : ''}`, url.origin);
                     url.href = prepareNewURL.href;
                     url.pathname = prepareNewURL.pathname;
                     url.search = prepareNewURL.search;
                     url.locale = req.nextUrl.locale;
-                }
-                /** return Response redirect with http code of redirect type */
-                switch (existsRedirect.redirectType) {
-                    case site_1.REDIRECT_TYPE_301: {
-                        return this.createRedirectResponse(url, response, 301, 'Moved Permanently');
-                    }
-                    case site_1.REDIRECT_TYPE_302: {
-                        return this.createRedirectResponse(url, response, 302, 'Found');
-                    }
-                    case site_1.REDIRECT_TYPE_SERVER_TRANSFER: {
-                        return this.rewrite(url.href, req, response, true);
-                    }
-                    default:
-                        return response;
+                    return this.dispatchRedirect(url, existsRedirect.redirectType, req, response, false);
                 }
             });
             const response = yield createResponse();
@@ -230,7 +226,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
      */
     getRedirects(siteName) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.redirectsService.fetchRedirects(siteName);
+            return this.redirectsService.fetchRedirects(siteName);
         });
     }
     /**
@@ -241,9 +237,8 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
      * @returns {string} normalize url
      */
     normalizeUrl(url) {
-        if (!url.search) {
+        if (!url.search)
             return url;
-        }
         /**
          * Prepare special parameters for exclusion.
          */
@@ -260,12 +255,7 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
         const newQueryString = url.search
             .replace(/^\?/, '')
             .split('&')
-            .filter((param) => {
-            if (!splittedPathname.includes(param)) {
-                return param;
-            }
-            return false;
-        })
+            .filter((param) => !splittedPathname.includes(param))
             .join('&');
         const newUrl = new URL(`${url.pathname.toLowerCase()}?${newQueryString}`, url.origin);
         url.search = newUrl.search;
@@ -273,6 +263,29 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
         url.href = newUrl.href;
         return url;
     }
+    /**
+     * Dispatch a redirect or rewrite based on type.
+     * @param {NextURL | string} target Final target to redirect/rewrite to (NextURL or string for externals).
+     * @param {string} type One of `REDIRECT_TYPE_301`, `REDIRECT_TYPE_302`, or `REDIRECT_TYPE_SERVER_TRANSFER`.
+     * @param {NextRequest} req Incoming request.
+     * @param {NextResponse} res Current response (used for header cleanup/carry-over).
+     * @param {boolean} isExternal Set to `true` when target is an external absolute URL.
+     * @returns A NextResponse.
+     */
+    dispatchRedirect(target, type, req, res, isExternal = false) {
+        switch (type) {
+            case site_1.REDIRECT_TYPE_301:
+                return this.createRedirectResponse(target, res, 301, 'Moved Permanently');
+            case site_1.REDIRECT_TYPE_302:
+                return this.createRedirectResponse(target, res, 302, 'Found');
+            case site_1.REDIRECT_TYPE_SERVER_TRANSFER:
+                // rewrite expects a string; unwrap NextURL if needed
+                return this.rewrite(typeof target === 'string' ? target : target.href, req, res, isExternal);
+            default:
+                // Unknown type: return the input response unchanged
+                return res;
+        }
+    }
     /**
      * Helper function to create a redirect response and remove the x-middleware-next header.
      * @param {NextURL} url The URL to redirect to.

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

@@ -20,9 +20,6 @@ const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
  * compares with current url and redirects to target url
  */
 export class RedirectsMiddleware extends MiddlewareBase {
-    /**
-     * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
-     */
     constructor(config) {
         super(config);
         this.config = config;
@@ -130,7 +127,7 @@ 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())) {
+                if (this.config.disabled && this.config.disabled(req, response)) {
                     debug.redirects('skipped (redirects middleware is disabled)');
                     return response;
                 }
@@ -146,7 +143,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     response.headers.set('Cache-Control', 'no-store, must-revalidate');
                     return response;
                 }
-                site = this.getSite(req, res);
+                site = this.getSite(req, response);
                 // Find the redirect from result of RedirectService
                 const existsRedirect = yield this.getExistsRedirect(req, site.name);
                 if (!existsRedirect) {
@@ -163,7 +160,19 @@ export class RedirectsMiddleware extends MiddlewareBase {
                 }
                 const url = this.normalizeUrl(req.nextUrl.clone());
                 if (REGEXP_ABSOLUTE_URL.test(existsRedirect.target)) {
-                    url.href = existsRedirect.target;
+                    // Perform variable substitution for absolute URLs
+                    let finalTarget = existsRedirect.target;
+                    if (isRegexOrUrl(existsRedirect.pattern) === 'regex') {
+                        const matched = url.pathname
+                            .replace(/\/*$/gi, '')
+                            .match(regexParser(existsRedirect.pattern));
+                        if (matched) {
+                            finalTarget = existsRedirect.target.replace(/\$(\d+)/g, (_, index) => {
+                                return matched[parseInt(index, 10)] || '';
+                            });
+                        }
+                    }
+                    return this.dispatchRedirect(finalTarget, existsRedirect.redirectType, req, response, true);
                 }
                 else {
                     const isUrl = isRegexOrUrl(existsRedirect.pattern) === 'url';
@@ -185,25 +194,12 @@ export class RedirectsMiddleware extends MiddlewareBase {
                     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);
+                    const prepareNewURL = new URL(`${targetPath}${mergedQueryString ? `?${mergedQueryString}` : ''}`, url.origin);
                     url.href = prepareNewURL.href;
                     url.pathname = prepareNewURL.pathname;
                     url.search = prepareNewURL.search;
                     url.locale = req.nextUrl.locale;
-                }
-                /** return Response redirect with http code of redirect type */
-                switch (existsRedirect.redirectType) {
-                    case REDIRECT_TYPE_301: {
-                        return this.createRedirectResponse(url, response, 301, 'Moved Permanently');
-                    }
-                    case REDIRECT_TYPE_302: {
-                        return this.createRedirectResponse(url, response, 302, 'Found');
-                    }
-                    case REDIRECT_TYPE_SERVER_TRANSFER: {
-                        return this.rewrite(url.href, req, response, true);
-                    }
-                    default:
-                        return response;
+                    return this.dispatchRedirect(url, existsRedirect.redirectType, req, response, false);
                 }
             });
             const response = yield createResponse();
@@ -224,7 +220,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
      */
     getRedirects(siteName) {
         return __awaiter(this, void 0, void 0, function* () {
-            return yield this.redirectsService.fetchRedirects(siteName);
+            return this.redirectsService.fetchRedirects(siteName);
         });
     }
     /**
@@ -235,9 +231,8 @@ export class RedirectsMiddleware extends MiddlewareBase {
      * @returns {string} normalize url
      */
     normalizeUrl(url) {
-        if (!url.search) {
+        if (!url.search)
             return url;
-        }
         /**
          * Prepare special parameters for exclusion.
          */
@@ -254,12 +249,7 @@ export class RedirectsMiddleware extends MiddlewareBase {
         const newQueryString = url.search
             .replace(/^\?/, '')
             .split('&')
-            .filter((param) => {
-            if (!splittedPathname.includes(param)) {
-                return param;
-            }
-            return false;
-        })
+            .filter((param) => !splittedPathname.includes(param))
             .join('&');
         const newUrl = new URL(`${url.pathname.toLowerCase()}?${newQueryString}`, url.origin);
         url.search = newUrl.search;
@@ -267,6 +257,29 @@ export class RedirectsMiddleware extends MiddlewareBase {
         url.href = newUrl.href;
         return url;
     }
+    /**
+     * Dispatch a redirect or rewrite based on type.
+     * @param {NextURL | string} target Final target to redirect/rewrite to (NextURL or string for externals).
+     * @param {string} type One of `REDIRECT_TYPE_301`, `REDIRECT_TYPE_302`, or `REDIRECT_TYPE_SERVER_TRANSFER`.
+     * @param {NextRequest} req Incoming request.
+     * @param {NextResponse} res Current response (used for header cleanup/carry-over).
+     * @param {boolean} isExternal Set to `true` when target is an external absolute URL.
+     * @returns A NextResponse.
+     */
+    dispatchRedirect(target, type, req, res, isExternal = false) {
+        switch (type) {
+            case REDIRECT_TYPE_301:
+                return this.createRedirectResponse(target, res, 301, 'Moved Permanently');
+            case REDIRECT_TYPE_302:
+                return this.createRedirectResponse(target, res, 302, 'Found');
+            case REDIRECT_TYPE_SERVER_TRANSFER:
+                // rewrite expects a string; unwrap NextURL if needed
+                return this.rewrite(typeof target === 'string' ? target : target.href, req, res, isExternal);
+            default:
+                // Unknown type: return the input response unchanged
+                return res;
+        }
+    }
     /**
      * Helper function to create a redirect response and remove the x-middleware-next header.
      * @param {NextURL} url The URL to redirect to.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.10.0-canary.1",
+  "version": "22.10.0-canary.10",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -72,16 +72,16 @@
     "react-dom": "^19.1.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "22.10.0-canary.1",
-    "@sitecore-jss/sitecore-jss-dev-tools": "22.10.0-canary.1",
-    "@sitecore-jss/sitecore-jss-react": "22.10.0-canary.1",
+    "@sitecore-jss/sitecore-jss": "22.10.0-canary.10",
+    "@sitecore-jss/sitecore-jss-dev-tools": "22.10.0-canary.10",
+    "@sitecore-jss/sitecore-jss-react": "22.10.0-canary.10",
     "@vercel/kv": "^0.2.1",
     "regex-parser": "^2.2.11",
     "sync-disk-cache": "^2.1.0"
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "fdb771841e9cfec52c003ef4a9e88c8ac9017bd0",
+  "gitHead": "79499009753a300a5169377663fc5270cd001365",
   "files": [
     "dist",
     "types",

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

@@ -22,9 +22,6 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
     protected config: RedirectsMiddlewareConfig;
     private redirectsService;
     private locales;
-    /**
-     * @param {RedirectsMiddlewareConfig} [config] redirects middleware config
-     */
     constructor(config: RedirectsMiddlewareConfig);
     /**
      * Gets the Next.js middleware handler with error handling
@@ -60,6 +57,16 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * @returns {string} normalize url
      */
     private normalizeUrl;
+    /**
+     * Dispatch a redirect or rewrite based on type.
+     * @param {NextURL | string} target Final target to redirect/rewrite to (NextURL or string for externals).
+     * @param {string} type One of `REDIRECT_TYPE_301`, `REDIRECT_TYPE_302`, or `REDIRECT_TYPE_SERVER_TRANSFER`.
+     * @param {NextRequest} req Incoming request.
+     * @param {NextResponse} res Current response (used for header cleanup/carry-over).
+     * @param {boolean} isExternal Set to `true` when target is an external absolute URL.
+     * @returns A NextResponse.
+     */
+    private dispatchRedirect;
     /**
      * Helper function to create a redirect response and remove the x-middleware-next header.
      * @param {NextURL} url The URL to redirect to.