react-native 0.71.4 → 0.72.0-rc.0

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

@@ -21,17 +21,28 @@ const fs = require('fs');
 const os = require('os');
 const path = require('path');
 
-const RN_ROOT = path.join(__dirname, '../..');
-
-const CODEGEN_REPO_PATH = `${RN_ROOT}/packages/react-native-codegen`;
-const CODEGEN_NPM_PATH = `${RN_ROOT}/../react-native-codegen`;
-const CORE_LIBRARIES = new Set(['rncore', 'FBReactNativeSpec']);
+const REACT_NATIVE_REPOSITORY_ROOT = path.join(
+  __dirname,
+  '..',
+  '..',
+  '..',
+  '..',
+);
+const REACT_NATIVE_PACKAGE_ROOT_FOLDER = path.join(__dirname, '..', '..');
+
+const CODEGEN_DEPENDENCY_NAME = '@react-native/codegen';
+const CODEGEN_REPO_PATH = `${REACT_NATIVE_REPOSITORY_ROOT}/packages/react-native-codegen`;
+const CODEGEN_NPM_PATH = `${REACT_NATIVE_PACKAGE_ROOT_FOLDER}/../${CODEGEN_DEPENDENCY_NAME}`;
+const CORE_LIBRARIES_WITH_OUTPUT_FOLDER = {
+  rncore: path.join(REACT_NATIVE_PACKAGE_ROOT_FOLDER, 'ReactCommon'),
+  FBReactNativeSpec: null,
+};
 const REACT_NATIVE_DEPENDENCY_NAME = 'react-native';
 
 // HELPERS
 
 function isReactNativeCoreLibrary(libraryName) {
-  return CORE_LIBRARIES.has(libraryName);
+  return libraryName in CORE_LIBRARIES_WITH_OUTPUT_FOLDER;
 }
 
 function executeNodeScript(node, script) {
@@ -118,7 +129,7 @@ function extractLibrariesFromJSON(
   var isBlocking = false;
   if (dependency == null) {
     dependency = REACT_NATIVE_DEPENDENCY_NAME;
-    dependencyPath = RN_ROOT;
+    dependencyPath = REACT_NATIVE_PACKAGE_ROOT_FOLDER;
     // If we are exploring the ReactNative libraries, we want to raise an error
     // if the codegen is not properly configured.
     isBlocking = true;
@@ -159,7 +170,10 @@ function handleReactNativeCodeLibraries(
   // Handle react-native core libraries.
   // This is required when react-native is outside of node_modules.
   console.log('[Codegen] Processing react-native core libraries');
-  const reactNativePkgJson = path.join(RN_ROOT, codegenConfigFilename);
+  const reactNativePkgJson = path.join(
+    REACT_NATIVE_PACKAGE_ROOT_FOLDER,
+    codegenConfigFilename,
+  );
   if (!fs.existsSync(reactNativePkgJson)) {
     throw '[Codegen] Error: Could not find config file for react-native.';
   }
@@ -175,7 +189,9 @@ function handleThirdPartyLibraries(
   codegenConfigKey,
 ) {
   // Determine which of these are codegen-enabled libraries
-  const configDir = baseCodegenConfigFileDir || path.join(RN_ROOT, '..');
+  const configDir =
+    baseCodegenConfigFileDir ||
+    path.join(REACT_NATIVE_PACKAGE_ROOT_FOLDER, '..');
   console.log(
     `\n\n[Codegen] >>>>> Searching for codegen-enabled libraries in ${configDir}`,
   );
@@ -273,7 +289,6 @@ function handleInAppLibraries(
 }
 
 // CodeGen
-
 function getCodeGenCliPath() {
   let codegenCliPath;
   if (fs.existsSync(CODEGEN_REPO_PATH)) {
@@ -293,7 +308,7 @@ function getCodeGenCliPath() {
   } else if (fs.existsSync(CODEGEN_NPM_PATH)) {
     codegenCliPath = CODEGEN_NPM_PATH;
   } else {
-    throw "error: Could not determine react-native-codegen location. Try running 'yarn install' or 'npm install' in your project root.";
+    throw `error: Could not determine ${CODEGEN_DEPENDENCY_NAME} location. Try running 'yarn install' or 'npm install' in your project root.`;
   }
   return codegenCliPath;
 }
@@ -336,7 +351,11 @@ function generateCode(iosOutputDir, library, tmpDir, node, pathToSchema) {
 
   executeNodeScript(
     node,
-    `${path.join(RN_ROOT, 'scripts', 'generate-specs-cli.js')} \
+    `${path.join(
+      REACT_NATIVE_PACKAGE_ROOT_FOLDER,
+      'scripts',
+      'generate-specs-cli.js',
+    )} \
         --platform ios \
         --schemaPath ${pathToSchema} \
         --outputDir ${tmpOutputDir} \
@@ -345,8 +364,10 @@ function generateCode(iosOutputDir, library, tmpDir, node, pathToSchema) {
   );
 
   // Finally, copy artifacts to the final output directory.
-  fs.mkdirSync(iosOutputDir, {recursive: true});
-  execSync(`cp -R ${tmpOutputDir}/* ${iosOutputDir}`);
+  const outputDir =
+    CORE_LIBRARIES_WITH_OUTPUT_FOLDER[library.config.name] ?? iosOutputDir;
+  fs.mkdirSync(outputDir, {recursive: true});
+  execSync(`cp -R ${tmpOutputDir}/* ${outputDir}`);
   console.log(`[Codegen] Generated artifacts: ${iosOutputDir}`);
 }
 
@@ -397,17 +418,23 @@ function createComponentProvider(
     fs.closeSync(fd);
     console.log(`Generated schema list: ${schemaListTmpPath}`);
 
+    const outputDir = path.join(
+      REACT_NATIVE_PACKAGE_ROOT_FOLDER,
+      'React',
+      'Fabric',
+    );
+
     // Generate FabricComponentProvider.
     // Only for iOS at this moment.
     executeNodeScript(
       node,
       `${path.join(
-        RN_ROOT,
+        REACT_NATIVE_PACKAGE_ROOT_FOLDER,
         'scripts',
         'generate-provider-cli.js',
-      )} --platform ios --schemaListPath "${schemaListTmpPath}" --outputDir ${iosOutputDir}`,
+      )} --platform ios --schemaListPath "${schemaListTmpPath}" --outputDir ${outputDir}`,
     );
-    console.log(`Generated provider in: ${iosOutputDir}`);
+    console.log(`Generated provider in: ${outputDir}`);
   }
 }
 
@@ -449,7 +476,7 @@ function findCodegenEnabledLibraries(
 //
 // This function is needed since, after aligning the codegen between
 // iOS and Android, we have to create empty folders in advance and
-// we don't know wheter they will be populated up until the end of the process.
+// we don't know whether they will be populated up until the end of the process.
 //
 // @parameter filepath: the root path from which we want to remove the empty files and folders.
 function cleanupEmptyFilesAndFolders(filepath) {

package/scripts/codegen/generate-legacy-interop-components.js

@@ -0,0 +1,123 @@
+/**
+ * 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.
+ *
+ * @format
+ */
+
+'use strict';
+
+const yargs = require('yargs');
+const fs = require('fs');
+
+const CONFIG_FILE_NAME = 'react-native.config.js';
+const PROJECT_FIELD = 'project';
+const IOS_FIELD = 'ios';
+const LEGACY_COMPONENTS_FIELD = 'unstable_reactLegacyComponentNames';
+const OUTPUT_FILE_NAME = 'RCTLegacyInteropComponents.mm';
+
+const argv = yargs
+  .option('p', {
+    alias: 'path',
+    description: 'Path to React Native application',
+  })
+  .option('o', {
+    alias: 'outputPath',
+    description: 'Path where generated artifacts will be output to',
+  })
+  .usage('Usage: $0 -p [path to app]')
+  .demandOption(['p']).argv;
+
+const appRoot = argv.path;
+const outputPath = argv.outputPath;
+
+function fileBody(components) {
+  // eslint-disable duplicate-license-header
+  return `
+/*
+ * 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.
+ */
+
+#import "RCTLegacyInteropComponents.h"
+
+@implementation RCTLegacyInteropComponents
+
++ (NSArray<NSString *> *)legacyInteropComponents
+{
+  return @[
+${components}
+  ];
+}
+
+@end
+`;
+  // eslint-enable duplicate-license-header
+}
+
+function extractComponentsNames(reactNativeConfig) {
+  if (!reactNativeConfig) {
+    console.log('No reactNativeConfig in the react-native.config.js file');
+    return null;
+  }
+
+  const project = reactNativeConfig[PROJECT_FIELD];
+
+  if (!project) {
+    console.log(`No ${PROJECT_FIELD} in the react-native config`);
+    return null;
+  }
+
+  const ios = project[IOS_FIELD];
+
+  if (!ios) {
+    console.log(
+      `No ${IOS_FIELD} in the ${PROJECT_FIELD} object of the config file`,
+    );
+    return null;
+  }
+
+  const componentNames = ios[LEGACY_COMPONENTS_FIELD];
+
+  if (!componentNames) {
+    console.log(
+      `No '${LEGACY_COMPONENTS_FIELD}' field in the ${PROJECT_FIELD}.${IOS_FIELD} object`,
+    );
+    return null;
+  }
+  return componentNames;
+}
+
+function generateRCTLegacyInteropComponents() {
+  const configFilePath = `${appRoot}/${CONFIG_FILE_NAME}`;
+  let reactNativeConfig = null;
+  try {
+    reactNativeConfig = require(configFilePath);
+  } catch (error) {
+    console.log(`No ${configFilePath}. Skip LegacyInterop generation`);
+    return;
+  }
+
+  const componentNames = extractComponentsNames(reactNativeConfig);
+  if (!componentNames) {
+    console.log('Skip LegacyInterop generation');
+    return;
+  }
+
+  let componentsArray = componentNames.map(name => `\t\t\t@"${name}",`);
+  // Remove the last comma
+  if (componentsArray.length > 0) {
+    componentsArray[componentsArray.length - 1] = componentsArray[
+      componentsArray.length - 1
+    ].slice(0, -1);
+  }
+
+  const filePath = `${outputPath}/${OUTPUT_FILE_NAME}`;
+  fs.writeFileSync(filePath, fileBody(componentsArray.join('\n')));
+}
+
+generateRCTLegacyInteropComponents();

package/scripts/find-node-for-xcode.sh

@@ -58,7 +58,10 @@ if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
 fi
 
 # Set up asdf-vm if present
-if [[ -f "$HOME/.asdf/asdf.sh" ]]; then
+if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
+  # shellcheck source=/dev/null
+  . "$ASDF_DIR/asdf.sh"
+elif [[ -f "$HOME/.asdf/asdf.sh" ]]; then
   # shellcheck source=/dev/null
   . "$HOME/.asdf/asdf.sh"
 elif [[ -x "$(command -v brew)" && -f "$(brew --prefix asdf)/asdf.sh" ]]; then

package/scripts/generate-provider-cli.js

@@ -13,7 +13,7 @@ let RNCodegen;
 try {
   RNCodegen = require('../packages/react-native-codegen/lib/generators/RNCodegen.js');
 } catch (e) {
-  RNCodegen = require('react-native-codegen/lib/generators/RNCodegen.js');
+  RNCodegen = require('@react-native/codegen/lib/generators/RNCodegen.js');
   if (!RNCodegen) {
     throw 'RNCodegen not found.';
   }

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

@@ -39,7 +39,7 @@ async function main(isInCI) {
   }
 }
 
-const isInCI = process.env.REACT_NATIVE_CI === 'true';
+const isInCI = process.env.CI === 'true';
 
 main(isInCI).then(() => {
   process.exit(0);

package/scripts/packager.sh

@@ -8,16 +8,16 @@
 THIS_DIR=$(cd -P "$(dirname "$(readlink "${BASH_SOURCE[0]}" || echo "${BASH_SOURCE[0]}")")" && pwd)
 REACT_NATIVE_ROOT="$THIS_DIR/.."
 # Application root directory - General use case: react-native is a dependency
-PROJECT_ROOT="$THIS_DIR/../../.."
+PROJECT_ROOT=${PROJECT_ROOT:-"$THIS_DIR/../../.."}
 
 # check and assign NODE_BINARY env
 # shellcheck disable=SC1090
 source "${THIS_DIR}/node-binary.sh"
 
 # When running react-native tests, react-native doesn't live in node_modules but in the PROJECT_ROOT
-if [ ! -d "$PROJECT_ROOT/node_modules/react-native" ];
+if [ ! -d "$THIS_DIR/../../../node_modules/react-native" ];
 then
-  PROJECT_ROOT="$THIS_DIR/.."
+  PROJECT_ROOT="$THIS_DIR/../../.."
 fi
 # Start packager from PROJECT_ROOT
 cd "$PROJECT_ROOT" || exit

package/scripts/react-native-xcode.sh

@@ -58,9 +58,8 @@ esac
 
 # Path to react-native folder inside node_modules
 REACT_NATIVE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-# The project should be located next to where react-native is installed
-# in node_modules.
-PROJECT_ROOT=${PROJECT_ROOT:-"$REACT_NATIVE_DIR/../.."}
+# Most projects have their project root, one level up from their Xcode project dir (the "ios" directory)
+PROJECT_ROOT=${PROJECT_ROOT:-"$PROJECT_DIR/.."}
 
 cd "$PROJECT_ROOT" || exit
 

package/scripts/react_native_pods.rb

@@ -23,8 +23,19 @@ $FOLLY_VERSION = '2021.07.22.00'
 
 $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
+
 # This function returns the min iOS version supported by React Native
-# By using this function, you won't have to manualy change your Podfile
+# By using this function, you won't have to manually change your Podfile
 # when we change the minimum version supported by the framework.
 def min_ios_version_supported
   return '12.4'
@@ -64,16 +75,21 @@ def use_react_native! (
   ios_folder: 'ios'
 )
 
+  # Set the app_path as env variable so the podspecs can access it.
+  ENV['APP_PATH'] = app_path
+  ENV['REACT_NATIVE_PATH'] = path
+
   # 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(app_path, ios_folder, $CODEGEN_OUTPUT_DIR)
+  CodegenUtils.clean_up_build_folder(path, app_path, ios_folder, $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.
   ENV['RCT_NEW_ARCH_ENABLED'] = new_arch_enabled ? "1" : "0"
   fabric_enabled = fabric_enabled || new_arch_enabled
+  ENV['RCT_FABRIC_ENABLED'] = fabric_enabled ? "1" : "0"
   ENV['USE_HERMES'] = hermes_enabled ? "1" : "0"
 
   prefix = path
@@ -82,7 +98,7 @@ def use_react_native! (
 
   # The Pods which should be included in all projects
   pod 'FBLazyVector', :path => "#{prefix}/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec"
+  pod 'FBReactNativeSpec', :path => "#{prefix}/React/FBReactNativeSpec" if !new_arch_enabled
   pod 'RCTRequired', :path => "#{prefix}/Libraries/RCTRequired"
   pod 'RCTTypeSafety', :path => "#{prefix}/Libraries/TypeSafety", :modular_headers => true
   pod 'React', :path => "#{prefix}/"
@@ -99,7 +115,7 @@ def use_react_native! (
   pod 'React-RCTText', :path => "#{prefix}/Libraries/Text"
   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"
 
   if hermes_enabled
@@ -116,6 +132,7 @@ def use_react_native! (
   pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger"
   pod 'React-logger', :path => "#{prefix}/ReactCommon/logger"
   pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true
+  pod 'React-NativeModulesApple', :path => "#{prefix}/ReactCommon/react/nativemodule/core/platform/ios", :modular_headers => true
   pod 'Yoga', :path => "#{prefix}/ReactCommon/yoga", :modular_headers => true
 
   pod 'DoubleConversion', :podspec => "#{prefix}/third-party-podspecs/DoubleConversion.podspec"
@@ -139,8 +156,11 @@ def use_react_native! (
   pod 'React-Codegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
 
   if fabric_enabled
-    checkAndGenerateEmptyThirdPartyProvider!(prefix, new_arch_enabled, $CODEGEN_OUTPUT_DIR)
-    setup_fabric!(:react_native_path => prefix)
+    checkAndGenerateEmptyThirdPartyProvider!(prefix, new_arch_enabled)
+    setup_fabric!(:react_native_path => prefix, new_arch_enabled: new_arch_enabled)
+  else
+    relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
+    build_codegen!(prefix, relative_installation_root)
   end
 
   # CocoaPods `configurations` option ensures that the target is copied only for the specified configurations,
@@ -200,7 +220,13 @@ end
 # - installer: the Cocoapod object that allows to customize the project.
 # - react_native_path: path to React Native.
 # - mac_catalyst_enabled: whether we are running the Pod on a Mac Catalyst project or not.
-def react_native_post_install(installer, react_native_path = "../node_modules/react-native", mac_catalyst_enabled: false)
+# - enable_hermes_profiler: whether the hermes profiler should be turned on in Release mode
+def react_native_post_install(
+  installer, react_native_path = "../node_modules/react-native",
+  mac_catalyst_enabled: false,
+  enable_hermes_profiler: false
+)
+  enable_hermes_profiler = enable_hermes_profiler || ENV["ENABLE_HERMES_PROFILER"] == "1"
   ReactNativePodsUtils.turn_off_resource_bundle_react_core(installer)
 
   ReactNativePodsUtils.apply_mac_catalyst_patches(installer) if mac_catalyst_enabled
@@ -209,25 +235,20 @@ def react_native_post_install(installer, react_native_path = "../node_modules/re
     flipper_post_install(installer)
   end
 
-  package_path = File.join(Pod::Config.instance.installation_root, react_native_path, "package.json")
-  package = JSON.parse(File.read(package_path))
-  version = package['version']
-
-  if ReactNativePodsUtils.has_pod(installer, 'hermes-engine') && is_building_hermes_from_source(version, react_native_path)
-    add_copy_hermes_framework_script_phase(installer, react_native_path)
-  else
-    remove_copy_hermes_framework_script_phase(installer, react_native_path)
-    remove_hermesc_build_dir(react_native_path)
-  end
+  fabric_enabled = ReactNativePodsUtils.has_pod(installer, 'React-Fabric')
 
   ReactNativePodsUtils.exclude_i386_architecture_while_using_hermes(installer)
   ReactNativePodsUtils.fix_library_search_paths(installer)
+  ReactNativePodsUtils.update_search_paths(installer)
   ReactNativePodsUtils.set_node_modules_user_settings(installer, react_native_path)
+  ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: fabric_enabled)
+  ReactNativePodsUtils.enable_hermes_profiler(installer, enable_hermes_profiler: enable_hermes_profiler)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
   is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == "1"
   NewArchitectureHelper.modify_flags_for_new_architecture(installer, is_new_arch_enabled)
 
+
   Pod::UI.puts "Pod install took #{Time.now.to_i - $START_TIME} [s] to run".green
 end
 
@@ -239,7 +260,7 @@ def use_react_native_codegen!(spec, options={})
   # 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] ||= "../.."
+  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"
@@ -318,9 +339,9 @@ def use_react_native_codegen!(spec, options={})
     # 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: $CODEGEN_OUTPUT_DIR,
-      codegen_module_dir: $CODEGEN_MODULE_DIR,
-      codegen_component_dir: $CODEGEN_COMPONENT_DIR,
+      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,

package/scripts/react_native_pods_utils/script_phases.rb

@@ -48,6 +48,6 @@ def get_script_template(react_native_path, export_vars={})
         WITH_ENVIRONMENT="$RCT_SCRIPT_RN_DIR/scripts/xcode/with-environment.sh"
         /bin/sh -c "$WITH_ENVIRONMENT $SCRIPT_PHASES_SCRIPT"
         EOS
-    result = ERB.new(template, 0, '->').result(binding)
+    result = ERB.new(template, trim_mode: '->').result(binding)
     return result
 end

package/scripts/react_native_pods_utils/script_phases.sh

@@ -31,9 +31,9 @@ find_node () {
 }
 
 find_codegen () {
-    CODEGEN_CLI_PATH=$("$NODE_BINARY" --print "require('path').dirname(require.resolve('react-native-codegen/package.json'))")
+    CODEGEN_CLI_PATH=$("$NODE_BINARY" --print "require('path').dirname(require.resolve('@react-native/codegen/package.json'))")
     if ! [ -d "$CODEGEN_CLI_PATH" ]; then
-        error "error: Could not determine react-native-codegen location, using node module resolution. Try running 'yarn install' or 'npm install' in your project root."
+        error "error: Could not determine @react-native/codegen location, using node module resolution. Try running 'yarn install' or 'npm install' in your project root."
     fi
 }
 
@@ -109,7 +109,7 @@ moveOutputs () {
     ls -1 "$RCT_SCRIPT_OUTPUT_DIR" >> "${SCRIPT_OUTPUT_FILE_0}" 2>&1
 }
 
-withCodgenDiscovery () {
+withCodegenDiscovery () {
     setup_dirs
     find_node
     find_codegen
@@ -127,7 +127,7 @@ noCodegenDiscovery () {
 }
 
 if [ "$RCT_SCRIPT_TYPE" = "withCodegenDiscovery" ]; then
-    withCodgenDiscovery "$@"
+    withCodegenDiscovery "$@"
 else
     noCodegenDiscovery "$@"
 fi

package/scripts/xcode/with-environment.sh

@@ -32,12 +32,12 @@ fi
 if [ -n "$NODE_BINARY" ]; then
     echo "Node found at: ${NODE_BINARY}"
 else
-    echo "[Warning] You need to configure your node path in the `'.xcode.env' file` environment. " \
-       "You can set it up quickly by running: " \
-       "echo 'export NODE_BINARY=$(command -v node)' > .xcode.env " \
-       "in the ios folder. This is needed by React Native to work correctly. " \
-       "We fallback to the DEPRECATED behavior of finding `node`. This will be REMOVED in a future version. " \
-       "You can read more about this here: https://reactnative.dev/docs/environment-setup#optional-configuring-your-environment" >&2
+    echo '[Warning] You need to configure your node path in the `".xcode.env" file` environment. ' \
+       'You can set it up quickly by running: ' \
+       '`echo export NODE_BINARY=$(command -v node) > .xcode.env` ' \
+       'in the ios folder. This is needed by React Native to work correctly. ' \
+       'We fallback to the DEPRECATED behavior of finding `node`. This will be REMOVED in a future version. ' \
+       'You can read more about this here: https://reactnative.dev/docs/environment-setup#optional-configuring-your-environment' >&2
     source "${REACT_NATIVE_PATH}/scripts/find-node-for-xcode.sh"
 fi
 

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2023-03-07-RNv0.71.4-31fdcf738940875c9bacf251e149006cf515d763
+hermes-2023-03-20-RNv0.72.0-49794cfc7c81fb8f69fd60c3bbf85a7480cc5a77

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

@@ -17,42 +17,13 @@ version = package['version']
 
 # sdks/.hermesversion
 hermestag_file = File.join(react_native_path, "sdks", ".hermesversion")
-isInCI = ENV['REACT_NATIVE_CI'] === 'true'
+build_from_source = ENV['BUILD_FROM_SOURCE'] === 'true'
 
-source = {}
 git = "https://github.com/facebook/hermes.git"
 
-isInMain = version.include?('1000.0.0')
-isNightly = version.start_with?('0.0.0-')
+abort_if_invalid_tarball_provided!
 
-if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
-  if !File.exist?(ENV['HERMES_ENGINE_TARBALL_PATH'])
-    abort "[Hermes] HERMES_ENGINE_TARBALL_PATH is set, but points to a non-existing file: \"#{ENV['HERMES_ENGINE_TARBALL_PATH']}\"\nIf you don't want to use tarball, run `unset HERMES_ENGINE_TARBALL_PATH`"
-  end
-end
-
-if ENV.has_key?('HERMES_ENGINE_TARBALL_PATH')
-  Pod::UI.puts "[Hermes] Using pre-built Hermes binaries from local path: #{ENV['HERMES_ENGINE_TARBALL_PATH']}".yellow if Object.const_defined?("Pod::UI")
-  source[:http] = "file://#{ENV['HERMES_ENGINE_TARBALL_PATH']}"
-elsif isInMain
-  Pod::UI.puts '[Hermes] Installing hermes-engine may take slightly longer, building Hermes compiler from source...'.yellow if Object.const_defined?("Pod::UI")
-  source[:git] = git
-  source[:commit] = `git ls-remote https://github.com/facebook/hermes main | cut -f 1`.strip
-elsif isNightly
-  Pod::UI.puts '[Hermes] Nightly version, download pre-built for Hermes'.yellow if Object.const_defined?("Pod::UI")
-  destination_path = download_nightly_hermes(react_native_path, version)
-  # set tarball as hermes engine
-  source[:http] = "file://#{destination_path}"
-elsif File.exist?(hermestag_file) && isInCI
-  Pod::UI.puts '[Hermes] Detected that you are on a React Native release branch, building Hermes from source but fetched from tag...'.yellow if Object.const_defined?("Pod::UI")
-  hermestag = File.read(hermestag_file).strip
-  source[:git] = git
-  source[:tag] = hermestag
-else
-  # Sample url from Maven:
-  # https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/0.71.0/react-native-artifacts-0.71.0-hermes-ios-debug.tar.gz
-  source[:http] = "https://repo1.maven.org/maven2/com/facebook/react/react-native-artifacts/#{version}/react-native-artifacts-#{version}-hermes-ios-#{build_type.to_s}.tar.gz"
-end
+source = compute_hermes_source(build_from_source, hermestag_file, git, version, build_type, react_native_path)
 
 Pod::Spec.new do |spec|
   spec.name        = "hermes-engine"
@@ -68,11 +39,14 @@ Pod::Spec.new do |spec|
   spec.preserve_paths      = '**/*.*'
   spec.source_files        = ''
 
-  spec.xcconfig = {
+  spec.pod_target_xcconfig = {
                     "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                     "CLANG_CXX_LIBRARY" => "compiler-default"
                   }.merge!(build_type == :debug ? { "GCC_PREPROCESSOR_DEFINITIONS" => "HERMES_ENABLE_DEBUGGER=1" } : {})
 
+  spec.ios.vendored_frameworks = "destroot/Library/Frameworks/ios/hermes.framework"
+  spec.osx.vendored_frameworks = "destroot/Library/Frameworks/macosx/hermes.framework"
+
   if source[:http] then
 
     spec.subspec 'Pre-built' do |ss|
@@ -104,39 +78,36 @@ Pod::Spec.new do |spec|
       ss.header_dir = 'hermes/Public'
     end
 
-    hermesc_path = ""
+    hermesc_path = "${PODS_ROOT}/hermes-engine/build_host_hermesc"
 
     if ENV.has_key?('HERMES_OVERRIDE_HERMESC_PATH') && File.exist?(ENV['HERMES_OVERRIDE_HERMESC_PATH']) then
       hermesc_path = ENV['HERMES_OVERRIDE_HERMESC_PATH']
-    else
-      # Keep hermesc_path synchronized with .gitignore entry.
-      ENV['REACT_NATIVE_PATH'] = react_native_path
-      hermesc_path = "${REACT_NATIVE_PATH}/sdks/hermes-engine/build_host_hermesc"
-      # NOTE: Prepare command is not run  if the pod is not downloaded.
-      spec.prepare_command = ". #{react_native_path}/sdks/hermes-engine/utils/build-hermesc-xcode.sh #{hermesc_path}"
     end
 
     spec.user_target_xcconfig = {
-      'FRAMEWORK_SEARCH_PATHS' => '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/iphoneos" ' +
-                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/iphonesimulator" ' +
-                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/macosx" ' +
-                                  '"$(PODS_ROOT)/hermes-engine/destroot/Library/Frameworks/catalyst"',
-      'OTHER_LDFLAGS' => '-framework "hermes"',
       'HERMES_CLI_PATH' => "#{hermesc_path}/bin/hermesc"
     }
 
+    spec.prepare_command = ". #{react_native_path}/sdks/hermes-engine/utils/create-dummy-hermes-xcframework.sh"
+
+    CMAKE_BINARY = %x(command -v cmake | tr -d '\n')
+    # NOTE: Script phases are sorted alphabetically inside Xcode project
     spec.script_phases = [
       {
-        :name => 'Build Hermes',
+        :name => '[RN] [1] Build Hermesc',
         :script => <<-EOS
         . ${PODS_ROOT}/../.xcode.env
-        export CMAKE_BINARY=${CMAKE_BINARY:-#{%x(command -v cmake | tr -d '\n')}}
-        . ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/build-hermes-xcode.sh #{version} #{hermesc_path}/ImportHermesc.cmake
+        export CMAKE_BINARY=${CMAKE_BINARY:-#{CMAKE_BINARY}}
+        . ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/build-hermesc-xcode.sh #{hermesc_path}
         EOS
       },
       {
-        :name => 'Copy Hermes Framework',
-        :script => ". ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/copy-hermes-xcode.sh"
+        :name => '[RN] [2] Build Hermes',
+        :script => <<-EOS
+        . ${PODS_ROOT}/../.xcode.env
+        export CMAKE_BINARY=${CMAKE_BINARY:-#{CMAKE_BINARY}}
+        . ${REACT_NATIVE_PATH}/sdks/hermes-engine/utils/build-hermes-xcode.sh #{version} #{hermesc_path}/ImportHermesc.cmake
+        EOS
       }
     ]
   end