electron-cli 0.3.0-alpha.12 → 0.3.0-alpha.14

package/Cargo.lock

@@ -376,7 +376,7 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "electron-cli"
-version = "0.3.0-alpha.12"
+version = "0.3.0-alpha.14"
 dependencies = [
  "anyhow",
  "apple-dmg",

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "electron-cli"
-version = "0.3.0-alpha.12"
+version = "0.3.0-alpha.14"
 edition = "2021"
 description = "Experimental Rust CLI for Electron project diagnostics and workflow automation"
 license = "MIT"

package/README.md

@@ -36,10 +36,10 @@ 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, `--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.
+- `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 distributables to a local directory with a manifest or to GitHub Releases; it reads JSON-shaped `config.forge.publishers` / `electronCli.publishers` arrays when `--publisher` is omitted, and `--publisher` still forces one publisher.
 
-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 GitHub publisher creates or reuses a release, uploads selected make artifacts, and can replace an existing asset with `--force`. It reads `GITHUB_TOKEN` or `GH_TOKEN` and can infer `OWNER/REPO` from package metadata, Forge GitHub publisher config, or `package.json` `repository`. You can also pass `--github-repo`.
 
 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.
 
@@ -54,12 +54,40 @@ 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"] }
+    ],
+    "publishers": [
+      { "name": "local", "config": { "to": "out/publish/local", "channel": "alpha" } },
+      {
+        "name": "@electron-forge/publisher-github",
+        "config": {
+          "repository": { "owner": "example", "name": "my-app" },
+          "draft": true,
+          "prerelease": true
+        }
+      }
+    ]
+  },
+  "config": {
+    "forge": {
+      "makers": [
+        { "name": "@electron-forge/maker-zip" }
+      ],
+      "publishers": [
+        { "name": "@electron-forge/publisher-github" }
+      ]
     }
   }
 }
 ```
 
-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. The publish command maps JSON-shaped publisher names to local and GitHub. JavaScript Forge config files are not evaluated.
 
 ## Install
 
@@ -125,7 +153,7 @@ The inspection and planning commands support `--json` so agents and scripts can
 `start --dry-run --json` shows the Electron executable that will be launched.
 `package --dry-run --json` shows the runtime, app file, metadata, icon, and extra-resource copy plan.
 `make --dry-run --json` shows the package prerequisite and selected maker artifact path.
-`publish --dry-run --json` shows the make prerequisite plus either the local destination/manifest path or the GitHub release/upload plan.
+`publish --dry-run --json` shows the make prerequisite plus either the local destination/manifest path or the GitHub release/upload plan. When multiple configured makers or publishers apply, the JSON output contains a `publishes` array.
 
 ```sh
 electron-cli plan --json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron-cli",
-  "version": "0.3.0-alpha.12",
+  "version": "0.3.0-alpha.14",
   "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)]
@@ -207,17 +207,17 @@ pub struct PublishArgs {
     #[arg(long)]
     pub arch: Option<String>,
 
-    /// Maker target whose artifact should be published.
-    #[arg(long, value_enum, default_value_t = MakeTarget::Zip)]
-    pub target: MakeTarget,
+    /// Maker target whose artifact should be published. Overrides configured makers when provided.
+    #[arg(long, value_enum)]
+    pub target: Option<MakeTarget>,
 
-    /// Publisher target to use.
-    #[arg(long, value_enum, default_value_t = PublishTarget::Local)]
-    pub publisher: PublishTarget,
+    /// Publisher target to use. Overrides configured publishers when provided.
+    #[arg(long, value_enum)]
+    pub publisher: Option<PublishTarget>,
 
     /// Destination for local published artifacts.
-    #[arg(long, default_value = "out/publish/local", value_name = "PATH")]
-    pub to: PathBuf,
+    #[arg(long, value_name = "PATH")]
+    pub to: Option<PathBuf>,
 
     /// GitHub repository to publish to, in OWNER/REPO form.
     #[arg(long, value_name = "OWNER/REPO")]
@@ -240,12 +240,12 @@ pub struct PublishArgs {
     pub github_prerelease: bool,
 
     /// GitHub API base URL, useful for GitHub Enterprise.
-    #[arg(long, default_value = "https://api.github.com", value_name = "URL")]
-    pub github_api_url: String,
+    #[arg(long, value_name = "URL")]
+    pub github_api_url: Option<String>,
 
     /// Release channel label written into the publish manifest.
-    #[arg(long, default_value = "default")]
-    pub channel: String,
+    #[arg(long)]
+    pub channel: Option<String>,
 
     /// Reuse an existing make artifact instead of running package and make first.
     #[arg(long)]
@@ -306,7 +306,7 @@ impl MakeTarget {
     }
 }
 
-#[derive(Debug, Clone, Copy, ValueEnum)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
 #[value(rename_all = "lower")]
 pub enum PublishTarget {
     Github,