create-kyro 0.9.0 → 0.9.1

package/dist/index.js

@@ -206,7 +206,10 @@ function formatPackageJson(pkg) {
 
 // src/generators/config.ts
 function generateKyroConfig(answers) {
-  const imports = ["import { defineConfig } from '@kyro-cms/core';"];
+  const imports = [
+    "import { defineKyroConfig } from '@kyro-cms/core';",
+    "import { templateCollections } from '@kyro-cms/core/templates';"
+  ];
   if (answers.database === "sqlite") {
     imports.push("import { createLocalAdapter } from '@kyro-cms/core';");
   } else if (answers.database === "postgres") {
@@ -226,66 +229,27 @@ function generateKyroConfig(answers) {
     adapterLines.push(`    connectionString: process.env.MONGODB_URI,`);
     adapterLines.push(`  }),`);
   }
-  let templateCollections = "";
   let templateGlobals = "";
   switch (answers.template) {
     case "minimal":
-      templateCollections = "import { minimalCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { siteSettingsGlobal, seoSettingsGlobal } from '@kyro-cms/core/templates';";
       break;
     case "starter":
-      templateCollections = "import { starterCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { coreSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "blog":
-      templateCollections = "import { blogCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "ecommerce":
-      templateCollections = "import { ecommerceCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "kitchen-sink":
-      templateCollections = `import { minimalCollections, starterCollections, blogCollections, ecommerceCollections, kitchenSinkCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';`;
       templateGlobals = "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
   }
-  if (templateCollections) imports.push(templateCollections);
   if (templateGlobals) imports.push(templateGlobals);
-  let collectionsConfig = "";
-  if (answers.template === "minimal") {
-    collectionsConfig = `  collections: [
-    ...Object.values(minimalCollections),
-  ],`;
-  } else if (answers.template === "starter") {
-    collectionsConfig = `  collections: [
-    ...Object.values(starterCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  } else if (answers.template === "blog") {
-    collectionsConfig = `  collections: [
-    ...Object.values(blogCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  } else if (answers.template === "ecommerce") {
-    collectionsConfig = `  collections: [
-    ...Object.values(ecommerceCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  } else if (answers.template === "kitchen-sink") {
-    collectionsConfig = `  collections: [
-    ...Object.values(minimalCollections),
-    ...Object.values(starterCollections),
-    ...Object.values(blogCollections),
-    ...Object.values(ecommerceCollections),
-    ...Object.values(kitchenSinkCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  }
+  const collectionKey = answers.template === "kitchen-sink" ? '["kitchen-sink"]' : `.${answers.template}`;
+  const collectionsConfig = `  collections: templateCollections${collectionKey},`;
   let globalsConfig = "";
   if (answers.template === "minimal") {
     globalsConfig = `  globals: [siteSettingsGlobal, seoSettingsGlobal],`;
@@ -296,9 +260,9 @@ function generateKyroConfig(answers) {
   }
   return `${imports.join("\n")}
 
-export default defineConfig({
-  name: '${answers.projectName}',
-  prefix: '/api',
+export default defineKyroConfig({
+  // name: '${answers.projectName}',
+  // prefix: '/api',
 ${adapterLines.join("\n")}
 ${collectionsConfig}
 ${globalsConfig}
@@ -320,7 +284,26 @@ export default defineConfig({
   output: 'server',
   integrations: [react(), kyro({ adminPath: '/admin', apiPath: '/api' }), kyroAdmin({ basePath: '/admin', apiPath: '/api' })],
   vite: {
-    plugins: [tailwind()],
+    plugins: [
+      tailwind(),
+      {
+        name: 'use-sync-external-store-shim-fix',
+        enforce: 'pre',
+        resolveId(id) {
+          if (
+            id === 'use-sync-external-store/shim' ||
+            id === 'use-sync-external-store/shim/index.js'
+          ) {
+            return '\\0virtual:use-sync-external-store-shim';
+          }
+        },
+        load(id) {
+          if (id === '\\0virtual:use-sync-external-store-shim') {
+            return \`export { useSyncExternalStore } from 'react';\`;
+          }
+        },
+      },
+    ],
   },
   server: {
     port: 4321,

package/package.json

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

package/src/generators/astro.ts

@@ -11,7 +11,26 @@ export default defineConfig({
   output: 'server',
   integrations: [react(), kyro({ adminPath: '/admin', apiPath: '/api' }), kyroAdmin({ basePath: '/admin', apiPath: '/api' })],
   vite: {
-    plugins: [tailwind()],
+    plugins: [
+      tailwind(),
+      {
+        name: 'use-sync-external-store-shim-fix',
+        enforce: 'pre',
+        resolveId(id) {
+          if (
+            id === 'use-sync-external-store/shim' ||
+            id === 'use-sync-external-store/shim/index.js'
+          ) {
+            return '\\0virtual:use-sync-external-store-shim';
+          }
+        },
+        load(id) {
+          if (id === '\\0virtual:use-sync-external-store-shim') {
+            return \`export { useSyncExternalStore } from 'react';\`;
+          }
+        },
+      },
+    ],
   },
   server: {
     port: 4321,

package/src/generators/config.ts

@@ -1,7 +1,10 @@
 import type { Answers } from "../prompts.js";
 
 export function generateKyroConfig(answers: Answers): string {
-  const imports: string[] = ["import { defineConfig } from '@kyro-cms/core';"];
+  const imports: string[] = [
+    "import { defineKyroConfig } from '@kyro-cms/core';",
+    "import { templateCollections } from '@kyro-cms/core/templates';",
+  ];
 
   if (answers.database === "sqlite") {
     imports.push("import { createLocalAdapter } from '@kyro-cms/core';");
@@ -24,69 +27,33 @@ export function generateKyroConfig(answers: Answers): string {
     adapterLines.push(`  }),`);
   }
 
-  let templateCollections = "";
   let templateGlobals = "";
-
   switch (answers.template) {
     case "minimal":
-      templateCollections = "import { minimalCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { siteSettingsGlobal, seoSettingsGlobal } from '@kyro-cms/core/templates';";
       break;
     case "starter":
-      templateCollections = "import { starterCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { coreSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "blog":
-      templateCollections = "import { blogCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "ecommerce":
-      templateCollections = "import { ecommerceCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';";
       templateGlobals = "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
     case "kitchen-sink":
-      templateCollections = `import { minimalCollections, starterCollections, blogCollections, ecommerceCollections, kitchenSinkCollections, mediaCollections, authCollections } from '@kyro-cms/core/templates';`;
       templateGlobals = "import { allSettingsGlobals } from '@kyro-cms/core/templates';";
       break;
   }
 
-  if (templateCollections) imports.push(templateCollections);
   if (templateGlobals) imports.push(templateGlobals);
 
-  let collectionsConfig = "";
-  if (answers.template === "minimal") {
-    collectionsConfig = `  collections: [
-    ...Object.values(minimalCollections),
-  ],`;
-  } else if (answers.template === "starter") {
-    collectionsConfig = `  collections: [
-    ...Object.values(starterCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  } else if (answers.template === "blog") {
-    collectionsConfig = `  collections: [
-    ...Object.values(blogCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  } else if (answers.template === "ecommerce") {
-    collectionsConfig = `  collections: [
-    ...Object.values(ecommerceCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  } else if (answers.template === "kitchen-sink") {
-    collectionsConfig = `  collections: [
-    ...Object.values(minimalCollections),
-    ...Object.values(starterCollections),
-    ...Object.values(blogCollections),
-    ...Object.values(ecommerceCollections),
-    ...Object.values(kitchenSinkCollections),
-    ...Object.values(mediaCollections),
-    ...Object.values(authCollections),
-  ],`;
-  }
+  const collectionKey =
+    answers.template === "kitchen-sink"
+      ? '["kitchen-sink"]'
+      : `.${answers.template}`;
+
+  const collectionsConfig = `  collections: templateCollections${collectionKey},`;
 
   let globalsConfig = "";
   if (answers.template === "minimal") {
@@ -99,9 +66,9 @@ export function generateKyroConfig(answers: Answers): string {
 
   return `${imports.join("\n")}
 
-export default defineConfig({
-  name: '${answers.projectName}',
-  prefix: '/api',
+export default defineKyroConfig({
+  // name: '${answers.projectName}',
+  // prefix: '/api',
 ${adapterLines.join("\n")}
 ${collectionsConfig}
 ${globalsConfig}

package/test/generators.test.ts

@@ -55,42 +55,29 @@ describe("generators", () => {
         ...baseAnswers,
         template: "minimal",
       });
-      expect(minimal).toContain("minimalCollections");
-      expect(minimal).not.toContain("mediaCollections");
-      expect(minimal).not.toContain("authCollections");
+      expect(minimal).toContain("templateCollections.minimal");
+      expect(minimal).not.toContain("templateCollections.starter");
 
       const starter = generateKyroConfig({
         ...baseAnswers,
         template: "starter",
       });
-      expect(starter).toContain("starterCollections");
-      expect(starter).toContain("mediaCollections");
-      expect(starter).toContain("authCollections");
+      expect(starter).toContain("templateCollections.starter");
 
       const blog = generateKyroConfig({ ...baseAnswers, template: "blog" });
-      expect(blog).toContain("blogCollections");
-      expect(blog).toContain("mediaCollections");
-      expect(blog).toContain("authCollections");
+      expect(blog).toContain("templateCollections.blog");
 
       const ecommerce = generateKyroConfig({
         ...baseAnswers,
         template: "ecommerce",
       });
-      expect(ecommerce).toContain("ecommerceCollections");
-      expect(ecommerce).toContain("mediaCollections");
-      expect(ecommerce).toContain("authCollections");
+      expect(ecommerce).toContain("templateCollections.ecommerce");
 
       const kitchen = generateKyroConfig({
         ...baseAnswers,
         template: "kitchen-sink",
       });
-      expect(kitchen).toContain("minimalCollections");
-      expect(kitchen).toContain("starterCollections");
-      expect(kitchen).toContain("blogCollections");
-      expect(kitchen).toContain("ecommerceCollections");
-      expect(kitchen).toContain("kitchenSinkCollections");
-      expect(kitchen).toContain("mediaCollections");
-      expect(kitchen).toContain("authCollections");
+      expect(kitchen).toContain('templateCollections["kitchen-sink"]');
     });
 
     it("imports settings globals per template", () => {
@@ -133,7 +120,8 @@ describe("generators", () => {
 
     it("uses correct template imports path", () => {
       const config = generateKyroConfig(baseAnswers);
-      expect(config).toContain("@kyro-cms/core/templates");
+      expect(config).toContain("import { templateCollections } from '@kyro-cms/core/templates'");
+      expect(config).toContain("defineKyroConfig");
     });
   });