react-native 0.0.0-263478b91 → 0.0.0-268efb102

package/React/CoreModules/RCTDevSettings.mm

@@ -18,6 +18,7 @@
 #import <React/RCTProfile.h>
 #import <React/RCTReloadCommand.h>
 #import <React/RCTUtils.h>
+#import <atomic>
 
 #import "CoreModulesPlugins.h"
 
@@ -31,7 +32,7 @@ static NSString *const kRCTDevSettingIsPerfMonitorShown = @"RCTPerfMonitorKey";
 
 static NSString *const kRCTDevSettingsUserDefaultsKey = @"RCTDevMenu";
 
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #import <React/RCTPackagerClient.h>
 #import <React/RCTPackagerConnection.h>
 #endif
@@ -113,10 +114,15 @@ void RCTDevSettingsSetEnabled(BOOL enabled)
 
 @end
 
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
+static RCTHandlerToken reloadToken;
+static std::atomic<int> numInitializedModules{0};
+#endif
+
 @interface RCTDevSettings () <RCTBridgeModule, RCTInvalidating, NativeDevSettingsSpec, RCTDevSettingsInspectable> {
   BOOL _isJSLoaded;
-#if ENABLE_PACKAGER_CONNECTION
-  RCTHandlerToken _reloadToken;
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
+  RCTHandlerToken _bridgeExecutorOverrideToken;
 #endif
 }
 
@@ -166,9 +172,30 @@ RCT_EXPORT_MODULE()
   return self;
 }
 
-- (void)setBundleManager:(RCTBundleManager *)bundleManager
+- (void)initialize
 {
-  _bundleManager = bundleManager;
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
+  if (self.bridge) {
+    RCTBridge *__weak weakBridge = self.bridge;
+    _bridgeExecutorOverrideToken = [[RCTPackagerConnection sharedPackagerConnection]
+        addNotificationHandler:^(id params) {
+          if (params != (id)kCFNull && [params[@"debug"] boolValue]) {
+            weakBridge.executorClass = objc_lookUpClass("RCTWebSocketExecutor");
+          }
+        }
+                         queue:dispatch_get_main_queue()
+                     forMethod:@"reload"];
+  }
+
+  if (numInitializedModules++ == 0) {
+    reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
+        addNotificationHandler:^(id params) {
+          RCTTriggerReloadCommandListeners(@"Global hotkey");
+        }
+                         queue:dispatch_get_main_queue()
+                     forMethod:@"reload"];
+  }
+#endif
 
 #if RCT_ENABLE_INSPECTOR
   if (self.bridge) {
@@ -178,12 +205,12 @@ RCT_EXPORT_MODULE()
     dispatch_async(dispatch_get_main_queue(), ^{
       [self.bridge
           dispatchBlock:^{
-            [RCTInspectorDevServerHelper connectWithBundleURL:bundleManager.bundleURL];
+            [RCTInspectorDevServerHelper connectWithBundleURL:self.bundleManager.bundleURL];
           }
                   queue:RCTJSThread];
     });
   } else {
-    [RCTInspectorDevServerHelper connectWithBundleURL:bundleManager.bundleURL];
+    [RCTInspectorDevServerHelper connectWithBundleURL:self.bundleManager.bundleURL];
   }
 #endif
 
@@ -192,24 +219,6 @@ RCT_EXPORT_MODULE()
   });
 }
 
-- (void)setBridge:(RCTBridge *)bridge
-{
-  [super setBridge:bridge];
-
-#if ENABLE_PACKAGER_CONNECTION
-  RCTBridge *__weak weakBridge = bridge;
-  _reloadToken = [[RCTPackagerConnection sharedPackagerConnection]
-      addNotificationHandler:^(id params) {
-        if (params != (id)kCFNull && [params[@"debug"] boolValue]) {
-          weakBridge.executorClass = objc_lookUpClass("RCTWebSocketExecutor");
-        }
-        RCTTriggerReloadCommandListeners(@"Global hotkey");
-      }
-                       queue:dispatch_get_main_queue()
-                   forMethod:@"reload"];
-#endif
-}
-
 - (dispatch_queue_t)methodQueue
 {
   return dispatch_get_main_queue();
@@ -218,8 +227,14 @@ RCT_EXPORT_MODULE()
 - (void)invalidate
 {
   [super invalidate];
-#if ENABLE_PACKAGER_CONNECTION
-  [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_reloadToken];
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
+  if (self.bridge) {
+    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_bridgeExecutorOverrideToken];
+  }
+
+  if (--numInitializedModules == 0) {
+    [[RCTPackagerConnection sharedPackagerConnection] removeHandler:reloadToken];
+  }
 #endif
 }
 
