create-avalon 0.1.21 → 0.1.23

package/dist/cli.js

@@ -1217,7 +1217,7 @@ export default defineHandler(() => {
 }
 
 // src/templates/deploy.ts
-function generateNetlifyToml(config) {
+function generateNetlifyToml(_config) {
   return `[build]
   base = "."
   command = "bun install && bun build.mjs"
@@ -1226,120 +1226,113 @@ function generateNetlifyToml(config) {
 [build.environment]
   NODE_VERSION = "22"
   BUN_VERSION = "latest"
-  NITRO_PRESET = "netlify_edge"
+  NITRO_PRESET = "netlify"
 
-[dev]
-  command = "bunx --bun vite"
-  autoLaunch = false
+[functions]
+  directory = ".netlify/functions-internal"
+  node_bundler = "none"
 
-# Edge functions are configured via .netlify/edge-functions/manifest.json
-# generated by Nitro at build time. The manifest routes "/*" to the
-# "server" edge function with static-file exclusion rules.
+# SSR catch-all — Netlify checks for a matching static/prerendered file
+# first (force=false is the default in netlify.toml). Only requests with
+# no static file hit the server function.
+[[redirects]]
+  from = "/*"
+  to = "/.netlify/functions/server"
+  status = 200
 `;
 }
 function generateBuildMjs() {
-  const lines = [
-    `/**`,
-    ` * Netlify build wrapper.`,
-    ` *`,
-    ` * Vite/Nitro leaves open handles after the build completes, preventing`,
-    ` * the Node process from exiting. This wrapper detects when the build`,
-    ` * output is ready, kills the entire process group, then runs post-build.`,
-    ` */`,
-    ``,
-    `import { spawn, execSync } from 'node:child_process';`,
-    `import { existsSync, rmSync } from 'node:fs';`,
-    `import { join } from 'node:path';`,
-    ``,
-    `const CWD = process.cwd();`,
-    `const EDGE_SERVER = join(CWD, '.netlify', 'edge-functions', 'server', 'server.js');`,
-    `const EDGE_MANIFEST = join(CWD, '.netlify', 'edge-functions', 'manifest.json');`,
-    `const NETLIFY_MAIN = join(CWD, '.netlify', 'functions-internal', 'main.mjs');`,
-    `const NETLIFY_SERVER = join(CWD, '.netlify', 'functions-internal', 'server', 'server.mjs');`,
-    `const OUTPUT_SSR = join(CWD, '.output', 'server', '_ssr', 'ssr.mjs');`,
-    ``,
-    `console.log('[build] Starting vite build...');`,
-    ``,
-    `for (const dir of ['.netlify', '.output', 'netlify']) {`,
-    `  const full = join(CWD, dir);`,
-    `  if (existsSync(full)) {`,
-    "    rmSync(full, { recursive: true, force: true });",
-    "    console.log(`[build] Cleaned stale ${dir}/`);",
-    `  }`,
-    `}`,
-    ``,
-    `const child = spawn('bunx', ['--bun', 'vite', 'build'], {`,
-    `  cwd: CWD,`,
-    `  stdio: 'inherit',`,
-    `  detached: true,`,
-    `});`,
-    ``,
-    `const childPid = child.pid;`,
-    `let done = false;`,
-    ``,
-    `function killTree() {`,
-    `  try { process.kill(-childPid, 'SIGKILL'); } catch {}`,
-    `  try { child.kill('SIGKILL'); } catch {}`,
-    `}`,
-    ``,
-    `function finish() {`,
-    `  if (done) return;`,
-    `  done = true;`,
-    `  clearInterval(poll);`,
-    `  clearTimeout(absoluteTimeout);`,
-    `  killTree();`,
-    ``,
-    `  setTimeout(() => {`,
-    `    console.log('[build] Running post-build...');`,
-    `    try {`,
-    `      execSync('node post-build.mjs', { cwd: CWD, stdio: 'inherit', timeout: 120_000 });`,
-    `    } catch (err) {`,
-    `      console.error('[build] post-build warning:', err.message);`,
-    `    }`,
-    ``,
-    `    if (existsSync(EDGE_SERVER) && existsSync(EDGE_MANIFEST))`,
-    `      console.log('[build] ✅ Edge function found');`,
-    `    else if (existsSync(NETLIFY_SERVER))`,
-    `      console.log('[build] ✅ Server function found (netlify v2)');`,
-    `    else if (existsSync(OUTPUT_SSR))`,
-    `      console.log('[build] ✅ SSR bundle found');`,
-    `    else`,
-    `      console.error('[build] ❌ No server output found');`,
-    ``,
-    `    console.log('[build] ✅ Complete');`,
-    `    process.exit(0);`,
-    `  }, 500);`,
-    `}`,
-    ``,
-    "child.on('exit', (code) => {",
-    "  console.log(`[build] vite build exited with code ${code}`);",
-    `  finish();`,
-    `});`,
-    ``,
-    "child.on('error', (err) => {",
-    `  console.error('[build] spawn error:', err);`,
-    `  process.exit(1);`,
-    `});`,
-    ``,
-    `const poll = setInterval(() => {`,
-    `  const edgeReady = existsSync(EDGE_SERVER) && existsSync(EDGE_MANIFEST);`,
-    `  const netlifyReady = existsSync(NETLIFY_MAIN) && existsSync(NETLIFY_SERVER);`,
-    `  const nodeServerReady = existsSync(OUTPUT_SSR);`,
-    `  if (edgeReady || netlifyReady || nodeServerReady) {`,
-    "    const kind = edgeReady ? 'netlify-edge' : netlifyReady ? 'netlify' : 'node-server';",
-    "    console.log(`[build] Output detected (${kind}), waiting 3s for final writes...`);",
-    `    clearInterval(poll);`,
-    `    setTimeout(finish, 3_000);`,
-    `  }`,
-    `}, 1_000);`,
-    ``,
-    `const absoluteTimeout = setTimeout(() => {`,
-    `  console.error('[build] Timeout — killing build');`,
-    `  finish();`,
-    `}, 240_000);`
-  ];
-  return lines.join(`
-`) + `
+  return `/**
+ * Build wrapper.
+ *
+ * Vite/Nitro leaves open handles after the build completes, preventing
+ * the Node process from exiting. This wrapper detects when the build
+ * output is ready, kills the entire process group, then runs post-build.
+ */
+
+import { spawn, execSync } from 'node:child_process';
+import { existsSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+
+const CWD = process.cwd();
+const NITRO_JSON = join(CWD, '.netlify', 'functions-internal', 'nitro.json');
+const SERVER_MJS = join(CWD, '.netlify', 'functions-internal', 'server', 'server.mjs');
+const OUTPUT_SSR = join(CWD, '.output', 'server', '_ssr', 'ssr.mjs');
+
+console.log('[build] Starting vite build...');
+
+for (const dir of ['.netlify', '.output', 'netlify']) {
+  const full = join(CWD, dir);
+  if (existsSync(full)) {
+    rmSync(full, { recursive: true, force: true });
+    console.log(\`[build] Cleaned stale \${dir}/\`);
+  }
+}
+
+const child = spawn('bunx', ['--bun', 'vite', 'build'], {
+  cwd: CWD,
+  stdio: 'inherit',
+  detached: true,
+});
+
+const childPid = child.pid;
+let done = false;
+
+function killTree() {
+  try { process.kill(-childPid, 'SIGKILL'); } catch {}
+  try { child.kill('SIGKILL'); } catch {}
+}
+
+function finish() {
+  if (done) return;
+  done = true;
+  clearInterval(poll);
+  clearTimeout(absoluteTimeout);
+  killTree();
+
+  setTimeout(() => {
+    console.log('[build] Running post-build...');
+    try {
+      execSync('node post-build.mjs', { cwd: CWD, stdio: 'inherit', timeout: 120_000 });
+    } catch (err) {
+      console.error('[build] post-build warning:', err.message);
+    }
+
+    const V1_SERVER = join(CWD, '.netlify', 'v1', 'functions', 'server', 'server.mjs');
+    if (existsSync(V1_SERVER)) console.log('[build] ✅ Server function found (v1 API)');
+    else if (existsSync(SERVER_MJS)) console.log('[build] ✅ Server function found (legacy)');
+    else if (existsSync(OUTPUT_SSR)) console.log('[build] ✅ SSR bundle found');
+    else console.error('[build] ❌ No server output found');
+
+    console.log('[build] ✅ Complete');
+    process.exit(0);
+  }, 500);
+}
+
+child.on('exit', (code) => {
+  console.log(\`[build] vite build exited with code \${code}\`);
+  finish();
+});
+
+child.on('error', (err) => {
+  console.error('[build] spawn error:', err);
+  process.exit(1);
+});
+
+const poll = setInterval(() => {
+  const netlifyReady = existsSync(NITRO_JSON) && existsSync(SERVER_MJS);
+  const nodeServerReady = existsSync(OUTPUT_SSR);
+  if (netlifyReady || nodeServerReady) {
+    console.log(\`[build] Output detected (\${netlifyReady ? 'netlify' : 'node-server'}), waiting 3s for final writes...\`);
+    clearInterval(poll);
+    setTimeout(finish, 3_000);
+  }
+}, 1_000);
+
+const absoluteTimeout = setTimeout(() => {
+  console.error('[build] Timeout — killing build');
+  finish();
+}, 240_000);
 `;
 }
 
@@ -1436,10 +1429,10 @@ function generatePackageJson(config) {
   }
   switch (config.middleware) {
     case "hono":
-      dependencies["hono"] = "latest";
+      dependencies.hono = "latest";
       break;
     case "elysia":
-      dependencies["elysia"] = "latest";
+      dependencies.elysia = "latest";
       break;
   }
   const devDependencies = {
@@ -1450,15 +1443,15 @@ function generatePackageJson(config) {
   };
   switch (config.styling) {
     case "tailwind":
-      devDependencies["tailwindcss"] = "latest";
+      devDependencies.tailwindcss = "latest";
       devDependencies["@tailwindcss/vite"] = "latest";
       break;
     case "shadcn":
-      devDependencies["tailwindcss"] = "latest";
+      devDependencies.tailwindcss = "latest";
       devDependencies["@tailwindcss/vite"] = "latest";
       dependencies["@shadcn/ui"] = "latest";
       dependencies["tailwind-merge"] = "^3.5.0";
-      dependencies["clsx"] = "^2.1.1";
+      dependencies.clsx = "^2.1.1";
       break;
   }
   const pkg = {
@@ -1467,17 +1460,12 @@ function generatePackageJson(config) {
     private: true,
     scripts: {
       dev: "bunx --bun vite dev",
-      build: config.deploy === "netlify" ? "bun build.mjs" : "bunx --bun vite build",
-      "post-build": config.deploy === "netlify" ? "node post-build.mjs" : undefined,
+      build: "node build.mjs",
       preview: "node .output/server/index.mjs"
     },
     dependencies,
     devDependencies
   };
-  for (const key of Object.keys(pkg.scripts)) {
-    if (pkg.scripts[key] === undefined)
-      delete pkg.scripts[key];
-  }
   return JSON.stringify(pkg, null, 2);
 }
 
@@ -1999,10 +1987,10 @@ async function scaffoldProject(config, targetDir) {
     ``
   ].join(`
 `));
+  await writeFile(join(targetDir, "build.mjs"), generateBuildMjs());
+  await writeFile(join(targetDir, "post-build.mjs"), generatePostBuildMjs());
   if (config.deploy === "netlify") {
     await writeFile(join(targetDir, "netlify.toml"), generateNetlifyToml(config));
-    await writeFile(join(targetDir, "build.mjs"), generateBuildMjs());
-    await writeFile(join(targetDir, "post-build.mjs"), generatePostBuildMjs());
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "create-avalon",
-	"version": "0.1.21",
+	"version": "0.1.23",
 	"description": "Scaffold a new Avalon project with multi-framework islands architecture",
 	"license": "MIT",
 	"type": "module",