expo-dev-client 0.4.7 → 0.6.1

package/.detoxrc.json

@@ -0,0 +1,41 @@
+{
+  "test-runner": "jest",
+  "runnerConfig": "e2e/config.json",
+  "skipLegacyWorkersInjection": true,
+  "devices": {
+    "emulator": {
+      "type": "android.emulator",
+      "device": {
+        "avdName": "DevClientEmulator"
+      }
+    },
+    "simulator": {
+      "type": "ios.simulator",
+      "device": {
+        "type": "iPhone 8"
+      }
+    }
+  },
+  "apps": {
+    "android.debug": {
+      "type": "android.apk",
+      "binaryPath": "android/app/build/outputs/apk/debug/app-debug.apk",
+      "build": "cd android && ./gradlew assembleDebug assembleAndroidTest -DtestBuildType=debug && cd .."
+    },
+    "ios.debug": {
+      "type": "ios.app",
+      "binaryPath": "ios/build/Build/Products/Debug-iphonesimulator/dev-client-e2e.app",
+      "build": "xcodebuild -workspace ios/dev-client-e2e.xcworkspace -scheme dev-client-e2e -configuration Debug -sdk iphonesimulator -arch x86_64 -derivedDataPath ios/build"
+    }
+  },
+  "configurations": {
+    "android": {
+      "device": "emulator",
+      "app": "android.debug"
+    },
+    "ios": {
+      "device": "simulator",
+      "app": "ios.debug"  
+    }
+  }
+}

package/CHANGELOG.md

@@ -10,6 +10,51 @@
 
 ### 💡 Others
 
