akanjs 2.0.6 → 2.0.7

package/README.ko.md

@@ -1,6 +1,6 @@
 # Akan.js
 
-[English](./README.md) | [Docs](https://akanjs.com/docs) | [npm](https://www.npmjs.com/package/akanjs)
+[English](https://unpkg.com/akanjs@latest/README.md) | [Docs](https://akanjs.com/docs) | [npm](https://www.npmjs.com/package/akanjs)
 
 **코드가 아니라, 비즈니스를 씁니다.**  
 **Write the business, not the plumbing.**

package/README.md

@@ -1,6 +1,6 @@
 # Akan.js
 
-[한국어](./README.ko.md) | [Docs](https://akanjs.com/docs) | [npm](https://www.npmjs.com/package/akanjs)
+[한국어](https://unpkg.com/akanjs@latest/README.ko.md) | [Docs](https://akanjs.com/docs) | [npm](https://www.npmjs.com/package/akanjs)
 
 **Write the business, not the plumbing.**
 

package/cli/application/application.command.ts

@@ -94,7 +94,10 @@ export class ApplicationCommand extends command("application", [ApplicationScrip
     }),
   startIos: target({ short: true, desc: "Start iOS app in simulator or device" })
     .with(App)
-    .option("target", String, { desc: "mobile target name or all" })
+    .option("target", String, {
+      ask: "Select mobile target",
+      enum: async ({ app }) => await getMobileTargetChoices(app),
+    })
     .option("env", String, {
       enum: ["local", "debug", "develop", "main"],
       desc: "backend environment",

package/cli/application/application.runner.ts

@@ -117,7 +117,7 @@ export class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     await this.#runMobileTargets(targets, async (mobileTarget) => {
-      await new CapacitorApp(app, mobileTarget.config).buildIos({ regenerate });
+      await new CapacitorApp(app, mobileTarget.config).buildIos({ env, regenerate });
     });
   }
   async startIos(
@@ -152,7 +152,7 @@ export class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     for (const mobileTarget of targets) {
-      await new CapacitorApp(app, mobileTarget.config).buildIos({ regenerate });
+      await new CapacitorApp(app, mobileTarget.config).buildIos({ env, regenerate });
     }
   }
 
@@ -163,7 +163,7 @@ export class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     await this.#runMobileTargets(targets, async (mobileTarget) => {
-      await new CapacitorApp(app, mobileTarget.config).buildAndroid("apk", { regenerate });
+      await new CapacitorApp(app, mobileTarget.config).buildAndroid("apk", { env, regenerate });
     });
   }
 
@@ -201,11 +201,9 @@ export class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     for (const mobileTarget of targets) {
-      await new CapacitorApp(app, mobileTarget.config).buildAndroid(assembleType, { regenerate });
+      await new CapacitorApp(app, mobileTarget.config).buildAndroid(assembleType, { env, regenerate });
       app.log(`Release Android ${app.name}/${mobileTarget.name} ${assembleType} Completed.`);
-      app.log(
-        `Path : ${app.cwdPath}/mobile/${mobileTarget.name}/android/app/build/outputs/${assembleType === "apk" ? "apk" : "bundle"}/release`,
-      );
+      app.log(`Path : ${app.cwdPath}/android/app/build/outputs/${assembleType === "apk" ? "apk" : "bundle"}/release`);
     }
   }
 

package/cli/build.ts

