okno 1.0.0-beta.18 → 1.0.0-beta.20

package/dist/editor/index.js

@@ -1018,10 +1018,17 @@ let W9 = class extends St {
     const t = this.currentRepo;
     return t ? `${t.owner}/${t.repo}@${t.branch}` : null;
   }
-  /** X-Okno-Path header — the monorepo subdir. Null (header omitted) at the
-   *  repo root so single-project repos send exactly what they did before. */
+  /** X-Okno-Path header — the monorepo subdir. The baked path describes the
+   *  build's OWN project (bakedRepo), so it's only valid while the editor targets
+   *  that repo. If the user switched to (or the editor auto-picked) a DIFFERENT
+   *  repo, the baked path is meaningless there — send nothing (repo root), or a
+   *  request would read/scaffold `<baked-subdir>/okno` inside the wrong repo (the
+   *  bug that scaffolded a stray root `okno/` into okno-test). Null → header
+   *  omitted → backend treats it as the repo root. */
   get rootHeader() {
-    return this.bakedRoot || null;
+    if (!this.bakedRoot) return null;
+    const t = this.bakedRepo, r = this.currentRepo;
+    return !t || !r ? null : t.owner === r.owner && t.repo === r.repo ? this.bakedRoot : null;
   }
   /** Base URL for CONTENT-engine calls (content/schema/files/publish). In dev
    *  these hit the Vite plugin's local engine (disk + git, no backend); in
@@ -41528,8 +41535,11 @@ class LT {
       try {
         if (this.project.isDev && await this.deriveDevRepo())
           return await this.refresh(), await this.dispatchAfterStatus();
-        if (this.project.currentRepo)
-          return await this.refresh(), await this.dispatchAfterStatus();
+        if (this.project.currentRepo) {
+          await this.refresh();
+          const n = this.project.bakedRepo, i = this.project.currentRepo;
+          return !this.setup.hasInstallation && n && !(n.owner === i.owner && n.repo === i.repo) && (this.project.setCurrentRepo(n), await this.refresh()), await this.dispatchAfterStatus();
+        }
         if (this.project.bakedRepo)
           return this.project.setCurrentRepo(this.project.bakedRepo), await this.refresh(), await this.dispatchAfterStatus();
         await this.fetchInstallations();

package/dist/index.js

@@ -1,4 +1,4 @@
-import { o as a } from "./plugin-HRVyik1g.js";
+import { o as a } from "./plugin-jvqdZWC0.js";
 export {
   a as okno
 };

package/dist/{plugin-HRVyik1g.js → plugin-jvqdZWC0.js}

@@ -1,75 +1,75 @@
-import { extname as Y, join as h, dirname as T, relative as N, sep as I, resolve as g } from "node:path";
-import { existsSync as O, readFileSync as U, mkdirSync as M, writeFileSync as j, cpSync as Q } from "node:fs";
+import { extname as Y, join as h, dirname as P, relative as N, sep as G, resolve as g } from "node:path";
+import { existsSync as O, readFileSync as U, mkdirSync as R, writeFileSync as T, cpSync as Q } from "node:fs";
 import { execSync as K } from "node:child_process";
 import { fileURLToPath as Z } from "node:url";
-import { i as x, g as q, s as E, b as tt, a as et, c as ot, e as nt, d as it, f as rt, h as P, j as A, k as st } from "./dispatch-DKZB5I61.js";
-import { simpleGit as R } from "simple-git";
+import { i as x, g as q, s as v, b as tt, a as et, c as ot, e as nt, d as rt, f as it, h as M, j as $, k as st } from "./dispatch-DKZB5I61.js";
+import { simpleGit as H } from "simple-git";
 import "./acorn-CZBJD705.js";
-function F(n, r, e) {
-  n.statusCode = r, n.setHeader("Content-Type", "application/json"), n.setHeader("Cache-Control", "no-store"), n.end(JSON.stringify(e));
+function F(n, i, e) {
+  n.statusCode = i, n.setHeader("Content-Type", "application/json"), n.setHeader("Cache-Control", "no-store"), n.end(JSON.stringify(e));
 }
 function at(n) {
-  return new Promise((r) => {
+  return new Promise((i) => {
     let e = "";
     n.on("data", (t) => e += t), n.on("end", () => {
       try {
-        r(e ? JSON.parse(e) : {});
+        i(e ? JSON.parse(e) : {});
       } catch {
-        r({});
+        i({});
       }
-    }), n.on("error", () => r({}));
+    }), n.on("error", () => i({}));
   });
 }
 function lt(n) {
-  return new Promise((r, e) => {
+  return new Promise((i, e) => {
     const t = [];
-    n.on("data", (a) => t.push(a)), n.on("end", () => r(Buffer.concat(t))), n.on("error", e);
+    n.on("data", (c) => t.push(c)), n.on("end", () => i(Buffer.concat(t))), n.on("error", e);
   });
 }
-function ct(n, r) {
-  if (r) {
-    for (const e of new Set(r.modules)) {
+function ct(n, i) {
+  if (i) {
+    for (const e of new Set(i.modules)) {
       const t = n.moduleGraph.getModuleById("\0okno:" + e);
       t && n.moduleGraph.invalidateModule(t);
     }
-    for (const e of new Set(r.files))
+    for (const e of new Set(i.files))
       n.moduleGraph.getModulesByFile(e)?.forEach((t) => n.moduleGraph.invalidateModule(t));
   }
 }
-function ut(n, r) {
-  n.middlewares.use(async (e, t, a) => {
-    if (!e.url?.startsWith("/__okno/api/")) return a();
+function ut(n, i) {
+  n.middlewares.use(async (e, t, c) => {
+    if (!e.url?.startsWith("/__okno/api/")) return c();
     const y = e.url.slice(12).split("?")[0], o = {
       method: e.method || "GET",
       route: y,
       json: () => at(e),
       binary: () => lt(e),
-      header: (i) => {
-        const s = e.headers[i];
+      header: (r) => {
+        const s = e.headers[r];
         return Array.isArray(s) ? s[0] : s;
       }
     };
     try {
-      const i = await x(r, o);
-      if (!i) return a();
-      ct(n, i.invalidation), F(t, i.status, i.body);
-    } catch (i) {
-      F(t, 500, { error: i instanceof Error ? i.message : String(i) });
+      const r = await x(i, o);
+      if (!r) return c();
+      ct(n, r.invalidation), F(t, r.status, r.body);
+    } catch (r) {
+      F(t, 500, { error: r instanceof Error ? r.message : String(r) });
     }
   });
 }
-function dt(n, r) {
+function dt(n, i) {
   let e;
   try {
-    e = decodeURIComponent(r);
+    e = decodeURIComponent(i);
   } catch {
     return null;
   }
   if (!e || e.includes("\0")) return null;
-  const t = g(n, "files"), a = g(t, e);
-  return a === t || !a.startsWith(t + I) ? null : a;
+  const t = g(n, "files"), c = g(t, e);
+  return c === t || !c.startsWith(t + G) ? null : c;
 }
-const H = "okno", ft = {
+const B = "okno", ft = {
   ".webp": "image/webp",
   ".png": "image/png",
   ".jpg": "image/jpeg",
@@ -90,80 +90,80 @@ const H = "okno", ft = {
   ".ttf": "font/ttf",
   ".otf": "font/otf"
 };
-function pt(n, r) {
-  ut(n, r), n.middlewares.use((e, t, a) => {
-    if (e.method !== "GET" || !e.url?.startsWith("/okno/files/")) return a();
+function pt(n, i) {
+  ut(n, i), n.middlewares.use((e, t, c) => {
+    if (e.method !== "GET" || !e.url?.startsWith("/okno/files/")) return c();
     const y = e.url.slice(12).split("?")[0];
-    if (!y) return a();
-    const o = dt(r, y);
+    if (!y) return c();
+    const o = dt(i, y);
     if (!o)
       return t.statusCode = 403, t.end("Forbidden");
     if (!O(o))
       return t.statusCode = 404, t.end("Not found");
-    const i = Y(o).toLowerCase();
-    t.setHeader("Content-Type", ft[i] || "application/octet-stream"), t.setHeader("Cache-Control", "public, max-age=3600"), t.end(U(o));
-  }), n.middlewares.use(async (e, t, a) => {
-    if (!e.url?.startsWith("/__okno/")) return a();
+    const r = Y(o).toLowerCase();
+    t.setHeader("Content-Type", ft[r] || "application/octet-stream"), t.setHeader("Cache-Control", "public, max-age=3600"), t.end(U(o));
+  }), n.middlewares.use(async (e, t, c) => {
+    if (!e.url?.startsWith("/__okno/")) return c();
     const y = e.url.slice(8);
     t.setHeader("Cache-Control", "no-store, no-cache, must-revalidate, proxy-revalidate"), t.setHeader("Pragma", "no-cache"), t.setHeader("Expires", "0");
     try {
       if (e.method === "GET" && y === "repo") {
         t.setHeader("Content-Type", "application/json");
         try {
-          const o = R(n.config.root), i = (await o.remote(["get-url", "origin"]))?.toString().trim(), s = (await o.revparse(["--abbrev-ref", "HEAD"])).trim(), { owner: f, repo: l } = gt(i);
+          const o = H(n.config.root), r = (await o.remote(["get-url", "origin"]))?.toString().trim(), s = (await o.revparse(["--abbrev-ref", "HEAD"])).trim(), { owner: f, repo: a } = gt(r);
           return t.end(
-            JSON.stringify({ ok: !0, owner: f, repo: l, branch: s || null, remote: i || null })
+            JSON.stringify({ ok: !0, owner: f, repo: a, branch: s || null, remote: r || null })
           );
         } catch (o) {
           return t.end(JSON.stringify({ ok: !1, error: String(o) }));
         }
       }
       if (e.method === "POST" && y.startsWith("mirror")) {
-        const i = new URL(e.url, "http://localhost").searchParams.get("path");
-        if (!i || i.includes("..") || !i.startsWith("files/"))
+        const r = new URL(e.url, "http://localhost").searchParams.get("path");
+        if (!r || r.includes("..") || !r.startsWith("files/"))
           return t.statusCode = 400, t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ error: "Invalid path" }));
-        const s = h(r, i);
+        const s = h(i, r);
         if (O(s))
           return t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, skipped: !0 }));
         const f = await mt(e);
-        return M(T(s), { recursive: !0 }), j(s, f), t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, written: i, bytes: f.length }));
+        return R(P(s), { recursive: !0 }), T(s, f), t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, written: r, bytes: f.length }));
       }
       if (e.method === "POST" && y === "sync") {
-        const i = (await ht(e))?.path;
-        if (i) {
-          if (i.includes("..") || i.includes("\0"))
+        const r = (await ht(e))?.path;
+        if (r) {
+          if (r.includes("..") || r.includes("\0"))
             return t.statusCode = 400, t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ error: "Invalid path" }));
-          const u = h(r, i);
+          const u = h(i, r);
           try {
-            const c = R(r);
-            await c.fetch("origin", H);
-            const m = (await c.revparse(["--show-toplevel"])).trim(), p = N(m, u).split(I).join("/"), w = await c.show([`origin/${H}:${p}`]);
-            M(T(u), { recursive: !0 }), j(u, w);
-          } catch (c) {
-            const m = c instanceof Error ? c.message : String(c);
+            const l = H(i);
+            await l.fetch("origin", B);
+            const m = (await l.revparse(["--show-toplevel"])).trim(), p = N(m, u).split(G).join("/"), w = await l.show([`origin/${B}:${p}`]);
+            R(P(u), { recursive: !0 }), T(u, w);
+          } catch (l) {
+            const m = l instanceof Error ? l.message : String(l);
             console.warn(
-              `[okno] sync: could not materialize ${i} from origin/${H} — ${m.split(`
+              `[okno] sync: could not materialize ${r} from origin/${B} — ${m.split(`
 `)[0]}`
             );
           }
-          return D(n, i, u), t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, invalidated: i }));
+          return D(n, r, u), t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, invalidated: r }));
         }
-        const s = R(r), f = await s.revparse(["--show-toplevel"]), l = N(f.trim(), r);
+        const s = H(i), f = await s.revparse(["--show-toplevel"]), a = N(f.trim(), i);
         try {
           const u = await s.pull();
-          for (const c of u.files)
-            if (c.startsWith(`${l}/`)) {
-              const m = c.slice(`${l}/`.length), p = h(r, m);
+          for (const l of u.files)
+            if (l.startsWith(`${a}/`)) {
+              const m = l.slice(`${a}/`.length), p = h(i, m);
               D(n, m, p);
             }
           return t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, files: u.files }));
         } catch (u) {
-          const c = u instanceof Error ? u.message : String(u);
-          return console.warn(`[okno] sync: git pull skipped — ${c.split(`
-`)[0]}`), t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, pullSkipped: !0, reason: c }));
+          const l = u instanceof Error ? u.message : String(u);
+          return console.warn(`[okno] sync: git pull skipped — ${l.split(`
+`)[0]}`), t.setHeader("Content-Type", "application/json"), t.end(JSON.stringify({ ok: !0, pullSkipped: !0, reason: l }));
         }
       }
-      a();
+      c();
     } catch (o) {
       t.statusCode = 500, t.end(JSON.stringify({ error: String(o) }));
     }
@@ -171,53 +171,53 @@ function pt(n, r) {
 }
 function gt(n) {
   if (!n) return { owner: null, repo: null };
-  const r = n.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
-  return r ? { owner: r[1], repo: r[2] } : { owner: null, repo: null };
+  const i = n.match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
+  return i ? { owner: i[1], repo: i[2] } : { owner: null, repo: null };
 }
 function mt(n) {
-  return new Promise((r, e) => {
+  return new Promise((i, e) => {
     const t = [];
-    n.on("data", (a) => t.push(a)), n.on("end", () => r(Buffer.concat(t))), n.on("error", e);
+    n.on("data", (c) => t.push(c)), n.on("end", () => i(Buffer.concat(t))), n.on("error", e);
   });
 }
 function ht(n) {
-  return new Promise((r) => {
+  return new Promise((i) => {
     let e = "";
     n.on("data", (t) => {
       e += t;
     }), n.on("end", () => {
       try {
-        r(e ? JSON.parse(e) : null);
+        i(e ? JSON.parse(e) : null);
       } catch {
-        r(null);
+        i(null);
       }
-    }), n.on("error", () => r(null));
+    }), n.on("error", () => i(null));
   });
 }
-function D(n, r, e) {
+function D(n, i, e) {
   const t = "\0okno:";
-  let a;
-  if (r.startsWith("pages/") ? a = t + "pages" : r.startsWith("collections/") ? a = t + "collections" : r.startsWith("globals/") && (a = t + "globals"), a) {
-    const y = n.moduleGraph.getModuleById(a);
+  let c;
+  if (i.startsWith("pages/") ? c = t + "pages" : i.startsWith("collections/") ? c = t + "collections" : i.startsWith("globals/") && (c = t + "globals"), c) {
+    const y = n.moduleGraph.getModuleById(c);
     y && n.moduleGraph.invalidateModule(y);
     const o = n.moduleGraph.getModulesByFile(e);
-    o && o.forEach((i) => {
-      n.moduleGraph.invalidateModule(i);
+    o && o.forEach((r) => {
+      n.moduleGraph.invalidateModule(r);
     });
   }
 }
-function yt(n, r) {
-  const e = (n.split("?")[0] ?? "").replace(/\\/g, "/"), t = r.replace(/\\/g, "/");
+function yt(n, i) {
+  const e = (n.split("?")[0] ?? "").replace(/\\/g, "/"), t = i.replace(/\\/g, "/");
   return e === t || e.startsWith(t + "/");
 }
-function wt(n, r) {
-  for (const [e, t] of Object.entries(r)) {
+function wt(n, i) {
+  for (const [e, t] of Object.entries(i)) {
     if (n === e) return t;
     if (n.startsWith(e + "/")) return t + n.slice(e.length);
   }
   return null;
 }
-const bt = "okno:", _ = "\0okno:", St = /* @__PURE__ */ new Set(["pages", "collections", "globals", "locales", "strings", "content"]), V = T(Z(import.meta.url)), _t = JSON.parse(U(g(V, "../package.json"), "utf-8")).version, L = q(), b = g(V, "../editor"), B = g(b, "index.ts"), Ot = O(B), kt = {
+const bt = "okno:", S = "\0okno:", _t = /* @__PURE__ */ new Set(["pages", "collections", "globals", "locales", "strings", "content"]), V = P(Z(import.meta.url)), St = JSON.parse(U(g(V, "../package.json"), "utf-8")).version, L = q(), b = g(V, "../editor"), I = g(b, "index.ts"), Ot = O(I), kt = {
   "@modules": g(b, "modules"),
   "@lib": g(b, "lib"),
   "@logger": g(b, "lib/logger.svelte.ts"),
@@ -229,39 +229,51 @@ const bt = "okno:", _ = "\0okno:", St = /* @__PURE__ */ new Set(["pages", "colle
   "@pages": g(b, "pages"),
   "@controllers": g(b, "controllers")
 };
-function vt() {
+function Et() {
   try {
-    const n = (a) => K(a, { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim(), e = n("git remote get-url origin").match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
-    if (!e) return null;
-    const t = n("git rev-parse --abbrev-ref HEAD") || "main";
-    return `${e[1]}/${e[2]}@${t}`;
+    const n = (t) => K(t, { encoding: "utf-8", stdio: ["ignore", "pipe", "ignore"] }).trim(), e = n("git remote get-url origin").match(/github\.com[:/]([^/]+)\/([^/]+?)(?:\.git)?\/?$/);
+    return e ? `${e[1]}/${e[2]}@${vt(n)}` : null;
   } catch {
     return null;
   }
 }
-function Et() {
+function vt(n) {
+  let i = "";
+  try {
+    i = n("git rev-parse --abbrev-ref HEAD");
+  } catch {
+  }
+  if (i && i !== "HEAD") return i;
+  const e = process.env;
+  return e.CF_PAGES_BRANCH || // Cloudflare Pages
+  e.VERCEL_GIT_COMMIT_REF || // Vercel
+  e.BRANCH || // Netlify
+  e.GITHUB_REF_NAME || // GitHub Actions
+  "main";
+}
+function Nt() {
   try {
     const n = K("git rev-parse --show-toplevel", {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
-    return N(n, process.cwd()).split(I).join("/");
+    return N(n, process.cwd()).split(G).join("/");
   } catch {
     return "";
   }
 }
-function jt(n = {}) {
-  const r = n.dir ?? "okno";
-  let e, t, a = !1, y = !1;
+function It(n = {}) {
+  const i = n.dir ?? "okno";
+  let e, t, c = !1, y = !1;
   return n.isEditor, {
     name: "okno",
     enforce: "pre",
-    config(o, i) {
-      const s = i.command === "serve";
-      return y = i.command === "build", a = s && Ot, {
+    config(o, r) {
+      const s = r.command === "serve";
+      return y = r.command === "build", c = s && Ot, {
         define: {
           __OKNO_API_URL__: JSON.stringify(n.apiUrl ?? "https://api.okno.build"),
-          __OKNO_VERSION__: JSON.stringify(_t),
+          __OKNO_VERSION__: JSON.stringify(St),
           // True when the consumer is running `vite dev` / `astro dev` /
           // `sveltekit dev` — anything that serves locally. Replaced at
           // consumer build time so the prebuilt editor bundle can honor
@@ -275,12 +287,12 @@ function jt(n = {}) {
           // auto-targets its repo with no picker. null outside a git
           // checkout → editor falls back to the picker. Dev ignores it
           // (runtime /__okno/repo derivation is more current).
-          __OKNO_REPO__: JSON.stringify(vt()),
+          __OKNO_REPO__: JSON.stringify(Et()),
           // Monorepo root path: the build dir relative to the git root (e.g.
           // "apps/site", or "" at the repo root). Sent as X-Okno-Path so the
           // hosted backend reads/writes content under `<root>/okno` instead of
           // the repo-root `okno` — one repo, many okno projects keyed (repo, path).
-          __OKNO_ROOT__: JSON.stringify(Et())
+          __OKNO_ROOT__: JSON.stringify(Nt())
         },
         // Source mode (monorepo dev only): skip prebundling so saves to
         // `package/editor/**` propagate via HMR instead of needing
@@ -289,7 +301,7 @@ function jt(n = {}) {
         // identically-named tsconfig aliases (`@components`, `@lib`, …). They
         // are instead resolved per-importer in `resolveId`, scoped to imports
         // originating inside the editor source tree. See editor-aliases.ts.
-        ...a && {
+        ...c && {
           optimizeDeps: { exclude: ["okno", "okno/editor"] }
         },
         server: {
@@ -302,7 +314,7 @@ function jt(n = {}) {
             // the backend mirrored saves to disk, causing spurious full
             // reloads. In production-mode the backend never touches local
             // FS so blocking those is pure harm — pulls go unseen.)
-            ignored: [`**/${r}/files/**`, `**/${r}/.okno-tree.json`]
+            ignored: [`**/${i}/files/**`, `**/${i}/.okno-tree.json`]
           },
           // Source mode: the editor loads via a dynamic `import("okno/editor")`
           // from a separate package over `@fs`, so Vite's startup dep scan
@@ -311,22 +323,22 @@ function jt(n = {}) {
           // re-optimize that 404s the now-stale prebundled chunks. Warming the
           // editor entry forces that crawl at startup, so those deps land in
           // the first optimize pass and never re-bundle under the user.
-          ...a && {
-            warmup: { clientFiles: [B] }
+          ...c && {
+            warmup: { clientFiles: [I] }
           }
         }
       };
     },
     configResolved(o) {
-      e = o.root, t = g(e, r);
+      e = o.root, t = g(e, i);
     },
     async buildStart() {
       if (O(t)) {
-        if (await P(t, e), y) {
+        if (await M(t, e), y) {
           const o = h(t, "files");
           if (O(o)) {
-            const i = O(h(e, "static")) ? h(e, "static") : h(e, "public"), s = h(i, "okno", "files");
-            g(s) !== g(o) && (M(s, { recursive: !0 }), Q(o, s, {
+            const r = O(h(e, "static")) ? h(e, "static") : h(e, "public"), s = h(r, "okno", "files");
+            g(s) !== g(o) && (R(s, { recursive: !0 }), Q(o, s, {
               recursive: !0,
               filter: (f) => !f.endsWith(".okno-tree.json")
             }));
@@ -334,7 +346,7 @@ function jt(n = {}) {
         }
         if (n.demo) {
           const o = h(e, "public");
-          O(o) || M(o, { recursive: !0 }), j(
+          O(o) || R(o, { recursive: !0 }), T(
             h(o, "okno-demo.json"),
             JSON.stringify(st(t))
           );
@@ -343,140 +355,140 @@ function jt(n = {}) {
     },
     configureServer(o) {
       pt(o, t);
-      const i = (f) => {
-        const l = N(t, f);
-        if (l.startsWith("..") || !l.endsWith(".ts")) return;
-        const u = l.split(/[\\/]/)[0];
+      const r = (f) => {
+        const a = N(t, f);
+        if (a.startsWith("..") || !a.endsWith(".ts")) return;
+        const u = a.split(/[\\/]/)[0];
         if (u !== "pages" && u !== "collections" && u !== "globals") return;
-        const c = o.moduleGraph.getModuleById(_ + u);
-        c && o.moduleGraph.invalidateModule(c), o.moduleGraph.getModulesByFile(f)?.forEach((m) => o.moduleGraph.invalidateModule(m)), !A(f) && o.ws.send({ type: "full-reload" });
+        const l = o.moduleGraph.getModuleById(S + u);
+        l && o.moduleGraph.invalidateModule(l), o.moduleGraph.getModulesByFile(f)?.forEach((m) => o.moduleGraph.invalidateModule(m)), !$(f) && o.ws.send({ type: "full-reload" });
       };
-      o.watcher.on("add", i), o.watcher.on("unlink", i), o.middlewares.use("/__okno/imports", async (f, l, u) => {
+      o.watcher.on("add", r), o.watcher.on("unlink", r), o.middlewares.use("/__okno/imports", async (f, a, u) => {
         if (f.method !== "GET") return u();
         try {
-          const [c, m, p] = await Promise.all([
-            E(e, "pages"),
-            E(e, "globals"),
-            E(e, "collections")
+          const [l, m, p] = await Promise.all([
+            v(e, "pages"),
+            v(e, "globals"),
+            v(e, "collections")
           ]);
-          l.setHeader("Content-Type", "application/json"), l.setHeader("Cache-Control", "no-store"), l.end(JSON.stringify({
-            pages: Array.from(c),
+          a.setHeader("Content-Type", "application/json"), a.setHeader("Cache-Control", "no-store"), a.end(JSON.stringify({
+            pages: Array.from(l),
             globals: Array.from(m),
             collections: Array.from(p)
           }));
-        } catch (c) {
-          u(c);
+        } catch (l) {
+          u(l);
         }
       });
       const s = "/__okno_bootstrap.js";
-      o.middlewares.use(s, async (f, l, u) => {
+      o.middlewares.use(s, async (f, a, u) => {
         try {
-          const c = await o.transformRequest("\0okno:bootstrap");
-          if (!c) {
-            l.statusCode = 500, l.end("okno bootstrap transform failed");
+          const l = await o.transformRequest("\0okno:bootstrap");
+          if (!l) {
+            a.statusCode = 500, a.end("okno bootstrap transform failed");
             return;
           }
-          l.setHeader("content-type", "text/javascript"), l.end(c.code);
-        } catch (c) {
-          u(c);
+          a.setHeader("content-type", "text/javascript"), a.end(l.code);
+        } catch (l) {
+          u(l);
         }
-      }), o.middlewares.use((f, l, u) => {
-        const c = "<script>window.__oknoDev=true<\/script>", m = n.demo ? "<script>window.__oknoDemo=true<\/script>" : "", p = `${c}${m}<script type="module" src="${s}"><\/script>`, w = [];
+      }), o.middlewares.use((f, a, u) => {
+        const l = "<script>window.__oknoDev=true<\/script>", m = n.demo ? "<script>window.__oknoDemo=true<\/script>" : "", p = `${l}${m}<script type="module" src="${s}"><\/script>`, w = [];
         let k = null;
-        const X = l.write.bind(l), G = l.end.bind(l), z = l.setHeader.bind(l), W = () => {
-          const d = l.getHeader("content-type");
+        const X = a.write.bind(a), j = a.end.bind(a), z = a.setHeader.bind(a), W = () => {
+          const d = a.getHeader("content-type");
           return typeof d == "string" && d.includes("text/html");
-        }, J = (d, S) => Buffer.isBuffer(d) ? d : d instanceof Uint8Array ? Buffer.from(d.buffer, d.byteOffset, d.byteLength) : typeof d == "string" ? Buffer.from(d, S || "utf-8") : Buffer.from(String(d));
-        l.write = (d, S, ...C) => (k === null && (k = W()), k ? (d && w.push(J(d, typeof S == "string" ? S : void 0)), !0) : X(d, S, ...C)), l.end = (d, S, ...C) => {
-          if (k === null && (k = W()), !k) return G(d, S, ...C);
-          d && w.push(J(d, typeof S == "string" ? S : void 0));
-          let v = Buffer.concat(w).toString("utf-8");
-          v.includes(p) || (v = v.includes("</body>") ? v.replace("</body>", `${p}</body>`) : v + p);
-          const $ = Buffer.from(v, "utf-8");
-          if (!l.headersSent)
+        }, J = (d, _) => Buffer.isBuffer(d) ? d : d instanceof Uint8Array ? Buffer.from(d.buffer, d.byteOffset, d.byteLength) : typeof d == "string" ? Buffer.from(d, _ || "utf-8") : Buffer.from(String(d));
+        a.write = (d, _, ...C) => (k === null && (k = W()), k ? (d && w.push(J(d, typeof _ == "string" ? _ : void 0)), !0) : X(d, _, ...C)), a.end = (d, _, ...C) => {
+          if (k === null && (k = W()), !k) return j(d, _, ...C);
+          d && w.push(J(d, typeof _ == "string" ? _ : void 0));
+          let E = Buffer.concat(w).toString("utf-8");
+          E.includes(p) || (E = E.includes("</body>") ? E.replace("</body>", `${p}</body>`) : E + p);
+          const A = Buffer.from(E, "utf-8");
+          if (!a.headersSent)
             try {
-              z("content-length", String($.length));
+              z("content-length", String(A.length));
             } catch {
             }
-          return G($, ...C);
+          return j(A, ...C);
         }, u();
       });
     },
     async handleHotUpdate(o) {
-      const i = h(t, "schema.ts"), s = h(t, "users.json"), f = h(t, "permissions.ts"), l = h(t, "modules.d.ts");
-      if (o.file === i) {
-        await P(t, e);
+      const r = h(t, "schema.ts"), s = h(t, "users.json"), f = h(t, "permissions.ts"), a = h(t, "modules.d.ts");
+      if (o.file === r) {
+        await M(t, e);
         for (const p of ["pages", "collections", "globals", "locales", "content", "strings"]) {
-          const w = o.server.moduleGraph.getModuleById(_ + p);
+          const w = o.server.moduleGraph.getModuleById(S + p);
           w && o.server.moduleGraph.invalidateModule(w);
         }
         return [];
       }
-      if (o.file === s || o.file === f || o.file === l)
+      if (o.file === s || o.file === f || o.file === a)
         return [];
-      const u = h(t, "strings.ts"), c = N(h(t, "strings"), o.file);
-      if (o.file === u || !c.startsWith("..") && c.endsWith(".ts")) {
-        await P(t, e);
+      const u = h(t, "strings.ts"), l = N(h(t, "strings"), o.file);
+      if (o.file === u || !l.startsWith("..") && l.endsWith(".ts")) {
+        await M(t, e);
         for (const p of ["strings", "content"]) {
-          const w = o.server.moduleGraph.getModuleById(_ + p);
+          const w = o.server.moduleGraph.getModuleById(S + p);
           w && o.server.moduleGraph.invalidateModule(w);
         }
       }
       const m = N(t, o.file);
       if (!m.startsWith("..") && m.endsWith(".ts")) {
         const p = m.split(/[\\/]/)[0];
-        if ((p === "pages" || p === "collections" || p === "globals") && A(o.file)) {
-          const w = o.server.moduleGraph.getModuleById(_ + p);
+        if ((p === "pages" || p === "collections" || p === "globals") && $(o.file)) {
+          const w = o.server.moduleGraph.getModuleById(S + p);
           return w && o.server.moduleGraph.invalidateModule(w), [];
         }
       }
     },
-    async resolveId(o, i) {
+    async resolveId(o, r) {
       if (o.startsWith(bt))
         return "\0" + o;
       if (o.startsWith("okno/")) {
         const s = o.slice(5);
-        if (St.has(s)) return _ + s;
+        if (_t.has(s)) return S + s;
       }
-      if (a && o === "okno/editor")
-        return B;
-      if (a && i && yt(i, b)) {
+      if (c && o === "okno/editor")
+        return I;
+      if (c && r && yt(r, b)) {
         const s = wt(o, kt);
         if (s)
-          return (await this.resolve(s, i, { skipSelf: !0 }))?.id;
+          return (await this.resolve(s, r, { skipSelf: !0 }))?.id;
       }
     },
     async load(o) {
-      if (!o.startsWith(_)) return;
-      const i = o.slice(_.length);
-      if (i === "runtime") {
+      if (!o.startsWith(S)) return;
+      const r = o.slice(S.length);
+      if (r === "runtime") {
         if (!L)
           throw new Error("okno: runtime/wrap.js missing — run `bun run build:pkg`");
         return L;
       }
-      if (i === "bootstrap")
+      if (r === "bootstrap")
         return 'import("okno/editor")';
-      if (i === "pages") {
-        const s = await E(e, "pages");
+      if (r === "pages") {
+        const s = await v(e, "pages");
         return await tt(t, s);
       }
-      if (i === "collections") {
-        const s = await E(e, "collections");
+      if (r === "collections") {
+        const s = await v(e, "collections");
         return await et(t, s, y);
       }
-      if (i === "globals") {
-        const s = await E(e, "globals");
+      if (r === "globals") {
+        const s = await v(e, "globals");
         return await ot(t, s);
       }
-      if (i === "locales")
+      if (r === "locales")
         return nt(t);
-      if (i === "strings")
-        return await it(t);
-      if (i === "content")
-        return rt();
+      if (r === "strings")
+        return await rt(t);
+      if (r === "content")
+        return it();
     }
   };
 }
 export {
-  jt as o
+  It as o
 };

package/dist/vite/index.js

@@ -1,4 +1,4 @@
-import { o as a } from "../plugin-HRVyik1g.js";
+import { o as a } from "../plugin-jvqdZWC0.js";
 export {
   a as okno
 };

package/dist/vite/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AA8FpD,wBAAgB,IAAI,CAAC,MAAM,GAAE,UAAe,GAAG,MAAM,CAsZpD"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../src/vite/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAClC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAA;AAoHpD,wBAAgB,IAAI,CAAC,MAAM,GAAE,UAAe,GAAG,MAAM,CAsZpD"}

package/package.json

@@ -2,7 +2,7 @@
 	"name": "okno",
 	"description": "Git-backed CMS with live editing for any Vite framework",
 	"author": "Gabriel Uhlíř",
-	"version": "1.0.0-beta.18",
+	"version": "1.0.0-beta.20",
 	"homepage": "https://okno.build",
 	"type": "module",
 	"types": "./dist/index.d.ts",