@akanjs/cli 3.0.0-alpha.1 → 3.0.0-alpha.11

package/incrementalBuilder.proc.js

@@ -8,7 +8,7 @@ import {
   DevGeneratedIndexSync,
   GraphClientEntryDiscovery,
   RouteClientBuilder
-} from "./index-rh16j3c7.js";
+} from "./index-j9cxndc0.js";
 import {
   HmrWatcher,
   WatchRootResolver
@@ -16,8 +16,9 @@ import {
 import {
   AppExecutor,
   WorkspaceExecutor
-} from "./index-hgna5rjy.js";
+} from "./index-yzsxc30b.js";
 import"./index-mxvakhsm.js";
+import"./index-1577bej2.js";
 import"./index-67546d0j.js";
 import"./index-r24hmh0q.js";
 

package/index-1577bej2.js

@@ -0,0 +1,7 @@
+// @bun
+// pkgs/@akanjs/devkit/getDirname.ts
+import path from "path";
+import { fileURLToPath } from "url";
+var getDirname = (url) => path.dirname(fileURLToPath(url));
+
+export { getDirname };

package/{index-1pvex4az.js → index-3789fdpg.js}

@@ -1,22 +1,22 @@
 // @bun
 import {
   RepairRunner
-} from "./index-mr5s7mqd.js";
+} from "./index-yzmqvg23.js";
 import {
   WorkflowRunner
-} from "./index-2q1f5j9k.js";
+} from "./index-cv9cxs5k.js";
+import {
+  ScalarScript
+} from "./index-4mgkgba3.js";
 import {
   PrimitiveScript
-} from "./index-bekddz9q.js";
+} from "./index-m90fn8xe.js";
 import {
   ModuleScript
-} from "./index-yzmhasdb.js";
-import {
-  ScalarScript
-} from "./index-ec09pws3.js";
+} from "./index-mewacxye.js";
 import {
   isPlaceholderAppId
-} from "./index-t3723f99.js";
+} from "./index-9va8zayb.js";
 import {
   AkanContextAnalyzer,
   akanMcpInstallConfigPaths,
@@ -27,17 +27,17 @@ import {
   renderDoctorText,
   resourceList,
   upsertCodexMcpServerBlock
-} from "./index-a00jg8x8.js";
+} from "./index-e4b2ae6b.js";
 import {
   buildAkanModuleContextIndex,
   createWorkflowBaselineSummary,
   createWorkflowStepRegistry,
   jsonText,
   toolingRolloutGate
-} from "./index-rzwcpcc3.js";
+} from "./index-kcsa1zff.js";
 import {
   Prompter
-} from "./index-tdbas9r0.js";
+} from "./index-j37qq1f2.js";
 import {
   getMobileTargets
 } from "./index-76rn3g2c.js";
@@ -45,10 +45,10 @@ import {
   CommandContainer,
   runner,
   script
-} from "./index-8hsbnyes.js";
+} from "./index-etwh7sd3.js";
 import {
   AppExecutor
-} from "./index-hgna5rjy.js";
+} from "./index-yzsxc30b.js";
 
 // pkgs/@akanjs/cli/context/context.script.ts
 import { Logger } from "akanjs/common";

package/{index-ec09pws3.js → index-4mgkgba3.js}

@@ -9,14 +9,14 @@ import {
   createPassedPrimitiveReport,
   generatedFilesForSync,
   scalarChangedFiles
-} from "./index-rzwcpcc3.js";
+} from "./index-kcsa1zff.js";
 import {
   Prompter
-} from "./index-tdbas9r0.js";
+} from "./index-j37qq1f2.js";
 import {
   runner,
   script
-} from "./index-8hsbnyes.js";
+} from "./index-etwh7sd3.js";
 
 // pkgs/@akanjs/cli/scalar/scalar.prompt.ts
 import { input } from "@inquirer/prompts";

package/{index-bbkek1bp.js → index-65aeh789.js}

