react-native-tvos 0.76.0-0rc0 → 0.76.0-0rc2

package/ReactAndroid/src/main/java/com/facebook/react/runtime/BridgelessDevSupportManager.java

@@ -23,6 +23,8 @@ import com.facebook.react.devsupport.HMRClient;
 import com.facebook.react.devsupport.ReactInstanceDevHelper;
 import com.facebook.react.devsupport.interfaces.DevSplitBundleCallback;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.facebook.react.runtime.internal.bolts.Continuation;
+import com.facebook.react.runtime.internal.bolts.Task;
 
 /**
  * An implementation of {@link com.facebook.react.devsupport.interfaces.DevSupportManager} that
@@ -67,17 +69,20 @@ class BridgelessDevSupportManager extends DevSupportManagerBase {
             mReactHost
                 .loadBundle(bundleLoader)
                 .onSuccess(
-                    task -> {
-                      if (task.isCompleted()) {
-                        String bundleURL =
-                            getDevServerHelper().getDevServerSplitBundleURL(bundlePath);
-                        ReactContext reactContext = mReactHost.getCurrentReactContext();
-                        if (reactContext != null) {
-                          reactContext.getJSModule(HMRClient.class).registerBundle(bundleURL);
+                    new Continuation<Boolean, Void>() {
+                      @Override
+                      public Void then(Task<Boolean> task) {
+                        if (task.getResult().equals(Boolean.TRUE)) {
+                          String bundleURL =
+                              getDevServerHelper().getDevServerSplitBundleURL(bundlePath);
+                          ReactContext reactContext = mReactHost.getCurrentReactContext();
+                          if (reactContext != null) {
+                            reactContext.getJSModule(HMRClient.class).registerBundle(bundleURL);
+                          }
+                          callback.onSuccess();
                         }
-                        callback.onSuccess();
+                        return null;
                       }
-                      return null;
                     });
           }
 

package/ReactAndroid/src/main/java/com/facebook/react/runtime/ReactHostImpl.java

@@ -9,6 +9,8 @@ package com.facebook.react.runtime;
 
 import static com.facebook.infer.annotation.Assertions.assertNotNull;
 import static com.facebook.infer.annotation.ThreadConfined.UI;
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
 
 import android.app.Activity;
 import android.content.Context;
@@ -250,12 +252,13 @@ public class ReactHostImpl implements ReactHost {
 
     detachSurface(surface);
     return callWithExistingReactInstance(
-        method,
-        reactInstance -> {
-          log(method, "Execute");
-          reactInstance.stopSurface(surface);
-        },
-        mBGExecutor);
+            method,
+            reactInstance -> {
+              log(method, "Execute");
+              reactInstance.stopSurface(surface);
+            },
+            mBGExecutor)
+        .makeVoid();
   }
 
   /**
@@ -776,7 +779,7 @@ public class ReactHostImpl implements ReactHost {
     };
   }
 
-  /* package */ Task<Void> loadBundle(final JSBundleLoader bundleLoader) {
+  /* package */ Task<Boolean> loadBundle(final JSBundleLoader bundleLoader) {
     final String method = "loadBundle()";
     log(method, "Schedule");
 
@@ -789,7 +792,7 @@ public class ReactHostImpl implements ReactHost {
         null);
   }
 
-  /* package */ Task<Void> registerSegment(
+  /* package */ Task<Boolean> registerSegment(
       final int segmentId, final String path, final Callback callback) {
     final String method =
         "registerSegment(segmentId = \"" + segmentId + "\", path = \"" + path + "\")";
@@ -825,7 +828,7 @@ public class ReactHostImpl implements ReactHost {
    * @param args Arguments to be passed to the function
    * @return A Task that will complete when the function call has been enqueued on the JS thread.
    */
-  /* package */ Task<Void> callFunctionOnModule(
+  /* package */ Task<Boolean> callFunctionOnModule(
       final String moduleName, final String methodName, final NativeArray args) {
     final String method = "callFunctionOnModule(\"" + moduleName + "\", \"" + methodName + "\")";
     return callWithExistingReactInstance(
@@ -947,9 +950,9 @@ public class ReactHostImpl implements ReactHost {
   }
 
   /** Schedule work on a ReactInstance that is already created. */
-  private Task<Void> callWithExistingReactInstance(
+  private Task<Boolean> callWithExistingReactInstance(
       final String callingMethod,
-      final ReactInstanceCalback callback,
+      final ReactInstanceCalback continuation,
       @Nullable Executor executor) {
     final String method = "callWithExistingReactInstance(" + callingMethod + ")";
 
@@ -959,18 +962,19 @@ public class ReactHostImpl implements ReactHost {
 
     return mCreateReactInstanceTaskRef
         .get()
-        .continueWith(
+        .onSuccess(
             task -> {
               final ReactInstance reactInstance =
                   ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()
                       ? task.getResult()
                       : mReactInstance;
-              if (reactInstance == null || task.isFaulted()) {
+              if (reactInstance == null) {
                 raiseSoftException(method, "Execute: reactInstance is null. Dropping work.");
-              } else {
-                callback.then(reactInstance);
+                return FALSE;
               }
-              return null;
+
+              continuation.then(reactInstance);
+              return TRUE;
             },
             executor);
   }
@@ -978,7 +982,7 @@ public class ReactHostImpl implements ReactHost {
   /** Create a ReactInstance if it doesn't exist already, and schedule work on it. */
   private Task<Void> callAfterGetOrCreateReactInstance(
       final String callingMethod,
-      final ReactInstanceCalback callback,
+      final ReactInstanceCalback runnable,
       @Nullable Executor executor) {
     final String method = "callAfterGetOrCreateReactInstance(" + callingMethod + ")";
 
@@ -987,17 +991,18 @@ public class ReactHostImpl implements ReactHost {
     }
 
     return getOrCreateReactInstance()
-        .continueWith(
+        .onSuccess(
             task -> {
               final ReactInstance reactInstance =
                   ReactNativeFeatureFlags.completeReactInstanceCreationOnBgThreadOnAndroid()
                       ? task.getResult()
                       : mReactInstance;
-              if (reactInstance == null || task.isFaulted()) {
+              if (reactInstance == null) {
                 raiseSoftException(method, "Execute: reactInstance is null. Dropping work.");
-              } else {
-                callback.then(reactInstance);
+                return null;
               }
+
+              runnable.then(reactInstance);
               return null;
             },
             executor)

package/{sdks/ossonly-soloader/src/main/java/com/facebook/soloader/MergedSoMapping.kt → ReactAndroid/src/main/java/com/facebook/react/soloader/OpenSourceMergedSoMapping.kt}

@@ -5,7 +5,9 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-package com.facebook.soloader
+package com.facebook.react.soloader
+
+import com.facebook.soloader.ExternalSoMapping
 
 /**
  * This class is a manually created MergedSoMapping.
@@ -16,9 +18,9 @@ package com.facebook.soloader
  * entry in the [invokeJniOnload] method, the [mapLibName] method as well as a new external function
  * that will take care of calling the JNI_OnLoad method.
  */
-public object MergedSoMapping {
+public object OpenSourceMergedSoMapping : ExternalSoMapping {
 
-  public fun mapLibName(input: String): String =
+  override public fun mapLibName(input: String): String =
       when (input) {
         "fabricjni",
         "jsinspector",
@@ -47,7 +49,7 @@ public object MergedSoMapping {
         else -> input
       }
 
-  public fun invokeJniOnload(libraryName: String): Unit {
+  override public fun invokeJniOnload(libraryName: String): Unit {
     when (libraryName) {
       "fabricjni" -> libfabricjni_so()
       "hermes_executor" -> libhermes_executor_so()

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewProps.kt

@@ -136,8 +136,8 @@ public object ViewProps {
   public const val BORDER_START_COLOR: String = "borderStartColor"
   public const val BORDER_END_COLOR: String = "borderEndColor"
   public const val ON_LAYOUT: String = "onLayout"
-  public const val BOX_SHADOW: String = "experimental_boxShadow"
-  public const val FILTER: String = "experimental_filter"
+  public const val BOX_SHADOW: String = "boxShadow"
+  public const val FILTER: String = "filter"
   public const val MIX_BLEND_MODE: String = "experimental_mixBlendMode"
   public const val TRANSFORM: String = "transform"
   public const val TRANSFORM_ORIGIN: String = "transformOrigin"

package/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewManager.java

@@ -7,6 +7,8 @@
 
 package com.facebook.react.views.view;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.Rect;
 import android.util.Log;
 import android.view.View;
@@ -94,6 +96,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
   @ReactProp(name = "accessible")
   public void setAccessible(ReactViewGroup view, boolean accessible) {
     view.setFocusable(accessible);
+    // This is required to handle Android TV/ Fire TV Devices that are Touch Enabled as well as LeanBack
+    // https://developer.android.com/reference/android/view/View#requestFocus(int,%20android.graphics.Rect)
+    // ** A view will not actually take focus if it is not focusable (isFocusable() returns false), **
+    // ** or if it is focusable and it is not focusable in touch mode (isFocusableInTouchMode()) **
+    // ** while the device is in touch mode.  **
+    if (hasTouchScreen(view.getContext())) {
+      view.setFocusableInTouchMode(accessible);
+    }
   }
 
   @ReactProp(name = "hasTVPreferredFocus")
@@ -498,6 +508,14 @@ public class ReactViewManager extends ReactClippingViewManager<ReactViewGroup> {
     }
     root.setFocusDestinations(fd);
   }
+  
+  /**
+   * Utility function to help capture Android TV/ Fire TV Devices with Touch Support
+   */
+  private boolean hasTouchScreen(Context context) {
+    PackageManager pm = context.getPackageManager();
+    return pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN);
+  }
 
   @ReactProp(name = "autoFocus")
   public void setAutoFocusTV(ReactViewGroup view, boolean autoFocus) {

package/ReactAndroid/src/main/jni/first-party/jni-lib-merge/jni_lib_merge.c

@@ -24,7 +24,8 @@
 
 // Class with mapping that will be generated by buck or manually edited by
 // users.
-static const char* invoke_class_name = "com/facebook/soloader/MergedSoMapping";
+static const char* invoke_class_name =
+    "com/facebook/react/soloader/OpenSourceMergedSoMapping";
 
 // Stub pre-merged library to ensure that our custom section gets created
 // when we merge a group of native libraries with no JNI_OnLoad. We don't

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 76;
   int32_t Patch = 0;
-  std::string_view Prerelease = "0rc0";
+  std::string_view Prerelease = "0rc2";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/BaseViewProps.cpp

@@ -229,7 +229,7 @@ BaseViewProps::BaseViewProps(
                                                  : convertRawProp(
                                                        context,
                                                        rawProps,
-                                                       "experimental_boxShadow",
+                                                       "boxShadow",
                                                        sourceProps.boxShadow,
                                                        {})),
       filter(
@@ -237,7 +237,7 @@ BaseViewProps::BaseViewProps(
                                                  : convertRawProp(
                                                        context,
                                                        rawProps,
-                                                       "experimental_filter",
+                                                       "filter",
                                                        sourceProps.filter,
                                                        {})),
       backgroundImage(
@@ -420,8 +420,8 @@ void BaseViewProps::setProp(
     RAW_SET_PROP_SWITCH_CASE_BASIC(removeClippedSubviews);
     RAW_SET_PROP_SWITCH_CASE_BASIC(experimental_layoutConformance);
     RAW_SET_PROP_SWITCH_CASE_BASIC(cursor);
-    RAW_SET_PROP_SWITCH_CASE(filter, "experimental_filter");
-    RAW_SET_PROP_SWITCH_CASE(boxShadow, "experimental_boxShadow");
+    RAW_SET_PROP_SWITCH_CASE(filter, "filter");
+    RAW_SET_PROP_SWITCH_CASE(boxShadow, "boxShadow");
 #if TARGET_OS_TV
       RAW_SET_PROP_SWITCH_CASE_BASIC(isTVSelectable);
       RAW_SET_PROP_SWITCH_CASE_BASIC(hasTVPreferredFocus);

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHermesInstance.h

@@ -22,6 +22,9 @@ using CrashManagerProvider =
 class RCTHermesInstance : public JSRuntimeFactory {
  public:
   RCTHermesInstance();
+  RCTHermesInstance(
+      std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
+      CrashManagerProvider crashManagerProvider);
   RCTHermesInstance(
       std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
       CrashManagerProvider crashManagerProvider,

package/ReactCommon/react/runtime/platform/ios/ReactCommon/RCTHermesInstance.mm

@@ -11,6 +11,13 @@ namespace facebook::react {
 
 RCTHermesInstance::RCTHermesInstance() : RCTHermesInstance(nullptr, nullptr, false) {}
 
+RCTHermesInstance::RCTHermesInstance(
+    std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
+    CrashManagerProvider crashManagerProvider)
+    : RCTHermesInstance(reactNativeConfig, std::move(crashManagerProvider), false)
+{
+}
+
 RCTHermesInstance::RCTHermesInstance(
     std::shared_ptr<const ReactNativeConfig> reactNativeConfig,
     CrashManagerProvider crashManagerProvider,

package/cli.js

@@ -109,7 +109,7 @@ function warnWithDeprecationSchedule() {
 ${chalk.yellow('⚠️')} The \`init\` command is deprecated.
 The behavior will be changed on ${chalk.white.bold(CLI_DEPRECATION_DATE.toLocaleDateString())} ${emphasis(`(${daysRemaining} day${daysRemaining > 1 ? 's' : ''})`)}.
 
-- Switch to ${chalk.dim('npx @react-native-community/cli init')} for the identical behavior.
+- Switch to ${chalk.grey.bold('npx @react-native-community/cli init')} for the identical behavior.
 - Refer to the documentation for information about alternative tools: ${chalk.dim('https://reactnative.dev/docs/getting-started')}`);
 }
 
@@ -117,11 +117,10 @@ function warnWithDeprecated() {
   if (!isInitCommand) {
     return;
   }
-
   console.warn(`
 🚨️ The \`init\` command is deprecated.
 
-- Switch to ${chalk.dim('npx @react-native-community/cli init')} for the identical behavior.
+- Switch to ${chalk.grey.bold('npx @react-native-community/cli init')} for the identical behavior.
 - Refer to the documentation for information about alternative tools: ${chalk.dim('https://reactnative.dev/docs/getting-started')}`);
 }
 
@@ -174,7 +173,7 @@ async function main() {
 
   const isDeprecated =
     CLI_DEPRECATION_DATE.getTime() <= new Date().getTime() ||
-    currentVersion.startsWith('0.76');
+    currentVersion.startsWith('0.77');
 
   /**
    * This command is now deprecated. We will continue to proxy commands to @react-native-community/cli, but it
@@ -191,8 +190,13 @@ async function main() {
       warnWithDeprecated();
       // We only exit if the user calls `init` and it's deprecated. All other cases should proxy to to @react-native-community/cli.
       // Be careful with this as it can break a lot of users.
+      console.warn(`${chalk.green('Exiting...')}`);
       process.exit(1);
-    } else if (currentVersion.startsWith('0.75')) {
+    } else if (
+      currentVersion.startsWith('0.75') ||
+      currentVersion.startsWith('0.76')
+    ) {
+      // We check deprecation schedule only for 0.75 and 0.76 and 0.77 is expected to land in Jan 2025.
       warnWithDeprecationSchedule();
     }
     warnWhenRunningInit();

package/gradle/libs.versions.toml

@@ -29,6 +29,7 @@ nexus-publish = "1.3.0"
 okhttp = "4.9.2"
 okio = "2.9.0"
 robolectric = "4.9.2"
+soloader = "0.12.1"
 xstream = "1.4.20"
 yoga-proguard-annotations = "1.19.0"
 # Native Dependencies
@@ -55,6 +56,7 @@ fresco-middleware = { module = "com.facebook.fresco:middleware", version.ref = "
 fresco-imagepipeline-okhttp3 = { module = "com.facebook.fresco:imagepipeline-okhttp3", version.ref = "fresco" }
 fresco-ui-common = { module = "com.facebook.fresco:ui-common", version.ref = "fresco" }
 infer-annotation = { module = "com.facebook.infer.annotation:infer-annotation", version.ref = "infer-annotation" }
+soloader = { module = "com.facebook.soloader:soloader", version.ref = "soloader" }
 yoga-proguard-annotations = { module = "com.facebook.yoga:proguard-annotations", version.ref = "yoga-proguard-annotations" }
 
 jsr305 = { module = "com.google.code.findbugs:jsr305", version.ref = "jsr305" }

package/jest-preset.js

@@ -15,7 +15,11 @@ module.exports = {
     platforms: ['android', 'ios', 'native'],
   },
   transform: {
-    '^.+\\.(js|ts|tsx)$': 'babel-jest',
+    '^.+\\.(js)$': [
+      'babel-jest',
+      {plugins: ['babel-plugin-syntax-hermes-parser']},
+    ],
+    '^.+\\.(ts|tsx)$': 'babel-jest',
     '^.+\\.(bmp|gif|jpg|jpeg|mp4|png|psd|svg|webp)$': require.resolve(
       './jest/assetFileTransformer.js',
     ),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.76.0-0rc0",
+  "version": "0.76.0-0rc2",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -83,7 +83,6 @@
     "scripts/react-native-xcode.sh",
     "sdks/.hermesversion",
     "sdks/hermes-engine",
-    "sdks/ossonly-soloader",
     "sdks/hermesc",
     "settings.gradle.kts",
     "src",
@@ -111,16 +110,18 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.76.0-rc.0",
-    "@react-native/codegen": "0.76.0-rc.0",
-    "@react-native/community-cli-plugin": "0.76.0-rc.0",
-    "@react-native/gradle-plugin": "0.76.0-rc.0",
-    "@react-native/js-polyfills": "0.76.0-rc.0",
-    "@react-native/normalize-colors": "0.76.0-rc.0",
-    "@react-native-tvos/virtualized-lists": "0.76.0-0rc0",
+    "@react-native/assets-registry": "0.76.0-rc.2",
+    "@react-native/codegen": "0.76.0-rc.2",
+    "@react-native/community-cli-plugin": "0.76.0-rc.2",
+    "@react-native/gradle-plugin": "0.76.0-rc.2",
+    "@react-native/js-polyfills": "0.76.0-rc.2",
+    "@react-native/normalize-colors": "0.76.0-rc.2",
+    "@react-native-tvos/virtualized-lists": "0.76.0-0rc2",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
+    "babel-jest": "^29.7.0",
+    "babel-plugin-syntax-hermes-parser": "^0.23.1",
     "base64-js": "^1.5.1",
     "chalk": "^4.0.0",
     "commander": "^12.0.0",
@@ -131,8 +132,8 @@
     "jest-environment-node": "^29.6.3",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.80.10",
-    "metro-source-map": "^0.80.10",
+    "metro-runtime": "^0.81.0-alpha.0",
+    "metro-source-map": "^0.81.0-alpha.0",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",

package/scripts/cocoapods/privacy_manifest_utils.rb

@@ -67,14 +67,29 @@ module PrivacyManifestUtils
     end
 
     def self.ensure_reference(file_path, user_project, target)
-        reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref&.path&.end_with? "PrivacyInfo.xcprivacy" }
-        unless reference_exists
-            # We try to find the main group, but if it doesn't exist, we default to adding the file to the project root – both work
-            file_root = user_project.root_object.main_group.children.find { |group|
-                group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name)
-            } || user_project
-            file_ref = file_root.new_file(file_path)
-            build_file = target.resources_build_phase.add_file_reference(file_ref, true)
+        privacy_info_filename = File.basename(file_path)
+
+        # Check if the file is already in the PBXBuildFile section
+        build_phase_reference_exists = target.resources_build_phase.files_references.any? { |file_ref| file_ref&.path&.end_with?(privacy_info_filename) }
+
+        unless build_phase_reference_exists
+            # Check if the file is already in the PBXFileReference section
+            existing_file_reference = user_project.files.find { |file| file.path&.end_with?(privacy_info_filename) }
+
+            if existing_file_reference
+                # If the file reference exists, add it to the build phase
+                target.resources_build_phase.add_file_reference(existing_file_reference, true)
+            else
+                # If the file reference doesn't exist, add it to the project and the build phase
+                # We try to find the main group, but if it doesn't exist, we default to adding the file to the project root - both work
+                file_root = user_project.root_object.main_group.children.find { |group|
+                    group.class == Xcodeproj::Project::Object::PBXGroup && (group.name == target.name || group.path == target.name)
+                } || user_project
+                puts "file_root: #{file_root}"
+
+                file_ref = file_root.new_file(file_path)
+                target.resources_build_phase.add_file_reference(file_ref, true)
+            end
         end
     end
 

package/scripts/cocoapods/utils.rb

@@ -700,10 +700,18 @@ class ReactNativePodsUtils
             map[field] = "$(inherited)" + flag
         else
             unless map[field].include?(flag)
-                map[field] = map[field] + flag
+                if map[field].instance_of? String
+                    map[field] = map[field] + flag
+                elsif map[field].instance_of? Array
+                    map[field].push(flag)
+                end
             end
             unless map[field].include?("$(inherited)")
-                map[field] = "$(inherited) " + map[field]
+                if map[field].instance_of? String
+                    map[field] = "$(inherited) " + map[field]
+                elsif map[field].instance_of? Array
+                    map[field].unshift("$(inherited)")
+                end
             end
         end
     end

package/scripts/react-native-xcode.sh

@@ -92,6 +92,8 @@ fi
 
 [ -z "$CLI_PATH" ] && CLI_PATH="$REACT_NATIVE_DIR/scripts/bundle.js"
 
+[ -z "$BUNDLE_COMMAND" ] && BUNDLE_COMMAND="bundle"
+
 [ -z "$COMPOSE_SOURCEMAP_PATH" ] && COMPOSE_SOURCEMAP_PATH="$REACT_NATIVE_DIR/scripts/compose-source-maps.js"
 
 if [[ -z "$BUNDLE_CONFIG" ]]; then

package/sdks/hermes-engine/hermes-engine.podspec

@@ -8,7 +8,7 @@ require_relative "./hermes-utils.rb"
 
 react_native_path = File.dirname(Pod::Executable.execute_command('node', ['-p',
   'require.resolve(
-  "react-native-tvos",
+  "react-native",
     {paths: [process.argv[1]]},
   )', __dir__]).strip
 )

package/sdks/hermes-engine/utils/build-apple-framework.sh

@@ -224,19 +224,7 @@ function create_universal_framework {
   for i in "${!platforms[@]}"; do
     local platform="${platforms[$i]}"
     local hermes_framework_path="${platform}/hermes.framework"
-    local dSYM_path="$hermes_framework_path"
-    local dSYM_base_path="$HERMES_PATH/destroot/Library/Frameworks"
-
-    # If the dSYM rename has failed, the dSYM are generated as 0.dSYM
-    # (Apple default name) rather then hermes.framework.dSYM.
-    if [[ -e "$dSYM_base_path/${platform}/0.dSYM" ]]; then
-      dSYM_path="${platform}/0"
-    fi
-
     args+="-framework $hermes_framework_path "
-
-    # Path to dSYM must be absolute
-    args+="-debug-symbols $dSYM_base_path/$dSYM_path.dSYM "
   done
 
   mkdir -p universal

package/sdks/hermes-engine/utils/build-ios-framework.sh

@@ -52,10 +52,24 @@ function build_framework {
   fi
 }
 
+# Allows RNTV CI to optionally build Vision OS framework
+function set_include_vision {
+    if [[ "$INCLUDE_VISION_OS" == "0" || "$INCLUDE_VISION_OS" == "false" || "$INCLUDE_VISION_OS" == "FALSE" ]]; then
+        include_vision=0
+    else
+        include_vision=1
+    fi
+}
+
 # group the frameworks together to create a universal framework
 function build_universal_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-        create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
+        set_include_vision
+        if [[ $include_vision == 1 ]]; then
+            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
+        else
+            create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "appletvos" "appletvsimulator"
+        fi
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -65,14 +79,17 @@ function build_universal_framework {
 # this is used to preserve backward compatibility
 function create_framework {
     if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
+        set_include_vision
+
         build_framework "iphoneos"
         build_framework "iphonesimulator"
         build_framework "appletvos"
         build_framework "appletvsimulator"
         build_framework "catalyst"
-        build_framework "xros"
-        build_framework "xrsimulator"
-
+        if [[ $include_vision == 1 ]]; then
+            build_framework "xros"
+            build_framework "xrsimulator"
+        fi
         build_universal_framework
     else
         echo "Skipping; Clean \"destroot\" to rebuild".

package/src/private/components/SafeAreaView_INTERNAL_DO_NOT_USE.js

@@ -13,15 +13,17 @@ import type {ViewProps} from '../../../Libraries/Components/View/ViewPropTypes';
 import Platform from '../../../Libraries/Utilities/Platform';
 import View from '../../../Libraries/Components/View/View';
 import * as React from 'react';
-export * from '../../../src/private/specs/components/RCTSafeAreaViewNativeComponent';
-import RCTSafeAreaViewNativeComponent from '../../../src/private/specs/components/RCTSafeAreaViewNativeComponent';
 
-let exported: React.AbstractComponent<ViewProps, React.ElementRef<typeof View>>;
-
-if (Platform.OS === 'android' || Platform.OS === 'ios') {
-  exported = RCTSafeAreaViewNativeComponent;
-} else {
-  exported = View;
-}
+const exported: React.AbstractComponent<
+  ViewProps,
+  React.ElementRef<typeof View>,
+> = Platform.select({
+  ios: require('../../../src/private/specs/components/RCTSafeAreaViewNativeComponent')
+    .default,
+  android:
+    require('../../../src/private/specs/components/RCTSafeAreaViewNativeComponent')
+      .default,
+  default: View,
+});
 
 export default exported;