react-native-tvos 0.71.13-1 → 0.72.4-0

package/scripts/cocoapods/__tests__/utils-test.rb

@@ -19,11 +19,10 @@ class UtilsTests < Test::Unit::TestCase
     def setup
         @base_path = "~/app/ios"
         Pathname.pwd!(@base_path)
-        File.enable_testing_mode!
     end
 
     def teardown
-        File.reset()
+        FileMock.reset()
         Pod::UI.reset()
         Pathname.reset()
         Pod::Config.reset()
@@ -520,11 +519,11 @@ class UtilsTests < Test::Unit::TestCase
     # =================================== #
     def test_createXcodeEnvIfMissing_whenItIsPresent_doNothing
         # Arrange
-        File.mocked_existing_files("/.xcode.env")
+        FileMock.mocked_existing_files("/.xcode.env")
         # Act
-        ReactNativePodsUtils.create_xcode_env_if_missing
+        ReactNativePodsUtils.create_xcode_env_if_missing(file_manager: FileMock)
         # Assert
-        assert_equal(File.exist_invocation_params, ["/.xcode.env"])
+        assert_equal(FileMock.exist_invocation_params, ["/.xcode.env"])
         assert_equal($collected_commands, [])
     end
 
@@ -532,9 +531,9 @@ class UtilsTests < Test::Unit::TestCase
         # Arrange
 
         # Act
-        ReactNativePodsUtils.create_xcode_env_if_missing
+        ReactNativePodsUtils.create_xcode_env_if_missing(file_manager: FileMock)
         # Assert
-        assert_equal(File.exist_invocation_params, ["/.xcode.env"])
+        assert_equal(FileMock.exist_invocation_params, ["/.xcode.env"])
         assert_equal($collected_commands, ["echo 'export NODE_BINARY=$(command -v node)' > /.xcode.env"])
     end
 
@@ -588,8 +587,156 @@ class UtilsTests < Test::Unit::TestCase
         assert_equal(Pod::UI.collected_messages, ["Framework build type is dynamic framework"])
         assert_equal(ENV['USE_FRAMEWORKS'], 'dynamic')
     end