@@ -2,7 +2,7 @@
 import {
   runner,
   script
-} from "./index-8hsbnyes.js";
+} from "./index-etwh7sd3.js";
 
 // pkgs/@akanjs/cli/page/page.runner.ts
 class PageRunner extends runner("page") {

package/{index-7c6k4yvg.js → index-8pd02prk.js}

@@ -2,10 +2,10 @@
 import {
   runner,
   script
-} from "./index-8hsbnyes.js";
+} from "./index-etwh7sd3.js";
 import {
   LibExecutor
-} from "./index-hgna5rjy.js";
+} from "./index-yzsxc30b.js";
 
 // pkgs/@akanjs/cli/semver.ts
 function parseVersion(version) {

package/{index-t3723f99.js → index-9va8zayb.js}

@@ -5,7 +5,7 @@ import {
 } from "./index-76rn3g2c.js";
 import {
   CommandExecutionError
-} from "./index-hgna5rjy.js";
+} from "./index-yzsxc30b.js";
 
 // pkgs/@akanjs/devkit/capacitorApp.ts
 import { cp, mkdir, readFile, rm, writeFile } from "fs/promises";
@@ -514,6 +514,10 @@ function getAdbDeviceStateIssues(output) {
     return [];
   });
 }
+function getAndroidLocalServerHost(adbDevicesOutput, fallbackHost) {
+  const onlineDeviceIds = adbDevicesOutput?.split(/\r?\n/).map((line) => line.trim().split(/\s+/)).filter(([id, state]) => id && state === "device").map(([id]) => id) ?? [];
+  return onlineDeviceIds.length === 1 && onlineDeviceIds[0]?.startsWith("emulator-") ? "10.0.2.2" : fallbackHost;
+}
 var ANDROID_MIN_SDK_VERSION = 26;
 function raiseGradleMinSdkVersion(content, floor = ANDROID_MIN_SDK_VERSION) {
   const match = content.match(/minSdkVersion\s*=\s*(\d+)/);
@@ -691,7 +695,7 @@ class CapacitorApp {
   async save() {
     await this.project.commit();
   }
-  async#prepareIos({ operation, env, regenerate = false }) {
+  async#prepareIos({ operation, env, regenerate = false, iosRunTargetKind }) {
     await this.init({ platform: "ios", operation, env, regenerate });
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("ios");
@@ -700,9 +704,10 @@ class CapacitorApp {
     await this.#applyDeepLinks("ios", { operation, env });
     await this.#flushIosEntitlements();
     await this.project.commit();
+    await this.#setCodeSignEntitlementsInIosIfExists("App/App.entitlements");
     await this.#generateAssets({ operation, env });
     this.app.verbose(`syncing iOS`);
-    await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env });
+    await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env }, { iosRunTargetKind });
     this.app.verbose(`sync completed.`);
   }
   async buildIos({ env = "debug", regenerate = false } = {}) {
@@ -721,10 +726,10 @@ class CapacitorApp {
   async runIos({ operation, env, regenerate = false, noAllowProvisioningUpdates = false, iosDeviceId }) {
     if (operation === "release")
       await this.prepareWww();
-    await this.#prepareIos({ operation, env, regenerate });
     const runTarget = await this.#selectIosRunTarget(iosDeviceId);
+    await this.#prepareIos({ operation, env, regenerate, iosRunTargetKind: runTarget.kind });
     if (runTarget.kind === "simulator") {
-      await this.#spawnMobile("npx", ["cap", "run", "ios", "--target", runTarget.id], { operation, env }, { stdio: "inherit" });
+      await this.#spawnMobile("npx", ["cap", "run", "ios", "--target", runTarget.id, "--no-sync"], { operation, env }, { stdio: "inherit", platform: "ios", iosRunTargetKind: runTarget.kind });
       return;
     }
     await this.#runIosPhysicalDevice({ operation, env, runTarget, noAllowProvisioningUpdates });
@@ -800,7 +805,7 @@ ${textError instanceof Error ? textError.message : ""}`);
     noAllowProvisioningUpdates
   }) {
     const mobileEnv = sanitizeIosNativeRunEnv(await this.#commandEnv(operation, env));
-    const configContent = await this.#writeCapacitorConfig({ operation }, mobileEnv);
+    const configContent = await this.#writeCapacitorConfig({ operation, platform: "ios", iosRunTargetKind: runTarget.kind }, mobileEnv);
     await this.#writeRootCapacitorConfig(configContent);
     const scheme = this.#iosScheme();
     const command = buildIosNativeRunCommand({
@@ -857,6 +862,7 @@ ${error.message}`;
     await this.#applyAndroidMinSdkVersion();
     await this.#applyPermissions({ operation, env });
     await this.#applyDeepLinks("android", { operation, env });
+    await this.#disableNativeKeyboardResizeInAndroid();
     await this.project.commit();
     await this.#generateAssets({ operation, env });
     await this.#ensureAndroidAssetsDir();
@@ -916,6 +922,23 @@ ${error.message}`;
   async openAndroid() {
     await this.#spawnMobile("npx", ["cap", "open", "android"], { operation: "local", env: "local" });
   }
+  async#disableNativeKeyboardResizeInAndroid() {
+    const manifestPath = path.join(this.app.cwdPath, this.androidRootPath, "app/src/main/AndroidManifest.xml");
+    let manifest = await readFile(manifestPath, "utf8");
+    let changed = false;
+    manifest = manifest.replace(/<activity\b[^>]*android:name="\.MainActivity"[^>]*>/, (activityTag) => {
+      if (activityTag.includes("android:windowSoftInputMode=")) {
+        const nextTag = activityTag.replace(/android:windowSoftInputMode="[^"]*"/, 'android:windowSoftInputMode="adjustNothing"');
+        changed ||= nextTag !== activityTag;
+        return nextTag;
+      }
+      changed = true;
+      return activityTag.replace(/>$/, `
+            android:windowSoftInputMode="adjustNothing">`);
+    });
+    if (changed)
+      await writeFile(manifestPath, manifest);
+  }
   async#ensureAndroidAssetsDir() {
     await mkdir(path.join(this.app.cwdPath, this.androidAssetsPath), { recursive: true });
   }
@@ -1005,12 +1028,16 @@ ${error.message}`;
     return html.replace(/<\/head\s*>/i, `${script}
 </head>`);
   }
-  async#writeCapacitorConfig({ operation }, commandEnv) {
+  async#writeCapacitorConfig({
+    operation,
+    platform,
+    iosRunTargetKind
+  }, commandEnv) {
     await mkdir(this.targetRoot, { recursive: true });
     let localIp;
     if (operation === "local") {
       const override = commandEnv.AKAN_PUBLIC_CLIENT_HOST ?? process.env.AKAN_PUBLIC_CLIENT_HOST;
-      const resolution = selectLocalDevHost(os.networkInterfaces(), { override });
+      const resolution = await this.#resolveLocalDevHost({ override, platform, iosRunTargetKind });
       localIp = resolution.host;
       this.#logDevHostResolution(resolution, commandEnv);
     }
@@ -1024,9 +1051,29 @@ ${error.message}`;
     await Bun.write(path.join(this.targetRoot, "capacitor.config.json"), content);
     return content;
   }
+  async#resolveLocalDevHost({
+    override,
+    platform,
+    iosRunTargetKind
+  }) {
+    const resolution = selectLocalDevHost(os.networkInterfaces(), { override });
+    if (resolution.source === "override")
+      return resolution;
+    if (platform === "ios" && iosRunTargetKind === "simulator")
+      return { ...resolution, host: "localhost", source: "platform" };
+    if (platform === "android") {
+      try {
+        const host = getAndroidLocalServerHost(await this.#spawn("adb", ["devices"]), resolution.host);
+        return host === resolution.host ? resolution : { ...resolution, host, source: "platform" };
+      } catch {
+        return resolution;
+      }
+    }
+    return resolution;
+  }
   #logDevHostResolution(resolution, commandEnv) {
     this.app.log(`Mobile live-reload server: ${this.#localCsrUrl(resolution.host, commandEnv)}`);
-    if (resolution.source === "override")
+    if (resolution.source === "override" || resolution.source === "platform")
       return;
     const suspicious = resolution.host === "127.0.0.1" || resolution.host.startsWith("169.254.");
     const alternatives = resolution.candidates.filter((candidate) => candidate.address !== resolution.host);
@@ -1226,18 +1273,26 @@ ${error.message}`;
     return await this.app.spawn(command, args, { cwd: this.app.cwdPath, ...options });
   }
   async#spawnMobile(command, args = [], { operation, env }, options = {}) {
+    const { iosRunTargetKind, platform, ...spawnOptions } = options;
     const mobileEnv = { ...await this.#commandEnv(operation, env), ...options.env };
-    const configContent = await this.#writeCapacitorConfig({ operation }, mobileEnv);
+    const configContent = await this.#writeCapacitorConfig({ operation, platform: platform ?? this.#inferMobilePlatform(args), iosRunTargetKind }, mobileEnv);
     await this.#writeRootCapacitorConfig(configContent);
     try {
       return await this.#spawn(command, args, {
-        ...options,
+        ...spawnOptions,
         env: mobileEnv
       });
     } finally {
       await this.#clearRootCapacitorConfigs();
     }
   }
+  #inferMobilePlatform(args) {
+    if (args.includes("android"))
+      return "android";
+    if (args.includes("ios"))
+      return "ios";
+    return;
+  }
   async addCamera() {
     await this.#setPermissionInIos({
       cameraUsageDescription: "$(PRODUCT_NAME) requires access to the camera to take photos.",
@@ -1339,17 +1394,31 @@ ${error.message}`;
       while (end < lines.length && !/^\s*\};\s*$/.test(lines[end] ?? ""))
         end++;
       const settings = lines.slice(start, end + 1);
-      if (settings.some((setting) => setting.includes("CODE_SIGN_ENTITLEMENTS")))
-        continue;
+      const configName = lines.slice(end + 1, end + 8).find((setting) => setting.includes("name = ")) ?? "";
       const indent = line.match(/^\s*/)?.[0] ?? "";
-      lines.splice(index, 0, `${indent}CODE_SIGN_ENTITLEMENTS = ${entitlementsRelPath};`);
-      index++;
-      changed = true;
+      const insertSettings = [];
+      if (!settings.some((setting) => setting.includes("CODE_SIGN_ENTITLEMENTS"))) {
+        insertSettings.push(`${indent}CODE_SIGN_ENTITLEMENTS = ${entitlementsRelPath};`);
+      }
+      if (configName.includes("name = Debug;") && !settings.some((setting) => setting.includes("CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION"))) {
+        insertSettings.push(`${indent}CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION = YES;`);
+      }
+      if (insertSettings.length > 0) {
+        lines.splice(index, 0, ...insertSettings);
+        index += insertSettings.length;
+        changed = true;
+      }
     }
     if (changed)
       await writeFile(pbxprojPath, lines.join(`
 `));
   }
