react-native-tvos 0.83.2-0 → 0.84.0-0

package/React/CoreModules/RCTDevLoadingView.mm

@@ -32,6 +32,7 @@ using namespace facebook::react;
   UIWindow *_window;
   UILabel *_label;
   UIView *_container;
+  UIButton *_dismissButton;
   NSDate *_showDate;
   BOOL _hiding;
   dispatch_block_t _initialMessageBlock;
@@ -85,7 +86,10 @@ RCT_EXPORT_MODULE()
       dispatch_time(DISPATCH_TIME_NOW, 0.2 * NSEC_PER_SEC), dispatch_get_main_queue(), self->_initialMessageBlock);
 }
 
-- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor
+- (void)showMessage:(NSString *)message
+              color:(UIColor *)color
+    backgroundColor:(UIColor *)backgroundColor
+      dismissButton:(BOOL)dismissButton
 {
   if (!RCTDevLoadingViewGetEnabled() || _hiding) {
     return;
@@ -112,61 +116,128 @@ RCT_EXPORT_MODULE()
 
     self->_showDate = [NSDate date];
 
+    if (self->_label == nullptr) {
+      self->_label = [[UILabel alloc] init];
+      self->_label.translatesAutoresizingMaskIntoConstraints = NO;
+      self->_label.font = [UIFont monospacedDigitSystemFontOfSize:12.0 weight:UIFontWeightRegular];
+      self->_label.textAlignment = NSTextAlignmentCenter;
+      [self->_container addSubview:self->_label];
+      self->_label.numberOfLines = 0;
+    }
+    self->_label.textColor = color;
+    self->_label.text = message;
+
+    if (self->_container == nullptr) {
+      self->_container = [[UIView alloc] init];
+      self->_container.translatesAutoresizingMaskIntoConstraints = NO;
+      UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hide)];
+      [self->_container addGestureRecognizer:tapGesture];
+      self->_container.userInteractionEnabled = YES;
+      [self->_container addSubview:self->_label];
+    }
+    self->_container.backgroundColor = backgroundColor;
+
+    // Handle button creation/removal dynamically based on dismissButton parameter
+    if (dismissButton && self->_dismissButton == nullptr) {
+      CGFloat hue = 0.0;
+      CGFloat saturation = 0.0;
+      CGFloat brightness = 0.0;
+      CGFloat alpha = 0.0;
+      [backgroundColor getHue:&hue saturation:&saturation brightness:&brightness alpha:&alpha];
+      UIColor *darkerBackground = [UIColor colorWithHue:hue
+                                             saturation:saturation
+                                             brightness:brightness * 0.7
+                                                  alpha:1.0];
+
+      UIButtonConfiguration *buttonConfig = [UIButtonConfiguration plainButtonConfiguration];
+      buttonConfig.attributedTitle = [[NSAttributedString alloc]
+          initWithString:@"Dismiss ✕"
+              attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:11.0 weight:UIFontWeightRegular]}];
+      buttonConfig.contentInsets = NSDirectionalEdgeInsetsMake(6, 12, 6, 12);
+      buttonConfig.background.backgroundColor = darkerBackground;
+      buttonConfig.background.cornerRadius = 10;
+      buttonConfig.baseForegroundColor = color;
+
+      // Button is a visual cue to tap anywhere on the banner to dismiss so no seperate action is needed
+      self->_dismissButton = [UIButton buttonWithConfiguration:buttonConfig primaryAction:nil];
+      self->_dismissButton.userInteractionEnabled = NO;
+      self->_dismissButton.translatesAutoresizingMaskIntoConstraints = NO;
+
+      // Prevent button from being compressed - force label to wrap instead
+      [self->_dismissButton setContentCompressionResistancePriority:UILayoutPriorityRequired
+                                                            forAxis:UILayoutConstraintAxisHorizontal];
+      [self->_dismissButton setContentHuggingPriority:UILayoutPriorityRequired
+                                              forAxis:UILayoutConstraintAxisHorizontal];
+
+      [self->_container addSubview:self->_dismissButton];
+    } else if (!dismissButton && self->_dismissButton != nullptr) {
+      [self->_dismissButton removeFromSuperview];
+      self->_dismissButton = nullptr;
+    }
+
     UIWindow *mainWindow = RCTKeyWindow();