+
+    # ============================ #
+    # Test - Update Search Paths   #
+    # ============================ #
+    def test_updateSearchPaths_whenUseFrameworks_addsSearchPaths
+        # Arrange
+        ENV['USE_FRAMEWORKS'] = 'static'
+        first_target = prepare_target("FirstTarget")
+        second_target = prepare_target("SecondTarget", nil, [
+            DependencyMock.new("RCT-Folly"),
+            DependencyMock.new("React-Codegen"),
+            DependencyMock.new("ReactCommon"),
+            DependencyMock.new("React-RCTFabric"),
+            DependencyMock.new("React-ImageManager"),
+        ])
+        third_target = prepare_target("ThirdTarget", "com.apple.product-type.bundle")
+        user_project_mock = UserProjectMock.new("a/path", [
+                prepare_config("Debug"),
+                prepare_config("Release"),
+            ],
+            :native_targets => [
+                first_target,
+                second_target
+            ]
+        )
+        pods_projects_mock = PodsProjectMock.new([third_target], {"hermes-engine" => {}})
+        installer = InstallerMock.new(pods_projects_mock, [
+            AggregatedProjectMock.new(user_project_mock)
+        ])
+
+        # Act
+        ReactNativePodsUtils.update_search_paths(installer)
+
+        # Assert
+        user_project_mock.build_configurations.each do |config|
+            received_search_path = config.build_settings["HEADER_SEARCH_PATHS"]
+            expected_search_path = "$(inherited) ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core ${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon-Samples/ReactCommon_Samples.framework/Headers/platform/ios ${PODS_CONFIGURATION_BUILD_DIR}/React-NativeModulesApple/React_NativeModulesApple.framework/Headers ${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios"
+            assert_equal(expected_search_path, received_search_path)
+        end
+
+        installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
+            if pod_name == "SecondTarget"
+                target_installation_result.native_target.build_configurations.each do |config|
+                    received_search_path = config.build_settings["HEADER_SEARCH_PATHS"]
+                    expected_Search_path = "$(inherited) \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/boost\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Fabric/React_Fabric.framework/Headers/react/renderer/imagemanager/platform/ios\""
+                    assert_equal(received_search_path, expected_Search_path)
+                end
+            else
+                target_installation_result.native_target.build_configurations.each do |config|
+                    assert_nil(config.build_settings["HEADER_SEARCH_PATHS"])
+                end
+            end
+        end
+    end
+
+    def test_updateSearchPaths_whenNotUseFrameworks_addsSearchPaths
+        # Arrange
+        first_target = prepare_target("FirstTarget")
+        second_target = prepare_target("SecondTarget")
+        third_target = prepare_target("ThirdTarget", "com.apple.product-type.bundle")
+        user_project_mock = UserProjectMock.new("a/path", [
+                prepare_config("Debug"),
+                prepare_config("Release"),
+            ],
+            :native_targets => [
+                first_target,
+                second_target
+            ]
+        )
+        pods_projects_mock = PodsProjectMock.new([third_target], {"hermes-engine" => {}})
+        installer = InstallerMock.new(pods_projects_mock, [
+            AggregatedProjectMock.new(user_project_mock)
+        ])
+
+        # Act
+        ReactNativePodsUtils.update_search_paths(installer)
+
+        # Assert
+        user_project_mock.build_configurations.each do |config|
+            assert_nil(config.build_settings["HEADER_SEARCH_PATHS"])
+        end
+    end
+
+    # ============================= #
+    # Test - Apply Flags For Fabric #
+    # ============================= #
+    def test_applyFlagsForFabric_whenFabricEnabled_addsTheFlag
+        # Arrange
+        first_target = prepare_target("FirstTarget")
+        second_target = prepare_target("SecondTarget")
+        third_target = prepare_target("ThirdTarget", "com.apple.product-type.bundle")
+        user_project_mock = UserProjectMock.new("a/path", [
+                prepare_config("Debug"),
+                prepare_config("Release"),
+            ],
+            :native_targets => [
+                first_target,
+                second_target
+            ]
+        )
+        pods_projects_mock = PodsProjectMock.new([third_target], {"hermes-engine" => {}})
+        installer = InstallerMock.new(pods_projects_mock, [
+            AggregatedProjectMock.new(user_project_mock)
+        ])
+
+        # Act
+        ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: true)
+
+        # Assert
+        user_project_mock.build_configurations.each do |config|
+            received_cflags = config.build_settings["OTHER_CFLAGS"]
+            expected_cflags = "$(inherited) -DRN_FABRIC_ENABLED"
+            assert_equal(received_cflags, expected_cflags)
+        end
+
+    end
+
+    def test_applyFlagsForFabric_whenFabricDisabled_doNothing
+        # Arrange
+        first_target = prepare_target("FirstTarget")
+        second_target = prepare_target("SecondTarget")
+        third_target = prepare_target("ThirdTarget", "com.apple.product-type.bundle")
+        user_project_mock = UserProjectMock.new("a/path", [
+                prepare_config("Debug"),
+                prepare_config("Release"),
+            ],
+            :native_targets => [
+                first_target,
+                second_target
+            ]
+        )
+        pods_projects_mock = PodsProjectMock.new([third_target], {"hermes-engine" => {}})
+        installer = InstallerMock.new(pods_projects_mock, [
+            AggregatedProjectMock.new(user_project_mock)
+        ])
+
+        # Act
+        ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: false)
+
+        # Assert
+        user_project_mock.build_configurations.each do |config|
+            assert_equal(config.build_settings["OTHER_CFLAGS"], "$(inherited)")
+        end
+    end
 end
 
+# ===== #
+# UTILS #
+# ===== #
+
 def prepare_empty_user_project_mock
     return UserProjectMock.new("a/path", [
         BuildConfigurationMock.new("Debug"),
@@ -605,11 +752,11 @@ def prepare_config(config_name)
     ]})
 end
 
-def prepare_target(name, product_type = nil)
+def prepare_target(name, product_type = nil, dependencies = [])
   return TargetMock.new(name, [
       prepare_config("Debug"),
       prepare_config("Release")
-  ], product_type)
+  ], product_type, dependencies)
 end
 
 def prepare_Code_Signing_build_configuration(name, param)

package/scripts/cocoapods/codegen.rb

@@ -5,23 +5,25 @@
 
 # It builds the codegen CLI if it is not present
 #
