expo-dev-launcher 0.7.0 → 0.8.3

package/android/src/debug/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -28,12 +28,12 @@ import expo.modules.devlauncher.launcher.DevLauncherLifecycle
 import expo.modules.devlauncher.launcher.DevLauncherReactActivityDelegateSupplier
 import expo.modules.devlauncher.launcher.DevLauncherRecentlyOpenedAppsRegistry
 import expo.modules.devlauncher.launcher.loaders.DevLauncherAppLoaderFactoryInterface
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
 import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser
 import expo.modules.devlauncher.launcher.menu.DevLauncherMenuDelegate
 import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityNOPDelegate
 import expo.modules.devlauncher.react.activitydelegates.DevLauncherReactActivityRedirectDelegate
 import expo.modules.devlauncher.tests.DevLauncherTestInterceptor
+import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
@@ -72,7 +72,7 @@ class DevLauncherController private constructor()
   override val devClientHost = DevLauncherClientHost((context as Application), DEV_LAUNCHER_HOST)
 
   private val recentlyOpedAppsRegistry = DevLauncherRecentlyOpenedAppsRegistry(context)
-  override var manifest: DevLauncherManifest? = null
+  override var manifest: Manifest? = null
     private set
   override var manifestURL: Uri? = null
     private set
@@ -188,16 +188,20 @@ class DevLauncherController private constructor()
         }
         return true
       }
