create-avalon 0.1.19 → 0.1.21

package/dist/cli.js

@@ -1226,112 +1226,120 @@ function generateNetlifyToml(config) {
 [build.environment]
   NODE_VERSION = "22"
   BUN_VERSION = "latest"
-  NITRO_PRESET = "netlify"
+  NITRO_PRESET = "netlify_edge"
 
-[functions]
-  directory = "netlify/functions"
+[dev]
+  command = "bunx --bun vite"
+  autoLaunch = false
 
-# 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
+# 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.
 `;
 }
 function generateBuildMjs() {
-  return `/**
- * 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 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);
+  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(`
+`) + `
 `;
 }
 
@@ -1859,6 +1867,8 @@ function generateViteConfig(config) {
     `    nitro: {`,
     `      preset: process.env.NITRO_PRESET || 'node_server',`,
     `      streaming: true,`,
+    `      clientEntry: 'app/entry-client',`,
+    `      globalCSS: ['app/shared/styles/main.css'],`,
     `      prerender: {`,
     `        routes: ['/'],`,
     `        crawlLinks: true,`,
@@ -1868,17 +1878,39 @@ function generateViteConfig(config) {
     `  });`,
     "",
     `  return {`,
+    `    environments: {`,
+    `      client: {`,
+    `        build: {`,
+    `          rollupOptions: {`,
+    `            input: './app/entry-client.ts',`,
+    `          },`,
+    `        },`,
+    `      },`,
+    `      ssr: {`,
+    `        build: {`,
+    `          rollupOptions: {`,
+    `            input: './server/renderer.ts',`,
+    `          },`,
+    `        },`,
+    `      },`,
+    `    },`,
+    ``,
     `    plugins: [`,
     pluginEntries.join(`
 `),
     `    ],`,
     ``,
     `    resolve: {`,
-    `      alias: {`,
-    `        '@shared': resolve(__dirname, 'app/shared'),`,
-    `        '@modules': resolve(__dirname, 'app/modules'),`,
-    `        '@': resolve(__dirname, 'app'),`,
-    `      },`,
+    `      alias: [`,
+    `        { find: '@shared', replacement: resolve('app/shared') },`,
+    `        { find: '@modules', replacement: resolve('app/modules') },`,
+    `        { find: '@/', replacement: \`\${resolve('app')}/\` },`,
+    `      ],`,
+    `    },`,
+    ``,
+    `    build: {`,
+    `      outDir: 'dist',`,
+    `      emptyOutDir: true,`,
     `    },`,
     ``,
     `    server: {`,

package/package.json

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