brustjs 0.1.9-alpha → 0.1.11-alpha

package/README.md

@@ -73,6 +73,7 @@ route apiece.
 ```
 brustjs dev   <entry>             # dev mode: watcher + WS reload + browser auto-reload
 brustjs build <entry> --out-dir D # prebuilt ./dist/ — run from the project (bun run dist/index.js)
+                  --target <auto|all|TARGET[,…]> # which native binary to bundle (default: auto = host platform)
 brustjs new   <name>              # scaffold a project (partial — see Status)
 ```
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brustjs",
-  "version": "0.1.9-alpha",
+  "version": "0.1.11-alpha",
   "description": "Bun + Rust SSR framework — React on the server, Rust everywhere else (napi cdylib + per-worker SharedArrayBuffer).",
   "license": "MIT",
   "repository": {
@@ -40,12 +40,12 @@
     "typescript": "^6.0.3"
   },
   "optionalDependencies": {
-    "brustjs-darwin-x64": "0.1.9-alpha",
-    "brustjs-darwin-arm64": "0.1.9-alpha",
-    "brustjs-linux-x64-gnu": "0.1.9-alpha",
-    "brustjs-linux-arm64-gnu": "0.1.9-alpha",
-    "brustjs-linux-x64-musl": "0.1.9-alpha",
-    "brustjs-linux-arm64-musl": "0.1.9-alpha"
+    "brustjs-darwin-x64": "0.1.11-alpha",
+    "brustjs-darwin-arm64": "0.1.11-alpha",
+    "brustjs-linux-x64-gnu": "0.1.11-alpha",
+    "brustjs-linux-arm64-gnu": "0.1.11-alpha",
+    "brustjs-linux-x64-musl": "0.1.11-alpha",
+    "brustjs-linux-arm64-musl": "0.1.11-alpha"
   },
   "peerDependencies": {
     "react": "^19.2.6",

package/runtime/cli/build.ts

@@ -1,5 +1,5 @@
 import { existsSync } from 'node:fs'
-import { copyFile, mkdir, readdir, rm } from 'node:fs/promises'
+import { copyFile, cp, mkdir, readdir, rm } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import path, { isAbsolute, resolve } from 'node:path'
 import {
@@ -59,14 +59,98 @@ async function collectNativeBinaries(): Promise<string[]> {
   return out
 }
 
+/** The 6 published platform targets (root package.json optionalDependencies),
+ * keyed by the napi binary infix `<platform>-<arch>[-<libc>]`. */
+export const VALID_TARGETS = [
+  'darwin-x64',
+  'darwin-arm64',
+  'linux-x64-gnu',
+  'linux-arm64-gnu',
+  'linux-x64-musl',
+  'linux-arm64-musl',
+] as const
+
+/** Host target infix — reuses the same detection as platformPackageName by
+ * stripping the `brustjs-` prefix. */
+export function hostTargetInfix(): string {
+  return platformPackageName().replace(/^brustjs-/, '')
+}
+
+function basenameTarget(absPath: string): string | null {
+  const b = absPath.replace(/^.*[/\\]/, '') // basename
+  const m = /^brust\.(.+)\.node$/.exec(b)
+  return m ? m[1] : null
+}
+
+/** Select which collected `brust.*.node` paths to copy for `target`.
+ * Pure: takes the collected absolute paths, returns selected paths + errors. */
+export function selectNativeBinaries(
+  collected: string[],
+  target: string,
+): { selected: string[]; errors: string[] } {
+  // Dedupe tokens here so `selected` never contains duplicate paths — the
+  // function's contract is a clean selection, independent of any caller-side
+  // copy-dedup (`--target darwin-arm64,darwin-arm64` must select once).
+  const tokens = [
+    ...new Set(
+      target
+        .split(',')
+        .map((t) => t.trim().toLowerCase())
+        .filter(Boolean),
+    ),
+  ]
+  const byTarget = new Map<string, string>() // infix → first abs path (dedupe)
+  for (const p of collected) {
+    const t = basenameTarget(p)
+    if (t && !byTarget.has(t)) byTarget.set(t, p)
+  }
+
+  if (tokens.length === 0) return { selected: [], errors: ['brust build: empty --target'] }
+
+  const hasAuto = tokens.includes('auto')
+  const hasAll = tokens.includes('all')
+  if ((hasAuto || hasAll) && tokens.length > 1) {
+    return {
+      selected: [],
+      errors: [
+        `brust build: --target "${target}" — auto/all cannot be combined with other targets`,
+      ],
+    }
+  }
+  if (hasAll) return { selected: [...byTarget.values()], errors: [] }
+
+  const wanted = hasAuto ? [hostTargetInfix()] : tokens
+  const selected: string[] = []
+  const errors: string[] = []
+  for (const t of wanted) {
+    if (!hasAuto && !VALID_TARGETS.includes(t as (typeof VALID_TARGETS)[number])) {
+      errors.push(
+        `brust build: unknown target "${t}" (valid: ${VALID_TARGETS.join(', ')}, or auto/all)`,
+      )
+      continue
+    }
+    const p = byTarget.get(t)
+    if (!p) {
+      errors.push(
+        `brust build: no native binary for target "${t}" — install brustjs-${t} or build it (bun --filter runtime run build)`,
+      )
+      continue
+    }
+    selected.push(p)
+  }
+  return { selected, errors }
+}
+
 interface ParsedArgs {
   entry: string // absolute path to the entry file
   outDir: string // absolute path to the output dir
+  target: string // --target value (default 'auto')
 }
 
 function parseArgs(args: string[]): ParsedArgs {
   let entry: string | undefined
   let outDir: string | undefined
+  let target = 'auto'
 
   for (let i = 0; i < args.length; i++) {
     const a = args[i]
@@ -78,6 +162,18 @@ function parseArgs(args: string[]): ParsedArgs {
       }
     } else if (a.startsWith('--out-dir=')) {
       outDir = a.slice('--out-dir='.length)
+    } else if (a === '--target') {
+      target = args[++i]
+      if (!target) {
+        console.error('brust build: --target requires a value')
+        process.exit(1)
+      }
+    } else if (a.startsWith('--target=')) {
+      target = a.slice('--target='.length)
+      if (!target) {
+        console.error('brust build: --target= requires a value')
+        process.exit(1)
+      }
     } else if (a.startsWith('-')) {
       console.error(`brust build: unknown flag "${a}"`)
       process.exit(1)
@@ -107,11 +203,11 @@ function parseArgs(args: string[]): ParsedArgs {
       : resolve(cwd, outDir)
     : resolve(cwd, 'dist')
 
-  return { entry: entryPath, outDir: outPath }
+  return { entry: entryPath, outDir: outPath, target }
 }
 
 export async function runBuild(args: string[]): Promise<void> {
-  const { entry, outDir } = parseArgs(args)
+  const { entry, outDir, target } = parseArgs(args)
   const entryDir = path.dirname(entry)
 
   console.log(`[brust build] entry:  ${entry}`)
@@ -177,12 +273,11 @@ export async function runBuild(args: string[]): Promise<void> {
   // native: true route. Pipeline runs even if no native routes exist (writes
   // an empty manifest) so consumers can rely on the output dir's presence.
   {
-    // outDir must align with the runtime's loadJinjaOnce which reads from
-    // `process.cwd() + '.brust/jinja'`. Existing CSS pipeline uses cwd too
-    // (see boot log: "built CSS → <cwd>/.brust/css/app.css"). entryDir
-    // diverges when user runs `bun run dev <entry>` from a different dir;
-    // cwd is the single source of truth for both pipelines.
-    const jinjaDir = path.join(process.cwd(), '.brust/jinja')
+    // Emit jinja templates INTO the build output dir (`<outDir>/jinja`), next to
+    // the other pre-built artifacts (islands, css, mcp-manifest), so a dist-only
+    // deploy ships the templates. The prebuilt runtime reads them from
+    // `<BRUST_DIST_DIR>/jinja` (see index.ts loadJinjaOnce / configureJinjaDir).
+    const jinjaDir = path.join(outDir, 'jinja')
     // Spec §7 Component-source resolution: scan the routes module's source for
     // ImportDeclarations, NOT the app entry's. The app entry only imports the
     // routes module + brust; the page components are imported by routes.tsx.
@@ -197,6 +292,17 @@ export async function runBuild(args: string[]): Promise<void> {
     })
     const nativeCount = (loadedRoutes ?? []).filter((r: any) => r?.nativeTemplate).length
     console.log(`[brust build] jinja:   ${nativeCount} template(s) → ${jinjaDir}`)
+
+    // Also mirror into cwd/.brust/jinja so the NON-prebuilt source runtime
+    // (`bun run <entry>` directly, and `bun run dev`) — which reads
+    // cwd/.brust/jinja — finds the same templates after a build. The prebuilt
+    // dist reads <distDir>/jinja (above); this keeps the dev/source path working
+    // without a separate compile step. `.brust/` is a gitignored cache dir.
+    const localJinjaDir = path.join(process.cwd(), '.brust', 'jinja')
+    if (path.resolve(localJinjaDir) !== path.resolve(jinjaDir)) {
+      await rm(localJinjaDir, { recursive: true, force: true })
+      await cp(jinjaDir, localJinjaDir, { recursive: true })
+    }
   }
 
   // 4.5. CSS — Tailwind v4 if app.css is present.
@@ -284,26 +390,30 @@ export async function runBuild(args: string[]): Promise<void> {
   }
   console.log(`[brust build] bundle:  ${path.join(outDir, 'index.js')}`)
 
-  // 7. Copy the current-platform native binary.
+  // 7. Copy the selected-platform native binary(ies).
   const nativeDir = path.join(outDir, 'native')
   await mkdir(nativeDir, { recursive: true })
 
   // napi-rs names the binary `brust.<platform>-<arch>[-libc].node` (binaryName
   // "brust", from the root napi config). Source/CI builds leave it in runtime/;
-  // an installed project carries it in the brustjs-<platform> package. Copy
-  // every match from both — multi-platform (CI matrix) and single-platform
-  // (local/installed) layouts both Just Work.
+  // an installed project carries it in the brustjs-<platform> package. The
+  // --target flag (default "auto" = host platform) selects which to copy.
   const nativeBinaries = await collectNativeBinaries()
-  if (nativeBinaries.length === 0) {
+  const { selected, errors } = selectNativeBinaries(nativeBinaries, target)
+  if (errors.length > 0) {
+    for (const e of errors) console.error(e)
+    process.exit(1)
+  }
+  if (selected.length === 0) {
     console.error(
-      `brust build: no native binary found. Looked in ${path.join(REPO_ROOT, 'runtime')} and ` +
-        `the ${platformPackageName()} package. From source run \`bun --filter runtime run build\` ` +
-        `(or :debug) first; in an installed project ensure the platform package is present.`,
+      `brust build: no native binary found for target "${target}". Looked in ` +
+        `${path.join(REPO_ROOT, 'runtime')} and the ${platformPackageName()} package. ` +
+        `From source run \`bun --filter runtime run build\` first.`,
     )
     process.exit(1)
   }
   const seen = new Set<string>()
-  for (const src of nativeBinaries) {
+  for (const src of selected) {
     const name = path.basename(src)
     if (seen.has(name)) continue
     seen.add(name)

package/runtime/cli/help.ts

@@ -0,0 +1,125 @@
+// Dep-free CLI help/version rendering + a tiny ANSI color util. All functions
+// return strings (no console writes) so they're unit-testable. index.ts owns
+// the actual stdout/stderr + exit codes.
+import { readFileSync } from 'node:fs'
+import path from 'node:path'
+
+/** Read the brustjs package.json version. `help.ts` lives at
+ * <root>/runtime/cli/, so ../../package.json is <root>/package.json in both the
+ * source tree and an installed node_modules/brustjs layout. Never throws —
+ * returns "unknown" on any failure (version must not crash the CLI). */
+export function readVersion(): string {
+  try {
+    const p = path.join(import.meta.dir, '..', '..', 'package.json')
+    const pkg = JSON.parse(readFileSync(p, 'utf8')) as { version?: string }
+    return pkg.version ?? 'unknown'
+  } catch {
+    return 'unknown'
+  }
+}
+
+function useColor(): boolean {
+  return Boolean(process.stdout.isTTY) && !process.env.NO_COLOR
+}
+function wrap(open: string, s: string): string {
+  return useColor() ? `\x1b[${open}m${s}\x1b[0m` : s
+}
+export const style = {
+  bold: (s: string) => wrap('1', s),
+  dim: (s: string) => wrap('2', s),
+  cyan: (s: string) => wrap('36', s),
+  green: (s: string) => wrap('32', s),
+  red: (s: string) => wrap('31', s),
+}
+
+interface CommandDef {
+  name: string
+  summary: string
+  usage: string
+  flags: { flag: string; desc: string }[]
+}
+
+export const COMMANDS: CommandDef[] = [
+  {
+    name: 'build',
+    summary: 'Compile a brust app to a self-contained dist/',
+    usage: 'brust build [entry] [options]',
+    flags: [
+      { flag: '[entry]', desc: 'Entry file (default ./index.ts)' },
+      { flag: '--out-dir <dir>', desc: 'Output directory (default ./dist)' },
+      {
+        flag: '--target <t>',
+        desc: 'Native target(s): auto | all | <platform>-<arch>[-<libc>][,…] (default auto)',
+      },
+    ],
+  },
+  {
+    name: 'dev',
+    summary: 'Run the dev server with hot reload',
+    usage: 'brust dev [entry] [options]',
+    flags: [
+      { flag: '[entry]', desc: 'Entry file (default ./index.ts)' },
+      { flag: '--port <n>', desc: 'Port to listen on' },
+    ],
+  },
+  {
+    name: 'new',
+    summary: 'Scaffold a new brust project',
+    usage: 'brust new <name> [options]',
+    flags: [
+      { flag: '<name>', desc: 'Project name (lowercase letters, digits, - _)' },
+      { flag: '--dir <path>', desc: 'Target directory (default ./<name>)' },
+    ],
+  },
+]
+
+function pad(s: string, w: number): string {
+  return s + ' '.repeat(Math.max(0, w - s.length))
+}
+
+export function renderVersion(): string {
+  return `brustjs ${readVersion()}`
+}
+
+export function renderRootHelp(): string {
+  const lines: string[] = []
+  lines.push(`${style.bold('brust')} ${style.dim(readVersion())} — the brust framework CLI`)
+  lines.push('')
+  lines.push(`${style.bold('Usage:')} brust <command> [options]`)
+  lines.push('')
+  const globals = [
+    { label: '-h, --help', desc: 'Show help (brust help <command> for details)' },
+    { label: '-v, --version', desc: 'Show the brustjs version' },
+  ]
+  // One shared column width across commands AND global flags so every
+  // description lines up in a single column.
+  const w = Math.max(...COMMANDS.map((c) => c.name.length), ...globals.map((g) => g.label.length))
+  lines.push(style.bold('Commands:'))
+  for (const c of COMMANDS) {
+    lines.push(`  ${style.cyan(pad(c.name, w))}  ${c.summary}`)
+  }
+  lines.push('')
+  lines.push(style.bold('Global:'))
+  for (const g of globals) {
+    lines.push(`  ${style.cyan(pad(g.label, w))}  ${g.desc}`)
+  }
+  lines.push('')
+  lines.push(style.dim('Run `brust help <command>` for command-specific options.'))
+  return lines.join('\n')
+}
+
+export function renderCommandHelp(name: string): string | null {
+  const c = COMMANDS.find((x) => x.name === name)
+  if (!c) return null
+  const lines: string[] = []
+  lines.push(`${style.bold('Usage:')} ${c.usage}`)
+  lines.push('')
+  lines.push(c.summary)
+  lines.push('')
+  lines.push(style.bold('Options:'))
+  const w = Math.max(...c.flags.map((f) => f.flag.length))
+  for (const f of c.flags) {
+    lines.push(`  ${style.cyan(pad(f.flag, w))}  ${f.desc}`)
+  }
+  return lines.join('\n')
+}

package/runtime/cli/index.ts

@@ -1,30 +1,65 @@
 #!/usr/bin/env bun
-const [, , subcommand, ...rest] = process.argv
+import { COMMANDS, renderCommandHelp, renderRootHelp, renderVersion } from './help.ts'
 
-switch (subcommand) {
-  case 'build': {
-    const { runBuild } = await import('./build.ts')
-    await runBuild(rest)
-    break
+const argv = process.argv.slice(2)
+const first = argv[0]
+const second = argv[1]
+
+// Derive from COMMANDS so the dispatch set and the help registry can never
+// drift (a name in KNOWN but absent from COMMANDS would print `null` as help).
+const KNOWN = new Set(COMMANDS.map((c) => c.name))
+
+function hasHelpFlag(args: string[]): boolean {
+  return args.includes('--help') || args.includes('-h')
+}
+
+if (first === '--version' || first === '-v' || first === 'version') {
+  console.log(renderVersion())
+  process.exit(0)
+}
+
+if (first === '--help' || first === '-h' || first === 'help') {
+  if (second && KNOWN.has(second)) {
+    console.log(renderCommandHelp(second))
+    process.exit(0)
   }
-  case 'dev': {
-    const { runDev } = await import('./dev.ts')
-    await runDev(rest)
-    break
+  if (second) {
+    console.error(`brust: unknown command "${second}".`)
+    console.error(renderRootHelp())
+    process.exit(1)
   }
-  case 'new': {
-    const { runNew } = await import('./new.ts')
-    await runNew(rest)
-    break
+  console.log(renderRootHelp())
+  process.exit(0)
+}
+
+if (first && KNOWN.has(first)) {
+  const rest = argv.slice(1)
+  if (hasHelpFlag(rest)) {
+    console.log(renderCommandHelp(first))
+    process.exit(0)
   }
-  default: {
-    if (!subcommand) {
-      console.error('brust: missing subcommand. Try: brust build | brust dev | brust new')
-    } else {
-      console.error(
-        `brust: unknown subcommand "${subcommand}". Try: brust build | brust dev | brust new`,
-      )
+  switch (first) {
+    case 'build': {
+      const { runBuild } = await import('./build.ts')
+      await runBuild(rest)
+      break
+    }
+    case 'dev': {
+      const { runDev } = await import('./dev.ts')
+      await runDev(rest)
+      break
+    }
+    case 'new': {
+      const { runNew } = await import('./new.ts')
+      await runNew(rest)
+      break
     }
-    process.exit(1)
   }
+} else if (!first) {
+  console.error(renderRootHelp())
+  process.exit(1)
+} else {
+  console.error(`brust: unknown command "${first}".`)
+  console.error('Run `brust --help` to see available commands.')
+  process.exit(1)
 }

package/runtime/cli/native-routes-emit.ts

@@ -3,6 +3,86 @@ import { dirname, relative, resolve } from 'node:path'
 import { buildDevClientTag } from '../dev/client.ts'
 import { ISLANDS_IMPORTMAP_AND_BOOTSTRAP } from '../islands/importmap.ts'
 
+/** Gather transitive component sources starting from a page source file.
+ *
+ * BFS/DFS over local imports reachable from `pageSourcePath`:
+ * - Reads each file's source text and adds it to `sources[ident]`.
+ * - Recursively follows local imports in each visited file.
+ * - Deduplicates by resolved path to handle cycles.
+ * - `mergedImports` is the union of every visited file's `scanImports`, with
+ *   the page's own imports taking precedence on a conflicting ident.
+ *
+ * Throws when the same ident resolves to two different absolute paths (across
+ * two different importing files) — that would be ambiguous for the Rust
+ * compiler. */
+export function gatherComponentSources(pageSourcePath: string): {
+  sources: Record<string, string>
+  mergedImports: Map<string, string>
+} {
+  const sources: Record<string, string> = {}
+  // mergedImports accumulates ident→resolvedPath across ALL visited files.
+  // The page's own imports win on conflict (inserted last below).
+  const mergedImports = new Map<string, string>()
+  const visited = new Set<string>()
+
+  // Queue items: { ident, resolvedPath } — ident is how the PARENT imported it.
+  // We start with the children of pageSourcePath (not the page itself).
+  function visit(filePath: string, ident: string) {
+    if (visited.has(filePath)) return
+    visited.add(filePath)
+
+    const sourceText = readFileSync(filePath, 'utf8')
+
+    // Record source keyed by ident — detect ambiguity.
+    if (ident in sources) {
+      // Same ident already seen — only an error if it resolves to a different path.
+      // We get the previous path from mergedImports (which maps ident → resolvedPath).
+      const existingPath = mergedImports.get(ident)
+      if (existingPath && existingPath !== filePath) {
+        throw new Error(
+          `native build: ambiguous component ident "${ident}" resolves to two paths: ${existingPath} and ${filePath}`,
+        )
+      }
+    } else {
+      sources[ident] = sourceText
+    }
+
+    // Scan this file's imports and recurse into local ones.
+    const childImports = scanImports(filePath)
+    for (const [childIdent, childPath] of childImports) {
+      // Merge into mergedImports — check for ambiguity.
+      const existing = mergedImports.get(childIdent)
+      if (existing !== undefined && existing !== childPath) {
+        throw new Error(
+          `native build: ambiguous component ident "${childIdent}" resolves to two paths: ${existing} and ${childPath}`,
+        )
+      }
+      if (existing === undefined) {
+        mergedImports.set(childIdent, childPath)
+      }
+      // Recurse into local files (skip node_modules / unresolved paths).
+      if (!childPath.includes('node_modules')) {
+        visit(childPath, childIdent)
+      }
+    }
+  }
+
+  // Seed: scan the page's own imports and visit each local file.
+  const pageImports = scanImports(pageSourcePath)
+  for (const [ident, resolvedPath] of pageImports) {
+    if (!resolvedPath.includes('node_modules')) {
+      visit(resolvedPath, ident)
+    }
+  }
+
+  // Page's own imports win on ident conflict — merge them last.
+  for (const [ident, resolvedPath] of pageImports) {
+    mergedImports.set(ident, resolvedPath)
+  }
+
+  return { sources, mergedImports }
+}
+
 /** Dev-only: splice the /_brust/dev WS client `<script>` into a compiled native
  * template so `native: true` (jinja) routes auto-reload like React-SSR routes.
  *
@@ -227,7 +307,11 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
   // the addon (`.node`) ships with every platform package, so this path works
   // for source builds and installed projects alike.
   let compileJsx:
-    | ((source: string, path: string) => { template: string; islandsJson: string })
+    | ((
+        source: string,
+        path: string,
+        componentSources?: Record<string, string>,
+      ) => { template: string; islandsJson: string; warnings?: string[] })
     | null = null
   if (nativeRoutes.length > 0) {
     const native = await import('../index.js')
@@ -254,12 +338,22 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
       continue
     }
     const outPath = resolve(opts.outDir, `${name}.jinja`)
-    let compiled: { template: string; islandsJson: string }
+
+    // Gather transitive component sources for native inlining and build the
+    // merged import map that covers nested components (e.g. islands inside an
+    // inlined native component that don't appear in the page's own imports).
+    const { sources, mergedImports } = gatherComponentSources(sourcePath)
+
+    let compiled: { template: string; islandsJson: string; warnings?: string[] }
     try {
-      compiled = compileJsx!(readFileSync(sourcePath, 'utf8'), sourcePath)
+      compiled = compileJsx!(readFileSync(sourcePath, 'utf8'), sourcePath, sources)
     } catch (e) {
       throw new Error(`native route "${name}" failed to compile (${sourcePath}):\n${String(e)}`)
     }
+
+    // Print non-fatal compiler warnings to stderr.
+    for (const w of compiled.warnings ?? []) process.stderr.write(`brust: ${w}\n`)
+
     // Dev-only: native routes don't pass through the React renderer's dev-client
     // injection, so splice the /_brust/dev WS script in here. reEmitJinja() runs
     // this on every hot reload, so the script is always present in dev.
@@ -270,10 +364,6 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
     writeFileSync(outPath, template)
     built.push(name)
 
-    // Page imports are needed for both island reconciliation and SSR component
-    // artifact emission — hoist scan here so both code paths can use it.
-    const pageImports = scanImports(sourcePath)
-
     // Islands post-processing. The compiler reports an island manifest ONLY
     // when the route uses <Island>; `"[]"` ⇒ no islands ⇒ leave the .jinja
     // byte-identical (no-island regression). Remove any stale sibling so a
@@ -281,7 +371,7 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
     const islandsJsonPath = resolve(opts.outDir, `${name}.islands.json`)
     if (compiled.islandsJson && compiled.islandsJson !== '[]') {
       writeFileSync(islandsJsonPath, compiled.islandsJson)
-      reconcileIslandManifest(outPath, islandsJsonPath, pageImports, name)
+      reconcileIslandManifest(outPath, islandsJsonPath, mergedImports, name)
     } else if (existsSync(islandsJsonPath)) {
       rmSync(islandsJsonPath, { force: true })
     }
@@ -289,7 +379,7 @@ export async function emitNativeTemplates(opts: NativeRouteEmitOpts): Promise<vo
     // SSR component artifacts: .components.json + .factory.ts
     const compJsonStr = (compiled as any).componentsJson ?? '[]'
     if (compJsonStr !== '[]') {
-      emitComponentArtifacts(outPath, compJsonStr, pageImports, name)
+      emitComponentArtifacts(outPath, compJsonStr, mergedImports, name)
     }
   }
 

package/runtime/index.d.ts

@@ -7,7 +7,7 @@ export interface CachedIslandJs {
   props: string
 }
 
-export declare function compileJsx(source: string, path: string): NapiCompiledJsx
+export declare function compileJsx(source: string, path: string, componentSources?: Record<string, string> | undefined | null): NapiCompiledJsx
 
 export declare function configureCache(maxEntries: number): NapiResult<undefined>
 
@@ -45,6 +45,11 @@ export interface NapiCompiledJsx {
    * `usesIsland`.
    */
   componentsJson: string
+  /**
+   * Non-fatal diagnostic messages from native-inline lowering. Empty when no
+   * `component_sources` are provided (i.e. the default `None` path).
+   */
+  warnings: Array<string>
 }
 
 /**

package/runtime/index.js

@@ -77,8 +77,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-android-arm64')
         const bindingPackageVersion = require('brustjs-android-arm64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -93,8 +93,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-android-arm-eabi')
         const bindingPackageVersion = require('brustjs-android-arm-eabi/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -114,8 +114,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-win32-x64-gnu')
         const bindingPackageVersion = require('brustjs-win32-x64-gnu/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -130,8 +130,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-win32-x64-msvc')
         const bindingPackageVersion = require('brustjs-win32-x64-msvc/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -147,8 +147,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-win32-ia32-msvc')
         const bindingPackageVersion = require('brustjs-win32-ia32-msvc/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -163,8 +163,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-win32-arm64-msvc')
         const bindingPackageVersion = require('brustjs-win32-arm64-msvc/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -182,8 +182,8 @@ function requireNative() {
     try {
       const binding = require('brustjs-darwin-universal')
       const bindingPackageVersion = require('brustjs-darwin-universal/package.json').version
-      if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-        throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+      if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+        throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
       }
       return binding
     } catch (e) {
@@ -198,8 +198,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-darwin-x64')
         const bindingPackageVersion = require('brustjs-darwin-x64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -214,8 +214,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-darwin-arm64')
         const bindingPackageVersion = require('brustjs-darwin-arm64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -234,8 +234,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-freebsd-x64')
         const bindingPackageVersion = require('brustjs-freebsd-x64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -250,8 +250,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-freebsd-arm64')
         const bindingPackageVersion = require('brustjs-freebsd-arm64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -271,8 +271,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-x64-musl')
           const bindingPackageVersion = require('brustjs-linux-x64-musl/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -287,8 +287,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-x64-gnu')
           const bindingPackageVersion = require('brustjs-linux-x64-gnu/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -305,8 +305,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-arm64-musl')
           const bindingPackageVersion = require('brustjs-linux-arm64-musl/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -321,8 +321,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-arm64-gnu')
           const bindingPackageVersion = require('brustjs-linux-arm64-gnu/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -339,8 +339,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-arm-musleabihf')
           const bindingPackageVersion = require('brustjs-linux-arm-musleabihf/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -355,8 +355,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-arm-gnueabihf')
           const bindingPackageVersion = require('brustjs-linux-arm-gnueabihf/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -373,8 +373,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-loong64-musl')
           const bindingPackageVersion = require('brustjs-linux-loong64-musl/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -389,8 +389,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-loong64-gnu')
           const bindingPackageVersion = require('brustjs-linux-loong64-gnu/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -407,8 +407,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-riscv64-musl')
           const bindingPackageVersion = require('brustjs-linux-riscv64-musl/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -423,8 +423,8 @@ function requireNative() {
         try {
           const binding = require('brustjs-linux-riscv64-gnu')
           const bindingPackageVersion = require('brustjs-linux-riscv64-gnu/package.json').version
-          if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-            throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+          if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+            throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
           }
           return binding
         } catch (e) {
@@ -440,8 +440,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-linux-ppc64-gnu')
         const bindingPackageVersion = require('brustjs-linux-ppc64-gnu/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -456,8 +456,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-linux-s390x-gnu')
         const bindingPackageVersion = require('brustjs-linux-s390x-gnu/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -476,8 +476,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-openharmony-arm64')
         const bindingPackageVersion = require('brustjs-openharmony-arm64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -492,8 +492,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-openharmony-x64')
         const bindingPackageVersion = require('brustjs-openharmony-x64/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {
@@ -508,8 +508,8 @@ function requireNative() {
       try {
         const binding = require('brustjs-openharmony-arm')
         const bindingPackageVersion = require('brustjs-openharmony-arm/package.json').version
-        if (bindingPackageVersion !== '0.1.9-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
-          throw new Error(`Native binding package version mismatch, expected 0.1.9-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
+        if (bindingPackageVersion !== '0.1.11-alpha' && process.env.NAPI_RS_ENFORCE_VERSION_CHECK && process.env.NAPI_RS_ENFORCE_VERSION_CHECK !== '0') {
+          throw new Error(`Native binding package version mismatch, expected 0.1.11-alpha but got ${bindingPackageVersion}. You can reinstall dependencies to fix this issue.`)
         }
         return binding
       } catch (e) {

package/runtime/index.ts

@@ -3,6 +3,7 @@ import type { ActionDef } from './actions.ts'
 import { isValidActionId } from './actions.ts'
 import { loadConfig } from './config.ts'
 import { configureCssEnabled, configureCssHrefsForRoute } from './css.ts'
+import { configureJinjaDir } from './islands/native-render.ts'
 
 export interface ServeOptions {
   /** Host/address to bind on. A hostname (e.g. `localhost`, resolved Rust-side)
@@ -419,10 +420,20 @@ export const brust = {
         }
       }
 
-      // Sub-project J — load .brust/jinja/*.jinja into the minijinja env so
-      // the startup-validation warning in registerRoutes can compare against
-      // a populated registry. Loads once at startup; dev hot reload reloads it.
-      loadJinjaOnce(path.resolve(process.cwd(), '.brust/jinja'))
+      // Sub-project J — load the compiled `*.jinja` templates into the minijinja
+      // env so the startup-validation warning in registerRoutes can compare
+      // against a populated registry. Loads once at startup; dev hot reload
+      // reloads it. The templates ship INSIDE the build output, so a pre-built
+      // run reads them (and their islands/components sidecars) from
+      // `<distDir>/jinja`; dev compiles them to `cwd/.brust/jinja`.
+      const jinjaDir = prebuilt
+        ? path.join(distDir!, 'jinja')
+        : path.resolve(process.cwd(), '.brust/jinja')
+      configureJinjaDir(jinjaDir)
+      loadJinjaOnce(jinjaDir)
+      if (prebuilt && existsSync(jinjaDir)) {
+        console.log(`[brust] main: using pre-built jinja at ${jinjaDir}`)
+      }
 
       this.registerRoutes(routes)
       const ssePaths = routes

package/runtime/islands/isr-jsx.ts

@@ -41,6 +41,13 @@ declare module 'react' {
        * component is called), valid on any SSR component or `ssr` island on a
        * native route. See {@link IsrConfig}. */
       isr?: IsrConfig
+      /** brust `native` inline directive — compiler-consumed (stripped at lower
+       * time). On a native-jinja route, `<Comp native />` expands the component
+       * inline at compile time (no JS-worker render) when it is pure
+       * (props→JSX, no hooks/side-effects); otherwise it degrades to a normal
+       * SSR component with a build warning. Bare boolean, like `ssr` on an
+       * island. */
+      native?: boolean
     }
   }
 }

package/runtime/islands/native-render.ts

@@ -20,6 +20,23 @@ import path from 'node:path'
 import { renderToString } from 'react-dom/server.node'
 import { createElement } from 'react'
 
+// Sub-project J — the directory holding the compiled `<Name>.jinja` templates
+// and their `.islands.json` / `.components.json` sidecars. Configured ONCE at
+// boot (`configureJinjaDir`) so it tracks the same location `loadJinjaOnce`
+// loads from: `<BRUST_DIST_DIR>/jinja` for a pre-built run, `cwd/.brust/jinja`
+// in dev. Falls back to the dev location when unset (tests pass an explicit dir).
+let _configuredJinjaDir: string | null = null
+
+/** Set the directory the sidecar-manifest readers resolve against. Called once
+ * at boot from `index.ts`, mirroring `configureIslandsDir`/`configureCssDir`. */
+export function configureJinjaDir(dir: string): void {
+  _configuredJinjaDir = dir
+}
+
+function defaultJinjaDir(): string {
+  return _configuredJinjaDir ?? path.resolve(process.cwd(), '.brust/jinja')
+}
+
 /** One entry of a `<template>.islands.json` manifest (enriched by T6). */
 export interface NativeIslandEntry {
   component: string
@@ -90,14 +107,14 @@ export function entityEncode(s: string): string {
 const manifestCache = new Map<string, NativeIslandEntry[] | null>()
 
 /** Read `<jinjaDir>/<templateName>.islands.json` and return the parsed entry
- * array, or `null` if the file doesn't exist. `jinjaDir` defaults to
- * `process.cwd()/.brust/jinja`; tests pass a temp dir. Both hits and misses
- * are cached by absolute path. */
+ * array, or `null` if the file doesn't exist. `jinjaDir` defaults to the
+ * boot-configured jinja dir (`configureJinjaDir`), or `cwd/.brust/jinja` when
+ * unset; tests pass a temp dir. Both hits and misses are cached by absolute path. */
 export function loadIslandManifest(
   templateName: string,
   jinjaDir?: string,
 ): NativeIslandEntry[] | null {
-  const dir = jinjaDir ?? path.resolve(process.cwd(), '.brust/jinja')
+  const dir = jinjaDir ?? defaultJinjaDir()
   const abs = path.resolve(dir, `${templateName}.islands.json`)
   if (manifestCache.has(abs)) return manifestCache.get(abs)!
   let parsed: NativeIslandEntry[] | null
@@ -251,7 +268,7 @@ export function loadComponentManifest(
   templateName: string,
   jinjaDir?: string,
 ): NativeComponentEntry[] | null {
-  const dir = jinjaDir ?? path.resolve(process.cwd(), '.brust/jinja')
+  const dir = jinjaDir ?? defaultJinjaDir()
   const abs = path.resolve(dir, `${templateName}.components.json`)
   if (componentManifestCache.has(abs)) return componentManifestCache.get(abs)!
   let parsed: NativeComponentEntry[] | null
@@ -282,7 +299,7 @@ export async function resolveComponentContext(
   const out: Record<string, string> = {}
   if (!manifest.length) return out
 
-  const dir = jinjaDir ?? path.resolve(process.cwd(), '.brust/jinja')
+  const dir = jinjaDir ?? defaultJinjaDir()
   const factoryPath = path.resolve(dir, `${templateName}.factory.ts`)
 
   let factoryMod = factoryCache.get(factoryPath)