expo-dev-launcher 1.1.0 → 1.2.1

package/ios/EXDevLauncherAuth.m

@@ -100,7 +100,7 @@ RCT_EXPORT_METHOD(getAuthSchemeAsync:(RCTPromiseResolveBlock)resolve
   NSArray<NSDictionary*> *urlTypes = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleURLTypes"];
   
   if (urlTypes != nil) {
-    for (int i = 1; i <= urlTypes.count; i++) {
+    for (int i = 0; i < urlTypes.count; i++) {
       NSDictionary *urlType = urlTypes[i];
       NSArray<NSString*> *schemes = urlType[@"CFBundleURLSchemes"];
       
@@ -116,24 +116,18 @@ RCT_EXPORT_METHOD(getAuthSchemeAsync:(RCTPromiseResolveBlock)resolve
 }
 
 RCT_EXPORT_METHOD(setSessionAsync:(NSString *)session
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-  [[NSUserDefaults standardUserDefaults] setObject:session forKey:@"expo-session-secret"];
-  [DevMenuManager.shared setSession:session];
-  resolve(nil);
-}
-
-RCT_EXPORT_METHOD(restoreSessionAsync:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-  NSString *session = [[NSUserDefaults standardUserDefaults] objectForKey:@"expo-session-secret"];
-  
-  if (session != nil) {
-    [DevMenuManager.shared setSession:session];
-  }
-  
-  resolve(session);
-}
+                   resolver:(RCTPromiseResolveBlock)resolve
+                   rejecter:(RCTPromiseRejectBlock)reject)
+ {
+   [[NSUserDefaults standardUserDefaults] setObject:session forKey:@"expo-session-secret"];
+   resolve(nil);
+ }
+
+ RCT_EXPORT_METHOD(restoreSessionAsync:(RCTPromiseResolveBlock)resolve
+                   rejecter:(RCTPromiseRejectBlock)reject)
+ {
+   NSString *session = [[NSUserDefaults standardUserDefaults] objectForKey:@"expo-session-secret"];
+   resolve(session);
+ }
 
 @end

package/ios/EXDevLauncherController.m

@@ -263,6 +263,8 @@
 
 - (void)navigateToLauncher
 {
+  NSAssert([NSThread isMainThread], @"This function must be called on main thread");
+
   [_appBridge invalidate];
   [self invalidateDevMenuApp];
   
@@ -276,36 +278,10 @@
   [self _removeInitModuleObserver];
 
   _launcherBridge = [[EXDevLauncherRCTBridge alloc] initWithDelegate:self launchOptions:_launchOptions];
-  
-  NSMutableDictionary *insets = [NSMutableDictionary new];
-  [insets setObject:@(0) forKey:@"top"];
-  [insets setObject:@(0) forKey:@"right"];
-  [insets setObject:@(0) forKey:@"bottom"];
-  [insets setObject:@(0) forKey:@"left"];
-  
-  if (@available(iOS 11.0, *)) {
-    UIWindow* window = [[UIApplication sharedApplication] keyWindow];
-    UIEdgeInsets safeAreaInsets = window.safeAreaInsets;
-    
-    [insets setObject:@(safeAreaInsets.top) forKey:@"top"];
-    [insets setObject:@(safeAreaInsets.right) forKey:@"right"];
-    [insets setObject:@(safeAreaInsets.bottom) forKey:@"bottom"];
-    [insets setObject:@(safeAreaInsets.left) forKey:@"left"];
-  }
-  
 
   RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:_launcherBridge
                                                    moduleName:@"main"
-                                            initialProperties:@{
-                                              @"insets": insets,
-                                              @"isSimulator":
-                                                              #if TARGET_IPHONE_SIMULATOR
-                                                              @YES
-                                                              #else
-                                                              @NO
-                                                              #endif
-                                              
-                                            }];
+                                            initialProperties:@{}];
 
   [self _ensureUserInterfaceStyleIsInSyncWithTraitEnv:rootView];
   
@@ -351,8 +327,11 @@
       if (!self) {
         return;
       }
-      
-      EXDevLauncherAppError *appError = [[EXDevLauncherAppError alloc] initWithMessage:error.description stack:nil];
+
+      EXDevLauncherUrl *devLauncherUrl = [[EXDevLauncherUrl alloc] init:url];
+      NSURL *appUrl = devLauncherUrl.url;
+      NSString *errorMessage = [NSString stringWithFormat:@"Failed to load app from %@ with error: %@", appUrl.absoluteString, error.localizedDescription];
+      EXDevLauncherAppError *appError = [[EXDevLauncherAppError alloc] initWithMessage:errorMessage stack:nil];
       [self.errorManager showError:appError];
     });
   }];
@@ -565,9 +544,6 @@
     
     [self _ensureUserInterfaceStyleIsInSyncWithTraitEnv:self.window.rootViewController];
 
-    [[UIDevice currentDevice] setValue:@(orientation) forKey:@"orientation"];
-    [UIViewController attemptRotationToDeviceOrientation];
-    
     if (backgroundColor) {
       self.window.rootViewController.view.backgroundColor = backgroundColor;
       self.window.backgroundColor = backgroundColor;

package/ios/Errors/EXDevLauncherErrorViewController.swift

@@ -60,6 +60,8 @@ public class EXDevLauncherErrorViewController: UIViewController, UITableViewData
   }
 
   private func navigateToLauncher() {
-    manager?.controller?.navigateToLauncher()
+    RCTExecuteOnMainQueue { [self]
+      self.manager?.controller?.navigateToLauncher()
+    }
   }
 }

package/ios/Manifest/EXDevLauncherManifestHelper.swift

