@akanjs/devkit 3.0.0-alpha.0 → 3.0.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/capacitorApp.ts CHANGED
@@ -24,7 +24,9 @@ interface RunIosConfig extends RunConfig {
24
24
  iosDeviceId?: string;
25
25
  }
26
26
 
27
- interface PrepareConfig extends RunConfig {}
27
+ interface PrepareConfig extends RunConfig {
28
+ iosRunTargetKind?: IosRunTargetKind;
29
+ }
28
30
 
29
31
  type MobileCommandEnv = Record<string, string | undefined>;
30
32
 
@@ -119,10 +121,11 @@ interface MaterializeCapacitorConfigOptions {
119
121
  localServerUrl?: string;
120
122
  localIp?: string;
121
123
  }
124
+ type MobilePlatform = "ios" | "android";
122
125
 
123
126
  export interface LocalDevHostResolution {
124
127
  host: string;
125
- source: "override" | "detected" | "loopback";
128
+ source: "override" | "detected" | "loopback" | "platform";
126
129
  candidates: { name: string; address: string }[];
127
130
  }
128
131
 
@@ -565,6 +568,16 @@ export function getAdbDeviceStateIssues(output: string) {
565
568
  });
566
569
  }
567
570
 
571
+ export function getAndroidLocalServerHost(adbDevicesOutput: string | undefined, fallbackHost: string) {
572
+ const onlineDeviceIds =
573
+ adbDevicesOutput
574
+ ?.split(/\r?\n/)
575
+ .map((line) => line.trim().split(/\s+/))
576
+ .filter(([id, state]) => id && state === "device")
577
+ .map(([id]) => id) ?? [];
578
+ return onlineDeviceIds.length === 1 && onlineDeviceIds[0]?.startsWith("emulator-") ? "10.0.2.2" : fallbackHost;
579
+ }
580
+
568
581
  export const ANDROID_MIN_SDK_VERSION = 26;
569
582
  export function raiseGradleMinSdkVersion(content: string, floor: number = ANDROID_MIN_SDK_VERSION): string | null {
570
583
  const match = content.match(/minSdkVersion\s*=\s*(\d+)/);
@@ -748,7 +761,7 @@ export class CapacitorApp {
748
761
  async save() {
749
762
  await this.project.commit();
750
763
  }
751
- async #prepareIos({ operation, env, regenerate = false }: PrepareConfig) {
764
+ async #prepareIos({ operation, env, regenerate = false, iosRunTargetKind }: PrepareConfig) {
752
765
  await this.init({ platform: "ios", operation, env, regenerate });
753
766
  await this.#prepareTargetAssets();
754
767
  await this.#prepareExternalFiles("ios");
@@ -757,9 +770,10 @@ export class CapacitorApp {
757
770
  await this.#applyDeepLinks("ios", { operation, env });
758
771
  await this.#flushIosEntitlements();
759
772
  await this.project.commit();
773
+ await this.#setCodeSignEntitlementsInIosIfExists("App/App.entitlements");
760
774
  await this.#generateAssets({ operation, env });
761
775
  this.app.verbose(`syncing iOS`);
762
- await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env });
776
+ await this.#spawnMobile("npx", ["cap", "sync", "ios"], { operation, env }, { iosRunTargetKind });
763
777
  this.app.verbose(`sync completed.`);
764
778
  }