@@ -350,16 +365,12 @@ RCT_EXPORT_METHOD(setHotLoadingEnabled : (BOOL)enabled)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
       if (enabled) {
-        if (self.bridge) {
-          [self.bridge enqueueJSCall:@"HMRClient" method:@"enable" args:@[] completion:NULL];
-        } else if (self.invokeJS) {
-          self.invokeJS(@"HMRClient", @"enable", @[]);
+        if (self.callableJSModules) {
+          [self.callableJSModules invokeModule:@"HMRClient" method:@"enable" withArgs:@[]];
         }
       } else {
-        if (self.bridge) {
-          [self.bridge enqueueJSCall:@"HMRClient" method:@"disable" args:@[] completion:NULL];
-        } else if (self.invokeJS) {
-          self.invokeJS(@"HMRClient", @"disable", @[]);
+        if (self.callableJSModules) {
+          [self.callableJSModules invokeModule:@"HMRClient" method:@"disable" withArgs:@[]];
         }
       }
 #pragma clang diagnostic pop
@@ -429,7 +440,7 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 
 - (void)addHandler:(id<RCTPackagerClientMethod>)handler forPackagerMethod:(NSString *)name
 {
-#if ENABLE_PACKAGER_CONNECTION
+#if RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
   [[RCTPackagerConnection sharedPackagerConnection] addHandler:handler forMethod:name];
 #endif
 }
@@ -437,17 +448,16 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 - (void)setupHMRClientWithBundleURL:(NSURL *)bundleURL
 {
   if (bundleURL && !bundleURL.fileURL) {
-    NSString *const path = [bundleURL.path substringFromIndex:1]; // Strip initial slash.
-    NSString *const host = bundleURL.host;
-    NSNumber *const port = bundleURL.port;
+    NSURLComponents *urlComponents = [[NSURLComponents alloc] initWithURL:bundleURL resolvingAgainstBaseURL:NO];
+    NSString *const path = [urlComponents.path substringFromIndex:1]; // Strip initial slash.
+    NSString *const host = urlComponents.host;
+    NSNumber *const port = urlComponents.port;
+    NSString *const scheme = urlComponents.scheme;
     BOOL isHotLoadingEnabled = self.isHotLoadingEnabled;
-    if (self.bridge) {
-      [self.bridge enqueueJSCall:@"HMRClient"
-                          method:@"setup"
-                            args:@[ @"ios", path, host, RCTNullIfNil(port), @(isHotLoadingEnabled) ]
-                      completion:NULL];
-    } else {
-      self.invokeJS(@"HMRClient", @"setup", @[ @"ios", path, host, RCTNullIfNil(port), @(isHotLoadingEnabled) ]);
+    if (self.callableJSModules) {
+      [self.callableJSModules invokeModule:@"HMRClient"
+                                    method:@"setup"
+                                  withArgs:@[ @"ios", path, host, RCTNullIfNil(port), @(isHotLoadingEnabled), scheme ]];
     }
   }
 }
@@ -455,13 +465,10 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 - (void)setupHMRClientWithAdditionalBundleURL:(NSURL *)bundleURL
 {
   if (bundleURL && !bundleURL.fileURL) { // isHotLoadingAvailable check
-    if (self.bridge) {
-      [self.bridge enqueueJSCall:@"HMRClient"
-                          method:@"registerBundle"
-                            args:@[ [bundleURL absoluteString] ]
-                      completion:NULL];
-    } else {
-      self.invokeJS(@"HMRClient", @"registerBundle", @[ [bundleURL absoluteString] ]);
+    if (self.callableJSModules) {
+      [self.callableJSModules invokeModule:@"HMRClient"
+                                    method:@"registerBundle"
+                                  withArgs:@[ [bundleURL absoluteString] ]];
     }
   }
 }
@@ -522,6 +529,9 @@ RCT_EXPORT_METHOD(addMenuItem : (NSString *)title)
 {
   return [super init];
 }
+- (void)initialize
+{
+}
 - (BOOL)isHotLoadingAvailable
 {
   return NO;

package/React/CoreModules/RCTDevSplitBundleLoader.mm

@@ -22,7 +22,7 @@ using namespace facebook::react;
 @interface RCTDevSplitBundleLoader () <NativeDevSplitBundleLoaderSpec>
 @end
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 
 @implementation RCTDevSplitBundleLoader
 
@@ -37,11 +37,6 @@ RCT_EXPORT_MODULE()
   return NO;
 }
 
-- (void)setBridge:(RCTBridge *)bridge
-{
-  _bridge = bridge;
-}
-
 RCT_EXPORT_METHOD(loadBundle
                   : (NSString *)bundlePath resolve
                   : (RCTPromiseResolveBlock)resolve reject

package/React/CoreModules/RCTDeviceInfo.mm

@@ -12,6 +12,7 @@
 #import <React/RCTAssert.h>
 #import <React/RCTConstants.h>
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTUIUtils.h>
 #import <React/RCTUtils.h>
 
@@ -19,7 +20,7 @@
 
 using namespace facebook::react;
 
-@interface RCTDeviceInfo () <NativeDeviceInfoSpec>
+@interface RCTDeviceInfo () <NativeDeviceInfoSpec, RCTInitializing>
 @end
 
 @implementation RCTDeviceInfo {
@@ -41,13 +42,12 @@ RCT_EXPORT_MODULE()
   return dispatch_get_main_queue();
 }
 
-- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
+- (void)initialize
 {
-  _moduleRegistry = moduleRegistry;
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
-                                             object:[moduleRegistry moduleForName:"AccessibilityManager"]];
+                                             object:[_moduleRegistry moduleForName:"AccessibilityManager"]];
 
   _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
 

package/React/CoreModules/RCTEventDispatcher.h

@@ -9,9 +9,10 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTEventDispatcherProtocol.h>
+#import <React/RCTInitializing.h>
 /**
  * This class wraps the -[RCTBridge enqueueJSCall:args:] method, and
  * provides some convenience methods for generating event calls.
  */
-@interface RCTEventDispatcher : NSObject <RCTEventDispatcherProtocol>
+@interface RCTEventDispatcher : NSObject <RCTEventDispatcherProtocol, RCTInitializing>
 @end

package/React/CoreModules/RCTEventDispatcher.mm

@@ -42,13 +42,12 @@ static uint16_t RCTUniqueCoalescingKeyGenerator = 0;
 
 @synthesize bridge = _bridge;
 @synthesize dispatchToJSThread = _dispatchToJSThread;
-@synthesize invokeJS = _invokeJS;
+@synthesize callableJSModules = _callableJSModules;
 
 RCT_EXPORT_MODULE()
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  _bridge = bridge;
   _events = [NSMutableDictionary new];
   _eventQueue = [NSMutableArray new];
   _eventQueueLock = [NSLock new];
@@ -57,28 +56,21 @@ RCT_EXPORT_MODULE()
   _observersLock = [NSLock new];
 }
 
+- (void)sendViewEventWithName:(NSString *)name reactTag:(NSNumber *)reactTag
+{
+  [_callableJSModules invokeModule:@"RCTViewEventEmitter" method:@"emit" withArgs:@[ name, RCTNullIfNil(reactTag) ]];
+}
+
 - (void)sendAppEventWithName:(NSString *)name body:(id)body
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:@"RCTNativeAppEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ name, body ] : @[ name ]
-                completion:NULL];
-  } else if (_invokeJS) {
-    _invokeJS(@"RCTNativeAppEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
-  }
+  [_callableJSModules invokeModule:@"RCTNativeAppEventEmitter"
+                            method:@"emit"
+                          withArgs:body ? @[ name, body ] : @[ name ]];
 }
 
 - (void)sendDeviceEventWithName:(NSString *)name body:(id)body
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:@"RCTDeviceEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ name, body ] : @[ name ]
-                completion:NULL];
-  } else if (_invokeJS) {
-    _invokeJS(@"RCTDeviceEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
-  }
+  [_callableJSModules invokeModule:@"RCTDeviceEventEmitter" method:@"emit" withArgs:body ? @[ name, body ] : @[ name ]];
 }
 
 - (void)sendTextEventWithType:(RCTTextEventType)type
