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

package/Cargo.lock

@@ -376,7 +376,7 @@ checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e"
 
 [[package]]
 name = "electron-cli"
-version = "0.3.0-alpha.13"
+version = "0.3.0-alpha.15"
 dependencies = [
  "anyhow",
  "apple-dmg",
@@ -386,6 +386,7 @@ dependencies = [
  "fatfs",
  "flate2",
  "fscommon",
+ "json5",
  "md5",
  "msi",
  "plist",
@@ -805,6 +806,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "json5"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "733a844dbd6fef128e98cb4487b887cb55454d92cd9994b1bafe004fabbe670c"
+dependencies = [
+ "serde",
+ "ucd-trie",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.6"
@@ -1448,6 +1459,12 @@ version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6f5e870be6c3b371b77fe0ee0bafb859fa4964b4404c27de1d380043c4dda20"
 
+[[package]]
+name = "ucd-trie"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"

package/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "electron-cli"
-version = "0.3.0-alpha.13"
+version = "0.3.0-alpha.15"
 edition = "2021"
 description = "Experimental Rust CLI for Electron project diagnostics and workflow automation"
 license = "MIT"
@@ -15,6 +15,7 @@ clap = { version = "4.6", features = ["derive"] }
 fatfs = "0.3"
 flate2 = { version = "1.1", default-features = false, features = ["rust_backend"] }
 fscommon = "0.1"
+json5 = "1"
 md5 = "0.7"
 msi = "0.10"
 plist = "1"

package/README.md

@@ -35,11 +35,11 @@ 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 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.
+- `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; it reads package metadata from `package.json`, JSON-shaped Forge config, and static Forge config files.
+- `make`: runs `package` and writes distributables under `out/make/<target>/<platform>/<arch>/`; it reads JSON-shaped `config.forge.makers` / `electronCli.makers` arrays and static Forge config files 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 and static Forge config files 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.
 
@@ -61,19 +61,35 @@ Package metadata can be configured in `package.json`:
       { "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. 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.
+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.
+
+Static `forge.config.js`, `forge.config.cjs`, `forge.config.mjs`, and `forge.config.ts` files are parsed in Rust when they export an object literal directly or via a local `const`/`let`/`var` identifier. Dynamic JavaScript config that calls functions, reads environment state, or computes the config at runtime is not evaluated.
 
 ## Install
 
@@ -139,7 +155,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.13",
+  "version": "0.3.0-alpha.15",
   "description": "Experimental Rust CLI for Electron project diagnostics and workflow automation",
   "license": "MIT",
   "repository": {

package/src/cli.rs

@@ -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,

package/src/commands/make.rs

@@ -27,7 +27,7 @@ use crate::{
     project::ProjectSnapshot,
 };
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub(crate) struct MakeReport {
     package: PackageReport,
     target: String,
@@ -74,6 +74,7 @@ pub fn run(args: MakeArgs) -> Result<()> {
     print_reports(&reports, args.json, MakeStatus::Made)
 }
 
+#[cfg(test)]
 pub(crate) fn build_report(args: &MakeArgs) -> Result<MakeReport> {
     let reports = build_reports(args)?;
     if reports.len() != 1 {
@@ -227,24 +228,13 @@ fn resolve_make_targets(
 }
 
 fn configured_makers(snapshot: &ProjectSnapshot) -> Result<Vec<ConfiguredMaker>> {
-    let Some(package_json_path) = &snapshot.package_json else {
-        return Ok(Vec::new());
-    };
-    let package_json_path = Path::new(package_json_path.as_str());
-    let raw = fs::read_to_string(package_json_path)
-        .with_context(|| format!("Could not read {}", package_json_path.display()))?;
-    let package = serde_json::from_str::<JsonValue>(&raw)
-        .with_context(|| format!("Could not parse {}", package_json_path.display()))?;
+    let project_config = crate::forge_config::read(snapshot)?;
 
     let mut makers = Vec::new();
     for value in [
-        package
-            .get("config")
-            .and_then(|config| config.get("forge"))
-            .and_then(|forge| forge.get("makers")),
-        package
-            .get("electronCli")
-            .or_else(|| package.get("electron-cli"))
+        project_config.forge().and_then(|forge| forge.get("makers")),
+        project_config
+            .electron_cli()
             .and_then(|config| config.get("makers")),
     ]
     .into_iter()
@@ -345,6 +335,7 @@ fn current_platform_label() -> String {
     }
 }
 
+#[cfg(test)]
 pub(crate) fn execute_make(report: &mut MakeReport, args: &MakeArgs) -> Result<()> {
     ensure_package_ready(std::slice::from_mut(report), args)?;
     execute_make_artifact(report, args)?;
@@ -2419,6 +2410,46 @@ mod tests {
         let _ = fs::remove_dir_all(root);
     }
 
+    #[test]
+    fn builds_make_reports_from_static_forge_config_js() {
+        let root = unique_temp_dir("configured-makers-js");
+        write_package_json(&root);
+        fs::write(
+            root.join("forge.config.js"),
+            r#"
+            module.exports = {
+              makers: [
+                { name: '@electron-forge/maker-zip' },
+                { name: '@electron-forge/maker-rpm', platforms: ['linux'] },
+              ],
+            };
+            "#,
+        )
+        .expect("forge config should be written");
+        write_app_file(&root);
+        write_fake_electron_dist(&root);
+
+        let args = MakeArgs {
+            cwd: root.clone(),
+            out_dir: PathBuf::from("out"),
+            name: None,
+            platform: Some("linux".to_string()),
+            arch: Some("x64".to_string()),
+            target: None,
+            skip_package: false,
+            force: false,
+            dry_run: true,
+            json: true,
+        };
+        let reports = build_reports(&args).expect("reports should build");
+
+        assert_eq!(reports.len(), 2);
+        assert_eq!(reports[0].target(), "zip");
+        assert_eq!(reports[1].target(), "rpm");
+
+        let _ = fs::remove_dir_all(root);
+    }
+
     #[test]
     fn explicit_make_target_overrides_configured_makers() {
         let root = unique_temp_dir("target-override");

package/src/commands/package.rs

@@ -12,7 +12,7 @@ use serde_json::Value as JsonValue;
 
 use crate::{cli::PackageArgs, output, project::ProjectSnapshot};
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 pub(crate) struct PackageReport {
     project: ProjectSnapshot,
     app_name: String,
@@ -31,13 +31,13 @@ pub(crate) struct PackageReport {
     warnings: Vec<String>,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 struct CopyStep {
     from: Utf8PathBuf,
     to: Utf8PathBuf,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 struct PackageMetadata {
     bundle_identifier: String,
     app_version: Option<String>,
@@ -49,13 +49,13 @@ struct PackageMetadata {
     darwin_dark_mode_support: bool,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Debug, Serialize)]
 struct IconResource {
     from: Utf8PathBuf,
     to: Utf8PathBuf,
 }
 
-#[derive(Debug, Serialize)]
+#[derive(Clone, Copy, Debug, Serialize)]
 #[serde(rename_all = "kebab-case")]
 enum PackageStatus {
     Planned,
@@ -67,6 +67,7 @@ struct PackageJsonConfig {
     product_name: Option<String>,
     app_version: Option<String>,
     packager: PackagerConfig,
+    warnings: Vec<String>,
 }
 
 #[derive(Debug, Default)]
@@ -133,7 +134,7 @@ pub(crate) fn build_report(snapshot: ProjectSnapshot, args: &PackageArgs) -> Res
         &platform,
     )?;
 
-    let mut warnings = Vec::new();
+    let mut warnings = package_config.warnings.clone();
     if snapshot.package_json.is_none() {
         warnings.push("No package.json found.".to_string());
     }
@@ -346,44 +347,40 @@ fn print_report(report: &PackageReport, json: bool) -> Result<()> {
 }
 
 fn read_package_json_config(snapshot: &ProjectSnapshot) -> Result<PackageJsonConfig> {
-    let Some(package_json_path) = &snapshot.package_json else {
-        return Ok(PackageJsonConfig::default());
-    };
-
-    let package_json_path = Path::new(package_json_path.as_str());
-    let raw = fs::read_to_string(package_json_path)
-        .with_context(|| format!("Could not read {}", package_json_path.display()))?;
-    let package = serde_json::from_str::<JsonValue>(&raw)
-        .with_context(|| format!("Could not parse {}", package_json_path.display()))?;
+    let project_config = crate::forge_config::read(snapshot)?;
 
     let mut packager = PackagerConfig::default();
-    if let Some(config) = package
-        .get("config")
-        .and_then(|config| config.get("forge"))
+    if let Some(config) = project_config
+        .forge()
         .and_then(|forge| forge.get("packagerConfig"))
     {
         packager.merge(parse_packager_config(config));
     }
-    if let Some(config) = package.get("electronPackagerConfig") {
+    if let Some(config) = project_config
+        .package()
+        .and_then(|package| package.get("electronPackagerConfig"))
+    {
         packager.merge(parse_packager_config(config));
     }
-    if let Some(config) = package
-        .get("electronCli")
-        .or_else(|| package.get("electron-cli"))
+    if let Some(config) = project_config
+        .electron_cli()
         .and_then(|config| config.get("packagerConfig"))
     {
         packager.merge(parse_packager_config(config));
     }
 
     Ok(PackageJsonConfig {
-        product_name: package
-            .get("productName")
+        product_name: project_config
+            .package()
+            .and_then(|package| package.get("productName"))
             .and_then(JsonValue::as_str)
             .map(ToOwned::to_owned),
-        app_version: package
-            .get("version")
+        app_version: project_config
+            .package()
+            .and_then(|package| package.get("version"))
             .and_then(JsonValue::as_str)
             .map(ToOwned::to_owned),
+        warnings: project_config.warnings().to_vec(),
         packager,
     })
 }
@@ -1380,6 +1377,52 @@ mod tests {
         let _ = fs::remove_dir_all(root);
     }
 
+    #[test]
+    fn plans_packager_metadata_from_forge_config_js() {
+        let root = unique_temp_dir("forge-config-metadata");
+        write_package_json(&root);
+        fs::write(
+            root.join("forge.config.js"),
+            r#"
+            module.exports = {
+              packagerConfig: {
+                name: 'Forge Config App',
+                executableName: 'ForgeExec',
+                appBundleId: 'com.example.forge-config',
+              },
+            };
+            "#,
+        )
+        .expect("forge config should be written");
+        write_app_file(&root);
+        write_fake_electron_dist(&root);
+
+        let args = PackageArgs {
+            cwd: root.clone(),
+            out_dir: PathBuf::from("out"),
+            name: None,
+            platform: None,
+            arch: None,
+            force: false,
+            dry_run: true,
+            json: true,
+        };
+        let snapshot = crate::project::inspect(&root).expect("project should inspect");
+        let report = build_report(snapshot, &args).expect("report should build");
+
+        assert_eq!(report.app_name, "Forge Config App");
+        assert_eq!(
+            report.executable_name,
+            executable_name("ForgeExec", &report.platform)
+        );
+        assert_eq!(
+            report.metadata.bundle_identifier,
+            "com.example.forge-config"
+        );
+
+        let _ = fs::remove_dir_all(root);
+    }
+
     #[test]
     fn packages_macos_info_plist_metadata() {
         if current_platform() != "darwin" {