Skip to content
TypeScript

fix(desktop): arm64 macOS builds no longer ship x64-only objc-js binary (#31285)

Josh Rossi2756da402b5d
diff --git a/scripts/build-desktop-artifact.test.ts b/scripts/build-desktop-artifact.test.ts
index aa04d9bfbf1..02f19b07b45 100644
--- a/scripts/build-desktop-artifact.test.ts
+++ b/scripts/build-desktop-artifact.test.ts
@@ -38,6 +38,7 @@ import {
packWindowsServerAsar,
preflightWindowsDesktopBuild,
renderMacPasskeyEntitlements,
+ resolveMacFileExclusions,
resolveMacWebAuthnEntitlements,
resolveMacPasskeySigningConfiguration,
resolveMergedStageDependencies,
@@ -664,6 +665,30 @@ it.layer(NodeServices.layer)("build-desktop-artifact", (it) => {
),
);
+ it("drops the other architecture's Darwin prebuilds from single-architecture Mac builds", () => {
+ const excludes = (arch: "arm64" | "x64" | "universal", file: string) =>
+ resolveMacFileExclusions(arch).some((glob) => NodePath.matchesGlob(file, glob.slice(1)));
+ const x64 = [
+ "node_modules/node-pty/prebuilds/darwin-x64/pty.node",
+ "node_modules/objc-js/prebuilds/darwin-x64/node.napi.node",
+ ];
+ const arm64 = [
+ "node_modules/node-pty/prebuilds/darwin-arm64/pty.node",
+ "node_modules/objc-js/prebuilds/darwin-arm64/node.napi.armv8.node",
+ ];
+
+ for (const file of x64) {
+ assert.isTrue(excludes("arm64", file), file);
+ assert.isFalse(excludes("x64", file), file);
+ assert.isFalse(excludes("universal", file), file);
+ }
+ for (const file of arm64) {
+ assert.isTrue(excludes("x64", file), file);
+ assert.isFalse(excludes("arm64", file), file);
+ assert.isFalse(excludes("universal", file), file);
+ }
+ });
+
it.effect("unpacks target Windows natives while excluding the other architecture", () =>
Effect.scoped(
Effect.gen(function* () {
diff --git a/scripts/build-desktop-artifact.ts b/scripts/build-desktop-artifact.ts
index 6e9fbbbd162..599c6b809a1 100644
--- a/scripts/build-desktop-artifact.ts
+++ b/scripts/build-desktop-artifact.ts
@@ -1014,14 +1014,15 @@ export const LINUX_FILE_EXCLUSIONS = [
"!**/node_modules/node-pty/prebuilds/darwin-*/**/*",
] as const;
-// node-pty bundles both Darwin architectures; only universal apps need both.
+// Native packages (node-pty, objc-js) ship prebuilds for both Darwin architectures; only universal
+// apps need both. macOS 27 warns that an arm64 app holding x64-only code won't open on macOS 28.
export function resolveMacFileExclusions(arch?: typeof BuildArch.Type) {
if (arch === undefined || arch === "universal") {
return [...MAC_FILE_EXCLUSIONS];
}
const unusedArch = arch === "arm64" ? "x64" : "arm64";
- return [...MAC_FILE_EXCLUSIONS, `!**/node_modules/node-pty/prebuilds/darwin-${unusedArch}/**/*`];
+ return [...MAC_FILE_EXCLUSIONS, `!**/node_modules/**/prebuilds/darwin-${unusedArch}/**/*`];
}
// Large ASAR sidecars avoid NSIS extracting thousands of loose files during installs and updates.
export const WINDOWS_SERVER_ASAR_RESOURCE = "server.asar";