react-native 0.72.0-rc.1 → 0.72.0-rc.3

package/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountItemDispatcher.java

@@ -193,6 +193,8 @@ public class MountItemDispatcher {
       return false;
     }
 
+    mItemDispatchListener.willMountItems();
+
     // As an optimization, execute all ViewCommands first
     // This should be:
     // 1) Performant: ViewCommands are often a replacement for SetNativeProps, which we've always
@@ -299,6 +301,9 @@ public class MountItemDispatcher {
       }
       mBatchedExecutionTime += SystemClock.uptimeMillis() - batchedExecutionStartTime;
     }
+
+    mItemDispatchListener.didMountItems();
+
     Systrace.endSection(Systrace.TRACE_TAG_REACT_JAVA_BRIDGE);
 
     return true;
@@ -415,6 +420,10 @@ public class MountItemDispatcher {
   }
 
   public interface ItemDispatchListener {
+    void willMountItems();
+
+    void didMountItems();
+
     void didDispatchMountItems();
   }
 }

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -18,5 +18,5 @@ public class ReactNativeVersion {
       "major", 0,
       "minor", 72,
       "patch", 0,
-      "prerelease", "rc.1");
+      "prerelease", "rc.3");
 }

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/ThemedReactContext.java

@@ -50,6 +50,7 @@ public class ThemedReactContext extends ReactContext {
     if (reactApplicationContext.hasCatalystInstance()) {
       initializeWithInstance(reactApplicationContext.getCatalystInstance());
     }
+    initializeInteropModules(reactApplicationContext);
     mReactApplicationContext = reactApplicationContext;
     mModuleName = moduleName;
     mSurfaceId = surfaceId;

package/ReactAndroid/src/main/java/com/facebook/react/uimanager/UIManagerModuleConstantsHelper.java

@@ -10,11 +10,15 @@ package com.facebook.react.uimanager;
 import static com.facebook.systrace.Systrace.TRACE_TAG_REACT_JAVA_BRIDGE;
 
 import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
 import com.facebook.react.common.MapBuilder;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.systrace.SystraceMessage;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * Helps generate constants map for {@link UIManagerModule} by collecting and merging constants from
@@ -113,6 +117,13 @@ import java.util.Map;
 
     Map viewManagerBubblingEvents = viewManager.getExportedCustomBubblingEventTypeConstants();
     if (viewManagerBubblingEvents != null) {
+
+      if (ReactFeatureFlags.enableFabricRenderer && ReactFeatureFlags.unstable_useFabricInterop) {
+        // For Fabric, events needs to be fired with a "top" prefix.
+        // For the sake of Fabric Interop, here we normalize events adding "top" in their
+        // name if the user hasn't provided it.
+        normalizeEventTypes(viewManagerBubblingEvents);
+      }
       recursiveMerge(cumulativeBubblingEventTypes, viewManagerBubblingEvents);
       recursiveMerge(viewManagerBubblingEvents, defaultBubblingEvents);
       viewManagerConstants.put(BUBBLING_EVENTS_KEY, viewManagerBubblingEvents);
@@ -145,6 +156,27 @@ import java.util.Map;
     return viewManagerConstants;
   }
 
+  @VisibleForTesting
+  /* package */ static void normalizeEventTypes(Map events) {
+    if (events == null) {
+      return;
+    }
+    Set<String> keysToNormalize = new HashSet<>();
+    for (Object key : events.keySet()) {
+      if (key instanceof String) {
+        String keyString = (String) key;
+        if (!keyString.startsWith("top")) {
+          keysToNormalize.add(keyString);
+        }
+      }
+    }
+    for (String oldKey : keysToNormalize) {
+      Object value = events.get(oldKey);
+      String newKey = "top" + oldKey.substring(0, 1).toUpperCase() + oldKey.substring(1);
+      events.put(newKey, value);
+    }
+  }
+
   /** Merges {@param source} map into {@param dest} map recursively */
   private static void recursiveMerge(@Nullable Map dest, @Nullable Map source) {
     if (dest == null || source == null || source.isEmpty()) {

package/ReactAndroid/src/main/java/com/facebook/react/views/scroll/MaintainVisibleScrollPositionHelper.java

@@ -18,6 +18,7 @@ import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.common.UIManagerType;
 import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.views.scroll.ReactScrollViewHelper.HasSmoothScroll;
 import com.facebook.react.views.view.ReactViewGroup;
@@ -89,6 +90,14 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup &
    * been updated.
    */
   public void updateScrollPosition() {
+    // On Fabric this will be called internally in `didMountItems`.
+    if (ViewUtil.getUIManagerType(mScrollView.getId()) == UIManagerType.FABRIC) {
+      return;
+    }
+    updateScrollPositionInternal();
+  }
+
+  private void updateScrollPositionInternal() {
     if (mConfig == null || mFirstVisibleView == null || mPrevFirstVisibleFrame == null) {
       return;
     }
@@ -169,6 +178,16 @@ public class MaintainVisibleScrollPositionHelper<ScrollViewT extends ViewGroup &
         });
   }
 
+  @Override
+  public void willMountItems(UIManager uiManager) {
+    computeTargetView();
+  }
+
+  @Override
+  public void didMountItems(UIManager uiManager) {
+    updateScrollPositionInternal();
+  }
+
   @Override
   public void didDispatchMountItems(UIManager uiManager) {
     // noop

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -18,7 +18,7 @@ constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 72;
   int32_t Patch = 0;
-  std::string_view Prerelease = "rc.1";
+  std::string_view Prerelease = "rc.3";
 } ReactNativeVersion;
 
 } // namespace facebook::react

