expo-dev-launcher 6.1.0-canary-20251013-623c5a6 → 6.1.0-canary-20251023-4c86f95

package/CHANGELOG.md

@@ -7,6 +7,7 @@
 ### 🎉 New features
 
 - Remove `ExpoAppDelegate` inheritance requirement ([#39417](https://github.com/expo/expo/pull/39417) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- [iOS] Add brownfield support ([#40463](https://github.com/expo/expo/pull/40463) by [@gabrieldonadel](https://github.com/gabrieldonadel))
 
 ### 🐛 Bug fixes
 

package/android/build.gradle

@@ -20,21 +20,32 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "6.1.0-canary-20251013-623c5a6"
+version = "6.1.0-canary-20251023-4c86f95"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "6.1.0-canary-20251013-623c5a6"
+    versionName "6.1.0-canary-20251023-4c86f95"
   }
 
   buildTypes {
+    create("debugOptimized") {
+      initWith(buildTypes.debug)
+      matchingFallbacks += ["release"]
+    }
+
     buildTypes.each {
       it.buildConfigField 'String', 'VERSION', "\"${defaultConfig.versionName}\""
     }
   }
 
+  sourceSets {
+    debugOptimized {
+      setRoot 'src/debug'
+    }
+  }
+
   buildFeatures {
     buildConfig true
     viewBinding true

package/expo-dev-launcher-gradle-plugin/src/main/kotlin/expo/modules/devlauncher/DevLauncherPlugin.kt

@@ -51,7 +51,7 @@ abstract class DevLauncherPlugin : Plugin<Project> {
     return if (System.getenv("EX_UPDATES_NATIVE_DEBUG") != "1" && reactExtension != null) {
       reactExtension.debuggableVariants.get().any { it.equals(variant.name, ignoreCase = true) }
     } else {
-      variant.buildType == "debug"
+      variant.buildType == "debug" || variant.buildType == "debugOptimized"
     }
   }
 

package/ios/EXDevLauncherController.h

@@ -46,15 +46,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) EXDevLauncherPendingDeepLinkRegistry *pendingDeepLinkRegistry;
 @property (nonatomic, strong) EXDevLauncherRecentlyOpenedAppsRegistry *recentlyOpenedAppsRegistry;
 @property (nonatomic, strong) id<EXUpdatesExternalInterface> updatesInterface;
-@property (nonatomic, readonly, assign) BOOL isStarted;
 
 + (instancetype)sharedInstance;
 
-- (void)startWithWindow:(UIWindow *)window;
-
-- (void)autoSetupPrepare:(id<EXDevLauncherControllerDelegate>)delegate launchOptions:(NSDictionary * _Nullable)launchOptions;
-
-- (void)autoSetupStart:(UIWindow *)window;
+- (void)start:(id<EXDevLauncherControllerDelegate>)delegate launchOptions:(NSDictionary * _Nullable)launchOptions;
 
 - (nullable NSURL *)sourceUrl;
 
@@ -78,8 +73,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (BOOL)isAppRunning;
 
-- (BOOL)isStarted;
-
 - (UIWindow * _Nullable)currentWindow;
 
 - (EXDevLauncherErrorManager *)errorManager;

package/ios/EXDevLauncherController.m

@@ -40,9 +40,6 @@
 #define VERSION @ STRINGIZE2(EX_DEV_LAUNCHER_VERSION)
 #endif
 
-#define EX_DEV_LAUNCHER_PACKAGER_PATH @"packages/expo-dev-launcher/index.bundle?platform=ios&dev=true&minify=false"
-
-
 @interface EXDevLauncherController ()
 
 @property (nonatomic, weak) UIWindow *window;
@@ -56,8 +53,8 @@
 @property (nonatomic, strong) EXDevLauncherErrorManager *errorManager;
 @property (nonatomic, strong) EXDevLauncherInstallationIDHelper *installationIDHelper;
 @property (nonatomic, strong, nullable) EXDevLauncherNetworkInterceptor *networkInterceptor;
-@property (nonatomic, assign) BOOL isStarted;
 @property (nonatomic, strong) EXDevLauncherReactNativeFactory *reactNativeFactory;
+@property (nonatomic, strong) DevLauncherViewController *devLauncherViewController;
 @property (nonatomic, strong) NSURL *lastOpenedAppUrl;
 
 @end
@@ -91,19 +88,6 @@
   return self;
 }
 
