create-fullstack-scaffold 0.5.3 → 0.5.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-fullstack-scaffold",
-  "version": "0.5.3",
+  "version": "0.5.6",
   "type": "module",
   "bin": {
     "create-fullstack-scaffold": "dist/cli/index.js"

package/template/package.json

@@ -1,7 +1,7 @@
 {
   "name": "biomimic-todo-app",
   "private": true,
-  "version": "0.5.3",
+  "version": "0.5.6",
   "type": "module",
   "bin": {
     "biomimic": "./dist/cli/index.js"

package/template/src/server/entries/node.ts

@@ -17,7 +17,23 @@ import { logger } from '../utils/logger'
 import { createApp } from '../app'
 import { getDb, runMigrations } from '../db'
 import { createISRCache, isISRRoute } from '@server/core/isr-cache'
-import { renderPage } from '@server/core/ssr-renderer'
+import { renderISRPage } from '@server/core/isr-renderer'
+// @client/entry-server 仅含 client 的 preset 存在；cli-only 会因静态
+// 导入悬空（verify 链已拦过一次）。运行时按需加载，缺省回退壳渲染。
+type RenderSSRFn = (pathname: string, data: never) => { html: string }
+
+async function loadRenderSSR(): Promise<RenderSSRFn | null> {
+  try {
+    // 变量说明符：tsc 不做模块解析（cli-only 无 client 目录时字面量
+    // 动态导入也会被 tsc 拦——与 vitest.config 的 react 插件同法）
+    const mod = '@client/entry-server'
+    const m = (await import(/* @vite-ignore */ mod)) as { renderSSR: RenderSSRFn }
+    return m.renderSSR
+  } catch {
+    return null
+  }
+}
+import { isrRegistry, type ISRRouterContext } from '@server/core/isr-registry'
 import { setISRCache } from '@server/core/isr-invalidation'
 import { setRuntimeAdapter } from '@server/core/runtime'
 import { getNodeRuntimeAdapter } from '@server/core/runtime-node'
@@ -130,11 +146,13 @@ app.get('*', async c => {
     }
 
     if (result.status === 'stale' && result.html) {
-      renderPage(pathname)
-        .then(rendered => {
-          isrCache.store(pathname, rendered.html).catch(e => {
-            console.warn('ISR cache store (background revalidation) failed:', e)
-          })
+      renderISRForRoute(pathname)
+        .then(html => {
+          if (html) {
+            isrCache.store(pathname, html).catch(e => {
+              console.warn('ISR cache store (background revalidation) failed:', e)
+            })
+          }
         })
         .catch(e => {
           console.warn('ISR background render failed:', e)
@@ -142,11 +160,14 @@ app.get('*', async c => {
       return c.html(result.html)
     }
 
-    const rendered = await renderPage(pathname)
-    isrCache.store(pathname, rendered.html).catch(e => {
-      console.warn('ISR cache store failed:', e)
-    })
-    return c.html(rendered.html)
+    const html = await renderISRForRoute(pathname)
+    if (html) {
+      isrCache.store(pathname, html).catch(e => {
+        console.warn('ISR cache store failed:', e)
+      })
+      return c.html(html)
+    }
+    return c.html(indexHtml)
   }
 
   return c.html(indexHtml)
@@ -191,6 +212,34 @@ export async function createServer() {
   return { server, port: config.port }
 }
 
+/**
+ * 真 ISR 渲染（与 CF 入口同管线）：registry fetch 数据 → renderSSR
+ * 页面级渲染 → renderISRPage 注入 body + meta + __SSR_DATA__。
+ * 返回 null 表示无注册路由/渲染失败，调用方回退 SPA index.html。
+ */
+async function renderISRForRoute(pathname: string): Promise<string | null> {
+  const entry = isrRegistry.match(pathname)
+  if (!entry) return null
+  const ctx: ISRRouterContext = { db: await getDb(), env: {} }
+  let data: unknown = {}
+  let meta = { title: 'App', description: '' }
+  try {
+    data = await entry.fetch(pathname, ctx)
+    meta = entry.meta(data, pathname)
+  } catch {
+    // DB 错误——回退默认 meta 继续渲染壳
+  }
+  const renderSSR = await loadRenderSSR()
+  if (!renderSSR) return null // 无 client（cli-only 等）——调用方回退 SPA
+  try {
+    const ssr = renderSSR(pathname, data as never)
+    return renderISRPage({ template: indexHtml, body: ssr.html, meta, data })
+  } catch (e) {
+    console.warn('ISR render failed:', e)
+    return null
+  }
+}
+
 export async function startServer() {
   const bootstrapLog = logger.bootstrap()