v0.18.3

* [eas-cli] integrate push key setup in build flow

* nits

* fix lint

* pr feedback

* pr feedback

.github/PULL_REQUEST_TEMPLATE

@@ -1,3 +1,10 @@
+<!-- Thanks for contributing to _EAS CLI_! Before you submit your pull request, please make sure to check the following boxes by putting an x in the [ ] (don't: [x ], [ x], do: [x]) -->
+
+# Checklist
+
+- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary.
+- [ ] I've tagged the changelog entry with `[EAS BUILD API]` if it's a part of a breaking change to EAS Build API (only possible when updating `@expo/eas-build-job` package).
+
 # Why
 
 Please describe the motivation for this PR, and link to relevant GitHub issues, forums posts, or feature requests.

.github/workflows/test.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files
-      - run: yarn lerna run build
+      - run: yarn typecheck
       - run: yarn test
         if: ${{ !matrix.coverage }}
       - run: yarn test --coverage

.yarnrc

@@ -0,0 +1 @@
+save-prefix ""

CHANGELOG.md

@@ -0,0 +1,360 @@
+# Changelog
+
+This is the log of notable changes to EAS CLI and related packages.
+
+## main
+
+### 🛠 Breaking changes
+
+### 🎉 New features
+
+- Push Key setup integrated with ios build command ([#473](https://github.com/expo/eas-cli/pull/473) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix android builds for PKCS12 keystores. ([#484](https://github.com/expo/eas-cli/pull/484) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+## [0.18.2](https://github.com/expo/eas-cli/releases/tag/v0.18.2) - 2021-06-25
+
+### 🎉 New features
+
+- Change default iOS image for projects with Expo SDK <= 41 (SDK 41 won't build with Xcode 12.5). ([#479](https://github.com/expo/eas-cli/pull/479) by [@dsokal](https://github.com/dsokal))
+- Make Apple team optional in appropriate cases. ([#468](https://github.com/expo/eas-cli/pull/468) by [@quinlanj](https://github.com/quinlanj))
+- Show projects that depend on a push key. ([#472](https://github.com/expo/eas-cli/pull/472) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix inverted conditional so we actually only prompt about commit when index is dirty. ([#481](https://github.com/expo/eas-cli/pull/481) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.18.1](https://github.com/expo/eas-cli/releases/tag/v0.18.1) - 2021-06-24
+
+### 🎉 New features
+
+- Add basic printing support for Apple App Specific Password. ([#474](https://github.com/expo/eas-cli/pull/474) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix CLI UI getting blocked on credentials migration, leading to partially migrated state. ([#477](https://github.com/expo/eas-cli/pull/477) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.18.0](https://github.com/expo/eas-cli/releases/tag/v0.18.0) - 2021-06-24
+
+### 🛠 Breaking changes
+
+- Drop support for `experimental.npmToken` in credentials.json, EAS Secrets can be used instead. ([#444](https://github.com/expo/eas-cli/pull/444) by [@dsokal](https://github.com/dsokal))
+- Remove `--allow-experimental` flag from `eas build:configure` as it has no effect now. ([#444](https://github.com/expo/eas-cli/pull/444) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Support bundle identifiers that begin with `.`. ([#459](https://github.com/expo/eas-cli/pull/459) by [@EvanBacon](https://github.com/EvanBacon))
+- Make credentials manager work with multi-target iOS projects. ([#441](https://github.com/expo/eas-cli/pull/441) by [@dsokal](https://github.com/dsokal))
+- Copy over credentials from Expo Classic to EAS. ([#445](https://github.com/expo/eas-cli/pull/445) by [@quinlanj](https://github.com/quinlanj))
+- Add Big Sur image for iOS builds. ([#457](https://github.com/expo/eas-cli/pull/457) by [@wkozyra95](https://github.com/wkozyra95))
+- New version of Android credentials manager. ([#460](https://github.com/expo/eas-cli/pull/460) by [@quinlanj](https://github.com/quinlanj))
+- Add an internal distribution with dev client to `build:configure` defaults. ([#465](https://github.com/expo/eas-cli/pull/465) by [@fson](https://github.com/fson))
+- Add `updates.channel` to build metadata. ([#461](https://github.com/expo/eas-cli/pull/461) by [@jkhales](https://github.com/jkhales))
+- iOS push key setup and management now available in `eas-cli credentials`. ([#469](https://github.com/expo/eas-cli/pull/469) [#470](https://github.com/expo/eas-cli/pull/470) by [@quinlanj](https://github.com/quinlanj))
+- Support new build status: `new`. ([#475](https://github.com/expo/eas-cli/pull/475) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Deprecate `--skip-credentials-check` flag because it doesn't do anything and is no longer needed. ([#442](https://github.com/expo/eas-cli/pull/442) by [@brentvatne](https://github.com/brentvatne))
+- Move android credentials code to new Graphql API. ([#439](https://github.com/expo/eas-cli/pull/439) [#440](https://github.com/expo/eas-cli/pull/440) [#438](https://github.com/expo/eas-cli/pull/438) [#443](https://github.com/expo/eas-cli/pull/443) [#447](https://github.com/expo/eas-cli/pull/447) [#451](https://github.com/expo/eas-cli/pull/451) [#455](https://github.com/expo/eas-cli/pull/455) by [@quinlanj](https://github.com/quinlanj))
+- Prepare Graphql infra to support iOS push keys. ([#456](https://github.com/expo/eas-cli/pull/456) by [@quinlanj](https://github.com/quinlanj))
+- Improve credentials DX ([#448](https://github.com/expo/eas-cli/pull/448) [#449](https://github.com/expo/eas-cli/pull/449) by [@quinlanj](https://github.com/quinlanj))
+- Add analytics on dev client builds. ([#454](https://github.com/expo/eas-cli/pull/454) by [@fson](https://github.com/fson))
+- Support non-git projects. ([#462](https://github.com/expo/eas-cli/pull/462) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.17.0](https://github.com/expo/eas-cli/releases/tag/v0.17.0) - 2021-06-02
+
+### 🐛 Bug fixes
+
+- Fix bundle identifier resolution when native target is not provided. ([#434](https://github.com/expo/eas-cli/pull/434) by [@dsokal](https://github.com/dsokal))
+- Fix git repo root path getter on Windows. ([#429](https://github.com/expo/eas-cli/pull/429) by [@brentvatne](https://github.com/brentvatne))
+- Fix resolving Android application identifier. ([#431](https://github.com/expo/eas-cli/pull/431) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Android credentials setup now on Graphql API. ([#434](https://github.com/expo/eas-cli/pull/427) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.16.0](https://github.com/expo/eas-cli/releases/tag/v0.16.0) - 2021-05-26
+
+### 🎉 New features
+
+- Opt out of capability syncing with `EXPO_NO_CAPABILITY_SYNC=1`. ([#426](https://github.com/expo/eas-cli/pull/426) by [@brentvatne](https://github.com/brentvatne))
+- Add more verbose logging around capability syncing to help debug reported issues. ([#426](https://github.com/expo/eas-cli/pull/426) by [@brentvatne](https://github.com/brentvatne))
+- Add managed credentials support for multi-target iOS projects. ([#414](https://github.com/expo/eas-cli/pull/414) by [@dsokal](https://github.com/dsokal))
+
+## [0.15.1](https://github.com/expo/eas-cli/releases/tag/v0.15.1) - 2021-05-25
+
+### 🎉 New features
+
+- Support auto capabilities in managed workflow using Expo config plugin introspection. ([#419](https://github.com/expo/eas-cli/pull/419) by [@EvanBacon](https://github.com/EvanBacon))
+
+### 🐛 Bug fixes
+
+- Fix sending `appBuildVersion` as part of the build metadata. ([#423](https://github.com/expo/eas-cli/pull/423) by [@dsokal](https://github.com/dsokal))
+
+## [0.15.0](https://github.com/expo/eas-cli/releases/tag/v0.15.0) - 2021-05-20
+
+### 🛠 Breaking changes
+
+- `[EAS BUILD API]` Remove "Auto" option for `schemeBuildConfiguration` and make the old "Auto" behaviour the default. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
+- Remove `experimental.disableIosBundleIdentifierValidation` flag from eas.json. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
+- Deprecate `android.package` and `ios.bundleIdentifier` in app config for generic projects. EAS CLI depends on the values in native code now. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
+- Remove application id synchronization (`android.package` and `ios.bundleIdentifier`) between app.json and native code when running builds. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Auto sync associated domains capability before building. ([#384](https://github.com/expo/eas-cli/pull/384) by [@EvanBacon](https://github.com/EvanBacon))
+- Add eas init command. [#402](https://github.com/expo/eas-cli/pull/402) by [@jkhales](https://github.com/jkhales))
+- Allow for arbitrary string values in `schemeBuildConfiguration`. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
+- Allow for installing custom `expo-cli` version on EAS Build. ([#409](https://github.com/expo/eas-cli/pull/409) by [@randomhajile](https://github.com/randomhajile))
+- Support PKCS kesytores for Android. ([#398](https://github.com/expo/eas-cli/pull/398) by [@wkozyra95](https://github.com/wkozyra95))
+- Support empty passwords in Android and iOS keystores. ([#398](https://github.com/expo/eas-cli/pull/398) by [@wkozyra95](https://github.com/wkozyra95))
+- Add more build metadata - `appBuildVersion`. ([#413](https://github.com/expo/eas-cli/pull/413) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix failure when publishing without the platform flag. ([#415](https://github.com/expo/eas-cli/pull/415) by [@jkhales](https://github.com/jkhales))
+- Pin versions in package.json. ([#399](https://github.com/expo/eas-cli/pull/399) by [@dsokal](https://github.com/dsokal))
+- Revert [0ac2f](https://github.com/expo/eas-cli/commit/0ac2fb77a118df609381c4e350aa68609340c3cd) as the root cause of the issue has been fixed in [#399](https://github.com/expo/eas-cli/pull/399).
+- Include development-client in valid buildType for internal distribution. ([#410](https://github.com/expo/eas-cli/pull/410) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.14.1](https://github.com/expo/eas-cli/releases/tag/v0.14.1) - 2021-05-11
+
+### 🐛 Bug fixes
+
+- Make the default urql requestPolicy 'network-only'. ([#397](https://github.com/expo/eas-cli/pull/397) by [@jkhales](https://github.com/jkhales))
+
+## [0.14.0](https://github.com/expo/eas-cli/releases/tag/v0.14.0) - 2021-05-10
+
+### 🛠 Breaking changes
+
+- Make eas branch:publish work with expo-cli >= 4.4.3 ([#366](https://github.com/expo/eas-cli/pull/366) by [@jkhales](https://github.com/jkhales))
+- Create asset keys without an extension. ([#366](https://github.com/expo/eas-cli/pull/366) by [@jkhales](https://github.com/jkhales))
+
+### 🎉 New features
+
+- Display platforms supported by an update group ([#391](https://github.com/expo/eas-cli/pull/391) by [@jkhales](https://github.com/jkhales))
+- Add a --platform flag to branch:publish command ([#389](https://github.com/expo/eas-cli/pull/389) by [@jkhales](https://github.com/jkhales))
+- Release new credentials manager. ([#363](https://github.com/expo/eas-cli/pull/363) by [@quinlanj](https://github.com/quinlanj))
+- Add QR code to install internal distribution build on device. ([#371](https://github.com/expo/eas-cli/pull/371) by [@axeldelafosse](https://github.com/axeldelafosse))
+
+### 🧹 Chores
+
+- Cleanup unused code. ([#364](https://github.com/expo/eas-cli/pull/364), [#365](https://github.com/expo/eas-cli/pull/365) by [@quinlanj](https://github.com/quinlanj))
+- Redesign UX in beta credentials manager. ([#360](https://github.com/expo/eas-cli/pull/360) by [@quinlanj](https://github.com/quinlanj))
+- Port more options to the beta credentials manager. ([#352](https://github.com/expo/eas-cli/pull/352), [357](https://github.com/expo/eas-cli/pull/357), [361](https://github.com/expo/eas-cli/pull/361) by [@quinlanj](https://github.com/quinlanj))
+- Add getBuildProfileNamesAsync helper to EasJsonReader. ([#351](https://github.com/expo/eas-cli/pull/351) by [@quinlanj](https://github.com/quinlanj))
+- Increase build timeout to 1 hour. ([#370](https://github.com/expo/eas-cli/pull/370) by [@wkozyra95](https://github.com/wkozyra95))
+- Remove check for pending builds. ([#373](https://github.com/expo/eas-cli/pull/373) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.13.0](https://github.com/expo/eas-cli/releases/tag/v0.13.0) - 2021-04-22
+
+### 🎉 New features
+
+- Implement offline distribution certificate validation when running a build in non-interactive mode. ([#344](https://github.com/expo/eas-cli/pull/344) by [@dsokal](https://github.com/dsokal))
+- Add support for building internal distribution apps for Apple Enterprise Teams. ([#344](https://github.com/expo/eas-cli/pull/344) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Display descriptive error message when API for EAS Build changes. ([#359](https://github.com/expo/eas-cli/pull/359) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.12.0](https://github.com/expo/eas-cli/releases/tag/v0.12.0) - 2021-04-22
+
+### 🎉 New features
+
+- Add the initiating user's username to the build metadata. ([#354](https://github.com/expo/eas-cli/pull/354) by [@dsokal](https://github.com/dsokal))
+- Add `--clear-cache` flag for `eas build`. ([#355](https://github.com/expo/eas-cli/pull/355) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix the bug where the account name was used as the username. ([#354](https://github.com/expo/eas-cli/pull/354) by [@dsokal](https://github.com/dsokal))
+
+## [0.11.1](https://github.com/expo/eas-cli/releases/tag/v0.11.1) - 2021-04-20
+
+### 🎉 New features
+
+- Resolve ios distribution types. ([#348](https://github.com/expo/eas-cli/pull/348) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Bump version of `@expo/apple-utils` to fix capabilities sync immediately after initial identifier registration. ([593c4](https://github.com/expo/eas-cli/commit/593c42f601396deba1751489343ec07b0a8876da) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.11.0](https://github.com/expo/eas-cli/releases/tag/v0.11.0) - 2021-04-20
+
+### 🛠 Breaking changes
+
+- `"credentialsSource": "auto"` is now deprecated. The option will use `"remote"` as the default value. ([#345](https://github.com/expo/eas-cli/pull/345) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add validation when setting up ad-hoc provisioning profile in non-interactive mode. ([#338](https://github.com/expo/eas-cli/pull/338) by [@dsokal](https://github.com/dsokal))
+- Allow for registering devices when running an ad-hoc build for the first time. ([#340](https://github.com/expo/eas-cli/pull/340) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix the bug where all Android managed builds produced AAB archives. The `buildType` property from `eas.json` is not ignored now. ([#349](https://github.com/expo/eas-cli/pull/349) by [@dsokal](https://github.com/dsokal))
+
+## [0.10.0](https://github.com/expo/eas-cli/releases/tag/v0.10.0) - 2021-04-16
+
+### 🛠 Breaking changes
+
+- `secrets:<COMMAND>` is renamed to `secret:<COMMAND>` ([#315](https://github.com/expo/eas-cli/pull/315) by [@fiberjw](https://github.com/fiberjw))
+- `secret:delete` now accepts `id` through a flag rather than an argument ([#315](https://github.com/expo/eas-cli/pull/315) by [@fiberjw](https://github.com/fiberjw))
+
+### 🎉 New features
+
+- Use special Expo SDK runtime version for managed projects ([#336](https://github.com/expo/eas-cli/pull/336)) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Fix the behavior where the provisioning profile was invalidated after syncing bundle id capabilities. ([#334](https://github.com/expo/eas-cli/pull/334) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Change build credentials summary format. ([#321](https://github.com/expo/eas-cli/pull/321) by [@dsokal](https://github.com/dsokal))
+
+## [0.9.1](https://github.com/expo/eas-cli/releases/tag/v0.9.1) - 2021-04-09
+
+### 🐛 Bug fixes
+
+- Fix provisioning profile validation to actually check status. ([#318](https://github.com/expo/eas-cli/pull/318) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Replace Credentials REST API calls with GraphQL counterparts, also improved DX. ([#293](https://github.com/expo/eas-cli/pull/293), [#299](https://github.com/expo/eas-cli/pull/299), [#301](https://github.com/expo/eas-cli/pull/301), [#317](https://github.com/expo/eas-cli/pull/317) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.9.0](https://github.com/expo/eas-cli/releases/tag/v0.9.0) - 2021-04-09
+
+### 🎉 New features
+
+- Retry graphQL call on network or transient server errors. ([#320](https://github.com/expo/eas-cli/pull/320) by [@jkhales](https://github.com/jkhales))
+- Display more friendly error messages when `eas submit` fails. ([#311](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
+- Add support for managing webhooks (new commands: `webhook:create`, `webhook:view`, `webhook:list`, `webhook:update`, and `webhook:delete`). ([#314](https://github.com/expo/eas-cli/pull/314) by [@dsokal](https://github.com/dsokal))
+- Support for local builds [experimental]. ([#305](https://github.com/expo/eas-cli/pull/305) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix the issue where the first iOS build fails for a project without `ios.bundleIdentifier` set in `app.json`. ([#319](https://github.com/expo/eas-cli/pull/319) by [@dsokal](https://github.com/dsokal))
+- Bump @expo/config-plugins to fix `eas build:configure` on Windows. ([d0f3e](https://github.com/expo/eas-cli/commit/d0f3e387e7f31dbce4c3b93b8d083c7d20d9e30d) by [@brentvatne](https://github.com/brentvatne))
+- Replace REST API calls with GraphQL counterparts. ([#333](https://github.com/expo/eas-cli/pull/333) by [@barthap](https://github.com/barthap))
+
+## [0.8.1](https://github.com/expo/eas-cli/releases/tag/v0.8.1) - 2021-04-06
+
+### 🐛 Bug fixes
+
+- Fix the issue where the build status never got updated when running `eas build`. ([#310](https://github.com/expo/eas-cli/pull/310) by [@dsokal](https://github.com/dsokal))
+
+## [0.8.0](https://github.com/expo/eas-cli/releases/tag/v0.8.0) - 2021-04-06
+
+### 🛠 Breaking changes
+
+- Change the way of disabling cache - add `cache.disabled` field. ([#295](https://github.com/expo/eas-cli/pull/295) by [@dsokal](https://github.com/dsokal))
+- `secrets:create` now uses flags rather than positional arguments ([#300](https://github.com/expo/eas-cli/pull/300) by [@fiberjw](https://github.com/fiberjw))
+- `secrets:create`'s `target` arg is now called `scope` ([#300](https://github.com/expo/eas-cli/pull/300) by [@fiberjw](https://github.com/fiberjw))
+- `secrets:list`'s `target` property is now called `scope` ([#300](https://github.com/expo/eas-cli/pull/300) by [@fiberjw](https://github.com/fiberjw))
+- `secrets:delete`'s `ID` arg is now optional ([#309](https://github.com/expo/eas-cli/pull/309) by [@fiberjw](https://github.com/fiberjw))
+- `secrets:delete`'s now allows users to choose secrets from a list ([#309](https://github.com/expo/eas-cli/pull/309) by [@fiberjw](https://github.com/fiberjw))
+
+### 🎉 New features
+
+- `build:view` and `build:list` now showing the distribution type (store / internal) and release channel. ([#284](https://github.com/expo/eas-cli/pull/284) by [@vthibault](https://github.com/vthibault))
+- Add analytics to EAS Build. ([#162](https://github.com/expo/eas-cli/pull/162) by [@wkozyra95](https://github.com/wkozyra95))
+- Improve tar archive support in EAS Submit. ([#297](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fix environment secret creation prompt. ([#298](https://github.com/expo/eas-cli/pull/298) by [@fiberjw](https://github.com/fiberjw))
+
+### 🧹 Chores
+
+- Replace REST API calls with GraphQL counterparts. ([#286](https://github.com/expo/eas-cli/pull/286), [#288](https://github.com/expo/eas-cli/pull/288), [#303](https://github.com/expo/eas-cli/pull/303), [#306](https://github.com/expo/eas-cli/pull/306), [#307](https://github.com/expo/eas-cli/pull/307) by [@dsokal](https://github.com/dsokal))
+
+## [0.7.0](https://github.com/expo/eas-cli/releases/tag/v0.7.0) - 2021-03-22
+
+### 🎉 New features
+
+- Print common error messages when builds fail. ([#272](https://github.com/expo/eas-cli/pull/272) by [@dsokal](https://github.com/dsokal))
+- Commit automatically if `EAS_BUILD_AUTOCOMMIT` is set. ([#271](https://github.com/expo/eas-cli/pull/271) by [@wkozyra95](https://github.com/wkozyra95))
+- Allow for installing custom `bundler` version on EAS Build. ([#277](https://github.com/expo/eas-cli/pull/277) by [@dsokal](https://github.com/dsokal))
+- Add support for managing environment secrets. ([#275](https://github.com/expo/eas-cli/pull/275) by [@fiberjw](https://github.com/fiberjw))
+
+### 🐛 Bug fixes
+
+- Fix `eas submit` local archive prompt for `.aab` files when submitting for iOS. ([#273](https://github.com/expo/eas-cli/pull/273) by [@barthap](https://github.com/barthap))
+- Verify whether "name" field in app.json contains any alphanumeric characters. ([#280](https://github.com/expo/eas-cli/pull/280) by [@wkozyra95](https://github.com/wkozyra95))
+- Detect dependency cycles in eas.json build profiles. ([#283](https://github.com/expo/eas-cli/pull/283) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.6.0](https://github.com/expo/eas-cli/releases/tag/v0.6.0) - 2021-03-09
+
+### 🛠 Breaking changes
+
+- Generic iOS projects: build release builds by default. ([#266](https://github.com/expo/eas-cli/pull/266) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Log the size of the archived project when uploading. ([#264](https://github.com/expo/eas-cli/pull/264) by [@wkozyra95](https://github.com/wkozyra95))
+- Add more build metadata (release channel, build profile name, git commit hash). ([#265](https://github.com/expo/eas-cli/pull/265) by [@dsokal](https://github.com/dsokal))
+- Display App Store link after successful submission. ([#144](https://github.com/expo/eas-cli/pull/144) by [@barthap](https://github.com/barthap))
+- Add `experimental.disableIosBundleIdentifierValidation` flag to eas.json. ([#263](https://github.com/expo/eas-cli/pull/263) by [@wkozyra95](https://github.com/wkozyra95))
+- Support internal distribution in non-interactive builds. ([#269](https://github.com/expo/eas-cli/pull/269) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Print Apple Team ID in the output of `device:list` when the team name is unknown. ([#268](https://github.com/expo/eas-cli/pull/268) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.5.0](https://github.com/expo/eas-cli/releases/tag/v0.5.0) - 2021-03-02
+
+### 🎉 New features
+
+- Add support for build cache. ([#247](https://github.com/expo/eas-cli/pull/247) by [@wkozyra95](https://github.com/wkozyra95))
+- Enable internal distribution support for self-managed credentials. ([#256](https://github.com/expo/eas-cli/pull/256) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Make sure all files are committed before build. ([#251](https://github.com/expo/eas-cli/pull/251) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `eas submit` support for tar.gz files. ([#257](https://github.com/expo/eas-cli/pull/257)) by [@wkozyra95](https://github.com/wkozyra95))
+- Show untracked files when checking `git status`. ([#259](https://github.com/expo/eas-cli/pull/259) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Upgrade `@expo/eas-build-job` from `0.2.12` to `0.2.13`. ([#245](https://github.com/expo/eas-cli/pull/245) by [@dsokal](https://github.com/dsokal))
+
+## [0.4.3](https://github.com/expo/eas-cli/releases/tag/v0.4.3) - 2021-02-23
+
+### 🎉 New features
+
+- Add support for iOS simulator builds. ([#240](https://github.com/expo/eas-cli/pull/240) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Use fixed version of `@expo/eas-json`. ([#243](https://github.com/expo/eas-cli/pull/243) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.4.2](https://github.com/expo/eas-cli/releases/tag/v0.4.2) - 2021-02-18
+
+### 🐛 Bug fixes
+
+- Fix detecting application target (iOS builds). ([#238](https://github.com/expo/eas-cli/pull/238) by [@dsokal](https://github.com/dsokal))
+
+## [0.4.1](https://github.com/expo/eas-cli/releases/tag/v0.4.1) - 2021-02-16
+
+### 🐛 Bug fixes
+
+- Fix `"buildType" is not allowed` error. ([#595bf](https://github.com/expo/eas-cli/commit/595bfecf1cbff0f76e7fd2049fe16f6f38bbe150) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.4.0](https://github.com/expo/eas-cli/releases/tag/v0.4.0) - 2021-02-16
+
+### 🎉 New features
+
+- Add build:cancel command. ([#219](https://github.com/expo/eas-cli/pull/219) by [@wkozyra95](https://github.com/wkozyra95))
+- Implement version auto increment for iOS builds. ([#231](https://github.com/expo/eas-cli/pull/231) by [@dsokal](https://github.com/dsokal))
+- Add support for builder environment customizations. ([#230](https://github.com/expo/eas-cli/pull/230) by [@wkozyra95](https://github.com/wkozyra95))
+- Add `schemeBuildConfiguration` option for generic iOS builds. ([#234](https://github.com/expo/eas-cli/pull/234) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix `--no-wait` flag for `eas build`. ([#226](https://github.com/expo/eas-cli/pull/226) by [@paul-ridgway](https://github.com/paul-ridgway))
+- Fix running builds from project subdirectories. ([#229](https://github.com/expo/eas-cli/pull/229) by [@wkozyra95](https://github.com/wkozyra95))

CONTRIBUTING.md

@@ -1,9 +1,39 @@
 ## Releasing a new version
 
-1. Add release notes to `CHANGELOG.md`.
-1. Run `yarn release` in the repository root folder. This will create a new tag
-   like `v1.0.0`.
-1. Wait until the `release` GitHub workflow has finished.
-1. Once the release ready to go, you can go to
-   https://github.com/expo/eas-cli/releases and mark it as not draft.
+1. Run `yarn release` in the repository root folder. This will create a new tag like `v1.0.0`.
+1. **Wait until the `release` GitHub workflow has finished.**
+   ![Wait for all three jobs to complete](./.gh-assets/release-workflow.png)
 1. Run `yarn lerna publish from-git` in the repository root folder. This will publish the packages to npm.
+
+   - This command works only if `HEAD` is on the release commit, e.g. when `git log -1` prints:
+
+     ```
+     commit cbb2de9e118bfbcb5a597b261d2dbef0bb5d4b0b (tag: v0.11.1)
+     Author: Brent Vatne <[email protected]>
+     Date:   Tue Apr 20 15:00:15 2021 -0700
+
+         v0.11.1
+     ```
+
+   - If you run `yarn lerna publish from-git` on any other commit, it'll print something like:
+
+     ```
+     lerna notice from-git No tagged release found
+     lerna success No changed packages to publish
+     ```
+
+   - If you ever run into the above issue, use `git checkout RELEASE_COMMIT_HASH` to checkout to the release commit. Later, when you've published the packages to npm, run `git checkout main` to go back to the latest commit.
+
+1. Update `CHANGELOG.md`.
+   - Add the new section with the release version in the title.
+   - Leave the `main` section empty (without any changelog entries).
+1. Once the release is ready to go, you can go to https://github.com/expo/eas-cli/releases and mark it as not draft.
+   - Remember to copy the changelog entries from `CHANGELOG.md`.
+   - Before hitting the submit button, make sure there are 5 assets available under the release entry.
+     ![There are 5 assets for each release](./.gh-assets/draft-release.png)
+1. If any of the changelog entries have been tagged with `[EAS BUILD API]`
+   - Open `package.json` and note the version of `@expo/eas-build-job` used in the eas-cli.
+   - Find the `Publish` commit in [expo/eas-build](https://github.com/expo/eas-build/commit/) for that version. In most cases, it will be the latest `Publish` commit.
+   - Find the `eas-cli-local-build-plugin` version published in that commit.
+     ![example publish commit](./.gh-assets/eas-build-publish-commit.png)
+   - Run `npm dist-tags add eas-cli-local-build-plugin@VERSION latest` with the version from the previous step.

LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020-present 650 Industries, Inc. (aka Expo)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.4.0"
+  "version": "0.18.3"
 }

package.json

@@ -6,6 +6,9 @@
   "scripts": {
     "build": "lerna run build",
     "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
+    "typecheck": "lerna run typecheck",
+    "start": "lerna run watch --parallel",
+    "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint . --ext .ts",
     "release": "lerna version",

packages/eas-cli/README.md

@@ -7,27 +7,28 @@ EAS command line tool
 [![Downloads/week](https://img.shields.io/npm/dw/eas-cli.svg)](https://npmjs.org/package/eas-cli)
 [![License](https://img.shields.io/npm/l/eas-cli.svg)](https://github.com/expo/eas-cli/blob/main/package.json)
 
-<!-- toc -->
-* [eas-cli](#eas-cli)
+* [Installation](#installation)
 * [Usage](#usage)
 * [Commands](#commands)
-<!-- tocstop -->
+
+# Installation
+
+```sh
+npm install -g eas-cli
+# or
+yarn global add eas-cli
+```
 
 # Usage
 
-<!-- usage -->
-```sh-session
-$ npm install -g eas-cli
-$ eas COMMAND
-running command...
-$ eas (-v|--version|version)
-eas-cli/0.4.0 darwin-x64 node-v14.15.4
-$ eas --help [COMMAND]
-USAGE
-  $ eas COMMAND
-...
+```sh
+eas COMMAND
+# runs the command
+eas (-v|--version|version)
+# prints the version
+eas --help COMMAND
+# outputs help for specific command
 ```
-<!-- usagestop -->
 
 # Commands
 
@@ -35,6 +36,7 @@ USAGE
 * [`eas account:login`](#eas-accountlogin)
 * [`eas account:logout`](#eas-accountlogout)
 * [`eas account:view`](#eas-accountview)
+* [`eas analytics [STATUS]`](#eas-analytics-status)
 * [`eas build`](#eas-build)
 * [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
 * [`eas build:configure`](#eas-buildconfigure)
@@ -45,7 +47,15 @@ USAGE
 * [`eas device:list`](#eas-devicelist)
 * [`eas device:view [UDID]`](#eas-deviceview-udid)
 * [`eas help [COMMAND]`](#eas-help-command)
+* [`eas secret:create`](#eas-secretcreate)
+* [`eas secret:delete`](#eas-secretdelete)
+* [`eas secret:list`](#eas-secretlist)
 * [`eas submit --platform=(android|ios)`](#eas-submit---platformandroidios)
+* [`eas webhook:create`](#eas-webhookcreate)
+* [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
+* [`eas webhook:list`](#eas-webhooklist)
+* [`eas webhook:update`](#eas-webhookupdate)
+* [`eas webhook:view ID`](#eas-webhookview-id)
 
 ## `eas account:login`
 
@@ -59,7 +69,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [build/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -73,7 +83,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [build/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -87,7 +97,18 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [build/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/account/view.ts)_
+
+## `eas analytics [STATUS]`
+
+View or change analytics settings
+
+```
+USAGE
+  $ eas analytics [STATUS]
+```
+
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas build`
 
@@ -99,14 +120,15 @@ USAGE
 
 OPTIONS
   -p, --platform=(android|ios|all)
+  --clear-cache                     Clear cache before the build
+  --local                           Run build locally [experimental]
   --non-interactive                 Run command in --non-interactive mode
   --profile=profile                 [default: release] Name of the build profile from eas.json
-  --skip-credentials-check          Skip validation of build credentials
   --skip-project-configuration      Skip project configuration
   --[no-]wait                       Wait for build(s) to complete
 ```
 
-_See code: [build/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -117,7 +139,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [build/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -129,10 +151,9 @@ USAGE
 
 OPTIONS
   -p, --platform=(android|ios|all)  Platform to configure
-  --allow-experimental              Enable experimental configuration steps.
 ```
 
-_See code: [build/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:list`
 
@@ -145,10 +166,10 @@ USAGE
 OPTIONS
   --limit=limit
   --platform=(all|android|ios)
-  --status=(in-queue|in-progress|errored|finished|canceled)
+  --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```
 
-_See code: [build/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -159,7 +180,7 @@ USAGE
   $ eas build:view [BUILD_ID]
 ```
 
-_See code: [build/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas credentials`
 
@@ -170,7 +191,7 @@ USAGE
   $ eas credentials
 ```
 
-_See code: [build/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -181,7 +202,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [build/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:list`
 
@@ -195,7 +216,7 @@ OPTIONS
   --apple-team-id=apple-team-id
 ```
 
-_See code: [build/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -206,7 +227,7 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [build/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -225,6 +246,50 @@ OPTIONS
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.0/src/commands/help.ts)_
 
+## `eas secret:create`
+
+Create an environment secret on the current project or owner account.
+
+```
+USAGE
+  $ eas secret:create
+
+OPTIONS
+  --name=name                Name of the secret
+  --scope=(account|project)  [default: project] Scope for the secret
+  --value=value              Value of the secret
+```
+
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/secret/create.ts)_
+
+## `eas secret:delete`
+
+Delete an environment secret by ID.
+
+```
+USAGE
+  $ eas secret:delete
+
+OPTIONS
+  --id=id  ID of the secret to delete
+
+DESCRIPTION
+  Unsure where to find the secret's ID? Run eas secrets:list
+```
+
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/secret/delete.ts)_
+
+## `eas secret:list`
+
+Lists environment secrets available for your current app
+
+```
+USAGE
+  $ eas secret:list
+```
+
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/secret/list.ts)_
+
 ## `eas submit --platform=(android|ios)`
 
 Submits build artifact to app store
@@ -303,5 +368,86 @@ EXAMPLES
          and provide its App ID
 ```
 
-_See code: [build/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.4.0/build/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/submit.ts)_
+
+## `eas webhook:create`
+
+Create a webhook on the current project.
+
+```
+USAGE
+  $ eas webhook:create
+
+OPTIONS
+  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
+
+  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
+                   header.
+
+  --url=url        Webhook URL
+```
+
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/webhook/create.ts)_
+
+## `eas webhook:delete [ID]`
+
+Delete a webhook on the current project.
+
+```
+USAGE
+  $ eas webhook:delete [ID]
+
+ARGUMENTS
+  ID  ID of the webhook to delete
+```
+
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/webhook/delete.ts)_
+
+## `eas webhook:list`
+
+List webhooks on the current project.
+
+```
+USAGE
+  $ eas webhook:list
+
+OPTIONS
+  --event=(BUILD)  Event type that triggers the webhook
+```
+
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/webhook/list.ts)_
+
+## `eas webhook:update`
+
+Create a webhook on the current project.
+
+```
+USAGE
+  $ eas webhook:update
+
+OPTIONS
+  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
+  --id=id          (required) Webhook ID
+
+  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
+                   header.
+
+  --url=url        Webhook URL
+```
+
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/webhook/update.ts)_
+
+## `eas webhook:view ID`
+
+View a webhook on the current project.
+
+```
+USAGE
+  $ eas webhook:view ID
+
+ARGUMENTS
+  ID  ID of the webhook to view
+```
+
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.18.3/packages/eas-cli/src/commands/webhook/view.ts)_
 <!-- commandsstop -->

packages/eas-cli/graphql-codegen.yml

@@ -3,6 +3,8 @@ schema: 'https://staging.exp.host/--/graphql'
 documents:
   - 'src/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
+  - 'src/credentials/android/api/graphql/**/!(*.d).{ts,tsx}'
+  - 'src/commands/**/*.ts'
 generates:
   src/graphql/generated.ts:
     plugins:

packages/eas-cli/package.json

@@ -1,66 +1,74 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.4.0",
+  "version": "0.18.3",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.17",
-    "@expo/config": "~3.3.19",
-    "@expo/config-plugins": "1.0.18",
-    "@expo/eas-build-job": "0.2.10",
-    "@expo/eas-json": "^0.4.0",
-    "@expo/json-file": "^8.2.24",
-    "@expo/plist": "^0.0.11",
-    "@expo/plugin-warn-if-update-available": "^1.7.0",
-    "@expo/results": "^1.0.0",
-    "@expo/spawn-async": "^1.5.0",
-    "@hapi/joi": "^17.1.1",
-    "@oclif/command": "^1",
-    "@oclif/config": "^1",
-    "@oclif/errors": "^1.3.3",
-    "@oclif/plugin-help": "^3",
-    "@urql/core": "^1.13.0",
-    "chalk": "^4.1.0",
-    "cli-table3": "^0.6.0",
-    "dateformat": "^3.0.3",
-    "env-paths": "^2.2.0",
-    "fast-glob": "^3.2.4",
-    "figures": "^3.2.0",
-    "form-data": "^3.0.0",
-    "fs-extra": "^9.0.1",
-    "getenv": "^1.0.0",
-    "got": "^11.5.2",
-    "graphql": "^15.3.0",
-    "graphql-tag": "^2.11.0",
-    "indent-string": "^4.0.0",
-    "keychain": "^1.3.0",
-    "lodash": "^4.17.20",
-    "md5-file": "^5.0.0",
-    "mime": "^2.4.7",
-    "minimatch": "^3.0.4",
-    "node-fetch": "^2.6.1",
-    "node-forge": "^0.10.0",
-    "nullthrows": "^1.1.1",
-    "ora": "^5.1.0",
-    "pkg-dir": "^4.2.0",
-    "progress": "^2.0.3",
-    "prompts": "^2.3.2",
-    "qrcode-terminal": "^0.12.0",
-    "semver": "^7.3.4",
-    "strip-ansi": "^6.0.0",
-    "tar": "^6.0.5",
-    "tempy": "^0.7.0",
-    "terminal-link": "^2.1.1",
-    "timeago.js": "^4.0.2",
-    "tslib": "^1",
-    "turndown": "^7.0.0",
-    "untildify": "^4.0.0",
-    "uuid": "^8.3.0",
-    "wrap-ansi": "^7.0.0"
+    "@amplitude/identify": "1.5.0",
+    "@amplitude/node": "1.5.0",
+    "@expo/apple-utils": "0.0.0-alpha.20",
+    "@expo/config": "3.3.42",
+    "@expo/config-plugins": "2.0.2",
+    "@expo/eas-build-job": "0.2.37",
+    "@expo/eas-json": "^0.18.2",
+    "@expo/json-file": "8.2.25",
+    "@expo/pkcs12": "0.0.4",
+    "@expo/plist": "0.0.11",
+    "@expo/plugin-warn-if-update-available": "1.7.0",
+    "@expo/results": "1.0.0",
+    "@expo/sdk-runtime-versions": "1.0.0",
+    "@expo/spawn-async": "1.5.0",
+    "@hapi/joi": "17.1.1",
+    "@oclif/command": "1.8.0",
+    "@oclif/config": "1.17.0",
+    "@oclif/errors": "1.3.3",
+    "@oclif/plugin-help": "3.2.0",
+    "@urql/core": "2.0.0",
+    "@urql/exchange-retry": "0.2.0",
+    "chalk": "4.1.0",
+    "cli-table3": "0.6.0",
+    "dateformat": "3.0.3",
+    "env-paths": "2.2.0",
+    "fast-glob": "3.2.4",
+    "figures": "3.2.0",
+    "form-data": "3.0.0",
+    "fs-extra": "9.0.1",
+    "getenv": "1.0.0",
+    "got": "11.5.2",
+    "graphql": "15.3.0",
+    "graphql-tag": "2.11.0",
+    "ignore": "5.1.8",
+    "indent-string": "4.0.0",
+    "jks-js": "1.0.0",
+    "keychain": "1.3.0",
+    "lodash": "4.17.20",
+    "mime": "2.4.7",
+    "minimatch": "3.0.4",
+    "nanoid": "3.1.23",
+    "node-fetch": "2.6.1",
+    "node-forge": "0.10.0",
+    "nullthrows": "1.1.1",
+    "ora": "5.1.0",
+    "pkg-dir": "4.2.0",
+    "progress": "2.0.3",
+    "prompts": "2.3.2",
+    "qrcode-terminal": "0.12.0",
+    "resolve-from": "5.0.0",
+    "semver": "7.3.4",
+    "strip-ansi": "6.0.0",
+    "tar": "6.0.5",
+    "tempy": "0.7.0",
+    "terminal-link": "2.1.1",
+    "timeago.js": "4.0.2",
+    "tslib": "1.14.1",
+    "turndown": "7.0.0",
+    "untildify": "4.0.0",
+    "uuid": "8.3.0",
+    "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
@@ -160,11 +168,14 @@
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme",
-    "build": "tsc",
+    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme && node patch-readme",
+    "build": "tsc --project tsconfig.build.json",
+    "watch": "yarn build --watch --preserveWatchOutput",
+    "typecheck": "tsc",
     "test": "jest",
-    "version": "yarn oclif-dev readme && git add README.md",
+    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml"
   },
-  "types": "build/index.d.ts"
+  "types": "build/index.d.ts",
+  "gitHead": "161808bc37c255fdea6801d69d23dbc725c056c3"
 }

packages/eas-cli/patch-readme.js

@@ -0,0 +1,9 @@
+const fs = require('fs');
+
+// Patch `oclif-dev readme` path and link generation
+let readmeContent = fs.readFileSync('README.md', 'utf8');
+readmeContent = readmeContent.replace(/\[build\//g, '[src/');
+readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
+fs.writeFileSync('README.md', readmeContent);
+
+console.log('Patched README path generation');

packages/eas-cli/src/__tests__/api-test.ts

@@ -21,7 +21,7 @@ describe('apiClient', () => {
         ],
       });
 
-    let error: Error;
+    let error: Error | null = null;
     try {
       await apiClient.post('test');
     } catch (e) {
@@ -41,7 +41,7 @@ describe('apiClient', () => {
   it('does not convert non-APIv2 error to ApiV2Error', async () => {
     nock(getExpoApiBaseUrl()).post('/--/api/v2/test').reply(500, 'Something went wrong');
 
-    let error: Error;
+    let error: Error | null = null;
     try {
       await apiClient.post('test');
     } catch (e) {

packages/eas-cli/src/analytics.ts

@@ -0,0 +1,106 @@
+import { Identify } from '@amplitude/identify';
+import * as Amplitude from '@amplitude/node';
+import os from 'os';
+import { v4 as uuidv4 } from 'uuid';
+
+import UserSettings from './user/UserSettings';
+
+/**
+ * We use require() to exclude package.json from TypeScript's analysis since it lives outside
+ * the src directory and would change the directory structure of the emitted files
+ * under the build directory
+ */
+const packageJSON = require('../package.json');
+
+const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
+  darwin: 'Mac',
+  win32: 'Windows',
+  linux: 'Linux',
+};
+
+let client: Amplitude.NodeClient | null = null;
+let userIdentifyCalled = false;
+let identifyData: {
+  userId: string;
+  deviceId: string;
+  identify: Identify;
+} | null = null;
+
+export async function initAsync(): Promise<void> {
+  if (process.env.DISABLE_EAS_ANALYTICS) {
+    await UserSettings.setAsync('amplitudeEnabled', false);
+  }
+  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', true);
+  if (amplitudeEnabled) {
+    const apiKey =
+      process.env.EXPO_STAGING || process.env.EXPO_LOCAL
+        ? 'cdebbc678931403439486c4750781544'
+        : '4ac443afd5073c0df6169291db1d3495';
+    client = Amplitude.init(apiKey);
+  }
+}
+
+export async function setUserDataAsync(
+  userId: string,
+  properties: Record<string, any>
+): Promise<void> {
+  const identify = new Identify();
+  Object.entries(properties).forEach(([property, value]) => {
+    identify.set(property, value);
+  });
+  const savedDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+  const deviceId = savedDeviceId ?? uuidv4();
+  if (!savedDeviceId) {
+    await UserSettings.setAsync('amplitudeDeviceId', deviceId);
+  }
+  identifyData = {
+    userId,
+    deviceId,
+    identify,
+  };
+
+  ensureUserIdentified();
+}
+
+export async function flushAsync(): Promise<void> {
+  if (client) {
+    await client.flush();
+  }
+}
+
+export function logEvent(name: string, properties: Record<string, any> = {}) {
+  if (client) {
+    ensureUserIdentified();
+    const { userId, deviceId } = identifyData ?? {};
+    client.logEvent({
+      event_type: name,
+      event_properties: properties,
+      ...(userId && { user_id: userId }),
+      ...(deviceId && { device_id: deviceId }),
+      ...getContext(),
+    });
+  }
+}
+
+function ensureUserIdentified() {
+  if (client && !userIdentifyCalled && identifyData) {
+    client.identify(identifyData.userId, identifyData.deviceId, identifyData.identify);
+    userIdentifyCalled = true;
+  }
+}
+
+function getContext() {
+  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
+  return {
+    os_name: platform,
+    os_version: os.release(),
+    device_brand: platform,
+    device_model: platform,
+    source_version: packageJSON?.version,
+    source: 'eas cli',
+  };
+}
+
+export enum AnalyticsEvent {
+  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
+}

packages/eas-cli/src/build/__tests__/credentials-test.ts

@@ -1,294 +0,0 @@
-import { Workflow } from '@expo/eas-build-job';
-import { CredentialsSource } from '@expo/eas-json';
-import prompts from 'prompts';
-
-import { asMock } from '../../__tests__/utils';
-import { CredentialsProvider } from '../../credentials/CredentialsProvider';
-import { ensureCredentialsAsync } from '../credentials';
-
-jest.mock('prompts');
-
-function createMockCredentialsProvider({
-  hasRemote,
-  hasLocal,
-  isLocalSynced,
-}: any): CredentialsProvider {
-  return {
-    platform: 'android',
-    hasRemoteAsync: jest.fn().mockImplementation(() => hasRemote || false),
-    hasLocalAsync: jest.fn().mockImplementation(() => hasLocal || false),
-    isLocalSyncedAsync: jest.fn().mockImplementation(() => isLocalSynced || false),
-  } as CredentialsProvider;
-}
-
-const originalConsoleLog = console.log;
-const originalConsoleWarn = console.warn;
-beforeAll(() => {
-  console.log = jest.fn();
-  console.warn = jest.fn();
-});
-afterAll(() => {
-  console.log = originalConsoleLog;
-  console.warn = originalConsoleWarn;
-});
-
-beforeEach(() => {
-  asMock(prompts).mockReset();
-  asMock(prompts).mockImplementation(() => {
-    throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
-  });
-});
-
-describe(ensureCredentialsAsync, () => {
-  describe('for generic builds', () => {
-    it("should use credentials.json if it's the only available credentials", async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: false,
-        hasLocal: true,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(src).toBe('local');
-    });
-    it("should use credentials from server if it's the only available credentials", async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: false,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(src).toBe('remote');
-    });
-    it('should use credentials.json if credentials are the same in credentials.json and on server', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: true,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(0);
-      expect(src).toBe('local');
-    });
-    it('should ask which credentials to use when local and remote crednitals have different values', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: false,
-      });
-      asMock(prompts).mockImplementationOnce(() => {
-        return { select: 'local' };
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(1);
-      expect(src).toBe('local');
-    });
-    it('should ask when local and remote are not the same (select remote)', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: false,
-      });
-      asMock(prompts).mockImplementationOnce(() => {
-        return { select: 'remote' };
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(1);
-      expect(src).toBe('remote');
-    });
-    it('should should throw an error when local and remote are not the same (in non interactive mode)', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: false,
-      });
-
-      try {
-        await ensureCredentialsAsync(provider, Workflow.Generic, CredentialsSource.AUTO, true);
-        throw new Error('ensureCredentialsAsync should throw an Error');
-      } catch (e) {
-        expect(e.message).toMatch(
-          'Contents of your local credentials.json for Android are not the same as credentials on EAS servers'
-        );
-      }
-
-      expect(prompts).toHaveBeenCalledTimes(0);
-    });
-    it('should ask when no credentials are present and return remote if confirm=true', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: false,
-        hasLocal: false,
-        isLocalSynced: false,
-      });
-      asMock(prompts).mockImplementationOnce(() => {
-        return { value: true }; //confirm
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(1);
-      expect(src).toBe('remote');
-    });
-    it('should ask when no credentials are present and abort if confimr=false', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: false,
-        hasLocal: false,
-        isLocalSynced: false,
-      });
-      asMock(prompts).mockImplementationOnce(() => {
-        return { value: false }; //confirm
-      });
-
-      try {
-        await ensureCredentialsAsync(provider, Workflow.Generic, CredentialsSource.AUTO, false);
-        throw new Error('ensureCredentialsAsync should throw an Error');
-      } catch (e) {
-        expect(e.message).toMatch(
-          'Aborting build process, credentials are not configured for Android'
-        );
-      }
-
-      expect(prompts).toHaveBeenCalledTimes(1);
-    });
-    it('should throw an error when no credentials are present in non interactive mode', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: false,
-        hasLocal: false,
-        isLocalSynced: false,
-      });
-      asMock(prompts).mockImplementation(() => {
-        return { value: true }; // confirm
-      });
-
-      try {
-        await ensureCredentialsAsync(provider, Workflow.Generic, CredentialsSource.AUTO, true);
-        throw new Error('ensureCredentialsAsync should throw an Error');
-      } catch (e) {
-        expect(e.message).toMatch('Credentials for this app are not configured');
-      }
-
-      expect(prompts).toHaveBeenCalledTimes(0);
-    });
-  });
-
-  describe('for managed builds', () => {
-    it("should use credentials.json if it's the only available credentials", async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: false,
-        hasLocal: true,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Managed,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(src).toBe('local');
-    });
-    it("should use credentials from server if it's the only available credentials", async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: false,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Managed,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(src).toBe('remote');
-    });
-    it('should use credentials.json if credentials are the same in credentials.json and on server', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: true,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Managed,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(0);
-      expect(src).toBe('local');
-    });
-
-    it('should use credentials.json even if credentials on server are different', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: false,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Managed,
-        CredentialsSource.AUTO,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(0);
-      expect(src).toBe('local');
-    });
-  });
-
-  describe('generic builds with credentialsSource set to local', () => {
-    it('should use credentials.json without asking even if credentials on server are different', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: false,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.LOCAL,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(0);
-      expect(src).toBe('local');
-    });
-  });
-
-  describe('generic builds with credentialsSource set to remote', () => {
-    it('should use credentials from server even if credentials.json exists and have different values', async () => {
-      const provider = createMockCredentialsProvider({
-        hasRemote: true,
-        hasLocal: true,
-        isLocalSynced: false,
-      });
-      const src = await ensureCredentialsAsync(
-        provider,
-        Workflow.Generic,
-        CredentialsSource.REMOTE,
-        false
-      );
-      expect(prompts).toHaveBeenCalledTimes(0);
-      expect(src).toBe('remote');
-    });
-  });
-});

packages/eas-cli/src/build/android/UpdatesModule.ts

@@ -1,5 +1,5 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
+import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
 import fs from 'fs-extra';
 
 import Log from '../../log';
@@ -10,7 +10,7 @@ import { ensureValidVersions } from '../utils/updates';
 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
   ensureValidVersions(exp);
   const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
   const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
 
   if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
@@ -22,12 +22,7 @@ export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig)
   }
 
   const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(
-    androidManifestPath
-  );
+  const androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
     const result = AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
@@ -52,10 +47,7 @@ export async function syncUpdatesConfigurationAsync(
   }
 
   const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  let androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(androidManifestPath);
+  let androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
     androidManifest = AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
@@ -70,7 +62,7 @@ export async function syncUpdatesConfigurationAsync(
 }
 
 async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
   const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
 
   if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
@@ -78,15 +70,46 @@ async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig)
     throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
   }
 
-  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(
-    androidManifestPath
-  );
+  const androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
     throw new Error('Missing values in AndroidManifest.xml');
   }
 }
+
+export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const androidManifest = await getAndroidManifestAsync(projectDir);
+    return AndroidConfig.Manifest.getMainApplicationMetaDataValue(
+      androidManifest,
+      AndroidConfig.Updates.Config.RELEASE_CHANNEL
+    );
+  } catch (err) {
+    return null;
+  }
+}
+
+export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const androidManifest = await getAndroidManifestAsync(projectDir);
+    const stringifiedRequestHeaders = AndroidConfig.Manifest.getMainApplicationMetaDataValue(
+      androidManifest,
+      'expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY' //TODO-JJ AndroidConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+    );
+    if (!stringifiedRequestHeaders) {
+      return null;
+    }
+    return JSON.parse(stringifiedRequestHeaders)['expo-channel-name'] ?? null;
+  } catch (err) {
+    console.log({ err });
+    return null;
+  }
+}
+
+async function getAndroidManifestAsync(projectDir: string): Promise<AndroidManifest> {
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  if (!androidManifestPath) {
+    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
+  }
+  return AndroidConfig.Manifest.readAndroidManifestAsync(androidManifestPath);
+}

packages/eas-cli/src/build/android/__tests__/UpdatesModule-test.ts

@@ -0,0 +1,108 @@
+import fs from 'fs-extra';
+import { vol } from 'memfs';
+import os from 'os';
+
+import { readChannelSafelyAsync } from '../UpdatesModule';
+
+jest.mock('fs');
+
+afterAll(() => {
+  // do not remove the following line
+  // this fixes a weird error with tempy in @expo/image-utils
+  fs.removeSync(os.tmpdir());
+});
+
+beforeEach(() => {
+  vol.reset();
+  // do not remove the following line
+  // this fixes a weird error with tempy in @expo/image-utils
+  fs.mkdirpSync(os.tmpdir());
+});
+
+const testChannel = 'test-channel';
+describe(readChannelSafelyAsync, () => {
+  it('retrieves the channel when it is defined natively', async () => {
+    vol.fromJSON(
+      {
+        './android/app/src/main/AndroidManifest.xml': AndroidManifestWithChannel,
+      },
+      '/expo-project'
+    );
+    const channel = await readChannelSafelyAsync('/expo-project');
+    expect(channel).toBe(testChannel);
+  });
+  it('returns null if the channel is not defined natively', async () => {
+    vol.fromJSON(
+      {
+        './android/app/src/main/AndroidManifest.xml': AndroidManifestNoChannel,
+      },
+      '/expo-project'
+    );
+    const channel = await readChannelSafelyAsync('/expo-project');
+    expect(channel).toBeNull();
+  });
+});
+
+const AndroidManifestWithChannel = `
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.expo.mycoolapp">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+      android:name=".MainApplication"
+      android:label="@string/app_name"
+      android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
+      android:allowBackup="true"
+      android:theme="@style/AppTheme">
+      <meta-data android:name="expo.modules.updates.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY" android:value='{"expo-channel-name":"${testChannel}"}'/>
+
+      <activity
+        android:name=".MainActivity"
+        android:launchMode="singleTask"
+        android:label="@string/app_name"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:windowSoftInputMode="adjustResize">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+      </activity>
+      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
+
+
+</manifest>
+`;
+const AndroidManifestNoChannel = `
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.expo.mycoolapp">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application
+      android:name=".MainApplication"
+      android:label="@string/app_name"
+      android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher_round"
+      android:allowBackup="true"
+      android:theme="@style/AppTheme">
+
+      <activity
+        android:name=".MainActivity"
+        android:launchMode="singleTask"
+        android:label="@string/app_name"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+        android:windowSoftInputMode="adjustResize">
+        <intent-filter>
+            <action android:name="android.intent.action.MAIN" />
+            <category android:name="android.intent.category.LAUNCHER" />
+        </intent-filter>
+      </activity>
+      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
+
+
+</manifest>
+`;

packages/eas-cli/src/build/android/__tests__/version-test.ts

@@ -0,0 +1,114 @@
+import { ExpoConfig } from '@expo/config';
+import fs from 'fs-extra';
+import { vol } from 'memfs';
+import os from 'os';
+
+import { readVersionCode, readVersionName } from '../version';
+
+jest.mock('fs');
+
+afterAll(() => {
+  // do not remove the following line
+  // this fixes a weird error with tempy in @expo/image-utils
+  fs.removeSync(os.tmpdir());
+});
+
+beforeEach(() => {
+  vol.reset();
+  // do not remove the following line
+  // this fixes a weird error with tempy in @expo/image-utils
+  fs.mkdirpSync(os.tmpdir());
+});
+
+describe(readVersionCode, () => {
+  describe('generic project', () => {
+    it('reads the version code from native code', () => {
+      const exp = initGenericProject();
+      const versionCode = readVersionCode('/repo', exp);
+      expect(versionCode).toBe(123);
+    });
+  });
+  describe('managed project', () => {
+    it('reads the version code from expo config', () => {
+      const exp = initManagedProject();
+      const versionCode = readVersionCode('/repo', exp);
+      expect(versionCode).toBe(123);
+    });
+  });
+});
+
+describe(readVersionName, () => {
+  describe('generic project', () => {
+    it('reads the version name from native code', () => {
+      const exp = initGenericProject();
+      const versionName = readVersionName('/repo', exp);
+      expect(versionName).toBe('1.0');
+    });
+  });
+  describe('managed project', () => {
+    it('reads the version from expo config', () => {
+      const exp = initManagedProject();
+      const versionName = readVersionName('/repo', exp);
+      expect(versionName).toBe('1.0.0');
+    });
+  });
+});
+
+function initGenericProject(): ExpoConfig {
+  vol.fromJSON(
+    {
+      './app.json': JSON.stringify({
+        expo: {
+          version: '1.0.0',
+          android: {
+            versionCode: 1,
+          },
+        },
+      }),
+      './android/app/build.gradle': `android {
+  defaultConfig {
+    applicationId "com.expo.testapp"
+    versionCode 123
+    versionName "1.0"
+  }
+}`,
+    },
+    '/repo'
+  );
+
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '1.0.0',
+    android: {
+      versionCode: 123,
+    },
+  };
+  return fakeExp;
+}
+
+function initManagedProject(): ExpoConfig {
+  vol.fromJSON(
+    {
+      './app.json': JSON.stringify({
+        expo: {
+          version: '1.0.0',
+          android: {
+            versionCode: 123,
+          },
+        },
+      }),
+    },
+    '/repo'
+  );
+
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '1.0.0',
+    android: {
+      versionCode: 123,
+    },
+  };
+  return fakeExp;
+}

packages/eas-cli/src/build/android/applicationId.ts

@@ -1,187 +0,0 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
-import assert from 'assert';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import Log from '../../log';
-import {
-  ensureAppIdentifierIsDefinedAsync,
-  getAndroidApplicationIdAsync,
-  getProjectConfigDescription,
-} from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { gitAddAsync } from '../../utils/git';
-import { Platform } from '../types';
-
-enum ApplicationIdSource {
-  AndroidProject,
-  AppJson,
-}
-
-function isApplicationIdValid(applicationId: string): boolean {
-  return /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(applicationId);
-}
-
-export async function ensureApplicationIdIsValidAsync(projectDir: string) {
-  const applicationId = await ensureAppIdentifierIsDefinedAsync(projectDir, Platform.Android);
-  if (!isApplicationIdValid(applicationId)) {
-    const configDescription = getProjectConfigDescription(projectDir);
-    Log.error(
-      `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`
-    );
-    Log.error(`Update "android.package" in ${configDescription} and run this command again.`);
-    throw new Error('Invalid applicationId');
-  }
-}
-
-export async function configureApplicationIdAsync(
-  projectDir: string,
-  exp: ExpoConfig,
-  allowExperimental: boolean
-): Promise<void> {
-  const configDescription = getProjectConfigDescription(projectDir);
-  const applicationIdFromConfig = AndroidConfig.Package.getPackage(exp);
-  const applicationIdFromAndroidProject = await getAndroidApplicationIdAsync(projectDir);
-
-  if (applicationIdFromAndroidProject && applicationIdFromConfig) {
-    if (applicationIdFromConfig !== applicationIdFromAndroidProject) {
-      Log.newLine();
-      Log.warn(
-        `We detected that your Android project is configured with a different application id than the one defined in ${configDescription}.`
-      );
-      const hasApplicationIdInStaticConfig = await hasApplicationIdInStaticConfigAsync(
-        projectDir,
-        exp
-      );
-      if (!hasApplicationIdInStaticConfig) {
-        Log.log(`If you choose the one defined in ${configDescription} we'll automatically configure your Android project with it.
-However, if you choose the one defined in the Android project you'll have to update ${configDescription} on your own.`);
-      }
-      Log.newLine();
-      const { applicationIdSource } = await promptAsync({
-        type: 'select',
-        name: 'applicationIdSource',
-        message: 'Which application id should we use?',
-        choices: [
-          {
-            title: `${chalk.bold(
-              applicationIdFromAndroidProject
-            )} - In build.gradle in Android project`,
-            value: ApplicationIdSource.AndroidProject,
-          },
-          {
-            title: `${chalk.bold(applicationIdFromConfig)} - In your ${configDescription}`,
-            value: ApplicationIdSource.AppJson,
-          },
-        ],
-      });
-      switch (applicationIdSource) {
-        case ApplicationIdSource.AppJson: {
-          await updateApplicationIdInBuildGradleAsync(projectDir, exp);
-          break;
-        }
-        case ApplicationIdSource.AndroidProject: {
-          if (hasApplicationIdInStaticConfig) {
-            await updateAppJsonConfigAsync(projectDir, exp, applicationIdFromAndroidProject);
-          } else {
-            throw new Error(missingPackageMessage(configDescription));
-          }
-          break;
-        }
-      }
-    }
-  } else if (!applicationIdFromAndroidProject && !applicationIdFromConfig) {
-    throw new Error(missingPackageMessage(configDescription));
-  } else if (applicationIdFromAndroidProject && !applicationIdFromConfig) {
-    if (getConfigFilePaths(projectDir).staticConfigPath) {
-      await updateAppJsonConfigAsync(projectDir, exp, applicationIdFromAndroidProject);
-    } else {
-      throw new Error(missingPackageMessage(configDescription));
-    }
-  } else if (!applicationIdFromAndroidProject && applicationIdFromConfig) {
-    // This should never happen, adding warning just in case
-    Log.warn(
-      'applicationId is not specified in your ./android/app/build.gradle file. Make sure your project is configured correctly before building.'
-    );
-    return;
-  }
-  if (allowExperimental) {
-    // this step is optional, the Play store is using applicationId value from build.gradle
-    // to identify the app, so package name does not need to be updated
-    await updatePackageNameAsync(projectDir, exp);
-    await gitAddAsync(path.join(projectDir, 'android'), { intentToAdd: true });
-  }
-}
-
-function missingPackageMessage(configDescription: string): string {
-  return `Please define "android.package" in ${configDescription} and run "eas build:configure" again.`;
-}
-
-async function updateAppJsonConfigAsync(
-  projectDir: string,
-  exp: ExpoConfig,
-  newApplicationId: string
-): Promise<void> {
-  const paths = getConfigFilePaths(projectDir);
-  assert(paths.staticConfigPath, "can't update dynamic configs");
-
-  const rawStaticConfig = await fs.readJSON(paths.staticConfigPath);
-  rawStaticConfig.expo = {
-    ...rawStaticConfig.expo,
-    android: { ...rawStaticConfig.expo?.android, package: newApplicationId },
-  };
-  await fs.writeJson(paths.staticConfigPath, rawStaticConfig, { spaces: 2 });
-
-  exp.android = { ...exp.android, package: newApplicationId };
-}
-
-/**
- * Check if static config exists and if expo.android.package is defined there.
- * It will return false if the value in static config is different than "android.package" in ExpoConfig
- */
-async function hasApplicationIdInStaticConfigAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<boolean> {
-  if (!exp.android?.package) {
-    return false;
-  }
-  const paths = getConfigFilePaths(projectDir);
-  if (!paths.staticConfigPath) {
-    return false;
-  }
-  const rawStaticConfig = await fs.readJson(paths.staticConfigPath);
-  return rawStaticConfig?.expo?.android?.package === exp.android.package;
-}
-
-async function updateApplicationIdInBuildGradleAsync(projectDir: string, exp: ExpoConfig) {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradle(projectDir);
-  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
-  const updatedBuildGradleContents = AndroidConfig.Package.setPackageInBuildGradle(
-    exp,
-    buildGradleContents
-  );
-  await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
-}
-
-async function updatePackageNameAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  await AndroidConfig.Package.renamePackageOnDisk(exp, projectDir);
-
-  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(
-    androidManifestPath
-  );
-  const updatedAndroidManifest = AndroidConfig.Package.setPackageInAndroidManifest(
-    exp,
-    androidManifest
-  );
-  await AndroidConfig.Manifest.writeAndroidManifestAsync(
-    androidManifestPath,
-    updatedAndroidManifest
-  );
-}

packages/eas-cli/src/build/android/build.ts

@@ -1,36 +1,44 @@
-import { Workflow } from '@expo/eas-build-job';
+import { Android, Metadata, Workflow } from '@expo/eas-build-job';
 import { EasConfig } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
 import path from 'path';
 
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
 import { createCredentialsContextAsync } from '../../credentials/context';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  getApplicationId,
+} from '../../project/android/applicationId';
 import { toggleConfirmAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
 import { CredentialsResult, prepareBuildRequestForPlatformAsync } from '../build';
 import { BuildContext, CommandContext, createBuildContext } from '../context';
-import { ensureCredentialsAsync } from '../credentials';
+import { transformMetadata } from '../graphql';
 import { Platform } from '../types';
-import { ensureApplicationIdIsValidAsync } from './applicationId';
+import { logCredentialsSource } from '../utils/credentials';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
+import { transformGenericJob, transformManagedJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
 export async function prepareAndroidBuildAsync(
   commandCtx: CommandContext,
   easConfig: EasConfig
-): Promise<() => Promise<string>> {
-  const buildCtx = createBuildContext<Platform.Android>({
+): Promise<() => Promise<string | undefined>> {
+  const buildCtx = createBuildContext<Platform.ANDROID>({
     commandCtx,
-    platform: Platform.Android,
+    platform: Platform.ANDROID,
     easConfig,
   });
   const { buildProfile } = buildCtx;
 
   if (
-    buildProfile.workflow === Workflow.Generic &&
+    buildProfile.workflow === Workflow.GENERIC &&
     !(await fs.pathExists(path.join(commandCtx.projectDir, 'android')))
   ) {
     throw new Error(
@@ -41,7 +49,7 @@ export async function prepareAndroidBuildAsync(
   }
 
   if (
-    buildProfile.workflow === Workflow.Generic &&
+    buildProfile.workflow === Workflow.GENERIC &&
     buildProfile.distribution === 'internal' &&
     buildProfile.gradleCommand?.match(/bundle/)
   ) {
@@ -60,52 +68,78 @@ This means that it will most likely produce an AAB and you will not be able to i
     }
   }
 
-  await ensureApplicationIdIsValidAsync(commandCtx.projectDir);
+  if (buildCtx.buildProfile.workflow === Workflow.MANAGED) {
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(commandCtx.projectDir, commandCtx.exp);
+  }
 
   return await prepareBuildRequestForPlatformAsync({
     ctx: buildCtx,
-    projectConfiguration: {},
     ensureCredentialsAsync: ensureAndroidCredentialsAsync,
     ensureProjectConfiguredAsync: async () => {
-      if (buildCtx.buildProfile.workflow === Workflow.Generic) {
+      if (buildCtx.buildProfile.workflow === Workflow.GENERIC) {
         await validateAndSyncProjectConfigurationAsync(commandCtx.projectDir, commandCtx.exp);
       }
     },
     prepareJobAsync,
+    sendBuildRequestAsync: async (
+      appId: string,
+      job: Android.Job,
+      metadata: Metadata
+    ): Promise<BuildResult> => {
+      const graphqlMetadata = transformMetadata(metadata);
+      if (job.type === Workflow.GENERIC) {
+        const graphqlJob = transformGenericJob(job);
+        return await BuildMutation.createAndroidGenericBuildAsync({
+          appId,
+          job: graphqlJob,
+          metadata: graphqlMetadata,
+        });
+      } else {
+        const graphqlJob = transformManagedJob(job);
+        return await BuildMutation.createAndroidManagedBuildAsync({
+          appId,
+          job: graphqlJob,
+          metadata: graphqlMetadata,
+        });
+      }
+    },
   });
 }
 
-function shouldProvideCredentials(ctx: BuildContext<Platform.Android>): boolean {
+function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
   return (
-    ctx.buildProfile.workflow === Workflow.Managed ||
-    (ctx.buildProfile.workflow === Workflow.Generic && !ctx.buildProfile.withoutCredentials)
+    ctx.buildProfile.workflow === Workflow.MANAGED ||
+    (ctx.buildProfile.workflow === Workflow.GENERIC && !ctx.buildProfile.withoutCredentials)
   );
 }
 
 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.Android>
+  ctx: BuildContext<Platform.ANDROID>
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
   if (!shouldProvideCredentials(ctx)) {
     return;
   }
+  const androidApplicationIdentifier = getApplicationId(
+    ctx.commandCtx.projectDir,
+    ctx.commandCtx.exp
+  );
   const provider = new AndroidCredentialsProvider(
     await createCredentialsContextAsync(ctx.commandCtx.projectDir, {
       nonInteractive: ctx.commandCtx.nonInteractive,
     }),
     {
       app: {
+        account: nullthrows(
+          findAccountByName(ctx.commandCtx.user.accounts, ctx.commandCtx.accountName),
+          `You do not have access to account: ${ctx.commandCtx.accountName}`
+        ),
         projectName: ctx.commandCtx.projectName,
-        accountName: ctx.commandCtx.accountName,
+        androidApplicationIdentifier,
       },
-      skipCredentialsCheck: ctx.commandCtx.skipCredentialsCheck,
     }
   );
-  const credentialsSource = await ensureCredentialsAsync(
-    provider,
-    ctx.buildProfile.workflow,
-    ctx.buildProfile.credentialsSource,
-    ctx.commandCtx.nonInteractive
-  );
+  const { credentialsSource } = ctx.buildProfile;
+  logCredentialsSource(credentialsSource, Platform.ANDROID);
   return {
     credentials: await provider.getCredentialsAsync(credentialsSource),
     source: credentialsSource,

packages/eas-cli/src/build/android/configure.ts

@@ -2,23 +2,27 @@ import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 
 import Log from '../../log';
-import { getAndroidApplicationIdAsync } from '../../project/projectUtils';
-import { gitAddAsync } from '../../utils/git';
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  warnIfAndroidPackageDefinedInAppConfigForGenericProject,
+} from '../../project/android/applicationId';
+import vcs from '../../vcs';
 import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
 import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
-import { configureApplicationIdAsync, ensureApplicationIdIsValidAsync } from './applicationId';
 
 export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
   if (!ctx.hasAndroidNativeProject) {
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
     return;
   }
+
+  warnIfAndroidPackageDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+
   await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
-  await configureApplicationIdAsync(ctx.projectDir, ctx.exp, ctx.allowExperimental);
-  await ensureApplicationIdIsValidAsync(ctx.projectDir);
 
   const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await gitAddAsync(easGradlePath, { intentToAdd: true });
+  await vcs.trackFileAsync(easGradlePath);
 
   if (isExpoUpdatesInstalled(ctx.projectDir)) {
     await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -30,20 +34,11 @@ export async function validateAndSyncProjectConfigurationAsync(
   projectDir: string,
   exp: ExpoConfig
 ): Promise<void> {
-  const applicationIdFromAndroidProject = await getAndroidApplicationIdAsync(projectDir);
-  const packageNameFromConfig = AndroidConfig.Package.getPackage(exp);
-  const isApplicationIdConfigured =
-    applicationIdFromAndroidProject && applicationIdFromAndroidProject === packageNameFromConfig;
-
-  const isEasBuildGradleConfigured = await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(
-    projectDir
-  );
-  if (!isEasBuildGradleConfigured || !isApplicationIdConfigured) {
+  if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
     throw new Error(
       'Project is not configured. Please run "eas build:configure" to configure the project.'
     );
   }
-
   if (isExpoUpdatesInstalled(projectDir)) {
     await syncUpdatesConfigurationAsync(projectDir, exp);
   }

packages/eas-cli/src/build/android/graphql.ts

@@ -0,0 +1,46 @@
+import { Android } from '@expo/eas-build-job';
+
+import {
+  AndroidGenericJobInput,
+  AndroidManagedBuildType,
+  AndroidManagedJobInput,
+} from '../../graphql/generated';
+import { transformProjectArchive } from '../graphql';
+
+export function transformGenericJob(job: Android.GenericJob): AndroidGenericJobInput {
+  return {
+    projectArchive: transformProjectArchive(job.projectArchive),
+    projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
+    updates: job.updates,
+    secrets: job.secrets,
+    builderEnvironment: job.builderEnvironment,
+    cache: job.cache,
+    gradleCommand: job.gradleCommand,
+    artifactPath: job.artifactPath,
+  };
+}
+
+export function transformManagedJob(job: Android.ManagedJob): AndroidManagedJobInput {
+  return {
+    projectArchive: transformProjectArchive(job.projectArchive),
+    projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
+    updates: job.updates,
+    secrets: job.secrets,
+    builderEnvironment: job.builderEnvironment,
+    cache: job.cache,
+    username: job.username,
+    buildType: transformBuildType(job.buildType),
+  };
+}
+
+function transformBuildType(buildType: Android.ManagedBuildType): AndroidManagedBuildType {
+  if (buildType === Android.ManagedBuildType.APK) {
+    return AndroidManagedBuildType.Apk;
+  } else if (buildType === Android.ManagedBuildType.APP_BUNDLE) {
+    return AndroidManagedBuildType.AppBundle;
+  } else {
+    return AndroidManagedBuildType.DevelopmentClient;
+  }
+}

packages/eas-cli/src/build/android/prepareJob.ts

@@ -1,34 +1,27 @@
-import {
-  Android,
-  ArchiveSource,
-  ArchiveSourceType,
-  Job,
-  Workflow,
-  sanitizeJob,
-} from '@expo/eas-build-job';
+import { Android, ArchiveSource, Cache, Job, Workflow, sanitizeJob } from '@expo/eas-build-job';
 import { AndroidGenericBuildProfile, AndroidManagedBuildProfile } from '@expo/eas-json';
 import path from 'path';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { readSecretEnvsAsync } from '../../credentials/credentialsJson/read';
-import { getProjectAccountNameAsync } from '../../project/projectUtils';
-import { gitRootDirectoryAsync } from '../../utils/git';
+import { getUsername } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
 import { Platform } from '../types';
 
 interface JobData {
-  archiveBucketKey: string;
+  projectArchive: ArchiveSource;
   credentials?: AndroidCredentials;
 }
 
 export async function prepareJobAsync(
-  ctx: BuildContext<Platform.Android>,
+  ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData
 ): Promise<Job> {
-  if (ctx.buildProfile.workflow === Workflow.Generic) {
+  if (ctx.buildProfile.workflow === Workflow.GENERIC) {
     const partialJob = await prepareGenericJobAsync(ctx, jobData, ctx.buildProfile);
     return sanitizeJob(partialJob);
-  } else if (ctx.buildProfile.workflow === Workflow.Managed) {
+  } else if (ctx.buildProfile.workflow === Workflow.MANAGED) {
     const partialJob = await prepareManagedJobAsync(ctx, jobData, ctx.buildProfile);
     return sanitizeJob(partialJob);
   } else {
@@ -37,23 +30,22 @@ export async function prepareJobAsync(
 }
 
 interface CommonJobProperties {
-  platform: Platform.Android;
+  platform: Platform.ANDROID;
   projectArchive: ArchiveSource;
   builderEnvironment: Android.BuilderEnvironment;
+  cache: Cache;
   secrets: {
     buildCredentials?: {
       keystore: Android.Keystore;
     };
-    secretEnvs?: Record<string, string>;
   };
 }
 
 async function prepareJobCommonAsync(
-  ctx: BuildContext<Platform.Android>,
+  ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData
 ): Promise<Partial<CommonJobProperties>> {
-  const secretEnvs = await readSecretEnvsAsync(ctx.commandCtx.projectDir);
-  const credentials = jobData.credentials;
+  const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
         buildCredentials: {
@@ -68,56 +60,59 @@ async function prepareJobCommonAsync(
     : {};
 
   return {
-    platform: Platform.Android,
-    projectArchive: {
-      type: ArchiveSourceType.S3,
-      bucketKey: jobData.archiveBucketKey,
-    },
+    platform: Platform.ANDROID,
+    projectArchive: jobData.projectArchive,
     builderEnvironment: {
       image: ctx.buildProfile.image,
       node: ctx.buildProfile.node,
       yarn: ctx.buildProfile.yarn,
       ndk: ctx.buildProfile.ndk,
+      expoCli: ctx.buildProfile.expoCli,
       env: ctx.buildProfile.env,
     },
+    cache: {
+      ...ctx.buildProfile.cache,
+      clear: ctx.commandCtx.clearCache,
+    },
     secrets: {
-      ...(secretEnvs ? { secretEnvs } : {}),
       ...buildCredentials,
     },
   };
 }
 
 async function prepareGenericJobAsync(
-  ctx: BuildContext<Platform.Android>,
+  ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData,
   buildProfile: AndroidGenericBuildProfile
 ): Promise<Partial<Android.GenericJob>> {
   const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
+    path.relative(await vcs.getRootPathAsync(), ctx.commandCtx.projectDir) || '.';
   return {
     ...(await prepareJobCommonAsync(ctx, jobData)),
-    type: Workflow.Generic,
+    type: Workflow.GENERIC,
     gradleCommand: buildProfile.gradleCommand,
     artifactPath: buildProfile.artifactPath,
     releaseChannel: buildProfile.releaseChannel,
+    updates: { channel: buildProfile.channel },
     projectRootDirectory,
   };
 }
 
 async function prepareManagedJobAsync(
-  ctx: BuildContext<Platform.Android>,
+  ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData,
   buildProfile: AndroidManagedBuildProfile
 ): Promise<Partial<Android.ManagedJob>> {
   const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
-  const accountName = await getProjectAccountNameAsync(ctx.commandCtx.projectDir);
+    path.relative(await vcs.getRootPathAsync(), ctx.commandCtx.projectDir) || '.';
+  const username = getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync());
   return {
     ...(await prepareJobCommonAsync(ctx, jobData)),
-    type: Workflow.Managed,
-    username: accountName,
+    type: Workflow.MANAGED,
+    username,
     buildType: buildProfile.buildType,
     releaseChannel: buildProfile.releaseChannel,
+    updates: { channel: buildProfile.channel },
     projectRootDirectory,
   };
 }

packages/eas-cli/src/build/android/version.ts

@@ -0,0 +1,44 @@
+import { ExpoConfig } from '@expo/config';
+import { AndroidConfig } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import fs from 'fs-extra';
+
+import { resolveWorkflow } from '../../project/workflow';
+
+export function readVersionCode(projectDir: string, exp: ExpoConfig): number | undefined {
+  const workflow = resolveWorkflow(projectDir, Platform.ANDROID);
+  if (workflow === Workflow.GENERIC) {
+    const buildGradle = readBuildGradle(projectDir);
+    const matchResult = buildGradle?.match(/versionCode (.*)/);
+    if (matchResult) {
+      return Number(matchResult[1]);
+    } else {
+      return undefined;
+    }
+  } else {
+    return AndroidConfig.Version.getVersionCode(exp) ?? undefined;
+  }
+}
+
+export function readVersionName(projectDir: string, exp: ExpoConfig): string | undefined {
+  const workflow = resolveWorkflow(projectDir, Platform.ANDROID);
+  if (workflow === Workflow.GENERIC) {
+    const buildGradle = readBuildGradle(projectDir);
+    const matchResult = buildGradle?.match(/versionName ["'](.*)["']/);
+    if (matchResult) {
+      return matchResult[1];
+    } else {
+      return undefined;
+    }
+  } else {
+    return exp.version;
+  }
+}
+
+function readBuildGradle(projectDir: string): string | undefined {
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  if (!fs.pathExistsSync(buildGradlePath)) {
+    return undefined;
+  }
+  return fs.readFileSync(buildGradlePath, 'utf8');
+}

packages/eas-cli/src/build/build.ts

@@ -1,122 +1,123 @@
-import { Job } from '@expo/eas-build-job';
+import { ArchiveSource, ArchiveSourceType, Job, Metadata } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import fs from 'fs-extra';
 
-import { apiClient } from '../api';
+import { UploadSessionType } from '../graphql/generated';
+import { BuildResult } from '../graphql/mutations/BuildMutation';
 import Log from '../log';
 import { promptAsync } from '../prompts';
-import { UploadType, uploadAsync } from '../uploads';
+import { uploadAsync } from '../uploads';
+import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
-import { platformDisplayNames } from './constants';
+import vcs from '../vcs';
+import { requestedPlatformDisplayNames } from './constants';
 import { BuildContext } from './context';
+import { runLocalBuildAsync } from './local';
 import { collectMetadata } from './metadata';
-import { AnalyticsEvent, Platform, TrackingContext } from './types';
-import Analytics from './utils/analytics';
+import { Platform, TrackingContext } from './types';
+import Analytics, { Event } from './utils/analytics';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
-import {
-  commitPromptAsync,
-  isGitStatusCleanAsync,
-  makeProjectTarballAsync,
-  showDiffAsync,
-} from './utils/repository';
+import { commitPromptAsync, makeProjectTarballAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
   credentials: Credentials;
 }
 
-interface Builder<TPlatform extends Platform, Credentials, ProjectConfiguration> {
+export interface JobData<Credentials> {
+  credentials?: Credentials;
+  projectArchive: ArchiveSource;
+}
+
+interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ctx: BuildContext<TPlatform>;
-  projectConfiguration: ProjectConfiguration;
 
   ensureCredentialsAsync(
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
   ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  prepareJobAsync(
-    ctx: BuildContext<TPlatform>,
-    jobData: {
-      archiveBucketKey: string;
-      credentials?: Credentials;
-      projectConfiguration?: ProjectConfiguration;
-    }
-  ): Promise<Job>;
+  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
+  sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }
 
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
-  ProjectConfiguration
->(builder: Builder<TPlatform, Credentials, ProjectConfiguration>): Promise<() => Promise<string>> {
+  TJob extends Job
+>(builder: Builder<TPlatform, Credentials, TJob>): Promise<() => Promise<string | undefined>> {
   const credentialsResult = await withAnalyticsAsync(
     async () => await builder.ensureCredentialsAsync(builder.ctx),
     {
-      successEvent: AnalyticsEvent.GATHER_CREDENTIALS_SUCCESS,
-      failureEvent: AnalyticsEvent.GATHER_CREDENTIALS_FAIL,
+      successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
+      failureEvent: Event.GATHER_CREDENTIALS_FAIL,
       trackingCtx: builder.ctx.trackingCtx,
     }
   );
   if (!builder.ctx.commandCtx.skipProjectConfiguration) {
     await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(builder.ctx), {
-      successEvent: AnalyticsEvent.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: AnalyticsEvent.CONFIGURE_PROJECT_FAIL,
+      successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
+      failureEvent: Event.CONFIGURE_PROJECT_FAIL,
       trackingCtx: builder.ctx.trackingCtx,
     });
   }
 
-  if (!(await isGitStatusCleanAsync())) {
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.addNewLineIfNone();
     await reviewAndCommitChangesAsync(
-      `[EAS Build] Run EAS Build for ${platformDisplayNames[builder.ctx.platform as Platform]}`,
+      `[EAS Build] Run EAS Build for ${
+        requestedPlatformDisplayNames[builder.ctx.platform as Platform]
+      }`,
       {
         nonInteractive: builder.ctx.commandCtx.nonInteractive,
       }
     );
   }
 
-  const archiveBucketKey = await uploadProjectAsync(builder.ctx);
+  const projectArchive = builder.ctx.commandCtx.local
+    ? ({
+        type: ArchiveSourceType.PATH,
+        path: (await makeProjectTarballAsync()).path,
+      } as const)
+    : ({
+        type: ArchiveSourceType.S3,
+        bucketKey: await uploadProjectAsync(builder.ctx),
+      } as const);
 
   const metadata = await collectMetadata(builder.ctx, {
     credentialsSource: credentialsResult?.source,
   });
   const job = await builder.prepareJobAsync(builder.ctx, {
-    archiveBucketKey,
+    projectArchive,
     credentials: credentialsResult?.credentials,
-    projectConfiguration: builder.projectConfiguration,
   });
 
   return async () => {
-    try {
-      return await withAnalyticsAsync(
-        async () => {
-          if (Log.isDebug) {
-            Log.log(`Starting ${platformDisplayNames[job.platform]} build`);
-          }
-          const {
-            data: { buildId, deprecationInfo },
-          } = await apiClient
-            .post(`projects/${builder.ctx.commandCtx.projectId}/builds`, {
-              json: {
-                job,
-                metadata,
-              },
-            })
-            .json();
-          printDeprecationWarnings(deprecationInfo);
-          return buildId;
-        },
-        {
-          successEvent: AnalyticsEvent.BUILD_REQUEST_SUCCESS,
-          failureEvent: AnalyticsEvent.BUILD_REQUEST_FAIL,
-          trackingCtx: builder.ctx.trackingCtx,
+    if (builder.ctx.commandCtx.local) {
+      await runLocalBuildAsync(job);
+      return undefined;
+    } else {
+      try {
+        return await sendBuildRequestAsync(builder, job, metadata);
+      } catch (error) {
+        if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+          Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
+          throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
+        ) {
+          Log.error(
+            `You have already reached the maximum number of pending ${
+              requestedPlatformDisplayNames[job.platform]
+            } builds for your account. Try again later.`
+          );
+          throw new Error('Build request failed.');
+        } else if (error?.graphQLErrors) {
+          Log.error(
+            'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
+          );
         }
-      );
-    } catch (error) {
-      const body = error?.response?.body;
-      if (body && JSON.parse(body)?.errors?.[0]?.code === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-        Log.error('EAS Build API has changed, please upgrade to the latest eas-cli');
+        throw error;
       }
-      throw error;
     }
   };
 }
@@ -132,19 +133,22 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         projectTarballPath = projectTarball.path;
 
         const { bucketKey } = await uploadAsync(
-          UploadType.TURTLE_PROJECT_SOURCES,
+          UploadSessionType.EasBuildProjectSources,
           projectTarball.path,
           createProgressTracker({
             total: projectTarball.size,
-            message: 'Uploading to EAS Build',
+            message: ratio =>
+              `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
+                projectTarball.size
+              )})`,
             completedMessage: `Uploaded to EAS`,
           })
         );
         return bucketKey;
       },
       {
-        successEvent: AnalyticsEvent.PROJECT_UPLOAD_SUCCESS,
-        failureEvent: AnalyticsEvent.PROJECT_UPLOAD_FAIL,
+        successEvent: Event.PROJECT_UPLOAD_SUCCESS,
+        failureEvent: Event.PROJECT_UPLOAD_FAIL,
         trackingCtx: ctx.trackingCtx,
       }
     );
@@ -155,11 +159,40 @@ async function uploadProjectAsync<TPlatform extends Platform>(
   }
 }
 
+async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJob extends Job>(
+  builder: Builder<TPlatform, Credentials, TJob>,
+  job: TJob,
+  metadata: Metadata
+): Promise<string> {
+  const { ctx } = builder;
+  return await withAnalyticsAsync(
+    async () => {
+      if (Log.isDebug) {
+        Log.log(`Starting ${requestedPlatformDisplayNames[job.platform]} build`);
+      }
+
+      const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
+        ctx.commandCtx.projectId,
+        job,
+        metadata
+      );
+
+      printDeprecationWarnings(deprecationInfo);
+      return build.id;
+    },
+    {
+      successEvent: Event.BUILD_REQUEST_SUCCESS,
+      failureEvent: Event.BUILD_REQUEST_FAIL,
+      trackingCtx: ctx.trackingCtx,
+    }
+  );
+}
+
 async function withAnalyticsAsync<Result>(
   fn: () => Promise<Result>,
   analytics: {
-    successEvent: AnalyticsEvent;
-    failureEvent: AnalyticsEvent;
+    successEvent: Event;
+    failureEvent: Event;
     trackingCtx: TrackingContext;
   }
 ): Promise<Result> {
@@ -183,12 +216,17 @@ enum ShouldCommitChanges {
 }
 
 async function reviewAndCommitChangesAsync(
-  commitMessage: string,
+  initialCommitMessage: string,
   { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
+  if (process.env.EAS_BUILD_AUTOCOMMIT) {
+    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+    Log.withTick('Committed changes.');
+    return;
+  }
   if (nonInteractive) {
     throw new Error(
-      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode to review and commit changes.'
+      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode or set EAS_BUILD_AUTOCOMMIT=1 in your environment.'
     );
   }
   const { selected } = await promptAsync({
@@ -212,10 +250,13 @@ async function reviewAndCommitChangesAsync(
       "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
     );
   } else if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync(commitMessage);
+    await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes.');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await showDiffAsync();
-    await reviewAndCommitChangesAsync(commitMessage, { nonInteractive, askedFirstTime: false });
+    await vcs.showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, {
+      nonInteractive,
+      askedFirstTime: false,
+    });
   }
 }

packages/eas-cli/src/build/configure.ts

@@ -6,32 +6,25 @@ import path from 'path';
 import Log from '../log';
 import { promptAsync } from '../prompts';
 import { ensureLoggedInAsync } from '../user/actions';
-import { gitAddAsync } from '../utils/git';
+import vcs from '../vcs';
 import { configureAndroidAsync } from './android/configure';
 import { ConfigureContext } from './context';
 import { configureIosAsync } from './ios/configure';
 import { RequestedPlatform } from './types';
-import {
-  commitPromptAsync,
-  ensureGitRepoExistsAsync,
-  isGitStatusCleanAsync,
-  maybeBailOnGitStatusAsync,
-  showDiffAsync,
-} from './utils/repository';
+import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';
 
 const configureCommitMessage = {
   [RequestedPlatform.Android]: 'Configure EAS Build for Android',
-  [RequestedPlatform.iOS]: 'Configure EAS Build for iOS',
+  [RequestedPlatform.Ios]: 'Configure EAS Build for iOS',
   [RequestedPlatform.All]: 'Configure EAS Build',
 };
 
 export async function configureAsync(options: {
   platform: RequestedPlatform;
   projectDir: string;
-  allowExperimental: boolean;
 }): Promise<void> {
-  await ensureGitRepoExistsAsync();
-  await maybeBailOnGitStatusAsync();
+  await vcs.ensureRepoExistsAsync();
+  await maybeBailOnRepoStatusAsync();
 
   const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
 
@@ -39,12 +32,11 @@ export async function configureAsync(options: {
     user: await ensureLoggedInAsync(),
     projectDir: options.projectDir,
     exp,
-    allowExperimental: options.allowExperimental,
     requestedPlatform: options.platform,
     shouldConfigureAndroid: [RequestedPlatform.All, RequestedPlatform.Android].includes(
       options.platform
     ),
-    shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.iOS].includes(options.platform),
+    shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.Ios].includes(options.platform),
     hasAndroidNativeProject: await fs.pathExists(path.join(options.projectDir, 'android')),
     hasIosNativeProject: await fs.pathExists(path.join(options.projectDir, 'ios')),
   };
@@ -58,7 +50,7 @@ export async function configureAsync(options: {
     await configureIosAsync(ctx);
   }
 
-  if (!(await isGitStatusCleanAsync())) {
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.newLine();
     await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
   } else {
@@ -67,6 +59,37 @@ export async function configureAsync(options: {
   }
 }
 
+const MANAGED_DEFAULTS = {
+  release: {
+    workflow: 'managed',
+  },
+  development: {
+    workflow: 'managed',
+    buildType: 'development-client',
+    distribution: 'internal',
+  },
+};
+const ANDROID_GENERIC_DEFAULTS = {
+  release: {
+    workflow: 'generic',
+  },
+  development: {
+    workflow: 'generic',
+    gradleCommand: ':app:assembleDebug',
+    distribution: 'internal',
+  },
+};
+const IOS_GENERIC_DEFAULTS = {
+  release: {
+    workflow: 'generic',
+  },
+  development: {
+    workflow: 'generic',
+    schemeBuildConfiguration: 'Debug',
+    distribution: 'internal',
+  },
+};
+
 export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
   const easJsonPath = path.join(ctx.projectDir, 'eas.json');
   let existingEasJson;
@@ -101,27 +124,19 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v
       ...existingEasJson,
       ...(shouldInitAndroid
         ? {
-            android: {
-              release: {
-                workflow: ctx.hasAndroidNativeProject ? 'generic' : 'managed',
-              },
-            },
+            android: ctx.hasAndroidNativeProject ? ANDROID_GENERIC_DEFAULTS : MANAGED_DEFAULTS,
           }
         : null),
       ...(shouldInitIOS
         ? {
-            ios: {
-              release: {
-                workflow: ctx.hasIosNativeProject ? 'generic' : 'managed',
-              },
-            },
+            ios: ctx.hasIosNativeProject ? IOS_GENERIC_DEFAULTS : MANAGED_DEFAULTS,
           }
         : null),
     },
   };
 
   await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await gitAddAsync(easJsonPath, { intentToAdd: true });
+  await vcs.trackFileAsync(easJsonPath);
   Log.withTick(`${existingEasJson ? 'Updated' : 'Generated'} eas.json`);
 }
 
@@ -132,7 +147,7 @@ enum ShouldCommitChanges {
 }
 
 async function reviewAndCommitChangesAsync(
-  commitMessage: string,
+  initialCommitMessage: string,
   askedFirstTime: boolean = true
 ): Promise<void> {
   const { selected } = await promptAsync({
@@ -152,10 +167,10 @@ async function reviewAndCommitChangesAsync(
   });
 
   if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync(commitMessage);
+    await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await showDiffAsync();
-    await reviewAndCommitChangesAsync(commitMessage, false);
+    await vcs.showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, false);
   }
 }

packages/eas-cli/src/build/constants.ts

@@ -1,12 +1,18 @@
-import { Platform, RequestedPlatform } from './types';
+import { AppPlatform } from '../graphql/generated';
+import { RequestedPlatform } from './types';
 
-export const platformDisplayNames = {
-  [RequestedPlatform.iOS]: 'iOS',
+export const requestedPlatformDisplayNames: Record<RequestedPlatform, string> = {
+  [RequestedPlatform.Ios]: 'iOS',
   [RequestedPlatform.Android]: 'Android',
   [RequestedPlatform.All]: 'Android and iOS',
 };
 
-export const platformEmojis = {
-  [Platform.iOS]: '🍎',
-  [Platform.Android]: '🤖',
+export const appPlatformDisplayNames: Record<AppPlatform, string> = {
+  [AppPlatform.Android]: 'Android',
+  [AppPlatform.Ios]: 'iOS',
+};
+
+export const appPlatformEmojis = {
+  [AppPlatform.Ios]: '🍎',
+  [AppPlatform.Android]: '🤖',
 };

packages/eas-cli/src/build/context.ts

@@ -1,10 +1,16 @@
-import { ExpoConfig, getConfig } from '@expo/config';
-import { AndroidBuildProfile, EasConfig, iOSBuildProfile } from '@expo/eas-json';
+import { ExpoConfig } from '@expo/config';
+import { Workflow } from '@expo/eas-build-job';
+import { AndroidBuildProfile, EasConfig, IosBuildProfile } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+import resolveFrom from 'resolve-from';
+import { v4 as uuidv4 } from 'uuid';
 
 import { getProjectAccountName } from '../project/projectUtils';
+import { findAccountByName } from '../user/Account';
 import { Actor } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
 import { Platform, RequestedPlatform, TrackingContext } from './types';
+import Analytics, { Event } from './utils/analytics';
 
 export interface CommandContext {
   requestedPlatform: RequestedPlatform;
@@ -15,9 +21,9 @@ export interface CommandContext {
   accountName: string;
   projectName: string;
   exp: ExpoConfig;
-  trackingCtx: TrackingContext;
   nonInteractive: boolean;
-  skipCredentialsCheck: boolean;
+  local: boolean;
+  clearCache: boolean;
   skipProjectConfiguration: boolean;
   waitForBuildEnd: boolean;
 }
@@ -25,26 +31,27 @@ export interface CommandContext {
 export async function createCommandContextAsync({
   requestedPlatform,
   profile,
+  exp,
   projectDir,
   projectId,
-  trackingCtx,
   nonInteractive = false,
-  skipCredentialsCheck = false,
+  local,
+  clearCache = false,
   skipProjectConfiguration = false,
   waitForBuildEnd,
 }: {
   requestedPlatform: RequestedPlatform;
   profile: string;
+  exp: ExpoConfig;
   projectId: string;
   projectDir: string;
-  trackingCtx: TrackingContext;
   nonInteractive: boolean;
-  skipCredentialsCheck: boolean;
+  local: boolean;
+  clearCache: boolean;
   skipProjectConfiguration: boolean;
   waitForBuildEnd: boolean;
 }): Promise<CommandContext> {
   const user = await ensureLoggedInAsync();
-  const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
   const accountName = getProjectAccountName(exp, user);
   const projectName = exp.slug;
 
@@ -57,9 +64,9 @@ export async function createCommandContextAsync({
     accountName,
     projectName,
     exp,
-    trackingCtx,
     nonInteractive,
-    skipCredentialsCheck,
+    local,
+    clearCache,
     skipProjectConfiguration,
     waitForBuildEnd,
   };
@@ -69,7 +76,6 @@ export interface ConfigureContext {
   user: Actor;
   projectDir: string;
   exp: ExpoConfig;
-  allowExperimental: boolean;
   requestedPlatform: RequestedPlatform;
   shouldConfigureAndroid: boolean;
   shouldConfigureIos: boolean;
@@ -77,9 +83,9 @@ export interface ConfigureContext {
   hasIosNativeProject: boolean;
 }
 
-type PlatformBuildProfile<T extends Platform> = T extends Platform.Android
+type PlatformBuildProfile<T extends Platform> = T extends Platform.ANDROID
   ? AndroidBuildProfile
-  : iOSBuildProfile;
+  : IosBuildProfile;
 
 export interface BuildContext<T extends Platform> {
   commandCtx: CommandContext;
@@ -101,14 +107,56 @@ export function createBuildContext<T extends Platform>({
   if (!buildProfile) {
     throw new Error(`${platform} build profile does not exist`);
   }
-  const builderTrackingCtx = {
-    ...commandCtx.trackingCtx,
+
+  const accountId = findAccountByName(commandCtx.user.accounts, commandCtx.accountName)?.id;
+  const devClientProperties = getDevClientEventProperties(platform, commandCtx, buildProfile);
+  const trackingCtx = {
+    tracking_id: uuidv4(),
     platform,
+    ...(accountId && { account_id: accountId }),
+    account_name: commandCtx.accountName,
+    project_id: commandCtx.projectId,
+    project_type: buildProfile.workflow,
+    ...devClientProperties,
   };
+  Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
   return {
     commandCtx,
-    trackingCtx: builderTrackingCtx,
+    trackingCtx,
     platform,
     buildProfile,
   };
 }
+
+function getDevClientEventProperties(
+  platform: Platform,
+  commandCtx: CommandContext,
+  buildProfile: AndroidBuildProfile | IosBuildProfile
+): Partial<TrackingContext> {
+  let includesDevClient;
+  const version = tryGetDevClientVersion(commandCtx.projectDir);
+  if (buildProfile.workflow === Workflow.MANAGED) {
+    includesDevClient = buildProfile.buildType === 'development-client';
+  } else if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
+  } else if (platform === Platform.IOS && 'schemeBuildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.schemeBuildConfiguration === 'Debug');
+  } else {
+    includesDevClient = false;
+  }
+
+  if (version) {
+    return { dev_client: includesDevClient, dev_client_version: version };
+  } else {
+    return { dev_client: includesDevClient };
+  }
+}
+
+function tryGetDevClientVersion(projectDir: string): string | null {
+  try {
+    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
+    return pkg.version?.toString() ?? null;
+  } catch {
+    return null;
+  }
+}

packages/eas-cli/src/build/create.ts

@@ -1,33 +1,36 @@
 import { EasJsonReader } from '@expo/eas-json';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 import ora from 'ora';
 
-import { apiClient } from '../api';
+import { BuildFragment, BuildStatus } from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log from '../log';
 import { sleep } from '../utils/promise';
+import vcs from '../vcs';
 import { prepareAndroidBuildAsync } from './android/build';
 import { CommandContext } from './context';
 import { prepareIosBuildAsync } from './ios/build';
-import { Build, BuildStatus, Platform, RequestedPlatform } from './types';
+import { Platform, RequestedPlatform } from './types';
 import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureGitRepoExistsAsync, ensureGitStatusIsCleanAsync } from './utils/repository';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 
 export async function buildAsync(commandCtx: CommandContext): Promise<void> {
-  await ensureGitRepoExistsAsync();
-  await ensureGitStatusIsCleanAsync(commandCtx.nonInteractive);
+  await vcs.ensureRepoExistsAsync();
+  await ensureRepoIsCleanAsync(commandCtx.nonInteractive);
 
   const scheduledBuilds = await startBuildsAsync(commandCtx);
+  if (commandCtx.local) {
+    return;
+  }
   Log.newLine();
   printLogsUrls(commandCtx.accountName, scheduledBuilds);
   Log.newLine();
 
   if (commandCtx.waitForBuildEnd) {
-    const builds = await waitForBuildEndAsync(
-      commandCtx,
-      scheduledBuilds.map(i => i.buildId)
-    );
-    Log.newLine();
+    const builds = await waitForBuildEndAsync(scheduledBuilds.map(i => i.buildId));
     printBuildResults(commandCtx.accountName, builds);
+    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
   }
 }
 
@@ -37,7 +40,7 @@ async function startBuildsAsync(
   const shouldBuildAndroid = [RequestedPlatform.Android, RequestedPlatform.All].includes(
     commandCtx.requestedPlatform
   );
-  const shouldBuildiOS = [RequestedPlatform.iOS, RequestedPlatform.All].includes(
+  const shouldBuildIos = [RequestedPlatform.Ios, RequestedPlatform.All].includes(
     commandCtx.requestedPlatform
   );
   const easConfig = await new EasJsonReader(
@@ -47,76 +50,82 @@ async function startBuildsAsync(
 
   const builds: {
     platform: Platform;
-    sendBuildRequestAsync: () => Promise<string>;
+    sendBuildRequestAsync: () => Promise<string | undefined>;
   }[] = [];
   if (shouldBuildAndroid) {
     const sendBuildRequestAsync = await prepareAndroidBuildAsync(commandCtx, easConfig);
-    builds.push({ platform: Platform.Android, sendBuildRequestAsync });
+    builds.push({ platform: Platform.ANDROID, sendBuildRequestAsync });
   }
-  if (shouldBuildiOS) {
+  if (shouldBuildIos) {
     const sendBuildRequestAsync = await prepareIosBuildAsync(commandCtx, easConfig);
-    builds.push({ platform: Platform.iOS, sendBuildRequestAsync });
+    builds.push({ platform: Platform.IOS, sendBuildRequestAsync });
   }
-  return Promise.all(
-    builds.map(async ({ platform, sendBuildRequestAsync }) => ({
-      platform,
-      buildId: await sendBuildRequestAsync(),
-    }))
-  );
+  return (
+    await Promise.all(
+      builds.map(async ({ platform, sendBuildRequestAsync }) => ({
+        platform,
+        buildId: await sendBuildRequestAsync(),
+      }))
+    )
+  ).filter((build): build is { platform: Platform; buildId: string } => !!build.buildId);
 }
 
 async function waitForBuildEndAsync(
-  commandCtx: CommandContext,
   buildIds: string[],
-  { timeoutSec = 1800, intervalSec = 30 } = {}
-): Promise<(Build | null)[]> {
+  { timeoutSec = 3600, intervalSec = 30 } = {}
+): Promise<(BuildFragment | null)[]> {
   Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
   const spinner = ora().start();
   let time = new Date().getTime();
   const endTime = time + timeoutSec * 1000;
   while (time <= endTime) {
-    const builds: (Build | null)[] = await Promise.all(
+    const builds: (BuildFragment | null)[] = await Promise.all(
       buildIds.map(async buildId => {
         try {
-          const { data } = await apiClient
-            .get(`projects/${commandCtx.projectId}/builds/${buildId}`)
-            .json();
-          return data;
+          return await BuildQuery.byIdAsync(buildId, { useCache: false });
         } catch (err) {
           return null;
         }
       })
     );
     if (builds.length === 1) {
-      switch (builds[0]?.status) {
-        case BuildStatus.FINISHED:
+      const build = nullthrows(builds[0]);
+      switch (build.status) {
+        case BuildStatus.Finished:
           spinner.succeed('Build finished');
           return builds;
-        case BuildStatus.IN_QUEUE:
+        case BuildStatus.New:
+          spinner.text = 'Build created';
+          break;
+        case BuildStatus.InQueue:
           spinner.text = 'Build queued...';
           break;
-        case BuildStatus.CANCELED:
+        case BuildStatus.Canceled:
           spinner.text = 'Build canceled';
           spinner.stopAndPersist();
           return builds;
-        case BuildStatus.IN_PROGRESS:
+        case BuildStatus.InProgress:
           spinner.text = 'Build in progress...';
           break;
-        case BuildStatus.ERRORED:
+        case BuildStatus.Errored:
           spinner.fail('Build failed');
-          throw new Error(`Standalone build failed!`);
+          if (build.error) {
+            return builds;
+          } else {
+            throw new Error(`Standalone build failed!`);
+          }
         default:
           spinner.warn('Unknown status.');
           throw new Error(`Unknown status: ${builds} - aborting!`);
       }
     } else {
-      if (builds.filter(build => build?.status === BuildStatus.FINISHED).length === builds.length) {
+      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
         spinner.succeed('All builds have finished');
         return builds;
       } else if (
         builds.filter(build =>
           build?.status
-            ? [BuildStatus.FINISHED, BuildStatus.ERRORED, BuildStatus.CANCELED].includes(
+            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
                 build.status
               )
             : false
@@ -125,13 +134,15 @@ async function waitForBuildEndAsync(
         spinner.fail('Some of the builds were canceled or failed.');
         return builds;
       } else {
-        const inQueue = builds.filter(build => build?.status === BuildStatus.IN_QUEUE).length;
-        const inProgress = builds.filter(build => build?.status === BuildStatus.IN_PROGRESS).length;
-        const errored = builds.filter(build => build?.status === BuildStatus.ERRORED).length;
-        const finished = builds.filter(build => build?.status === BuildStatus.FINISHED).length;
-        const canceled = builds.filter(build => build?.status === BuildStatus.CANCELED).length;
+        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
+        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
+        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
+        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
+        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
+        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
         const unknownState = builds.length - inQueue - inProgress - errored - finished;
         spinner.text = [
+          newBuilds && `Builds created: ${newBuilds}`,
           inQueue && `Builds in queue: ${inQueue}`,
           inProgress && `Builds in progress: ${inProgress}`,
           canceled && `Builds canceled: ${canceled}`,
@@ -151,3 +162,12 @@ async function waitForBuildEndAsync(
     'Timeout reached! It is taking longer than expected to finish the build, aborting...'
   );
 }
+
+function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | null)[]): void {
+  const failedBuilds = (maybeBuilds.filter(i => i) as BuildFragment[]).filter(
+    i => i.status === BuildStatus.Errored
+  );
+  if (failedBuilds.length > 0) {
+    process.exit(1);
+  }
+}

packages/eas-cli/src/build/credentials.ts

@@ -1,104 +0,0 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { CredentialsSource } from '@expo/eas-json';
-import chalk from 'chalk';
-
-import { CredentialsProvider } from '../credentials/CredentialsProvider';
-import Log from '../log';
-import { confirmAsync, promptAsync } from '../prompts';
-import { platformDisplayNames } from './constants';
-
-function logCredentials(target: 'local' | 'remote', platform: Platform) {
-  let message = `Using ${target} ${platformDisplayNames[platform]} credentials`;
-  if (target === 'local') message += ` ${chalk.dim('(credentials.json)')}`;
-  if (target === 'remote') message += ` ${chalk.dim('(Expo server)')}`;
-  Log.succeed(message);
-}
-
-async function ensureCredentialsAutoAsync(
-  provider: CredentialsProvider,
-  workflow: Workflow,
-  nonInteractive: boolean
-): Promise<CredentialsSource.LOCAL | CredentialsSource.REMOTE> {
-  const platform = platformDisplayNames[provider.platform];
-  switch (workflow) {
-    case Workflow.Managed:
-      if (await provider.hasLocalAsync()) {
-        return CredentialsSource.LOCAL;
-      } else {
-        return CredentialsSource.REMOTE;
-      }
-    case Workflow.Generic: {
-      const hasLocal = await provider.hasLocalAsync();
-      const hasRemote = await provider.hasRemoteAsync();
-      if (hasRemote && hasLocal) {
-        if (!(await provider.isLocalSyncedAsync())) {
-          if (nonInteractive) {
-            throw new Error(
-              `Contents of your local credentials.json for ${platform} are not the same as credentials on EAS servers. To use the desired credentials, set the "builds.${platform}.{profile}.credentialsSource" field in the credentials.json file to one of the following: "local", "remote".`
-            );
-          } else {
-            Log.log(
-              `Contents of your local credentials.json for ${platform} are not the same as credentials on EAS servers`
-            );
-          }
-
-          const { select } = await promptAsync({
-            type: 'select',
-            name: 'select',
-            message: 'Which credentials do you want to use for this build?',
-            choices: [
-              { title: 'Local credentials.json', value: CredentialsSource.LOCAL },
-              { title: 'Credentials stored on EAS servers.', value: CredentialsSource.REMOTE },
-            ],
-          });
-          return select;
-        } else {
-          return CredentialsSource.LOCAL;
-        }
-      } else if (hasLocal) {
-        logCredentials('local', provider.platform);
-        return CredentialsSource.LOCAL;
-      } else if (hasRemote) {
-        logCredentials('remote', provider.platform);
-        return CredentialsSource.REMOTE;
-      } else {
-        if (nonInteractive) {
-          throw new Error(
-            `Credentials for this app are not configured and there is no entry in credentials.json for ${platform}. Either configure credentials.json, or launch the build without "--non-interactive" flag to get a prompt to generate credentials automatically.`
-          );
-        } else if (Log.isDebug) {
-          Log.warn(
-            `Credentials for this app are not configured and there is no entry in credentials.json for ${platform}`
-          );
-        }
-
-        const confirm = await confirmAsync({
-          message: `${platform} credentials not found, generate now?`,
-        });
-        if (confirm) {
-          return CredentialsSource.REMOTE;
-        } else {
-          throw new Error(`Aborting build process, credentials are not configured for ${platform}`);
-        }
-      }
-    }
-  }
-}
-
-export async function ensureCredentialsAsync(
-  provider: CredentialsProvider,
-  workflow: Workflow,
-  src: CredentialsSource,
-  nonInteractive: boolean
-): Promise<CredentialsSource.LOCAL | CredentialsSource.REMOTE> {
-  switch (src) {
-    case CredentialsSource.LOCAL:
-      logCredentials('local', provider.platform);
-      return CredentialsSource.LOCAL;
-    case CredentialsSource.REMOTE:
-      logCredentials('remote', provider.platform);
-      return CredentialsSource.REMOTE;
-    case CredentialsSource.AUTO:
-      return await ensureCredentialsAutoAsync(provider, workflow, nonInteractive);
-  }
-}

packages/eas-cli/src/build/graphql.ts

@@ -0,0 +1,64 @@
+import { ArchiveSource, ArchiveSourceType, Metadata, Workflow } from '@expo/eas-build-job';
+
+import {
+  BuildCredentialsSource,
+  BuildMetadataInput,
+  BuildWorkflow,
+  DistributionType,
+  ProjectArchiveSourceInput,
+  ProjectArchiveSourceType,
+} from '../graphql/generated';
+
+export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
+  if (archiveSource.type === ArchiveSourceType.S3) {
+    return {
+      type: ProjectArchiveSourceType.S3,
+      bucketKey: archiveSource.bucketKey,
+    };
+  } else if (archiveSource.type === ArchiveSourceType.URL) {
+    return {
+      type: ProjectArchiveSourceType.Url,
+      url: archiveSource.url,
+    };
+  } else {
+    throw new Error(`Unsupported project archive source type: '${archiveSource.type}'`);
+  }
+}
+
+export function transformMetadata(metadata: Metadata): BuildMetadataInput {
+  return {
+    ...metadata,
+    credentialsSource:
+      metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
+    distribution: metadata.distribution && transformDistribution(metadata.distribution),
+    workflow: metadata.workflow && transformWorkflow(metadata.workflow),
+  };
+}
+
+function transformCredentialsSource(
+  credentialsSource: Metadata['credentialsSource']
+): BuildCredentialsSource {
+  if (credentialsSource === 'local') {
+    return BuildCredentialsSource.Local;
+  } else {
+    return BuildCredentialsSource.Remote;
+  }
+}
+
+function transformDistribution(distribution: Metadata['distribution']): DistributionType {
+  if (distribution === 'internal') {
+    return DistributionType.Internal;
+  } else if (distribution === 'simulator') {
+    return DistributionType.Simulator;
+  } else {
+    return DistributionType.Store;
+  }
+}
+
+function transformWorkflow(workflow: Metadata['workflow']): BuildWorkflow {
+  if (workflow === Workflow.GENERIC) {
+    return BuildWorkflow.Generic;
+  } else {
+    return BuildWorkflow.Managed;
+  }
+}

packages/eas-cli/src/build/ios/UpdatesModule.ts

@@ -5,7 +5,7 @@ import fs from 'fs-extra';
 import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { gitAddAsync } from '../../utils/git';
+import vcs from '../../vcs';
 import { ensureValidVersions } from '../utils/updates';
 import { readPlistAsync, writePlistAsync } from './plist';
 
@@ -84,5 +84,24 @@ async function writeExpoPlistAsync(
 ): Promise<void> {
   const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
   await writePlistAsync(expoPlistPath, expoPlist);
-  await gitAddAsync(expoPlistPath, { intentToAdd: true });
+  await vcs.trackFileAsync(expoPlistPath);
+}
+
+export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const expoPlist = await readExpoPlistAsync(projectDir);
+    return expoPlist[IOSConfig.Updates.Config.RELEASE_CHANNEL] ?? null;
+  } catch (err) {
+    return null;
+  }
+}
+
+export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const expoPlist: any = await readExpoPlistAsync(projectDir); // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
+    const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'] ?? {}; //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+    return updatesRequestHeaders['expo-channel-name'] ?? null;
+  } catch (err) {
+    return null;
+  }
 }

packages/eas-cli/src/build/ios/__tests__/UpdatesModule-test.ts

@@ -0,0 +1,88 @@
+import fs from 'fs-extra';
+import { vol } from 'memfs';
+import os from 'os';
+
+import { readChannelSafelyAsync } from '../UpdatesModule';
+
+jest.mock('fs');
+
+afterAll(() => {
+  // do not remove the following line
+  // this fixes a weird error with tempy in @expo/image-utils
+  fs.removeSync(os.tmpdir());
+});
+
+beforeEach(() => {
+  vol.reset();
+  // do not remove the following line
+  // this fixes a weird error with tempy in @expo/image-utils
+  fs.mkdirpSync(os.tmpdir());
+});
+
+const testChannel = 'test-channel';
+describe(readChannelSafelyAsync, () => {
+  it('retrieves the channel when it is defined natively', async () => {
+    vol.fromJSON(
+      {
+        'ios/expo-project/Supporting/Expo.plist': ExpoPlistWithChannel,
+        'ios/expo-project/AppDelegate.m': '',
+      },
+      '/expo-project'
+    );
+    const channel = await readChannelSafelyAsync('/expo-project');
+    expect(channel).toBe(testChannel);
+  });
+  it('returns null if the channel is not defined natively', async () => {
+    vol.fromJSON(
+      {
+        'ios/expo-project/Supporting/Expo.plist': ExpoPlistWithOutChannel,
+        'ios/expo-project/AppDelegate.m': '',
+      },
+      '/expo-project'
+    );
+    const channel = await readChannelSafelyAsync('/expo-project');
+    expect(channel).toBeNull();
+  });
+});
+
+const ExpoPlistWithChannel = `
+<plist version="1.0">
+  <dict>
+    <key>EXUpdatesCheckOnLaunch</key>
+    <string>ALWAYS</string>
+    <key>EXUpdatesEnabled</key>
+    <true/>
+    <key>EXUpdatesLaunchWaitMs</key>
+    <integer>0</integer>
+    <key>EXUpdatesReleaseChannel</key>
+    <string>default</string>
+    <key>EXUpdatesSDKVersion</key>
+    <string>40.0.0</string>
+    <key>EXUpdatesURL</key>
+    <string>https://exp.host/@user/expo-project</string>
+    <key>EXUpdatesRequestHeaders</key>
+		<dict>
+			<key>expo-channel-name</key>
+			<string>${testChannel}</string>
+		</dict>
+  </dict>
+</plist>
+`;
+const ExpoPlistWithOutChannel = `
+<plist version="1.0">
+  <dict>
+    <key>EXUpdatesCheckOnLaunch</key>
+    <string>ALWAYS</string>
+    <key>EXUpdatesEnabled</key>
+    <true/>
+    <key>EXUpdatesLaunchWaitMs</key>
+    <integer>0</integer>
+    <key>EXUpdatesReleaseChannel</key>
+    <string>default</string>
+    <key>EXUpdatesSDKVersion</key>
+    <string>40.0.0</string>
+    <key>EXUpdatesURL</key>
+    <string>https://exp.host/@user/expo-project</string>
+  </dict>
+</plist>
+`;

packages/eas-cli/src/build/ios/__tests__/version-test.ts

@@ -1,10 +1,17 @@
 import { ExpoConfig } from '@expo/config';
+import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
 import { readPlistAsync } from '../plist';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from '../version';
+import {
+  BumpStrategy,
+  bumpVersionAsync,
+  bumpVersionInAppJsonAsync,
+  readBuildNumberAsync,
+  readShortVersionAsync,
+} from '../version';
 
 jest.mock('fs');
 
@@ -38,9 +45,11 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = await readPlistAsync('/repo/ios/myproject/Info.plist');
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
-    expect(fakeExp.ios.buildNumber).toBe('2');
+    expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
     expect(appJSON.expo.ios.buildNumber).toBe('2');
     expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
@@ -57,9 +66,11 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = await readPlistAsync('/repo/ios/myproject/Info.plist');
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.1');
-    expect(fakeExp.ios.buildNumber).toBe('1');
+    expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.1');
     expect(appJSON.expo.ios.buildNumber).toBe('1');
     expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.1');
@@ -76,9 +87,11 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = await readPlistAsync('/repo/ios/myproject/Info.plist');
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
-    expect(fakeExp.ios.buildNumber).toBe('1');
+    expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.0');
     expect(appJSON.expo.ios.buildNumber).toBe('1');
     expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
@@ -99,7 +112,7 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('1.0.0');
-    expect(fakeExp.ios.buildNumber).toBe('2');
+    expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
     expect(appJSON.expo.ios.buildNumber).toBe('2');
   });
@@ -115,7 +128,7 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('1.0.1');
-    expect(fakeExp.ios.buildNumber).toBe('1');
+    expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.1');
     expect(appJSON.expo.ios.buildNumber).toBe('1');
   });
@@ -131,12 +144,48 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('1.0.0');
-    expect(fakeExp.ios.buildNumber).toBe('1');
+    expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.0');
     expect(appJSON.expo.ios.buildNumber).toBe('1');
   });
 });
 
+describe(readBuildNumberAsync, () => {
+  describe('generic project', () => {
+    it('reads the build number from native code', async () => {
+      const exp = initGenericProject();
+      const buildNumber = await readBuildNumberAsync('/repo', exp);
+      expect(buildNumber).toBe('1');
+    });
+  });
+
+  describe('managed project', () => {
+    it('reads the build number from expo config', async () => {
+      const exp = initManagedProject();
+      const buildNumber = await readBuildNumberAsync('/repo', exp);
+      expect(buildNumber).toBe('1');
+    });
+  });
+});
+
+describe(readShortVersionAsync, () => {
+  describe('generic project', () => {
+    it('reads the short version from native code', async () => {
+      const exp = initGenericProject();
+      const shortVersion = await readShortVersionAsync('/repo', exp);
+      expect(shortVersion).toBe('1.0.0');
+    });
+  });
+
+  describe('managed project', () => {
+    it('reads the version from app config', async () => {
+      const exp = initGenericProject();
+      const shortVersion = await readShortVersionAsync('/repo', exp);
+      expect(shortVersion).toBe('1.0.0');
+    });
+  });
+});
+
 function initGenericProject(): ExpoConfig {
   vol.fromJSON(
     {

packages/eas-cli/src/build/ios/build.ts

@@ -1,33 +1,36 @@
-import { IOSConfig } from '@expo/config-plugins';
-import { Workflow } from '@expo/eas-build-job';
+import { Ios, Job, Metadata, Workflow } from '@expo/eas-build-job';
 import { EasConfig } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import sortBy from 'lodash/sortBy';
 import path from 'path';
 
-import Log from '../../log';
-import { promptAsync } from '../../prompts';
-import { prepareBuildRequestForPlatformAsync } from '../build';
+import { IosCredentials } from '../../credentials/ios/types';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
+import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
+import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
+import { resolveTargetsAsync } from '../../project/ios/target';
+import { JobData, prepareBuildRequestForPlatformAsync } from '../build';
 import { BuildContext, CommandContext, createBuildContext } from '../context';
+import { transformMetadata } from '../graphql';
 import { Platform } from '../types';
-import { ensureBundleIdentifierIsValidAsync } from './bundleIdentifer';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
+import { transformGenericJob, transformManagedJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
 export async function prepareIosBuildAsync(
   commandCtx: CommandContext,
   easConfig: EasConfig
-): Promise<() => Promise<string>> {
-  const buildCtx = createBuildContext<Platform.iOS>({
+): Promise<() => Promise<string | undefined>> {
+  const buildCtx = createBuildContext<Platform.IOS>({
     commandCtx,
-    platform: Platform.iOS,
+    platform: Platform.IOS,
     easConfig,
   });
+  const { buildProfile } = buildCtx;
 
   if (
-    buildCtx.buildProfile.workflow === Workflow.Generic &&
+    buildProfile.workflow === Workflow.GENERIC &&
     !(await fs.pathExists(path.join(commandCtx.projectDir, 'ios')))
   ) {
     throw new Error(
@@ -37,68 +40,68 @@ export async function prepareIosBuildAsync(
     );
   }
 
-  let iosBuildScheme: string | undefined;
-  let iosApplicationTarget: string | undefined;
-  if (buildCtx.buildProfile.workflow === Workflow.Generic) {
-    iosBuildScheme = buildCtx.buildProfile.scheme ?? (await resolveSchemeAsync(buildCtx));
-    iosApplicationTarget = await IOSConfig.Target.getApplicationTargetForSchemeAsync(
-      buildCtx.commandCtx.projectDir,
-      iosBuildScheme
+  if (buildProfile.workflow === Workflow.MANAGED) {
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(
+      commandCtx.projectDir,
+      commandCtx.exp
     );
   }
 
-  await ensureBundleIdentifierIsValidAsync(commandCtx.projectDir);
+  const xcodeBuildContext = await resolveXcodeBuildContextAsync(
+    {
+      projectDir: commandCtx.projectDir,
+      nonInteractive: commandCtx.nonInteractive,
+      exp: commandCtx.exp,
+    },
+    buildProfile
+  );
+  const targets = await resolveTargetsAsync(
+    {
+      projectDir: commandCtx.projectDir,
+      exp: commandCtx.exp,
+    },
+    xcodeBuildContext
+  );
 
   return await prepareBuildRequestForPlatformAsync({
     ctx: buildCtx,
-    projectConfiguration: {
-      iosBuildScheme,
-      iosApplicationTarget,
+    ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
+      return ensureIosCredentialsAsync(ctx, targets);
     },
-    ensureCredentialsAsync: ensureIosCredentialsAsync,
     ensureProjectConfiguredAsync: async () => {
       await validateAndSyncProjectConfigurationAsync({
         projectDir: commandCtx.projectDir,
         exp: commandCtx.exp,
-        buildProfile: buildCtx.buildProfile,
+        buildProfile,
       });
     },
-    prepareJobAsync,
+    prepareJobAsync: async (
+      ctx: BuildContext<Platform.IOS>,
+      jobData: JobData<IosCredentials>
+    ): Promise<Job> => {
+      return await prepareJobAsync(ctx, { ...jobData, buildScheme: xcodeBuildContext.buildScheme });
+    },
+    sendBuildRequestAsync: async (
+      appId: string,
+      job: Ios.Job,
+      metadata: Metadata
+    ): Promise<BuildResult> => {
+      const graphqlMetadata = transformMetadata(metadata);
+      if (job.type === Workflow.GENERIC) {
+        const graphqlJob = transformGenericJob(job);
+        return await BuildMutation.createIosGenericBuildAsync({
+          appId,
+          job: graphqlJob,
+          metadata: graphqlMetadata,
+        });
+      } else {
+        const graphqlJob = transformManagedJob(job);
+        return await BuildMutation.createIosManagedBuildAsync({
+          appId,
+          job: graphqlJob,
+          metadata: graphqlMetadata,
+        });
+      }
+    },
   });
 }
-
-async function resolveSchemeAsync(ctx: BuildContext<Platform.iOS>): Promise<string> {
-  const schemes = IOSConfig.Scheme.getSchemesFromXcodeproj(ctx.commandCtx.projectDir);
-  if (schemes.length === 1) {
-    return schemes[0];
-  }
-
-  const sortedSchemes = sortBy(schemes);
-  Log.newLine();
-  Log.log(
-    `We've found multiple schemes in your Xcode project: ${chalk.bold(sortedSchemes.join(', '))}`
-  );
-  Log.log(
-    `You can specify the scheme you want to build at ${chalk.bold(
-      `builds.ios.${ctx.commandCtx.profile}.scheme`
-    )} in eas.json.`
-  );
-  if (ctx.commandCtx.nonInteractive) {
-    const withoutTvOS = sortedSchemes.filter(i => !i.includes('tvOS'));
-    const scheme = withoutTvOS.length > 0 ? withoutTvOS[0] : sortedSchemes[0];
-    Log.log(
-      `You've run Expo CLI in non-interactive mode, choosing the ${chalk.bold(scheme)} scheme.`
-    );
-    Log.newLine();
-    return scheme;
-  } else {
-    const { selectedScheme } = await promptAsync({
-      type: 'select',
-      name: 'selectedScheme',
-      message: 'Which scheme would you like to build now?',
-      choices: sortedSchemes.map(scheme => ({ title: scheme, value: scheme })),
-    });
-    Log.newLine();
-    return selectedScheme as string;
-  }
-}

packages/eas-cli/src/build/ios/bundleIdentifer.ts

@@ -1,134 +0,0 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-
-import Log from '../../log';
-import {
-  ensureAppIdentifierIsDefinedAsync,
-  getProjectConfigDescription,
-} from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { Platform } from '../types';
-import { updateAppJsonConfigAsync } from '../utils/appJson';
-
-enum BundleIdentiferSource {
-  XcodeProject,
-  AppJson,
-}
-
-function isBundleIdentifierValid(bundleIdentifier: string): boolean {
-  return /^[a-zA-Z][a-zA-Z0-9\-.]+$/.test(bundleIdentifier);
-}
-
-export async function ensureBundleIdentifierIsValidAsync(projectDir: string) {
-  const bundleIdentifier = await ensureAppIdentifierIsDefinedAsync(projectDir, Platform.iOS);
-  if (!isBundleIdentifierValid(bundleIdentifier)) {
-    const configDescription = getProjectConfigDescription(projectDir);
-    Log.error(
-      `Invalid format of iOS bundleId. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`
-    );
-    Log.error(`Update "ios.bundleIdentifier" in ${configDescription} and run this command again.`);
-    throw new Error('Invalid bundleIdentifier');
-  }
-}
-
-export async function configureBundleIdentifierAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<void> {
-  const configDescription = getProjectConfigDescription(projectDir);
-  const bundleIdentifierFromPbxproj = IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(
-    projectDir
-  );
-  const bundleIdentifierFromConfig = IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
-  if (bundleIdentifierFromPbxproj && bundleIdentifierFromConfig) {
-    if (bundleIdentifierFromPbxproj !== bundleIdentifierFromConfig) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `We detected that your Xcode project is configured with a different bundle identifier than the one defined in ${configDescription}.`
-      );
-      const hasBundleIdentifierInStaticConfig = await hasBundleIdentifierInStaticConfigAsync(
-        projectDir,
-        exp
-      );
-      if (!hasBundleIdentifierInStaticConfig) {
-        Log.log(`If you choose the one defined in ${configDescription} we'll automatically configure your Xcode project with it.
-However, if you choose the one defined in the Xcode project you'll have to update ${configDescription} on your own.`);
-      }
-      Log.newLine();
-      const { bundleIdentifierSource } = await promptAsync({
-        type: 'select',
-        name: 'bundleIdentifierSource',
-        message: 'Which bundle identifier should we use?',
-        choices: [
-          {
-            title: `${chalk.bold(bundleIdentifierFromPbxproj)} - In Xcode project`,
-            value: BundleIdentiferSource.XcodeProject,
-          },
-          {
-            title: `${chalk.bold(bundleIdentifierFromConfig)} - In your ${configDescription}`,
-            value: BundleIdentiferSource.AppJson,
-          },
-        ],
-      });
-      switch (bundleIdentifierSource) {
-        case BundleIdentiferSource.AppJson: {
-          IOSConfig.BundleIdentifier.setBundleIdentifierForPbxproj(
-            projectDir,
-            bundleIdentifierFromConfig
-          );
-          break;
-        }
-        case BundleIdentiferSource.XcodeProject: {
-          if (hasBundleIdentifierInStaticConfig) {
-            await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-              config.ios = { ...config.ios, bundleIdentifier: bundleIdentifierFromPbxproj };
-            });
-          } else {
-            throw new Error(missingBundleIdentifierMessage(configDescription));
-          }
-          break;
-        }
-      }
-    }
-  } else if (!bundleIdentifierFromPbxproj && !bundleIdentifierFromConfig) {
-    throw new Error(missingBundleIdentifierMessage(configDescription));
-  } else if (bundleIdentifierFromPbxproj && !bundleIdentifierFromConfig) {
-    if (getConfigFilePaths(projectDir).staticConfigPath) {
-      await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-        config.ios = { ...config.ios, bundleIdentifier: bundleIdentifierFromPbxproj };
-      });
-    } else {
-      throw new Error(missingBundleIdentifierMessage(configDescription));
-    }
-  } else if (!bundleIdentifierFromPbxproj && bundleIdentifierFromConfig) {
-    IOSConfig.BundleIdentifier.setBundleIdentifierForPbxproj(
-      projectDir,
-      bundleIdentifierFromConfig
-    );
-  }
-}
-
-function missingBundleIdentifierMessage(configDescription: string): string {
-  return `Please define "ios.bundleIdentifier" in ${configDescription} and run "eas build:configure" again.`;
-}
-
-/**
- * Check if static config exists and if ios.bundleIdentifier is defined there.
- * It will return false if the value in static config is different than "ios.bundleIdentifier" in ExpoConfig
- */
-async function hasBundleIdentifierInStaticConfigAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<boolean> {
-  if (!exp.ios?.bundleIdentifier) {
-    return false;
-  }
-  const paths = getConfigFilePaths(projectDir);
-  if (!paths.staticConfigPath) {
-    return false;
-  }
-  const rawStaticConfig = await fs.readJson(paths.staticConfigPath);
-  return rawStaticConfig?.expo?.ios?.bundleIdentifier === exp.ios.bundleIdentifier;
-}

packages/eas-cli/src/build/ios/configure.ts

@@ -1,24 +1,24 @@
 import { ExpoConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
 import { Workflow } from '@expo/eas-build-job';
-import { VersionAutoIncrement, iOSBuildProfile } from '@expo/eas-json';
+import { IosBuildProfile, VersionAutoIncrement } from '@expo/eas-json';
 
 import Log from '../../log';
+import {
+  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
+  warnIfBundleIdentifierDefinedInAppConfigForGenericProject,
+} from '../../project/ios/bundleIdentifier';
 import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
 import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
-import {
-  configureBundleIdentifierAsync,
-  ensureBundleIdentifierIsValidAsync,
-} from './bundleIdentifer';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
   if (!ctx.hasIosNativeProject) {
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
     return;
   }
-  await configureBundleIdentifierAsync(ctx.projectDir, ctx.exp);
-  await ensureBundleIdentifierIsValidAsync(ctx.projectDir);
+
+  warnIfBundleIdentifierDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
 
   if (isExpoUpdatesInstalled(ctx.projectDir)) {
     await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -33,20 +33,12 @@ export async function validateAndSyncProjectConfigurationAsync({
 }: {
   projectDir: string;
   exp: ExpoConfig;
-  buildProfile: iOSBuildProfile;
+  buildProfile: IosBuildProfile;
 }): Promise<void> {
   const { workflow, autoIncrement } = buildProfile;
   const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement);
 
-  if (workflow === Workflow.Generic) {
-    const bundleIdentifierFromPbxproj = IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(
-      projectDir
-    );
-    if (!bundleIdentifierFromPbxproj || bundleIdentifierFromPbxproj !== exp.ios?.bundleIdentifier) {
-      throw new Error(
-        'Bundle identifier is not configured correctly in your Xcode project. Please run "eas build:configure" to configure it.'
-      );
-    }
+  if (workflow === Workflow.GENERIC) {
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }

packages/eas-cli/src/build/ios/credentials.ts

@@ -1,73 +1,49 @@
-import { Workflow } from '@expo/eas-build-job';
-import { CredentialsSource, DistributionType } from '@expo/eas-json';
-import assert from 'assert';
-
 import { createCredentialsContextAsync } from '../../credentials/context';
-import IosCredentialsProvider, {
-  IosCredentials,
-} from '../../credentials/ios/IosCredentialsProvider';
-import { AppLookupParams } from '../../credentials/ios/credentials';
+import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
+import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
+import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
-import { ensureCredentialsAsync } from '../credentials';
 import { Platform } from '../types';
+import { logCredentialsSource } from '../utils/credentials';
 
 export async function ensureIosCredentialsAsync(
-  ctx: BuildContext<Platform.iOS>
+  buildCtx: BuildContext<Platform.IOS>,
+  targets: Target[]
 ): Promise<CredentialsResult<IosCredentials> | undefined> {
-  if (!shouldProvideCredentials(ctx)) {
+  if (!shouldProvideCredentials(buildCtx)) {
     return;
   }
-  assert(ctx.commandCtx.exp?.ios?.bundleIdentifier, 'ios.bundleIdentifier is required');
-  return await resolveIosCredentialsAsync(ctx.commandCtx.projectDir, {
-    app: {
-      accountName: ctx.commandCtx.accountName,
-      projectName: ctx.commandCtx.projectName,
-      bundleIdentifier: ctx.commandCtx.exp.ios.bundleIdentifier,
-    },
-    workflow: ctx.buildProfile.workflow,
-    credentialsSource: ctx.buildProfile.credentialsSource,
-    distribution: ctx.buildProfile.distribution ?? DistributionType.STORE,
-    nonInteractive: ctx.commandCtx.nonInteractive,
-    skipCredentialsCheck: ctx.commandCtx.skipCredentialsCheck,
+
+  const { projectDir } = buildCtx.commandCtx;
+
+  const ctx = await createCredentialsContextAsync(projectDir, {
+    nonInteractive: buildCtx.commandCtx.nonInteractive,
   });
-}
 
-interface ResolveCredentialsParams {
-  app: AppLookupParams;
-  workflow: Workflow;
-  credentialsSource: CredentialsSource;
-  distribution: DistributionType;
-  nonInteractive: boolean;
-  skipCredentialsCheck: boolean;
-}
+  const provider = new IosCredentialsProvider(ctx, {
+    app: getAppFromContext(ctx),
+    targets,
+    iosCapabilitiesOptions: {
+      entitlements: await resolveEntitlementsJsonAsync(
+        buildCtx.commandCtx.projectDir,
+        buildCtx.buildProfile.workflow
+      ),
+    },
+    distribution: buildCtx.buildProfile.distribution ?? 'store',
+    enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
+  });
 
-export async function resolveIosCredentialsAsync(
-  projectDir: string,
-  params: ResolveCredentialsParams
-): Promise<CredentialsResult<IosCredentials>> {
-  const provider = new IosCredentialsProvider(
-    await createCredentialsContextAsync(projectDir, {
-      nonInteractive: params.nonInteractive,
-    }),
-    {
-      app: params.app,
-      distribution: params.distribution,
-      skipCredentialsCheck: params.skipCredentialsCheck,
-    }
-  );
-  const credentialsSource = await ensureCredentialsAsync(
-    provider,
-    params.workflow,
-    params.credentialsSource,
-    params.nonInteractive
-  );
+  const { credentialsSource } = buildCtx.buildProfile;
+
+  logCredentialsSource(credentialsSource, Platform.IOS);
   return {
     credentials: await provider.getCredentialsAsync(credentialsSource),
     source: credentialsSource,
   };
 }
 
-function shouldProvideCredentials(ctx: BuildContext<Platform.iOS>): boolean {
-  return true;
+function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
+  return buildCtx.buildProfile.distribution !== 'simulator';
 }

packages/eas-cli/src/build/ios/graphql.ts

@@ -0,0 +1,82 @@
+import { Env, Ios } from '@expo/eas-build-job';
+import nullthrows from 'nullthrows';
+
+import {
+  DistributionType,
+  IosGenericJobInput,
+  IosJobSecretsInput,
+  IosManagedBuildType,
+  IosManagedJobInput,
+} from '../../graphql/generated';
+import { transformProjectArchive } from '../graphql';
+
+export function transformGenericJob(job: Ios.GenericJob): IosGenericJobInput {
+  return {
+    projectArchive: transformProjectArchive(job.projectArchive),
+    projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
+    updates: job.updates,
+    distribution: job.distribution && transformDistributionType(job.distribution),
+    secrets: transformIosSecrets(job.secrets),
+    builderEnvironment: job.builderEnvironment,
+    cache: job.cache,
+    scheme: job.scheme,
+    buildConfiguration: job.buildConfiguration,
+    artifactPath: job.artifactPath,
+  };
+}
+
+export function transformManagedJob(job: Ios.ManagedJob): IosManagedJobInput {
+  return {
+    projectArchive: transformProjectArchive(job.projectArchive),
+    projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
+    updates: job.updates,
+    distribution: job.distribution && transformDistributionType(job.distribution),
+    secrets: transformIosSecrets(job.secrets),
+    builderEnvironment: job.builderEnvironment,
+    cache: job.cache,
+    buildType: job.buildType && transformBuildType(job.buildType),
+    username: job.username,
+  };
+}
+
+function transformDistributionType(distributionType: Ios.DistributionType): DistributionType {
+  if (distributionType === 'store') {
+    return DistributionType.Store;
+  } else if (distributionType === 'internal') {
+    return DistributionType.Internal;
+  } else {
+    return DistributionType.Simulator;
+  }
+}
+
+function transformIosSecrets(secrets: {
+  buildCredentials?: Ios.BuildCredentials;
+  env?: Env;
+}): IosJobSecretsInput {
+  const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];
+
+  for (const targetName of Object.keys(secrets.buildCredentials ?? {})) {
+    buildCredentials.push({
+      targetName,
+      provisioningProfileBase64: nullthrows(secrets.buildCredentials?.[targetName])
+        .provisioningProfileBase64,
+      distributionCertificate: nullthrows(secrets.buildCredentials?.[targetName])
+        .distributionCertificate,
+    });
+  }
+
+  return {
+    buildCredentials,
+    environmentSecrets: secrets.env,
+  };
+}
+
+function transformBuildType(buildType: Ios.ManagedBuildType): IosManagedBuildType {
+  if (buildType === Ios.ManagedBuildType.DEVELOPMENT_CLIENT) {
+    return IosManagedBuildType.DevelopmentClient;
+  } else {
+    return IosManagedBuildType.Release;
+  }
+}

packages/eas-cli/src/build/ios/prepareJob.ts

@@ -1,43 +1,29 @@
-import {
-  ArchiveSource,
-  ArchiveSourceType,
-  Job,
-  Workflow,
-  iOS,
-  sanitizeJob,
-} from '@expo/eas-build-job';
-import { iOSGenericBuildProfile, iOSManagedBuildProfile } from '@expo/eas-json';
-import assert from 'assert';
+import { ArchiveSource, Cache, Ios, Job, Workflow, sanitizeJob } from '@expo/eas-build-job';
+import { IosGenericBuildProfile, IosManagedBuildProfile } from '@expo/eas-json';
 import path from 'path';
+import semver from 'semver';
 
-import {
-  IosCredentials,
-  IosTargetCredentials,
-  isCredentialsMap,
-  readSecretEnvsAsync,
-} from '../../credentials/credentialsJson/read';
-import { getProjectAccountNameAsync } from '../../project/projectUtils';
-import { gitRootDirectoryAsync } from '../../utils/git';
+import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
+import { getUsername } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
 import { Platform } from '../types';
 
 interface JobData {
-  archiveBucketKey: string;
+  projectArchive: ArchiveSource;
   credentials?: IosCredentials;
-  projectConfiguration: {
-    iosBuildScheme?: string;
-    iosApplicationTarget?: string;
-  };
+  buildScheme: string;
 }
 
 export async function prepareJobAsync(
-  ctx: BuildContext<Platform.iOS>,
+  ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Job> {
-  if (ctx.buildProfile.workflow === Workflow.Generic) {
+  if (ctx.buildProfile.workflow === Workflow.GENERIC) {
     const partialJob = await prepareGenericJobAsync(ctx, jobData, ctx.buildProfile);
     return sanitizeJob(partialJob);
-  } else if (ctx.buildProfile.workflow === Workflow.Managed) {
+  } else if (ctx.buildProfile.workflow === Workflow.MANAGED) {
     const partialJob = await prepareManagedJobAsync(ctx, jobData, ctx.buildProfile);
     return sanitizeJob(partialJob);
   } else {
@@ -46,123 +32,114 @@ export async function prepareJobAsync(
 }
 
 interface CommonJobProperties {
-  platform: Platform.iOS;
+  platform: Platform.IOS;
   projectArchive: ArchiveSource;
-  builderEnvironment: iOS.BuilderEnvironment;
-  releaseChannel: string;
+  builderEnvironment: Ios.BuilderEnvironment;
+  distribution?: Ios.DistributionType;
+  cache: Cache;
   secrets: {
-    buildCredentials: iOS.BuildCredentials;
-    secretEnvs?: Record<string, string>;
+    buildCredentials: Ios.BuildCredentials;
+    environmentSecrets?: Record<string, string>;
   };
 }
 
 async function prepareJobCommonAsync(
-  ctx: BuildContext<Platform.iOS>,
-  {
-    archiveBucketKey,
-    credentials,
-    targetName,
-  }: { archiveBucketKey: string; credentials?: IosCredentials; targetName?: string }
+  ctx: BuildContext<Platform.IOS>,
+  { credentials, projectArchive }: { credentials?: IosCredentials; projectArchive: ArchiveSource }
 ): Promise<Partial<CommonJobProperties>> {
-  const secretEnvs = await readSecretEnvsAsync(ctx.commandCtx.projectDir);
-
-  let buildCredentials: CommonJobProperties['secrets']['buildCredentials'] = {};
-  if (credentials && isCredentialsMap(credentials)) {
-    const targets = Object.keys(credentials);
-    for (const target of targets) {
-      buildCredentials[target] = prepareTargetCredentials(credentials[target]);
+  const buildCredentials: CommonJobProperties['secrets']['buildCredentials'] = {};
+  if (credentials) {
+    const targetNames = Object.keys(credentials);
+    for (const targetName of targetNames) {
+      buildCredentials[targetName] = prepareTargetCredentials(credentials[targetName]);
     }
-  } else if (credentials) {
-    // targetName
-    // - for managed projects: sanitized .name from the app config
-    // - for generic projects: name of the application target
-    assert(targetName, 'target name should be defined');
-    buildCredentials = {
-      [targetName]: prepareTargetCredentials(credentials),
-    };
   }
 
   return {
-    platform: Platform.iOS,
-    projectArchive: {
-      type: ArchiveSourceType.S3,
-      bucketKey: archiveBucketKey,
-    },
+    platform: Platform.IOS,
+    projectArchive,
+    distribution: ctx.buildProfile.distribution,
     builderEnvironment: {
-      image: ctx.buildProfile.image,
+      image: resolveImage(ctx),
       node: ctx.buildProfile.node,
       yarn: ctx.buildProfile.yarn,
+      bundler: ctx.buildProfile.bundler,
       cocoapods: ctx.buildProfile.cocoapods,
       fastlane: ctx.buildProfile.fastlane,
+      expoCli: ctx.buildProfile.expoCli,
       env: ctx.buildProfile.env,
     },
+    cache: {
+      ...ctx.buildProfile.cache,
+      clear: ctx.commandCtx.clearCache,
+    },
     secrets: {
-      ...(secretEnvs ? { secretEnvs } : {}),
       buildCredentials,
     },
   };
 }
 
-function prepareTargetCredentials(targetCredentials: IosTargetCredentials): iOS.TargetCredentials {
+function resolveImage(ctx: BuildContext<Platform.IOS>): Ios.BuilderEnvironment['image'] {
+  // see https://linear.app/expo/issue/ENG-1396/make-default-image-dependent-on-sdk-version
+  if (!ctx.buildProfile.image && ctx.commandCtx.exp.sdkVersion) {
+    const majorSdkVersion = semver.major(ctx.commandCtx.exp.sdkVersion);
+    if (majorSdkVersion <= 41) {
+      return 'macos-catalina-10.15-xcode-12.4';
+    }
+  }
+  return ctx.buildProfile.image ?? 'default';
+}
+
+function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {
   return {
     provisioningProfileBase64: targetCredentials.provisioningProfile,
     distributionCertificate: {
-      dataBase64: targetCredentials.distributionCertificate.certP12,
-      password: targetCredentials.distributionCertificate.certPassword,
+      dataBase64: targetCredentials.distributionCertificate.certificateP12,
+      password: targetCredentials.distributionCertificate.certificatePassword,
     },
   };
 }
 
 async function prepareGenericJobAsync(
-  ctx: BuildContext<Platform.iOS>,
+  ctx: BuildContext<Platform.IOS>,
   jobData: JobData,
-  buildProfile: iOSGenericBuildProfile
-): Promise<Partial<iOS.GenericJob>> {
+  buildProfile: IosGenericBuildProfile
+): Promise<Partial<Ios.GenericJob>> {
   const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
+    path.relative(await vcs.getRootPathAsync(), ctx.commandCtx.projectDir) || '.';
   return {
     ...(await prepareJobCommonAsync(ctx, {
-      archiveBucketKey: jobData.archiveBucketKey,
       credentials: jobData.credentials,
-      targetName: jobData.projectConfiguration.iosApplicationTarget,
+      projectArchive: jobData.projectArchive,
     })),
-    type: Workflow.Generic,
-    scheme: jobData.projectConfiguration.iosBuildScheme,
-    schemeBuildConfiguration: buildProfile.schemeBuildConfiguration,
+    type: Workflow.GENERIC,
+    scheme: jobData.buildScheme,
+    buildConfiguration: buildProfile.schemeBuildConfiguration,
     artifactPath: buildProfile.artifactPath,
     releaseChannel: buildProfile.releaseChannel,
+    updates: { channel: buildProfile.channel },
     projectRootDirectory,
   };
 }
 
 async function prepareManagedJobAsync(
-  ctx: BuildContext<Platform.iOS>,
+  ctx: BuildContext<Platform.IOS>,
   jobData: JobData,
-  buildProfile: iOSManagedBuildProfile
-): Promise<Partial<iOS.ManagedJob>> {
+  buildProfile: IosManagedBuildProfile
+): Promise<Partial<Ios.ManagedJob>> {
   const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
-  const accountName = await getProjectAccountNameAsync(ctx.commandCtx.projectDir);
-  const targetName = sanitizedName(ctx.commandCtx.exp.name);
+    path.relative(await vcs.getRootPathAsync(), ctx.commandCtx.projectDir) || '.';
+  const username = getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync());
   return {
     ...(await prepareJobCommonAsync(ctx, {
-      archiveBucketKey: jobData.archiveBucketKey,
       credentials: jobData.credentials,
-      targetName,
+      projectArchive: jobData.projectArchive,
     })),
-    type: Workflow.Managed,
+    type: Workflow.MANAGED,
     buildType: buildProfile.buildType,
-    username: accountName,
+    username,
     releaseChannel: buildProfile.releaseChannel,
+    updates: { channel: buildProfile.channel },
     projectRootDirectory,
   };
 }
-
-// copy-pasted from expo-cli/packages/xdl/src/Exp.ts
-// it's used in eject
-function sanitizedName(name: string) {
-  return name
-    .replace(/[\W_]+/g, '')
-    .normalize('NFD')
-    .replace(/[\u0300-\u036f]/g, '');
-}

packages/eas-cli/src/build/ios/version.ts

@@ -1,10 +1,12 @@
 import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
 
 import Log from '../../log';
+import { resolveWorkflow } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { readPlistAsync, writePlistAsync } from './plist';
@@ -100,9 +102,30 @@ export async function bumpVersionInAppJsonAsync({
   }
 }
 
-async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
-  return await readPlistAsync(infoPlistPath);
+export async function readShortVersionAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<string | undefined> {
+  const workflow = resolveWorkflow(projectDir, Platform.IOS);
+  if (workflow === Workflow.GENERIC) {
+    const infoPlist = await readInfoPlistAsync(projectDir);
+    return infoPlist.CFBundleShortVersionString;
+  } else {
+    return exp.version;
+  }
+}
+
+export async function readBuildNumberAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<string | undefined> {
+  const workflow = resolveWorkflow(projectDir, Platform.IOS);
+  if (workflow === Workflow.GENERIC) {
+    const infoPlist = await readInfoPlistAsync(projectDir);
+    return infoPlist.CFBundleVersion;
+  } else {
+    return IOSConfig.Version.getBuildNumber(exp);
+  }
 }
 
 async function writeVersionsToInfoPlistAsync({
@@ -120,6 +143,11 @@ async function writeVersionsToInfoPlistAsync({
   return updatedInfoPlist;
 }
 
+async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
+  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
+  return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+}
+
 async function writeInfoPlistAsync({
   projectDir,
   infoPlist,

packages/eas-cli/src/build/local.ts

@@ -0,0 +1,45 @@
+import { Job } from '@expo/eas-build-job';
+import spawnAsync from '@expo/spawn-async';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+
+import Log from '../log';
+
+const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
+
+export async function runLocalBuildAsync(job: Job): Promise<void> {
+  const execNameOrPath =
+    process.env.EAS_LOCAL_BUILD_PLUGIN_PATH ??
+    (await findWithNodeResolution()) ??
+    PLUGIN_PACKAGE_NAME;
+  try {
+    const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
+    await spawnAsync(execNameOrPath, [arg], {
+      stdio: 'inherit',
+    });
+  } catch (err) {
+    if (err.code === 'ENOENT') {
+      Log.warn(`Could not resolve executable ${execNameOrPath}.`);
+      Log.warn(
+        `Install ${PLUGIN_PACKAGE_NAME} package from npm e.g. ${chalk.bold(
+          `npm install -g ${PLUGIN_PACKAGE_NAME}`
+        )} and make sure it's in PATH.`
+      );
+      throw err;
+    }
+  }
+}
+
+async function findWithNodeResolution(): Promise<string | undefined> {
+  try {
+    const resolvedPath = path.resolve(
+      path.dirname(require.resolve(PLUGIN_PACKAGE_NAME)),
+      '../bin/run'
+    );
+    if (await fs.pathExists(resolvedPath)) {
+      return resolvedPath;
+    }
+  } catch {}
+  return undefined;
+}

packages/eas-cli/src/build/metadata.ts

@@ -1,8 +1,24 @@
-import { CredentialsSource, DistributionType } from '@expo/eas-json';
+import { Metadata } from '@expo/eas-build-job';
+import { CredentialsSource } from '@expo/eas-json';
 
-import { getAppIdentifierAsync } from '../project/projectUtils';
+import { getApplicationId } from '../project/android/applicationId';
+import { getBundleIdentifier } from '../project/ios/bundleIdentifier';
+import { getUsername } from '../project/projectUtils';
+import { ensureLoggedInAsync } from '../user/actions';
+import vcs from '../vcs';
+import {
+  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
+} from './android/UpdatesModule';
+import { readVersionCode, readVersionName } from './android/version';
 import { BuildContext } from './context';
-import { BuildMetadata, Platform } from './types';
+import {
+  readChannelSafelyAsync as readIosChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
+} from './ios/UpdatesModule';
+import { readBuildNumberAsync, readShortVersionAsync } from './ios/version';
+import { Platform } from './types';
+import { isExpoUpdatesInstalled } from './utils/updates';
 
 /**
  * We use require() to exclude package.json from TypeScript's analysis since it lives outside
@@ -18,17 +34,104 @@ export async function collectMetadata<T extends Platform>(
   }: {
     credentialsSource?: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
   }
-): Promise<BuildMetadata> {
+): Promise<Metadata> {
+  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   return {
-    appVersion: ctx.commandCtx.exp.version!,
+    // TODO: type error fixed in https://github.com/expo/eas-build/pull/34
+    // remove @ts-expect-error after upgrading @expo/eas-build-job
+    // @ts-expect-error error TS2322: not assignable to type 'Record<string, string | number>'
+    trackingContext: ctx.trackingCtx,
+    appVersion: await resolveAppVersionAsync(ctx),
+    appBuildVersion: await resolveAppBuildVersionAsync(ctx),
     cliVersion: packageJSON.version,
     workflow: ctx.buildProfile.workflow,
     credentialsSource,
     sdkVersion: ctx.commandCtx.exp.sdkVersion,
-    trackingContext: ctx.trackingCtx,
-    distribution: ctx.buildProfile.distribution ?? DistributionType.STORE,
+    ...channelOrReleaseChannel,
+    distribution: ctx.buildProfile.distribution ?? 'store',
     appName: ctx.commandCtx.exp.name,
-    appIdentifier:
-      (await getAppIdentifierAsync(ctx.commandCtx.projectDir, ctx.platform)) ?? undefined,
+    appIdentifier: resolveAppIdentifier(ctx),
+    buildProfile: ctx.commandCtx.profile,
+    gitCommitHash: await vcs.getCommitHashAsync(),
+    username: getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync()),
   };
 }
+
+async function resolveAppVersionAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string | undefined> {
+  if (ctx.platform === Platform.IOS) {
+    return await readShortVersionAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+  } else {
+    return readVersionName(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+  }
+}
+
+async function resolveAppBuildVersionAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string | undefined> {
+  if (ctx.platform === Platform.IOS) {
+    return await readBuildNumberAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+  } else {
+    const versionCode = readVersionCode(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    return versionCode !== undefined ? String(versionCode) : undefined;
+  }
+}
+
+function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string {
+  if (ctx.platform === Platform.IOS) {
+    return getBundleIdentifier(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+  } else {
+    return getApplicationId(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+  }
+}
+
+async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<{ channel: string } | { releaseChannel: string } | null> {
+  if (!isExpoUpdatesInstalled(ctx.commandCtx.projectDir)) {
+    return null;
+  }
+  if (ctx.buildProfile.channel) {
+    return { channel: ctx.buildProfile.channel };
+  }
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
+  const channel = await getNativeChannelAsync(ctx);
+  if (channel) {
+    return { channel };
+  }
+  const releaseChannel = await getNativeReleaseChannelAsync(ctx);
+  return { releaseChannel };
+}
+
+async function getNativeReleaseChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string> {
+  switch (ctx.platform) {
+    case Platform.ANDROID: {
+      return (await readAndroidReleaseChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? 'default';
+    }
+    case Platform.IOS: {
+      return (await readIosReleaseChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? 'default';
+    }
+    default:
+      return 'default';
+  }
+}
+
+async function getNativeChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string | undefined> {
+  switch (ctx.platform) {
+    case Platform.ANDROID: {
+      return (await readAndroidChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? undefined;
+    }
+    case Platform.IOS: {
+      return (await readIosChannelSafelyAsync(ctx.commandCtx.projectDir)) ?? undefined;
+    }
+  }
+
+  return undefined;
+}

packages/eas-cli/src/build/types.ts

@@ -1,20 +1,13 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import {
-  AndroidBuildProfile,
-  CredentialsSource,
-  DistributionType,
-  iOSBuildProfile,
-} from '@expo/eas-json';
+export { Platform } from '@expo/eas-build-job';
 
 export enum RequestedPlatform {
   Android = 'android',
-  iOS = 'ios',
+  Ios = 'ios',
   All = 'all',
 }
 
-export { Platform };
-
 export enum BuildStatus {
+  NEW = 'new',
   IN_QUEUE = 'in-queue',
   IN_PROGRESS = 'in-progress',
   ERRORED = 'errored',
@@ -22,104 +15,4 @@ export enum BuildStatus {
   CANCELED = 'canceled',
 }
 
-export type TrackingContext = Record<string, string | number>;
-
-export interface Build {
-  id: string;
-  status: BuildStatus;
-  platform: Platform;
-  createdAt: string;
-  updatedAt: string;
-  artifacts?: BuildArtifacts;
-  metadata?: Partial<BuildMetadata>;
-}
-
-interface BuildArtifacts {
-  buildUrl?: string;
-  logsUrl: string;
-}
-
-export type BuildMetadata = {
-  /**
-   * Application version (the expo.version key in app.json/app.config.js)
-   */
-  appVersion: string;
-
-  /**
-   * EAS CLI version
-   */
-  cliVersion: string;
-
-  /**
-   * Build workflow
-   * It's either 'generic' or 'managed'
-   */
-  workflow: Workflow;
-
-  /**
-   * Credentials source
-   * Credentials could be obtained either from credential.json or EAS servers.
-   */
-  credentialsSource?: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
-
-  /**
-   * Expo SDK version
-   * It's determined by the expo package version in package.json.
-   * It's undefined if the expo package is not installed for the project.
-   */
-  sdkVersion?: string;
-
-  /**
-   * Release channel (for expo-updates)
-   * It's undefined if the expo-updates package is not installed for the project.
-   */
-  releaseChannel?: string;
-
-  /**
-   * Tracking context
-   * It's used to track build process across different Expo services and tools.
-   */
-  trackingContext: TrackingContext;
-
-  /**
-   * Distribution type
-   * Indicates whether this is a build for store or internal distribution.
-   */
-  distribution: DistributionType;
-
-  /**
-   * App name (expo.name in app.json/app.config.js)
-   */
-  appName?: string;
-
-  /**
-   * App identifier:
-   * - iOS builds: the bundle identifier (expo.ios.bundleIdentifier in app.json/app.config.js)
-   * - Android builds: the application id (expo.android.package in app.json/app.config.js)
-   */
-  appIdentifier?: string;
-};
-
-export type PlatformBuildProfile<T extends Platform> = T extends Platform.Android
-  ? AndroidBuildProfile
-  : iOSBuildProfile;
-
-export enum AnalyticsEvent {
-  BUILD_COMMAND = 'builds cli build command',
-  PROJECT_UPLOAD_SUCCESS = 'builds cli project upload success',
-  PROJECT_UPLOAD_FAIL = 'builds cli project upload fail',
-  GATHER_CREDENTIALS_SUCCESS = 'builds cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'builds cli gather credentials fail',
-  CONFIGURE_PROJECT_SUCCESS = 'builds cli configure project success',
-  CONFIGURE_PROJECT_FAIL = 'builds cli configure project fail',
-  BUILD_REQUEST_SUCCESS = 'build cli build request success',
-  BUILD_REQUEST_FAIL = 'builds cli build request fail',
-
-  BUILD_STATUS_COMMAND = 'builds cli build status',
-
-  CREDENTIALS_SYNC_COMMAND = 'builds cli credentials sync command',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'builds cli credentials sync update local success',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'builds cli credentials sync update local fail',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'builds cli credentials sync update remote success',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'builds cli credentials sync update remote fail',
-}
+export type TrackingContext = Record<string, string | number | boolean>;

packages/eas-cli/src/build/utils/analytics.ts

@@ -1,3 +1,27 @@
+import { logEvent } from '../../analytics';
+
+export enum Event {
+  BUILD_COMMAND = 'build cli build command',
+  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
+  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
+  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
+  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
+  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
+  BUILD_REQUEST_SUCCESS = 'build cli build request success',
+  BUILD_REQUEST_FAIL = 'build cli build request fail',
+
+  BUILD_STATUS_COMMAND = 'build cli build status',
+
+  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
+}
+
 export default {
-  logEvent: (a: any, b: any) => {},
+  logEvent(name: Event, properties: Record<string, any>) {
+    logEvent(name, properties);
+  },
 };

packages/eas-cli/src/build/utils/appJson.ts

@@ -1,4 +1,3 @@
-// import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import * as ExpoConfig from '@expo/config';
 import assert from 'assert';
 import fs from 'fs-extra';

packages/eas-cli/src/build/utils/credentials.ts

@@ -0,0 +1,15 @@
+import { Platform } from '@expo/eas-build-job';
+import { CredentialsSource } from '@expo/eas-json';
+import chalk from 'chalk';
+
+import Log from '../../log';
+import { requestedPlatformDisplayNames } from '../constants';
+
+export function logCredentialsSource(credentialsSource: CredentialsSource, platform: Platform) {
+  let message = `Using ${credentialsSource} ${requestedPlatformDisplayNames[platform]} credentials`;
+  if (credentialsSource === CredentialsSource.LOCAL)
+    message += ` ${chalk.dim('(credentials.json)')}`;
+  else if (credentialsSource === CredentialsSource.REMOTE)
+    message += ` ${chalk.dim('(Expo server)')}`;
+  Log.succeed(message);
+}

packages/eas-cli/src/build/utils/formatBuild.ts

@@ -1,57 +1,64 @@
 import chalk from 'chalk';
 
+import { BuildFragment, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
 import formatFields from '../../utils/formatFields';
-import { platformDisplayNames } from '../constants';
-import { Build, BuildStatus } from '../types';
+import { appPlatformDisplayNames } from '../constants';
 import { getBuildLogsUrl } from './url';
 
-interface Options {
-  accountName: string;
-}
-
-export default function formatBuild(build: Build, { accountName }: Options) {
+export function formatGraphQLBuild(build: BuildFragment) {
+  const actor = getActorName(build);
+  const account = build.project.__typename === 'App' ? build.project.ownerAccount.name : 'unknown';
   const fields: { label: string; value: string }[] = [
     { label: 'ID', value: build.id },
     {
       label: 'Platform',
-      value: platformDisplayNames[build.platform],
+      value: appPlatformDisplayNames[build.platform],
     },
     {
       label: 'Status',
       get value() {
         switch (build.status) {
-          case BuildStatus.IN_QUEUE:
+          case GraphQLBuildStatus.New:
+            return chalk.blue('new');
+          case GraphQLBuildStatus.InQueue:
             return chalk.blue('in queue');
-          case BuildStatus.IN_PROGRESS:
+          case GraphQLBuildStatus.InProgress:
             return chalk.blue('in progress');
-          case BuildStatus.CANCELED:
+          case GraphQLBuildStatus.Canceled:
             return chalk.gray('canceled');
-          case BuildStatus.FINISHED:
+          case GraphQLBuildStatus.Finished:
             return chalk.green('finished');
-          case BuildStatus.ERRORED:
+          case GraphQLBuildStatus.Errored:
             return chalk.red('errored');
           default:
             return 'unknown';
         }
       },
     },
+    {
+      label: 'Distribution',
+      value: build.distribution?.toLowerCase() ?? chalk.gray('unknown'),
+    },
+    {
+      label: 'Release Channel',
+      value: build.releaseChannel ?? chalk.gray('unknown'),
+    },
     {
       label: 'Logs',
-      value: getBuildLogsUrl({ buildId: build.id, account: accountName }),
+      value: getBuildLogsUrl({ buildId: build.id, account }),
     },
     {
       label: 'Artifact',
       get value() {
-        if (build.status === BuildStatus.IN_QUEUE || build.status === BuildStatus.IN_PROGRESS) {
-        }
         switch (build.status) {
-          case BuildStatus.IN_QUEUE:
-          case BuildStatus.IN_PROGRESS:
+          case GraphQLBuildStatus.New:
+          case GraphQLBuildStatus.InQueue:
+          case GraphQLBuildStatus.InProgress:
             return '<in progress>';
-          case BuildStatus.CANCELED:
-          case BuildStatus.ERRORED:
+          case GraphQLBuildStatus.Canceled:
+          case GraphQLBuildStatus.Errored:
             return '---------';
-          case BuildStatus.FINISHED: {
+          case GraphQLBuildStatus.Finished: {
             const url = build.artifacts?.buildUrl;
             return url ? url : chalk.red('not found');
           }
@@ -63,14 +70,26 @@ export default function formatBuild(build: Build, { accountName }: Options) {
     { label: 'Started at', value: new Date(build.createdAt).toLocaleString() },
     {
       label: 'Finished at',
-      value:
-        build.status === BuildStatus.IN_QUEUE || build.status === BuildStatus.IN_PROGRESS
-          ? '<in progress>'
-          : new Date(build.updatedAt).toLocaleString(),
+      value: [
+        GraphQLBuildStatus.New,
+        GraphQLBuildStatus.InQueue,
+        GraphQLBuildStatus.InProgress,
+      ].includes(build.status)
+        ? '<in progress>'
+        : new Date(build.updatedAt).toLocaleString(),
     },
-    // TODO: we can do it once we migrate to GraphQL
-    // { label: 'Started by', get: build => 'TODO' },
+    { label: 'Started by', value: actor ?? 'unknown' },
   ];
 
   return formatFields(fields);
 }
+
+const getActorName = (build: BuildFragment): string => {
+  if (!build.initiatingActor) {
+    return 'unknown';
+  } else if (build.initiatingActor.__typename === 'User') {
+    return build.initiatingActor.username;
+  } else {
+    return build.initiatingActor.firstName ?? 'unknown';
+  }
+};

packages/eas-cli/src/build/utils/printBuildInfo.ts

@@ -1,16 +1,23 @@
-import { DistributionType } from '@expo/eas-json';
 import assert from 'assert';
 import chalk from 'chalk';
+import indentString from 'indent-string';
+import qrcodeTerminal from 'qrcode-terminal';
 
-import Log from '../../log';
-import { platformDisplayNames, platformEmojis } from '../constants';
-import { Build } from '../types';
-import { getBuildLogsUrl } from './url';
-
-export interface DeprecationInfo {
-  type: 'user-facing' | 'internal';
-  message: string;
-}
+import {
+  BuildError,
+  BuildFragment,
+  BuildStatus,
+  DistributionType,
+  EasBuildDeprecationInfo,
+  EasBuildDeprecationInfoType,
+} from '../../graphql/generated';
+import Log, { learnMore } from '../../log';
+import {
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  requestedPlatformDisplayNames,
+} from '../constants';
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
 export function printLogsUrls(
   accountName: string,
@@ -29,55 +36,80 @@ export function printLogsUrls(
         buildId,
         account: accountName,
       });
-      Log.log(`${platformDisplayNames[platform]} build details: ${chalk.underline(logsUrl)}`);
+      Log.log(
+        `${requestedPlatformDisplayNames[platform]} build details: ${chalk.underline(logsUrl)}`
+      );
     });
   }
 }
 
-export function printBuildResults(accountName: string, builds: (Build | null)[]): void {
+export function printBuildResults(accountName: string, builds: (BuildFragment | null)[]): void {
+  Log.newLine();
   if (builds.length === 1) {
     const [build] = builds;
     assert(build, 'Build should be defined');
     printBuildResult(accountName, build);
   } else {
-    (builds.filter(i => i) as Build[])
-      .filter(build => build.status === 'finished')
-      .forEach(build => printBuildResult(accountName, build));
+    (builds.filter(i => i) as BuildFragment[]).forEach(build =>
+      printBuildResult(accountName, build)
+    );
   }
 }
 
-function printBuildResult(accountName: string, build: Build): void {
-  if (build.metadata?.distribution === DistributionType.INTERNAL) {
+function printBuildResult(accountName: string, build: BuildFragment): void {
+  Log.addNewLineIfNone();
+  if (build.status === BuildStatus.Errored) {
+    const userError = build.error;
+    Log.error(
+      `${appPlatformEmojis[build.platform]} ${
+        appPlatformDisplayNames[build.platform]
+      } build failed${userError ? ':' : ''}`
+    );
+    if (userError) {
+      printUserError(userError);
+    }
+    return;
+  }
+  if (build.status === BuildStatus.Canceled) {
+    Log.error(
+      `${appPlatformEmojis[build.platform]} ${
+        appPlatformDisplayNames[build.platform]
+      } build was canceled`
+    );
+    return;
+  }
+
+  if (build.distribution === DistributionType.Internal) {
     const logsUrl = getBuildLogsUrl({
       buildId: build.id,
       account: accountName,
     });
+    const installUrl = getInternalDistributionInstallUrl(build);
+    qrcodeTerminal.generate(installUrl, code => console.log(`${indentString(code, 2)}\n`));
     Log.log(
-      `${platformEmojis[build.platform]} Open this link on your ${
-        platformDisplayNames[build.platform]
-      } devices to install the app:`
+      `${appPlatformEmojis[build.platform]} Open this link on your ${
+        appPlatformDisplayNames[build.platform]
+      } devices (or scan the QR code) to install the app:`
     );
     Log.log(`${chalk.underline(logsUrl)}`);
-    Log.newLine();
   } else {
     // TODO: it looks like buildUrl could possibly be undefined, based on the code below.
     // we should account for this case better if it is possible
     const url = build.artifacts?.buildUrl ?? '';
-    Log.log(`${platformEmojis[build.platform]} ${platformDisplayNames[build.platform]} app:`);
+    Log.log(`${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`);
     Log.log(`${chalk.underline(url)}`);
-    Log.newLine();
   }
 }
 
-export function printDeprecationWarnings(deprecationInfo?: DeprecationInfo): void {
+export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationInfo | null): void {
   if (!deprecationInfo) {
     return;
   }
-  if (deprecationInfo.type === 'internal') {
+  if (deprecationInfo.type === EasBuildDeprecationInfoType.Internal) {
     Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
     Log.warn("Changes won't affect your project config.");
     Log.warn(deprecationInfo.message);
-  } else if (deprecationInfo.type === 'user-facing') {
+  } else if (deprecationInfo.type === EasBuildDeprecationInfoType.UserFacing) {
     Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
     Log.warn(
       'There might be some changes necessary to your project config, latest eas-cli will provide more specific error messages.'
@@ -88,3 +120,10 @@ export function printDeprecationWarnings(deprecationInfo?: DeprecationInfo): voi
     Log.warn(deprecationInfo);
   }
 }
+
+export function printUserError(error: BuildError): void {
+  Log.error(error.message);
+  if (error.docsUrl) {
+    Log.error(learnMore(error.docsUrl, { dim: false }));
+  }
+}

packages/eas-cli/src/build/utils/repository.ts

@@ -1,4 +1,3 @@
-import spawnAsync from '@expo/spawn-async';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import ora from 'ora';
@@ -8,56 +7,17 @@ import { v4 as uuidv4 } from 'uuid';
 
 import Log from '../../log';
 import { confirmAsync, promptAsync } from '../../prompts';
-import {
-  doesGitRepoExistAsync,
-  getGitDiffOutputAsync,
-  gitDiffAsync,
-  gitRootDirectoryAsync,
-  gitStatusAsync,
-  isGitInstalledAsync,
-} from '../../utils/git';
+import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
+import vcs from '../../vcs';
 
-async function ensureGitRepoExistsAsync(): Promise<void> {
-  if (!(await isGitInstalledAsync())) {
-    throw new Error('git command not found, install it before proceeding');
-  }
-
-  if (await doesGitRepoExistAsync()) {
-    return;
-  }
-
-  Log.warn("It looks like you haven't initialized the git repository yet.");
-  Log.warn('EAS Build requires you to use a git repository for your project.');
-
-  const confirmInit = await confirmAsync({
-    message: `Would you like to run 'git init' in the current directory?`,
-  });
-  if (!confirmInit) {
-    throw new Error(
-      'A git repository is required for building your project. Initialize it and run this command again.'
-    );
-  }
-  await spawnAsync('git', ['init']);
-
-  Log.log("We're going to make an initial commit for you repository.");
-
-  await spawnAsync('git', ['add', '-A']);
-  await commitPromptAsync('Initial commit');
-}
-
-async function isGitStatusCleanAsync(): Promise<boolean> {
-  const changes = await gitStatusAsync();
-  return changes.length === 0;
-}
-
-async function maybeBailOnGitStatusAsync(): Promise<void> {
-  if (await isGitStatusCleanAsync()) {
+export async function maybeBailOnRepoStatusAsync(): Promise<void> {
+  if (!(await vcs.hasUncommittedChangesAsync())) {
     return;
   }
   Log.addNewLineIfNone();
-  Log.warn(`${chalk.bold('Warning!')} Your git working tree is dirty.`);
+  Log.warn(`${chalk.bold('Warning!')} Your repository working tree is dirty.`);
   Log.log(
     `It's recommended to ${chalk.bold(
       'commit all your changes before proceeding'
@@ -72,12 +32,12 @@ async function maybeBailOnGitStatusAsync(): Promise<void> {
   }
 }
 
-async function ensureGitStatusIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (await isGitStatusCleanAsync()) {
+export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
+  if (!(await vcs.hasUncommittedChangesAsync())) {
     return;
   }
   Log.addNewLineIfNone();
-  Log.warn(`${chalk.bold('Warning!')} Your git working tree is dirty.`);
+  Log.warn(`${chalk.bold('Warning!')} Your repository working tree is dirty.`);
   Log.log(
     `This operation needs to be run on a clean working tree, please ${chalk.bold(
       'commit all your changes before proceeding'
@@ -90,13 +50,30 @@ async function ensureGitStatusIsCleanAsync(nonInteractive = false): Promise<void
     message: `Commit changes to git?`,
   });
   if (answer) {
-    await commitPromptAsync();
+    await commitPromptAsync({ commitAllFiles: true });
   } else {
     throw new Error('Please commit all changes. Aborting...');
   }
 }
 
-async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
+export async function commitPromptAsync({
+  initialCommitMessage,
+  commitAllFiles,
+}: {
+  initialCommitMessage?: string;
+  commitAllFiles?: boolean;
+} = {}): Promise<void> {
+  const { message } = await promptAsync({
+    type: 'text',
+    name: 'message',
+    message: 'Commit message:',
+    initial: initialCommitMessage,
+    validate: (input: string) => input !== '',
+  });
+  await vcs.commitAsync({ commitAllFiles, commitMessage: message });
+}
+
+export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
   const spinner = ora('Compressing project files');
 
   await fs.mkdirp(getTmpDirectory());
@@ -118,62 +95,29 @@ async function makeProjectTarballAsync(): Promise<{ path: string; size: number }
   startTimer(compressTimerLabel);
 
   try {
-    await spawnAsync('git', [
-      'clone',
-      '--local',
-      '--no-hardlinks',
-      '--depth',
-      '1',
-      `file://${await gitRootDirectoryAsync()}`,
-      shallowClonePath,
-    ]);
+    await vcs.makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
-  } finally {
-    // Stop the timer
+  } catch (err) {
     clearTimeout(timer);
-    await fs.remove(shallowClonePath);
-
-    const duration = endTimer(compressTimerLabel);
     if (spinner.isSpinning) {
-      const prettyTime = formatMilliseconds(duration);
-      spinner.succeed(`Compressed project files ${chalk.dim(prettyTime)}`);
+      spinner.fail();
     }
+    throw err;
+  } finally {
+    await fs.remove(shallowClonePath);
   }
+  clearTimeout(timer);
 
   const { size } = await fs.stat(tarPath);
+  const duration = endTimer(compressTimerLabel);
+  if (spinner.isSpinning) {
+    const prettyTime = formatMilliseconds(duration);
+    spinner.succeed(
+      `Compressed project files ${chalk.dim(`${prettyTime} (${formatBytes(size)})`)}`
+    );
+  }
+
   return { size, path: tarPath };
 }
-
-async function showDiffAsync() {
-  const outputTooLarge = (await getGitDiffOutputAsync()).split(/\r\n|\r|\n/).length > 100;
-  await gitDiffAsync({ withPager: outputTooLarge });
-}
-
-async function commitPromptAsync(initialCommitMessage?: string): Promise<void> {
-  const { message } = await promptAsync({
-    type: 'text',
-    name: 'message',
-    message: 'Commit message:',
-    initial: initialCommitMessage,
-    validate: (input: string) => input !== '',
-  });
-  await commitChangedFilesAsync(message);
-}
-
-async function commitChangedFilesAsync(message: string): Promise<void> {
-  await spawnAsync('git', ['add', '-u']);
-  await spawnAsync('git', ['commit', '-m', message]);
-}
-
-export {
-  isGitStatusCleanAsync,
-  showDiffAsync,
-  commitPromptAsync,
-  commitChangedFilesAsync,
-  ensureGitRepoExistsAsync,
-  ensureGitStatusIsCleanAsync,
-  maybeBailOnGitStatusAsync,
-  makeProjectTarballAsync,
-};

packages/eas-cli/src/build/utils/url.ts

@@ -1,4 +1,7 @@
-import { getExpoWebsiteBaseUrl } from '../../api';
+import assert from 'assert';
+
+import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
+import { AppPlatform, BuildFragment } from '../../graphql/generated';
 
 export function getBuildLogsUrl({
   buildId,
@@ -13,3 +16,15 @@ export function getBuildLogsUrl({
 export function getArtifactUrl(artifactId: string): string {
   return `${getExpoWebsiteBaseUrl()}/artifacts/${artifactId}`;
 }
+
+export function getInternalDistributionInstallUrl(build: BuildFragment): string {
+  if (build.platform === AppPlatform.Ios) {
+    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/--/api/v2/projects/${
+      build.project.id
+    }/builds/${build.id}/manifest.plist`;
+  }
+
+  assert(build.artifacts?.buildUrl, 'buildUrl is missing');
+
+  return build.artifacts.buildUrl;
+}

packages/eas-cli/src/commandUtils/EasCommand.ts

@@ -0,0 +1,38 @@
+import { Command } from '@oclif/command';
+
+import {
+  AnalyticsEvent,
+  flushAsync as flushAnalyticsAsync,
+  initAsync as initAnalyticsAsync,
+  logEvent,
+} from '../analytics';
+import { getUserAsync } from '../user/User';
+import { ensureLoggedInAsync } from '../user/actions';
+
+export default abstract class EasCommand extends Command {
+  /**
+   * When user data is unavailable locally, determines if the command will
+   * force the user to log in
+   */
+  protected requiresAuthentication = true;
+
+  async init() {
+    await initAnalyticsAsync();
+
+    if (this.requiresAuthentication) {
+      await ensureLoggedInAsync();
+    } else {
+      await getUserAsync();
+    }
+    logEvent(AnalyticsEvent.ACTION, {
+      // id is assigned by oclif in constructor based on the filepath:
+      // commands/submit === submit, commands/build/list === build:list
+      action: `eas ${this.id}`,
+    });
+  }
+
+  async finally(err: Error) {
+    await flushAnalyticsAsync();
+    return super.finally(err);
+  }
+}

packages/eas-cli/src/commandUtils/__tests__/EasCommand-test.ts

@@ -0,0 +1,78 @@
+import { flushAsync, initAsync, logEvent } from '../../analytics';
+import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
+import { getUserAsync } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';
+import EasCommand from '../EasCommand';
+import TestEasCommand from './TestEasCommand';
+
+describe(EasCommand.name, () => {
+  beforeAll(() => {
+    TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
+    jest.mock('../../user/User', () => ({ getUserAsync: jest.fn(() => mockJester) }));
+    jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
+    jest.mock('../../analytics', () => {
+      const { AnalyticsEvent } = jest.requireActual('../../analytics');
+      return {
+        AnalyticsEvent,
+        logEvent: jest.fn(),
+        initAsync: jest.fn(),
+        flushAsync: jest.fn(),
+      };
+    });
+  });
+
+  afterEach(() => {
+    (ensureLoggedInAsync as jest.Mock).mockClear();
+    (initAsync as jest.Mock).mockClear();
+    (flushAsync as jest.Mock).mockClear();
+    (logEvent as jest.Mock).mockClear();
+  });
+
+  describe('without exceptions', () => {
+    it('ensures the user is logged in', async () => {
+      await TestEasCommand.run();
+
+      expect(ensureLoggedInAsync).toHaveReturnedWith(mockJester);
+    });
+
+    it('ensures the user data is read from cache', async () => {
+      (TestEasCommand.prototype.authValue as jest.Mock).mockImplementationOnce(() => false);
+
+      await TestEasCommand.run();
+
+      expect(getUserAsync).toHaveReturnedWith(mockJester);
+    });
+
+    it('initializes analytics', async () => {
+      await TestEasCommand.run();
+
+      expect(initAsync).toHaveBeenCalled();
+    });
+
+    it('flushes analytics', async () => {
+      await TestEasCommand.run();
+
+      expect(flushAsync).toHaveBeenCalled();
+    });
+
+    it('logs events', async () => {
+      await TestEasCommand.run();
+
+      expect(logEvent).toHaveBeenCalledWith('action', {
+        action: `eas ${TestEasCommand.id}`,
+      });
+    });
+  });
+
+  describe('after exceptions', () => {
+    it('flushes analytics', async () => {
+      try {
+        await TestEasCommand.run().then(() => {
+          throw new Error('foo');
+        });
+      } catch (error) {}
+
+      expect(flushAsync).toHaveBeenCalled();
+    });
+  });
+});

packages/eas-cli/src/commandUtils/__tests__/TestEasCommand.ts

@@ -0,0 +1,13 @@
+import EasCommand from '../EasCommand';
+
+export default class TestEasCommand extends EasCommand {
+  requiresAuthentication = this.authValue();
+
+  authValue() {
+    return false;
+  }
+
+  async run() {}
+}
+
+TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not

packages/eas-cli/src/commands/account/view.ts

@@ -2,8 +2,7 @@ import { Command } from '@oclif/command';
 import chalk from 'chalk';
 
 import Log from '../../log';
-import { getUserAsync } from '../../user/User';
-import { getActorDisplayName } from '../../user/actions';
+import { getActorDisplayName, getUserAsync } from '../../user/User';
 
 export default class AccountView extends Command {
   static description = 'show the username you are logged in as';

packages/eas-cli/src/commands/analytics.ts

@@ -0,0 +1,25 @@
+import { Command } from '@oclif/command';
+
+import Log from '../log';
+import UserSettings from '../user/UserSettings';
+
+export default class AnalyticsView extends Command {
+  static description = 'View or change analytics settings';
+
+  static args = [{ name: 'STATUS', options: ['on', 'off'] }];
+
+  async run() {
+    const { STATUS: status } = this.parse(AnalyticsView).args;
+    if (status) {
+      await UserSettings.setAsync('amplitudeEnabled', status === 'on');
+      Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);
+    } else {
+      const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
+      Log.log(
+        `Analytics are ${
+          amplitudeEnabled === false ? 'disabled' : 'enabled'
+        } on this eas-cli installation.`
+      );
+    }
+  }
+}

packages/eas-cli/src/commands/branch/create.ts

@@ -4,45 +4,49 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';
 
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { UpdateBranch } from '../../graphql/generated';
+import {
+  CreateUpdateBranchForAppMutation,
+  CreateUpdateBranchForAppMutationVariables,
+  UpdateBranch,
+} from '../../graphql/generated';
 import Log from '../../log';
-import { ensureProjectExistsAsync } from '../../project/ensureProjectExists';
-import { findProjectRootAsync, getProjectAccountName } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
-import { getBranchNameAsync } from '../../utils/git';
+import vcs from '../../vcs';
 
 export async function createUpdateBranchOnAppAsync({
   appId,
-  branchName,
-}: {
-  appId: string;
-  branchName: string;
-}): Promise<Pick<UpdateBranch, 'id' | 'branchName'>> {
-  const data = await withErrorHandlingAsync(
+  name,
+}: CreateUpdateBranchForAppMutationVariables): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
+  const result = await withErrorHandlingAsync(
     graphqlClient
-      .mutation<
-        { updateBranch: { createUpdateBranchForApp: Pick<UpdateBranch, 'id' | 'branchName'> } },
-        { appId: string; branchName: string }
-      >(
+      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
         gql`
-          mutation createUpdateBranchForApp($appId: ID!, $branchName: String!) {
+          mutation createUpdateBranchForApp($appId: ID!, $name: String!) {
             updateBranch {
-              createUpdateBranchForApp(appId: $appId, branchName: $branchName) {
+              createUpdateBranchForApp(appId: $appId, name: $name) {
                 id
-                branchName
+                name
               }
             }
           }
         `,
         {
           appId,
-          branchName,
+          name,
         }
       )
       .toPromise()
   );
-  return data.updateBranch.createUpdateBranchForApp;
+  const newBranch = result.updateBranch.createUpdateBranchForApp;
+  if (!newBranch) {
+    throw new Error(`Could not create branch ${name}.`);
+  }
+  return newBranch;
 }
 
 export default class BranchCreate extends Command {
@@ -51,7 +55,7 @@ export default class BranchCreate extends Command {
 
   static args = [
     {
-      name: 'branchName',
+      name: 'name',
       required: false,
       description: 'Name of the branch to create',
     },
@@ -66,7 +70,7 @@ export default class BranchCreate extends Command {
 
   async run() {
     let {
-      args: { branchName },
+      args: { name },
       flags,
     } = this.parse(BranchCreate);
 
@@ -76,28 +80,25 @@ export default class BranchCreate extends Command {
     }
 
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-    const projectId = await ensureProjectExistsAsync({
-      accountName,
-      projectName: exp.slug,
-    });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
 
-    if (!branchName) {
+    if (!name) {
       const validationMessage = 'Branch name may not be empty.';
       if (flags.json) {
         throw new Error(validationMessage);
       }
-      ({ branchName } = await promptAsync({
+      ({ name } = await promptAsync({
         type: 'text',
-        name: 'branchName',
+        name: 'name',
         message: 'Please name the branch:',
         initial:
-          (await getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
+          (await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
         validate: value => (value ? true : validationMessage),
       }));
     }
 
-    const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, branchName });
+    const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });
 
     if (flags.json) {
       Log.log(newBranch);
@@ -105,9 +106,7 @@ export default class BranchCreate extends Command {
     }
 
     Log.withTick(
-      `️Created a new branch: ${chalk.bold(newBranch.branchName)} on project ${chalk.bold(
-        `@${accountName}/${exp.slug}`
-      )}.`
+      `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
     );
   }
 }

packages/eas-cli/src/commands/branch/delete.ts

@@ -0,0 +1,153 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  DeleteUpdateBranchMutation,
+  DeleteUpdateBranchMutationVariables,
+  DeleteUpdateBranchResult,
+  GetBranchInfoQuery,
+  GetBranchInfoQueryVariables,
+} from '../../graphql/generated';
+import Log from '../../log';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
+
+async function getBranchInfoAsync({
+  appId,
+  name,
+}: GetBranchInfoQueryVariables): Promise<{ branchId: string }> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetBranchInfoQuery, GetBranchInfoQueryVariables>(
+        gql`
+          query GetBranchInfo($appId: String!, $name: String!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateBranchByName(name: $name) {
+                  id
+                  name
+                }
+              }
+            }
+          }
+        `,
+        {
+          appId,
+          name,
+        }
+      )
+      .toPromise()
+  );
+  const branchId = data.app?.byId.updateBranchByName?.id;
+  if (!branchId) {
+    throw new Error(`Could not find branch ${name} on ${appId}`);
+  }
+  return { branchId };
+}
+
+async function deleteBranchOnAppAsync({
+  branchId,
+}: DeleteUpdateBranchMutationVariables): Promise<DeleteUpdateBranchResult> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .mutation<DeleteUpdateBranchMutation, DeleteUpdateBranchMutationVariables>(
+        gql`
+          mutation DeleteUpdateBranch($branchId: ID!) {
+            updateBranch {
+              deleteUpdateBranch(branchId: $branchId) {
+                id
+              }
+            }
+          }
+        `,
+        {
+          branchId,
+        }
+      )
+      .toPromise()
+  );
+  return data.updateBranch.deleteUpdateBranch;
+}
+
+export default class BranchDelete extends Command {
+  static hidden = true;
+  static description = 'Republish an update group';
+
+  static args = [
+    {
+      name: 'name',
+      required: false,
+      description: 'Name of the branch to delete',
+    },
+  ];
+  static flags = {
+    json: flags.boolean({
+      description: `return JSON with the edited branch's ID and name.`,
+      default: false,
+    }),
+  };
+
+  async run() {
+    let {
+      args: { name },
+      flags: { json: jsonFlag },
+    } = this.parse(BranchDelete);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!name) {
+      const validationMessage = 'branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please enter the name of the branch to delete:',
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    const { branchId } = await getBranchInfoAsync({ appId: projectId, name });
+
+    if (!jsonFlag) {
+      Log.addNewLineIfNone();
+      Log.warn(
+        `You are about to permamently delete branch: "${name}" and all of the updates published on it.` +
+          `\nThis action is irreversible.`
+      );
+      Log.newLine();
+      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
+      if (!confirmed) {
+        Log.error(`Cancelled deletion of branch: "${name}".`);
+        process.exit(1);
+      }
+    }
+
+    const deletionResult = await deleteBranchOnAppAsync({
+      branchId,
+    });
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(deletionResult));
+    }
+
+    Log.withTick(
+      `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
+    );
+  }
+}

packages/eas-cli/src/commands/branch/list.ts

@@ -1,17 +1,63 @@
+import { getConfig } from '@expo/config';
 import { Command, flags } from '@oclif/command';
-import { CLIError } from '@oclif/errors';
+import chalk from 'chalk';
 import CliTable from 'cli-table3';
 import gql from 'graphql-tag';
-import { format } from 'timeago.js';
 
-import { graphqlClient } from '../../graphql/client';
-import { RootQuery, Update, UpdateBranch } from '../../graphql/generated';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { BranchesByAppQuery, BranchesByAppQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
-import { findProjectRootAsync, getProjectFullNameAsync } from '../../project/projectUtils';
-import { getActorDisplayName } from '../../user/actions';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 
 const BRANCHES_LIMIT = 10_000;
 
+export async function listBranchesAsync({ projectId }: { projectId: string }) {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
+        gql`
+          query BranchesByAppQuery($appId: String!, $limit: Int!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateBranches(offset: 0, limit: $limit) {
+                  id
+                  name
+                  updates(offset: 0, limit: 10) {
+                    id
+                    actor {
+                      __typename
+                      id
+                      ... on User {
+                        username
+                      }
+                      ... on Robot {
+                        firstName
+                      }
+                    }
+                    createdAt
+                    message
+                    runtimeVersion
+                    group
+                    platform
+                  }
+                }
+              }
+            }
+          }
+        `,
+        {
+          appId: projectId,
+          limit: BRANCHES_LIMIT,
+        }
+      )
+      .toPromise()
+  );
+
+  return data?.app?.byId.updateBranches ?? [];
+}
+
 export default class BranchList extends Command {
   static hidden = true;
 
@@ -31,82 +77,34 @@ export default class BranchList extends Command {
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');
     }
-    const fullName = await getProjectFullNameAsync(projectDir);
-    const branches = await this.listBranchesAsync({ fullName });
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const branches = await listBranchesAsync({ projectId });
     if (flags.json) {
       Log.log(JSON.stringify(branches, null, 2));
     } else {
-      const table = new CliTable({ head: ['Branch', 'Latest update'] });
+      const table = new CliTable({
+        head: ['branch', ...UPDATE_COLUMNS],
+        wordWrap: true,
+      });
+
       table.push(
-        ...branches.map((branch: UpdateBranch) => [
-          branch.branchName,
+        ...branches.map(branch => [
+          branch.name,
           formatUpdate(branch.updates[0]),
+          branch.updates[0]?.runtimeVersion ?? 'N/A',
+          branch.updates[0]?.group ?? 'N/A',
+          getPlatformsForGroup({
+            updates: branch.updates,
+            group: branch.updates[0]?.group,
+          }),
         ])
       );
+      Log.log(chalk.bold('Branches with their most recent update group:'));
       Log.log(table.toString());
       if (branches.length >= BRANCHES_LIMIT) {
         Log.warn(`Showing first ${BRANCHES_LIMIT} branches, some results might be omitted.`);
       }
     }
   }
-
-  async listBranchesAsync({ fullName }: { fullName: string }): Promise<UpdateBranch[]> {
-    const { data, error } = await graphqlClient
-      .query<RootQuery>(
-        gql`
-          query BranchesByAppQuery($fullName: String!, $limit: Int!) {
-            app {
-              byFullName(fullName: $fullName) {
-                id
-                fullName
-                updateBranches(offset: 0, limit: $limit) {
-                  id
-                  branchName
-                  updates(offset: 0, limit: 1) {
-                    id
-                    actor {
-                      __typename
-                      id
-                      ... on User {
-                        username
-                      }
-                      ... on Robot {
-                        firstName
-                      }
-                    }
-                    updatedAt
-                    updateMessage
-                  }
-                }
-              }
-            }
-          }
-        `,
-        {
-          fullName,
-          limit: BRANCHES_LIMIT,
-        }
-      )
-      .toPromise();
-
-    if (error) {
-      if (error.networkError) {
-        throw new CLIError(`Fetching branches failed: ${error.networkError.message}`);
-      } else {
-        throw new CLIError(error.graphQLErrors.map(e => e.message).join('\n'));
-      }
-    }
-
-    return data?.app?.byFullName.updateBranches ?? [];
-  }
-}
-
-function formatUpdate(update: Update | undefined): string {
-  if (!update) {
-    return 'N/A';
-  }
-  const message = update.updateMessage ? `"${update.updateMessage}" ` : '';
-  return `${message}(${format(update.updatedAt, 'en_US')} by ${getActorDisplayName(
-    update.actor as any
-  )})`;
 }

packages/eas-cli/src/commands/branch/publish.ts

@@ -1,120 +1,302 @@
-import { getConfig } from '@expo/config';
+import { getConfig, getDefaultTarget } from '@expo/config';
+import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
 import { Command, flags } from '@oclif/command';
+import assert from 'assert';
 import chalk from 'chalk';
 import Table from 'cli-table3';
+import dateFormat from 'dateformat';
+import gql from 'graphql-tag';
+import { uniqBy } from 'lodash';
 import ora from 'ora';
 
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  Actor,
+  GetUpdateGroupAsyncQuery,
+  RootQueryUpdatesByGroupArgs,
+  Update,
+  UpdateInfoGroup,
+} from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log from '../../log';
-import { ensureProjectExistsAsync } from '../../project/ensureProjectExists';
 import {
   findProjectRootAsync,
-  getBranchByNameAsync,
   getProjectAccountNameAsync,
+  getProjectIdAsync,
 } from '../../project/projectUtils';
-import { buildUpdateInfoGroupAsync, collectAssets, uploadAssetsAsync } from '../../project/publish';
-import { promptAsync } from '../../prompts';
-import { getLastCommitMessageAsync } from '../../utils/git';
+import {
+  PublishPlatform,
+  buildBundlesAsync,
+  buildUpdateInfoGroupAsync,
+  collectAssets,
+  uploadAssetsAsync,
+} from '../../project/publish';
+import { promptAsync, selectAsync } from '../../prompts';
+import { formatUpdate } from '../../update/utils';
+import vcs from '../../vcs';
+import { listBranchesAsync } from './list';
+import { viewUpdateBranchAsync } from './view';
+
+export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
+type PlatformFlag = PublishPlatform | 'all';
+
+async function getUpdateGroupAsync({
+  group,
+}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
+  const { updatesByGroup } = await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
+        gql`
+          query getUpdateGroupAsync($group: ID!) {
+            updatesByGroup(group: $group) {
+              id
+              group
+              runtimeVersion
+              manifestFragment
+              platform
+              message
+            }
+          }
+        `,
+        {
+          group,
+        }
+      )
+      .toPromise()
+  );
+  return updatesByGroup;
+}
 
 export default class BranchPublish extends Command {
   static hidden = true;
   static description = 'Publish an update group to a branch.';
 
+  static args = [
+    {
+      name: 'name',
+      description: 'Name of the branch to publish on',
+    },
+  ];
+
   static flags = {
+    message: flags.string({
+      description: 'Short message describing the updates.',
+      required: false,
+    }),
+    republish: flags.boolean({
+      description: 'republish an update group',
+      exclusive: ['input-dir', 'skip-bundler'],
+    }),
+    group: flags.string({
+      description: 'update group to republish',
+      exclusive: ['input-dir', 'skip-bundler'],
+    }),
     'input-dir': flags.string({
       description: 'location of the bundle',
       default: 'dist',
       required: false,
     }),
-    branch: flags.string({
-      description: 'current name of the branch.',
+    'skip-bundler': flags.boolean({
+      description: `skip running Expo CLI to bundle the app before publishing`,
+      default: false,
     }),
-    message: flags.string({
-      description: 'Short message describing the updates.',
+    platform: flags.enum({
+      char: 'p',
+      description: `Only publish to a single platform`,
+      options: [...defaultPublishPlatforms, 'all'],
+      default: 'all',
       required: false,
     }),
     json: flags.boolean({
-      description: `return a json with the edited branch's ID and name.`,
+      description: `return a json with the new update group.`,
       default: false,
     }),
   };
 
   async run() {
     let {
-      flags: { json: jsonFlag, branch: branchName, message: updateMessage, 'input-dir': inputDir },
+      args: { name },
+      flags: {
+        json: jsonFlag,
+        message,
+        republish,
+        group,
+        'input-dir': inputDir,
+        'skip-bundler': skipBundler,
+      },
     } = this.parse(BranchPublish);
+    const platformFlag = this.parse(BranchPublish).flags.platform as PlatformFlag;
+    // If a group was specified, that means we are republishing it.
+    republish = group ? true : republish;
 
     const projectDir = await findProjectRootAsync(process.cwd());
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');
     }
 
-    const accountName = await getProjectAccountNameAsync(projectDir);
-    const {
-      exp: { slug, runtimeVersion },
-    } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const accountName = await getProjectAccountNameAsync(exp);
+    let { slug, runtimeVersion, sdkVersion } = exp;
+
+    // When a SDK version is supplied instead of a runtime version and we're in the managed workflow
+    // construct the runtimeVersion with special meaning indicating that the runtime is an
+    // Expo SDK preset runtime that can be launched in Expo Go.
+    const isManagedProject = getDefaultTarget(projectDir) === 'managed';
+    if (!runtimeVersion && sdkVersion && isManagedProject) {
+      Log.withTick('Generating runtime version from sdk version');
+      runtimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
+    }
+
     if (!runtimeVersion) {
       throw new Error(
         "Couldn't find 'runtimeVersion'. Please specify it under the 'expo' key in 'app.json'"
       );
     }
-    const projectId = await ensureProjectExistsAsync({
-      accountName,
-      projectName: slug,
-    });
+    const projectId = await getProjectIdAsync(exp);
 
-    if (!branchName) {
+    if (!name) {
       const validationMessage = 'branch name may not be empty.';
       if (jsonFlag) {
         throw new Error(validationMessage);
       }
-      ({ branchName } = await promptAsync({
-        type: 'text',
-        name: 'branchName',
-        message: 'Please enter the name of the branch to publish on:',
-        validate: value => (value ? true : validationMessage),
-      }));
+
+      const branches = await listBranchesAsync({ projectId });
+      name = await selectAsync<string>(
+        'which branch would you like to publish on?',
+        branches.map(branch => {
+          return {
+            title: `${branch.name} ${chalk.grey(
+              `- current update: ${formatUpdate(branch.updates[0])}`
+            )}`,
+            value: branch.name,
+          };
+        })
+      );
+    }
+    assert(name, 'branch name must be specified.');
+
+    const { id: branchId, updates } = await viewUpdateBranchAsync({
+      appId: projectId,
+      name,
+    });
+
+    let updateInfoGroup: UpdateInfoGroup = {};
+    let oldMessage: string, oldRuntimeVersion: string;
+    if (republish) {
+      // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
+      // Instead we get the `updateInfoGroup` from the update we wish to republish.
+      let updatesToRepublish: Pick<
+        Update,
+        'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
+      >[];
+      if (group) {
+        updatesToRepublish = await getUpdateGroupAsync({ group });
+      } else {
+        // Drop into interactive mode if the user has not specified an update group to republish.
+        if (jsonFlag) {
+          throw new Error('You must specify the update group to republish.');
+        }
+
+        const updateGroups = uniqBy(updates, u => u.group)
+          .filter(update => {
+            // Only show groups that have updates on the specified platform(s).
+            return platformFlag === 'all' || update.platform === platformFlag;
+          })
+          .map(update => ({
+            title: formatUpdateTitle(update),
+            value: update.group,
+          }));
+        if (updateGroups.length === 0) {
+          throw new Error(
+            `There are no updates on branch "${name}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
+          );
+        }
+
+        const selectedUpdateGroup = await selectAsync<string>(
+          'which update would you like to republish?',
+          updateGroups
+        );
+        updatesToRepublish = updates.filter(update => update.group === selectedUpdateGroup);
+      }
+      const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
+        // Only republish to the specified platforms
+        update => platformFlag === 'all' || update.platform === platformFlag
+      );
+      if (updatesToRepublishFilteredByPlatform.length === 0) {
+        throw new Error(
+          `There are no updates on branch "${name}" published on the platform(s) "${platformFlag}" with group ID "${
+            group ? group : updatesToRepublish[0].group
+          }". Did you mean to publish a new update instead?`
+        );
+      }
+
+      let publicationPlatformMessage: string;
+      if (platformFlag === 'all') {
+        if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
+          Log.warn(`You are republishing an update that wasn't published for all platforms.`);
+        }
+        publicationPlatformMessage = `The republished update will appear on the same plaforms it was originally published on: ${updatesToRepublishFilteredByPlatform
+          .map(update => update.platform)
+          .join(',')}`;
+      } else {
+        publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
+      }
+      Log.withTick(publicationPlatformMessage);
+
+      for (const update of updatesToRepublishFilteredByPlatform) {
+        const { manifestFragment } = update;
+        const platform = update.platform as PublishPlatform;
+
+        updateInfoGroup[platform] = JSON.parse(manifestFragment);
+      }
+
+      // These are the same for each member of an update group
+      group = updatesToRepublishFilteredByPlatform[0].group;
+      oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
+      oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
+    } else {
+      // build bundle and upload assets for a new publish
+      if (!skipBundler) {
+        await buildBundlesAsync({ projectDir, inputDir });
+      }
+
+      const assetSpinner = ora('Uploading assets...').start();
+      try {
+        const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
+        const assets = collectAssets({ inputDir: inputDir!, platforms });
+        await uploadAssetsAsync(assets);
+        updateInfoGroup = await buildUpdateInfoGroupAsync(assets);
+        assetSpinner.succeed('Uploaded assets!');
+      } catch (e) {
+        assetSpinner.fail('Failed to upload assets');
+        throw e;
+      }
     }
 
-    if (!updateMessage) {
+    if (!message) {
       const validationMessage = 'publish message may not be empty.';
       if (jsonFlag) {
         throw new Error(validationMessage);
       }
-      ({ publishMessage: updateMessage } = await promptAsync({
+      ({ publishMessage: message } = await promptAsync({
         type: 'text',
         name: 'publishMessage',
         message: `Please enter a publication message.`,
-        initial: (await getLastCommitMessageAsync())?.trim(),
+        initial: republish
+          ? `Republish "${oldMessage!}" - group: ${group}`
+          : (await vcs.getLastCommitMessageAsync())?.trim(),
         validate: value => (value ? true : validationMessage),
       }));
     }
 
-    const { id: branchId } = await getBranchByNameAsync({
-      appId: projectId,
-      branchName: branchName!,
-    });
-
-    let updateInfoGroup;
-    const assetSpinner = ora('Uploading assets...').start();
-    try {
-      const assets = collectAssets(inputDir!);
-      await uploadAssetsAsync(assets);
-      updateInfoGroup = await buildUpdateInfoGroupAsync(assets);
-      assetSpinner.succeed('Uploaded assets!');
-    } catch (e) {
-      assetSpinner.fail('Failed to upload assets');
-      throw e;
-    }
-
     let newUpdateGroup;
     const publishSpinner = ora('Publishing...').start();
     try {
       newUpdateGroup = await PublishMutation.publishUpdateGroupAsync({
         branchId,
         updateInfoGroup,
-        runtimeVersion,
-        updateMessage,
+        runtimeVersion: republish ? oldRuntimeVersion! : runtimeVersion,
+        message,
       });
       publishSpinner.succeed('Published!');
     } catch (e) {
@@ -123,7 +305,7 @@ export default class BranchPublish extends Command {
     }
 
     if (jsonFlag) {
-      Log.log(newUpdateGroup);
+      Log.log(JSON.stringify(newUpdateGroup));
     } else {
       const outputMessage = new Table({
         wordWrap: true,
@@ -148,12 +330,23 @@ export default class BranchPublish extends Command {
       });
       outputMessage.push(
         [chalk.dim('project'), `@${accountName}/${slug}`],
-        [chalk.dim('branch'), branchName],
+        [chalk.dim('branch'), name],
         [chalk.dim('runtimeVersion'), runtimeVersion],
-        [chalk.dim('updateGroupID'), newUpdateGroup.updateGroup],
-        [chalk.dim('message'), updateMessage]
+        [chalk.dim('groupID'), newUpdateGroup.group],
+        [chalk.dim('message'), message]
       );
       Log.log(outputMessage.toString());
     }
   }
 }
+
+function formatUpdateTitle(
+  update: Pick<Update, 'message' | 'createdAt' | 'runtimeVersion'> & {
+    actor?: Pick<Actor, 'firstName'> | null;
+  }
+): string {
+  const { message, createdAt, actor, runtimeVersion } = update;
+  return `[${dateFormat(createdAt, 'mmm dd HH:MM')} by ${
+    actor?.firstName ?? 'unknown'
+  }, runtimeVersion: ${runtimeVersion}] ${message}`;
+}

packages/eas-cli/src/commands/branch/rename.ts

@@ -4,36 +4,34 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';
 
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { EditUpdateBranchInput, UpdateBranch } from '../../graphql/generated';
+import {
+  EditUpdateBranchInput,
+  EditUpdateBranchMutation,
+  EditUpdateBranchMutationVariables,
+  UpdateBranch,
+} from '../../graphql/generated';
 import Log from '../../log';
-import { ensureProjectExistsAsync } from '../../project/ensureProjectExists';
-import { findProjectRootAsync, getProjectAccountName } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
 
 async function renameUpdateBranchOnAppAsync({
   appId,
-  currentName,
+  name,
   newName,
-}: {
-  appId: string;
-  currentName: string;
-  newName: string;
-}): Promise<UpdateBranch> {
+}: EditUpdateBranchInput): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
   const data = await withErrorHandlingAsync(
     graphqlClient
-      .mutation<
-        { updateBranch: { editUpdateBranch: UpdateBranch } },
-        {
-          input: EditUpdateBranchInput;
-        }
-      >(
+      .mutation<EditUpdateBranchMutation, EditUpdateBranchMutationVariables>(
         gql`
           mutation EditUpdateBranch($input: EditUpdateBranchInput!) {
             updateBranch {
               editUpdateBranch(input: $input) {
                 id
-                branchName
+                name
               }
             }
           }
@@ -41,8 +39,8 @@ async function renameUpdateBranchOnAppAsync({
         {
           input: {
             appId,
-            branchName: currentName,
-            newBranchName: newName,
+            name,
+            newName,
           },
         }
       )
@@ -79,12 +77,9 @@ export default class BranchRename extends Command {
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');
     }
-    const { exp } = await getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-    const projectId = await ensureProjectExistsAsync({
-      accountName,
-      projectName: exp.slug,
-    });
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
 
     if (!currentName) {
       const validationMessage = 'current name may not be empty.';
@@ -114,19 +109,19 @@ export default class BranchRename extends Command {
 
     const editedBranch = await renameUpdateBranchOnAppAsync({
       appId: projectId,
-      currentName: currentName!,
+      name: currentName!,
       newName: newName!,
     });
 
     if (jsonFlag) {
-      Log.log(editedBranch);
+      Log.log(JSON.stringify(editedBranch));
       return;
     }
 
     Log.withTick(
       `️Renamed branch from ${currentName} to ${chalk.bold(
-        editedBranch.branchName
-      )} on project ${chalk.bold(`@${accountName}/${exp.slug}`)}.`
+        editedBranch.name
+      )} on project ${chalk.bold(fullName)}.`
     );
   }
 }

packages/eas-cli/src/commands/branch/view.ts

@@ -6,64 +6,64 @@ import gql from 'graphql-tag';
 import { groupBy } from 'lodash';
 
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { Update } from '../../graphql/generated';
+import {
+  Maybe,
+  Robot,
+  Update,
+  UpdateBranch,
+  User,
+  ViewBranchQuery,
+  ViewBranchQueryVariables,
+} from '../../graphql/generated';
 import Log from '../../log';
-import { ensureProjectExistsAsync } from '../../project/ensureProjectExists';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 
 const PAGE_LIMIT = 10_000;
 
-type TruncatedUpdate = Pick<Update, 'updateGroup' | 'updateMessage' | 'createdAt' | 'actor'>;
+type TruncatedUpdate = Pick<Update, 'group' | 'message' | 'createdAt' | 'actor'>;
 
-async function viewUpdateBranchAsync({
+export async function viewUpdateBranchAsync({
   appId,
-  branchName,
-}: {
-  appId: string;
-  branchName: string;
-}): Promise<{
-  id: string;
-  branchName: string;
-  updates: TruncatedUpdate[];
-}> {
+  name,
+}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<
+  Pick<UpdateBranch, 'id' | 'name'> & {
+    updates: (Pick<
+      Update,
+      'id' | 'group' | 'message' | 'createdAt' | 'runtimeVersion' | 'platform' | 'manifestFragment'
+    > & {
+      actor?: Maybe<Pick<User, 'firstName' | 'id'> | Pick<Robot, 'firstName' | 'id'>>;
+    })[];
+  }
+> {
   const data = await withErrorHandlingAsync(
     graphqlClient
-      .mutation<
-        {
-          app: {
-            byId: {
-              updateBranchByBranchName: {
-                id: string;
-                branchName: string;
-                updates: TruncatedUpdate[];
-              };
-            };
-          };
-        },
-        {
-          appId: string;
-          branchName: string;
-          limit: number;
-        }
-      >(
+      .query<ViewBranchQuery, ViewBranchQueryVariables>(
         gql`
-          query ViewBranch($appId: String!, $branchName: String!, $limit: Int!) {
+          query ViewBranch($appId: String!, $name: String!, $limit: Int!) {
             app {
               byId(appId: $appId) {
                 id
-                updateBranchByBranchName(branchName: $branchName) {
+                updateBranchByName(name: $name) {
                   id
-                  branchName
+                  name
                   updates(offset: 0, limit: $limit) {
                     id
-                    updateGroup
-                    updateMessage
+                    group
+                    message
                     createdAt
+                    runtimeVersion
+                    platform
+                    manifestFragment
                     actor {
                       id
                       ... on User {
-                        firstName
+                        username
                       }
                       ... on Robot {
                         firstName
@@ -77,13 +77,17 @@ async function viewUpdateBranchAsync({
         `,
         {
           appId,
-          branchName,
+          name,
           limit: PAGE_LIMIT,
         }
       )
       .toPromise()
   );
-  return data.app.byId.updateBranchByBranchName;
+  const updateBranch = data.app?.byId.updateBranchByName;
+  if (!updateBranch) {
+    throw new Error(`Could not find branch "${name}"`);
+  }
+  return updateBranch;
 }
 
 export default class BranchView extends Command {
@@ -92,7 +96,7 @@ export default class BranchView extends Command {
 
   static args = [
     {
-      name: 'branchName',
+      name: 'name',
       required: false,
       description: 'Name of the branch to view',
     },
@@ -107,7 +111,7 @@ export default class BranchView extends Command {
 
   async run() {
     let {
-      args: { branchName },
+      args: { name },
       flags: { json: jsonFlag },
     } = this.parse(BranchView);
 
@@ -115,23 +119,19 @@ export default class BranchView extends Command {
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');
     }
-    const accountName = await getProjectAccountNameAsync(projectDir);
-    const {
-      exp: { slug },
-    } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const projectId = await ensureProjectExistsAsync({
-      accountName,
-      projectName: slug,
-    });
 
-    if (!branchName) {
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!name) {
       const validationMessage = 'Branch name may not be empty.';
       if (jsonFlag) {
         throw new Error(validationMessage);
       }
-      ({ branchName } = await promptAsync({
+      ({ name } = await promptAsync({
         type: 'text',
-        name: 'branchName',
+        name: 'name',
         message: 'Please enter the name of the branch to view:',
         validate: value => (value ? true : validationMessage),
       }));
@@ -139,38 +139,41 @@ export default class BranchView extends Command {
 
     const UpdateBranch = await viewUpdateBranchAsync({
       appId: projectId,
-      branchName,
+      name,
     });
 
-    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.updateGroup)).map(
-      updateGroup => updateGroup[0]
+    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
+      group => group[0]
     );
 
     if (jsonFlag) {
-      Log.log({ ...UpdateBranch, updates });
+      Log.log(JSON.stringify({ ...UpdateBranch, updates }));
       return;
     }
 
-    const updateGroupTable = new Table({
-      head: ['createdAt', 'updateMessage', 'updateGroup', 'actor'],
+    const groupTable = new Table({
+      head: UPDATE_COLUMNS,
       wordWrap: true,
     });
 
     for (const update of updates) {
-      updateGroupTable.push([
-        new Date(update.createdAt).toLocaleString(),
-        update.updateMessage,
-        update.updateGroup,
-        update.actor?.firstName,
+      groupTable.push([
+        formatUpdate(update),
+        update.runtimeVersion,
+        update.group,
+        getPlatformsForGroup({
+          updates: UpdateBranch.updates,
+          group: update.group,
+        }),
       ]);
     }
 
     Log.withTick(
-      `️Branch: ${chalk.bold(UpdateBranch.branchName)} on project ${chalk.bold(
-        `@${accountName}/${slug}`
+      `️Branch: ${chalk.bold(UpdateBranch.name)} on project ${chalk.bold(
+        fullName
       )}. Branch ID: ${chalk.bold(UpdateBranch.id)}`
     );
     Log.log(chalk.bold('Recent update groups published on this branch:'));
-    Log.log(updateGroupTable.toString());
+    Log.log(groupTable.toString());
   }
 }

packages/eas-cli/src/commands/build/cancel.ts

@@ -1,12 +1,17 @@
+import { getConfig } from '@expo/config';
 import { Command } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 import ora from 'ora';
 
-import { platformEmojis } from '../../build/constants';
-import { Platform } from '../../build/types';
+import { appPlatformEmojis } from '../../build/constants';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { AppPlatform, Build, BuildStatus } from '../../graphql/generated';
+import {
+  Build,
+  BuildStatus,
+  CancelBuildMutation,
+  CancelBuildMutationVariables,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import {
@@ -19,7 +24,7 @@ import { confirmAsync, selectAsync } from '../../prompts';
 async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
   const data = await withErrorHandlingAsync(
     graphqlClient
-      .mutation<{ build: { cancel: { id: string; status: BuildStatus } } }>(
+      .mutation<CancelBuildMutation, CancelBuildMutationVariables>(
         gql`
           mutation CancelBuildMutation($buildId: ID!) {
             build(buildId: $buildId) {
@@ -37,17 +42,20 @@ async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'st
   return data.build!.cancel;
 }
 
-const appPlatformMap = {
-  [AppPlatform.Android]: Platform.Android,
-  [AppPlatform.Ios]: Platform.iOS,
-};
-
 function formatUnfinishedBuild(
   build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
 ): string {
-  const platform = platformEmojis[appPlatformMap[build.platform]];
+  const platform = appPlatformEmojis[build.platform];
   const startTime = new Date(build.createdAt).toLocaleString();
-  const status = chalk.blue(build.status === BuildStatus.InQueue ? 'in-queue' : 'in-progress');
+  let statusText: string;
+  if (build.status === BuildStatus.New) {
+    statusText = 'new';
+  } else if (build.status === BuildStatus.InQueue) {
+    statusText = 'in queue';
+  } else {
+    statusText = 'in progress';
+  }
+  const status = chalk.blue(statusText);
   return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
 }
 
@@ -58,12 +66,13 @@ async function selectBuildToCancelAsync(
   const spinner = ora().start('Fetching the uncompleted builds…');
   let builds;
   try {
-    const [inQueueBuilds, inProgressBuilds] = await Promise.all([
+    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
+      BuildQuery.allForAppAsync(projectId, { status: BuildStatus.New }),
       BuildQuery.allForAppAsync(projectId, { status: BuildStatus.InQueue }),
       BuildQuery.allForAppAsync(projectId, { status: BuildStatus.InProgress }),
     ]);
     spinner.stop();
-    builds = [...inQueueBuilds, ...inProgressBuilds];
+    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
   } catch (error) {
     spinner.fail(
       `Something went wrong and we couldn't fetch the builds for the project ${projectFullName}.`
@@ -109,8 +118,9 @@ export default class BuildCancel extends Command {
     const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const projectId = await getProjectIdAsync(projectDir);
-    const projectFullName = await getProjectFullNameAsync(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
 
     if (buildIdFromArg) {
       await ensureBuildExistsAsync(buildIdFromArg);

packages/eas-cli/src/commands/build/configure.ts

@@ -17,10 +17,6 @@ export default class BuildConfigure extends Command {
       char: 'p',
       options: ['android', 'ios', 'all'],
     }),
-    'allow-experimental': flags.boolean({
-      description: 'Enable experimental configuration steps.',
-      default: false,
-    }),
   };
 
   async run() {
@@ -32,20 +28,10 @@ export default class BuildConfigure extends Command {
 
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
-    const allowExperimental = flags['allow-experimental'];
-
-    if (allowExperimental) {
-      Log.warn(
-        `Project configuration will execute some additional steps that might fail if structure of your native project is significantly different from ${chalk.bold(
-          'expo eject'
-        )} or ${chalk.bold('expo init')}`
-      );
-    }
 
     await ensureLoggedInAsync();
     await configureAsync({
       platform,
-      allowExperimental,
       projectDir: (await findProjectRootAsync()) ?? process.cwd(),
     });
 
@@ -70,10 +56,9 @@ function logSuccess(platform: RequestedPlatform) {
 
 - Run ${chalk.bold('eas build')} when you are ready to create your first build.
 - Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to ${storesText}
-- ${learnMore(
-    'https://docs.expo.io/build/introduction',
-    'Learn more about other capabilities of EAS Build'
-  )}`);
+- ${learnMore('https://docs.expo.io/build/introduction', {
+    learnMoreMessage: 'Learn more about other capabilities of EAS Build',
+  })}`);
 }
 
 async function promptForPlatformAsync(): Promise<RequestedPlatform> {
@@ -88,7 +73,7 @@ async function promptForPlatformAsync(): Promise<RequestedPlatform> {
       },
       {
         title: 'iOS',
-        value: RequestedPlatform.iOS,
+        value: RequestedPlatform.Ios,
       },
       {
         title: 'Android',

packages/eas-cli/src/commands/build/index.ts

@@ -1,41 +1,31 @@
-import { Command, flags } from '@oclif/command';
+import { ExpoConfig, getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
-import { v4 as uuidv4 } from 'uuid';
 
-import { apiClient } from '../../api';
 import { configureAsync } from '../../build/configure';
 import { createCommandContextAsync } from '../../build/context';
 import { buildAsync } from '../../build/create';
-import { AnalyticsEvent, Build as BuildType, RequestedPlatform } from '../../build/types';
-import Analytics from '../../build/utils/analytics';
-import formatBuild from '../../build/utils/formatBuild';
-import { isGitStatusCleanAsync } from '../../build/utils/repository';
-import { AppPlatform } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import { RequestedPlatform } from '../../build/types';
+import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import {
   isEasEnabledForProjectAsync,
   warnEasUnavailable,
 } from '../../project/isEasEnabledForProject';
-import {
-  findProjectRootAsync,
-  getProjectAccountNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, promptAsync } from '../../prompts';
-import { Actor } from '../../user/User';
-import { ensureLoggedInAsync } from '../../user/actions';
+import vcs from '../../vcs';
 
-export default class Build extends Command {
+export default class Build extends EasCommand {
   static description = 'Start a build';
 
   static flags = {
     platform: flags.enum({ char: 'p', options: ['android', 'ios', 'all'] }),
     'skip-credentials-check': flags.boolean({
       default: false,
-      description: 'Skip validation of build credentials',
+      hidden: true,
     }),
     'skip-project-configuration': flags.boolean({
       default: false,
@@ -49,16 +39,23 @@ export default class Build extends Command {
       default: false,
       description: 'Run command in --non-interactive mode',
     }),
+    local: flags.boolean({
+      default: false,
+      description: 'Run build locally [experimental]',
+    }),
     wait: flags.boolean({
       default: true,
       allowNo: true,
       description: 'Wait for build(s) to complete',
     }),
+    'clear-cache': flags.boolean({
+      default: false,
+      description: 'Clear cache before the build',
+    }),
   };
 
   async run(): Promise<void> {
     const { flags } = this.parse(Build);
-    const user = await ensureLoggedInAsync();
 
     const nonInteractive = flags['non-interactive'];
     if (!flags.platform && nonInteractive) {
@@ -67,42 +64,40 @@ export default class Build extends Command {
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const projectId = await getProjectIdAsync(projectDir);
+    if (flags['skip-credentials-check']) {
+      Log.warnDeprecatedFlag(
+        'skip-credentials-check',
+        'Build credential validation is always skipped with the --non-interactive flag. You can also skip interactively.'
+      );
+      Log.newLine();
+    }
 
-    if (!(await isEasEnabledForProjectAsync(projectId))) {
+    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    let { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!flags.local && !(await isEasEnabledForProjectAsync(projectId))) {
       warnEasUnavailable();
       process.exitCode = 1;
       return;
     }
 
-    const accountName = await getProjectAccountNameAsync(projectDir);
-    const accountHasPendingBuilds = await ensureNoPendingBuildsExistAsync({
-      accountName,
-      platform,
-      projectId,
-      user,
-    });
-    if (accountHasPendingBuilds) {
+    if (flags.local && !verifyOptionsForLocalBuilds(platform)) {
+      process.exitCode = 1;
       return;
     }
 
-    await ensureProjectConfiguredAsync(projectDir);
-
-    const trackingCtx = {
-      tracking_id: uuidv4(),
-      requested_platform: flags.platform,
-    };
-    Analytics.logEvent(AnalyticsEvent.BUILD_COMMAND, trackingCtx);
+    exp = (await ensureProjectConfiguredAsync(projectDir)) ?? exp;
 
     const commandCtx = await createCommandContextAsync({
       requestedPlatform: platform,
       profile: flags.profile,
+      exp,
       projectDir,
       projectId,
-      trackingCtx,
       nonInteractive,
-      skipCredentialsCheck: flags['skip-credentials-check'],
+      clearCache: flags['clear-cache'],
+      local: flags.local,
       skipProjectConfiguration: flags['skip-project-configuration'],
       waitForBuildEnd: flags.wait,
     });
@@ -110,61 +105,15 @@ export default class Build extends Command {
   }
 }
 
-async function ensureNoPendingBuildsExistAsync({
-  user,
-  platform,
-  accountName,
-  projectId,
-}: {
-  user: Actor;
-  platform: RequestedPlatform;
-  accountName: string;
-  projectId: string;
-}): Promise<boolean> {
-  // allow expo admins to run as many builds as they wish
-  if (user.isExpoAdmin) {
+function verifyOptionsForLocalBuilds(platform: RequestedPlatform): boolean {
+  if (platform === RequestedPlatform.All) {
+    Log.error('Builds for multiple platforms are not supported with flag --local');
+    return false;
+  } else if (process.platform !== 'darwin' && platform === RequestedPlatform.Ios) {
+    Log.error('Unsupported platform, macOS is required to build apps for iOS');
     return false;
-  }
-
-  const appPlatforms = toAppPlatforms(platform);
-  const maybePendingBuilds = await Promise.all(
-    appPlatforms.map(appPlatform => BuildQuery.getPendingBuildIdAsync(accountName, appPlatform))
-  );
-  const pendingBuilds = maybePendingBuilds.filter(i => i !== null);
-  if (pendingBuilds.length > 0) {
-    Log.newLine();
-    Log.error(
-      'Your other builds are still pending. Wait for them to complete before running this command again.'
-    );
-    Log.newLine();
-    const results = await Promise.all(
-      pendingBuilds.map(pendingBuild => {
-        return apiClient.get<{ data: BuildType }>(
-          `projects/${projectId}/builds/${pendingBuild?.id}`,
-          {
-            responseType: 'json',
-          }
-        );
-      })
-    );
-
-    for (const result of results) {
-      Log.log(formatBuild(result.body.data, { accountName }));
-    }
-
-    process.exitCode = 1;
-    return true;
-  }
-  return false;
-}
-
-function toAppPlatforms(requestedPlatform: RequestedPlatform): AppPlatform[] {
-  if (requestedPlatform === RequestedPlatform.All) {
-    return [AppPlatform.Android, AppPlatform.Ios];
-  } else if (requestedPlatform === RequestedPlatform.Android) {
-    return [AppPlatform.Android];
   } else {
-    return [AppPlatform.Ios];
+    return true;
   }
 }
 
@@ -180,7 +129,7 @@ async function promptForPlatformAsync(): Promise<RequestedPlatform> {
       },
       {
         title: 'iOS',
-        value: RequestedPlatform.iOS,
+        value: RequestedPlatform.Ios,
       },
       {
         title: 'Android',
@@ -191,9 +140,9 @@ async function promptForPlatformAsync(): Promise<RequestedPlatform> {
   return platform;
 }
 
-async function ensureProjectConfiguredAsync(projectDir: string): Promise<void> {
+async function ensureProjectConfiguredAsync(projectDir: string): Promise<ExpoConfig | null> {
   if (await fs.pathExists(path.join(projectDir, 'eas.json'))) {
-    return;
+    return null;
   }
   const confirm = await confirmAsync({
     message: 'This app is not set up for building with EAS. Set it up now?',
@@ -202,13 +151,14 @@ async function ensureProjectConfiguredAsync(projectDir: string): Promise<void> {
     await configureAsync({
       projectDir,
       platform: RequestedPlatform.All,
-      allowExperimental: false,
     });
-    if (!(await isGitStatusCleanAsync())) {
+    if (await vcs.hasUncommittedChangesAsync()) {
       throw new Error(
-        'Build process requires clean git working tree, please commit all your changes and run `eas build` again'
+        'Build process requires clean working tree, please commit all your changes and run `eas build` again'
       );
     }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    return exp;
   } else {
     throw new Error(
       `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(

packages/eas-cli/src/commands/build/list.ts

@@ -1,14 +1,15 @@
+import { getConfig } from '@expo/config';
 import { Command, flags } from '@oclif/command';
 import chalk from 'chalk';
 import ora from 'ora';
 
-import { apiClient } from '../../api';
-import { Build } from '../../build/types';
-import formatBuild from '../../build/utils/formatBuild';
+import { BuildStatus, RequestedPlatform } from '../../build/types';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import {
   findProjectRootAsync,
-  getProjectAccountNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
@@ -17,34 +18,46 @@ export default class BuildList extends Command {
   static description = 'list all builds for your project';
 
   static flags = {
-    platform: flags.enum({ options: ['all', 'android', 'ios'] }),
-    status: flags.enum({ options: ['in-queue', 'in-progress', 'errored', 'finished', 'canceled'] }),
+    platform: flags.enum({
+      options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
+    }),
+    status: flags.enum({
+      options: [
+        BuildStatus.NEW,
+        BuildStatus.IN_QUEUE,
+        BuildStatus.IN_PROGRESS,
+        BuildStatus.ERRORED,
+        BuildStatus.FINISHED,
+        BuildStatus.CANCELED,
+      ],
+    }),
     limit: flags.integer(),
   };
 
   async run() {
-    const { platform, status, limit = 10 } = this.parse(BuildList).flags;
+    const { platform: requestedPlatform, status: buildStatus, limit = 10 } = this.parse(
+      BuildList
+    ).flags;
+
+    const platform = toAppPlatform(requestedPlatform);
+    const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const projectId = await getProjectIdAsync(projectDir);
-    const accountName = await getProjectAccountNameAsync(projectDir);
-    const projectName = await getProjectFullNameAsync(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const projectName = await getProjectFullNameAsync(exp);
 
     const spinner = ora().start('Fetching the build list for the project…');
 
     try {
-      const response = await apiClient.get<{ data: { builds: Build[] } }>(
-        `projects/${projectId}/builds`,
-        {
-          searchParams: { platform, status, limit },
-          responseType: 'json',
-        }
-      );
-
-      const { builds } = response.body.data;
+      const builds = await BuildQuery.allForAppAsync(projectId, {
+        limit,
+        platform,
+        status: graphqlBuildStatus,
+      });
 
       if (builds.length) {
-        if (platform || status) {
+        if (platform || graphqlBuildStatus) {
           spinner.succeed(
             `Showing ${builds.length} matching builds for the project ${projectName}`
           );
@@ -53,7 +66,7 @@ export default class BuildList extends Command {
         }
 
         const list = builds
-          .map(build => formatBuild(build, { accountName }))
+          .map(build => formatGraphQLBuild(build))
           .join(`\n\n${chalk.dim('———')}\n\n`);
 
         Log.log(`\n${list}`);
@@ -66,3 +79,31 @@ export default class BuildList extends Command {
     }
   }
 }
+
+const toAppPlatform = (requestedPlatform?: RequestedPlatform): AppPlatform | undefined => {
+  if (!requestedPlatform || requestedPlatform === RequestedPlatform.All) {
+    return undefined;
+  } else if (requestedPlatform === RequestedPlatform.Android) {
+    return AppPlatform.Android;
+  } else {
+    return AppPlatform.Ios;
+  }
+};
+
+const toGraphQLBuildStatus = (buildStatus: BuildStatus): GraphQLBuildStatus | undefined => {
+  if (!buildStatus) {
+    return undefined;
+  } else if (buildStatus === BuildStatus.NEW) {
+    return GraphQLBuildStatus.New;
+  } else if (buildStatus === BuildStatus.IN_QUEUE) {
+    return GraphQLBuildStatus.InQueue;
+  } else if (buildStatus === BuildStatus.IN_PROGRESS) {
+    return GraphQLBuildStatus.InProgress;
+  } else if (buildStatus === BuildStatus.ERRORED) {
+    return GraphQLBuildStatus.Errored;
+  } else if (buildStatus === BuildStatus.FINISHED) {
+    return GraphQLBuildStatus.Finished;
+  } else {
+    return GraphQLBuildStatus.Canceled;
+  }
+};

packages/eas-cli/src/commands/build/view.ts

@@ -1,14 +1,13 @@
+import { getConfig } from '@expo/config';
 import { Command } from '@oclif/command';
-import { HTTPError } from 'got';
 import ora from 'ora';
 
-import { apiClient } from '../../api';
-import { Build } from '../../build/types';
-import formatBuild from '../../build/utils/formatBuild';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import { BuildFragment } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import {
   findProjectRootAsync,
-  getProjectAccountNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
@@ -22,34 +21,24 @@ export default class BuildView extends Command {
     const { BUILD_ID: buildId } = this.parse(BuildView).args;
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const projectId = await getProjectIdAsync(projectDir);
-    const accountName = await getProjectAccountNameAsync(projectDir);
-    const projectName = await getProjectFullNameAsync(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const projectName = await getProjectFullNameAsync(exp);
 
     const spinner = ora().start('Fetching the build…');
 
     try {
-      let build: Build;
+      let build: BuildFragment;
 
-      if (buildId == null) {
-        const response = await apiClient.get<{ data: { builds: Build[] } }>(
-          `projects/${projectId}/builds`,
-          {
-            searchParams: { limit: 1 },
-            responseType: 'json',
-          }
-        );
-
-        build = response.body.data.builds[0];
+      if (buildId) {
+        build = await BuildQuery.byIdAsync(buildId);
       } else {
-        const response = await apiClient.get<{ data: Build }>(
-          `projects/${projectId}/builds/${buildId}`,
-          {
-            responseType: 'json',
-          }
-        );
-
-        build = response.body.data;
+        const builds = await BuildQuery.allForAppAsync(projectId, { limit: 1 });
+        if (builds.length === 0) {
+          spinner.fail(`Couldn't find any builds for the project ${projectName}`);
+          return;
+        }
+        build = builds[0];
       }
 
       if (buildId) {
@@ -58,29 +47,17 @@ export default class BuildView extends Command {
         spinner.succeed(`Showing the last build for the project ${projectName}`);
       }
 
-      Log.log(`\n${formatBuild(build, { accountName })}`);
-    } catch (e) {
-      const error = e as HTTPError;
-
-      if (error.response.statusCode === 400) {
-        if (buildId) {
-          spinner.fail(
-            `Couldn't find a build for the project ${projectName} matching the id ${buildId}`
-          );
-        } else {
-          spinner.fail(`Couldn't find any builds for the project ${projectName}`);
-        }
+      Log.log(`\n${formatGraphQLBuild(build)}`);
+    } catch (err) {
+      if (buildId) {
+        spinner.fail(`Something went wrong and we couldn't fetch the build with id ${buildId}`);
       } else {
-        if (buildId) {
-          spinner.fail(`Something went wrong and we couldn't fetch the build with id ${buildId}`);
-        } else {
-          spinner.fail(
-            `Something went wrong and we couldn't fetch the last build for the project ${projectName}`
-          );
-        }
+        spinner.fail(
+          `Something went wrong and we couldn't fetch the last build for the project ${projectName}`
+        );
       }
 
-      throw error;
+      throw err;
     }
   }
 }

packages/eas-cli/src/commands/channel/create.ts

@@ -4,13 +4,16 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';
 
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { UpdateChannel } from '../../graphql/generated';
+import {
+  CreateUpdateChannelOnAppMutation,
+  CreateUpdateChannelOnAppMutationVariables,
+} from '../../graphql/generated';
 import Log from '../../log';
-import { ensureProjectExistsAsync } from '../../project/ensureProjectExists';
 import {
   findProjectRootAsync,
   getBranchByNameAsync,
-  getProjectAccountNameAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
@@ -23,32 +26,21 @@ async function createUpdateChannelOnAppAsync({
   appId: string;
   channelName: string;
   branchId: string;
-}): Promise<UpdateChannel> {
+}): Promise<CreateUpdateChannelOnAppMutation> {
   // Point the new channel at a branch with its same name.
   const branchMapping = JSON.stringify({
     data: [{ branchId, branchMappingLogic: 'true' }],
     version: 0,
   });
-  const data = await withErrorHandlingAsync(
+  return await withErrorHandlingAsync(
     graphqlClient
-      .mutation<
-        { updateChannel: { createUpdateChannelForApp: UpdateChannel } },
-        { appId: string; channelName: string; branchMapping: string }
-      >(
+      .mutation<CreateUpdateChannelOnAppMutation, CreateUpdateChannelOnAppMutationVariables>(
         gql`
-          mutation CreateUpdateChannelForApp(
-            $appId: ID!
-            $channelName: String!
-            $branchMapping: String!
-          ) {
+          mutation CreateUpdateChannelOnApp($appId: ID!, $name: String!, $branchMapping: String!) {
             updateChannel {
-              createUpdateChannelForApp(
-                appId: $appId
-                channelName: $channelName
-                branchMapping: $branchMapping
-              ) {
+              createUpdateChannelForApp(appId: $appId, name: $name, branchMapping: $branchMapping) {
                 id
-                channelName
+                name
                 branchMapping
               }
             }
@@ -56,13 +48,12 @@ async function createUpdateChannelOnAppAsync({
         `,
         {
           appId,
-          channelName,
+          name: channelName,
           branchMapping,
         }
       )
       .toPromise()
   );
-  return data.updateChannel.createUpdateChannelForApp;
 }
 
 export default class ChannelCreate extends Command {
@@ -71,7 +62,7 @@ export default class ChannelCreate extends Command {
 
   static args = [
     {
-      name: 'channelName',
+      name: 'name',
       required: false,
       description: 'Name of the channel to create',
     },
@@ -87,7 +78,7 @@ export default class ChannelCreate extends Command {
 
   async run() {
     let {
-      args: { channelName },
+      args: { name: channelName },
       flags: { json: jsonFlag },
     } = this.parse(ChannelCreate);
 
@@ -95,23 +86,18 @@ export default class ChannelCreate extends Command {
     if (!projectDir) {
       throw new Error('Please run this command inside a project directory.');
     }
-    const accountName = await getProjectAccountNameAsync(projectDir);
-    const {
-      exp: { slug },
-    } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const projectId = await ensureProjectExistsAsync({
-      accountName,
-      projectName: slug,
-    });
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {
       const validationMessage = 'Channel name may not be empty.';
       if (jsonFlag) {
         throw new Error(validationMessage);
       }
-      ({ channelName } = await promptAsync({
+      ({ name: channelName } = await promptAsync({
         type: 'text',
-        name: 'channelName',
+        name: 'name',
         message: 'Please name the channel:',
         validate: value => (value ? true : validationMessage),
       }));
@@ -122,33 +108,41 @@ export default class ChannelCreate extends Command {
     try {
       const existingBranch = await getBranchByNameAsync({
         appId: projectId,
-        branchName: channelName,
+        name: channelName,
       });
       branchId = existingBranch.id;
       branchMessage = `We found a branch with the same name`;
     } catch (e) {
       const newBranch = await createUpdateBranchOnAppAsync({
         appId: projectId,
-        branchName: channelName,
+        name: channelName,
       });
       branchId = newBranch.id;
       branchMessage = `We also went ahead and made a branch with the same name`;
     }
 
-    const newChannel = await createUpdateChannelOnAppAsync({
+    const {
+      updateChannel: { createUpdateChannelForApp: newChannel },
+    } = await createUpdateChannelOnAppAsync({
       appId: projectId,
       channelName,
       branchId,
     });
 
+    if (!newChannel) {
+      throw new Error(
+        `Could not create channel with name ${channelName} on app with id ${projectId}`
+      );
+    }
+
     if (jsonFlag) {
-      Log.log(newChannel);
+      Log.log(JSON.stringify(newChannel));
       return;
     }
 
     Log.withTick(
-      `️Created a new channel ${chalk.bold(newChannel.channelName)} on project ${chalk.bold(
-        `@${accountName}/${slug}`
+      `️Created a new channel ${chalk.bold(newChannel.name)} on project ${chalk.bold(
+        fullName
       )}. ${branchMessage} and have pointed the channel at it. You can now update your app by publishing!`
     );
   }

packages/eas-cli/src/commands/channel/edit.ts

@@ -0,0 +1,192 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  GetChannelByNameToEditQuery,
+  GetChannelByNameToEditQueryVariables,
+  UpdateBranch,
+  UpdateChannel,
+  UpdateChannelBranchMappingMutation,
+  UpdateChannelBranchMappingMutationVariables,
+} from '../../graphql/generated';
+import Log from '../../log';
+import {
+  findProjectRootAsync,
+  getBranchByNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+
+async function getChannelByNameForAppAsync({
+  appId,
+  channelName,
+}: GetChannelByNameToEditQueryVariables): Promise<
+  Pick<UpdateChannel, 'id' | 'name'> & {
+    updateBranches: Pick<UpdateBranch, 'id' | 'name'>[];
+  }
+> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetChannelByNameToEditQuery, GetChannelByNameToEditQueryVariables>(
+        gql`
+          query GetChannelByNameToEdit($appId: String!, $channelName: String!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateChannelByName(name: $channelName) {
+                  id
+                  name
+                  updateBranches(offset: 0, limit: 1) {
+                    id
+                    name
+                  }
+                }
+              }
+            }
+          }
+        `,
+        { appId, channelName }
+      )
+      .toPromise()
+  );
+  const updateChannelByNameResult = data.app?.byId.updateChannelByName;
+  if (!updateChannelByNameResult) {
+    throw new Error(`Could not find a channel named ${channelName} on app with id ${appId}`);
+  }
+  return updateChannelByNameResult;
+}
+
+export async function updateChannelBranchMappingAsync({
+  channelId,
+  branchMapping,
+}: UpdateChannelBranchMappingMutationVariables): Promise<{
+  id: string;
+  name: string;
+  branchMapping: string;
+}> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
+        gql`
+          mutation UpdateChannelBranchMapping($channelId: ID!, $branchMapping: String!) {
+            updateChannel {
+              editUpdateChannel(channelId: $channelId, branchMapping: $branchMapping) {
+                id
+                name
+                branchMapping
+              }
+            }
+          }
+        `,
+        { channelId, branchMapping }
+      )
+      .toPromise()
+  );
+  const channel = data.updateChannel.editUpdateChannel;
+  if (!channel) {
+    throw new Error(`Could not fine channel with id ${channelId}`);
+  }
+  return data.updateChannel.editUpdateChannel!;
+}
+
+export default class ChannelEdit extends Command {
+  static hidden = true;
+  static description = 'Point a channel at a new branch.';
+
+  static args = [
+    {
+      name: 'name',
+      required: false,
+      description: 'Name of the channel to edit',
+    },
+  ];
+
+  static flags = {
+    branch: flags.string({
+      description: 'Name of the branch to point to',
+    }),
+    json: flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+      default: false,
+    }),
+  };
+
+  async run() {
+    let {
+      args: { name: channelName },
+      flags: { branch: branchName, json: jsonFlag },
+    } = this.parse(ChannelEdit);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!channelName) {
+      const validationMessage = 'A channel name is required to edit a specific channel.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name: channelName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please enter the name of the channel to edit:',
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
+    if (existingChannel.updateBranches.length > 1) {
+      throw new Error(
+        'There is a rollout in progress. Please manage it with "channel:rollout" instead.'
+      );
+    }
+    const existingBranch = existingChannel.updateBranches[0];
+
+    Log.addNewLineIfNone();
+    Log.log(
+      chalk`Channel {bold ${existingChannel.name}} is currently set to branch {bold ${existingBranch.name}}`
+    );
+    Log.addNewLineIfNone();
+
+    if (!branchName) {
+      const validationMessage = 'branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name: branchName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: chalk`What branch should it change to?`,
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
+    const channel = await updateChannelBranchMappingAsync({
+      channelId: existingChannel.id,
+      // todo: move branch mapping logic to utility
+      branchMapping: JSON.stringify({
+        data: [{ branchId: branch.id, branchMappingLogic: 'true' }],
+        version: 0,
+      }),
+    });
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(channel));
+      return;
+    }
+
+    Log.withTick(
+      chalk`Channel {bold ${channel.name}} is now set to branch {bold ${branch.name}}.\n`
+    );
+    Log.log(
+      chalk`Users with builds on channel {bold ${channel.name}} will now receive the active update on {bold ${branch.name}}.`
+    );
+  }
+}

packages/eas-cli/src/commands/channel/list.ts

@@ -0,0 +1,108 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  GetAllChannelsForAppQuery,
+  GetAllChannelsForAppQueryVariables,
+} from '../../graphql/generated';
+import Log from '../../log';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { logChannelDetails } from './view';
+
+const CHANNEL_LIMIT = 10_000;
+
+async function getAllUpdateChannelForAppAsync({
+  appId,
+}: {
+  appId: string;
+}): Promise<GetAllChannelsForAppQuery> {
+  return await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetAllChannelsForAppQuery, GetAllChannelsForAppQueryVariables>(
+        gql`
+          query GetAllChannelsForApp($appId: String!, $offset: Int!, $limit: Int!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateChannels(offset: $offset, limit: $limit) {
+                  id
+                  name
+                  branchMapping
+                  updateBranches(offset: 0, limit: $limit) {
+                    id
+                    name
+                    updates(offset: 0, limit: 10) {
+                      id
+                      group
+                      message
+                      runtimeVersion
+                      createdAt
+                      platform
+                      actor {
+                        id
+                        ... on User {
+                          username
+                        }
+                        ... on Robot {
+                          firstName
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `,
+        { appId, offset: 0, limit: CHANNEL_LIMIT }
+      )
+      .toPromise()
+  );
+}
+
+export default class ChannelList extends Command {
+  static hidden = true;
+  static description = 'List all channels on the current project.';
+
+  static flags = {
+    json: flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+      default: false,
+    }),
+  };
+
+  async run() {
+    const {
+      flags: { json: jsonFlag },
+    } = this.parse(ChannelList);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({
+      appId: projectId,
+    });
+    const channels = getAllUpdateChannelForAppResult.app?.byId.updateChannels;
+    if (!channels) {
+      throw new Error(`Could not find channels on project with id ${projectId}`);
+    }
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(channels));
+      return;
+    }
+
+    Log.log(); // spacing
+    for (const channel of channels) {
+      Log.log(`Details of channel ${chalk.bold(chalk.cyan(channel.name))}:`);
+      logChannelDetails(channel);
+    }
+  }
+}

packages/eas-cli/src/commands/channel/rollout.ts

@@ -0,0 +1,429 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+
+import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
+import Log from '../../log';
+import {
+  findProjectRootAsync,
+  getBranchByNameAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync, selectAsync } from '../../prompts';
+import { updateChannelBranchMappingAsync } from './edit';
+import { BranchMapping, getBranchMapping, getUpdateChannelByNameForAppAsync } from './view';
+
+async function promptForRolloutPercentAsync({
+  promptMessage,
+}: {
+  promptMessage: string;
+}): Promise<number> {
+  const { name: rolloutPercent } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    format: value => {
+      return parseInt(value, 10);
+    },
+    message: promptMessage,
+    initial: 0,
+    validate: (rolloutPercent: string): true | string => {
+      const floatValue = parseFloat(rolloutPercent);
+      return Number.isInteger(floatValue) && floatValue >= 0 && floatValue <= 100
+        ? true
+        : 'The rollout percentage must be an integer between 0 and 100 inclusive.';
+    },
+  });
+  return rolloutPercent;
+}
+
+function getRolloutInfo(
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery
+): {
+  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
+  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
+  currentPercent: number;
+} {
+  const { branchMapping } = getBranchMapping(
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
+  );
+  const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
+  const newBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+    branch => branch.id === newBranchId
+  )[0];
+  const oldBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+    branch => branch.id === oldBranchId
+  )[0];
+
+  if (!newBranch || !oldBranch) {
+    throw new Error(
+      `Branch mapping rollout is missing a branch for channel "${getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.name}".`
+    );
+  }
+
+  const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
+  return { newBranch, oldBranch, currentPercent };
+}
+
+async function startRolloutAsync({
+  channelName,
+  branchName,
+  percent,
+  jsonFlag,
+  projectId,
+  fullName,
+  currentBranchMapping,
+  getUpdateChannelByNameForAppResult,
+}: {
+  channelName?: string;
+  branchName?: string;
+  percent?: number;
+  jsonFlag: boolean;
+  projectId: string;
+  fullName: string;
+  currentBranchMapping: BranchMapping;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
+}): Promise<{
+  newChannelInfo: {
+    id: string;
+    name: string;
+    branchMapping: string;
+  };
+  logMessage: string;
+}> {
+  if (!branchName) {
+    const validationMessage = 'A branch must be specified.';
+    if (jsonFlag) {
+      throw new Error(validationMessage);
+    }
+    ({ name: branchName } = await promptAsync({
+      type: 'text',
+      name: 'name',
+      message: `Select a branch to rollout onto ${channelName}`,
+      validate: value => (value ? true : validationMessage),
+    }));
+  }
+  const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
+  const oldBranchId = currentBranchMapping.data[0].branchId;
+  if (branch.id === oldBranchId) {
+    throw new Error(
+      `channel "${channelName}" is already pointing at branch "${branchName}". Rollouts must be done with distinct branches.`
+    );
+  }
+
+  if (percent == null) {
+    if (jsonFlag) {
+      throw new Error(
+        'You must specify a percent with the --percent flag when initiating a rollout with the --json flag.'
+      );
+    }
+    const promptMessage = `What percent of users should be directed to the branch "${branchName}"?`;
+    percent = await promptForRolloutPercentAsync({ promptMessage });
+  }
+
+  const newBranchMapping = {
+    version: 0,
+    data: [
+      {
+        branchId: branch.id,
+        branchMappingLogic: {
+          operand: percent / 100,
+          clientKey: 'rolloutToken',
+          branchMappingOperator: 'hash_lt',
+        },
+      },
+      currentBranchMapping.data[0],
+    ],
+  };
+  const newChannelInfo = await updateChannelBranchMappingAsync({
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
+    branchMapping: JSON.stringify(newBranchMapping),
+  });
+
+  const oldBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
+    branch => branch.id === oldBranchId
+  )[0];
+  if (!oldBranch) {
+    throw new Error(
+      `Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`
+    );
+  }
+
+  const logMessage = `️Started a rollout of branch ${chalk.bold(
+    branchName
+  )} onto channel ${chalk.bold(channelName!)}! ${chalk.bold(
+    percent
+  )}% of users will be directed to branch ${chalk.bold(branchName)}, ${chalk.bold(
+    100 - percent
+  )}% to branch ${chalk.bold(oldBranch.name)}.`;
+
+  return { newChannelInfo, logMessage };
+}
+
+async function editRolloutAsync({
+  channelName,
+  percent,
+  jsonFlag,
+  currentBranchMapping,
+  getUpdateChannelByNameForAppResult,
+}: {
+  channelName?: string;
+  percent?: number;
+  jsonFlag: boolean;
+  currentBranchMapping: BranchMapping;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
+}): Promise<{
+  newChannelInfo: {
+    id: string;
+    name: string;
+    branchMapping: string;
+  };
+  logMessage: string;
+}> {
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
+    getUpdateChannelByNameForAppResult
+  );
+
+  if (percent == null) {
+    if (jsonFlag) {
+      throw new Error(
+        'A rollout is already in progress. If you wish to modify it you must use specify the new rollout percentage with the --percent flag.'
+      );
+    }
+    const promptMessage = `Currently ${currentPercent}% of all users are routed to branch ${
+      newBranch.name
+    } and ${100 - currentPercent}% of all users are routed to branch ${
+      oldBranch.name
+    }. What percent of users should be directed to the branch ${newBranch.name}?`;
+    percent = await promptForRolloutPercentAsync({ promptMessage });
+  }
+
+  const newBranchMapping = { ...currentBranchMapping };
+  newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;
+
+  const newChannelInfo = await updateChannelBranchMappingAsync({
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
+    branchMapping: JSON.stringify(newBranchMapping),
+  });
+
+  const logMessage = `️Rollout of branch ${chalk.bold(newBranch.name)} onto channel ${chalk.bold(
+    channelName!
+  )} updated from ${chalk.bold(currentPercent)}% to ${chalk.bold(percent)}%. ${chalk.bold(
+    percent
+  )}% of users will be directed to branch ${chalk.bold(newBranch.name)}, ${chalk.bold(
+    100 - percent
+  )}% to branch ${chalk.bold(oldBranch.name)}.`;
+
+  return { newChannelInfo, logMessage };
+}
+
+async function endRolloutAsync({
+  channelName,
+  branchName,
+  jsonFlag,
+  projectId,
+  getUpdateChannelByNameForAppResult,
+}: {
+  channelName?: string;
+  branchName?: string;
+  jsonFlag: boolean;
+  projectId: string;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
+}): Promise<{
+  newChannelInfo: {
+    id: string;
+    name: string;
+    branchMapping: string;
+  };
+  logMessage: string;
+}> {
+  // end rollout
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
+    getUpdateChannelByNameForAppResult
+  );
+
+  let endOnNewBranch;
+  if (branchName) {
+    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
+    switch (branch.id) {
+      case newBranch.id:
+        endOnNewBranch = true;
+        break;
+      case oldBranch.id:
+        endOnNewBranch = false;
+        break;
+      default:
+        throw new Error(
+          `The branch "${branchName}" specified by --branch must be one of the branches involved in the rollout: "${newBranch.name}" or "${oldBranch.name}".`
+        );
+    }
+  } else {
+    if (jsonFlag) {
+      throw new Error(
+        'Branch name must be specified with the --branch flag when both the --end and --json flag are true.'
+      );
+    }
+    endOnNewBranch = await selectAsync<boolean>(
+      'Ending the rollout will send all traffic to a single branch. Which one should that be?',
+      [
+        {
+          title: `${newBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
+          value: true,
+        },
+        {
+          title: `${oldBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
+          value: false,
+        },
+      ]
+    );
+  }
+  if (endOnNewBranch == null) {
+    throw new Error('Branch to end on is undefined.');
+  }
+
+  const newBranchMapping = {
+    version: 0,
+    data: [
+      {
+        branchId: endOnNewBranch ? newBranch.id : oldBranch.id,
+        branchMappingLogic: 'true',
+      },
+    ],
+  };
+
+  const newChannelInfo = await updateChannelBranchMappingAsync({
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
+    branchMapping: JSON.stringify(newBranchMapping),
+  });
+  const logMessage = `️Rollout on channel ${chalk.bold(
+    channelName
+  )} ended. All traffic is now sent to branch ${chalk.bold(
+    endOnNewBranch ? newBranch.name : oldBranch.name
+  )}`;
+
+  return { newChannelInfo, logMessage };
+}
+
+export default class ChannelRollout extends Command {
+  static hidden = true;
+  static description = 'Rollout a new branch out to a channel incrementally.';
+
+  static args = [
+    {
+      name: 'channel',
+      required: true,
+      description: 'rollout that the channel is on',
+    },
+  ];
+
+  static flags = {
+    branch: flags.string({
+      description: 'branch to rollout',
+      required: false,
+    }),
+    percent: flags.integer({
+      description: 'percent of traffic to redirect to the new branch',
+      required: false,
+    }),
+    end: flags.boolean({
+      description: 'end the rollout',
+      default: false,
+    }),
+    json: flags.boolean({
+      description: 'print output as a JSON object with the new channel ID, name and branch mapping',
+      default: false,
+    }),
+  };
+
+  async run() {
+    const {
+      args: { channel: channelName },
+      flags: { json: jsonFlag, end: endFlag },
+    } = this.parse(ChannelRollout);
+    const {
+      flags: { branch: branchName, percent },
+    } = this.parse(ChannelRollout);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
+
+    const getUpdateChannelByNameForAppResult = await getUpdateChannelByNameForAppAsync({
+      appId: projectId,
+      channelName: channelName!,
+    });
+    const { branchMapping: currentBranchMapping, isRollout } = getBranchMapping(
+      getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
+    );
+
+    if (currentBranchMapping.data.length === 0) {
+      throw new Error('The channel is not pointing at any branches.');
+    }
+    if (currentBranchMapping.data.length > 2) {
+      throw new Error('"channel:rollout" cannot handle branch mappings with more than 2 branches.');
+    }
+    // This combination doesn't make sense. Throw an error explaining the options.
+    if (isRollout && branchName && !endFlag) {
+      throw new Error(
+        `There is a rollout in progress. You can only either edit the rollout percent or 'end' it.`
+      );
+    }
+
+    /**
+     * This if/else block has three branches:
+     *  1. The branch mapping is not a rollout, i.e. it is pointing to a single branch.
+     *  2. The branch mapping is a rollout.
+     *    a. increase/decrease the rollout percentage.
+     *    b. end the rollout.
+     */
+    let rolloutMutationResult: {
+      newChannelInfo: {
+        id: string;
+        name: string;
+        branchMapping: string;
+      };
+      logMessage: string;
+    };
+    if (!isRollout) {
+      rolloutMutationResult = await startRolloutAsync({
+        channelName,
+        branchName,
+        percent,
+        jsonFlag,
+        projectId,
+        fullName,
+        currentBranchMapping,
+        getUpdateChannelByNameForAppResult,
+      });
+    } else if (endFlag) {
+      rolloutMutationResult = await endRolloutAsync({
+        channelName,
+        branchName,
+        jsonFlag,
+        projectId,
+        getUpdateChannelByNameForAppResult,
+      });
+    } else {
+      rolloutMutationResult = await editRolloutAsync({
+        channelName,
+        percent,
+        jsonFlag,
+        currentBranchMapping,
+        getUpdateChannelByNameForAppResult,
+      });
+    }
+    if (!rolloutMutationResult) {
+      throw new Error('rollout result is empty');
+    }
+    const { newChannelInfo, logMessage } = rolloutMutationResult;
+    if (jsonFlag) {
+      Log.log(JSON.stringify(newChannelInfo));
+      return;
+    }
+    Log.withTick(logMessage);
+  }
+}

packages/eas-cli/src/commands/channel/view.ts

@@ -0,0 +1,261 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import assert from 'assert';
+import chalk from 'chalk';
+import Table from 'cli-table3';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  GetChannelByNameForAppQuery,
+  GetChannelByNameForAppQueryVariables,
+} from '../../graphql/generated';
+import Log from '../../log';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import {
+  FormatUpdateParameter,
+  UPDATE_COLUMNS,
+  formatUpdate,
+  getPlatformsForGroup,
+} from '../../update/utils';
+
+export type BranchMapping = {
+  version: number;
+  data: {
+    branchId: string;
+    branchMappingLogic: {
+      operand: number;
+      clientKey: string;
+      branchMappingOperator: string;
+    } & string;
+  }[];
+};
+
+/**
+ * Get the branch mapping and determine whether it is a rollout.
+ * Ensure that the branch mapping is properly formatted.
+ */
+export function getBranchMapping(
+  branchMappingString?: string
+): { branchMapping: BranchMapping; isRollout: boolean; rolloutPercent?: number } {
+  if (!branchMappingString) {
+    throw new Error('Missing branch mapping.');
+  }
+  let branchMapping: BranchMapping;
+  try {
+    branchMapping = JSON.parse(branchMappingString);
+  } catch (e) {
+    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
+  }
+  assert(branchMapping, 'Branch Mapping must be defined.');
+
+  if (branchMapping.version !== 0) {
+    throw new Error('Branch mapping must be version 0.');
+  }
+
+  const isRollout = branchMapping.data.length === 2;
+  const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
+
+  switch (branchMapping.data.length) {
+    case 0:
+      break;
+    case 1:
+      if (branchMapping.data[0].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a single branch must be "true"');
+      }
+      break;
+    case 2:
+      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
+      }
+      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
+      }
+      if (rolloutPercent == null) {
+        throw new Error('Branch mapping is missing a "rolloutPercent"');
+      }
+      if (branchMapping.data[1].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
+      }
+      break;
+    default:
+      throw new Error('Branch mapping data must have length less than or equal to 2.');
+  }
+
+  return { branchMapping, isRollout, rolloutPercent };
+}
+
+export async function getUpdateChannelByNameForAppAsync({
+  appId,
+  channelName,
+}: GetChannelByNameForAppQueryVariables): Promise<GetChannelByNameForAppQuery> {
+  return await withErrorHandlingAsync(
+    graphqlClient
+      .query<GetChannelByNameForAppQuery, GetChannelByNameForAppQueryVariables>(
+        gql`
+          query GetChannelByNameForApp($appId: String!, $channelName: String!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateChannelByName(name: $channelName) {
+                  id
+                  name
+                  createdAt
+                  branchMapping
+                  updateBranches(offset: 0, limit: 1000) {
+                    id
+                    name
+                    updates(offset: 0, limit: 10) {
+                      id
+                      group
+                      message
+                      runtimeVersion
+                      createdAt
+                      platform
+                      actor {
+                        id
+                        ... on User {
+                          username
+                        }
+                        ... on Robot {
+                          firstName
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `,
+        { appId, channelName }
+      )
+      .toPromise()
+  );
+}
+
+export function logChannelDetails(channel: {
+  branchMapping: string;
+  updateBranches: {
+    updates: (FormatUpdateParameter & {
+      runtimeVersion: string;
+      group: string;
+      platform: string;
+    })[];
+    name: string;
+    id: string;
+  }[];
+}): void {
+  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+
+  const table = new Table({
+    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+
+  for (const index in branchMapping.data) {
+    if (parseInt(index, 10) > 1) {
+      throw new Error('Branch Mapping data must have length less than or equal to 2.');
+    }
+
+    const { branchId } = branchMapping.data[index];
+    const branch = channel.updateBranches.filter(branch => branch.id === branchId)[0];
+    if (!branch) {
+      throw new Error('Branch mapping is pointing at a missing branch.');
+    }
+    const update = branch.updates[0];
+    table.push([
+      branch.name,
+      ...(isRollout
+        ? [
+            parseInt(index, 10) === 0
+              ? `${rolloutPercent! * 100}%`
+              : `${(1 - rolloutPercent!) * 100}%`,
+          ]
+        : []),
+      formatUpdate(update),
+      update?.runtimeVersion ?? 'N/A',
+      update?.group ?? 'N/A,',
+      getPlatformsForGroup({
+        updates: branch.updates,
+        group: branch.updates[0]?.group,
+      }),
+    ]);
+  }
+  Log.log(table.toString());
+}
+
+export default class ChannelView extends Command {
+  static hidden = true;
+  static description = 'View a channel on the current project.';
+
+  static args = [
+    {
+      name: 'name',
+      required: false,
+      description: 'Name of the channel to view',
+    },
+  ];
+
+  static flags = {
+    json: flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+      default: false,
+    }),
+  };
+
+  async run() {
+    let {
+      args: { name: channelName },
+      flags: { json: jsonFlag },
+    } = this.parse(ChannelView);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const fullName = await getProjectFullNameAsync(exp);
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!channelName) {
+      const validationMessage = 'A channel name is required to view a specific channel.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ name: channelName } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'Please name the channel:',
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    const getUpdateChannelByNameForAppresult = await getUpdateChannelByNameForAppAsync({
+      appId: projectId,
+      channelName,
+    });
+    const channel = getUpdateChannelByNameForAppresult.app?.byId.updateChannelByName;
+    if (!channel) {
+      throw new Error(`Could not fine channel with name ${channelName}`);
+    }
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(channel));
+      return;
+    }
+
+    Log.withTick(
+      chalk`Channel: {bold ${channel.name}} on project {bold ${fullName}}. Channel ID: {bold ${channel.id}}`
+    );
+    Log.log(
+      chalk`{bold Branches, pointed at by this channel, and their most recent update group:}`
+    );
+    logChannelDetails(channel);
+  }
+}

packages/eas-cli/src/commands/credentials.ts

@@ -1,6 +1,5 @@
 import { Command } from '@oclif/command';
 
-import { CredentialsManager } from '../credentials/CredentialsManager';
 import { createCredentialsContextAsync } from '../credentials/context';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';
 
@@ -9,6 +8,6 @@ export default class Credentials extends Command {
 
   async run() {
     const ctx = await createCredentialsContextAsync(process.cwd(), {});
-    new CredentialsManager(ctx).runActionAsync(new SelectPlatform());
+    await new SelectPlatform().runAsync(ctx);
   }
 }

packages/eas-cli/src/commands/device/list.ts

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Command, flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -21,7 +22,8 @@ export default class BuildList extends Command {
     let appleTeamIdentifier = this.parse(BuildList).flags['apple-team-id'];
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const accountName = await getProjectAccountNameAsync(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const accountName = await getProjectAccountNameAsync(exp);
 
     let spinner: ora.Ora;
 
@@ -42,7 +44,9 @@ export default class BuildList extends Command {
               name: 'appleTeamIdentifier',
               message: 'What Apple Team would you like to list devices for?',
               choices: teams.map(team => ({
-                title: `${team.appleTeamName} (ID: ${team.appleTeamIdentifier})`,
+                title: team.appleTeamName
+                  ? `${team.appleTeamName} (ID: ${team.appleTeamIdentifier})`
+                  : team.appleTeamIdentifier,
                 value: team.appleTeamIdentifier,
               })),
             });
@@ -71,7 +75,9 @@ export default class BuildList extends Command {
       if (result?.appleDevices.length) {
         const { appleTeamName, appleDevices } = result;
 
-        spinner.succeed(`Found ${appleDevices.length} devices for team ${appleTeamName}`);
+        spinner.succeed(
+          `Found ${appleDevices.length} devices for team ${appleTeamName ?? appleTeamIdentifier}`
+        );
 
         const list = appleDevices
           .map(device =>

packages/eas-cli/src/commands/device/view.ts

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Command } from '@oclif/command';
 import ora from 'ora';
 
@@ -29,7 +30,8 @@ If you are not sure what is the UDID of the device you are looking for, run:
     }
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const accountName = await getProjectAccountNameAsync(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const accountName = await getProjectAccountNameAsync(exp);
 
     const spinner = ora().start(`Fetching device details for ${UDID}…`);
 

packages/eas-cli/src/commands/init.ts

@@ -0,0 +1,28 @@
+import { getConfig } from '@expo/config';
+import { Command } from '@oclif/command';
+import chalk from 'chalk';
+
+import Log from '../log';
+import { findProjectRootAsync, setProjectIdAsync } from '../project/projectUtils';
+
+export default class InitView extends Command {
+  static hidden = true;
+  static description = 'Create or link an EAS project';
+
+  async run() {
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+
+    if (exp.extra?.eas?.projectId) {
+      Log.error(
+        `app.json is already linked to project with ID: ${chalk.bold(exp.extra?.eas?.projectId)}`
+      );
+      return;
+    }
+
+    await setProjectIdAsync(projectDir);
+  }
+}

packages/eas-cli/src/commands/secret/create.ts

@@ -0,0 +1,155 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+
+import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
+import Log from '../../log';
+import {
+  isEasEnabledForProjectAsync,
+  warnEasUnavailable,
+} from '../../project/isEasEnabledForProject';
+import {
+  findProjectRootAsync,
+  getProjectAccountNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
+import { getActorDisplayName } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';
+
+export enum EnvironmentSecretScope {
+  ACCOUNT = 'account',
+  PROJECT = 'project',
+}
+export default class EnvironmentSecretCreate extends Command {
+  static description = 'Create an environment secret on the current project or owner account.';
+
+  static flags = {
+    scope: flags.enum({
+      description: 'Scope for the secret',
+      options: [EnvironmentSecretScope.ACCOUNT, EnvironmentSecretScope.PROJECT],
+      default: EnvironmentSecretScope.PROJECT,
+    }),
+    name: flags.string({
+      description: 'Name of the secret',
+    }),
+    value: flags.string({
+      description: 'Value of the secret',
+    }),
+  };
+
+  async run() {
+    const actor = await ensureLoggedInAsync();
+    let {
+      flags: { name, value: secretValue, scope },
+    } = this.parse(EnvironmentSecretCreate);
+
+    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const accountName = await getProjectAccountNameAsync(exp);
+
+    const { slug } = exp;
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!(await isEasEnabledForProjectAsync(projectId))) {
+      warnEasUnavailable();
+      process.exitCode = 1;
+      return;
+    }
+
+    if (!scope) {
+      const validationMessage = 'Secret scope may not be empty.';
+
+      ({ scope } = await promptAsync({
+        type: 'select',
+        name: 'scope',
+        message: 'Where should this secret be used:',
+        choices: [
+          { title: 'Account-wide', value: EnvironmentSecretScope.ACCOUNT },
+          { title: 'Project-specific', value: EnvironmentSecretScope.PROJECT },
+        ],
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    if (!name) {
+      ({ name } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: `Secret name:`,
+        validate: value => {
+          if (!value) {
+            return 'Secret name may not be empty.';
+          }
+
+          // this validation regex here is just to shorten the feedback loop
+          // the source of truth is in www's EnvironmentSecretValidator class
+          if (!value.match(/^\w+$/)) {
+            return 'Names may contain only letters, numbers, and underscores.';
+          }
+
+          return true;
+        },
+      }));
+
+      if (!name) throw new Error('Secret name may not be empty.');
+    }
+
+    if (!secretValue) {
+      const validationMessage = 'Secret value may not be empty.';
+
+      ({ secretValue } = await promptAsync({
+        type: 'text',
+        name: 'secretValue',
+        message: 'Secret value:',
+        validate: value => (value ? true : validationMessage),
+      }));
+
+      if (!secretValue) throw new Error(validationMessage);
+    }
+
+    if (scope === EnvironmentSecretScope.PROJECT) {
+      const secret = await EnvironmentSecretMutation.createForApp(
+        { name, value: secretValue },
+        projectId
+      );
+      if (!secret) {
+        throw new Error(
+          `Could not create secret with name ${name} on project with id ${projectId}`
+        );
+      }
+
+      Log.withTick(
+        `️Created a new secret ${chalk.bold(name)} on project ${chalk.bold(
+          `@${accountName}/${slug}`
+        )}.`
+      );
+    } else if (scope === EnvironmentSecretScope.ACCOUNT) {
+      const ownerAccount = findAccountByName(actor.accounts, accountName);
+      if (!ownerAccount) {
+        Log.warn(
+          `Your account (${getActorDisplayName(actor)}) doesn't have access to the ${chalk.bold(
+            accountName
+          )} account`
+        );
+        return;
+      }
+
+      const secret = await EnvironmentSecretMutation.createForAccount(
+        { name, value: secretValue },
+        ownerAccount.id
+      );
+
+      if (!secret) {
+        throw new Error(
+          `Could not create secret with name ${name} on account with id ${ownerAccount.id}`
+        );
+      }
+
+      Log.withTick(
+        `️Created a new secret ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
+      );
+    }
+  }
+}

packages/eas-cli/src/commands/secret/delete.ts

@@ -0,0 +1,100 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+
+import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
+import {
+  EnvironmentSecretWithScope,
+  EnvironmentSecretsQuery,
+} from '../../graphql/queries/EnvironmentSecretsQuery';
+import Log from '../../log';
+import {
+  isEasEnabledForProjectAsync,
+  warnEasUnavailable,
+} from '../../project/isEasEnabledForProject';
+import {
+  findProjectRootAsync,
+  getProjectAccountNameAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { EnvironmentSecretScope } from './create';
+
+export default class EnvironmentSecretDelete extends Command {
+  static description = `Delete an environment secret by ID.
+Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
+
+  static flags = {
+    id: flags.string({
+      description: 'ID of the secret to delete',
+    }),
+  };
+
+  async run() {
+    await ensureLoggedInAsync();
+
+    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
+    const projectAccountName = await getProjectAccountNameAsync(exp);
+
+    if (!(await isEasEnabledForProjectAsync(projectId))) {
+      warnEasUnavailable();
+      process.exitCode = 1;
+      return;
+    }
+
+    let {
+      flags: { id },
+    } = this.parse(EnvironmentSecretDelete);
+    let secret: EnvironmentSecretWithScope | undefined;
+
+    if (!id) {
+      const validationMessage = 'You must select which secret to delete.';
+
+      const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectFullName);
+
+      ({ secret } = await promptAsync({
+        type: 'autocomplete',
+        name: 'secret',
+        message: 'Pick the secret to be deleted:',
+        choices: secrets.map(secret => ({
+          title: `${secret.name} (${secret.scope})`,
+          value: secret,
+        })),
+      }));
+
+      id = secret?.id;
+
+      if (!id) throw new Error(validationMessage);
+    }
+
+    Log.addNewLineIfNone();
+    Log.warn(
+      `You are about to permamently delete secret${
+        secret?.name ? ` "${secret?.name}"` : ''
+      } with id: "${id}".\nThis action is irreversible.`
+    );
+    Log.newLine();
+    const confirmed = await toggleConfirmAsync({
+      message: `Are you sure you wish to proceed?${
+        secret?.scope === EnvironmentSecretScope.ACCOUNT
+          ? ' This secret is applied across your whole account and may affect multiple apps.'
+          : ''
+      }`,
+    });
+    if (!confirmed) {
+      Log.error(
+        `Canceled deletion of secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".`
+      );
+      process.exit(1);
+    }
+
+    await EnvironmentSecretMutation.delete(id);
+
+    Log.withTick(`️Deleted secret${secret?.name ? ` "${secret?.name}"` : ''} with id "${id}".`);
+  }
+}

packages/eas-cli/src/commands/secret/list.ts

@@ -0,0 +1,58 @@
+import { getConfig } from '@expo/config';
+import { Command } from '@oclif/command';
+import chalk from 'chalk';
+import Table from 'cli-table3';
+import dateFormat from 'dateformat';
+
+import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
+import Log from '../../log';
+import {
+  isEasEnabledForProjectAsync,
+  warnEasUnavailable,
+} from '../../project/isEasEnabledForProject';
+import {
+  findProjectRootAsync,
+  getProjectAccountNameAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+
+export default class EnvironmentSecretList extends Command {
+  static description = 'Lists environment secrets available for your current app';
+
+  async run(): Promise<void> {
+    await ensureLoggedInAsync();
+
+    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
+    const projectAccountName = await getProjectAccountNameAsync(exp);
+
+    if (!(await isEasEnabledForProjectAsync(projectId))) {
+      warnEasUnavailable();
+      process.exitCode = 1;
+      return;
+    }
+
+    if (!projectDir) {
+      throw new Error("Please run this command inside your project's directory");
+    }
+
+    const secrets = await EnvironmentSecretsQuery.allAsync(projectAccountName, projectFullName);
+
+    const table = new Table({
+      head: ['Name', 'Scope', 'ID', 'Updated at'],
+      wordWrap: true,
+    });
+
+    for (const secret of secrets) {
+      const { name, createdAt: updatedAt, scope, id } = secret;
+      table.push([name, scope, id, dateFormat(updatedAt, 'mmm dd HH:MM:ss')]);
+    }
+
+    Log.log(chalk`{bold Secrets for this account and project:}`);
+    Log.log(table.toString());
+  }
+}

packages/eas-cli/src/commands/submit.ts

@@ -1,23 +1,21 @@
-import { Command, flags } from '@oclif/command';
+import { getConfig } from '@expo/config';
+import { flags } from '@oclif/command';
 
+import EasCommand from '../commandUtils/EasCommand';
+import { AppPlatform } from '../graphql/generated';
 import { learnMore } from '../log';
 import { isEasEnabledForProjectAsync, warnEasUnavailable } from '../project/isEasEnabledForProject';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { promptAsync } from '../prompts';
 import AndroidSubmitCommand from '../submissions/android/AndroidSubmitCommand';
 import IosSubmitCommand from '../submissions/ios/IosSubmitCommand';
-import {
-  AndroidSubmitCommandFlags,
-  IosSubmitCommandFlags,
-  SubmissionPlatform,
-} from '../submissions/types';
-import { ensureLoggedInAsync } from '../user/actions';
+import { AndroidSubmitCommandFlags, IosSubmitCommandFlags } from '../submissions/types';
 
 const COMMON_FLAGS = '';
 const ANDROID_FLAGS = 'Android specific options';
 const IOS_FLAGS = 'iOS specific options';
 
-export default class BuildSubmit extends Command {
+export default class BuildSubmit extends EasCommand {
   static description = 'Submits build artifact to app store';
   static usage = 'submit --platform=(android|ios)';
   static aliases = ['build:submit'];
@@ -158,17 +156,17 @@ export default class BuildSubmit extends Command {
         'company-name': companyName,
 
         // common
-        platform: platformFromParams,
         ...flags
       },
     } = this.parse(BuildSubmit);
 
-    await ensureLoggedInAsync();
-
-    const platform = platformFromParams ?? (await promptForPlatformAsync());
+    const platform =
+      (flags.platform?.toUpperCase() as AppPlatform | undefined) ??
+      (await promptForPlatformAsync());
 
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-    const projectId = await getProjectIdAsync(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
 
     if (!(await isEasEnabledForProjectAsync(projectId))) {
       warnEasUnavailable();
@@ -181,7 +179,7 @@ export default class BuildSubmit extends Command {
       throw new Error("Please run this command inside your project's directory");
     }
 
-    if (platform === SubmissionPlatform.Android) {
+    if (platform === AppPlatform.Android) {
       const options: AndroidSubmitCommandFlags = {
         androidPackage,
         releaseStatus,
@@ -191,7 +189,7 @@ export default class BuildSubmit extends Command {
       const ctx = AndroidSubmitCommand.createContext(projectDir, projectId, options);
       const command = new AndroidSubmitCommand(ctx);
       await command.runAsync();
-    } else if (platform === SubmissionPlatform.iOS) {
+    } else if (platform === AppPlatform.Ios) {
       const options: IosSubmitCommandFlags = {
         appleId,
         ascAppId,
@@ -211,7 +209,7 @@ export default class BuildSubmit extends Command {
   }
 }
 
-async function promptForPlatformAsync(): Promise<SubmissionPlatform> {
+async function promptForPlatformAsync(): Promise<AppPlatform> {
   const { platform } = await promptAsync({
     type: 'select',
     message: 'Submit to platform',
@@ -219,11 +217,11 @@ async function promptForPlatformAsync(): Promise<SubmissionPlatform> {
     choices: [
       {
         title: 'iOS',
-        value: SubmissionPlatform.iOS,
+        value: AppPlatform.Ios,
       },
       {
         title: 'Android',
-        value: SubmissionPlatform.Android,
+        value: AppPlatform.Android,
       },
     ],
   });

packages/eas-cli/src/commands/update/delete.ts

@@ -0,0 +1,88 @@
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  DeleteUpdateGroupMutation,
+  UpdateMutationDeleteUpdateGroupArgs,
+} from '../../graphql/generated';
+import Log from '../../log';
+import { confirmAsync } from '../../prompts';
+
+async function deleteUpdateGroupAsync({
+  group,
+}: {
+  group: string;
+}): Promise<DeleteUpdateGroupMutation> {
+  return await withErrorHandlingAsync(
+    graphqlClient
+      .mutation<DeleteUpdateGroupMutation, UpdateMutationDeleteUpdateGroupArgs>(
+        gql`
+          mutation DeleteUpdateGroup($group: ID!) {
+            update {
+              deleteUpdateGroup(group: $group) {
+                group
+              }
+            }
+          }
+        `,
+        { group }
+      )
+      .toPromise()
+  );
+}
+
+export default class UpdateDelete extends Command {
+  static hidden = true;
+  static description = 'Delete all the updates in an update Group.';
+
+  static args = [
+    {
+      name: 'groupId',
+      required: true,
+      description: 'The ID of an update group to delete.',
+    },
+  ];
+
+  static flags = {
+    json: flags.boolean({
+      description: `Return a json with the group ID of the deleted updates.`,
+      default: false,
+    }),
+  };
+
+  async run() {
+    const {
+      args: { groupId: group },
+      flags: { json: jsonFlag },
+    } = this.parse(UpdateDelete);
+
+    if (!jsonFlag) {
+      const shouldAbort = await confirmAsync({
+        message:
+          `🚨${chalk.red('CAUTION')}🚨\n\n` +
+          `${chalk.yellow(`This will delete all of the updates in group "${group}".`)} ${chalk.red(
+            'This is a permanent operation.'
+          )}\n\n` +
+          `If you want to revert to a previous publish, you should use 'branch:publish --republish' targeted at the last working update group instead.\n\n` +
+          `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'branch:publish --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent cacheing behavior by clients.\n\n` +
+          `Would you like to abort?`,
+      });
+
+      if (shouldAbort) {
+        Log.log('Aborted.');
+        return;
+      }
+    }
+
+    await deleteUpdateGroupAsync({ group });
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify({ group }));
+      return;
+    }
+
+    Log.withTick(`Deleted update group ${group}`);
+  }
+}

packages/eas-cli/src/commands/update/show.ts

@@ -1,10 +0,0 @@
-import { Command } from '@oclif/command';
-
-export default class UpdateShow extends Command {
-  static hidden = true;
-  static description = 'details about a particular revision';
-
-  async run() {
-    throw new Error('Not implemented');
-  }
-}

packages/eas-cli/src/commands/update/view.ts

@@ -0,0 +1,100 @@
+import { Command, flags } from '@oclif/command';
+import Table from 'cli-table3';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { UpdatesByGroupQuery, UpdatesByGroupQueryVariables } from '../../graphql/generated';
+import Log from '../../log';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+
+export async function viewUpdateAsync({
+  groupId,
+}: {
+  groupId: string;
+}): Promise<UpdatesByGroupQuery> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<UpdatesByGroupQuery, UpdatesByGroupQueryVariables>(
+        gql`
+          query UpdatesByGroup($groupId: ID!) {
+            updatesByGroup(group: $groupId) {
+              id
+              group
+              runtimeVersion
+              platform
+              message
+              actor {
+                id
+                ... on User {
+                  username
+                }
+                ... on Robot {
+                  firstName
+                }
+              }
+              createdAt
+            }
+          }
+        `,
+        {
+          groupId,
+        }
+      )
+      .toPromise()
+  );
+  if (data.updatesByGroup.length === 0) {
+    throw new Error(`Could not find any updates with group ID: "${groupId}"`);
+  }
+  return data;
+}
+export default class UpdateView extends Command {
+  static hidden = true;
+  static description = 'Update group details.';
+
+  static args = [
+    {
+      name: 'groupId',
+      required: true,
+      description: 'The ID of an update group.',
+    },
+  ];
+
+  static flags = {
+    json: flags.boolean({
+      description: `Return a json with the updates belonging to the group.`,
+      default: false,
+    }),
+  };
+
+  async run() {
+    const {
+      args: { groupId },
+      flags: { json: jsonFlag },
+    } = this.parse(UpdateView);
+
+    const { updatesByGroup } = await viewUpdateAsync({ groupId });
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(updatesByGroup));
+      return;
+    }
+
+    const groupTable = new Table({
+      head: [...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    const representativeUpdate = updatesByGroup[0];
+    groupTable.push([
+      formatUpdate(representativeUpdate),
+      representativeUpdate.runtimeVersion,
+      representativeUpdate.group,
+      getPlatformsForGroup({
+        updates: updatesByGroup,
+        group: updatesByGroup[0]?.group,
+      }),
+    ]);
+
+    Log.log(groupTable.toString());
+  }
+}

packages/eas-cli/src/commands/webhook/create.ts

@@ -0,0 +1,50 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import ora from 'ora';
+
+import { WebhookType } from '../../graphql/generated';
+import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { prepareInputParamsAsync } from '../../webhooks/input';
+
+export default class WebhookCreate extends Command {
+  static description = 'Create a webhook on the current project.';
+
+  static flags = {
+    event: flags.enum({
+      description: 'Event type that triggers the webhook',
+      options: [WebhookType.Build],
+      default: WebhookType.Build,
+    }),
+    url: flags.string({
+      description: 'Webhook URL',
+    }),
+    secret: flags.string({
+      description:
+        "Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature' header.",
+    }),
+  };
+
+  async run() {
+    await ensureLoggedInAsync();
+    const { flags } = this.parse(WebhookCreate);
+    const webhookInputParams = await prepareInputParamsAsync(flags);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    const spinner = ora('Creating a webhook').start();
+    try {
+      await WebhookMutation.createWebhookAsync(projectId, webhookInputParams);
+      spinner.succeed('Successfully created a webhook');
+    } catch (err) {
+      spinner.fail('Failed to create a webhook');
+      throw err;
+    }
+  }
+}

packages/eas-cli/src/commands/webhook/delete.ts

@@ -0,0 +1,102 @@
+import { getConfig } from '@expo/config';
+import { Command } from '@oclif/command';
+import assert from 'assert';
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+import ora from 'ora';
+
+import { WebhookFragment } from '../../graphql/generated';
+import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
+import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
+import Log from '../../log';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { formatWebhook } from '../../webhooks/formatWebhook';
+
+export default class WebhookDelete extends Command {
+  static description = 'Delete a webhook on the current project.';
+
+  static args = [
+    {
+      name: 'ID',
+      required: false,
+      description: 'ID of the webhook to delete',
+    },
+  ];
+
+  async run() {
+    await ensureLoggedInAsync();
+    let {
+      args: { ID: webhookId },
+    } = this.parse(WebhookDelete);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    let webhook: WebhookFragment | undefined =
+      webhookId && (await WebhookQuery.byIdAsync(webhookId));
+    if (!webhookId) {
+      const webhooks = await fetchWebhooksByAppIdAsync(projectId);
+      if (webhooks.length === 0) {
+        process.exit(1);
+      }
+      ({ webhook } = await promptAsync({
+        type: 'autocomplete',
+        name: 'webhook',
+        message: 'Pick the webhook to be deleted:',
+        choices: webhooks.map(i => ({
+          title: `${chalk.bold(i.url)} (Event: ${i.event}, ID: ${i.id})`,
+          value: i,
+        })),
+      }));
+      webhookId = nullthrows(webhook).id;
+    }
+
+    assert(webhook, 'Webhook must be defined here');
+
+    Log.addNewLineIfNone();
+    Log.log(formatWebhook(webhook));
+    Log.newLine();
+    Log.warn(`You are about to permamently delete this webhook.\nThis action is irreversible.`);
+    Log.newLine();
+    const confirmed = await toggleConfirmAsync({
+      message: 'Are you sure you wish to proceed?',
+    });
+
+    if (!confirmed) {
+      Log.error(`Canceled deletion of the webhook`);
+      process.exit(1);
+    }
+
+    const spinner = ora('Deleting the webhook').start();
+    try {
+      await WebhookMutation.deleteWebhookAsync(webhookId);
+      spinner.succeed('Successfully deleted the webhook');
+    } catch (err) {
+      spinner.fail('Failed to delete the webhook');
+      throw err;
+    }
+  }
+}
+
+async function fetchWebhooksByAppIdAsync(appId: string): Promise<WebhookFragment[]> {
+  const spinner = ora('Fetching webhooks').start();
+  try {
+    const webhooks = await WebhookQuery.byAppIdAsync(appId);
+    if (webhooks.length === 0) {
+      spinner.fail('There are no webhooks on the project');
+      return [];
+    } else {
+      spinner.succeed(`Successfully fetched ${webhooks.length} webhooks`);
+      return webhooks;
+    }
+  } catch (err) {
+    spinner.fail("Something went wrong and we couldn't fetch the webhook list");
+    throw err;
+  }
+}

packages/eas-cli/src/commands/webhook/list.ts

@@ -0,0 +1,60 @@
+import { getConfig } from '@expo/config';
+import { Command, flags } from '@oclif/command';
+import chalk from 'chalk';
+import ora from 'ora';
+
+import { WebhookType } from '../../graphql/generated';
+import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
+import Log from '../../log';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { formatWebhook } from '../../webhooks/formatWebhook';
+
+export default class WebhookList extends Command {
+  static description = 'List webhooks on the current project.';
+
+  static flags = {
+    event: flags.enum({
+      description: 'Event type that triggers the webhook',
+      options: [WebhookType.Build],
+    }),
+  };
+
+  async run() {
+    await ensureLoggedInAsync();
+    const {
+      flags: { event },
+    } = this.parse(WebhookList);
+
+    const projectDir = await findProjectRootAsync(process.cwd());
+    if (!projectDir) {
+      throw new Error('Please run this command inside a project directory.');
+    }
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
+
+    const spinner = ora(`Fetching the list of webhook on project ${projectFullName}`).start();
+    try {
+      const webhooks = await WebhookQuery.byAppIdAsync(projectId, event && { event });
+      if (webhooks.length === 0) {
+        spinner.fail(`There are no webhooks on project ${projectFullName}`);
+      } else {
+        spinner.succeed(`Found ${webhooks.length} webhooks on project ${projectFullName}`);
+        const list = webhooks
+          .map(webhook => formatWebhook(webhook))
+          .join(`\n\n${chalk.dim('———')}\n\n`);
+        Log.log(`\n${list}`);
+      }
+    } catch (err) {
+      spinner.fail(
+        `Something went wrong and we couldn't fetch the webhook list for the project ${projectFullName}`
+      );
+      throw err;
+    }
+  }
+}

packages/eas-cli/src/commands/webhook/update.ts

@@ -0,0 +1,54 @@
+import { Command, flags } from '@oclif/command';
+import pick from 'lodash/pick';
+import ora from 'ora';
+
+import { WebhookType } from '../../graphql/generated';
+import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
+import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { prepareInputParamsAsync } from '../../webhooks/input';
+
+export default class WebhookUpdate extends Command {
+  static description = 'Create a webhook on the current project.';
+
+  static flags = {
+    id: flags.string({
+      description: 'Webhook ID',
+      required: true,
+    }),
+    event: flags.enum({
+      description: 'Event type that triggers the webhook',
+      options: [WebhookType.Build],
+      default: WebhookType.Build,
+    }),
+    url: flags.string({
+      description: 'Webhook URL',
+    }),
+    secret: flags.string({
+      description:
+        "Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature' header.",
+    }),
+  };
+
+  async run() {
+    await ensureLoggedInAsync();
+    const { flags } = this.parse(WebhookUpdate);
+
+    const webhookId = flags.id;
+
+    const webhook = await WebhookQuery.byIdAsync(webhookId);
+    const webhookInputParams = await prepareInputParamsAsync(
+      pick(flags, ['event', 'url', 'secret']),
+      webhook
+    );
+
+    const spinner = ora('Updating a webhook').start();
+    try {
+      await WebhookMutation.updateWebhookAsync(webhookId, webhookInputParams);
+      spinner.succeed('Successfully updated a webhook');
+    } catch (err) {
+      spinner.fail('Failed to update a webhook');
+      throw err;
+    }
+  }
+}

packages/eas-cli/src/commands/webhook/view.ts

@@ -0,0 +1,36 @@
+import { Command } from '@oclif/command';
+import ora from 'ora';
+
+import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
+import Log from '../../log';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { formatWebhook } from '../../webhooks/formatWebhook';
+
+export default class WebhookView extends Command {
+  static description = 'View a webhook on the current project.';
+
+  static args = [
+    {
+      name: 'ID',
+      required: true,
+      description: 'ID of the webhook to view',
+    },
+  ];
+
+  async run() {
+    await ensureLoggedInAsync();
+    const {
+      args: { ID: webhookId },
+    } = this.parse(WebhookView);
+
+    const spinner = ora(`Fetching the webhook details for ID ${webhookId}`).start();
+    try {
+      const webhook = await WebhookQuery.byIdAsync(webhookId);
+      spinner.succeed(`Found the webhook details`);
+      Log.log(`\n${formatWebhook(webhook)}`);
+    } catch (err) {
+      spinner.fail(`Couldn't find the webhook with ID ${webhookId}`);
+      throw err;
+    }
+  }
+}

packages/eas-cli/src/credentials/CredentialsManager.ts

@@ -1,13 +0,0 @@
-import { Context } from './context';
-
-export interface Action<T = void> {
-  runAsync(manager: CredentialsManager, ctx: Context): Promise<T>;
-}
-
-export class CredentialsManager {
-  constructor(private ctx: Context) {}
-
-  public async runActionAsync<T>(action: Action<T>): Promise<T> {
-    return await action.runAsync(this, this.ctx);
-  }
-}

packages/eas-cli/src/credentials/CredentialsProvider.ts

@@ -1,8 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-
-export interface CredentialsProvider {
-  platform: Platform;
-  hasRemoteAsync(): Promise<boolean>;
-  hasLocalAsync(): Promise<boolean>;
-  isLocalSyncedAsync(): Promise<boolean>;
-}

packages/eas-cli/src/credentials/__mocks__/context.ts

@@ -1,7 +0,0 @@
-import { getAndroidApiMock } from '../__tests__/fixtures-android';
-import { createCtxMock } from '../__tests__/fixtures-context';
-
-export const createCredentialsContextAsync = () =>
-  createCtxMock({
-    android: getAndroidApiMock(),
-  });

packages/eas-cli/src/credentials/__tests__/fixtures-android.ts

@@ -1,70 +1,134 @@
-import { AndroidCredentials } from '../android/credentials';
-import { testKeystore2Base64, testKeystoreBase64 } from './fixtures-base64-data';
-import { testExperienceName, testJester2ExperienceName } from './fixtures-constants';
+import {
+  AndroidAppBuildCredentialsFragment,
+  AndroidFcmFragment,
+  AndroidFcmVersion,
+  AndroidKeystoreFragment,
+  AndroidKeystoreType,
+  AppFragment,
+  CommonAndroidAppCredentialsFragment,
+} from '../../graphql/generated';
+import { Keystore } from '../android/credentials';
+import {
+  testKeystore2Base64,
+  testKeystoreBase64,
+  testPKCS12KeystoreBase64,
+  testPKCS12KeystoreEmptyPasswordBase64,
+} from './fixtures-base64-data';
 
-export const testKeystore = {
+export const testKeystore: Keystore = {
   keystore: testKeystoreBase64,
   keystorePassword: 'ae6777e9444a436dbe533d2be46c83ba',
   keyAlias: 'QHdrb3p5cmEvY3JlZGVudGlhbHMtdGVzdA==',
   keyPassword: '43f760fe7ecd4e6a925779eb45bc787b',
 };
-export const testKeystore2 = {
+export const testKeystore2: Keystore = {
   keystore: testKeystore2Base64,
   keystorePassword: '6faeed2326b94effadbeb731510c2378',
   keyAlias: 'QHdrb3p5cmEvY3JlZGVudGlhbHMtdGVzdA==',
   keyPassword: 'e4829b38057042d78f25053f390478f9',
 };
 
-export const testPushCredentials = {
-  fcmApiKey: 'examplefcmapikey',
+// Generated by: keytool -genkey -alias test-alias -keystore keystore.p12 -storetype PKCS12 -keyalg RSA -storepass password -validity 730 -keysize 2048
+// A Keystore in a PKCS#12 file, where all entries are under aliases
+// This particular PKCS#12 has one key and one certificate under 'test-alias'
+export const testPKCS12Keystore: Keystore = {
+  keystore: testPKCS12KeystoreBase64,
+  keystorePassword: 'password',
+  keyAlias: 'test-alias',
 };
 
-export const testAppCredentials = {
-  experienceName: testExperienceName,
-  keystore: testKeystore,
-  pushCredentials: testPushCredentials,
+// openssl req -new -newkey rsa:4096 -nodes -keyout test.key -out test.csr
+// openssl x509 -req -sha256 -days 365 -in test.csr -signkey test.key -out test.pem
+// openssl pkcs12 -export -in test.pem -inkey test.key -name "test-alias" -passout pass: -out emptyPassword.p12
+// cat emptyPassword.p12 | base64
+export const testPKCS12EmptyPasswordKeystore: Keystore = {
+  keystore: testPKCS12KeystoreEmptyPasswordBase64,
+  keystorePassword: '',
+  keyAlias: 'test-alias',
 };
 
-export const testJester2AppCredentials = {
-  experienceName: testJester2ExperienceName,
-  keystore: testKeystore2,
-  pushCredentials: testPushCredentials,
+export const testAppFragment: AppFragment = {
+  id: 'test-app-id',
+  fullName: '@testuser/testapp',
+  slug: 'testapp',
 };
 
-export const testAllCredentials: { [key: string]: AndroidCredentials } = {
-  [testExperienceName]: testAppCredentials,
+export const testLegacyAndroidFcmFragment: AndroidFcmFragment = {
+  id: 'test-id',
+  snippet: {
+    firstFourCharacters: 'abcd',
+    lastFourCharacters: 'efgh',
+  },
+  credential: 'abcdxxxxxxefgh',
+  version: AndroidFcmVersion.Legacy,
+  createdAt: new Date(),
+  updatedAt: new Date(),
 };
 
-export function getApiClientWrapperMock() {
-  // by default all method throw exceptions to make sure that we only call what is expected
-  const getUnexpectedCallMock = () =>
-    jest.fn(() => {
-      throw new Error('unexpected call');
-    });
+export const testJksAndroidKeystoreFragment: AndroidKeystoreFragment = {
+  id: 'test-id',
+  type: AndroidKeystoreType.Jks,
+  keystore: testKeystoreBase64,
+  keystorePassword: testKeystore.keystorePassword,
+  keyAlias: testKeystore.keyAlias,
+  keyPassword: testKeystore.keyPassword,
+  md5CertificateFingerprint: 'test-md5',
+  sha1CertificateFingerprint: 'test-sha1',
+  sha256CertificateFingerprint: 'test-sha256',
+  createdAt: new Date(),
+  updatedAt: new Date(),
+};
+
+export const testLegacyAndroidBuildCredentialsFragment: AndroidAppBuildCredentialsFragment = {
+  id: 'test-id',
+  isDefault: true,
+  isLegacy: true,
+  name: 'legacy',
+  androidKeystore: testJksAndroidKeystoreFragment,
+};
+
+export const testLegacyAndroidAppCredentialsFragment: CommonAndroidAppCredentialsFragment = {
+  id: 'test-id',
+  applicationIdentifier: null,
+  isLegacy: true,
+  app: testAppFragment,
+  androidFcm: testLegacyAndroidFcmFragment,
+  androidAppBuildCredentialsList: [testLegacyAndroidBuildCredentialsFragment],
+};
+
+export const testAndroidBuildCredentialsFragment: AndroidAppBuildCredentialsFragment = {
+  id: 'test-id',
+  isDefault: true,
+  isLegacy: false,
+  name: 'Google App Store Build Credentials',
+  androidKeystore: testJksAndroidKeystoreFragment,
+};
+
+export const testAndroidAppCredentialsFragment: CommonAndroidAppCredentialsFragment = {
+  id: 'test-id',
+  applicationIdentifier: null,
+  isLegacy: false,
+  app: testAppFragment,
+  androidFcm: testLegacyAndroidFcmFragment,
+  androidAppBuildCredentialsList: [testLegacyAndroidBuildCredentialsFragment],
+};
+
+export function getNewAndroidApiMock() {
   return {
-    getAllCredentialsApi: getUnexpectedCallMock(),
-    getAllCredentialsForAppApi: getUnexpectedCallMock(),
-    updateKeystoreApi: getUnexpectedCallMock(),
-    updateFcmKeyApi: getUnexpectedCallMock(),
-    removeKeystoreApi: getUnexpectedCallMock(),
-    removeFcmKeyApi: getUnexpectedCallMock(),
-  };
-}
-
-export function getAndroidApiMock() {
-  return {
-    fetchAllAsync: jest.fn(() => testAllCredentials),
-    fetchKeystoreAsync: jest.fn(() => testKeystore),
-    updateKeystoreAsync: jest.fn(),
-    removeKeystoreAsync: jest.fn(),
-  };
-}
-
-export function getAndroidApiMockWithoutCredentials() {
-  return {
-    fetchAllAsync: jest.fn(() => []),
-    fetchKeystoreAsync: jest.fn(() => null),
-    updateKeystoreAsync: jest.fn(),
-    removeKeystoreAsync: jest.fn(),
+    getAndroidAppCredentialsWithCommonFieldsAsync: jest.fn(),
+    getAndroidAppBuildCredentialsListAsync: jest.fn(() => []),
+    getLegacyAndroidAppCredentialsWithCommonFieldsAsync: jest.fn(),
+    getLegacyAndroidAppBuildCredentialsAsync: jest.fn(),
+    createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync: jest.fn(),
+    updateAndroidAppCredentialsAsync: jest.fn(),
+    updateAndroidAppBuildCredentialsAsync: jest.fn(),
+    createAndroidAppBuildCredentialsAsync: jest.fn(),
+    getDefaultAndroidAppBuildCredentialsAsync: jest.fn(),
+    getAndroidAppBuildCredentialsByNameAsync: jest.fn(),
+    createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),
+    createKeystoreAsync: jest.fn(),
+    createFcmAsync: jest.fn(),
+    deleteKeystoreAsync: jest.fn(),
+    deleteFcmAsync: jest.fn(),
   };
 }

packages/eas-cli/src/credentials/__tests__/fixtures-appstore.ts

@@ -1,3 +1,11 @@
+import { AuthCtx } from '../ios/appstore/authenticate';
+
+export const testAuthCtx: AuthCtx = {
+  appleId: 'test-apple-id',
+  appleIdPassword: 'test-apple-password',
+  team: { id: 'test-team-id', name: 'test-team-name', inHouse: false },
+};
+
 export function getAppstoreMock() {
   return {
     ensureAuthenticatedAsync: jest.fn(),

packages/eas-cli/src/credentials/__tests__/fixtures-base64-data.ts

@@ -4,4 +4,15 @@ export const testKeystoreBase64 =
 export const testKeystore2Base64 =
   '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';
 
+export const testPKCS12KeystoreBase64 =
+  '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';
+
+export const testPKCS12KeystoreEmptyPasswordBase64 =
+  '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
Line truncated
+
 export const testProvisioningProfileBase64 = `MIIdDQYJKoZIhvcNAQcCoIIc/jCCHPoCAQExCzAJBgUrDgMCGgUAMIINoAYJKoZIhvcNAQcBoIINkQSCDY08P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJVVEYtOCI/Pgo8IURPQ1RZUEUgcGxpc3QgUFVCTElDICItLy9BcHBsZS8vRFREIFBMSVNUIDEuMC8vRU4iICJodHRwOi8vd3d3LmFwcGxlLmNvbS9EVERzL1Byb3BlcnR5TGlzdC0xLjAuZHRkIj4KPHBsaXN0IHZlcnNpb249IjEuMCI+CjxkaWN0PgoJPGtleT5BcHBJRE5hbWU8L2tleT4KCTxzdHJpbmc+dGVzdGFwcCA8L3N0cmluZz4KCTxrZXk+QXBwbGljYXRpb25JZGVudGlmaWVyUHJlZml4PC9rZXk+Cgk8YXJyYXk+Cgk8c3RyaW5nPlFMNzZYWUg3M1A8L3N0cmluZz4KCTwvYXJyYXk+Cgk8a2V5PkNyZWF0aW9uRGF0ZTwva2V5PgoJPGRhdGU+MjAyMC0wNy0xM1QxMjozNzowM1o8L2RhdGU+Cgk8a2V5PlBsYXRmb3JtPC9rZXk+Cgk8YXJyYXk+CgkJPHN0cmluZz5pT1M8L3N0cmluZz4KCTwvYXJyYXk+Cgk8a2V5PklzWGNvZGVNYW5hZ2VkPC9rZXk+Cgk8ZmFsc2UvPgoJPGtleT5EZXZlbG9wZXJDZXJ0aWZpY2F0ZXM8L2tleT4KCTxhcnJheT4KCQk8ZGF0YT5NSUlGb1RDQ0JJbWdBd0lCQWdJSU9UWW9sUmhEaTlrd0RRWUpLb1pJaHZjTkFRRUxCUUF3Z1pZeEN6QUpCZ05WQkFZVEFsVlRNUk13RVFZRFZRUUtEQXBCY0hCc1pTQkpibU11TVN3d0tnWURWUVFMRENOQmNIQnNaU0JYYjNKc1pIZHBaR1VnUkdWMlpXeHZjR1Z5SUZKbGJHRjBhVzl1Y3pGRU1FSUdBMVVFQXd3N1FYQndiR1VnVjI5eWJHUjNhV1JsSUVSbGRtVnNiM0JsY2lCU1pXeGhkR2x2Ym5NZ1EyVnlkR2xtYVdOaGRHbHZiaUJCZFhSb2IzSnBkSGt3SGhjTk1qQXdOekV6TVRJeU5qRTJXaGNOTWpFd056RXpNVEl5TmpFMldqQ0JsREVhTUJnR0NnbVNKb21UOGl4a0FRRU1DbEZNTnpaWVdVZzNNMUF4T2pBNEJnTlZCQU1NTVdsUWFHOXVaU0JFYVhOMGNtbGlkWFJwYjI0NklFRnNhV05xWVNCWFlYSmphR0hGZ2lBb1VVdzNObGhaU0RjelVDa3hFekFSQmdOVkJBc01DbEZNTnpaWVdVZzNNMUF4R0RBV0JnTlZCQW9NRDBGc2FXTnFZU0JYWVhKamFHSEZnakVMTUFrR0ExVUVCaE1DVlZNd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUNuTUNPT2VqWjEvUjBBTTJ3Sis0cjBDc2F3N0x3N2xFenBTREQ5OUd4TjA2ZkZ3cW1HRnBWdFhsRzhWYUN0cW1sZzl5MzJiMVltd1pJcXJRR3FteVY1cUk4RDJvTzh2QjVvRDJVT3IrUHgzOTQ0YnQyZFFZaUlHQTNlZi81SktZa1E3VDhXWXFQczg3Q1NORnZ5MHhJa1dHbFBpa0dhd0xXcmtzZmJUNFdkMU90dVhiYUtoTEZGNmp5alU0ZCtYN2NoNGtQOFFvdHlkWk5vWmltQTVTYWNtVmRidUM0YTlvQStPL3dscUliaXdiTUtGQlE2Q29tRTFKelpQaWtXMDFoZ1V2T2kvSEtKb0Nsdnp5SmZMLzhZbm43dDRSdUs5bmxHaHNIanJ5b3hFRDdiTGZpcUlKRTllcWlvNTBTK2cycFllWS9tNUh6SW04V1lOZ0RXcjFsTkFnTUJBQUdqZ2dIeE1JSUI3VEFNQmdOVkhSTUJBZjhFQWpBQU1COEdBMVVkSXdRWU1CYUFGSWduRndtcHRoaGdpK3pydXZaSFdjVlNWS08zTUQ4R0NDc0dBUVVGQndFQkJETXdNVEF2QmdnckJnRUZCUWN3QVlZamFIUjBjRG92TDI5amMzQXVZWEJ3YkdVdVkyOXRMMjlqYzNBd015MTNkMlJ5TVRFd2dnRWRCZ05WSFNBRWdnRVVNSUlCRURDQ0FRd0dDU3FHU0liM1kyUUZBVENCL2pDQnd3WUlLd1lCQlFVSEFnSXdnYllNZ2JOU1pXeHBZVzVqWlNCdmJpQjBhR2x6SUdObGNuUnBabWxqWVhSbElHSjVJR0Z1ZVNCd1lYSjBlU0JoYzNOMWJXVnpJR0ZqWTJWd2RHRnVZMlVnYjJZZ2RHaGxJSFJvWlc0Z1lYQndiR2xqWVdKc1pTQnpkR0Z1WkdGeVpDQjBaWEp0Y3lCaGJtUWdZMjl1WkdsMGFXOXVjeUJ2WmlCMWMyVXNJR05sY25ScFptbGpZWFJsSUhCdmJHbGplU0JoYm1RZ1kyVnlkR2xtYVdOaGRHbHZiaUJ3Y21GamRHbGpaU0J6ZEdGMFpXMWxiblJ6TGpBMkJnZ3JCZ0VGQlFjQ0FSWXFhSFIwY0RvdkwzZDNkeTVoY0hCc1pTNWpiMjB2WTJWeWRHbG1hV05oZEdWaGRYUm9iM0pwZEhrdk1CWUdBMVVkSlFFQi93UU1NQW9HQ0NzR0FRVUZCd01ETUIwR0ExVWREZ1FXQkJUTGhSdGRhRVRjRmx4Q0grZnRGQ3d4U3UvZmlUQU9CZ05WSFE4QkFmOEVCQU1DQjRBd0V3WUtLb1pJaHZkalpBWUJCQUVCL3dRQ0JRQXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSEJxL2VSeitIYTRtemZ0cHZ0SGQ4TTFNb2d0c01UaVNNVDFZK0VGbUQ5UWZYdXdCM3F1ckhQbHFiMjFvV01CWU9TaWcwRDlFZG9Ta29STXAwdU5kaUltVnMycVc0bEgvQ25zL0w1QkhqU2NQc3kwbXUrSitlQjZXZzNXTDduNm1pM3BlOCtxZ2dxak41RVU2YW1Ca04wMmU3Z0pMZnlkcHRSRlBOaklOWFh6bDkxOVNDeUo2VXl3OGFUblBrZFc5eTI1UHgrUHJBSmNDVm1hbFRlYkJvNWxnbUNKejlKUkU3Q3pQd2xmaVBRbUZRMlJVTEpONTBrMmRGSmtESk1jUHd1OFdvUmNBMFE3M21NU256OVNiS21UcHhzeUNEUUo2WHJ5Sm1vKy9aQmEvM0k0dE15dkNBUVQ1alNLWjFrUXJ4c2xFdGJHZE5Bb0xUaUJ6dHY3Wjk0PTwvZGF0YT4KCTwvYXJyYXk+CgoJCQkJCQkJCQkJCgk8a2V5PkVudGl0bGVtZW50czwva2V5PgoJPGRpY3Q+CgkJPGtleT5iZXRhLXJlcG9ydHMtYWN0aXZlPC9rZXk+CgkJPHRydWUvPgoJCQkJCgkJCQk8a2V5PmFwcGxpY2F0aW9uLWlkZW50aWZpZXI8L2tleT4KCQk8c3RyaW5nPlFMNzZYWUg3M1Aub3JnLnJlYWN0anMubmF0aXZlLmV4YW1wbGUudGVzdGFwcC50dXJ0bGV2Mjwvc3RyaW5nPgoJCQkJCgkJCQk8a2V5PmtleWNoYWluLWFjY2Vzcy1ncm91cHM8L2tleT4KCQk8YXJyYXk+CgkJCQk8c3RyaW5nPlFMNzZYWUg3M1AuKjwvc3RyaW5nPgoJCQkJPHN0cmluZz5jb20uYXBwbGUudG9rZW48L3N0cmluZz4KCQk8L2FycmF5PgoJCQkJCgkJCQk8a2V5PmdldC10YXNrLWFsbG93PC9rZXk+CgkJPGZhbHNlLz4KCQkJCQoJCQkJPGtleT5jb20uYXBwbGUuZGV2ZWxvcGVyLnRlYW0taWRlbnRpZmllcjwva2V5PgoJCTxzdHJpbmc+UUw3NlhZSDczUDwvc3RyaW5nPgoJCQkJCgkJCQk8a2V5PmFwcy1lbnZpcm9ubWVudDwva2V5PgoJCTxzdHJpbmc+cHJvZHVjdGlvbjwvc3RyaW5nPgoKCTwvZGljdD4KCTxrZXk+RXhwaXJhdGlvbkRhdGU8L2tleT4KCTxkYXRlPjIwMjEtMDctMTNUMTI6MjY6MTZaPC9kYXRlPgoJPGtleT5OYW1lPC9rZXk+Cgk8c3RyaW5nPm9yZy5yZWFjdGpzLm5hdGl2ZS5leGFtcGxlLnRlc3RhcHAudHVydGxldjIgcHJvZmlsPC9zdHJpbmc+Cgk8a2V5PlRlYW1JZGVudGlmaWVyPC9rZXk+Cgk8YXJyYXk+CgkJPHN0cmluZz5RTDc2WFlINzNQPC9zdHJpbmc+Cgk8L2FycmF5PgoJPGtleT5UZWFtTmFtZTwva2V5PgoJPHN0cmluZz5BbGljamEgV2FyY2hhxYI8L3N0cmluZz4KCTxrZXk+VGltZVRvTGl2ZTwva2V5PgoJPGludGVnZXI+MzY0PC9pbnRlZ2VyPgoJPGtleT5VVUlEPC9rZXk+Cgk8c3RyaW5nPjQ1NjBiNTU1LWFhODMtNDRiNy1iYjMxLTAwMGIwMDZjNDM2ZDwvc3RyaW5nPgoJPGtleT5WZXJzaW9uPC9rZXk+Cgk8aW50ZWdlcj4xPC9pbnRlZ2VyPgo8L2RpY3Q+CjwvcGxpc3Q+oIIMsjCCA/MwggLboAMCAQICARcwDQYJKoZIhvcNAQEFBQAwYjELMAkGA1UEBhMCVVMxEzARBgNVBAoTCkFwcGxlIEluYy4xJjAkBgNVBAsTHUFwcGxlIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRYwFAYDVQQDEw1BcHBsZSBSb290IENBMB4XDTA3MDQxMjE3NDMyOFoXDTIyMDQxMjE3NDMyOFoweTELMAkGA1UEBhMCVVMxE
Line truncated
+
+// Generated using instructions from https://support.magplus.com/hc/en-us/articles/203808748-iOS-Creating-a-Distribution-Certificate-and-p12-File
+// When exporting from kechain password was left blank
+export const testDistributionCertificateEmptyPasswordBase64 =
+  'MIIMlwIBAzCCDF4GCSqGSIb3DQEHAaCCDE8EggxLMIIMRzCCBs8GCSqGSIb3DQEHBqCCBsAwgga8AgEAMIIGtQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIbxms3H70KbsCAggAgIIGiCAdgBcty+2paB8pfNSvARDGIMeFZq8dwUcEFCeTZgk9+u/Tt7t9S7u6sJgrxLmtBbugkAGHPpjaf9x7C39UOwSjNj9SbI3xZ2A0kzCAseVcg6ezqJaVfI262SFbJGonZC+qBPDSlQksCBpkYr9mA57F9Y5c9b3jLH8hmdvQgXKp1lADJyBGUjXSJewgFrszbglFtrPdfC2kjo84gjcGp2aeD97mIiC+VlIkRWjbbymR5D3eUf7iH4vcj7dzLX+KuXay6oP/Aw96jvqhHWM5UlUqywrnwVl8dRTxU30rl6IwbbzPbURMDbPdFZHkNk6Zdq4+qZemMqNINfnZ+8Fn3G1Q2lZBqmlwca8DsM6KiQe+kWNUuEHFBUAWtIEd2TBC7O5uEa0II2JxYTXqWs5IaoV6H4qrFmWrW/FeJMKoCJpRvyrK0ohvJKsweSTG1o0//t72SZcCZBBBrpq1zewMFDYmdrgPYDcCDTmn5m74n3bVbMGlKqe8e7juG+8EFz7wSulL9G9o27+d/zira3LW5k4CjFW5b4IOT6RREBA3CiURZRgPJ5TQn7p0a3yQv6XLKHtH9/s2lhcBKhgkADZq9vjptxfurYJ/TyXo2MmjTazM6GFz699PXhYd5vSMsUr5w2+ltLjh7N/ulV6U03D0tgvXy0/41HzwrIHsw59PQTxjiR9b8H3GeZw9LuvRw4hQC45vnn1Zhjld+czRk3idBpzAQz3C5C6HKvTgY0ATOF/VcBsY7iRooz0CYtpy5+EGB0Vecp7p4U0JycmoxJpDlwuy/6wnyOcMLCsRNAXY+zE+UTdq6G3AkAJEl//2hCAKh8PdqIFcyacBRKF+kqEGoLAeiyJD3aGVdiYXHU3J9ijtJxp0ynF/GuUKrvRhsVFNll1AhUlXgNE8eJMUo+ra60C0zpMGUCr/DW/5gzq3+2mmiXxPuL+pcUXH28Tih1k+LIJxcxEFyQk6wBxKjSV3M3VMnueXzO9QXPrZ4Tzo5j+SyqDXCMJRz2USfp6nnBZSPqPnmgSRG5oaXZ1WqAF+mPYFJQr0kJ1/llCeohVEa18/NaejXEvO5SabroPjq8KAAX+IlLZoxm9zf2P6cOOueGyUTocrO5moGsfv/jA7yI+fHlPYSABsNZcdOIs3A5TZMwK1OWokdab7seRpMHdV+t2CuVF0vCnTwRK6KTW2ws/73OxiZ+AXVQGb9Z5XsIhV5vuoXrHWBVLO/WkKbOSMz3URlfghe7xYw/6/xCy8eoqFot/pRj5k+ue9HHLfRhvlgk+zRNBS7RxIYa/i4/7VqTaP5GBfKecjUXrzp2Q0BzJhstHOYbB2ga//DOzUXWql61aW++0YyXNILNPrV+il0NSXUG8IinYx6nVIOwN7rWcZawxtULz8mGaKmKkOes0mSCCFZdXGXH0YcpzqjoCpJRTi9Wohi4crrKuOyaojavudQp5Khuik21Z+xKsM/SaQbXb+Hg7kcOnhKQmRURFt6/zsZXGMRTGoqICpsQkkIW6op0qkb0mJ5wjlk0XHzlywV4rtMH5apg7l5H0IXZRL/j2uvD8gJbQvN2M9aO/QlSsqFtSlB1A8KiGM4uw5bnWMNho+qFQsD3gn1WK6nQRhvw2UubfMOpOIhptYic6ZlfjDJIkVih9+paavWoALl4/yfhgI4rrQMoLdgu+lw/iOkRx7Zs/mibx6CudZvwBxYkarUD/4nZpmLfuEOlNETOSom3xwuvVJrT2nZSd6I+40Um7pzPYXtsgkgY1VGyVlUfD/a4U56RhJQK51X5TebQNnA9ylwN9husrQg4wtUyxcJPYfozbaDtc818V6aXdBgMOI664piSikpeGqI+2W3KaaNuJIO0YcvgNwfFMBr99ZDadmETDt3tKLrQZPqGhqislJtFG15C/LPWNtQgLu6is052OjbISXF6wksAIOwCttWaYk+tetF9H+4ZAx4YoLcocfX8vKeZc69KqmhOZi1prnstwgyBWQcdzb5HN7DLd1lhmqOHXRnFqT7lnsyM6Wok6m1Rq0D9AxuPXJzvcfNN3jpVUahCMOonaBmBUYLyNpcIm3fM93kb5Z5pnYhNnnigVuUf4gH4AgfVkFkgpOW+I5WbsukWHbS1tkNkOXo/A/8dW1ovLkv0FS+uf5h4OX6pmduellaCqX0NlEeP3M0fsG5NN5VrsKgKsasUuZsZ8shUhEkOINIl5ibPlsZiYHmQYK9Zkgm3d2cHUwggVwBgkqhkiG9w0BBwGgggVhBIIFXTCCBVkwggVVBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQI1SsyhsysJ20CAggABIIEyI3hCegwo0DAV4GUbBs62Z0V4C2KmeFYG9DkAYnFvNRSAEnE8vfWz/iFCLGtpFo17otMspKMvX1V5AOfUlKcpsl2kDgxoqNs0ILoXLTq+RWO8gZ5CKXZxLpsoCa5g/Adleoliq315s4HrdHeXUPp5rRR0yEcI0gFoB3r6D/fETGJ4rW4J9dvWjYzIRySMjRok4dMRN4c2Olospfn9Ig8+E4M6anpuy5Q3oMhjMv2rf93siqqzKv+AdIeBKtTn++LuOj/imetCVM7B+wp+jc22W33gwxhsY5rPcm3yUXm5fFOdevEk2bXISwbKUZIgr/J7AmFexzjzDlsPWj5qA2sV62NX+wp0bRvxBQGv2he5h1sAdhEHG8PgyYftDUEdkjhipQ1V02h2dnd//kuRfQQvQXfkmEFwiSLpjmwNGe7+UPsUCp/23s2rgd5IlmJJhBZ1jEEQetntK6GE0FQceERtindwqmfvdxDPgx/A4Veir+nE/bVnXHuY9HT+MCVOoOtHd6mq59VjbEMDxpeYquhYfIVtjasNYmHogB0Vh8w4A8sqUUEWYU7XwOkdk3DVDPcH1zOdIUAZDqJtgxGHKIhAY7eUjrs2fRsJa5YjfKxw26E4OBQXcMBXIiXw1/fGyeksk0vQLw6gtM9W2PboaD9UOMySlAX8NgCCjekI67EBrmT7sienBo07YqTUnNyGn+cfwW+xWcCsLIQAtzkvj6D/Qp3X8Iix/tM76JEgj5XlqkfzrFgp6/DQnsovwI0rT4WNfdXORQ7OvDaP9pxpgjtMPtnU9FVKNFrUFnS5Gox24+ezRD0GMCDcHT0qjDaZt2qZ2Uhw+jorDCShK/BK0at7jjvpJNqBgdaHvuSzNEyW4GOWid/xwTswjMIjbC3Va77WXj0ECe5oiySoQOrO7yfp+l9a6WRkiWWINsGrjgKeTuP8JYGCKxKI6wn/EdjOEdoEMDQo7fSWvTfaSEeWvQhw1vHnc/gRk6e0EYHSAjEOnDGujAlfOoYJFS8ZblyQzWtxs0l4BXUUH8NuyzM484znBKxA35FVOeWEpDwpNlZTXFd90DSEk0nppmzO0yjzoQo2P48D3s7ohNXt9hpLAjLMm2Nus+eOw1Jw4eoCgdBQ1TkBdH5BCPywuhLYXGECe8rrOYmsBYxhSxE5cUxQjqHBD4ke0jND5ZeOQEu+gqK/wrNBI1Y2jCPXN+gOuURXqUznRPt7VRRNhDZzfdp/yvSU1iGHf0crtW3MuFsQSpg5Vh0Bp9DAUoFI+uzOinsgRWv/tmTW0MO5MRS+QluAFNXNmGPfP8FRcYYuud4W1JdcB1qaLzCrapHxYhPQ91HU51cAmd0xrQ+sm8I/mwL4FqGGzDkNaV85JSQ6hmSU6nOJiPAdMhfptmkzU3lImfN/KWyY5BOCPEnWYwGVCpUVguqA2tBRp36fE8LGw4UoSmGHGTO4/yqNZ3gadodyj2YPidRWUQyHBpMf3GGrBNkw9fNgrhEZOJly8FPIHShWg+8vJq4zzg44dbxldun7sGYGtWFLP0hB9sjQMf6Xb4QM77PIYqnzKWb37qu7MeLKisqnhQXgOdltfCVEsD8cLmsiBSIhbbTrVOZ1eXdp7GSQj0TG74hEIRLtWpcuzFUMC0GCSqGSIb3DQEJFDEgHh4AVwBvAGoAYwBpAGUAYwBoACAASwBvAHoAeQByAGEwIwYJKoZIhvcNAQkVMRYEFOZtLT3J9PWFMsJpTiXQeVHfjaZrMDAwITAJBgUrDgMCGgUABBRoxaaqcbwULmfILJR1w2Sikq8pUwQIE6Ey2sQzzokCAQE=';

packages/eas-cli/src/credentials/__tests__/fixtures-constants.ts

@@ -5,6 +5,7 @@ export const jester: Actor = {
   id: 'jester-id',
   username: 'jester',
   accounts: [{ id: 'jester-account-id', name: 'jester' }],
+  isExpoAdmin: false,
 };
 
 export const jester2: Actor = {
@@ -12,6 +13,7 @@ export const jester2: Actor = {
   id: 'jester2-id',
   username: 'jester2',
   accounts: [{ id: 'jester2-account-id', name: 'jester2' }],
+  isExpoAdmin: false,
 };
 
 export const testUsername = jester.username;
@@ -32,6 +34,7 @@ export const testAppJson = {
   slug: testSlug,
   sdkVersion: '38.0.0',
   ios: { bundleIdentifier: testBundleIdentifier },
+  android: { package: testPackageName },
 };
 
 export const testAppJsonWithDifferentOwner = {

packages/eas-cli/src/credentials/__tests__/fixtures-context.ts

@@ -1,19 +1,17 @@
 import merge from 'lodash/merge';
 
-import { CredentialsManager } from '../CredentialsManager';
 import { Context } from '../context';
-import { getAndroidApiMockWithoutCredentials } from './fixtures-android';
+import { getNewAndroidApiMock } from './fixtures-android';
 import { getAppstoreMock } from './fixtures-appstore';
 import { testAppJson, testUsername } from './fixtures-constants';
-import { getIosApiMockWithoutCredentials } from './fixtures-ios';
-import { getNewIosApiMockWithoutCredentials } from './fixtures-new-ios';
+import { getNewIosApiMock } from './fixtures-ios';
 
 export function createCtxMock(mockOverride: Record<string, any> = {}): Context {
   const defaultMock = {
-    ios: getIosApiMockWithoutCredentials(),
-    newIos: getNewIosApiMockWithoutCredentials(),
-    android: getAndroidApiMockWithoutCredentials(),
+    ios: getNewIosApiMock(),
+    android: getNewAndroidApiMock(),
     appStore: getAppstoreMock(),
+    bestEffortAppStoreAuthenticateAsync: jest.fn(),
     ensureAppleCtx: jest.fn(),
     ensureProjectContext: jest.fn(),
     user: {
@@ -28,14 +26,3 @@ export function createCtxMock(mockOverride: Record<string, any> = {}): Context {
   };
   return merge(defaultMock, mockOverride) as any;
 }
-
-export function createManagerMock(mockOverride: Record<string, any> = {}): CredentialsManager {
-  return merge(
-    {
-      runActionAsync: jest.fn(() => {
-        throw new Error('unexpected call'); // should be implemented in test directly
-      }),
-    },
-    mockOverride
-  );
-}