-- (NSArray<id<RCTBridgeModule>> *)extraModulesForBridge:(RCTBridge *)bridge
-{
-  NSMutableArray<id<RCTBridgeModule>> *modules = [NSMutableArray new];
-
-  [modules addObject:[RCTDevMenu new]];
-#ifndef EX_DEV_LAUNCHER_URL
-  [modules addObject:[EXDevLauncherRCTDevSettings new]];
-#endif
-  [modules addObject:[DevClientNoOpLoadingView new]];
-
-  return modules;
-}
-
 + (NSString * _Nullable)version {
 #ifdef VERSION
   return VERSION;
@@ -111,88 +95,6 @@
   return nil;
 }
 
-// Expo developers: Enable the below code by running
-//     export EX_DEV_LAUNCHER_URL=http://localhost:8090
-// in your shell before doing pod install. This will cause the controller to see if
-// the expo-launcher packager is running, and if so, use that instead of
-// the prebuilt bundle.
-// See the pod_target_xcconfig definition in expo-dev-launcher.podspec
-
-- (nullable NSURL *)devLauncherBaseURL
-{
-#ifdef EX_DEV_LAUNCHER_URL
-  return [NSURL URLWithString:@EX_DEV_LAUNCHER_URL];
-#endif
-  return nil;
-}
-- (nullable NSURL *)devLauncherURL
-{
-#ifdef EX_DEV_LAUNCHER_URL
-  return [NSURL URLWithString:EX_DEV_LAUNCHER_PACKAGER_PATH
-                relativeToURL:[self devLauncherBaseURL]];
-#endif
-  return nil;
-}
-
-- (nullable NSURL *)devLauncherStatusURL
-{
-#ifdef EX_DEV_LAUNCHER_URL
-  return [NSURL URLWithString:@"status"
-                relativeToURL:[self devLauncherBaseURL]];
-#endif
-  return nil;
-}
-
-- (BOOL)isLauncherPackagerRunning
-{
-  // Shamelessly copied from RN core (RCTBundleURLProvider)
-
-  // If we are not running in the main thread, run away
-  if (![NSThread isMainThread]) {
-    return NO;
-  }
-
-  NSURL *url = [self devLauncherStatusURL];
-  NSURLSession *session = [NSURLSession sharedSession];
-  NSURLRequest *request = [NSURLRequest requestWithURL:url
-                                           cachePolicy:NSURLRequestUseProtocolCachePolicy
-                                       timeoutInterval:1];
-  __block NSURLResponse *response;
-  __block NSData *data;
-
-  dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
-  [[session dataTaskWithRequest:request
-              completionHandler:^(NSData *d, NSURLResponse *res, __unused NSError *err) {
-                data = d;
-                response = res;
-                dispatch_semaphore_signal(semaphore);
-              }] resume];
-  dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
-
-  NSString *status = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
-  return [status isEqualToString:@"packager-status:running"];
-}
-
-- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge
-{
-  return [self getSourceURL];
-}
-
-- (NSURL *)bundleURL
-{
-  return [self getSourceURL];
-}
-
-- (NSURL *)getSourceURL
-{
-  NSURL *launcherURL = [self devLauncherURL];
-  if (launcherURL != nil && [self isLauncherPackagerRunning]) {
-    return launcherURL;
-  }
-  NSURL *bundleURL = [[NSBundle mainBundle] URLForResource:@"EXDevLauncher" withExtension:@"bundle"];
-  return [[NSBundle bundleWithURL:bundleURL] URLForResource:@"main" withExtension:@"jsbundle"];
-}
-
 - (void)clearRecentlyOpenedApps
 {
   return [_recentlyOpenedAppsRegistry clearRegistry];
@@ -242,27 +144,22 @@
   return _possibleManifestURL;
 }
 
-- (UIWindow *)currentWindow
-{
-  return _window;
-}
 
 - (EXDevLauncherErrorManager *)errorManage
 {
   return _errorManager;
 }
 