@@ -15,6 +15,7 @@ const build = async () => {
       target: "bun",
       outdir: `${OUT_DIR}/cli`,
       external: Object.keys({ ...packageJson.dependencies, ...packageJson.peerDependencies }),
+      plugins: [],
     });
     await $`cp -R ${CLI_DIR}/templates ${OUT_DIR}/cli/templates`;
   } catch (error) {

package/cli/index.js

@@ -2203,7 +2203,7 @@ var require_source_map_support = __commonJS((exports, module) => {
 });
 
 var require_typescript = __commonJS((exports, module) => {
-  var __dirname = "/Users/kangminseon/Desktop/Mintaka_Github/bunkan/node_modules/typescript/lib", __filename = "/Users/kangminseon/Desktop/Mintaka_Github/bunkan/node_modules/typescript/lib/typescript.js";
+  var __dirname = "/Users/kangminseon/github/Ieading-flight-guidance/node_modules/typescript/lib", __filename = "/Users/kangminseon/github/Ieading-flight-guidance/node_modules/typescript/lib/typescript.js";
   
   var ts = {};
   ((module2) => {
@@ -174321,6 +174321,7 @@ var appRootAllowedDirs = new Set([
   "env",
   "ios",
   "lib",
+  "mobile",
   "page",
   "private",
   "public",
@@ -180781,9 +180782,10 @@ var resolveMobileTargetByBasePath = (targets, basePath2) => {
   if (!template)
     return;
   return {
-    name: template.name,
+    name: normalizedBasePath,
     config: {
       ...template.config,
+      name: normalizedBasePath,
       basePath: normalizedBasePath
     }
   };
@@ -180837,32 +180839,46 @@ class CapacitorApp {
   project;
   iosTargetName = "App";
   targetRoot;
+  targetRootPath;
+  targetWebRoot;
+  targetAssetRoot;
+  iosRootPath = "ios";
+  iosProjectPath = "ios/App";
+  androidRootPath = "android";
   constructor(app, target) {
     this.app = app;
     this.target = target;
-    this.targetRoot = path34.join(this.app.cwdPath, "mobile", this.target.name);
-    this.project = new MobileProject(this.targetRoot, {
-      android: { path: "android" },
-      ios: { path: "ios/App" }
+    this.targetRootPath = path34.posix.join("mobile", this.target.name);
+    this.targetRoot = path34.join(this.app.cwdPath, this.targetRootPath);
+    this.targetWebRoot = path34.join(this.targetRoot, "www");
+    this.targetAssetRoot = path34.join(this.targetRoot, "assets");
+    this.project = new MobileProject(this.app.cwdPath, {
+      android: { path: this.androidRootPath },
+      ios: { path: this.iosProjectPath }
     });
   }
-  async init({ platform, regenerate = false } = {}) {
+  async init({
+    platform,
+    operation = "release",
+    env = "debug",
+    regenerate = false
+  } = {}) {
     await mkdir10(this.targetRoot, { recursive: true });
     await this.#writeCapacitorConfig();
     if (regenerate) {
       if (!platform || platform === "ios")
-        await rm4(path34.join(this.targetRoot, "ios"), { recursive: true, force: true });
+        await rm4(path34.join(this.app.cwdPath, this.iosRootPath), { recursive: true, force: true });
       if (!platform || platform === "android")
-        await rm4(path34.join(this.targetRoot, "android"), { recursive: true, force: true });
+        await rm4(path34.join(this.app.cwdPath, this.androidRootPath), { recursive: true, force: true });
     }
     const project = this.project;
     await this.project.load();
     if ((!platform || platform === "android") && !project.android) {
-      await this.#spawn("npx", ["cap", "add", "android"]);
+      await this.#spawnMobile("npx", ["cap", "add", "android"], { operation, env });
       await this.project.load();
     }
     if ((!platform || platform === "ios") && !project.ios) {
-      await this.#spawn("npx", ["cap", "add", "ios"]);
+      await this.#spawnMobile("npx", ["cap", "add", "ios"], { operation, env });
       await this.project.load();
     }
     return this;
@@ -180870,57 +180886,52 @@ class CapacitorApp {
   async save() {
     await this.project.commit();
   }
-  async#prepareIos({ regenerate = false } = {}) {
-    await this.init({ platform: "ios", regenerate });
+  async#prepareIos({ operation, env, regenerate = false }) {
+    await this.init({ platform: "ios", operation, env, regenerate });
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("ios");
     await this.#applyIosMetadata();
     await this.#applyPermissions();
     await this.#applyLinks();
     await this.project.commit();
-    await this.#generateAssets();
+    await this.#generateAssets({ operation, env });
     this.app.verbose(`syncing iOS`);
-    await this.#spawn("npx", ["cap", "sync", "ios"]);
+    await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env });
     this.app.verbose(`sync completed.`);
   }
-  async buildIos(options = {}) {
+  async buildIos({ env = "debug", regenerate = false } = {}) {
     await this.prepareWww();
-    await this.#prepareIos(options);
-    await this.#spawn("npx", ["cap", "build", "ios"], { stdio: "inherit" });
+    await this.#prepareIos({ operation: "release", env, regenerate });
+    await this.#spawnMobile("npx", ["cap", "build", "ios"], { operation: "release", env }, { stdio: "inherit" });
     this.app.verbose(`build completed iOS.`);
     return;
   }
   async syncIos() {
-    await this.#spawn("npx", ["cap", "sync", "ios"]);
+    await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation: "local", env: "local" });
   }
   async openIos() {
-    await this.#spawn("npx", ["cap", "open", "ios"]);
+    await this.#spawnMobile("npx", ["cap", "open", "ios"], { operation: "local", env: "local" });
   }
   async runIos({ operation, env, regenerate = false }) {
     if (operation === "release")
       await this.prepareWww();
-    await this.#prepareIos({ regenerate });
+    await this.#prepareIos({ operation, env, regenerate });
     const args = ["cap", "run", "ios"];
-    if (operation !== "release")
-      args.push("--live-reload");
-    await this.#spawn("npx", args, {
-      env: this.#commandEnv(operation, env),
-      stdio: "inherit"
-    });
+    await this.#spawnMobile("npx", args, { operation, env }, { stdio: "inherit" });
   }
-  async#prepareAndroid({ regenerate = false } = {}) {
-    await this.init({ platform: "android", regenerate });
+  async#prepareAndroid({ operation, env, regenerate = false }) {
+    await this.init({ platform: "android", operation, env, regenerate });
     await this.#prepareTargetAssets();
     await this.#prepareExternalFiles("android");
     await this.#applyAndroidMetadata();
     await this.#applyPermissions();
     await this.#applyLinks();
     await this.project.commit();
-    await this.#generateAssets();
-    await this.#spawn("npx", ["cap", "sync", "android"]);
+    await this.#generateAssets({ operation, env });
+    await this.#spawnMobile("npx", ["cap", "sync", "android"], { operation, env });
   }
   async#updateAndroidBuildTypes() {
-    const appGradle = await FileEditor.create(`${this.targetRoot}/android/app/build.gradle`);
+    const appGradle = await FileEditor.create(path34.join(this.app.cwdPath, this.androidRootPath, "app/build.gradle"));
     const buildTypesBlock = `
       debug {
         applicationIdSuffix ".debug"
@@ -180955,54 +180966,49 @@ class CapacitorApp {
     }
     await appGradle.save();
   }
-  async buildAndroid(assembleType, options = {}) {
+  async buildAndroid(assembleType, { env = "debug", regenerate = false } = {}) {
     await this.prepareWww();
-    await this.#prepareAndroid(options);
+    await this.#prepareAndroid({ operation: "release", env, regenerate });
     await this.#updateAndroidBuildTypes();
     const isWindows = process.platform === "win32";
     const gradleCommand = isWindows ? "gradlew.bat" : "./gradlew";
     await this.app.spawn(gradleCommand, [assembleType === "apk" ? "assembleRelease" : "bundleRelease"], {
       stdio: "inherit",
-      cwd: `${this.targetRoot}/android`
+      cwd: path34.join(this.app.cwdPath, this.androidRootPath),
+      env: this.#commandEnv("release", env)
     });
   }
   async openAndroid() {
-    await this.#spawn("npx", ["cap", "open", "android"]);
+    await this.#spawnMobile("npx", ["cap", "open", "android"], { operation: "local", env: "local" });
   }
   async syncAndroid(options = {}) {
     await this.prepareWww();
-    await this.#prepareAndroid(options);
+    await this.#prepareAndroid({ operation: "release", env: "debug", ...options });
     this.app.log(`Sync Android Completed.`);
   }
   async runAndroid({ operation, env, regenerate = false }) {
     if (operation === "release")
       await this.prepareWww();
-    await this.#prepareAndroid({ regenerate });
+    await this.#prepareAndroid({ operation, env, regenerate });
     this.app.logger.info(`Running Android in ${operation} mode on ${env} env`);
     const args = ["cap", "run", "android"];
-    if (operation !== "release")
-      args.push("--live-reload");
-    await this.#spawn("npx", args, {
-      env: this.#commandEnv(operation, env),
-      stdio: "inherit"
-    });
+    await this.#spawnMobile("npx", args, { operation, env }, { stdio: "inherit" });
   }
   async releaseIos() {
     await this.prepareWww();
-    await this.#prepareIos();
+    await this.#prepareIos({ operation: "release", env: "main" });
   }
   async releaseAndroid() {
     await this.prepareWww();
-    await this.#prepareAndroid();
+    await this.#prepareAndroid({ operation: "release", env: "main" });
   }
   async prepareWww() {
     const htmlSource = path34.join(this.app.dist.cwdPath, "csr", targetHtmlFilename(this.target));
     if (!await Bun.file(htmlSource).exists())
       throw new Error(`CSR html for mobile target '${this.target.name}' not found: ${htmlSource}`);
-    const wwwDir = path34.join(this.targetRoot, "www");
-    await rm4(wwwDir, { recursive: true, force: true });
-    await mkdir10(wwwDir, { recursive: true });
-    await Bun.write(path34.join(wwwDir, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
+    await rm4(this.targetWebRoot, { recursive: true, force: true });
+    await mkdir10(this.targetWebRoot, { recursive: true });
+    await Bun.write(path34.join(this.targetWebRoot, "index.html"), this.#injectMobileTargetMeta(await Bun.file(htmlSource).text()));
   }
   #injectMobileTargetMeta(html) {
     const basePath2 = this.target.basePath?.replace(/^\/+|\/+$/g, "") ?? "";
@@ -181014,24 +181020,40 @@ class CapacitorApp {
   }
   async#writeCapacitorConfig() {
     await mkdir10(this.targetRoot, { recursive: true });
-    const appInfoPath = path34.relative(this.targetRoot, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
-    const baseConfigPath = path34.relative(this.targetRoot, path34.join(this.app.workspace.cwdPath, "pkgs/akanjs/devkit/capacitor.base.config")).split(path34.sep).join("/");
-    const content = `import { withBase } from "${baseConfigPath.startsWith(".") ? baseConfigPath : `./${baseConfigPath}`}";
-import appInfo from "${appInfoPath}";
+    const appInfoPath = path34.relative(this.app.cwdPath, path34.join(this.app.cwdPath, "akan.app.json")).split(path34.sep).join("/");
+    const baseConfigPath = path34.relative(this.app.cwdPath, path34.join(this.app.workspace.cwdPath, "pkgs/akanjs/devkit/capacitor.base.config")).split(path34.sep).join("/");
+    const content = `import type { AppScanResult } from "akanjs/devkit";
+import { withBase } from "${baseConfigPath.startsWith(".") ? baseConfigPath : `./${baseConfigPath}`}";
+import appInfo from "${appInfoPath.startsWith(".") ? appInfoPath : `./${appInfoPath}`}";
 
-export default withBase((config) => config, appInfo, "${this.target.name}");
+export default withBase(
+  (config, target) => ({
+    ...config,
+    webDir: \`mobile/\${target.name}/www\`,
+    android: {
+      ...config.android,
+      path: "android",
+    },
+    ios: {
+      ...config.ios,
+      path: "ios",
+    },
+  }),
+  appInfo as AppScanResult,
+);
 `;
-    await Bun.write(path34.join(this.targetRoot, "capacitor.config.ts"), content);
+    await Bun.write(path34.join(this.app.cwdPath, "capacitor.config.ts"), content);
   }
   async#prepareTargetAssets() {
     if (!this.target.assets)
       return;
-    const assetsDir = path34.join(this.targetRoot, "assets");
-    await mkdir10(assetsDir, { recursive: true });
+    await mkdir10(this.targetAssetRoot, { recursive: true });
     if (this.target.assets.icon)
-      await cp2(path34.join(this.app.cwdPath, this.target.assets.icon), path34.join(assetsDir, "icon.png"), { force: true });
+      await cp2(path34.join(this.app.cwdPath, this.target.assets.icon), path34.join(this.targetAssetRoot, "icon.png"), {
+        force: true
+      });
     if (this.target.assets.splash)
-      await cp2(path34.join(this.app.cwdPath, this.target.assets.splash), path34.join(assetsDir, "splash.png"), {
+      await cp2(path34.join(this.app.cwdPath, this.target.assets.splash), path34.join(this.targetAssetRoot, "splash.png"), {
         force: true
       });
   }
@@ -181039,16 +181061,26 @@ export default withBase((config) => config, appInfo, "${this.target.name}");
     const files = this.target.files?.[platform];
     if (!files)
       return;
+    const platformRoot = path34.join(this.app.cwdPath, platform === "ios" ? this.iosRootPath : this.androidRootPath);
     await Promise.all(Object.entries(files).map(async ([to, from]) => {
-      const targetPath = path34.join(this.targetRoot, platform, to);
+      const targetPath = path34.join(platformRoot, to);
       await mkdir10(path34.dirname(targetPath), { recursive: true });
       await cp2(path34.join(this.app.cwdPath, from), targetPath, { force: true });
     }));
   }
-  async#generateAssets() {
+  async#generateAssets({ operation, env }) {
     if (!this.target.assets)
       return;
-    await this.#spawn("npx", ["@capacitor/assets", "generate"]);
+    await this.#spawnMobile("npx", [
+      "@capacitor/assets",
+      "generate",
+      "--assetPath",
+      path34.posix.join(this.targetRootPath, "assets"),
+      "--iosProject",
+      this.iosProjectPath,
+      "--androidProject",
+      this.androidRootPath
+    ], { operation, env });
   }
   async#applyIosMetadata() {
     this.project.ios.setBundleId("App", "Debug", this.target.appId);
@@ -181098,16 +181130,21 @@ export default withBase((config) => config, appInfo, "${this.target.name}");
     }
   }
   #commandEnv(operation, env) {
-    return {
-      ...process.env,
+    return this.app.getCommandEnv({
       APP_OPERATION_MODE: operation,
-      AKAN_PUBLIC_OPERATION_MODE: operation,
+      AKAN_PUBLIC_OPERATION_MODE: env === "local" ? "local" : "cloud",
       AKAN_PUBLIC_ENV: env,
       AKAN_MOBILE_TARGET: this.target.name
-    };
+    });
   }
   async#spawn(command, args = [], options = {}) {
