@akanjs/devkit 3.0.0-beta.22 → 3.0.0-beta.24

package/frontendBuild/ssrBaseArtifactBuilder.ts

@@ -1,5 +1,6 @@
 import path from "node:path";
 import { optimize } from "@tailwindcss/node";
+import type { AkanWebConfig } from "akanjs";
 import type { BaseBuildArtifact } from "akanjs/server";
 import { resolveSsrPageEntriesForApp } from "../artifact/implicitRootLayout";
 import { computeRouteSeedIndex, type RouteSeedIndex, saveRouteSeedIndex } from "../artifact/routeSeedIndex";
@@ -36,6 +37,12 @@ export class SsrBaseArtifactBuilder {
     this.#absArtifactDir = path.resolve(this.#artifactDir);
   }
 
+  //? The web router reads this, so `akan start` writes the whole surface: a native shell asks the dev server for the
+  //? CSR page even when the app ships none, and a narrowed dev artifact hands it the SSR page, which cannot run there.
+  static servedWeb(command: "build" | "start", web: AkanWebConfig): AkanWebConfig {
+    return command === "start" ? { ssr: true, csr: true } : web;
+  }
+
   async build(): Promise<BuildSsrBaseArtifactResult> {
     const akanConfig = await this.#app.getConfig();
     const { rscClientUrl, rscRuntimeClientManifest, rscRuntimeSsrManifest, vendorMap } =
@@ -77,7 +84,7 @@ export class SsrBaseArtifactBuilder {
       branches: [...akanConfig.branches],
       i18n: akanConfig.i18n,
       imageConfig: akanConfig.images,
-      web: akanConfig.web,
+      web: SsrBaseArtifactBuilder.servedWeb(this.#command, akanConfig.web),
       deepLinkAssociations: Object.values(akanConfig.mobile.targets)
         .filter((target) => (target.deepLinks?.domains?.length ?? 0) > 0)
         .map((target) => ({

package/incrementalBuilder/buildBatch.proc.ts

@@ -7,6 +7,7 @@ import type { App } from "@akanjs/devkit/commandDecorators";
 import { AppExecutor, WorkspaceExecutor } from "@akanjs/devkit/executors";
 import {
   CsrArtifactBuilder,
+  CsrDevBundler,
   CssCompiler,
   FontOptimizer,
   PagesBundleBuilder,
@@ -14,6 +15,7 @@ import {
 } from "@akanjs/devkit/frontendBuild";
 import { Logger } from "akanjs/common";
 import type { BuilderMessage, BuildPhase } from "akanjs/server";
+import { resolveDevCsrMode } from "akanjs/server/hmr/csrDevManifest";
 import type { BuildBatchRequest, BuildBatchResult, OptimizedFonts, PagesBatchCssAssets } from "./buildBatchProtocol";
 
 // `Bun.build` keeps native bundler arenas that `Bun.gc(true)` cannot reclaim; only exiting returns them.
@@ -80,14 +82,47 @@ class BuildBatch {
   async #buildCsr(): Promise<void> {
     const started = Date.now();
     try {
-      await new CsrArtifactBuilder(this.#app).build();
-      this.#logger.verbose(`csr-rebundle ok (${Date.now() - started}ms)`);
+      if (resolveDevCsrMode() === "registry") await this.#updateCsrRegistry(started);
+      else await this.#rebuildCsrArtifact(started);
       this.#emitStatus("csr");
     } catch (err) {
       this.#fail("csr", "csr-rebundle", err);
     }
   }
 
+  async #rebuildCsrArtifact(started: number): Promise<void> {
+    await new CsrArtifactBuilder(this.#app).build();
+    this.#logger.verbose(`csr-rebundle ok (${Date.now() - started}ms)`);
+    // A CSR tab takes none of the SSR refresh messages, so a rebuilt artifact reaches it only as this reload.
+    if (this.#request.changedFiles.length === 0) return;
+    this.#emit({
+      type: "csr-updated",
+      data: { generation: Date.now(), mode: "artifact", reload: true, reason: "the CSR artifact was rebuilt" },
+    });
+  }
+
+  async #updateCsrRegistry(started: number): Promise<void> {
+    const update = await new CsrDevBundler(this.#app).update(this.#request.changedFiles);
+    if (!update) {
+      this.#logger.verbose(`csr-dev unchanged (${Date.now() - started}ms)`);
+      return;
+    }
+    this.#logger.verbose(
+      `csr-dev generation=${update.generation} ${update.reload ? `reload (${update.reason})` : `patch modules=${update.changedIds.length}`} graph=${update.moduleCount} (${Date.now() - started}ms)`,
+    );
+    this.#emit({
+      type: "csr-updated",
+      data: {
+        generation: update.generation,
+        mode: "registry",
+        reload: update.reload,
+        reason: update.reason,
+        patchUrl: update.patchUrl,
+        changedIds: update.changedIds,
+      },
+    });
+  }
+
   // Rewritten with the bundle: the backend rereads it on `pages-updated` to pick up added, moved or deleted routes.
   async #buildPages(): Promise<void> {
     const started = Date.now();

package/incrementalBuilder/incrementalBuilder.host.ts

@@ -11,6 +11,7 @@ const builderMsgTypeSet = new Set<BuilderMessage["type"]>([
   "invalidate",
   "css-updated",
   "pages-updated",
+  "csr-updated",
   "build-status",
   "builder-metrics",
 ]);

package/integration/devStability.integration.test.ts

@@ -487,7 +487,7 @@ describe("dev resource budgets", () => {
         `csr-armed-marker-${attempt}`,
       ),
     );
-    await host.waitForLogSince(resyncMark, /csr-rebundle ok/, WAIT_MS);
+    await host.waitForLogSince(resyncMark, /csr-rebundle ok|csr-dev generation=\d+ patch/, WAIT_MS);
   });
 
   budgetTest("bounds the rsc worker and the tree across repeated saves", async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "3.0.0-beta.22",
+  "version": "3.0.0-beta.24",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -47,7 +47,7 @@
     "@earendil-works/pi-tui": "0.86.1",
     "@inquirer/prompts": "^8.4.3",
     "@tailwindcss/node": "^4.3.0",
-    "akanjs": "3.0.0-beta.22",
+    "akanjs": "3.0.0-beta.24",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",
@@ -63,7 +63,7 @@
     "typescript": "^6.0.3"
   },
   "peerDependencies": {
-    "react": "19.2.7"
+    "react": "19.3.0"
   },
   "peerDependenciesMeta": {
     "react": {