From 17c06fd7179f265294c5eb699ae7073acbcb4628 Mon Sep 17 00:00:00 2001 From: Ethan Kemp Date: Thu, 13 Mar 2025 11:26:50 -0400 Subject: [PATCH 1/2] fix(osxUniversal): set appropriate archs in process.env for Mac universal builds issue #3657 --- packages/api/core/src/api/package.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/api/core/src/api/package.ts b/packages/api/core/src/api/package.ts index f3b4510ce8..07786d9bdd 100644 --- a/packages/api/core/src/api/package.ts +++ b/packages/api/core/src/api/package.ts @@ -413,6 +413,7 @@ export const listrPackage = ( newRoot: true, }, async (childTrace, _, task) => { + process.env.npm_config_arch = target.arch; return delayTraceTillSignal( childTrace, task.newListr( From c012573905f464d9709822308c15d0d5f53ef8c6 Mon Sep 17 00:00:00 2001 From: Erick Zhao Date: Fri, 14 Mar 2025 12:25:55 -0700 Subject: [PATCH 2/2] chore: only set `npm_config_arch` for universal and restore original value --- packages/api/core/src/api/package.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/api/core/src/api/package.ts b/packages/api/core/src/api/package.ts index 07786d9bdd..2463a1ab0b 100644 --- a/packages/api/core/src/api/package.ts +++ b/packages/api/core/src/api/package.ts @@ -413,7 +413,10 @@ export const listrPackage = ( newRoot: true, }, async (childTrace, _, task) => { - process.env.npm_config_arch = target.arch; + const originalConfigArch = process.env.npm_config_arch; + if (target.forUniversal) { + process.env.npm_config_arch = target.arch; + } return delayTraceTillSignal( childTrace, task.newListr( @@ -440,6 +443,9 @@ export const listrPackage = ( title: 'Finalizing package', task: childTrace({ name: 'finalize-package', category: '@electron-forge/core' }, async () => { await addSignalAndWait(signalPackageDone, target); + if (target.forUniversal) { + process.env.npm_config_arch = originalConfigArch; + } }), }, ],