@@ -195,15 +187,12 @@ RCT_EXPORT_MODULE()
 
 - (void)dispatchEvent:(id<RCTEvent>)event
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:[[event class] moduleDotMethod] args:[event arguments]];
-  } else if (_invokeJS) {
-    NSString *moduleDotMethod = [[event class] moduleDotMethod];
-    NSArray<NSString *> *const components = [moduleDotMethod componentsSeparatedByString:@"."];
-    NSString *const moduleName = components[0];
-    NSString *const methodName = components[1];
-    _invokeJS(moduleName, methodName, [event arguments]);
-  }
+  NSString *moduleDotMethod = [[event class] moduleDotMethod];
+  NSArray<NSString *> *const components = [moduleDotMethod componentsSeparatedByString:@"."];
+  NSString *const moduleName = components[0];
+  NSString *const methodName = components[1];
+
+  [_callableJSModules invokeModule:moduleName method:methodName withArgs:[event arguments]];
 }
 
 - (dispatch_queue_t)methodQueue

package/React/CoreModules/RCTKeyboardObserver.mm

@@ -60,7 +60,7 @@ RCT_EXPORT_MODULE()
 #define IMPLEMENT_KEYBOARD_HANDLER(EVENT)                                              \
   -(void)EVENT : (NSNotification *)notification                                        \
   {                                                                                    \
-    if (!self.bridge && !self.invokeJS) {                                              \
+    if (!self.callableJSModules) {                                                     \
       return;                                                                          \
     }                                                                                  \
     [self sendEventWithName:@ #EVENT body:RCTParseKeyboardNotification(notification)]; \

package/React/CoreModules/RCTLogBox.mm

@@ -43,18 +43,22 @@ RCT_EXPORT_METHOD(show)
       if (!strongSelf) {
         return;
       }
-      if (!strongSelf->_view) {
-        if (self->_bridge) {
-          strongSelf->_view = [[RCTLogBoxView alloc] initWithFrame:[UIScreen mainScreen].bounds bridge:self->_bridge];
-        } else {
-          NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
-          [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface"
-                                                              object:nil
-                                                            userInfo:userInfo];
-          return;
+
+      if (strongSelf->_view) {
+        [strongSelf->_view show];
+        return;
+      }
+
+      if (strongSelf->_bridge) {
+        if (strongSelf->_bridge.valid) {
+          strongSelf->_view = [[RCTLogBoxView alloc] initWithFrame:[UIScreen mainScreen].bounds
+                                                            bridge:strongSelf->_bridge];
+          [strongSelf->_view show];
         }
+      } else {
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObjectsAndKeys:strongSelf, @"logbox", nil];
+        [[NSNotificationCenter defaultCenter] postNotificationName:@"CreateLogBoxSurface" object:nil userInfo:userInfo];
       }
-      [strongSelf->_view show];
     });
   }
 }

