feat: pick up default config from RCT_NEW_ARCH_ENABLED

Author: okwasniewski

.circleci/config.yml

@@ -4,6 +4,8 @@ jobs:
   analyse:
     docker:
       - image: cimg/node:current
+    environment:
+      SKIP_YARN_COREPACK_CHECK: 0 
     steps:
       - checkout
       - restore_cache:

ReactNativeBrownfield.podspec

@@ -1,5 +1,9 @@
 require 'json'
 
+is_new_arch_enabled = ENV['RCT_NEW_ARCH_ENABLED'] == '1'
+new_arch_enabled_flag = (is_new_arch_enabled ? " -DRCT_NEW_ARCH_ENABLED" : "")
+other_cflags = "$(inherited)" + new_arch_enabled_flag
+
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |spec|
@@ -14,7 +18,9 @@ Pod::Spec.new do |spec|
 
   # s.source       = { :git => "[email protected]/michalchudziak/react-native-brownfield.git", :tag => "v#{s.version}" }
   spec.source       = { :path => "." }
-  spec.source_files  = "ios/**/*.{h,m}"
+  spec.source_files  = "ios/**/*.{h,m,mm}"
+  spec.compiler_flags = new_arch_enabled_flag
+  spec.pod_target_xcconfig = { 'OTHER_CPLUSPLUSFLAGS' => other_cflags }
 
   spec.dependency 'React'
-end
+end

ios/ReactNativeBrownfield.h

@@ -14,6 +14,15 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) NSString *bundlePath;
 @property (nonatomic) RCTRootViewFactory* rootViewFactory;
 
+/// This property controls whether the App will use the Fabric renderer of the New Architecture or not.
+@property (nonatomic, assign) BOOL fabricEnabled;
+
+/// This property controls whether React Native's new initialization layer is enabled.
+@property (nonatomic, assign) BOOL bridgelessEnabled;
+
+/// This method controls whether the `turboModules` feature of the New Architecture is turned on or off
+@property (nonatomic, assign) BOOL turboModuleEnabled;
+
 +(ReactNativeBrownfield*)shared;
 
 -(void)startReactNative;

ios/ReactNativeBrownfield.mm

@@ -9,7 +9,6 @@ @implementation ReactNativeBrownfield
 @synthesize entryFile = _entryFile;
 @synthesize fallbackResource = _fallbackResource;
 @synthesize bundlePath = _bundlePath;
-@synthesize bridge;
 
 + (ReactNativeBrownfield*)shared {
     static ReactNativeBrownfield *sharedBridgeManager = nil;
@@ -27,10 +26,27 @@ - (id)init {
         _entryFile = @"index";
         _fallbackResource = nil;
         _bundlePath = @"main.jsbundle";
+     
+        // Pick the default setting from RCT_NEW_ARCH_ENABLED flag.
+        BOOL newArchEnabled = [self newArchEnabled];
+        _fabricEnabled = newArchEnabled;
+        _bridgelessEnabled = newArchEnabled;
+        _turboModuleEnabled = newArchEnabled;
     }
     return self;
 }
 
+- (BOOL)newArchEnabled
+{
+#if RCT_NEW_ARCH_ENABLED
+  return YES;
+#else
+  return NO;
+#endif
+}
+
+
+
 - (void)startReactNative {
     [self startReactNative:nil];
 }
@@ -52,9 +68,9 @@ - (void)startReactNative:(void(^)(void))onBundleLoaded launchOptions:(NSDictiona
 
   RCTRootViewFactoryConfiguration *configuration =
       [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
-                                                       newArchEnabled:true
-                                                   turboModuleEnabled:true
-                                                    bridgelessEnabled:true];
+                                                       newArchEnabled:_fabricEnabled
+                                                   turboModuleEnabled:_turboModuleEnabled
+                                                    bridgelessEnabled:_bridgelessEnabled];
   _rootViewFactory = [[RCTRootViewFactory alloc] initWithConfiguration:configuration andTurboModuleManagerDelegate:nil];
 
     if (onBundleLoaded != nil) {