+## 0.6.1 — 2021-10-15
+
+_This version does not introduce any user-facing changes._
+
+## 0.6.0 — 2021-10-07
+
+### 🛠 Breaking changes
+
+- Added a native dependency on the `expo-manifests` package. ([#14461](https://github.com/expo/expo/pull/14461) by [@esamelson](https://github.com/esamelson))
+  - This is a breaking change for projects **without `react-native-unimodules` or `expo-modules-core` installed**. In order to upgrade from `expo-dev-client@0.5.1` or below to this version in such projects, the following changes must be made:
+    - In `ios/Podfile`, change the deployment target to `platform :ios, '12.0'` and add the following lines inside the main target:
+      ```ruby
+      pod 'EXJSONUtils', path: '../node_modules/expo-json-utils/ios', :configurations => :debug
+      pod 'EXManifests', path: '../node_modules/expo-manifests/ios', :configurations => :debug
+      ```
+    - In `android/settings.gradle`, add the following lines:
+      ```groovy
+      include ':expo-json-utils'
+      project(':expo-json-utils').projectDir = new File('../node_modules/expo-json-utils/android')
+      
+      ```
+      include ':expo-manifests'
+project(':expo-manifests').projectDir = new File('../node_modules/expo-manifests/android')
+```
+  - No additional setup is necessary for projects already using `react-native-unimodules` or `expo-modules-core`.
+- Replace Android DevLauncherManifest class with `expo-manifests`. ([#14462](https://github.com/expo/expo/pull/14462) by [@esamelson](https://github.com/esamelson))
+
+### 🐛 Bug fixes
+
+- Fix building errors from use_frameworks! in Podfile. ([#14523](https://github.com/expo/expo/pull/14523) by [@kudo](https://github.com/kudo))
+
+### 💡 Others
+
+- Updated `@expo/config-plugins` ([#14443](https://github.com/expo/expo/pull/14443) by [@EvanBacon](https://github.com/EvanBacon))
+
+## 0.5.1 — 2021-09-03
+
+_This version does not introduce any user-facing changes._
+
+## 0.5.0 — 2021-09-02
+
+### 💡 Others
+
+- Fix .npmignore and remove `tests/` directory from published npm package. ([#13990](https://github.com/expo/expo/pull/13990) by [@esamelson](https://github.com/esamelson))
+
 ## 0.4.7 — 2021-08-06
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -1,12 +1,11 @@
 # expo-dev-client
 
-This is a preview version of the Expo Development Client.
+`expo-dev-client` is an npm package installable in any Expo or React Native project. Once installed, any Debug builds of your application will gain an extensible debug menu and the ability to load projects from Expo CLI. Release builds of your application will not change other than the addition of a few header files. Your debug builds can be shared with anyone on your team who needs to work on or review your application. Your team can develop the JavaScript portion of your application with expo-cli and your custom client without waiting for your native code to build until the
+next time you need to upgrade, install a new module, or otherwise change the native code in your project.
 
 ## Documentation
 
-## Installation
-
-See [Installation](https://docs.expo.io/clients/installation/)
+You can find the documentation under [https://docs.expo.io/clients/introduction](https://docs.expo.io/clients/introduction).
 
 ## Contributing
 

package/android/build.gradle

@@ -23,7 +23,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet('targetSdkVersion', 30)
     versionCode 1
-    versionName "0.4.7"
+    versionName "0.6.1"
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }
@@ -81,6 +81,7 @@ dependencies {
   androidTestImplementation project(":expo-updates-interface")
   androidTestImplementation project(":expo-dev-menu")
   androidTestImplementation project(":expo-dev-launcher")
+  androidTestImplementation project(":expo-manifests")
 
   //noinspection GradleDynamicVersion
   androidTestImplementation 'com.facebook.react:react-native:+'  // From node_modules

package/dependencies.js

@@ -10,6 +10,9 @@ module.exports = {
   'expo-dev-menu-interface': {
     root: resolve('expo-dev-menu-interface'),
   },
+  'expo-manifests': {
+    root: resolve('expo-manifests'),
+  },
   'expo-updates-interface': {
     root: resolve('expo-updates-interface'),
   },

package/e2e/DevLauncher.e2e.ts

@@ -0,0 +1,104 @@
+import { element, expect, waitFor, by, device } from 'detox';
+
+const MenuTimeout = 50000;
+const LauncherMainScreenTimeout = 30000;
+const LocalAppTimeout = 60000;
+
+function getInvocationManager() {
+  // @ts-ignore
+  return global.detox[Object.getOwnPropertySymbols(global.detox)[0]]._invocationManager;
+}
+
+function getLocalIPAddress(): string {
+  if (device.getPlatform() === 'ios') {
+    return 'localhost';
+  }
+  return require('os')
+    .networkInterfaces()
+    .en0.find((elm: { family: string }) => elm.family === 'IPv4').address;
+}
+
+async function openMenu(): Promise<void> {
+  if (device.getPlatform() === 'android') {
+    return getInvocationManager().execute({
+      target: {
+        type: 'Class',
+        value: 'com.testrunner.DevClientDetoxHelper',
+      },
+      method: 'openMenu',
+      args: [],
+    });
+  }
+  return await device.shake();
+}
+
+describe('DevLauncher', () => {
+  beforeEach(async () => {
+    await device.launchApp({ newInstance: true });
+  });
+
+  it('should render main screen', async () => {
+    await expect(element(by.id('DevLauncherMainScreen'))).toBeVisible();
+  });
+
+  it('should be able to open dev menu', async () => {
+    await expect(element(by.id('DevLauncherMainScreen'))).toBeVisible();
+
+    await openMenu();
+
+    await waitFor(element(by.id('DevMenuMainScreen')))
+      .toBeVisible()
+      .withTimeout(MenuTimeout);
+  });
+
+  it('should be able to load app from URL', async () => {
+    const urlInput = element(by.id('DevLauncherURLInput'));
+    const loadButton = element(by.id('DevLauncherLoadAppButton'));
+
+    await expect(urlInput).toBeVisible();
+    await expect(loadButton).toBeVisible();
+
+    await urlInput.typeText(`http://${getLocalIPAddress()}:8081`);
+    if (device.getPlatform() === 'android') {
+      // close keyboard
+      await device.pressBack();
+    }
+    await loadButton.multiTap(2);
+
+    await waitFor(element(by.id('LocalAppMainScreen')))
+      .toBeVisible()
+      .withTimeout(LocalAppTimeout);
+  });
+
+  it('should be able to come back to the dev launcher screen', async () => {
+    const urlInput = element(by.id('DevLauncherURLInput'));
+    const loadButton = element(by.id('DevLauncherLoadAppButton'));
+
+    await expect(urlInput).toBeVisible();
+    await expect(loadButton).toBeVisible();
+
+    await urlInput.typeText(`http://${getLocalIPAddress()}:8081`);
+    if (device.getPlatform() === 'android') {
+      // close keyboard
+      await device.pressBack();
+    }
+    await loadButton.multiTap(2);
+
+    await waitFor(element(by.id('LocalAppMainScreen')))
+      .toBeVisible()
+      .withTimeout(LocalAppTimeout);
+
+    await openMenu();
+
+    const backToLauncher = element(by.text('Back to Launcher'));
+
+    await waitFor(backToLauncher)
+      .toBeVisible()
+      .withTimeout(MenuTimeout);
+    await backToLauncher.tap();
+
+    await waitFor(element(by.id('DevLauncherMainScreen')))
+      .toBeVisible()
+      .withTimeout(LauncherMainScreenTimeout);
+  });
+});

