create-avalon 0.1.15 → 0.1.17

package/README.md

@@ -1,59 +1,59 @@
-# create-avalon
-
-Scaffold a new [Avalon](https://useavalon.dev) project in seconds.
-
-## Usage
-
-```bash
-npm create avalon@latest
-```
-
-Or with other package managers:
-
-```bash
-pnpm create avalon@latest
-yarn create avalon
-bun create avalon
-```
-
-The CLI walks you through:
-
-- Project name and directory
-- Framework selection (React, Preact, Vue, Svelte, Solid, Lit, Qwik — or multiple)
-- Styling approach (CSS Modules, Tailwind, vanilla CSS)
-- Optional features (API routes, middleware, layouts, MDX)
-- Package manager preference
-
-## What you get
-
-A ready-to-run Avalon project with file-system routing, islands architecture, and zero JavaScript by default.
-
-```
-my-project/
-├── app/
-│   ├── modules/
-│   │   └── home/
-│   │       ├── pages/          # File-system routes
-│   │       ├── components/     # Interactive components
-│   │       └── layouts/        # Module layouts
-│   └── shared/
-│       ├── layouts/            # Root layout
-│       ├── components/         # Shared components
-│       └── styles/             # Global styles & tokens
-├── middleware/                  # Server middleware
-├── routes/
-│   └── api/                    # API routes
-├── server/                     # Server config & env
-├── public/                     # Static assets
-├── vite.config.ts
-└── package.json
-```
-
-## Links
-
-- [Documentation](https://useavalon.dev/docs/introduction)
-- [GitHub](https://github.com/useAvalon/Avalon)
-
-## License
-
-MIT
+# create-avalon
+
+Scaffold a new [Avalon](https://useavalon.dev) project in seconds.
+
+## Usage
+
+```bash
+npm create avalon@latest
+```
+
+Or with other package managers:
+
+```bash
+pnpm create avalon@latest
+yarn create avalon
+bun create avalon
+```
+
+The CLI walks you through:
+
+- Project name and directory
+- Framework selection (React, Preact, Vue, Svelte, Solid, Lit, Qwik — or multiple)
+- Styling approach (CSS Modules, Tailwind, vanilla CSS)
+- Optional features (API routes, middleware, layouts, MDX)
+- Package manager preference
+
+## What you get
+
+A ready-to-run Avalon project with file-system routing, islands architecture, and zero JavaScript by default.
+
+```
+my-project/
+├── app/
+│   ├── modules/
+│   │   └── home/
+│   │       ├── pages/          # File-system routes
+│   │       ├── components/     # Interactive components
+│   │       └── layouts/        # Module layouts
+│   └── shared/
+│       ├── layouts/            # Root layout
+│       ├── components/         # Shared components
+│       └── styles/             # Global styles & tokens
+├── middleware/                  # Server middleware
+├── routes/
+│   └── api/                    # API routes
+├── server/                     # Server config & env
+├── public/                     # Static assets
+├── vite.config.ts
+└── package.json
+```
+
+## Links
+
+- [Documentation](https://useavalon.dev/docs/introduction)
+- [GitHub](https://github.com/useAvalon/Avalon)
+
+## License
+
+MIT

package/dist/cli.js

@@ -1371,6 +1371,11 @@ function generateViteConfig(config) {
     `    nitro: {`,
     `      preset: process.env.NITRO_PRESET || 'node_server',`,
     `      streaming: true,`,
+    `      prerender: {`,
+    `        routes: ['/'],`,
+    `        crawlLinks: true,`,
+    `        ignore: [],`,
+    `      },`,
     `    },`,
     `  });`,
     "",
@@ -1730,6 +1735,14 @@ function generateNetlifyToml(config) {
 
 [functions]
   directory = "netlify/functions"
+
+# 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() {
@@ -1784,7 +1797,7 @@ function finish() {
   setTimeout(() => {
     console.log('[build] Running post-build...');
     try {
-      execSync('node post-build.mjs', { cwd: CWD, stdio: 'inherit', timeout: 60_000 });
+      execSync('node post-build.mjs', { cwd: CWD, stdio: 'inherit', timeout: 120_000 });
     } catch (err) {
       console.error('[build] post-build warning:', err.message);
     }
@@ -1837,7 +1850,6 @@ function generatePostBuildMjs() {
     ` * - Generates _redirects for island JS path mapping`,
     ` * - Copies island JS to clean paths for local preview`,
     ` * - Copies server function to all Netlify function paths`,
-    ` * - Ensures SSR catch-all redirect exists`,
     ` */`,
     ``,
     `import {`,
@@ -1932,23 +1944,140 @@ function generatePostBuildMjs() {
     `  console.log('[netlify-fn] Copied server function to all Netlify paths');`,
     `}`,
     ``,
-    `// ── Ensure SSR catch-all redirect ─────────────────────────────────`,
-    `function ensureNetlifyRedirects() {`,
-    `  const redirectsPath = join(DIST_DIR, '_redirects');`,
-    `  let content = existsSync(redirectsPath) ? readFileSync(redirectsPath, 'utf-8') : '';`,
-    `  if (content.includes('/.netlify/functions/server')) return;`,
-    `  const catchAll = '\\n# SSR catch-all (Nitro server function)\\n/*  /.netlify/functions/server  200\\n';`,
-    `  content = content.trimEnd() + '\\n' + catchAll;`,
-    `  writeFileSync(redirectsPath, content);`,
-    `  console.log('[redirects] Added SSR catch-all to _redirects');`,
-    `}`,
-    ``,
     `// ── Run ──────────────────────────────────────────────────────────`,
+    `(async () => {`,
+    ``,
     `generateIslandRedirects();`,
     `copyAdapters();`,
     `copyToNetlifyPaths();`,
-    `ensureNetlifyRedirects();`,
+    ``,
+    `// ── Prerender (SSG) ──────────────────────────────────────────────`,
+    `// Spawn the built server and fetch routes to generate static HTML.`,
+    `// The Netlify preset produces a function handler (not a standalone`,
+    `// server), so we detect it and wrap it in a minimal HTTP server.`,
+    ``,
+    `function isNetlifyHandler(entryPath) {`,
+    `  const code = readFileSync(entryPath, 'utf-8');`,
+    `  return code.includes('path: "/*"') || code.includes('path:\`/*\`');`,
+    `}`,
+    ``,
+    `function writeNetlifyWrapper(serverDir, port) {`,
+    `  const wrapperPath = join(serverDir, '_prerender-server.mjs');`,
+    `  writeFileSync(wrapperPath, [`,
+    `    'import { createServer } from "node:http";',`,
+    `    'import handler from "./main.mjs";',`,
+    `    'const PORT = ' + port + ';',`,
+    `    'const server = createServer(async (req, res) => {',`,
+    `    '  try {',`,
+    `    '    const url = new URL(req.url, "http://localhost:" + PORT);',`,
+    `    '    const headers = new Headers();',`,
+    `    '    for (const [key, value] of Object.entries(req.headers)) {',`,
+    `    '      if (value) headers.set(key, Array.isArray(value) ? value.join(", ") : value);',`,
+    `    '    }',`,
+    `    '    const request = new Request(url.toString(), { method: req.method, headers });',`,
+    `    '    const response = await handler(request);',`,
+    `    '    res.writeHead(response.status, Object.fromEntries(response.headers.entries()));',`,
+    `    '    res.end(await response.text());',`,
+    `    '  } catch (err) { console.error("[prerender-wrapper]", err); res.writeHead(500); res.end("Error"); }',`,
+    `    '});',`,
+    `    'server.listen(PORT, "127.0.0.1", () => console.log("[prerender-wrapper] Listening on port " + PORT));',`,
+    `  ].join('\\n'));`,
+    `  return wrapperPath;`,
+    `}`,
+    ``,
+    `const serverEntries = [`,
+    `  join(CWD, '.output', 'server', 'index.mjs'),`,
+    `  join(CWD, '.netlify', 'functions-internal', 'server', 'server.mjs'),`,
+    `  join(CWD, '.netlify', 'v1', 'functions', 'server', 'server.mjs'),`,
+    `];`,
+    `const serverEntry = serverEntries.find(p => existsSync(p));`,
+    `const outputDir = [join(CWD, '.output', 'public'), DIST_DIR].find(d => existsSync(d));`,
+    ``,
+    `if (serverEntry && outputDir) {`,
+    `  const { spawn: spawnProcess } = await import('node:child_process');`,
+    `  const PORT = 13172;`,
+    `  const baseUrl = 'http://localhost:' + PORT;`,
+    `  const netlifyMode = isNetlifyHandler(serverEntry);`,
+    `  let actualEntry = serverEntry;`,
+    `  if (netlifyMode) {`,
+    `    const mainMjs = join(dirname(serverEntry), 'main.mjs');`,
+    `    if (existsSync(mainMjs)) {`,
+    `      actualEntry = writeNetlifyWrapper(dirname(serverEntry), PORT);`,
+    `      console.log('[prerender] Netlify handler detected, using wrapper');`,
+    `    }`,
+    `  }`,
+    `  console.log('[prerender] Spawning server on port ' + PORT + '...');`,
+    `  const srv = spawnProcess('node', [actualEntry], {`,
+    `    env: { ...process.env, PORT: String(PORT), NITRO_PORT: String(PORT), HOST: '127.0.0.1', NITRO_HOST: '127.0.0.1', NODE_ENV: 'production' },`,
+    `    stdio: ['ignore', 'pipe', 'pipe'],`,
+    `  });`,
+    `  srv.stdout?.on('data', d => { const m = d.toString().trim(); if (m) console.log('[prerender:server] ' + m); });`,
+    `  srv.stderr?.on('data', d => { const m = d.toString().trim(); if (m) console.error('[prerender:server:err] ' + m); });`,
+    `  let ready = false;`,
+    `  const t0 = Date.now();`,
+    `  while (Date.now() - t0 < 15000) {`,
+    `    try { const r = await fetch(baseUrl + '/'); if (r.ok || r.status < 500) { ready = true; break; } } catch {}`,
+    `    await new Promise(r => setTimeout(r, 200));`,
+    `  }`,
+    `  if (ready) {`,
+    `    console.log('[prerender] Server ready');`,
+    `    const visited = new Set();`,
+    `    const queue = ['/'];`,
+    `    const prerendered = [];`,
+    `    while (queue.length > 0) {`,
+    `      const batch = queue.splice(0, 4);`,
+    `      await Promise.all(batch.map(async (route) => {`,
+    `        const norm = route.endsWith('/') && route !== '/' ? route.slice(0, -1) : route;`,
+    `        if (visited.has(norm)) return;`,
+    `        visited.add(norm);`,
+    `        try {`,
+    `          const res = await fetch(baseUrl + norm);`,
+    `          if (!res.ok) { console.error('[prerender] ' + norm + ' returned ' + res.status); return; }`,
+    `          const html = await res.text();`,
+    `          const fileName = join(norm, 'index.html');`,
+    `          const out = join(outputDir, fileName);`,
+    `          mkdirSync(dirname(out), { recursive: true });`,
+    `          writeFileSync(out, html);`,
+    `          prerendered.push(norm);`,
+    `          console.log('[prerender] ' + norm);`,
+    `          // Crawl links`,
+    `          const re = /<a\\s[^>]*href=["']([^"'#?]+)/gi;`,
+    `          let m;`,
+    `          while ((m = re.exec(html)) !== null) {`,
+    `            const href = m[1];`,
+    `            if (href.startsWith('/') && !href.startsWith('//') && !href.startsWith('/assets/') && !href.startsWith('/islands/') && !href.match(/\\.\\w{2,5}$/)) {`,
+    `              const n = href.endsWith('/') && href !== '/' ? href.slice(0, -1) : href;`,
+    `              if (!visited.has(n)) queue.push(n);`,
+    `            }`,
+    `          }`,
+    `        } catch (err) { console.error('[prerender] Error fetching ' + norm + ':', err.message); }`,
+    `      }));`,
+    `    }`,
+    `    srv.kill('SIGKILL');`,
+    `    console.log('[prerender] Done: ' + prerendered.length + ' page(s)');`,
+    `    // Clean up wrapper`,
+    `    if (netlifyMode) {`,
+    `      const wp = join(dirname(serverEntry), '_prerender-server.mjs');`,
+    `      if (existsSync(wp)) unlinkSync(wp);`,
+    `    }`,
+    `    // Copy to alt output dirs`,
+    `    for (const alt of [DIST_DIR, join(CWD, '.netlify', 'v1', 'functions', 'server', 'public')].filter(d => d !== outputDir && existsSync(dirname(d)))) {`,
+    `      for (const route of prerendered) {`,
+    `        const f = join(route, 'index.html');`,
+    `        const src = join(outputDir, f);`,
+    `        const dest = join(alt, f);`,
+    `        if (existsSync(src)) { mkdirSync(dirname(dest), { recursive: true }); copyFileSync(src, dest); }`,
+    `      }`,
+    `    }`,
+    `  } else {`,
+    `    srv.kill('SIGKILL');`,
+    `    console.error('[prerender] Server did not start, skipping prerender');`,
+    `  }`,
+    `}`,
+    ``,
     `console.log('[post-build] Complete');`,
+    ``,
+    `})().catch(err => { console.error('[post-build] Fatal:', err); process.exit(1); });`,
     ``
   ];
   return lines.join(`

package/package.json

@@ -1,39 +1,39 @@
-{
-	"name": "create-avalon",
-	"version": "0.1.15",
-	"description": "Scaffold a new Avalon project with multi-framework islands architecture",
-	"license": "MIT",
-	"type": "module",
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/useAvalon/Avalon.git",
-		"directory": "packages/create-avalon"
-	},
-	"homepage": "https://useavalon.dev",
-	"keywords": [
-		"avalon",
-		"create",
-		"scaffold",
-		"cli",
-		"islands",
-		"vite"
-	],
-	"bin": {
-		"create-avalon": "dist/cli.js"
-	},
-	"files": [
-		"dist",
-		"README.md"
-	],
-	"scripts": {
-		"build": "bun build src/cli.ts --outdir dist --target node --format esm",
-		"prepublishOnly": "bun run build"
-	},
-	"dependencies": {
-		"@clack/prompts": "^1.1.0"
-	},
-	"devDependencies": {
-		"fast-check": "^4.6.0",
-		"vitest": "^4.1.0"
-	}
-}
+{
+	"name": "create-avalon",
+	"version": "0.1.17",
+	"description": "Scaffold a new Avalon project with multi-framework islands architecture",
+	"license": "MIT",
+	"type": "module",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/useAvalon/Avalon.git",
+		"directory": "packages/create-avalon"
+	},
+	"homepage": "https://useavalon.dev",
+	"keywords": [
+		"avalon",
+		"create",
+		"scaffold",
+		"cli",
+		"islands",
+		"vite"
+	],
+	"bin": {
+		"create-avalon": "dist/cli.js"
+	},
+	"files": [
+		"dist",
+		"README.md"
+	],
+	"scripts": {
+		"build": "bun build src/cli.ts --outdir dist --target node --format esm",
+		"prepublishOnly": "bun run build"
+	},
+	"dependencies": {
+		"@clack/prompts": "^1.1.0"
+	},
+	"devDependencies": {
+		"fast-check": "^4.6.0",
+		"vitest": "^4.1.0"
+	}
+}