opacacms 0.3.4 → 0.3.6

package/dist/cli/index.js

@@ -2017,12 +2017,12 @@ var init_init = __esm(() => {
       }
       const srcDir = fs3.existsSync(resolve(targetDir, "src")) ? "src/" : "";
       const nextPathPrefix = framework === "nextjs" ? `${srcDir}app/(opaca)/` : "";
-      const cfPathPrefix = framework === "cloudflare-workers" ? "src/" : "";
+      const cfPathPrefix = framework === "cloudflare-workers" ? "src/(opaca)/" : "";
       const pathPrefix = framework === "nextjs" ? nextPathPrefix : cfPathPrefix;
       const configCode = `import { defineConfig } from 'opacacms/config';
 ${dbImport}
-import { posts } from './${pathPrefix}opaca/collections/posts';
-import { siteSettings } from './${pathPrefix}opaca/globals/site-settings';
+import { posts } from './${pathPrefix}_collections/posts';
+import { siteSettings } from './${pathPrefix}_globals/site-settings';
 
 ${dbType === "d1" ? `const getConfig = (env: any, request: Request) => defineConfig({
   appName: "My OpacaCMS App",
@@ -2074,13 +2074,13 @@ export const siteSettings = defineGlobal({
       writeFile("opaca.config.ts", configCode);
       if (framework === "nextjs") {
         const baseDir = `${srcDir}app/(opaca)`;
-        createDir(`${baseDir}/opaca/collections`);
-        createDir(`${baseDir}/opaca/globals`);
-        createDir(`${baseDir}/api/opaca/[[...slug]]`);
+        createDir(`${baseDir}/_collections`);
+        createDir(`${baseDir}/_globals`);
+        createDir(`${baseDir}/api/[[...slug]]`);
         createDir(`${baseDir}/admin/[[...slug]]`);
-        writeFile(`${baseDir}/opaca/collections/posts.ts`, postsCode);
-        writeFile(`${baseDir}/opaca/globals/site-settings.ts`, globalsCode);
-        const importSteps = srcDir ? "../../../../../../" : "../../../../../";
+        writeFile(`${baseDir}/_collections/posts.ts`, postsCode);
+        writeFile(`${baseDir}/_globals/site-settings.ts`, globalsCode);
+        const importSteps = srcDir ? "../../../../../" : "../../../../";
         const routeCode = `import { createNextHandler } from 'opacacms/runtimes/next';
 import config from '${importSteps}opaca.config';
 
@@ -2093,7 +2093,7 @@ export const PATCH = handler.PATCH;
 export const DELETE = handler.DELETE;
 export const OPTIONS = handler.OPTIONS;
 `;
-        writeFile(`${baseDir}/api/opaca/[[...slug]]/route.ts`, routeCode);
+        writeFile(`${baseDir}/api/[[...slug]]/route.ts`, routeCode);
         const pageCode = `'use client';
 
 import { useEffect, useState } from 'react';
@@ -2136,10 +2136,10 @@ export default function Page() {
 `;
         writeFile(`${baseDir}/admin/[[...slug]]/page.tsx`, pageCode);
       } else if (framework === "cloudflare-workers") {
-        createDir("src/opaca/collections");
-        createDir("src/opaca/globals");
-        writeFile("src/opaca/collections/posts.ts", postsCode);
-        writeFile("src/opaca/globals/site-settings.ts", globalsCode);
+        createDir("src/(opaca)/_collections");
+        createDir("src/(opaca)/_globals");
+        writeFile("src/(opaca)/_collections/posts.ts", postsCode);
+        writeFile("src/(opaca)/_globals/site-settings.ts", globalsCode);
         const indexCode = `import { createCloudflareWorkersHandler } from "opacacms/runtimes/cloudflare-workers";
 import config from "../opaca.config";
 
@@ -2147,11 +2147,11 @@ export default createCloudflareWorkersHandler(config, { enableAdmin: true });
 `;
         writeFile("src/index.ts", indexCode);
       } else if (framework === "nuxt") {
-        createDir("opaca/collections");
-        createDir("opaca/globals");
+        createDir("(opaca)/_collections");
+        createDir("(opaca)/_globals");
         createDir("server/api/opaca");
-        writeFile("opaca/collections/posts.ts", postsCode);
-        writeFile("opaca/globals/site-settings.ts", globalsCode);
+        writeFile("(opaca)/_collections/posts.ts", postsCode);
+        writeFile("(opaca)/_globals/site-settings.ts", globalsCode);
         const routeCode = `import { createAPIRouter } from 'opacacms/server/router';
 import config from '../../../opaca.config';
 
@@ -2162,10 +2162,10 @@ export default defineEventHandler(async (event) => {
 `;
         writeFile("server/api/opaca/[...slug].ts", routeCode);
       } else {
-        createDir("opaca/collections");
-        createDir("opaca/globals");
-        writeFile("opaca/collections/posts.ts", postsCode);
-        writeFile("opaca/globals/site-settings.ts", globalsCode);
+        createDir("(opaca)/_collections");
+        createDir("(opaca)/_globals");
+        writeFile("(opaca)/_collections/posts.ts", postsCode);
+        writeFile("(opaca)/_globals/site-settings.ts", globalsCode);
         const serverCode = `import { createBunHandler } from 'opacacms/runtimes/bun';
 import config from './opaca.config';
 
@@ -2183,12 +2183,24 @@ console.log('\uD83D\uDE80 OpacaCMS Backend Listening on http://localhost:3001');
             pkg.dependencies = {};
           if (!pkg.dependencies.opacacms) {
             pkg.dependencies.opacacms = "latest";
-            fs3.writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, 2));
           }
+          if (dbType === "sqlite") {
+            if (!pkg.dependencies["better-sqlite3"])
+              pkg.dependencies["better-sqlite3"] = "latest";
+          } else if (dbType === "postgres") {
+            if (!pkg.dependencies["postgres"])
+              pkg.dependencies["postgres"] = "latest";
+          } else if (dbType === "d1") {
+            if (!pkg.devDependencies)
+              pkg.devDependencies = {};
+            if (!pkg.devDependencies["@cloudflare/workers-types"])
+              pkg.devDependencies["@cloudflare/workers-types"] = "latest";
+          }
+          fs3.writeFileSync(pkgJsonPath, JSON.stringify(pkg, null, 2));
         } catch (e) {}
       }
       s.stop(`Scaffolding complete!`);
-      Vt2(`1. Check the newly created \`opaca.config.ts\` and \`opaca\` folder.
+      Vt2(`1. Check the newly created \`opaca.config.ts\` and \`(opaca)\` folder.
 2. Run \`npm install\` (or your preferred package manager) to install dependencies.
 3. Start your dev server!`, "Next Steps");
       Gt(`Build something awesome! \uD83C\uDF88`);

package/dist/index.d.ts

@@ -1,7 +1,5 @@
 export * from "./auth";
 export * from "./client";
-export * from "./client/RichText";
-export * from "./client/rich-text-utils";
 export * from "./config";
 export * from "./config-utils";
 export * from "./schema";

package/dist/index.js

@@ -32,134 +32,15 @@ import {
 import"./chunk-jq1drsen.js";
 import"./chunk-h8v093av.js";
 import"./chunk-8sqjbsgt.js";
-// src/client/RichText.tsx
-import { CodeNode } from "@lexical/code";
-import { AutoLinkNode, LinkNode } from "@lexical/link";
-import { ListItemNode, ListNode } from "@lexical/list";
-import { LexicalComposer } from "@lexical/react/LexicalComposer";
-import { ContentEditable } from "@lexical/react/LexicalContentEditable";
-import { LexicalErrorBoundary } from "@lexical/react/LexicalErrorBoundary";
-import { HistoryPlugin } from "@lexical/react/LexicalHistoryPlugin";
-import { LinkPlugin } from "@lexical/react/LexicalLinkPlugin";
-import { ListPlugin } from "@lexical/react/LexicalListPlugin";
-import { RichTextPlugin } from "@lexical/react/LexicalRichTextPlugin";
-import { HeadingNode, QuoteNode } from "@lexical/rich-text";
-import { useMemo } from "react";
-import { jsxDEV } from "react/jsx-dev-runtime";
-"use client";
-var theme = {
-  ltr: "ltr",
-  rtl: "rtl",
-  placeholder: "opaca-rich-text-placeholder",
-  paragraph: "opaca-rich-text-p",
-  quote: "opaca-rich-text-quote",
-  heading: {
-    h1: "opaca-rich-text-h1",
-    h2: "opaca-rich-text-h2",
-    h3: "opaca-rich-text-h3"
-  },
-  list: {
-    ol: "opaca-rich-text-ol",
-    ul: "opaca-rich-text-ul",
-    listitem: "opaca-rich-text-li"
-  },
-  link: "opaca-rich-text-link",
-  text: {
-    bold: "opaca-rich-text-bold",
-    italic: "opaca-rich-text-italic",
-    underline: "opaca-rich-text-underline",
-    strikethrough: "opaca-rich-text-strikethrough",
-    code: "opaca-rich-text-code"
-  }
-};
-function RichText({ content, className }) {
-  const initialConfig = useMemo(() => {
-    let editorState = content;
-    if (typeof content === "string" && content.startsWith("{")) {
-      try {
-        editorState = content;
-      } catch (e) {
-        editorState = undefined;
-      }
-    } else if (typeof content === "object" && content !== null) {
-      editorState = JSON.stringify(content);
-    }
-    return {
-      namespace: "OpacaRichTextRenderer",
-      theme,
-      editable: false,
-      nodes: [HeadingNode, ListNode, ListItemNode, QuoteNode, CodeNode, LinkNode, AutoLinkNode],
-      onError: (error) => {
-        console.error("RichText Renderer Error:", error);
-      },
-      editorState
-    };
-  }, [content]);
-  if (!content)
-    return null;
-  return /* @__PURE__ */ jsxDEV("div", {
-    className: `opaca-rich-text-renderer ${className || ""}`,
-    children: /* @__PURE__ */ jsxDEV(LexicalComposer, {
-      initialConfig,
-      children: [
-        /* @__PURE__ */ jsxDEV(RichTextPlugin, {
-          contentEditable: /* @__PURE__ */ jsxDEV(ContentEditable, {
-            className: "opaca-rich-text-content"
-          }, undefined, false, undefined, this),
-          placeholder: null,
-          ErrorBoundary: LexicalErrorBoundary
-        }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV(ListPlugin, {}, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV(LinkPlugin, {}, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV(HistoryPlugin, {}, undefined, false, undefined, this)
-      ]
-    }, undefined, true, undefined, this)
-  }, undefined, false, undefined, this);
-}
-// src/client/rich-text-utils.ts
-function getRichTextText(content) {
-  if (!content)
-    return "";
-  if (typeof content === "string") {
-    if (content.startsWith("{") && content.includes('"root"')) {
-      try {
-        return getRichTextText(JSON.parse(content));
-      } catch {
-        return content;
-      }
-    }
-    return content;
-  }
-  if (content.root) {
-    return extractLexicalNodes(content.root.children);
-  }
-  if (Array.isArray(content)) {
-    return extractLexicalNodes(content);
-  }
-  return "";
-}
-function extractLexicalNodes(nodes) {
-  if (!nodes || !Array.isArray(nodes))
-    return "";
-  return nodes.map((node) => {
-    if (node.text)
-      return node.text;
-    if (node.children)
-      return extractLexicalNodes(node.children);
-    return "";
-  }).join(" ").replace(/\s+/g, " ").trim();
-}
 export {
   zodToOpacaFields,
   z,
   sanitizeConfig,
-  getRichTextText,
   defineGlobal,
   defineConfig,
   defineCollection,
   createClient,
   createAuth,
-  RichText,
   OpacaError,
   $ZodString,
   $ZodOptional,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opacacms",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "license": "MIT",
   "description": "OpacaCMS: A lightweight, type-safe, and developer-first Headless CMS for the edge and beyond.",
   "keywords": [
@@ -136,17 +136,11 @@
     }
   },
   "devDependencies": {
-    "@aws-sdk/client-s3": "^3.1009.0",
-    "@aws-sdk/s3-request-presigner": "^3.1009.0",
-    "@better-auth/api-key": "^1.5.5",
-    "@better-auth/core": "^1.5.5",
     "@cloudflare/workers-types": "^4.20260313.1",
     "@faker-js/faker": "^10.3.0",
     "@happy-dom/global-registrator": "^20.8.4",
-    "@hono-rate-limiter/cloudflare": "^0.2.2",
     "@hono/bun-transpiler": "^0.2.1",
     "@hono/esbuild-transpiler": "^0.1.4",
-    "@hono/node-server": "^1.19.11",
     "@lexical/code": "^0.41.0",
     "@lexical/history": "^0.41.0",
     "@lexical/html": "^0.41.0",
@@ -162,7 +156,6 @@
     "@nanostores/react": "^1.0.0",
     "@nanostores/router": "^1.0.0",
     "@r2wc/react-to-web-component": "^2.1.1",
-    "@scalar/hono-api-reference": "^0.10.4",
     "@tanstack/react-form": "^1.28.5",
     "@testing-library/dom": "^10.4.1",
     "@testing-library/react": "^16.3.2",
@@ -170,22 +163,15 @@
     "@types/bun": "latest",
     "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
-    "better-sqlite3": "^12.6.2",
     "bun-plugin-scss": "^1.0.0",
     "class-variance-authority": "^0.7.1",
-    "dotenv": "^17.3.1",
     "esbuild": "^0.27.4",
     "esbuild-wasm": "^0.27.4",
     "happy-dom": "^20.8.4",
     "hono": "^4.12.7",
-    "ky": "^1.14.3",
-    "kysely-bun-sqlite": "^0.4.0",
-    "kysely-d1": "^0.4.0",
-    "kysely-postgres-js": "^3.0.0",
     "lexical": "^0.41.0",
     "lucide-react": "^0.577.0",
     "nanostores": "^1.1.1",
-    "postgres": "^3.4.8",
     "radix-ui": "^1.4.3",
     "sass": "^1.98.0",
     "zod": "^4.3.6",
@@ -197,24 +183,50 @@
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "typescript": "^5.9.3",
-    "zod": "^4.3.6"
+    "zod": "^4.3.6",
+    "@aws-sdk/client-s3": "^3.1009.0",
+    "@aws-sdk/s3-request-presigner": "^3.1009.0",
+    "better-sqlite3": "^12.6.2",
+    "kysely-bun-sqlite": "^0.4.0",
+    "kysely-d1": "^0.4.0",
+    "kysely-postgres-js": "^3.0.0",
+    "postgres": "^3.4.8"
   },
   "peerDependenciesMeta": {
-    "@hono/graphql-server": {
+    "@aws-sdk/client-s3": {
       "optional": true
     },
-    "graphql": {
+    "@aws-sdk/s3-request-presigner": {
       "optional": true
     },
-    "hono-rate-limiter": {
+    "better-sqlite3": {
+      "optional": true
+    },
+    "kysely-bun-sqlite": {
+      "optional": true
+    },
+    "kysely-d1": {
+      "optional": true
+    },
+    "kysely-postgres-js": {
+      "optional": true
+    },
+    "postgres": {
       "optional": true
     }
   },
   "dependencies": {
+    "@better-auth/api-key": "^1.5.5",
+    "@better-auth/core": "^1.5.5",
+    "@hono-rate-limiter/cloudflare": "^0.2.2",
     "@hono/graphql-server": "^0.7.0",
+    "@hono/node-server": "^1.19.11",
+    "@scalar/hono-api-reference": "^0.10.4",
     "better-auth": "^1.5.5",
+    "dotenv": "^17.3.1",
     "graphql": "^16.13.1",
     "hono-rate-limiter": "^0.5.3",
+    "ky": "^1.14.3",
     "kysely": "^0.28.11",
     "zod-to-json-schema": "^3.25.1"
   },