-# @parameter react_native_path: the path to the react native installation
-# @parameter relative_installation_root: the path to the relative installation root of the pods
+# 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)
-    codegen_repo_path = "#{relative_installation_root}/#{react_native_path}/packages/react-native-codegen";
-    codegen_npm_path = "#{relative_installation_root}/#{react_native_path}/../react-native-codegen";
+def build_codegen!(react_native_path, relative_installation_root, dir_manager: Dir)
+    codegen_repo_path = "#{relative_installation_root}/#{react_native_path}/../react-native-codegen";
+    codegen_npm_path = "#{relative_installation_root}/#{react_native_path}/../@react-native/codegen";
     codegen_cli_path = ""
 
-    if Dir.exist?(codegen_repo_path)
+    if dir_manager.exist?(codegen_repo_path)
       codegen_cli_path = codegen_repo_path
-    elsif Dir.exist?(codegen_npm_path)
+    elsif dir_manager.exist?(codegen_npm_path)
       codegen_cli_path = codegen_npm_path
     else
-      raise "[codegen] Couldn't not find react-native-codegen."
+      raise "[codegen] Could not find react-native-codegen."
     end
 
-    if !Dir.exist?("#{codegen_cli_path}/lib")
+    if !dir_manager.exist?("#{codegen_cli_path}/lib")
       Pod::UI.puts "[Codegen] building #{codegen_cli_path}."
       system("#{codegen_cli_path}/scripts/oss/build.sh")
     end
@@ -29,26 +31,28 @@ def build_codegen!(react_native_path, relative_installation_root)
 
 # It generates an empty `ThirdPartyProvider`, required by Fabric to load the components
 #
-# @parameter react_native_path: path to the react native framework
-# @parameter new_arch_enabled: whether the New Architecture is enabled or not
-# @parameter codegen_output_dir: the output directory for the codegen
-def checkAndGenerateEmptyThirdPartyProvider!(react_native_path, new_arch_enabled, codegen_output_dir)
+# Parameters:
+# - react_native_path: path to the react native framework
+# - new_arch_enabled: whether the New Architecture is enabled or not
+# - dir_manager: a class that implements the `Dir` interface. Defaults to `Dir`, the Dependency can be injected for testing purposes.
+# - file_manager: a class that implements the `File` interface. Defaults to `File`, the Dependency can be injected for testing purposes.
+def checkAndGenerateEmptyThirdPartyProvider!(react_native_path, new_arch_enabled, dir_manager: Dir, file_manager: File)
     return if new_arch_enabled
 
     relative_installation_root = Pod::Config.instance.installation_root.relative_path_from(Pathname.pwd)
 
-    output_dir = "#{relative_installation_root}/#{codegen_output_dir}"
+    output_dir = "#{react_native_path}/React/Fabric"
 
     provider_h_path = "#{output_dir}/RCTThirdPartyFabricComponentsProvider.h"
-    provider_cpp_path ="#{output_dir}/RCTThirdPartyFabricComponentsProvider.cpp"
+    provider_cpp_path ="#{output_dir}/RCTThirdPartyFabricComponentsProvider.mm"
 
-    if(!File.exist?(provider_h_path) || !File.exist?(provider_cpp_path))
+    if(!file_manager.exist?(provider_h_path) || !file_manager.exist?(provider_cpp_path))
         # build codegen
-        build_codegen!(react_native_path, relative_installation_root)
+        build_codegen!(react_native_path, relative_installation_root, dir_manager: dir_manager)
 
         # Just use a temp empty schema list.
         temp_schema_list_path = "#{output_dir}/tmpSchemaList.txt"
-        File.open(temp_schema_list_path, 'w') do |f|
+        file_manager.open(temp_schema_list_path, 'w') do |f|
             f.write('[]')
             f.fsync
         end
@@ -62,7 +66,7 @@ def checkAndGenerateEmptyThirdPartyProvider!(react_native_path, new_arch_enabled
             "--schemaListPath", temp_schema_list_path,
             "--outputDir", "#{output_dir}"
         ])
-        File.delete(temp_schema_list_path) if File.exist?(temp_schema_list_path)
+        file_manager.delete(temp_schema_list_path) if file_manager.exist?(temp_schema_list_path)
     end
 end
 

package/scripts/cocoapods/codegen_utils.rb

@@ -37,7 +37,8 @@ class CodegenUtils
     # Parameters
     # - spec: the cocoapod specs
     # - codegen_output_dir: the output directory for the codegen
