@timber-js/app 0.1.34 → 0.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.1.34",
+  "version": "0.1.36",
   "description": "Vite-native React framework for Cloudflare Workers — correct HTTP semantics, real status codes, pages that work without JavaScript",
   "keywords": [
     "cloudflare-workers",
@@ -87,7 +87,8 @@
   "dependencies": {
     "@opentelemetry/api": "^1.9.0",
     "@opentelemetry/context-async-hooks": "^2.6.0",
-    "@opentelemetry/sdk-trace-base": "^2.6.0"
+    "@opentelemetry/sdk-trace-base": "^2.6.0",
+    "nitro": "^3.0.0"
   },
   "peerDependencies": {
     "@content-collections/core": "^0.14.0",

package/src/adapters/nitro.ts

@@ -206,6 +206,10 @@ export function nitro(options: NitroAdapterOptions = {}): TimberPlatformAdapter
       // Generate the Nitro config with static asset cache rules
       const nitroConfig = generateNitroConfig(preset, options.nitroConfig);
       await writeFile(join(outDir, 'nitro.config.ts'), nitroConfig);
+
+      // Run the Nitro build to produce a production-ready server bundle.
+      // The output goes to dist/nitro/.output/server/index.mjs (for node-server preset).
+      await runNitroBuild(outDir, preset, options.nitroConfig);
     },
 
     // Only presets that produce a locally-runnable server get preview().
@@ -276,7 +280,7 @@ export function generateNitroEntry(
   return `// Generated by @timber-js/app/adapters/nitro
 // Do not edit — this file is regenerated on each build.
 
-${manifestImport}import { defineEventHandler, toWebRequest, sendWebResponse } from 'h3'
+${manifestImport}import { defineEventHandler, sendWebResponse } from 'nitro/h3'
 import handler, { runWithEarlyHintsSender } from '${serverEntryRelative}'
 
 // Set TIMBER_RUNTIME for instrumentation.ts conditional SDK initialization.
@@ -284,7 +288,8 @@ import handler, { runWithEarlyHintsSender } from '${serverEntryRelative}'
 process.env.TIMBER_RUNTIME = '${runtimeName}'
 
 export default defineEventHandler(async (event) => {
-  const webRequest = toWebRequest(event)
+  // h3 v2: event.request is a standard Web Request
+  const webRequest = event.request
 ${handlerCall}
   return sendWebResponse(event, webResponse)
 })
@@ -300,6 +305,7 @@ export function generateNitroConfig(
 
   const config: Record<string, unknown> = {
     preset: presetConfig.nitroPreset,
+    entry: './entry.ts',
     output: { dir: presetConfig.outputDir },
     // Static asset cache headers — hashed assets are immutable, others get 1h.
     // See design/25-production-deployments.md §"CDN / Edge Cache"
@@ -315,7 +321,7 @@ export function generateNitroConfig(
   return `// Generated by @timber-js/app/adapters/nitro
 // Do not edit — this file is regenerated on each build.
 
-import { defineNitroConfig } from 'nitropack/config'
+import { defineNitroConfig } from 'nitro/config'
 
 export default defineNitroConfig(${configJson})
 `;
@@ -521,6 +527,44 @@ export function generateNitroPreviewCommand(
   };
 }
 
+/**
+ * Run the Nitro production build using the programmatic API.
+ * Uses dynamic import so nitro is only loaded at build time.
+ * Externalizes the timber RSC/SSR output — those files are pre-built
+ * by timber and have internal references that nitro's bundler can't follow.
+ */
+async function runNitroBuild(
+  nitroDir: string,
+  preset: NitroPreset,
+  userConfig?: Record<string, unknown>
+): Promise<void> {
+  const presetConfig = PRESET_CONFIGS[preset];
+  const { createNitro, build: nitroBuild, prepare, copyPublicAssets } = await import('nitro');
+
+  const nitro = await createNitro({
+    rootDir: nitroDir,
+    preset: presetConfig.nitroPreset,
+    entry: join(nitroDir, 'entry.ts'),
+    output: { dir: join(nitroDir, presetConfig.outputDir) },
+    routeRules: {
+      '/assets/**': { headers: { 'Cache-Control': IMMUTABLE_CACHE } },
+    },
+    // Don't bundle the timber RSC/SSR build output — it has its own
+    // internal file references that nitro's bundler can't follow.
+    // Mark them as external so rollup leaves the imports as-is.
+    rollupConfig: {
+      external: [/\.\.\/rsc\//, /\.\/_timber-manifest-init/],
+    },
+    ...presetConfig.extraConfig,
+    ...userConfig,
+  });
+
+  await prepare(nitro);
+  await copyPublicAssets(nitro);
+  await nitroBuild(nitro);
+  await nitro.close();
+}
+
 /** Spawn a Nitro preview process and pipe stdio. */
 function spawnNitroPreview(command: string, args: string[], cwd: string): Promise<void> {
   return new Promise<void>((resolve, reject) => {