package/ReactCommon/react/renderer/components/view/YogaLayoutableShadowNode.cpp

@@ -369,21 +369,6 @@ void YogaLayoutableShadowNode::updateYogaProps() {
   YGStyle result{baseStyle};
 
   // Aliases with precedence
-  if (!props.inset.isUndefined()) {
-    result.position()[YGEdgeAll] = props.inset;
-  }
-  if (!props.insetBlock.isUndefined()) {
-    result.position()[YGEdgeVertical] = props.insetBlock;
-  }
-  if (!props.insetInline.isUndefined()) {
-    result.position()[YGEdgeHorizontal] = props.insetInline;
-  }
-  if (!props.insetInlineEnd.isUndefined()) {
-    result.position()[YGEdgeEnd] = props.insetInlineEnd;
-  }
-  if (!props.insetInlineStart.isUndefined()) {
-    result.position()[YGEdgeStart] = props.insetInlineStart;
-  }
   if (!props.marginInline.isUndefined()) {
     result.margin()[YGEdgeHorizontal] = props.marginInline;
   }
@@ -410,12 +395,6 @@ void YogaLayoutableShadowNode::updateYogaProps() {
   }
 
   // Aliases without precedence
-  if (CompactValue(result.position()[YGEdgeBottom]).isUndefined()) {
-    result.position()[YGEdgeBottom] = props.insetBlockEnd;
-  }
-  if (CompactValue(result.position()[YGEdgeTop]).isUndefined()) {
-    result.position()[YGEdgeTop] = props.insetBlockStart;
-  }
   if (CompactValue(result.margin()[YGEdgeTop]).isUndefined()) {
     result.margin()[YGEdgeTop] = props.marginBlockStart;
   }

package/ReactCommon/react/renderer/components/view/YogaStylableProps.cpp

@@ -136,13 +136,6 @@ void YogaStylableProps::setProp(
     static const auto defaults = YogaStylableProps{};
 
     // Aliases
-    RAW_SET_PROP_SWITCH_CASE(inset, "inset");
-    RAW_SET_PROP_SWITCH_CASE(insetBlock, "insetBlock");
-    RAW_SET_PROP_SWITCH_CASE(insetBlockEnd, "insetBlockEnd");
-    RAW_SET_PROP_SWITCH_CASE(insetBlockStart, "insetBlockStart");
-    RAW_SET_PROP_SWITCH_CASE(insetInline, "insetInline");
-    RAW_SET_PROP_SWITCH_CASE(insetInlineEnd, "insetInlineEnd");
-    RAW_SET_PROP_SWITCH_CASE(insetInlineStart, "insetInlineStart");
     RAW_SET_PROP_SWITCH_CASE(marginInline, "marginInline");
     RAW_SET_PROP_SWITCH_CASE(marginInlineStart, "marginInlineStart");
     RAW_SET_PROP_SWITCH_CASE(marginInlineEnd, "marginInlineEnd");
@@ -242,48 +235,6 @@ void YogaStylableProps::convertRawPropAliases(
     const PropsParserContext &context,
     YogaStylableProps const &sourceProps,
     RawProps const &rawProps) {
-  inset = convertRawProp(
-      context,
-      rawProps,
-      "inset",
-      sourceProps.inset,
-      CompactValue::ofUndefined());
-  insetBlock = convertRawProp(
-      context,
-      rawProps,
-      "insetBlock",
-      sourceProps.insetBlock,
-      CompactValue::ofUndefined());
-  insetBlockEnd = convertRawProp(
-      context,
-      rawProps,
-      "insetBlockEnd",
-      sourceProps.insetBlockEnd,
-      CompactValue::ofUndefined());
-  insetBlockStart = convertRawProp(
-      context,
-      rawProps,
-      "insetBlockStart",
-      sourceProps.insetBlockStart,
-      CompactValue::ofUndefined());
-  insetInline = convertRawProp(
-      context,
-      rawProps,
-      "insetInline",
-      sourceProps.insetInline,
-      CompactValue::ofUndefined());
-  insetInlineEnd = convertRawProp(
-      context,
-      rawProps,
-      "insetInlineEnd",
-      sourceProps.insetInlineEnd,
-      CompactValue::ofUndefined());
-  insetInlineStart = convertRawProp(
-      context,
-      rawProps,
-      "insetInlineStart",
-      sourceProps.insetInlineStart,
-      CompactValue::ofUndefined());
   marginInline = convertRawProp(
       context,
       rawProps,

package/ReactCommon/react/renderer/components/view/YogaStylableProps.h

@@ -43,11 +43,6 @@ class YogaStylableProps : public Props {
 
   // Duplicates of existing properties with different names, taking
   // precedence. E.g. "marginBlock" instead of "marginVertical"
-  CompactValue inset;
-  CompactValue insetInline;
-  CompactValue insetInlineEnd;
-  CompactValue insetInlineStart;
-
   CompactValue marginInline;
   CompactValue marginInlineStart;
   CompactValue marginInlineEnd;
@@ -61,10 +56,6 @@ class YogaStylableProps : public Props {
   // BlockEnd/BlockStart map to top/bottom (no writing mode), but we preserve
   // Yoga's precedence and prefer specific edges (e.g. top) to ones which are
   // flow relative (e.g. blockStart).
-  CompactValue insetBlock;
-  CompactValue insetBlockEnd;
-  CompactValue insetBlockStart;
-
   CompactValue marginBlockStart;
   CompactValue marginBlockEnd;
 

package/ReactCommon/react/renderer/core/CoreFeatures.cpp

@@ -16,6 +16,7 @@ bool CoreFeatures::blockPaintForUseLayoutEffect = false;
 bool CoreFeatures::useNativeState = false;
 bool CoreFeatures::cacheNSTextStorage = false;
 bool CoreFeatures::cacheLastTextMeasurement = false;
+bool CoreFeatures::cancelImageDownloadsOnRecycle = false;
 
 } // namespace react
 } // namespace facebook

package/ReactCommon/react/renderer/core/CoreFeatures.h

@@ -44,6 +44,10 @@ class CoreFeatures {
   // This flag enables a caching mechanism to avoid subsequents measurements
   // of the same Text with the same constrainst.
   static bool cacheLastTextMeasurement;
+
+  // Fabric was not cancelling image downloads when <ImageView /> was removed
+  // from view hierarchy. This feature flag enables this feature.
+  static bool cancelImageDownloadsOnRecycle;
 };
 
 } // namespace react

package/ReactCommon/react/renderer/imagemanager/ImageRequest.h

@@ -35,20 +35,24 @@ class ImageRequest final {
   /*
    * The move constructor.
    */
-  ImageRequest(ImageRequest &&other) noexcept;
+  ImageRequest(ImageRequest &&other) noexcept = default;
 
   /*
    * `ImageRequest` does not support copying by design.
    */
   ImageRequest(const ImageRequest &other) = delete;
 
-  ~ImageRequest();
-
   /**
    * Set cancelation function.
    */
   void setCancelationFunction(std::function<void(void)> cancelationFunction);
 
+  /*
+   * Calls cancel function if one is defined. Should be when downloading
+   * image isn't needed anymore. E.g. <ImageView /> was removed.
+   */
+  void cancel() const;
+
   /*
    * Returns the Image Source associated with the request.
    */

package/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp

@@ -18,17 +18,6 @@ ImageRequest::ImageRequest(
   // Not implemented.
 }
 
-ImageRequest::ImageRequest(ImageRequest &&other) noexcept
-    : imageSource_(std::move(other.imageSource_)),
-      telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)) {
-  // Not implemented.
-}
-
-ImageRequest::~ImageRequest() {
-  // Not implemented.
-}
-
 const ImageResponseObserverCoordinator &ImageRequest::getObserverCoordinator()
     const {
   // Not implemented

package/ReactCommon/react/renderer/imagemanager/platform/ios/react/renderer/imagemanager/ImageRequest.cpp

@@ -17,27 +17,17 @@ ImageRequest::ImageRequest(
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
 }
 
-ImageRequest::ImageRequest(ImageRequest &&other) noexcept
-    : imageSource_(std::move(other.imageSource_)),
-      telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)) {
-  other.coordinator_ = nullptr;
-  other.cancelRequest_ = nullptr;
-  other.telemetry_ = nullptr;
-  other.imageSource_ = {};
+void ImageRequest::setCancelationFunction(
+    std::function<void(void)> cancelationFunction) {
+  cancelRequest_ = cancelationFunction;
 }
 
-ImageRequest::~ImageRequest() {
+void ImageRequest::cancel() const {
   if (cancelRequest_) {
     cancelRequest_();
   }
 }
 
-void ImageRequest::setCancelationFunction(
-    std::function<void(void)> cancelationFunction) {
-  cancelRequest_ = cancelationFunction;
-}
-
 const ImageSource &ImageRequest::getImageSource() const {
   return imageSource_;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.72.0-rc.1",
+  "version": "0.72.0-rc.3",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -79,27 +79,27 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.2.1",
-    "@react-native-community/cli": "11.1.1",
-    "@react-native-community/cli-platform-android": "11.1.1",
-    "@react-native-community/cli-platform-ios": "11.1.1",
+    "@react-native-community/cli": "11.2.3",
+    "@react-native-community/cli-platform-android": "11.2.3",
+    "@react-native-community/cli-platform-ios": "11.2.3",
     "@react-native/assets-registry": "^0.72.0",
     "@react-native/codegen": "^0.72.4",
-    "@react-native/gradle-plugin": "^0.72.6",
+    "@react-native/gradle-plugin": "^0.72.7",
     "@react-native/js-polyfills": "^0.72.1",
     "@react-native/normalize-colors": "^0.72.0",
     "@react-native/virtualized-lists": "^0.72.4",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
-    "deprecated-react-native-prop-types": "^4.0.0",
+    "deprecated-react-native-prop-types": "4.1.0",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.5",
     "invariant": "^2.2.4",
     "jest-environment-node": "^29.2.1",
     "jsc-android": "^250231.0.0",
     "memoize-one": "^5.0.0",
-    "metro-runtime": "0.76.0",
-    "metro-source-map": "0.76.0",
+    "metro-runtime": "0.76.4",
+    "metro-source-map": "0.76.4",
     "mkdirp": "^0.5.1",
     "nullthrows": "^1.1.1",
     "pretty-format": "^26.5.2",
@@ -108,7 +108,7 @@
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
-    "scheduler": "^0.23.0",
+    "scheduler": "0.24.0-canary-efb381bbf-20230505",
     "stacktrace-parser": "^0.1.10",
     "use-sync-external-store": "^1.0.0",
     "whatwg-fetch": "^3.0.0",

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

@@ -82,7 +82,7 @@ class FlipperTests < Test::Unit::TestCase
             assert_equal(config.build_settings['SWIFT_VERSION'], '4.1')
         end
 
-        reactCore_target = installer.target_with_name("React-Core")
+        reactCore_target = installer.target_with_name("React-RCTAppDelegate")
         reactCore_target.build_configurations.each do |config|
             if config.name == 'Debug' || config.name == 'CustomConfig' then
                 assert_equal(config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'], ['$(inherited)', 'FB_SONARKIT_ENABLED=1'])
@@ -144,6 +144,14 @@ class FlipperTests < Test::Unit::TestCase
                             BuildConfigurationMock.new("Release", is_debug: false),
                             BuildConfigurationMock.new("CustomConfig", is_debug: true),
                         ]
+                    ),
+                    TargetMock.new(
+                        "React-RCTAppDelegate",
+                        [
+                            BuildConfigurationMock.new("Debug", is_debug: true),
+                            BuildConfigurationMock.new("Release", is_debug: false),
+                            BuildConfigurationMock.new("CustomConfig", is_debug: true),
+                        ]
                     )
                 ]
             )

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

@@ -105,7 +105,9 @@ class JSEngineTests < Test::Unit::TestCase
         assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
         assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
         assert_equal($podInvocation["libevent"][:version], "~> 2.1.12")
-        assert_equal($podInvocation["hermes-engine"][:podspec], "../../sdks/hermes/hermes-engine.podspec")
+        hermes_engine_pod_invocation = $podInvocation["hermes-engine"]
+        assert_equal(hermes_engine_pod_invocation[:podspec], "../../sdks/hermes-engine/hermes-engine.podspec")
+        assert_equal(hermes_engine_pod_invocation[:tag], "")
     end
 
     def test_setupHermes_installsPods_installsFabricSubspecWhenFabricEnabled
@@ -118,7 +120,9 @@ class JSEngineTests < Test::Unit::TestCase
         # Assert
         assert_equal($podInvocationCount, 4)
         assert_equal($podInvocation["React-jsi"][:path], "../../ReactCommon/jsi")
-        assert_equal($podInvocation["hermes-engine"][:podspec], "../../sdks/hermes/hermes-engine.podspec")
+        hermes_engine_pod_invocation = $podInvocation["hermes-engine"]
+        assert_equal(hermes_engine_pod_invocation[:podspec], "../../sdks/hermes-engine/hermes-engine.podspec")
+        assert_equal(hermes_engine_pod_invocation[:tag], "")
         assert_equal($podInvocation["React-hermes"][:path], "../../ReactCommon/hermes")
         assert_equal($podInvocation["libevent"][:version], "~> 2.1.12")
     end

package/scripts/cocoapods/__tests__/test_utils/podSpy.rb

@@ -26,7 +26,7 @@ def podSpy_cleanUp
     $podInvocationCount = 0
 end
 
-def pod(name, version = nil, path: nil, configurations: nil, modular_headers: nil, podspec: nil)
+def pod(name, version = nil, path: nil, configurations: nil, modular_headers: nil, podspec: nil, tag: nil)
     $podInvocationCount += 1
     params = {}
     if version != nil then params[:version] = version end
@@ -34,5 +34,6 @@ def pod(name, version = nil, path: nil, configurations: nil, modular_headers: ni
     if configurations != nil then params[:configurations] = configurations end
     if modular_headers != nil then params[:modular_headers] = modular_headers end
     if podspec != nil then params[:podspec] = podspec end
+    if tag != nil then params[:tag] = tag end
     $podInvocation[name] = params
 end

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

@@ -677,74 +677,6 @@ class UtilsTests < Test::Unit::TestCase
             assert_equal(config.build_settings["OTHER_CFLAGS"], "$(inherited)")
         end
     end
-
-    # ============================= #
-    # Test - Enable Hermes Profiler #
-    # ============================= #
-
-    def test_enableHermesProfiler_whenEnableHermesProfileIsTrue_setsFlagsInRelease
-        # 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.enable_hermes_profiler(installer, enable_hermes_profiler: true)
-
-         # Assert
-         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
-            target_installation_result.native_target.build_configurations.each do |config|
-                if config.name != "Release"
-                    assert_nil(config.build_settings["OTHER_CFLAGS"])
-                else
-                    assert_equal(config.build_settings["OTHER_CFLAGS"], "$(inherited) -DRCT_REMOTE_PROFILE=1")
-                end
-            end
-         end
-    end
-
-    def test_enableHermesProfiler_whenEnableHermesProfileIsFalse_doesNothing
-        # 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.enable_hermes_profiler(installer)
-
-         # Assert
-         installer.target_installation_results.pod_target_installation_results.each do |pod_name, target_installation_result|
-            target_installation_result.native_target.build_configurations.each do |config|
-                assert_nil(config.build_settings["OTHER_CFLAGS"])
-            end
-         end
-    end
 end
 
 # ===== #

package/scripts/cocoapods/flipper.rb

@@ -77,8 +77,8 @@ def flipper_post_install(installer)
             end
         end
 
-        # Enable flipper for React-Core Debug configuration
-        if target.name == 'React-Core'
+        # 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']

package/scripts/cocoapods/jsengine.rb

@@ -30,7 +30,12 @@ def setup_hermes!(react_native_path: "../node_modules/react-native", fabric_enab
     abort unless prep_status == 0
 
     pod 'React-jsi', :path => "#{react_native_path}/ReactCommon/jsi"
-    pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes/hermes-engine.podspec"
+    # 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_path, "sdks", ".hermesversion")
+    hermestag = File.exist?(hermestag_file) ? File.read(hermestag_file).strip : ''
+
+    pod 'hermes-engine', :podspec => "#{react_native_path}/sdks/hermes-engine/hermes-engine.podspec", :tag => hermestag
     pod 'React-hermes', :path => "#{react_native_path}/ReactCommon/hermes"
     pod 'libevent', '~> 2.1.12'
 end

package/scripts/cocoapods/utils.rb

@@ -220,13 +220,6 @@ class ReactNativePodsUtils
         end
     end
 
-    def self.enable_hermes_profiler(installer, enable_hermes_profiler: false)
-        return if !enable_hermes_profiler
-
-        Pod::UI.puts "[Hermes Profiler] Enable Hermes Sample profiler"
-        self.add_compiler_flag_to_pods(installer, "-DRCT_REMOTE_PROFILE=1", configuration: "Release")
-    end
-
     # ========= #
     # Utilities #
     # ========= #

package/scripts/react_native_pods.rb

@@ -222,11 +222,10 @@ end
 # - mac_catalyst_enabled: whether we are running the Pod on a Mac Catalyst project or not.
 # - 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
+  installer,
+  react_native_path = "../node_modules/react-native",
+  mac_catalyst_enabled: 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
@@ -242,13 +241,11 @@ def react_native_post_install(
   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