-    def generate_react_codegen_podspec!(spec, codegen_output_dir)
+    # - 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)
         # 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
@@ -49,10 +50,10 @@ class CodegenUtils
         output_dir = "#{relative_installation_root}/#{codegen_output_dir}"
         Pod::Executable.execute_command("mkdir", ["-p", output_dir]);
 
-        podspec_path = File.join(output_dir, 'React-Codegen.podspec.json')
+        podspec_path = file_manager.join(output_dir, 'React-Codegen.podspec.json')
         Pod::UI.puts "[Codegen] Generating #{podspec_path}"
 
-        File.open(podspec_path, 'w') do |f|
+        file_manager.open(podspec_path, 'w') do |f|
           f.write(spec.to_json)
           f.fsync
         end
@@ -67,13 +68,40 @@ class CodegenUtils
     # - fabric_enabled: whether fabric is enabled or not.
     # - hermes_enabled: whether hermes is enabled or not.
     # - script_phases: whether we want to add some build script phases or not.
-    def get_react_codegen_spec(package_json_file, folly_version: '2021.07.22.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil)
-        package = JSON.parse(File.read(package_json_file))
+    # - 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: '2021.07.22.00', fabric_enabled: false, hermes_enabled: true, script_phases: nil, file_manager: File)
+        package = JSON.parse(file_manager.read(package_json_file))
         version = package['version']
-
+        new_arch_disabled = ENV['RCT_NEW_ARCH_ENABLED'] != "1"
+        use_frameworks = ENV['USE_FRAMEWORKS'] != nil
         folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
         boost_compiler_flags = '-Wno-documentation'
 
+        header_search_paths = [
+          "\"$(PODS_ROOT)/boost\"",
+          "\"$(PODS_ROOT)/RCT-Folly\"",
+          "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
+          "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
+          "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
+        ]
+        framework_search_paths = []
+
+        if use_frameworks
+          header_search_paths.concat([
+            "\"$(PODS_ROOT)/DoubleConversion\"",
+            "\"$(PODS_TARGET_SRCROOT)\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-Fabric/React_Fabric.framework/Headers\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-NativeModulesApple/React_NativeModulesApple.framework/Headers\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-RCTFabric/RCTFabric.framework/Headers\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers\"",
+            "\"$(PODS_CONFIGURATION_BUILD_DIR)/React-utils/React_utils.framework/Headers\"",
+          ])
+        end
+
         spec = {
           'name' => "React-Codegen",
           'version' => version,
@@ -89,17 +117,11 @@ class CodegenUtils
             'tvos' => min_ios_version_supported,
           },
           'source_files' => "**/*.{h,mm,cpp}",
-          'pod_target_xcconfig' => { "HEADER_SEARCH_PATHS" =>
-            [
-              "\"$(PODS_ROOT)/boost\"",
-              "\"$(PODS_ROOT)/RCT-Folly\"",
-              "\"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\"",
-              "\"$(PODS_ROOT)/Headers/Private/React-Fabric\"",
-              "\"$(PODS_ROOT)/Headers/Private/React-RCTFabric\"",
-            ].join(' ')
+          'pod_target_xcconfig' => {
+            "HEADER_SEARCH_PATHS" => header_search_paths.join(' '),
+            "FRAMEWORK_SEARCH_PATHS" => framework_search_paths
           },
           'dependencies': {
-            "FBReactNativeSpec": [],
             "React-jsiexecutor": [],
             "RCT-Folly": [],
             "RCTRequired": [],
@@ -107,20 +129,25 @@ class CodegenUtils
             "React-Core": [],
             "React-jsi": [],
             "ReactCommon/turbomodule/bridging": [],
-            "ReactCommon/turbomodule/core": []
+            "ReactCommon/turbomodule/core": [],
+            "React-NativeModulesApple": [],
+            "glog": [],
+            "DoubleConversion": [],
           }
         }
 
         if fabric_enabled
           spec[:'dependencies'].merge!({
             'React-graphics': [],
-            'React-rncore':  [],
+            'React-Fabric': [],
+            'React-debug': [],
+            'React-utils': [],
           });
         end
 
         if hermes_enabled
           spec[:'dependencies'].merge!({
-            'hermes-engine': [], # let React Native decide which version of Hermes Engine to be used. Otherwise, this can create conflicts.
+            'hermes-engine': [],
           });
         else
           spec[:'dependencies'].merge!({
@@ -128,6 +155,13 @@ class CodegenUtils
           });
         end
 
+        if new_arch_disabled
+          spec[:dependencies].merge!({
+            'React-rncore': [],
+            'FBReactNativeSpec': [],
+          })
+        end
+
         if script_phases
           Pod::UI.puts "[Codegen] Adding script_phases to React-Codegen."
           spec[:'script_phases'] = script_phases
@@ -141,15 +175,16 @@ class CodegenUtils
     # 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)
+    def get_codegen_config_from_file(config_path, config_key, file_manager: File)
       empty = {}
-      if !File.exist?(config_path)
+      if !file_manager.exist?(config_path)
         return empty
       end
 
-      config = JSON.parse(File.read(config_path))
+      config = JSON.parse(file_manager.read(config_path))
       return config[config_key] ? config[config_key] : empty
     end
 
@@ -158,19 +193,20 @@ class CodegenUtils
     # 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)
+    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.join(app_path, library['jsSrcsDir'])
+          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.join(app_path, app_codegen_config['jsSrcsDir'])
+        codegen_dir = file_manager.join(app_path, app_codegen_config['jsSrcsDir'])
         file_list.concat (Finder.find_codegen_file(codegen_dir))
       end
 
@@ -189,6 +225,7 @@ class CodegenUtils
     # - 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(
@@ -199,10 +236,11 @@ class CodegenUtils
       react_native_path: "../node_modules/react-native",
       config_key: 'codegenConfig',
       codegen_utils: CodegenUtils.new(),
-      script_phase_extractor: CodegenScriptPhaseExtractor.new()
+      script_phase_extractor: CodegenScriptPhaseExtractor.new(),
+      file_manager: File
       )
       if !app_path
