From d45f97f07b131a499a860bdc613c0119fdd924ec Mon Sep 17 00:00:00 2001
From: Theo Gravity <theo@suteki.nu>
Date: Thu, 29 Feb 2024 14:41:20 -0800
Subject: [PATCH 1/2] fix: Use config.mirror first before env variables for
 download URL

---
 pkg/electron/electronDownloader.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/electron/electronDownloader.go b/pkg/electron/electronDownloader.go
index 13ead95..328bb7a 100644
--- a/pkg/electron/electronDownloader.go
+++ b/pkg/electron/electronDownloader.go
@@ -83,15 +83,15 @@ func downloadElectron(configs []ElectronDownloadOptions) ([]string, error) {
 }
 
 func getBaseUrl(config *ElectronDownloadOptions) string {
-	v := os.Getenv("NPM_CONFIG_ELECTRON_MIRROR")
+	v := config.Mirror
 	if len(v) == 0 {
-		v = os.Getenv("npm_config_electron_mirror")
+		v = os.Getenv("NPM_CONFIG_ELECTRON_MIRROR")
 	}
 	if len(v) == 0 {
-		v = os.Getenv("ELECTRON_MIRROR")
+		v = os.Getenv("npm_config_electron_mirror")
 	}
 	if len(v) == 0 {
-		v = config.Mirror
+		v = os.Getenv("ELECTRON_MIRROR")
 	}
 	if len(v) == 0 {
 		if strings.Contains(config.Version, "-nightly.") {

From 970496449b0b02780d654d61af1e3277515a2545 Mon Sep 17 00:00:00 2001
From: Michael Maietta <mmaietta@outlook.com>
Date: Thu, 14 Mar 2024 09:04:13 -0700
Subject: [PATCH 2/2] adding changeset and merging in latest master

---
 .changeset/pre.json                | 3 ++-
 .changeset/rotten-fireants-flow.md | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/rotten-fireants-flow.md

diff --git a/.changeset/pre.json b/.changeset/pre.json
index 7cff3f7..f517a8b 100644
--- a/.changeset/pre.json
+++ b/.changeset/pre.json
@@ -5,6 +5,7 @@
     "app-builder-bin": "4.2.0"
   },
   "changesets": [
-    "orange-seahorses-listen"
+    "orange-seahorses-listen",
+    "rotten-fireants-flow"
   ]
 }
diff --git a/.changeset/rotten-fireants-flow.md b/.changeset/rotten-fireants-flow.md
new file mode 100644
index 0000000..d7f01f9
--- /dev/null
+++ b/.changeset/rotten-fireants-flow.md
@@ -0,0 +1,5 @@
+---
+"app-builder-bin": patch
+---
+
+fix: Use npm config.mirror first before env variables for download URL