-- (void)startWithWindow:(UIWindow *)window
+- (void)start:(id<EXDevLauncherControllerDelegate>)delegate launchOptions:(NSDictionary * _Nullable)launchOptions
 {
-  _isStarted = YES;
-  _window = window;
-  EXDevLauncherUncaughtExceptionHandler.isInstalled = true;
-
-  if (_launchOptions[UIApplicationLaunchOptionsURLKey]) {
-    // For deeplink launch, we need the keyWindow for expo-splash-screen to setup correctly.
-    [_window makeKeyWindow];
-    return;
+  _delegate = delegate;
+  _launchOptions = launchOptions;
+  NSDictionary *lastOpenedApp = [self.recentlyOpenedAppsRegistry mostRecentApp];
+  if (lastOpenedApp != nil) {
+    _lastOpenedAppUrl = [NSURL URLWithString:lastOpenedApp[@"url"]];
   }
+  EXDevLauncherBundleURLProviderInterceptor.isInstalled = true;
+  EXDevLauncherUncaughtExceptionHandler.isInstalled = true;
 
   void (^navigateToLauncher)(NSError *) = ^(NSError *error) {
     __weak typeof(self) weakSelf = self;
@@ -294,26 +191,6 @@
   [self navigateToLauncher];
 }
 
-- (void)autoSetupPrepare:(id<EXDevLauncherControllerDelegate>)delegate launchOptions:(NSDictionary * _Nullable)launchOptions
-{
-  _delegate = delegate;
-  _launchOptions = launchOptions;
-  NSDictionary *lastOpenedApp = [self.recentlyOpenedAppsRegistry mostRecentApp];
-  if (lastOpenedApp != nil) {
-    _lastOpenedAppUrl = [NSURL URLWithString:lastOpenedApp[@"url"]];
-  }
-  EXDevLauncherBundleURLProviderInterceptor.isInstalled = true;
-}
-
-- (void)autoSetupStart:(UIWindow *)window
-{
-  if (_delegate != nil) {
-    [self startWithWindow:window];
-  } else {
-    @throw [NSException exceptionWithName:NSInternalInconsistencyException reason:@"[EXDevLauncherController autoSetupStart:] was called before autoSetupPrepare:. Make sure you've set up expo-modules correctly in AppDelegate and are using ReactDelegate to create a bridge before calling [super application:didFinishLaunchingWithOptions:]." userInfo:nil];
-  }
-}
-
 - (void)navigateToLauncher
 {
   NSAssert([NSThread isMainThread], @"This function must be called on main thread");
@@ -330,23 +207,11 @@
   [self.delegate destroyReactInstance];
 
 #if RCT_DEV
-  NSURL *url = [self devLauncherURL];
-  if (url != nil) {
-    // Connect to the websocket
-    [[RCTPackagerConnection sharedPackagerConnection] setSocketConnectionURL:url];
-  }
-
   [self _addInitModuleObserver];
 #endif
-
-  DevLauncherViewController *swiftUIViewController = [[DevLauncherViewController alloc] init];
-
-  _window.rootViewController = swiftUIViewController;
-  [_window makeKeyAndVisible];
-
-  dispatch_async(dispatch_get_main_queue(), ^{
-    [self onAppContentDidAppear];
-  });
+  if (_devLauncherViewController != nil) {
+    [_devLauncherViewController resetHostingController];
+  }
 }
 
 - (BOOL)onDeepLink:(NSURL *)url options:(NSDictionary *)options
@@ -863,7 +728,10 @@
 
 - (UIViewController *)createRootViewController
 {
-  return [[DevLauncherViewController alloc] init];
+  if (_devLauncherViewController == nil){
+    _devLauncherViewController = [[DevLauncherViewController alloc] init];
+  }
+  return _devLauncherViewController;
 }
 
 - (void)setRootView:(UIView *)rootView toRootViewController:(UIViewController *)rootViewController

package/ios/ReactDelegateHandler/ExpoDevLauncherAppDelegateSubscriber.swift

@@ -3,14 +3,6 @@
 import ExpoModulesCore
 
 public class ExpoDevLauncherAppDelegateSubscriber: ExpoAppDelegateSubscriber {
-  public func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) -> Bool {
-    guard let window = UIApplication.shared.delegate?.window ?? UIApplication.shared.windows.filter { $0.isKeyWindow }.first else {
-      fatalError("Cannot find the keyWindow. Make sure to call `window.makeKeyAndVisible()`.")
-    }
-    EXDevLauncherController.sharedInstance().autoSetupStart(window)
-    return false
-  }
-
   public func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey: Any] = [:]) -> Bool {
     return EXDevLauncherController.sharedInstance().onDeepLink(url, options: options)
   }

