react-native-tvos 0.73.7-1 → 0.74.0-0

package/scripts/react_native_pods.rb

@@ -9,7 +9,6 @@ require 'pathname'
 require_relative './cocoapods/FlipperConfiguration.rb'
 require_relative './react_native_pods_utils/script_phases.rb'
 require_relative './cocoapods/jsengine.rb'
-require_relative './cocoapods/flipper.rb'
 require_relative './cocoapods/fabric.rb'
 require_relative './cocoapods/codegen.rb'
 require_relative './cocoapods/codegen_utils.rb'
@@ -22,7 +21,6 @@ require_relative './cocoapods/helpers.rb'
 $CODEGEN_OUTPUT_DIR = 'build/generated/ios'
 $CODEGEN_COMPONENT_DIR = 'react/renderer/components'
 $CODEGEN_MODULE_DIR = '.'
-$FOLLY_VERSION = '2022.05.16.00'
 
 $START_TIME = Time.now.to_i
 
@@ -67,39 +65,37 @@ end
 # - new_arch_enabled: whether the new architecture should be enabled or not.
 # - :production [DEPRECATED] whether the dependencies must be installed to target a Debug or a Release build.
 # - hermes_enabled: whether Hermes should be enabled or not.
-# - flipper_configuration: The configuration to use for flipper.
 # - app_path: path to the React Native app. Required by the New Architecture.
 # - config_file_dir: directory of the `package.json` file, required by the New Architecture.
-# - ios_folder: the folder where the iOS code base lives. For a template app, it is `ios`, the default. For RNTester, it is `.`.
 def use_react_native! (
   path: "../node_modules/react-native",
   fabric_enabled: false,
   new_arch_enabled: NewArchitectureHelper.new_arch_enabled,
   production: false, # deprecated
   hermes_enabled: ENV['USE_HERMES'] && ENV['USE_HERMES'] == '0' ? false : true,
-  flipper_configuration: FlipperConfiguration.disabled,
   app_path: '..',
-  config_file_dir: '',
-  ios_folder: 'ios'
+  config_file_dir: ''
 )
 
   # Set the app_path as env variable so the podspecs can access it.
   ENV['APP_PATH'] = app_path
   ENV['REACT_NATIVE_PATH'] = path
 
+  ReactNativePodsUtils.check_minimum_required_xcode()
+
   # Current target definition is provided by Cocoapods and it refers to the target
   # that has invoked the `use_react_native!` function.
   ReactNativePodsUtils.detect_use_frameworks(current_target_definition)
 
-  CodegenUtils.clean_up_build_folder(path, app_path, ios_folder, $CODEGEN_OUTPUT_DIR)
+  CodegenUtils.clean_up_build_folder(path, $CODEGEN_OUTPUT_DIR)
 
   # We are relying on this flag also in third parties libraries to proper install dependencies.
   # Better to rely and enable this environment flag if the new architecture is turned on using flags.
   relative_path_from_current = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
   react_native_version = NewArchitectureHelper.extract_react_native_version(File.join(relative_path_from_current, path))
   ENV['RCT_NEW_ARCH_ENABLED'] = NewArchitectureHelper.compute_new_arch_enabled(new_arch_enabled, react_native_version)
-
   fabric_enabled = fabric_enabled || NewArchitectureHelper.new_arch_enabled
+
   ENV['RCT_FABRIC_ENABLED'] = fabric_enabled ? "1" : "0"
   ENV['USE_HERMES'] = hermes_enabled ? "1" : "0"
 
