[0.73] Merge 0.73.6 from upstream (#2095)

Merge 0.73.6 from upstream into 0.73-stable

.circleci/configurations/executors.yml

@@ -35,4 +35,4 @@ executors:
       xcode: *xcode_version
     resource_class: macos.x86.medium.gen2
     environment:
-      - BUILD_FROM_SOURCE: true
+      - RCT_BUILD_HERMES_FROM_SOURCE: true

.circleci/configurations/jobs.yml

@@ -673,7 +673,7 @@ jobs:
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
       - HERMES_VERSION_FILE: "packages/react-native/sdks/.hermesversion"
-      - BUILD_FROM_SOURCE: true
+      - RCT_BUILD_HERMES_FROM_SOURCE: true
     steps:
       - run:
           name: Install dependencies

packages/react-native/Libraries/LogBox/Data/__tests__/parseLogBoxLog-test.js

@@ -1021,6 +1021,54 @@ Please follow the instructions at: fburl.com/rn-remote-assets`,
       });
     });
 
+    it('detects a component stack for ts, tsx, jsx, and js files', () => {
+      expect(
+        parseLogBoxLog([
+          'Some kind of message\n    in MyTSComponent (at MyTSXComponent.ts:1)\n    in MyTSXComponent (at MyTSCComponent.tsx:1)\n    in MyJSXComponent (at MyJSXComponent.jsx:1)\n    in MyJSComponent (at MyJSComponent.js:1)',
+        ]),
+      ).toEqual({
+        componentStack: [
+          {
+            content: 'MyTSComponent',
+            fileName: 'MyTSXComponent.ts',
+            location: {
+              column: -1,
+              row: 1,
+            },
+          },
+          {
+            content: 'MyTSXComponent',
+            fileName: 'MyTSCComponent.tsx',
+            location: {
+              column: -1,
+              row: 1,
+            },
+          },
+          {
+            content: 'MyJSXComponent',
+            fileName: 'MyJSXComponent.jsx',
+            location: {
+              column: -1,
+              row: 1,
+            },
+          },
+          {
+            content: 'MyJSComponent',
+            fileName: 'MyJSComponent.js',
+            location: {
+              column: -1,
+              row: 1,
+            },
+          },
+        ],
+        category: 'Some kind of message',
+        message: {
+          content: 'Some kind of message',
+          substitutions: [],
+        },
+      });
+    });
+
     it('detects a component stack in the first argument (JSC)', () => {
       expect(
         parseLogBoxLog([

packages/react-native/Libraries/LogBox/Data/parseLogBoxLog.js

@@ -192,7 +192,7 @@ export function parseComponentStack(message: string): ComponentStack {
       if (!s) {
         return null;
       }
-      const match = s.match(/(.*) \(at (.*\.js):([\d]+)\)/);
+      const match = s.match(/(.*) \(at (.*\.(?:js|jsx|ts|tsx)):([\d]+)\)/);
       if (!match) {
         return null;
       }

packages/react-native/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm

@@ -29,7 +29,7 @@
 
 @implementation RCTViewComponentView {
   RCTUIColor *_backgroundColor; // [macOS]
-  CALayer *_borderLayer;
+  __weak CALayer *_borderLayer;
   BOOL _needsInvalidateLayer;
   BOOL _isJSResponder;
   BOOL _removeClippedSubviews;
@@ -430,9 +430,7 @@ - (void)updateLayoutMetrics:(const LayoutMetrics &)layoutMetrics
   _layoutMetrics = layoutMetrics;
   _needsInvalidateLayer = YES;
 
-  if (_borderLayer) {
-    _borderLayer.frame = self.layer.bounds;
-  }
+  _borderLayer.frame = self.layer.bounds;
 
   if (_contentView) {
     _contentView.frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
@@ -714,10 +712,7 @@ - (void)invalidateLayer
 
   if (useCoreAnimationBorderRendering) {
     layer.mask = nil;
-    if (_borderLayer) {
-      [_borderLayer removeFromSuperlayer];
-      _borderLayer = nil;
-    }
+    [_borderLayer removeFromSuperlayer];
 
     layer.borderWidth = (CGFloat)borderMetrics.borderWidths.left;
     CGColorRef borderColor = RCTCreateCGColorRefFromSharedColor(borderMetrics.borderColors.left);
@@ -730,11 +725,12 @@ - (void)invalidateLayer
     layer.backgroundColor = _backgroundColor.CGColor;
   } else {
     if (!_borderLayer) {
-      _borderLayer = [CALayer new];
-      _borderLayer.zPosition = -1024.0f;
-      _borderLayer.frame = layer.bounds;
-      _borderLayer.magnificationFilter = kCAFilterNearest;
-      [layer addSublayer:_borderLayer];
+      CALayer *borderLayer = [CALayer new];
+      borderLayer.zPosition = -1024.0f;
+      borderLayer.frame = layer.bounds;
+      borderLayer.magnificationFilter = kCAFilterNearest;
+      [layer addSublayer:borderLayer];
+      _borderLayer = borderLayer;
     }
 
     layer.backgroundColor = nil;
@@ -787,6 +783,10 @@ - (void)invalidateLayer
       }
     }
 
+    // If mutations are applied inside of Animation block, it may cause _borderLayer to be animated.
+    // To stop that, imperatively remove all animations from _borderLayer.
+    [_borderLayer removeAllAnimations];
+
     // Stage 2.5. Custom Clipping Mask
     CAShapeLayer *maskLayer = nil;
     CGFloat cornerRadius = 0;

packages/react-native/scripts/cocoapods/utils.rb

@@ -86,6 +86,27 @@ def self.exclude_i386_architecture_while_using_hermes(installer)
         end
     end
 
+    def self.fix_flipper_for_xcode_15_3(installer)
+        installer.pods_project.targets.each do |target|
+            if target.name == 'Flipper'
+                file_path = 'Pods/Flipper/xplat/Flipper/FlipperTransportTypes.h'
+                if !File.exist?(file_path)
+                    return
+                end
+
+                contents = File.read(file_path)
+                if contents.include?('#include <functional>')
+                    return
+                end
+                mod_content = contents.gsub("#pragma once", "#pragma once\n#include <functional>")
+                File.chmod(0755, file_path)
+                File.open(file_path, 'w') do |file|
+                    file.puts(mod_content)
+                end
+            end
+        end
+    end
+
     def self.set_use_hermes_build_setting(installer, hermes_enabled)
         Pod::UI.puts("Setting USE_HERMES build settings")
         projects = self.extract_projects(installer)

packages/react-native/scripts/react_native_pods.rb

@@ -322,6 +322,7 @@ def react_native_post_install(
   ReactNativePodsUtils.apply_flags_for_fabric(installer, fabric_enabled: fabric_enabled)
   ReactNativePodsUtils.apply_xcode_15_patch(installer)
   ReactNativePodsUtils.updateOSDeploymentTarget(installer)
+  ReactNativePodsUtils.fix_flipper_for_xcode_15_3(installer)
 
   NewArchitectureHelper.set_clang_cxx_language_standard_if_needed(installer)
   NewArchitectureHelper.modify_flags_for_new_architecture(installer, NewArchitectureHelper.new_arch_enabled)

packages/react-native/sdks/hermes-engine/hermes-utils.rb

@@ -8,6 +8,7 @@
 require 'open3' # [macOS]
 
 HERMES_GITHUB_URL = "https://github.com/facebook/hermes.git"
+ENV_BUILD_FROM_SOURCE = "RCT_BUILD_HERMES_FROM_SOURCE"
 
 module HermesEngineSourceType
     LOCAL_PREBUILT_TARBALL = :local_prebuilt_tarball
@@ -31,7 +32,7 @@ def HermesEngineSourceType.isFromSource(source_type)
 # - To use a specific tarball, install the dependencies with:
 # `HERMES_ENGINE_TARBALL_PATH=<path_to_tarball> bundle exec pod install`
 # - To force a build from source, install the dependencies with:
-# `BUILD_FROM_SOURCE=true bundle exec pod install`
+# `RCT_BUILD_HERMES_FROM_SOURCE=true bundle exec pod install`
 # If none of the two are provided, Cocoapods will check whether there is a tarball for the current version
 # (either release or nightly). If not, it will fall back to building from source (the latest commit on main).
 #
@@ -86,11 +87,11 @@ def hermes_commit_envvar_defined()
 end
 
 def force_build_from_tag(react_native_path)
-    return ENV['BUILD_FROM_SOURCE'] === 'true' && File.exist?(hermestag_file(react_native_path))
+    return ENV[ENV_BUILD_FROM_SOURCE] === 'true' && File.exist?(hermestag_file(react_native_path))
 end
 
 def force_build_from_main(react_native_path)
-    return ENV['BUILD_FROM_SOURCE'] === 'true' && !File.exist?(hermestag_file(react_native_path))
+    return ENV[ENV_BUILD_FROM_SOURCE] === 'true' && !File.exist?(hermestag_file(react_native_path))
 end
 
 def release_artifact_exists(version)