@brightsideoy/kama 0.1.0-alpha.151 → 0.1.0-alpha.153

package/bin/cli.js

@@ -311,7 +311,7 @@ export default {
                     "schema:remote": `wrangler d1 execute ${dbName} --remote --file=../node_modules/@brightsideoy/kama/schema.sql`,
                     "seed:local": `wrangler d1 execute ${dbName} --local --file=seed.sql > /dev/null 2>&1`,
                     "seed:remote": `wrangler d1 execute ${dbName} --remote --file=seed.sql`,
-                    "dev": "npm run schema:local && npm run seed:local && wrangler dev --remote --log-level warn --inspector-port=9230",
+                    "dev": "npm run schema:local && npm run seed:local && wrangler dev --port 8787 --inspector-port 9239",
                     "deploy": "npm run schema:remote && npm run seed:remote && wrangler deploy"
                 },
                 dependencies: {
@@ -359,7 +359,14 @@ export default {
         };
 
         writeFileSync(join(cmsDir, 'wrangler.json'), JSON.stringify(cmsWranglerConfig, null, 2));
-        writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets\nCLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN\n`);
+
+        writeFileSync(join(cmsDir, '.dev.vars'), `# Cloudflare Edge Cache Purging Secrets
+CLOUDFLARE_API_TOKEN=cfut_YOUR_CUSTOM_PURGE_TOKEN
+
+# Local Development Overrides (Takes precedence over wrangler.json vars during local dev)
+CDN_DOMAIN=http://localhost:8787
+PUBLIC_FRONTEND_URL=http://localhost:4321
+`);
     } else {
         const nodeServerContent = `import { serve } from '@hono/node-server';
 import { serveStatic } from '@hono/node-server/serve-static';
@@ -408,11 +415,13 @@ if (distPath) {
   });
 }
 
-const port = process.env.PORT || 8787;
-console.log(\`🔥 Kama Node Server & Admin UI running on http://localhost:\${port}\`);
-if (distPath) console.log(\`👉 Serving Admin UI from: \${distPath}\`);
+const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 8787;
 
-serve({ fetch: kamaApp.fetch, port });
+serve({ fetch: kamaApp.fetch, port }, (info) => {
+  console.log(\`\\n🔥 KAMA CMS Node Server is running!\`);
+  console.log(\`┃ Local    http://localhost:\${info.port}/\`);
+  if (distPath) console.log(\`┃ Admin UI Serving from: \${distPath}\\n\`);
+});
 `;
         writeFileSync(join(cmsDir, 'server.js'), nodeServerContent);
 
@@ -441,13 +450,14 @@ serve({ fetch: kamaApp.fetch, port });
             }, null, 2)
         );
 
+        // For Node mode, localhost is explicitly used
         writeFileSync(join(cmsDir, '.env'), `PORT=8787
 KAMA_RUNTIME=node
 DB_PATH=./kama.db
 LOCAL_MEDIA_PATH=./public/media
-PUBLIC_CMS_URL=${cmsFullUrl}
-PUBLIC_API_URL=${cmsFullUrl}
-PUBLIC_FRONTEND_URL=${shouldCreateSite ? `http://${siteDomain}` : 'http://localhost:4321'}
+PUBLIC_CMS_URL=http://localhost:8787
+PUBLIC_API_URL=http://localhost:8787
+PUBLIC_FRONTEND_URL=http://localhost:4321
 `);
     }
 
@@ -692,6 +702,7 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
                 run_worker_first: true
             };
 
+            // These are production variables used on Cloudflare!
             configObj.vars = configObj.vars || {};
             configObj.vars.PUBLIC_CMS_URL = cmsFullUrl;
             configObj.vars.PUBLIC_API_URL = cmsFullUrl;
@@ -720,6 +731,7 @@ async function generateAstroSite(rootDir, siteFolder, siteDomain, cmsFullUrl, wo
     const channelKey = siteFolder.replace(/[^a-z0-9_-]/gi, '-').toLowerCase();
     const treeKey = 'main-tree';
 
+    // 🎯 FIX: 'navigation' is properly set as the treeType so it resolves correctly
     const seedSql = `
 -- Seed data for site: ${safeSiteLabel}
 
@@ -729,7 +741,7 @@ VALUES ('${channelKey}', '${safeSiteLabel}', 'website', 'en', 0, '{}');
 
 -- 2. Create the Tree and link it to the Channel
 INSERT OR IGNORE INTO trees (key, label, treeType, channelId, isHidden, dataJson)
-VALUES ('${treeKey}', 'Main Tree', 'main-navigation', (SELECT id FROM channels WHERE key = '${channelKey}'), 0, '{}');
+VALUES ('${treeKey}', 'Main Tree', 'navigation', (SELECT id FROM channels WHERE key = '${channelKey}'), 0, '{}');
 
 INSERT OR IGNORE INTO channel_trees (channelId, treeId, key)
 VALUES ((SELECT id FROM channels WHERE key = '${channelKey}'), (SELECT id FROM trees WHERE key = '${treeKey}'), 'main');
@@ -762,9 +774,11 @@ VALUES (
         appendFileSync(seedPath, seedSql);
     }
 
+    // Local Development Overrides
     const envContent = [
-        `PUBLIC_CMS_URL="${cmsFullUrl}"`,
-        `PUBLIC_API_URL="${cmsFullUrl}"`,
+        `# Local Development Overrides (Production uses wrangler.json vars)`,
+        `PUBLIC_CMS_URL="http://localhost:8787"`,
+        `PUBLIC_API_URL="http://localhost:8787"`,
         `PUBLIC_CHANNEL_ID="${channelKey}"`,
         `PUBLIC_TREE_ID="${treeKey}"`,
         `PUBLIC_HOME_SLUG="home"`,