react-native 0.0.0-16bb2ae4f → 0.0.0-18697adec

package/Libraries/Renderer/shims/ReactFabric.js

@@ -6,7 +6,9 @@
  *
  * @format
  * @flow
- * @generated SignedSource<<dd0939e57b6f6addeff0b75ba29fbb41>>
+ * @generated SignedSource<<40f01afd3b6d95a617ac8e48748a2a76>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

package/Libraries/Renderer/shims/ReactFeatureFlags.js

@@ -6,7 +6,9 @@
  *
  * @format
  * @flow strict-local
- * @generated SignedSource<<7fc82101078b5f2226a6b58a9715ec95>>
+ * @generated SignedSource<<bed66083565ac46f6de032dd8f2d6814>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

package/Libraries/Renderer/shims/ReactNative.js

@@ -6,7 +6,9 @@
  *
  * @format
  * @flow
- * @generated SignedSource<<2d98809d55453ea61e203a8425692891>>
+ * @generated SignedSource<<fd14f2375864691ea971c77ac6088e4b>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

package/Libraries/Renderer/shims/ReactNativeTypes.js

@@ -6,7 +6,9 @@
  *
  * @format
  * @flow strict
- * @generated SignedSource<<d970268c93059bcc9626426c0c280439>>
+ * @generated SignedSource<<67969011689de134487d7110b6519058>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 import type {ElementRef, ElementType, Element, AbstractComponent} from 'react';

package/Libraries/Renderer/shims/ReactNativeViewConfigRegistry.js

@@ -6,7 +6,9 @@
  *
  * @format
  * @flow strict-local
- * @generated SignedSource<<3276da8ef0bf14ad0623df6e1f704d72>>
+ * @generated SignedSource<<5b2da3e92f44ee2684113b45af052f5d>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 /* eslint-disable react-internal/invariant-args */

package/Libraries/Renderer/shims/createReactNativeComponentClass.js

@@ -6,7 +6,9 @@
  *
  * @format
  * @flow strict-local
- * @generated SignedSource<<745b7b5c173d0bc75b6d97938c98728d>>
+ * @generated SignedSource<<435ec24b3531c66986fe5d529795713b>>
+ *
+ * This file was sync'd from the facebook/react repository.
  */
 
 'use strict';

package/Libraries/Settings/React-RCTSettings.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.06.28.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTSettings"

package/Libraries/StyleSheet/normalizeColor.js

@@ -10,7 +10,7 @@
 
 /* eslint no-bitwise: 0 */
 
-import normalizeColorBase from '@react-native/normalize-color/base';
+import _normalizeColor from '@react-native/normalize-color';
 
 import type {ColorValue} from './StyleSheet';
 import type {ProcessedColorValue} from './processColor';
@@ -27,7 +27,7 @@ function normalizeColor(
   }
 
   if (typeof color === 'string' || typeof color === 'number') {
-    return normalizeColorBase(color);
+    return _normalizeColor(color);
   }
 }
 

package/Libraries/Text/Text.js

@@ -18,6 +18,7 @@ import {NativeText, NativeVirtualText} from './TextNativeComponent';
 import {type TextProps} from './TextProps';
 import * as React from 'react';
 import {useContext, useMemo, useState} from 'react';
