Fix hermes executor not available when use_frameworks is enabled

facebook · Jul 19, 2022 · 78ab43b · 78ab43b
1 parent 1d997ce
commit 78ab43b
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 35 deletions.
diff --git a/React/AppSetup/RCTAppSetupUtils.h b/React/AppSetup/RCTAppSetupUtils.h
@@ -11,21 +11,9 @@
 
 #if RCT_NEW_ARCH_ENABLED
 
-#ifndef RCT_USE_HERMES
-#if __has_include(<reacthermes/HermesExecutorFactory.h>)
-#define RCT_USE_HERMES 1
-#else
-#define RCT_USE_HERMES 0
-#endif
-#endif
-
-#if RCT_USE_HERMES
-#import <reacthermes/HermesExecutorFactory.h>
-#else
-#import <React/JSCExecutorFactory.h>
-#endif
-
+#import <React/RCTJSIExecutorRuntimeInstaller.h>
 #import <ReactCommon/RCTTurboModuleManager.h>
+
 #endif
 
 RCT_EXTERN_C_BEGIN
@@ -38,7 +26,7 @@ RCT_EXTERN_C_END
 #if RCT_NEW_ARCH_ENABLED
 RCT_EXTERN id<RCTTurboModule> RCTAppSetupDefaultModuleFromClass(Class moduleClass);
 
-std::unique_ptr<facebook::react::JSExecutorFactory> RCTAppSetupDefaultJsExecutorFactory(
+facebook::react::JSIExecutor::RuntimeInstaller RCTAppSetupDefaultJsRuntimeInstaller(
     RCTBridge *bridge,
     RCTTurboModuleManager *turboModuleManager);
 #endif
diff --git a/React/AppSetup/RCTAppSetupUtils.mm b/React/AppSetup/RCTAppSetupUtils.mm
@@ -92,7 +92,7 @@ void RCTAppSetupPrepareApp(UIApplication *application)
   return [moduleClass new];
 }
 
-std::unique_ptr<facebook::react::JSExecutorFactory> RCTAppSetupDefaultJsExecutorFactory(
+facebook::react::JSIExecutor::RuntimeInstaller RCTAppSetupDefaultJsRuntimeInstaller(
     RCTBridge *bridge,
     RCTTurboModuleManager *turboModuleManager)
 {
@@ -111,19 +111,14 @@ void RCTAppSetupPrepareApp(UIApplication *application)
   }
 #endif
 
-#if RCT_USE_HERMES
-  return std::make_unique<facebook::react::HermesExecutorFactory>(
-#else
-  return std::make_unique<facebook::react::JSCExecutorFactory>(
-#endif
-      facebook::react::RCTJSIExecutorRuntimeInstaller([turboModuleManager, bridge](facebook::jsi::Runtime &runtime) {
-        if (!bridge || !turboModuleManager) {
-          return;
-        }
-        facebook::react::RuntimeExecutor syncRuntimeExecutor =
-            [&](std::function<void(facebook::jsi::Runtime & runtime_)> &&callback) { callback(runtime); };
-        [turboModuleManager installJSBindingWithRuntimeExecutor:syncRuntimeExecutor];
-      }));
+  return facebook::react::RCTJSIExecutorRuntimeInstaller([turboModuleManager, bridge](facebook::jsi::Runtime &runtime) {
+    if (!bridge || !turboModuleManager) {
+      return;
+    }
+    facebook::react::RuntimeExecutor syncRuntimeExecutor =
+        [&](std::function<void(facebook::jsi::Runtime & runtime_)> &&callback) { callback(runtime); };
+    [turboModuleManager installJSBindingWithRuntimeExecutor:syncRuntimeExecutor];
+  });
 }
 
 #endif
diff --git a/template/ios/HelloWorld/AppDelegate.mm b/template/ios/HelloWorld/AppDelegate.mm
@@ -1,14 +1,28 @@
 #import "AppDelegate.h"
 
+#import <React/RCTAppSetupUtils.h>
 #import <React/RCTBridge.h>
 #import <React/RCTBundleURLProvider.h>
+#import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTJSIExecutorRuntimeInstaller.h>
 #import <React/RCTRootView.h>
 
-#import <React/RCTAppSetupUtils.h>
+#ifndef RCT_USE_HERMES
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+#define RCT_USE_HERMES 1
+#else
+#define RCT_USE_HERMES 0
+#endif
+#endif
+
+#if RCT_USE_HERMES
+#import <reacthermes/HermesExecutorFactory.h>
+#else
+#import <React/JSCExecutorFactory.h>
+#endif
 
 #if RCT_NEW_ARCH_ENABLED
 #import <React/CoreModulesPlugins.h>
-#import <React/RCTCxxBridgeDelegate.h>
 #import <React/RCTFabricSurfaceHostingProxyRootView.h>
 #import <React/RCTSurfacePresenter.h>
 #import <React/RCTSurfacePresenterBridgeAdapter.h>
@@ -18,7 +32,7 @@
 
 static NSString *const kRNConcurrentRoot = @"concurrentRoot";
 
-@interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate> {
+@interface AppDelegate () <RCTTurboModuleManagerDelegate> {
   RCTTurboModuleManager *_turboModuleManager;
   RCTSurfacePresenterBridgeAdapter *_bridgeAdapter;
   std::shared_ptr<const facebook::react::ReactNativeConfig> _reactNativeConfig;
@@ -27,6 +41,9 @@ @interface AppDelegate () <RCTCxxBridgeDelegate, RCTTurboModuleManagerDelegate>
 @end
 #endif
 
+@interface AppDelegate () <RCTCxxBridgeDelegate>
+@end
+
 @implementation AppDelegate
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
@@ -91,18 +108,28 @@ - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
 #endif
 }
 
-#if RCT_NEW_ARCH_ENABLED
-
 #pragma mark - RCTCxxBridgeDelegate
 
 - (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
 {
+#if RCT_NEW_ARCH_ENABLED
   _turboModuleManager = [[RCTTurboModuleManager alloc] initWithBridge:bridge
                                                              delegate:self
                                                             jsInvoker:bridge.jsCallInvoker];
-  return RCTAppSetupDefaultJsExecutorFactory(bridge, _turboModuleManager);
+  auto installBindings = RCTAppSetupDefaultJsRuntimeInstaller(bridge, _turboModuleManager);
+#else
+  auto installBindings = facebook::react::RCTJSIExecutorRuntimeInstaller(nullptr);
+#endif
+
+#if RCT_USE_HERMES
+  return std::make_unique<facebook::react::HermesExecutorFactory>(installBindings);
+#else
+  return std::make_unique<facebook::react::JSCExecutorFactory>(installBindings);
+#endif
 }
 
+#if RCT_NEW_ARCH_ENABLED
+
 #pragma mark RCTTurboModuleManagerDelegate
 
 - (Class)getModuleClassFromName:(const char *)name