Set InspectorFlags in RCTAppDelegate (facebook#41976)

Summary: Pull Request resolved: facebook#41976 Progress towards an opt-in setup for our new CDP backend. - Wires up D51563107 to conditionally disable the legacy Hermes debugger via `ReactNativeConfig`. - **Configuration covered**: iOS, for the `RCTAppDelegate` code path. - Create C++-only overload of `RCTAppSetupPrepareApp`, deprecate the previous function. Changelog: [iOS][Deprecated] - Deprecate `RCTAppSetupPrepareApp`, replaced with C++ overload Reviewed By: motiz88 Differential Revision: D51589221 fbshipit-source-id: 1688f97c69abb06d271b4d26b875365a8d86ba77
gabrieldonadel · Dec 19, 2023 · 7a4950b · 7a4950b
1 parent 11d3e11
commit 7a4950b
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 2 deletions.
diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm b/packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
@@ -84,7 +84,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
   NSDictionary *initProps = updateInitialProps([self prepareInitialProps], fabricEnabled);
 
-  RCTAppSetupPrepareApp(application, enableTM);
+  RCTAppSetupPrepareApp(application, enableTM, *_reactNativeConfig);
 
   UIView *rootView;
   if (enableBridgeless) {

diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h
@@ -11,6 +11,8 @@
 
 #ifdef __cplusplus
 
+#import <react/config/ReactNativeConfig.h>
+
 #import <memory>
 
 #ifndef RCT_USE_HERMES
@@ -44,11 +46,22 @@ std::unique_ptr<facebook::react::JSExecutorFactory> RCTAppSetupJsExecutorFactory
     RCTBridge *bridge,
     const std::shared_ptr<facebook::react::RuntimeScheduler> &runtimeScheduler);
 
+/**
+ * Register features and experiments prior to app initialization.
+ */
+void RCTAppSetupPrepareApp(
+    UIApplication *application,
+    BOOL turboModuleEnabled,
+    const facebook::react::ReactNativeConfig &reactNativeConfig);
+
 #endif // __cplusplus
 
 RCT_EXTERN_C_BEGIN
 
-void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled);
+[[deprecated("Use the 3-argument overload of RCTAppSetupPrepareApp instead")]] void RCTAppSetupPrepareApp(
+    UIApplication *application,
+    BOOL turboModuleEnabled);
+
 UIView *RCTAppSetupDefaultRootView(
     RCTBridge *bridge,
     NSString *moduleName,

diff --git a/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm b/packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm
@@ -24,6 +24,9 @@
 #import <React/RCTFabricSurface.h>
 #import <React/RCTSurfaceHostingProxyRootView.h>
 
+// jsinspector-modern
+#import <jsinspector-modern/InspectorFlags.h>
+
 void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
 {
   RCTEnableTurboModule(turboModuleEnabled);
@@ -35,6 +38,20 @@ void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
 #endif
 }
 
+void RCTAppSetupPrepareApp(
+    UIApplication *application,
+    BOOL turboModuleEnabled,
+    const facebook::react::ReactNativeConfig &reactNativeConfig)
+{
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+  RCTAppSetupPrepareApp(application, turboModuleEnabled);
+#pragma clang diagnostic pop
+
+  auto &inspectorFlags = facebook::react::jsinspector_modern::InspectorFlags::getInstance();
+  inspectorFlags.initFromConfig(reactNativeConfig);
+}
+
 UIView *
 RCTAppSetupDefaultRootView(RCTBridge *bridge, NSString *moduleName, NSDictionary *initialProperties, BOOL fabricEnabled)
 {

diff --git a/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec b/packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec
@@ -87,6 +87,7 @@ Pod::Spec.new do |s|
   add_dependency(s, "React-utils")
   add_dependency(s, "React-debug")
   add_dependency(s, "React-rendererdebug")
+  add_dependency(s, "React-jsinspector")
 
   if use_hermes
     s.dependency "React-hermes"