@blinkk/root-cms 2.1.2-alpha.0 → 2.2.1-alpha.0

package/dist/app.js

@@ -1,13 +1,89 @@
 // core/app.tsx
 import crypto from "crypto";
 import path from "path";
-import { fileURLToPath } from "url";
 import { render as renderToString } from "preact-render-to-string";
 
+// core/project.ts
+var SCHEMA_MODULES = import.meta.glob(
+  [
+    "/**/*.schema.ts",
+    "!/appengine/**/*.schema.ts",
+    "!/functions/**/*.schema.ts",
+    "!/gae/**/*.schema.ts"
+  ],
+  { eager: true }
+);
+async function getProjectSchemas() {
+  const schemas = {};
+  for (const fileId in SCHEMA_MODULES) {
+    const schemaModule = SCHEMA_MODULES[fileId];
+    if (schemaModule.default) {
+      schemas[fileId] = schemaModule.default;
+    }
+  }
+  return schemas;
+}
+async function getCollectionSchema(collectionId) {
+  if (!testValidCollectionId(collectionId)) {
+    throw new Error(`invalid collection id: ${collectionId}`);
+  }
+  const fileId = `/collections/${collectionId}.schema.ts`;
+  const module = SCHEMA_MODULES[fileId];
+  if (!module.default) {
+    console.warn(`collection schema not exported in: ${fileId}`);
+    return null;
+  }
+  const collection = module.default;
+  collection.id = collectionId;
+  return convertOneOfTypes(collection);
+}
+function testValidCollectionId(id) {
+  return /^[A-Za-z0-9_-]+$/.test(id);
+}
+function convertOneOfTypes(collection) {
+  const clone = structuredClone(collection);
+  const types = clone.types || {};
+  function handleOneOfField(field) {
+    const names = [];
+    (field.types || []).forEach((sub) => {
+      if (typeof sub === "string") {
+        names.push(sub);
+        return;
+      }
+      if (sub.name) {
+        names.push(sub.name);
+        if (!types[sub.name]) {
+          types[sub.name] = sub;
+          if (sub.fields) {
+            walk(sub);
+          }
+        }
+      }
+    });
+    field.types = names;
+  }
+  function handleField(field) {
+    if (field.type === "oneof") {
+      handleOneOfField(field);
+    } else if (field.type === "object") {
+      walk(field);
+    } else if (field.type === "array" && field.of) {
+      handleField(field.of);
+    }
+  }
+  function walk(schema) {
+    const fields = schema?.fields || [];
+    fields.forEach(handleField);
+  }
+  walk(clone);
+  clone.types = types;
+  return clone;
+}
+
 // package.json
 var package_default = {
   name: "@blinkk/root-cms",
-  version: "2.1.2-alpha.0",
+  version: "3.0.0",
   author: "s@blinkk.com",
   license: "MIT",
   engines: {
@@ -61,8 +137,8 @@ var package_default = {
     build: 'rm -rf dist && concurrently -n "core,signin,ui" npm:build:core npm:build:signin npm:build:ui',
     "build:core": "tsup-node --config=./core/tsup.config.ts",
     "//": "NOTE: esbuild is used here because tsup doesn't currently support aliases.",
-    "build:ui": "esbuild ui/ui.tsx --bundle --minify --alias:react=@preact/compat --alias:react-dom=@preact/compat --tsconfig=ui/tsconfig.json --outdir=dist/ui",
-    "build:signin": "esbuild signin/signin.tsx --bundle --minify --tsconfig=signin/tsconfig.json --outdir=dist/ui",
+    "build:ui": "esbuild ui/ui.tsx --bundle --minify --alias:react=@preact/compat --alias:react-dom=@preact/compat --tsconfig=ui/tsconfig.json --outdir=dist/ui --legal-comments=external",
+    "build:signin": "esbuild signin/signin.tsx --bundle --minify --tsconfig=signin/tsconfig.json --outdir=dist/ui --legal-comments=external",
     dev: 'rm -rf dist && concurrently -k -n "core,ui" npm:dev:core npm:dev:signin npm:dev:ui',
     "dev:core": "pnpm build:core --watch",
     "dev:signin": "pnpm build:signin --watch",
@@ -131,7 +207,7 @@ var package_default = {
     "@types/jsonwebtoken": "9.0.1",
     "@types/node": "24.3.1",
     concurrently: "7.6.0",
-    esbuild: "0.19.9",
+    esbuild: "0.25.9",
     firebase: "12.2.1",
     "firebase-admin": "13.5.0",
     "firebase-functions": "6.4.0",
@@ -156,7 +232,7 @@ var package_default = {
     yjs: "13.6.27"
   },
   peerDependencies: {
-    "@blinkk/root": "2.1.2-alpha.0",
+    "@blinkk/root": "2.1.1",
     "firebase-admin": ">=11",
     "firebase-functions": ">=4",
     preact: ">=10",
@@ -169,86 +245,17 @@ var package_default = {
   }
 };
 
-// core/project.ts
-var SCHEMA_MODULES = import.meta.glob(
-  [
-    "/**/*.schema.ts",
-    "!/appengine/**/*.schema.ts",
-    "!/functions/**/*.schema.ts",
-    "!/gae/**/*.schema.ts"
-  ],
-  { eager: true }
-);
-async function getProjectSchemas() {
-  const schemas = {};
-  for (const fileId in SCHEMA_MODULES) {
-    const schemaModule = SCHEMA_MODULES[fileId];
-    if (schemaModule.default) {
-      schemas[fileId] = schemaModule.default;
-    }
+// core/server-version.ts
+var SERVER_STARTUP_TS = String(Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3));
+function getServerVersion() {
+  if (process.env.NODE_ENV === "development") {
+    return SERVER_STARTUP_TS;
   }
-  return schemas;
-}
-async function getCollectionSchema(collectionId) {
-  if (!testValidCollectionId(collectionId)) {
-    throw new Error(`invalid collection id: ${collectionId}`);
-  }
-  const fileId = `/collections/${collectionId}.schema.ts`;
-  const module = SCHEMA_MODULES[fileId];
-  if (!module.default) {
-    console.warn(`collection schema not exported in: ${fileId}`);
-    return null;
-  }
-  const collection = module.default;
-  collection.id = collectionId;
-  return convertOneOfTypes(collection);
-}
-function testValidCollectionId(id) {
-  return /^[A-Za-z0-9_-]+$/.test(id);
-}
-function convertOneOfTypes(collection) {
-  const clone = structuredClone(collection);
-  const types = clone.types || {};
-  function handleOneOfField(field) {
-    const names = [];
-    (field.types || []).forEach((sub) => {
-      if (typeof sub === "string") {
-        names.push(sub);
-        return;
-      }
-      if (sub.name) {
-        names.push(sub.name);
-        if (!types[sub.name]) {
-          types[sub.name] = sub;
-          if (sub.fields) {
-            walk(sub);
-          }
-        }
-      }
-    });
-    field.types = names;
-  }
-  function handleField(field) {
-    if (field.type === "oneof") {
-      handleOneOfField(field);
-    } else if (field.type === "object") {
-      walk(field);
-    } else if (field.type === "array" && field.of) {
-      handleField(field.of);
-    }
-  }
-  function walk(schema) {
-    const fields = schema?.fields || [];
-    fields.forEach(handleField);
-  }
-  walk(clone);
-  clone.types = types;
-  return clone;
+  return package_default?.version || "root-3.0.0";
 }
 
 // core/app.tsx
 import { jsx, jsxs } from "preact/jsx-runtime";
-var __dirname = path.dirname(fileURLToPath(import.meta.url));
 var DEFAULT_FAVICON_URL = "https://lh3.googleusercontent.com/ijK50TfQlV_yJw3i-CMlnD6osH4PboZBILZrJcWhoNMEmoyCD5e1bAxXbaOPe5w4gG_Scf37EXrmZ6p8sP2lue5fLZ419m5JyLMs=e385-w256";
 function App(props) {
   return /* @__PURE__ */ jsxs("html", { children: [
@@ -356,21 +363,9 @@ async function renderApp(req, res, options) {
   const mainHtml = renderToString(
     /* @__PURE__ */ jsx(App, { title, ctx, favicon: cmsConfig.favicon })
   );
-  let html = `<!doctype html>
-${mainHtml}`;
   const nonce = generateNonce();
-  if (req.viteServer) {
-    const uiCssPath = path.join(__dirname, "ui/ui.css");
-    const uiJsPath = path.join(__dirname, "ui/ui.js");
-    const tpl = html.replace("{CSS_URL}", cachebust(req, `/@fs${uiCssPath}`)).replace("{JS_URL}", cachebust(req, `/@fs${uiJsPath}`)).replaceAll("{NONCE}", nonce);
-    html = await req.viteServer.transformIndexHtml(req.originalUrl, tpl);
-    html = html.replace(
-      '<script type="module" src="/@vite/client"></script>',
-      `<script type="module" src="/@vite/client" nonce="${nonce}"></script>`
-    );
-  } else {
-    html = html.replace("{CSS_URL}", cachebust(req, "/cms/static/ui.css")).replace("{JS_URL}", cachebust(req, "/cms/static/ui.js")).replaceAll("{NONCE}", nonce);
-  }
+  const html = `<!doctype html>
+${mainHtml}`.replace("{CSS_URL}", cachebust(req, "/cms/static/ui.css")).replace("{JS_URL}", cachebust(req, "/cms/static/ui.js")).replaceAll("{NONCE}", nonce);
   res.setHeader("Content-Type", "text/html");
   setSecurityHeaders(options, req, res, nonce);
   res.send(html);
@@ -450,21 +445,9 @@ async function renderSignIn(req, res, options) {
   const mainHtml = renderToString(
     /* @__PURE__ */ jsx(SignIn, { title: "Sign in", ctx, favicon: options.cmsConfig.favicon })
   );
-  let html = `<!doctype html>
-${mainHtml}`;
   const nonce = generateNonce();
-  if (req.viteServer) {
-    const cssPath = path.join(__dirname, "ui/signin.css");
-    const jsPath = path.join(__dirname, "ui/signin.js");
-    const tpl = html.replace("{CSS_URL}", cachebust(req, `/@fs${cssPath}`)).replace("{JS_URL}", cachebust(req, `/@fs${jsPath}`)).replaceAll("{NONCE}", nonce);
-    html = await req.viteServer.transformIndexHtml(req.originalUrl, tpl);
-    html = html.replace(
-      '<script type="module" src="/@vite/client"></script>',
-      `<script type="module" src="/@vite/client" nonce="${nonce}"></script>`
-    );
-  } else {
-    html = html.replace("{CSS_URL}", cachebust(req, "/cms/static/signin.css")).replace("{JS_URL}", cachebust(req, "/cms/static/signin.js")).replaceAll("{NONCE}", nonce);
-  }
+  const html = `<!doctype html>
+${mainHtml}`.replace("{CSS_URL}", cachebust(req, "/cms/static/signin.css")).replace("{JS_URL}", cachebust(req, "/cms/static/signin.js")).replaceAll("{NONCE}", nonce);
   res.setHeader("Content-Type", "text/html");
   setSecurityHeaders(options, req, res, nonce);
   res.status(403);
@@ -523,8 +506,12 @@ function getRefererOrigin(req) {
   return refererOrigin;
 }
 function cachebust(req, url) {
-  const value = req.hostname === "localhost" ? Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3) : package_default.version;
-  return `${url}?c=${value}`;
+  const cb = getServerVersion();
+  const host = req.get("host");
+  if (host?.includes("localhost")) {
+    return `http://${host}${url}?c=${cb}`;
+  }
+  return `${url}?c=${cb}`;
 }
 export {
   getCollection,

package/dist/plugin.js

@@ -370,6 +370,18 @@ import { getFirestore } from "firebase-admin/firestore";
 import * as jsonwebtoken from "jsonwebtoken";
 import sirv from "sirv";
 
+// shared/sse.ts
+var SSEEvent = {
+  /**
+   * First connection event.
+   */
+  CONNECTED: "connected",
+  /**
+   * Changes to any .schema.ts file.
+   */
+  SCHEMA_CHANGED: "schemaChanged"
+};
+
 // core/api.ts
 import { promises as fs2 } from "fs";
 import path3 from "path";
@@ -2413,6 +2425,227 @@ function api(server, options) {
   });
 }
 
+// package.json
+var package_default = {
+  name: "@blinkk/root-cms",
+  version: "3.0.0",
+  author: "s@blinkk.com",
+  license: "MIT",
+  engines: {
+    node: ">=16.0.0"
+  },
+  repository: {
+    type: "git",
+    url: "git+https://github.com/blinkk/rootjs.git",
+    directory: "packages/root-cms"
+  },
+  files: [
+    "dist/**/*"
+  ],
+  bin: {
+    "root-cms": "./bin/root-cms.js"
+  },
+  type: "module",
+  module: "./dist/index.js",
+  types: "./dist/index.d.ts",
+  exports: {
+    ".": {
+      types: "./dist/core.d.ts",
+      import: "./dist/core.js"
+    },
+    "./client": {
+      types: "./dist/client.d.ts",
+      import: "./dist/client.js"
+    },
+    "./core": {
+      types: "./dist/core.d.ts",
+      import: "./dist/core.js"
+    },
+    "./functions": {
+      types: "./dist/functions.d.ts",
+      import: "./dist/functions.js"
+    },
+    "./plugin": {
+      types: "./dist/plugin.d.ts",
+      import: "./dist/plugin.js"
+    },
+    "./project": {
+      types: "./dist/project.d.ts",
+      import: "./dist/project.js"
+    },
+    "./richtext": {
+      types: "./dist/richtext.d.ts",
+      import: "./dist/richtext.js"
+    }
+  },
+  scripts: {
+    build: 'rm -rf dist && concurrently -n "core,signin,ui" npm:build:core npm:build:signin npm:build:ui',
+    "build:core": "tsup-node --config=./core/tsup.config.ts",
+    "//": "NOTE: esbuild is used here because tsup doesn't currently support aliases.",
+    "build:ui": "esbuild ui/ui.tsx --bundle --minify --alias:react=@preact/compat --alias:react-dom=@preact/compat --tsconfig=ui/tsconfig.json --outdir=dist/ui --legal-comments=external",
+    "build:signin": "esbuild signin/signin.tsx --bundle --minify --tsconfig=signin/tsconfig.json --outdir=dist/ui --legal-comments=external",
+    dev: 'rm -rf dist && concurrently -k -n "core,ui" npm:dev:core npm:dev:signin npm:dev:ui',
+    "dev:core": "pnpm build:core --watch",
+    "dev:signin": "pnpm build:signin --watch",
+    "dev:ui": "pnpm build:ui --watch",
+    test: "pnpm build && firebase emulators:exec 'vitest run'",
+    "test:watch": "pnpm build && firebase emulators:exec 'vitest'"
+  },
+  dependencies: {
+    "@genkit-ai/ai": "1.18.0",
+    "@genkit-ai/core": "1.18.0",
+    "@genkit-ai/vertexai": "1.18.0",
+    "@google-cloud/firestore": "7.11.3",
+    "@hello-pangea/dnd": "18.0.1",
+    "body-parser": "1.20.2",
+    commander: "11.0.0",
+    "csv-parse": "5.5.2",
+    "csv-stringify": "6.4.4",
+    diff: "8.0.2",
+    "dts-dom": "3.7.0",
+    "fnv-plus": "1.3.1",
+    genkit: "1.18.0",
+    jsonwebtoken: "9.0.2",
+    kleur: "4.1.5",
+    sirv: "2.0.3",
+    "tiny-glob": "0.2.9",
+    zod: "3.23.8"
+  },
+  "//": "NOTE(stevenle): due to compat issues with mantine and preact, mantine is pinned to v4.2.12",
+  devDependencies: {
+    "@babel/core": "7.17.9",
+    "@blinkk/root": "workspace:*",
+    "@editorjs/editorjs": "2.30.8",
+    "@editorjs/header": "2.8.8",
+    "@editorjs/image": "2.10.2",
+    "@editorjs/list": "2.0.6",
+    "@editorjs/nested-list": "1.4.3",
+    "@editorjs/raw": "2.5.1",
+    "@editorjs/table": "2.4.4",
+    "@editorjs/underline": "1.2.1",
+    "@emotion/react": "11.10.5",
+    "@firebase/app-compat": "0.5.2",
+    "@firebase/app-types": "0.9.3",
+    "@firebase/rules-unit-testing": "5.0.0",
+    "@lexical/code": "0.33.1",
+    "@lexical/html": "0.33.1",
+    "@lexical/link": "0.33.1",
+    "@lexical/list": "0.33.1",
+    "@lexical/markdown": "0.33.1",
+    "@lexical/react": "0.33.1",
+    "@lexical/rich-text": "0.33.1",
+    "@lexical/selection": "0.33.1",
+    "@lexical/utils": "0.33.1",
+    "@mantine/core": "4.2.12",
+    "@mantine/hooks": "4.2.12",
+    "@mantine/modals": "4.2.12",
+    "@mantine/notifications": "4.2.12",
+    "@mantine/spotlight": "4.2.12",
+    "@preact/compat": "17.1.2",
+    "@tabler/icons-preact": "2.47.0",
+    "@types/body-parser": "1.19.3",
+    "@types/fnv-plus": "1.3.2",
+    "@types/gapi": "0.0.47",
+    "@types/gapi.client.drive-v3": "0.0.4",
+    "@types/gapi.client.sheets-v4": "0.0.4",
+    "@types/google.accounts": "0.0.14",
+    "@types/jsonwebtoken": "9.0.1",
+    "@types/node": "24.3.1",
+    concurrently: "7.6.0",
+    esbuild: "0.25.9",
+    firebase: "12.2.1",
+    "firebase-admin": "13.5.0",
+    "firebase-functions": "6.4.0",
+    "firebase-tools": "14.15.2",
+    "highlight.js": "11.6.0",
+    "json-diff-kit": "1.0.29",
+    lexical: "0.33.1",
+    marked: "9.1.1",
+    "mdast-util-from-markdown": "2.0.1",
+    "mdast-util-gfm": "3.0.0",
+    "micromark-extension-gfm": "3.0.0",
+    preact: "10.27.1",
+    "preact-render-to-string": "6.6.1",
+    "preact-router": "4.1.2",
+    react: "npm:@preact/compat@^17.1.2",
+    "react-dom": "npm:@preact/compat@^17.1.2",
+    "react-json-view-compare": "2.0.2",
+    tsup: "8.5.0",
+    typescript: "5.9.2",
+    vite: "7.1.4",
+    vitest: "3.2.4",
+    yjs: "13.6.27"
+  },
+  peerDependencies: {
+    "@blinkk/root": "2.1.1",
+    "firebase-admin": ">=11",
+    "firebase-functions": ">=4",
+    preact: ">=10",
+    "preact-render-to-string": ">=5"
+  },
+  peerDependenciesMeta: {
+    "firebase-functions": {
+      optional: true
+    }
+  }
+};
+
+// core/server-version.ts
+var SERVER_STARTUP_TS = String(Math.floor((/* @__PURE__ */ new Date()).getTime() / 1e3));
+function getServerVersion() {
+  if (process.env.NODE_ENV === "development") {
+    return SERVER_STARTUP_TS;
+  }
+  return package_default?.version || "root-3.0.0";
+}
+
+// core/sse.ts
+function sse(server) {
+  const sseClients = /* @__PURE__ */ new Set();
+  const sseBroadcast = (event, data) => {
+    const message = formatMessage(event, data);
+    sseClients.forEach((res) => {
+      try {
+        res.write(message);
+      } catch (error) {
+        sseClients.delete(res);
+      }
+    });
+  };
+  server.use("/cms/api/sse.connect", async (req, res) => {
+    res.writeHead(200, {
+      "Content-Type": "text/event-stream",
+      "Cache-Control": "no-cache",
+      Connection: "keep-alive",
+      "Access-Control-Allow-Origin": "*",
+      "Access-Control-Allow-Headers": "Cache-Control"
+    });
+    sseClients.add(res);
+    const connectedMessage = formatMessage(
+      SSEEvent.CONNECTED,
+      // Send the server version to notify clients if their current version is
+      // out-of-date.
+      { serverVersion: getServerVersion() }
+    );
+    res.write(connectedMessage);
+    req.on("close", () => {
+      sseClients.delete(res);
+    });
+    req.on("aborted", () => {
+      sseClients.delete(res);
+    });
+  });
+  return { sseBroadcast };
+}
+function formatMessage(event, data) {
+  const lines = [`event: ${event}`];
+  if (data) {
+    lines.push(`data: ${JSON.stringify(data)}`);
+  }
+  const message = lines.join("\n") + "\n\n";
+  return message;
+}
+
 // core/plugin.ts
 var __dirname2 = path5.dirname(fileURLToPath2(import.meta.url));
 async function writeCollectionSchemasToJson(rootConfig) {
@@ -2477,6 +2710,7 @@ function cmsPlugin(options) {
   const firebaseConfig = options.firebaseConfig || {};
   const app = getFirebaseApp(firebaseConfig.projectId);
   const auth = getAuth(app);
+  let sseBroadcast = null;
   function loginRequired(req) {
     const urlPath = String(req.originalUrl).split("?")[0].toLowerCase();
     if (urlPath === "/cms/api/cron.run") {
@@ -2743,6 +2977,10 @@ function cmsPlugin(options) {
       });
       const staticDir = path5.resolve(__dirname2, "ui");
       server.use("/cms/static", sirv(staticDir, { dev: false }));
+      const sseData = sse(server);
+      if (sseData.sseBroadcast) {
+        sseBroadcast = sseData.sseBroadcast;
+      }
       api(server, { getRenderer });
       server.use("/cms", async (req, res) => {
         try {
@@ -2762,13 +3000,19 @@ function cmsPlugin(options) {
       });
     }
   };
-  if (options.watch !== false) {
+  if (process.env.NODE_ENV === "development" && options.watch !== false) {
     plugin.onFileChange = (eventName, filepath) => {
       if (filepath.endsWith(".schema.ts")) {
         Promise.resolve().then(() => (init_generate_types(), generate_types_exports)).then((generateTypesModule) => {
           const generateTypes2 = generateTypesModule.generateTypes;
           generateTypes2();
         });
+        if (sseBroadcast) {
+          const eventData = {
+            file: path5.basename(filepath)
+          };
+          sseBroadcast(SSEEvent.SCHEMA_CHANGED, eventData);
+        }
       }
     };
   }