@brightsideoy/kama 0.1.0-alpha.109 → 0.1.0-alpha.111

package/README.md

@@ -134,7 +134,7 @@ my-kama-workspace/
 │       ├── nodes/           # e.g., page.yaml, product.yaml
 │       ├── blocks/          # e.g., hero.yaml, image_card.yaml
 │       └── node-layouts/    # e.g., two-column.yaml
-├── cms-worker/              # 👉 BACKEND PIPELINE
+├── kama-worker/              # 👉 BACKEND PIPELINE
 │   ├── index.js             # Worker entrypoint (ES Module)
 │   ├── wrangler.json        # Bindings (D1, R2, Vars)
 │   └── package.json

package/bin/cli.js

@@ -28,7 +28,7 @@ async function main() {
     console.log('\n🔥 --- KAMA SITE GENERATOR --- 🔥\n');
 
     console.log('Select mode:');
-    console.log('  1) Kickstart new Kama Monorepo (CMS + Initial Site)');
+    console.log('  1) Kickstart new Kama Monorepo (CMS + Optional Site)');
     console.log('  2) Add a new Astro Site to current workspace (sites/)');
 
     const choice = await rl.question('\nChoice [1/2]: ');
@@ -54,13 +54,19 @@ async function createFullWorkspace() {
     const envChoice = await rl.question('\nChoice [1/2]: ');
     const isCloudflare = envChoice.trim() === '2';
 
+    // 🎯 Ask if user wants an Astro frontend site scaffolded
+    const createSiteInput = await rl.question('\n🚀 Do you want to scaffold an initial Astro frontend site? (y/n) [y]: ');
+    const shouldCreateSite = createSiteInput.trim().toLowerCase() !== 'n';
+
     let cmsDomain = 'localhost:8787';
     let siteDomain = 'localhost:4321';
 
     // Only ask for domains if deploying to Cloudflare Edge
     if (isCloudflare) {
         cmsDomain = (await rl.question('\nCMS Admin Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
-        siteDomain = (await rl.question('First Website Domain (e.g., kama.t3cloud.eu): ')) || 'kama.t3cloud.eu';
+        if (shouldCreateSite) {
+            siteDomain = (await rl.question('First Website Domain (e.g., kama.t3cloud.eu): ')) || 'kama.t3cloud.eu';
+        }
     }
 
     // Standardize scheme for localhost vs custom edge domains
@@ -83,9 +89,10 @@ async function createFullWorkspace() {
         `node_modules/
 .env
 .DS_Store
-cms-worker/.dev.vars
-cms-worker/bundled-definitions.js
-cms-worker/.wrangler/
+kama-worker/.dev.vars
+kama-worker/bundled-definitions.js
+kama-worker/bundled-definitions.ts
+kama-worker/.wrangler/
 sites/*/.env
 sites/*/.astro/
 sites/*/dist/
@@ -184,18 +191,18 @@ sites/*/dist/
     }
     // ------------------------------
 
-    // 🎯 1. Root package.json
+    // 🎯 1. Root package.json (includes 'sites/*' wildcard in workspaces so user can add sites later)
     writeFileSync(
         join(rootDir, 'package.json'),
         JSON.stringify({
             name: projName,
             private: true,
             type: 'module',
-            workspaces: ['cms-worker', 'sites/*'],
+            workspaces: ['kama-worker', 'sites/*'],
             scripts: {
                 'bundle:schemas': 'node node_modules/@brightsideoy/kama/scripts/bundle-definitions.js',
-                'dev:cms': 'npm run bundle:schemas && npm run dev -w cms-worker',
-                'deploy:cms': 'npm run bundle:schemas && npm run deploy -w cms-worker',
+                'dev:cms': 'npm run bundle:schemas && npm run dev -w kama-worker',
+                'deploy:cms': 'npm run bundle:schemas && npm run deploy -w kama-worker',
             },
             dependencies: {
                 '@brightsideoy/kama': currentKamaVersion,
@@ -205,7 +212,7 @@ sites/*/dist/
 
     // 🎯 2. Setup CMS Worker with Dynamic Names
     console.log(`\n☁️ Configuring CMS Worker '${workerName}' (${cmsDomain})...`);
-    const cmsDir = join(rootDir, 'cms-worker');
+    const cmsDir = join(rootDir, 'kama-worker');
     mkdirSync(cmsDir, { recursive: true });
 
     // 🎯 Properly wrap and inject BUNDLED_DEFINITIONS from LOCAL workspace, not node_modules
@@ -253,7 +260,7 @@ export default {
                 '@brightsideoy/kama': currentKamaVersion,
             },
             devDependencies: {
-                wrangler: '^3.80.0',
+                wrangler: '^4.0.0', // 👈 Updated to ^4.0.0 to support ES import attributes in dependencies
                 tsx: '^4.19.2',
             },
         }, null, 2)
@@ -275,7 +282,7 @@ export default {
         },
         vars: {
             CDN_DOMAIN: cmsDomain,
-            PUBLIC_FRONTEND_URL: isCloudflare ? `https://${siteDomain}` : 'http://localhost:4321',
+            PUBLIC_FRONTEND_URL: (isCloudflare && shouldCreateSite) ? `https://${siteDomain}` : 'http://localhost:4321',
             CLOUDFLARE_ZONE_ID: isCloudflare ? "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID" : "local-zone-not-needed"
         },
         d1_databases: [{
@@ -304,9 +311,13 @@ export default {
         `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=${isCloudflare ? 'cfut_YOUR_CUSTOM_PURGE_TOKEN' : 'local_token'}\n`
     );
 
-    // 🎯 3. Setup First Astro Site tied to target workerName
-    const siteFolderName = isCloudflare ? siteDomain.split('.')[0] : 'web';
-    await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsFullUrl, workerName, isCloudflare);
+    // 🎯 3. Setup Astro Site (ONLY if requested)
+    if (shouldCreateSite) {
+        const siteFolderName = isCloudflare ? siteDomain.split('.')[0] : 'web';
+        await generateAstroSite(rootDir, siteFolderName, siteDomain, cmsFullUrl, workerName, isCloudflare);
+    } else {
+        console.log(`\nℹ️ Skipping Astro site creation. You can add a site later by running 'npx create-kama' (Mode 2) inside this workspace.`);
+    }
 
     console.log(`\n✨ Workspace ready! Next steps:`);
     console.log(`  1. cd ${projName}`);
@@ -316,12 +327,12 @@ export default {
         if (d1DatabaseId === '00000000-0000-0000-0000-000000000000' || d1DatabaseId === 'REPLACE_WITH_YOUR_D1_ID') {
             console.log(`  3. Run 'npx wrangler login' and create a D1 database manually.`);
         }
-        console.log(`  4. Update CLOUDFLARE_ZONE_ID in cms-worker/wrangler.json with your actual Zone ID`);
-        console.log(`  5. Securely store your purge token: cd cms-worker && npx wrangler secret put CLOUDFLARE_API_TOKEN`);
+        console.log(`  4. Update CLOUDFLARE_ZONE_ID in kama-worker/wrangler.json with your actual Zone ID`);
+        console.log(`  5. Securely store your purge token: cd kama-worker && npx wrangler secret put CLOUDFLARE_API_TOKEN`);
         console.log(`  6. Run 'npm run dev:cms' from the workspace root to start the backend.`);
     } else {
         console.log(`  3. Run 'npm run dev:cms' from the workspace root to start the local SQLite backend.`);
-        console.log(`\n💡 Note: You can deploy to Cloudflare later by updating 'cms-worker/wrangler.json' with real IDs.`);
+        console.log(`\n💡 Note: You can deploy to Cloudflare later by updating 'kama-worker/wrangler.json' with real IDs.`);
     }
 }
 
@@ -337,7 +348,7 @@ async function createNewSiteOnly() {
     }
 
     let targetWorkerName = 'kama-worker';
-    const cmsWranglerPath = join(rootDir, 'cms-worker', 'wrangler.json');
+    const cmsWranglerPath = join(rootDir, 'kama-worker', 'wrangler.json');
     if (existsSync(cmsWranglerPath)) {
         try {
             const cmsWrangler = JSON.parse(readFileSync(cmsWranglerPath, 'utf-8'));
@@ -509,8 +520,8 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
             dependencies: {
                 '@astrojs/cloudflare': '^14.2.5',
                 '@brightsideoy/kama': currentKamaVersion,
-                astro: '^5.0.0', // Ensure using modern Astro
-                wrangler: '^3.80.0',
+                astro: '^7.2.0',
+                wrangler: '^4.0.0', // 👈 Updated to ^4.0.0
             },
         }, null, 2)
     );