@mirinjs/cli 0.1.0-alpha.15 → 0.1.0-alpha.16

package/package.json

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

package/src/artifacts.ts

@@ -9,7 +9,7 @@
  *    entry from the `mirin` package, and a CEF framework downloaded once from
  *    the matching GitHub Release into `~/.mirinjs/cef/<version>`. No Rust needed.
  *
- * Alpha supports macOS arm64, Windows x64, and Linux x64.
+ * Alpha supports macOS arm64, Windows x64/arm64, and Linux x64/arm64.
  */
 
 import {
@@ -89,11 +89,11 @@ function helperFileName(): string {
 function assertSupportedPlatform(): void {
   const supported =
     (process.platform === "darwin" && process.arch === "arm64") ||
-    (process.platform === "win32" && process.arch === "x64") ||
-    (process.platform === "linux" && process.arch === "x64");
+    (process.platform === "win32" && (process.arch === "x64" || process.arch === "arm64")) ||
+    (process.platform === "linux" && (process.arch === "x64" || process.arch === "arm64"));
   if (!supported) {
     throw new Error(
-      "mirin alpha supports macOS arm64, Windows x64, and Linux x64 " +
+      "mirin alpha supports macOS arm64, Windows x64/arm64, and Linux x64/arm64 " +
         `(got ${process.platform}/${process.arch}).`,
     );
   }

package/src/build.ts

@@ -121,6 +121,8 @@ export interface BuildResult {
   channel: string;
   /** Update baseUrl, if `release` is configured. */
   baseUrl?: string;
+  /** Markdown release notes embedded in the updater manifest, if configured. */
+  releaseNotes?: string;
   /** libmirin_core path (for the updater codec at release time). */
   coreDylib: string;
   /** Project root (so `mirin release` can resolve relative asset paths). */
@@ -183,6 +185,7 @@ export async function build(
   const version = opts.version ?? appVersion(projectDir);
   const channel: string = config.release?.channel ?? "stable";
   const baseUrl: string | undefined = config.release?.baseUrl;
+  const releaseNotes: string | undefined = config.release?.notes;
   const dmg: boolean | import("mirinjs").DmgConfig = config.dmg ?? true;
   const nsis: boolean | import("mirinjs").NsisConfig = config.nsis ?? true;
   const inno: boolean | import("mirinjs").InnoConfig = config.inno ?? true;
@@ -320,6 +323,7 @@ export async function build(
     version,
     channel,
     baseUrl,
+    releaseNotes,
     coreDylib: artifacts.coreDylib,
     projectDir,
     dmg,

package/src/package/linux/package.ts

@@ -137,7 +137,7 @@ async function buildFpm(
   kind: "deb" | "rpm",
 ): Promise<LinuxPackageResult> {
   const fpm = resolveFpm();
-  const arch = kind === "deb" ? "amd64" : "x86_64";
+  const arch = linuxPackageArch(kind);
   const fileName =
     kind === "deb"
       ? `${binName}_${input.version}_${arch}.deb`
@@ -242,7 +242,8 @@ async function buildAppImage(
     stageHicolorIcon(appDirRoot, input);
   }
 
-  const fileName = `${input.appName}-${input.version}-x86_64.AppImage`;
+  const arch = linuxPackageArch("appimage");
+  const fileName = `${input.appName}-${input.version}-${arch}.AppImage`;
   const out = join(input.outDir, fileName);
   rmSync(out, { force: true });
 
@@ -250,7 +251,7 @@ async function buildAppImage(
   // --appimage-extract-and-run: run appimagetool without FUSE. ARCH is required by
   // appimagetool; NO_STRIP avoids stripping the Bun-compiled host (which would break it).
   const res = await $`${appimagetool} --appimage-extract-and-run ${appDirRoot} ${out}`
-    .env({ ...process.env, ARCH: "x86_64", NO_STRIP: "1" })
+    .env({ ...process.env, ARCH: arch, NO_STRIP: "1" })
     .nothrow()
     .quiet();
   rmSync(appDirRoot, { recursive: true, force: true });
@@ -261,6 +262,13 @@ async function buildAppImage(
   return { format: "appimage", path: out, size: size(out) };
 }
 
+function linuxPackageArch(kind: "appimage" | "deb" | "rpm"): string {
+  if (process.arch === "arm64") {
+    return kind === "deb" ? "arm64" : "aarch64";
+  }
+  return kind === "deb" ? "amd64" : "x86_64";
+}
+
 /** Resolve the effective set of formats from config + an optional CLI/caller override. */
 export function resolveLinuxFormats(
   linux: boolean | LinuxConfig | undefined,

package/src/release.ts

@@ -166,6 +166,7 @@ export async function release(projectDir = process.cwd()): Promise<number> {
     channel: result.channel,
     platform,
     arch,
+    body: result.releaseNotes,
     tarHash,
     bundle: { url: bundleName, sha256: bundleSha, size: bundleSize },
     patches,