765
779
  async buildIos({ env = "debug", regenerate = false }: { env?: RunConfig["env"]; regenerate?: boolean } = {}) {
@@ -777,14 +791,14 @@ export class CapacitorApp {
777
791
  }
778
792
  async runIos({ operation, env, regenerate = false, noAllowProvisioningUpdates = false, iosDeviceId }: RunIosConfig) {
779
793
  if (operation === "release") await this.prepareWww();
780
- await this.#prepareIos({ operation, env, regenerate });
781
794
  const runTarget = await this.#selectIosRunTarget(iosDeviceId);
795
+ await this.#prepareIos({ operation, env, regenerate, iosRunTargetKind: runTarget.kind });
782
796
  if (runTarget.kind === "simulator") {
783
797
  await this.#spawnMobile(
784
798
  "npx",
785
- ["cap", "run", "ios", "--target", runTarget.id],
799
+ ["cap", "run", "ios", "--target", runTarget.id, "--no-sync"],
786
800
  { operation, env },
787
- { stdio: "inherit" },
801
+ { stdio: "inherit", platform: "ios", iosRunTargetKind: runTarget.kind },
788
802
  );
789
803
  return;
790
804
  }
@@ -878,7 +892,10 @@ export class CapacitorApp {
878
892
  noAllowProvisioningUpdates: boolean;
879
893
  }) {
880
894
  const mobileEnv = sanitizeIosNativeRunEnv(await this.#commandEnv(operation, env));
881
- const configContent = await this.#writeCapacitorConfig({ operation }, mobileEnv);
895
+ const configContent = await this.#writeCapacitorConfig(
896
+ { operation, platform: "ios", iosRunTargetKind: runTarget.kind },
897
+ mobileEnv,
898
+ );
882
899
  await this.#writeRootCapacitorConfig(configContent);
883
900
  const scheme = this.#iosScheme();
884
901
  const command = buildIosNativeRunCommand({
@@ -943,6 +960,7 @@ export class CapacitorApp {
943
960
  await this.#applyAndroidMinSdkVersion();
944
961
  await this.#applyPermissions({ operation, env });
945
962
  await this.#applyDeepLinks("android", { operation, env });
963
+ await this.#disableNativeKeyboardResizeInAndroid();
946
964
  await this.project.commit();
947
965
  await this.#generateAssets({ operation, env });
948
966
  await this.#ensureAndroidAssetsDir();
@@ -1010,6 +1028,24 @@ export class CapacitorApp {
1010
1028
  async openAndroid() {
1011
1029
  await this.#spawnMobile("npx", ["cap", "open", "android"], { operation: "local", env: "local" });
1012
1030
  }
1031
+ async #disableNativeKeyboardResizeInAndroid() {
1032
+ const manifestPath = path.join(this.app.cwdPath, this.androidRootPath, "app/src/main/AndroidManifest.xml");
1033
+ let manifest = await readFile(manifestPath, "utf8");
1034
+ let changed = false;
1035
+ manifest = manifest.replace(/<activity\b[^>]*android:name="\.MainActivity"[^>]*>/, (activityTag) => {
1036
+ if (activityTag.includes("android:windowSoftInputMode=")) {
1037
+ const nextTag = activityTag.replace(
1038
+ /android:windowSoftInputMode="[^"]*"/,
1039
+ 'android:windowSoftInputMode="adjustNothing"',
1040
+ );
1041
+ changed ||= nextTag !== activityTag;
1042
+ return nextTag;
1043
+ }
1044
+ changed = true;
1045
+ return activityTag.replace(/>$/, '\n android:windowSoftInputMode="adjustNothing">');
1046
+ });
1047
+ if (changed) await writeFile(manifestPath, manifest);
1048
+ }
1013
1049
  async #ensureAndroidAssetsDir() {
1014
1050
  await mkdir(path.join(this.app.cwdPath, this.androidAssetsPath), { recursive: true });
1015
1051
  }
@@ -1100,12 +1136,19 @@ export class CapacitorApp {
1100
1136
  if (html.includes("window.__AKAN_MOBILE_TARGET__")) return html;
1101
1137
  return html.replace(/<\/head\s*>/i, `${script}\n</head>`);
1102
1138
  }
1103
- async #writeCapacitorConfig({ operation }: Pick<RunConfig, "operation">, commandEnv: MobileCommandEnv) {
1139
+ async #writeCapacitorConfig(
1140
+ {
1141
+ operation,
1142
+ platform,
1143
+ iosRunTargetKind,
1144
+ }: Pick<RunConfig, "operation"> & { platform?: MobilePlatform; iosRunTargetKind?: IosRunTargetKind },
1145
+ commandEnv: MobileCommandEnv,
1146
+ ) {
1104
1147
  await mkdir(this.targetRoot, { recursive: true });
1105
1148
  let localIp: string | undefined;
1106
1149
  if (operation === "local") {
1107
1150
  const override = commandEnv.AKAN_PUBLIC_CLIENT_HOST ?? process.env.AKAN_PUBLIC_CLIENT_HOST;
1108
- const resolution = selectLocalDevHost(os.networkInterfaces(), { override });
1151
+ const resolution = await this.#resolveLocalDevHost({ override, platform, iosRunTargetKind });
1109
1152
  localIp = resolution.host;
1110
1153
  this.#logDevHostResolution(resolution, commandEnv);
1111
1154
  }
@@ -1118,11 +1161,36 @@ export class CapacitorApp {
1118
1161
  await Bun.write(path.join(this.targetRoot, "capacitor.config.json"), content);
1119
1162
  return content;
1120
1163
  }
1164
+ // An explicit override always wins; an emulator/simulator run reaches the host machine through a
1165
+ // loopback alias (10.0.2.2 / localhost), so LAN detection only applies to physical-device runs.
1166
+ async #resolveLocalDevHost({
1167
+ override,
1168
+ platform,
1169
+ iosRunTargetKind,
1170
+ }: {
1171
+ override?: string;
1172
+ platform?: MobilePlatform;
1173
+ iosRunTargetKind?: IosRunTargetKind;
1174
+ }): Promise<LocalDevHostResolution> {
1175
+ const resolution = selectLocalDevHost(os.networkInterfaces(), { override });
1176
+ if (resolution.source === "override") return resolution;
1177
+ if (platform === "ios" && iosRunTargetKind === "simulator")
1178
+ return { ...resolution, host: "localhost", source: "platform" };
1179
+ if (platform === "android") {
1180
+ try {
1181
+ const host = getAndroidLocalServerHost(await this.#spawn("adb", ["devices"]), resolution.host);
1182
+ return host === resolution.host ? resolution : { ...resolution, host, source: "platform" };
1183
+ } catch {
1184
+ return resolution;
1185
+ }
1186
+ }
1187
+ return resolution;
1188
+ }
1121
1189
  // Surface the live-reload URL a physical device must reach, and warn when auto-detection landed on
1122
1190
  // a likely-unreachable host so a blank WebView is not mistaken for an app bug.
1123
1191
  #logDevHostResolution(resolution: LocalDevHostResolution, commandEnv: MobileCommandEnv) {
1124
1192
  this.app.log(`Mobile live-reload server: ${this.#localCsrUrl(resolution.host, commandEnv)}`);
1125
- if (resolution.source === "override") return;
1193
+ if (resolution.source === "override" || resolution.source === "platform") return;
1126
1194
  const suspicious = resolution.host === "127.0.0.1" || resolution.host.startsWith("169.254.");
1127
1195
  const alternatives = resolution.candidates.filter((candidate) => candidate.address !== resolution.host);
1128
1196
  if (!suspicious && alternatives.length === 0) return;
@@ -1332,20 +1400,29 @@ export class CapacitorApp {
1332
1400
  command: string,
1333
1401
  args: string[] = [],
1334
1402
  { operation, env }: Pick<RunConfig, "operation" | "env">,
1335
- options: Parameters<AppExecutor["spawn"]>[2] = {},
1403
+ options: SpawnMobileOptions = {},
1336
1404
  ) {
1405
+ const { iosRunTargetKind, platform, ...spawnOptions } = options;
1337
1406
  const mobileEnv = { ...(await this.#commandEnv(operation, env)), ...options.env };
1338
- const configContent = await this.#writeCapacitorConfig({ operation }, mobileEnv);
1407
+ const configContent = await this.#writeCapacitorConfig(
1408
+ { operation, platform: platform ?? this.#inferMobilePlatform(args), iosRunTargetKind },
1409
+ mobileEnv,
1410
+ );
1339
1411
  await this.#writeRootCapacitorConfig(configContent);
1340
1412
  try {
1341
1413
  return await this.#spawn(command, args, {
1342
- ...options,
1414
+ ...spawnOptions,
1343
1415
  env: mobileEnv,
1344
1416
  });
1345
1417
  } finally {
1346
1418
  await this.#clearRootCapacitorConfigs();
1347
1419
  }
1348
1420
  }
1421
+ #inferMobilePlatform(args: string[]): MobilePlatform | undefined {
1422
+ if (args.includes("android")) return "android";
1423
+ if (args.includes("ios")) return "ios";
1424
+ return undefined;
1425
+ }
1349
1426
  async addCamera() {
1350
1427
  await this.#setPermissionInIos({
1351
1428
  cameraUsageDescription: "$(PRODUCT_NAME) requires access to the camera to take photos.",
@@ -1446,14 +1523,31 @@ export class CapacitorApp {
1446
1523
  let end = index;
1447
1524
  while (end < lines.length && !/^\s*\};\s*$/.test(lines[end] ?? "")) end++;
1448
1525
  const settings = lines.slice(start, end + 1);
1449
- if (settings.some((setting) => setting.includes("CODE_SIGN_ENTITLEMENTS"))) continue;
1526
+ const configName = lines.slice(end + 1, end + 8).find((setting) => setting.includes("name = ")) ?? "";
1450
1527
  const indent = line.match(/^\s*/)?.[0] ?? "";
1451
- lines.splice(index, 0, `${indent}CODE_SIGN_ENTITLEMENTS = ${entitlementsRelPath};`);
1452
- index++;
1453
- changed = true;
1528
+ const insertSettings = [];
1529
+ if (!settings.some((setting) => setting.includes("CODE_SIGN_ENTITLEMENTS"))) {
1530
+ insertSettings.push(`${indent}CODE_SIGN_ENTITLEMENTS = ${entitlementsRelPath};`);
1531
+ }
1532
+ if (
1533
+ configName.includes("name = Debug;") &&
1534
+ !settings.some((setting) => setting.includes("CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION"))
1535
+ ) {
1536
+ insertSettings.push(`${indent}CODE_SIGN_ALLOW_ENTITLEMENTS_MODIFICATION = YES;`);
1537
+ }
1538
+ if (insertSettings.length > 0) {
1539
+ lines.splice(index, 0, ...insertSettings);
1540
+ index += insertSettings.length;
1541
+ changed = true;
1542
+ }
1454
1543
  }
