Produce only universal Node.js binaries by default

Author: kraenhansen

packages/cmake-rn/src/cli.ts

@@ -117,6 +117,10 @@ program = program.action(
         // Forcing the types a bit here, since the platform id option is dynamically added
         if ((baseOptions as Record<string, unknown>)[platform.id]) {
           for (const target of platform.targets) {
+            // Skip redundant targets
+            if (platform.redundantTargets?.includes(target)) {
+              continue;
+            }
             targets.add(target);
           }
         }

packages/cmake-rn/src/platforms/node.ts

@@ -15,6 +15,14 @@ import type { Platform } from "./types.js";
 import { toDeclarationArguments } from "../cmake.js";
 import { getNodeApiIncludeDirectories } from "../headers.js";
 
+type Architecture = "arm64" | "x86_64" | "arm64;x86_64";
+
+const ARCHITECTURES = {
+  "arm64-apple-darwin": "arm64",
+  "x86_64-apple-darwin": "x86_64",
+  "arm64;x86_64-apple-darwin": "arm64;x86_64",
+} satisfies Record<NodeTriplet, Architecture>;
+
 type Target = `${NodeTriplet}-node`;
 
 type NodeOpts = Record<string, unknown>;
@@ -51,6 +59,7 @@ export const platform: Platform<Target[], NodeOpts> = {
     "x86_64-apple-darwin-node",
     "arm64;x86_64-apple-darwin-node",
   ],
+  redundantTargets: ["arm64-apple-darwin-node", "x86_64-apple-darwin-node"],
   defaultTargets() {
     if (process.platform === "darwin") {
       if (process.arch === "arm64") {
@@ -64,12 +73,14 @@ export const platform: Platform<Target[], NodeOpts> = {
   amendCommand(command) {
     return command;
   },
-  configureArgs({ target }) {
+  configureArgs({ target }, { configuration }) {
     const triplet = tripletFromTarget(target);
     return [
       "-G",
       "Ninja",
       ...toDeclarationArguments({
+        CMAKE_BUILD_TYPE: configuration,
+        CMAKE_OSX_ARCHITECTURES: ARCHITECTURES[triplet],
         // TODO: Make this names less "cmake-js" specific with an option to use the CMAKE_JS prefix
         CMAKE_JS_INC: getNodeApiIncludeDirectories(),
         CMAKE_SHARED_LINKER_FLAGS: getLinkerFlags(triplet),

packages/cmake-rn/src/platforms/types.ts

@@ -37,6 +37,11 @@ export type Platform<
    * All the targets supported by this platform.
    */
   targets: Readonly<Targets>;
+  /**
+   * Targets which are redundant when building all supported targets.
+   * Ex. universal / multi-arch targets that are already produced by other targets.
+   */
+  redundantTargets?: Readonly<Targets>;
   /**
    * Get the limited subset of targets that should be built by default for this platform, to support a development workflow.
    */

packages/host/src/node/prebuilds/node.ts

@@ -7,10 +7,10 @@ import { NodeTriplet } from "./triplets.js";
 
 type OSArchName =
   | `${typeof process.platform}-${typeof process.arch}`
-  | "darwin-arm64;x86_64";
+  | "darwin-arm64;x64";
 
 const DIRECTORY_NAMES_PER_TARGET = {
-  "arm64;x86_64-apple-darwin": "darwin-arm64;x86_64",
+  "arm64;x86_64-apple-darwin": "darwin-arm64;x64",
   "arm64-apple-darwin": "darwin-arm64",
   "x86_64-apple-darwin": "darwin-x64",
 } satisfies Record<NodeTriplet, OSArchName>;