create-avalon 0.1.16 → 0.1.17

package/dist/cli.js

@@ -1735,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() {
@@ -1842,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 {`,
@@ -1937,27 +1944,47 @@ 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'),`,
@@ -1970,8 +1997,17 @@ function generatePostBuildMjs() {
     `  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', [serverEntry], {`,
+    `  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'],`,
     `  });`,
@@ -2019,6 +2055,11 @@ function generatePostBuildMjs() {
     `    }`,
     `    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) {`,

package/package.json

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