expo-modules-core 2.1.2 → 2.1.4

package/CHANGELOG.md

@@ -10,6 +10,20 @@
 
 ### 💡 Others
 
+## 2.1.4 — 2025-01-19
+
+### 🎉 New features
+
+- support RN 0.77 in SDK 52 ([#34088](https://github.com/expo/expo/pull/34088) by [@vonovak](https://github.com/vonovak))
+
+### 💡 Others
+
+- Allowed extending `process.env` types. ([#34112](https://github.com/expo/expo/pull/34112) by [@kudo](https://github.com/kudo))
+
+## 2.1.3 — 2025-01-10
+
+_This version does not introduce any user-facing changes._
+
 ## 2.1.2 — 2024-12-16
 
 ### 🐛 Bug fixes

package/ExpoModulesCore.podspec

@@ -92,6 +92,10 @@ Pod::Spec.new do |s|
   s.dependency 'React-NativeModulesApple'
   s.dependency 'React-RCTFabric'
 
+  if reactNativeTargetVersion >= 77
+    s.dependency 'ReactAppDependencyProvider'
+  end
+
   install_modules_dependencies(s)
 
   s.source_files = 'ios/**/*.{h,m,mm,swift,cpp}', 'common/cpp/**/*.{h,cpp}'

package/android/build.gradle

@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 apply plugin: 'com.android.library'
 
 group = 'host.exp.exponent'
-version = '2.1.2'
+version = '2.1.4'
 
 def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
 apply from: expoModulesCorePlugin
@@ -67,7 +67,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "2.1.2"
+    versionName "2.1.4"
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled.toString()
 
     testInstrumentationRunner "expo.modules.TestRunner"

package/build/ts-declarations/global.d.ts

@@ -47,29 +47,37 @@ type ViewConfig = {
         registrationName: string;
     }>;
 };
+export interface ExpoProcessEnv {
+    NODE_ENV: string;
+    /** Used in `@expo/metro-runtime`. */
+    EXPO_DEV_SERVER_ORIGIN?: string;
+    EXPO_ROUTER_IMPORT_MODE?: string;
+    EXPO_ROUTER_ABS_APP_ROOT?: string;
+    EXPO_ROUTER_APP_ROOT?: string;
+    /** Maps to the `experiments.baseUrl` property in the project Expo config. This is injected by `babel-preset-expo` and supports automatic cache invalidation. */
+    EXPO_BASE_URL?: string;
+    /** Build-time representation of the `Platform.OS` value that the current JavaScript was bundled for. Does not support platform shaking wrapped require statements. */
+    EXPO_OS?: string;
+    [key: string]: any;
+}
 export interface ExpoProcess {
-    env: {
-        NODE_ENV: string;
-        /** Used in `@expo/metro-runtime`. */
-        EXPO_DEV_SERVER_ORIGIN?: string;
-        EXPO_ROUTER_IMPORT_MODE?: string;
-        EXPO_ROUTER_ABS_APP_ROOT?: string;
-        EXPO_ROUTER_APP_ROOT?: string;
-        /** Maps to the `experiments.baseUrl` property in the project Expo config. This is injected by `babel-preset-expo` and supports automatic cache invalidation. */
-        EXPO_BASE_URL?: string;
-        /** Build-time representation of the `Platform.OS` value that the current JavaScript was bundled for. Does not support platform shaking wrapped require statements. */
-        EXPO_OS?: string;
-        [key: string]: any;
-    };
+    env: ExpoProcessEnv;
     [key: string]: any;
 }
 declare global {
+    namespace NodeJS {
+        interface ProcessEnv extends ExpoProcessEnv {
+        }
+        interface Process extends ExpoProcess {
+            env: ProcessEnv;
+        }
+    }
     /**
      * Global object containing all the native bindings installed by Expo.
      * This object is not available in projects without the `expo` package installed.
      */
     var expo: ExpoGlobal;
-    var process: ExpoProcess;
+    var process: NodeJS.Process;
     /**
      * ExpoDomWebView is defined in `@expo/dom-webview` runtime.
      */

package/build/ts-declarations/global.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/global.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAI7B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,SAAS,EAAE,OAAO,SAAS,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAIlC;;OAEG;IACH,MAAM,IAAI,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhD;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;IAEnD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,KAAK,UAAU,GAAG;IAChB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE;QACH,QAAQ,EAAE,MAAM,CAAC;QACjB,qCAAqC;QACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAEhC,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,wBAAwB,CAAC,EAAE,MAAM,CAAC;QAClC,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAE9B,gKAAgK;QAChK,aAAa,CAAC,EAAE,MAAM,CAAC;QAEvB,sKAAsK;QACtK,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAID,OAAO,CAAC,MAAM,CAAC;IACb;;;OAGG;IACH,IAAI,IAAI,EAAE,UAAU,CAAC;IAGrB,IAAI,OAAO,EAAE,WAAW,CAAC;IAEzB;;OAEG;IACH,IAAI,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;CACrD"}
+{"version":3,"file":"global.d.ts","sourceRoot":"","sources":["../../src/ts-declarations/global.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAI7B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAElC;;OAEG;IACH,SAAS,EAAE,OAAO,SAAS,CAAC;IAE5B;;OAEG;IACH,YAAY,EAAE,OAAO,YAAY,CAAC;IAIlC;;OAEG;IACH,MAAM,IAAI,MAAM,CAAC;IAEjB;;OAEG;IACH,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAAC;IAEhD;;;OAGG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,UAAU,GAAG,IAAI,CAAC;IAEnD;;OAEG;IACH,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,KAAK,UAAU,GAAG;IAChB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACrC,gBAAgB,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAChE,CAAC;AAEF,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC;IACjB,qCAAqC;IACrC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,uBAAuB,CAAC,EAAE,MAAM,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAE9B,gKAAgK;IAChK,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB,sKAAsK;IACtK,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,cAAc,CAAC;IACpB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAID,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,MAAM,CAAC;QACf,UAAiB,UAAW,SAAQ,cAAc;SAAG;QACrD,UAAiB,OAAQ,SAAQ,WAAW;YAC1C,GAAG,EAAE,UAAU,CAAC;SACjB;KACF;IAED;;;OAGG;IACH,IAAI,IAAI,EAAE,UAAU,CAAC;IAErB,IAAI,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC;IAE5B;;OAEG;IACH,IAAI,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;CACrD"}

package/ios/AppDelegates/EXAppDelegateWrapper.h

@@ -6,10 +6,23 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+@interface RCTAppDelegate ()
+
+- (RCTRootViewFactory *)createRCTRootViewFactory;
+
+@end
+
 @interface EXAppDelegateWrapper : RCTAppDelegate
 
 @property (nonatomic, strong, readonly) EXReactDelegateWrapper *reactDelegate;
 
+/**
+ Currently (RN 0.76) `customizeRootView` signature in `RCTAppDelegate` is broken as it uses `RCTRootView` type,
+ but this type is no longer used. It should rather be `RCTSurfaceHostingView`, but for simplicity it could be just `UIView`.
+ We need a helper function in Objective-C to actually make it to work, otherwise the types will conflict in Swift.
+ */
++ (void)customizeRootView:(nonnull UIView *)rootView byAppDelegate:(nonnull RCTAppDelegate *)appDelegate;
+
 @end
 
 NS_ASSUME_NONNULL_END

package/ios/AppDelegates/EXAppDelegateWrapper.mm

@@ -9,22 +9,14 @@
 #import <React/RCTComponentViewFactory.h> // Allows non-umbrella since it's coming from React-RCTFabric
 #import <ReactCommon/RCTHost.h> // Allows non-umbrella because the header is not inside a clang module
 
+// TODO remove the if when 76 is not supported, or rather remove the EXAppDelegateWrapper because it's deprecated
+#if __has_include(<ReactAppDependencyProvider/RCTAppDependencyProvider.h>)
+#import <ReactAppDependencyProvider/RCTAppDependencyProvider.h>
+#endif
 
 @interface RCTAppDelegate () <RCTComponentViewFactoryComponentProvider, RCTHostDelegate>
 @end
 
-@interface RCTRootViewFactoryConfiguration ()
-
-- (void)setCustomizeRootView:(void (^)(UIView *rootView))customizeRootView;
-
-@end
-
-@interface EXAppDelegateWrapper()
-
-@property (nonatomic, strong) EXReactDelegateWrapper *reactDelegate;
-
-@end
-
 @implementation EXAppDelegateWrapper {
   EXExpoAppDelegate *_expoAppDelegate;
 }
@@ -33,7 +25,7 @@
 {
   if (self = [super init]) {
     _expoAppDelegate = [[EXExpoAppDelegate alloc] init];
-    _reactDelegate = [[EXReactDelegateWrapper alloc] initWithExpoReactDelegate:_expoAppDelegate.reactDelegate];
+    _expoAppDelegate.shouldCallReactNativeSetup = NO;
   }
   return self;
 }
@@ -43,8 +35,7 @@
 // which `UIApplicationDelegate` selectors are implemented.
 - (BOOL)respondsToSelector:(SEL)selector
 {
-  return [super respondsToSelector:selector]
-    || [_expoAppDelegate respondsToSelector:selector];
+  return [super respondsToSelector:selector] || [_expoAppDelegate respondsToSelector:selector];
 }
 
 // Forwards all invocations to `ExpoAppDelegate` object.
@@ -53,89 +44,48 @@
   return _expoAppDelegate;
 }
 
-#if !TARGET_OS_OSX
+#pragma mark - RCTAppDelegate
+
+// Make sure to override all necessary methods from `RCTAppDelegate` here, explicitly forwarding everything to `_expoAppDelegate`.
+// `forwardingTargetForSelector` works only for methods that are not specified in this and `RCTAppDelegate` classes.
+
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+#if __has_include(<ReactAppDependencyProvider/RCTAppDependencyProvider.h>)
+	self.dependencyProvider = [RCTAppDependencyProvider new];
+#endif
   [super application:application didFinishLaunchingWithOptions:launchOptions];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wunused-result"
-  [_expoAppDelegate application:application didFinishLaunchingWithOptions:launchOptions];
-#pragma clang diagnostic pop
-  return YES;
+  return [_expoAppDelegate application:application didFinishLaunchingWithOptions:launchOptions];
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+  return [_expoAppDelegate applicationDidBecomeActive:application];
 }
-#endif // !TARGET_OS_OSX
 
 - (UIViewController *)createRootViewController
 {
-  return [self.reactDelegate createRootViewController];
+  return [_expoAppDelegate createRootViewController];
 }
 
 - (RCTRootViewFactory *)createRCTRootViewFactory
 {
-  __weak __typeof(self) weakSelf = self;
-  RCTBundleURLBlock bundleUrlBlock = ^{
-    RCTAppDelegate *strongSelf = weakSelf;
-    return strongSelf.bundleURL;
-  };
-
-  RCTRootViewFactoryConfiguration *configuration =
-      [[RCTRootViewFactoryConfiguration alloc] initWithBundleURLBlock:bundleUrlBlock
-                                                       newArchEnabled:self.newArchEnabled
-                                                   turboModuleEnabled:self.newArchEnabled
-                                                    bridgelessEnabled:self.newArchEnabled];
-
-  configuration.createRootViewWithBridge = ^UIView *(RCTBridge *bridge, NSString *moduleName, NSDictionary *initProps)
-  {
-    return [weakSelf createRootViewWithBridge:bridge moduleName:moduleName initProps:initProps];
-  };
-
-  configuration.createBridgeWithDelegate = ^RCTBridge *(id<RCTBridgeDelegate> delegate, NSDictionary *launchOptions)
-  {
-    return [weakSelf createBridgeWithDelegate:delegate launchOptions:launchOptions];
-  };
-
-  configuration.customizeRootView = ^(UIView *_Nonnull rootView) {
-    [weakSelf customizeRootView:(RCTRootView *)rootView];
-  };
-
-  // NOTE(kudo): `sourceURLForBridge` is not referenced intentionally because it does not support New Architecture.
-  configuration.sourceURLForBridge = nil;
-
-  if ([self respondsToSelector:@selector(extraModulesForBridge:)]) {
-    configuration.extraModulesForBridge = ^NSArray<id<RCTBridgeModule>> *_Nonnull(RCTBridge *_Nonnull bridge)
-    {
-      return [weakSelf extraModulesForBridge:bridge];
-    };
-  }
-
-  if ([self respondsToSelector:@selector(extraLazyModuleClassesForBridge:)]) {
-    configuration.extraLazyModuleClassesForBridge =
-        ^NSDictionary<NSString *, Class> *_Nonnull(RCTBridge *_Nonnull bridge)
-    {
-      return [weakSelf extraLazyModuleClassesForBridge:bridge];
-    };
-  }
-
-  if ([self respondsToSelector:@selector(bridge:didNotFindModule:)]) {
-    configuration.bridgeDidNotFindModule = ^BOOL(RCTBridge *_Nonnull bridge, NSString *_Nonnull moduleName) {
-      return [weakSelf bridge:bridge didNotFindModule:moduleName];
-    };
-  }
-
-  return [[EXReactRootViewFactory alloc] initWithReactDelegate:self.reactDelegate configuration:configuration turboModuleManagerDelegate:self];
+  return [_expoAppDelegate createRCTRootViewFactory];
 }
 
-#if !TARGET_OS_OSX
-- (void)customizeRootView:(UIView *)rootView {
+- (void)customizeRootView:(UIView *)rootView
+{
   [_expoAppDelegate customizeRootView:rootView];
 }
-#endif // !TARGET_OS_OSX
 
 #pragma mark - RCTComponentViewFactoryComponentProvider
 
 - (NSDictionary<NSString *, Class<RCTComponentViewProtocol>> *)thirdPartyFabricComponents
 {
-  return @{};
+#if __has_include(<ReactAppDependencyProvider/RCTAppDependencyProvider.h>)
+	return self.dependencyProvider.thirdPartyFabricComponents;
+#endif
+	return @{};
 }
 
 #pragma mark - RCTHostDelegate
@@ -152,4 +102,11 @@
 {
 }
 
+#pragma mark - Helpers
+
++ (void)customizeRootView:(nonnull UIView *)rootView byAppDelegate:(nonnull RCTAppDelegate *)appDelegate
+{
+  [appDelegate customizeRootView:(RCTRootView *)rootView];
+}
+
 @end

package/ios/AppDelegates/ExpoAppDelegate.swift

@@ -1,8 +1,13 @@
 import Dispatch
 import Foundation
+import React_RCTAppDelegate
+
+// TODO(vonovak,20250107) - Remove the if expression when we drop SDK 52 / RN 76 support
+#if canImport(ReactAppDependencyProvider)
+import ReactAppDependencyProvider
+#endif
 
 var subscribers = [ExpoAppDelegateSubscriberProtocol]()
-var reactDelegateHandlers = [ExpoReactDelegateHandler]()
 
 /**
  Allows classes extending `ExpoAppDelegateSubscriber` to hook into project's app delegate
@@ -11,16 +16,22 @@ var reactDelegateHandlers = [ExpoReactDelegateHandler]()
  Keep functions and markers in sync with https://developer.apple.com/documentation/uikit/uiapplicationdelegate
  */
 @objc(EXExpoAppDelegate)
-open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
-  open var window: UIWindow?
-
+open class ExpoAppDelegate: ExpoAppInstance {
+  /**
+   Whether to skip calling the React Native instance setup from `RCTAppDelegate`.
+   Set this property to `false` if your app delegate is not supposed to initialize a React Native app,
+   but only to handle the app delegate subscribers.
+   */
   @objc
-  public let reactDelegate = ExpoReactDelegate(handlers: reactDelegateHandlers)
+  public var shouldCallReactNativeSetup: Bool = true
 
   #if os(iOS) || os(tvOS)
   // MARK: - Initializing the App
 
-  open func application(_ application: UIApplication, willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
+  open override func application(
+    _ application: UIApplication,
+    willFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
     let parsedSubscribers = subscribers.filter {
       $0.responds(to: #selector(application(_:willFinishLaunchingWithOptions:)))
     }
@@ -37,10 +48,22 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
     }
   }
 
-  open func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
-    return subscribers.reduce(false) { result, subscriber in
-      return subscriber.application?(application, didFinishLaunchingWithOptions: launchOptions) ?? false || result
+  open override func application(
+    _ application: UIApplication,
+    didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil
+  ) -> Bool {
+#if canImport(ReactAppDependencyProvider)
+    self.dependencyProvider = RCTAppDependencyProvider()
+#endif
+    if shouldCallReactNativeSetup {
+      super.application(application, didFinishLaunchingWithOptions: launchOptions)
+    }
+
+    subscribers.forEach { subscriber in
+      // Subscriber result is ignored as it doesn't matter if any subscriber handled the incoming URL – we always return `true` anyway.
+      _ = subscriber.application?(application, didFinishLaunchingWithOptions: launchOptions)
     }
+    return true
   }
 
   // TODO: - Configuring and Discarding Scenes
@@ -48,39 +71,39 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
   // MARK: - Responding to App Life-Cycle Events
 
   @objc
-  open func applicationDidBecomeActive(_ application: UIApplication) {
+  open override func applicationDidBecomeActive(_ application: UIApplication) {
     subscribers.forEach { $0.applicationDidBecomeActive?(application) }
   }
 
   @objc
-  open func applicationWillResignActive(_ application: UIApplication) {
+  open override func applicationWillResignActive(_ application: UIApplication) {
     subscribers.forEach { $0.applicationWillResignActive?(application) }
   }
 
   @objc
-  open func applicationDidEnterBackground(_ application: UIApplication) {
+  open override func applicationDidEnterBackground(_ application: UIApplication) {
     subscribers.forEach { $0.applicationDidEnterBackground?(application) }
   }
 
-  open func applicationWillEnterForeground(_ application: UIApplication) {
+  open override func applicationWillEnterForeground(_ application: UIApplication) {
     subscribers.forEach { $0.applicationWillEnterForeground?(application) }
   }
 
-  open func applicationWillTerminate(_ application: UIApplication) {
+  open override func applicationWillTerminate(_ application: UIApplication) {
     subscribers.forEach { $0.applicationWillTerminate?(application) }
   }
 
-  @objc public func customizeRootView(_ rootView: UIView) {
-    subscribers.forEach { $0.customizeRootView?(rootView) }
-  }
-
   // TODO: - Responding to Environment Changes
 
   // TODO: - Managing App State Restoration
 
   // MARK: - Downloading Data in the Background
 
-  open func application(_ application: UIApplication, handleEventsForBackgroundURLSession identifier: String, completionHandler: @escaping () -> Void) {
+  open override func application(
+    _ application: UIApplication,
+    handleEventsForBackgroundURLSession identifier: String,
+    completionHandler: @escaping () -> Void
+  ) {
     let selector = #selector(application(_:handleEventsForBackgroundURLSession:completionHandler:))
     let subs = subscribers.filter { $0.responds(to: selector) }
     var subscribersLeft = subs.count
@@ -107,15 +130,15 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
 
   // MARK: - Handling Remote Notification Registration
 
-  open func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
+  open override func application(_ application: UIApplication, didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data) {
     subscribers.forEach { $0.application?(application, didRegisterForRemoteNotificationsWithDeviceToken: deviceToken) }
   }
 
-  open func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
+  open override func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
     subscribers.forEach { $0.application?(application, didFailToRegisterForRemoteNotificationsWithError: error) }
   }
 
-  open func application(
+  open override func application(
     _ application: UIApplication,
     didReceiveRemoteNotification userInfo: [AnyHashable: Any],
     fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void
@@ -160,13 +183,13 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
 
   // MARK: - Continuing User Activity and Handling Quick Actions
 
-  open func application(_ application: UIApplication, willContinueUserActivityWithType userActivityType: String) -> Bool {
+  open override func application(_ application: UIApplication, willContinueUserActivityWithType userActivityType: String) -> Bool {
     return subscribers.reduce(false) { result, subscriber in
       return subscriber.application?(application, willContinueUserActivityWithType: userActivityType) ?? false || result
     }
   }
 
-  open func application(
+  open override func application(
     _ application: UIApplication,
     continue userActivity: NSUserActivity,
     restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void
@@ -196,18 +219,22 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
     }
   }
 
-  open func application(_ application: UIApplication, didUpdate userActivity: NSUserActivity) {
+  open override func application(_ application: UIApplication, didUpdate userActivity: NSUserActivity) {
     return subscribers.forEach { $0.application?(application, didUpdate: userActivity) }
   }
 
-  open func application(_ application: UIApplication, didFailToContinueUserActivityWithType userActivityType: String, error: Error) {
+  open override func application(_ application: UIApplication, didFailToContinueUserActivityWithType userActivityType: String, error: Error) {
     return subscribers.forEach {
       $0.application?(application, didFailToContinueUserActivityWithType: userActivityType, error: error)
     }
   }
 
 #if !os(tvOS)
-  open func application(_ application: UIApplication, performActionFor shortcutItem: UIApplicationShortcutItem, completionHandler: @escaping (Bool) -> Void) {
+  open override func application(
+    _ application: UIApplication,
+    performActionFor shortcutItem: UIApplicationShortcutItem,
+    completionHandler: @escaping (Bool) -> Void
+  ) {
     let selector = #selector(application(_:performActionFor:completionHandler:))
     let subs = subscribers.filter { $0.responds(to: selector) }
     var subscribersLeft = subs.count
@@ -237,7 +264,10 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
 
   // MARK: - Background Fetch
 
-  open func application(_ application: UIApplication, performFetchWithCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
+  open override func application(
+    _ application: UIApplication,
+    performFetchWithCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void
+  ) {
     let selector = #selector(application(_:performFetchWithCompletionHandler:))
     let subs = subscribers.filter { $0.responds(to: selector) }
     var subscribersLeft = subs.count
@@ -282,7 +312,7 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
 
   // MARK: - Opening a URL-Specified Resource
 
-  open func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
+  open override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
     return subscribers.reduce(false) { result, subscriber in
       return subscriber.application?(app, open: url, options: options) ?? false || result
     }
@@ -301,7 +331,7 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
    * a different orientation.
    */
 #if !os(tvOS)
-  open func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
+  open override func application(_ application: UIApplication, supportedInterfaceOrientationsFor window: UIWindow?) -> UIInterfaceOrientationMask {
     let deviceOrientationMask = allowedOrientations(for: UIDevice.current.userInterfaceIdiom)
     let universalOrientationMask = allowedOrientations(for: .unspecified)
     let infoPlistOrientations = deviceOrientationMask.isEmpty ? universalOrientationMask : deviceOrientationMask
@@ -323,6 +353,13 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
 
   #endif // os(iOS)
 
+  // MARK: - ExpoAppDelegateSubscriberProtocol
+
+  @objc
+  open override func customize(_ rootView: RCTRootView) {
+    subscribers.forEach { $0.customizeRootView?(rootView) }
+  }
+
   // MARK: - Statics
 
   @objc
@@ -348,17 +385,6 @@ open class ExpoAppDelegate: UIResponder, UIApplicationDelegate {
   public static func getSubscriberOfType<Subscriber>(_ type: Subscriber.Type) -> Subscriber? {
     return subscribers.first { $0 is Subscriber } as? Subscriber
   }
-
-  @objc
-  public static func registerReactDelegateHandlersFrom(modulesProvider: ModulesProvider) {
-    modulesProvider.getReactDelegateHandlers()
-      .sorted { tuple1, tuple2 -> Bool in
-        return ModulePriorities.get(tuple1.packageName) > ModulePriorities.get(tuple2.packageName)
-      }
-      .forEach { handlerTuple in
-        reactDelegateHandlers.append(handlerTuple.handler.init())
-      }
-  }
 }
 
 #if os(iOS)

package/ios/AppDelegates/ExpoAppInstance.swift

@@ -0,0 +1,94 @@
+import React_RCTAppDelegate
+
+private var reactDelegateHandlers = [ExpoReactDelegateHandler]()
+
+@objc(EXAppInstance)
+open class ExpoAppInstance: RCTAppDelegate {
+  @objc
+  public let reactDelegate = ExpoReactDelegate(handlers: reactDelegateHandlers)
+
+  @objc
+  open override func createRootViewController() -> UIViewController {
+    return reactDelegate.createRootViewController()
+  }
+
+  open override func bundleURL() -> URL? {
+#if DEBUG
+    return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: ".expo/.virtual-metro-entry")
+#else
+    return Bundle.main.url(forResource: "main", withExtension: "jsbundle")
+#endif
+  }
+
+  @objc
+  open override func createRCTRootViewFactory() -> RCTRootViewFactory {
+    let bundleUrlBlock: RCTBundleURLBlock = { [weak self] in
+      return self?.bundleURL()
+    }
+
+    let configuration = RCTRootViewFactoryConfiguration(
+      bundleURLBlock: bundleUrlBlock,
+      newArchEnabled: newArchEnabled(),
+      turboModuleEnabled: turboModuleEnabled(),
+      bridgelessEnabled: bridgelessEnabled()
+    )
+
+    configuration.createRootViewWithBridge = { bridge, moduleName, initProps in
+      return self.createRootView(with: bridge, moduleName: moduleName, initProps: initProps)
+    }
+
+    configuration.createBridgeWithDelegate = { delegate, launchOptions in
+      return self.createBridge(with: delegate, launchOptions: launchOptions)
+    }
+
+    configuration.customizeRootView = { rootView in
+      // @tsapeta: We cannot just call `self.customize(rootView)` – see the comment of the `customizeRootView:byAppDelegate:` function in EXAppDelegateWrapper.h
+      return EXAppDelegateWrapper.customizeRootView(rootView, by: self)
+    }
+
+    // NOTE(kudo): `sourceURLForBridge` is not referenced intentionally because it does not support New Architecture.
+    configuration.sourceURLForBridge = nil
+
+    if responds(to: #selector(extraModules(for:))) {
+      configuration.extraModulesForBridge = { bridge in
+        return self.extraModules(for: bridge)
+      }
+    }
+
+    if responds(to: #selector(extraLazyModuleClasses(for:))) {
+      configuration.extraLazyModuleClassesForBridge = { bridge in
+        return self.extraLazyModuleClasses(for: bridge)
+      }
+    }
+
+    if responds(to: #selector(bridge(_:didNotFindModule:))) {
+      configuration.bridgeDidNotFindModule = { bridge, moduleName in
+        return self.bridge(bridge, didNotFindModule: moduleName)
+      }
+    }
+
+    return ExpoReactRootViewFactory(
+      reactDelegate: reactDelegate,
+      configuration: configuration,
+      turboModuleManagerDelegate: self
+    )
+  }
+
+  open override func sourceURL(for bridge: RCTBridge) -> URL? {
+    // This method is called only in the old architecture. For compatibility just use the result of a new `bundleURL` method.
+    return bundleURL()
+  }
+
+  // MARK: - Statics
+
+  @objc
+  public static func registerReactDelegateHandlersFrom(modulesProvider: ModulesProvider) {
+    modulesProvider.getReactDelegateHandlers()
+      .sorted { tuple1, tuple2 -> Bool in
+        return ModulePriorities.get(tuple1.packageName) > ModulePriorities.get(tuple2.packageName)
+      }
+      .forEach { handlerTuple in
+        reactDelegateHandlers.append(handlerTuple.handler.init())
+      }
+  }
+}

package/ios/ReactDelegates/EXReactRootViewFactory.h

@@ -3,22 +3,23 @@
 #pragma once
 
 #import <ExpoModulesCore/Platform.h>
-#import <ExpoModulesCore/EXReactDelegateWrapper.h>
 #import <ExpoModulesCore/RCTAppDelegateUmbrella.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
+@class EXReactDelegate;
+
 NS_SWIFT_NAME(ExpoReactRootViewFactory)
 @interface EXReactRootViewFactory : RCTRootViewFactory
 
-@property (nonatomic, weak, nullable) EXReactDelegateWrapper *reactDelegate;
+@property (nonatomic, weak, nullable) EXReactDelegate *reactDelegate;
 
 /**
  Initializer for EXAppDelegateWrapper integration
  */
-- (instancetype)initWithReactDelegate:(nullable EXReactDelegateWrapper *)reactDelegate
+- (instancetype)initWithReactDelegate:(nullable EXReactDelegate *)reactDelegate
                         configuration:(RCTRootViewFactoryConfiguration *)configuration
-           turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate;
+           turboModuleManagerDelegate:(nullable id)turboModuleManagerDelegate;
 
 /**
  Calls super `viewWithModuleName:initialProperties:launchOptions:` from `RCTRootViewFactory`.

package/ios/ReactDelegates/EXReactRootViewFactory.mm

@@ -1,9 +1,9 @@
 // Copyright 2018-present 650 Industries. All rights reserved.
 
 #import <ExpoModulesCore/EXReactRootViewFactory.h>
-
 #import <ExpoModulesCore/EXReactDelegateWrapper+Private.h>
 #import <ExpoModulesCore/RCTAppDelegateUmbrella.h>
+#import <ExpoModulesCore/Swift.h>
 
 @interface RCTRootViewFactory ()
 
@@ -13,9 +13,9 @@
 
 @implementation EXReactRootViewFactory
 
-- (instancetype)initWithReactDelegate:(nullable EXReactDelegateWrapper *)reactDelegate
+- (instancetype)initWithReactDelegate:(nullable EXReactDelegate *)reactDelegate
                         configuration:(RCTRootViewFactoryConfiguration *)configuration
-           turboModuleManagerDelegate:(id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
+           turboModuleManagerDelegate:(nullable id<RCTTurboModuleManagerDelegate>)turboModuleManagerDelegate
 {
   if (self = [super initWithConfiguration:configuration andTurboModuleManagerDelegate:turboModuleManagerDelegate]) {
     self.reactDelegate = reactDelegate;
@@ -28,7 +28,7 @@
                  launchOptions:(nullable NSDictionary *)launchOptions
 {
   if (self.reactDelegate != nil) {
-    return [self.reactDelegate createReactRootView:moduleName initialProperties:initialProperties launchOptions:launchOptions];
+    return [self.reactDelegate createReactRootViewWithModuleName:moduleName initialProperties:initialProperties launchOptions:launchOptions];
   }
   return [super viewWithModuleName:moduleName initialProperties:initialProperties launchOptions:launchOptions];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "description": "The core of Expo Modules architecture",
   "main": "src/index.ts",
   "types": "build/index.d.ts",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@testing-library/react-native": "^12.5.2",
-    "expo-module-scripts": "^4.0.0"
+    "expo-module-scripts": "^4.0.3"
   },
-  "gitHead": "637acf537a92ac6209bfced71e097ba736b43fef"
+  "gitHead": "0a0c6d35a691fc59c0d94675d159ac9e3dfd6f26"
 }

package/src/ts-declarations/global.ts

@@ -60,38 +60,46 @@ type ViewConfig = {
   directEventTypes: Record<string, { registrationName: string }>;
 };
 
-export interface ExpoProcess {
-  env: {
-    NODE_ENV: string;
-    /** Used in `@expo/metro-runtime`. */
-    EXPO_DEV_SERVER_ORIGIN?: string;
+export interface ExpoProcessEnv {
+  NODE_ENV: string;
+  /** Used in `@expo/metro-runtime`. */
+  EXPO_DEV_SERVER_ORIGIN?: string;
+
+  EXPO_ROUTER_IMPORT_MODE?: string;
+  EXPO_ROUTER_ABS_APP_ROOT?: string;
+  EXPO_ROUTER_APP_ROOT?: string;
 
-    EXPO_ROUTER_IMPORT_MODE?: string;
-    EXPO_ROUTER_ABS_APP_ROOT?: string;
-    EXPO_ROUTER_APP_ROOT?: string;
+  /** Maps to the `experiments.baseUrl` property in the project Expo config. This is injected by `babel-preset-expo` and supports automatic cache invalidation. */
+  EXPO_BASE_URL?: string;
 
-    /** Maps to the `experiments.baseUrl` property in the project Expo config. This is injected by `babel-preset-expo` and supports automatic cache invalidation. */
-    EXPO_BASE_URL?: string;
+  /** Build-time representation of the `Platform.OS` value that the current JavaScript was bundled for. Does not support platform shaking wrapped require statements. */
+  EXPO_OS?: string;
 
-    /** Build-time representation of the `Platform.OS` value that the current JavaScript was bundled for. Does not support platform shaking wrapped require statements. */
-    EXPO_OS?: string;
+  [key: string]: any;
+}
 
-    [key: string]: any;
-  };
+export interface ExpoProcess {
+  env: ExpoProcessEnv;
   [key: string]: any;
 }
 
 /* eslint-disable no-var */
 
 declare global {
+  namespace NodeJS {
+    export interface ProcessEnv extends ExpoProcessEnv {}
+    export interface Process extends ExpoProcess {
+      env: ProcessEnv;
+    }
+  }
+
   /**
    * Global object containing all the native bindings installed by Expo.
    * This object is not available in projects without the `expo` package installed.
    */
   var expo: ExpoGlobal;
 
-  // @ts-ignore - Suppress incompatible `NodeJS.Process` type if people include process type from `@types/node`
-  var process: ExpoProcess;
+  var process: NodeJS.Process;
 
   /**
    * ExpoDomWebView is defined in `@expo/dom-webview` runtime.