expo-dev-client 0.6.3 → 0.7.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 0.7.0 — 2021-12-03
+
+### 🐛 Bug fixes
+
+- [plugin] Fix android adding duplicate schemes. ([#15057](https://github.com/expo/expo/pull/15057) by [@EvanBacon](https://github.com/EvanBacon))
+
 ## 0.6.3 — 2021-10-21
 
 _This version does not introduce any user-facing changes._

package/README.md

@@ -1,12 +1,16 @@
 # expo-dev-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
+`expo-dev-client` is an npm package installable in any Expo or React Native project. Once installed, 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
 
-You can find the documentation under [https://docs.expo.io/clients/introduction](https://docs.expo.io/clients/introduction).
+You can find the documentation under [https://docs.expo.io/clients/introduction](https://docs.expo.dev/clients/introduction).
+
+## Issues
+
+If you encounter any issues using this package in your project, please [report your issue here](https://github.com/expo/expo/issues/new?template=dev_client_bug_report.yml). 
 
 ## Contributing
 
-Contributions are very welcome! Please refer to guidelines described in the [contributing guide](https://github.com/expo/expo#contributing).
+Contributions are very welcome! Please refer to guidelines described in the [contributing guide](https://github.com/expo/expo#contributing).

package/android/build.gradle

@@ -23,7 +23,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet('targetSdkVersion', 30)
     versionCode 1
-    versionName "0.6.3"
+    versionName "0.7.0"
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }

package/e2e/DevLauncher.e2e.ts

@@ -1,8 +1,28 @@
 import { element, expect, waitFor, by, device } from 'detox';
 
-const MenuTimeout = 50000;
-const LauncherMainScreenTimeout = 30000;
-const LocalAppTimeout = 60000;
+const MenuTimeout = 70 * 1000;
+const LauncherMainScreenTimeout = 50 * 1000;
+const LocalAppTimeout = 80 * 1000;
+
+const sleep = (duration: number) =>
+  new Promise<void>((resolve) => setTimeout(() => resolve(), duration));
+
+async function pressMenuButton(buttonString: string) {
+  let button = element(by.text(buttonString));
+
+  await waitFor(button).toBeVisible().withTimeout(MenuTimeout);
+
+  // When we open the dev-menu, we will see an animation.
+  // Unfortunately, if we try to click to button before the
+  // animation finishes, it may not work. We might click different a button.
+  // So try to wait for the animation to finish.
+  await sleep(1000);
+
+  button = element(by.text(buttonString));
+  await waitFor(button).toBeVisible();
+
+  await button.tap();
+}
 
 function getInvocationManager() {
   // @ts-ignore
@@ -90,12 +110,7 @@ describe('DevLauncher', () => {
 
     await openMenu();
 
-    const backToLauncher = element(by.text('Back to Launcher'));
-
-    await waitFor(backToLauncher)
-      .toBeVisible()
-      .withTimeout(MenuTimeout);
-    await backToLauncher.tap();
+    await pressMenuButton('Back to Launcher');
 
     await waitFor(element(by.id('DevLauncherMainScreen')))
       .toBeVisible()

package/e2e/config.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-client",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "description": "Expo Development Client",
   "main": "build/DevClient.js",
   "types": "build/DevClient.d.ts",
@@ -32,18 +32,18 @@
   "homepage": "https://docs.expo.dev/clients/introduction/",
   "dependencies": {
     "@expo/config-plugins": "^4.0.2",
-    "expo-dev-launcher": "0.8.4",
-    "expo-dev-menu": "0.8.4",
+    "expo-dev-launcher": "0.9.0",
+    "expo-dev-menu": "0.8.5",
     "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-test-runner": "0.0.6"
+    "expo-test-runner": "0.0.7"
   },
   "jest": {
-    "preset": "expo-module-scripts/ios"
+    "preset": "expo-module-scripts"
   },
-  "gitHead": "4fa0497a180ae707fa860cb03858630ab7af19f4"
+  "gitHead": "33c06f161723dc5b6099b9d7eded686bd92c7bbf"
 }

package/plugin/build/withDevClient.js

@@ -11,8 +11,8 @@ const app_plugin_2 = __importDefault(require("expo-dev-menu/app.plugin"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const constants_1 = require("./constants");
-const withGeneratedAndroidScheme_1 = __importDefault(require("./withGeneratedAndroidScheme"));
-const withGeneratedIosScheme_1 = __importDefault(require("./withGeneratedIosScheme"));
+const withGeneratedAndroidScheme_1 = require("./withGeneratedAndroidScheme");
+const withGeneratedIosScheme_1 = require("./withGeneratedIosScheme");
 const pkg = require('expo-dev-client/package.json');
 const REACT_NATIVE_CONFIG_JS = `// File created by expo-dev-client/app.plugin.js
 
@@ -23,8 +23,8 @@ module.exports = {
 };
 `;
 function withReactNativeConfigJs(config) {
-    config = config_plugins_1.withDangerousMod(config, ['android', addReactNativeConfigAsync]);
-    config = config_plugins_1.withDangerousMod(config, ['ios', addReactNativeConfigAsync]);
+    config = (0, config_plugins_1.withDangerousMod)(config, ['android', addReactNativeConfigAsync]);
+    config = (0, config_plugins_1.withDangerousMod)(config, ['ios', addReactNativeConfigAsync]);
     return config;
 }
 const addReactNativeConfigAsync = async (config) => {
@@ -47,11 +47,11 @@ const addReactNativeConfigAsync = async (config) => {
     return config;
 };
 function withDevClient(config) {
-    config = app_plugin_2.default(config);
-    config = app_plugin_1.default(config);
+    config = (0, app_plugin_2.default)(config);
+    config = (0, app_plugin_1.default)(config);
     config = withReactNativeConfigJs(config);
-    config = withGeneratedAndroidScheme_1.default(config);
-    config = withGeneratedIosScheme_1.default(config);
+    config = (0, withGeneratedAndroidScheme_1.withGeneratedAndroidScheme)(config);
+    config = (0, withGeneratedIosScheme_1.withGeneratedIosScheme)(config);
     return config;
 }
-exports.default = config_plugins_1.createRunOncePlugin(withDevClient, pkg.name, pkg.version);
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withDevClient, pkg.name, pkg.version);

package/plugin/build/withGeneratedAndroidScheme.d.ts

@@ -1,5 +1,4 @@
-import { AndroidManifest } from '@expo/config-plugins';
+import { AndroidManifest, ConfigPlugin } from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
-declare const _default: import("@expo/config-plugins").ConfigPlugin<void>;
-export default _default;
+export declare const withGeneratedAndroidScheme: ConfigPlugin;
 export declare function setGeneratedAndroidScheme(config: Pick<ExpoConfig, 'scheme' | 'slug'>, androidManifest: AndroidManifest): AndroidManifest;

package/plugin/build/withGeneratedAndroidScheme.js

@@ -3,14 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setGeneratedAndroidScheme = void 0;
+exports.setGeneratedAndroidScheme = exports.withGeneratedAndroidScheme = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-const android_plugins_1 = require("@expo/config-plugins/build/plugins/android-plugins");
 const getDefaultScheme_1 = __importDefault(require("./getDefaultScheme"));
-exports.default = android_plugins_1.createAndroidManifestPlugin(setGeneratedAndroidScheme, 'withGeneratedAndroidScheme');
+const withGeneratedAndroidScheme = (config) => {
+    return (0, config_plugins_1.withAndroidManifest)(config, (config) => {
+        config.modResults = setGeneratedAndroidScheme(config, config.modResults);
+        return config;
+    });
+};
+exports.withGeneratedAndroidScheme = withGeneratedAndroidScheme;
 function setGeneratedAndroidScheme(config, androidManifest) {
     // Generate a cross-platform scheme used to launch the dev client.
-    const scheme = getDefaultScheme_1.default(config);
-    return config_plugins_1.AndroidConfig.Scheme.appendScheme(scheme, androidManifest);
+    const scheme = (0, getDefaultScheme_1.default)(config);
+    if (!config_plugins_1.AndroidConfig.Scheme.hasScheme(scheme, androidManifest)) {
+        androidManifest = config_plugins_1.AndroidConfig.Scheme.appendScheme(scheme, androidManifest);
+    }
+    return androidManifest;
 }
 exports.setGeneratedAndroidScheme = setGeneratedAndroidScheme;

package/plugin/build/withGeneratedIosScheme.d.ts

@@ -1,5 +1,4 @@
-import { IOSConfig, InfoPlist } from '@expo/config-plugins';
+import { IOSConfig, InfoPlist, ConfigPlugin } from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
-declare const _default: import("@expo/config-plugins").ConfigPlugin<void>;
-export default _default;
+export declare const withGeneratedIosScheme: ConfigPlugin;
 export declare function setGeneratedIosScheme(config: Pick<ExpoConfig, 'scheme' | 'slug'>, infoPlist: InfoPlist): IOSConfig.InfoPlist;

package/plugin/build/withGeneratedIosScheme.js

@@ -3,15 +3,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setGeneratedIosScheme = void 0;
+exports.setGeneratedIosScheme = exports.withGeneratedIosScheme = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
-const ios_plugins_1 = require("@expo/config-plugins/build/plugins/ios-plugins");
 const getDefaultScheme_1 = __importDefault(require("./getDefaultScheme"));
-exports.default = ios_plugins_1.createInfoPlistPlugin(setGeneratedIosScheme, 'withGeneratedIosScheme');
+const withGeneratedIosScheme = (config) => {
+    return (0, config_plugins_1.withInfoPlist)(config, (config) => {
+        config.modResults = setGeneratedIosScheme(config, config.modResults);
+        return config;
+    });
+};
+exports.withGeneratedIosScheme = withGeneratedIosScheme;
 function setGeneratedIosScheme(config, infoPlist) {
     // Generate a cross-platform scheme used to launch the dev client.
-    const scheme = getDefaultScheme_1.default(config);
-    const result = config_plugins_1.IOSConfig.Scheme.appendScheme(scheme, infoPlist);
-    return result;
+    const scheme = (0, getDefaultScheme_1.default)(config);
+    if (!config_plugins_1.IOSConfig.Scheme.hasScheme(scheme, infoPlist)) {
+        infoPlist = config_plugins_1.IOSConfig.Scheme.appendScheme(scheme, infoPlist);
+    }
+    return infoPlist;
 }
 exports.setGeneratedIosScheme = setGeneratedIosScheme;

package/plugin/src/withDevClient.ts

@@ -8,8 +8,8 @@ import fs from 'fs';
 import path from 'path';
 
 import { InstallationPage } from './constants';
-import withGeneratedAndroidScheme from './withGeneratedAndroidScheme';
-import withGeneratedIosScheme from './withGeneratedIosScheme';
+import { withGeneratedAndroidScheme } from './withGeneratedAndroidScheme';
+import { withGeneratedIosScheme } from './withGeneratedIosScheme';
 
 const pkg = require('expo-dev-client/package.json');
 
@@ -37,7 +37,7 @@ const addReactNativeConfigAsync: Mod = async (config) => {
         `Could not add expo-dev-client dependencies to existing file ${filename}. See expo-dev-client installation instructions to add them manually: ${InstallationPage}`
       );
     }
-  } catch (error) {
+  } catch (error: any) {
     if (error.code === 'ENOENT') {
       // The file doesn't exist, so we create it.
       fs.writeFileSync(filename, REACT_NATIVE_CONFIG_JS);

package/plugin/src/withGeneratedAndroidScheme.ts

@@ -1,10 +1,19 @@
-import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
-import { createAndroidManifestPlugin } from '@expo/config-plugins/build/plugins/android-plugins';
+import {
+  AndroidConfig,
+  AndroidManifest,
+  ConfigPlugin,
+  withAndroidManifest,
+} from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
 
 import getDefaultScheme from './getDefaultScheme';
 
-export default createAndroidManifestPlugin(setGeneratedAndroidScheme, 'withGeneratedAndroidScheme');
+export const withGeneratedAndroidScheme: ConfigPlugin = (config) => {
+  return withAndroidManifest(config, (config) => {
+    config.modResults = setGeneratedAndroidScheme(config, config.modResults);
+    return config;
+  });
+};
 
 export function setGeneratedAndroidScheme(
   config: Pick<ExpoConfig, 'scheme' | 'slug'>,
@@ -12,5 +21,8 @@ export function setGeneratedAndroidScheme(
 ): AndroidManifest {
   // Generate a cross-platform scheme used to launch the dev client.
   const scheme = getDefaultScheme(config);
-  return AndroidConfig.Scheme.appendScheme(scheme, androidManifest);
+  if (!AndroidConfig.Scheme.hasScheme(scheme, androidManifest)) {
+    androidManifest = AndroidConfig.Scheme.appendScheme(scheme, androidManifest);
+  }
+  return androidManifest;
 }

package/plugin/src/withGeneratedIosScheme.ts

@@ -1,10 +1,14 @@
-import { IOSConfig, InfoPlist } from '@expo/config-plugins';
-import { createInfoPlistPlugin } from '@expo/config-plugins/build/plugins/ios-plugins';
+import { IOSConfig, InfoPlist, withInfoPlist, ConfigPlugin } from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
 
 import getDefaultScheme from './getDefaultScheme';
 
-export default createInfoPlistPlugin(setGeneratedIosScheme, 'withGeneratedIosScheme');
+export const withGeneratedIosScheme: ConfigPlugin = (config) => {
+  return withInfoPlist(config, (config) => {
+    config.modResults = setGeneratedIosScheme(config, config.modResults);
+    return config;
+  });
+};
 
 export function setGeneratedIosScheme(
   config: Pick<ExpoConfig, 'scheme' | 'slug'>,
@@ -12,6 +16,9 @@ export function setGeneratedIosScheme(
 ): IOSConfig.InfoPlist {
   // Generate a cross-platform scheme used to launch the dev client.
   const scheme = getDefaultScheme(config);
-  const result = IOSConfig.Scheme.appendScheme(scheme, infoPlist);
-  return result;
+
+  if (!IOSConfig.Scheme.hasScheme(scheme, infoPlist)) {
+    infoPlist = IOSConfig.Scheme.appendScheme(scheme, infoPlist);
+  }
+  return infoPlist;
 }