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

package/React/Base/RCTBundleURLProvider.mm

@@ -15,14 +15,14 @@ NSString *const RCTBundleURLProviderUpdatedNotification = @"RCTBundleURLProvider
 
 const NSUInteger kRCTBundleURLProviderDefaultPort = RCT_METRO_PORT;
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 static BOOL kRCTAllowPackagerAccess = YES;
 void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed)
 {
   kRCTAllowPackagerAccess = allowed;
 }
 #endif
-
+static NSString *const kRCTPackagerSchemeKey = @"RCT_packager_scheme";
 static NSString *const kRCTJsLocationKey = @"RCT_jsLocation";
 static NSString *const kRCTEnableDevKey = @"RCT_enableDev";
 static NSString *const kRCTEnableMinificationKey = @"RCT_enableMinification";
@@ -65,23 +65,34 @@ static NSString *const kRCTEnableMinificationKey = @"RCT_enableMinification";
   [self settingsUpdated];
 }
 
-static NSURL *serverRootWithHostPort(NSString *hostPort)
+static NSURL *serverRootWithHostPort(NSString *hostPort, NSString *scheme)
 {
+  if (![scheme length]) {
+    scheme = @"http";
+  }
   if ([hostPort rangeOfString:@":"].location != NSNotFound) {
-    return [NSURL URLWithString:[NSString stringWithFormat:@"http://%@/", hostPort]];
+    return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@/", scheme, hostPort]];
   }
-  return [NSURL
-      URLWithString:[NSString
-                        stringWithFormat:@"http://%@:%lu/", hostPort, (unsigned long)kRCTBundleURLProviderDefaultPort]];
+  return [NSURL URLWithString:[NSString stringWithFormat:@"%@://%@:%lu/",
+                                                         scheme,
+                                                         hostPort,
+                                                         (unsigned long)kRCTBundleURLProviderDefaultPort]];
 }
 
 #if RCT_DEV_MENU
 + (BOOL)isPackagerRunning:(NSString *)hostPort
 {
-  NSURL *url = [serverRootWithHostPort(hostPort) URLByAppendingPathComponent:@"status"];
+  return [RCTBundleURLProvider isPackagerRunning:hostPort scheme:nil];
+}
+
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
+{
+  NSURL *url = [serverRootWithHostPort(hostPort, scheme) URLByAppendingPathComponent:@"status"];
 
   NSURLSession *session = [NSURLSession sharedSession];
-  NSURLRequest *request = [NSURLRequest requestWithURL:url];
+  NSURLRequest *request = [NSURLRequest requestWithURL:url
+                                           cachePolicy:NSURLRequestUseProtocolCachePolicy
+                                       timeoutInterval:10];
   __block NSURLResponse *response;
   __block NSData *data;
 
@@ -120,6 +131,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 {
   return false;
 }
+
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme
+{
+  return false;
+}
 #endif
 
 - (NSString *)packagerServerHost
@@ -136,7 +152,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 
 - (NSString *)packagerServerHostPort
 {
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
   if (!kRCTAllowPackagerAccess) {
     RCTLogInfo(@"Packager server access is disabled in this environment");
     return nil;
@@ -144,7 +160,8 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 #endif
   NSString *location = [self jsLocation];
 #if RCT_DEV_MENU
-  if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location]) {
+  NSString *scheme = [self packagerScheme];
+  if ([location length] && ![RCTBundleURLProvider isPackagerRunning:location scheme:scheme]) {
     location = nil;
   }
 #endif
@@ -168,8 +185,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   } else {
     return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                              packagerHost:packagerServerHostPort
+                                           packagerScheme:[self packagerScheme]
                                                 enableDev:[self enableDev]
-                                       enableMinification:[self enableMinification]];
+                                       enableMinification:[self enableMinification]
+                                              modulesOnly:NO
+                                                runModule:YES];
   }
 }
 