package/e2e/android/DetoxTest.java

@@ -0,0 +1,92 @@
+package com.testrunner;
+
+import static androidx.test.espresso.Espresso.onView;
+import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.wix.detox.Detox;
+import com.wix.detox.config.DetoxConfig;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import expo.modules.devlauncher.DevLauncherController;
+import expo.modules.devlauncher.launcher.DevLauncherActivity;
+import expo.modules.devmenu.DevMenuManager;
+
+// We need this class to pass dev launcher host to detox.
+// Otherwise it won't detect that the app has been started.
+class ReactNativeHolder extends ContextWrapper implements ReactApplication {
+  public ReactNativeHolder(Context base) {
+    super(base);
+  }
+
+  @Override
+  public ReactNativeHost getReactNativeHost() {
+    return DevLauncherController.getInstance().getDevClientHost();
+  }
+}
+
+class DevClientDetoxHelper {
+  public static Activity getCurrentActivity() {
+    final Activity[] activity = new Activity[1];
+
+    onView(isRoot()).check((view, noViewFoundException) -> {
+
+      View checkedView = view;
+
+      while (checkedView instanceof ViewGroup && ((ViewGroup) checkedView).getChildCount() > 0) {
+
+        checkedView = ((ViewGroup) checkedView).getChildAt(0);
+
+        if (checkedView.getContext() instanceof Activity) {
+          activity[0] = (Activity) checkedView.getContext();
+          return;
+        }
+      }
+    });
+    return activity[0];
+  }
+
+  public static void openMenu() throws InterruptedException {
+    getInstrumentation().waitForIdleSync();
+    Activity activity = getCurrentActivity();
+    int counter = 10;
+    while (counter-- > 0 && activity == null) {
+      Thread.sleep(100);
+      activity = getCurrentActivity();
+    }
+
+    DevMenuManager.INSTANCE.openMenu(activity, null);
+  }
+}
+
+@RunWith(AndroidJUnit4.class)
+@LargeTest
+public class DetoxTest {
+  @Rule
+  public ActivityTestRule<DevLauncherActivity> mActivityRule = new ActivityTestRule<>(DevLauncherActivity.class, false, false);
+
+  @Test
+  public void runDetoxTests() {
+    DetoxConfig detoxConfig = new DetoxConfig();
+    detoxConfig.idlePolicyConfig.masterTimeoutSec = 90;
+    detoxConfig.rnContextLoadTimeoutSec = 180;
+
+    ReactNativeHolder reactNativeHolder = new ReactNativeHolder(getInstrumentation().getTargetContext().getApplicationContext());
+    Detox.runTests(mActivityRule, reactNativeHolder, detoxConfig);
+  }
+}

package/e2e/android/MainActivity.java

@@ -0,0 +1,40 @@
+// custom
+package com.testrunner;
+
+import android.content.Intent;
+
+import expo.modules.devmenu.react.DevMenuAwareReactActivity;
+import com.facebook.react.ReactActivityDelegate;
+
+import expo.modules.ReactActivityDelegateWrapper;
+import expo.modules.devlauncher.DevLauncherController;
+
+public class MainActivity extends DevMenuAwareReactActivity {
+  /**
+  * Returns the name of the main component registered from JavaScript.
+  * This is used to schedule rendering of the component.
+  */
+  @Override
+  protected String getMainComponentName() {
+    return "main";
+  }
+
+  @Override
+  public void onNewIntent(Intent intent) {
+    if (DevLauncherController.tryToHandleIntent(this, intent)) {
+      return;
+    }
+    super.onNewIntent(intent);
+  }
+
+  @Override
+  protected ReactActivityDelegate createReactActivityDelegate() {
+    return DevLauncherController.wrapReactActivityDelegate(this, () -> new ReactActivityDelegateWrapper(
+      this,
+      new ReactActivityDelegate(
+        this,
+        getMainComponentName()
+      )
+    ));
+  }
+}

package/e2e/android/MainApplication.java