1455
1544
  if (changed) await writeFile(pbxprojPath, lines.join("\n"));
1456
1545
  }
1546
+ async #setCodeSignEntitlementsInIosIfExists(entitlementsRelPath: string) {
1547
+ const entitlementsPath = path.join(this.app.cwdPath, this.iosProjectPath, entitlementsRelPath);
1548
+ if (!(await Bun.file(entitlementsPath).exists())) return;
1549
+ await this.#setCodeSignEntitlementsInIos(entitlementsRelPath);
1550
+ }
1457
1551
  async #setUrlSchemesInAndroid(schemes: string[]) {
1458
1552
  const manifestPath = path.join(this.app.cwdPath, this.androidRootPath, "app/src/main/AndroidManifest.xml");
1459
1553
  let manifest = await readFile(manifestPath, "utf8");
package/executors.test.ts CHANGED
@@ -149,8 +149,10 @@ describe("Executor filesystem helpers", () => {
149
149
  "AI Development Guide",
150
150
  );
151
151
  expect(await readFile(path.join(root, "workspace/docs/GENERATED.md"), "utf8")).toContain("Generated Akan Files");
152
+ // Rules and their plugin registrations live in the package's base config, so a framework release reaches an
153
+ // existing workspace on `bun update` — the workspace file only extends it and scopes its own files.
152
154
  expect(await readFile(path.join(root, "workspace/biome.json"), "utf8")).toContain(
153
- "./node_modules/@akanjs/devkit/lint/no-import-client-functions.grit",
155
+ '"extends": ["@akanjs/devkit/biome.base.json"]',
154
156
  );
155
157
  });
