create-kyro 0.3.1 → 0.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-kyro",
-  "version": "0.3.1",
+  "version": "0.4.1",
   "description": "Interactive scaffolding for Kyro CMS projects",
   "type": "module",
   "bin": {

package/src/generators/astro.ts

@@ -1,82 +1,19 @@
 import type { Answers } from "../prompts.js";
 
 export function generateAstroConfig(answers: Answers): string {
-  const integrations: string[] = [];
-  const vitePlugins: string[] = [];
-  const vitePluginsLength = vitePlugins.length;
-
-  if (answers.styling === "tailwind") {
-    integrations.push("  react(),");
-    vitePlugins.push("    tailwindcss(),");
-  }
-
-  const adapter = answers.admin
-    ? `
-  adapter: node({
-    mode: 'standalone'
-  }),`
-    : "";
-
-  const nativeExternals = `
-    ssr: {
-      external: [
-        'better-sqlite3',
-        'sharp',
-        'ssh2',
-        'cpu-features',
-        'ssh2-sftp-client',
-        'ioredis',
-        'nodemailer',
-        'jsonwebtoken',
-        '@mapbox/node-pre-gyp',
-        'mock-aws-s3',
-        'aws-sdk',
-        'nock',
-      ],
-    },
-    optimizeDeps: {
-      exclude: [
-        'better-sqlite3',
-        'sharp',
-        'ssh2',
-        'cpu-features',
-        'ssh2-sftp-client',
-        'ioredis',
-        'nodemailer',
-        'jsonwebtoken',
-        '@mapbox/node-pre-gyp',
-        'mock-aws-s3',
-        'aws-sdk',
-        'nock',
-      ],
-    },`;
-
-  const config = `import { defineConfig } from 'astro/config';
-import node from '@astrojs/node';
-${answers.styling === "tailwind" ? "import react from '@astrojs/react';\nimport tailwindcss from '@tailwindcss/vite';" : ""}
+  return `import { defineConfig } from 'astro/config';
+import kyro from '@kyro-cms/core';
+import { kyroAdmin } from '@kyro-cms/admin';
 
 export default defineConfig({
-  output: 'server',${adapter}
-
+  output: 'server',
   integrations: [
-${integrations.join("\n")}
-  ],${
-    vitePluginsLength > 0
-      ? `
-  vite: {
-    plugins: [
-${vitePlugins.join("\n")}
-    ],${nativeExternals}
-  },`
-      : `
-  vite: {${nativeExternals}
-  },`
-  }
+    kyro({ adminPath: '/admin', apiPath: '/api' }),
+    kyroAdmin({ basePath: '/admin', apiPath: '/api' }),
+  ],
   server: {
     port: 4321,
     host: true,
   },
 });`;
-
-  return config;
 }

package/src/generators/config.ts

@@ -2,66 +2,57 @@ import type { Answers } from "../prompts.js";
 
 export function generateKyroConfig(answers: Answers): string {
   const imports: string[] = ["import { defineConfig } from '@kyro-cms/core';"];
-  const adapterLines: string[] = [];
 
   if (answers.database === "sqlite") {
     imports.push("import { createLocalAdapter } from '@kyro-cms/core';");
-    adapterLines.push(`  adapter: createLocalAdapter({ path: './data.db' }),`);
   } else if (answers.database === "postgres") {
     imports.push("import { createDrizzleAdapter } from '@kyro-cms/core';");
-    adapterLines.push(`  adapter: createDrizzleAdapter({`);
-    adapterLines.push(`    connectionString: process.env.DATABASE_URL,`);
-    adapterLines.push(`  }),`);
-  } else if (answers.database === "mysql") {
-    imports.push("import { createDrizzleAdapter } from '@kyro-cms/core';");
+  } else if (answers.database === "mongodb") {
+    imports.push("import { createMongoDBAdapter } from '@kyro-cms/core';");
+  }
+
+  const adapterLines: string[] = [];
+  if (answers.database === "sqlite") {
+    adapterLines.push(`  adapter: createLocalAdapter({ path: './data.db' }),`);
+  } else if (answers.database === "postgres") {
     adapterLines.push(`  adapter: createDrizzleAdapter({`);
     adapterLines.push(`    connectionString: process.env.DATABASE_URL,`);
     adapterLines.push(`  }),`);
   } else if (answers.database === "mongodb") {
-    imports.push("import { createMongoDBAdapter } from '@kyro-cms/core';");
     adapterLines.push(`  adapter: createMongoDBAdapter({`);
     adapterLines.push(`    connectionString: process.env.MONGODB_URI,`);
     adapterLines.push(`  }),`);
   }
 
-  const apiConfig = [
-    "    rest: true,",
-    "    graphql: true,",
-    "    trpc: true,",
-    "    websocket: true,",
-  ];
-
-  const features: string[] = [];
-  if (answers.auth) {
-    features.push("  auth: true,");
-  }
-  if (answers.versioning) {
-    features.push("  versioning: true,");
-  }
-
   let templateCollections = "";
   let templateGlobals = "";
 
   switch (answers.template) {
     case "minimal":
       templateCollections =
-        "import { minimalCollections } from '@kyro-cms/core';";
+        "import { minimalCollections } from '@kyro-cms/core/templates';";
+      templateGlobals =
+        "import { coreSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "blog":
-      templateCollections = "import { blogCollections } from '@kyro-cms/core';";
+      templateCollections = "import { blogCollections } from '@kyro-cms/core/templates';";
+      templateGlobals =
+        "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "ecommerce":
-      templateCollections =
-        "import { ecommerceCollections } from '@kyro-cms/core';";
+      templateCollections = "import { ecommerceCollections } from '@kyro-cms/core/templates';";
+      templateGlobals =
+        "import { allSettingsGlobals, ecommerceSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "kitchen-sink":
-      templateCollections = `import { minimalCollections, blogCollections, ecommerceCollections, kitchenSinkCollections } from '@kyro-cms/core';`;
+      templateCollections = `import { minimalCollections, blogCollections, ecommerceCollections, kitchenSinkCollections } from '@kyro-cms/core/templates';`;
+      templateGlobals =
+        "import { allSettingsGlobals, ecommerceSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
   }
 
-  if (templateCollections) {
-    imports.push(templateCollections);
-  }
+  if (templateCollections) imports.push(templateCollections);
+  if (templateGlobals) imports.push(templateGlobals);
 
   let collectionsConfig = "";
   if (answers.template === "minimal") {
@@ -79,17 +70,25 @@ export function generateKyroConfig(answers: Answers): string {
   ],`;
   }
 
-  const config = `${imports.join("\n")}
+  let globalsConfig = "";
+  if (answers.template === "minimal") {
+    globalsConfig = `  globals: coreSettingsGlobals,`;
+  } else if (answers.template === "blog" || answers.template === "ecommerce") {
+    globalsConfig = answers.template === "ecommerce"
+      ? `  globals: [...allSettingsGlobals, ...ecommerceSettingsGlobals],`
+      : `  globals: allSettingsGlobals,`;
+  } else if (answers.template === "kitchen-sink") {
+    globalsConfig = `  globals: [...allSettingsGlobals, ...ecommerceSettingsGlobals],`;
+  }
+
+  return `${imports.join("\n")}
 
 export default defineConfig({
   name: '${answers.projectName}',
-  prefix: '/api',${adapterLines.length > 0 ? "\n" + adapterLines.join("\n") : ""}
-${collectionsConfig ? collectionsConfig : ""}${features.length > 0 ? "\n" + features.join("\n") : ""}
-
-  api: {
-${apiConfig.join("\n")}
-  },
+  prefix: '/api',
+${adapterLines.join("\n")}
+${collectionsConfig}
+${globalsConfig}
+  auth: true,
 });`;
-
-  return config;
 }