@preprio/toolkit 0.1.0-beta.3 → 0.1.0-beta.4

package/dist/astro/index.cjs

@@ -30,7 +30,7 @@ __export(astro_exports, {
 module.exports = __toCommonJS(astro_exports);
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/server.ts
 var PreprError = class extends Error {
@@ -172,6 +172,20 @@ var UTM_PARAMS = [
   "utm_content",
   "utm_campaign"
 ];
+function serializeCookie(cookie) {
+  const parts = [
+    `${cookie.name}=${encodeURIComponent(cookie.value)}`,
+    `Max-Age=${cookie.maxAge}`,
+    `Path=${cookie.path}`
+  ];
+  if (cookie.sameSite) {
+    parts.push(`SameSite=${cookie.sameSite}`);
+  }
+  if (cookie.secure) {
+    parts.push("Secure");
+  }
+  return parts.join("; ");
+}
 function parseCookies(request) {
   const cookies = /* @__PURE__ */ new Map();
   const header = request.headers.get("cookie");
@@ -190,7 +204,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -239,6 +257,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -257,7 +284,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -269,7 +297,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -284,12 +313,7 @@ async function onPreprRequest(context, next, options) {
   });
   const response = await next();
   for (const cookie of responseCookies) {
-    const parts = [
-      `${cookie.name}=${encodeURIComponent(cookie.value)}`,
-      `Max-Age=${cookie.maxAge}`,
-      `Path=${cookie.path}`
-    ];
-    response.headers.append("Set-Cookie", parts.join("; "));
+    response.headers.append("Set-Cookie", serializeCookie(cookie));
   }
   return response;
 }

package/dist/astro/index.js

@@ -1,5 +1,5 @@
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/server.ts
 var PreprError = class extends Error {
@@ -141,6 +141,20 @@ var UTM_PARAMS = [
   "utm_content",
   "utm_campaign"
 ];
+function serializeCookie(cookie) {
+  const parts = [
+    `${cookie.name}=${encodeURIComponent(cookie.value)}`,
+    `Max-Age=${cookie.maxAge}`,
+    `Path=${cookie.path}`
+  ];
+  if (cookie.sameSite) {
+    parts.push(`SameSite=${cookie.sameSite}`);
+  }
+  if (cookie.secure) {
+    parts.push("Secure");
+  }
+  return parts.join("; ");
+}
 function parseCookies(request) {
   const cookies = /* @__PURE__ */ new Map();
   const header = request.headers.get("cookie");
@@ -159,7 +173,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -208,6 +226,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -226,7 +253,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -238,7 +266,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -253,12 +282,7 @@ async function onPreprRequest(context, next, options) {
   });
   const response = await next();
   for (const cookie of responseCookies) {
-    const parts = [
-      `${cookie.name}=${encodeURIComponent(cookie.value)}`,
-      `Max-Age=${cookie.maxAge}`,
-      `Path=${cookie.path}`
-    ];
-    response.headers.append("Set-Cookie", parts.join("; "));
+    response.headers.append("Set-Cookie", serializeCookie(cookie));
   }
   return response;
 }

package/dist/{chunk-5JGPWQVA.js → chunk-3FOY6KL4.js}

@@ -1704,16 +1704,34 @@ function getCookie(name) {
 }
 function setCookie(name, value, options = {}) {
   if (typeof document === "undefined") return;
-  const { maxAge, path = "/" } = options;
+  const { maxAge, path = "/", sameSite, secure } = options;
   let cookie = `${name}=${encodeURIComponent(value)};path=${path}`;
   if (typeof maxAge === "number") {
     cookie += `;max-age=${maxAge}`;
   }
+  if (sameSite) {
+    cookie += `;samesite=${sameSite}`;
+  }
+  if (secure) {
+    cookie += ";secure";
+  }
   document.cookie = cookie;
 }
-function removeCookie(name, path = "/") {
+function removeCookie(name, path = "/", options = {}) {
   if (typeof document === "undefined") return;
-  document.cookie = `${name}=;path=${path};expires=Thu, 01 Jan 1970 00:00:00 GMT`;
+  const { sameSite, secure } = options;
+  let cookie = `${name}=;path=${path};expires=Thu, 01 Jan 1970 00:00:00 GMT`;
+  if (sameSite) {
+    cookie += `;samesite=${sameSite}`;
+  }
+  if (secure) {
+    cookie += ";secure";
+  }
+  document.cookie = cookie;
+}
+function crossSiteCookieOptions() {
+  if (typeof window === "undefined" || !window.isSecureContext) return {};
+  return { sameSite: "None", secure: true };
 }
 
 // src/core/locales/en.json
@@ -1844,7 +1862,13 @@ function createIframeBridge(store) {
 }
 
 // src/core/toolbar-change-handler.ts
-var COOKIE_OPTS = { maxAge: ONE_YEAR_SECONDS, path: "/" };
+function cookieOpts() {
+  return {
+    maxAge: ONE_YEAR_SECONDS,
+    path: "/",
+    ...crossSiteCookieOptions()
+  };
+}
 function createChangeHandler(deps) {
   const { store, stega, syncAutoClean } = deps;
   function updateParam(name, value) {
@@ -1861,9 +1885,9 @@ function createChangeHandler(deps) {
   return function handleChange(before, after) {
     if (before.selectedSegment !== after.selectedSegment) {
       if (after.selectedSegment === null) {
-        removeCookie(COOKIE_SEGMENT);
+        removeCookie(COOKIE_SEGMENT, "/", crossSiteCookieOptions());
       } else {
-        setCookie(COOKIE_SEGMENT, after.selectedSegment, COOKIE_OPTS);
+        setCookie(COOKIE_SEGMENT, after.selectedSegment, cookieOpts());
       }
       updateParam(PARAM_SEGMENT, after.selectedSegment);
       sendPreprEvent("segment_changed", {
@@ -1872,9 +1896,9 @@ function createChangeHandler(deps) {
     }
     if (before.selectedVariant !== after.selectedVariant) {
       if (after.selectedVariant === null) {
-        removeCookie(COOKIE_VARIANT);
+        removeCookie(COOKIE_VARIANT, "/", crossSiteCookieOptions());
       } else {
-        setCookie(COOKIE_VARIANT, after.selectedVariant, COOKIE_OPTS);
+        setCookie(COOKIE_VARIANT, after.selectedVariant, cookieOpts());
       }
       updateParam(PARAM_VARIANT, after.selectedVariant);
       sendPreprEvent("variant_changed", {
@@ -1900,8 +1924,8 @@ function createChangeHandler(deps) {
       if (Object.keys(coupled).length > 0) {
         store.set(coupled);
       }
-      setCookie(COOKIE_PREVIEW_MODE, String(after.previewMode), COOKIE_OPTS);
-      setCookie(COOKIE_TOOLBAR_OPEN, "false", COOKIE_OPTS);
+      setCookie(COOKIE_PREVIEW_MODE, String(after.previewMode), cookieOpts());
+      setCookie(COOKIE_TOOLBAR_OPEN, "false", cookieOpts());
       sendPreprEvent("preview_mode_toggled", { previewMode: after.previewMode });
       syncAutoClean(after.previewMode);
       const [path, existing] = splitPath(deps.currentPath());
@@ -1916,7 +1940,7 @@ function createChangeHandler(deps) {
       }
     }
     if (before.toolbarOpen !== after.toolbarOpen) {
-      setCookie(COOKIE_TOOLBAR_OPEN, String(after.toolbarOpen), COOKIE_OPTS);
+      setCookie(COOKIE_TOOLBAR_OPEN, String(after.toolbarOpen), cookieOpts());
     }
   };
 }

package/dist/index.cjs

@@ -43,7 +43,7 @@ __export(src_exports, {
 module.exports = __toCommonJS(src_exports);
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -67,16 +67,34 @@ function getCookie(name) {
 }
 function setCookie(name, value, options = {}) {
   if (typeof document === "undefined") return;
-  const { maxAge, path = "/" } = options;
+  const { maxAge, path = "/", sameSite, secure } = options;
   let cookie = `${name}=${encodeURIComponent(value)};path=${path}`;
   if (typeof maxAge === "number") {
     cookie += `;max-age=${maxAge}`;
   }
+  if (sameSite) {
+    cookie += `;samesite=${sameSite}`;
+  }
+  if (secure) {
+    cookie += ";secure";
+  }
   document.cookie = cookie;
 }
-function removeCookie(name, path = "/") {
+function removeCookie(name, path = "/", options = {}) {
   if (typeof document === "undefined") return;
-  document.cookie = `${name}=;path=${path};expires=Thu, 01 Jan 1970 00:00:00 GMT`;
+  const { sameSite, secure } = options;
+  let cookie = `${name}=;path=${path};expires=Thu, 01 Jan 1970 00:00:00 GMT`;
+  if (sameSite) {
+    cookie += `;samesite=${sameSite}`;
+  }
+  if (secure) {
+    cookie += ";secure";
+  }
+  document.cookie = cookie;
+}
+function crossSiteCookieOptions() {
+  if (typeof window === "undefined" || !window.isSecureContext) return {};
+  return { sameSite: "None", secure: true };
 }
 
 // src/core/locales/en.json
@@ -933,7 +951,13 @@ function createToolbarStore(initial = {}) {
 }
 
 // src/core/toolbar-change-handler.ts
-var COOKIE_OPTS = { maxAge: ONE_YEAR_SECONDS, path: "/" };
+function cookieOpts() {
+  return {
+    maxAge: ONE_YEAR_SECONDS,
+    path: "/",
+    ...crossSiteCookieOptions()
+  };
+}
 function createChangeHandler(deps) {
   const { store, stega, syncAutoClean } = deps;
   function updateParam(name, value) {
@@ -950,9 +974,9 @@ function createChangeHandler(deps) {
   return function handleChange(before, after) {
     if (before.selectedSegment !== after.selectedSegment) {
       if (after.selectedSegment === null) {
-        removeCookie(COOKIE_SEGMENT);
+        removeCookie(COOKIE_SEGMENT, "/", crossSiteCookieOptions());
       } else {
-        setCookie(COOKIE_SEGMENT, after.selectedSegment, COOKIE_OPTS);
+        setCookie(COOKIE_SEGMENT, after.selectedSegment, cookieOpts());
       }
       updateParam(PARAM_SEGMENT, after.selectedSegment);
       sendPreprEvent("segment_changed", {
@@ -961,9 +985,9 @@ function createChangeHandler(deps) {
     }
     if (before.selectedVariant !== after.selectedVariant) {
       if (after.selectedVariant === null) {
-        removeCookie(COOKIE_VARIANT);
+        removeCookie(COOKIE_VARIANT, "/", crossSiteCookieOptions());
       } else {
-        setCookie(COOKIE_VARIANT, after.selectedVariant, COOKIE_OPTS);
+        setCookie(COOKIE_VARIANT, after.selectedVariant, cookieOpts());
       }
       updateParam(PARAM_VARIANT, after.selectedVariant);
       sendPreprEvent("variant_changed", {
@@ -989,8 +1013,8 @@ function createChangeHandler(deps) {
       if (Object.keys(coupled).length > 0) {
         store.set(coupled);
       }
-      setCookie(COOKIE_PREVIEW_MODE, String(after.previewMode), COOKIE_OPTS);
-      setCookie(COOKIE_TOOLBAR_OPEN, "false", COOKIE_OPTS);
+      setCookie(COOKIE_PREVIEW_MODE, String(after.previewMode), cookieOpts());
+      setCookie(COOKIE_TOOLBAR_OPEN, "false", cookieOpts());
       sendPreprEvent("preview_mode_toggled", { previewMode: after.previewMode });
       syncAutoClean(after.previewMode);
       const [path, existing] = splitPath(deps.currentPath());
@@ -1005,7 +1029,7 @@ function createChangeHandler(deps) {
       }
     }
     if (before.toolbarOpen !== after.toolbarOpen) {
-      setCookie(COOKIE_TOOLBAR_OPEN, String(after.toolbarOpen), COOKIE_OPTS);
+      setCookie(COOKIE_TOOLBAR_OPEN, String(after.toolbarOpen), cookieOpts());
     }
   };
 }
@@ -2271,7 +2295,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -2320,6 +2348,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -2338,7 +2375,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -2350,7 +2388,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }

package/dist/index.d.cts

@@ -5,7 +5,7 @@ export { f as PreprEnvironment, g as PreprEventType, h as PreprHeaderName, i as
  * Package version; must match package.json. Lives in its own leaf module so
  * core can import it without cycling through the barrel.
  */
-declare const VERSION = "0.1.0-beta.3";
+declare const VERSION = "0.1.0-beta.4";
 
 interface ToolbarState {
     locale: Locale;
@@ -160,6 +160,15 @@ interface CookieSpec {
     value: string;
     maxAge: number;
     path: string;
+    /**
+     * Set to `'None'` for cookies that must survive the Prepr editor's
+     * cross-site preview iframe — browsers drop the browser-default `Lax`
+     * cookies there. Always paired with `secure`, which browsers require for
+     * `SameSite=None`.
+     */
+    sameSite?: 'Strict' | 'Lax' | 'None';
+    /** Adds `Secure`. Required by browsers alongside `SameSite=None`. */
+    secure?: boolean;
 }
 interface PreprMiddlewareResult {
     requestHeaders: Headers;

package/dist/index.d.ts

@@ -5,7 +5,7 @@ export { f as PreprEnvironment, g as PreprEventType, h as PreprHeaderName, i as
  * Package version; must match package.json. Lives in its own leaf module so
  * core can import it without cycling through the barrel.
  */
-declare const VERSION = "0.1.0-beta.3";
+declare const VERSION = "0.1.0-beta.4";
 
 interface ToolbarState {
     locale: Locale;
@@ -160,6 +160,15 @@ interface CookieSpec {
     value: string;
     maxAge: number;
     path: string;
+    /**
+     * Set to `'None'` for cookies that must survive the Prepr editor's
+     * cross-site preview iframe — browsers drop the browser-default `Lax`
+     * cookies there. Always paired with `secure`, which browsers require for
+     * `SameSite=None`.
+     */
+    sameSite?: 'Strict' | 'Lax' | 'None';
+    /** Adds `Secure`. Required by browsers alongside `SameSite=None`. */
+    secure?: boolean;
 }
 interface PreprMiddlewareResult {
     requestHeaders: Headers;

package/dist/index.js

@@ -16,10 +16,10 @@ import {
   setTrackingParam,
   stegaClean,
   trackEvent
-} from "./chunk-5JGPWQVA.js";
+} from "./chunk-3FOY6KL4.js";
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/server.ts
 var PreprError = class extends Error {
@@ -198,7 +198,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -247,6 +251,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -265,7 +278,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -277,7 +291,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }

package/dist/nextjs/components.cjs

@@ -48,16 +48,34 @@ function getCookie(name) {
 }
 function setCookie(name, value, options = {}) {
   if (typeof document === "undefined") return;
-  const { maxAge, path = "/" } = options;
+  const { maxAge, path = "/", sameSite, secure } = options;
   let cookie = `${name}=${encodeURIComponent(value)};path=${path}`;
   if (typeof maxAge === "number") {
     cookie += `;max-age=${maxAge}`;
   }
+  if (sameSite) {
+    cookie += `;samesite=${sameSite}`;
+  }
+  if (secure) {
+    cookie += ";secure";
+  }
   document.cookie = cookie;
 }
-function removeCookie(name, path = "/") {
+function removeCookie(name, path = "/", options = {}) {
   if (typeof document === "undefined") return;
-  document.cookie = `${name}=;path=${path};expires=Thu, 01 Jan 1970 00:00:00 GMT`;
+  const { sameSite, secure } = options;
+  let cookie = `${name}=;path=${path};expires=Thu, 01 Jan 1970 00:00:00 GMT`;
+  if (sameSite) {
+    cookie += `;samesite=${sameSite}`;
+  }
+  if (secure) {
+    cookie += ";secure";
+  }
+  document.cookie = cookie;
+}
+function crossSiteCookieOptions() {
+  if (typeof window === "undefined" || !window.isSecureContext) return {};
+  return { sameSite: "None", secure: true };
 }
 
 // src/core/locales/en.json
@@ -910,7 +928,13 @@ function createToolbarStore(initial = {}) {
 }
 
 // src/core/toolbar-change-handler.ts
-var COOKIE_OPTS = { maxAge: ONE_YEAR_SECONDS, path: "/" };
+function cookieOpts() {
+  return {
+    maxAge: ONE_YEAR_SECONDS,
+    path: "/",
+    ...crossSiteCookieOptions()
+  };
+}
 function createChangeHandler(deps) {
   const { store, stega, syncAutoClean } = deps;
   function updateParam(name, value) {
@@ -927,9 +951,9 @@ function createChangeHandler(deps) {
   return function handleChange(before, after) {
     if (before.selectedSegment !== after.selectedSegment) {
       if (after.selectedSegment === null) {
-        removeCookie(COOKIE_SEGMENT);
+        removeCookie(COOKIE_SEGMENT, "/", crossSiteCookieOptions());
       } else {
-        setCookie(COOKIE_SEGMENT, after.selectedSegment, COOKIE_OPTS);
+        setCookie(COOKIE_SEGMENT, after.selectedSegment, cookieOpts());
       }
       updateParam(PARAM_SEGMENT, after.selectedSegment);
       sendPreprEvent("segment_changed", {
@@ -938,9 +962,9 @@ function createChangeHandler(deps) {
     }
     if (before.selectedVariant !== after.selectedVariant) {
       if (after.selectedVariant === null) {
-        removeCookie(COOKIE_VARIANT);
+        removeCookie(COOKIE_VARIANT, "/", crossSiteCookieOptions());
       } else {
-        setCookie(COOKIE_VARIANT, after.selectedVariant, COOKIE_OPTS);
+        setCookie(COOKIE_VARIANT, after.selectedVariant, cookieOpts());
       }
       updateParam(PARAM_VARIANT, after.selectedVariant);
       sendPreprEvent("variant_changed", {
@@ -966,8 +990,8 @@ function createChangeHandler(deps) {
       if (Object.keys(coupled).length > 0) {
         store.set(coupled);
       }
-      setCookie(COOKIE_PREVIEW_MODE, String(after.previewMode), COOKIE_OPTS);
-      setCookie(COOKIE_TOOLBAR_OPEN, "false", COOKIE_OPTS);
+      setCookie(COOKIE_PREVIEW_MODE, String(after.previewMode), cookieOpts());
+      setCookie(COOKIE_TOOLBAR_OPEN, "false", cookieOpts());
       sendPreprEvent("preview_mode_toggled", { previewMode: after.previewMode });
       syncAutoClean(after.previewMode);
       const [path, existing] = splitPath(deps.currentPath());
@@ -982,7 +1006,7 @@ function createChangeHandler(deps) {
       }
     }
     if (before.toolbarOpen !== after.toolbarOpen) {
-      setCookie(COOKIE_TOOLBAR_OPEN, String(after.toolbarOpen), COOKIE_OPTS);
+      setCookie(COOKIE_TOOLBAR_OPEN, String(after.toolbarOpen), cookieOpts());
     }
   };
 }

package/dist/nextjs/components.js

@@ -2,7 +2,7 @@
 import {
   createPreprToolbar,
   loadTrackingPixel
-} from "../chunk-5JGPWQVA.js";
+} from "../chunk-3FOY6KL4.js";
 
 // src/nextjs/components.ts
 import { usePathname, useRouter } from "next/navigation";

package/dist/nextjs/index.cjs

@@ -38,7 +38,7 @@ module.exports = __toCommonJS(nextjs_exports);
 var import_server = require("next/server");
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -77,7 +77,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -126,6 +130,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -144,7 +157,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -156,7 +170,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -183,7 +198,10 @@ function createPreprMiddleware(request, responseOrOptions, maybeOptions) {
   for (const cookie of responseCookies) {
     response.cookies.set(cookie.name, cookie.value, {
       maxAge: cookie.maxAge,
-      path: cookie.path
+      path: cookie.path,
+      // Lower-cased: Next's cookie API expects 'none' | 'lax' | 'strict'.
+      ...cookie.sameSite ? { sameSite: cookie.sameSite.toLowerCase() } : {},
+      ...cookie.secure ? { secure: true } : {}
     });
   }
   return response;

package/dist/nextjs/index.js

@@ -2,7 +2,7 @@
 import { NextResponse } from "next/server";
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -41,7 +41,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -90,6 +94,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -108,7 +121,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -120,7 +134,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -147,7 +162,10 @@ function createPreprMiddleware(request, responseOrOptions, maybeOptions) {
   for (const cookie of responseCookies) {
     response.cookies.set(cookie.name, cookie.value, {
       maxAge: cookie.maxAge,
-      path: cookie.path
+      path: cookie.path,
+      // Lower-cased: Next's cookie API expects 'none' | 'lax' | 'strict'.
+      ...cookie.sameSite ? { sameSite: cookie.sameSite.toLowerCase() } : {},
+      ...cookie.secure ? { secure: true } : {}
     });
   }
   return response;

package/dist/nuxt/index.cjs

@@ -35,7 +35,7 @@ __export(nuxt_exports, {
 module.exports = __toCommonJS(nuxt_exports);
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -56,6 +56,20 @@ var UTM_PARAMS = [
   "utm_content",
   "utm_campaign"
 ];
+function serializeCookie(cookie) {
+  const parts = [
+    `${cookie.name}=${encodeURIComponent(cookie.value)}`,
+    `Max-Age=${cookie.maxAge}`,
+    `Path=${cookie.path}`
+  ];
+  if (cookie.sameSite) {
+    parts.push(`SameSite=${cookie.sameSite}`);
+  }
+  if (cookie.secure) {
+    parts.push("Secure");
+  }
+  return parts.join("; ");
+}
 function parseCookies(request) {
   const cookies = /* @__PURE__ */ new Map();
   const header = request.headers.get("cookie");
@@ -74,7 +88,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -123,6 +141,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -141,7 +168,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -153,7 +181,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -179,12 +208,7 @@ function handlePreprRequest(event, options) {
   });
   event.context[PREPR_CONTEXT_KEY] = requestHeaders;
   for (const cookie of responseCookies) {
-    const parts = [
-      `${cookie.name}=${encodeURIComponent(cookie.value)}`,
-      `Max-Age=${cookie.maxAge}`,
-      `Path=${cookie.path}`
-    ];
-    event.node.res.appendHeader("Set-Cookie", parts.join("; "));
+    event.node.res.appendHeader("Set-Cookie", serializeCookie(cookie));
   }
 }
 function getPreprHeadersFromEvent(event) {

package/dist/nuxt/index.js

@@ -1,5 +1,5 @@
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -20,6 +20,20 @@ var UTM_PARAMS = [
   "utm_content",
   "utm_campaign"
 ];
+function serializeCookie(cookie) {
+  const parts = [
+    `${cookie.name}=${encodeURIComponent(cookie.value)}`,
+    `Max-Age=${cookie.maxAge}`,
+    `Path=${cookie.path}`
+  ];
+  if (cookie.sameSite) {
+    parts.push(`SameSite=${cookie.sameSite}`);
+  }
+  if (cookie.secure) {
+    parts.push("Secure");
+  }
+  return parts.join("; ");
+}
 function parseCookies(request) {
   const cookies = /* @__PURE__ */ new Map();
   const header = request.headers.get("cookie");
@@ -38,7 +52,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -87,6 +105,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -105,7 +132,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -117,7 +145,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -143,12 +172,7 @@ function handlePreprRequest(event, options) {
   });
   event.context[PREPR_CONTEXT_KEY] = requestHeaders;
   for (const cookie of responseCookies) {
-    const parts = [
-      `${cookie.name}=${encodeURIComponent(cookie.value)}`,
-      `Max-Age=${cookie.maxAge}`,
-      `Path=${cookie.path}`
-    ];
-    event.node.res.appendHeader("Set-Cookie", parts.join("; "));
+    event.node.res.appendHeader("Set-Cookie", serializeCookie(cookie));
   }
 }
 function getPreprHeadersFromEvent(event) {

package/dist/sveltekit/index.cjs

@@ -35,7 +35,7 @@ __export(sveltekit_exports, {
 module.exports = __toCommonJS(sveltekit_exports);
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -56,6 +56,20 @@ var UTM_PARAMS = [
   "utm_content",
   "utm_campaign"
 ];
+function serializeCookie(cookie) {
+  const parts = [
+    `${cookie.name}=${encodeURIComponent(cookie.value)}`,
+    `Max-Age=${cookie.maxAge}`,
+    `Path=${cookie.path}`
+  ];
+  if (cookie.sameSite) {
+    parts.push(`SameSite=${cookie.sameSite}`);
+  }
+  if (cookie.secure) {
+    parts.push("Secure");
+  }
+  return parts.join("; ");
+}
 function parseCookies(request) {
   const cookies = /* @__PURE__ */ new Map();
   const header = request.headers.get("cookie");
@@ -74,7 +88,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -123,6 +141,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -141,7 +168,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -153,7 +181,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -173,12 +202,7 @@ function preprHandle(options) {
     }
     const response = await resolve(event);
     for (const cookie of responseCookies) {
-      const parts = [
-        `${cookie.name}=${encodeURIComponent(cookie.value)}`,
-        `Max-Age=${cookie.maxAge}`,
-        `Path=${cookie.path}`
-      ];
-      response.headers.append("Set-Cookie", parts.join("; "));
+      response.headers.append("Set-Cookie", serializeCookie(cookie));
     }
     return response;
   };

package/dist/sveltekit/index.js

@@ -1,5 +1,5 @@
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.4";
 
 // src/core/constants.ts
 var COOKIE_PREVIEW_MODE = "Prepr-Preview-Mode";
@@ -20,6 +20,20 @@ var UTM_PARAMS = [
   "utm_content",
   "utm_campaign"
 ];
+function serializeCookie(cookie) {
+  const parts = [
+    `${cookie.name}=${encodeURIComponent(cookie.value)}`,
+    `Max-Age=${cookie.maxAge}`,
+    `Path=${cookie.path}`
+  ];
+  if (cookie.sameSite) {
+    parts.push(`SameSite=${cookie.sameSite}`);
+  }
+  if (cookie.secure) {
+    parts.push("Secure");
+  }
+  return parts.join("; ");
+}
 function parseCookies(request) {
   const cookies = /* @__PURE__ */ new Map();
   const header = request.headers.get("cookie");
@@ -38,7 +52,11 @@ function processPreprRequest(request, opts) {
   const requestHeaders = new Headers(request.headers);
   const responseCookies = [];
   const requestCookies = parseCookies(request);
-  const searchParams = new URL(request.url).searchParams;
+  const url = new URL(request.url);
+  const searchParams = url.searchParams;
+  const forwardedProto = request.headers.get("x-forwarded-proto")?.split(",")[0]?.trim();
+  const isSecure = forwardedProto ? forwardedProto === "https" : url.protocol === "https:";
+  const crossSite = isSecure ? { sameSite: "None", secure: true } : {};
   for (const key of UTM_PARAMS) {
     const value = searchParams.get(key);
     if (value !== null) {
@@ -87,6 +105,15 @@ function processPreprRequest(request, opts) {
   }
   requestHeaders.set("Prepr-Preview-Bar", "true");
   const isLivePreview = searchParams.get(PARAM_HIDE_BAR) === "true";
+  if (!isLivePreview && !requestCookies.has(COOKIE_PREVIEW_MODE)) {
+    responseCookies.push({
+      name: COOKIE_PREVIEW_MODE,
+      value: "true",
+      maxAge: ONE_YEAR_SECONDS,
+      path: "/",
+      ...crossSite
+    });
+  }
   if (!isLivePreview) {
     const segmentCookie = requestCookies.get(COOKIE_SEGMENT);
     if (segmentCookie) {
@@ -105,7 +132,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -117,7 +145,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_SEGMENT,
         value: previewSegment,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -137,12 +166,7 @@ function preprHandle(options) {
     }
     const response = await resolve(event);
     for (const cookie of responseCookies) {
-      const parts = [
-        `${cookie.name}=${encodeURIComponent(cookie.value)}`,
-        `Max-Age=${cookie.maxAge}`,
-        `Path=${cookie.path}`
-      ];
-      response.headers.append("Set-Cookie", parts.join("; "));
+      response.headers.append("Set-Cookie", serializeCookie(cookie));
     }
     return response;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@preprio/toolkit",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.4",
   "description": "Prepr personalization, A/B testing and preview toolkit for Next.js, Nuxt, Astro, SvelteKit and Express",
   "license": "MIT",
   "repository": {