-    self->_window = [[UIWindow alloc] initWithWindowScene:mainWindow.windowScene];
+    if (self->_window == nullptr) {
+      UIWindowScene *windowScene = mainWindow.windowScene;
+      if (windowScene != nil) {
+        self->_window = [[UIWindow alloc] initWithWindowScene:windowScene];
+      } else {
+        self->_window = [[UIWindow alloc] init];
+      }
 #if TARGET_OS_TV
-    self->_window.windowLevel = UIWindowLevelNormal + 1;
+      self->_window.windowLevel = UIWindowLevelNormal + 1;
 #else
-    self->_window.windowLevel = UIWindowLevelStatusBar + 1;
+      self->_window.windowLevel = UIWindowLevelStatusBar + 1;
 #endif
-    self->_window.rootViewController = [UIViewController new];
-
-    self->_container = [[UIView alloc] init];
-    self->_container.backgroundColor = backgroundColor;
-    self->_container.translatesAutoresizingMaskIntoConstraints = NO;
-    UITapGestureRecognizer *tapGesture = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(hide)];
-    [self->_container addGestureRecognizer:tapGesture];
-    self->_container.userInteractionEnabled = YES;
-
-    self->_label = [[UILabel alloc] init];
-    self->_label.translatesAutoresizingMaskIntoConstraints = NO;
-    self->_label.font = [UIFont monospacedDigitSystemFontOfSize:12.0 weight:UIFontWeightRegular];
-    self->_label.textAlignment = NSTextAlignmentCenter;
-    self->_label.textColor = color;
-    self->_label.text = message;
-
-    [self->_window.rootViewController.view addSubview:self->_container];
-    [self->_container addSubview:self->_label];
+      self->_window.rootViewController = [UIViewController new];
+      [self->_window.rootViewController.view addSubview:self->_container];
+    }
 
     CGFloat topSafeAreaHeight = mainWindow.safeAreaInsets.top;
-    CGFloat height = topSafeAreaHeight + 25;
-    self->_window.frame = CGRectMake(0, 0, mainWindow.frame.size.width, height);
-
     self->_window.hidden = NO;
 
     [self->_window layoutIfNeeded];
 
-    [NSLayoutConstraint activateConstraints:@[
+    NSMutableArray *constraints = [NSMutableArray arrayWithArray:@[
       // Container constraints
       [self->_container.topAnchor constraintEqualToAnchor:self->_window.rootViewController.view.topAnchor],
       [self->_container.leadingAnchor constraintEqualToAnchor:self->_window.rootViewController.view.leadingAnchor],
       [self->_container.trailingAnchor constraintEqualToAnchor:self->_window.rootViewController.view.trailingAnchor],
-      [self->_container.heightAnchor constraintEqualToConstant:height],
 
       // Label constraints
-      [self->_label.centerXAnchor constraintEqualToAnchor:self->_container.centerXAnchor],
-      [self->_label.bottomAnchor constraintEqualToAnchor:self->_container.bottomAnchor constant:-5],
+      [self->_label.topAnchor constraintEqualToAnchor:self->_container.topAnchor constant:topSafeAreaHeight + 8],
+      [self->_label.leadingAnchor constraintEqualToAnchor:self->_container.leadingAnchor constant:10],
+      [self->_label.bottomAnchor constraintEqualToAnchor:self->_container.bottomAnchor constant:-8],
     ]];
+
+    // Add button-specific constraints if button exists
+    if (self->_dismissButton != nullptr) {
+      [constraints addObjectsFromArray:@[
+        [self->_dismissButton.trailingAnchor constraintEqualToAnchor:self->_container.trailingAnchor constant:-10],
+        [self->_dismissButton.centerYAnchor constraintEqualToAnchor:self->_label.centerYAnchor],
+        [self->_dismissButton.heightAnchor constraintEqualToConstant:22],
+        [self->_label.trailingAnchor constraintEqualToAnchor:self->_dismissButton.leadingAnchor constant:-10],
+      ]];
+    } else {
+      [constraints addObject:[self->_label.trailingAnchor constraintEqualToAnchor:self->_container.trailingAnchor
+                                                                         constant:-10]];
+    }
+
+    [NSLayoutConstraint activateConstraints:constraints];
+
+    [self->_window layoutIfNeeded];
+    self->_window.frame = CGRectMake(0, 0, mainWindow.frame.size.width, self->_container.frame.size.height);
   });
 }
 
 RCT_EXPORT_METHOD(
     showMessage : (NSString *)message withColor : (NSNumber *__nonnull)color withBackgroundColor : (NSNumber *__nonnull)
-        backgroundColor)
+        backgroundColor withDismissButton : (NSNumber *)dismissButton)
 {
-  [self showMessage:message color:[RCTConvert UIColor:color] backgroundColor:[RCTConvert UIColor:backgroundColor]];
+  [self showMessage:message
+                color:[RCTConvert UIColor:color]
+      backgroundColor:[RCTConvert UIColor:backgroundColor]
+        dismissButton:[dismissButton boolValue]];
 }