156
158
 
package/executors.ts CHANGED
@@ -42,6 +42,7 @@ import { AkanAppConfig, AkanLibConfig, decreaseBuildNum, increaseBuildNum } from
42
42
  import { FileSys } from "./fileSys";
43
43
  import { getDirname } from "./getDirname";
44
44
  import { Linter } from "./linter";
45
+ import { resolveRepoName } from "./repoIdentity";
45
46
  import { AppInfo, LibInfo, PkgInfo, WorkspaceInfo } from "./scanInfo";
46
47
  import { Spinner } from "./spinner";
47
48
  // Type-only: the implementation is loaded on demand in `getTypeChecker` to keep `typescript` out of
@@ -788,7 +789,7 @@ export class WorkspaceExecutor extends Executor {
788
789
  static #execs = new Map<string, WorkspaceExecutor>();
789
790
  static fromRoot({
790
791
  workspaceRoot = process.cwd(),
791
- repoName = path.basename(process.cwd()),
792
+ repoName = resolveRepoName(workspaceRoot),
792
793
  }: {
793
794
  workspaceRoot?: string;
794
795
  repoName?: string;
@@ -47,11 +47,24 @@ export class AllRoutesBuilder {
47
47
  this.#app.verbose(`[build-all] discovered ${seedIndex.entries.length} routes`);
48
48
  this.#discovery = await GraphClientEntryDiscovery.create(this.#app);
49
49
 
50
+ // Discovery first, bundling second. Chunk splitting only dedupes within one `Bun.build`, so a
51
+ // dependency shared by entries from different routes was emitted once per route that reached it.
52
+ // Discovery is cached and does no bundling, so collecting every entry up front costs almost nothing.
53
+ const allEntries: string[] = [];
54
+ const seen = new Set<string>();
50
55
  for (const entry of seedIndex.entries) {
51
56
  const seeds = Array.from(new Set([...seedIndex.globalLayoutFiles, ...entry.seeds]));
52
- const delta = await this.#buildRoute(entry.routeId, seeds);
53
- this.#mergeRoute(entry.routeId, delta);
57
+ for (const discovered of await this.#discovery.discover(seeds)) {
58
+ if (seen.has(discovered)) continue;
59
+ seen.add(discovered);
60
+ allEntries.push(discovered);
61
+ }
62
+ this.#routeIds.push(entry.routeId);
54
63
  }
64
+ this.#app.verbose(`[build-all] ${allEntries.length} client entries across ${this.#routeIds.length} routes`);
65
+
66
+ const delta = await this.#buildEntries(allEntries);
67
+ this.#mergeDelta(delta);
55
68
  this.#merged.knownEntries = Array.from(this.#knownSet);
56
69
 
57
70
  const manifest: RoutesManifest = {
@@ -76,28 +89,34 @@ export class AllRoutesBuilder {
76
89
  return { manifest, manifestPath, seedIndex };
77
90
  }
78
91
 
79
- async #buildRoute(routeId: string, seeds: string[]): Promise<BuildRouteClientResult> {
92
+ async #buildEntries(entries: string[]): Promise<BuildRouteClientResult> {
80
93
  if (!this.#discovery) throw new Error("[build-all] client entry discovery is not initialized");
94
+ if (entries.length === 0)
95
+ return {
96
+ manifestDelta: {},
97
+ ssrManifestDelta: { moduleLoading: null, moduleMap: {} },
98
+ newEntries: [],
99
+ clientDeps: [],
100
+ };
81
101
  const started = Date.now();
82
102
  const delta = await new RouteClientBuilder({
83
103
  app: this.#app,
84
- routeId,
85
- seeds,
104
+ seeds: [],
105
+ entries,
86
106
  artifact: this.#artifact,
87
107
  knownEntries: this.#knownSet,
88
108
  discovery: this.#discovery,
89
109
  command: this.#command,
90
110
  }).build();
91
- this.#app.verbose(`[build-all] ${routeId} +${delta.newEntries.length} entries (${Date.now() - started}ms)`);
111
+ this.#app.verbose(`[build-all] bundled ${delta.newEntries.length} entries (${Date.now() - started}ms)`);
92
112
  return delta;
93
113
  }
94
114
 
95
- #mergeRoute(routeId: string, delta: BuildRouteClientResult): void {
115
+ #mergeDelta(delta: BuildRouteClientResult): void {
96
116
  for (const [key, row] of Object.entries(delta.manifestDelta)) this.#merged.clientManifest[key] = row;
97
117
  for (const [url, byName] of Object.entries(delta.ssrManifestDelta.moduleMap)) {
98
118
  this.#merged.ssrManifest.moduleMap[url] = byName;
99
119
  }
100
120
  for (const abs of delta.newEntries) this.#knownSet.add(abs);
101
- this.#routeIds.push(routeId);
102
121
  }
103
122
  }
@@ -0,0 +1,38 @@
1
+ import { describe, expect, test } from "bun:test";
2
+ import { mkdtemp, writeFile } from "node:fs/promises";
3
+ import { tmpdir } from "node:os";
4
+ import path from "node:path";
5
+ import { CssCandidateCache } from "./cssCandidateCache";
6
+
7
+ const scan = async (source: string) => {
8
+ const dir = await mkdtemp(path.join(tmpdir(), "css-candidate-"));
9
+ const file = path.join(dir, "probe.tsx");
10
+ await writeFile(file, source);
11
+ return await new CssCandidateCache(path.join(dir, "cache.json")).load().then((c) => c.candidatesFor(file));
12
+ };
13
+
14
+ describe("CssCandidateCache token extraction", () => {
15
+ test("keeps plain utilities, variants and arbitrary values whole", async () => {
16
+ const candidates = await scan(`const c = "w-full hover:bg-muted md:w-1/2 text-[#fff]";`);
17
+ expect(candidates).toEqual(expect.arrayContaining(["w-full", "hover:bg-muted", "md:w-1/2", "text-[#fff]"]));
18
+ });
19
+
20
+ // A candidate that opens with `[` used to be torn into `_td` + `px-3`, so every descendant-variant
21
+ // rule in the framework compiled to nothing and its element rendered unstyled with no diagnostic.
22
+ test("keeps an arbitrary variant that starts with a bracket", async () => {
23
+ const candidates = await scan(`const c = "[&_td]:px-3 [&>*]:gap-2 [&_tbody_tr]:border-t";`);
24
+ expect(candidates).toEqual(expect.arrayContaining(["[&_td]:px-3", "[&>*]:gap-2", "[&_tbody_tr]:border-t"]));
25
+ expect(candidates).not.toContain("_td");
26
+ });
27
+
28
+ // A labelled tuple type looks like an arbitrary property, and compiles to a rule whose declaration is
29
+ // TypeScript. `optimize()` cannot parse that, and drops far more than the offending rule on its way
30
+ // out — every variant in the build went missing, so nothing hovered, focused or responded to a
31
+ // breakpoint. Tailwind writes a space in an arbitrary value as `_`, so whitespace rules the token out.
32
+ test("ignores a labelled tuple type that only looks like an arbitrary property", async () => {
33
+ const candidates = await scan(
34
+ `type A = [key: string, make: () => unknown][];\ntype B = [setQueryArgs: (a: Args) => Args, options?: Policy];`,
35
+ );
36
+ expect(candidates.filter((candidate) => candidate.startsWith("["))).toEqual([]);
37
+ });
38
+ });
@@ -1,7 +1,19 @@
1
1
  import { stat } from "node:fs/promises";
2
2
 
3
- /** Every identifier-ish token in a source file is a potential tailwind class. */
4
- const CANDIDATE_RE = /-?[\w@][\w:/.-]*(?:\[[^\]]+\][\w:/.-]*)*/g;
3
+ /**
4
+ * Every identifier-ish token in a source file is a potential tailwind class. The leading alternation
5
+ * matters: an arbitrary variant starts with `[` (`[&_td]:px-3`, `[&>*]:gap-2`), and a pattern anchored
6
+ * on a word character tears it into `_td` plus `px-3` instead — both meaningless, so the rule compiles
7
+ * to nothing and the element silently renders unstyled.
8
+ *
9
+ * Brackets must hold no whitespace. Tailwind spells a space in an arbitrary value `_`, so a bracket
10
+ * group containing one is never a class — but it is exactly the shape of a labelled tuple type
11
+ * (`[key: string, make: () => unknown]`). Scanned as a candidate, that compiles to an arbitrary
12
+ * *property* rule carrying TypeScript as its declaration, which the lightningcss pass in `optimize()`
13
+ * cannot parse; its error recovery then drops a whole span of the stylesheet — in practice every
14
+ * variant rule in the build, leaving hover, focus, responsive and dark styles silently absent.
15
+ */
16
+ const CANDIDATE_RE = /-?(?:[\w@]|\[[^\]\s]+\])[\w:/.-]*(?:\[[^\]\s]+\][\w:/.-]*)*/g;
5
17
 
