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

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.5";
 
 // 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
@@ -170,7 +188,11 @@ function t(key, locale, vars) {
 }
 
 // src/core/utils.ts
-function sendPreprEvent(event, data) {
+var trustedParentOrigin = null;
+function setTrustedParentOrigin(origin) {
+  trustedParentOrigin = origin;
+}
+function sendPreprEvent(event, data, options) {
   if (typeof window !== "undefined") {
     const message = {
       name: "prepr_preview_bar",
@@ -181,7 +203,11 @@ function sendPreprEvent(event, data) {
       new CustomEvent("prepr_preview_bar", { detail: message })
     );
     if (window.parent && window.parent !== window) {
-      window.parent.postMessage(message, "*");
+      if (trustedParentOrigin) {
+        window.parent.postMessage(message, trustedParentOrigin);
+      } else if (options?.allowUntrustedTarget) {
+        window.parent.postMessage(message, "*");
+      }
     }
   }
 }
@@ -267,7 +293,23 @@ function createElementCache(query, ttl = 1e3) {
 }
 
 // src/core/iframe-bridge.ts
-function createIframeBridge(store) {
+var EDITOR_BASE_DOMAIN = "prepr.io";
+function isAllowedEditorOrigin(origin, allowed) {
+  if (allowed) return allowed.includes(origin);
+  let url;
+  try {
+    url = new URL(origin);
+  } catch {
+    return false;
+  }
+  if (url.protocol !== "https:" || url.port !== "") return false;
+  const suffix = `.${EDITOR_BASE_DOMAIN}`;
+  if (!url.hostname.endsWith(suffix)) return false;
+  const label = url.hostname.slice(0, -suffix.length);
+  return label.length > 0 && !label.includes(".");
+}
+function createIframeBridge(store, options = {}) {
+  const allowedOrigins = options.allowedEditorOrigins;
   let parentOrigin = null;
   const onKeyDown = (event) => {
     const key = event.key.toLowerCase();
@@ -277,14 +319,16 @@ function createIframeBridge(store) {
   const onMessage = (evt) => {
     const data = evt?.data;
     if (data?.event === "prepr:initVE" && !parentOrigin) {
+      if (!isAllowedEditorOrigin(evt.origin, allowedOrigins)) return;
       parentOrigin = evt.origin;
+      setTrustedParentOrigin(parentOrigin);
       if (data.scrollPosition != null) {
         const top = data.scrollPosition;
         setTimeout(() => window.scrollTo(0, top), 1);
       }
       store.set({ previewMode: true, editMode: data.editMode ?? true });
     }
-    if (evt.origin !== parentOrigin) return;
+    if (!parentOrigin || evt.origin !== parentOrigin) return;
     if (data?.event === "prepr:getScrollPosition") {
       const currentScrollY = window.scrollY || document.documentElement.scrollTop;
       sendPreprEvent("getScrollPosition", { value: currentScrollY });
@@ -292,13 +336,15 @@ function createIframeBridge(store) {
   };
   return {
     start() {
-      sendPreprEvent("loaded");
+      sendPreprEvent("loaded", void 0, { allowUntrustedTarget: true });
       window.addEventListener("keydown", onKeyDown);
       window.addEventListener("message", onMessage);
     },
     stop() {
       window.removeEventListener("keydown", onKeyDown);
       window.removeEventListener("message", onMessage);
+      parentOrigin = null;
+      setTrustedParentOrigin(null);
     }
   };
 }
@@ -933,43 +979,55 @@ 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) {
+  function updateParams(patch) {
     const [path, existing] = splitPath(deps.currentPath());
     const params = new URLSearchParams(existing);
-    if (value === null) {
-      params.delete(name);
-    } else {
-      params.set(name, value);
+    for (const [name, value] of Object.entries(patch)) {
+      if (value === null) {
+        params.delete(name);
+      } else {
+        params.set(name, value);
+      }
     }
     const query = params.toString();
     deps.navigate(query ? `${path}?${query}` : path);
   }
   return function handleChange(before, after) {
+    const paramPatch = {};
     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);
+      paramPatch[PARAM_SEGMENT] = after.selectedSegment;
       sendPreprEvent("segment_changed", {
         segment: after.selectedSegment ?? void 0
       });
     }
     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);
+      paramPatch[PARAM_VARIANT] = after.selectedVariant;
       sendPreprEvent("variant_changed", {
         variant: after.selectedVariant ?? void 0
       });
     }
+    if (Object.keys(paramPatch).length > 0) {
+      updateParams(paramPatch);
+    }
     if (before.editMode !== after.editMode) {
       if (after.editMode) {
         stega.start();
@@ -989,8 +1047,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 +1063,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());
     }
   };
 }
@@ -2075,7 +2133,9 @@ function createPreprToolbar(opts) {
   });
   syncAutoClean(store.get().previewMode);
   const bridge = createIframeBridge(store);
-  sendPreprEvent("getScrollPosition", { value: 0 });
+  sendPreprEvent("getScrollPosition", { value: 0 }, {
+    allowUntrustedTarget: true
+  });
   if (isIframe) {
     bridge.start();
   }
@@ -2271,7 +2331,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 +2384,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 +2411,8 @@ function processPreprRequest(request, opts) {
         name: COOKIE_VARIANT,
         value: previewAb,
         maxAge: ONE_YEAR_SECONDS,
-        path: "/"
+        path: "/",
+        ...crossSite
       });
     }
   }