@@ -177,6 +197,7 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
 {
   return [RCTBundleURLProvider jsBundleURLForBundleRoot:bundleRoot
                                            packagerHost:[self packagerServerHostPort]
+                                         packagerScheme:[self packagerScheme]
                                               enableDev:[self enableDev]
                                      enableMinification:[self enableMinification]
                                             modulesOnly:YES
@@ -211,13 +232,17 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
                         offlineBundle:(NSBundle *)offlineBundle
 {
   NSString *packagerServerHostPort = [self packagerServerHostPort];
+  NSString *packagerServerScheme = [self packagerScheme];
   if (!packagerServerHostPort) {
     // Serve offline bundle (local file)
     NSBundle *bundle = offlineBundle ?: [NSBundle mainBundle];
     return [bundle URLForResource:name withExtension:extension];
   }
   NSString *path = [NSString stringWithFormat:@"/%@/%@.%@", root, name, extension];
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerServerHostPort query:nil];
+  return [[self class] resourceURLForResourcePath:path
+                                     packagerHost:packagerServerHostPort
+                                           scheme:packagerServerScheme
+                                            query:nil];
 }
 
 + (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
@@ -240,6 +265,23 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
                  enableMinification:(BOOL)enableMinification
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule
+{
+  return [[self class] jsBundleURLForBundleRoot:bundleRoot
+                                   packagerHost:packagerHost
+                                 packagerScheme:nil
+                                      enableDev:enableDev
+                             enableMinification:enableMinification
+                                    modulesOnly:modulesOnly
+                                      runModule:runModule];
+}
+
++ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                       packagerHost:(NSString *)packagerHost
+                     packagerScheme:(NSString *)scheme
+                          enableDev:(BOOL)enableDev
+                 enableMinification:(BOOL)enableMinification
+                        modulesOnly:(BOOL)modulesOnly
+                          runModule:(BOOL)runModule
 {
   NSString *path = [NSString stringWithFormat:@"/%@.bundle", bundleRoot];
 #ifdef HERMES_BYTECODE_VERSION
@@ -260,12 +302,20 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   if (bundleID) {
     query = [NSString stringWithFormat:@"%@&app=%@", query, bundleID];
   }
-  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost query:query];
+  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:scheme query:query];
 }
 
 + (NSURL *)resourceURLForResourcePath:(NSString *)path packagerHost:(NSString *)packagerHost query:(NSString *)query
 {
-  NSURLComponents *components = [NSURLComponents componentsWithURL:serverRootWithHostPort(packagerHost)
+  return [[self class] resourceURLForResourcePath:path packagerHost:packagerHost scheme:nil query:query];
+}
+
++ (NSURL *)resourceURLForResourcePath:(NSString *)path
+                         packagerHost:(NSString *)packagerHost
+                               scheme:(NSString *)scheme
+                                query:(NSString *)query
+{
+  NSURLComponents *components = [NSURLComponents componentsWithURL:serverRootWithHostPort(packagerHost, scheme)
                                            resolvingAgainstBaseURL:NO];
   components.path = path;
   if (query != nil) {
@@ -296,6 +346,15 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   return [[NSUserDefaults standardUserDefaults] stringForKey:kRCTJsLocationKey];
 }
 
+- (NSString *)packagerScheme
+{
+  NSString *packagerScheme = [[NSUserDefaults standardUserDefaults] stringForKey:kRCTPackagerSchemeKey];
+  if (![packagerScheme length]) {
+    return @"http";
+  }
+  return packagerScheme;
+}
+
 - (void)setEnableDev:(BOOL)enableDev
 {
   [self updateValue:@(enableDev) forKey:kRCTEnableDevKey];
@@ -311,6 +370,11 @@ static NSURL *serverRootWithHostPort(NSString *hostPort)
   [self updateValue:@(enableMinification) forKey:kRCTEnableMinificationKey];
 }
 
+- (void)setPackagerScheme:(NSString *)packagerScheme
+{
+  [self updateValue:packagerScheme forKey:kRCTPackagerSchemeKey];
+}
+
 + (instancetype)sharedSettings
 {
   static RCTBundleURLProvider *sharedInstance;

package/React/Base/RCTCallableJSModules.m

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTBridge.h"
+#import "RCTBridgeModule.h"
+
+@implementation RCTCallableJSModules {
+  RCTBridgelessJSModuleMethodInvoker _bridgelessJSModuleMethodInvoker;
+  __weak RCTBridge *_bridge;
+}
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+}
+
+- (void)setBridgelessJSModuleMethodInvoker:(RCTBridgelessJSModuleMethodInvoker)bridgelessJSModuleMethodInvoker
+{
+  _bridgelessJSModuleMethodInvoker = bridgelessJSModuleMethodInvoker;
+}
+
+- (void)invokeModule:(NSString *)moduleName method:(NSString *)methodName withArgs:(NSArray *)args
+{
+  [self invokeModule:moduleName method:methodName withArgs:args onComplete:NULL];
+}
+
+- (void)invokeModule:(NSString *)moduleName
+              method:(NSString *)methodName
+            withArgs:(NSArray *)args
+          onComplete:(dispatch_block_t)onComplete
+{
+  RCTBridge *bridge = _bridge;
+  if (bridge) {
+    [bridge enqueueJSCall:moduleName method:methodName args:args completion:onComplete];
+    return;
+  }
+
+  if (_bridgelessJSModuleMethodInvoker) {
+    _bridgelessJSModuleMethodInvoker(moduleName, methodName, args, onComplete);
+  }
+}
+
+@end

package/React/Base/RCTConstants.h

@@ -10,15 +10,14 @@
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotification;
 RCT_EXTERN NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey;
 
-/*
- * Allows to enable or disable on-demand view mounting feature of ScrollView.
- * It's an experimental feature that improves performance and memory footprint of huge lists inside ScrollView.
- */
-RCT_EXTERN BOOL RCTExperimentGetOnDemandViewMounting(void);
-RCT_EXTERN void RCTExperimentSetOnDemandViewMounting(BOOL value);
-
 /*
  * Preemptive View Allocation
  */
 RCT_EXTERN BOOL RCTExperimentGetPreemptiveViewAllocationDisabled(void);
 RCT_EXTERN void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value);
+
+/*
+ * Remove clipped subviews
+ */
+RCT_EXTERN BOOL RCTGetRemoveClippedSubviewsEnabled(void);
+RCT_EXTERN void RCTSetRemoveClippedSubviewsEnabled(BOOL value);

package/React/Base/RCTConstants.m

@@ -11,31 +11,31 @@ NSString *const RCTUserInterfaceStyleDidChangeNotification = @"RCTUserInterfaceS
 NSString *const RCTUserInterfaceStyleDidChangeNotificationTraitCollectionKey = @"traitCollection";
 
 /*
- * On-demand view mounting
+ * Preemptive View Allocation
  */
-static BOOL RCTExperimentOnDemandViewMounting = NO;
+static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
 
-BOOL RCTExperimentGetOnDemandViewMounting()
+BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
 {
-  return RCTExperimentOnDemandViewMounting;
+  return RCTExperimentPreemptiveViewAllocationDisabled;
 }
 
-void RCTExperimentSetOnDemandViewMounting(BOOL value)
+void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
 {
-  RCTExperimentOnDemandViewMounting = value;
+  RCTExperimentPreemptiveViewAllocationDisabled = value;
 }
 
 /*
- * Preemptive View Allocation
+ * Remove clipped subviews
  */
-static BOOL RCTExperimentPreemptiveViewAllocationDisabled = NO;
+static BOOL RCTRemoveClippedSubviewsEnabled = NO;
 
-BOOL RCTExperimentGetPreemptiveViewAllocationDisabled()
+BOOL RCTGetRemoveClippedSubviewsEnabled(void)
 {
-  return RCTExperimentPreemptiveViewAllocationDisabled;
+  return RCTRemoveClippedSubviewsEnabled;
 }
 
-void RCTExperimentSetPreemptiveViewAllocationDisabled(BOOL value)
+void RCTSetRemoveClippedSubviewsEnabled(BOOL value)
 {
-  RCTExperimentPreemptiveViewAllocationDisabled = value;
+  RCTRemoveClippedSubviewsEnabled = value;
 }

package/React/Base/RCTConvert.h

@@ -74,7 +74,7 @@ typedef NSURL RCTFileURL;
 #endif
 
 #if TARGET_OS_IPHONE
-+ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json API_AVAILABLE(ios(10.0));
++ (WKDataDetectorTypes)WKDataDetectorTypes:(id)json;
 #endif
 
 + (UIViewContentMode)UIViewContentMode:(id)json;

package/React/Base/RCTConvert.m

@@ -807,7 +807,7 @@ static UIColor *RCTColorFromSemanticColorName(NSString *semanticColorName)
   return color;
 }
 