-
 RCT_EXPORT_METHOD(hide)
 {
   if (!RCTDevLoadingViewGetEnabled()) {
@@ -192,6 +263,9 @@ RCT_EXPORT_METHOD(hide)
           self->_window.frame = windowFrame;
           self->_window.hidden = YES;
           self->_window = nil;
+          self->_container = nil;
+          self->_label = nil;
+          self->_dismissButton = nil;
           self->_hiding = false;
         }];
   });
@@ -215,7 +289,7 @@ RCT_EXPORT_METHOD(hide)
     backgroundColor = [UIColor colorWithHue:0 saturation:0 brightness:0.98 alpha:1];
   }
 
-  [self showMessage:message color:color backgroundColor:backgroundColor];
+  [self showMessage:message color:color backgroundColor:backgroundColor dismissButton:false];
 }
 
 - (void)showOfflineMessage
@@ -229,7 +303,7 @@ RCT_EXPORT_METHOD(hide)
   }
 
   NSString *message = [NSString stringWithFormat:@"Connect to %@ to develop JavaScript.", RCT_PACKAGER_NAME];
-  [self showMessage:message color:color backgroundColor:backgroundColor];
+  [self showMessage:message color:color backgroundColor:backgroundColor dismissButton:false];
 }
 
 - (BOOL)isDarkModeEnabled
@@ -288,10 +362,16 @@ RCT_EXPORT_METHOD(hide)
 + (void)setEnabled:(BOOL)enabled
 {
 }
-- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor
+- (void)showMessage:(NSString *)message
+              color:(UIColor *)color
+    backgroundColor:(UIColor *)backgroundColor
+      dismissButton:(BOOL)dismissButton
 {
 }
-- (void)showMessage:(NSString *)message withColor:(NSNumber *)color withBackgroundColor:(NSNumber *)backgroundColor
+- (void)showMessage:(NSString *)message
+              withColor:(NSNumber *)color
+    withBackgroundColor:(NSNumber *)backgroundColor
+      withDismissButton:(NSNumber *)dismissButton
 {
 }
 - (void)showWithURL:(NSURL *)URL

package/React/CoreModules/RCTDevSettings.h

@@ -11,6 +11,14 @@
 #import <React/RCTEventEmitter.h>
 #import <React/RCTInitializing.h>
 
+@class RCTPackagerClientResponder;
+typedef uint32_t RCTHandlerToken;
+typedef void (^RCTNotificationHandler)(NSDictionary<NSString *, id> *);
+typedef void (^RCTRequestHandler)(NSDictionary<NSString *, id> *, RCTPackagerClientResponder *);
+typedef void (^RCTConnectedHandler)(void);
+
+@class RCTPackagerConnection;
+
 @protocol RCTPackagerClientMethod;
 
 /**
@@ -85,6 +93,10 @@
  */
 @property (nonatomic, assign) BOOL isPerfMonitorShown;
 
