diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm index f5cd8bcc2b2..a6fcb509476 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm @@ -6,41 +6,38 @@ */ #import "RCTAppDelegate.h" -#import #import -#import -#import - #import "RCTAppSetupUtils.h" #if RCT_NEW_ARCH_ENABLED #import #import #import +#import #import #import #import #import #import #import +#import #import #import "RCTLegacyInteropComponents.h" static NSString *const kRNConcurrentRoot = @"concurrentRoot"; -@interface RCTAppDelegate () { +@interface RCTAppDelegate () < + RCTTurboModuleManagerDelegate, + RCTCxxBridgeDelegate, + RCTComponentViewFactoryComponentProvider> { std::shared_ptr _reactNativeConfig; facebook::react::ContextContainer::Shared _contextContainer; + std::shared_ptr _runtimeScheduler; } @end #endif -@interface RCTAppDelegate () { - std::shared_ptr _runtimeScheduler; -} -@end - @implementation RCTAppDelegate #if RCT_NEW_ARCH_ENABLED @@ -158,8 +155,6 @@ static NSString *const kRNConcurrentRoot = @"concurrentRoot"; #endif } -#if RCT_NEW_ARCH_ENABLED - #pragma mark - RCTTurboModuleManagerDelegate - (Class)getModuleClassFromName:(const char *)name diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h index 6558a849e01..990fb77ef1a 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h +++ b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h @@ -11,7 +11,7 @@ #ifdef __cplusplus -#import +#if RCT_NEW_ARCH_ENABLED #ifndef RCT_USE_HERMES #if __has_include() @@ -27,27 +27,21 @@ #import #endif -#if RCT_NEW_ARCH_ENABLED #import #endif +#if RCT_NEW_ARCH_ENABLED // Forward declaration to decrease compilation coupling namespace facebook::react { class RuntimeScheduler; } -#if RCT_NEW_ARCH_ENABLED RCT_EXTERN id RCTAppSetupDefaultModuleFromClass(Class moduleClass); std::unique_ptr RCTAppSetupDefaultJsExecutorFactory( RCTBridge *bridge, RCTTurboModuleManager *turboModuleManager, std::shared_ptr const &runtimeScheduler); - -#else -std::unique_ptr RCTAppSetupJsExecutorFactoryForOldArch( - RCTBridge *bridge, - std::shared_ptr const &runtimeScheduler); #endif #endif // __cplusplus diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm index 419a386d05a..c7701867ecf 100644 --- a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm +++ b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm @@ -7,10 +7,6 @@ #import "RCTAppSetupUtils.h" -#import -#import -#import - #if RCT_NEW_ARCH_ENABLED // Turbo Module #import @@ -19,6 +15,7 @@ #import #import #import +#import #import #import @@ -138,25 +135,4 @@ std::unique_ptr RCTAppSetupDefaultJsExecutor })); } -#else - -std::unique_ptr RCTAppSetupJsExecutorFactoryForOldArch( - RCTBridge *bridge, - std::shared_ptr const &runtimeScheduler) -{ -#if RCT_USE_HERMES - return std::make_unique( -#else - return std::make_unique( -#endif - facebook::react::RCTJSIExecutorRuntimeInstaller([bridge, runtimeScheduler](facebook::jsi::Runtime &runtime) { - if (!bridge) { - return; - } - if (runtimeScheduler) { - facebook::react::RuntimeSchedulerBinding::createAndInstallIfNeeded(runtime, runtimeScheduler); - } - })); -} - #endif diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec index 88da0d9fe7d..a98f3aea404 100644 --- a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec +++ b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec @@ -48,9 +48,6 @@ header_search_paths = [ "$(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-utils/React_utils.framework/Headers/", - "$(PODS_CONFIGURATION_BUILD_DIR)/React-debug/React_debug.framework/Headers/", - "$(PODS_CONFIGURATION_BUILD_DIR)/React-runtimescheduler/React_runtimescheduler.framework/Headers/", ] : []).map{|p| "\"#{p}\""}.join(" ") Pod::Spec.new do |s| @@ -83,7 +80,6 @@ Pod::Spec.new do |s| s.dependency "React-RCTImage" s.dependency "React-NativeModulesApple" s.dependency "React-CoreModules" - s.dependency "React-runtimescheduler" if ENV['USE_HERMES'] == nil || ENV['USE_HERMES'] == "1" s.dependency "React-hermes" @@ -95,8 +91,6 @@ Pod::Spec.new do |s| s.dependency "React-Fabric" s.dependency "React-RCTFabric" s.dependency "React-graphics" - s.dependency "React-utils" - s.dependency "React-debug" s.script_phases = { :name => "Generate Legacy Components Interop", diff --git a/packages/react-native/React-Core.podspec b/packages/react-native/React-Core.podspec index 0db3ff3186e..720e115e0b7 100644 --- a/packages/react-native/React-Core.podspec +++ b/packages/react-native/React-Core.podspec @@ -126,13 +126,11 @@ Pod::Spec.new do |s| end s.dependency "RCT-Folly", folly_version - s.dependency "React-cxxreact" - s.dependency "React-perflogger" - s.dependency "React-jsi" - s.dependency "React-jsiexecutor" - s.dependency "React-utils" + s.dependency "React-cxxreact", version + s.dependency "React-perflogger", version + s.dependency "React-jsi", version + s.dependency "React-jsiexecutor", version s.dependency "SocketRocket", socket_rocket_version - s.dependency "React-runtimeexecutor" s.dependency "Yoga" s.dependency "glog" diff --git a/packages/react-native/React/Base/RCTRuntimeExecutorFromBridge.h b/packages/react-native/React/Base/RCTRuntimeExecutorFromBridge.h deleted file mode 100644 index 11968c8d887..00000000000 --- a/packages/react-native/React/Base/RCTRuntimeExecutorFromBridge.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import -#ifdef __cplusplus -#import - -NS_ASSUME_NONNULL_BEGIN - -@class RCTBridge; - -facebook::react::RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge); - -NS_ASSUME_NONNULL_END -#endif diff --git a/packages/react-native/React/Base/RCTRuntimeExecutorFromBridge.mm b/packages/react-native/React/Base/RCTRuntimeExecutorFromBridge.mm deleted file mode 100644 index b38c043da24..00000000000 --- a/packages/react-native/React/Base/RCTRuntimeExecutorFromBridge.mm +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright (c) Meta Platforms, Inc. and affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#import "RCTRuntimeExecutorFromBridge.h" -#import -#import -#import -#import - -using namespace facebook::react; - -@interface RCTBridge () -- (std::shared_ptr)jsMessageThread; -- (void)invokeAsync:(std::function &&)func; -@end - -RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge) -{ - RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil."); - - auto bridgeWeakWrapper = wrapManagedObjectWeakly([bridge batchedBridge] ?: bridge); - - RuntimeExecutor runtimeExecutor = [bridgeWeakWrapper]( - std::function &&callback) { - RCTBridge *bridge = unwrapManagedObjectWeakly(bridgeWeakWrapper); - - RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil at the moment of scheduling a call."); - - [bridge invokeAsync:[bridgeWeakWrapper, callback = std::move(callback)]() { - RCTCxxBridge *batchedBridge = (RCTCxxBridge *)unwrapManagedObjectWeakly(bridgeWeakWrapper); - - RCTAssert(batchedBridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil at the moment of invocation."); - - if (!batchedBridge) { - return; - } - - auto runtime = (facebook::jsi::Runtime *)(batchedBridge.runtime); - - RCTAssert( - runtime, @"RCTRuntimeExecutorFromBridge: Bridge must have a valid jsi::Runtime at the moment of invocation."); - - if (!runtime) { - return; - } - - callback(*runtime); - }]; - }; - - return runtimeExecutor; -} diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.h b/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.h index 5c4c22bd5ef..188d19992c6 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.h +++ b/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.h @@ -6,6 +6,7 @@ */ #import +#import #import #import @@ -14,6 +15,8 @@ NS_ASSUME_NONNULL_BEGIN @class RCTSurfacePresenter; @class RCTBridge; +facebook::react::RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge); + /* * Controls a life-cycle of a Surface Presenter based on Bridge's life-cycle. * We are moving away from using Bridge. diff --git a/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm b/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm index 0c3c8a92aa9..b456b80a385 100644 --- a/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm +++ b/packages/react-native/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm @@ -15,7 +15,6 @@ #import #import #import -#import #import #import @@ -43,6 +42,43 @@ static ContextContainer::Shared RCTContextContainerFromBridge(RCTBridge *bridge) return contextContainer; } +RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge) +{ + RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil."); + + auto bridgeWeakWrapper = wrapManagedObjectWeakly([bridge batchedBridge] ?: bridge); + + RuntimeExecutor runtimeExecutor = [bridgeWeakWrapper]( + std::function &&callback) { + RCTBridge *bridge = unwrapManagedObjectWeakly(bridgeWeakWrapper); + + RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil at the moment of scheduling a call."); + + [bridge invokeAsync:[bridgeWeakWrapper, callback = std::move(callback)]() { + RCTCxxBridge *batchedBridge = (RCTCxxBridge *)unwrapManagedObjectWeakly(bridgeWeakWrapper); + + RCTAssert(batchedBridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil at the moment of invocation."); + + if (!batchedBridge) { + return; + } + + auto runtime = (facebook::jsi::Runtime *)(batchedBridge.runtime); + + RCTAssert( + runtime, @"RCTRuntimeExecutorFromBridge: Bridge must have a valid jsi::Runtime at the moment of invocation."); + + if (!runtime) { + return; + } + + callback(*runtime); + }]; + }; + + return runtimeExecutor; +} + @implementation RCTSurfacePresenterBridgeAdapter { RCTSurfacePresenter *_Nullable _surfacePresenter; __weak RCTBridge *_bridge; diff --git a/packages/react-native/React/React-RCTFabric.podspec b/packages/react-native/React/React-RCTFabric.podspec index f9d9368394d..0c399c1797a 100644 --- a/packages/react-native/React/React-RCTFabric.podspec +++ b/packages/react-native/React/React-RCTFabric.podspec @@ -30,6 +30,7 @@ header_search_paths = [ "\"$(PODS_ROOT)/Headers/Private/Yoga\"", "\"$(PODS_ROOT)/Headers/Public/React-Codegen\"", "\"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\"", + ] if ENV['USE_FRAMEWORKS'] @@ -42,9 +43,6 @@ if ENV['USE_FRAMEWORKS'] header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-graphics/React_graphics.framework/Headers/react/renderer/graphics/platform/ios\"" header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-ImageManager/React_ImageManager.framework/Headers\"" header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"" - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\"" - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\"" - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimescheduler/React_runtimescheduler.framework/Headers\"" end Pod::Spec.new do |s| @@ -81,8 +79,6 @@ Pod::Spec.new do |s| s.dependency "Yoga" s.dependency "React-RCTText" s.dependency "React-FabricImage" - s.dependency "React-utils" - s.dependency "React-runtimescheduler" if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1" s.dependency "hermes-engine" diff --git a/packages/react-native/ReactCommon/React-Fabric.podspec b/packages/react-native/ReactCommon/React-Fabric.podspec index 1347d9dad3e..9ad649073b3 100644 --- a/packages/react-native/ReactCommon/React-Fabric.podspec +++ b/packages/react-native/ReactCommon/React-Fabric.podspec @@ -232,6 +232,14 @@ Pod::Spec.new do |s| end end + s.subspec "debug_core" do |ss| + ss.dependency folly_dep_name, folly_version + ss.compiler_flags = folly_compiler_flags + ss.source_files = "react/debug/**/*.{m,mm,cpp,h}" + ss.exclude_files = "react/debug/tests" + ss.header_dir = "react/debug" + end + s.subspec "debug_renderer" do |ss| ss.dependency folly_dep_name, folly_version ss.compiler_flags = folly_compiler_flags @@ -315,4 +323,19 @@ Pod::Spec.new do |s| ss.header_dir = "react/renderer/leakchecker" ss.pod_target_xcconfig = { "GCC_WARN_PEDANTIC" => "YES" } end + + s.subspec "runtimescheduler" do |ss| + ss.dependency folly_dep_name, folly_version + ss.compiler_flags = folly_compiler_flags + ss.source_files = "react/renderer/runtimescheduler/**/*.{cpp,h}" + ss.exclude_files = "react/renderer/runtimescheduler/tests" + ss.header_dir = "react/renderer/runtimescheduler" + ss.pod_target_xcconfig = { "GCC_WARN_PEDANTIC" => "YES" } + end + + s.subspec "utils" do |ss| + ss.source_files = "react/utils/*.{m,mm,cpp,h}" + ss.header_dir = "react/utils" + end + end diff --git a/packages/react-native/ReactCommon/ReactCommon.podspec b/packages/react-native/ReactCommon/ReactCommon.podspec index 448907b3b8f..9ca2ec4b996 100644 --- a/packages/react-native/ReactCommon/ReactCommon.podspec +++ b/packages/react-native/ReactCommon/ReactCommon.podspec @@ -70,4 +70,8 @@ Pod::Spec.new do |s| sss.source_files = "react/nativemodule/core/ReactCommon/**/*.{cpp,h}" end end + + s.subspec "react_debug_core" do |sss| + sss.source_files = "react/debug/*.{cpp,h}" + end end diff --git a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec index 7157273b4b5..fe1b09b0a59 100644 --- a/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec +++ b/packages/react-native/ReactCommon/cxxreact/React-cxxreact.podspec @@ -33,7 +33,7 @@ Pod::Spec.new do |s| s.source_files = "*.{cpp,h}" s.exclude_files = "SampleCxxModule.*" s.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags - s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-runtimeexecutor/React_runtimeexecutor.framework/Headers\"", + s.pod_target_xcconfig = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/RCT-Folly\" \"$(PODS_ROOT)/DoubleConversion\"", "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } s.header_dir = "cxxreact" diff --git a/packages/react-native/ReactCommon/react/debug/React-debug.podspec b/packages/react-native/ReactCommon/react/debug/React-debug.podspec deleted file mode 100644 index dab4a31652e..00000000000 --- a/packages/react-native/ReactCommon/react/debug/React-debug.podspec +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -require "json" - -package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json"))) -version = package['version'] - -source = { :git => 'https://github.com/facebook/react-native.git' } -if version == '1000.0.0' - # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. - source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1") -else - source[:tag] = "v#{version}" -end - -Pod::Spec.new do |s| - s.name = "React-debug" - s.version = version - s.summary = "-" # TODO - s.homepage = "https://reactnative.dev/" - s.license = package["license"] - s.author = "Meta Platforms, Inc. and its affiliates" - s.platforms = { :ios => min_ios_version_supported } - s.source = source - s.source_files = "**/*.{cpp,h}" - s.header_dir = "react/debug" - s.pod_target_xcconfig = { "CLANG_CXX_LANGUAGE_STANDARD" => "c++17" } - - if ENV['USE_FRAMEWORKS'] - s.module_name = "React_debug" - s.header_mappings_dir = "../.." - end -end diff --git a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec index aaf2213a8ae..0ef251588cc 100644 --- a/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec +++ b/packages/react-native/ReactCommon/react/renderer/imagemanager/platform/ios/React-ImageManager.podspec @@ -48,8 +48,6 @@ Pod::Spec.new do |s| "\"$(PODS_ROOT)/DoubleConversion\"", "\"${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-debug/React_debug.framework/Headers\"", - "\"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\"", ] end @@ -63,7 +61,5 @@ Pod::Spec.new do |s| s.dependency "React-Fabric" s.dependency "React-Core/Default" s.dependency "React-RCTImage" - s.dependency "React-debug" - s.dependency "React-utils" s.dependency "glog" end diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec deleted file mode 100644 index 14c9ed0daa0..00000000000 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/React-runtimescheduler.podspec +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -require "json" - -package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "..", "package.json"))) -version = package['version'] - -source = { :git => 'https://github.com/facebook/react-native.git' } -if version == '1000.0.0' - # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. - source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1") -else - source[:tag] = "v#{version}" -end - -folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", -] - -if ENV['USE_FRAMEWORKS'] - header_search_paths << "\"$(PODS_TARGET_SRCROOT)/../../..\"" #this is needed to allow the RuntimeScheduler access its own files - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\"" -end - -Pod::Spec.new do |s| - s.name = "React-runtimescheduler" - s.version = version - s.summary = "-" # TODO - s.homepage = "https://reactnative.dev/" - s.license = package["license"] - s.author = "Meta Platforms, Inc. and its affiliates" - s.platforms = { :ios => min_ios_version_supported } - s.source = source - s.source_files = "**/*.{cpp,h}" - s.compiler_flags = folly_compiler_flags - s.header_dir = "react/renderer/runtimescheduler" - s.exclude_files = "tests" - s.pod_target_xcconfig = { - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')} - - if ENV['USE_FRAMEWORKS'] - s.module_name = "React_runtimescheduler" - s.header_mappings_dir = "../../.." - end - - s.dependency "React-jsi" - s.dependency "React-runtimeexecutor" - s.dependency "React-callinvoker" - s.dependency "React-debug" - s.dependency "glog" - s.dependency "RCT-Folly", folly_version - - if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1" - s.dependency "hermes-engine" - else - s.dependency "React-jsi" - end - -end diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp index 0164dc1c768..79d317f11b1 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.cpp @@ -7,7 +7,6 @@ #include "RuntimeSchedulerBinding.h" #include -#include "RuntimeScheduler.h" #include "SchedulerPriorityUtils.h" #include "primitives.h" diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h index 50d5f25509a..95925b97785 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerBinding.h @@ -8,11 +8,10 @@ #pragma once #include +#include namespace facebook::react { -class RuntimeScheduler; - /* * Exposes RuntimeScheduler to JavaScript realm. */ diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp index 988f97b0146..dc1e78584ac 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.cpp @@ -8,7 +8,6 @@ #include "RuntimeSchedulerCallInvoker.h" #include -#include "RuntimeScheduler.h" namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h index 2fa54232339..93cc925f685 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/RuntimeSchedulerCallInvoker.h @@ -8,11 +8,10 @@ #pragma once #include +#include namespace facebook::react { -class RuntimeScheduler; - /* * Exposes RuntimeScheduler to native modules. All calls invoked on JavaScript * queue from native modules will be funneled through RuntimeScheduler. diff --git a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h index 0968a63c5c6..3ba035b6872 100644 --- a/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h +++ b/packages/react-native/ReactCommon/react/renderer/runtimescheduler/primitives.h @@ -7,7 +7,9 @@ #pragma once +#include #include +#include #include namespace facebook::react { diff --git a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h index 2ada81212d1..739b02766ce 100644 --- a/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h +++ b/packages/react-native/ReactCommon/react/renderer/scheduler/SchedulerToolbox.h @@ -13,7 +13,7 @@ #include #include #include - +#include #include #include #include diff --git a/packages/react-native/ReactCommon/react/utils/React-utils.podspec b/packages/react-native/ReactCommon/react/utils/React-utils.podspec deleted file mode 100644 index d262c559241..00000000000 --- a/packages/react-native/ReactCommon/react/utils/React-utils.podspec +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) Meta Platforms, Inc. and affiliates. -# -# This source code is licensed under the MIT license found in the -# LICENSE file in the root directory of this source tree. - -require "json" - -package = JSON.parse(File.read(File.join(__dir__, "..", "..", "..", "package.json"))) -version = package['version'] - -source = { :git => 'https://github.com/facebook/react-native.git' } -if version == '1000.0.0' - # This is an unpublished version, use the latest commit hash of the react-native repo, which we’re presumably in. - source[:commit] = `git rev-parse HEAD`.strip if system("git rev-parse --git-dir > /dev/null 2>&1") -else - source[:tag] = "v#{version}" -end - -folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32' -folly_version = '2021.07.22.00' - -header_search_paths = [ - "\"$(PODS_ROOT)/RCT-Folly\"", - "\"$(PODS_TARGET_SRCROOT)\"", - "\"$(PODS_TARGET_SRCROOT)/ReactCommon\"", -] - -if ENV["USE_FRAMEWORKS"] - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\"" -end - -Pod::Spec.new do |s| - s.name = "React-utils" - s.version = version - s.summary = "-" # TODO - s.homepage = "https://reactnative.dev/" - s.license = package["license"] - s.author = "Meta Platforms, Inc. and its affiliates" - s.platforms = { :ios => min_ios_version_supported } - s.source = source - s.source_files = "**/*.{cpp,h,mm}" - s.compiler_flags = folly_compiler_flags - s.header_dir = "react/utils" - s.exclude_files = "tests" - s.pod_target_xcconfig = { - "CLANG_CXX_LANGUAGE_STANDARD" => "c++17", - "HEADER_SEARCH_PATHS" => header_search_paths.join(' ')} - - if ENV['USE_FRAMEWORKS'] - s.module_name = "React_utils" - s.header_mappings_dir = "../.." - end - - s.dependency "RCT-Folly", folly_version - s.dependency "React-debug" - s.dependency "glog" -end diff --git a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb index e3595ccb2fb..da138e23b86 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/codegen_utils-test.rb @@ -577,8 +577,7 @@ class CodegenUtilsTests < Test::Unit::TestCase 'React-graphics': [], 'React-rncore': [], 'React-Fabric': [], - 'React-utils': [], - 'React-debug': [], + }) specs[:'script_phases'] = script_phases @@ -590,13 +589,11 @@ class CodegenUtilsTests < Test::Unit::TestCase specs = get_podspec_no_fabric_no_script() specs["pod_target_xcconfig"]["FRAMEWORK_SEARCH_PATHS"].concat([]) - specs["pod_target_xcconfig"]["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-FabricImage/React_FabricImage.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\"") + specs["pod_target_xcconfig"]["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-FabricImage/React_FabricImage.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\"") specs[:dependencies].merge!({ 'React-graphics': [], 'React-Fabric': [], - 'React-utils': [], - 'React-debug': [], }) return specs diff --git a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb index 4482d8e25b5..c97349ed15d 100644 --- a/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb +++ b/packages/react-native/scripts/cocoapods/__tests__/new_architecture-test.rb @@ -129,7 +129,7 @@ class NewArchitectureTests < Test::Unit::TestCase # Assert assert_equal(spec.compiler_flags, NewArchitectureHelper.folly_compiler_flags) - assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${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\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.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-utils/React_utils.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\"") + assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${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\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.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\"") assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17") assert_equal(spec.pod_target_xcconfig["OTHER_CPLUSPLUSFLAGS"], "$(inherited) -DRCT_NEW_ARCH_ENABLED=1 -DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1") assert_equal( @@ -148,8 +148,6 @@ class NewArchitectureTests < Test::Unit::TestCase { :dependency_name => "Yoga" }, { :dependency_name => "React-Fabric" }, { :dependency_name => "React-graphics" }, - { :dependency_name => "React-utils" }, - { :dependency_name => "React-debug" }, { :dependency_name => "hermes-engine" } ]) end @@ -168,7 +166,7 @@ class NewArchitectureTests < Test::Unit::TestCase # Assert assert_equal(spec.compiler_flags, "-Wno-nullability-completeness #{NewArchitectureHelper.folly_compiler_flags}") - assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${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\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.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-utils/React_utils.framework/Headers\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\"") + assert_equal(spec.pod_target_xcconfig["HEADER_SEARCH_PATHS"], "#{other_flags} \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/Headers/Private/Yoga\" \"$(PODS_ROOT)/DoubleConversion\" \"${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\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-FabricImage/React_FabricImage.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\"") assert_equal(spec.pod_target_xcconfig["CLANG_CXX_LANGUAGE_STANDARD"], "c++17") assert_equal( spec.dependencies, diff --git a/packages/react-native/scripts/cocoapods/codegen_utils.rb b/packages/react-native/scripts/cocoapods/codegen_utils.rb index 45ed74bd1e2..c980f05762d 100644 --- a/packages/react-native/scripts/cocoapods/codegen_utils.rb +++ b/packages/react-native/scripts/cocoapods/codegen_utils.rb @@ -100,8 +100,6 @@ class CodegenUtils "\"$(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 @@ -132,7 +130,7 @@ class CodegenUtils "React-jsi": [], "ReactCommon/turbomodule/bridging": [], "ReactCommon/turbomodule/core": [], - "React-NativeModulesApple": [], + "React-NativeModulesApple": [], "glog": [], "DoubleConversion": [], } @@ -142,8 +140,6 @@ class CodegenUtils spec[:'dependencies'].merge!({ 'React-graphics': [], 'React-Fabric': [], - 'React-debug': [], - 'React-utils': [], }); end diff --git a/packages/react-native/scripts/cocoapods/new_architecture.rb b/packages/react-native/scripts/cocoapods/new_architecture.rb index 192d2702645..7dd43c34d9c 100644 --- a/packages/react-native/scripts/cocoapods/new_architecture.rb +++ b/packages/react-native/scripts/cocoapods/new_architecture.rb @@ -109,8 +109,6 @@ class NewArchitectureHelper header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers\"" header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/ReactCommon/ReactCommon.framework/Headers/react/nativemodule/core\"" header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-RCTFabric/RCTFabric.framework/Headers\"" - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-utils/React_utils.framework/Headers\"" - header_search_paths << "\"${PODS_CONFIGURATION_BUILD_DIR}/React-debug/React_debug.framework/Headers\"" end header_search_paths_string = header_search_paths.join(" ") spec.compiler_flags = compiler_flags.empty? ? @@folly_compiler_flags : "#{compiler_flags} #{@@folly_compiler_flags}" @@ -137,8 +135,6 @@ class NewArchitectureHelper spec.dependency "Yoga" spec.dependency "React-Fabric" spec.dependency "React-graphics" - spec.dependency "React-utils" - spec.dependency "React-debug" if ENV["USE_HERMES"] == nil || ENV["USE_HERMES"] == "1" spec.dependency "hermes-engine" diff --git a/packages/react-native/scripts/react_native_pods.rb b/packages/react-native/scripts/react_native_pods.rb index 8202be66039..8b786505cbf 100644 --- a/packages/react-native/scripts/react_native_pods.rb +++ b/packages/react-native/scripts/react_native_pods.rb @@ -117,8 +117,6 @@ def use_react_native! ( pod 'React-Core/RCTWebSocket', :path => "#{prefix}/" pod 'React-rncore', :path => "#{prefix}/ReactCommon" pod 'React-cxxreact', :path => "#{prefix}/ReactCommon/cxxreact" - pod 'React-debug', :path => "#{prefix}/ReactCommon/react/debug" - pod 'React-utils', :path => "#{prefix}/ReactCommon/react/utils" if hermes_enabled setup_hermes!(:react_native_path => prefix, :fabric_enabled => fabric_enabled) @@ -131,7 +129,6 @@ def use_react_native! ( pod 'React-callinvoker', :path => "#{prefix}/ReactCommon/callinvoker" pod 'React-runtimeexecutor', :path => "#{prefix}/ReactCommon/runtimeexecutor" - pod 'React-runtimescheduler', :path => "#{prefix}/ReactCommon/react/renderer/runtimescheduler" pod 'React-perflogger', :path => "#{prefix}/ReactCommon/reactperflogger" pod 'React-logger', :path => "#{prefix}/ReactCommon/logger" pod 'ReactCommon/turbomodule/core', :path => "#{prefix}/ReactCommon", :modular_headers => true diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock index 4f90a9b694d..be0ec11b28e 100644 --- a/packages/rn-tester/Podfile.lock +++ b/packages/rn-tester/Podfile.lock @@ -122,22 +122,18 @@ PODS: - React-RCTVibration (= 1000.0.0) - React-callinvoker (1000.0.0) - React-Codegen (1000.0.0): - - DoubleConversion - FBReactNativeSpec - - glog - hermes-engine - RCT-Folly - RCTRequired - RCTTypeSafety - React-Core - - React-debug - React-Fabric - React-graphics - React-jsi - React-jsiexecutor - React-NativeModulesApple - React-rncore - - React-utils - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - React-Core (1000.0.0): @@ -145,13 +141,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default (= 1000.0.0) - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/CoreModulesHeaders (1000.0.0): @@ -159,26 +153,22 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/Default (1000.0.0): - glog - hermes-engine - RCT-Folly (= 2021.07.22.00) - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/DevSupport (1000.0.0): @@ -187,14 +177,12 @@ PODS: - RCT-Folly (= 2021.07.22.00) - React-Core/Default (= 1000.0.0) - React-Core/RCTWebSocket (= 1000.0.0) - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) - React-jsinspector (= 1000.0.0) - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTActionSheetHeaders (1000.0.0): @@ -202,13 +190,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTAnimationHeaders (1000.0.0): @@ -216,13 +202,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTBlobHeaders (1000.0.0): @@ -230,13 +214,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTImageHeaders (1000.0.0): @@ -244,13 +226,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTLinkingHeaders (1000.0.0): @@ -258,13 +238,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTNetworkHeaders (1000.0.0): @@ -272,13 +250,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTPushNotificationHeaders (1000.0.0): @@ -286,13 +262,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTSettingsHeaders (1000.0.0): @@ -300,13 +274,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTTextHeaders (1000.0.0): @@ -314,13 +286,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTVibrationHeaders (1000.0.0): @@ -328,13 +298,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-Core/RCTWebSocket (1000.0.0): @@ -342,13 +310,11 @@ PODS: - hermes-engine - RCT-Folly (= 2021.07.22.00) - React-Core/Default (= 1000.0.0) - - React-cxxreact + - React-cxxreact (= 1000.0.0) - React-hermes - - React-jsi - - React-jsiexecutor - - React-perflogger - - React-runtimeexecutor - - React-utils + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - React-perflogger (= 1000.0.0) - SocketRocket (= 0.6.0) - Yoga - React-CoreModules (1000.0.0): @@ -373,16 +339,10 @@ PODS: - React-logger (= 1000.0.0) - React-perflogger (= 1000.0.0) - React-runtimeexecutor (= 1000.0.0) - - React-debug (1000.0.0) - React-Fabric (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-Fabric/animations (= 1000.0.0) - React-Fabric/attributedstring (= 1000.0.0) - React-Fabric/butter (= 1000.0.0) @@ -391,112 +351,69 @@ PODS: - React-Fabric/components (= 1000.0.0) - React-Fabric/config (= 1000.0.0) - React-Fabric/core (= 1000.0.0) + - React-Fabric/debug_core (= 1000.0.0) - React-Fabric/debug_renderer (= 1000.0.0) - React-Fabric/imagemanager (= 1000.0.0) - React-Fabric/leakchecker (= 1000.0.0) - React-Fabric/mapbuffer (= 1000.0.0) - React-Fabric/mounting (= 1000.0.0) + - React-Fabric/runtimescheduler (= 1000.0.0) - React-Fabric/scheduler (= 1000.0.0) - React-Fabric/telemetry (= 1000.0.0) - React-Fabric/templateprocessor (= 1000.0.0) - React-Fabric/textlayoutmanager (= 1000.0.0) - React-Fabric/uimanager (= 1000.0.0) + - React-Fabric/utils (= 1000.0.0) - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/animations (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/attributedstring (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/butter (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/componentregistry (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/componentregistrynative (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug + - React-Fabric/components/activityindicator (= 1000.0.0) + - React-Fabric/components/image (= 1000.0.0) - React-Fabric/components/inputaccessory (= 1000.0.0) - React-Fabric/components/legacyviewmanagerinterop (= 1000.0.0) - React-Fabric/components/modal (= 1000.0.0) @@ -511,395 +428,233 @@ PODS: - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/activityindicator (1000.0.0): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/components/image (1000.0.0): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/inputaccessory (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/legacyviewmanagerinterop (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/modal (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/rncore (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/root (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/safeareaview (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/scrollview (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/text (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/textinput (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/unimplementedview (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/components/view (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - Yoga - React-Fabric/config (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/core (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/debug_core (1000.0.0): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/debug_renderer (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/imagemanager (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/leakchecker (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/mapbuffer (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/mounting (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils + - ReactCommon/turbomodule/core (= 1000.0.0) + - React-Fabric/runtimescheduler (1000.0.0): + - RCT-Folly/Fabric (= 2021.07.22.00) + - RCTRequired (= 1000.0.0) + - RCTTypeSafety (= 1000.0.0) + - React-graphics (= 1000.0.0) + - React-jsi (= 1000.0.0) + - React-jsiexecutor (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/scheduler (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/telemetry (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/templateprocessor (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/textlayoutmanager (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-Fabric/uimanager - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - React-Fabric/uimanager (1000.0.0): - - DoubleConversion - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Core - - React-debug - React-graphics (= 1000.0.0) - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - - React-runtimescheduler - - React-utils - ReactCommon/turbomodule/core (= 1000.0.0) - - React-FabricImage (1000.0.0): - - DoubleConversion - - glog - - hermes-engine + - React-Fabric/utils (1000.0.0): - RCT-Folly/Fabric (= 2021.07.22.00) - RCTRequired (= 1000.0.0) - RCTTypeSafety (= 1000.0.0) - - React-Fabric - React-graphics (= 1000.0.0) - - React-ImageManager - React-jsi (= 1000.0.0) - React-jsiexecutor (= 1000.0.0) - - React-logger - ReactCommon/turbomodule/core (= 1000.0.0) - - Yoga - React-graphics (1000.0.0): - glog - RCT-Folly/Fabric (= 2021.07.22.00) @@ -916,13 +671,10 @@ PODS: - React-jsinspector (= 1000.0.0) - React-perflogger (= 1000.0.0) - React-ImageManager (1000.0.0): - - glog - RCT-Folly/Fabric - React-Core/Default - - React-debug - React-Fabric - React-RCTImage - - React-utils - React-jsi (1000.0.0): - boost (= 1.76.0) - DoubleConversion @@ -964,11 +716,6 @@ PODS: - RCTRequired - RCTTypeSafety - React-Core - - React-CoreModules - - React-hermes - - React-NativeModulesApple - - React-RCTImage - - React-RCTNetwork - ReactCommon/turbomodule/core - React-RCTBlob (1000.0.0): - hermes-engine @@ -980,19 +727,11 @@ PODS: - React-RCTNetwork (= 1000.0.0) - ReactCommon/turbomodule/core (= 1000.0.0) - React-RCTFabric (1000.0.0): - - glog - - hermes-engine - RCT-Folly/Fabric (= 2021.07.22.00) - React-Core (= 1000.0.0) - React-Fabric (= 1000.0.0) - - React-FabricImage - - React-graphics - React-ImageManager - React-RCTImage (= 1000.0.0) - - React-RCTText - - React-runtimescheduler - - React-utils - - Yoga - React-RCTImage (1000.0.0): - RCT-Folly (= 2021.07.22.00) - RCTTypeSafety (= 1000.0.0) @@ -1043,18 +782,6 @@ PODS: - React-rncore (1000.0.0) - React-runtimeexecutor (1000.0.0): - React-jsi (= 1000.0.0) - - React-runtimescheduler (1000.0.0): - - glog - - hermes-engine - - RCT-Folly (= 2021.07.22.00) - - React-callinvoker - - React-debug - - React-jsi - - React-runtimeexecutor - - React-utils (1000.0.0): - - glog - - RCT-Folly (= 2021.07.22.00) - - React-debug - ReactCommon-Samples (1000.0.0): - DoubleConversion - hermes-engine @@ -1085,7 +812,6 @@ PODS: - React-logger (= 1000.0.0) - React-perflogger (= 1000.0.0) - ScreenshotManager (0.0.1): - - glog - RCT-Folly (= 2021.07.22.00) - React-Core - SocketRocket (0.6.0) @@ -1119,7 +845,7 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.182.0) - FlipperKit/SKIOSNetworkPlugin (= 0.182.0) - glog (from `../react-native/third-party-podspecs/glog.podspec`) - - hermes-engine (from `../react-native/sdks/hermes-engine/hermes-engine.podspec`) + - hermes-engine (from `../react-native/sdks/hermes/hermes-engine.podspec`) - libevent (~> 2.1.12) - OCMock (~> 3.9.1) - OpenSSL-Universal (= 1.1.1100) @@ -1135,9 +861,7 @@ DEPENDENCIES: - React-Core/RCTWebSocket (from `../react-native/`) - React-CoreModules (from `../react-native/React/CoreModules`) - React-cxxreact (from `../react-native/ReactCommon/cxxreact`) - - React-debug (from `../react-native/ReactCommon/react/debug`) - React-Fabric (from `../react-native/ReactCommon`) - - React-FabricImage (from `../react-native/ReactCommon`) - React-graphics (from `../react-native/ReactCommon/react/renderer/graphics`) - React-hermes (from `../react-native/ReactCommon/hermes`) - React-ImageManager (from `../react-native/ReactCommon/react/renderer/imagemanager/platform/ios`) @@ -1162,8 +886,6 @@ DEPENDENCIES: - React-RCTVibration (from `../react-native/Libraries/Vibration`) - React-rncore (from `../react-native/ReactCommon`) - React-runtimeexecutor (from `../react-native/ReactCommon/runtimeexecutor`) - - React-runtimescheduler (from `../react-native/ReactCommon/react/renderer/runtimescheduler`) - - React-utils (from `../react-native/ReactCommon/react/utils`) - ReactCommon-Samples (from `../react-native/ReactCommon/react/nativemodule/samples`) - ReactCommon/turbomodule/core (from `../react-native/ReactCommon`) - ScreenshotManager (from `NativeModuleExample`) @@ -1199,8 +921,7 @@ EXTERNAL SOURCES: glog: :podspec: "../react-native/third-party-podspecs/glog.podspec" hermes-engine: - :podspec: "../react-native/sdks/hermes-engine/hermes-engine.podspec" - :tag: '' + :podspec: "../react-native/sdks/hermes/hermes-engine.podspec" RCT-Folly: :podspec: "../react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -1219,12 +940,8 @@ EXTERNAL SOURCES: :path: "../react-native/React/CoreModules" React-cxxreact: :path: "../react-native/ReactCommon/cxxreact" - React-debug: - :path: "../react-native/ReactCommon/react/debug" React-Fabric: :path: "../react-native/ReactCommon" - React-FabricImage: - :path: "../react-native/ReactCommon" React-graphics: :path: "../react-native/ReactCommon/react/renderer/graphics" React-hermes: @@ -1273,10 +990,6 @@ EXTERNAL SOURCES: :path: "../react-native/ReactCommon" React-runtimeexecutor: :path: "../react-native/ReactCommon/runtimeexecutor" - React-runtimescheduler: - :path: "../react-native/ReactCommon/react/renderer/runtimescheduler" - React-utils: - :path: "../react-native/ReactCommon/react/utils" ReactCommon: :path: "../react-native/ReactCommon" ReactCommon-Samples: @@ -1290,8 +1003,8 @@ SPEC CHECKSUMS: boost: 57d2868c099736d80fcd648bf211b4431e51a558 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54 - FBLazyVector: f4492a543c5a8fa1502d3a5867e3f7252497cfe8 - FBReactNativeSpec: 7a256eec25705f77ac6d6c6187ec2d89a180fa6c + FBLazyVector: d68947eddece25638eb0f642d1b957c90388afd1 + FBReactNativeSpec: e15126dac01896217e97d3ed3045a67be39e97cd Flipper: 6edb735e6c3e332975d1b17956bcc584eccf5818 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30 @@ -1302,55 +1015,51 @@ SPEC CHECKSUMS: FlipperKit: 2efad7007d6745a3f95e4034d547be637f89d3f6 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b - hermes-engine: a5dc057727e424d33bc71ab0f73e1f763848ff0d + hermes-engine: d4e3147fcec14fb95d56cad45f03f126e725a098 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1 - RCTRequired: 82c56a03b3efd524bfdb581a906add903f78f978 - RCTTypeSafety: 034ade4e3b36be976b8378f825ccadbe104fa852 - React: cb6dc75e09f32aeddb4d8fb58a394a67219a92fe - React-callinvoker: bae59cbd6affd712bbfc703839dad868ff35069d - React-Codegen: 42dae0c7801d765934f76cfbaefcb5742524cc98 - React-Core: 98f0e61878ef96afbf3ec4e9690a4bf720e7cb73 - React-CoreModules: fa9b32bbc7818672a7ca91eeef4867e133b566ec - React-cxxreact: 9a06a6853644cb043351ca10edd4e2b913c5b41c - React-debug: d1cd203242675d48eecec6c2553933c0e0a3874f - React-Fabric: b421e9789c777f236917181a14f1c2fb74b9f048 - React-FabricImage: 8552a7e0919bc2ab09c6869a7507ad7a46e552d9 - React-graphics: a85048af7e210ec4fed185ef201726f7b4825cc0 - React-hermes: 008e4f46da454b583bc4299fcd8cc7efdc6afd33 - React-ImageManager: 528eb68fe16f08d4c76cd32949e6bcd9e4aeae4b - React-jsi: ae20bc6ced4999f64acc5163cbfa67f878f346f4 - React-jsiexecutor: 754993beb8627912e5b25344cad02ed11a616d9f - React-jsinspector: bede0a6ac88f2463eafc1301239fe943adf06fa7 - React-logger: c20eb15d006d5c303cf6bfbb11243c8d579d9f56 - React-NativeModulesApple: d6c7428e80cce84be43ed559e954187fd655a346 - React-perflogger: c294d51cfc18b90caa1604ef3a0fe2dd76b9e15e - React-RCTActionSheet: 943bd5f540f3af1e5a149c13c4de81858edf718a - React-RCTAnimation: a430a8c32e7947b7b014f7bd1ef6825168ad4841 - React-RCTAppDelegate: c847ea72bc6fd48b7b6693755c232a3cecbbc970 - React-RCTBlob: 9de0f88a876429c31b96b63975173c60978b5586 - React-RCTFabric: f54bcc97dfd11a124a9ac992ae4f0f2fd4a4493b - React-RCTImage: 8addd5fae983149d4506fbf8b36be30585adadf4 - React-RCTLinking: aec004e7f55b71be0f68913b1d993964fc8013e1 - React-RCTNetwork: 67229afd0642c55d4493cad5129238a7a1599441 - React-RCTPushNotification: 9e4bba7bb3a4682281216a81f3342caecf84cef7 - React-RCTSettings: 9b6f5a70aa3b859b2686794c3441e278b4f6e0a6 - React-RCTTest: d4004e03f9e5ca2607eb05bee5a0618b189a127a - React-RCTText: 6d0a9927391dc26325c2edf60ef7d36f637e709c - React-RCTVibration: ae65884c71d67f356396d6fcc44eec48b5afef70 - React-rncore: fe8c75a4beb121d0f923f0a45a17910083ccb681 - React-runtimeexecutor: e1c32bc249dd3cf3919cb4664fd8dc84ef70cff7 - React-runtimescheduler: 3f19ac94cc41d5ff1a15a54af9fad2c8e2bcc420 - React-utils: 2c3b06a36a63d6fce240ac5cb1de003b95222810 - ReactCommon: de6e7a92ad50207b08bcf696a61d9b509876e131 - ReactCommon-Samples: 13b7118480fb9abeee8a98bc1cceff06984cfde4 - ScreenshotManager: d39b964a374e5012e2b8c143e29ead86b1da6a3c + RCTRequired: 54a4f03dbbebb0cfdb4e2ba8d3b1d0b1258f8c08 + RCTTypeSafety: a41e253b4ed644708899857d912b2f50c7b6214d + React: 2fc6c4c656cccd6753016528ad41199c16fd558e + React-callinvoker: a7d5e883a83bb9bd3985b08be832c5e76451d18f + React-Codegen: ecc7c203dcc86316ff12a865dbfc71190458b367 + React-Core: 6ed76c248f07d2d65d8d15b33a75444ef6ff7938 + React-CoreModules: 9b9060df7f561e9c8f8364333c2ec645d7c698d2 + React-cxxreact: aff243750dad852080636e615d7ae5639381735b + React-Fabric: 6b5c30b6e60a85446cc5d3702fa262fd1fc15619 + React-graphics: e70886fff4b79bec3745de761900a770029591f2 + React-hermes: 7f0e87d44b1c7cfbdd11aa3c070d04435fe75d57 + React-ImageManager: 9fd3521fb8871cd5bea83d2d282da27d6ef91199 + React-jsi: e4c75a1cf727c8761908ac2eeb1084e47ba88a26 + React-jsiexecutor: 8361f78286021782d885e0888bb059a4045c59b9 + React-jsinspector: 9b56a373a6797114e1d89a7dffa98ee98af67a8f + React-logger: 07c9b44040a6f948b8e2033207b23cb623f0b9b4 + React-NativeModulesApple: 47a650ab999a254890d8294581b59761f09d3867 + React-perflogger: b4b9fb2ddd856b78003708ab3cf66ce03e6bc7c4 + React-RCTActionSheet: 1b1501ef80928be10702cd0ce09120358094cd82 + React-RCTAnimation: 6741f7be3e269e057c1426074cc70f34b56e114b + React-RCTAppDelegate: 777164f9f62174c65df37286df4eee43b44a6fb0 + React-RCTBlob: fd1ee93e48aa67b0183346a59754375de93de63d + React-RCTFabric: 179b2203e1b8b89b6ec8fa6104071beb553b1684 + React-RCTImage: 055685a12c88939437f6520d9e7c120cd666cbf1 + React-RCTLinking: b149b3ff1f96fa93fc445230b9c171adb0e5572c + React-RCTNetwork: 21abb4231182651f48b7035beaa011b1ab7ae8f4 + React-RCTPushNotification: f3af966de34c1fe2df8860625d225fb2f581d15e + React-RCTSettings: 64b6acabfddf7f96796229b101bd91f46d14391b + React-RCTTest: 81ebfa8c2e1b0b482effe12485e6486dc0ff70d7 + React-RCTText: 4e5ae05b778a0ed2b22b012af025da5e1a1c4e54 + React-RCTVibration: ecfd04c1886a9c9a4e31a466c0fbcf6b36e92fde + React-rncore: 4c50bd546c117f4024a84bf6de1dd905d5fa3e82 + React-runtimeexecutor: c7b2cd6babf6cc50340398bfbb7a9da13c93093f + ReactCommon: b3e76cb18ee28cd0e3a927f5b53f888312443b6b + ReactCommon-Samples: 7bf1ed1f5d659fae980b40c35c5a431d0ec49189 + ScreenshotManager: 4e5729bfcd19014d277e57eb60e8e75db64b2953 SocketRocket: fccef3f9c5cedea1353a9ef6ada904fde10d6608 - Yoga: 239f77be94241af2a02e7018fe6165a715bc25f1 + Yoga: 1b1a12ff3d86a10565ea7cbe057d42f5e5fb2a07 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: bdab6add69d555774de227d7119a8f5ae02a670e +PODFILE CHECKSUM: 9fa6f105e2187b680e978d57b28e2f700c8bd295 -COCOAPODS: 1.12.1 +COCOAPODS: 1.12.0 diff --git a/packages/rn-tester/RNTester/AppDelegate.mm b/packages/rn-tester/RNTester/AppDelegate.mm index f4e8d4006c5..d9a5e3ff6cb 100644 --- a/packages/rn-tester/RNTester/AppDelegate.mm +++ b/packages/rn-tester/RNTester/AppDelegate.mm @@ -9,18 +9,69 @@ #import #import +#import +#import +#import #import #import +#import + #if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC #import #endif +#ifdef RN_FABRIC_ENABLED +#import +#import +#import +#import + +#import +#import +#import +#import +#import +#endif + #if RCT_NEW_ARCH_ENABLED #import #import #endif +#if DEBUG +#ifdef FB_SONARKIT_ENABLED +#import +#import +#import +#import +#import +#import +#import +#endif +#endif + +#import +#import "RNTesterTurboModuleProvider.h" + +@interface AppDelegate () { +#ifdef RN_FABRIC_ENABLED + RCTSurfacePresenterBridgeAdapter *_bridgeAdapter; + std::shared_ptr _reactNativeConfig; + facebook::react::ContextContainer::Shared _contextContainer; + std::shared_ptr _runtimeScheduler; +#endif +} +@end + +#if RCT_NEW_ARCH_ENABLED +/// Declare conformance to `RCTComponentViewFactoryComponentProvider` +@interface AppDelegate () +@end +#endif + +static NSString *const kRNConcurrentRoot = @"concurrentRoot"; + @implementation AppDelegate - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions @@ -64,6 +115,67 @@ [RCTJavaScriptLoader loadBundleAtURL:[self sourceURLForBridge:bridge] onProgress:onProgress onComplete:loadCallback]; } +#pragma mark - RCTCxxBridgeDelegate + +// This function is called during +// `[[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];` +- (std::unique_ptr)jsExecutorFactoryForBridge:(RCTBridge *)bridge +{ + std::shared_ptr callInvoker = bridge.jsCallInvoker; + +#ifdef RN_FABRIC_ENABLED + _runtimeScheduler = std::make_shared(RCTRuntimeExecutorFromBridge(bridge)); + _contextContainer->erase("RuntimeScheduler"); + _contextContainer->insert("RuntimeScheduler", _runtimeScheduler); + callInvoker = std::make_shared(_runtimeScheduler); +#endif + + RCTTurboModuleManager *turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge + delegate:self + jsInvoker:callInvoker]; + [bridge setRCTTurboModuleRegistry:turboModuleManager]; + +#if RCT_DEV + /** + * Eagerly initialize RCTDevMenu so CMD + d, CMD + i, and CMD + r work. + * This is a stop gap until we have a system to eagerly init Turbo Modules. + */ + [turboModuleManager moduleForName:"RCTDevMenu"]; +#endif + + __weak __typeof(self) weakSelf = self; + +#if RCT_USE_HERMES + return std::make_unique( +#else + return std::make_unique( +#endif + facebook::react::RCTJSIExecutorRuntimeInstaller([weakSelf, bridge, turboModuleManager]( + facebook::jsi::Runtime &runtime) { + if (!bridge) { + return; + } + +#if RN_FABRIC_ENABLED + __typeof(self) strongSelf = weakSelf; + if (strongSelf && strongSelf->_runtimeScheduler) { + facebook::react::RuntimeSchedulerBinding::createAndInstallIfNeeded(runtime, strongSelf->_runtimeScheduler); + } +#endif + + facebook::react::RuntimeExecutor syncRuntimeExecutor = + [&](std::function &&callback) { callback(runtime); }; + [turboModuleManager installJSBindingWithRuntimeExecutor:syncRuntimeExecutor]; + })); +} + +#pragma mark - RCTTurboModuleManagerDelegate + +- (Class)getModuleClassFromName:(const char *)name +{ + return facebook::react::RNTesterTurboModuleClassProvider(name); +} + - (std::shared_ptr)getTurboModule:(const std::string &)name jsInvoker:(std::shared_ptr)jsInvoker {