@@ -0,0 +1,84 @@
+package com.testrunner;
+
+import android.app.Application;
+import android.content.res.Configuration;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.PackageList;
+import com.facebook.react.ReactApplication;
+import com.facebook.react.ReactNativeHost;
+import com.facebook.react.ReactPackage;
+import com.facebook.soloader.SoLoader;
+
+import expo.interfaces.devmenu.DevMenuSettingsInterface;
+import expo.modules.ApplicationLifecycleDispatcher;
+import expo.modules.ReactNativeHostWrapper;
+import expo.modules.devlauncher.DevLauncherController;
+import expo.modules.devmenu.DevMenuDefaultSettings;
+import expo.modules.devmenu.DevMenuManager;
+import expo.modules.devmenu.tests.DevMenuTestInterceptor;
+
+import java.util.List;
+
+public class MainApplication extends Application implements ReactApplication {
+  private final ReactNativeHost mReactNativeHost = new ReactNativeHostWrapper(
+      this,
+      new ReactNativeHost(this) {
+        @Override
+        public boolean getUseDeveloperSupport() {
+          return BuildConfig.DEBUG;
+        }
+
+        @Override
+        protected List<ReactPackage> getPackages() {
+          return new PackageList(this).getPackages();
+        }
+
+        @Override
+        protected String getJSMainModuleName() {
+          return "index";
+        }
+      });
+
+  @Override
+  public ReactNativeHost getReactNativeHost() {
+    return mReactNativeHost;
+  }
+
+  @Override
+  public void onCreate() {
+    super.onCreate();
+    SoLoader.init(this, /* native exopackage */ false);
+
+    DevMenuManager.INSTANCE.setTestInterceptor(new DevMenuTestInterceptor() {
+      @Nullable
+      @Override
+      public DevMenuSettingsInterface overrideSettings() {
+        return new DevMenuDefaultSettings() {
+          @Override
+          public boolean getShowsAtLaunch() {
+            return false;
+          }
+
+          @Override
+          public boolean isOnboardingFinished() {
+            return true;
+          }
+        };
+      }
+    });
+
+    DevLauncherController.initialize(this, mReactNativeHost);
+
+
+    ApplicationLifecycleDispatcher.onApplicationCreate(this);
+  }
+
+  @Override
+  public void onConfigurationChanged(@NonNull Configuration newConfig) {
+    super.onConfigurationChanged(newConfig);
+    ApplicationLifecycleDispatcher.onConfigurationChanged(this, newConfig);
+  }
+}

package/e2e/app/App.tsx

@@ -0,0 +1,19 @@
+import React from 'react';
+import { StyleSheet, Text, View } from 'react-native';
+
+export default function App() {
+  return (
+    <View style={styles.container} testID="LocalAppMainScreen">
+      <Text>Open up App.js to start working on your app!</Text>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: '#fff',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+});

package/e2e/config.json

@@ -0,0 +1,9 @@
+{
+  "maxWorkers": 1,
+  "testEnvironment": "./environments",
+  "testRunner": "jest-circus/runner",
+  "testTimeout": 120000,
+  "testRegex": "\\.e2e\\.ts$",
+  "reporters": ["detox/runners/jest/streamlineReporter"],
+  "verbose": true
+}

package/e2e/environments.js

@@ -0,0 +1,23 @@
+const {
+  DetoxCircusEnvironment,
+  SpecReporter,
+  WorkerAssignReporter,
+} = require('detox/runners/jest-circus');
+
+class CustomDetoxEnvironment extends DetoxCircusEnvironment {
+  constructor(config, context) {
+    super(config, context);
+
+    // Can be safely removed, if you are content with the default value (=300000ms)
+    this.initTimeout = 300000;
+
+    // This takes care of generating status logs on a per-spec basis. By default, Jest only reports at file-level.
+    // This is strictly optional.
+    this.registerListeners({
+      SpecReporter,
+      WorkerAssignReporter,
+    });
+  }
+}
+
+module.exports = CustomDetoxEnvironment;

package/e2e/ios/AppDelegate.m

