@brightsideoy/kama 0.1.0-alpha.60 → 0.1.0-alpha.62

package/bin/cli.js

@@ -32,8 +32,8 @@ async function main() {
  */
 async function createFullWorkspace() {
     const projName = (await rl.question('Project folder name [kama-workspace]: ')) || 'kama-workspace';
-    const cmsDomain = (await rl.question('CMS Admin Domain (e.g., cms.example.com): ')) || 'cms.example.com';
-    const siteDomain = (await rl.question('First Website Domain (e.g., www.example.com): ')) || 'www.example.com';
+    const cmsDomain = (await rl.question('CMS Admin Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
+    const siteDomain = (await rl.question('First Website Domain (e.g., kama.t3cloud.eu): ')) || 'kama.t3cloud.eu';
 
     const rootDir = join(process.cwd(), projName);
 
@@ -171,6 +171,7 @@ async function createFullWorkspace() {
         }, null, 2)
     );
 
+    // 🎯 Fixed CMS wrangler.json (Added PUBLIC_FRONTEND_URL & CLOUDFLARE_ZONE_ID to public vars)
     writeFileSync(
         join(cmsDir, 'wrangler.json'),
         JSON.stringify({
@@ -184,7 +185,11 @@ async function createFullWorkspace() {
                 binding: 'ASSETS'
             },
             routes: [{ pattern: cmsDomain, custom_domain: true }],
-            vars: { CDN_DOMAIN: cmsDomain },
+            vars: {
+                CDN_DOMAIN: cmsDomain,
+                PUBLIC_FRONTEND_URL: `https://${siteDomain}`,
+                CLOUDFLARE_ZONE_ID: "REPLACE_WITH_YOUR_32_CHAR_ZONE_ID"
+            },
             d1_databases: [{
                 binding: 'DB',
                 database_name: dbName,
@@ -197,10 +202,10 @@ async function createFullWorkspace() {
         }, null, 2)
     );
 
-    // 🎯 Generate backend .dev.vars template for Cloudflare Cache Purging
+    // 🎯 Fixed .dev.vars (Only contains API token for local dev, not public Zone ID)
     writeFileSync(
         join(cmsDir, '.dev.vars'),
-        `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_ZONE_ID=\nCLOUDFLARE_API_TOKEN=\nPUBLIC_FRONTEND_URL=https://${siteDomain}\n`
+        `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN\n`
     );
 
     // 🎯 3. Setup First Astro Site tied to target workerName
@@ -211,11 +216,11 @@ async function createFullWorkspace() {
     console.log(`  1. cd ${projName}`);
     console.log(`  2. npm install`);
     if (d1DatabaseId === 'REPLACE_WITH_YOUR_D1_ID') {
-        console.log(`  3. Run 'npx wrangler login', create a D1 database, and update cms-worker/wrangler.json`);
-    } else {
-        console.log(`  3. Fill in your API tokens in cms-worker/.dev.vars`);
-        console.log(`  4. Run 'npm run dev:cms' from the workspace root to start the backend.`);
+        console.log(`  3. Run 'npx wrangler login' and create a D1 database.`);
     }
+    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(`  6. Run 'npm run dev:cms' from the workspace root to start the backend.`);
 }
 
 /**
@@ -229,7 +234,6 @@ async function createNewSiteOnly() {
         return;
     }
 
-    // Try reading cms-worker/wrangler.json to determine workerName dynamically
     let targetWorkerName = 'kama-worker';
     const cmsWranglerPath = join(rootDir, 'cms-worker', 'wrangler.json');
     if (existsSync(cmsWranglerPath)) {
@@ -241,7 +245,7 @@ async function createNewSiteOnly() {
 
     const siteFolder = await rl.question('Site folder name (e.g., my-new-site): ');
     const siteDomain = await rl.question('Website Domain (e.g., brand.com): ');
-    const cmsDomain = (await rl.question('CMS API Domain (e.g., cms.example.com): ')) || 'cms.example.com';
+    const cmsDomain = (await rl.question('CMS API Domain (e.g., admin.t3cloud.eu): ')) || 'admin.t3cloud.eu';
 
     await generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain.replace(/^https?:\/\//, ''), targetWorkerName);
 
@@ -282,7 +286,7 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain, wor
         }, null, 2)
     );
 
-    // 🎯 Changed output directory to ./dist/client for Astro SSR output
+    // 🎯 Fixed Astro wrangler.json: Added `run_worker_first: true` to prevent media routing 404s on Edge
     writeFileSync(
         join(siteDir, 'wrangler.json'),
         JSON.stringify({
@@ -295,6 +299,7 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain, wor
                 binding: 'ASSETS',
                 html_handling: 'drop-trailing-slash',
                 not_found_handling: '404-page',
+                run_worker_first: true
             },
             services: [{ binding: 'CMS_WORKER', service: workerName }],
             routes: [{ pattern: siteDomain, custom_domain: true }],
@@ -305,7 +310,6 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsDomain, wor
         }, null, 2)
     );
 
-    // 🎯 Changed output mode to 'server' to support Service Bindings
     const astroConfig = `import { defineConfig } from 'astro/config';
 import cloudflare from '@astrojs/cloudflare';