Skip to content

Remove RCTAppSetupPrepareApp overload and InspectorFlags call #42642

Closed
huntie wants to merge 1 commit into from
Closed

Remove RCTAppSetupPrepareApp overload and InspectorFlags call #42642

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-native/Libraries/AppDelegate/RCTAppDelegate.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(

NSDictionary *initProps = updateInitialProps([self prepareInitialProps], fabricEnabled);

RCTAppSetupPrepareApp(application, enableTM, *_reactNativeConfig);
RCTAppSetupPrepareApp(application, enableTM);

@okwasniewski okwasniewski Jan 25, 2024

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh nice! This will make my PR easier #42263 (no need to separate this logic to another function). Commenting here to get notified when it gets merged 👍🏻

@huntie huntie Jan 30, 2024

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great :D It'll get merged as soon as I sort out the PR that's stacked with this (failing internal CI in a tricky way).


UIView *rootView;
if (enableBridgeless) {
Expand Down
14 changes: 1 addition & 13 deletions packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@

#ifdef __cplusplus

#import <react/config/ReactNativeConfig.h>

#import <memory>

#if USE_HERMES
Expand Down Expand Up @@ -43,21 +41,11 @@ 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_msg("Use the 3-argument overload of RCTAppSetupPrepareApp instead");

void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled);
UIView *RCTAppSetupDefaultRootView(
RCTBridge *bridge,
NSString *moduleName,
Expand Down
17 changes: 0 additions & 17 deletions packages/react-native/Libraries/AppDelegate/RCTAppSetupUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@
#import <React/RCTFabricSurface.h>
#import <React/RCTSurfaceHostingProxyRootView.h>

// jsinspector-modern
#import <jsinspector-modern/InspectorFlags.h>

void RCTAppSetupPrepareApp(UIApplication *application, BOOL turboModuleEnabled)
{
RCTEnableTurboModule(turboModuleEnabled);
Expand All @@ -38,20 +35,6 @@ 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)
{
Expand Down
1 change: 0 additions & 1 deletion packages/react-native/Libraries/AppDelegate/React-RCTAppDelegate.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ 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"
Expand Down