@sitecore-jss/sitecore-jss-nextjs 22.2.0-canary.41 → 22.2.0-canary.42

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

@@ -13,10 +13,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedirectsMiddleware = void 0;
-const regex_parser_1 = __importDefault(require("regex-parser"));
-const server_1 = require("next/server");
-const site_1 = require("@sitecore-jss/sitecore-jss/site");
 const sitecore_jss_1 = require("@sitecore-jss/sitecore-jss");
+const site_1 = require("@sitecore-jss/sitecore-jss/site");
+const server_1 = require("next/server");
+const regex_parser_1 = __importDefault(require("regex-parser"));
 const middleware_1 = require("./middleware");
 const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
 const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
@@ -96,10 +96,12 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
-                    case site_1.REDIRECT_TYPE_301:
-                        return server_1.NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 301, statusText: 'Moved Permanently', headers: res === null || res === void 0 ? void 0 : res.headers }));
-                    case site_1.REDIRECT_TYPE_302:
-                        return server_1.NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 302, statusText: 'Found', headers: res === null || res === void 0 ? void 0 : res.headers }));
+                    case site_1.REDIRECT_TYPE_301: {
+                        return this.createRedirectResponse(redirectUrl, res, 301, 'Moved Permanently');
+                    }
+                    case site_1.REDIRECT_TYPE_302: {
+                        return this.createRedirectResponse(redirectUrl, res, 302, 'Found');
+                    }
                     case site_1.REDIRECT_TYPE_SERVER_TRANSFER: {
                         return this.rewrite(redirectUrl, req, res || server_1.NextResponse.next());
                     }
@@ -211,5 +213,21 @@ class RedirectsMiddleware extends middleware_1.MiddlewareBase {
         }
         return new URL(`${url.pathname}`, url.origin);
     }
+    /**
+     * Helper function to create a redirect response and remove the x-middleware-next header.
+     * @param {string} url The URL to redirect to.
+     * @param {Response} res The response object.
+     * @param {number} status The HTTP status code of the redirect.
+     * @param {string} statusText The status text of the redirect.
+     * @returns {NextResponse<unknown>} The redirect response.
+     */
+    createRedirectResponse(url, res, status, statusText) {
+        const redirect = server_1.NextResponse.redirect(url, Object.assign(Object.assign({}, (res || {})), { status,
+            statusText, headers: res === null || res === void 0 ? void 0 : res.headers }));
+        if (res === null || res === void 0 ? void 0 : res.headers) {
+            redirect.headers.delete('x-middleware-next');
+        }
+        return redirect;
+    }
 }
 exports.RedirectsMiddleware = RedirectsMiddleware;

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

@@ -7,10 +7,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import regexParser from 'regex-parser';
-import { NextResponse } from 'next/server';
-import { GraphQLRedirectsService, REDIRECT_TYPE_301, REDIRECT_TYPE_302, REDIRECT_TYPE_SERVER_TRANSFER, } from '@sitecore-jss/sitecore-jss/site';
 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 { NextResponse } from 'next/server';
+import regexParser from 'regex-parser';
 import { MiddlewareBase } from './middleware';
 const REGEXP_CONTEXT_SITE_LANG = new RegExp(/\$siteLang/, 'i');
 const REGEXP_ABSOLUTE_URL = new RegExp('^(?:[a-z]+:)?//', 'i');
@@ -90,10 +90,12 @@ export class RedirectsMiddleware extends MiddlewareBase {
                 const redirectUrl = decodeURIComponent(url.href);
                 /** return Response redirect with http code of redirect type **/
                 switch (existsRedirect.redirectType) {
-                    case REDIRECT_TYPE_301:
-                        return NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 301, statusText: 'Moved Permanently', headers: res === null || res === void 0 ? void 0 : res.headers }));
-                    case REDIRECT_TYPE_302:
-                        return NextResponse.redirect(redirectUrl, Object.assign(Object.assign({}, res), { status: 302, statusText: 'Found', headers: res === null || res === void 0 ? void 0 : res.headers }));
+                    case REDIRECT_TYPE_301: {
+                        return this.createRedirectResponse(redirectUrl, res, 301, 'Moved Permanently');
+                    }
+                    case REDIRECT_TYPE_302: {
+                        return this.createRedirectResponse(redirectUrl, res, 302, 'Found');
+                    }
                     case REDIRECT_TYPE_SERVER_TRANSFER: {
                         return this.rewrite(redirectUrl, req, res || NextResponse.next());
                     }
@@ -205,4 +207,20 @@ export class RedirectsMiddleware extends MiddlewareBase {
         }
         return new URL(`${url.pathname}`, url.origin);
     }
+    /**
+     * Helper function to create a redirect response and remove the x-middleware-next header.
+     * @param {string} url The URL to redirect to.
+     * @param {Response} res The response object.
+     * @param {number} status The HTTP status code of the redirect.
+     * @param {string} statusText The status text of the redirect.
+     * @returns {NextResponse<unknown>} The redirect response.
+     */
+    createRedirectResponse(url, res, status, statusText) {
+        const redirect = NextResponse.redirect(url, Object.assign(Object.assign({}, (res || {})), { status,
+            statusText, headers: res === null || res === void 0 ? void 0 : res.headers }));
+        if (res === null || res === void 0 ? void 0 : res.headers) {
+            redirect.headers.delete('x-middleware-next');
+        }
+        return redirect;
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.2.0-canary.41",
+  "version": "22.2.0-canary.42",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "sideEffects": false,
@@ -72,9 +72,9 @@
     "react-dom": "^18.2.0"
   },
   "dependencies": {
-    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.41",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.41",
-    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.41",
+    "@sitecore-jss/sitecore-jss": "^22.2.0-canary.42",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.2.0-canary.42",
+    "@sitecore-jss/sitecore-jss-react": "^22.2.0-canary.42",
     "@vercel/kv": "^0.2.1",
     "prop-types": "^15.8.1",
     "regex-parser": "^2.2.11",
@@ -82,7 +82,7 @@
   },
   "description": "",
   "types": "types/index.d.ts",
-  "gitHead": "8d68f790f0005add2c761f82e8fd891c5e879618",
+  "gitHead": "93b6c7552e5e8913be0d37ddd08a802a264edff3",
   "files": [
     "dist",
     "types",

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

@@ -1,5 +1,5 @@
-import { NextResponse, NextRequest } from 'next/server';
 import { GraphQLRedirectsServiceConfig } from '@sitecore-jss/sitecore-jss/site';
+import { NextRequest, NextResponse } from 'next/server';
 import { MiddlewareBase, MiddlewareBaseConfig } from './middleware';
 /**
  * extended RedirectsMiddlewareConfig config type for RedirectsMiddleware
@@ -45,4 +45,13 @@ export declare class RedirectsMiddleware extends MiddlewareBase {
      * @returns {string} normalize url
      */
     private normalizeUrl;
+    /**
+     * Helper function to create a redirect response and remove the x-middleware-next header.
+     * @param {string} url The URL to redirect to.
+     * @param {Response} res The response object.
+     * @param {number} status The HTTP status code of the redirect.
+     * @param {string} statusText The status text of the redirect.
+     * @returns {NextResponse<unknown>} The redirect response.
+     */
+    private createRedirectResponse;
 }