@akanjs/devkit 2.1.0-rc.4 → 2.1.0-rc.6

package/frontendBuild/buildRouteClient.test.ts

@@ -72,14 +72,12 @@ describe("route client store bootstrap", () => {
     expect(CLIENT_BUNDLE_NAMING.asset.includes("[name]")).toBe(false);
   });
 
-  test("resolves SSR client runtime aliases from the server renderer package", () => {
+  test("keeps start SSR client React imports bare and rewrites resolved fetch imports", () => {
     const aliases = RouteClientBuilder.resolveSsrClientRuntimeAliases();
 
-    expect(Object.keys(aliases)).toEqual(
+    expect(Object.keys(aliases)).not.toEqual(
       expect.arrayContaining(["react", "react-dom", "react-dom/client", "react/jsx-runtime", "react/jsx-dev-runtime"]),
     );
-    expect(aliases.react).toBe(Bun.resolveSync("react", RouteClientBuilder.resolveAkanServerEntry()));
-    expect(aliases.react).not.toBe("react");
     expect(aliases[Bun.resolveSync("akanjs/fetch", RouteClientBuilder.resolveAkanServerEntry())]).toBe("akanjs/fetch");
   });
 

package/frontendBuild/routeClientBuilder.ts

@@ -224,11 +224,7 @@ export class RouteClientBuilder {
 
   static resolveSsrClientRuntimeAliases(): Record<string, string> {
     const serverEntry = RouteClientBuilder.resolveAkanServerEntry();
-    const aliases = Object.fromEntries(
-      SSR_CLIENT_ALIAS_EXTERNALS.map((specifier) => [specifier, Bun.resolveSync(specifier, serverEntry)]),
-    ) as Record<string, string>;
-    aliases[Bun.resolveSync("akanjs/fetch", serverEntry)] = "akanjs/fetch";
-    return aliases;
+    return { [Bun.resolveSync("akanjs/fetch", serverEntry)]: "akanjs/fetch" };
   }
 
   static resolveSsrClientExternalOptions(command: "build" | "start"): {

package/frontendBuild/ssrBaseArtifactBuilder.ts

@@ -92,24 +92,27 @@ export class SsrBaseArtifactBuilder {
     return { rscClientUrl, vendorMap };
   }
   async #resolveAkanServerPath() {
-    const candidates = [
-      path.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
-      path.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
-      path.join(path.dirname(Bun.main), "node_modules/akanjs/server"),
-      path.join(path.dirname(Bun.main), "../../akanjs/server"),
-      path.resolve(import.meta.dir, "../../server"),
-      path.resolve(import.meta.dir, "../server"),
-    ];
+    const candidates: string[] = [];
     try {
-      candidates.unshift(path.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
+      candidates.push(path.dirname(Bun.resolveSync("akanjs/server", this.#app.workspace.workspaceRoot)));
     } catch {
-      // Source workspaces and bundled CLI execution have different resolution roots; try the explicit candidates.
+      // Source workspaces and bundled CLI execution have different resolution roots; try explicit candidates below.
     }
+    candidates.push(
+      path.join(this.#app.workspace.workspaceRoot, "pkgs/akanjs/server"),
+      path.join(this.#app.workspace.workspaceRoot, "node_modules/akanjs/server"),
+    );
     try {
-      candidates.unshift(path.dirname(Bun.resolveSync("akanjs/server", path.dirname(Bun.main))));
+      candidates.push(path.dirname(Bun.resolveSync("akanjs/server", path.dirname(Bun.main))));
     } catch {
       // Published CLI installs may hoist dependencies differently; explicit Bun.main candidates cover that.
     }
+    candidates.push(
+      path.join(path.dirname(Bun.main), "node_modules/akanjs/server"),
+      path.join(path.dirname(Bun.main), "../../akanjs/server"),
+      path.resolve(import.meta.dir, "../../server"),
+      path.resolve(import.meta.dir, "../server"),
+    );
     for (const candidate of candidates) {
       if (await Bun.file(path.join(candidate, "rscClient.tsx")).exists()) return candidate;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.1.0-rc.4",
+  "version": "2.1.0-rc.6",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -36,7 +36,7 @@
     "@langchain/deepseek": "^1.0.26",
     "@langchain/openai": "^1.4.6",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.1.0-rc.3",
+    "akanjs": "2.1.0-rc.5",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",