package/React/CoreModules/RCTPerfMonitor.mm

@@ -20,6 +20,7 @@
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridge.h>
 #import <React/RCTFPSGraph.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTInvalidating.h>
 #import <React/RCTJavaScriptExecutor.h>
 #import <React/RCTPerformanceLogger.h>
@@ -84,8 +85,13 @@ static vm_size_t RCTGetResidentMemorySize(void)
   return memoryUsageInByte;
 }
 
-@interface RCTPerfMonitor
-    : NSObject <RCTBridgeModule, RCTTurboModule, RCTInvalidating, UITableViewDataSource, UITableViewDelegate>
+@interface RCTPerfMonitor : NSObject <
+                                RCTBridgeModule,
+                                RCTTurboModule,
+                                RCTInitializing,
+                                RCTInvalidating,
+                                UITableViewDataSource,
+                                UITableViewDelegate>
 
 #if __has_include(<React/RCTDevMenu.h>)
 @property (nonatomic, strong, readonly) RCTDevMenuItem *devMenuItem;
@@ -150,9 +156,8 @@ RCT_EXPORT_MODULE()
   return dispatch_get_main_queue();
 }
 
-- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
+- (void)initialize
 {
-  _moduleRegistry = moduleRegistry;
 #if __has_include(<React/RCTDevMenu.h>)
   [(RCTDevMenu *)[_moduleRegistry moduleForName:"DevMenu"] addItem:self.devMenuItem];
 #endif

package/React/CoreModules/RCTRedBox.mm

@@ -201,11 +201,7 @@
 
 - (NSInteger)bottomSafeViewHeight
 {
-  if (@available(iOS 11.0, *)) {
-    return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
-  } else {
-    return 0;
-  }
+  return RCTSharedApplication().delegate.window.safeAreaInsets.bottom;
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)

package/React/CoreModules/RCTTiming.h

@@ -9,6 +9,7 @@
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTFrameUpdate.h>
+#import <React/RCTInitializing.h>
 #import <React/RCTInvalidating.h>
 
 @protocol RCTTimingDelegate
@@ -19,7 +20,7 @@
 
 @end
 
-@interface RCTTiming : NSObject <RCTBridgeModule, RCTInvalidating, RCTFrameUpdateObserver>
+@interface RCTTiming : NSObject <RCTBridgeModule, RCTInvalidating, RCTFrameUpdateObserver, RCTInitializing>
 
 - (instancetype)initWithDelegate:(id<RCTTimingDelegate>)delegate;
 - (void)createTimerForNextFrame:(nonnull NSNumber *)callbackID

package/React/CoreModules/RCTTiming.mm

@@ -118,11 +118,9 @@ RCT_EXPORT_MODULE()
   return self;
 }
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  RCTAssert(!_bridge, @"Should never be initialized twice!");
   [self setup];
