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

package/akanConfig/types.ts

@@ -1,4 +1,3 @@
-export { archs } from "akanjs";
 export type {
   AkanConfigFile,
   AkanMobileConfig,
@@ -21,3 +20,4 @@ export type {
   ScanResult,
   WorkspaceScanResult,
 } from "akanjs";
+export { archs } from "akanjs";

package/applicationBuildRunner.ts

@@ -51,23 +51,6 @@ const SSR_RENDER_EXTERNALS = [
   "react-server-dom-webpack/client.browser",
 ] as const;
 
-const TYPECHECK_WORKER_CODE = `
-import { TypeChecker } from "@akanjs/devkit";
-
-try {
-  const configPath = process.env.AKAN_TYPECHECK_TSCONFIG;
-  if (!configPath) throw new Error("AKAN_TYPECHECK_TSCONFIG is required");
-  const result = TypeChecker.checkProject(configPath);
-  if (result.errors.length > 0) {
-    console.error(result.message);
-    process.exit(1);
-  }
-} catch (error) {
-  console.error(error instanceof Error ? error.message : String(error));
-  process.exit(1);
-}
-`;
-
 export class ApplicationBuildRunner {
   #app: App;
   #fast: boolean;
@@ -258,7 +241,8 @@ export class ApplicationBuildRunner {
   }
 
   async #checkProjectInChildProcess(tsconfigPath: string) {
-    const proc = Bun.spawn([process.execPath, "--eval", TYPECHECK_WORKER_CODE], {
+    const entry = await this.#resolveTypecheckWorkerEntry();
+    const proc = Bun.spawn([process.execPath, entry], {
       cwd: this.#app.workspace.workspaceRoot,
       env: this.#app.getCommandEnv({
         AKAN_COMMAND_TYPE: "typecheck",
@@ -275,6 +259,17 @@ export class ApplicationBuildRunner {
     if (exitCode !== 0) throw new Error((stderr || stdout).trim() || `Typecheck failed with exit code ${exitCode}`);
   }
 
+  async #resolveTypecheckWorkerEntry() {
+    const candidates = [
+      path.join(this.#app.workspace.workspaceRoot, "pkgs/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path.join(this.#app.workspace.workspaceRoot, "node_modules/@akanjs/devkit/typecheck/typecheck.proc.ts"),
+      path.join(import.meta.dir, "typecheck.proc.js"),
+      path.join(import.meta.dir, "typecheck.proc.ts"),
+    ];
+    for (const candidate of candidates) if (await Bun.file(candidate).exists()) return candidate;
+    throw new Error(`[cli] typecheck worker entry not found; looked in: ${candidates.join(", ")}`);
+  }
+
   async #buildOrThrow(label: string, config: Bun.BuildConfig): Promise<Bun.BuildOutput> {
     const result = await Bun.build(config);
     if (!result.success) throw new AggregateError(result.logs, `[${label}] Bun.build failed`);

package/capacitorApp.ts

@@ -217,7 +217,7 @@ export class CapacitorApp {
       .split(path.sep)
       .join("/");
     const content = `import type { AppScanResult } from "akanjs";
-import { withBase } from "@akanjs/devkit/capacitor.base.config";
+import { withBase } from "akanjs/capacitor.base.config";
 import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
 export default withBase(

package/frontendBuild/cssImportResolver.ts

@@ -120,12 +120,7 @@ export class CssImportResolver {
   }
 
   #resolutionBases(fromBase: string): string[] {
-    return [
-      fromBase,
-      this.#workspaceRoot,
-      path.dirname(Bun.main),
-      path.resolve(path.dirname(Bun.main), "../.."),
-    ];
+    return [fromBase, this.#workspaceRoot, path.dirname(Bun.main), path.resolve(path.dirname(Bun.main), "../..")];
   }
 
   #packageJsonCandidates(pkgName: string): string[] {

package/incrementalBuilder/incrementalBuilder.proc.ts

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { Logger } from "akanjs/common";
 import {
   type App,
   AppExecutor,
@@ -16,6 +15,7 @@ import {
   WatchRootResolver,
   WorkspaceExecutor,
 } from "@akanjs/devkit";
+import { Logger } from "akanjs/common";
 import type {
   BaseBuildArtifact,
   BuilderEvent,

package/lint/no-import-external-library.grit

@@ -6,6 +6,7 @@ JsModuleSource() as $source where {
   not $source <: or {
     r"\"\..*",
     r"\"akanjs.*",
+    r"\"@akanjs.*",
     r"\"@playwright.*",
     r"\"@radix-ui.*",
     r"\"@apps/.*",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "2.1.0-rc.6",
+  "version": "2.1.0-rc.7",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -23,11 +23,6 @@
       "default": "./index.ts"
     },
     "./package.json": "./package.json",
-    "./capacitor.base.config": {
-      "import": "./capacitor.base.config.ts",
-      "types": "./capacitor.base.config.ts",
-      "default": "./capacitor.base.config.ts"
-    },
     "./*": "./*"
   },
   "dependencies": {
@@ -36,7 +31,7 @@
     "@langchain/deepseek": "^1.0.26",
     "@langchain/openai": "^1.4.6",
     "@trapezedev/project": "^7.1.4",
-    "akanjs": "2.1.0-rc.5",
+    "akanjs": "2.1.0-rc.6",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "daisyui": "^5.5.20",

package/src/capacitorApp.ts

@@ -1,9 +1,9 @@
+import { type AppExecutor, FileSys } from "@akanjs/devkit";
 import type { CapacitorConfig } from "@capacitor/cli";
 import { MobileProject } from "@trapezedev/project";
 import type { AndroidProject } from "@trapezedev/project/dist/android/project";
 import type { IosProject } from "@trapezedev/project/dist/ios/project";
 import { capitalize } from "akanjs/common";
-import { type AppExecutor, FileSys } from "@akanjs/devkit";
 
 import { FileEditor } from "./fileEditor";
 

package/typecheck/typecheck.proc.ts

@@ -0,0 +1,14 @@
+import { TypeChecker } from "../typeChecker";
+
+try {
+  const configPath = process.env.AKAN_TYPECHECK_TSCONFIG;
+  if (!configPath) throw new Error("AKAN_TYPECHECK_TSCONFIG is required");
+  const result = TypeChecker.checkProject(configPath);
+  if (result.errors.length > 0) {
+    console.error(result.message);
+    process.exit(1);
+  }
+} catch (error) {
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exit(1);
+}

package/capacitor.base.config.ts

@@ -1,88 +0,0 @@
-import os from "node:os";
-import type { CapacitorConfig } from "@capacitor/cli";
-import type { AkanMobileTargetConfig, AppScanResult } from "akanjs";
-
-const getLocalIP = () => {
-  const interfaces = os.networkInterfaces();
-  for (const interfaceName in interfaces) {
-    const iface = interfaces[interfaceName];
-    if (!iface) continue;
-    for (const alias of iface) {
-      if (alias.family === "IPv4" && !alias.internal) return alias.address;
-    }
-  }
-  return "127.0.0.1"; // fallback to localhost if no suitable IP found
-};
-
-const normalizeBasePath = (basePath: string | undefined) => basePath?.replace(/^\/+|\/+$/g, "");
-
-const routeBasePaths = (appInfo: AppScanResult) =>
-  new Set(
-    appInfo.routes
-      .map((route) => route.replace(/^\.\//, "").split("/")[0])
-      .filter((segment): segment is string => !!segment && !segment.startsWith("_") && !segment.startsWith("(")),
-  );
-
-const resolveTarget = (appInfo: AppScanResult, targetName = process.env.AKAN_MOBILE_TARGET) => {
-  const targets = appInfo.akanConfig.mobile.targets;
-  if (!targets || Object.keys(targets).length === 0) throw new Error("Akan mobile target metadata is missing.");
-  if (targetName) {
-    const target = targets[targetName];
-    if (!target) {
-      const basePath = normalizeBasePath(targetName);
-      const [template] = Object.values(targets);
-      if (basePath && template && routeBasePaths(appInfo).has(basePath))
-        return { ...template, name: basePath, basePath };
-      throw new Error(`Akan mobile target '${targetName}' was not found.`);
-    }
-    return target;
-  }
-  const entries = Object.entries(targets);
-  if (entries.length !== 1) throw new Error("AKAN_MOBILE_TARGET is required when multiple mobile targets exist.");
-  return entries[0]?.[1] as AkanMobileTargetConfig;
-};
-
-const localCsrUrl = (ip: string, target: AkanMobileTargetConfig) => {
-  const basePath = normalizeBasePath(target.basePath);
-  const port = process.env.AKAN_PUBLIC_CLIENT_PORT ?? process.env.PORT ?? "8282";
-  return `http://${ip}:${port}/${basePath ? `${basePath}` : ""}?csr=true`;
-};
-
-export const withBase = (
-  configImp: (config: CapacitorConfig, target: AkanMobileTargetConfig) => CapacitorConfig = (config) => config,
-  appData?: AppScanResult,
-  targetName?: string,
-) => {
-  const ip = getLocalIP();
-  const appInfo = appData;
-  if (!appInfo) throw new Error("withBase requires apps/<app>/akan.app.json metadata.");
-  const target = resolveTarget(appInfo, targetName);
-  const baseConfig: CapacitorConfig = {
-    ...target,
-    appId: target.appId,
-    appName: target.appName,
-    webDir: "dist",
-    server:
-      process.env.APP_OPERATION_MODE !== "release"
-        ? {
-            androidScheme: "http",
-            url: localCsrUrl(ip, target),
-            cleartext: true,
-            allowNavigation: [ip, "localhost"],
-          }
-        : {
-            allowNavigation: ["*"],
-          },
-    plugins: {
-      CapacitorCookies: { enabled: true },
-      ...target.plugins,
-    },
-    android: {
-      ...target.android,
-    },
-    ios: {
-      ...target.ios,
-    },
-  };
-  return configImp(baseConfig, target);
-};