+#if RCT_DEV
+@property (nonatomic, readonly) RCTPackagerConnection *packagerConnection;
+#endif
+
 /**
  * Toggle the element inspector.
  */
@@ -102,7 +114,30 @@
 
 #if RCT_DEV_MENU
 - (void)addHandler:(id<RCTPackagerClientMethod>)handler
-    forPackagerMethod:(NSString *)name __deprecated_msg("Use RCTPackagerConnection directly instead");
+    forPackagerMethod:(NSString *)name __deprecated_msg("Use addRequestHandler or addNotificationHandler instead");
+#endif
+
+#if RCT_DEV
+/**
+ * Registers a handler for a notification broadcast from the packager. An
+ * example is "reload" - an instruction to reload from the packager.
+ * If multiple notification handlers are registered for the same method, they
+ * will all be invoked sequentially.
+ */
+- (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler
+                                    queue:(dispatch_queue_t)queue
+                                forMethod:(NSString *)method;
+
+/**
+ * Registers a handler for a request from the packager. An example is
+ * pokeSamplingProfiler; it asks for profile data from the client.
+ * Only one handler can be registered for a given method; calling this
+ * displaces any previous request handler registered for that method.
+ */
+- (RCTHandlerToken)addRequestHandler:(RCTRequestHandler)handler
+                               queue:(dispatch_queue_t)queue
+                           forMethod:(NSString *)method;
+
 #endif
 
 @end

package/React/CoreModules/RCTDevSettings.mm

@@ -32,9 +32,12 @@ static NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
 
 static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 
+#if RCT_DEV
+#import <React/RCTPackagerConnection.h>
+#endif
+
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #import <React/RCTPackagerClient.h>
-#import <React/RCTPackagerConnection.h>
 #endif
 
 #if RCT_ENABLE_INSPECTOR
@@ -145,6 +148,9 @@ RCT_EXPORT_MODULE()
   };
   RCTDevSettingsUserDefaultsDataSource *dataSource =
       [[RCTDevSettingsUserDefaultsDataSource alloc] initWithDefaultValues:defaultValues];
+#if RCT_DEV
+  _packagerConnection = [RCTPackagerConnection new];
+#endif
   _isShakeGestureEnabled = true;
   return [self initWithDataSource:dataSource];
 }
@@ -178,18 +184,27 @@ RCT_EXPORT_MODULE()
 
 - (void)initialize
 {
+#if RCT_DEV
+  [_packagerConnection startWithBundleManager:_bundleManager];
+#endif
+
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   if (numInitializedModules++ == 0) {
-    reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
+    reloadToken = [self
         addNotificationHandler:^(id params) {
           RCTTriggerReloadCommandListeners(@"Global hotkey");
         }
                          queue:dispatch_get_main_queue()
                      forMethod:@"reload"];
 #if RCT_DEV_MENU
-    devMenuToken = [[RCTPackagerConnection sharedPackagerConnection]
+    __weak __typeof(self) weakSelf = self;
+    devMenuToken = [self
         addNotificationHandler:^(id params) {
-          [[self.moduleRegistry moduleForName:"DevMenu"] show];
+          __typeof(self) strongSelf = weakSelf;
+          if (strongSelf == nullptr) {
+            return;
+          }
+          [[strongSelf.moduleRegistry moduleForName:"DevMenu"] show];
         }
                          queue:dispatch_get_main_queue()
                      forMethod:@"devMenu"];
@@ -240,9 +255,9 @@ RCT_EXPORT_MODULE()
   [super invalidate];
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   if (--numInitializedModules == 0) {
-    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:reloadToken];
+    [_packagerConnection removeHandler:reloadToken];
 #if RCT_DEV_MENU
-    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:devMenuToken];
+    [_packagerConnection removeHandler:devMenuToken];
 #endif
   }
 #endif
@@ -422,10 +437,27 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
   }
 }
 
