expo-dev-launcher 5.1.5 → 5.1.6

package/CHANGELOG.md

@@ -10,6 +10,13 @@
 
 ### 💡 Others
 
+## 5.1.6 — 2025-04-25
+
+### 💡 Others
+
+- [iOS] Remove usage of deprecated `SFAuthenticationSession` for user login. ([#36395](https://github.com/expo/expo/pull/36395) by [@alanjhughes](https://github.com/alanjhughes))
+- [Android] Enable edge-to-edge. ([#36363](https://github.com/expo/expo/pull/36363) by [@behenate](https://github.com/behenate))
+
 ## 5.1.5 — 2025-04-23
 
 ### 🐛 Bug fixes

package/android/build.gradle

@@ -8,13 +8,13 @@ expoModule {
 }
 
 group = "host.exp.exponent"
-version = "5.1.5"
+version = "5.1.6"
 
 android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "5.1.5"
+    versionName "5.1.6"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/launcher/DevLauncherActivity.kt

@@ -6,6 +6,7 @@ import android.view.KeyEvent
 import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.WindowCompat
 import com.facebook.react.ReactActivity
 import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.ReactInstanceEventListener
@@ -51,6 +52,8 @@ class DevLauncherActivity : ReactActivity(), ReactInstanceEventListener, DevLaun
   }
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    // Enables edge-to-edge
+    WindowCompat.setDecorFitsSystemWindows(window, false)
     super.onCreate(savedInstanceState)
 
     contentView = findViewById(android.R.id.content) ?: return

package/android/src/debug/java/expo/modules/devlauncher/launcher/errors/DevLauncherErrorActivity.kt

@@ -4,6 +4,11 @@ import android.app.Activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import android.widget.LinearLayout
+import androidx.core.view.ViewCompat
+import androidx.core.view.WindowCompat
+import androidx.core.view.WindowInsetsCompat
+import androidx.core.view.updatePadding
 import androidx.fragment.app.FragmentActivity
 import com.facebook.react.ReactActivity
 import expo.modules.devlauncher.databinding.ErrorFragmentBinding
@@ -21,12 +26,28 @@ class DevLauncherErrorActivity :
   private val adapter = DevLauncherStackAdapter(this, null)
 
   override fun onCreate(savedInstanceState: Bundle?) {
+    // Enables edge-to-edge
+    WindowCompat.setDecorFitsSystemWindows(window, false)
     super.onCreate(savedInstanceState)
 
     binding = ErrorFragmentBinding.inflate(layoutInflater)
     binding.homeButton.setOnClickListener { this.launchHome() }
     binding.reloadButton.setOnClickListener { this.reload() }
 
+    // Set footer padding to avoid the navigation bar
+    ViewCompat.setOnApplyWindowInsetsListener(binding.errorFooterContent) { view, windowInsets ->
+      val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+      view.updatePadding(bottom = insets.bottom)
+      WindowInsetsCompat.CONSUMED
+    }
+
+    // Set title padding to account for status bar
+    ViewCompat.setOnApplyWindowInsetsListener(binding.errorTitle) { view, windowInsets ->
+      val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
+      view.updatePadding(top = insets.top)
+      WindowInsetsCompat.CONSUMED
+    }
+
     synchronized(DevLauncherErrorActivity) {
       val error = currentError
       if (error != null) {

package/android/src/main/res/layout/error_fragment.xml

@@ -20,6 +20,7 @@
     android:weightSum="1">
 
     <TextView
+      android:id="@+id/error_title"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:tag="DevLauncherErrorScreen"
@@ -62,6 +63,7 @@
     android:layout_alignParentBottom="true">
 
     <LinearLayout
+      android:id="@+id/error_footer_content"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@color/dev_launcher_white"

package/android/src/main/res/values/styles.xml

@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <style name="Theme.DevLauncher.LauncherActivity" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="android:navigationBarColor">@android:color/transparent</item>
+    <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:windowLightStatusBar">true</item>
+    <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+    <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+
     <item name="android:windowContentOverlay">@null</item>
     <item name="android:windowNoTitle">true</item>
     <item name="android:windowIsFloating">false</item>
@@ -9,7 +15,12 @@
   </style>
 
   <style name="Theme.DevLauncher.ErrorActivity" parent="Theme.AppCompat.Light.NoActionBar">
+    <item name="android:navigationBarColor">@android:color/transparent</item>
     <item name="android:statusBarColor">@android:color/transparent</item>
+    <item name="android:windowLightStatusBar">true</item>
+    <item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
+    <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
+
     <item name="colorPrimary">@color/dev_launcher_primary</item>
     <item name="colorPrimaryDark">@color/dev_launcher_colorPrimaryDark</item>
     <item name="colorAccent">@color/dev_launcher_colorAccentDark</item>

package/ios/DevLauncherAuth.swift

@@ -1,19 +1,19 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
 import ExpoModulesCore
-import SafariServices
-import React
+import AuthenticationServices
 
 private let DEV_LAUNCHER_DEFAULT_SCHEME = "expo-dev-launcher"
 
 public class DevLauncherAuth: Module {
   private var redirectPromise: Promise?
-  private var authSession: SFAuthenticationSession?
+  private var authSession: ASWebAuthenticationSession?
+  private let presentationContext = DevLauncherAuthPresentationContext()
 
   public func definition() -> ModuleDefinition {
     Name("ExpoDevLauncherAuth")
 
-    AsyncFunction("openAuthSessionAsync") { (authURL: URL, redirectURL: String, promise: Promise) in
+    AsyncFunction("openAuthSessionAsync") { (authURL: URL, _: String, promise: Promise) in
       if self.redirectPromise != nil {
         throw WebBrowserAlreadyPresentedException()
       }
@@ -34,20 +34,18 @@ public class DevLauncherAuth: Module {
         self?.flowDidFinish()
       }
 
-      self.authSession = SFAuthenticationSession(url: authURL, callbackURLScheme: redirectURL, completionHandler: completionHandler)
+      // With ASWebAuthenticationSession, all that is required for the callbackURLScheme is the scheme defined in CFBundleURLSchemes.
+      // ://auth is not necessary.
+      let scheme = getAuthScheme()
+
+      self.authSession = ASWebAuthenticationSession(url: authURL, callbackURLScheme: scheme, completionHandler: completionHandler)
+      self.authSession?.presentationContextProvider = presentationContext
+      self.authSession?.prefersEphemeralWebBrowserSession = true
       self.authSession?.start()
-    }
+    }.runOnQueue(.main)
 
     AsyncFunction("getAuthSchemeAsync") { () -> String in
-      if let urlTypes = Bundle.main.object(forInfoDictionaryKey: "CFBundleURLTypes") as? [[String: Any]] {
-        for urlType in urlTypes {
-          if let schemes = urlType["CFBundleURLSchemes"] as? [String], !schemes.isEmpty {
-            return schemes[0]
-          }
-        }
-      }
-
-      return DEV_LAUNCHER_DEFAULT_SCHEME
+      getAuthScheme()
     }
 
     AsyncFunction("setSessionAsync") { (session: String?) in
@@ -59,7 +57,24 @@ public class DevLauncherAuth: Module {
     }
   }
 
+  private func getAuthScheme() -> String {
+    guard let urlTypes = Bundle.main.object(forInfoDictionaryKey: "CFBundleURLTypes") as? [[String: Any]] else {
+      return DEV_LAUNCHER_DEFAULT_SCHEME
+    }
+
+    return urlTypes.compactMap { urlType in
+      (urlType["CFBundleURLSchemes"] as? [String])?.first
+    }.first ?? DEV_LAUNCHER_DEFAULT_SCHEME
+  }
+
   private func flowDidFinish() {
     self.redirectPromise = nil
   }
 }
+
+private class DevLauncherAuthPresentationContext: NSObject, ASWebAuthenticationPresentationContextProviding {
+  func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
+    let window = UIApplication.shared.windows.first { $0.isKeyWindow }
+    return window ?? ASPresentationAnchor()
+  }
+}

package/ios/EXDevLauncherURLHelper.swift

@@ -14,16 +14,13 @@ public class EXDevLauncherUrl: NSObject {
   @objc
   public init(_ url: URL) {
     self.queryParams = EXDevLauncherURLHelper.getQueryParamsForUrl(url)
-    self.url = url
-
-    if EXDevLauncherURLHelper.isDevLauncherURL(url) {
-      if let urlParam = self.queryParams["url"] {
-        if let urlFromParam = URL.init(string: urlParam) {
-          self.url = EXDevLauncherURLHelper.replaceEXPScheme(urlFromParam, to: "http")
-        }
-      }
+
+    if EXDevLauncherURLHelper.isDevLauncherURL(url),
+      let urlParam = queryParams["url"],
+      let urlFromParam = URL(string: urlParam) {
+      self.url = EXDevLauncherURLHelper.replaceEXPScheme(urlFromParam, to: "http")
     } else {
-      self.url = EXDevLauncherURLHelper.replaceEXPScheme(self.url, to: "http")
+      self.url = EXDevLauncherURLHelper.replaceEXPScheme(url, to: "http")
     }
 
     super.init()
@@ -39,48 +36,53 @@ public class EXDevLauncherURLHelper: NSObject {
 
   @objc
   public static func hasUrlQueryParam(_ url: URL) -> Bool {
-    var hasUrlQueryParam = false
-
-    let components = URLComponents.init(url: url, resolvingAgainstBaseURL: false)
-
-    if (components?.queryItems?.contains(where: {
-      $0.name == "url" && $0.value != nil
-    })) ?? false {
-      hasUrlQueryParam = true
+    guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+    let queryItems = components.queryItems else {
+      return false
     }
 
-    return hasUrlQueryParam
+    return queryItems.contains { $0.name == "url" && $0.value != nil }
   }
 
   @objc
   public static func disableOnboardingPopupIfNeeded(_ url: URL) {
-    let components = URLComponents.init(url: url, resolvingAgainstBaseURL: false)
+    guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+    let queryItems = components.queryItems else {
+      return
+    }
 
-    if (components?.queryItems?.contains(where: {
+    let shouldDisable = queryItems.contains {
       $0.name == "disableOnboarding" && ($0.value ?? "") == "1"
-    })) ?? false {
+    }
+
+    if shouldDisable {
       DevMenuPreferences.isOnboardingFinished = true
     }
   }
 
   @objc
   public static func replaceEXPScheme(_ url: URL, to scheme: String) -> URL {
-    var components = URLComponents(url: url, resolvingAgainstBaseURL: false)
-    if components?.scheme == "exp" {
-      components?.scheme = scheme
+    guard var components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+    components.scheme == "exp" else {
+      return url
     }
-    return components?.url ?? url
+
+    components.scheme = scheme
+    return components.url ?? url
   }
 
   @objc
   public static func getQueryParamsForUrl(_ url: URL) -> [String: String] {
-    let components = URLComponents.init(url: url, resolvingAgainstBaseURL: false)
-    var dict: [String: String] = [:]
+    guard let components = URLComponents(url: url, resolvingAgainstBaseURL: false),
+    let queryItems = components.queryItems else {
+      return [:]
+    }
 
-    for parameter in components?.queryItems ?? [] {
-      dict[parameter.name] = parameter.value?.removingPercentEncoding ?? ""
+    var params: [String: String] = [:]
+    for item in queryItems {
+      params[item.name] = item.value?.removingPercentEncoding ?? ""
     }
 
-    return dict
+    return params
   }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -31,8 +31,8 @@
   "homepage": "https://docs.expo.dev",
   "dependencies": {
     "ajv": "8.11.0",
-    "expo-dev-menu": "6.1.5",
-    "expo-manifests": "~0.16.2",
+    "expo-dev-menu": "6.1.6",
+    "expo-manifests": "~0.16.3",
     "resolve-from": "^5.0.0"
   },
   "devDependencies": {
@@ -43,10 +43,10 @@
     "@testing-library/jest-native": "^4.0.4",
     "@testing-library/react-native": "^13.1.0",
     "babel-plugin-module-resolver": "^5.0.0",
-    "babel-preset-expo": "~13.1.6",
+    "babel-preset-expo": "~13.1.7",
     "date-fns": "^2.28.0",
-    "expo-dev-client-components": "2.1.2",
-    "expo-module-scripts": "^4.1.4",
+    "expo-dev-client-components": "2.1.3",
+    "expo-module-scripts": "^4.1.5",
     "graphql": "^16.0.1",
     "graphql-request": "^3.6.1",
     "react": "19.0.0",
@@ -67,5 +67,5 @@
       "/node_modules/(?!((jest-)?react-native|@react-native(-community)?)/|@react-navigation/)"
     ]
   },
-  "gitHead": "dd4ea2ac865a2b0c1f4ea3fc5879d90679099862"
+  "gitHead": "3cd208465df78e385ca9380531bbbfe33ca68e81"
 }