-        Pod::UI.warn '[Codegen] error: app_path is requried to use codegen discovery.'
+        Pod::UI.warn '[Codegen] error: app_path is required to use codegen discovery.'
         abort
       end
 
@@ -217,7 +255,7 @@ class CodegenUtils
       # 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.join(app_path, 'package.json')
+      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)
 
@@ -248,7 +286,8 @@ class CodegenUtils
       codegen_output_dir: 'build/generated/ios',
       config_key: 'codegenConfig',
       folly_version: '2021.07.22.00',
-      codegen_utils: CodegenUtils.new()
+      codegen_utils: CodegenUtils.new(),
+      file_manager: File
       )
       return if codegen_disabled
 
@@ -275,7 +314,7 @@ class CodegenUtils
         :config_key => config_key
       )
       react_codegen_spec = codegen_utils.get_react_codegen_spec(
-        File.join(relative_installation_root, react_native_path, "package.json"),
+        file_manager.join(relative_installation_root, react_native_path, "package.json"),
         :folly_version => folly_version,
         :fabric_enabled => fabric_enabled,
         :hermes_enabled => hermes_enabled,
@@ -307,23 +346,26 @@ class CodegenUtils
       return @@CLEANUP_DONE
     end
 
-    def self.clean_up_build_folder(app_path, ios_folder, codegen_dir)
+    def self.clean_up_build_folder(rn_path, app_path, ios_folder, codegen_dir, dir_manager: Dir, file_manager: File)
       return if CodegenUtils.cleanup_done()
       CodegenUtils.set_cleanup_done(true)
 
-      codegen_path = File.join(app_path, ios_folder, codegen_dir)
-      return if !Dir.exist?(codegen_path)
+      codegen_path = file_manager.join(app_path, ios_folder, codegen_dir)
+      return if !dir_manager.exist?(codegen_path)
 
-      FileUtils.rm_rf(Dir.glob("#{codegen_path}/*"))
-      CodegenUtils.assert_codegen_folder_is_empty(app_path, ios_folder, codegen_dir)
+      FileUtils.rm_rf(dir_manager.glob("#{codegen_path}/*"))
+      base_provider_path = file_manager.join(rn_path, 'React', 'Fabric', 'RCTThirdPartyFabricComponentsProvider')
+      FileUtils.rm_rf("#{base_provider_path}.h")
+      FileUtils.rm_rf("#{base_provider_path}.mm")
+      CodegenUtils.assert_codegen_folder_is_empty(app_path, ios_folder, codegen_dir, dir_manager: dir_manager, file_manager: file_manager)
     end
 
     # Need to split this function from the previous one to be able to test it properly.
-    def self.assert_codegen_folder_is_empty(app_path, ios_folder, codegen_dir)
+    def self.assert_codegen_folder_is_empty(app_path, ios_folder, codegen_dir, dir_manager: Dir, file_manager: File)
       # double check that the files have actually been deleted.
       # Emit an error message if not.
-      codegen_path = File.join(app_path, ios_folder, codegen_dir)
-      if Dir.exist?(codegen_path) && Dir.glob("#{codegen_path}/*").length() != 0
+      codegen_path = file_manager.join(app_path, ios_folder, codegen_dir)
+      if dir_manager.exist?(codegen_path) && dir_manager.glob("#{codegen_path}/*").length() != 0
         Pod::UI.warn "Unable to remove the content of #{codegen_path} folder. Please run rm -rf #{codegen_path} and try again."
         abort
       end

package/scripts/cocoapods/fabric.rb

@@ -7,10 +7,10 @@
 # It sets up the Fabric dependencies.
 #
 # @parameter react_native_path: relative path to react-native
-def setup_fabric!(react_native_path: "../node_modules/react-native")
+def setup_fabric!(react_native_path: "../node_modules/react-native", new_arch_enabled: false)
     pod 'React-Fabric', :path => "#{react_native_path}/ReactCommon"
-    pod 'React-rncore', :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"
     pod 'RCT-Folly/Fabric', :podspec => "#{react_native_path}/third-party-podspecs/RCT-Folly.podspec"
 end

package/scripts/cocoapods/flipper.rb

@@ -6,14 +6,13 @@
 # Default versions of Flipper and related dependencies.
 # Update this map to bump the dependencies.
 $flipper_default_versions = {
-    'Flipper' => '0.125.0',
+    'Flipper' => '0.182.0',
     'Flipper-Boost-iOSX' => '1.76.0.1.11',
     'Flipper-DoubleConversion' => '3.2.0.1',
     'Flipper-Fmt' => '7.1.7',
     'Flipper-Folly' => '2.6.10',
     'Flipper-Glog' => '0.5.0.5',
     'Flipper-PeerTalk' => '0.0.4',
-    'Flipper-RSocket' => '1.4.3',
     'OpenSSL-Universal' => '1.1.1100',
 }
 
@@ -39,7 +38,6 @@ def use_flipper_pods(versions = {}, configurations: ['Debug'])
     versions['Flipper-Folly'] ||= $flipper_default_versions['Flipper-Folly']
     versions['Flipper-Glog'] ||= $flipper_default_versions['Flipper-Glog']
     versions['Flipper-PeerTalk'] ||= $flipper_default_versions['Flipper-PeerTalk']
-    versions['Flipper-RSocket'] ||= $flipper_default_versions['Flipper-RSocket']
     versions['OpenSSL-Universal'] ||= $flipper_default_versions['OpenSSL-Universal']
     pod 'FlipperKit', versions['Flipper'], :configurations => configurations
     pod 'FlipperKit/FlipperKitLayoutPlugin', versions['Flipper'], :configurations => configurations
@@ -55,7 +53,6 @@ def use_flipper_pods(versions = {}, configurations: ['Debug'])
     pod 'Flipper-Folly', versions['Flipper-Folly'], :configurations => configurations
     pod 'Flipper-Glog', versions['Flipper-Glog'], :configurations => configurations
     pod 'Flipper-PeerTalk', versions['Flipper-PeerTalk'], :configurations => configurations
-    pod 'Flipper-RSocket', versions['Flipper-RSocket'], :configurations => configurations
     pod 'FlipperKit/Core', versions['Flipper'], :configurations => configurations
     pod 'FlipperKit/CppBridge', versions['Flipper'], :configurations => configurations
     pod 'FlipperKit/FBCxxFollyDynamicConvert', versions['Flipper'], :configurations => configurations
@@ -80,8 +77,8 @@ def flipper_post_install(installer)
             end
         end
 
-        # Enable flipper for React-Core Debug configuration for iOS
-        if target.name == 'React-Core-iOS'
+        # Enable flipper for React-RCTAppDelegate Debug configuration
+        if target.name == 'React-RCTAppDelegate'
             target.build_configurations.each do |config|
                 if config.debug?
                     config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['$(inherited)', 'FB_SONARKIT_ENABLED=1']