@timber-js/app 0.1.34 → 0.1.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@timber-js/app",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "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

@@ -6,8 +6,9 @@
 // See design/11-platform.md and design/25-production-deployments.md.
 
 import { writeFile, mkdir, cp } from 'node:fs/promises';
-import { execFile } from 'node:child_process';
+import { execFile, execFileSync } from 'node:child_process';
 import { join, relative } from 'node:path';
+import { createRequire } from 'node:module';
 import type { TimberPlatformAdapter, TimberConfig } from './types';
 // Inlined from server/asset-headers.ts — adapters are loaded by Node at
 // Vite startup time, before Vite's module resolver is available, so cross-
@@ -206,6 +207,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);
     },
 
     // Only presets that produce a locally-runnable server get preview().
@@ -276,7 +281,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, toWebRequest, sendWebResponse } from 'nitro/h3'
 import handler, { runWithEarlyHintsSender } from '${serverEntryRelative}'
 
 // Set TIMBER_RUNTIME for instrumentation.ts conditional SDK initialization.
@@ -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,29 @@ export function generateNitroPreviewCommand(
   };
 }
 
+/**
+ * Run the Nitro production build.
+ * Resolves the `nitro` CLI binary from node_modules and runs `nitro build`
+ * in the given directory, which reads nitro.config.ts and produces
+ * .output/server/index.mjs (for node-server preset).
+ */
+function runNitroBuild(nitroDir: string): Promise<void> {
+  // Resolve the nitro CLI binary from the dependency graph rather than
+  // relying on npx, which may not be available in all environments.
+  const require = createRequire(import.meta.url);
+  const nitroPkg = require.resolve('nitro/package.json');
+  const nitroBin = join(nitroPkg, '..', 'dist', 'cli', 'index.mjs');
+
+  return new Promise<void>((resolve, reject) => {
+    const child = execFile('node', [nitroBin, 'build'], { cwd: nitroDir }, (err) => {
+      if (err) reject(new Error(`Nitro build failed: ${err.message}`));
+      else resolve();
+    });
+    child.stdout?.pipe(process.stdout);
+    child.stderr?.pipe(process.stderr);
+  });
+}
+
 /** Spawn a Nitro preview process and pipe stdio. */
 function spawnNitroPreview(command: string, args: string[], cwd: string): Promise<void> {
   return new Promise<void>((resolve, reject) => {