-  _bridge = bridge;
 }
 
 - (void)setup

package/React/CoreModules/React-CoreModules.podspec

@@ -17,7 +17,7 @@ else
 end
 
 folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.04.26.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-CoreModules"

package/React/CxxBridge/RCTCxxBridge.mm

@@ -40,7 +40,7 @@
 #import <reactperflogger/BridgeNativeModulePerfLogger.h>
 
 #ifndef RCT_USE_HERMES
-#if __has_include(<hermes/hermes.h>)
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
 #define RCT_USE_HERMES 1
 #else
 #define RCT_USE_HERMES 0
@@ -48,7 +48,7 @@
 #endif
 
 #if RCT_USE_HERMES
-#import <reacthermes/HermesExecutorFactory.h">
+#import <reacthermes/HermesExecutorFactory.h>
 #else
 #import "JSCExecutorFactory.h"
 #endif
@@ -194,7 +194,6 @@ static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogg
 - (instancetype)initWithParentBridge:(RCTBridge *)bridge;
 - (void)partialBatchDidFlush;
 - (void)batchDidComplete;
-- (void)forceGarbageCollection;
 
 @end
 
@@ -237,6 +236,7 @@ struct RCTInstanceCallback : public InstanceCallback {
   RCTModuleRegistry *_objCModuleRegistry;
   RCTViewRegistry *_viewRegistry_DEPRECATED;
   RCTBundleManager *_bundleManager;
+  RCTCallableJSModules *_callableJSModules;
 }
 
 @synthesize bridgeDescription = _bridgeDescription;
