@akanjs/devkit 3.0.0-beta.30 → 3.0.0-beta.31

package/akanConfig/akanConfig.test.ts

@@ -491,6 +491,29 @@ describe("AkanAppConfig", () => {
     expect(config.native.targets.default).toMatchObject({ indexPath: "/explore", desktop: { server: true } });
   });
 
+  test("a platform section may name its own indexPath, normalized like the section's", () => {
+    const config = new AkanAppConfig(
+      app,
+      [],
+      packageJson,
+      {
+        native: {
+          indexPath: "/mobile",
+          ios: { indexPath: "cockpit/" },
+          desktop: { indexPath: " / ", server: true },
+        },
+      },
+      baseDevEnv,
+    );
+
+    expect(config.native.targets.default).toMatchObject({
+      indexPath: "/mobile",
+      ios: { indexPath: "/cockpit" },
+      desktop: { indexPath: "/", server: true },
+    });
+    expect(config.native.targets.default.android).toBeUndefined();
+  });
+
   test("a target takes the native section with its own fields over it: objects merge, lists and values replace", () => {
     const config = new AkanAppConfig(
       app,

package/akanConfig/akanConfig.ts

@@ -293,9 +293,11 @@ export class AkanAppConfig implements AppConfigResult {
         } = merged;
         const indexPath = normalizeIndexPath(rawIndexPath);
         const deepLinks = normalizeDeepLinks(rawDeepLinks);
-        const { teamId: rawTeamId, ...iosRest } = merged.ios ?? {};
+        const { teamId: rawTeamId, ...iosRest } = AkanAppConfig.#platformIndexPath(merged.ios ?? {});
         const teamId = rawTeamId?.trim();
-        const { sha256CertFingerprints: rawFingerprints, ...androidRest } = merged.android ?? {};
+        const { sha256CertFingerprints: rawFingerprints, ...androidRest } = AkanAppConfig.#platformIndexPath(
+          merged.android ?? {},
+        );
         const fingerprints = normalizeStringList(rawFingerprints);
         const target: AkanNativeTarget = {
           ...rest,
@@ -307,6 +309,7 @@ export class AkanAppConfig implements AppConfigResult {
           ...(merged.android
             ? { android: { ...androidRest, ...(fingerprints ? { sha256CertFingerprints: fingerprints } : {}) } }
             : {}),
+          ...(merged.desktop ? { desktop: AkanAppConfig.#platformIndexPath(merged.desktop) } : {}),
           appName: merged.appName ?? this.app.name,
           appId: merged.appId ?? appId,
           version: merged.version ?? version,
@@ -318,6 +321,11 @@ export class AkanAppConfig implements AppConfigResult {
     );
     return { appName, appId, ...(root.fileName ? { fileName: root.fileName } : {}), version, buildNum, targets };
   }
+  static #platformIndexPath<T extends { indexPath?: string }>(section: T): T {
+    const { indexPath: rawIndexPath, ...rest } = section;
+    const indexPath = normalizeIndexPath(rawIndexPath);
+    return { ...rest, ...(indexPath ? { indexPath } : {}) } as T;
+  }
   /** `own` over `base`: plain objects merge key by key, and any other value, a list included, replaces. */
   static #overlay(base: AkanNativeSettings, own: AkanNativeSettings): AkanNativeSettings {
     const merge = (kept: unknown, value: unknown, top: boolean, key: string): unknown => {
@@ -356,8 +364,9 @@ export class AkanAppConfig implements AppConfigResult {
       "android",
       "desktop",
     ],
-    ios: ["teamId", "infoPlist", "entitlements", "privacy", "files"],
+    ios: ["indexPath", "teamId", "infoPlist", "entitlements", "privacy", "files"],
     android: [
+      "indexPath",
       "sha256CertFingerprints",
       "googleServices",
       "push",
@@ -367,7 +376,7 @@ export class AkanAppConfig implements AppConfigResult {
       "activity",
       "files",
     ],
-    desktop: ["server", "recovery", "window", "screenCapture"],
+    desktop: ["indexPath", "server", "recovery", "window", "screenCapture"],
     deepLinks: ["schemes", "domains"],
   } as const;
   //* Settings that moved when `mobile` became `native` are named with where they went, instead of "unknown".

package/mobile/nativeApp.test.ts

@@ -87,14 +87,40 @@ describe("NativeApp", () => {
   });
 
   test("opens a dev build on its target's home, the CSR shell under the locale", () => {
-    expect(new NativeApp(fakeApp(), target({ indexPath: "/explore" })).startPath("en")).toBe(
+    expect(new NativeApp(fakeApp(), target({ indexPath: "/explore" })).startPath("en", "ios")).toBe(
       "/en/explore?csr=true&akanMobileTarget=default&akanMobileIndexPath=%2Fexplore",
     );
-    expect(new NativeApp(fakeApp(), target({ name: "admin", basePath: "/admin/" })).startPath("ko")).toBe(
+    expect(new NativeApp(fakeApp(), target({ name: "admin", basePath: "/admin/" })).startPath("ko", "android")).toBe(
       "/ko/admin?csr=true&akanMobileTarget=admin&akanMobileBasePath=admin",
     );
   });
 
+  test("a platform section's indexPath wins on that platform, and the others keep the target's", () => {
+    const app = new NativeApp(fakeApp(), target({ indexPath: "/mobile", desktop: { indexPath: "/", server: true } }));
+
+    expect(app.indexPath("ios")).toBe("/mobile");
+    expect(app.indexPath("android")).toBe("/mobile");
+    expect(app.indexPath("macos")).toBe("/");
+    expect(app.indexPath("windows")).toBe("/");
+    expect(app.startPath("en", "macos")).toBe("/en?csr=true&akanMobileTarget=default&akanMobileIndexPath=%2F");
+    expect(app.startPath("en", "ios")).toBe(
+      "/en/mobile?csr=true&akanMobileTarget=default&akanMobileIndexPath=%2Fmobile",
+    );
+  });
+
+  test("assembles each platform's web root with that platform's indexPath", async () => {
+    const root = await makeTempRoot();
+    await writeText(path.join(root, "dist/csr/index.html"), "<html><head></head><body></body></html>");
+    const app = { ...fakeApp(), cwdPath: root, dist: { cwdPath: path.join(root, "dist") } } as unknown as App;
+    const nativeApp = new NativeApp(app, target({ indexPath: "/mobile", desktop: { indexPath: "/console" } }));
+    const injected = async () => await Bun.file(path.join(nativeApp.web.dir, "index.html")).text();
+
+    await nativeApp.assembleWeb("linux");
+    expect(await injected()).toContain('"indexPath":"/console"');
+    await nativeApp.assembleWeb("android");
+    expect(await injected()).toContain('"indexPath":"/mobile"');
+  });
+
   test("builds its config from the app's locales and the plugins' native contributions", async () => {
     const push: AkanPlugin = { name: "push-notification", native: { permission: "push", plugins: ["push"] } };
     const app = new NativeApp(

package/mobile/nativeApp.ts

@@ -74,14 +74,24 @@ export class NativeApp {
     return path.join(this.targetRoot, "dev", platform);
   }
 
+  /** Where the app starts on `platform`: its platform section's `indexPath`, else the target's. */
+  indexPath(platform: NativePlatform) {
+    const { config } = this.target;
+    const section = platform === "ios" ? config.ios : platform === "android" ? config.android : config.desktop;
+    return section?.indexPath ?? config.indexPath;
+  }
+
   /** The web root, from the production build the native commands run first. */
-  async assembleWeb() {
+  async assembleWeb(platform: NativePlatform) {
     const dist = this.app.dist.cwdPath;
-    return await this.web.assemble(this.target.config, {
-      html: path.join(dist, "csr", targetHtmlFilename(this.target.config)),
-      publicDir: path.join(dist, "public"),
-      fontsDir: path.join(dist, ".akan", "artifact", "fonts"),
-    });
+    return await this.web.assemble(
+      { ...this.target.config, indexPath: this.indexPath(platform) },
+      {
+        html: path.join(dist, "csr", targetHtmlFilename(this.target.config)),
+        publicDir: path.join(dist, "public"),
+        fontsDir: path.join(dist, ".akan", "artifact", "fonts"),
+      },
+    );
   }
 
   /** Where a desktop build stages the executables it carries (akan.config.ts `bin`). */
@@ -168,7 +178,7 @@ export class NativeApp {
   async build(platform: NativePlatform, { profile = "release", server, installer = false }: NativeBuildOptions = {}) {
     NativeApp.#assertServerPlatform(platform, server);
     if (installer && platform !== "windows") throw new Error(`An installer is built for Windows, not for ${platform}.`);
-    await this.assembleWeb();
+    await this.assembleWeb(platform);
     const { api, config } = await this.prepare(platform, server);
     return await api.build({
       ...this.#task(platform, config),
@@ -182,7 +192,7 @@ export class NativeApp {
     { device, teamId, profile = "debug", server }: NativeRunOptions & NativeBuildOptions = {},
   ) {
     NativeApp.#assertServerPlatform(platform, server);
-    await this.assembleWeb();
+    await this.assembleWeb(platform);
     const { api, config } = await this.prepare(platform, server);
     return await api.run({
       ...this.#task(platform, config),
@@ -211,7 +221,7 @@ export class NativeApp {
         wsPaths: [`${routes.prefix}${routes.websocketPrefix}`],
         reversePorts: [Number(new URL(upstream).port)],
         onLine: this.#appLine,
-        startPath: this.startPath(lang),
+        startPath: this.startPath(lang, platform),
         ...(device ? { device } : {}),
         ...(teamId ? { ios: { signing: { teamId } } } : {}),
       });
@@ -242,7 +252,7 @@ export class NativeApp {
   }
 
   async releaseIos({ teamId, adHoc = false }: { teamId?: string; adHoc?: boolean } = {}) {
-    await this.assembleWeb();
+    await this.assembleWeb("ios");
     const { api, config } = await this.prepare("ios");
     return await api.release({
       ...this.#task("ios", config),
@@ -263,7 +273,7 @@ export class NativeApp {
   ) {
     NativeApp.#assertServerPlatform(platform, server);
     this.#assertUpdates();
-    await this.assembleWeb();
+    await this.assembleWeb(platform);
     const { api, config } = await this.prepare(platform, server);
     return await api.publishUpdate({
       ...this.#task(platform, config),
@@ -324,14 +334,14 @@ export class NativeApp {
 
   async releaseAndroid({ formats = ["aab"] }: { formats?: ("aab" | "apk")[] } = {}) {
     const signing = NativeApp.androidSigning();
-    await this.assembleWeb();
+    await this.assembleWeb("android");
     const { api, config } = await this.prepare("android");
     return await api.release({ ...this.#task("android", config), platform: "android", signing, formats });
   }
 
   /** An unsigned OTA update of this target's web bundle for `platform`, and the channel its binary follows. */
   async packUpdate(platform: MobilePlatform, { out }: { out?: string } = {}) {
-    await this.assembleWeb();
+    await this.assembleWeb(platform);
     const { api, config } = await this.prepare(platform);
     if (!config.updates)
       throw new Error(
@@ -370,12 +380,13 @@ export class NativeApp {
 
   /** The first page of a dev build, the target's home as a release bundle opens it; the dev server answers the CSR
    * shell only for `?csr=true`. */
-  startPath(lang: string) {
+  startPath(lang: string, platform: NativePlatform) {
     const basePath = this.target.config.basePath?.replace(/^\/+|\/+$/g, "");
+    const indexPath = this.indexPath(platform);
     const params = new URLSearchParams({ csr: "true", akanMobileTarget: this.target.name });
     if (basePath) params.set("akanMobileBasePath", basePath);
-    if (this.target.config.indexPath) params.set("akanMobileIndexPath", this.target.config.indexPath);
-    const home = [lang, basePath, this.target.config.indexPath]
+    if (indexPath) params.set("akanMobileIndexPath", indexPath);
+    const home = [lang, basePath, indexPath]
       .flatMap((part) => (part ?? "").split("/"))
       .filter((segment) => segment.length > 0);
     return `/${home.join("/")}?${params}`;

package/mobile/nativeConfig.ts

@@ -234,10 +234,7 @@ export class NativeConfig {
   }
 
   //? akanConfig refuses a target whose merged updates lack url or publicKey; the type still has them optional.
-  static #updates(
-    target: AkanNativeTarget,
-    env?: NativeEnv,
-  ): NonNullable<AkanNativeConfig["updates"]> | undefined {
+  static #updates(target: AkanNativeTarget, env?: NativeEnv): NonNullable<AkanNativeConfig["updates"]> | undefined {
     const { url, publicKey, channel = env, ...rest } = target.updates ?? {};
     return url && publicKey ? { ...rest, url, publicKey, ...(channel ? { channel } : {}) } : undefined;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/devkit",
-  "version": "3.0.0-beta.30",
+  "version": "3.0.0-beta.31",
   "sourceType": "module",
   "type": "module",
   "publishConfig": {
@@ -47,7 +47,7 @@
     "@earendil-works/pi-tui": "0.86.1",
     "@inquirer/prompts": "^8.4.3",
     "@tailwindcss/node": "^4.3.0",
-    "akanjs": "3.0.0-beta.30",
+    "akanjs": "3.0.0-beta.31",
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
     "dayjs": "^1.11.20",