@@ -107,10 +103,11 @@ def use_react_native! (
 
   ReactNativePodsUtils.warn_if_not_on_arm64()
 
+  build_codegen!(prefix, relative_path_from_current)
+
   # The Pods which should be included in all projects
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec" if !NewArchitectureHelper.new_arch_enabled
-  pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
+  pod 'RCTRequired', :path => "#{prefix}/Libraries/Required"
   pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety", :modular_headers => true
   pod 'React', :path => "#{prefix}/"
   pod 'React-Core', :path => "#{prefix}/"
@@ -133,9 +130,11 @@ def use_react_native! (
   pod 'React-cxxreact', :path => "#{prefix}/ReactCommon/cxxreact"
   pod 'React-debug', :path => "#{prefix}/ReactCommon/react/debug"
   pod 'React-utils', :path => "#{prefix}/ReactCommon/react/utils"
+  pod 'React-featureflags', :path => "#{prefix}/ReactCommon/react/featureflags"
   pod 'React-Mapbuffer', :path => "#{prefix}/ReactCommon"
   pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
-  pod "React-nativeconfig", :path => "#{prefix}/ReactCommon"
+  pod 'React-nativeconfig', :path => "#{prefix}/ReactCommon"
+  pod 'RCTDeprecation', :path => "#{prefix}/ReactApple/Libraries/RCTFoundation/RCTDeprecation"
 
   if hermes_enabled
     setup_hermes!(:react_native_path => prefix)
@@ -159,9 +158,11 @@ def use_react_native! (
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
   pod 'glog', :podspec => "#{prefix}/third-party-podspecs/glog.podspec"
   pod 'boost', :podspec => "#{prefix}/third-party-podspecs/boost.podspec"
+  pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
   pod 'RCT-Folly', :podspec => "#{prefix}/third-party-podspecs/RCT-Folly.podspec", :modular_headers => true
   pod 'fmt', :podspec => "#{prefix}/third-party-podspecs/fmt.podspec"
 
+  folly_config = get_folly_config()
   run_codegen!(
     app_path,
     config_file_dir,
@@ -172,7 +173,7 @@ def use_react_native! (
     :hermes_enabled => hermes_enabled,
     :codegen_output_dir => $CODEGEN_OUTPUT_DIR,
     :package_json_file => File.join(__dir__, "..", "package.json"),
-    :folly_version => $FOLLY_VERSION
+    :folly_version => folly_config[:version]
   )
 
   pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
@@ -181,22 +182,7 @@ def use_react_native! (
   # If the New Arch is turned off, we will use the Old Renderer, though.
   # RNTester always installed Fabric, this change is required to make the template work.
   setup_fabric!(:react_native_path => prefix)
-  checkAndGenerateEmptyThirdPartyProvider!(prefix, NewArchitectureHelper.new_arch_enabled)
-
-  if !fabric_enabled
-    relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
-    build_codegen!(prefix, relative_installation_root)
-  end
-
-  if NewArchitectureHelper.new_arch_enabled
-    setup_bridgeless!(:react_native_path => prefix, :use_hermes => hermes_enabled)
-  end
-
-  # Flipper now build in Release mode but it is not linked to the Release binary (as specified by the Configuration option)
-  if flipper_configuration.flipper_enabled
-    install_flipper_dependencies(prefix)
-    use_flipper_pods(flipper_configuration.versions, :configurations => flipper_configuration.configurations)
-  end
+  setup_bridgeless!(:react_native_path => prefix, :use_hermes => hermes_enabled)
 
   pods_to_update = LocalPodspecPatch.pods_to_update(:react_native_path => prefix)
   if !pods_to_update.empty?
@@ -257,7 +243,8 @@ end
 # - spec: The spec that has to be configured with the New Architecture code
 # - new_arch_enabled: Whether the module should install dependencies for the new architecture
 def install_modules_dependencies(spec, new_arch_enabled: NewArchitectureHelper.new_arch_enabled)
-  NewArchitectureHelper.install_modules_dependencies(spec, new_arch_enabled, $FOLLY_VERSION)
+  folly_config = get_folly_config()
+  NewArchitectureHelper.install_modules_dependencies(spec, new_arch_enabled, folly_config[:version])
 end
 
 # It returns the default flags.
@@ -268,14 +255,13 @@ def get_default_flags()
   return ReactNativePodsUtils.get_default_flags()
 end
 
-# It installs the flipper dependencies into the project.
-#
-# Parameters
-# - versions: a dictionary of Flipper Library -> Versions that can be used to customize which version of Flipper to install.
-# - configurations: an array of configuration where to install the dependencies.
-def use_flipper!(versions = {}, configurations: ['Debug'])
-  Pod::UI.warn "use_flipper is deprecated, use the flipper_configuration option in the use_react_native function"
-  use_flipper_pods(versions, :configurations => configurations)
+# This method returns an hash with the folly version and the folli compiler flags
+# that can be used to configure libraries.
+# In this way, we can update those values in react native, and all the libraries will benefit
+# from it.
+# @return an hash with the `:version` and `:compiler_flags` fields.
+def get_folly_config()
+  return Helpers::Constants.folly_config
 end
 
 # Function that executes after React Native has been installed to configure some flags and build settings.
@@ -288,32 +274,29 @@ end
 def react_native_post_install(
   installer,
   react_native_path = "../node_modules/react-native",
-  mac_catalyst_enabled: false
+  mac_catalyst_enabled: false,
+  ccache_enabled: ENV['USE_CCACHE'] == '1'
 )
   ReactNativePodsUtils.turn_off_resource_bundle_react_core(installer)
 
   ReactNativePodsUtils.apply_mac_catalyst_patches(installer) if mac_catalyst_enabled
 
-  if ReactNativePodsUtils.has_pod(installer, 'Flipper')
-    flipper_post_install(installer)
-  end
-
   fabric_enabled = ENV['RCT_FABRIC_ENABLED'] == '1'
   hermes_enabled = ENV['USE_HERMES'] == '1'
 
   if hermes_enabled
     ReactNativePodsUtils.set_gcc_preprocessor_definition_for_React_hermes(installer)
-    ReactNativePodsUtils.exclude_i386_architecture_while_using_hermes(installer)
   end
 
   ReactNativePodsUtils.fix_library_search_paths(installer)
   ReactNativePodsUtils.update_search_paths(installer)
   ReactNativePodsUtils.set_use_hermes_build_setting(installer, hermes_enabled)
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
-  ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: fabric_enabled)
-  ReactNativePodsUtils.apply_xcode_15_patch(installer)
+  ReactNativePodsUtils.set_ccache_compiler_and_linker_build_settings(installer, react_native_path, ccache_enabled)
+  ReactNativePodsUtils.apply_xcode_15_patch(installer) 
   ReactNativePodsUtils.updateOSDeploymentTarget(installer)
-  ReactNativePodsUtils.fix_flipper_for_xcode_15_3(installer)
+  ReactNativePodsUtils.set_dynamic_frameworks_flags(installer)
+  ReactNativePodsUtils.add_ndebug_flag_to_pods_in_release(installer)
   ReactNativePodsUtils.add_privacy_manifest_if_needed(installer)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
@@ -322,104 +305,3 @@ def react_native_post_install(
 
   Pod::UI.puts "Pod install took #{Time.now.to_i - $START_TIME} [s] to run".green
 end
-
-# === LEGACY METHOD ===
-# We need to keep this while we continue to support the old architecture.
-# =====================
-def use_react_native_codegen!(spec, options={})
-  return if NewArchitectureHelper.new_arch_enabled
-  # TODO: Once the new codegen approach is ready for use, we should output a warning here to let folks know to migrate.
-
-  # The prefix to react-native
-  react_native_path = options[:react_native_path] ||= ".."
-
-  # Library name (e.g. FBReactNativeSpec)
-  library_name = options[:library_name] ||= "#{spec.name.gsub('_','-').split('-').collect(&:capitalize).join}Spec"
-  Pod::UI.puts "[Codegen] Found #{library_name}"
-
-  relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
-  output_dir = options[:output_dir] ||= $CODEGEN_OUTPUT_DIR
-  output_dir_module = "#{output_dir}/#{$CODEGEN_MODULE_DIR}"
-  output_dir_component = "#{output_dir}/#{$CODEGEN_COMPONENT_DIR}"
-
-  codegen_config = {
-    "modules" => {
-      :js_srcs_pattern => "Native*.js",
-      :generated_dir => "#{relative_installation_root}/#{output_dir_module}/#{library_name}",
-      :generated_files => [
-        "#{library_name}.h",
-        "#{library_name}-generated.mm"
-      ]
-    },
-    "components" => {
-      :js_srcs_pattern => "*NativeComponent.js",
-      :generated_dir => "#{relative_installation_root}/#{output_dir_component}/#{library_name}",
-      :generated_files => [
-        "ComponentDescriptors.h",
-        "EventEmitters.cpp",
-        "EventEmitters.h",
-        "Props.cpp",
-        "Props.h",
-        "States.cpp",
-        "States.h",
-        "RCTComponentViewHelpers.h",
-        "ShadowNodes.cpp",
-        "ShadowNodes.h"
-      ]
-    }
-  }
-
-  # The path to JavaScript files
-  js_srcs_dir = options[:js_srcs_dir] ||= "./"
-  library_type = options[:library_type]
-
-  if library_type
-    if !codegen_config[library_type]
-      raise "[Codegen] invalid library_type: #{library_type}. Check your podspec to make sure it's set to 'modules' or 'components'. Removing the option will generate files for both"
-    end
-    js_srcs_pattern = codegen_config[library_type][:js_srcs_pattern]
-  end
-
-  if library_type
-    generated_dirs = [ codegen_config[library_type][:generated_dir] ]
-    generated_files = codegen_config[library_type][:generated_files].map { |filename| "#{codegen_config[library_type][:generated_dir]}/#{filename}" }
-  else
-    generated_dirs = [ codegen_config["modules"][:generated_dir], codegen_config["components"][:generated_dir] ]
-    generated_files = codegen_config["modules"][:generated_files].map { |filename| "#{codegen_config["modules"][:generated_dir]}/#{filename}" }
-    generated_files = generated_files.concat(codegen_config["components"][:generated_files].map { |filename| "#{codegen_config["components"][:generated_dir]}/#{filename}" })
-  end
-
-  if js_srcs_pattern
-    file_list = `find #{js_srcs_dir} -type f -name #{js_srcs_pattern}`.split("\n").sort
-    input_files = file_list.map { |filename| "${PODS_TARGET_SRCROOT}/#{filename}" }
-  else
-    input_files = [ js_srcs_dir ]
-  end
-
-  # Prepare filesystem by creating empty files that will be picked up as references by CocoaPods.
-  prepare_command = "mkdir -p #{generated_dirs.join(" ")} && touch -a #{generated_files.join(" ")}"
-  system(prepare_command) # Always run prepare_command when a podspec uses the codegen, as CocoaPods may skip invoking this command in certain scenarios. Replace with pre_integrate_hook after updating to CocoaPods 1.11
-  spec.prepare_command = prepare_command
-
-  env_files = ["$PODS_ROOT/../.xcode.env.local", "$PODS_ROOT/../.xcode.env"]
-
-  spec.script_phase = {
-    :name => 'Generate Specs',
-    :input_files => input_files + env_files, # This also needs to be relative to Xcode
-    :output_files => ["${DERIVED_FILE_DIR}/codegen-#{library_name}.log"].concat(generated_files.map { |filename| "${PODS_TARGET_SRCROOT}/#{filename}"} ),
-    # The final generated files will be created when this script is invoked at Xcode build time.
-    :script => get_script_phases_no_codegen_discovery(
-      react_native_path: react_native_path,
-      codegen_output_dir: output_dir,
-      codegen_module_dir: output_dir_module,
-      codegen_component_dir: output_dir_component,
-      library_name: library_name,
-      library_type: library_type,
-      js_srcs_pattern: js_srcs_pattern,
-      js_srcs_dir: js_srcs_dir,
-      file_list: file_list
-    ),
-    :execution_position => :before_compile,
-    :show_env_vars_in_log => true
-  }
-end

package/scripts/react_native_pods_utils/script_phases.rb

@@ -11,9 +11,7 @@ def get_script_phases_with_codegen_discovery(options)
     export_vars = {
         'RCT_SCRIPT_RN_DIR' => "$RCT_SCRIPT_POD_INSTALLATION_ROOT/#{options[:react_native_path]}",
         'RCT_SCRIPT_APP_PATH' => "$RCT_SCRIPT_POD_INSTALLATION_ROOT/#{options[:relative_app_root]}",
-        'RCT_SCRIPT_CONFIG_FILE_DIR' => "#{options[:relative_config_file_dir] != '' ? "$RCT_SCRIPT_POD_INSTALLATION_ROOT/#{options[:relative_config_file_dir]}" : ''}",
         'RCT_SCRIPT_OUTPUT_DIR' => "$RCT_SCRIPT_POD_INSTALLATION_ROOT",
-        'RCT_SCRIPT_FABRIC_ENABLED' => "#{options[:fabric_enabled]}",
         'RCT_SCRIPT_TYPE' => "withCodegenDiscovery",
     }
     return get_script_template(options[:react_native_path], export_vars)

package/scripts/react_native_pods_utils/script_phases.sh

@@ -76,7 +76,7 @@ generateCodegenSchemaFromJavaScript () {
 
     # shellcheck disable=SC2086
     # $JS_SRCS not having double quotations is intentional
-    "$NODE_BINARY" "$CODEGEN_CLI_PATH/lib/cli/combine/combine-js-to-schema-cli.js" "$GENERATED_SCHEMA_FILE" $JS_SRCS
+    "$NODE_BINARY" "$CODEGEN_CLI_PATH/lib/cli/combine/combine-js-to-schema-cli.js" --exclude NativeSampleTurboModule "$GENERATED_SCHEMA_FILE" $JS_SRCS
 }
 
 generateCodegenArtifactsFromSchema () {
@@ -96,7 +96,7 @@ generateCodegenArtifactsFromSchema () {
 generateArtifacts () {
     describe "Generating codegen artifacts"
     pushd "$RCT_SCRIPT_RN_DIR" >/dev/null || exit 1
-        "$NODE_BINARY" "scripts/generate-codegen-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --fabricEnabled "$RCT_SCRIPT_FABRIC_ENABLED" --configFileDir "$RCT_SCRIPT_CONFIG_FILE_DIR" --nodeBinary "$NODE_BINARY"
+        "$NODE_BINARY" "scripts/generate-codegen-artifacts.js" --path "$RCT_SCRIPT_APP_PATH" --outputPath "$TEMP_OUTPUT_DIR" --targetPlatform "ios"
     popd >/dev/null || exit 1
 }
 

package/scripts/xcode/ccache-clang++.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# Get the absolute path of this script
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+REACT_NATIVE_CCACHE_CONFIGPATH=$SCRIPT_DIR/ccache.conf
+# Provide our config file if none is already provided
+export CCACHE_CONFIGPATH="${CCACHE_CONFIGPATH:-$REACT_NATIVE_CCACHE_CONFIGPATH}"
+
+exec ccache clang++ "$@"

package/scripts/xcode/ccache-clang.sh

@@ -0,0 +1,14 @@
+#!/bin/sh
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# Get the absolute path of this script
+SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
+
+REACT_NATIVE_CCACHE_CONFIGPATH=$SCRIPT_DIR/ccache.conf
+# Provide our config file if none is already provided
+export CCACHE_CONFIGPATH="${CCACHE_CONFIGPATH:-$REACT_NATIVE_CCACHE_CONFIGPATH}"
+
+exec ccache clang "$@"

package/scripts/xcode/ccache.conf

@@ -0,0 +1,11 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# See https://ccache.dev/manual/4.3.html#_configuration_options for details and available options
+
+sloppiness = clang_index_store,file_stat_matches,include_file_ctime,include_file_mtime,ivfsoverlay,pch_defines,modules,system_headers,time_macros
+file_clone = true
+depend_mode = true
+inode_cache = true

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-04-19-RNv0.73.5-81ba94ffcf874e378f78579e8a5733e65a2a1b48
+hermes-2024-04-19-RNv0.74.0-165ff0ee4154834c995b80227ecd67e94a031035

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

@@ -114,7 +114,6 @@ Pod::Spec.new do |spec|
     # This podspec is also run in CI to build Hermes without using Pod install
     # and sometimes CI fails because `Pod::Executable` does not exist if it is not run with Pod Install.
     if defined?(Pod::Executable.to_s)
-      puts "Const Defined!"
       CMAKE_BINARY = Pod::Executable::which!('cmake')
       # NOTE: Script phases are sorted alphabetically inside Xcode project
       spec.script_phases = [

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

@@ -103,6 +103,7 @@ function configure_apple_framework {
       -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
       -DHERMES_ENABLE_BITCODE:BOOLEAN=false \
       -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
+      -DHERMES_BUILD_SHARED_JSI:BOOLEAN=false \
       -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
       -DIMPORT_HERMESC:PATH="$IMPORT_HERMESC_PATH" \
       -DJSI_DIR="$JSI_PATH" \

package/sdks/hermes-engine/utils/build-hermes-xcode.sh

@@ -10,6 +10,26 @@ release_version="$1"; shift
 hermesc_path="$1"; shift
 jsi_path="$1"; shift
 
+# Based on platform name returns the framework copy destination. Used later by `vendored_frameworks` in Podspec. 
+# Fallbacks to "ios" if platform is not recognized.
+function get_platform_copy_destination {
+    if [[ $1 == "macosx" ]]; then
+      echo "macosx"
+      return
+    fi
+    
+    echo "ios"
+}
+
+function get_deployment_target {
+    if [[ $1 == "macosx" ]]; then
+      echo ${MACOSX_DEPLOYMENT_TARGET}
+      return
+    fi
+    
+    echo ${IPHONEOS_DEPLOYMENT_TARGET}
+}
+
 enable_debugger="false"
 if [[ "$CONFIGURATION" == "Debug" ]]; then
   enable_debugger="true"
@@ -24,10 +44,7 @@ else
   cmake_build_type="MinSizeRel"
 fi
 
-deployment_target=${IPHONEOS_DEPLOYMENT_TARGET}
-if [ -z "$deployment_target" ]; then
-  deployment_target=${MACOSX_DEPLOYMENT_TARGET}
-fi
+deployment_target=$(get_deployment_target $PLATFORM_NAME)
 
 xcode_15_flags=""
 xcode_major_version=$(xcodebuild -version | grep -oE '[0-9]*' | head -n 1)
@@ -54,6 +71,7 @@ echo "Configure Apple framework"
   -DHERMES_ENABLE_TEST_SUITE:BOOLEAN=false \
   -DHERMES_ENABLE_BITCODE:BOOLEAN=false \
   -DHERMES_BUILD_APPLE_FRAMEWORK:BOOLEAN=true \
+  -DHERMES_BUILD_SHARED_JSI:BOOLEAN=false \
   -DHERMES_BUILD_APPLE_DSYM:BOOLEAN=true \
   -DIMPORT_HERMESC:PATH="${hermesc_path}" \
   -DJSI_DIR="$jsi_path" \
@@ -69,6 +87,8 @@ echo "Build Apple framework"
 
 echo "Copy Apple framework to destroot/Library/Frameworks"
 
+platform_copy_destination=$(get_platform_copy_destination $PLATFORM_NAME)
+
 cp -pfR \
   "${PODS_ROOT}/hermes-engine/build/${PLATFORM_NAME}/API/hermes/hermes.framework" \
-  "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/ios"
+  "${PODS_ROOT}/hermes-engine/destroot/Library/Frameworks/${platform_copy_destination}"

package/sdks/hermes-engine/utils/build-hermesc-xcode.sh

@@ -4,27 +4,15 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-set -x
+set -x -e
 
 hermesc_dir_path="$1"; shift
 jsi_path="$1"
 
 # This script is supposed to be executed from Xcode "run script" phase.
-# Xcode sets up its build environment based on the build target.
-# Here we override relevant envvars to make sure that we build hermesc for macosx,
-# even if Xcode build target is iphone, iponesimulator, etc.
-MACOSX_DEPLOYMENT_TARGET=$(sw_vers -productVersion)
-export MACOSX_DEPLOYMENT_TARGET=$MACOSX_DEPLOYMENT_TARGET
+# Xcode sets up its build environment based on the build target (iphone, iphonesimulator, macodsx).
+# We want to make sure that hermesc is built for mac.
+# So we clean the environment with env -i, and explicitly set SDKROOT to macosx
 SDKROOT=$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
-export SDKROOT=$SDKROOT
-
-if ! "$CMAKE_BINARY" -S "${PODS_ROOT}/hermes-engine" -B "$hermesc_dir_path" -DJSI_DIR="$jsi_path"
-then
-    echo "Failed to configure Hermesc cmake project."
-    exit 1
-fi
-if ! "$CMAKE_BINARY" --build "$hermesc_dir_path" --target hermesc -j "$(sysctl -n hw.ncpu)"
-then
-    echo "Failed to build Hermesc cmake project."
-    exit 1
-fi
+env -i SDKROOT="$SDKROOT" "$CMAKE_BINARY" -S "${PODS_ROOT}/hermes-engine" -B "$hermesc_dir_path" -DJSI_DIR="$jsi_path"
+env -i SDKROOT="$SDKROOT" "$CMAKE_BINARY" --build "$hermesc_dir_path" --target hermesc -j "$(sysctl -n hw.ncpu)"

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

@@ -4,6 +4,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
+if [ "$CI" ]; then
+  set -x
+fi
+set -e
+
 # Given a specific target, retrieve the right architecture for it
 # $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst
 function get_architecture {
@@ -18,7 +23,7 @@ function get_architecture {
     elif [[ $1 == "catalyst" ]]; then
       echo "x86_64;arm64"
     else
-      echo "Error: unknown arkitecture passed $1"
+      echo "Error: unknown architecture passed $1"
       exit 1
     fi
 }

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

@@ -4,6 +4,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
+if [ "$CI" ]; then
+  set -x
+fi
+set -e
+
 # shellcheck source=xplat/js/react-native-github/sdks/hermes-engine/utils/build-apple-framework.sh
 CURR_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
 . "${CURR_SCRIPT_DIR}/build-apple-framework.sh"

package/sdks/hermes-engine/utils/create-dummy-hermes-xcframework.sh

@@ -19,11 +19,13 @@ pushd destroot/Library/Frameworks > /dev/null || exit 1
 
 echo '' > dummy.c
 
-mkdir -p macosx/hermes.framework
-clang dummy.c -dynamiclib -o macosx/hermes.framework/hermes
+platforms=( "macosx" "ios" ) # Add other platforms here if needed
 
-mkdir -p ios/hermes.framework
-clang dummy.c -dynamiclib -o ios/hermes.framework/hermes
+for platform in "${platforms[@]}" 
+do 
+    mkdir -p "${platform}/hermes.framework"
+    clang dummy.c -dynamiclib -o "${platform}/hermes.framework/hermes"
+done
 
 rm dummy.c
 

package/sdks/hermes-engine/utils/replace_hermes_version.js

@@ -9,9 +9,9 @@
 
 'use strict';
 
-const yargs = require('yargs');
-const fs = require('fs');
 const {execSync} = require('child_process');
+const fs = require('fs');
+const yargs = require('yargs');
 
 const LAST_BUILD_FILENAME = '.last_build_configuration';
 

package/settings.gradle.kts

@@ -29,10 +29,3 @@ include(":packages:react-native:ReactAndroid:hermes-engine")
 
 project(":packages:react-native:ReactAndroid:hermes-engine").projectDir =
     file("ReactAndroid/hermes-engine/")
-
-// No flipper-integration for TV
-// 
-// include(":packages:react-native:ReactAndroid:flipper-integration")
-// 
-// project(":packages:react-native:ReactAndroid:flipper-integration").projectDir =
-//     file("ReactAndroid/flipper-integration/")

package/{Libraries/Core → src/private/core}/setUpDOM.js

@@ -8,8 +8,8 @@
  * @format
  */
 
-import DOMRect from '../DOM/Geometry/DOMRect';
-import DOMRectReadOnly from '../DOM/Geometry/DOMRectReadOnly';
+import DOMRect from '../webapis/dom/geometry/DOMRect';
+import DOMRectReadOnly from '../webapis/dom/geometry/DOMRectReadOnly';
 
 // $FlowExpectedError[cannot-write] The global isn't writable anywhere but here, where we define it
 global.DOMRect = DOMRect;

package/src/private/featureflags/NativeReactNativeFeatureFlags.js

@@ -0,0 +1,42 @@
+/**
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @generated SignedSource<<8509d5ee87efb5aa8da7efcd2085d0a2>>
+ * @flow strict-local
+ */
+
+/**
+ * IMPORTANT: Do NOT modify this file directly.
+ *
+ * To change the definition of the flags, edit
+ *   packages/react-native/scripts/featureflags/ReactNativeFeatureFlags.config.js.
+ *
+ * To regenerate this code, run the following script from the repo root:
+ *   yarn featureflags-update
+ */
+
+import type {TurboModule} from '../../../Libraries/TurboModule/RCTExport';
+
+import * as TurboModuleRegistry from '../../../Libraries/TurboModule/TurboModuleRegistry';
+
+export interface Spec extends TurboModule {
+  +commonTestFlag?: () => boolean;
+  +enableBackgroundExecutor?: () => boolean;
+  +useModernRuntimeScheduler?: () => boolean;
+  +enableMicrotasks?: () => boolean;
+  +batchRenderingUpdatesInEventLoop?: () => boolean;
+  +enableSpannableBuildingUnification?: () => boolean;
+  +enableCustomDrawOrderFabric?: () => boolean;
+  +enableFixForClippedSubviewsCrash?: () => boolean;
+  +inspectorEnableCxxInspectorPackagerConnection?: () => boolean;
+  +inspectorEnableModernCDPRegistry?: () => boolean;
+}
+
+const NativeReactNativeFeatureFlags: ?Spec = TurboModuleRegistry.get<Spec>(
+  'NativeReactNativeFeatureFlagsCxx',
+);
+
+export default NativeReactNativeFeatureFlags;