+import invariant from 'invariant';
 
 /**
  * Text is the fundamental component for displaying text.
@@ -148,6 +149,14 @@ const Text: React.AbstractComponent<
     }
   }
 
+  let numberOfLines = restProps.numberOfLines;
+  if (numberOfLines != null && !(numberOfLines >= 0)) {
+    console.error(
+      `'numberOfLines' in <Text> must be a non-negative number, received: ${numberOfLines}. The value will be set to 0.`,
+    );
+    numberOfLines = 0;
+  }
+
   const hasTextAncestor = useContext(TextAncestor);
 
   return hasTextAncestor ? (
@@ -155,6 +164,7 @@ const Text: React.AbstractComponent<
       {...restProps}
       {...eventHandlersForText}
       isHighlighted={isHighlighted}
+      numberOfLines={numberOfLines}
       selectionColor={selectionColor}
       style={style}
       ref={forwardedRef}
@@ -168,6 +178,7 @@ const Text: React.AbstractComponent<
         allowFontScaling={allowFontScaling !== false}
         ellipsizeMode={ellipsizeMode ?? 'tail'}
         isHighlighted={isHighlighted}
+        numberOfLines={numberOfLines}
         selectionColor={selectionColor}
         style={style}
         ref={forwardedRef}

package/Libraries/Text/TextInput/RCTBaseTextInputView.m

@@ -242,20 +242,10 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
                           @"streetAddressLine2": UITextContentTypeStreetAddressLine2,
                           @"sublocality": UITextContentTypeSublocality,
                           @"telephoneNumber": UITextContentTypeTelephoneNumber,
+                          @"username": UITextContentTypeUsername,
+                          @"password": UITextContentTypePassword,
                           };
 
-      #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
-        if (@available(iOS 11.0, *)) {
-          NSDictionary<NSString *, NSString *> * iOS11extras = @{@"username": UITextContentTypeUsername,
-                                                                  @"password": UITextContentTypePassword};
-
-          NSMutableDictionary<NSString *, NSString *> * iOS11baseMap = [contentTypeMap mutableCopy];
-          [iOS11baseMap addEntriesFromDictionary:iOS11extras];
-
-          contentTypeMap = [iOS11baseMap copy];
-        }
-      #endif
-
       #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
         if (@available(iOS 12.0, *)) {
           NSDictionary<NSString *, NSString *> * iOS12extras = @{@"newPassword": UITextContentTypeNewPassword,

package/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m

@@ -30,17 +30,10 @@
     _heightConstraint = [_safeAreaContainer.heightAnchor constraintEqualToConstant:0];
     _heightConstraint.active = YES;
 
-    if (@available(iOS 11.0, *)) {
-      [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
-      [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
-      [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
-      [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor].active = YES;
-    } else {
-      [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.bottomAnchor].active = YES;
-      [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.topAnchor].active = YES;
-      [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.leadingAnchor].active = YES;
-      [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.trailingAnchor].active = YES;
-    }
+    [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
+    [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
+    [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
+    [_safeAreaContainer.trailingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.trailingAnchor].active = YES;
   }
   return self;
 }

package/Libraries/Text/TextProps.js

@@ -66,13 +66,7 @@ export type TextProps = $ReadOnly<{|
    * Set hyphenation strategy on Android.
    *
    */
