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

package/React/CoreModules/RCTEventDispatcher.mm

@@ -42,14 +42,12 @@ static uint16_t RCTUniqueCoalescingKeyGenerator = 0;
 
 @synthesize bridge = _bridge;
 @synthesize dispatchToJSThread = _dispatchToJSThread;
-@synthesize invokeJS = _invokeJS;
-@synthesize invokeJSWithModuleDotMethod = _invokeJSWithModuleDotMethod;
+@synthesize callableJSModules = _callableJSModules;
 
 RCT_EXPORT_MODULE()
 
-- (void)setBridge:(RCTBridge *)bridge
+- (void)initialize
 {
-  _bridge = bridge;
   _events = [NSMutableDictionary new];
   _eventQueue = [NSMutableArray new];
   _eventQueueLock = [NSLock new];
@@ -58,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
@@ -196,11 +187,12 @@ RCT_EXPORT_MODULE()
 
 - (void)dispatchEvent:(id<RCTEvent>)event
 {
-  if (_bridge) {
-    [_bridge enqueueJSCall:[[event class] moduleDotMethod] args:[event arguments]];
-  } else if (_invokeJSWithModuleDotMethod) {
-    _invokeJSWithModuleDotMethod([[event class] moduleDotMethod], [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,21 +201,11 @@
 
 - (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)
 
-- (void)dealloc
-{
-  _stackTraceTableView.dataSource = nil;
-  _stackTraceTableView.delegate = nil;
-}
-
 - (NSString *)stripAnsi:(NSString *)text
 {
   NSError *error = nil;
@@ -456,6 +446,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
 @synthesize bridge = _bridge;
 @synthesize moduleRegistry = _moduleRegistry;
+@synthesize bundleManager = _bundleManager;
 
 RCT_EXPORT_MODULE()
 
@@ -642,7 +633,7 @@ RCT_EXPORT_METHOD(dismiss)
 
 - (void)redBoxWindow:(__unused RCTRedBoxWindow *)redBoxWindow openStackFrameInEditor:(RCTJSStackFrame *)stackFrame
 {
-  NSURL *const bundleURL = _overrideBundleURL ?: _bridge.bundleURL;
+  NSURL *const bundleURL = _overrideBundleURL ?: _bundleManager.bundleURL;
   if (![bundleURL.scheme hasPrefix:@"http"]) {
     RCTLogWarn(@"Cannot open stack frame in editor because you're not connected to the packager.");
     return;

package/React/CoreModules/RCTSourceCode.mm

@@ -23,6 +23,7 @@ using namespace facebook::react;
 RCT_EXPORT_MODULE()
 
 @synthesize bridge = _bridge;
+@synthesize bundleManager = _bundleManager;
 
 + (BOOL)requiresMainQueueSetup
 {
@@ -37,7 +38,7 @@ RCT_EXPORT_MODULE()
 - (NSDictionary<NSString *, id> *)getConstants
 {
   return @{
-    @"scriptURL" : self.bridge.bundleURL.absoluteString ?: @"",
+    @"scriptURL" : self.bundleManager.bundleURL.absoluteString ?: @"",
   };
 }
 

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 = '2020.01.13.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
 
@@ -236,6 +235,8 @@ struct RCTInstanceCallback : public InstanceCallback {
 
   RCTModuleRegistry *_objCModuleRegistry;
   RCTViewRegistry *_viewRegistry_DEPRECATED;
+  RCTBundleManager *_bundleManager;
+  RCTCallableJSModules *_callableJSModules;
 }
 
 @synthesize bridgeDescription = _bridgeDescription;
@@ -243,12 +244,67 @@ struct RCTInstanceCallback : public InstanceCallback {
 @synthesize performanceLogger = _performanceLogger;
 @synthesize valid = _valid;
 
+- (RCTModuleRegistry *)moduleRegistry
+{
+  return _objCModuleRegistry;
+}
+
 - (void)setRCTTurboModuleRegistry:(id<RCTTurboModuleRegistry>)turboModuleRegistry
 {
   _turboModuleRegistry = turboModuleRegistry;
   [_objCModuleRegistry setTurboModuleRegistry:_turboModuleRegistry];
 }
 
+- (void)attachBridgeAPIsToTurboModule:(id<RCTTurboModule>)module
+{
+  id<RCTBridgeModule> bridgeModule = (id<RCTBridgeModule>)module;
+  /**
+   * Attach the RCTViewRegistry to this TurboModule, which allows this TurboModule
+   * To query a React component's UIView, given its reactTag.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED`
+   */
+  if ([bridgeModule respondsToSelector:@selector(setViewRegistry_DEPRECATED:)]) {
+    bridgeModule.viewRegistry_DEPRECATED = _viewRegistry_DEPRECATED;
+  }
+
+  /**
+   * Attach the RCTBundleManager to this TurboModule, which allows this TurboModule to
+   * read from/write to the app's bundle URL.
+   *
+   * Usage: In the TurboModule @implementation, include:
+   *   `@synthesize bundleManager = _bundleManager`
+   */
+  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
 {
   return _jsMessageThread;
@@ -285,8 +341,12 @@ struct RCTInstanceCallback : public InstanceCallback {
     _moduleDataByID = [NSMutableArray new];
     _objCModuleRegistry = [RCTModuleRegistry new];
     [_objCModuleRegistry setBridge:self];
+    _bundleManager = [RCTBundleManager new];
+    [_bundleManager setBridge:self];
     _viewRegistry_DEPRECATED = [RCTViewRegistry new];
     [_viewRegistry_DEPRECATED setBridge:self];
+    _callableJSModules = [RCTCallableJSModules new];
+    [_callableJSModules setBridge:self];
 
     [RCTBridge setCurrentBridge:self];
 
@@ -337,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.
@@ -466,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) {
@@ -763,7 +826,9 @@ struct RCTInstanceCallback : public InstanceCallback {
     moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass
                                                      bridge:self
                                              moduleRegistry:_objCModuleRegistry
-                                    viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED];
+                                    viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
+                                              bundleManager:_bundleManager
+                                          callableJSModules:_callableJSModules];
     BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
     _moduleDataByName[moduleName] = moduleData;
@@ -838,7 +903,9 @@ struct RCTInstanceCallback : public InstanceCallback {
     RCTModuleData *moduleData = [[RCTModuleData alloc] initWithModuleInstance:module
                                                                        bridge:self
                                                                moduleRegistry:_objCModuleRegistry
-                                                      viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED];
+                                                      viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
+                                                                bundleManager:_bundleManager
+                                                            callableJSModules:_callableJSModules];
     BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
     _moduleDataByName[moduleName] = moduleData;
@@ -892,7 +959,9 @@ struct RCTInstanceCallback : public InstanceCallback {
       moduleData = [[RCTModuleData alloc] initWithModuleClass:moduleClass
                                                        bridge:self
                                                moduleRegistry:_objCModuleRegistry
-                                      viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED];
+                                      viewRegistry_DEPRECATED:_viewRegistry_DEPRECATED
+                                                bundleManager:_bundleManager
+                                            callableJSModules:_callableJSModules];
       BridgeNativeModulePerfLogger::moduleDataCreateEnd([moduleName UTF8String], moduleDataId);
 
       _moduleDataByName[moduleName] = moduleData;
@@ -1061,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/CxxModule/RCTNativeModule.mm

@@ -100,7 +100,9 @@ void RCTNativeModule::invoke(unsigned int methodId, folly::dynamic &&params, int
 #else
     (void)(callId);
 #endif
-    invokeInner(weakBridge, weakModuleData, methodId, std::move(params), callId, isSyncModule ? Sync : Async);
+    @autoreleasepool {
+      invokeInner(weakBridge, weakModuleData, methodId, std::move(params), callId, isSyncModule ? Sync : Async);
+    }
   };
 
   if (isSyncModule) {

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

package/React/DevSupport/RCTPackagerConnection.mm

@@ -41,6 +41,7 @@ struct Registration {
   RCTReconnectingWebSocket *_socket;
   BOOL _socketConnected;
   NSString *_serverHostPortForSocket;
+  NSString *_serverSchemeForSocket;
   id _bundleURLChangeObserver;
   uint32_t _nextToken;
   std::vector<Registration<RCTNotificationHandler>> _notificationRegistrations;
@@ -63,7 +64,8 @@ struct Registration {
   if (self = [super init]) {
     _nextToken = 1; // Prevent randomly erasing a handler if you pass a bogus 0 token
     _serverHostPortForSocket = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-    _socket = socketForLocation(_serverHostPortForSocket);
+    _serverSchemeForSocket = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+    _socket = socketForLocation(_serverHostPortForSocket, _serverSchemeForSocket);
     _socket.delegate = self;
     [_socket start];
 
@@ -79,7 +81,7 @@ struct Registration {
   return self;
 }
 
-static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort)
+static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPort, NSString *scheme)
 {
   NSString *serverHost;
   NSString *serverPort;
@@ -90,9 +92,12 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
   if ([locationComponents count] > 1) {
     serverPort = locationComponents[1];
   }
+  if (![scheme length]) {
+    scheme = @"http";
+  }
   NSURLComponents *const components = [NSURLComponents new];
   components.host = serverHost ?: @"localhost";
-  components.scheme = @"http";
+  components.scheme = scheme;
   components.port = serverPort ? @(serverPort.integerValue) : @(kRCTBundleURLProviderDefaultPort);
   components.path = @"/message";
   components.queryItems = @[ [NSURLQueryItem queryItemWithName:@"role" value:@"ios"] ];
@@ -120,26 +125,32 @@ static RCTReconnectingWebSocket *socketForLocation(NSString *const serverHostPor
   _requestRegistrations.clear();
 }
 
-- (void)bundleURLSettingsChanged
+- (void)reconnect:(NSString *)packagerServerHostPort
 {
   std::lock_guard<std::mutex> l(_mutex);
   if (_socket == nil) {
     return; // already stopped
   }
 
-  NSString *const serverHostPort = [[RCTBundleURLProvider sharedSettings] packagerServerHostPort];
-  if ([serverHostPort isEqual:_serverHostPortForSocket]) {
+  NSString *const serverScheme = [[RCTBundleURLProvider sharedSettings] packagerScheme];
+  if ([packagerServerHostPort isEqual:_serverHostPortForSocket] && [serverScheme isEqual:_serverSchemeForSocket]) {
     return; // unchanged
   }
 
   _socket.delegate = nil;
   [_socket stop];
-  _serverHostPortForSocket = serverHostPort;
-  _socket = socketForLocation(serverHostPort);
+  _serverHostPortForSocket = packagerServerHostPort;
+  _serverSchemeForSocket = serverScheme;
+  _socket = socketForLocation(packagerServerHostPort, serverScheme);
   _socket.delegate = self;
   [_socket start];
 }
 
+- (void)bundleURLSettingsChanged
+{
+  [self reconnect:[[RCTBundleURLProvider sharedSettings] packagerServerHostPort]];
+}
+
 - (RCTHandlerToken)addNotificationHandler:(RCTNotificationHandler)handler
                                     queue:(dispatch_queue_t)queue
                                 forMethod:(NSString *)method

package/React/FBReactNativeSpec/FBReactNativeSpec.podspec

@@ -4,7 +4,9 @@
 # LICENSE file in the root directory of this source tree.
 
 require "json"
-require_relative "../../scripts/react_native_pods.rb"
+
+react_native_path = "../.."
+require_relative "#{react_native_path}/scripts/react_native_pods.rb"
 
 package = JSON.parse(File.read(File.join(__dir__, "..", "..", "package.json")))
 version = package['version']
@@ -18,7 +20,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                   = "FBReactNativeSpec"
@@ -30,7 +32,7 @@ Pod::Spec.new do |s|
   s.platforms              = { :ios => "11.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
-  s.source_files           = "**/*.{c,h,m,mm,cpp}"
+  s.source_files           = "**/FBReactNativeSpec*.{h,mm}"
   s.header_dir             = "FBReactNativeSpec"
 
   s.pod_target_xcconfig    = {
@@ -46,5 +48,11 @@ Pod::Spec.new do |s|
   s.dependency "React-jsi", version
   s.dependency "ReactCommon/turbomodule/core", version
 
-  use_react_native_codegen! (s)
+  use_react_native_codegen!(s, {
+    :react_native_path => react_native_path,
+    :js_srcs_dir => "#{react_native_path}/Libraries",
+    :library_name => "FBReactNativeSpec",
+    :library_type => "modules",
+    :output_dir => "#{react_native_path}/React/FBReactNativeSpec/FBReactNativeSpec"
+  })
 end

package/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm

@@ -7,6 +7,7 @@
 
 #import "RCTLegacyViewManagerInteropComponentView.h"
 
+#import <React/RCTAssert.h>
 #import <React/UIView+React.h>
 #import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropComponentDescriptor.h>
 #import <react/renderer/components/legacyviewmanagerinterop/LegacyViewManagerInteropViewProps.h>
@@ -28,6 +29,8 @@ static NSString *const kRCTLegacyInteropChildIndexKey = @"index";
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    RCTWarnNotAllowedForNewArchitecture(
+        self, @"ViewManager with interop layer is not allowed in the new architecture.");
     static const auto defaultProps = std::make_shared<const LegacyViewManagerInteropViewProps>();
     _props = defaultProps;
     _viewsToBeMounted = [NSMutableArray new];

package/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h

@@ -25,11 +25,8 @@
  * Subclasses may override this method.
  * Default implementation calls `[UIViewController dismissViewControllerAnimated:completion:]`.
  */
-- (void)dismissViewController:(UIViewController *)modalViewController animated:(BOOL)animated;
-
-/**
- * Should be called by subclasses when ViewController is dismissed.
- */
-- (void)didDismissViewController;
+- (void)dismissViewController:(UIViewController *)modalViewController
+                     animated:(BOOL)animated
+                   completion:(void (^)(void))completion;
 
 @end