@@ -2350,7 +2424,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.5";
 
 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.5";
 
 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-NLQIRN5O.js";
 
 // src/version.ts
-var VERSION = "0.1.0-beta.3";
+var VERSION = "0.1.0-beta.5";
 
 // 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/json-script.cjs

@@ -0,0 +1,32 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/core/json-script.ts
+var json_script_exports = {};
+__export(json_script_exports, {
+  serializeForScriptTag: () => serializeForScriptTag
+});
+module.exports = __toCommonJS(json_script_exports);
+function serializeForScriptTag(value) {
+  return JSON.stringify(value ?? null).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  serializeForScriptTag
+});

package/dist/json-script.d.cts

@@ -0,0 +1,17 @@
+/**
+ * Serialize a value for embedding inside `<script type="application/json">`.
+ *
+ * `JSON.stringify` does not escape `<`, `>` or `&`, so a string value
+ * containing `</script>` would close the tag early and let the remainder parse
+ * as HTML — stored XSS whenever any part of the payload is author-controlled
+ * (CMS segment names reach these components verbatim).
+ *
+ * Escaping `<` and `>` as `\uXXXX` keeps the output valid JSON that parses back
+ * to the identical value, while making an early tag close impossible. `&` is
+ * escaped too so the payload is also safe inside HTML-escaping contexts, and
+ * U+2028/U+2029 because they are literal line terminators in JS source but
+ * legal unescaped inside a JSON string.
+ */
+declare function serializeForScriptTag(value: unknown): string;
+
+export { serializeForScriptTag };

package/dist/json-script.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Serialize a value for embedding inside `<script type="application/json">`.
+ *
+ * `JSON.stringify` does not escape `<`, `>` or `&`, so a string value
+ * containing `</script>` would close the tag early and let the remainder parse
+ * as HTML — stored XSS whenever any part of the payload is author-controlled
+ * (CMS segment names reach these components verbatim).
+ *
+ * Escaping `<` and `>` as `\uXXXX` keeps the output valid JSON that parses back
+ * to the identical value, while making an early tag close impossible. `&` is
+ * escaped too so the payload is also safe inside HTML-escaping contexts, and
+ * U+2028/U+2029 because they are literal line terminators in JS source but
+ * legal unescaped inside a JSON string.
+ */
+declare function serializeForScriptTag(value: unknown): string;
+
+export { serializeForScriptTag };

package/dist/json-script.js

@@ -0,0 +1,7 @@
+// src/core/json-script.ts
+function serializeForScriptTag(value) {
+  return JSON.stringify(value ?? null).replace(/</g, "\\u003c").replace(/>/g, "\\u003e").replace(/&/g, "\\u0026").replace(/\u2028/g, "\\u2028").replace(/\u2029/g, "\\u2029");
+}
+export {
+  serializeForScriptTag
+};