expo-dev-launcher 2.1.3 → 2.1.4

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 2.1.4 — 2023-02-28
+
+### 🐛 Bug fixes
+
+- Fixed dev client crash when server URL has no scheme. ([#21274](https://github.com/expo/expo/pull/21274) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+- Fixed dev client not showing logged user and initial data. ([#21425](https://github.com/expo/expo/pull/21425) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
 ## 2.1.3 — 2023-02-25
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -40,7 +40,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 33)
     versionCode 9
-    versionName "2.1.3"
+    versionName "2.1.4"
   }
 
   lintOptions {

package/bundle/App.tsx

@@ -26,8 +26,8 @@ type LauncherAppProps = object;
 
 export function App(props: LauncherAppProps) {
   return (
-    <LoadInitialData loader={<Splash />}>
-      <View style={{ direction: 'ltr', flex: 1 }}>
+    <View style={{ direction: 'ltr', flex: 1 }}>
+      <LoadInitialData loader={<Splash />}>
         <AppProviders>
           <Stack.Navigator
             initialRouteName="Main"
@@ -44,8 +44,8 @@ export function App(props: LauncherAppProps) {
             <Stack.Screen name="Crash Report" component={CrashReportScreen} />
           </Stack.Navigator>
         </AppProviders>
-      </View>
-    </LoadInitialData>
+      </LoadInitialData>
+    </View>
   );
 }
 

package/ios/EXDevLauncherURLHelper.swift

@@ -65,11 +65,11 @@ public class EXDevLauncherURLHelper: NSObject {
 
   @objc
   public static func replaceEXPScheme(_ url: URL, to scheme: String) -> URL {
-    var components = URLComponents.init(url: url, resolvingAgainstBaseURL: false)!
-    if components.scheme == "exp" {
-      components.scheme = scheme
+    var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
+    if components?.scheme == "exp" {
+      components?.scheme = scheme
     }
-    return components.url!
+    return components?.url ?? url
   }
 
   @objc

package/ios/Tests/EXDevLauncherURLHelperTests.swift

@@ -5,9 +5,9 @@ import XCTest
 @testable import EXDevLauncher
 
 class EXDevLauncherURLHelperTests: XCTestCase {
-  
+
   let encodedUrlString = "http%3A%2F%2Flocalhost%3A8081"
-  
+
   func testIsDevLauncherURL() {
     let defaultUrl = "scheme://expo-development-client"
     XCTAssertTrue(EXDevLauncherURLHelper.isDevLauncherURL(URL(string: defaultUrl)))
@@ -22,28 +22,32 @@ class EXDevLauncherURLHelperTests: XCTestCase {
 
     let actual2 = EXDevLauncherURLHelper.replaceEXPScheme(URL(string: "http://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081")!, to: "scheme")
     XCTAssertEqual(URL(string: "http://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081"), actual2)
+
+    // should not crash if provided URL does not include scheme
+    let actual3 = EXDevLauncherURLHelper.replaceEXPScheme(URL(string: "192.168.0.12:19000")!, to: "scheme")
+    XCTAssertEqual(URL(string: "192.168.0.12:19000"), actual3)
   }
-  
+
   func testDevLauncherUrls() {
     // dev-client scheme with valid url param -> loadApp with specified url param
     expectDevLauncherUrlToEqual(input:"scheme://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081%2Findex.bundle%3Fplatform%3Dios%26dev%3Dtrue",
                          expected:"http://localhost:8081/index.bundle?platform=ios&dev=true")
-    
+
     // non-dev-client scheme with valid url param -> defer loading to loaded app
     expectDevLauncherUrlToEqual(input: "scheme://not-dev-client/?url=\(encodedUrlString)",
                                 expected: "scheme://not-dev-client/?url=\(encodedUrlString)")
 
   }
-  
+
   func testDevLauncherUrlQueryParams() {
     let url = "scheme://expo-development-client/?url=http%3A%2F%2Flocalhost%3A8081&updateMessage=123"
     let devLauncherUrl = EXDevLauncherUrl(URL(string:url)!)
     let queryParams = devLauncherUrl.queryParams
-    
+
     XCTAssertEqual(queryParams["updateMessage"], "123")
     XCTAssertEqual(queryParams["url"], "http://localhost:8081")
   }
-  
+
   //  HELPER
   func expectDevLauncherUrlToEqual(input: String, expected: String) {
     let devLauncherUrl = EXDevLauncherUrl(URL(string:input)!)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -63,5 +63,5 @@
       "./setupTests.ts"
     ]
   },
-  "gitHead": "51a41f5a28ebb1c59a065d5f1e072e1e7d402552"
+  "gitHead": "8174f5855f6a2abe0cc7dc0063b559cf635774c2"
 }