opacacms 0.3.5 → 0.3.7

package/dist/cli/index.js

@@ -1937,6 +1937,14 @@ var init_init = __esm(() => {
       Wt2(import_picocolors.default.bgBlue(import_picocolors.default.white(" Welcome to OpacaCMS Setup! ")));
       const targetDir = args.target ? resolve(process.cwd(), args.target) : process.cwd();
       const pkgJsonPath = resolve(targetDir, "package.json");
+      const existingConfigs = ["opaca.config.ts", "opacacms.config.ts", "opaca.config.js"];
+      for (const config of existingConfigs) {
+        if (fs3.existsSync(resolve(targetDir, config))) {
+          Vt2(`Found an existing ${config} in the directory. OpacaCMS is already initialized!`);
+          Gt(import_picocolors.default.yellow("Initialization skipped."));
+          process.exit(0);
+        }
+      }
       let framework = detectFramework(pkgJsonPath);
       if (framework !== "unknown") {
         const confirmFramework = await Rt({
@@ -1973,11 +1981,12 @@ var init_init = __esm(() => {
       const dbType = await Jt({
         message: "Which database would you like to use?",
         options: [
-          { value: "sqlite", label: "SQLite (Local/Bun)" },
+          { value: "bun-sqlite", label: "Bun SQLite (Fastest, requires Bun runtime)" },
+          { value: "better-sqlite3", label: "Better SQLite3 (Standard Node.js)" },
           { value: "d1", label: "Cloudflare D1" },
           { value: "postgres", label: "PostgreSQL" }
         ],
-        initialValue: framework === "cloudflare-workers" ? "d1" : "sqlite"
+        initialValue: framework === "cloudflare-workers" ? "d1" : "bun-sqlite"
       });
       if (Ct(dbType)) {
         Nt("Operation cancelled.");
@@ -1995,8 +2004,11 @@ var init_init = __esm(() => {
       s.start(`Generating boilerplate for ${framework}...`);
       let dbImport = "";
       let dbInit = "";
-      if (dbType === "sqlite") {
-        dbImport = `import { createSQLiteAdapter } from 'opacacms/db/sqlite';`;
+      if (dbType === "bun-sqlite") {
+        dbImport = `import { createBunSQLiteAdapter } from 'opacacms/db/bun-sqlite';`;
+        dbInit = `createBunSQLiteAdapter('local.db')`;
+      } else if (dbType === "better-sqlite3") {
+        dbImport = `import { createSQLiteAdapter } from 'opacacms/db/better-sqlite';`;
         dbInit = `createSQLiteAdapter('local.db')`;
       } else if (dbType === "d1") {
         dbImport = `import { createD1Adapter } from 'opacacms/db/d1';`;
@@ -2017,12 +2029,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",
@@ -2073,6 +2085,49 @@ export const siteSettings = defineGlobal({
       };
       writeFile("opaca.config.ts", configCode);
       if (framework === "nextjs") {
+        if (dbType === "better-sqlite3") {
+          const nextConfigs = ["next.config.ts", "next.config.mjs", "next.config.js"];
+          let foundConfig = false;
+          for (const conf of nextConfigs) {
+            const confPath = resolve(targetDir, conf);
+            if (fs3.existsSync(confPath)) {
+              let content = fs3.readFileSync(confPath, "utf-8");
+              if (content.includes("serverExternalPackages")) {
+                if (!content.includes("better-sqlite3")) {
+                  content = content.replace(/serverExternalPackages:\s*\[/, "serverExternalPackages: ['better-sqlite3', ");
+                  fs3.writeFileSync(confPath, content);
+                }
+              } else if (content.includes("const nextConfig = {")) {
+                content = content.replace("const nextConfig = {", `const nextConfig = {
+  serverExternalPackages: ['better-sqlite3'],`);
+                fs3.writeFileSync(confPath, content);
+              } else if (content.includes("const nextConfig: NextConfig = {")) {
+                content = content.replace("const nextConfig: NextConfig = {", `const nextConfig: NextConfig = {
+  serverExternalPackages: ['better-sqlite3'],`);
+                fs3.writeFileSync(confPath, content);
+              } else if (content.includes("module.exports = {")) {
+                content = content.replace("module.exports = {", `module.exports = {
+  serverExternalPackages: ['better-sqlite3'],`);
+                fs3.writeFileSync(confPath, content);
+              } else {
+                Vt2(`Could not automatically modify ${conf}. Please add \`serverExternalPackages: ['better-sqlite3']\` to your Next.js config.`);
+              }
+              foundConfig = true;
+              break;
+            }
+          }
+          if (!foundConfig) {
+            const newNextConfig = `import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+  serverExternalPackages: ["better-sqlite3"]
+};
+
+export default nextConfig;
+`;
+            writeFile("next.config.ts", newNextConfig);
+          }
+        }
         const baseDir = `${srcDir}app/(opaca)`;
         createDir(`${baseDir}/_collections`);
         createDir(`${baseDir}/_globals`);
@@ -2184,7 +2239,13 @@ console.log('\uD83D\uDE80 OpacaCMS Backend Listening on http://localhost:3001');
           if (!pkg.dependencies.opacacms) {
             pkg.dependencies.opacacms = "latest";
           }
-          if (dbType === "sqlite") {
+          if (dbType === "bun-sqlite") {
+            if (!pkg.dependencies["kysely-bun-sqlite"])
+              pkg.dependencies["kysely-bun-sqlite"] = "latest";
+            if (framework === "nextjs" && pkg.scripts && pkg.scripts.dev) {
+              pkg.scripts.dev = pkg.scripts.dev.replace("next dev", "bunx --bun next dev");
+            }
+          } else if (dbType === "better-sqlite3") {
             if (!pkg.dependencies["better-sqlite3"])
               pkg.dependencies["better-sqlite3"] = "latest";
           } else if (dbType === "postgres") {

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.5",
+  "version": "0.3.7",
   "license": "MIT",
   "description": "OpacaCMS: A lightweight, type-safe, and developer-first Headless CMS for the edge and beyond.",
   "keywords": [