@@ -244,6 +244,11 @@ struct RCTInstanceCallback : public InstanceCallback {
 @synthesize performanceLogger = _performanceLogger;
 @synthesize valid = _valid;
 
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return _objCModuleRegistry;
+}
+
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
 {
   _turboModuleRegistry = turboModuleRegistry;
@@ -274,6 +279,30 @@ struct RCTInstanceCallback : public InstanceCallback {
   if ([bridgeModule respondsToSelector:@selector(setBundleManager:)]) {
     bridgeModule.bundleManager = _bundleManager;
   }
+
+  /**
+   * Attach the RCTCallableJSModules to this TurboModule, which allows this TurboModule
+   * to call JS Module methods.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize callableJSModules = _callableJSModules`
+   */
+
+  if ([bridgeModule respondsToSelector:@selector(setCallableJSModules:)]) {
+    bridgeModule.callableJSModules = _callableJSModules;
+  }
+
+  /**
+   * Attach the RCTModuleRegistry to this TurboModule, which allows this TurboModule
+   * to require other TurboModules/NativeModules.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize moduleRegistry = _moduleRegistry`
+   */
+
+  if ([bridgeModule respondsToSelector:@selector(setModuleRegistry:)]) {
+    bridgeModule.moduleRegistry = _objCModuleRegistry;
+  }
 }
 
 - (std::shared_ptr<MessageQueueThread>)jsMessageThread
@@ -316,6 +345,8 @@ struct RCTInstanceCallback : public InstanceCallback {
     [_bundleManager setBridge:self];
     _viewRegistry_DEPRECATED = [RCTViewRegistry new];
     [_viewRegistry_DEPRECATED setBridge:self];
+    _callableJSModules = [RCTCallableJSModules new];
+    [_callableJSModules setBridge:self];
 
     [RCTBridge setCurrentBridge:self];
 
@@ -366,11 +397,6 @@ struct RCTInstanceCallback : public InstanceCallback {
 }
 
 - (void)handleMemoryWarning
-{
-  [self forceGarbageCollection];
-}
-
-- (void)forceGarbageCollection
 {
   // We only want to run garbage collector when the loading is finished
   // and the instance is valid.
@@ -495,6 +521,14 @@ struct RCTInstanceCallback : public InstanceCallback {
   // Load the source asynchronously, then store it for later execution.
   dispatch_group_enter(prepareBridge);
   __block NSData *sourceCode;
+
+#if (RCT_DEV | RCT_ENABLE_LOADING_VIEW) && __has_include(<React/RCTDevLoadingViewProtocol.h>)
+  {
+    id<RCTDevLoadingViewProtocol> loadingView = [self moduleForName:@"DevLoadingView" lazilyLoadIfNecessary:YES];
+    [loadingView showWithURL:self.bundleURL];
+  }
+#endif
+
   [self
       loadSource:^(NSError *error, RCTSource *source) {
         if (error) {
@@ -793,7 +827,8 @@ struct RCTInstanceCallback : public InstanceCallback {
                                                      bridge:self
                                              moduleRegistry:_objCModuleRegistry
                                     viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
-                                              bundleManager:_bundleManager];
+                                              bundleManager:_bundleManager
+                                          callableJSModules:_callableJSModules];
     BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
     _moduleDataByName[moduleName] = moduleData;
@@ -869,7 +904,8 @@ struct RCTInstanceCallback : public InstanceCallback {
                                                                        bridge:self
                                                                moduleRegistry:_objCModuleRegistry
                                                       viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
-                                                                bundleManager:_bundleManager];
+                                                                bundleManager:_bundleManager
+                                                            callableJSModules:_callableJSModules];
     BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
     _moduleDataByName[moduleName] = moduleData;
@@ -924,7 +960,8 @@ struct RCTInstanceCallback : public InstanceCallback {
                                                        bridge:self
                                                moduleRegistry:_objCModuleRegistry
                                       viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
-                                                bundleManager:_bundleManager];
+                                                bundleManager:_bundleManager
+                                            callableJSModules:_callableJSModules];
       BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
       _moduleDataByName[moduleName] = moduleData;
@@ -1093,7 +1130,7 @@ struct RCTInstanceCallback : public InstanceCallback {
   [self.devSettings setupHMRClientWithBundleURL:self.bundleURL];
 }
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 - (void)loadAndExecuteSplitBundleURL:(NSURL *)bundleURL
                              onError:(RCTLoadAndExecuteErrorBlock)onError
                           onComplete:(dispatch_block_t)onComplete

package/React/DevSupport/RCTPackagerConnection.h

@@ -59,6 +59,9 @@ typedef void (^RCTConnectedHandler)(void);
 /** Disconnects and removes all handlers. */
 - (void)stop;
 
+/** Reconnect with given packager server. */
+- (void)reconnect:(NSString *)packagerServerHostPort;
+
 /**
  * Historically no distinction was made between notification and request
  * handlers. If you use this method, it will be registered as *both* a