electron-cli 0.3.0-alpha.11 → 0.3.0-alpha.13

package/Cargo.lock

@@ -144,6 +144,18 @@ version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
 
+[[package]]
+name = "cab"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "171228650e6721d5acc0868a462cd864f49ac5f64e4a42cde270406e64e404d2"
+dependencies = [
+ "byteorder",
+ "flate2",
+ "lzxd",
+ "time",
+]
+
 [[package]]
 name = "camino"
 version = "1.2.2"
@@ -163,6 +175,17 @@ dependencies = [
  "shlex",
 ]
 
+[[package]]
+name = "cfb"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3"
+dependencies = [
+ "fnv",
+ "uuid",
+ "web-time",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.4"
@@ -353,25 +376,37 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "electron-cli"
-version = "0.3.0-alpha.11"
+version = "0.3.0-alpha.13"
 dependencies = [
  "anyhow",
  "apple-dmg",
+ "cab",
  "camino",
  "clap",
  "fatfs",
  "flate2",
  "fscommon",
  "md5",
+ "msi",
  "plist",
  "rpm",
  "serde",
  "serde_json",
  "tar",
  "ureq",
+ "uuid",
  "zip",
 ]
 
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
 [[package]]
 name = "enum-display-derive"
 version = "0.1.1"
@@ -449,6 +484,12 @@ dependencies = [
  "zlib-rs",
 ]
 
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
 [[package]]
 name = "foldhash"
 version = "0.1.5"
@@ -809,6 +850,12 @@ version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "616ec5685824bcc94416c6d4a7a446eea774a31efd7062c8480ba6fd06d7a6e5"
 
+[[package]]
+name = "lzxd"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b29dffab797218e12e4df08ef5d15ab9efca2504038b1b32b9b32fc844b39c9"
+
 [[package]]
 name = "md5"
 version = "0.7.0"
@@ -831,6 +878,18 @@ dependencies = [
  "simd-adler32",
 ]
 
+[[package]]
+name = "msi"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0325f8473ef1f5c38ee42345e2cd1678299cbbfa169d1776654a2a682867420"
+dependencies = [
+ "byteorder",
+ "cfb",
+ "encoding_rs",
+ "uuid",
+]
+
 [[package]]
 name = "nom"
 version = "8.0.0"
@@ -1197,6 +1256,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha1_smol"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -1471,6 +1536,7 @@ checksum = "d258b83ceec21034727ecee8c382cfa6c3e133699b0742c64571814fb420c9f7"
 dependencies = [
  "getrandom 0.4.2",
  "js-sys",
+ "sha1_smol",
  "wasm-bindgen",
 ]
 
@@ -1583,6 +1649,16 @@ dependencies = [
  "semver",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki-roots"
 version = "1.0.7"

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "electron-cli"
-version = "0.3.0-alpha.11"
+version = "0.3.0-alpha.13"
 edition = "2021"
 description = "Experimental Rust CLI for Electron project diagnostics and workflow automation"
 license = "MIT"
@@ -9,16 +9,19 @@ repository = "https://github.com/Ikana/electron-cli"
 [dependencies]
 anyhow = "1.0"
 apple-dmg = "0.5"
+cab = "0.6"
 camino = { version = "1.1", features = ["serde1"] }
 clap = { version = "4.6", features = ["derive"] }
 fatfs = "0.3"
 flate2 = { version = "1.1", default-features = false, features = ["rust_backend"] }
 fscommon = "0.1"
 md5 = "0.7"
+msi = "0.10"
 plist = "1"
 rpm = { version = "0.24", default-features = false, features = ["payload", "gzip-compression"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 tar = "0.4"
 ureq = { version = "3.3", features = ["json"] }
+uuid = { version = "1", features = ["v5"] }
 zip = { version = "8.6.0", default-features = false, features = ["deflate-flate2-zlib-rs"] }

package/README.md

@@ -36,12 +36,12 @@ The Rust-native flow currently owns:
 - `init --template minimal`: writes a local Electron starter without Electron Forge.
 - `start`: launches the installed Electron runtime directly.
 - `package`: copies the installed Electron runtime, app files, installed production dependency closure, app metadata, macOS icon, and extra resources into a local app bundle for the current platform and architecture.
-- `make`: runs `package` and writes a distributable under `out/make/<target>/<platform>/<arch>/`; ZIP works on all platforms, `--target dmg` writes a basic macOS disk image, and `--target deb` / `--target rpm` write Linux packages.
+- `make`: runs `package` and writes distributables under `out/make/<target>/<platform>/<arch>/`; it reads JSON-shaped `config.forge.makers` / `electronCli.makers` arrays when `--target` is omitted, and `--target` still forces one maker. ZIP works on all platforms, `--target dmg` writes a basic macOS disk image, `--target deb` / `--target rpm` write Linux packages, and `--target msi` writes a basic Windows Installer package.
 - `publish`: runs `make` and publishes the distributable to a local directory with a manifest or to GitHub Releases.
 
 The GitHub publisher creates or reuses a release, uploads the selected make artifact, and can replace an existing asset with `--force`. It reads `GITHUB_TOKEN` or `GH_TOKEN` and can infer `OWNER/REPO` from `package.json` `repository`, or you can pass `--github-repo`.
 
-The DMG maker is currently a pure-Rust FAT32 image with the app bundle and an Applications entry. HFS+/APFS layout customization, Windows installers, Windows/Linux icon embedding, signing, and notarization are still TODO.
+The DMG maker is currently a pure-Rust FAT32 image with the app bundle and an Applications entry. The MSI maker writes a compressed embedded CAB, Windows Installer database tables, and a Start Menu shortcut when the packaged executable is present. HFS+/APFS DMG layout customization, installer UI customization, Windows/Linux icon embedding, signing, and notarization are still TODO.
 
 Package metadata can be configured in `package.json`:
 
@@ -54,12 +54,26 @@ Package metadata can be configured in `package.json`:
       "appCategoryType": "public.app-category.developer-tools",
       "icon": "assets/icon",
       "extraResource": "assets/config.json"
+    },
+    "makers": [
+      { "name": "@electron-forge/maker-zip" },
+      { "name": "@electron-forge/maker-dmg", "platforms": ["darwin"] },
+      { "name": "@electron-forge/maker-deb", "platforms": ["linux"] },
+      { "name": "@electron-forge/maker-rpm", "platforms": ["linux"] },
+      { "name": "@electron-forge/maker-wix", "platforms": ["win32"] }
+    ]
+  },
+  "config": {
+    "forge": {
+      "makers": [
+        { "name": "@electron-forge/maker-zip" }
+      ]
     }
   }
 }
 ```
 
-The package command also reads JSON-shaped `config.forge.packagerConfig` and `electronPackagerConfig` entries for the same fields. JavaScript Forge config files are not evaluated.
+The package command also reads JSON-shaped `config.forge.packagerConfig` and `electronPackagerConfig` entries for the same fields. The make command maps JSON-shaped Forge maker names to the Rust-native targets it supports: zip, dmg, deb, rpm, and wix/msi. JavaScript Forge config files are not evaluated.
 
 ## Install
 
@@ -97,6 +111,7 @@ cargo run -- make --dry-run
 cargo run -- make --target dmg --dry-run
 cargo run -- make --target deb --dry-run
 cargo run -- make --target rpm --dry-run
+cargo run -- make --target msi --platform win32 --dry-run
 cargo run -- publish --dry-run
 cargo run -- publish --publisher github --dry-run
 cargo run -- publish --publisher github --github-repo OWNER/REPO --github-tag v0.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-cli",
-  "version": "0.3.0-alpha.11",
+  "version": "0.3.0-alpha.13",
   "description": "Experimental Rust CLI for Electron project diagnostics and workflow automation",
   "license": "MIT",
   "repository": {

package/src/cli.rs

@@ -164,9 +164,9 @@ pub struct MakeArgs {
     #[arg(long)]
     pub arch: Option<String>,
 
-    /// Maker target to run.
-    #[arg(long, value_enum, default_value_t = MakeTarget::Zip)]
-    pub target: MakeTarget,
+    /// Maker target to run. Overrides configured makers when provided.
+    #[arg(long, value_enum)]
+    pub target: Option<MakeTarget>,
 
     /// Reuse an existing package output instead of running package first.
     #[arg(long)]
@@ -289,6 +289,7 @@ impl PackageManager {
 pub enum MakeTarget {
     Deb,
     Dmg,
+    Msi,
     Rpm,
     Zip,
 }
@@ -298,6 +299,7 @@ impl MakeTarget {
         match self {
             MakeTarget::Deb => "deb",
             MakeTarget::Dmg => "dmg",
+            MakeTarget::Msi => "msi",
             MakeTarget::Rpm => "rpm",
             MakeTarget::Zip => "zip",
         }