+#if RCT_DEV
+- (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler
+                                    queue:(dispatch_queue_t)queue
+                                forMethod:(NSString *)method
+{
+  return [_packagerConnection addNotificationHandler:handler queue:queue forMethod:method];
+}
+
+- (RCTHandlerToken)addRequestHandler:(RCTRequestHandler)handler
+                               queue:(dispatch_queue_t)queue
+                           forMethod:(NSString *)method
+{
+  return [_packagerConnection addRequestHandler:handler queue:queue forMethod:method];
+}
+
+#endif
+
 - (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name
 {
 #if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
-  [[RCTPackagerConnection sharedPackagerConnection] addHandler:handler forMethod:name];
+  [_packagerConnection addHandler:handler forMethod:name];
 #endif
 }
 
@@ -512,7 +544,7 @@ RCT_EXPORT_METHOD(openDebugger)
 
 @end
 
-#else // #if RCT_DEV_MENU
+#else // #if RCT_DEV_MENU || RCT_REMOTE_PROFILE
 
 @interface RCTDevSettings () <NativeDevSettingsSpec>
 @end
@@ -578,6 +610,10 @@ RCT_EXPORT_METHOD(openDebugger)
   return std::make_shared<facebook::react::NativeDevSettingsSpecJSI>(params);
 }
 
+- (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name
+{
+}
+
 @end
 
 #endif // #if RCT_DEV_MENU

package/React/CoreModules/RCTExceptionsManager.mm

@@ -77,8 +77,11 @@ RCT_EXPORT_MODULE()
     RCTTriggerReloadCommandListeners(@"JS Crash Reload");
   } else if (!RCT_DEV) {
     NSString *description = [@"Unhandled JS Exception: " stringByAppendingString:message];
-    NSDictionary *errorInfo =
-        @{NSLocalizedDescriptionKey : description, RCTJSStackTraceKey : stack, RCTJSExtraDataKey : extraDataAsJSON};
+    NSDictionary *errorInfo = @{
+      NSLocalizedDescriptionKey : description,
+      RCTJSStackTraceKey : stack == nil ? (id)kCFNull : stack,
+      RCTJSExtraDataKey : extraDataAsJSON == nil ? (id)kCFNull : extraDataAsJSON
+    };
     RCTFatal([NSError errorWithDomain:RCTErrorDomain code:0 userInfo:errorInfo]);
   }
 }

package/React/CoreModules/RCTPlatform.mm

@@ -31,10 +31,11 @@ static NSString *interfaceIdiom(UIUserInterfaceIdiom idiom)
       return @"tv";
     case UIUserInterfaceIdiomCarPlay:
       return @"carplay";
-#if TARGET_OS_VISION
     case UIUserInterfaceIdiomVision:
       return @"vision";
-#endif
+    case UIUserInterfaceIdiomMac:
+      return @"mac";
+    case UIUserInterfaceIdiomUnspecified:
     default:
       return @"unknown";
   }

package/React/CoreModules/RCTStatusBarManager.mm

@@ -218,7 +218,7 @@ RCT_EXPORT_METHOD(setNetworkActivityIndicatorVisible : (BOOL)visible)
 
 - (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)constantsToExport
 {
-  return (facebook::react::ModuleConstants<JS::NativeStatusBarManagerIOS::Constants>)[self getConstants];
+  return [self getConstants];
 }
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:

package/React/CxxBridge/RCTCxxBridge.mm

@@ -19,7 +19,6 @@
 #import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
 #import <React/RCTCxxBridgeDelegate.h>
-#import <React/RCTCxxModule.h>
 #import <React/RCTCxxUtils.h>
 #import <React/RCTDevSettings.h>
 #import <React/RCTDisplayLink.h>
