@celsian/vura-cli 0.8.0 → 0.8.1

package/README.md

@@ -52,10 +52,8 @@ and 12 GiB profiles.
 
 ## Documentation
 
-_vura.io docs site launches with v0.5 — until then, see the repo README and CHANGELOG._
-
 - [Quick start — /ladder/0-create/](https://vura.io/ladder/0-create/)
-- [Task routes — /reference/tasks/](https://vura.io/ladder/5-tasks/)
+- [Task routes — /ladder/5-tasks/](https://vura.io/ladder/5-tasks/)
 - [Self-host — /self-host/](https://vura.io/self-host/)
 
 ## License

package/dist/commands/build.d.ts

@@ -2,14 +2,16 @@
  * `vura build` — Build the project for deployment.
  *
  * 1. Scan routes → build manifest
- * 2. Generate server entry (for hot server)
- * 3. Generate function entries (for serverless)
- * 4. Generate task entries (for task routes)
- * 5. Bundle server-mode pages with esbuild
- * 6. Render static pages (mode: 'static')
- * 7. Run adapter.buildEnd() if configured
- * 8. Write manifest.json
- * 9. Emit hot deploy templates (Dockerfile, fly.toml, package.json) when hot routes present
+ * 2. Bundle browser entries for client and hybrid pages
+ * 3. Render build-time pages (static, client shells, hybrid HTML) → dist/static
+ * 4. Copy public/ → dist/public
+ * 5. core build(): server entry, function entries, task entries, manifest.json,
+ *    then adapter.buildEnd()
+ * 6. Emit hot deploy templates (Dockerfile, fly.toml, package.json)
+ *
+ * The adapter runs last, and the two steps that write dist/static and
+ * dist/public run before it, because an adapter that serves prerendered pages
+ * has to be able to read them.
  */
 /**
  * Remove hashed page bundles that this build did not emit.
@@ -19,9 +21,11 @@
  * `dist/static/_then/pages` grew with every incremental build and the dead
  * copies shipped to whatever the project deployed to.
  *
- * Recursive, because pages nest (`loaders/island.js`). Empty directories left
- * behind by a deleted page are removed too. `fs` is injected so this can be
- * tested without touching a disk.
+ * The sweep itself now lives in core as `pruneStaleOutputs`, because the same
+ * accretion happens to `dist/server`, `dist/functions` and each adapter's own
+ * output directory, and four copies of a recursive delete is four chances to
+ * fix one and not the others. This wrapper is the client-bundle name and the
+ * client-bundle reason; the behaviour is shared.
  */
 export declare function pruneStaleBundles(dir: string, keep: Set<string>, fs: {
     readdir: (p: string, o: {

package/dist/commands/build.js

@@ -2,16 +2,18 @@
  * `vura build` — Build the project for deployment.
  *
  * 1. Scan routes → build manifest
- * 2. Generate server entry (for hot server)
- * 3. Generate function entries (for serverless)
- * 4. Generate task entries (for task routes)
- * 5. Bundle server-mode pages with esbuild
- * 6. Render static pages (mode: 'static')
- * 7. Run adapter.buildEnd() if configured
- * 8. Write manifest.json
- * 9. Emit hot deploy templates (Dockerfile, fly.toml, package.json) when hot routes present
+ * 2. Bundle browser entries for client and hybrid pages
+ * 3. Render build-time pages (static, client shells, hybrid HTML) → dist/static
+ * 4. Copy public/ → dist/public
+ * 5. core build(): server entry, function entries, task entries, manifest.json,
+ *    then adapter.buildEnd()
+ * 6. Emit hot deploy templates (Dockerfile, fly.toml, package.json)
+ *
+ * The adapter runs last, and the two steps that write dist/static and
+ * dist/public run before it, because an adapter that serves prerendered pages
+ * has to be able to read them.
  */
-import { buildManifest, build, renderStaticPages, generateClientPageEntry, vuraBrowserResolvePlugin, vuraActionsStubPlugin } from '@celsian/vura-core';
+import { buildManifest, build, renderStaticPages, generateClientPageEntry, vuraBrowserResolvePlugin, vuraActionsStubPlugin, pruneStaleOutputs } from '@celsian/vura-core';
 import { createRequire } from 'node:module';
 import { existsSync, readFileSync } from 'node:fs';
 import { join as pathJoin, resolve as pathResolve, relative } from 'node:path';
@@ -25,40 +27,14 @@ import { loadConfig } from '../config-loader.js';
  * `dist/static/_then/pages` grew with every incremental build and the dead
  * copies shipped to whatever the project deployed to.
  *
- * Recursive, because pages nest (`loaders/island.js`). Empty directories left
- * behind by a deleted page are removed too. `fs` is injected so this can be
- * tested without touching a disk.
+ * The sweep itself now lives in core as `pruneStaleOutputs`, because the same
+ * accretion happens to `dist/server`, `dist/functions` and each adapter's own
+ * output directory, and four copies of a recursive delete is four chances to
+ * fix one and not the others. This wrapper is the client-bundle name and the
+ * client-bundle reason; the behaviour is shared.
  */
 export async function pruneStaleBundles(dir, keep, fs) {
-    let removed = 0;
-    let entries;
-    try {
-        entries = await fs.readdir(dir, { withFileTypes: true });
-    }
-    catch {
-        return 0; // nothing was written here
-    }
-    for (const entry of entries) {
-        const full = pathJoin(dir, entry.name);
-        if (entry.isDirectory()) {
-            removed += await pruneStaleBundles(full, keep, fs);
-            // The page that lived here is gone; do not leave the empty shell.
-            try {
-                const rest = await fs.readdir(full, { withFileTypes: true });
-                if (rest.length === 0)
-                    await fs.rm(full, { recursive: true, force: true });
-            }
-            catch {
-                /* raced or unreadable: leaving it is harmless */
-            }
-            continue;
-        }
-        if (keep.has(full))
-            continue;
-        await fs.rm(full, { force: true });
-        removed++;
-    }
-    return removed;
+    return pruneStaleOutputs(dir, keep, fs);
 }
 // ---------------------------------------------------------------------------
 // Deploy template strings — inlined so they survive tsc compilation (tsc does
@@ -343,7 +319,7 @@ export async function buildCommand(_args) {
     //
     // Page and layout bundling now happens once, in core. `serverEsmResolvePlugin`
     // below is still used for the standalone entry.
-    // 3c. Bundle browser entries for client and hybrid pages.
+    // 2. Bundle browser entries for client and hybrid pages.
     // Each bundle is a generated wrapper (generateClientPageEntry) that imports
     // the page module and calls mount() (client) / hydrate() (hybrid) — bundling
     // the raw page module alone leaves the shell at "Loading..." forever because
@@ -382,6 +358,7 @@ export async function buildCommand(_args) {
                 outfile: outPath,
                 jsx: 'automatic',
                 jsxImportSource,
+                absWorkingDir: root,
                 // Browser-resolve first: a page that imports `@celsian/vura-core` for
                 // useLoaderData must get the pure client module here, not the package
                 // root, which reaches node:fs and cannot be bundled for a browser.
@@ -420,15 +397,7 @@ export async function buildCommand(_args) {
             console.log(`    ✓ removed ${pruned} stale bundle${pruned === 1 ? '' : 's'} from earlier builds`);
         }
     }
-    // 4. Build API routes + task entries
-    console.log('  Building...');
-    const result = await build(manifest, config, root);
-    console.log(`  Server entry: ${result.serverEntry}`);
-    console.log(`  Functions: ${result.functions.length} serverless bundles`);
-    if (result.taskEntries.length > 0) {
-        console.log(`  Tasks: ${result.taskEntries.length} task entries`);
-    }
-    // 5. Render build-time pages (static, client shells, and hybrid prerendered HTML)
+    // 3. Render build-time pages (static, client shells, and hybrid prerendered HTML)
     const staticPages = manifest.pages.filter(p => p.mode !== 'server');
     if (staticPages.length > 0) {
         console.log(`  Rendering ${staticPages.length} build-time pages...`);
@@ -468,6 +437,12 @@ export async function buildCommand(_args) {
                 outfile: tmpFile,
                 jsx: 'automatic',
                 jsxImportSource,
+                // esbuild anchors resolution to the working directory its service
+                // captured, which is not necessarily the cwd at call time. Core's
+                // bundlers pass this for the same reason; this one did not, and a
+                // second build in one process resolved against the first build's
+                // directory — which fails outright once that directory is gone.
+                absWorkingDir: root,
                 plugins: [serverEsmResolvePlugin],
                 external: sharedRuntimeExternals,
             });
@@ -482,7 +457,7 @@ export async function buildCommand(_args) {
         const { rm } = await import('node:fs/promises');
         await rm(tmpDir, { recursive: true, force: true }).catch(() => { });
     }
-    // 6. Copy public assets to dist/public/ for production static serving.
+    // 4. Copy public assets to dist/public/ for production static serving.
     // Prefer the framework-standard root public/ directory, but support the
     // historical starter/runbook layout src/public/ when root public/ is absent.
     const publicDir = join(root, 'public');
@@ -499,10 +474,25 @@ export async function buildCommand(_args) {
         const label = publicSourceDir === publicDir ? 'public/' : 'src/public/';
         console.log(`  Copied ${label} → dist/public/`);
     }
+    // 5. Build API routes, task entries and the adapter artifacts.
+    //
+    // This runs AFTER the page render and the public copy, not before. The
+    // adapter's buildEnd is the last step by design — this file's own header has
+    // said so since it was written — and an adapter that reads dist/static, which
+    // is what serving prerendered pages on Cloudflare and Lambda requires, saw
+    // either nothing on a clean build or the PREVIOUS build's HTML on a dirty
+    // one. It ran fourth of nine only because the page render was added later.
+    console.log('  Building...');
+    const result = await build(manifest, config, root);
+    console.log(`  Server entry: ${result.serverEntry}`);
+    console.log(`  Functions: ${result.functions.length} serverless bundles`);
+    if (result.taskEntries.length > 0) {
+        console.log(`  Tasks: ${result.taskEntries.length} task entries`);
+    }
     if (config.adapter) {
         console.log(`  Adapter: ${config.adapter.name}`);
     }
-    // 9. Emit hot deploy templates when the project has hot routes
+    // 6. Emit hot deploy templates when the project has hot routes
     const hotRoutes = manifest.api.filter(r => r.kind === 'hot');
     const hasWsRoutes = hotRoutes.some(r => r.hasWebsocket === true);
     const distDir = join(root, 'dist');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@celsian/vura-cli",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Vura CLI — build and deploy full-stack apps",
   "type": "module",
   "bin": {
@@ -15,12 +15,12 @@
     "!dist/**/*.map"
   ],
   "dependencies": {
-    "@celsian/vura-core": "0.8.0",
+    "@celsian/vura-core": "0.8.1",
     "esbuild": "^0.28.2",
-    "what-framework": "^0.13.4"
+    "what-framework": "^0.13.6"
   },
   "peerDependencies": {
-    "@celsian/vura-adapter-vura": "0.8.0",
+    "@celsian/vura-adapter-vura": "0.8.1",
     "ws": "^8.0.0"
   },
   "peerDependenciesMeta": {
@@ -32,7 +32,7 @@
     }
   },
   "devDependencies": {
-    "@celsian/vura-adapter-vura": "0.8.0",
+    "@celsian/vura-adapter-vura": "0.8.1",
     "@types/ws": "^8.18.1",
     "ws": "^8.21.3"
   },