fixup! Dereference framework directories

Author: kraenhansen

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

@@ -8,6 +8,7 @@ import {
   AppleTriplet as Triplet,
   createAppleFramework,
   createXCframework,
+  dereferenceDirectory,
 } from "react-native-node-api";
 
 import type { Platform } from "./types.js";
@@ -372,6 +373,18 @@ export const platform: Platform<Triplet[], AppleOpts> = {
       }
     }
 
+    // Make sure none of the frameworks are symlinks
+    // We do this before creating an xcframework to avoid symlink paths being invalidated
+    // as the xcframework might be moved to a different location
+    await Promise.all(
+      frameworkPaths.map(async (frameworkPath) => {
+        const stat = await fs.promises.lstat(frameworkPath);
+        if (stat.isSymbolicLink()) {
+          await dereferenceDirectory(frameworkPath);
+        }
+      }),
+    );
+
     const extension = xcframeworkExtension ? ".xcframework" : ".apple.node";
 
     assert(
@@ -391,7 +404,6 @@ export const platform: Platform<Triplet[], AppleOpts> = {
         outputPath: xcframeworkOutputPath,
         frameworkPaths,
         autoLink,
-        dereferenceFrameworkLinks: true,
       }),
       {
         text: `Assembling XCFramework (${libraryName})`,

packages/host/src/node/index.ts

@@ -22,6 +22,9 @@ export {
   determineXCFrameworkFilename,
 } from "./prebuilds/apple.js";
 
-export { determineLibraryBasename } from "./path-utils.js";
+export {
+  determineLibraryBasename,
+  dereferenceDirectory,
+} from "./path-utils.js";
 
 export { weakNodeApiPath } from "./weak-node-api.js";

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

@@ -6,10 +6,7 @@ import os from "node:os";
 import { spawn } from "@react-native-node-api/cli-utils";
 
 import { AppleTriplet } from "./triplets.js";
-import {
-  dereferenceDirectory,
-  determineLibraryBasename,
-} from "../path-utils.js";
+import { determineLibraryBasename } from "../path-utils.js";
 
 type AppleArchitecture = "arm64" | "x86_64" | "arm64;x86_64";
 
@@ -45,7 +42,6 @@ type XCframeworkOptions = {
   frameworkPaths: string[];
   outputPath: string;
   autoLink: boolean;
-  dereferenceFrameworkLinks: boolean;
 };
 
 export async function createAppleFramework(
@@ -101,7 +97,6 @@ export async function createXCframework({
   frameworkPaths,
   outputPath,
   autoLink,
-  dereferenceFrameworkLinks,
 }: XCframeworkOptions) {
   // Delete any existing xcframework to prevent the error:
   // - A library with the identifier 'macos-arm64' already exists.
@@ -126,17 +121,6 @@ export async function createXCframework({
       outputMode: "buffered",
     },
   );
-  if (dereferenceFrameworkLinks) {
-    // TODO: Loop over the framework directories and copy their content if they're links
-    for await (const entry of fs.promises.glob("**/*.framework", {
-      cwd: xcodeOutputPath,
-      withFileTypes: true,
-    })) {
-      if (entry.isSymbolicLink()) {
-        await dereferenceDirectory(path.join(entry.parentPath, entry.name));
-      }
-    }
-  }
   if (xcodeOutputPath !== outputPath) {
     // Rename the xcframework to the original output path
     await fs.promises.rename(xcodeOutputPath, outputPath);