-  android_hyphenationFrequency?: ?(
-    | 'normal'
-    | 'none'
-    | 'full'
-    | 'high'
-    | 'balanced'
-  ),
+  android_hyphenationFrequency?: ?('normal' | 'none' | 'full'),
   children?: ?Node,
 
   /**

package/Libraries/TurboModule/TurboModuleRegistry.js

@@ -16,7 +16,7 @@ const turboModuleProxy = global.__turboModuleProxy;
 
 function requireModule<T: TurboModule>(name: string): ?T {
   // Bridgeless mode requires TurboModules
-  if (!global.RN$Bridgeless) {
+  if (global.RN$Bridgeless !== true) {
     // Backward compatibility layer during migration.
     const legacyModule = NativeModules[name];
     if (legacyModule != null) {

package/Libraries/TypeSafety/RCTTypeSafety.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.06.28.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "RCTTypeSafety"

package/Libraries/UTFSequence.js

@@ -16,7 +16,7 @@ const deepFreezeAndThrowOnMutationInDev = require('./Utilities/deepFreezeAndThro
  * A collection of Unicode sequences for various characters and emoji.
  *
  *  - More explicit than using the sequences directly in code.
- *  - Source code should be limitted to ASCII.
+ *  - Source code should be limited to ASCII.
  *  - Less chance of typos.
  */
 const UTFSequence: {|

package/Libraries/Utilities/Dimensions.js

@@ -14,25 +14,20 @@ import EventEmitter, {
 import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
 import NativeDeviceInfo, {
   type DisplayMetrics,
+  type DisplayMetricsAndroid,
   type DimensionsPayload,
 } from './NativeDeviceInfo';
 import invariant from 'invariant';
 
-type DimensionsValue = {
-  window?: DisplayMetrics,
-  screen?: DisplayMetrics,
-  ...
-};
-
 const eventEmitter = new EventEmitter<{
-  change: [DimensionsValue],
+  change: [DimensionsPayload],
 }>();
 let dimensionsInitialized = false;
-let dimensions: DimensionsValue;
+let dimensions: DimensionsPayload;
 
 class Dimensions {
   /**
-   * NOTE: `useWindowDimensions` is the preffered API for React components.
+   * NOTE: `useWindowDimensions` is the preferred API for React components.
    *
    * Initial dimensions are set before `runApplication` is called so they should
    * be available before any other require's are run, but may be updated later.
@@ -46,9 +41,9 @@ class Dimensions {
    * Example: `const {height, width} = Dimensions.get('window');`
    *
    * @param {string} dim Name of dimension as defined when calling `set`.
-   * @returns {Object?} Value for the dimension.
+   * @returns {DisplayMetrics? | DisplayMetricsAndroid?} Value for the dimension.
    */
-  static get(dim: string): Object {
+  static get(dim: string): DisplayMetrics | DisplayMetricsAndroid {
     invariant(dimensions[dim], 'No dimension set for key ' + dim);
     return dimensions[dim];
   }
@@ -57,9 +52,9 @@ class Dimensions {
    * This should only be called from native code by sending the
    * didUpdateDimensions event.
    *
-   * @param {object} dims Simple string-keyed object of dimensions to set
+   * @param {DimensionsPayload} dims Simple string-keyed object of dimensions to set
    */
-  static set(dims: $ReadOnly<{[key: string]: any, ...}>): void {
+  static set(dims: $ReadOnly<DimensionsPayload>): void {
     // We calculate the window dimensions in JS so that we don't encounter loss of
     // precision in transferring the dimensions (which could be non-integers) over
     // the bridge.
@@ -128,7 +123,7 @@ class Dimensions {
   }
 }
 
-let initialDims: ?$ReadOnly<{[key: string]: any, ...}> =
+let initialDims: ?$ReadOnly<DimensionsPayload> =
   global.nativeExtensions &&
   global.nativeExtensions.DeviceInfo &&
   global.nativeExtensions.DeviceInfo.Dimensions;

package/Libraries/Utilities/FeatureDetection.js

@@ -0,0 +1,31 @@
+/**
+ * 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.
+ *
+ * @flow
+ * @format
+ */
+
+/**
+ * @return whether or not a @param {function} f is provided natively by calling
+ * `toString` and check if the result includes `[native code]` in it.
+ *
+ * Note that a polyfill can technically fake this behavior but few does it.
+ * Therefore, this is usually good enough for our purpose.
+ */
+function isNativeFunction(f: Function): boolean {
+  return typeof f === 'function' && f.toString().indexOf('[native code]') > -1;
+}
+
+/**
+ * @return whether or not the constructor of @param {object} o is an native
+ * function named with @param {string} expectedName.
+ */
+function hasNativeConstructor(o: Object, expectedName: string): boolean {
+  const con = Object.getPrototypeOf(o).constructor;
+  return con.name === expectedName && isNativeFunction(con);
+}
+
+module.exports = {isNativeFunction, hasNativeConstructor};

package/Libraries/Utilities/HMRClient.js

@@ -48,6 +48,7 @@ export type HMRClientNativeInterface = {|
     host: string,
     port: number | string,
     isEnabled: boolean,
+    scheme?: string,
   ): void,
 |};
 
@@ -118,7 +119,7 @@ const HMRClient: HMRClientNativeInterface = {
         JSON.stringify({
           type: 'log',
           level,
-          mode: global.RN$Bridgeless ? 'NOBRIDGE' : 'BRIDGE',
+          mode: global.RN$Bridgeless === true ? 'NOBRIDGE' : 'BRIDGE',
           data: data.map(item =>
             typeof item === 'string'
               ? item
@@ -146,6 +147,7 @@ const HMRClient: HMRClientNativeInterface = {
     host: string,
     port: number | string,
     isEnabled: boolean,
+    scheme?: string = 'http',
   ) {
     invariant(platform, 'Missing required parameter `platform`');
     invariant(bundleEntry, 'Missing required parameter `bundleEntry`');
@@ -155,8 +157,12 @@ const HMRClient: HMRClientNativeInterface = {
     // Moving to top gives errors due to NativeModules not being initialized
     const LoadingView = require('./LoadingView');
 
-    const wsHost = port !== null && port !== '' ? `${host}:${port}` : host;
-    const client = new MetroHMRClient(`ws://${wsHost}/hot`);
+    const serverHost = port !== null && port !== '' ? `${host}:${port}` : host;
+
+    const serverScheme = scheme;
+
+    const client = new MetroHMRClient(`${serverScheme}://${serverHost}/hot`);
+
     hmrClient = client;
 
     const {fullBundleUrl} = getDevServer();
@@ -165,9 +171,7 @@ const HMRClient: HMRClientNativeInterface = {
       // there are any important URL parameters we can't reconstruct from
       // `setup()`'s arguments.
       fullBundleUrl ??
-        // The ws://.../hot?bundleEntry= format is an alternative to specifying
-        // a regular HTTP bundle URL.
-        `ws://${wsHost}/hot?bundleEntry=${bundleEntry}&platform=${platform}`,
+        `${serverScheme}://${serverHost}/hot?bundleEntry=${bundleEntry}&platform=${platform}`,
     );
 
     client.on('connection-error', e => {

package/Libraries/Utilities/MatrixMath.js

@@ -71,7 +71,7 @@ const MatrixMath = {
    * This create a perspective projection towards negative z
    * Clipping the z range of [-near, -far]
    *
-   * @param fovInRadians - field of view in randians
+   * @param fovInRadians - field of view in radians
    */
   createPerspective: function(fovInRadians, aspect, near, far) {
     const h = 1 / Math.tan(fovInRadians / 2);

package/Libraries/Utilities/NativeDeviceInfo.js

@@ -11,7 +11,7 @@
 import type {TurboModule} from '../TurboModule/RCTExport';
 import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
-type DisplayMetricsAndroid = {|
+export type DisplayMetricsAndroid = {|
   width: number,
   height: number,
   scale: number,

package/Libraries/Utilities/deprecatedPropType.js

@@ -20,8 +20,8 @@ function deprecatedPropType(
   return function validate(props, propName, componentName, ...rest) {
     // Don't warn for native components.
     if (
-      !global.RN$Bridgeless &&
-      UIManager.hasViewManagerConfig(componentName) &&
+      global.RN$Bridgeless !== true &&
+      !UIManager.hasViewManagerConfig(componentName) &&
       props[propName] !== undefined
     ) {
       console.warn(

package/Libraries/Utilities/useWindowDimensions.js

@@ -9,10 +9,15 @@
  */
 
 import Dimensions from './Dimensions';
-import {type DisplayMetrics} from './NativeDeviceInfo';
+import {
+  type DisplayMetrics,
+  type DisplayMetricsAndroid,
+} from './NativeDeviceInfo';
 import {useEffect, useState} from 'react';
 
-export default function useWindowDimensions(): DisplayMetrics {
+export default function useWindowDimensions():
+  | DisplayMetrics
+  | DisplayMetricsAndroid {
   const [dimensions, setDimensions] = useState(() => Dimensions.get('window'));
   useEffect(() => {
     function handleChange({window}) {

package/Libraries/Vibration/React-RCTVibration.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.06.28.00'
+folly_version = '2021.06.28.00-v2'
 
 Pod::Spec.new do |s|
   s.name                   = "React-RCTVibration"

package/Libraries/vendor/emitter/_EventSubscriptionVendor.js

@@ -58,7 +58,7 @@ class EventSubscriptionVendor<EventDefinitions: {...}> {
    * Removes a bulk set of the subscriptions.
    *
    * @param {?string} eventType - Optional name of the event type whose
-   *   registered supscriptions to remove, if null remove all subscriptions.
+   *   registered subscriptions to remove, if null remove all subscriptions.
    */
   removeAllSubscriptions<K: $Keys<EventDefinitions>>(eventType: ?K): void {
     if (eventType == null) {

package/React/Base/RCTBridge+Private.h

@@ -7,6 +7,7 @@
 
 #import <React/RCTBridge.h>
 
+@class RCTModuleRegistry;
 @class RCTModuleData;
 @protocol RCTJavaScriptExecutor;
 
@@ -62,6 +63,13 @@ RCT_EXTERN void RCTRegisterModule(Class);
  */
 @property (nonatomic, strong, readwrite) NSURL *bundleURL;
 
+/**
+ * An object that allows one to require NativeModules/TurboModules.
+ * RCTModuleRegistry is implemented in bridgeless mode and bridge mode.
+ * Used by RCTRootView.
+ */
+@property (nonatomic, strong, readonly) RCTModuleRegistry *moduleRegistry;
+
 @end
 
 @interface RCTBridge (RCTCxxBridge)

package/React/Base/RCTBridge.h

@@ -160,6 +160,19 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
 RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
 
+// Turn off TurboModule delegate locking
+RCT_EXTERN BOOL RCTTurboModuleManagerDelegateLockingDisabled(void);
+RCT_EXTERN void RCTDisableTurboModuleManagerDelegateLocking(BOOL enabled);
+
+typedef enum {
+  kRCTGlobalScope,
+  kRCTGlobalScopeUsingRetainJSCallback,
+  kRCTTurboModuleManagerScope,
+} RCTTurboModuleCleanupMode;
+
+RCT_EXTERN RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void);
+RCT_EXTERN void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode);
+
 /**
  * Async batched bridge used to communicate with the JavaScript application.
  */

package/React/Base/RCTBridge.m

@@ -15,6 +15,7 @@
 #import "RCTInspectorDevServerHelper.h"
 #endif
 #import "RCTDevLoadingViewProtocol.h"
+#import "RCTJSThread.h"
 #import "RCTLog.h"
 #import "RCTModuleData.h"
 #import "RCTPerformanceLogger.h"
@@ -138,6 +139,29 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
   turboModuleSharedMutexInitEnabled = enabled;
 }
 
+static RCTTurboModuleCleanupMode turboModuleCleanupMode = kRCTGlobalScope;
+RCTTurboModuleCleanupMode RCTGetTurboModuleCleanupMode(void)
+{
+  return turboModuleCleanupMode;
+}
+
+void RCTSetTurboModuleCleanupMode(RCTTurboModuleCleanupMode mode)
+{
+  turboModuleCleanupMode = mode;
+}
+
+// Turn off TurboModule delegate locking
+static BOOL turboModuleManagerDelegateLockingDisabled = YES;
+BOOL RCTTurboModuleManagerDelegateLockingDisabled(void)
+{
+  return turboModuleManagerDelegateLockingDisabled;
+}
+
+void RCTDisableTurboModuleManagerDelegateLocking(BOOL disabled)
+{
+  turboModuleManagerDelegateLockingDisabled = disabled;
+}
+
 @interface RCTBridge () <RCTReloadListener>
 @end
 
@@ -145,15 +169,9 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
   NSURL *_delegateBundleURL;
 }
 
-dispatch_queue_t RCTJSThread;
-
 + (void)initialize
 {
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    // Set up JS thread
-    RCTJSThread = (id)kCFNull;
-  });
+  _RCTInitializeJSThreadConstantInternal();
 }
 
 static RCTBridge *RCTCurrentBridgeInstance = nil;
@@ -246,6 +264,11 @@ RCT_NOT_IMPLEMENTED(-(instancetype)init)
   });
 }
 
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return self.batchedBridge.moduleRegistry;
+}
+
 - (NSArray<Class> *)moduleClasses
 {
   return self.batchedBridge.moduleClasses;

package/React/Base/RCTBridgeModule.h

@@ -9,6 +9,7 @@
 #import <UIKit/UIKit.h>
 
 #import <React/RCTDefines.h>
+#import <React/RCTJSThread.h>
 
 @class RCTBridge;
 @protocol RCTBridgeMethod;
@@ -42,16 +43,6 @@ typedef void (^RCTPromiseResolveBlock)(id result);
  */
 typedef void (^RCTPromiseRejectBlock)(NSString *code, NSString *message, NSError *error);
 
-/**
- * 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;
-
 RCT_EXTERN_C_BEGIN
 
 typedef struct RCTMethodInfo {
@@ -124,7 +115,7 @@ RCT_EXTERN_C_END
  * moduleRegistry = _moduleRegistry;`. If using Swift, add
  * `@objc var moduleRegistry: RCTModuleRegistry!` to your module.
  */
-@property (nonatomic, weak, readonly) RCTModuleRegistry *moduleRegistry;
+@property (nonatomic, weak, readwrite) RCTModuleRegistry *moduleRegistry;
 
 /**
  * A reference to the RCTViewRegistry. Useful for modules that query UIViews,
@@ -430,7 +421,7 @@ RCT_EXTERN_C_END
 @end
 
 typedef void (^RCTBridgelessBundleURLSetter)(NSURL *bundleURL);
-typedef NSURL * (^RCTBridgelessBundleURLGetter)();
+typedef NSURL * (^RCTBridgelessBundleURLGetter)(void);
 
 /**
  * A class that allows NativeModules/TurboModules to read/write the bundleURL, with or without the bridge.

package/React/Base/RCTBundleURLProvider.h

@@ -12,7 +12,7 @@
 RCT_EXTERN NSString *const RCTBundleURLProviderUpdatedNotification;
 RCT_EXTERN const NSUInteger kRCTBundleURLProviderDefaultPort;
 
-#if RCT_DEV_MENU
+#if RCT_DEV_MENU | RCT_PACKAGER_LOADING_FUNCTIONALITY
 /**
  * Allow/disallow accessing the packager server for various runtime scenario.
  * For instance, if a test run should never access the packager, disable it
@@ -52,6 +52,13 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  */
 + (BOOL)isPackagerRunning:(NSString *)hostPort;
 
+/**
+ * Returns if there's a packager running at the given scheme://host:port.
+ * The port is optional, if not specified, kRCTBundleURLProviderDefaultPort will be used
+ * The scheme is also optional, if not specified, a default http protocol will be used
+ */
++ (BOOL)isPackagerRunning:(NSString *)hostPort scheme:(NSString *)scheme;
+
 /**
  * Returns the jsBundleURL for a given bundle entrypoint and
  * the fallback offline JS bundle if the packager is not running.
@@ -99,9 +106,15 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  * The IP address or hostname of the packager.
  */
 @property (nonatomic, copy) NSString *jsLocation;
+
 @property (nonatomic, assign) BOOL enableMinification;
 @property (nonatomic, assign) BOOL enableDev;
 
+/**
+ * The scheme/protocol used of the packager, the default is the http protocol
+ */
+@property (nonatomic, copy) NSString *packagerScheme;
+
 + (instancetype)sharedSettings;
 
 /**
@@ -129,6 +142,13 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
                         modulesOnly:(BOOL)modulesOnly
                           runModule:(BOOL)runModule;
 
++ (NSURL *)jsBundleURLForBundleRoot:(NSString *)bundleRoot
+                       packagerHost:(NSString *)packagerHost
+                     packagerScheme:(NSString *)scheme
+                          enableDev:(BOOL)enableDev
+                 enableMinification:(BOOL)enableMinification
+                        modulesOnly:(BOOL)modulesOnly
+                          runModule:(BOOL)runModule;
 /**
  * Given a hostname for the packager and a resource path (including "/"), return the URL to the resource.
  * In general, please use the instance method to decide if the packager is running and fallback to the pre-packaged
@@ -136,4 +156,9 @@ RCT_EXTERN void RCTBundleURLProviderAllowPackagerServerAccess(BOOL allowed);
  */
 + (NSURL *)resourceURLForResourcePath:(NSString *)path packagerHost:(NSString *)packagerHost query:(NSString *)query;
 
++ (NSURL *)resourceURLForResourcePath:(NSString *)path
+                         packagerHost:(NSString *)packagerHost
+                               scheme:(NSString *)scheme
+                                query:(NSString *)query;
+
 @end