From e04f0e174b468f1786f2e33e9e84120dac9be692 Mon Sep 17 00:00:00 2001
From: Riccardo Cipolleschi <cipolleschi@meta.com>
Date: Tue, 24 Jun 2025 20:53:48 +0100
Subject: [PATCH] fix: cocoapods  also in hybrid mode (RNDep prebuild)

---
 .../react-native/scripts/react_native_pods.rb |   5 +-
 packages/rn-tester/Podfile.lock               | 228 +++++++++++++-----
 2 files changed, 165 insertions(+), 68 deletions(-)

diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb
index c7a8507cfd7..676d8b80eb4 100644
--- a/packages/react-native/scripts/react_native_pods.rb
+++ b/packages/react-native/scripts/react_native_pods.rb
@@ -188,8 +188,11 @@ def use_react_native! (
   else
     # Install prebuilt React Native Core and React Native Dependencies
     ReactNativeCoreUtils.rncore_log("Using React Native Core and React Native Dependencies prebuilt versions.")
-    pod 'React-Core-prebuilt', :podspec => "#{prefix}/React-Core-prebuilt.podspec", :modular_headers => true
     pod 'ReactNativeDependencies', :podspec => "#{prefix}/third-party-podspecs/ReactNativeDependencies.podspec", :modular_headers => true
+
+    if !ReactNativeCoreUtils.build_rncore_from_source()
+      pod 'React-Core-prebuilt', :podspec => "#{prefix}/React-Core-prebuilt.podspec", :modular_headers => true
+    end
   end
 
   pod 'ReactCodegen', :path => $CODEGEN_OUTPUT_DIR, :modular_headers => true
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 2a568e1874e..4997609046d 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -584,6 +584,7 @@ PODS:
     - RCT-Folly
     - RCT-Folly/Fabric
     - React-Fabric
+    - React-Fabric/bridging
     - React-FabricComponents
     - React-graphics
     - React-jsi
@@ -609,6 +610,7 @@ PODS:
     - React-debug
     - React-Fabric/animations (= 1000.0.0)
     - React-Fabric/attributedstring (= 1000.0.0)
+    - React-Fabric/bridging (= 1000.0.0)
     - React-Fabric/componentregistry (= 1000.0.0)
     - React-Fabric/componentregistrynative (= 1000.0.0)
     - React-Fabric/components (= 1000.0.0)
@@ -684,6 +686,31 @@ PODS:
     - React-utils
     - ReactCommon/turbomodule/core
     - SocketRocket
+  - React-Fabric/bridging (1000.0.0):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-rendererdebug
+    - React-runtimeexecutor
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+    - SocketRocket
   - React-Fabric/componentregistry (1000.0.0):
     - boost
     - DoubleConversion
@@ -1243,11 +1270,13 @@ PODS:
     - React-FabricComponents/components/inputaccessory (= 1000.0.0)
     - React-FabricComponents/components/iostextinput (= 1000.0.0)
     - React-FabricComponents/components/modal (= 1000.0.0)
+    - React-FabricComponents/components/rncore (= 1000.0.0)
     - React-FabricComponents/components/safeareaview (= 1000.0.0)
     - React-FabricComponents/components/scrollview (= 1000.0.0)
     - React-FabricComponents/components/text (= 1000.0.0)
     - React-FabricComponents/components/textinput (= 1000.0.0)
     - React-FabricComponents/components/unimplementedview (= 1000.0.0)
+    - React-FabricComponents/components/virtualview (= 1000.0.0)
     - React-featureflags
     - React-graphics
     - React-jsi
@@ -1341,6 +1370,33 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
+  - React-FabricComponents/components/rncore (1000.0.0):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-RCTFBReactNativeSpec
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
   - React-FabricComponents/components/safeareaview (1000.0.0):
     - boost
     - DoubleConversion
@@ -1476,6 +1532,33 @@ PODS:
     - ReactCommon/turbomodule/core
     - SocketRocket
     - Yoga
+  - React-FabricComponents/components/virtualview (1000.0.0):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
+    - React-Core
+    - React-cxxreact
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-jsi
+    - React-jsiexecutor
+    - React-logger
+    - React-RCTFBReactNativeSpec
+    - React-rendererdebug
+    - React-runtimescheduler
+    - React-utils
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
   - React-FabricComponents/textlayoutmanager (1000.0.0):
     - boost
     - DoubleConversion
@@ -2122,7 +2205,18 @@ PODS:
     - React-utils
     - SocketRocket
   - React-runtimeexecutor (1000.0.0):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - React-debug
+    - React-featureflags
     - React-jsi (= 1000.0.0)
+    - React-utils
+    - SocketRocket
   - React-RuntimeHermes (1000.0.0):
     - boost
     - DoubleConversion
@@ -2565,84 +2659,84 @@ SPEC CHECKSUMS:
   boost: 7e761d76ca2ce687f7cc98e698152abd03a18f90
   DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
   fast_float: b32c788ed9c6a8c584d114d0047beda9664e7cc6
-  FBLazyVector: d3c2dd739a63c1a124e775df075dc7c517a719cb
+  FBLazyVector: 44d5255c7aa15d523f37e6208a8c91b1a561d4da
   fmt: a40bb5bd0294ea969aaaba240a927bd33d878cdd
   glog: 5683914934d5b6e4240e497e0f4a3b42d1854183
-  hermes-engine: fd5605ca4043c8317548d649d0b64e5dafc2a124
+  hermes-engine: 46c18ef5bf4b0b10af329c7165fdf0c2360bb94b
   MyNativeView: 9b03b64f5cd9220bf7ef49fcdfc468effe704fa0
   NativeCxxModuleExample: 2897d5f3aee8a02dd201a3dd41fbc94ada1aac5e
   OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
   OSSLibraryExample: bf5b5a4238613dae3c536faff58f87528e6191cf
   RCT-Folly: 846fda9475e61ec7bcbf8a3fe81edfcaeb090669
   RCTDeprecation: 3808e36294137f9ee5668f4df2e73dc079cd1dcf
-  RCTRequired: a00614e2da5344c2cda3d287050b6cee00e21dc6
-  RCTTypeSafety: 459a16418c6b413060d35434ba3e83f5b0bd2651
-  React: 170a01a19ba2525ab7f11243e2df6b19bf268093
-  React-callinvoker: f08f425e4043cd1998a158b6e39a6aed1fd1d718
-  React-Core: d35c5cf69898fd026e5cd93a0454b1d42e999d3e
-  React-CoreModules: 3ce1d43f6cc37f43759ec543ce1c0010080f1de1
-  React-cxxreact: 3169b106af8f405e182d131d3a0844201e3252e2
-  React-debug: 195df38487d3f48a7af04deddeb4a5c6d4440416
-  React-defaultsnativemodule: 8afea5a4bd07addb523bf48489b8a684ea1bdff0
-  React-domnativemodule: 8a813559774e65bc800fe489bbb454cd546f21d7
-  React-Fabric: e9846203f11ab49be8b1329c76301bbd399ef2ad
-  React-FabricComponents: 032d6f01f1d6966633418c0fece18f698ddb7897
-  React-FabricImage: 264c9ce5241e43e25b94c8de55ac6c3c8a046472
-  React-featureflags: 595651ea13c63a9f77f06d9a1973b665b4a28b7e
-  React-featureflagsnativemodule: 06823479a2ee210cfa0e9c19447c2722a8d995f2
-  React-graphics: 1f99b9b5515eac389f0cf9c85b03abc366d6a933
-  React-hermes: 745eb45a6d0aae7e890d0aae0def54670bbd103c
-  React-idlecallbacksnativemodule: 4e65f183318b8a0fbabc481a4eafc0f0d62d1cbf
-  React-ImageManager: a6833445e17879933378b7c0ba45ee42115c14bc
-  React-jserrorhandler: bec134a192c50338193544404d45df24fb8a19ca
-  React-jsi: 4ad77650fb0ca4229569eb2532db7a87e3d12662
-  React-jsiexecutor: fa5b80bdbe1ceffc33a892da20fc07b4dfa4df7a
-  React-jsinspector: 10b5dc4eef2a3d05b80be2114ed676496c5bf59c
-  React-jsinspectorcdp: 5fb266e5f23d3a2819ba848e9d4d0b6b00f95934
-  React-jsinspectornetwork: 1655a81f3fe14789df41e063bd56dd130cc3562a
-  React-jsinspectortracing: 5b0be488e06958a572e1badfe8509929ae1cc83b
-  React-jsitooling: 9e563b89f94cf4baf872fe47105d60ae83f4ce4d
-  React-jsitracing: ce443686f52538d1033ce7db1e7d643e866262f0
-  React-logger: 116c3ae5a9906671d157aa00882a5ee75a5a7ebc
-  React-Mapbuffer: fc937cfa41140d7724c559c3d16c50dd725361c8
-  React-microtasksnativemodule: 09899c7389250279bdcc5384f0281bb069979855
-  React-NativeModulesApple: d05b718ccd8b68c184e76dbc1efb63385197595b
-  React-oscompat: 7133e0e945cda067ae36b22502df663d73002864
-  React-perflogger: ada3cdf3dfc8b7cd1fabe3c91b672e23981611ab
-  React-performancetimeline: e7d5849d89ee39557dcd56dfb6e7b0d49003d925
-  React-RCTActionSheet: 1bf8cc8086ad1c15da3407dfb7bc9dd94dc7595d
-  React-RCTAnimation: 263593e66c89bf810604b1ace15dfa382a1ca2df
-  React-RCTAppDelegate: 3a99437ffa7460f85045de65f9bed6b1c47d5f09
-  React-RCTBlob: 7b76230c53fe87d305eeeb250b0aae031bb6cbae
-  React-RCTFabric: 2fd2ef899c7219fd39fd61c39750510f88a81434
-  React-RCTFBReactNativeSpec: 4ed3b463eb26726b04ac65c73797207ecab5634c
-  React-RCTImage: de404b6b0ebe53976a97e3a0dee819c83e12977b
-  React-RCTLinking: 06742cfad41c506091403a414370743a4ed75af3
-  React-RCTNetwork: b4577eec0092c16d8996e415e4cac7a372d6d362
-  React-RCTPushNotification: ea11178d499696516e0ff9ae335edbe99b06f94b
-  React-RCTRuntime: 925039e78fc530e0421c308ccc607f214f3c7be1
-  React-RCTSettings: d3c2dd305ec81f7faf42762ec598d57f07fd43be
-  React-RCTTest: 2db46eda60bc2228cb67622a580e8e86b00088d9
-  React-RCTText: e416825b80c530647040ef91d23ffd35ccc87981
-  React-RCTVibration: 1837a27fc16eeffc9509779c3334fde54c012bcc
-  React-rendererconsistency: 777c894edc43dde01499189917ac54ee76ae6a6a
-  React-renderercss: a9cb6ba7f49a80dc4b4f7008bae1590d12f27049
-  React-rendererdebug: fea8bde927403a198742b2d940a5f1cd8230c0b4
-  React-RuntimeApple: 6a0c164a8855edb4987b90da2d4d8601302de72d
-  React-RuntimeCore: 6dec37113b759b76641bd028bfbbbec8cf923356
-  React-runtimeexecutor: a16a24b964e964afe833a652d703e1bb39f10dc9
-  React-RuntimeHermes: d4f661204d3061219a63951eb4efed4dcaf3f12f
-  React-runtimescheduler: ae44fe8b4170a9d59f62e8b7d7b060c179db739d
-  React-timing: 9d49179631e5e3c759e6e82d4c613c73da80a144
-  React-utils: 0944df8d553d66b27f486282c42a84a969fd2f6c
-  ReactAppDependencyProvider: 68f2d2cefd6c9b9f2865246be2bfe86ebd49238d
+  RCTRequired: 06dfc38d8c33128e965204df01b5eafdfe5cf588
+  RCTTypeSafety: f811726308949478728149388088b9ab7814f497
+  React: 5d6710814435fe532f5d309927c92053ac477d31
+  React-callinvoker: 1b05e01429dea0ade98e39e333b1b7a33d25d297
+  React-Core: ccf581a8e9784207032e7dbbcb7fa289d3fb61f2
+  React-CoreModules: 0762edf23428f87fac0c654692db3c46d1ab11cb
+  React-cxxreact: 80b38820c0f4ce4c8c5e55e34d5e7a874564ca18
+  React-debug: a8571e20f19cd8639c15c0e2721d4835783d9b1b
+  React-defaultsnativemodule: e4543182d339e8c4803f0088ed49a222500813f7
+  React-domnativemodule: 47f5bd5e09329fe830d51d68bcfec35a37817706
+  React-Fabric: c428ec991a2f8b09255fe4a3373649cc639da11d
+  React-FabricComponents: 1582d346bddd4da09d72cc0dc6eb13cba0575ca2
+  React-FabricImage: 214e450de8d7cb7cc31cf4eb8293c381570659c6
+  React-featureflags: e7f088cc080b7a32d076bc01edb9e54ff048edfb
+  React-featureflagsnativemodule: b09516b2daaf00ccf592c44d794a161911d9fe3d
+  React-graphics: 2b55c06d633e740452f047a5248b4242c7c2df22
+  React-hermes: 25f675b4697d18fa702580789bfa114f523896e9
+  React-idlecallbacksnativemodule: bf101b2286cddca4cd05614d70672890621f0671
+  React-ImageManager: 9808caa1213fbb57ee129e7bd002efc58ad7a349
+  React-jserrorhandler: b32a196f3273c9c1bba492a09f55952281388812
+  React-jsi: 3f7499b616371227d7ec02734b49c969928d93bc
+  React-jsiexecutor: 815cf4d4a29358f1c7e6ba400e7cd8f1883fa017
+  React-jsinspector: eba7c8f006c6410054c0b2b91b56963bac1faf46
+  React-jsinspectorcdp: 5da97439dd870d1baf97e0b34e34ff8497805848
+  React-jsinspectornetwork: 1049ba6d56216560c2b40852b8c805d7c019863b
+  React-jsinspectortracing: 36da1b5b96877cddf578607789f6fa14efb9c0fc
+  React-jsitooling: 79f0f921398976864b00ced540dc5691ea82e5b9
+  React-jsitracing: b83d49072f31962ff3167e37708500094ed3cb76
+  React-logger: 11788fc47bb8d80d34f864d7467361d78f51fb74
+  React-Mapbuffer: 751c27a41ee3021c1d9c1e8bad2b0a8dcc02e8b8
+  React-microtasksnativemodule: 736c42ce0bebce6a1cb72b9d8a89f575cb0e297a
+  React-NativeModulesApple: 375337d9a35c3030d81ed6e9d857822c9c8838b5
+  React-oscompat: b403d3396288dcdc2f81592fdbf3a4641ecd4980
+  React-perflogger: c8c50ad750d2816c232f9afe3224ad7cfaf696f2
+  React-performancetimeline: d80881125ce1715354ac66a94367affc6c7d85ba
+  React-RCTActionSheet: 4d001fb0328f8e866c5d5dec1d460fed12649a67
+  React-RCTAnimation: 923fcb51f02f0f5eb86c077c761d6567216aa4ca
+  React-RCTAppDelegate: 10703f77742af907524e55385402a89fe7d3e47d
+  React-RCTBlob: 894f9ce6192c320eeff9b7a2f0743a1b3b188d7b
+  React-RCTFabric: 7b88cf7b2933d0e9392eaa530ff0adbb7ce591a9
+  React-RCTFBReactNativeSpec: 42b378230d989f45202706d72541116d03f7464d
+  React-RCTImage: debfef0ebabf46fec055c0c3e66009f5e675b8eb
+  React-RCTLinking: d2a5f4ceafd0c2e29a5ba9f515a972d2ac8fba51
+  React-RCTNetwork: 3598a6d7d877b5cecbf68632442aca40caf29fa0
+  React-RCTPushNotification: 8174e6f36d80e98ecadda82ed5beeb683f2c62e8
+  React-RCTRuntime: dcfa715884c09b4744bf0d755b4276a7f2795eed
+  React-RCTSettings: b39f577682255512bb7bfd958f58974309ce490c
+  React-RCTTest: bacf7a7e14cd0764f6b4bdd63ecc41032ff2a063
+  React-RCTText: 09d158cf486bebbf8f1f3f4fae0e930c0436a4e7
+  React-RCTVibration: 0eb42f2a30b180f201909d9edf2be539b7489e0c
+  React-rendererconsistency: 7e0c71409a99812dcbf0fc39840c7c4093d552a8
+  React-renderercss: 182d2defce5652fab3917e784cc460453a733e1e
+  React-rendererdebug: 50f9a160b90838f9c1fa1d01c71ac0dc8c1268e6
+  React-RuntimeApple: 8c45fd94eb0de20833547dec65561d1c7012690c
+  React-RuntimeCore: d07e6dca7c613e30398dcc8f9143e401186eb961
+  React-runtimeexecutor: bac2fe60a0b42b4ec8624e52c526015ec45b14a5
+  React-RuntimeHermes: 59e9e18ece8ce09c4fda4e86dbfd5b2781176ff1
+  React-runtimescheduler: 8c863a0165afb03abd6637bd92cc64c4a782cb3f
+  React-timing: 603e5af15e57ae7c2041570fc56d0ee22a778370
+  React-utils: b61aa8adee958ad0363b592d56082c9cfc7d2d37
+  ReactAppDependencyProvider: fa934f08609f12842d6b1edc0d53322e1da7793a
   ReactCodegen: 8fc4c8b6562a59409b5650e67f78719093d093bf
-  ReactCommon: a53973ab35d399560ace331ec9e2b26db0592cec
-  ReactCommon-Samples: dcc128cbf51ac38d2578791750d0a046d1b8a5e9
+  ReactCommon: 199e68b403e70a6d720c0a77b66a70d55265b87a
+  ReactCommon-Samples: e3154cdc46606e2d7a6976975054f75321a776ae
   ScreenshotManager: 6ac0b11c7bbd5cf1abd9448fb3b856fe6fd65ff7
   SocketRocket: d4aabe649be1e368d1318fdf28a022d714d65748
-  Yoga: c4e80f1c2235fa6236d71a49e5bb2ee74d987921
+  Yoga: eb68106387ed25b414c3844d8391c2764de679d6
 
-PODFILE CHECKSUM: 8591f96a513620a2a83a0b9a125ad3fa32ea1369
+PODFILE CHECKSUM: b0abc972ac4c3a335250548a31500196b1a2c163
 
 COCOAPODS: 1.15.2