react-native-tvos 0.74.5-0 → 0.75.2-0rc1

package/scripts/cocoapods/autolinking.rb

@@ -0,0 +1,205 @@
+# 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.
+
+require 'json'
+require 'pathname'
+require 'cocoapods'
+require_relative './autolinking_utils.rb'
+require_relative '../react_native_pods.rb'
+
+# Your project will have to depend on the @react-native-community/cli if you use this method
+# for listing React native modules.
+#
+# Parameters:
+# - config_command: the command to run to get the application's current config, e.g. ['npx', '@react-native-community/cli', 'config']
+def list_native_modules!(config_command)
+
+  if !(config_command.is_a? Array and config_command.size > 0)
+    Pod::UI.warn "Expected a list_native_modules! to be called with a config command", [
+      "Unable to autolink if no config is provided for the current project."
+    ]
+    exit(1)
+  end
+
+  # Ignore stderr output, we're only interested in stdout and the return code. Libraries can output warnings to
+  # stderr which create problems for JSON deserializing.
+  json, _, status = Pod::Executable.capture_command(config_command[0], config_command[1..], capture: :both)
+
+  if not status.success?
+    Pod::UI.warn "The command: '#{config_command.join(" ").bold.yellow}' returned a status code of #{status.exitstatus.to_s.bold.red}", [
+        "In order to autolink using Cocoapods, this framework uses @react-native-community/cli to discover React Native native modules",
+        "Please either add it: yarn add -D @react-native-community/cli or consult your framework's documentation."
+    ]
+    exit(status.exitstatus)
+  end
+
+  config = JSON.parse(json)
+
+  packages = config["dependencies"]
+  ios_project_root = Pathname.new(config["project"]["ios"]["sourceDir"])
+  react_native_path = Pathname.new(config["reactNativePath"])
+  found_pods = []
+
+  packages.each do |package_name, package|
+    next unless package_config = package["platforms"]["ios"]
+
+    name = package["name"]
+    podspec_path = package_config["podspecPath"]
+    script_phases = package_config["scriptPhases"]
+    configurations = package_config["configurations"]
+
+    # Add a warning to the queue and continue to the next dependency if the podspec_path is nil/empty
+    if podspec_path.nil? || podspec_path.empty?
+      Pod::UI.warn("list_native_modules! skipped the react-native dependency '#{name}'. No podspec file was found.",
+        [
+          "Check to see if there is an updated version that contains the necessary podspec file",
+          "Contact the library maintainers or send them a PR to add a podspec. The react-native-webview podspec is a good example of a package.json driven podspec. See https://github.com/react-native-community/react-native-webview/blob/master/react-native-webview.podspec",
+          "If necessary, you can disable autolinking for the dependency and link it manually. See https://github.com/react-native-community/cli/blob/main/docs/autolinking.md#how-can-i-disable-autolinking-for-unsupported-library"
+        ])
+      next
+    end
+
+    spec = Pod::Specification.from_file(podspec_path)
+
+    # Skip pods that do not support the platform of the current target.
+    next unless AutolinkingUtils.is_platform_supported?(current_target_definition, spec)
+
+    podspec_dir_path = Pathname.new(File.dirname(podspec_path))
+
+    relative_path = podspec_dir_path.relative_path_from ios_project_root
+
+    found_pods.push({
+      "configurations": configurations,
+      "name": name,
+      "path": relative_path.to_path,
+      "podspec_path": podspec_path,
+      "script_phases": script_phases
+    })
+  end
+
+  if found_pods.size > 0
+    pods = found_pods.map { |p| p[:name] }.sort.to_sentence
+    Pod::UI.puts "Found #{found_pods.size} #{"module".pluralize(found_pods.size)} for target `#{current_target_definition.name}`"
+  end
+
+  return {
+    "ios_packages": found_pods,
+    "ios_project_root_path": ios_project_root.to_s,
+    "react_native_path": react_native_path.relative_path_from(ios_project_root).to_s
+  }
+end
+
+# Your project will have to depend on the @react-native-community/cli if you use this method
+# for listing React native modules.
+#
+# Parameters:
+# - config:
+#   - :ios_packages - Array of React Native iOS packages, e.g. [{ package_name: "Foo", package: { .. }}, ...]
+#   - :ios_project_root_path - Absolute path to the react_native project's ios folder, e.g. /Users/foobar/project/rn_project/ios
+#   - :react_native_path - Relative path to the react_native from the project, e.g. ./node_modules/react-native
+def link_native_modules!(config)
+  Pod::UI.puts "link_native_modules! #{config}"
+
+  if !(
+    config[:ios_packages].is_a? Array and
+    config[:ios_project_root_path].is_a? String and
+    config[:react_native_path].is_a? String
+  )
+    Pod::UI.warn("link_native_modules! has been called with a malformed 'config' parameter",
+      [
+        "This is the config argument passed: #{config.inspect}",
+      ]);
+    exit(1)
+  end
+
+  ios_project_root = config[:ios_project_root_path]
+
+  packages = config[:ios_packages]
+  found_pods = []
+
+  packages.each do |package|
+    podspec_path = package[:podspec_path]
+    configurations = package[:configurations]
+
+    # Add a warning to the queue and continue to the next dependency if the podspec_path is nil/empty
+    if podspec_path.nil? || podspec_path.empty?
+      Pod::UI.warn("use_native_modules! skipped the react-native dependency '#{package[:name]}'. No podspec file was found.",
+        [
+          "Check to see if there is an updated version that contains the necessary podspec file",
+          "Contact the library maintainers or send them a PR to add a podspec. The react-native-webview podspec is a good example of a package.json driven podspec. See https://github.com/react-native-community/react-native-webview/blob/master/react-native-webview.podspec",
+          "If necessary, you can disable autolinking for the dependency and link it manually. See https://github.com/react-native-community/cli/blob/main/docs/autolinking.md#how-can-i-disable-autolinking-for-unsupported-library"
+        ])
+      next
+    end
+
+    spec = Pod::Specification.from_file(podspec_path)
+
+    # Don't try track packages that exclude our platforms
+    next unless AutolinkingUtils.is_platform_supported?(current_target_definition, spec)
+
+    # We want to do a look up inside the current CocoaPods target
+    # to see if it's already included, this:
+    #   1. Gives you the chance to define it beforehand
+    #   2. Ensures CocoaPods won't explode if it's included twice
+    #
+    this_target = current_target_definition
+    existing_deps = current_target_definition.dependencies
+
+    # Skip dependencies that the user already activated themselves.
+    next if existing_deps.find do |existing_dep|
+      existing_dep.name.split('/').first == spec.name
+    end
+
+    podspec_dir_path = Pathname.new(File.dirname(podspec_path))
+
+    relative_path = podspec_dir_path.relative_path_from ios_project_root
+
+    # Register the found React Native module into our collection of Pods.
+    pod spec.name, :path => relative_path.to_path, :configurations => configurations
+
+    if package[:script_phases] && !this_target.abstract?
+      # Can be either an object, or an array of objects
+      Array(package[:script_phases]).each do |phase|
+        # see https://www.rubydoc.info/gems/cocoapods-core/Pod/Podfile/DSL#script_phase-instance_method
+        # for the full object keys
+        Pod::UI.puts "Adding a custom script phase for Pod #{spec.name}: #{phase["name"] || 'No name specified.'}"
+
+        # Support passing in a path relative to the root of the package
+        if phase["path"]
+          phase["script"] = File.read(File.expand_path(phase["path"], package[:path]))
+          phase.delete("path")
+        end
+
+        # Support converting the execution position into a symbol
+        phase["execution_position"] = phase["execution_position"]&.to_sym
+
+        phase = Hash[phase.map { |k, v| [k.to_sym, v] }]
+        script_phase phase
+      end
+    end
+
+    found_pods.push spec
+  end
+
+  if found_pods.size > 0
+    pods = found_pods.map { |p| p.name }.sort.to_sentence
+    Pod::UI.puts "Auto-linking React Native #{"module".pluralize(found_pods.size)} for target `#{current_target_definition.name}`: #{pods}"
+  end
+
+  return {
+    :reactNativePath => config[:react_native_path]
+  }
+end
+
+$default_command = ['node', '-e', "process.argv=['', '', 'config'];require('@react-native-community/cli').run()"];
+
+# Autolink your native modules
+#
+# Parameters:
+# - config_command: the command to run to get the application's current config, e.g. ['npx', '@react-native-community/cli', 'config'],
+#                   you can override this if you'd like to avoid the dependency. e.g. ['cat', 'your_config.json']
+def use_native_modules!(config_command = $default_command)
+  return link_native_modules!(list_native_modules!(config_command))
+end

