@mirinjs/cli 0.1.0-alpha.20 → 0.1.0-alpha.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mirinjs/cli",
-  "version": "0.1.0-alpha.20",
+  "version": "0.1.0-alpha.22",
   "description": "CLI for mirin apps: dev, build, init.",
   "type": "module",
   "license": "MIT",
@@ -27,15 +27,15 @@
     "bun": ">=1.2.0"
   },
   "dependencies": {
-    "create-mirinjs": "0.1.0-alpha.20",
-    "mirinjs": "0.1.0-alpha.20"
+    "create-mirinjs": "0.1.0-alpha.22",
+    "mirinjs": "0.1.0-alpha.22"
   },
   "optionalDependencies": {
-    "@mirinjs/darwin-arm64": "0.1.0-alpha.20",
-    "@mirinjs/win32-x64": "0.1.0-alpha.20",
-    "@mirinjs/win32-arm64": "0.1.0-alpha.20",
-    "@mirinjs/linux-arm64": "0.1.0-alpha.20",
-    "@mirinjs/linux-x64": "0.1.0-alpha.20"
+    "@mirinjs/darwin-arm64": "0.1.0-alpha.22",
+    "@mirinjs/win32-x64": "0.1.0-alpha.22",
+    "@mirinjs/win32-arm64": "0.1.0-alpha.22",
+    "@mirinjs/linux-arm64": "0.1.0-alpha.22",
+    "@mirinjs/linux-x64": "0.1.0-alpha.22"
   },
   "publishConfig": {
     "access": "public"

package/src/build.ts

@@ -22,6 +22,7 @@ import { buildAppBundle } from "./bundle/macos/index.ts";
 import { normalizeCefLocales } from "./bundle/shared/cef-locales.ts";
 import { buildWindowsBundle } from "./bundle/windows/index.ts";
 import { compileWorkers, normalizeSidecars } from "./extras.ts";
+import { resolveIconSource } from "./icons/sources.ts";
 import { makeWindowsIcon } from "./icons/windows/index.ts";
 import { buildLinuxPackages, resolveLinuxFormats } from "./package/linux/index.ts";
 import { sweepBuildTemps } from "./temps.ts";
@@ -194,7 +195,8 @@ export async function build(
   const linux: boolean | import("mirinjs").LinuxConfig = config.linux ?? true;
   const publisher: string = config.publisher ?? appName;
   const cefLocales = normalizeCefLocales(config.cef?.locales);
-  const appIconPath: string | undefined = config.icon ? join(projectDir, config.icon) : undefined;
+  // `.icon` documents are macOS-only, so the platform picks its own source.
+  const appIconPath = resolveIconSource(config.icon, projectDir);
 
   console.log(`[mirin build] ${appName} ${version}`);
 

package/src/dev.ts

@@ -30,6 +30,7 @@ const IS_WINDOWS = process.platform === "win32";
 const IS_LINUX = process.platform === "linux";
 
 import { compileWorkers, normalizeSidecars } from "./extras.ts";
+import { resolveIconSource } from "./icons/sources.ts";
 import { createReporter } from "./shared/report.ts";
 import { DevSession } from "./shared/session.ts";
 import { sweepBuildTemps } from "./temps.ts";
@@ -72,7 +73,7 @@ export async function dev(projectDir = process.cwd(), options?: DevOptions): Pro
   const appName: string = config.name ?? "Mirin App";
   const bundleId: string = config.id ?? "dev.mirin.app";
   const mainEntry = join(projectDir, config.main ?? "main/main.ts");
-  const iconSrc = config.icon ? join(projectDir, config.icon) : undefined;
+  const iconSrc = resolveIconSource(config.icon, projectDir);
   // Linux: resolve the app icon to a concrete PNG the core stamps onto the window
   // as `_NET_WM_ICON` (cosmic dock/taskbar). Passed straight through in dev — no
   // bundling; the file is read from the project at window-create time.

package/src/icons/sources.ts

@@ -0,0 +1,25 @@
+/**
+ * Resolve the manifest's `icon` — a path, or per-platform {@link IconSources} —
+ * to the absolute path this build's target platform should use.
+ */
+
+import { join } from "node:path";
+import type { IconSources } from "mirinjs/config";
+
+export type IconPlatform = "macos" | "windows" | "linux";
+
+export function currentIconPlatform(platform: NodeJS.Platform = process.platform): IconPlatform {
+  if (platform === "win32") return "windows";
+  if (platform === "darwin") return "macos";
+  return "linux";
+}
+
+export function resolveIconSource(
+  icon: string | IconSources | undefined,
+  projectDir: string,
+  platform: IconPlatform = currentIconPlatform(),
+): string | undefined {
+  if (!icon) return undefined;
+  const picked = typeof icon === "string" ? icon : (icon[platform] ?? icon.default);
+  return picked ? join(projectDir, picked) : undefined;
+}