react-native-tvos 0.78.0-0rc4 → 0.79.0-0

package/package.json

@@ -1,19 +1,22 @@
 {
   "name": "react-native-tvos",
-  "version": "0.78.0-0rc4",
+  "version": "0.79.0-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/facebook/react-native.git",
+    "url": "git+https://github.com/react-native-tvos/react-native-tvos.git",
     "directory": "packages/react-native"
   },
-  "homepage": "https://reactnative.dev/",
+  "homepage": "https://github.com/react-native-tvos/react-native-tvos/wiki",
   "keywords": [
     "react",
     "react-native",
     "android",
     "ios",
+    "tvos",
+    "apple tv",
+    "android tv",
     "mobile",
     "cross-platform",
     "app-framework",
@@ -108,13 +111,13 @@
     }
   },
   "dependencies": {
-    "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.78.0-rc.4",
-    "@react-native/codegen": "0.78.0-rc.4",
-    "@react-native/community-cli-plugin": "0.78.0-rc.4",
-    "@react-native/gradle-plugin": "0.78.0-rc.4",
-    "@react-native/js-polyfills": "0.78.0-rc.4",
-    "@react-native/normalize-colors": "0.78.0-rc.4",
+    "@jest/create-cache-key-function": "^29.7.0",
+    "@react-native/assets-registry": "0.79.0",
+    "@react-native/codegen": "0.79.0",
+    "@react-native/community-cli-plugin": "0.79.0",
+    "@react-native/gradle-plugin": "0.79.0",
+    "@react-native/js-polyfills": "0.79.0",
+    "@react-native/normalize-colors": "0.79.0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -127,14 +130,14 @@
     "flow-enums-runtime": "^0.0.6",
     "glob": "^7.1.1",
     "invariant": "^2.2.4",
-    "jest-environment-node": "^29.6.3",
+    "jest-environment-node": "^29.7.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "^0.81.0",
-    "metro-source-map": "^0.81.0",
+    "metro-runtime": "^0.82.0",
+    "metro-source-map": "^0.82.0",
     "nullthrows": "^1.1.1",
     "pretty-format": "^29.7.0",
     "promise": "^8.3.0",
-    "react-devtools-core": "^6.0.1",
+    "react-devtools-core": "^6.1.1",
     "react-refresh": "^0.14.0",
     "regenerator-runtime": "^0.13.2",
     "scheduler": "0.25.0",
@@ -143,7 +146,7 @@
     "whatwg-fetch": "^3.0.0",
     "ws": "^6.2.3",
     "yargs": "^17.6.2",
-    "@react-native-tvos/virtualized-lists": "0.78.0-0rc4"
+    "@react-native-tvos/virtualized-lists": "0.79.0-0"
   },
   "codegenConfig": {
     "libraries": [

package/react-native.config.js

@@ -20,9 +20,24 @@
 
 const verbose = process.env.DEBUG && process.env.DEBUG.includes('react-native');
 
+function findCommunityPlatformPackage(spec, startDir = process.cwd()) {
+  // In monorepos, we cannot make any assumptions on where
+  // `@react-native-community/*` gets installed. The safest way to find it
+  // (barring adding an optional peer dependency) is to start from the project
+  // root.
+  //
+  // Note that we're assuming that the current working directory is the project
+  // root. This is also what `@react-native-community/cli` assumes (see
+  // https://github.com/react-native-community/cli/blob/14.x/packages/cli-tools/src/findProjectRoot.ts).
+  const main = require.resolve(spec, {paths: [startDir]});
+  return require(main);
+}
+
 let android;
 try {
-  android = require('@react-native-community/cli-platform-android');
+  android = findCommunityPlatformPackage(
+    '@react-native-community/cli-platform-android',
+  );
 } catch {
   if (verbose) {
     console.warn(
@@ -33,7 +48,9 @@ try {
 
 let ios;
 try {
-  ios = require('@react-native-community/cli-platform-ios');
+  ios = findCommunityPlatformPackage(
+    '@react-native-community/cli-platform-ios',
+  );
 } catch {
   if (verbose) {
     console.warn(
@@ -44,27 +61,11 @@ try {
 
 const commands = [];
 
-try {
-  const {
-    bundleCommand,
-    startCommand,
-  } = require('@react-native/community-cli-plugin');
-  commands.push(bundleCommand, startCommand);
-} catch (e) {
-  const known =
-    e.code === 'MODULE_NOT_FOUND' &&
-    e.message.includes('@react-native-community/cli-server-api');
-
-  if (!known) {
-    throw e;
-  }
-
-  if (verbose) {
-    console.warn(
-      '@react-native-community/cli-server-api not found, the react-native.config.js may be unusable.',
-    );
-  }
-}
+const {
+  bundleCommand,
+  startCommand,
+} = require('@react-native/community-cli-plugin');
+commands.push(bundleCommand, startCommand);
 
 const codegenCommand = {
   name: 'codegen',

package/scripts/cocoapods/codegen.rb

@@ -5,21 +5,6 @@
 
 require_relative './helpers.rb'
 
-# It builds the codegen CLI if it is not present
-#
-# Parameters:
-# - react_native_path: the path to the react native installation
-# - relative_installation_root: the path to the relative installation root of the pods
-# - dir_manager: a class that implements the `Dir` interface. Defaults to `Dir`, the Dependency can be injected for testing purposes.
-# @throws an error if it could not find the codegen folder.
-def build_codegen!(react_native_path, relative_installation_root, dir_manager: Dir)
-  codegen_repo_path = "#{basePath(react_native_path, relative_installation_root)}/../react-native-codegen"
-  return unless dir_manager.exist?(codegen_repo_path) && !dir_manager.exist?("#{codegen_repo_path}/lib")
-
-  Pod::UI.puts "[Codegen] building #{codegen_repo_path}"
-  system("#{codegen_repo_path}/scripts/oss/build.sh")
-end
-
 # keeping the run_codegen! method for testing purposes
 def run_codegen!(
   app_path,
@@ -36,6 +21,10 @@ def run_codegen!(
   codegen_utils: CodegenUtils.new()
   )
 
+  if ENV["RCT_SKIP_CODEGEN"] == "1"
+    return
+  end
+
   codegen_utils.use_react_native_codegen_discovery!(
     disable_codegen,
     app_path,

package/scripts/cocoapods/codegen_utils.rb

@@ -13,16 +13,6 @@ class CodegenUtils
     def initialize()
     end
 
-    @@REACT_CODEGEN_PODSPEC_GENERATED = false
-
-    def self.set_react_codegen_podspec_generated(value)
-        @@REACT_CODEGEN_PODSPEC_GENERATED = value
-    end
-
-    def self.react_codegen_podspec_generated
-        @@REACT_CODEGEN_PODSPEC_GENERATED
-    end
-
     @@REACT_CODEGEN_DISCOVERY_DONE = false
 
     def self.set_react_codegen_discovery_done(value)
@@ -33,246 +23,6 @@ class CodegenUtils
         @@REACT_CODEGEN_DISCOVERY_DONE
     end
 
-    # It takes some cocoapods specs and writes them into a file
-    #
-    # Parameters
-    # - spec: the cocoapod specs
-    # - codegen_output_dir: the output directory for the codegen
-    # - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes.
-    def generate_react_codegen_podspec!(spec, codegen_output_dir, file_manager: File, logger: CodegenUtils::UI)
-        # 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
-          logger.puts("Skipping ReactCodegen podspec generation.")
-          return
-        end
-
-        relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
-        output_dir = "#{relative_installation_root}/#{codegen_output_dir}"
-        Pod::Executable.execute_command("mkdir", ["-p", output_dir]);
-
-        podspec_path = file_manager.join(output_dir, 'ReactCodegen.podspec.json')
-        logger.puts("Generating #{podspec_path}")
-
-        file_manager.open(podspec_path, 'w') do |f|
-          f.write(spec.to_json)
-          f.fsync
-        end
-
-        @@REACT_CODEGEN_PODSPEC_GENERATED = true
-    end
-
-    # 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
-    # - hermes_enabled: whether hermes is enabled or not.
-    # - script_phases: whether we want to add some build script phases or not.
-    # - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes.
-    def get_react_codegen_spec(package_json_file, folly_version: Helpers::Constants.folly_config[:version], hermes_enabled: true, script_phases: nil, file_manager: File, logger: CodegenUtils::UI)
-        package = JSON.parse(file_manager.read(package_json_file))
-        version = package['version']
-        use_frameworks = ENV['USE_FRAMEWORKS'] != nil
-
-        folly_compiler_flags = Helpers::Constants.folly_config[:compiler_flags]
-        boost_compiler_flags = Helpers::Constants.boost_config[:compiler_flags]
-
-        header_search_paths = [
-          "\"$(PODS_ROOT)/boost\"",
-          "\"$(PODS_ROOT)/RCT-Folly\"",
-          "\"$(PODS_ROOT)/DoubleConversion\"",
-          "\"$(PODS_ROOT)/fast_float/include\"",
-          "\"$(PODS_ROOT)/fmt/include\"",
-          "\"${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\"",
-          "\"$(PODS_TARGET_SRCROOT)\"",
-        ]
-        framework_search_paths = []
-
-        if use_frameworks
-          ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-Fabric", "React_Fabric", ["react/renderer/components/view/platform/cxx"])
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-FabricImage", "React_FabricImage", []))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-graphics", "React_graphics", ["react/renderer/graphics/platform/ios"]))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "ReactCommon", "ReactCommon", ["react/nativemodule/core"]))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-NativeModulesApple", "React_NativeModulesApple", []))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-RCTFabric", "RCTFabric", []))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-debug", "React_debug", []))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-rendererdebug", "React_rendererdebug", []))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-utils", "React_utils", []))
-            .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-featureflags", "React_featureflags", []))
-            .each { |search_path|
-              header_search_paths << "\"#{search_path}\""
-            }
-        end
-
-        spec = {
-          'name' => "ReactCodegen",
-          'version' => version,
-          'summary' => 'Temp pod for generated files for React Native',
-          'homepage' => 'https://facebook.com/',
-          'license' => 'Unlicense',
-          'authors' => 'Facebook',
-          'compiler_flags'  => "#{folly_compiler_flags} #{boost_compiler_flags} -Wno-nullability-completeness -std=c++20",
-          'source' => { :git => '' },
-          'header_mappings_dir' => './',
-          'platforms' => min_supported_versions,
-          'source_files' => "**/*.{h,mm,cpp}",
-          'exclude_files' => "RCTAppDependencyProvider.{h,mm}", # these files are generated in the same codegen path but needs to belong to a different pod
-          'pod_target_xcconfig' => {
-            "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
-            "FRAMEWORK_SEARCH_PATHS" => framework_search_paths,
-            "OTHER_CPLUSPLUSFLAGS" => "$(inherited) #{folly_compiler_flags} #{boost_compiler_flags}",
-          },
-          'dependencies': {
-            "React-jsiexecutor": [],
-            "RCT-Folly": [],
-            "RCTRequired": [],
-            "RCTTypeSafety": [],
-            "React-Core": [],
-            "React-jsi": [],
-            "ReactCommon/turbomodule/bridging": [],
-            "ReactCommon/turbomodule/core": [],
-            "React-NativeModulesApple": [],
-            "glog": [],
-            "DoubleConversion": [],
-            'React-graphics': [],
-            'React-rendererdebug': [],
-            'React-Fabric': [],
-            'React-FabricImage': [],
-            'React-debug': [],
-            'React-utils': [],
-            'React-featureflags': [],
-            'React-RCTAppDelegate': [],
-          }
-        }
-
-        if hermes_enabled
-          spec[:'dependencies'].merge!({
-            'hermes-engine': [],
-          });
-        else
-          spec[:'dependencies'].merge!({
-            'React-jsc': [],
-          });
-        end
-
-        if script_phases
-          logger.puts("Adding script_phases to ReactCodegen.")
-          spec[:'script_phases'] = script_phases
-        end
-
-        return spec
-    end
-
-    # It extracts the codegen config from the configuration file
-    #
-    # Parameters
-    # - config_path: a path to the configuration file
-    # - config_key: the codegen configuration key
-    # - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes.
-    #
-    # Returns: the list of dependencies as extracted from the package.json
-    def get_codegen_config_from_file(config_path, config_key, file_manager: File)
-      empty = {}
-      if !file_manager.exist?(config_path)
-        return empty
-      end
-
-      config = JSON.parse(file_manager.read(config_path))
-      return config[config_key] ? config[config_key] : empty
-    end
-
-    # It creates a list of JS files that contains the JS specifications that Codegen needs to use to generate the code
-    #
-    # Parameters
-    # - app_codegen_config: an object that contains the configurations
-    # - app_path: path to the app
-    # - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes.
-    #
-    # Returns: the list of files that needs to be used by Codegen
-    def get_list_of_js_specs(app_codegen_config, app_path, file_manager: File)
-      file_list = []
-
-      if app_codegen_config['libraries'] then
-        Pod::UI.warn '[Deprecated] You are using the old `libraries` array to list all your codegen.\nThis method will be removed in the future.\nUpdate your `package.json` with a single object.'
-        app_codegen_config['libraries'].each do |library|
-          library_dir = file_manager.join(app_path, library['jsSrcsDir'])
-          file_list.concat(Finder.find_codegen_file(library_dir))
-        end
-      elsif app_codegen_config['jsSrcsDir'] then
-        codegen_dir = file_manager.join(app_path, app_codegen_config['jsSrcsDir'])
-        file_list.concat (Finder.find_codegen_file(codegen_dir))
-      end
-
-      input_files = file_list.map { |filename| "${PODS_ROOT}/../#{Pathname.new(filename).realpath().relative_path_from(Pod::Config.instance.installation_root)}" }
-
-      return input_files
-    end
-
-    # It generates the build script phase for the codegen
-    #
-    # Parameters
-    # - app_path: the path to the app
-    # - fabric_enabled: whether fabric is enabled or not
-    # - config_file_dir: the directory of the config file
-    # - react_native_path: the path to React Native
-    # - config_key: the configuration key to use in the package.json for the Codegen
-    # - codegen_utils: an object which exposes utilities functions for the codegen
-    # - script_phase_extractor: an object that is able to extract the Xcode Script Phases for React Native
-    # - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes.
-    #
-    # Return: an object containing the script phase
-    def get_react_codegen_script_phases(
-      app_path,
-      fabric_enabled: false,
-      hermes_enabled: false,
-      config_file_dir: '',
-      react_native_path: "../node_modules/react-native",
-      config_key: 'codegenConfig',
-      codegen_utils: CodegenUtils.new(),
-      script_phase_extractor: CodegenScriptPhaseExtractor.new(),
-      file_manager: File,
-      logger: CodegenUtils::UI
-      )
-      if !app_path
-        logger.warn("error: app_path is required to use codegen discovery.")
-        abort
-      end
-
-      # We need to convert paths to relative path from installation_root for the script phase for CI.
-      relative_app_root = Pathname.new(app_path).realpath().relative_path_from(Pod::Config.instance.installation_root)
-
-      relative_config_file_dir = ''
-      if config_file_dir != ''
-        relative_config_file_dir = Pathname.new(config_file_dir).relative_path_from(Pod::Config.instance.installation_root)
-      end
-
-      # Generate input files for in-app libaraies which will be used to check if the script needs to be run.
-      # TODO: Ideally, we generate the input_files list from generate-codegen-artifacts.js and read the result here.
-      #       Or, generate this podspec in generate-codegen-artifacts.js as well.
-      app_package_path = file_manager.join(app_path, 'package.json')
-      app_codegen_config = codegen_utils.get_codegen_config_from_file(app_package_path, config_key)
-      input_files = codegen_utils.get_list_of_js_specs(app_codegen_config, app_path)
-
-      # Add a script phase to trigger generate artifact.
-      # Some code is duplicated so that it's easier to delete the old way and switch over to this once it's stabilized.
-      return {
-        'name': 'Generate Specs',
-        'execution_position': :before_compile,
-        'input_files' => input_files,
-        'show_env_vars_in_log': true,
-        'output_files': ["${DERIVED_FILE_DIR}/react-codegen.log"],
-        'script': script_phase_extractor.extract_script_phase(
-          react_native_path: react_native_path,
-          relative_app_root: relative_app_root,
-          relative_config_file_dir: relative_config_file_dir,
-          fabric_enabled: fabric_enabled
-        ),
-      }
-    end
-
     def use_react_native_codegen_discovery!(
       codegen_disabled,
       app_path,
@@ -300,25 +50,8 @@ class CodegenUtils
         abort
       end
 
-      logger.warn("warn: using experimental new codegen integration")
       relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
 
-      # Generate ReactCodegen podspec here to add the script phases.
-      script_phases = codegen_utils.get_react_codegen_script_phases(
-        app_path,
-        :fabric_enabled => fabric_enabled,
-        :config_file_dir => config_file_dir,
-        :react_native_path => react_native_path,
-        :config_key => config_key
-      )
-      react_codegen_spec = codegen_utils.get_react_codegen_spec(
-        file_manager.join(relative_installation_root, react_native_path, "package.json"),
-        :folly_version => folly_version,
-        :hermes_enabled => hermes_enabled,
-        :script_phases => script_phases
-      )
-      codegen_utils.generate_react_codegen_podspec!(react_codegen_spec, codegen_output_dir)
-
       out = Pod::Executable.execute_command(
         'node',
         [
@@ -343,6 +76,10 @@ class CodegenUtils
     end
 
     def self.clean_up_build_folder(rn_path, codegen_dir, dir_manager: Dir, file_manager: File)
+      if ENV["RCT_SKIP_CODEGEN"] == "1"
+        return
+      end
+
       return if CodegenUtils.cleanup_done()
       CodegenUtils.set_cleanup_done(true)
 

package/scripts/cocoapods/jsengine.rb

@@ -5,25 +5,25 @@
 
 require_relative './utils.rb'
 
-# It sets up the JavaScriptCore and JSI pods.
+# It sets up the JavaScriptCore.
 #
 # @parameter react_native_path: relative path to react-native
 # @parameter fabric_enabled: whether Fabirc is enabled
 def setup_jsc!(react_native_path: "../node_modules/react-native", fabric_enabled: false)
-    pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
-    pod 'React-jsc', :path => "#{react_native_path}/ReactCommon/jsc"
-    if fabric_enabled
-        pod 'React-jsc/Fabric', :path => "#{react_native_path}/ReactCommon/jsc"
+    if ENV['USE_THIRD_PARTY_JSC'] != '1'
+        pod 'React-jsc', :path => "#{react_native_path}/ReactCommon/jsc"
+        if fabric_enabled
+            pod 'React-jsc/Fabric', :path => "#{react_native_path}/ReactCommon/jsc"
+        end
     end
 end
 
-# It sets up the Hermes and JSI pods.
+# It sets up the Hermes.
 #
 # @parameter react_native_path: relative path to react-native
 # @parameter fabric_enabled: whether Fabirc is enabled
 def setup_hermes!(react_native_path: "../node_modules/react-native")
     react_native_dir = Pod::Config.instance.installation_root.join(react_native_path)
-    pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
     # This `:tag => hermestag` below is only to tell CocoaPods to update hermes-engine when React Native version changes.
     # We have custom logic to compute the source for hermes-engine. See sdks/hermes-engine/*
     hermestag_file = File.join(react_native_dir, "sdks", ".hermesversion")
@@ -31,3 +31,13 @@ def setup_hermes!(react_native_path: "../node_modules/react-native")
     pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes-engine/hermes-engine.podspec", :tag => hermestag
     pod 'React-hermes', :path => "#{react_native_path}/ReactCommon/hermes"
 end
+
+# Utility function to depend on JS engine based on the environment variable.
+def depend_on_js_engine(s)
+  if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
+    s.dependency 'hermes-engine'
+    s.dependency 'React-hermes'
+  elsif ENV['USE_THIRD_PARTY_JSC'] != '1'
+    s.dependency 'React-jsc'
+  end
+end

package/scripts/cocoapods/new_architecture.rb

@@ -7,6 +7,7 @@ require 'json'
 
 require_relative "./utils.rb"
 require_relative "./helpers.rb"
+require_relative "./jsengine.rb"
 
 class NewArchitectureHelper
     @@NewArchWarningEmitted = false # Used not to spam warnings to the user.
@@ -96,6 +97,7 @@ class NewArchitectureHelper
                 .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-debug", "React_debug", []))
                 .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-ImageManager", "React_ImageManager", []))
                 .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-rendererdebug", "React_rendererdebug", []))
+                .concat(ReactNativePodsUtils.create_header_search_path_for_frameworks("PODS_CONFIGURATION_BUILD_DIR", "React-renderercss", "React_renderercss", []))
                 .each { |search_path|
                     header_search_paths << "\"#{search_path}\""
                 }
@@ -134,12 +136,10 @@ class NewArchitectureHelper
         spec.dependency "React-rendererdebug"
         # This dependency is required for the cases when the pod includes generated sources, specifically Props.cpp.
         spec.dependency "DoubleConversion"
+        spec.dependency 'React-jsi'
+        spec.dependency 'React-renderercss'
 
-        if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1"
-            spec.dependency "hermes-engine"
-        else
-            spec.dependency "React-jsi"
-        end
+        depend_on_js_engine(spec)
 
         spec.pod_target_xcconfig = current_config
     end
@@ -158,37 +158,7 @@ class NewArchitectureHelper
         return package["version"]
     end
 
-    def self.compute_new_arch_enabled(new_arch_enabled, react_native_version)
-        # Regex that identify a version with the syntax `<major>.<minor>.<patch>[-<prerelease>[.-]k]
-        # where
-        # - major is a number
-        # - minor is a number
-        # - patch is a number
-        # - prerelease is a string (can include numbers)
-        # - k is a number
-        version_regex = /^(\d+)\.(\d+)\.(\d+)(?:-(\w+(?:[-.]\d+)?))?$/
-
-        if match_data = react_native_version.match(version_regex)
-
-            prerelease = match_data[4].to_s
-
-            # We want to enforce the new architecture for 1.0.0 and greater,
-            # but not for 1000 as version 1000 is currently main.
-            if prerelease.include?("prealpha")
-                if ENV['RCT_NEW_ARCH_ENABLED'] != nil && !@@NewArchWarningEmitted
-                    warning_message = "[New Architecture] Starting from version 1.0.0-prealpha the value of the " \
-                                      "RCT_NEW_ARCH_ENABLED flag is ignored and the New Architecture is enabled by default."
-                    Pod::UI.warn warning_message
-                    @@NewArchWarningEmitted = true
-                end
-
-                return "1"
-            end
-        end
-        return new_arch_enabled ? "1" : "0"
-    end
-
     def self.new_arch_enabled
-        return ENV["RCT_NEW_ARCH_ENABLED"] == nil || ENV["RCT_NEW_ARCH_ENABLED"] == "1"
+        return ENV["RCT_NEW_ARCH_ENABLED"] == '0' ? false : true
     end
 end

package/scripts/cocoapods/utils.rb

@@ -45,11 +45,15 @@ class ReactNativePodsUtils
 
     def self.set_gcc_preprocessor_definition_for_React_hermes(installer)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-hermes", :debug)
-        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-jsinspector", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "hermes-engine", :debug)
         self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "HERMES_ENABLE_DEBUGGER=1", "React-RuntimeHermes", :debug)
     end
 
+    def self.set_gcc_preprocessor_definition_for_debugger(installer)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED=1", "React-jsinspector", :debug)
+        self.add_build_settings_to_pod(installer, "GCC_PREPROCESSOR_DEFINITIONS", "REACT_NATIVE_DEBUGGER_ENABLED_DEVONLY=1", "React-jsinspector", :debug)
+    end
+
     def self.turn_off_resource_bundle_react_core(installer)
         # this is needed for Xcode 14, see more details here https://github.com/facebook/react-native/issues/34673
         # we should be able to remove this once CocoaPods catches up to it, see more details here https://github.com/CocoaPods/CocoaPods/issues/11402
@@ -287,7 +291,8 @@ class ReactNativePodsUtils
     # Add a new dependency to an existing spec, configuring also the headers search paths
     def self.add_dependency(spec, dependency_name, base_folder_for_frameworks, framework_name, additional_paths: [], version: nil, subspec_dependency: nil)
         # Update Search Path
-        optional_current_search_path = spec.to_hash["pod_target_xcconfig"]["HEADER_SEARCH_PATHS"]
+        current_pod_target_xcconfig = spec.to_hash["pod_target_xcconfig"] ? spec.to_hash["pod_target_xcconfig"] : {}
+        optional_current_search_path = current_pod_target_xcconfig["HEADER_SEARCH_PATHS"]
         current_search_paths = (optional_current_search_path != nil ? optional_current_search_path : "")
             .split(" ")
         create_header_search_path_for_frameworks(base_folder_for_frameworks, dependency_name, framework_name, additional_paths)
@@ -295,7 +300,6 @@ class ReactNativePodsUtils
                 wrapped_path = "\"#{path}\""
                 current_search_paths << wrapped_path
             }
-        current_pod_target_xcconfig = spec.to_hash["pod_target_xcconfig"]
         current_pod_target_xcconfig["HEADER_SEARCH_PATHS"] = current_search_paths.join(" ")
         spec.pod_target_xcconfig = current_pod_target_xcconfig
 
@@ -604,7 +608,7 @@ class ReactNativePodsUtils
     end
 
     def self.react_native_pods
-        return [
+        pods = [
             "DoubleConversion",
             "FBLazyVector",
             "RCT-Folly",
@@ -622,6 +626,7 @@ class ReactNativePodsUtils
             "React-RCTAppDelegate",
             "React-RCTBlob",
             "React-RCTFabric",
+            "React-RCTRuntime",
             "React-RCTImage",
             "React-RCTLinking",
             "React-RCTNetwork",
@@ -633,11 +638,12 @@ class ReactNativePodsUtils
             "React-callinvoker",
             "React-cxxreact",
             "React-graphics",
-            "React-jsc",
             "React-jsi",
             "React-jsiexecutor",
             "React-jsinspector",
+            "React-jsitooling",
             "React-logger",
+            "React-oscompat",
             "React-perflogger",
             "React-rncore",
             "React-runtimeexecutor",
@@ -651,6 +657,11 @@ class ReactNativePodsUtils
             "hermes-engine",
             "React-hermes",
         ]
+        if ENV['USE_THIRD_PARTY_JSC'] != '1'
+            pods << "React-jsc"
+        end
+
+        return pods
     end
 
     def self.add_search_path_to_result(result, base_path, additional_paths, include_base_path)