package/scripts/cocoapods/autolinking_utils.rb

@@ -0,0 +1,25 @@
+# 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.
+
+class AutolinkingUtils
+
+    def self.nested_path_exists?(object, *path)
+        path.reduce(object) do |obj, method|
+            return false unless obj.respond_to?(method)
+            obj.public_send(method)
+        end
+        return true
+    end
+
+    def self.is_platform_supported?(current_target_definition, spec)
+        platform = current_target_definition.platform
+        if !platform
+            # Historically we've supported platforms that aren't specifically excluded.
+            return true
+        end
+        return spec.supported_on_platform?(platform.name)
+    end
+
+end

package/scripts/cocoapods/codegen_utils.rb

@@ -43,7 +43,7 @@ class CodegenUtils
         # This podspec file should only be create once in the session/pod install.
         # This happens when multiple targets are calling use_react_native!.
         if @@REACT_CODEGEN_PODSPEC_GENERATED
-          Pod::UI.puts "[Codegen] Skipping React-Codegen podspec generation."
+          Pod::UI.puts "[Codegen] Skipping ReactCodegen podspec generation."
           return
         end
 
@@ -51,7 +51,7 @@ class CodegenUtils
         output_dir = "#{relative_installation_root}/#{codegen_output_dir}"
         Pod::Executable.execute_command("mkdir", ["-p", output_dir]);
 