@@ -5,7 +5,9 @@ import UIKit
 @objc
 public class EXDevLauncherManifestHelper: NSObject {
   private static func defaultOrientationForOrientationMask(_ orientationMask: UIInterfaceOrientationMask) -> UIInterfaceOrientation {
-    if orientationMask.contains(.portrait) {
+    if orientationMask.contains(.all) {
+      return UIInterfaceOrientation.unknown
+    } else  if orientationMask.contains(.portrait) {
       return UIInterfaceOrientation.portrait
     } else if orientationMask.contains(.landscapeLeft) {
       return UIInterfaceOrientation.landscapeLeft

package/ios/ReactDelegateHandler/ExpoDevLauncherReactDelegateHandler.swift

@@ -73,14 +73,30 @@ public class ExpoDevLauncherReactDelegateHandler: ExpoReactDelegateHandler, RCTB
   // MARK: EXDevelopmentClientControllerDelegate implementations
 
   public func devLauncherController(_ developmentClientController: EXDevLauncherController, didStartWithSuccess success: Bool) {
-    let bridge = RCTBridge(delegate: self.bridgeDelegate, launchOptions: self.launchOptions)
+    var launchOptions: [AnyHashable: Any] = [:]
+
+    if let initialLaunchOptions = self.launchOptions {
+      for (key, value) in initialLaunchOptions {
+        launchOptions[key] = value
+      }
+    }
+
+    for (key, value) in developmentClientController.getLaunchOptions() {
+      launchOptions[key] = value
+    }
+
+    let bridge = RCTBridge(delegate: self.bridgeDelegate, launchOptions: launchOptions)
     developmentClientController.appBridge = bridge
 
     let rootView = RCTRootView(bridge: bridge!, moduleName: self.rootViewModuleName!, initialProperties: self.rootViewInitialProperties)
     rootView.backgroundColor = self.deferredRootView?.backgroundColor ?? UIColor.white
     let window = getWindow()
-    window.rootViewController = self.reactDelegate?.createRootViewController()
-    window.rootViewController!.view = rootView
+
+    // NOTE: this order of assignment seems to actually have an effect on behaviour
+    // direct assignment of window.rootViewController.view = rootView does not work
+    let rootViewController = self.reactDelegate?.createRootViewController()
+    rootViewController!.view = rootView
+    window.rootViewController = rootViewController
     window.makeKeyAndVisible()
 
     // it is purposeful that we don't clean up saved properties here, because we may initialize

package/ios/Tests/EXDevLauncherManifestHelperTests.swift

@@ -8,8 +8,8 @@ class EXDevLauncherManifestHelperTests: XCTestCase {
   func testExportManifestOrientation() {
     XCTAssertEqual(UIInterfaceOrientation.portrait, EXDevLauncherManifestHelper.exportManifestOrientation("portrait"))
     XCTAssertEqual(UIInterfaceOrientation.landscapeLeft, EXDevLauncherManifestHelper.exportManifestOrientation("landscape"))
-    XCTAssertEqual(UIInterfaceOrientation.portrait, EXDevLauncherManifestHelper.exportManifestOrientation("default"))
-    XCTAssertEqual(UIInterfaceOrientation.portrait, EXDevLauncherManifestHelper.exportManifestOrientation("unsupported-value"))
+    XCTAssertEqual(UIInterfaceOrientation.unknown, EXDevLauncherManifestHelper.exportManifestOrientation("default"))
+    XCTAssertEqual(UIInterfaceOrientation.unknown, EXDevLauncherManifestHelper.exportManifestOrientation("unsupported-value"))
   }
 
   func testExportManifestUserInterfaceStyle() {

package/ios/Views/EXDevLauncherErrorView.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="20037" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="20020"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -21,7 +21,7 @@
                                 <rect key="frame" x="20" y="64" width="335" height="594"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="1Bh-aT-q2c" userLabel="Header Stack View">
-                                        <rect key="frame" x="0.0" y="0.0" width="335" height="86.333333333333329"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="335" height="103"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="There was a problem loading the project." lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yz7-qW-osQ">
                                                 <rect key="frame" x="0.0" y="0.0" width="335" height="57.333333333333336"/>
@@ -29,8 +29,8 @@
                                                 <color key="textColor" red="0.10588235294117647" green="0.12156862745098039" blue="0.13725490196078433" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This development build encountered the following error." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NuU-oV-ttb">
-                                                <rect key="frame" x="0.0" y="69.333333333333343" width="335" height="17"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This development build encountered the following error:" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NuU-oV-ttb">
+                                                <rect key="frame" x="0.0" y="69.333333333333343" width="335" height="33.666666666666657"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <color key="textColor" red="0.10588235294117647" green="0.12156862745098039" blue="0.13725490196078433" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <nil key="highlightedColor"/>
@@ -38,7 +38,7 @@
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="12" translatesAutoresizingMaskIntoConstraints="NO" id="Yt5-QM-Cuc" userLabel="Error Stack View">
-                                        <rect key="frame" x="0.0" y="104.33333333333334" width="335" height="489.66666666666663"/>
+                                        <rect key="frame" x="0.0" y="121" width="335" height="473"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Error infromation" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VXA-BB-Jf6">
                                                 <rect key="frame" x="0.0" y="0.0" width="335" height="17"/>
@@ -47,7 +47,7 @@
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="YTm-Ru-mwN">
-                                                <rect key="frame" x="0.0" y="29.000000000000028" width="335" height="460.66666666666674"/>
+                                                <rect key="frame" x="0.0" y="29" width="335" height="444"/>
                                                 <color key="backgroundColor" white="1" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <color key="separatorColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <color key="sectionIndexColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>