@@ -992,7 +991,7 @@ struct RCTInstanceCallback : public InstanceCallback {
       // modules on the main thread in parallel with loading the JS code, so
       // they will already be available before they are ever required.
       dispatch_block_t block = ^{
-        if (self.valid && ![moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
+        if (self.valid) {
           [self->_performanceLogger appendStartForTag:RCTPLNativeModuleMainThread];
           (void)[moduleData instance];
           [moduleData gatherConstants];

package/React/CxxModule/RCTCxxMethod.mm

@@ -129,7 +129,7 @@ using namespace facebook::react;
       // TODO: we should convert this to JSValue directly
       return convertFollyDynamicToId(result);
     }
-  } catch (const facebook::xplat::JsArgumentException &ex) {
+  } catch ([[maybe_unused]] const facebook::xplat::JsArgumentException &ex) {
     RCTLogError(
         @"Method %@.%s argument error: %s",
         RCTBridgeModuleNameForClass([module class]),

package/React/CxxModule/RCTCxxUtils.mm

@@ -13,7 +13,6 @@
 #import <jsi/jsi.h>
 
 #import "DispatchMessageQueueThread.h"
-#import "RCTCxxModule.h"
 #import "RCTNativeModule.h"
 
 namespace facebook::react {
@@ -27,16 +26,7 @@ createNativeModules(NSArray<RCTModuleData *> *modules, RCTBridge *bridge, const
 {
   std::vector<std::unique_ptr<NativeModule>> nativeModules;
   for (RCTModuleData *moduleData in modules) {
-    if ([moduleData.moduleClass isSubclassOfClass:[RCTCxxModule class]]) {
-      nativeModules.emplace_back(
-          std::make_unique<CxxNativeModule>(
-              instance,
-              [moduleData.name UTF8String],
-              [moduleData] { return [(RCTCxxModule *)(moduleData.instance) createModule]; },
-              std::make_shared<DispatchMessageQueueThread>(moduleData)));
-    } else {
-      nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
-    }
+    nativeModules.emplace_back(std::make_unique<RCTNativeModule>(bridge, moduleData));
   }
   return nativeModules;
 }
@@ -78,7 +68,7 @@ NSError *tryAndReturnError(const std::function<void()> &func)
       return nil;
     } @catch (NSException *exception) {
       return RCTErrorWithNSException(exception);
-    } @catch (id exception) {
+    } @catch (id) {
       // This will catch any other ObjC exception, but no C++ exceptions
       return RCTErrorWithMessage(@"non-std ObjC Exception");
     }

package/React/DevSupport/RCTDevLoadingViewProtocol.h

@@ -11,7 +11,10 @@
 
 @protocol RCTDevLoadingViewProtocol <NSObject>
 + (void)setEnabled:(BOOL)enabled;
-- (void)showMessage:(NSString *)message color:(UIColor *)color backgroundColor:(UIColor *)backgroundColor;
+- (void)showMessage:(NSString *)message
+              color:(UIColor *)color
+    backgroundColor:(UIColor *)backgroundColor
+      dismissButton:(BOOL)dismissButton;
 - (void)showWithURL:(NSURL *)URL;
 - (void)updateProgress:(RCTLoadingProgress *)progress;
 - (void)hide;

package/React/DevSupport/RCTPackagerConnection.h

@@ -7,6 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
+#import <React/RCTBundleManager.h>
 #import <React/RCTDefines.h>
 
 #if RCT_DEV
@@ -24,8 +25,6 @@ typedef void (^RCTConnectedHandler)(void);
 /** Encapsulates singleton connection to React Native packager. */
 @interface RCTPackagerConnection : NSObject
 
-+ (instancetype)sharedPackagerConnection;
-
 /**
  * Registers a handler for a notification broadcast from the packager. An
  * example is "reload" - an instruction to reload from the packager.
@@ -62,6 +61,9 @@ typedef void (^RCTConnectedHandler)(void);
 /** Reconnect with given packager server, if packagerServerHostPort has changed. */
 - (void)reconnect:(NSString *)packagerServerHostPort;
 
+/** starts packager connection with configuration from the bundle manager */
+- (void)startWithBundleManager:(RCTBundleManager *)bundleManager;
+
 /**
  * Historically no distinction was made between notification and request
  * handlers. If you use this method, it will be registered as *both* a

package/React/DevSupport/RCTPackagerConnection.mm

@@ -13,6 +13,7 @@
 
 #import <React/RCTAssert.h>
 #import <React/RCTBridge.h>
+#import <React/RCTBundleManager.h>
 #import <React/RCTBundleURLProvider.h>
 #import <React/RCTConstants.h>
 #import <React/RCTConvert.h>
@@ -50,43 +51,13 @@ struct Registration {
   std::vector<Registration<RCTNotificationHandler>> _notificationRegistrations;
   std::vector<Registration<RCTRequestHandler>> _requestRegistrations;
   std::vector<Registration<RCTConnectedHandler>> _connectedRegistrations;
-}
-
-+ (instancetype)sharedPackagerConnection
-{
-  static RCTPackagerConnection *connection;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    connection = [RCTPackagerConnection new];
-  });
-  return connection;
+  RCTBundleManager *_bundleManager;
 }
 
 - (instancetype)init
 {
   if (self = [super init]) {
     _nextToken = 1; // Prevent randomly erasing a handler if you pass a bogus 0 token
-    _serverHostPortForSocket = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-    _serverSchemeForSocket = [[RCTBundleURLProvider sharedSettings] packagerScheme];
-    _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
-    _socket.delegate = self;
-    [_socket start];
-
-    RCTPackagerConnection *const __weak weakSelf = self;
-    _bundleURLChangeObserver =
-        [[NSNotificationCenter defaultCenter] addObserverForName:RCTBundleURLProviderUpdatedNotification
-                                                          object:nil
-                                                           queue:[NSOperationQueue mainQueue]
-                                                      usingBlock:^(NSNotification *_Nonnull __unused note) {
-                                                        [weakSelf bundleURLSettingsChanged];
-                                                      }];
-    _reloadWithPotentiallyNewURLObserver =
-        [[NSNotificationCenter defaultCenter] addObserverForName:RCTTriggerReloadCommandNotification
-                                                          object:nil
-                                                           queue:[NSOperationQueue mainQueue]
-                                                      usingBlock:^(NSNotification *_Nonnull __unused note) {
-                                                        [weakSelf bundleURLSettingsChanged];
-                                                      }];
   }
   return self;
 }
@@ -119,6 +90,32 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
   return [[RCTReconnectingWebSocket alloc] initWithURL:components.URL queue:queue];
 }
 
+- (void)startWithBundleManager:(RCTBundleManager *)bundleManager
+{
+  _serverHostPortForSocket = [bundleManager.bundleConfig getPackagerServerHost];
+  _serverSchemeForSocket = [bundleManager.bundleConfig getPackagerServerScheme];
+  _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
+  _socket.delegate = self;
+  [_socket start];
+  _bundleManager = bundleManager;
+
+  RCTPackagerConnection *const __weak weakSelf = self;
+  _bundleURLChangeObserver =
+      [[NSNotificationCenter defaultCenter] addObserverForName:RCTBundleURLProviderUpdatedNotification
+                                                        object:nil
+                                                         queue:[NSOperationQueue mainQueue]
+                                                    usingBlock:^(NSNotification *_Nonnull __unused note) {
+                                                      [weakSelf bundleURLSettingsChanged];
+                                                    }];
+  _reloadWithPotentiallyNewURLObserver =
+      [[NSNotificationCenter defaultCenter] addObserverForName:RCTTriggerReloadCommandNotification
+                                                        object:nil
+                                                         queue:[NSOperationQueue mainQueue]
+                                                    usingBlock:^(NSNotification *_Nonnull __unused note) {
+                                                      [weakSelf bundleURLSettingsChanged];
+                                                    }];
+}
+
 - (void)stop
 {
   std::lock_guard<std::mutex> l(_mutex);
@@ -144,7 +141,7 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
     return; // already stopped
   }
 
-  NSString *const serverScheme = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+  NSString *const serverScheme = [_bundleManager.bundleConfig getPackagerServerScheme];
   if ([packagerServerHostPort isEqual:_serverHostPortForSocket] && [serverScheme isEqual:_serverSchemeForSocket]) {
     return; // unchanged
   }
@@ -161,7 +158,7 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
 - (void)bundleURLSettingsChanged
 {
   // Will only reconnect if `packagerServerHostPort` has actually changed
-  [self reconnect:[[RCTBundleURLProvider sharedSettings] packagerServerHostPort]];
+  [self reconnect:[_bundleManager.bundleConfig getPackagerServerHost]];
 }
 
 - (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler