react-native 0.0.0-17be3a003 → 0.0.0-18697adec

package/Libraries/LogBox/LogBox.js

@@ -11,10 +11,24 @@
 import Platform from '../Utilities/Platform';
 import RCTLog from '../Utilities/RCTLog';
 
-import type {IgnorePattern} from './Data/LogBoxData';
+import type {IgnorePattern, LogData} from './Data/LogBoxData';
+import type {ExtendedExceptionData} from './Data/parseLogBoxLog';
+
+export type {LogData, ExtendedExceptionData, IgnorePattern};
 
 let LogBox;
 
+interface ILogBox {
+  install(): void;
+  uninstall(): void;
+  isInstalled(): boolean;
+  ignoreLogs($ReadOnlyArray<IgnorePattern>): void;
+  ignoreAllLogs(?boolean): void;
+  clearAllLogs(): void;
+  addLog(log: LogData): void;
+  addException(error: ExtendedExceptionData): void;
+}
+
 /**
  * LogBox displays logs in the app.
  */
@@ -22,45 +36,44 @@ if (__DEV__) {
   const LogBoxData = require('./Data/LogBoxData');
   const {parseLogBoxLog, parseInterpolation} = require('./Data/parseLogBoxLog');
 
-  // LogBox needs to insert itself early,
-  // in order to access the component stacks appended by React DevTools.
-  const {error, warn} = console;
-  let errorImpl = error.bind(console);
-  let warnImpl = warn.bind(console);
+  let originalConsoleError;
+  let originalConsoleWarn;
+  let consoleErrorImpl;
+  let consoleWarnImpl;
 
-  (console: any).error = function(...args) {
-    errorImpl(...args);
-  };
-  (console: any).warn = function(...args) {
-    warnImpl(...args);
-  };
+  let isLogBoxInstalled: boolean = false;
 
   LogBox = {
-    ignoreLogs: (patterns: $ReadOnlyArray<IgnorePattern>): void => {
-      LogBoxData.addIgnorePatterns(patterns);
-    },
+    install(): void {
+      if (isLogBoxInstalled) {
+        return;
+      }
 
-    ignoreAllLogs: (value?: ?boolean): void => {
-      LogBoxData.setDisabled(value == null ? true : value);
-    },
+      isLogBoxInstalled = true;
 
-    uninstall: (): void => {
-      errorImpl = error;
-      warnImpl = warn;
-      delete (console: any).disableLogBox;
-    },
-
-    install: (): void => {
       // Trigger lazy initialization of module.
       require('../NativeModules/specs/NativeLogBox');
 
-      errorImpl = function(...args) {
-        registerError(...args);
-      };
+      // IMPORTANT: we only overwrite `console.error` and `console.warn` once.
+      // When we uninstall we keep the same reference and only change its
+      // internal implementation
+      const isFirstInstall = originalConsoleError == null;
+      if (isFirstInstall) {
+        originalConsoleError = console.error.bind(console);
+        originalConsoleWarn = console.warn.bind(console);
+
+        // $FlowExpectedError[cannot-write]
+        console.error = (...args) => {
+          consoleErrorImpl(...args);
+        };
+        // $FlowExpectedError[cannot-write]
+        console.warn = (...args) => {
+          consoleWarnImpl(...args);
+        };
+      }
 
-      warnImpl = function(...args) {
-        registerWarning(...args);
-      };
+      consoleErrorImpl = registerError;
+      consoleWarnImpl = registerWarning;
 
       if ((console: any).disableYellowBox === true) {
         LogBoxData.setDisabled(true);
@@ -88,6 +101,50 @@ if (__DEV__) {
         registerWarning(...args);
       });
     },
+
+    uninstall(): void {
+      if (!isLogBoxInstalled) {
+        return;
+      }
+
+      isLogBoxInstalled = false;
+
+      // IMPORTANT: we don't re-assign to `console` in case the method has been
+      // decorated again after installing LogBox. E.g.:
+      // Before uninstalling: original > LogBox > OtherErrorHandler
+      // After uninstalling:  original > LogBox (noop) > OtherErrorHandler
+      consoleErrorImpl = originalConsoleError;
+      consoleWarnImpl = originalConsoleWarn;
+      delete (console: any).disableLogBox;
+    },
+
+    isInstalled(): boolean {
+      return isLogBoxInstalled;
+    },
+
+    ignoreLogs(patterns: $ReadOnlyArray<IgnorePattern>): void {
+      LogBoxData.addIgnorePatterns(patterns);
+    },
+
+    ignoreAllLogs(value?: ?boolean): void {
+      LogBoxData.setDisabled(value == null ? true : value);
+    },
+
+    clearAllLogs(): void {
+      LogBoxData.clear();
+    },
+
+    addLog(log: LogData): void {
+      if (isLogBoxInstalled) {
+        LogBoxData.addLog(log);
+      }
+    },
+
+    addException(error: ExtendedExceptionData): void {
+      if (isLogBoxInstalled) {
+        LogBoxData.addException(error);
+      }
+    },
   };
 
   const isRCTLogAdviceWarning = (...args) => {
@@ -103,7 +160,7 @@ if (__DEV__) {
   const registerWarning = (...args): void => {
     // Let warnings within LogBox itself fall through.
     if (LogBoxData.isLogBoxErrorMessage(String(args[0]))) {
-      error.call(console, ...args);
+      originalConsoleError(...args);
       return;
     }
 
@@ -113,7 +170,7 @@ if (__DEV__) {
 
         if (!LogBoxData.isMessageIgnored(message.content)) {
           // Be sure to pass LogBox warnings through.
-          warn.call(console, ...args);
+          originalConsoleWarn(...args);
 
           LogBoxData.addLog({
             level: 'warn',
@@ -131,7 +188,7 @@ if (__DEV__) {
   const registerError = (...args): void => {
     // Let errors within LogBox itself fall through.
     if (LogBoxData.isLogBoxErrorMessage(args[0])) {
-      error.call(console, ...args);
+      originalConsoleError(...args);
       return;
     }
 
@@ -144,7 +201,7 @@ if (__DEV__) {
         //
         // The 'warning' module needs to be handled here because React internally calls
         // `console.error('Warning: ')` with the component stack already included.
-        error.call(console, ...args);
+        originalConsoleError(...args);
         return;
       }
 
@@ -169,7 +226,7 @@ if (__DEV__) {
         // Interpolate the message so they are formatted for adb and other CLIs.
         // This is different than the message.content above because it includes component stacks.
         const interpolated = parseInterpolation(args);
-        error.call(console, interpolated.message.content);
+        originalConsoleError(interpolated.message.content);
 
         LogBoxData.addLog({
           level,
@@ -184,28 +241,38 @@ if (__DEV__) {
   };
 } else {
   LogBox = {
-    ignoreLogs: (patterns: $ReadOnlyArray<IgnorePattern>): void => {
+    install(): void {
+      // Do nothing.
+    },
+
+    uninstall(): void {
+      // Do nothing.
+    },
+
+    isInstalled(): boolean {
+      return false;
+    },
+
+    ignoreLogs(patterns: $ReadOnlyArray<IgnorePattern>): void {
+      // Do nothing.
+    },
+
+    ignoreAllLogs(value?: ?boolean): void {
       // Do nothing.
     },
 
-    ignoreAllLogs: (value?: ?boolean): void => {
+    clearAllLogs(): void {
       // Do nothing.
     },
 
-    install: (): void => {
+    addLog(log: LogData): void {
       // Do nothing.
     },
 
-    uninstall: (): void => {
+    addException(error: ExtendedExceptionData): void {
       // Do nothing.
     },
   };
 }
 
-module.exports = (LogBox: {
-  ignoreLogs($ReadOnlyArray<IgnorePattern>): void,
-  ignoreAllLogs(?boolean): void,
-  install(): void,
-  uninstall(): void,
-  ...
-});
+module.exports = (LogBox: ILogBox);

package/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js

@@ -36,6 +36,7 @@ function LogBoxInspectorSourceMapStatus(props: Props): React.Node {
         const animation = Animated.loop(
           Animated.timing(animated, {
             duration: 2000,
+            // $FlowFixMe[method-unbinding]
             easing: Easing.linear,
             toValue: 1,
             useNativeDriver: true,

package/Libraries/Modal/Modal.js

@@ -193,6 +193,7 @@ class Modal extends React.Component<Props> {
   }
 
   componentDidMount() {
+    // 'modalDismissed' is for the old renderer in iOS only
     if (ModalEventEmitter) {
       this._eventSubscription = ModalEventEmitter.addListener(
         'modalDismissed',
@@ -251,9 +252,16 @@ class Modal extends React.Component<Props> {
         hardwareAccelerated={this.props.hardwareAccelerated}
         onRequestClose={this.props.onRequestClose}
         onShow={this.props.onShow}
+        onDismiss={() => {
+          if (this.props.onDismiss) {
+            this.props.onDismiss();
+          }
+        }}
+        visible={this.props.visible}
         statusBarTranslucent={this.props.statusBarTranslucent}
         identifier={this._identifier}
         style={styles.modal}
+        // $FlowFixMe[method-unbinding] added when improving typing for this parameters
         onStartShouldSetResponder={this._shouldSetResponder}
         supportedOrientations={this.props.supportedOrientations}
         onOrientationChange={this.props.onOrientationChange}>

package/Libraries/Modal/RCTModalHostViewNativeComponent.js

@@ -13,7 +13,6 @@ import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import type {
   WithDefault,
   DirectEventHandler,
-  BubblingEventHandler,
   Int32,
 } from '../Types/CodegenTypes';
 
@@ -91,7 +90,14 @@ type NativeProps = $ReadOnly<{|
    *
    * See https://reactnative.dev/docs/modal.html#ondismiss
    */
-  onDismiss?: ?BubblingEventHandler<null>,
+  onDismiss?: ?DirectEventHandler<null>,
+
+  /**
+   * The `visible` prop determines whether your modal is visible.
+   *
+   * See https://reactnative.dev/docs/modal.html#visible
+   */
+  visible?: WithDefault<boolean, false>,
 
   /**
    * Deprecated. Use the `animationType` prop instead.

package/Libraries/NativeAnimation/Nodes/RCTPropsAnimatedNode.m

@@ -16,7 +16,6 @@
 @implementation RCTPropsAnimatedNode
 {
   NSNumber *_connectedViewTag;
-  NSNumber *_rootTag;
   NSString *_connectedViewName;
   __weak RCTBridge *_bridge;
   __weak id<RCTSurfacePresenterStub> _surfacePresenter;
@@ -48,7 +47,6 @@
   _connectedViewTag = viewTag;
   _connectedViewName = viewName;
   _managedByFabric = RCTUIManagerTypeForTagIsFabric(viewTag);
-  _rootTag = nil;
 }
 
 - (void)disconnectFromView:(NSNumber *)viewTag
@@ -58,7 +56,6 @@
   _connectedViewTag = nil;
   _connectedViewName = nil;
   _managedByFabric = NO;
-  _rootTag = nil;
 }
 
 - (void)updateView

package/Libraries/NativeAnimation/RCTAnimationPlugins.mm

@@ -17,13 +17,14 @@
 #import <unordered_map>
 
 Class RCTAnimationClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"NativeAnimatedModule", RCTNativeAnimatedModuleCls},
     {"NativeAnimatedTurboModule", RCTNativeAnimatedTurboModuleCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }

package/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm

@@ -9,6 +9,7 @@
 #import <React/RCTNativeAnimatedModule.h>
 #import <React/RCTNativeAnimatedNodesManager.h>
 #import <React/RCTLog.h>
+#import <React/RCTInitializing.h>
 
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 
@@ -16,6 +17,9 @@
 
 typedef void (^AnimatedOperation)(RCTNativeAnimatedNodesManager *nodesManager);
 
+@interface RCTNativeAnimatedModule () <RCTInitializing>
+@end
+
 @implementation RCTNativeAnimatedModule
 {
   RCTNativeAnimatedNodesManager *_nodesManager;
@@ -69,10 +73,9 @@ RCT_EXPORT_MODULE();
   [bridge.surfacePresenter addObserver:self];
 }
 
-- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
+- (void)initialize
 {
-  [super setModuleRegistry:moduleRegistry];
-  [[moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
+  [[self.moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
 }
 
 /*

package/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h

@@ -15,7 +15,7 @@
 
 @interface RCTNativeAnimatedNodesManager : NSObject
 
-- (nonnull instancetype)initWithBridge:(nonnull RCTBridge *)bridge
+- (nonnull instancetype)initWithBridge:(RCTBridge *)bridge
                       surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 
 - (void)updateAnimations;

package/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.m

@@ -55,7 +55,7 @@ static NSString *RCTNormalizeAnimatedEventName(NSString *eventName)
   CADisplayLink *_displayLink;
 }
 
-- (instancetype)initWithBridge:(nonnull RCTBridge *)bridge surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
+- (instancetype)initWithBridge:(RCTBridge *)bridge surfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter;
 {
   if ((self = [super init])) {
     _bridge = bridge;

package/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm

@@ -9,12 +9,13 @@
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <React/RCTNativeAnimatedTurboModule.h>
 #import <React/RCTNativeAnimatedNodesManager.h>
+#import <React/RCTInitializing.h>
 
 #import "RCTAnimationPlugins.h"
 
 typedef void (^AnimatedOperation)(RCTNativeAnimatedNodesManager *nodesManager);
 
-@interface RCTNativeAnimatedTurboModule() <NativeAnimatedModuleSpec>
+@interface RCTNativeAnimatedTurboModule() <NativeAnimatedModuleSpec, RCTInitializing>
 @end
 
 @implementation RCTNativeAnimatedTurboModule
@@ -26,6 +27,9 @@ typedef void (^AnimatedOperation)(RCTNativeAnimatedNodesManager *nodesManager);
   // Operations called before views have been updated.
   NSMutableArray<AnimatedOperation> *_preOperations;
   NSMutableDictionary<NSNumber *, NSNumber *> *_animIdIsManagedByFabric;
+  // A set of nodeIDs managed by Fabric.
+  NSMutableSet<NSNumber *> *_nodeIDsManagedByFabric;
+
 }
 
 RCT_EXPORT_MODULE();
@@ -41,10 +45,26 @@ RCT_EXPORT_MODULE();
     _operations = [NSMutableArray new];
     _preOperations = [NSMutableArray new];
     _animIdIsManagedByFabric = [NSMutableDictionary new];
+    _nodeIDsManagedByFabric = [NSMutableSet new];
   }
   return self;
 }
 
+- (void)initialize
+{
+  if (self.bridge) {
+    _surfacePresenter = self.bridge.surfacePresenter;
+    _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:_surfacePresenter];
+    [self.bridge.uiManager.observerCoordinator addObserver:self];
+  } else {
+    // _surfacePresenter set in setSurfacePresenter:
+    _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:nil surfacePresenter:_surfacePresenter];
+  }
+
+  [_surfacePresenter addObserver:self];
+  [[self.moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
+}
+
 - (void)invalidate
 {
   [super invalidate];
@@ -62,21 +82,6 @@ RCT_EXPORT_MODULE();
   return RCTGetUIManagerQueue();
 }
 
-- (void)setBridge:(RCTBridge *)bridge
-{
-  [super setBridge:bridge];
-  _surfacePresenter = bridge.surfacePresenter;
-  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:_surfacePresenter];
-  [bridge.uiManager.observerCoordinator addObserver:self];
-  [_surfacePresenter addObserver:self];
-}
-
-- (void)setModuleRegistry:(RCTModuleRegistry *)moduleRegistry
-{
-  [super setModuleRegistry:moduleRegistry];
-  [[moduleRegistry moduleForName:"EventDispatcher"] addDispatchObserver:self];
-}
-
 /*
  * In bridgeless mode, `setBridge` is never called during initializtion. Instead this selector is invoked via
  * BridgelessTurboModuleSetup.
@@ -84,8 +89,6 @@ RCT_EXPORT_MODULE();
 - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
 {
   _surfacePresenter = surfacePresenter;
-  _nodesManager = [[RCTNativeAnimatedNodesManager alloc] initWithBridge:self.bridge surfacePresenter:_surfacePresenter];
-  [_surfacePresenter addObserver:self];
 }
 
 #pragma mark -- API
@@ -111,6 +114,9 @@ RCT_EXPORT_METHOD(createAnimatedNode:(double)tag
 RCT_EXPORT_METHOD(connectAnimatedNodes:(double)parentTag
                   childTag:(double)childTag)
 {
+  if ([_nodeIDsManagedByFabric containsObject:@(childTag)]) {
+    [_nodeIDsManagedByFabric addObject:@(parentTag)];
+  }
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager connectAnimatedNodes:[NSNumber numberWithDouble:parentTag] childTag:[NSNumber numberWithDouble:childTag]];
   }];
@@ -133,16 +139,11 @@ RCT_EXPORT_METHOD(startAnimatingNode:(double)animationId
     [nodesManager startAnimatingNode:[NSNumber numberWithDouble:animationId] nodeTag:[NSNumber numberWithDouble:nodeTag] config:config endCallback:callBack];
   }];
 
- RCTExecuteOnMainQueue(^{
-   if (![self->_nodesManager isNodeManagedByFabric:[NSNumber numberWithDouble:nodeTag]]) {
-     return;
-   }
-
-   RCTExecuteOnUIManagerQueue(^{
-     self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
-     [self flushOperationQueues];
-   });
- });
+  BOOL isNodeManagedByFabric = [_nodeIDsManagedByFabric containsObject:@(nodeTag)];
+  if (isNodeManagedByFabric) {
+    self->_animIdIsManagedByFabric[[NSNumber numberWithDouble:animationId]] = @YES;
+    [self flushOperationQueues];
+  }
 }
 
 RCT_EXPORT_METHOD(stopAnimation:(double)animationId)
@@ -188,6 +189,9 @@ RCT_EXPORT_METHOD(extractAnimatedNodeOffset:(double)nodeTag)
 RCT_EXPORT_METHOD(connectAnimatedNodeToView:(double)nodeTag
                   viewTag:(double)viewTag)
 {
+  if (RCTUIManagerTypeForTagIsFabric(@(viewTag))) {
+    [_nodeIDsManagedByFabric addObject:@(nodeTag)];
+  }
   NSString *viewName = [self.bridge.uiManager viewNameForReactTag:[NSNumber numberWithDouble:viewTag]];
   [self addOperationBlock:^(RCTNativeAnimatedNodesManager *nodesManager) {
     [nodesManager connectAnimatedNodeToView:[NSNumber numberWithDouble:nodeTag] viewTag:[NSNumber numberWithDouble:viewTag] viewName:viewName];

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

package/Libraries/Network/RCTHTTPRequestHandler.h

@@ -8,6 +8,11 @@
 #import <React/RCTInvalidating.h>
 #import <React/RCTURLRequestHandler.h>
 
+typedef NSURLSessionConfiguration* (^NSURLSessionConfigurationProvider)(void);
+/**
+ *  The block provided via this function will provide the NSURLSessionConfiguration for all HTTP requests made by the app.
+*/
+RCT_EXTERN void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider);
 /**
  * This is the default RCTURLRequestHandler implementation for HTTP requests.
  */

package/Libraries/Network/RCTHTTPRequestHandler.mm

@@ -18,6 +18,12 @@
 
 @end
 
+static NSURLSessionConfigurationProvider urlSessionConfigurationProvider;
+
+void RCTSetCustomNSURLSessionConfigurationProvider(NSURLSessionConfigurationProvider provider) {
+  urlSessionConfigurationProvider = provider;
+}
+
 @implementation RCTHTTPRequestHandler
 {
   NSMapTable *_delegates;
@@ -75,14 +81,20 @@ RCT_EXPORT_MODULE()
     NSOperationQueue *callbackQueue = [NSOperationQueue new];
     callbackQueue.maxConcurrentOperationCount = 1;
     callbackQueue.underlyingQueue = [[_moduleRegistry moduleForName:"Networking"] methodQueue];
-    NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
-    // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
-    if (useWifiOnly) {
-      configuration.allowsCellularAccess = ![useWifiOnly boolValue];
+    NSURLSessionConfiguration *configuration;
+    if (urlSessionConfigurationProvider) {
+      configuration = urlSessionConfigurationProvider();
+    } else {
+      configuration = [NSURLSessionConfiguration defaultSessionConfiguration];
+      // Set allowsCellularAccess to NO ONLY if key ReactNetworkForceWifiOnly exists AND its value is YES
+      if (useWifiOnly) {
+        configuration.allowsCellularAccess = ![useWifiOnly boolValue];
+      }
+      [configuration setHTTPShouldSetCookies:YES];
+      [configuration setHTTPCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
+      [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
     }
-    [configuration setHTTPShouldSetCookies:YES];
-    [configuration setHTTPCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
-    [configuration setHTTPCookieStorage:[NSHTTPCookieStorage sharedHTTPCookieStorage]];
+    assert(configuration != nil);
     _session = [NSURLSession sessionWithConfiguration:configuration
                                              delegate:self
                                         delegateQueue:callbackQueue];

package/Libraries/Network/RCTNetworkPlugins.mm

@@ -17,15 +17,16 @@
 #import <unordered_map>
 
 Class RCTNetworkClassProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sCoreModuleClassMap = {
+  // Intentionally leak to avoid crashing after static destructors are run.
+  static const auto sCoreModuleClassMap = new const std::unordered_map<std::string, Class (*)(void)>{
     {"Networking", RCTNetworkingCls},
     {"DataRequestHandler", RCTDataRequestHandlerCls},
     {"FileRequestHandler", RCTFileRequestHandlerCls},
     {"HTTPRequestHandler", RCTHTTPRequestHandlerCls},
   };
 
-  auto p = sCoreModuleClassMap.find(name);
-  if (p != sCoreModuleClassMap.end()) {
+  auto p = sCoreModuleClassMap->find(name);
+  if (p != sCoreModuleClassMap->end()) {
     auto classFunc = p->second;
     return classFunc();
   }

package/Libraries/Network/RCTNetworking.h

@@ -31,7 +31,7 @@
  * Allows RCTNetworking instances to be initialized with handlers.
  * The handlers will be requested via the bridge's moduleForName method when required.
  */
-- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(void))getHandlers;
+- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(RCTModuleRegistry *))getHandlers;
 
 /**
  * Does a handler exist for the specified request?

package/Libraries/Network/RCTNetworking.mm

@@ -148,7 +148,7 @@ static NSString *RCTGenerateFormBoundary()
   NSMutableDictionary<NSNumber *, RCTNetworkTask *> *_tasksByRequestID;
   std::mutex _handlersLock;
   NSArray<id<RCTURLRequestHandler>> *_handlers;
-  NSArray<id<RCTURLRequestHandler>> * (^_handlersProvider)(void);
+  NSArray<id<RCTURLRequestHandler>> * (^_handlersProvider)(RCTModuleRegistry *);
   NSMutableArray<id<RCTNetworkingRequestHandler>> *_requestHandlers;
   NSMutableArray<id<RCTNetworkingResponseHandler>> *_responseHandlers;
 }
@@ -167,7 +167,7 @@ RCT_EXPORT_MODULE()
   return [super initWithDisabledObservation];
 }
 
-- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(void))getHandlers
+- (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(RCTModuleRegistry *moduleRegistry))getHandlers
 {
   if (self = [super initWithDisabledObservation]) {
     _handlersProvider = getHandlers;
@@ -209,7 +209,7 @@ RCT_EXPORT_MODULE()
 
     if (!_handlers) {
       if (_handlersProvider) {
-        _handlers = _handlersProvider();
+        _handlers = _handlersProvider(self.moduleRegistry);
       } else {
         _handlers = [self.bridge modulesConformingToProtocol:@protocol(RCTURLRequestHandler)];
       }

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