expo-dev-launcher 4.0.3 → 4.0.4

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 4.0.4 — 2024-04-24
+
+### 🐛 Bug fixes
+
+- Fixed "Missing transform.routerRoot option in Metro bundling request" error when loading the bundle. ([#28428](https://github.com/expo/expo/pull/28428) by [@kudo](https://github.com/kudo))
+
 ## 4.0.3 — 2024-04-23
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -17,7 +17,7 @@ android {
   namespace "expo.modules.devlauncher"
   defaultConfig {
     versionCode 9
-    versionName "4.0.3"
+    versionName "4.0.4"
   }
 
   buildTypes {

package/android/src/debug/java/expo/modules/devlauncher/helpers/DevLauncherReactUtils.kt

@@ -10,13 +10,17 @@ import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.JSBundleLoader
 import com.facebook.react.common.annotations.UnstableReactNativeAPI
 import com.facebook.react.defaults.DefaultReactHostDelegate
+import com.facebook.react.devsupport.DevLauncherDevServerHelper
 import com.facebook.react.devsupport.DevLauncherInternalSettings
+import com.facebook.react.devsupport.DevServerHelper
 import com.facebook.react.devsupport.DevSupportManagerBase
 import com.facebook.react.devsupport.interfaces.DevSupportManager
+import com.facebook.react.modules.systeminfo.AndroidInfoHelpers
 import com.facebook.react.runtime.ReactHostDelegate
 import com.facebook.react.runtime.ReactHostImpl
 import expo.interfaces.devmenu.ReactHostWrapper
 import expo.interfaces.devmenu.annotations.ContainsDevMenuExtension
+import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 import expo.modules.devlauncher.react.DevLauncherDevSupportManagerSwapper
 import expo.modules.devlauncher.rncompatibility.DevLauncherBridgeDevSupportManager
 import expo.modules.devlauncher.rncompatibility.DevLauncherBridgelessDevSupportManager
@@ -123,11 +127,12 @@ private fun injectDebugServerHost(
   val mDevServerHelperField = devSupportManagerBaseClass.getDeclaredField("mDevServerHelper")
   mDevServerHelperField.isAccessible = true
   val devServerHelper = mDevServerHelperField[devSupportManager]
-  val mSettingsField = devServerHelper.javaClass.getDeclaredField("mSettings")
+  check(devServerHelper is DevLauncherDevServerHelper)
+  val mSettingsField = DevServerHelper::class.java.getDeclaredField("mSettings")
   mSettingsField.isAccessible = true
   mSettingsField[devServerHelper] = settings
 
-  val packagerConnectionSettingsField = devServerHelper.javaClass.getDeclaredField("mPackagerConnectionSettings")
+  val packagerConnectionSettingsField = DevServerHelper::class.java.getDeclaredField("mPackagerConnectionSettings")
   packagerConnectionSettingsField.isAccessible = true
   packagerConnectionSettingsField[devServerHelper] = settings.public_getPackagerConnectionSettings()
 }
@@ -210,6 +215,22 @@ private fun injectLocalBundleLoader(
   }
 }
 
+fun injectDevServerHelper(context: Context, devSupportManager: DevSupportManager, controller: DevLauncherControllerInterface?) {
+  val defaultServerHost = AndroidInfoHelpers.getServerHost(context)
+  val devSettings = DevLauncherInternalSettings(context, defaultServerHost)
+  val devLauncherDevServerHelper = DevLauncherDevServerHelper(
+    context = context,
+    controller = controller,
+    devSettings = devSettings,
+    packagerConnection = devSettings.public_getPackagerConnectionSettings()
+  )
+  DevSupportManagerBase::class.java.setProtectedDeclaredField(
+    devSupportManager,
+    "mDevServerHelper",
+    devLauncherDevServerHelper
+  )
+}
+
 fun findDevMenuPackage(): ReactPackage? {
   return try {
     val clazz = Class.forName("expo.modules.devmenu.DevMenuPackage")

package/android/src/main/java/com/facebook/react/devsupport/DevLauncherDevServerHelper.kt

@@ -0,0 +1,50 @@
+package com.facebook.react.devsupport
+
+import android.content.Context
+import android.net.Uri
+import com.facebook.react.modules.debug.interfaces.DeveloperSettings
+import com.facebook.react.packagerconnection.PackagerConnectionSettings
+import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+
+class DevLauncherDevServerHelper(
+  context: Context,
+  private val controller: DevLauncherControllerInterface?,
+  devSettings: DeveloperSettings,
+  packagerConnection: PackagerConnectionSettings
+) :
+  DevServerHelper(devSettings, context.packageName, packagerConnection) {
+
+  override fun getDevServerBundleURL(jsModulePath: String?): String {
+    return controller?.manifest?.getBundleURL() ?: super.getDevServerBundleURL(jsModulePath)
+  }
+
+  override fun getDevServerSplitBundleURL(jsModulePath: String?): String {
+    return controller?.manifest?.getBundleURL() ?: super.getDevServerSplitBundleURL(jsModulePath)
+  }
+
+  override fun getSourceUrl(mainModuleName: String?): String {
+    return controller?.manifest?.getBundleURL() ?: super.getSourceUrl(mainModuleName)
+  }
+
+  override fun getSourceMapUrl(mainModuleName: String?): String {
+    val defaultValue = super.getSourceMapUrl(mainModuleName)
+    val bundleURL = controller?.manifest?.getBundleURL()
+      ?: return defaultValue
+
+    val parsedURL = Uri.parse(bundleURL)
+    val customOptions = parsedURL.queryParameterNames.mapNotNull { key ->
+      if (key.startsWith("transform")) {
+        key to requireNotNull(parsedURL.getQueryParameter(key))
+      } else {
+        null
+      }
+    }.ifEmpty {
+      return defaultValue
+    }
+
+    val customOptionsString = customOptions.joinToString("&") { (key, value) ->
+      "$key=$value"
+    }
+    return "$defaultValue&$customOptionsString"
+  }
+}

package/android/src/main/java/com/facebook/react/devsupport/DevLauncherInternalSettings.kt

@@ -1,7 +1,7 @@
 package com.facebook.react.devsupport
 
 import android.content.Context
-import com.facebook.react.packagerconnection.PackagerConnectionSettings
+import com.facebook.react.devsupport.DevInternalSettings.Listener
 import expo.modules.devlauncher.react.DevLauncherPackagerConnectionSettings
 
 internal class DevLauncherInternalSettings(
@@ -15,16 +15,3 @@ internal class DevLauncherInternalSettings(
   @Suppress("FunctionName")
   fun public_getPackagerConnectionSettings() = getPackagerConnectionSettings()
 }
-
-/**
- * A wrapper of [DevInternalSettings] allows us to access the package-private [DevInternalSettings] properties
- */
-internal class DevLauncherInternalSettingsWrapper(private val devSettings: DevInternalSettings) {
-  val isStartSamplingProfilerOnInit = devSettings.isStartSamplingProfilerOnInit
-  var isRemoteJSDebugEnabled: Boolean
-    get() = devSettings.isRemoteJSDebugEnabled
-    set(value) {
-      devSettings.isRemoteJSDebugEnabled = value
-    }
-  val packagerConnectionSettings: PackagerConnectionSettings = devSettings.packagerConnectionSettings
-}

package/android/src/react-native-74/debug/expo/modules/devlauncher/rncompatibility/DevLauncherBridgeDevSupportManager.kt

@@ -8,6 +8,7 @@ import com.facebook.react.devsupport.interfaces.DevBundleDownloadListener
 import com.facebook.react.devsupport.interfaces.RedBoxHandler
 import com.facebook.react.packagerconnection.RequestHandler
 import expo.modules.devlauncher.DevLauncherController
+import expo.modules.devlauncher.helpers.injectDevServerHelper
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.koin.optInject
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
@@ -15,7 +16,7 @@ import expo.modules.devlauncher.launcher.errors.DevLauncherAppError
 import expo.modules.devlauncher.launcher.errors.DevLauncherErrorActivity
 
 class DevLauncherBridgeDevSupportManager(
-  applicationContext: Context?,
+  applicationContext: Context,
   reactInstanceDevHelper: ReactInstanceDevHelper?,
   packagerPathForJSBundleName: String?,
   enableOnCreate: Boolean,
@@ -38,10 +39,17 @@ class DevLauncherBridgeDevSupportManager(
   DevLauncherKoinComponent {
   private val controller: DevLauncherControllerInterface? by optInject()
 
+  init {
+    injectDevServerHelper(applicationContext, this, controller)
+  }
+
   override fun showNewJavaError(message: String?, e: Throwable) {
     Log.e("DevLauncher", "$message", e)
     if (!DevLauncherController.wasInitialized()) {
-      Log.e("DevLauncher", "DevLauncher wasn't initialized. Couldn't intercept native error handling.")
+      Log.e(
+        "DevLauncher",
+        "DevLauncher wasn't initialized. Couldn't intercept native error handling."
+      )
       super.showNewJavaError(message, e)
       return
     }
@@ -55,7 +63,7 @@ class DevLauncherBridgeDevSupportManager(
     DevLauncherErrorActivity.showError(activity, DevLauncherAppError(message, e))
   }
 
-  override fun getUniqueTag() = "DevLauncherApp - Bridge"
+  override fun getUniqueTag() = "DevLauncherApp-Bridge"
 
   override fun startInspector() {
     // no-op for the default `startInspector` which would be implicitly called

package/android/src/react-native-74/debug/expo/modules/devlauncher/rncompatibility/DevLauncherBridgelessDevSupportManager.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import com.facebook.react.runtime.NonFinalBridgelessDevSupportManager
 import com.facebook.react.runtime.ReactHostImpl
 import expo.modules.devlauncher.DevLauncherController
+import expo.modules.devlauncher.helpers.injectDevServerHelper
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.koin.optInject
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
@@ -18,6 +19,10 @@ class DevLauncherBridgelessDevSupportManager(
 ) : NonFinalBridgelessDevSupportManager(host, context, packagerPathForJSBundleName), DevLauncherKoinComponent {
   private val controller: DevLauncherControllerInterface? by optInject()
 
+  init {
+    injectDevServerHelper(context, this, controller)
+  }
+
   override fun showNewJavaError(message: String?, e: Throwable) {
     Log.e("DevLauncher", "$message", e)
     if (!DevLauncherController.wasInitialized()) {
@@ -35,7 +40,7 @@ class DevLauncherBridgelessDevSupportManager(
     DevLauncherErrorActivity.showError(activity, DevLauncherAppError(message, e))
   }
 
-  override fun getUniqueTag() = "DevLauncherApp - Bridgeless"
+  override fun getUniqueTag() = "DevLauncherApp-Bridgeless"
 
   override fun startInspector() {
     // no-op for the default `startInspector` which would be implicitly called

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-dev-launcher",
   "title": "Expo Development Launcher",
-  "version": "4.0.3",
+  "version": "4.0.4",
   "description": "Pre-release version of the Expo development launcher package for testing.",
   "main": "build/DevLauncher.js",
   "types": "build/DevLauncher.d.ts",
@@ -31,7 +31,7 @@
   "homepage": "https://docs.expo.dev",
   "dependencies": {
     "ajv": "8.11.0",
-    "expo-dev-menu": "5.0.3",
+    "expo-dev-menu": "5.0.5",
     "expo-manifests": "~0.14.0",
     "resolve-from": "^5.0.0",
     "semver": "^7.6.0"
@@ -66,5 +66,5 @@
       "./setupTests.ts"
     ]
   },
-  "gitHead": "ee4f30ef3b5fa567ad1bf94794197f7683fdd481"
+  "gitHead": "8b4cb45563b85c2ec91b1b249d136661bf6e8981"
 }