@akanjs/devkit 2.3.2-rc.6 → 2.3.2-rc.8

package/frontendBuild/frontendBuild.test.ts

@@ -120,6 +120,32 @@ describe("PagesBundleBuilder", () => {
     expect(result.logs).toEqual([]);
     expect(result.outputs.some((output) => output.kind === "entry-point")).toBe(true);
   });
+
+  test("uses live server fetch instead of signal macro in server pages bundles", () => {
+    const source = [
+      'import { makePageProto, registerClientRuntime } from "akanjs/client";',
+      'import { FetchClient } from "akanjs/fetch";',
+      'import * as cnst from "./cnst";',
+      'import { getSerializedSignal } from "./sig" with { type: "macro" };',
+      'import type * as dict from "./dict";',
+      'import type * as signal from "./sig";',
+      "",
+      "const dictionary = {};",
+      "const pageProto = makePageProto<typeof dict>(dictionary);",
+      "const fetchProto = FetchClient.build<typeof signal>(cnst, getSerializedSignal(), { Err: pageProto.Err });",
+      'export const runtime = registerClientRuntime({ ...pageProto, ...fetchProto }, { scope: "app" });',
+      "",
+    ].join("\n");
+
+    const transformed = PagesBundleBuilder.transformServerUseClientFetchSource(source);
+
+    expect(transformed).toContain('import { fetch as serverFetch } from "./sig";');
+    expect(transformed).toContain(
+      "const fetchProto = FetchClient.build<typeof signal>(cnst, serverFetch.serializedSignal, { Err: pageProto.Err, base: serverFetch });",
+    );
+    expect(transformed).not.toContain("getSerializedSignal");
+    expect(transformed).not.toContain('with { type: "macro" }');
+  });
 });
 
 describe("CsrArtifactBuilder", () => {

package/frontendBuild/pagesBundleBuilder.ts

@@ -65,6 +65,7 @@ export class PagesBundleBuilder {
       plugins: [
         PagesBundleBuilder.createPagesEntryPlugin(entrySource),
         PagesBundleBuilder.createServerCssStubPlugin(),
+        PagesBundleBuilder.createServerUseClientFetchPlugin(),
         await createExternalizeFrameworkPlugin({ app: this.#app, extra: akanConfig.externalLibs }),
         akanConfig.barrelImports.length > 0
           ? await createBarrelImportsPlugin(this.#app, {
@@ -147,4 +148,38 @@ export class PagesBundleBuilder {
       },
     };
   }
+
+  static createServerUseClientFetchPlugin(): BunPlugin {
+    return {
+      name: "akan-server-use-client-fetch",
+      setup(build) {
+        build.onLoad({ filter: /[/\\]lib[/\\]useClient\.(ts|tsx|js|jsx)$/ }, async (args) => {
+          const source = await Bun.file(args.path).text();
+          const transformed = PagesBundleBuilder.transformServerUseClientFetchSource(source);
+          if (transformed === source) return undefined;
+          return { contents: transformed, loader: loaderFor(args.path) };
+        });
+      },
+    };
+  }
+
+  static transformServerUseClientFetchSource(source: string): string {
+    if (!source.includes(`with { type: "macro" }`) || !source.includes("FetchClient.build")) return source;
+    return source
+      .replace(
+        /import\s+\{\s*getSerializedSignal\s*\}\s+from\s+["']\.\/sig["']\s+with\s+\{\s*type\s*:\s*["']macro["']\s*\};/,
+        `import { fetch as serverFetch } from "./sig";`,
+      )
+      .replace(
+        /const\s+fetchProto\s*=\s*FetchClient\.build<[^;]+;/,
+        "const fetchProto = FetchClient.build<typeof signal>(cnst, serverFetch.serializedSignal, { Err: pageProto.Err, base: serverFetch });",
+      );
+  }
+}
+
+function loaderFor(absPath: string): "ts" | "tsx" | "js" | "jsx" {
+  if (absPath.endsWith(".tsx")) return "tsx";
+  if (absPath.endsWith(".jsx")) return "jsx";
+  if (absPath.endsWith(".ts")) return "ts";
+  return "js";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.3.2-rc.6",
+  "version": "2.3.2-rc.8",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -32,7 +32,7 @@
     "@langchain/openai": "^1.4.6",
     "@tailwindcss/node": "^4.3.0",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.3.2-rc.6",
+    "akanjs": "2.3.2-rc.8",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",