-        podspec_path = file_manager.join(output_dir, 'React-Codegen.podspec.json')
+        podspec_path = file_manager.join(output_dir, 'ReactCodegen.podspec.json')
         Pod::UI.puts "[Codegen] Generating #{podspec_path}"
 
         file_manager.open(podspec_path, 'w') do |f|
@@ -62,7 +62,7 @@ class CodegenUtils
         @@REACT_CODEGEN_PODSPEC_GENERATED = true
     end
 
-    # It generates the podspec object that represents the `React-Codegen.podspec` file
+    # It generates the podspec object that represents the `ReactCodegen.podspec` file
     #
     # Parameters
     # - package_json_file: the path to the `package.json`, required to extract the proper React Native version
@@ -81,7 +81,7 @@ class CodegenUtils
           "\"$(PODS_ROOT)/RCT-Folly\"",
           "\"$(PODS_ROOT)/DoubleConversion\"",
           "\"$(PODS_ROOT)/fmt/include\"",
-          "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
+          "\"${PODS_ROOT}/Headers/Public/ReactCodegen/react/renderer/components\"",
           "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
           "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
           "\"$(PODS_ROOT)/Headers/Private/Yoga\"",
@@ -108,7 +108,7 @@ class CodegenUtils
         end
 
         spec = {
-          'name' => "React-Codegen",
+          'name' => "ReactCodegen",
           'version' => version,
           'summary' => 'Temp pod for generated files for React Native',
           'homepage' => 'https://facebook.com/',
@@ -156,7 +156,7 @@ class CodegenUtils
         end
 
         if script_phases
-          Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen."
+          Pod::UI.puts "[Codegen] Adding script_phases to ReactCodegen."
           spec[:'script_phases'] = script_phases
         end
 
@@ -298,7 +298,7 @@ class CodegenUtils
       Pod::UI.warn '[Codegen] warn: using experimental new codegen integration'
       relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
 
-      # Generate React-Codegen podspec here to add the script phases.
+      # Generate ReactCodegen podspec here to add the script phases.
       script_phases = codegen_utils.get_react_codegen_script_phases(
         app_path,
         :fabric_enabled => fabric_enabled,

package/scripts/cocoapods/fabric.rb

@@ -9,6 +9,7 @@
 # @parameter react_native_path: relative path to react-native
 def setup_fabric!(react_native_path: "../node_modules/react-native")
     pod 'React-Fabric', :path => "#{react_native_path}/ReactCommon"
+    pod 'React-FabricComponents', :path => "#{react_native_path}/ReactCommon"
     pod 'React-graphics', :path => "#{react_native_path}/ReactCommon/react/renderer/graphics"
     pod 'React-RCTFabric', :path => "#{react_native_path}/React", :modular_headers => true
     pod 'React-ImageManager', :path => "#{react_native_path}/ReactCommon/react/renderer/imagemanager/platform/ios"

package/scripts/cocoapods/new_architecture.rb

@@ -101,7 +101,7 @@ class NewArchitectureHelper
         ReactNativePodsUtils.add_flag_to_map_with_inheritance(current_config, "OTHER_CPLUSPLUSFLAGS", self.computeFlags(new_arch_enabled))
 
         spec.dependency "React-RCTFabric" # This is for Fabric Component
-        spec.dependency "React-Codegen"
+        spec.dependency "ReactCodegen"
 
         spec.dependency "RCTRequired"
         spec.dependency "RCTTypeSafety"

package/scripts/cocoapods/spm.rb

@@ -0,0 +1,94 @@
+# 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.
+
+class SPMManager
+  def initialize()
+     @dependencies_by_pod = {}
+  end
+
+  def dependency(pod_spec, url:, requirement:,  products:)
+    @dependencies_by_pod[pod_spec.name] ||= []
+    @dependencies_by_pod[pod_spec.name] << { url: url, requirement: requirement, products: products}
+  end
+
+  def apply_on_post_install(installer)
+    project = installer.pods_project
+
+    log 'Cleaning old SPM dependencies from Pods project'
+    clean_spm_dependencies_from_target(project, @dependencies_by_pod)
+    log 'Adding SPM dependencies to Pods project'
+    @dependencies_by_pod.each do |pod_name, dependencies|
+      dependencies.each do |spm_spec|
+        log "Adding SPM dependency on product #{spm_spec[:products]}"
+        add_spm_to_target(
+          project,
+          project.targets.find { |t| t.name == pod_name},
+          spm_spec[:url],
+          spm_spec[:requirement],
+          spm_spec[:products]
+        )
+        log " Adding workaround for Swift package not found issue"
+        target = project.targets.find { |t| t.name == pod_name}
+        target.build_configurations.each do |config|
+          target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'] ||= ['$(inherited)']
+          search_path = '${SYMROOT}/${CONFIGURATION}${EFFECTIVE_PLATFORM_NAME}/'
+          unless target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'].include?(search_path)
+            target.build_settings(config.name)['SWIFT_INCLUDE_PATHS'].push(search_path)
+          end
+        end
+      end
+    end
+
+    unless @dependencies_by_pod.empty?
+      log_warning "If you're using Xcode 15 or earlier you might need to close and reopen the Xcode workspace"
+      unless ENV["USE_FRAMEWORKS"] == "dynamic"
+        @dependencies_by_pod.each do |pod_name, dependencies|
+          log_warning "Pod #{pod_name} is using swift package(s) #{dependencies.map{|i| i[:products]}.flatten.uniq.join(", ")} with static linking, this might cause linker errors. Consider using USE_FRAMEOWRKS=dynamic, see https://github.com/facebook/react-native/pull/44627#issuecomment-2123119711 for more information"
+        end
+      end
+    end
+  end
+
+  private
+
+  def log(msg)
+    ::Pod::UI.puts "[SPM] #{msg}"
+  end
+
+  def log_warning(msg)
+    ::Pod::UI.puts "\n\n[SPM] WARNING!!! #{msg}\n\n"
+  end
+
+  def clean_spm_dependencies_from_target(project, new_targets)
+    project.root_object.package_references.delete_if { |pkg| (pkg.class == Xcodeproj::Project::Object::XCRemoteSwiftPackageReference) }
+  end
+
+  def add_spm_to_target(project, target, url, requirement, products)
+    pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
+    ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
+    pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
+    if !pkg
+      pkg = project.new(pkg_class)
+      pkg.repositoryURL = url
+      pkg.requirement = requirement
+      log(" Adding package to workspace: #{pkg.inspect}")
+      project.root_object.package_references << pkg
+    end
+    products.each do |product_name|
+      ref = target.package_product_dependencies.find do |r|
+        r.class == ref_class && r.package == pkg && r.product_name == product_name
+      end
+      next if ref
+
+      log(" Adding product dependency #{product_name} to #{target.name}")
+      ref = project.new(ref_class)
+      ref.package = pkg
+      ref.product_name = product_name
+      target.package_product_dependencies << ref
+    end
+  end
+end
+
+SPM = SPMManager.new

package/scripts/cocoapods/utils.rb

@@ -61,26 +61,15 @@ class ReactNativePodsUtils
         end
     end
 
-    def self.set_use_hermes_build_setting(installer, hermes_enabled)
-        Pod::UI.puts("Setting USE_HERMES build settings")
+    def self.set_build_setting(installer, build_setting:, value:, config_name: nil)
+        Pod::UI.puts("Setting #{build_setting} build settings")
         projects = self.extract_projects(installer)
 
         projects.each do |project|
             project.build_configurations.each do |config|
-                config.build_settings["USE_HERMES"] = hermes_enabled
-            end
-
-            project.save()
-        end
-    end
-
-    def self.set_node_modules_user_settings(installer, react_native_path)
-        Pod::UI.puts("Setting REACT_NATIVE build settings")
-        projects = self.extract_projects(installer)
-
-        projects.each do |project|
-            project.build_configurations.each do |config|
-                config.build_settings["REACT_NATIVE_PATH"] = File.join("${PODS_ROOT}", "..", react_native_path)
+                if config_name == nil || config.name == config_name
+                    config.build_settings[build_setting] = value
+                end
             end
 
             project.save()
@@ -580,9 +569,9 @@ class ReactNativePodsUtils
     end
 
     def self.set_codegen_search_paths(target_installation_result)
-        header_search_paths = ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Codegen", "React_Codegen", [])
+        header_search_paths = ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCodegen", "ReactCodegen", [])
             .map { |search_path| "\"#{search_path}\"" }
-        ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "React-Codegen", header_search_paths)
+        ReactNativePodsUtils.update_header_paths_if_depends_on(target_installation_result, "ReactCodegen", header_search_paths)
     end
 
     def self.set_reactcommon_searchpaths(target_installation_result)
@@ -615,7 +604,7 @@ class ReactNativePodsUtils
             "RCTRequired",
             "RCTTypeSafety",
             "React",
-            "React-Codegen",
+            "ReactCodegen",
             "React-Core",
             "React-CoreModules",
             "React-Fabric",

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();