diff --git a/RNTester/Podfile.lock b/RNTester/Podfile.lock index e118258891365e..91f0b5c30c4211 100644 --- a/RNTester/Podfile.lock +++ b/RNTester/Podfile.lock @@ -1,15 +1,67 @@ PODS: - boost-for-react-native (1.63.0) + - CocoaAsyncSocket (7.6.5) - DoubleConversion (1.1.6) - - FBLazyVector (0.63.34) - - FBReactNativeSpec (0.63.34): - - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.34) - - RCTTypeSafety (= 0.63.34) - - React-Core (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) + - FBLazyVector (0.63.35) + - FBReactNativeSpec (0.63.35): + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.35) + - RCTTypeSafety (= 0.63.35) + - React-Core (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - Flipper (0.75.1): + - Flipper-Folly (~> 2.5) + - Flipper-RSocket (~> 1.3) + - Flipper-Boost-iOSX (1.76.0.1.11) + - Flipper-DoubleConversion (1.1.7) + - Flipper-Fmt (7.1.7) + - Flipper-Folly (2.6.7): + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt (= 7.1.7) + - Flipper-Glog + - libevent (~> 2.1.12) + - OpenSSL-Universal (= 1.1.180) + - Flipper-Glog (0.3.6) + - Flipper-PeerTalk (0.0.4) + - Flipper-RSocket (1.4.3): + - Flipper-Folly (~> 2.6) + - FlipperKit (0.75.1): + - FlipperKit/Core (= 0.75.1) + - FlipperKit/Core (0.75.1): + - Flipper (~> 0.75.1) + - FlipperKit/CppBridge + - FlipperKit/FBCxxFollyDynamicConvert + - FlipperKit/FBDefines + - FlipperKit/FKPortForwarding + - FlipperKit/CppBridge (0.75.1): + - Flipper (~> 0.75.1) + - FlipperKit/FBCxxFollyDynamicConvert (0.75.1): + - Flipper-Folly (~> 2.5) + - FlipperKit/FBDefines (0.75.1) + - FlipperKit/FKPortForwarding (0.75.1): + - CocoaAsyncSocket (~> 7.6) + - Flipper-PeerTalk (~> 0.0.4) + - FlipperKit/FlipperKitHighlightOverlay (0.75.1) + - FlipperKit/FlipperKitLayoutPlugin (0.75.1): + - FlipperKit/Core + - FlipperKit/FlipperKitHighlightOverlay + - FlipperKit/FlipperKitLayoutTextSearchable + - YogaKit (~> 1.18) + - FlipperKit/FlipperKitLayoutTextSearchable (0.75.1) + - FlipperKit/FlipperKitNetworkPlugin (0.75.1): + - FlipperKit/Core + - FlipperKit/FlipperKitReactPlugin (0.75.1): + - FlipperKit/Core + - FlipperKit/FlipperKitUserDefaultsPlugin (0.75.1): + - FlipperKit/Core + - FlipperKit/SKIOSNetworkPlugin (0.75.1): + - FlipperKit/Core + - FlipperKit/FlipperKitNetworkPlugin - glog (0.3.5) + - libevent (2.1.12) + - OpenSSL-Universal (1.1.180) - RCT-Folly (2020.01.13.00): - boost-for-react-native - DoubleConversion @@ -19,290 +71,311 @@ PODS: - boost-for-react-native - DoubleConversion - glog - - RCTRequired (0.63.34) - - RCTTypeSafety (0.63.34): - - FBLazyVector (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - RCTRequired (= 0.63.34) - - React-Core (= 0.63.34) - - React (0.63.34): - - React-Core (= 0.63.34) - - React-Core/DevSupport (= 0.63.34) - - React-Core/RCTWebSocket (= 0.63.34) - - React-RCTActionSheet (= 0.63.34) - - React-RCTAnimation (= 0.63.34) - - React-RCTBlob (= 0.63.34) - - React-RCTImage (= 0.63.34) - - React-RCTLinking (= 0.63.34) - - React-RCTNetwork (= 0.63.34) - - React-RCTSettings (= 0.63.34) - - React-RCTText (= 0.63.34) - - React-RCTVibration (= 0.63.34) - - React-ART (0.63.34): - - React-Core/ARTHeaders (= 0.63.34) - - React-callinvoker (0.63.34) - - React-Core (0.63.34): + - RCTRequired (0.63.35) + - RCTTypeSafety (0.63.35): + - FBLazyVector (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - RCTRequired (= 0.63.35) + - React-Core (= 0.63.35) + - React (0.63.35): + - React-Core (= 0.63.35) + - React-Core/DevSupport (= 0.63.35) + - React-Core/RCTWebSocket (= 0.63.35) + - React-RCTActionSheet (= 0.63.35) + - React-RCTAnimation (= 0.63.35) + - React-RCTBlob (= 0.63.35) + - React-RCTImage (= 0.63.35) + - React-RCTLinking (= 0.63.35) + - React-RCTNetwork (= 0.63.35) + - React-RCTSettings (= 0.63.35) + - React-RCTText (= 0.63.35) + - React-RCTVibration (= 0.63.35) + - React-ART (0.63.35): + - React-Core/ARTHeaders (= 0.63.35) + - React-callinvoker (0.63.35) + - React-Core (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.34) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-Core/Default (= 0.63.35) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/ARTHeaders (0.63.34): + - React-Core/ARTHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/CoreModulesHeaders (0.63.34): + - React-Core/CoreModulesHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/Default (0.63.34): + - React-Core/Default (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/DevSupport (0.63.34): + - React-Core/DevSupport (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.34) - - React-Core/RCTWebSocket (= 0.63.34) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) - - React-jsinspector (= 0.63.34) + - React-Core/Default (= 0.63.35) + - React-Core/RCTWebSocket (= 0.63.35) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) + - React-jsinspector (= 0.63.35) - Yoga - - React-Core/RCTActionSheetHeaders (0.63.34): + - React-Core/RCTActionSheetHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTAnimationHeaders (0.63.34): + - React-Core/RCTAnimationHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTBlobHeaders (0.63.34): + - React-Core/RCTBlobHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTImageHeaders (0.63.34): + - React-Core/RCTImageHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTLinkingHeaders (0.63.34): + - React-Core/RCTLinkingHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTNetworkHeaders (0.63.34): + - React-Core/RCTNetworkHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTPushNotificationHeaders (0.63.34): + - React-Core/RCTPushNotificationHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTSettingsHeaders (0.63.34): + - React-Core/RCTSettingsHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTTextHeaders (0.63.34): + - React-Core/RCTTextHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTVibrationHeaders (0.63.34): + - React-Core/RCTVibrationHeaders (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - React-Core/Default - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-Core/RCTWebSocket (0.63.34): + - React-Core/RCTWebSocket (0.63.35): - glog - RCT-Folly (= 2020.01.13.00) - - React-Core/Default (= 0.63.34) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsiexecutor (= 0.63.34) + - React-Core/Default (= 0.63.35) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsiexecutor (= 0.63.35) - Yoga - - React-CoreModules (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.34) - - React-Core/CoreModulesHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - React-RCTImage (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-cxxreact (0.63.34): + - React-CoreModules (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.35) + - React-Core/CoreModulesHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - React-RCTImage (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-cxxreact (0.63.35): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.34) - - React-jsinspector (= 0.63.34) - - React-jsi (0.63.34): + - React-callinvoker (= 0.63.35) + - React-jsinspector (= 0.63.35) + - React-jsi (0.63.35): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsi/Default (= 0.63.34) - - React-jsi/Default (0.63.34): + - React-jsi/Default (= 0.63.35) + - React-jsi/Default (0.63.35): - boost-for-react-native (= 1.63.0) - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-jsiexecutor (0.63.34): + - React-jsiexecutor (0.63.35): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - React-jsinspector (0.63.34) - - React-RCTActionSheet (0.63.34): - - React-Core/RCTActionSheetHeaders (= 0.63.34) - - React-RCTAnimation (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.34) - - React-Core/RCTAnimationHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTBlob (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTBlobHeaders (= 0.63.34) - - React-Core/RCTWebSocket (= 0.63.34) - - React-jsi (= 0.63.34) - - React-RCTNetwork (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTImage (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.34) - - React-Core/RCTImageHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - React-RCTNetwork (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTLinking (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - React-Core/RCTLinkingHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTNetwork (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.34) - - React-Core/RCTNetworkHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTPushNotification (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCTTypeSafety (= 0.63.34) - - React-Core/RCTPushNotificationHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTSettings (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - RCTTypeSafety (= 0.63.34) - - React-Core/RCTSettingsHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTTest (0.63.34): - - RCT-Folly (= 2020.01.13.00) - - React-Core (= 0.63.34) - - React-CoreModules (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-RCTText (0.63.34): - - React-Core/RCTTextHeaders (= 0.63.34) - - React-RCTVibration (0.63.34): - - FBReactNativeSpec (= 0.63.34) - - RCT-Folly (= 2020.01.13.00) - - React-Core/RCTVibrationHeaders (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-TurboModuleCxx-RNW (0.63.34): - - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.34) - - React-TurboModuleCxx-WinRTPort (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) - - React-TurboModuleCxx-WinRTPort (0.63.34): - - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.34) - - React-TurboModuleCxx-WinRTPort/WinRT (= 0.63.34) - - React-TurboModuleCxx-WinRTPort/Shared (0.63.34) - - React-TurboModuleCxx-WinRTPort/WinRT (0.63.34): - - React-callinvoker (= 0.63.34) - - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.34) - - ReactCommon/turbomodule/core (0.63.34): + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - React-jsinspector (0.63.35) + - React-RCTActionSheet (0.63.35): + - React-Core/RCTActionSheetHeaders (= 0.63.35) + - React-RCTAnimation (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.35) + - React-Core/RCTAnimationHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTBlob (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTBlobHeaders (= 0.63.35) + - React-Core/RCTWebSocket (= 0.63.35) + - React-jsi (= 0.63.35) + - React-RCTNetwork (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTImage (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.35) + - React-Core/RCTImageHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - React-RCTNetwork (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTLinking (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - React-Core/RCTLinkingHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTNetwork (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.35) + - React-Core/RCTNetworkHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTPushNotification (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCTTypeSafety (= 0.63.35) + - React-Core/RCTPushNotificationHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTSettings (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - RCTTypeSafety (= 0.63.35) + - React-Core/RCTSettingsHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTTest (0.63.35): + - RCT-Folly (= 2020.01.13.00) + - React-Core (= 0.63.35) + - React-CoreModules (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-RCTText (0.63.35): + - React-Core/RCTTextHeaders (= 0.63.35) + - React-RCTVibration (0.63.35): + - FBReactNativeSpec (= 0.63.35) + - RCT-Folly (= 2020.01.13.00) + - React-Core/RCTVibrationHeaders (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-TurboModuleCxx-RNW (0.63.35): + - RCT-Folly (= 2020.01.13.00) + - React-callinvoker (= 0.63.35) + - React-TurboModuleCxx-WinRTPort (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) + - React-TurboModuleCxx-WinRTPort (0.63.35): + - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.35) + - React-TurboModuleCxx-WinRTPort/WinRT (= 0.63.35) + - React-TurboModuleCxx-WinRTPort/Shared (0.63.35) + - React-TurboModuleCxx-WinRTPort/WinRT (0.63.35): + - React-callinvoker (= 0.63.35) + - React-TurboModuleCxx-WinRTPort/Shared (= 0.63.35) + - ReactCommon/turbomodule/core (0.63.35): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.34) - - React-Core (= 0.63.34) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/samples (0.63.34): + - React-callinvoker (= 0.63.35) + - React-Core (= 0.63.35) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/samples (0.63.35): - DoubleConversion - glog - RCT-Folly (= 2020.01.13.00) - - React-callinvoker (= 0.63.34) - - React-Core (= 0.63.34) - - React-cxxreact (= 0.63.34) - - React-jsi (= 0.63.34) - - ReactCommon/turbomodule/core (= 0.63.34) + - React-callinvoker (= 0.63.35) + - React-Core (= 0.63.35) + - React-cxxreact (= 0.63.35) + - React-jsi (= 0.63.35) + - ReactCommon/turbomodule/core (= 0.63.35) - Yoga (1.14.0) + - YogaKit (1.18.1): + - Yoga (~> 1.14) DEPENDENCIES: - boost-for-react-native (from `../third-party-podspecs/boost-for-react-native.podspec`) - DoubleConversion (from `../third-party-podspecs/DoubleConversion.podspec`) - FBLazyVector (from `../Libraries/FBLazyVector`) - FBReactNativeSpec (from `../Libraries/FBReactNativeSpec`) + - Flipper (~> 0.75.1) + - Flipper-DoubleConversion (= 1.1.7) + - Flipper-Folly (~> 2.5) + - Flipper-Glog (= 0.3.6) + - Flipper-PeerTalk (~> 0.0.4) + - Flipper-RSocket (~> 1.3) + - FlipperKit (~> 0.75.1) + - FlipperKit/Core (~> 0.75.1) + - FlipperKit/CppBridge (~> 0.75.1) + - FlipperKit/FBCxxFollyDynamicConvert (~> 0.75.1) + - FlipperKit/FBDefines (~> 0.75.1) + - FlipperKit/FKPortForwarding (~> 0.75.1) + - FlipperKit/FlipperKitHighlightOverlay (~> 0.75.1) + - FlipperKit/FlipperKitLayoutPlugin (~> 0.75.1) + - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.75.1) + - FlipperKit/FlipperKitNetworkPlugin (~> 0.75.1) + - FlipperKit/FlipperKitReactPlugin (~> 0.75.1) + - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.75.1) + - FlipperKit/SKIOSNetworkPlugin (~> 0.75.1) - glog (from `../third-party-podspecs/glog.podspec`) - RCT-Folly (from `../third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../Libraries/RCTRequired`) @@ -335,6 +408,22 @@ DEPENDENCIES: - ReactCommon/turbomodule/samples (from `../ReactCommon`) - Yoga (from `../ReactCommon/yoga`) +SPEC REPOS: + trunk: + - CocoaAsyncSocket + - Flipper + - Flipper-Boost-iOSX + - Flipper-DoubleConversion + - Flipper-Fmt + - Flipper-Folly + - Flipper-Glog + - Flipper-PeerTalk + - Flipper-RSocket + - FlipperKit + - libevent + - OpenSSL-Universal + - YogaKit + EXTERNAL SOURCES: boost-for-react-native: :podspec: "../third-party-podspecs/boost-for-react-native.podspec" @@ -403,38 +492,51 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost-for-react-native: dabda8622e76020607c2ae1e65cc0cda8b61479d + CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b - FBLazyVector: b2ef546ab9669b603aa4ac278cc6c092d1495fd3 - FBReactNativeSpec: f303e8d9ed30b92200a1f05561d7e71f45f57f3e + FBLazyVector: 9276b61136f589d7d6d06582d64339cce2c4af76 + FBReactNativeSpec: 4024e06c6b67b86a85131214dfd2c013b7fc5883 + Flipper: d3da1aa199aad94455ae725e9f3aa43f3ec17021 + Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c + Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41 + Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b + Flipper-Folly: 83af37379faa69497529e414bd43fbfc7cae259a + Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6 + Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9 + Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 + FlipperKit: 8a20b5c5fcf9436cac58551dc049867247f64b00 glog: 1cb7c408c781ae8f35bbababe459b45e3dee4ec1 + libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 + OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa - RCTRequired: ebd9e618e6b86bb37ff97e23e560ccf3d016cae3 - RCTTypeSafety: 663206f6af54352085b63fe14f9755b3be4aa39a - React: 89d755de790e4fb15e411ec29ee7e38b73f26188 - React-ART: 8335397e7377113eef43a2cb3125380b17b4f0ef - React-callinvoker: add128e80be111f6ebb523535805aff6351e75f5 - React-Core: a4e974cb584f5e5e89f16b33e72afdf92508f154 - React-CoreModules: 8fedd9c203f02653568cd33a8adc70043620c398 - React-cxxreact: 33ebb7ed1e0b83efff2f2c07c45be3d1baad4235 - React-jsi: 505742da429b93844806a9af19fa129d4c7c0958 - React-jsiexecutor: baeef618e588586eaeac95f8c6075c5207524e19 - React-jsinspector: cd221638f8ef53d2709c3f0340696c206d93a6bd - React-RCTActionSheet: 295a44bc5eb85fb770e055d194300f5a320bec82 - React-RCTAnimation: 949e3d4ce33c56fdad9c24a49e814829d3801444 - React-RCTBlob: 71593f82c6b3a5a1e2da49df47251ff4fb574fe7 - React-RCTImage: 6067d6a8e2f5c05da7e31c5861c732cd502a9628 - React-RCTLinking: b1fbdb65a3e830f345c057d4f68f84836d917855 - React-RCTNetwork: 53b92cc7db4fde7b0dc79bc19de391a23f678db3 - React-RCTPushNotification: bb914376e2e2a320110d96c0daee96e648cff283 - React-RCTSettings: 4a828b7af45fb943e212e9a8d68a96657fe8937b - React-RCTTest: 89d10aa1e54d7415bf66a449a352d639c043a887 - React-RCTText: e1e237d7d3fc7042f836ffabac42232bbc574401 - React-RCTVibration: ab0222d12bbf34c8641787fbb1969f5d7e320fe5 - React-TurboModuleCxx-RNW: 99eebf88d5bbf90e3cc0726356e5356e87ffa3a3 - React-TurboModuleCxx-WinRTPort: 9c0d5e7b828a98e901f95abde4e6ad160d0250c9 - ReactCommon: abbd81fa77ac11b9a083fa5b3174d0d941890815 - Yoga: 3ec099675c2d5f2f7ed2ee4b97ef70a3bd137058 + RCTRequired: 5c1d81e7e475dc1a245ed626e480a3d479086416 + RCTTypeSafety: a526a16a85a8ae4cf577811a178c89bbd05e6196 + React: a78ac2c6311ff96c2486cee60586f0a76104ab7b + React-ART: dd31de92a6afd311fd95415610bbd45f3fa655a6 + React-callinvoker: 8afe157bbafcf22a6ab002fbf7a9eedbe7e9206b + React-Core: e40d4122e87c73ed14c02ce6516032d964f02e4b + React-CoreModules: 966153891095c20269a143d43c307c18e64ef97a + React-cxxreact: 9ce5eb91cf7fe4e8800bab89dbe4585ed12189e8 + React-jsi: 20679e5af89625fc064438e38ecea0afa2a4a8f4 + React-jsiexecutor: a9bfadb3f21e146d5b00b6e4b142d60861505431 + React-jsinspector: 4ca898a545d102557f01edb0478e529631bedf21 + React-RCTActionSheet: 1affae330807ac51ac54b3320cdf3719c4b490a9 + React-RCTAnimation: f46fec66717c6ca7ff4e148ab6f480b3c66c21c7 + React-RCTBlob: 9b226256ff05b96965ed2260fc02e8d4a95af44f + React-RCTImage: 1793ff8d1f40d884289c9dc16fe2fbac26c15828 + React-RCTLinking: 66bce797f25b722007f32b6bd9f95647dbec53a1 + React-RCTNetwork: 419e10fb0feb663c146e142fd7ad17dbe3f0e1b7 + React-RCTPushNotification: 33540ff2428d4209b1cefa631af85f7d458675c2 + React-RCTSettings: dc71374b4a501548e510fa7de20fb98a6c38b3e2 + React-RCTTest: 92ada192b37f7df8211549931e7e548db22d6083 + React-RCTText: 41810612d6c9b429bfafbb59e8238bb702132532 + React-RCTVibration: 841a6aa4662f1b369186e73eedcaa1f83f95d4c1 + React-TurboModuleCxx-RNW: 58055dfe02390e97a0afe4da62e252d05d126106 + React-TurboModuleCxx-WinRTPort: 94b7d0fe6c5b12a4ef8064f71ce1728dee424c6b + ReactCommon: 6a4cc0420a81d73b144d304a194a52c8ede472b3 + Yoga: 2f768e565b91d1e3a9d09bf741458623edeef42d + YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: dbdccdd110aedfbfec53a1685103e6291c57a217 +PODFILE CHECKSUM: 5778caa6b51e058eeab6b9d1c539074c087ef830 COCOAPODS: 1.10.1 diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm index 566ec01c64389a..a278d8e6a80d72 100644 --- a/React/CxxBridge/RCTCxxBridge.mm +++ b/React/CxxBridge/RCTCxxBridge.mm @@ -1370,7 +1370,7 @@ - (void)executeApplicationScript:(NSData *)script url:(NSURL *)url async:(BOOL)a } else if (reactInstance) { reactInstance->loadScriptFromString(std::make_unique(script), sourceUrlStr.UTF8String, !async); } else { - std::string methodName = async ? "loadApplicationScript" : "loadApplicationScriptSync"; + std::string methodName = async ? "loadBundle" : "loadBundleSync"; throw std::logic_error("Attempt to call " + methodName + ": on uninitialized bridge"); } }]; diff --git a/React/CxxBridge/RCTObjcExecutor.mm b/React/CxxBridge/RCTObjcExecutor.mm index 47d5787aa18845..7eebcfcdde2372 100644 --- a/React/CxxBridge/RCTObjcExecutor.mm +++ b/React/CxxBridge/RCTObjcExecutor.mm @@ -67,7 +67,12 @@ setGlobalVariable("__fbBatchedBridgeConfig", std::make_unique(folly::toJson(config))); } - void loadApplicationScript(std::unique_ptr script, std::string sourceURL) override + void initializeRuntime() override + { + // We do nothing here since initialization is done in the constructor + } + + void loadBundle(std::unique_ptr script, std::string sourceURL) override { RCTProfileBeginFlowEvent(); [m_jse executeApplicationScript:[NSData dataWithBytes:script->c_str() length:script->size()] diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java index b9572f64ce3eb1..db9f29b130e7fa 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/JavaJSExecutor.java @@ -38,7 +38,7 @@ public ProxyExecutorException(Throwable cause) { * @param sourceURL url or file location from which script content was loaded */ @DoNotStrip - void loadApplicationScript(String sourceURL) throws ProxyExecutorException; + void loadBundle(String sourceURL) throws ProxyExecutorException; /** * Execute javascript method within js context diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java index 103f22868f57cb..83772aecf5eae9 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/JSDebuggerWebSocketClient.java @@ -81,7 +81,7 @@ public void prepareJSRuntime(JSDebuggerCallback callback) { } } - public void loadApplicationScript( + public void loadBundle( String sourceURL, HashMap injectedObjects, JSDebuggerCallback callback) { int requestID = mRequestID.getAndIncrement(); mCallbacks.put(requestID, callback); diff --git a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java index b045cf69f48b04..e993205ee7f998 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java +++ b/ReactAndroid/src/main/java/com/facebook/react/devsupport/WebsocketJavaScriptExecutor.java @@ -153,10 +153,9 @@ public void close() { } @Override - public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyExecutorException { + public void loadBundle(String sourceURL) throws JavaJSExecutor.ProxyExecutorException { JSExecutorCallbackFuture callback = new JSExecutorCallbackFuture(); - Assertions.assertNotNull(mWebSocketClient) - .loadApplicationScript(sourceURL, mInjectedObjects, callback); + Assertions.assertNotNull(mWebSocketClient).loadBundle(sourceURL, mInjectedObjects, callback); try { callback.get(); } catch (Throwable cause) { @@ -178,7 +177,7 @@ public void loadApplicationScript(String sourceURL) throws JavaJSExecutor.ProxyE @Override public void setGlobalVariable(String propertyName, String jsonEncodedValue) { - // Store and use in the next loadApplicationScript() call. + // Store and use in the next loadBundle() call. mInjectedObjects.put(propertyName, jsonEncodedValue); } } diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp index 43914cadd2f48c..17e324d115456b 100644 --- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp +++ b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.cpp @@ -53,9 +53,7 @@ ProxyExecutor::~ProxyExecutor() { m_executor.reset(); } -void ProxyExecutor::loadApplicationScript( - std::unique_ptr, - std::string sourceURL) { +void ProxyExecutor::initializeRuntime() { folly::dynamic nativeModuleConfig = folly::dynamic::array; { @@ -76,14 +74,17 @@ void ProxyExecutor::loadApplicationScript( "__fbBatchedBridgeConfig", std::make_unique(folly::toJson(config))); } +} - static auto loadApplicationScript = - jni::findClassStatic(EXECUTOR_BASECLASS) - ->getMethod("loadApplicationScript"); +void ProxyExecutor::loadBundle( + std::unique_ptr, + std::string sourceURL) { + static auto loadBundle = jni::findClassStatic(EXECUTOR_BASECLASS) + ->getMethod("loadBundle"); // The proxy ignores the script data passed in. - loadApplicationScript(m_executor.get(), jni::make_jstring(sourceURL).get()); + loadBundle(m_executor.get(), jni::make_jstring(sourceURL).get()); // We can get pending calls here to native but the queue will be drained when // we launch the application. } diff --git a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h index fa1c12634fcfbd..c9eab4170d41f4 100644 --- a/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h +++ b/ReactAndroid/src/main/jni/react/jni/ProxyExecutor.h @@ -37,7 +37,8 @@ class ProxyExecutor : public JSExecutor { jni::global_ref &&executorInstance, std::shared_ptr delegate); virtual ~ProxyExecutor() override; - virtual void loadApplicationScript( + virtual void initializeRuntime() override; + virtual void loadBundle( std::unique_ptr script, std::string sourceURL) override; virtual void setBundleRegistry( diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java index 3a341c7136880e..0c6bbde0e8bdd0 100644 --- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java +++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/JSDebuggerWebSocketClientTest.java @@ -40,7 +40,7 @@ public void test_prepareJSRuntime_ShouldSendCorrectMessage() throws Exception { } @Test - public void test_loadApplicationScript_ShouldSendCorrectMessage() throws Exception { + public void test_loadBundle_ShouldSendCorrectMessage() throws Exception { final JSDebuggerWebSocketClient.JSDebuggerCallback cb = PowerMockito.mock(JSDebuggerWebSocketClient.JSDebuggerCallback.class); @@ -49,7 +49,7 @@ public void test_loadApplicationScript_ShouldSendCorrectMessage() throws Excepti injectedObjects.put("key1", "value1"); injectedObjects.put("key2", "value2"); - client.loadApplicationScript("http://localhost:8080/index.js", injectedObjects, cb); + client.loadBundle("http://localhost:8080/index.js", injectedObjects, cb); PowerMockito.verifyPrivate(client) .invoke( "sendMessage", diff --git a/ReactCommon/cxxreact/Instance.cpp b/ReactCommon/cxxreact/Instance.cpp index de1a1201e8c15d..6643b83a617865 100644 --- a/ReactCommon/cxxreact/Instance.cpp +++ b/ReactCommon/cxxreact/Instance.cpp @@ -50,6 +50,8 @@ void Instance::initializeBridge( nativeToJsBridge_ = std::make_shared( jsef.get(), moduleRegistry_, jsQueue, callback_); + nativeToJsBridge_->initializeRuntime(); + /** * After NativeToJsBridge is created, the jsi::Runtime should exist. * Also, the JS message queue thread exists. So, it's safe to @@ -65,25 +67,25 @@ void Instance::initializeBridge( CHECK(nativeToJsBridge_); } -void Instance::loadApplication( +void Instance::loadBundle( std::unique_ptr bundleRegistry, std::unique_ptr string, std::string sourceURL) { callback_->incrementPendingJSCalls(); - SystraceSection s("Instance::loadApplication", "sourceURL", sourceURL); - nativeToJsBridge_->loadApplication( + SystraceSection s("Instance::loadBundle", "sourceURL", sourceURL); + nativeToJsBridge_->loadBundle( std::move(bundleRegistry), std::move(string), std::move(sourceURL)); } -void Instance::loadApplicationSync( +void Instance::loadBundleSync( std::unique_ptr bundleRegistry, std::unique_ptr string, std::string sourceURL) { std::unique_lock lock(m_syncMutex); m_syncCV.wait(lock, [this] { return m_syncReady; }); - SystraceSection s("Instance::loadApplicationSync", "sourceURL", sourceURL); - nativeToJsBridge_->loadApplicationSync( + SystraceSection s("Instance::loadBundleSync", "sourceURL", sourceURL); + nativeToJsBridge_->loadBundleSync( std::move(bundleRegistry), std::move(string), std::move(sourceURL)); } @@ -91,7 +93,7 @@ void Instance::setSourceURL(std::string sourceURL) { callback_->incrementPendingJSCalls(); SystraceSection s("Instance::setSourceURL", "sourceURL", sourceURL); - nativeToJsBridge_->loadApplication(nullptr, nullptr, std::move(sourceURL)); + nativeToJsBridge_->loadBundle(nullptr, nullptr, std::move(sourceURL)); } void Instance::loadScriptFromString( @@ -100,9 +102,9 @@ void Instance::loadScriptFromString( bool loadSynchronously) { SystraceSection s("Instance::loadScriptFromString", "sourceURL", sourceURL); if (loadSynchronously) { - loadApplicationSync(nullptr, std::move(string), std::move(sourceURL)); + loadBundleSync(nullptr, std::move(string), std::move(sourceURL)); } else { - loadApplication(nullptr, std::move(string), std::move(sourceURL)); + loadBundle(nullptr, std::move(string), std::move(sourceURL)); } } @@ -158,12 +160,12 @@ void Instance::loadRAMBundle( std::string startupScriptSourceURL, bool loadSynchronously) { if (loadSynchronously) { - loadApplicationSync( + loadBundleSync( std::move(bundleRegistry), std::move(startupScript), std::move(startupScriptSourceURL)); } else { - loadApplication( + loadBundle( std::move(bundleRegistry), std::move(startupScript), std::move(startupScriptSourceURL)); diff --git a/ReactCommon/cxxreact/Instance.h b/ReactCommon/cxxreact/Instance.h index fdafd0a1f36e23..0d5bacb5360243 100644 --- a/ReactCommon/cxxreact/Instance.h +++ b/ReactCommon/cxxreact/Instance.h @@ -47,6 +47,8 @@ class RN_EXPORT Instance { std::shared_ptr jsQueue, std::shared_ptr moduleRegistry); + void initializeRuntime(); + void setSourceURL(std::string sourceURL); void loadScriptFromString( @@ -129,11 +131,11 @@ class RN_EXPORT Instance { private: void callNativeModules(folly::dynamic &&calls, bool isEndOfBatch); - void loadApplication( + void loadBundle( std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL); - void loadApplicationSync( + void loadBundleSync( std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL); diff --git a/ReactCommon/cxxreact/JSExecutor.h b/ReactCommon/cxxreact/JSExecutor.h index ab54642d9992fe..b3b29d1b326503 100644 --- a/ReactCommon/cxxreact/JSExecutor.h +++ b/ReactCommon/cxxreact/JSExecutor.h @@ -59,10 +59,15 @@ class JSExecutorFactory { class RN_EXPORT JSExecutor { public: + /** + * Prepares the JS runtime for React Native by installing global variables. + * Called once before any JS is evaluated. + */ + virtual void initializeRuntime() = 0; /** * Execute an application script bundle in the JS context. */ - virtual void loadApplicationScript( + virtual void loadBundle( std::unique_ptr script, std::string sourceURL) = 0; diff --git a/ReactCommon/cxxreact/NativeToJsBridge.cpp b/ReactCommon/cxxreact/NativeToJsBridge.cpp index 5f44c274977f98..4d31ef058a17ad 100644 --- a/ReactCommon/cxxreact/NativeToJsBridge.cpp +++ b/ReactCommon/cxxreact/NativeToJsBridge.cpp @@ -114,7 +114,12 @@ NativeToJsBridge::~NativeToJsBridge() { << "NativeToJsBridge::destroy() must be called before deallocating the NativeToJsBridge!"; } -void NativeToJsBridge::loadApplication( +void NativeToJsBridge::initializeRuntime() { + runOnExecutorQueue( + [](JSExecutor *executor) mutable { executor->initializeRuntime(); }); +} + +void NativeToJsBridge::loadBundle( std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL) { @@ -129,7 +134,7 @@ void NativeToJsBridge::loadApplication( executor->setBundleRegistry(std::move(bundleRegistry)); } try { - executor->loadApplicationScript( + executor->loadBundle( std::move(*startupScript), std::move(startupScriptSourceURL)); } catch (...) { m_applicationScriptHasFailure = true; @@ -138,7 +143,7 @@ void NativeToJsBridge::loadApplication( }); } -void NativeToJsBridge::loadApplicationSync( +void NativeToJsBridge::loadBundleSync( std::unique_ptr bundleRegistry, std::unique_ptr startupScript, std::string startupScriptSourceURL) { @@ -146,7 +151,7 @@ void NativeToJsBridge::loadApplicationSync( m_executor->setBundleRegistry(std::move(bundleRegistry)); } try { - m_executor->loadApplicationScript( + m_executor->loadBundle( std::move(startupScript), std::move(startupScriptSourceURL)); } catch (...) { m_applicationScriptHasFailure = true; diff --git a/ReactCommon/cxxreact/NativeToJsBridge.h b/ReactCommon/cxxreact/NativeToJsBridge.h index 44fc65f24ea091..9cc9176b093bca 100644 --- a/ReactCommon/cxxreact/NativeToJsBridge.h +++ b/ReactCommon/cxxreact/NativeToJsBridge.h @@ -32,7 +32,7 @@ class RAMBundleRegistry; // executors and their threads. All functions here can be called from // any thread. // -// Except for loadApplicationScriptSync(), all void methods will queue +// Except for loadBundleSync(), all void methods will queue // work to run on the jsQueue passed to the ctor, and return // immediately. class NativeToJsBridge { @@ -63,16 +63,21 @@ class NativeToJsBridge { */ void invokeCallback(double callbackId, folly::dynamic &&args); + /** + * Sets global variables in the JS Context. + */ + void initializeRuntime(); + /** * Starts the JS application. If bundleRegistry is non-null, then it is * used to fetch JavaScript modules as individual scripts. * Otherwise, the script is assumed to include all the modules. */ - void loadApplication( + void loadBundle( std::unique_ptr bundleRegistry, std::unique_ptr startupCode, std::string sourceURL); - void loadApplicationSync( + void loadBundleSync( std::unique_ptr bundleRegistry, std::unique_ptr startupCode, std::string sourceURL); diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp index 5de5b109e80de7..0f1370a7eeb50c 100644 --- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp +++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp @@ -77,13 +77,8 @@ JSIExecutor::JSIExecutor( *runtime, "__jsiExecutorDescription", runtime->description()); } -void JSIExecutor::loadApplicationScript( - std::unique_ptr script, - std::string sourceURL) { - SystraceSection s("JSIExecutor::loadApplicationScript"); - - // TODO: check for and use precompiled HBC - +void JSIExecutor::initializeRuntime() { + SystraceSection s("JSIExecutor::initializeRuntime"); runtime_->global().setProperty( *runtime_, "nativeModuleProxy", @@ -141,6 +136,19 @@ void JSIExecutor::loadApplicationScript( if (runtimeInstaller_) { runtimeInstaller_(*runtime_); } + bool hasLogger(ReactMarker::logTaggedMarker); + if (hasLogger) { + ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP); + } +} + +void JSIExecutor::loadBundle( + std::unique_ptr script, + std::string sourceURL) { + SystraceSection s("JSIExecutor::loadBundle"); + + // TODO: check for and use precompiled HBC + bool hasLogger(ReactMarker::logTaggedMarker); std::string scriptName = simpleBasename(sourceURL); if (hasLogger) { @@ -151,7 +159,6 @@ void JSIExecutor::loadApplicationScript( std::make_unique(std::move(script)), sourceURL); flush(); if (hasLogger) { - ReactMarker::logMarker(ReactMarker::CREATE_REACT_CONTEXT_STOP); ReactMarker::logTaggedMarker( ReactMarker::RUN_JS_BUNDLE_STOP, scriptName.c_str()); } diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h index 5f26660ce1148e..2cd3776baf52a2 100644 --- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h +++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.h @@ -77,7 +77,8 @@ class JSIExecutor : public JSExecutor { std::shared_ptr delegate, const JSIScopedTimeoutInvoker &timeoutInvoker, RuntimeInstaller runtimeInstaller); - void loadApplicationScript( + void initializeRuntime() override; + void loadBundle( std::unique_ptr script, std::string sourceURL) override; void setBundleRegistry(std::unique_ptr) override;