@akanjs/devkit 2.1.0-rc.2 → 2.1.0-rc.3

package/frontendBuild/cssImportResolver.ts

@@ -24,9 +24,9 @@ export class CssImportResolver {
 
   async resolve(id: string, fromBase: string): Promise<string | null> {
     for (const resolve of [
+      () => this.#resolveWithTsconfig(id),
       () => this.#resolveWithBun(id, fromBase),
       () => this.#resolveWithRequire(id, fromBase),
-      () => this.#resolveWithTsconfig(id),
       () => this.#resolvePackageStyle(id, fromBase),
     ]) {
       const resolved = await resolve();
@@ -36,21 +36,27 @@ export class CssImportResolver {
   }
 
   #resolveWithBun(id: string, fromBase: string): string | null {
-    try {
-      const resolved = Bun.resolveSync(id, fromBase);
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = Bun.resolveSync(id, base);
+        if (CssImportResolver.isCssFile(resolved)) return resolved;
+      } catch {
+        // Try the next known package resolution root.
+      }
     }
+    return null;
   }
 
   #resolveWithRequire(id: string, fromBase: string): string | null {
-    try {
-      const resolved = require.resolve(id, { paths: [fromBase] });
-      return CssImportResolver.isCssFile(resolved) ? resolved : null;
-    } catch {
-      return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const resolved = require.resolve(id, { paths: [base] });
+        if (CssImportResolver.isCssFile(resolved)) return resolved;
+      } catch {
+        // Try the next known package resolution root.
+      }
     }
+    return null;
   }
 
   async #resolveWithTsconfig(id: string): Promise<string | null> {
@@ -77,8 +83,25 @@ export class CssImportResolver {
   async #resolvePackageStyle(id: string, fromBase: string): Promise<string | null> {
     const pkgName = CssImportResolver.getPackageName(id);
     if (!pkgName) return null;
+    for (const base of this.#resolutionBases(fromBase)) {
+      try {
+        const pkgPath = require.resolve(`${pkgName}/package.json`, { paths: [base] });
+        const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+        if (resolved) return resolved;
+      } catch {
+        // Try the next known package resolution root.
+      }
+    }
+    for (const pkgPath of this.#packageJsonCandidates(pkgName)) {
+      const resolved = await this.#resolvePackageStyleFromPackageJson(id, pkgName, pkgPath);
+      if (resolved) return resolved;
+    }
+    return null;
+  }
+
+  async #resolvePackageStyleFromPackageJson(id: string, pkgName: string, pkgPath: string): Promise<string | null> {
     try {
-      const pkgPath = require.resolve(`${pkgName}/package.json`, { paths: [fromBase] });
+      if (!(await Bun.file(pkgPath).exists())) return null;
       const pkgDir = path.dirname(pkgPath);
       const pkg = await Bun.file(pkgPath).json();
       const subpath = id === pkgName ? "." : `.${id.slice(pkgName.length)}`;
@@ -96,6 +119,24 @@ export class CssImportResolver {
     }
   }
 
+  #resolutionBases(fromBase: string): string[] {
+    return [
+      fromBase,
+      this.#workspaceRoot,
+      path.dirname(Bun.main),
+      path.resolve(path.dirname(Bun.main), "../.."),
+    ];
+  }
+
+  #packageJsonCandidates(pkgName: string): string[] {
+    return [
+      path.join(this.#workspaceRoot, "pkgs", pkgName, "package.json"),
+      path.join(this.#workspaceRoot, "node_modules", pkgName, "package.json"),
+      path.join(path.dirname(Bun.main), "node_modules", pkgName, "package.json"),
+      path.join(path.dirname(Bun.main), "../../", pkgName, "package.json"),
+    ];
+  }
+
   async #firstExisting(basePath: string): Promise<string | null> {
     for (const suffix of CSS_IMPORT_EXTS) {
       const candidate = `${basePath}${suffix}`;

package/frontendBuild/ssrBaseArtifactBuilder.ts

@@ -94,13 +94,26 @@ export class SsrBaseArtifactBuilder {
   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"),
     ];
+    try {
+      candidates.unshift(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.
+    }
+    try {
+      candidates.unshift(path.dirname(Bun.resolveSync("akanjs/server", path.dirname(Bun.main))));
+    } catch {
+      // Published CLI installs may hoist dependencies differently; explicit Bun.main candidates cover that.
+    }
     for (const candidate of candidates) {
       if (await Bun.file(path.join(candidate, "rscClient.tsx")).exists()) return candidate;
     }
-    return candidates[0];
+    throw new Error(`[base-artifact] failed to locate akanjs/server; looked in: ${candidates.join(", ")}`);
   }
 
   async #buildStyleAssets(): Promise<{

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.1.0-rc.2",
+  "version": "2.1.0-rc.3",
   "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.1",
+    "akanjs": "2.1.0-rc.3",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "fontaine": "^0.8.0",