@@ -0,0 +1,99 @@
+#import "AppDelegate.h"
+
+#import <React/RCTBridge.h>
+#import <React/RCTBundleURLProvider.h>
+#import <React/RCTRootView.h>
+#import <React/RCTLinkingManager.h>
+
+@import EXDevMenu;
+
+#import <EXDevLauncher/EXDevLauncherController.h>
+
+@interface DevMenuDetoxTestInterceptor : NSObject<DevMenuTestInterceptor>
+
+@end
+
+@implementation DevMenuDetoxTestInterceptor
+
+- (BOOL)isOnboardingFinishedKey
+{
+  return YES;
+}
+
+- (BOOL)shouldShowAtLaunch
+{
+  return NO;
+}
+
+@end
+
+@interface AppDelegate () <RCTBridgeDelegate>
+
+@property (nonatomic, strong) NSDictionary *launchOptions;
+
+@end
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
+{
+  [DevMenuTestInterceptorManager setTestInterceptor:[DevMenuDetoxTestInterceptor new]];
+
+  self.launchOptions = launchOptions;
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+
+  EXDevLauncherController *controller = [EXDevLauncherController sharedInstance];
+  [controller startWithWindow:self.window delegate:(id<EXDevLauncherControllerDelegate>)self launchOptions:launchOptions];
+
+  [super application:application didFinishLaunchingWithOptions:launchOptions];
+
+  return YES;
+}
+
+- (RCTBridge *)initializeReactNativeApp
+{
+  NSDictionary *launchOptions = [EXDevLauncherController.sharedInstance getLaunchOptions];
+
+  RCTBridge *bridge = [[RCTBridge alloc] initWithDelegate:self launchOptions:launchOptions];
+  RCTRootView *rootView = [[RCTRootView alloc] initWithBridge:bridge moduleName:@"main" initialProperties:nil];
+  rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
+
+  UIViewController *rootViewController = [UIViewController new];
+  rootViewController.view = rootView;
+  self.window.rootViewController = rootViewController;
+  [self.window makeKeyAndVisible];
+
+  return bridge;
+ }
+
+- (NSURL *)sourceURLForBridge:(RCTBridge *)bridge {
+  return [[EXDevLauncherController sharedInstance] sourceUrl];
+}
+
+// Linking API
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
+  if ([EXDevLauncherController.sharedInstance onDeepLink:url options:options]) {
+    return true;
+  }
+
+  return [RCTLinkingManager application:application openURL:url options:options];
+}
+
+// Universal Links
+- (BOOL)application:(UIApplication *)application continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(nonnull void (^)(NSArray<id<UIUserActivityRestoring>> * _Nullable))restorationHandler {
+  return [RCTLinkingManager application:application
+                   continueUserActivity:userActivity
+                     restorationHandler:restorationHandler];
+}
+
+@end
+
+@implementation AppDelegate (EXDevLauncherControllerDelegate)
+ 
+- (void)devLauncherController:(EXDevLauncherController *)developmentClientController
+          didStartWithSuccess:(BOOL)success
+{
+  developmentClientController.appBridge = [self initializeReactNativeApp];
+}
+ 
+@end

package/expo-dev-client.podspec

@@ -12,10 +12,12 @@ Pod::Spec.new do |s|
   s.homepage       = package['homepage']
   s.platform       = :ios, '11.0'
   s.source         = { git: 'https://github.com/expo/expo.git' }
+  s.static_framework = true
   s.header_dir     = 'EXDevClient'
 
   s.dependency 'expo-dev-launcher', :configurations => :debug
   s.dependency 'expo-dev-menu', :configurations => :debug
   s.dependency 'expo-dev-menu-interface'
+  s.dependency 'EXManifests', :configurations => :debug
   s.dependency 'EXUpdatesInterface'
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-client",
-  "version": "0.4.7",
+  "version": "0.6.1",
   "description": "Expo Development Client",
   "main": "build/DevClient.js",
   "types": "build/DevClient.d.ts",
@@ -11,7 +11,8 @@
     "test": "expo-module test",
     "prepare": "expo-module prepare",
     "prepublishOnly": "expo-module prepublishOnly",
-    "expo-module": "expo-module"
+    "expo-module": "expo-module",
+    "e2e": "expo-test-runner run-test -t e2e"
   },
   "keywords": [
     "react-native",
@@ -28,19 +29,21 @@
   },
   "author": "650 Industries, Inc.",
   "license": "MIT",
-  "homepage": "https://docs.expo.io/versions/latest/sdk/module-template",
+  "homepage": "https://docs.expo.dev/clients/introduction/",
   "dependencies": {
-    "@expo/config-plugins": "^3.0.0",
-    "expo-dev-launcher": "0.6.7",
-    "expo-dev-menu": "0.7.7",
-    "expo-dev-menu-interface": "0.3.4",
-    "expo-updates-interface": "~0.2.2"
+    "@expo/config-plugins": "^3.1.0",
+    "expo-dev-launcher": "0.8.2",
+    "expo-dev-menu": "0.8.3",
+    "expo-dev-menu-interface": "0.4.1",
+    "expo-manifests": "~0.2.2",
+    "expo-updates-interface": "~0.4.0"
   },
   "devDependencies": {
-    "expo-module-scripts": "^2.0.0"
+    "expo-module-scripts": "^2.0.0",
+    "expo-test-runner": "0.0.6"
   },
   "jest": {
     "preset": "expo-module-scripts/ios"
   },
-  "gitHead": "b588610e02acf18f338a3187882e139fd031a9b6"
+  "gitHead": "e30402e90972d9e1838d7b63a40a71a41398a772"
 }

package/plugin/build/constants.d.ts

@@ -0,0 +1 @@
+export declare const InstallationPage = "https://docs.expo.dev/clients/installation/";