+  async#setCodeSignEntitlementsInIosIfExists(entitlementsRelPath) {
+    const entitlementsPath = path.join(this.app.cwdPath, this.iosProjectPath, entitlementsRelPath);
+    if (!await Bun.file(entitlementsPath).exists())
+      return;
+    await this.#setCodeSignEntitlementsInIos(entitlementsRelPath);
+  }
   async#setUrlSchemesInAndroid(schemes) {
     const manifestPath = path.join(this.app.cwdPath, this.androidRootPath, "app/src/main/AndroidManifest.xml");
     let manifest = await readFile(manifestPath, "utf8");
@@ -1444,4 +1513,4 @@ ${filter}$1`);
   }
 }
 
-export { SWIFTUICORE_MIN_IOS_MAJOR, rootCapacitorConfigFilenames, rootCapacitorConfigPaths, clearRootCapacitorConfigs, writeRootCapacitorConfig, selectLocalDevHost, parseIosRuntimeMajor, sortIosRunTargets, parseDevicectlDevices, parseSimctlDevices, buildIosNativeRunCommand, classifyIosRunFailure, formatIosRunFailureMessage, sanitizeIosNativeRunEnv, PLACEHOLDER_APP_IDS, isPlaceholderAppId, getMissingAndroidReleaseSigningKeys, formatAndroidReleaseSigningError, getAdbDeviceStateIssues, ANDROID_MIN_SDK_VERSION, raiseGradleMinSdkVersion, assertJsonSerializable, materializeCapacitorConfig, CapacitorApp };
+export { SWIFTUICORE_MIN_IOS_MAJOR, rootCapacitorConfigFilenames, rootCapacitorConfigPaths, clearRootCapacitorConfigs, writeRootCapacitorConfig, selectLocalDevHost, parseIosRuntimeMajor, sortIosRunTargets, parseDevicectlDevices, parseSimctlDevices, buildIosNativeRunCommand, classifyIosRunFailure, formatIosRunFailureMessage, sanitizeIosNativeRunEnv, PLACEHOLDER_APP_IDS, isPlaceholderAppId, getMissingAndroidReleaseSigningKeys, formatAndroidReleaseSigningError, getAdbDeviceStateIssues, getAndroidLocalServerHost, ANDROID_MIN_SDK_VERSION, raiseGradleMinSdkVersion, assertJsonSerializable, materializeCapacitorConfig, CapacitorApp };

package/{index-nm6wghb6.js → index-a5cs7d8r.js}

@@ -1,10 +1,10 @@
 // @bun
 import {
   CloudRunner
-} from "./index-zasydjxd.js";
+} from "./index-nwqqssnb.js";
 import {
   PackageScript
-} from "./index-k95xkh4p.js";
+} from "./index-h5whaj26.js";
 import {
   AiSession,
   CloudApi,
@@ -12,13 +12,13 @@ import {
 } from "./index-0cj2zxbm.js";
 import {
   ApplicationScript
-} from "./index-e16gnn26.js";
+} from "./index-bzznxgcx.js";
 import {
   script
-} from "./index-8hsbnyes.js";
+} from "./index-etwh7sd3.js";
 import {
   PkgExecutor
-} from "./index-hgna5rjy.js";
+} from "./index-yzsxc30b.js";
 
 // pkgs/@akanjs/cli/cloud/cloud.script.ts
 import { Logger } from "akanjs/common";

package/{index-e16gnn26.js → index-bzznxgcx.js}

@@ -1,14 +1,14 @@
 // @bun
+import {
+  LibraryScript
+} from "./index-8pd02prk.js";
 import {
   resolveMobileTargets
 } from "./index-76rn3g2c.js";
-import {
-  LibraryScript
-} from "./index-7c6k4yvg.js";
 import {
   runner,
   script
-} from "./index-8hsbnyes.js";
+} from "./index-etwh7sd3.js";
 import {
   HmrWatcher,
   WatchRootResolver
@@ -18,7 +18,7 @@ import {
   LibExecutor,
   PkgExecutor,
   WorkspaceExecutor
-} from "./index-hgna5rjy.js";
+} from "./index-yzsxc30b.js";
 import {
   __require
 } from "./index-r24hmh0q.js";
@@ -1898,9 +1898,9 @@ function openBrowser(url) {
 }
 
 // pkgs/@akanjs/cli/application/application.runner.ts
-var loadBuildRunner = async () => (await import("./applicationBuildRunner-ct2pxyvw.js")).ApplicationBuildRunner;
+var loadBuildRunner = async () => (await import("./applicationBuildRunner-6m8n71w4.js")).ApplicationBuildRunner;
 var loadReleasePackager = async () => (await import("./applicationReleasePackager-gg8ccbeh.js")).ApplicationReleasePackager;
-var loadCapacitorApp = async () => (await import("./capacitorApp-4r9sm3qg.js")).CapacitorApp;
+var loadCapacitorApp = async () => (await import("./capacitorApp-mr81qdxq.js")).CapacitorApp;
 var loadAbstractCompactor = async () => (await import("./abstractCompactor-e5yq60qz.js")).AbstractCompactor;
 var loadPrompts = async () => await import("@inquirer/prompts");