package/ios/ReactDelegateHandler/ExpoDevLauncherReactDelegateHandler.swift

@@ -8,9 +8,9 @@ public class ExpoDevLauncherReactDelegateHandler: ExpoReactDelegateHandler, EXDe
   private weak var reactNativeFactory: RCTReactNativeFactory?
   private weak var reactDelegate: ExpoReactDelegate?
   private var launchOptions: [AnyHashable: Any]?
-  private var deferredRootView: EXDevLauncherDeferredRCTRootView?
   private var rootViewModuleName: String?
   private var rootViewInitialProperties: [AnyHashable: Any]?
+  private weak var rootViewController: UIViewController?
 
   public override func createReactRootView(
     reactDelegate: ExpoReactDelegate,
@@ -24,7 +24,7 @@ public class ExpoDevLauncherReactDelegateHandler: ExpoReactDelegateHandler, EXDe
 
     self.reactDelegate = reactDelegate
     self.launchOptions = launchOptions
-    EXDevLauncherController.sharedInstance().autoSetupPrepare(self, launchOptions: launchOptions)
+    EXDevLauncherController.sharedInstance().start(self, launchOptions: launchOptions)
     if let sharedController = UpdatesControllerRegistry.sharedInstance.controller {
       // for some reason the swift compiler and bridge are having issues here
       EXDevLauncherController.sharedInstance().updatesInterface = sharedController
@@ -33,8 +33,22 @@ public class ExpoDevLauncherReactDelegateHandler: ExpoReactDelegateHandler, EXDe
 
     self.rootViewModuleName = moduleName
     self.rootViewInitialProperties = initialProperties
-    self.deferredRootView = EXDevLauncherDeferredRCTRootView()
-    return self.deferredRootView
+
+    let viewController = EXDevLauncherController.sharedInstance().createRootViewController()
+    rootViewController = viewController
+
+    // We need to create a wrapper View because React Native Factory will reassign rootViewController later
+    let wrapperView = UIView()
+    wrapperView.addSubview(viewController.view)
+    viewController.view.translatesAutoresizingMaskIntoConstraints = false
+    NSLayoutConstraint.activate([
+      viewController.view.topAnchor.constraint(equalTo: wrapperView.topAnchor),
+      viewController.view.leadingAnchor.constraint(equalTo: wrapperView.leadingAnchor),
+      viewController.view.trailingAnchor.constraint(equalTo: wrapperView.trailingAnchor),
+      viewController.view.bottomAnchor.constraint(equalTo: wrapperView.bottomAnchor)
+    ])
+
+    return wrapperView
   }
 
   @objc
@@ -71,29 +85,13 @@ public class ExpoDevLauncherReactDelegateHandler: ExpoReactDelegateHandler, EXDe
       launchOptions: developmentClientController.getLaunchOptions()
     )
     developmentClientController.appBridge = RCTBridge.current()
-    rootView.backgroundColor = self.deferredRootView?.backgroundColor ?? UIColor.white
-    let window = getWindow()
 
-    // NOTE: this order of assignment seems to actually have an effect on behaviour
-    // direct assignment of window.rootViewController.view = rootView does not work
-    guard let rootViewController = self.reactDelegate?.createRootViewController() else {
+    guard let rootViewController = rootViewController ?? self.reactDelegate?.createRootViewController() else {
       fatalError("Invalid rootViewController returned from ExpoReactDelegate")
     }
     rootViewController.view = rootView
-    window.rootViewController = rootViewController
-    window.makeKeyAndVisible()
-
     // it is purposeful that we don't clean up saved properties here, because we may initialize
     // several React instances over a single app lifetime and we want them all to have the same
     // initial properties
   }