+
+    intent?.let {
+      return handleExternalIntent(it)
+    }
+
     return false
   }
 
   private fun handleExternalIntent(intent: Intent): Boolean {
-    if (mode == Mode.APP) {
-      return false
+    if (mode != Mode.APP && intent.action != Intent.ACTION_MAIN) {
+      pendingIntentRegistry.intent = intent
     }
 
-    pendingIntentRegistry.intent = intent
-    return true
+    return false
   }
 
   private fun ensureHostWasCleared(host: ReactNativeHost, activityToBeInvalidated: ReactActivity? = null) {

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

@@ -8,15 +8,15 @@ import expo.modules.devlauncher.helpers.loadUpdate
 import expo.modules.devlauncher.koin.DevLauncherKoinComponent
 import expo.modules.devlauncher.koin.optInject
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
 import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser
+import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 import org.koin.core.component.inject
 import java.lang.IllegalStateException
 
 interface DevLauncherAppLoaderFactoryInterface {
   suspend fun createAppLoader(url: Uri, manifestParser: DevLauncherManifestParser): DevLauncherAppLoader
-  fun getManifest(): DevLauncherManifest?
+  fun getManifest(): Manifest?
   fun shouldUseDeveloperSupport(): Boolean
 }
 
@@ -27,7 +27,7 @@ class DevLauncherAppLoaderFactory : DevLauncherKoinComponent, DevLauncherAppLoad
   private val controller: DevLauncherControllerInterface by inject()
 
   private var instanceWasCreated = false
-  private var manifest: DevLauncherManifest? = null
+  private var manifest: Manifest? = null
   private var useDeveloperSupport = true
 
   override suspend fun createAppLoader(url: Uri, manifestParser: DevLauncherManifestParser): DevLauncherAppLoader {
@@ -45,7 +45,7 @@ class DevLauncherAppLoaderFactory : DevLauncherKoinComponent, DevLauncherAppLoad
       } else {
         val configuration = createUpdatesConfigurationWithUrl(url)
         val update = updatesInterface!!.loadUpdate(configuration, context) {
-          manifest = DevLauncherManifest.fromJson(it.toString().reader())
+          manifest = Manifest.fromManifestJson(it) // TODO: might be able to pass actual manifest object in here
           return@loadUpdate !manifest!!.isUsingDeveloperTool()
         }
         if (manifest!!.isUsingDeveloperTool()) {
@@ -59,7 +59,7 @@ class DevLauncherAppLoaderFactory : DevLauncherKoinComponent, DevLauncherAppLoad
     }
   }
 
-  override fun getManifest(): DevLauncherManifest? = checkIfInstanceWasCreated { manifest }
+  override fun getManifest(): Manifest? = checkIfInstanceWasCreated { manifest }
 
   override fun shouldUseDeveloperSupport(): Boolean = checkIfInstanceWasCreated { useDeveloperSupport }
 

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

@@ -12,11 +12,11 @@ import expo.modules.devlauncher.helpers.isValidColor
 import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 import expo.modules.devlauncher.launcher.configurators.DevLauncherExpoActivityConfigurator
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
 import expo.modules.devlauncher.launcher.manifest.DevLauncherUserInterface
+import expo.modules.manifests.core.Manifest
 
 abstract class DevLauncherExpoAppLoader(
-  private val manifest: DevLauncherManifest,
+  private val manifest: Manifest,
   appHost: ReactNativeHost,
   context: Context,
   controller: DevLauncherControllerInterface,
@@ -39,7 +39,7 @@ abstract class DevLauncherExpoAppLoader(
   }
 
   private fun applyUserInterfaceStyle(context: ReactContext) {
-    val userInterfaceStyle = when (manifest.userInterfaceStyle) {
+    val userInterfaceStyle = when (manifest.getAndroidUserInterfaceStyle()) {
       DevLauncherUserInterface.DARK -> "dark"
       DevLauncherUserInterface.LIGHT -> "light"
       else -> return
@@ -70,7 +70,7 @@ abstract class DevLauncherExpoAppLoader(
   }
 
   private fun applyBackgroundColor(view: View) {
-    val backgroundColor = manifest.backgroundColor ?: return
+    val backgroundColor = manifest.getAndroidBackgroundColor() ?: return
     if (!isValidColor(backgroundColor)) {
       return
     }
@@ -78,6 +78,6 @@ abstract class DevLauncherExpoAppLoader(
   }
 
   override fun getAppName(): String? {
-    return manifest.name
+    return manifest.getName()
   }
 }

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

@@ -5,19 +5,19 @@ import android.net.Uri
 import com.facebook.react.ReactNativeHost
 import expo.modules.devlauncher.helpers.injectReactInterceptor
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
+import expo.modules.manifests.core.Manifest
 
 /**
  * Implementation of DevLauncherExpoAppLoader which is used for loading locally served projects in
  * development.
  */
 class DevLauncherLocalAppLoader(
-  private val manifest: DevLauncherManifest,
+  private val manifest: Manifest,
   private val appHost: ReactNativeHost,
   private val context: Context,
   controller: DevLauncherControllerInterface
 ) : DevLauncherExpoAppLoader(manifest, appHost, context, controller) {
   override fun injectBundleLoader(): Boolean {
-    return injectReactInterceptor(context, appHost, Uri.parse(manifest.bundleUrl))
+    return injectReactInterceptor(context, appHost, Uri.parse(manifest.getBundleURL()))
   }
 }

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

@@ -3,19 +3,15 @@ package expo.modules.devlauncher.launcher.loaders
 import android.content.Context
 import com.facebook.react.ReactNativeHost
 import expo.modules.devlauncher.helpers.injectLocalBundleLoader
-import expo.modules.devlauncher.helpers.isValidColor
-import expo.modules.devlauncher.helpers.setProtectedDeclaredField
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.launcher.configurators.DevLauncherExpoActivityConfigurator
-import expo.modules.devlauncher.launcher.manifest.DevLauncherUserInterface
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
+import expo.modules.manifests.core.Manifest
 
 /**
  * Implementation of DevLauncherExpoAppLoader which is used for loading published projects served
  * remotely.
  */
 class DevLauncherPublishedAppLoader(
-  manifest: DevLauncherManifest,
+  manifest: Manifest,
   private val localBundlePath: String,
   private val appHost: ReactNativeHost,
   context: Context,

package/android/src/debug/java/expo/modules/devlauncher/modules/DevLauncherInternalModule.kt

@@ -100,7 +100,12 @@ class DevLauncherInternalModule(reactContext: ReactApplicationContext?)
 
   @ReactMethod
   fun getPendingDeepLink(promise: Promise) {
-    promise.resolve(intentRegistry.intent?.data?.toString())
+    intentRegistry.intent?.data?.let {
+      promise.resolve(it.toString())
+      return
+    }
+
+    promise.resolve(intentRegistry.intent?.action)
   }
 
   private fun onNewPendingIntent(intent: Intent) {

package/android/src/debug/java/expo/modules/devlauncher/modules/DevLauncherModule.kt

@@ -15,7 +15,7 @@ class DevLauncherModule(reactContext: ReactApplicationContext?) : ReactContextBa
 
   override fun getConstants(): Map<String, Any?> {
     val manifestString = try {
-      controller?.manifest?.rawData
+      controller?.manifest?.getRawJson().toString()
     } catch (_: IllegalStateException) {
       null
     }

package/android/src/main/java/expo/modules/devlauncher/launcher/DevLauncherControllerInterface.kt

@@ -7,7 +7,7 @@ import com.facebook.react.ReactActivityDelegate
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.bridge.ReactContext
 import expo.modules.devlauncher.DevLauncherController
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
+import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 
 interface DevLauncherControllerInterface {
@@ -21,7 +21,7 @@ interface DevLauncherControllerInterface {
   fun getCurrentReactActivityDelegate(activity: ReactActivity, delegateSupplierDevLauncher: DevLauncherReactActivityDelegateSupplier): ReactActivityDelegate
   fun handleIntent(intent: Intent?, activityToBeInvalidated: ReactActivity?): Boolean
 
-  val manifest: DevLauncherManifest?
+  val manifest: Manifest?
   val manifestURL: Uri?
   val devClientHost: DevLauncherClientHost
   val mode: DevLauncherController.Mode

package/android/src/main/java/expo/modules/devlauncher/launcher/configurators/DevLauncherExpoActivityConfigurator.kt

@@ -16,29 +16,29 @@ import com.facebook.react.ReactActivity
 import expo.modules.devlauncher.helpers.RGBAtoARGB
 import expo.modules.devlauncher.helpers.isValidColor
 import expo.modules.devlauncher.launcher.manifest.DevLauncherOrientation
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
 import expo.modules.devlauncher.launcher.manifest.DevLauncherStatusBarStyle
+import expo.modules.manifests.core.Manifest
 
 class DevLauncherExpoActivityConfigurator(
-  private var manifest: DevLauncherManifest,
+  private var manifest: Manifest,
   private val context: Context
 ) {
   fun applyTaskDescription(activity: Activity) {
-    if (!isValidColor(manifest.primaryColor)) {
+    if (!isValidColor(manifest.getPrimaryColor())) {
       return
     }
-    val color = Color.parseColor(manifest.primaryColor)
+    val color = Color.parseColor(manifest.getPrimaryColor())
     val icon = BitmapFactory.decodeResource(context.resources, context.applicationInfo.icon)
 
     activity.setTaskDescription(ActivityManager.TaskDescription(
-      manifest.name,
+      manifest.getName(),
       icon,
       color
     ))
   }
 
   fun applyOrientation(activity: ReactActivity) {
-    when (manifest.orientation) {
+    when (manifest.getOrientation()) {
       DevLauncherOrientation.DEFAULT -> activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
       DevLauncherOrientation.PORTRAIT -> activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
       DevLauncherOrientation.LANDSCAPE -> activity.requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
@@ -47,10 +47,11 @@ class DevLauncherExpoActivityConfigurator(
   }
 
   fun applyStatusBarConfiguration(activity: ReactActivity) {
-    val style = manifest.androidStatusBar?.barStyle
-    val backgroundColor = manifest.androidStatusBar?.backgroundColor
-    val translucent = manifest.androidStatusBar?.translucent ?: true
-    val hidden = manifest.androidStatusBar?.hidden ?: false
+    val statusBarOptions = manifest.getAndroidStatusBarOptions()
+    val style = statusBarOptions?.optString("barStyle")
+    val backgroundColor = statusBarOptions?.optString("backgroundColor")
+    val translucent = statusBarOptions == null || statusBarOptions.optBoolean("translucent", true)
+    val hidden = statusBarOptions != null && statusBarOptions.optBoolean("hidden", false)
 
     activity.runOnUiThread {
       // clear android:windowTranslucentStatus flag from Window as RN achieves translucency using WindowInsets
@@ -80,7 +81,7 @@ class DevLauncherExpoActivityConfigurator(
   }
 
   @UiThread
-  private fun setStyle(style: DevLauncherStatusBarStyle?, activity: Activity): DevLauncherStatusBarStyle {
+  private fun setStyle(style: String?, activity: Activity): String {
     var appliedStatusBarStyle = DevLauncherStatusBarStyle.LIGHT
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
       val decorView = activity.window.decorView

package/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifestParser.kt

@@ -3,7 +3,9 @@ package expo.modules.devlauncher.launcher.manifest
 import android.net.Uri
 import expo.modules.devlauncher.helpers.await
 import expo.modules.devlauncher.helpers.fetch
+import expo.modules.manifests.core.Manifest
 import okhttp3.OkHttpClient
+import org.json.JSONObject
 import java.io.Reader
 
 class DevLauncherManifestParser(
@@ -28,9 +30,9 @@ class DevLauncherManifestParser(
     return response.body()!!.charStream()
   }
 
-  suspend fun parseManifest(): DevLauncherManifest {
+  suspend fun parseManifest(): Manifest {
     downloadManifest().use {
-      return DevLauncherManifest.fromJson(it)
+      return Manifest.fromManifestJson(JSONObject(it.readText()))
     }
   }
 }

package/android/src/main/java/expo/modules/devlauncher/launcher/manifest/DevLauncherManifestTypes.kt

@@ -1,33 +1,18 @@
 package expo.modules.devlauncher.launcher.manifest
 
-import com.google.gson.annotations.SerializedName
-
-enum class DevLauncherOrientation {
-  @SerializedName("default")
-  DEFAULT,
-
-  @SerializedName("portrait")
-  PORTRAIT,
-
-  @SerializedName("landscape")
-  LANDSCAPE
+object DevLauncherOrientation {
+  const val DEFAULT = "default"
+  const val PORTRAIT = "portrait"
+  const val LANDSCAPE = "landscape"
 }
 
-enum class DevLauncherUserInterface {
-  @SerializedName("automatic")
-  AUTOMATIC,
-
-  @SerializedName("dark")
-  DARK,
-
-  @SerializedName("light")
-  LIGHT
+object DevLauncherUserInterface {
+  const val AUTOMATIC = "automatic"
+  const val DARK = "dark"
+  const val LIGHT = "light"
 }
 
-enum class DevLauncherStatusBarStyle {
-  @SerializedName("dark-content")
-  DARK,
-
-  @SerializedName("light-content")
-  LIGHT
+object DevLauncherStatusBarStyle {
+  const val DARK = "dark-content"
+  const val LIGHT = "light-content"
 }

package/android/src/main/java/expo/modules/devlauncher/launcher/menu/DevLauncherMenuDelegate.kt

@@ -26,10 +26,10 @@ private class LauncherDelegate(private val controller: DevLauncherControllerInte
 
 private class AppDelegate(private val controller: DevLauncherControllerInterface) : DevMenuDelegateInterface {
   override fun appInfo(): Bundle = Bundle().apply {
-    putString("appName", controller.manifest?.name ?: "Development Client - App")
-    putString("appVersion", controller.manifest?.version)
+    putString("appName", controller.manifest?.getName() ?: "Development Client - App")
+    putString("appVersion", controller.manifest?.getVersion())
     putString("appIcon", null)
-    putString("hostUrl", controller.manifest?.hostUri
+    putString("hostUrl", controller.manifest?.getHostUri()
       ?: reactInstanceManager().devSupportManager?.sourceUrl)
   }
 

package/android/src/release/java/expo/modules/devlauncher/DevLauncherController.kt

@@ -10,7 +10,7 @@ import com.facebook.react.bridge.ReactContext
 import expo.modules.devlauncher.launcher.DevLauncherClientHost
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
 import expo.modules.devlauncher.launcher.DevLauncherReactActivityDelegateSupplier
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
+import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 
 const val DEV_LAUNCHER_IS_NOT_AVAILABLE = "DevLauncher isn't available in release builds"
@@ -28,7 +28,7 @@ class DevLauncherController private constructor() : DevLauncherControllerInterfa
   override val devClientHost: DevLauncherClientHost
     get() = throw IllegalStateException(DEV_LAUNCHER_IS_NOT_AVAILABLE)
 
-  override val manifest: DevLauncherManifest
+  override val manifest: Manifest
     get() = throw IllegalStateException(DEV_LAUNCHER_IS_NOT_AVAILABLE)
 
   override val manifestURL: Uri

package/android/src/testDebug/java/expo/modules/devlauncher/DevLauncherControllerTest.kt

@@ -0,0 +1,50 @@
+package expo.modules.devlauncher
+
+import android.content.Intent
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.facebook.react.ReactNativeHost
+import com.google.common.truth.Truth
+import expo.interfaces.devmenu.DevMenuManagerInterface
+import expo.modules.devlauncher.koin.DevLauncherKoinContext
+import expo.modules.devlauncher.tests.DevLauncherTestInterceptor
+import io.mockk.mockk
+import io.mockk.verify
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class DevLauncherControllerTest {
+
+  internal class DevLauncherTestInterceptorAllowReinitialization : DevLauncherTestInterceptor {
+    override fun allowReinitialization() = true
+  }
+
+  @Before
+  fun setup() {
+    val reactNativeHost = mockk<ReactNativeHost>(relaxed = true)
+    DevLauncherKoinContext.reinitialize()
+    DevLauncherKoinContext.app.koin.declare(DevLauncherTestInterceptorAllowReinitialization())
+    DevLauncherController.initialize(ApplicationProvider.getApplicationContext(), reactNativeHost)
+  }
+
+  @Test
+  fun `sets shouldAutoLaunch on dev menu manager`() {
+    val controller = DevLauncherController.instance as DevLauncherController
+    val mockDevMenuManager = mockk<DevMenuManagerInterface>(relaxed = true)
+    controller.devMenuManager = mockDevMenuManager
+    Truth.assertThat(controller.canLaunchDevMenuOnStart).isTrue()
+
+    controller.handleIntent(Intent().apply {
+      data = Uri.parse("https://expo-development-client")
+      putExtra("EXDevMenuDisableAutoLaunch", true)
+    }, null)
+
+    verify {
+      mockDevMenuManager.setCanLaunchDevMenuOnStart(false)
+    }
+    Truth.assertThat(controller.canLaunchDevMenuOnStart).isFalse()
+  }
+}

package/android/src/testDebug/java/expo/modules/devlauncher/launcher/DevLauncherRecentlyOpenedAppsRegistryTest.kt

@@ -0,0 +1,43 @@
+package expo.modules.devlauncher.launcher
+
+import android.net.Uri
+import androidx.test.core.app.ApplicationProvider
+import com.google.common.truth.Truth
+import io.mockk.every
+import io.mockk.mockkObject
+import io.mockk.unmockkAll
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+internal class DevLauncherRecentlyOpenedAppsRegistryTest {
+  @Test
+  fun `adds app to registry`() {
+    val urlString = "http://localhost:8081"
+    val registry = DevLauncherRecentlyOpenedAppsRegistry(ApplicationProvider.getApplicationContext())
+    registry.appWasOpened(Uri.parse(urlString), "test-app")
+    val apps = registry.getRecentlyOpenedApps()
+    Truth.assertThat(apps[urlString]).isEqualTo("test-app")
+  }
+
+  @Test
+  fun `removes app from registry after 3 days have elapsed`() {
+    val currentTime = System.currentTimeMillis()
+    val time3DaysAnd1SecondAgo = currentTime - ((1000 * 60 * 60 * 24 * 3) + 1000)
+
+    mockkObject(DevLauncherRecentlyOpenedAppsRegistry.TimeHelper)
+    every {
+      DevLauncherRecentlyOpenedAppsRegistry.TimeHelper.getCurrentTime()
+    } returns time3DaysAnd1SecondAgo
+
+    val urlString = "http://localhost:8081"
+    val registry = DevLauncherRecentlyOpenedAppsRegistry(ApplicationProvider.getApplicationContext())
+    registry.appWasOpened(Uri.parse(urlString), "test-app")
+
+    unmockkAll()
+
+    val apps = registry.getRecentlyOpenedApps()
+    Truth.assertThat(apps[urlString]).isNull()
+  }
+}

package/android/src/testDebug/java/expo/modules/devlauncher/launcher/loaders/DevLauncherAppLoaderFactoryTest.kt

@@ -8,8 +8,8 @@ import com.google.common.truth.Truth
 import expo.modules.devlauncher.helpers.loadUpdate
 import expo.modules.devlauncher.koin.DevLauncherKoinContext
 import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
-import expo.modules.devlauncher.launcher.manifest.DevLauncherManifest
 import expo.modules.devlauncher.launcher.manifest.DevLauncherManifestParser
+import expo.modules.manifests.core.Manifest
 import expo.modules.updatesinterface.UpdatesInterface
 import io.mockk.coEvery
 import io.mockk.mockk
@@ -64,7 +64,7 @@ internal class DevLauncherAppLoaderFactoryTest {
     val appLoaderFactory = DevLauncherAppLoaderFactory()
 
     val manifestParser = mockk<DevLauncherManifestParser>()
-    val manifest = DevLauncherManifest.fromJson(developmentManifestJSONString.reader())
+    val manifest = Manifest.fromManifestJson(JSONObject(developmentManifestJSONString))
     coEvery { manifestParser.isManifestUrl() } returns true
     coEvery { manifestParser.parseManifest() } returns manifest
 
@@ -78,7 +78,7 @@ internal class DevLauncherAppLoaderFactoryTest {
     val appLoaderFactory = DevLauncherAppLoaderFactory()
 
     val manifestParser = mockk<DevLauncherManifestParser>()
-    val manifest = DevLauncherManifest.fromJson(publishedManifestJSONString.reader())
+    val manifest = Manifest.fromManifestJson(JSONObject(publishedManifestJSONString))
     coEvery { manifestParser.isManifestUrl() } returns true
     coEvery { manifestParser.parseManifest() } returns manifest
 

package/android/src/testDebug/java/expo/modules/devlauncher/modules/DevLauncherModuleTest.kt

@@ -0,0 +1,38 @@
+package expo.modules.devlauncher.modules
+
+import android.net.Uri
+import com.facebook.react.bridge.ReactApplicationContext
+import com.google.common.truth.Truth
+import expo.modules.devlauncher.koin.DevLauncherKoinContext
+import expo.modules.devlauncher.launcher.DevLauncherControllerInterface
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.koin.dsl.module
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class DevLauncherModuleTest {
+
+  @Test
+  fun `exports manifestURL for currently loaded app`() {
+    // used by snack
+
+    val urlString = "https://exp.host/@test/test?query=param"
+    val manifestURL = Uri.parse(urlString)
+
+    val devLauncherController = mockk<DevLauncherControllerInterface>(relaxed = true)
+    DevLauncherKoinContext.app.koin.loadModules(listOf(
+        module {
+          single { devLauncherController }
+        }
+    ))
+    every { devLauncherController.manifestURL } returns manifestURL
+
+    val reactApplicationContext = mockk<ReactApplicationContext>(relaxed = true)
+    val module = DevLauncherModule(reactApplicationContext)
+    val constants = module.constants
+    Truth.assertThat(constants["manifestURL"]).isEqualTo(urlString)
+  }
+}

package/build/DevLauncherErrorManager.js

@@ -1,4 +1,5 @@
 let isErrorHandlingEnabled = true;
+let wasHit = false; // whether the original error handler was called
 const unavailableErrorPossibleSolutions = `Some possible solutions:
 - Make sure that the method is available on the current platform.
 - Make sure you're using the newest available version of this development client.
@@ -32,8 +33,14 @@ function customizeError(error) {
 }
 function errorHandler(originalHandler, error, isFatal) {
     if (error instanceof Error) {
+        // Suppresses `"main" has not been registered` error only if it was caused by a different error.
+        // Otherwise, we want to show it, cause the user may forget to call `AppRegistry.registerComponent`.
+        if (wasHit && error.message?.includes('has not been registered. This can happen if')) {
+            return;
+        }
         customizeError(error);
     }
+    wasHit = true;
     originalHandler(error, isFatal);
 }
 export function createErrorHandler(originalHandler) {

package/build/DevLauncherErrorManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"DevLauncherErrorManager.js","sourceRoot":"","sources":["../src/DevLauncherErrorManager.ts"],"names":[],"mappings":"AAGA,IAAI,sBAAsB,GAAG,IAAI,CAAC;AAElC,MAAM,iCAAiC,GAAG;;;;mGAIyD,CAAC;AAEpG,MAAM,gCAAgC,GAAG;;;mGAG0D,CAAC;AAEpG,SAAS,2BAA2B,CAAC,KAAiB;IACpD,KAAK,CAAC,OAAO,IAAI,MAAM,GAAG,iCAAiC,CAAC;AAC9D,CAAC;AAED,SAAS,+BAA+B,CAAC,KAAY;IACnD,KAAK,CAAC,OAAO,GAAG;;EAEhB,gCAAgC,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,KAAyB;IAC/C,IAAI,MAAM,IAAI,KAAK,EAAE;QACnB,sCAAsC;QACtC,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,iBAAiB,CAAC,CAAC;gBACtB,2BAA2B,CAAC,KAAK,CAAC,CAAC;gBACnC,MAAM;aACP;SACF;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE;QACjE,+BAA+B,CAAC,KAAK,CAAC,CAAC;KACxC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO;IACnD,IAAI,KAAK,YAAY,KAAK,EAAE;QAC1B,cAAc,CAAC,KAAK,CAAC,CAAC;KACvB;IAED,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,eAAe;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,IAAI,sBAAsB,EAAE;YAC1B,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO;SACR;QAED,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,sBAAsB,GAAG,KAAK,CAAC;AACjC,CAAC","sourcesContent":["// Similar interface to the one used in expo modules.\ntype CodedError = Error & { code?: string };\n\nlet isErrorHandlingEnabled = true;\n\nconst unavailableErrorPossibleSolutions = `Some possible solutions:\n- Make sure that the method is available on the current platform.\n- Make sure you're using the newest available version of this development client.\n- Make sure you're running a compatible version of your JavaScript code.\n- If you've installed a new library recently, you may need to make a new development client build.`;\n\nconst moduleIsMissingPossibleSolutions = `Some possible solutions:\n- Make sure you're using the newest available version of this development client.\n- Make sure you're running a compatible version of your JavaScript code.\n- If you've installed a new library recently, you may need to make a new development client build.`;\n\nfunction customizeUnavailableMessage(error: CodedError) {\n  error.message += '\\n\\n' + unavailableErrorPossibleSolutions;\n}\n\nfunction customizeModuleIsMissingMessage(error: Error) {\n  error.message = `Your JavaScript code tried to access a native module that doesn't exist in this development client. \n\n${moduleIsMissingPossibleSolutions}`;\n}\n\nfunction customizeError(error: Error | CodedError) {\n  if ('code' in error) {\n    // It's a CodedError from expo modules\n    switch (error.code) {\n      case 'ERR_UNAVAILABLE': {\n        customizeUnavailableMessage(error);\n        break;\n      }\n    }\n  } else if (error.message.includes('Native module cannot be null')) {\n    customizeModuleIsMissingMessage(error);\n  }\n}\n\nfunction errorHandler(originalHandler, error, isFatal) {\n  if (error instanceof Error) {\n    customizeError(error);\n  }\n\n  originalHandler(error, isFatal);\n}\n\nexport function createErrorHandler(originalHandler) {\n  return (error, isFatal) => {\n    if (isErrorHandlingEnabled) {\n      errorHandler(originalHandler, error, isFatal);\n      return;\n    }\n\n    originalHandler(error, isFatal);\n  };\n}\n\nexport function disableErrorHandling() {\n  isErrorHandlingEnabled = false;\n}\n"]}
+{"version":3,"file":"DevLauncherErrorManager.js","sourceRoot":"","sources":["../src/DevLauncherErrorManager.ts"],"names":[],"mappings":"AAGA,IAAI,sBAAsB,GAAG,IAAI,CAAC;AAClC,IAAI,MAAM,GAAG,KAAK,CAAC,CAAC,gDAAgD;AAEpE,MAAM,iCAAiC,GAAG;;;;mGAIyD,CAAC;AAEpG,MAAM,gCAAgC,GAAG;;;mGAG0D,CAAC;AAEpG,SAAS,2BAA2B,CAAC,KAAiB;IACpD,KAAK,CAAC,OAAO,IAAI,MAAM,GAAG,iCAAiC,CAAC;AAC9D,CAAC;AAED,SAAS,+BAA+B,CAAC,KAAY;IACnD,KAAK,CAAC,OAAO,GAAG;;EAEhB,gCAAgC,EAAE,CAAC;AACrC,CAAC;AAED,SAAS,cAAc,CAAC,KAAyB;IAC/C,IAAI,MAAM,IAAI,KAAK,EAAE;QACnB,sCAAsC;QACtC,QAAQ,KAAK,CAAC,IAAI,EAAE;YAClB,KAAK,iBAAiB,CAAC,CAAC;gBACtB,2BAA2B,CAAC,KAAK,CAAC,CAAC;gBACnC,MAAM;aACP;SACF;KACF;SAAM,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,8BAA8B,CAAC,EAAE;QACjE,+BAA+B,CAAC,KAAK,CAAC,CAAC;KACxC;AACH,CAAC;AAED,SAAS,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO;IACnD,IAAI,KAAK,YAAY,KAAK,EAAE;QAC1B,gGAAgG;QAChG,oGAAoG;QACpG,IAAI,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC,6CAA6C,CAAC,EAAE;YACpF,OAAO;SACR;QACD,cAAc,CAAC,KAAK,CAAC,CAAC;KACvB;IAED,MAAM,GAAG,IAAI,CAAC;IACd,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,eAAe;IAChD,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACxB,IAAI,sBAAsB,EAAE;YAC1B,YAAY,CAAC,eAAe,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;YAC9C,OAAO;SACR;QAED,eAAe,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,sBAAsB,GAAG,KAAK,CAAC;AACjC,CAAC","sourcesContent":["// Similar interface to the one used in expo modules.\ntype CodedError = Error & { code?: string };\n\nlet isErrorHandlingEnabled = true;\nlet wasHit = false; // whether the original error handler was called\n\nconst unavailableErrorPossibleSolutions = `Some possible solutions:\n- Make sure that the method is available on the current platform.\n- Make sure you're using the newest available version of this development client.\n- Make sure you're running a compatible version of your JavaScript code.\n- If you've installed a new library recently, you may need to make a new development client build.`;\n\nconst moduleIsMissingPossibleSolutions = `Some possible solutions:\n- Make sure you're using the newest available version of this development client.\n- Make sure you're running a compatible version of your JavaScript code.\n- If you've installed a new library recently, you may need to make a new development client build.`;\n\nfunction customizeUnavailableMessage(error: CodedError) {\n  error.message += '\\n\\n' + unavailableErrorPossibleSolutions;\n}\n\nfunction customizeModuleIsMissingMessage(error: Error) {\n  error.message = `Your JavaScript code tried to access a native module that doesn't exist in this development client. \n\n${moduleIsMissingPossibleSolutions}`;\n}\n\nfunction customizeError(error: Error | CodedError) {\n  if ('code' in error) {\n    // It's a CodedError from expo modules\n    switch (error.code) {\n      case 'ERR_UNAVAILABLE': {\n        customizeUnavailableMessage(error);\n        break;\n      }\n    }\n  } else if (error.message.includes('Native module cannot be null')) {\n    customizeModuleIsMissingMessage(error);\n  }\n}\n\nfunction errorHandler(originalHandler, error, isFatal) {\n  if (error instanceof Error) {\n    // Suppresses `\"main\" has not been registered` error only if it was caused by a different error.\n    // Otherwise, we want to show it, cause the user may forget to call `AppRegistry.registerComponent`.\n    if (wasHit && error.message?.includes('has not been registered. This can happen if')) {\n      return;\n    }\n    customizeError(error);\n  }\n\n  wasHit = true;\n  originalHandler(error, isFatal);\n}\n\nexport function createErrorHandler(originalHandler) {\n  return (error, isFatal) => {\n    if (isErrorHandlingEnabled) {\n      errorHandler(originalHandler, error, isFatal);\n      return;\n    }\n\n    originalHandler(error, isFatal);\n  };\n}\n\nexport function disableErrorHandling() {\n  isErrorHandlingEnabled = false;\n}\n"]}

package/expo-dev-launcher.podspec

@@ -13,6 +13,7 @@ Pod::Spec.new do |s|
   s.platform       = :ios, '11.0'
   s.swift_version  = '5.2'
   s.source         = { :git => 'https://github.com/github_account/expo-development-client.git', :tag => "#{s.version}" }
+  s.static_framework = true
   s.source_files   = 'ios/**/*.{h,m,swift,cpp}'
   s.preserve_paths = 'ios/**/*.{h,m,swift}'
   s.exclude_files  = ['ios/Unsafe/**/*.{h,m,mm,swift,cpp}', 'ios/Tests/**/*.{h,m,swift}']
@@ -37,6 +38,7 @@ Pod::Spec.new do |s|
   
   s.dependency "React-Core"
   s.dependency "expo-dev-menu-interface"
+  s.dependency "EXManifests"
   s.dependency "EXUpdatesInterface"
   
   s.subspec 'Unsafe' do |unsafe|

package/ios/EXDevLauncher.m

@@ -3,7 +3,12 @@
 #import "EXDevLauncher.h"
 #import "EXDevLauncherController.h"
 
+#if __has_include(<EXDevLauncher/EXDevLauncher-Swift.h>)
+// For cocoapods framework, the generated swift header will be inside EXDevLauncher module
+#import <EXDevLauncher/EXDevLauncher-Swift.h>
+#else
 #import <EXDevLauncher-Swift.h>
+#endif
 
 @implementation EXDevLauncher
 
@@ -16,10 +21,11 @@ RCT_EXPORT_MODULE()
 
 - (NSDictionary *)constantsToExport
 {
-  NSString *manifestString = [EXDevLauncherController.sharedInstance appManifest].rawData;
+  NSDictionary *rawManifestJSON = [EXDevLauncherController.sharedInstance appManifest].rawManifestJSON;
+  NSData *manifestStringData = rawManifestJSON ? [NSJSONSerialization dataWithJSONObject:rawManifestJSON options:kNilOptions error:NULL] : nil;
   NSString *manifestURLString = [EXDevLauncherController.sharedInstance appManifestURL].absoluteString;
   return @{
-    @"manifestString": manifestString ?: [NSNull null],
+    @"manifestString": manifestStringData ? [[NSString alloc] initWithData:manifestStringData encoding:NSUTF8StringEncoding] : [NSNull null],
     @"manifestURL": manifestURLString ?: [NSNull null]
   };
 }

package/ios/EXDevLauncher.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>

package/ios/EXDevLauncher.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>