@reactvision/react-native-visionos 0.86.2 → 0.86.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reactvision/react-native-visionos",
-  "version": "0.86.2",
+  "version": "0.86.3",
   "description": "React Native for visionOS",
   "license": "MIT",
   "repository": {

package/scripts/cocoapods/autolinking.rb

@@ -40,21 +40,7 @@ def list_native_modules!(config_command)
   packages = config["dependencies"]
   ios_project_root = Pathname.new(config["project"]["ios"]["sourceDir"])
   react_native_path = Pathname.new(config["reactNativePath"])
-  # Written next to the Podfile being installed, not next to `project.ios.sourceDir`.
-  #
-  # The CLI reports `project.ios.sourceDir` as the app's `ios/` folder for any app that has one,
-  # whatever platform this install is for. On an out-of-tree platform the Podfile lives elsewhere —
-  # `visionos/` — and React Native's codegen looks for this file under the directory it is building
-  # from. Writing it to `ios/` therefore left the visionOS build without it, and
-  # `findCodegenEnabledLibraries` fell back to scanning the app's package.json, where `react-native`
-  # and the visionOS fork both declare the same turbo modules. `pod install` then died with
-  # "declared in more than one libraries" for AccessibilityManager, Appearance, AppState,
-  # DeviceInfo, PlatformConstants and StatusBarManager.
-  #
-  # `ios_project_root` is deliberately left alone above: it is also used to make podspec paths
-  # relative, and those are correct as they stand because `ios/` and `visionos/` are siblings.
-  codegen_output_path = Pathname.new(Pod::Config.instance.installation_root.to_s)
-    .join("build/generated/autolinking/autolinking.json")
+  codegen_output_path = ios_project_root.join("build/generated/autolinking/autolinking.json")
 
   # Write autolinking react-native-config output to codegen folder
   FileUtils.mkdir_p(File.dirname(codegen_output_path))

package/scripts/codegen/generate-artifacts-executor/utils.js

@@ -239,8 +239,34 @@ function findExternalLibraries(
     'Searching for codegen-enabled libraries in the project dependencies.',
     true,
   );
+  // This package IS React Native. An out-of-tree platform requires it to be installed alongside
+  // upstream `react-native` — the app still builds iOS and Android from that one — and both declare
+  // the same turbo modules (AccessibilityManager, Appearance, AppState, DeviceInfo,
+  // PlatformConstants, StatusBarManager). Library identity below is the *package* name, so the two
+  // read as different libraries claiming the same modules and the conflict check rejects the pair,
+  // killing `pod install`.
+  //
+  // Upstream's copy is skipped: for this build, React Native is this package. Skipping the scan
+  // altogether would also silence the conflict, and was tried — it loses this package's own
+  // visionOS-only codegen library (FBReactNativeSpec_visionOS), and the build then fails much later
+  // on a missing generated header.
+  const selfPkgName = JSON.parse(
+    fs.readFileSync(
+      path.join(__dirname, '..', '..', '..', 'package.json'),
+      'utf8',
+    ),
+  ).name;
+  const skipUpstreamReactNative =
+    selfPkgName !== 'react-native' && dependencies['react-native'] != null;
+
   // Handle third-party libraries
   return Object.keys(dependencies).flatMap(dependency => {
+    if (skipUpstreamReactNative && dependency === 'react-native') {
+      codegenLog(
+        `Skipping upstream react-native: ${selfPkgName} is React Native for this build.`,
+      );
+      return [];
+    }
     let configFilePath = '';
     try {
       configFilePath = require.resolve(path.join(dependency, 'package.json'), {