@sitecore-jss/sitecore-jss-nextjs 22.1.0-canary.60 → 22.1.0-canary.61

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

@@ -227,6 +227,28 @@ class MetadataHandler {
             path: query.route,
             maxAge: 3,
         });
+        // Cookies with the SameSite=Lax policy set by Next.js setPreviewData function causes CORS issue
+        // when Next.js preview mode is activated, resulting the page to render in normal mode instead.
+        // By replacing it with "SameSite=None; Secure", we ensure cookies are correctly sent with
+        // cross-origin requests, allowing the page to be editable. This change should be reverted
+        // once vercel addresses this open issue: https://github.com/vercel/next.js/issues/49927
+        const setCookieHeader = res.getHeader('Set-Cookie');
+        if (setCookieHeader && Array.isArray(setCookieHeader)) {
+            const modifiedCookies = setCookieHeader.map((cookie) => {
+                const cookieIdentifiers = {
+                    __prerender_bypass: /^__prerender_bypass=/,
+                    __next_preview_data: /^__next_preview_data=/,
+                };
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                for (const [_, regex] of Object.entries(cookieIdentifiers)) {
+                    if (cookie.match(regex)) {
+                        return cookie.replace(/SameSite=Lax/, 'SameSite=None; Secure');
+                    }
+                }
+                return cookie;
+            });
+            res.setHeader('Set-Cookie', modifiedCookies);
+        }
         const route = ((_c = (_b = this.config).resolvePageUrl) === null || _c === void 0 ? void 0 : _c.call(_b, {
             itemPath: query.route,
         })) || query.route;

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

@@ -222,6 +222,28 @@ export class MetadataHandler {
             path: query.route,
             maxAge: 3,
         });
+        // Cookies with the SameSite=Lax policy set by Next.js setPreviewData function causes CORS issue
+        // when Next.js preview mode is activated, resulting the page to render in normal mode instead.
+        // By replacing it with "SameSite=None; Secure", we ensure cookies are correctly sent with
+        // cross-origin requests, allowing the page to be editable. This change should be reverted
+        // once vercel addresses this open issue: https://github.com/vercel/next.js/issues/49927
+        const setCookieHeader = res.getHeader('Set-Cookie');
+        if (setCookieHeader && Array.isArray(setCookieHeader)) {
+            const modifiedCookies = setCookieHeader.map((cookie) => {
+                const cookieIdentifiers = {
+                    __prerender_bypass: /^__prerender_bypass=/,
+                    __next_preview_data: /^__next_preview_data=/,
+                };
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                for (const [_, regex] of Object.entries(cookieIdentifiers)) {
+                    if (cookie.match(regex)) {
+                        return cookie.replace(/SameSite=Lax/, 'SameSite=None; Secure');
+                    }
+                }
+                return cookie;
+            });
+            res.setHeader('Set-Cookie', modifiedCookies);
+        }
         const route = ((_c = (_b = this.config).resolvePageUrl) === null || _c === void 0 ? void 0 : _c.call(_b, {
             itemPath: query.route,
         })) || query.route;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sitecore-jss/sitecore-jss-nextjs",
-  "version": "22.1.0-canary.60",
+  "version": "22.1.0-canary.61",
   "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.1.0-canary.60",
-    "@sitecore-jss/sitecore-jss-dev-tools": "^22.1.0-canary.60",
-    "@sitecore-jss/sitecore-jss-react": "^22.1.0-canary.60",
+    "@sitecore-jss/sitecore-jss": "^22.1.0-canary.61",
+    "@sitecore-jss/sitecore-jss-dev-tools": "^22.1.0-canary.61",
+    "@sitecore-jss/sitecore-jss-react": "^22.1.0-canary.61",
     "@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": "628474dab2ef16f0111b9c750524dc52df342b27",
+  "gitHead": "18e1922f358789f202797ef198794354ca2c0a03",
   "files": [
     "dist",
     "types",