remove jsErrorHandlingFunc from constructor of RCTHost

Summary:
Changelog: [Internal]

after D45720132, we don't need this!

bypass-github-export-checks

Reviewed By: cipolleschi

Differential Revision: D45720130

fbshipit-source-id: dd3d8a5bd95faffefb94264d67dfb785dff50ade
This commit is contained in:
Phillip Pan
2023-05-11 18:58:13 -07:00
committed by Facebook GitHub Bot
parent d1348f6ba4
commit 2acd5c0329
4 changed files with 4 additions and 15 deletions
@@ -61,7 +61,6 @@ typedef std::shared_ptr<facebook::react::JSEngineInstance> (^RCTHostJSEngineProv
- (instancetype)initWithHostDelegate:(id<RCTHostDelegate>)hostDelegate
turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
bindingsInstallFunc:(facebook::react::ReactInstance::BindingsInstallFunc)bindingsInstallFunc
jsErrorHandlingFunc:(facebook::react::JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc
jsEngineProvider:(nullable RCTHostJSEngineProvider)jsEngineProvider NS_DESIGNATED_INITIALIZER
FB_OBJC_DIRECT;
@@ -34,7 +34,6 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
NSURL *_bundleURL;
RCTBundleManager *_bundleManager;
facebook::react::ReactInstance::BindingsInstallFunc _bindingsInstallFunc;
JsErrorHandler::JsErrorHandlingFunc _jsErrorHandlingFunc;
RCTHostJSEngineProvider _jsEngineProvider;
// All the surfaces that need to be started after main bundle execution
@@ -59,7 +58,6 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
- (instancetype)initWithHostDelegate:(id<RCTHostDelegate>)hostDelegate
turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
bindingsInstallFunc:(facebook::react::ReactInstance::BindingsInstallFunc)bindingsInstallFunc
jsErrorHandlingFunc:(JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc
jsEngineProvider:(nullable RCTHostJSEngineProvider)jsEngineProvider
{
if (self = [super init]) {
@@ -69,7 +67,6 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
_bundleManager = [RCTBundleManager new];
_bindingsInstallFunc = bindingsInstallFunc;
_moduleRegistry = [RCTModuleRegistry new];
_jsErrorHandlingFunc = jsErrorHandlingFunc;
_jsEngineProvider = [jsEngineProvider copy];
__weak RCTHost *weakHost = self;
@@ -159,8 +156,7 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
turboModuleManagerDelegate:_turboModuleManagerDelegate
onInitialBundleLoad:_onInitialBundleLoad
bindingsInstallFunc:_bindingsInstallFunc
moduleRegistry:_moduleRegistry
jsErrorHandlingFunc:_jsErrorHandlingFunc];
moduleRegistry:_moduleRegistry];
}
- (RCTFabricSurface *)createSurfaceWithModuleName:(NSString *)moduleName
@@ -229,8 +225,7 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
turboModuleManagerDelegate:_turboModuleManagerDelegate
onInitialBundleLoad:_onInitialBundleLoad
bindingsInstallFunc:_bindingsInstallFunc
moduleRegistry:_moduleRegistry
jsErrorHandlingFunc:_jsErrorHandlingFunc];
moduleRegistry:_moduleRegistry];
[[NSNotificationCenter defaultCenter]
postNotification:[NSNotification notificationWithName:RCTHostDidReloadNotification object:nil]];
@@ -256,7 +251,7 @@ NSString *const RCTHostDidReloadNotification = @"RCTHostDidReloadNotification";
NSString *message = [NSString stringWithCString:errorMap.getString(JSErrorHandlerKey::kErrorMessage).c_str()
encoding:[NSString defaultCStringEncoding]];
std::vector<facebook::react::MapBuffer> frames = errorMap.getMapBufferList(JSErrorHandlerKey::kAllStackFrames);
NSMutableArray *stack = [NSMutableArray new];
NSMutableArray<NSDictionary<NSString *, id> *> *stack = [NSMutableArray new];
for (facebook::react::MapBuffer const &mapBuffer : frames) {
NSDictionary *frame = @{
@"file" : [NSString stringWithCString:mapBuffer.getString(JSErrorHandlerKey::kFrameFileName).c_str()
@@ -58,9 +58,7 @@ typedef void (^_Null_unspecified RCTInstanceInitialBundleLoadCompletionBlock)();
turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
onInitialBundleLoad:(RCTInstanceInitialBundleLoadCompletionBlock)onInitialBundleLoad
bindingsInstallFunc:(facebook::react::ReactInstance::BindingsInstallFunc)bindingsInstallFunc
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
jsErrorHandlingFunc:(facebook::react::JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc
FB_OBJC_DIRECT;
moduleRegistry:(RCTModuleRegistry *)moduleRegistry FB_OBJC_DIRECT;
- (void)callFunctionOnJSModule:(NSString *)moduleName method:(NSString *)method args:(NSArray *)args;
@@ -73,7 +73,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
RCTInstanceInitialBundleLoadCompletionBlock _onInitialBundleLoad;
ReactInstance::BindingsInstallFunc _bindingsInstallFunc;
RCTTurboModuleManager *_turboModuleManager;
JsErrorHandler::JsErrorHandlingFunc _jsErrorHandlingFunc;
std::mutex _invalidationMutex;
std::atomic<bool> _valid;
RCTJSThreadManager *_jsThreadManager;
@@ -91,7 +90,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
onInitialBundleLoad:(RCTInstanceInitialBundleLoadCompletionBlock)onInitialBundleLoad
bindingsInstallFunc:(ReactInstance::BindingsInstallFunc)bindingsInstallFunc
moduleRegistry:(RCTModuleRegistry *)moduleRegistry
jsErrorHandlingFunc:(JsErrorHandler::JsErrorHandlingFunc)jsErrorHandlingFunc;
{
if (self = [super init]) {
_performanceLogger = [RCTPerformanceLogger new];
@@ -104,7 +102,6 @@ void RCTInstanceSetRuntimeDiagnosticFlags(NSString *flags)
_jsThreadManager = [RCTJSThreadManager new];
_onInitialBundleLoad = onInitialBundleLoad;
_bindingsInstallFunc = bindingsInstallFunc;
_jsErrorHandlingFunc = jsErrorHandlingFunc;
_bridgeModuleDecorator = [[RCTBridgeModuleDecorator alloc] initWithViewRegistry:[RCTViewRegistry new]
moduleRegistry:moduleRegistry
bundleManager:bundleManager