-    return await this.app.spawn(command, args, { cwd: this.targetRoot, ...options });
+    return await this.app.spawn(command, args, { cwd: this.app.cwdPath, ...options });
+  }
+  async#spawnMobile(command, args = [], { operation, env }, options = {}) {
+    return await this.#spawn(command, args, {
+      ...options,
+      env: { ...this.#commandEnv(operation, env), ...options.env }
+    });
   }
   async addCamera() {
     await this.#setPermissionInIos({
@@ -182385,7 +182422,7 @@ class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     await this.#runMobileTargets(targets, async (mobileTarget2) => {
-      await new CapacitorApp(app, mobileTarget2.config).buildIos({ regenerate });
+      await new CapacitorApp(app, mobileTarget2.config).buildIos({ env, regenerate });
     });
   }
   async startIos(app, {
@@ -182411,14 +182448,14 @@ class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     for (const mobileTarget2 of targets) {
-      await new CapacitorApp(app, mobileTarget2.config).buildIos({ regenerate });
+      await new CapacitorApp(app, mobileTarget2.config).buildIos({ env, regenerate });
     }
   }
   async buildAndroid(app, { target, env = "debug", regenerate = false } = {}) {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     await this.#runMobileTargets(targets, async (mobileTarget2) => {
-      await new CapacitorApp(app, mobileTarget2.config).buildAndroid("apk", { regenerate });
+      await new CapacitorApp(app, mobileTarget2.config).buildAndroid("apk", { env, regenerate });
     });
   }
   async startAndroid(app, {
@@ -182444,9 +182481,9 @@ class ApplicationRunner extends runner("application") {
     const targets = await resolveMobileTargets(app, target);
     await this.#buildMobileCsr(app, env);
     for (const mobileTarget2 of targets) {
-      await new CapacitorApp(app, mobileTarget2.config).buildAndroid(assembleType, { regenerate });
+      await new CapacitorApp(app, mobileTarget2.config).buildAndroid(assembleType, { env, regenerate });
       app.log(`Release Android ${app.name}/${mobileTarget2.name} ${assembleType} Completed.`);
-      app.log(`Path : ${app.cwdPath}/mobile/${mobileTarget2.name}/android/app/build/outputs/${assembleType === "apk" ? "apk" : "bundle"}/release`);
+      app.log(`Path : ${app.cwdPath}/android/app/build/outputs/${assembleType === "apk" ? "apk" : "bundle"}/release`);
     }
   }
   async#buildMobileCsr(app, env) {
@@ -182816,7 +182853,10 @@ class ApplicationCommand extends command("application", [ApplicationScript], ({
   start: target({ short: true, desc: "Start development server (frontend SSR + backend)" }).with(App).option("open", Boolean, { desc: "open web browser?", default: false }).option("write", Boolean, { desc: "write code generation", default: true }).exec(async function(app, open, write) {
     await this.applicationScript.start(app, { open, write });
   }),
-  startIos: target({ short: true, desc: "Start iOS app in simulator or device" }).with(App).option("target", String, { desc: "mobile target name or all" }).option("env", String, {
+  startIos: target({ short: true, desc: "Start iOS app in simulator or device" }).with(App).option("target", String, {
+    ask: "Select mobile target",
+    enum: async ({ app }) => await getMobileTargetChoices(app)
+  }).option("env", String, {
     enum: ["local", "debug", "develop", "main"],
     desc: "backend environment",
     default: "local"

package/constant/serialize.ts

@@ -53,7 +53,7 @@ const serializeInput = <Input = unknown>(
     return Object.fromEntries(
       Object.entries(modelRef[FIELD_META]).map(([key, field]) => [
         key,
-        field.isClass && !field.isScalar
+        serializeType === "input" && field.isClass && !field.isScalar
           ? serialize(ID, field.arrDepth, getRelationId((value as Record<string, unknown>)?.[key]), serializeType, {
               nullable: field.nullable,
               key,

package/devkit/capacitor.base.config.ts

@@ -16,12 +16,25 @@ const getLocalIP = () => {
 
 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) throw new Error(`Akan mobile target '${targetName}' was not found.`);
+    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);
@@ -31,7 +44,8 @@ const resolveTarget = (appInfo: AppScanResult, targetName = process.env.AKAN_MOB
 
 const localCsrUrl = (ip: string, target: AkanMobileTargetConfig) => {
   const basePath = normalizeBasePath(target.basePath);
-  return `http://${ip}:8282/${basePath ? `${basePath}` : ""}?csr=true`;
+  const port = process.env.AKAN_PUBLIC_CLIENT_PORT ?? process.env.PORT ?? "8282";
+  return `http://${ip}:${port}/${basePath ? `${basePath}` : ""}?csr=true`;
 };
 
 export const withBase = (
@@ -44,9 +58,10 @@ export const withBase = (
   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: "www",
+    webDir: "dist",
     server:
       process.env.APP_OPERATION_MODE !== "release"
         ? {
@@ -62,7 +77,6 @@ export const withBase = (
       CapacitorCookies: { enabled: true },
       ...target.plugins,
     },
-    ...target,
     android: {
       ...target.android,
     },