-
-  // MARK: Internals
-
-  private func getWindow() -> UIWindow {
-    guard let window = UIApplication.shared.windows.filter(\.isKeyWindow).first ?? UIApplication.shared.delegate?.window as? UIWindow else {
-      fatalError("Cannot find the current window.")
-    }
-    return window
-  }
 }

package/ios/SwiftUI/DevLauncherViewController.swift

@@ -7,7 +7,7 @@ import SwiftUI
 
   @objc public override init(nibName: String?, bundle: Bundle?) {
     super.init(nibName: nibName, bundle: bundle)
-    setupViewController()
+    addHostingController()
   }
 
   @objc public convenience init() {
@@ -16,7 +16,7 @@ import SwiftUI
 
   required init?(coder: NSCoder) {
     super.init(coder: coder)
-    setupViewController()
+    addHostingController()
   }
 
   private func setupViewController() {
@@ -27,9 +27,13 @@ import SwiftUI
     hostingController?.view.backgroundColor = UIColor.clear
   }
 
-  public override func viewDidLoad() {
-    super.viewDidLoad()
+  @objc public func resetHostingController() {
+    hostingController = nil
+    view = UIView()
+    addHostingController()
+  }
 
+  private func addHostingController() {
     if hostingController == nil {
       setupViewController()
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "6.1.0-canary-20251013-623c5a6",
+  "version": "6.1.0-canary-20251023-4c86f95",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "repository": {
     "type": "git",
@@ -15,10 +15,10 @@
   "license": "MIT",
   "homepage": "https://docs.expo.dev",
   "dependencies": {
-    "expo-dev-menu": "7.0.15-canary-20251013-623c5a6",
-    "expo-manifests": "1.0.9-canary-20251013-623c5a6"
+    "expo-dev-menu": "7.0.16-canary-20251023-4c86f95",
+    "expo-manifests": "1.0.9-canary-20251023-4c86f95"
   },
   "peerDependencies": {
-    "expo": "55.0.0-canary-20251013-623c5a6"
+    "expo": "55.0.0-canary-20251023-4c86f95"
   }
 }

package/ios/ReactDelegateHandler/EXDevLauncherDeferredRCTRootView.h

@@ -1,14 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <React/RCTRootView.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-/**
- EXDevLauncherDeferredRCTRootView is a special no-op class for expo-dev-launcher to defer react instance creation until `EXDevLauncherController` finishing setup.
- */
-@interface EXDevLauncherDeferredRCTRootView : UIView
-
-@end
-
-NS_ASSUME_NONNULL_END

package/ios/ReactDelegateHandler/EXDevLauncherDeferredRCTRootView.m

@@ -1,47 +0,0 @@
-// Copyright 2018-present 650 Industries. All rights reserved.
-
-#import <EXDevLauncher/EXDevLauncherDeferredRCTRootView.h>
-
-@interface EXDevLauncherNoopUIView : UIView
-
-@end
-
-@implementation EXDevLauncherNoopUIView
-
-- (NSMethodSignature *)methodSignatureForSelector:(SEL)aSelector
-{
-  NSMethodSignature *signature = [super methodSignatureForSelector:aSelector];
-  if (!signature) {
-    signature = [NSMethodSignature signatureWithObjCTypes:"@@:"];
-  }
-  return signature;
-}
-
-- (void)forwardInvocation:(NSInvocation *)anInvocation
-{
-  id nilPtr = nil;
-  [anInvocation setReturnValue:&nilPtr];
-}
-
-@end
-
-@implementation EXDevLauncherDeferredRCTRootView
-
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wobjc-designated-initializers"
-
-- (instancetype)initWithBridge:(RCTBridge *)bridge
-                    moduleName:(NSString *)moduleName
-             initialProperties:(NSDictionary *)initialProperties
-{
-  // RCTRootView throws an exception for default initializers
-  // and other designated initializers requires a real bridge.
-  // We use a trick here to initialize a NoopUIView and cast back to EXDevLauncherDeferredRCTRootView.
-  self = (EXDevLauncherDeferredRCTRootView *)[[EXDevLauncherNoopUIView alloc] initWithFrame:CGRectZero];
-  return self;
-}
-
-#pragma clang diagnostic pop
-
-@end
-