6
18
  interface CachedFile {
7
19
  mtimeMs: number;
@@ -27,7 +39,7 @@ interface CacheFile {
27
39
  */
28
40
  export class CssCandidateCache {
29
41
  /** Bump when the token regex or the entry shape changes, so stale extractions are not reused. */
30
- static readonly #version = 1;
42
+ static readonly #version = 3;
31
43
  readonly #path: string;
32
44
  readonly #entries = new Map<string, CachedFile>();
33
45
  #dirty = false;
@@ -1,26 +1,41 @@
1
1
  import fs from "node:fs";
2
2
  import path from "node:path";
3
+ import zlib from "node:zlib";
3
4
  import type { App } from "../commandDecorators";
4
5
 
5
6
  const COMPRESSIBLE_EXTS = new Set([".css", ".html", ".js", ".json", ".svg"]);
6
7
  const MIN_COMPRESS_BYTES = 1024;
8
+ /**
9
+ * Quality 11 is roughly 100x slower than gzip, so it is spent only where it pays: there is one CSS asset
10
+ * per basePath and it is the largest single file the app ships, worth ~20% over gzip for ~0.2s. Raising the
11
+ * several hundred JS chunks from 9 to 11 costs ~12s of build time to save a few hundred KB, so they stay at 9.
12
+ */
13
+ const BROTLI_QUALITY_BY_EXT = { ".css": 11 } as const;
14
+ const DEFAULT_BROTLI_QUALITY = 9;
15
+ const GZIP_LEVEL = 9;
7
16
 
8
17
  export interface PrecompressArtifactsResult {
9
18
  files: number;
10
19
  inputBytes: number;
11
20
  outputBytes: number;
21
+ brotliBytes: number;
12
22
  }
13
23
 
14
24
  export async function precompressArtifacts(app: App): Promise<PrecompressArtifactsResult> {
15
- const roots = [path.join(app.dist.cwdPath, ".akan/artifact/client")];
16
- const result: PrecompressArtifactsResult = { files: 0, inputBytes: 0, outputBytes: 0 };
25
+ //* styles too: WebRouter serves both prefixes through the same sidecar-aware #fileResponse, and the
26
+ //* one CSS asset per basePath is the largest uncompressed payload the app ships.
27
+ const roots = [
28
+ path.join(app.dist.cwdPath, ".akan/artifact/client"),
29
+ path.join(app.dist.cwdPath, ".akan/artifact/styles"),
30
+ ];
31
+ const result: PrecompressArtifactsResult = { files: 0, inputBytes: 0, outputBytes: 0, brotliBytes: 0 };
17
32
 
18
33
  await Promise.all(roots.map((root) => precompressRoot(root, result)));
19
34
  if (result.files > 0) {
20
35
  app.verbose(
21
- `[precompress] wrote ${result.files} gzip sidecars (${formatBytes(result.inputBytes)} -> ${formatBytes(
36
+ `[precompress] wrote ${result.files} sidecars (${formatBytes(result.inputBytes)} -> gzip ${formatBytes(
22
37
  result.outputBytes,
23
- )})`,
38
+ )} / br ${formatBytes(result.brotliBytes)})`,
24
39
  );
25
40
  }
26
41
  return result;
@@ -32,16 +47,29 @@ async function precompressRoot(root: string, result: PrecompressArtifactsResult)
32
47
  for await (const filePath of glob.scan({ cwd: root, absolute: true })) {
33
48
  if (!(await shouldPrecompress(filePath))) continue;
34
49
  const bytes = await Bun.file(filePath).bytes();
35
- const gz = Bun.gzipSync(toArrayBuffer(bytes));
36
- await Bun.write(`${filePath}.gz`, gz);
50
+ const buffer = toArrayBuffer(bytes);
51
+ const gz = Bun.gzipSync(buffer, { level: GZIP_LEVEL });
52
+ const br = brotliCompress(buffer, path.extname(filePath).toLowerCase());
53
+ await Promise.all([Bun.write(`${filePath}.gz`, gz), Bun.write(`${filePath}.br`, br)]);
37
54
  result.files += 1;
38
55
  result.inputBytes += bytes.byteLength;
39
56
  result.outputBytes += gz.byteLength;
57
+ result.brotliBytes += br.byteLength;
40
58
  }
41
59
  }
42
60
 
61
+ function brotliCompress(buffer: ArrayBuffer, ext: string): Buffer {
62
+ const quality = BROTLI_QUALITY_BY_EXT[ext as keyof typeof BROTLI_QUALITY_BY_EXT] ?? DEFAULT_BROTLI_QUALITY;
63
+ return zlib.brotliCompressSync(buffer, {
64
+ params: {
65
+ [zlib.constants.BROTLI_PARAM_QUALITY]: quality,
66
+ [zlib.constants.BROTLI_PARAM_SIZE_HINT]: buffer.byteLength,
67
+ },
68
+ });
69
+ }
70
+
43
71
  async function shouldPrecompress(filePath: string): Promise<boolean> {
44
- if (filePath.endsWith(".gz")) return false;
72
+ if (filePath.endsWith(".gz") || filePath.endsWith(".br")) return false;
45
73
  if (!COMPRESSIBLE_EXTS.has(path.extname(filePath).toLowerCase())) return false;
46
74
  const file = Bun.file(filePath);
47
75
  if (!(await file.exists())) return false;
@@ -33,6 +33,15 @@ export interface BuildRouteClientOptions {
33
33
  routeId?: string;
34
34
  command?: "build" | "start";
35
35
  discovery?: ClientEntryDiscovery;
36
+ /**
37
+ * Client entries resolved by the caller, which skips discovery and bundles exactly this list.
38
+ *
39
+ * `AllRoutesBuilder` passes every route's entries at once so they share one `Bun.build`. Chunk
40
+ * splitting is scoped to a single invocation, so a dependency reachable from entries spread across
41
+ * several invocations is emitted once per invocation — mermaid landed in `apps/akan` four times that
42
+ * way. Dev keeps one build per route and leaves this unset.
43
+ */
44
+ entries?: string[];
36
45
  }
37
46
 
38
47
  export interface BuildRouteClientResult {
@@ -61,6 +70,7 @@ export class RouteClientBuilder {
61
70
  #knownEntries: Set<string>;
62
71
  #command: "build" | "start";
63
72
  #discovery?: ClientEntryDiscovery;
73
+ #entries?: string[];
64
74
 
65
75
  constructor(options: BuildRouteClientOptions) {
66
76
  this.#app = options.app;
@@ -68,11 +78,13 @@ export class RouteClientBuilder {
68
78
  this.#knownEntries = options.knownEntries ?? new Set<string>();
69
79
  this.#command = options.command ?? "start";
70
80
  this.#discovery = options.discovery;
81
+ this.#entries = options.entries;
71
82
  }
72
83
 
73
84
  async build(): Promise<BuildRouteClientResult> {
74
- const discovery = this.#discovery ?? (await GraphClientEntryDiscovery.create(this.#app));
75
- const discovered = await discovery.discover(this.#seeds);
85
+ const discovered =
86
+ this.#entries ??
87
+ (await (this.#discovery ?? (await GraphClientEntryDiscovery.create(this.#app))).discover(this.#seeds));
76
88
  const entries = discovered.filter((e) => !this.#knownEntries.has(e));
77
89
  if (entries.length === 0) return this.#emptyResult(discovered);
78
90
 
@@ -285,9 +285,14 @@ export class DevResourceProbe {
285
285
  "rscWorkerRecycleCount",
286
286
  "httpFullSsrCount",
287
287
  ];
288
- const rssMb = (Number(child.rssBytes ?? 0) / 1024 / 1024).toFixed(0);
288
+ // `rssBytes` is the replica's own; the RSC worker is a separate process reporting under
289
+ // `rscWorker*`. These used to be the same field, because the worker's report shadowed the
290
+ // replica's — so this line printed the worker's RSS labelled as the child's.
291
+ const toMb = (bytes: unknown) => (Number(bytes ?? 0) / 1024 / 1024).toFixed(0);
289
292
  const parts = keys.map((key) => `${key}=${child[key] ?? "?"}`);
290
- console.info(`[metrics ${label}] rsc rss=${rssMb}MB ${parts.join(" ")}`);
293
+ console.info(
294
+ `[metrics ${label}] replicaRss=${toMb(child.rssBytes)}MB rscWorkerRss=${toMb(child.rscWorkerRssBytes)}MB ${parts.join(" ")}`,
295
+ );
291
296
  }
292
297
 
293
298
  async #waitForLog(pattern: RegExp, timeoutMs: number): Promise<boolean> {