react-native-tvos 0.74.3-0 → 0.75.2-0

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

@@ -34,18 +34,19 @@ const REACT_NATIVE_REPOSITORY_ROOT = path.join(
 );
 const REACT_NATIVE_PACKAGE_ROOT_FOLDER = path.join(__dirname, '..', '..');
 const CODEGEN_REPO_PATH = `${REACT_NATIVE_REPOSITORY_ROOT}/packages/react-native-codegen`;
+const RNCORE_CONFIGS = {
+  ios: path.join(REACT_NATIVE_PACKAGE_ROOT_FOLDER, 'ReactCommon'),
+  android: path.join(
+    REACT_NATIVE_PACKAGE_ROOT_FOLDER,
+    'ReactAndroid',
+    'build',
+    'generated',
+    'source',
+    'codegen',
+  ),
+};
 const CORE_LIBRARIES_WITH_OUTPUT_FOLDER = {
-  rncore: {
-    ios: path.join(REACT_NATIVE_PACKAGE_ROOT_FOLDER, 'ReactCommon'),
-    android: path.join(
-      REACT_NATIVE_PACKAGE_ROOT_FOLDER,
-      'ReactAndroid',
-      'build',
-      'generated',
-      'source',
-      'codegen',
-    ),
-  },
+  rncore: RNCORE_CONFIGS,
   FBReactNativeSpec: {
     ios: null,
     android: path.join(
@@ -415,20 +416,47 @@ function generateSchemaInfo(library, platform) {
   };
 }
 
-function generateCode(outputPath, schemaInfo, includesGeneratedCode, platform) {
-  const tmpDir = fs.mkdtempSync(
-    path.join(os.tmpdir(), schemaInfo.library.config.name),
+function shouldSkipGenerationForRncore(schemaInfo, platform) {
+  if (platform !== 'ios' || schemaInfo.library.config.name !== 'rncore') {
+    return false;
+  }
+  const rncoreOutputPath = path.join(
+    RNCORE_CONFIGS.ios,
+    'react',
+    'renderer',
+    'components',
+    'rncore',
   );
+  const rncoreAbsolutePath = path.resolve(rncoreOutputPath);
+  return (
+    rncoreAbsolutePath.includes('node_modules') &&
+    fs.existsSync(rncoreAbsolutePath) &&
+    fs.readdirSync(rncoreAbsolutePath).length > 0
+  );
+}
+
+function generateCode(outputPath, schemaInfo, includesGeneratedCode, platform) {
+  if (shouldSkipGenerationForRncore(schemaInfo, platform)) {
+    console.log(
+      '[Codegen - rncore] Skipping iOS code generation for rncore as it has been generated already.',
+    );
+    return;
+  }
+
+  const libraryName = schemaInfo.library.config.name;
+  const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), libraryName));
   const tmpOutputDir = path.join(tmpDir, 'out');
   fs.mkdirSync(tmpOutputDir, {recursive: true});
 
-  console.log(`[Codegen] Generating Native Code for ${platform}`);
+  console.log(
+    `[Codegen] Generating Native Code for ${libraryName} - ${platform}`,
+  );
   const useLocalIncludePaths = includesGeneratedCode;
   generateSpecsCLIExecutor.generateSpecFromInMemorySchema(
     platform,
     schemaInfo.schema,
     tmpOutputDir,
-    schemaInfo.library.config.name,
+    libraryName,
     'com.facebook.fbreact.specs',
     schemaInfo.library.config.type,
     useLocalIncludePaths,
@@ -436,13 +464,9 @@ function generateCode(outputPath, schemaInfo, includesGeneratedCode, platform) {
 
   // Finally, copy artifacts to the final output directory.
   const outputDir =
-    reactNativeCoreLibraryOutputPath(
-      schemaInfo.library.config.name,
-      platform,
-    ) ?? outputPath;
+    reactNativeCoreLibraryOutputPath(libraryName, platform) ?? outputPath;
   fs.mkdirSync(outputDir, {recursive: true});
-  // TODO: Fix this. This will not work on Windows.
-  execSync(`cp -R ${tmpOutputDir}/* "${outputDir}"`);
+  fs.cpSync(tmpOutputDir, outputDir, {recursive: true});
   console.log(`[Codegen] Generated artifacts: ${outputDir}`);
 }
 
@@ -595,6 +619,22 @@ function cleanupEmptyFilesAndFolders(filepath) {
   }
 }
 
+function generateRNCoreComponentsIOS(projectRoot /*: string */) /*: void*/ {
+  const ios = 'ios';
+  buildCodegenIfNeeded();
+  const pkgJson = readPkgJsonInDirectory(projectRoot);
+  const rncoreLib = findProjectRootLibraries(pkgJson, projectRoot).filter(
+    library => library.config.name === 'rncore',
+  )[0];
+  if (!rncoreLib) {
+    throw new Error(
+      "[Codegen] Can't find rncore library. Failed to generate rncore artifacts",
+    );
+  }
+  const rncoreSchemaInfo = generateSchemaInfo(rncoreLib, ios);
+  generateCode('', rncoreSchemaInfo, false, ios);
+}
+
 // Execute
 
 /**
@@ -688,7 +728,8 @@ function execute(projectRoot, targetPlatform, baseOutputPath) {
 }
 
 module.exports = {
-  execute: execute,
+  execute,
+  generateRNCoreComponentsIOS,
   // exported for testing purposes only:
   _extractLibrariesFromJSON: extractLibrariesFromJSON,
   _cleanupEmptyFilesAndFolders: cleanupEmptyFilesAndFolders,

package/scripts/hermes/hermes-utils.js

@@ -14,6 +14,7 @@ const {execSync, spawnSync} = require('child_process');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const {stdin} = require('process');
 
 /*::
 type BuildType = 'dry-run' | 'release' | 'nightly' | 'prealpha';
@@ -22,8 +23,9 @@ type BuildType = 'dry-run' | 'release' | 'nightly' | 'prealpha';
 const SDKS_DIR = path.normalize(path.join(__dirname, '..', '..', 'sdks'));
 const HERMES_DIR = path.join(SDKS_DIR, 'hermes');
 const HERMES_TAG_FILE_PATH = path.join(SDKS_DIR, '.hermesversion');
+const HERMES_PATCH_FILE_PATH = path.join(__dirname, 'hermes.patch');
 const HERMES_SOURCE_TARBALL_BASE_URL =
-  'https://github.com/react-native-tvos/hermes/tarball/';
+  'https://github.com/facebook/hermes/tarball/';
 const HERMES_TARBALL_DOWNLOAD_DIR = path.join(SDKS_DIR, 'download');
 const MACOS_BIN_DIR = path.join(SDKS_DIR, 'hermesc', 'osx-bin');
 const MACOS_HERMESC_PATH = path.join(MACOS_BIN_DIR, 'hermesc');
@@ -81,7 +83,7 @@ function setHermesTag(hermesTag /*: string */) {
 
 function getHermesTagSHA(hermesTag /*: string */) /*: string */ {
   return execSync(
-    `git ls-remote https://github.com/react-native-tvos/hermes ${hermesTag} | cut -f 1`,
+    `git ls-remote https://github.com/facebook/hermes ${hermesTag} | cut -f 1`,
   )
     .toString()
     .trim();
@@ -107,7 +109,7 @@ function downloadHermesSourceTarball() {
   }
 
   console.info(
-    `[Hermes] Downloading Hermes source code for commit ${hermesTagSHA} from ${hermesTarballUrl}`,
+    `[Hermes] Downloading Hermes source code for commit ${hermesTagSHA}`,
   );
   try {
     delegateSync('curl', [hermesTarballUrl, '-Lo', hermesTarballDownloadPath]);
@@ -142,6 +144,24 @@ function expandHermesSourceTarball() {
   }
 }
 
+function patchHermesSourceTarball() {
+  if (!fs.existsSync(HERMES_PATCH_FILE_PATH)) {
+    console.log('[Hermes] No Hermes patch found.');
+    return;
+  }
+  console.info(
+    `[Hermes] Patching Hermes source from ${HERMES_PATCH_FILE_PATH}`,
+  );
+
+  try {
+    delegateSync('patch', ['-p1', '-i', HERMES_PATCH_FILE_PATH], {
+      cwd: HERMES_DIR,
+    });
+  } catch (error) {
+    throw new Error(`[Hermes] Failed to patch Hermes source: ${error}`);
+  }
+}
+
 function copyBuildScripts() {
   if (!fs.existsSync(SDKS_DIR)) {
     throw new Error(
@@ -327,6 +347,7 @@ module.exports = {
   createTarballFromDirectory,
   downloadHermesSourceTarball,
   expandHermesSourceTarball,
+  patchHermesSourceTarball,
   getHermesTagSHA,
   getHermesTarballDownloadPath,
   getHermesPrebuiltArtifactsTarballName,

package/scripts/hermes/prepare-hermes-for-build.js

@@ -19,6 +19,7 @@ const {
   copyPodSpec,
   downloadHermesSourceTarball,
   expandHermesSourceTarball,
+  patchHermesSourceTarball,
   shouldBuildHermesFromSource,
   shouldUsePrebuiltHermesC,
 } = require('./hermes-utils');
@@ -30,6 +31,7 @@ async function main(isInCI) {
   }
   downloadHermesSourceTarball();
   expandHermesSourceTarball();
+  patchHermesSourceTarball();
   copyPodSpec();
   copyBuildScripts();
 

package/scripts/react-native-xcode.sh

@@ -90,9 +90,7 @@ fi
 
 [ -z "$NODE_ARGS" ] && export NODE_ARGS=""
 
-[ -z "$CLI_PATH" ] && export CLI_PATH="$REACT_NATIVE_DIR/cli.js"
-
-[ -z "$BUNDLE_COMMAND" ] && BUNDLE_COMMAND="bundle"
+[ -z "$CLI_PATH" ] && CLI_PATH="$REACT_NATIVE_DIR/scripts/bundle.js"
 
 [ -z "$COMPOSE_SOURCEMAP_PATH" ] && COMPOSE_SOURCEMAP_PATH="$REACT_NATIVE_DIR/scripts/compose-source-maps.js"
 
@@ -139,8 +137,19 @@ if [[ $USE_HERMES != false && $DEV == false ]]; then
   EXTRA_ARGS+=("--minify" "false")
 fi
 
+# Allow opting out of using npx react-native config
+if [[ -n "$CONFIG_JSON" ]]; then
+  EXTRA_ARGS+=("--load-config" "$CONFIG_JSON")
+elif [[ -n "$CONFIG_CMD" ]]; then
+  EXTRA_ARGS+=("--config-cmd" "$CONFIG_APP")
+else
+  EXTRA_ARGS+=("--config-cmd" "$NODE_BINARY $NODE_ARGS $REACT_NATIVE_DIR/cli.js config")
+fi
+
+# shellcheck disable=SC2086
 "$NODE_BINARY" $NODE_ARGS "$CLI_PATH" $BUNDLE_COMMAND \
   $CONFIG_ARG \
+  --config-cmd "$CONFIG" \
   --entry-file "$ENTRY_FILE" \
   --platform "$BUNDLE_PLATFORM" \
   --dev $DEV \

package/scripts/react_native_pods.rb

@@ -6,7 +6,6 @@
 require 'json'
 require 'open3'
 require 'pathname'
-require_relative './cocoapods/FlipperConfiguration.rb'
 require_relative './react_native_pods_utils/script_phases.rb'
 require_relative './cocoapods/jsengine.rb'
 require_relative './cocoapods/fabric.rb'
@@ -18,6 +17,9 @@ require_relative './cocoapods/local_podspec_patch.rb'
 require_relative './cocoapods/runtime.rb'
 require_relative './cocoapods/helpers.rb'
 require_relative './cocoapods/privacy_manifest_utils.rb'
+require_relative './cocoapods/spm.rb'
+# Importing to expose use_native_modules!
+require_relative './cocoapods/autolinking.rb'
 
 $CODEGEN_OUTPUT_DIR = 'build/generated/ios'
 $CODEGEN_COMPONENT_DIR = 'react/renderer/components'
@@ -25,18 +27,6 @@ $CODEGEN_MODULE_DIR = '.'
 
 $START_TIME = Time.now.to_i
 
-# `@react-native-community/cli-platform-ios/native_modules` defines
-# use_native_modules. We use node to resolve its path to allow for
-# different packager and workspace setups. This is reliant on
-# `@react-native-community/cli-platform-ios` being a direct dependency
-# of `react-native`.
-require Pod::Executable.execute_command('node', ['-p',
-  'require.resolve(
-    "@react-native-community/cli-platform-ios/native_modules.rb",
-    {paths: [process.argv[1]]},
-  )', __dir__]).strip
-
-
 def min_ios_version_supported
   return Helpers::Constants.min_ios_version_supported
 end
@@ -115,8 +105,6 @@ def use_react_native! (
   pod 'React', :path => "#{prefix}/"
   pod 'React-Core', :path => "#{prefix}/"
   pod 'React-CoreModules', :path => "#{prefix}/React/CoreModules"
-  # Not for tvOS
-  # pod 'React-RCTActionSheet', :path => "#{prefix}/Libraries/ActionSheetIOS"
   pod 'React-RCTActionSheet', :path => "#{prefix}/Libraries/ActionSheetIOS"
   pod 'React-RCTAppDelegate', :path => "#{prefix}/Libraries/AppDelegate"
   pod 'React-RCTAnimation', :path => "#{prefix}/Libraries/NativeAnimation"
@@ -126,14 +114,18 @@ def use_react_native! (
   pod 'React-RCTNetwork', :path => "#{prefix}/Libraries/Network"
   pod 'React-RCTSettings', :path => "#{prefix}/Libraries/Settings"
   pod 'React-RCTText', :path => "#{prefix}/Libraries/Text"
-# Not for tvOS
-# pod 'React-RCTVibration', :path => "#{prefix}/Libraries/Vibration"
+  pod 'React-RCTVibration', :path => "#{prefix}/Libraries/Vibration"
   pod 'React-Core/RCTWebSocket', :path => "#{prefix}/"
   pod 'React-rncore', :path => "#{prefix}/ReactCommon"
   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-featureflagsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/featureflags"
+  pod 'React-microtasksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/microtasks"
+  pod 'React-idlecallbacksnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/idlecallbacks"
+  pod 'React-domnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/dom"
+  pod 'React-defaultsnativemodule', :path => "#{prefix}/ReactCommon/react/nativemodule/defaults"
   pod 'React-Mapbuffer', :path => "#{prefix}/ReactCommon"
   pod 'React-jserrorhandler', :path => "#{prefix}/ReactCommon/jserrorhandler"
   pod 'React-nativeconfig', :path => "#{prefix}/ReactCommon"
@@ -149,9 +141,11 @@ def use_react_native! (
   pod 'React-jsinspector', :path => "#{prefix}/ReactCommon/jsinspector-modern"
 
   pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker"
+  pod 'React-performancetimeline', :path => "#{prefix}/ReactCommon/react/performance/timeline"
   pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor"
   pod 'React-runtimescheduler', :path => "#{prefix}/ReactCommon/react/renderer/runtimescheduler"
   pod 'React-rendererdebug', :path => "#{prefix}/ReactCommon/react/renderer/debug"
+  pod 'React-rendererconsistency', :path => "#{prefix}/ReactCommon/react/renderer/consistency"
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
   pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
   pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true
@@ -179,7 +173,7 @@ def use_react_native! (
     :folly_version => folly_config[:version]
   )
 
-  pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
+  pod 'ReactCodegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
 
   # Always need fabric to access the RCTSurfacePresenterBridgeAdapter which allow to enable the RuntimeScheduler
   # If the New Arch is turned off, we will use the Old Renderer, though.
@@ -250,6 +244,18 @@ def install_modules_dependencies(spec, new_arch_enabled: NewArchitectureHelper.n
   NewArchitectureHelper.install_modules_dependencies(spec, new_arch_enabled, folly_config[:version])
 end
 
+
+# This function can be used by library developer to declare a SwiftPackageManager dependency.
+#
+# Parameters:
+# - spec: The spec the Swift Package Manager dependency has to be added to
+# - url: The URL of the Swift Package Manager dependency
+# - requirement: The version requirement of the Swift Package Manager dependency (eg. ` {kind: 'upToNextMajorVersion', minimumVersion: '5.9.1'},`)
+# - products: The product/target of the Swift Package Manager dependency (eg. AlamofireDynamic)
+def spm_dependency(spec, url:, requirement:, products:)
+  SPM.dependency(spec, url: url, requirement: requirement, products: products)
+end
+
 # It returns the default flags.
 # deprecated.
 def get_default_flags()
@@ -267,6 +273,10 @@ def get_folly_config()
   return Helpers::Constants.folly_config
 end
 
+def rct_cxx_language_standard()
+  return Helpers::Constants.cxx_language_standard
+end
+
 # Function that executes after React Native has been installed to configure some flags and build settings.
 #
 # Parameters
@@ -294,8 +304,10 @@ def react_native_post_install(
 
   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.set_build_setting(installer, build_setting: "USE_HERMES", value: hermes_enabled)
+  ReactNativePodsUtils.set_build_setting(installer, build_setting: "REACT_NATIVE_PATH", value: File.join("${PODS_ROOT}", "..", react_native_path))
+  ReactNativePodsUtils.set_build_setting(installer, build_setting: "SWIFT_ACTIVE_COMPILATION_CONDITIONS", value: ['$(inherited)', 'DEBUG'], config_name: "Debug")
+
   ReactNativePodsUtils.set_ccache_compiler_and_linker_build_settings(installer, react_native_path, ccache_enabled)
   if Environment.new().ruby_platform().include?('darwin')
     ReactNativePodsUtils.apply_xcode_15_patch(installer)
@@ -303,6 +315,7 @@ def react_native_post_install(
   ReactNativePodsUtils.updateOSDeploymentTarget(installer)
   ReactNativePodsUtils.set_dynamic_frameworks_flags(installer)
   ReactNativePodsUtils.add_ndebug_flag_to_pods_in_release(installer)
+  SPM.apply_on_post_install(installer)
 
   if privacy_file_aggregation_enabled
     PrivacyManifestUtils.add_aggregated_privacy_manifest(installer)

package/scripts/react_native_pods_utils/script_phases.sh

@@ -104,7 +104,7 @@ moveOutputs () {
     mkdir -p "$RCT_SCRIPT_OUTPUT_DIR"
 
     # Copy all output to output_dir
-    cp -R -X "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
+    /bin/cp -R -X "$TEMP_OUTPUT_DIR/." "$RCT_SCRIPT_OUTPUT_DIR" || exit 1
     echo "$LIBRARY_NAME output has been written to $RCT_SCRIPT_OUTPUT_DIR:" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
     ls -1 "$RCT_SCRIPT_OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
 }

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-06-28-RNv0.74.3-8a42e289991d48575dcb4012ea9205d707dac43d
+hermes-2024-08-15-RNv0.75.1-4b3bf912cc0f705b51b71ce1a5b8bd79b93a451b

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

@@ -24,7 +24,7 @@ Pod::Spec.new do |spec|
   spec.license     = package['license']
   spec.author      = "Facebook"
   spec.source      = source
-  spec.platforms   = { :osx => "10.13", :ios => "13.4", :tvos => "13.4" }
+  spec.platforms   = { :osx => "10.13", :ios => "13.4", :visionos => "1.0", :tvos => "13.4" }
 
   spec.preserve_paths      = '**/*.*'
   spec.source_files        = ''
@@ -45,6 +45,7 @@ Pod::Spec.new do |spec|
       ss.source_files = "destroot/include/hermes/**/*.h"
       ss.header_mappings_dir = "destroot/include"
       ss.ios.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
+      ss.visionos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
       ss.tvos.vendored_frameworks = "destroot/Library/Frameworks/universal/hermes.xcframework"
       ss.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
     end
@@ -81,6 +82,12 @@ Pod::Spec.new do |spec|
       ss.header_dir = 'hermes'
     end
 
+    spec.subspec 'cdp' do |ss|
+      ss.source_files = ''
+      ss.public_header_files = 'API/hermes/cdp/*.h'
+      ss.header_dir = 'hermes/cdp'
+    end
+
     spec.subspec 'inspector' do |ss|
       ss.source_files = ''
       ss.public_header_files = 'API/hermes/inspector/*.h'

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

@@ -17,6 +17,8 @@ REACT_NATIVE_PATH=${REACT_NATIVE_PATH:-$CURR_SCRIPT_DIR/../../..}
 
 NUM_CORES=$(sysctl -n hw.ncpu)
 
+PLATFORMS=("macosx" "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator")
+
 if [[ -z "$JSI_PATH" ]]; then
   JSI_PATH="$REACT_NATIVE_PATH/ReactCommon/jsi"
 fi
@@ -37,6 +39,10 @@ function get_ios_deployment_target {
   use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('ios')"
 }
 
+function get_visionos_deployment_target {
+  use_env_var_or_ruby_prop "${XROS_DEPLOYMENT_TARGET}" "deployment_target('visionos')"
+}
+
 function get_tvos_deployment_target {
   use_env_var_or_ruby_prop "${IOS_DEPLOYMENT_TARGET}" "deployment_target('tvos')"
 }
@@ -152,6 +158,9 @@ function build_apple_framework {
     mkdir -p destroot/include/hermes
     cp API/hermes/*.h destroot/include/hermes
 
+    mkdir -p destroot/include/hermes/cdp
+    cp API/hermes/cdp/*.h destroot/include/hermes/cdp
+
     mkdir -p destroot/include/hermes/inspector
     cp API/hermes/inspector/*.h destroot/include/hermes/inspector
 
@@ -164,21 +173,12 @@ function build_apple_framework {
 }
 
 function prepare_dest_root_for_ci {
+  mkdir -p  "destroot/bin"
+  for platform in "${PLATFORMS[@]}"; do
+    mkdir -p "destroot/Library/Frameworks/$platform"
+    cp -R "./build_$platform/API/hermes/hermes.framework"* "destroot/Library/Frameworks/$platform"
+  done
 
-  mkdir -p "destroot/Library/Frameworks/macosx"
-  mkdir -p "destroot/bin"
-  mkdir -p "destroot/Library/Frameworks/iphoneos"
-  mkdir -p "destroot/Library/Frameworks/iphonesimulator"
-  mkdir -p "destroot/Library/Frameworks/appletvos"
-  mkdir -p "destroot/Library/Frameworks/appletvsimulator"
-  mkdir -p "destroot/Library/Frameworks/catalyst"
-
-  cp -R "./build_macosx/API/hermes/hermes.framework"* "destroot/Library/Frameworks/macosx"
-  cp -R "./build_iphoneos/API/hermes/hermes.framework"* "destroot/Library/Frameworks/iphoneos"
-  cp -R "./build_iphonesimulator/API/hermes/hermes.framework"* "destroot/Library/Frameworks/iphonesimulator"
-  cp -R "./build_appletvos/API/hermes/hermes.framework"* "destroot/Library/Frameworks/appletvos"
-  cp -R "./build_appletvsimulator/API/hermes/hermes.framework"* "destroot/Library/Frameworks/appletvsimulator"
-  cp -R "./build_catalyst/API/hermes/hermes.framework"* "destroot/Library/Frameworks/catalyst"
   cp "./build_macosx/bin/"* "destroot/bin"
 
   # Copy over Hermes and JSI API headers.
@@ -188,6 +188,9 @@ function prepare_dest_root_for_ci {
   mkdir -p destroot/include/hermes
   cp API/hermes/*.h destroot/include/hermes
 
+  mkdir -p destroot/include/hermes/cdp
+  cp API/hermes/cdp/*.h destroot/include/hermes/cdp
+
   mkdir -p destroot/include/hermes/inspector
   cp API/hermes/inspector/*.h destroot/include/hermes/inspector
 

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

@@ -10,24 +10,30 @@ 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. 
+# 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
+    elif [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
+      echo "xros"
+      return
     fi
-    
+
     echo "ios"
 }
 
 function get_deployment_target {
     if [[ $1 == "macosx" ]]; then
-      echo ${MACOSX_DEPLOYMENT_TARGET}
+      echo "${MACOSX_DEPLOYMENT_TARGET}"
+      return
+    elif [[ $1 == "xrsimulator" || $1 == "xros" ]]; then
+      echo "${XROS_DEPLOYMENT_TARGET}"
       return
     fi
-    
-    echo ${IPHONEOS_DEPLOYMENT_TARGET}
+
+    echo "${IPHONEOS_DEPLOYMENT_TARGET}"
 }
 
 enable_debugger="false"

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

@@ -10,9 +10,9 @@ 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
+# $1 the target you want to build. Allowed values: iphoneos, iphonesimulator, catalyst, xros, xrsimulator
 function get_architecture {
-    if [[ $1 == "iphoneos" ]]; then
+    if [[ $1 == "iphoneos" || $1 == "xros" || $1 == "xrsimulator" ]]; then
       echo "arm64"
     elif [[ $1 == "iphonesimulator" ]]; then
       echo "x86_64;arm64"
@@ -28,18 +28,25 @@ function get_architecture {
     fi
 }
 
+function get_deployment_target {
+    if [[ $1 == "xros" || $1 == "xrsimulator" ]]; then
+      echo "$(get_visionos_deployment_target)"
+    elif [[ $1 == "appletvos" || $1 == "appletvsimulator" ]]; then
+      echo "$(get_tvos_deployment_target)"
+    else
+      echo "$(get_ios_deployment_target)"
+    fi
+}
+
 # build a single framework
 # $1 is the target to build
 function build_framework {
   if [ ! -d destroot/Library/Frameworks/universal/hermes.xcframework ]; then
-    ios_deployment_target=$(get_ios_deployment_target)
-    if [[ "$1" == "appletvos" || "$1" == "appletvsimulator" ]]; then
-      ios_deployment_target=$(get_tvos_deployment_target)
-    fi
+    deployment_target=$(get_deployment_target "$1")
 
     architecture=$(get_architecture "$1")
 
-    build_apple_framework "$1" "$architecture" "$ios_deployment_target"
+    build_apple_framework "$1" "$architecture" "$deployment_target"
   else
     echo "Skipping; Clean \"destroot\" to rebuild".
   fi
@@ -48,7 +55,7 @@ function build_framework {
 # 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" "appletvos" "appletvsimulator" "catalyst"
+        create_universal_framework "iphoneos" "iphonesimulator" "catalyst" "xros" "xrsimulator" "appletvos" "appletvsimulator"
     else
         echo "Skipping; Clean \"destroot\" to rebuild".
     fi
@@ -65,6 +72,8 @@ function create_framework {
         build_framework "appletvos"
         build_framework "appletvsimulator"
         build_framework "catalyst"
+        build_framework "xros"
+        build_framework "xrsimulator"
 
         build_universal_framework
     else

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

@@ -19,7 +19,7 @@ pushd destroot/Library/Frameworks > /dev/null || exit 1
 
 echo '' > dummy.c
 
-platforms=( "macosx" "ios" ) # Add other platforms here if needed
+platforms=( "macosx" "ios" "xros" ) # Add other platforms here if needed
 
 for platform in "${platforms[@]}" 
 do 

package/sdks/hermesc/osx-bin/hermes-lit

@@ -8,7 +8,7 @@ import os
 import sys
 
 # Make sure we can find the lit package.
-sys.path.insert(0, os.path.join("/Users/distiller/react-native/packages/react-native/sdks/hermes/external/llvh", 'utils', 'lit'))
+sys.path.insert(0, os.path.join("/Users/runner/work/react-native/react-native/packages/react-native/sdks/hermes/external/llvh", 'utils', 'lit'))
 
 if __name__=='__main__':
     from lit.main import main

package/src/private/core/composeStyles.js

@@ -0,0 +1,27 @@
+/**
+ * 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.
+ *
+ * @flow strict
+ * @format
+ */
+
+/**
+ * Combines two styles such that `style2` will override any styles in `style1`.
+ * If either style is null or undefined, the other one is returned without
+ * allocating an array, saving allocations and enabling memoization.
+ */
+export default function composeStyles<T1, T2>(
+  style1: ?T1,
+  style2: ?T2,
+): ?(T1 | T2 | $ReadOnlyArray<T1 | T2>) {
+  if (style1 == null) {
+    return style2;
+  }
+  if (style2 == null) {
+    return style1;
+  }
+  return [style1, style2];
+}