-/** Returns an alphabetically sorted comma seperated list of the valid semantic color names
+/** Returns an alphabetically sorted comma separated list of the valid semantic color names
  */
 static NSString *RCTSemanticColorNames()
 {
@@ -850,7 +850,11 @@ static NSString *RCTSemanticColorNames()
     if ((value = [dictionary objectForKey:@"semantic"])) {
       if ([value isKindOfClass:[NSString class]]) {
         NSString *semanticName = value;
-        UIColor *color = RCTColorFromSemanticColorName(semanticName);
+        UIColor *color = [UIColor colorNamed:semanticName];
+        if (color != nil) {
+          return color;
+        }
+        color = RCTColorFromSemanticColorName(semanticName);
         if (color == nil) {
           RCTLogConvertError(
               json,
@@ -859,7 +863,11 @@ static NSString *RCTSemanticColorNames()
         return color;
       } else if ([value isKindOfClass:[NSArray class]]) {
         for (id name in value) {
-          UIColor *color = RCTColorFromSemanticColorName(name);
+          UIColor *color = [UIColor colorNamed:name];
+          if (color != nil) {
+            return color;
+          }
+          color = RCTColorFromSemanticColorName(name);
           if (color != nil) {
             return color;
           }
@@ -879,13 +887,29 @@ static NSString *RCTSemanticColorNames()
       UIColor *lightColor = [RCTConvert UIColor:light];
       id dark = [appearances objectForKey:@"dark"];
       UIColor *darkColor = [RCTConvert UIColor:dark];
+      id highContrastLight = [appearances objectForKey:@"highContrastLight"];
+      UIColor *highContrastLightColor = [RCTConvert UIColor:highContrastLight];
+      id highContrastDark = [appearances objectForKey:@"highContrastDark"];
+      UIColor *highContrastDarkColor = [RCTConvert UIColor:highContrastDark];
       if (lightColor != nil && darkColor != nil) {
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
         if (@available(iOS 13.0, *)) {
-          UIColor *color =
-              [UIColor colorWithDynamicProvider:^UIColor *_Nonnull(UITraitCollection *_Nonnull collection) {
-                return collection.userInterfaceStyle == UIUserInterfaceStyleDark ? darkColor : lightColor;
-              }];
+          UIColor *color = [UIColor colorWithDynamicProvider:^UIColor *_Nonnull(
+                                        UITraitCollection *_Nonnull collection) {
+            if (collection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+              if (collection.accessibilityContrast == UIAccessibilityContrastHigh && highContrastDarkColor != nil) {
+                return highContrastDarkColor;
+              } else {
+                return darkColor;
+              }
+            } else {
+              if (collection.accessibilityContrast == UIAccessibilityContrastHigh && highContrastLightColor != nil) {
+                return highContrastLightColor;
+              } else {
+                return lightColor;
+              }
+            }
+          }];
           return color;
         } else {
 #endif

package/React/Base/RCTCxxConvert.h

@@ -10,7 +10,7 @@
 /**
  * This class provides a collection of conversion functions for mapping
  * JSON objects to cxx types. Extensible via categories.
- * Convert methods are expected to return cxx objects wraped in RCTManagedPointer.
+ * Convert methods are expected to return cxx objects wrapped in RCTManagedPointer.
  */
 
 @interface RCTCxxConvert : NSObject

package/React/Base/RCTDefines.h

@@ -54,6 +54,15 @@
 #define RCT_DEV_MENU RCT_DEV
 #endif
 
+/**
+ * Controls for the core packgaer loading functionality
+ * By default, this inherits from RCT_DEV_MENU but it also gives the capability to
+ * enable the packager functionality without the rest of the dev tools from RCT_DEV_MENU
+ */
+#ifndef RCT_ENABLE_LOADING_FROM_PACKAGER
+#define RCT_ENABLE_LOADING_FROM_PACKAGER RCT_DEV_MENU
+#endif
+
 #ifndef RCT_ENABLE_INSPECTOR
 #if RCT_DEV && __has_include(<React/RCTInspectorDevServerHelper.h>)
 #define RCT_ENABLE_INSPECTOR 1
@@ -62,11 +71,11 @@
 #endif
 #endif
 
-#ifndef ENABLE_PACKAGER_CONNECTION
+#ifndef RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION
 #if RCT_DEV && (__has_include("RCTPackagerConnection.h") || __has_include(<React/RCTPackagerConnection.h>))
-#define ENABLE_PACKAGER_CONNECTION 1
+#define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 1
 #else
-#define ENABLE_PACKAGER_CONNECTION 0
+#define RCT_DEV_SETTINGS_ENABLE_PACKAGER_CONNECTION 0
 #endif
 #endif
 

package/React/Base/RCTEventDispatcherProtocol.h

@@ -8,7 +8,6 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTBridge.h>
-#import <React/RCTJSInvokerModule.h>
 
 /**
  * The threshold at which text inputs will start warning that the JS thread
@@ -80,7 +79,9 @@ typedef NS_ENUM(NSInteger, RCTTextEventType) {
  * This class wraps the -[RCTBridge enqueueJSCall:args:] method, and
  * provides some convenience methods for generating event calls.
  */
-@protocol RCTEventDispatcherProtocol <RCTBridgeModule, RCTJSDispatcherModule, RCTJSInvokerModule>
+@protocol RCTEventDispatcherProtocol <RCTBridgeModule, RCTJSDispatcherModule>
+
+- (void)sendViewEventWithName:(NSString *)name reactTag:(NSNumber *)reactTag;
 
 /**
  * Deprecated, do not use.

package/React/{Views/RCTPickerManager.h → Base/RCTInitializing.h}

@@ -5,8 +5,10 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTViewManager.h>
+#import <Foundation/Foundation.h>
 
-@interface RCTPickerManager : RCTViewManager
+@protocol RCTInitializing <NSObject>
+
+- (void)initialize;
 
 @end

package/React/Base/RCTJSThread.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#import <React/RCTDefines.h>
+
+/**
+ * This constant can be returned from +methodQueue to force module
+ * methods to be called on the JavaScript thread. This can have serious
+ * implications for performance, so only use this if you're sure it's what
+ * you need.
+ *
+ * NOTE: RCTJSThread is not a real libdispatch queue
+ */
+RCT_EXTERN dispatch_queue_t RCTJSThread;
+
+/**
+ * Initializes the RCTJSThread constant.
+ * Exported because the bridgeless initialization layer needs to initialize
+ * RCTJSThread. In bridgeless mode, RCTBridge isn't accessed, and RCTJSThread
+ * therefore isn't initialized.
+ */
+RCT_EXTERN void _RCTInitializeJSThreadConstantInternal(void);

package/React/Base/RCTJSThread.m

@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTJSThread.h"
+
+dispatch_queue_t RCTJSThread;
+
+void _RCTInitializeJSThreadConstantInternal(void)
+{
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    // Set up JS thread
+    RCTJSThread = (id)kCFNull;
+  });
+}

package/React/Base/RCTModuleData.h

@@ -16,6 +16,7 @@
 @class RCTModuleRegistry;
 @class RCTViewRegistry;
 @class RCTBundleManager;
+@class RCTCallableJSModules;
 
 typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
 
@@ -25,20 +26,23 @@ typedef id<RCTBridgeModule> (^RCTBridgeModuleProvider)(void);
                              bridge:(RCTBridge *)bridge
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
-                      bundleManager:(RCTBundleManager *)bundleManager;
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules;
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
                      moduleProvider:(RCTBridgeModuleProvider)moduleProvider
                              bridge:(RCTBridge *)bridge
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
-                      bundleManager:(RCTBundleManager *)bundleManager NS_DESIGNATED_INITIALIZER;
+                      bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 - (instancetype)initWithModuleInstance:(id<RCTBridgeModule>)instance
                                 bridge:(RCTBridge *)bridge
                         moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
-                         bundleManager:(RCTBundleManager *)bundleManager NS_DESIGNATED_INITIALIZER;
+                         bundleManager:(RCTBundleManager *)bundleManager
+                     callableJSModules:(RCTCallableJSModules *)callableJSModules NS_DESIGNATED_INITIALIZER;
 
 /**
  * Calls `constantsToExport` on the module and stores the result. Note that

package/React/Base/RCTModuleData.mm

@@ -15,6 +15,7 @@
 
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
+#import "RCTInitializing.h"
 #import "RCTLog.h"
 #import "RCTModuleMethod.h"
 #import "RCTProfile.h"
@@ -51,6 +52,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
   RCTModuleRegistry *_moduleRegistry;
   RCTViewRegistry *_viewRegistry_DEPRECATED;
   RCTBundleManager *_bundleManager;
+  RCTCallableJSModules *_callableJSModules;
+  BOOL _isInitialized;
 }
 
 @synthesize methods = _methods;
@@ -105,6 +108,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                       bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   return [self initWithModuleClass:moduleClass
                     moduleProvider:^id<RCTBridgeModule> {
@@ -113,7 +117,8 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                             bridge:bridge
                     moduleRegistry:moduleRegistry
            viewRegistry_DEPRECATED:viewRegistry_DEPRECATED
-                     bundleManager:bundleManager];
+                     bundleManager:bundleManager
+                 callableJSModules:callableJSModules];
 }
 
 - (instancetype)initWithModuleClass:(Class)moduleClass
@@ -122,6 +127,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                      moduleRegistry:(RCTModuleRegistry *)moduleRegistry
             viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                       bundleManager:(RCTBundleManager *)bundleManager
+                  callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
     _bridge = bridge;
@@ -130,6 +136,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
     _moduleRegistry = moduleRegistry;
     _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
     _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
     [self setUp];
   }
   return self;
@@ -140,6 +147,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
                         moduleRegistry:(RCTModuleRegistry *)moduleRegistry
                viewRegistry_DEPRECATED:(RCTViewRegistry *)viewRegistry_DEPRECATED
                          bundleManager:(RCTBundleManager *)bundleManager
+                     callableJSModules:(RCTCallableJSModules *)callableJSModules
 {
   if (self = [super init]) {
     _bridge = bridge;
@@ -148,6 +156,7 @@ BOOL RCTIsMainQueueExecutionOfConstantsToExportDisabled()
     _moduleRegistry = moduleRegistry;
     _viewRegistry_DEPRECATED = viewRegistry_DEPRECATED;
     _bundleManager = bundleManager;
+    _callableJSModules = callableJSModules;
     [self setUp];
   }
   return self;
@@ -211,9 +220,14 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
       [self setModuleRegistryForInstance];
       [self setViewRegistryForInstance];
       [self setBundleManagerForInstance];
+      [self setCallableJSModulesForInstance];
     }
 
     [self setUpMethodQueue];
+
+    if (shouldSetup) {
+      [self _initializeModule];
+    }
   }
   RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
 
@@ -309,6 +323,32 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init);
   }
 }
 
+- (void)setCallableJSModulesForInstance
+{
+  if ([_instance respondsToSelector:@selector(callableJSModules)] &&
+      _instance.callableJSModules != _callableJSModules) {
+    RCT_PROFILE_BEGIN_EVENT(RCTProfileTagAlways, @"[RCTModuleData setCallableJSModulesForInstance]", nil);
+    @try {
+      [(id)_instance setValue:_callableJSModules forKey:@"callableJSModules"];
+    } @catch (NSException *exception) {
+      RCTLogError(
+          @"%@ has no setter or ivar for its module registry, which is not "
+           "permitted. You must either @synthesize the callableJSModules property, "
+           "or provide your own setter method.",
+          self.name);
+    }
+    RCT_PROFILE_END_EVENT(RCTProfileTagAlways, @"");
+  }
+}
+
+- (void)_initializeModule
+{
+  if (!_isInitialized && [_instance respondsToSelector:@selector(initialize)]) {
+    _isInitialized = YES;
+    [(id<RCTInitializing>)_instance initialize];
+  }
+}
+
 - (void)finishSetupForInstance
 {
   if (!_setupComplete && _instance) {

package/React/Base/RCTMultipartStreamReader.m

@@ -7,8 +7,6 @@
 
 #import "RCTMultipartStreamReader.h"
 
-#import <QuartzCore/CAAnimation.h>
-
 #define CRLF @"\r\n"
 
 @implementation RCTMultipartStreamReader {