convert to ESM

.eslintrc.js

@@ -11,6 +11,7 @@ module.exports = {
         ignoreDeclarationSort: true,
       },
     ],
+    'flowtype/no-types-missing-file-annotation': 'off',
     curly: 'warn',
     'import/no-cycle': 'error',
     'import/no-extraneous-dependencies': [
@@ -26,6 +27,10 @@ module.exports = {
             name: 'lodash',
             message: "Don't use lodash, it's heavy!",
           },
+          {
+            name: 'node-fetch',
+            message: 'Use got instead, node-fetch is used only for the GraphQL client.',
+          },
         ],
       },
     ],

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -14,11 +14,6 @@ body:
   - type: markdown
     attributes:
       value: If you leave out sections there is a high likelihood your issue will be closed. If you have a question, not a bug report, please post it on our [forums](https://forums.expo.dev/) instead.
-  - type: input
-    attributes:
-      label: Build/Submit details page URL
-      description: If you're reporting an issue with EAS Build and/or EAS Submit, please provide the URL to the details page URL. The page can be only viewed by the Expo team members. Providing the URL is optional but it makes debugging the issue easier.
-      placeholder: https://expo.dev/accounts/ACCOUNT_NAME/projects/PROJECT_NAME/builds/BUILD_ID
   - type: textarea
     validations:
       required: true
@@ -26,18 +21,12 @@ body:
       label: Summary
       description: Describe the issue in 1 or 2 sentences
       placeholder: Clearly describe what the expected behavior is vs. what is actually happening. This should be as short as possible, while still communicating all the necessary information. If your summary is just 'X library/method isn't working', then you need to continue debugging yourself and provide more information.
-  - type: input
-    validations:
-      required: true
-    attributes:
-      label: Managed or bare?
-      description: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project. See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
   - type: textarea
     validations:
       required: true
     attributes:
       label: Environment
-      description: Run `npx expo-env-info` and paste the output here.
+      placeholder: Run `eas diagnostics` and paste the output here
   - type: textarea
     validations:
       required: false

.github/PULL_REQUEST_TEMPLATE

@@ -3,6 +3,7 @@
 # Checklist
 
 - [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary. You can comment this pull request with `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]` and CHANGELOG.md will be updated automatically.
+- [ ] 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
 

.github/workflows/changelog.yml

@@ -10,7 +10,7 @@ jobs:
     if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: '16'
       - name: Checkout Pull Request
@@ -28,8 +28,8 @@ jobs:
             echo "Invalid /changelog-entry command"
             exit 1
           fi
-          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
-          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | xargs )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | xargs )
           yarn changelog-entry "$CATEGORY" "$MESSAGE"
         env:
           GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}

.github/workflows/install.yml

@@ -15,6 +15,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: bash bin/install.sh
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - run: eas --version

.github/workflows/release.yml

@@ -25,30 +25,22 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
-      - id: x64
-        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
-      - id: arm
-        run: echo "::set-output name=filename::$(ls eas-*-arm.tar.gz)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+        run: yarn oclif-dev pack --targets linux-x64,linux-arm
       - name: Upload linux-x64 tarball
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
-          asset_name: ${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-linux-x64.tar.gz
+          asset_name: eas-linux-x64.tar.gz
           asset_content_type: application/gzip
       - name: Upload linux-arm tarball
         uses: actions/upload-release-asset@v1
@@ -56,8 +48,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.arm.outputs.filename }}
-          asset_name: ${{ steps.arm.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-linux-arm.tar.gz
+          asset_name: eas-linux-arm.tar.gz
           asset_content_type: application/gzip
   build-mac:
     name: Build for macOS
@@ -66,27 +58,22 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets darwin-x64
-      - id: x64
-        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+        run: yarn oclif-dev pack --targets darwin-x64
       - name: Upload darwin-x64 tarball
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
-          asset_name: ${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-darwin-x64.tar.gz
+          asset_name: eas-darwin-x64.tar.gz
           asset_content_type: application/gzip
   build-windows:
     name: Build for Windows
@@ -94,29 +81,27 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
-      - run: |
-          yarn pretarball-ci
-          yarn oclif pack:win
+      - run: yarn oclif-dev pack:win
         working-directory: ${{ github.workspace }}/packages/eas-cli
       - id: x64
         run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
       - id: x86
         run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
       - name: Upload x64 installer
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win32/${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win/${{ steps.x64.outputs.filename }}
           asset_name: ${{ steps.x64.outputs.filename }}
           asset_content_type: application/gzip
       - name: Upload x86 installer
@@ -125,7 +110,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win32/${{ steps.x86.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
           asset_name: ${{ steps.x86.outputs.filename }}
           asset_content_type: application/gzip
   publish-to-npm:
@@ -134,7 +119,7 @@ jobs:
     needs: [build-linux, build-mac, build-windows]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
@@ -153,7 +138,7 @@ jobs:
     needs: publish-to-npm
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           node-version: '16'
       - name: Install dependencies

.github/workflows/size.yml

@@ -7,14 +7,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: 16
+          node-version: '16'
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           pattern: './packages/eas-cli/dist/*.tar.gz'
           compression: 'none'
-          strip-hash: "v\\d+.\\d+.\\d+-\\w+-"
-          clean-script: 'clean'

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files

.gitignore

@@ -1,19 +1,14 @@
-# Build directories
-packages/*/build
-packages/eas-cli/dist
-packages/eas-cli/tmp
-
-# Code editors
-.idea
-.history
-
-# macOS
-.DS_Store
-
-# Node
-node_modules
 *-debug.log
 *-error.log
 
-# Tests
+**/build/**
+!packages/eas-cli/src/commands/build/**
+!packages/eas-cli/src/build/**
+
+dist
+/package-lock.json
+tmp
+node_modules
 coverage
+.history
+.DS_Store

.prettierrc

@@ -2,7 +2,7 @@
   "printWidth": 100,
   "tabWidth": 2,
   "singleQuote": true,
-  "bracketSameLine": true,
+  "jsxBracketSameLine": true,
   "trailingComma": "es5",
   "arrowParens": "avoid"
 }

CHANGELOG.md

@@ -8,384 +8,21 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Add code signing. ([#964](https://github.com/expo/eas-cli/pull/964) by [@wschurman](https://github.com/wschurman))
-- Install expo-updates when running update:configure. ([#977](https://github.com/expo/eas-cli/pull/977) by [@jkhales](https://github.com/jkhales))
-- Make `update:configure` work on native files. ([#978](https://github.com/expo/eas-cli/pull/978) by [@jkhales](https://github.com/jkhales))
-
-### 🐛 Bug fixes
-
-- Fix `"Unknown status"` error when a build is canceled. ([#1012](https://github.com/expo/eas-cli/pull/1012) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
-- Add error message when package.json is outside git repository. ([#971](https://github.com/expo/eas-cli/pull/971) by [@wkozyra95](https://github.com/wkozyra95))
-- Make runtime version policy warning on the update command more descriptive. ([#979](https://github.com/expo/eas-cli/pull/979) by [@kbrandwijk](https://github.com/kbrandwijk))
-- Remove unused flag. ([#995](https://github.com/expo/eas-cli/pull/995) by [@wkozyra95](https://github.com/wkozyra95))
-- Replace `got` with `node-fetch`. ([#1000](https://github.com/expo/eas-cli/pull/1000) by [@wkozyra95](https://github.com/wkozyra95))
-- Upgrade dependencies. ([#1015](https://github.com/expo/eas-cli/pull/1015) by [@dsokal](https://github.com/dsokal))
-
-## [0.47.0](https://github.com/expo/eas-cli/releases/tag/v0.47.0) - 2022-02-08
-
-### 🐛 Bug fixes
-
-- Return informative error when running `eas channel:rollout` with a channel that does not exist. ([#930](https://github.com/expo/eas-cli/pull/930) by [@jkhales](https://github.com/jkhales))
-- Check if `expo-updates` is installed before publish. ([#953](https://github.com/expo/eas-cli/pull/953) by [@jkhales](https://github.com/jkhales))
-
-### 🧹 Chores
-
-- Upgrade dependencies. ([#946](https://github.com/expo/eas-cli/pull/946) by [@dsokal](https://github.com/dsokal))
-
-## [0.46.0](https://github.com/expo/eas-cli/releases/tag/v0.46.0) - 2022-01-26
-
-### 🛠 Breaking changes
-
-- Drop support for building iOS builds on macOS Catalina. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Fix URL placeholder for iOS submits. ([#941](https://github.com/expo/eas-cli/pull/941) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
-- Unify EAS command descriptions style. ([#925](https://github.com/expo/eas-cli/pull/925) by [@dsokal](https://github.com/dsokal))
-- Upgrade dependencies. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
-
-## [0.45.1](https://github.com/expo/eas-cli/releases/tag/v0.45.1) - 2022-01-19
-
-### 🎉 New features
-
-- Add json output for started builds when using `--no-wait`. ([#921](https://github.com/expo/eas-cli/pull/921) by [@kbrandwijk](https://github.com/kbrandwijk))
-- Add support to `eas build` for specifying a custom `prebuildCommand` in `eas.json`. ([#919](https://github.com/expo/eas-cli/pull/919) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-### 🧹 Chores
-
-- Add macOS Monterey image. ([#922](https://github.com/expo/eas-cli/pull/922) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.45.0](https://github.com/expo/eas-cli/releases/tag/v0.45.0) - 2022-01-18
-
-### 🎉 New features
-
-- Add `eas device:delete`. ([#890](https://github.com/expo/eas-cli/pull/890) by [@kbrandwijk](https://github.com/kbrandwijk))
-
-### 🧹 Chores
-
-- Upgrade dependencies. ([#872](https://github.com/expo/eas-cli/pull/872) by [@dsokal](https://github.com/dsokal))
-
-## [0.44.1](https://github.com/expo/eas-cli/releases/tag/v0.44.1) - 2022-01-11
-
-### 🐛 Bug fixes
-
-- Fix build:configure expo-updates configuration to only run on generic projects. ([#904](https://github.com/expo/eas-cli/pull/904) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
-- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot) + [@dsokal](https://github.com/dsokal))
-- Replace `@expo/plugin-autocomplete` with `@oclif/plugin-autocomplete`. Upgrade oclif deps. ([#903](https://github.com/expo/eas-cli/pull/903) by [@dsokal](https://github.com/dsokal))
-
-## [0.44.0](https://github.com/expo/eas-cli/releases/tag/v0.44.0) - 2022-01-11
-
-### 🛠 Breaking changes
-
-- No longer enable APNS (iOS Push Notifications) capability by default anymore. ([#797](https://github.com/expo/eas-cli/pull/797) by [@EvanBacon](https://github.com/EvanBacon))
-- Don't configure Android projects locally. Clean up old Gradle signing config. Streamline `expo-updates` configuration. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
-
-### 🎉 New features
-
-- Add `update:list` command. ([#884](https://github.com/expo/eas-cli/pull/884) by [@jkhales](https://github.com/jkhales))
-- Improve error message for outdated Apple PLA error. ([#889](https://github.com/expo/eas-cli/pull/889) by [@EvanBacon](https://github.com/EvanBacon))
-- Add `--output` flag to the build command. ([#885](https://github.com/expo/eas-cli/pull/885) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
-- Fix creating project archive with symlink cycle. ([#891](https://github.com/expo/eas-cli/pull/891) by [@wkozyra95](https://github.com/wkozyra95))
-- Sign Android debug builds with the correct keystore. Previously, all debug builds would be signed with a default debug keystore. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
-
-## [0.43.0](https://github.com/expo/eas-cli/releases/tag/v0.43.0) - 2022-01-03
-
-### 🎉 New features
-
-- Add `eas channel:delete`. ([#846](https://github.com/expo/eas-cli/pull/846), [#869](https://github.com/expo/eas-cli/pull/869) by [@jkhales](https://github.com/jkhales))
-- Add `eas autocomplete`. ([#870](https://github.com/expo/eas-cli/pull/870) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Fix saving `build:inspect` results to project subdirectory. ([#863](https://github.com/expo/eas-cli/pull/863) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.42.4](https://github.com/expo/eas-cli/releases/tag/v0.42.4) - 2021-12-21
-
-### 🐛 Bug fixes
-
-- Add missing dependency - `@oclif/plugin-help`. ([#865](https://github.com/expo/eas-cli/pull/865) by [@dsokal](https://github.com/dsokal))
-
-## [0.42.3](https://github.com/expo/eas-cli/releases/tag/v0.42.3) - 2021-12-21
-
-### 🐛 Bug fixes
-
-- Allow select eas commands to be run outside of a project. ([#851](https://github.com/expo/eas-cli/pull/851) by [@jkhales](https://github.com/jkhales))
-
-### 🧹 Chores
-
-- Replace all oclif dependencies with `@oclif/core`. ([#858](https://github.com/expo/eas-cli/pull/858) by [@dsokal](https://github.com/dsokal))
-
-## [0.41.1](https://github.com/expo/eas-cli/releases/tag/v0.41.1) - 2021-12-16
-
-### 🎉 New features
-
-- Adds commands for EAS Update, which is now in preview for subscribers. EAS Update makes fixing small bugs and pushing quick fixes a snap in between app store submissions. It accomplishes this by allowing an end-user's app to swap out the non-native parts of their app (for example, JS, styling, and image changes) with a new update that contains bug fixes and other updates.
-  - Adds `eas update`, which can bundle and publish updates on a branch.
-  - Adds `eas branch`, which manages branches. Branches contain a list of updates and are linked to channels.
-  - Adds `eas channel`, which manages channels. Channels are specified inside builds and are linked to branches, allowing us to link specific updates with specific builds.
-  - Read more in our [feature preview docs](https://docs.expo.dev/eas-update/introduction/).
-
-### 🐛 Bug fixes
-
-- Fix `eas submit` displaying a prompt in non-interactive mode when some ASC API credentials are missing in `eas.json`. ([#841](https://github.com/expo/eas-cli/pull/841) by [@barthap](https://github.com/barthap))
-
-## [0.41.0](https://github.com/expo/eas-cli/releases/tag/v0.41.0) - 2021-12-13
-
-### 🎉 New features
-
-- Ask user to select profile if `release` does not exist. ([#829](https://github.com/expo/eas-cli/pull/829) by [@dsokal](https://github.com/dsokal))
-- Add `build:inspect` command. ([#834](https://github.com/expo/eas-cli/pull/834) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
-- Fix validating tool versions in eas.json. ([#832](https://github.com/expo/eas-cli/pull/832) by [@dsokal](https://github.com/dsokal))
-- Fix submission URL. ([#845](https://github.com/expo/eas-cli/pull/845) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
-- Warn when building managed project with SDK < 41. ([#833](https://github.com/expo/eas-cli/pull/833) by [@dsokal](https://github.com/dsokal))
-
-## [0.40.0](https://github.com/expo/eas-cli/releases/tag/v0.40.0) - 2021-12-08
-
-### 🛠 Breaking changes
-
-- [eas-cli] change eas update:publish to eas update. ([#830](https://github.com/expo/eas-cli/pull/830) by [@jkhales](https://github.com/jkhales))
-
-### 🐛 Bug fixes
-
-- Pass build profile environment to credentials command. ([#828](https://github.com/expo/eas-cli/pull/828) by [@quinlanj](https://github.com/quinlanj))
-
-## [0.39.0](https://github.com/expo/eas-cli/releases/tag/v0.39.0) - 2021-12-06
-
-### 🎉 New features
-
-- Set runtime version in `eas update:configure`. ([#811](https://github.com/expo/eas-cli/pull/811) by [@jkhales](https://github.com/jkhales))
-- Print project workflow in `eas diagnostics`. ([#822](https://github.com/expo/eas-cli/pull/822) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
-- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
-- Improve error message for missing ascAppId. ([#813](https://github.com/expo/eas-cli/pull/813) by [@wkozyra95](https://github.com/wkozyra95))
-- Add `react-native` version to metadata. ([#823](https://github.com/expo/eas-cli/pull/823) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.38.3](https://github.com/expo/eas-cli/releases/tag/v0.38.3) - 2021-11-29
-
-### 🐛 Bug fixes
-
-- Print warning about outdated version to stderr. ([#805](https://github.com/expo/eas-cli/pull/805) by [@wkozyra95](https://github.com/wkozyra95))
-- Fix Apple sign in capabilities. ([#806](https://github.com/expo/eas-cli/pull/806) by [@brentvatne](https://github.com/brentvatne))
-
-## [0.38.2](https://github.com/expo/eas-cli/releases/tag/v0.38.2) - 2021-11-26
-
-### 🎉 New features
-
-- Add support for extending submit profiles. ([#794](https://github.com/expo/eas-cli/pull/794) by [@dsokal](https://github.com/dsokal))
-- Add command: `eas update:configure`. ([#800](https://github.com/expo/eas-cli/pull/800) by [@jkhales](https://github.com/jkhales))
-
-### 🐛 Bug fixes
-
-- Fix reading app version and app build version of iOS projects. ([#798](https://github.com/expo/eas-cli/pull/798) by [@dsokal](https://github.com/dsokal))
-- Fix push notifications entitlements. ([#801](https://github.com/expo/eas-cli/pull/801) by [@brentvatne](https://github.com/brentvatne))
-
-## [0.38.1](https://github.com/expo/eas-cli/releases/tag/v0.38.1) - 2021-11-25
-
-### 🐛 Bug fixes
-
-- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
-
-## [0.38.0](https://github.com/expo/eas-cli/releases/tag/v0.38.0) - 2021-11-24
-
-### 🎉 New features
-
-- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
-- Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Compute runtime version policies. ([#783](https://github.com/expo/eas-cli/pull/783), [#785](https://github.com/expo/eas-cli/pull/785) by [@jkhales](https://github.com/jkhales))
-- Fix local builds with npm < 7. ([#787](https://github.com/expo/eas-cli/pull/787) by [@dsokal](https://github.com/dsokal))
-- Override `applicationId`/`bundleIdentifier` when auto-submitting after build. ([#780](https://github.com/expo/eas-cli/pull/780) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
-- Upgrade `typescript` to 4.5.2. Upgrade oclif dependencies. ([#781](https://github.com/expo/eas-cli/pull/781) by [@dsokal](https://github.com/dsokal))
-- Make missing `git` command error message more descriptive. ([#784](https://github.com/expo/eas-cli/pull/784) by [@dsokal](https://github.com/dsokal))
-
-## [0.37.0](https://github.com/expo/eas-cli/releases/tag/v0.37.0) - 2021-11-18
-
-### 🛠 Breaking changes
-
-- Require explicitly defined applicationId/bundleIdentifier for EAS Submit in case of bare projects consisting of multiple product flavors on Android or multiple schemes/targets on iOS. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🎉 New features
-
-- Auto create channel on publish. ([#766](https://github.com/expo/eas-cli/pull/766) by [@jkhales](https://github.com/jkhales))
-- Interactively configure Git `user.name` and `user.email`. ([#772](https://github.com/expo/eas-cli/pull/772) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Validate release channel in eas.json. ([#764](https://github.com/expo/eas-cli/pull/764) by [@dsokal](https://github.com/dsokal))
-- Make the missing profile error message more descriptive. ([#761](https://github.com/expo/eas-cli/pull/761) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
-- Better error message when missing eas.json. ([#770](https://github.com/expo/eas-cli/pull/770) by [@quinlanj](https://github.com/quinlanj))
-
-## [0.36.1](https://github.com/expo/eas-cli/releases/tag/v0.36.1) - 2021-11-15
-
-### 🐛 Bug fixes
-
-- Fix `dateformat` import issue when building with `--local` flag. ([a520d](https://github.com/expo/eas-cli/commit/a520d1750736d61d6489da6487879f35ed3deb23) by [@dsokal](https://github.com/dsokal))
-
-## [0.36.0](https://github.com/expo/eas-cli/releases/tag/v0.36.0) - 2021-11-15
-
-### 🛠 Breaking changes
-
-- Do not require manual `eas-cli-local-build-plugin` installation. An existing global installation (either with `yarn global add` or `npm install -g`) will not be used anymore. ([#753](https://github.com/expo/eas-cli/pull/753) by [@dsokal](https://github.com/dsokal))
-
-### 🎉 New features
-
-- Use Keystore Service when `keytool` is not installed. ([#754](https://github.com/expo/eas-cli/pull/754) by [@dsokal](https://github.com/dsokal))
-- Add applicationId/bundleIdentifier fields to the submit profile. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
-- Fix auto-submitting with `--auto-submit-with-profile`. ([#748](https://github.com/expo/eas-cli/pull/748) by [@dsokal](https://github.com/dsokal))
-- Pass env from build profile when resolving entitlements. ([#751](https://github.com/expo/eas-cli/pull/751) by [@wkozyra95](https://github.com/wkozyra95))
-- Only prompt for Apple Id username if authenticating with an App Specific Password. ([#745](https://github.com/expo/eas-cli/pull/745) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Use same URL paths for local development of EAS CLI as production. ([#750](https://github.com/expo/eas-cli/pull/750) by [@ide](https://github.com/ide))
-- Grammar: Api -> API. ([#755](https://github.com/expo/eas-cli/pull/755) by [@quinlanj](https://github.com/quinlanj))
-- Add analytics for EAS Submit. ([#752](https://github.com/expo/eas-cli/pull/752) by [@quinlanj](https://github.com/quinlanj))
-- Add an 'attempt' event to build and submit analytics. ([#757](https://github.com/expo/eas-cli/pull/757) by [@quinlanj](https://github.com/quinlanj))
-
-## [0.35.0](https://github.com/expo/eas-cli/releases/tag/v0.35.0) - 2021-11-08
-
-### 🎉 New features
-
-- Add ASC API Key generation workflow. ([#718](https://github.com/expo/eas-cli/pull/718) by [@quinlanj](https://github.com/quinlanj))
-- Add support for removal of ASC API Keys. ([#721](https://github.com/expo/eas-cli/pull/721) by [@quinlanj](https://github.com/quinlanj))
-- Allow users to assign an ASC API Key to their project. ([#719](https://github.com/expo/eas-cli/pull/719) by [@quinlanj](https://github.com/quinlanj))
-- Add setup support for ASC API Keys. ([#733](https://github.com/expo/eas-cli/pull/733) by [@quinlanj](https://github.com/quinlanj))
-- Show initiating user display name when selecting a build to submit. ([#730](https://github.com/expo/eas-cli/pull/730) by [@barthap](https://github.com/barthap))
-- Handle Apple servers maintenance error in `eas submit`. ([#738](https://github.com/expo/eas-cli/pull/738) by [@barthap](https://github.com/barthap))
-- Integrate ASC API Key with submissions workflow. ([#737](https://github.com/expo/eas-cli/pull/737) by [@quinlanj](https://github.com/quinlanj))
-- Change EAS API server domain. ([#744](https://github.com/expo/eas-cli/pull/744) by [@ide](https://github.com/ide))
-
-### 🧹 Chores
-
-- Clean up credentials prompt method. ([#728](https://github.com/expo/eas-cli/pull/728) by [@quinlanj](https://github.com/quinlanj))
-- Bump `@expo/apple-utils` to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723) by [@brentvatne](https://github.com/brentvatne))
-- Grammar: replace setup with set up. ([#735](https://github.com/expo/eas-cli/pull/735) by [@quinlanj](https://github.com/quinlanj))
-- Improve VCS workflow migration experience. ([#732](https://github.com/expo/eas-cli/pull/732) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.34.1](https://github.com/expo/eas-cli/releases/tag/v0.34.1) - 2021-11-02
-
-### 🐛 Bug fixes
-
-- Don't show commit prompt in no-commit workflow after installing `expo-dev-client`. ([#722](https://github.com/expo/eas-cli/pull/722) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
-- Add App Store Connect API Key graphql type and print support. ([#717](https://github.com/expo/eas-cli/pull/717) by [@quinlanj](https://github.com/quinlanj))
-
-## [0.34.0](https://github.com/expo/eas-cli/releases/tag/v0.34.0) - 2021-11-01
-
-### 🛠 Breaking changes
-
-- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
-- Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
-- Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
-- Implement no-commit build workflow. Add required `cli` field in root of `eas.json`. ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🐛 Bug fixes
-
-- Better error message when eas.json is invalid. ([#707](https://github.com/expo/eas-cli/pull/707) by [@dsokal](https://github.com/dsokal))
-- Fix credentials workflow for new users: add additionalTypenames for credentials. ([#703](https://github.com/expo/eas-cli/pull/703) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Add additionalTypenames for other queries. ([#704](https://github.com/expo/eas-cli/pull/704) by [@quinlanj](https://github.com/quinlanj))
-- Fix errors after pulling down most recent graphql schema changes. ([#713](https://github.com/expo/eas-cli/pull/713) by [@quinlanj](https://github.com/quinlanj))
-- Refactor credentials manager. ([#712](https://github.com/expo/eas-cli/pull/712) by [@quinlanj](https://github.com/quinlanj))
-- Remove unneeded parameters. ([#710](https://github.com/expo/eas-cli/pull/710) by [@quinlanj](https://github.com/quinlanj))
-- Enforce additionalTypenames for graphql queries. ([#709](https://github.com/expo/eas-cli/pull/709) by [@quinlanj](https://github.com/quinlanj))
-
-## [0.33.1](https://github.com/expo/eas-cli/releases/tag/v0.33.1) - 2021-10-22
-
-### 🎉 New features
-
-- Compute runtime version using config-plugins. ([#697](https://github.com/expo/eas-cli/pull/697) by [@jkhales](https://github.com/jkhales))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ ([#706](https://github.com/expo/eas-cli/pull/706) by [@brentvatne](https://github.com/brentvatne))
-
-## [0.33.0](https://github.com/expo/eas-cli/releases/tag/v0.33.0) - 2021-10-20
-
-### 🎉 New features
-
-- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
-  - Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
-  - To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
-    ```json
-      {
-        "build": {
-          "production": { ... }
-        },
-        "submit": {
-          "production": { ... }
-        }
-      }
-    ```
-
-### 🐛 Bug fixes
-
-- Skip the second prompt for Apple ID if the user is already signed in with Apple. ([#691](https://github.com/expo/eas-cli/pull/691) by [@dsokal](https://github.com/dsokal))
-- Unify reading `app.json`. ([#692](https://github.com/expo/eas-cli/pull/692) by [@dsokal](https://github.com/dsokal))
-
-## [0.32.0](https://github.com/expo/eas-cli/releases/tag/v0.32.0) - 2021-10-15
-
-### 🎉 New features
-
-- Add App Store Connect API Key support to iOS submissions. ([#678](https://github.com/expo/eas-cli/pull/678) by [@quinlanj](https://github.com/quinlanj))
-- Create/list/revoke App Store Connect Api keys via Apple apis. ([#687](https://github.com/expo/eas-cli/pull/687) by [@quinlanj](https://github.com/quinlanj))
-- Add ability to select a build from a list in `eas submit` interactive mode. ([#688](https://github.com/expo/eas-cli/pull/688) by [@barthap](https://github.com/barthap))
-
 ### 🐛 Bug fixes
 
 - Fix printing App Store Connect URL after submission. ([#683](https://github.com/expo/eas-cli/pull/683) by [@brentvatne](https://github.com/brentvatne))
 
 ### 🧹 Chores
 
-- Add App Store Connect API Key fields to `eas.json`. ([#684](https://github.com/expo/eas-cli/pull/684) by [@quinlanj](https://github.com/quinlanj))
 - Enable no-underscore-dangle eslint rule. ([#686](https://github.com/expo/eas-cli/pull/686) by [@dsokal](https://github.com/dsokal))
 
-## [0.31.1](https://github.com/expo/eas-cli/releases/tag/v0.31.1) - 2021-10-08
+## [0.31.1](https://github.com/expo/eas-cli/releases/tag/0.31.1) - 2021-10-08
 
 ### 🐛 Bug fixes
 
 - Google Service Account Keys: Fix non-interactive bug in credentials service workflow ([#682](https://github.com/expo/eas-cli/pull/682) by [@quinlanj](https://github.com/quinlanj))
 
-## [0.31.0](https://github.com/expo/eas-cli/releases/tag/v0.31.0) - 2021-10-08
+## [0.31.0](https://github.com/expo/eas-cli/releases/tag/0.31.0) - 2021-10-08
 
 ### 🛠 Breaking changes
 
@@ -396,7 +33,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Integrate credentials service with Android submissions. ([#664](https://github.com/expo/eas-cli/pull/664) by [@quinlanj](https://github.com/quinlanj))
 - Add option to review ad-hoc devices when reusing provisioning profile. ([#673](https://github.com/expo/eas-cli/pull/673) by [@dsokal](https://github.com/dsokal))
 
-## [0.30.1](https://github.com/expo/eas-cli/releases/tag/v0.30.1) - 2021-10-06
+## [0.30.1](https://github.com/expo/eas-cli/releases/tag/0.30.1) - 2021-10-06
 
 ### 🐛 Bug fixes
 
@@ -775,7 +412,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- 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))
+- `[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))

CONTRIBUTING.md

@@ -1,4 +1,10 @@
 ## Releasing a new version
 
 1. Run `yarn release` in the repository root folder.
-2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
+2. Wait, the `release` workflow on GitHub Actions is going to take care of the rest (including publishing packages to npm and updating the changelog).
+3. Check the changelog. If any of the 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.

bin/install.sh

@@ -11,7 +11,7 @@
 
   prefix="${EAS_PREFIX:-/usr/local}"
   temp_dir="$(mktemp -d)"
-
+  
   if  [ -t 1 ] && [ -z "${NO_COLOR:-}" ]
   then
     # Use colors when stdout is a terminal and NO_COLOR isn't set.
@@ -67,7 +67,7 @@
   if [[ ! ":$PATH:" == *":$prefix/bin:"* ]]; then
     abort "Your path is missing $prefix/bin, you need to add this to \$PATH use this installer."
   fi
-
+  
   hardware="$(uname -m)"
   case "$hardware" in
     x86_64)
@@ -95,12 +95,13 @@
       abort "This installer is supported only on macOS, Linux, and Windows Subsystem for Linux."
       ;;
   esac
-  url=$(hub release -L 1 | xargs hub release show --show-downloads | grep "${platform}-${arch}.tar.gz")
+
+  url="https://github.com/expo/eas-cli/releases/latest/download/eas-$platform-$arch.tar.gz"
   echo "Installing EAS CLI from $url"
 
   mkdir -p "$temp_dir"
   cd "$temp_dir"
-
+  
   echo
   echo "Downloading..."
   if [ "$(command -v curl)" ]

bin/run

@@ -1 +1 @@
-../packages/eas-cli/bin/dev
+../packages/eas-cli/bin/run

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.48.0"
+  "version": "0.31.1"
 }

package.json

@@ -1,35 +1,32 @@
 {
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
   "scripts": {
     "build": "lerna run build",
-    "build:tarballs:linux": "yarn build-for-size-check",
-    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
+    "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 .",
-    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
+    "lint": "eslint . --ext .ts --ext .js",
+    "release": "lerna version",
     "test": "jest",
-    "clean": "lerna run clean && rm -rf node_modules coverage"
+    "clean": "lerna run clean"
   },
   "devDependencies": {
-    "@types/jest": "27.4.1",
+    "@expo/oclif-dev-cli": "1.24.0-expo",
+    "@types/jest": "27.0.1",
     "@types/node": "16.7.8",
-    "eslint": "8.11.0",
-    "eslint-config-universe": "10.0.0",
+    "eslint": "7.32.0",
+    "eslint-config-universe": "8.0.0",
     "eslint-plugin-async-protect": "1.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "27.5.1",
-    "jest-watch-typeahead": "1.0.0",
+    "jest": "27.1.0",
+    "jest-watch-typeahead": "0.6.4",
     "lerna": "4.0.0",
-    "oclif": "2.5.0",
-    "prettier": "2.5.1",
-    "ts-jest": "27.1.3",
-    "typescript": "4.6.2"
+    "prettier": "2.3.2",
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.2"
   },
   "volta": {
     "node": "16.10.0",

packages/eas-cli/bin/dev

@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-
-const oclif = require('@oclif/core');
-const path = require('path');
-
-const project = path.join(__dirname, '..', 'tsconfig.json');
-
-// In dev mode -> use ts-node and dev plugins
-process.env.NODE_ENV = 'development';
-
-require('ts-node').register({ project });
-
-// In dev mode, always show stack traces
-oclif.settings.disableJsonFlag = true
-
-// Start the CLI
-oclif.run().then(oclif.flush).catch(oclif.Errors.handle);

packages/eas-cli/bin/dev.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\dev" %*

packages/eas-cli/bin/run

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-require('@oclif/core')
+require('@oclif/command')
   .run()
-  .then(require('@oclif/core/flush'))
-  .catch(require('@oclif/core/handle'));
+  .then(require('@oclif/command/flush'))
+  .catch(require('@oclif/errors/handle'));

packages/eas-cli/graphql-codegen.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://staging-api.expo.dev/graphql'
+schema: 'https://staging.exp.host/--/graphql'
 documents:
   - 'src/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'

packages/eas-cli/package.json

@@ -1,70 +1,69 @@
 {
   "name": "eas-cli",
+  "type": "module",
   "description": "EAS command line tool",
-  "version": "0.48.0",
+  "version": "0.31.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.27",
-    "@expo/code-signing-certificates": "0.0.2",
-    "@expo/config": "6.0.19",
-    "@expo/config-plugins": "4.1.0",
-    "@expo/config-types": "44.0.0",
-    "@expo/eas-build-job": "0.2.66",
-    "@expo/eas-json": "0.48.0",
-    "@expo/json-file": "8.2.34",
-    "@expo/pkcs12": "0.0.7",
-    "@expo/plist": "0.0.17",
-    "@expo/plugin-warn-if-update-available": "2.1.0",
-    "@expo/prebuild-config": "3.1.0",
+    "@expo/apple-utils": "0.0.0-alpha.25",
+    "@expo/config": "6.0.2",
+    "@expo/config-plugins": "4.0.2",
+    "@expo/eas-build-job": "0.2.52",
+    "@expo/eas-json": "^0.31.0",
+    "@expo/json-file": "8.2.33",
+    "@expo/pkcs12": "0.0.4",
+    "@expo/plist": "0.0.14",
+    "@expo/plugin-warn-if-update-available": "1.7.0",
+    "@expo/prebuild-config": "3.0.2",
     "@expo/results": "1.0.0",
-    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.6.0",
+    "@expo/rudder-sdk-node": "1.1.0",
+    "@expo/sdk-runtime-versions": "1.0.0",
+    "@expo/spawn-async": "1.5.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.5.3",
-    "@oclif/plugin-autocomplete": "1.2.0",
-    "@oclif/plugin-help": "5.1.12",
-    "@urql/core": "2.4.3",
-    "@urql/exchange-retry": "0.3.2",
+    "@oclif/command": "1.8.0",
+    "@oclif/config": "1.17.0",
+    "@oclif/errors": "1.3.5",
+    "@oclif/plugin-help": "3.2.3",
+    "@urql/core": "2.3.1",
+    "@urql/exchange-retry": "0.3.0",
     "chalk": "4.1.2",
-    "cli-table3": "0.6.1",
-    "dateformat": "4.6.3",
-    "dicer": "0.3.1",
+    "cli-table3": "0.6.0",
+    "dateformat": "4.5.1",
     "env-paths": "2.2.0",
     "envinfo": "7.8.1",
-    "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.2.11",
+    "fast-glob": "3.2.7",
     "figures": "3.2.0",
-    "form-data": "4.0.0",
-    "fs-extra": "10.0.1",
+    "form-data": "3.0.0",
+    "fs-extra": "10.0.0",
     "getenv": "1.0.0",
+    "got": "11.8.2",
     "gradle-to-js": "2.0.0",
-    "graphql": "16.3.0",
-    "graphql-tag": "2.12.6",
-    "ignore": "5.2.0",
+    "graphql": "15.5.1",
+    "graphql-tag": "2.12.5",
+    "ignore": "5.1.8",
     "indent-string": "4.0.0",
-    "jks-js": "1.0.2",
-    "joi": "17.6.0",
+    "jks-js": "1.0.1",
+    "joi": "17.4.2",
     "keychain": "1.3.0",
     "log-symbols": "4.1.0",
-    "mime": "3.0.0",
-    "minimatch": "3.0.5",
-    "nanoid": "3.3.1",
-    "node-fetch": "2.6.7",
-    "node-forge": "1.2.1",
+    "mime": "2.5.2",
+    "minimatch": "3.0.4",
+    "nanoid": "3.1.25",
+    "node-fetch": "2.6.1",
+    "node-forge": "0.10.0",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "prompts": "2.4.2",
+    "prompts": "2.3.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
     "semver": "7.3.5",
     "slash": "3.0.0",
     "strip-ansi": "6.0.0",
-    "structured-headers": "0.4.1",
     "tar": "6.1.11",
     "terminal-link": "2.1.1",
     "tslib": "2.3.1",
@@ -74,33 +73,31 @@
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "2.6.2",
-    "@graphql-codegen/introspection": "2.1.1",
-    "@graphql-codegen/typescript": "2.4.7",
-    "@graphql-codegen/typescript-operations": "2.3.4",
+    "@graphql-codegen/cli": "^1.19.2",
+    "@graphql-codegen/introspection": "^1.18.0",
+    "@graphql-codegen/typescript": "^1.17.11",
+    "@graphql-codegen/typescript-operations": "^1.17.10",
     "@types/dateformat": "3.0.1",
-    "@types/dicer": "0.2.2",
     "@types/envinfo": "7.8.1",
-    "@types/fs-extra": "9.0.13",
+    "@types/form-data": "^2.5.0",
+    "@types/fs-extra": "9.0.12",
     "@types/getenv": "^1.0.0",
     "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
-    "@types/node-forge": "1.0.1",
-    "@types/prompts": "2.0.14",
-    "@types/semver": "7.3.9",
-    "@types/tar": "6.1.1",
+    "@types/node-forge": "^0.9.5",
+    "@types/prompts": "^2.0.9",
+    "@types/semver": "7.3.8",
+    "@types/tar": "4.0.5",
     "@types/tough-cookie": "4.0.1",
-    "@types/uuid": "8.3.4",
+    "@types/uuid": "8.3.1",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "0.26.1",
+    "axios": "0.21.4",
     "eslint-plugin-graphql": "4.0.0",
-    "form-data": "4.0.0",
-    "memfs": "3.4.1",
-    "mockdate": "3.0.5",
-    "nock": "13.2.4",
+    "memfs": "3.2.2",
+    "mockdate": "^3.0.2",
+    "nock": "^13.0.5",
     "tempy": "0.7.0",
-    "ts-deepmerge": "2.0.1",
-    "typescript": "4.6.2"
+    "ts-deepmerge": "1.0.8"
   },
   "engines": {
     "node": ">=12.0.0"
@@ -121,16 +118,12 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@oclif/plugin-autocomplete",
       "@oclif/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
     "topics": {
       "account": {
-        "description": "manage account"
-      },
-      "branch": {
-        "description": "manage update branches"
+        "description": "manage your account"
       },
       "build": {
         "description": "build app binaries"
@@ -139,10 +132,10 @@
         "description": "manage update channels"
       },
       "device": {
-        "description": "manage Apple devices for Internal Distribution"
+        "description": "manage your Apple devices for internal distribution"
       },
       "project": {
-        "description": "manage project"
+        "description": "manage your project"
       },
       "release": {
         "description": "manage update releases"
@@ -173,25 +166,18 @@
           }
         }
       }
-    },
-    "additionalHelpFlags": [
-      "-h"
-    ],
-    "additionalVersionFlags": [
-      "-v"
-    ]
+    }
   },
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "./scripts/prepack.sh",
-    "pretarball-ci": "./scripts/pretarball-ci.sh",
+    "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 readme && node scripts/patch-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",
-    "clean": "rm -rf dist build tmp node_modules yarn-error.log"
+    "clean": "rm -rf build node_modules"
   }
 }

packages/eas-cli/patch-readme.js

@@ -1,7 +1,7 @@
 const { promises: fs } = require('fs');
 
 (async () => {
-  // Patch `oclif readme` path and link generation
+  // Patch `oclif-dev readme` path and link generation
   let readmeContent = await fs.readFile('README.md', 'utf8');
   readmeContent = readmeContent.replace(/\[build\//g, '[src/');
   readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');

packages/eas-cli/scripts/prepack.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-rm -rf build
-yarn build
-
-if [ -z "$CLI_SIZE_CHECK" ]; then
-  yarn oclif manifest
-fi

packages/eas-cli/scripts/pretarball-ci.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-EAS_CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-PACKAGE_JSON_PATH="$EAS_CLI_DIR/package.json"
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  sed -i '' "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-else
-  sed -i  "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-fi

packages/eas-cli/src/ApiV2Error.ts

@@ -0,0 +1,27 @@
+import { JSONValue } from '@expo/json-file';
+import { HTTPError, RequestError } from 'got/dist/source';
+
+export default class ApiV2Error extends RequestError {
+  readonly name = 'ApiV2Error';
+  readonly expoApiV2ErrorCode: string;
+  readonly expoApiV2ErrorDetails?: JSONValue;
+  readonly expoApiV2ErrorServerStack?: string;
+  readonly expoApiV2ErrorMetadata?: object;
+
+  constructor(
+    originalError: HTTPError,
+    response: {
+      message: string;
+      code: string;
+      stack?: string;
+      details?: JSONValue;
+      metadata?: object;
+    }
+  ) {
+    super(response.message, originalError, originalError.request);
+    this.expoApiV2ErrorCode = response.code;
+    this.expoApiV2ErrorDetails = response.details;
+    this.expoApiV2ErrorServerStack = response.stack;
+    this.expoApiV2ErrorMetadata = response.metadata;
+  }
+}

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

@@ -1,12 +1,14 @@
 import assert from 'assert';
+import { RequestError } from 'got/dist/source';
 import nock from 'nock';
 
-import { ApiV2Error, api, getExpoApiBaseUrl } from '../api';
+import ApiV2Error from '../ApiV2Error';
+import { apiClient, getExpoApiBaseUrl } from '../api';
 
 describe('apiClient', () => {
   it('converts Expo APIv2 error to ApiV2Error', async () => {
     nock(getExpoApiBaseUrl())
-      .post('/v2/test')
+      .post('/--/api/v2/test')
       .reply(400, {
         errors: [
           {
@@ -21,7 +23,7 @@ describe('apiClient', () => {
 
     let error: Error | null = null;
     try {
-      await api.postAsync('test', { body: {} });
+      await apiClient.post('test');
     } catch (e: any) {
       error = e;
     }
@@ -37,15 +39,15 @@ describe('apiClient', () => {
   });
 
   it('does not convert non-APIv2 error to ApiV2Error', async () => {
-    nock(getExpoApiBaseUrl()).post('/v2/test').reply(500, 'Something went wrong');
+    nock(getExpoApiBaseUrl()).post('/--/api/v2/test').reply(500, 'Something went wrong');
 
     let error: Error | null = null;
     try {
-      await api.postAsync('test', { body: {} });
+      await apiClient.post('test');
     } catch (e: any) {
       error = e;
     }
-    expect(error).not.toBeNull();
+    expect(error).toBeInstanceOf(RequestError);
     expect(error).not.toBeInstanceOf(ApiV2Error);
   });
 });

packages/eas-cli/src/analytics.ts

@@ -3,8 +3,14 @@ import os from 'os';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
-import UserSettings from '../user/UserSettings';
-import { easCliVersion } from '../utils/easCli';
+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',
@@ -91,7 +97,7 @@ export function logEvent(name: string, properties: Record<string, any> = {}): vo
   ensureUserIdentified();
 
   const { userId, deviceId } = identifyData ?? {};
-  const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
+  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
 
   const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
   rudderstackClient.track({
@@ -120,7 +126,7 @@ function getRudderStackContext(): Record<string, any> {
   return {
     os: { name: platform, version: os.release() },
     device: { type: platform, model: platform },
-    app: { name: 'eas cli', version: easCliVersion ?? undefined },
+    app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
   };
 }
 

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

@@ -1,25 +0,0 @@
-import { Analytics, Event } from './events';
-
-export type TrackingContext = Record<string, string | number | boolean>;
-
-export async function withAnalyticsAsync<Result>(
-  fn: () => Promise<Result>,
-  analytics: {
-    attemptEvent: Event;
-    successEvent: Event;
-    failureEvent: Event;
-    trackingCtx: TrackingContext;
-  }
-): Promise<Result> {
-  try {
-    const result = await fn();
-    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
-    return result;
-  } catch (error: any) {
-    Analytics.logEvent(analytics.failureEvent, {
-      ...analytics.trackingCtx,
-      reason: error.message,
-    });
-    throw error;
-  }
-}

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

@@ -1,52 +0,0 @@
-import { logEvent } from './rudderstackClient';
-export type Event = BuildEvent | SubmissionEvent;
-
-export enum SubmissionEvent {
-  SUBMIT_COMMAND = 'submit cli submit command',
-  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
-  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
-  SUBMIT_COMMAND_FAIL = 'submit cli fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
-  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
-  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
-  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
-  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
-  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
-  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
-}
-
-export enum BuildEvent {
-  BUILD_COMMAND = 'build cli build command',
-  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
-  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
-  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
-  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
-  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
-  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
-  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
-  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_ATTEMPT = 'build cli credentials sync update local attempt',
-  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_ATTEMPT = 'build cli credentials sync update remote attempt',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
-
-  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
-}
-
-export class Analytics {
-  static logEvent(name: Event, properties: Record<string, any>): void {
-    logEvent(name, properties);
-  }
-}

packages/eas-cli/src/api.ts

@@ -1,102 +1,50 @@
-import { JSONValue } from '@expo/json-file';
+import got, { HTTPError, NormalizedOptions, RequestError } from 'got';
 
-import fetch, { RequestError, RequestInit } from './fetch';
+import ApiV2Error from './ApiV2Error';
 import { getAccessToken, getSessionSecret } from './user/sessionStorage';
 
-export class ApiV2Error extends Error {
-  readonly name = 'ApiV2Error';
-  readonly expoApiV2ErrorCode: string;
-  readonly expoApiV2ErrorDetails?: JSONValue;
-  readonly expoApiV2ErrorServerStack?: string;
-  readonly expoApiV2ErrorMetadata?: object;
-
-  constructor(response: {
-    message: string;
-    code: string;
-    stack?: string;
-    details?: JSONValue;
-    metadata?: object;
-  }) {
-    super(response.message);
-    this.expoApiV2ErrorCode = response.code;
-    this.expoApiV2ErrorDetails = response.details;
-    this.expoApiV2ErrorServerStack = response.stack;
-    this.expoApiV2ErrorMetadata = response.metadata;
-  }
-}
-
-interface RequestOptions {
-  body: JSONValue;
-}
-
-export const api = {
-  async putAsync(path: string, options: RequestOptions): Promise<any> {
-    return await requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
-  },
-
-  async postAsync(path: string, options: RequestOptions): Promise<any> {
-    return await requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
-  },
-
-  async deleteAsync(path: string): Promise<any> {
-    return await requestAsync(path, { method: 'DELETE' });
-  },
-
-  async getAsync(path: string): Promise<any> {
-    return await requestAsync(path, { method: 'GET' });
-  },
-};
-
-async function requestAsync(path: string, options: RequestInit): Promise<any> {
-  try {
-    const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
-      ...options,
-      headers: {
-        'Content-Type': 'application/json',
-        ...getAuthHeaders(),
+export const apiClient = got.extend({
+  prefixUrl: getExpoApiBaseUrl() + '/--/api/v2/',
+  hooks: {
+    beforeRequest: [
+      (options: NormalizedOptions) => {
+        const token = getAccessToken();
+        if (token) {
+          options.headers.authorization = `Bearer ${token}`;
+          return;
+        }
+        const sessionSecret = getSessionSecret();
+        if (sessionSecret) {
+          options.headers['expo-session'] = sessionSecret;
+        }
       },
-    });
-    return await response.json();
-  } catch (err) {
-    await handleApiErrorAsync(err);
-  }
-}
-
-async function handleApiErrorAsync(err: any): Promise<void> {
-  if (err instanceof RequestError) {
-    let result: { [key: string]: any };
-    try {
-      result = (await err.response.json()) as { [key: string]: any };
-    } catch {
-      throw new Error(`Malformed api response: ${await err.response.text()}`);
-    }
-    if (result.errors?.length) {
-      throw new ApiV2Error(result.errors[0]);
-    }
-  } else {
-    throw err;
-  }
-}
-
-function getAuthHeaders(): Record<string, string> {
-  const token = getAccessToken();
-  if (token) {
-    return { authorization: `Bearer ${token}` };
-  }
-  const sessionSecret = getSessionSecret();
-  if (sessionSecret) {
-    return { 'expo-session': sessionSecret };
-  }
-  return {};
-}
+    ],
+    beforeError: [
+      (error: RequestError): RequestError => {
+        if (error instanceof HTTPError) {
+          let result: { [key: string]: any };
+          try {
+            result = JSON.parse(error.response.body as string);
+          } catch (e2) {
+            return error;
+          }
+          if (result.errors?.length) {
+            return new ApiV2Error(error, result.errors[0]);
+          }
+        }
+        return error;
+      },
+    ],
+  },
+});
 
 export function getExpoApiBaseUrl(): string {
   if (process.env.EXPO_STAGING) {
-    return `https://staging-api.expo.dev`;
+    return `https://staging.exp.host`;
   } else if (process.env.EXPO_LOCAL) {
     return `http://127.0.0.1:3000`;
   } else {
-    return `https://api.expo.dev`;
+    return `https://exp.host`;
   }
 }
 
@@ -109,13 +57,3 @@ export function getExpoWebsiteBaseUrl(): string {
     return `https://expo.dev`;
   }
 }
-
-export function getEASUpdateURL(projectId: string): string {
-  if (process.env.EXPO_STAGING) {
-    return new URL(projectId, `https://staging-u.expo.dev`).href;
-  } else if (process.env.EXPO_LOCAL) {
-    return new URL(`expo-updates/${projectId}`, `http://127.0.0.1:3000`).href;
-  } else {
-    return new URL(projectId, `https://u.expo.dev`).href;
-  }
-}

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

@@ -0,0 +1,115 @@
+import { ExpoConfig } from '@expo/config';
+import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
+import fs from 'fs-extra';
+
+import Log from '../../log';
+import { getProjectAccountName } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+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.getAppBuildGradleFilePath(projectDir);
+  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
+
+  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
+    const updatedBuildGradleContents =
+      AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
+        projectDir,
+        buildGradleContents
+      );
+    await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
+  }
+
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  const androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
+    const result = AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
+
+    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, result);
+  }
+}
+
+export async function syncUpdatesConfigurationAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  try {
+    await ensureUpdatesConfiguredAsync(projectDir, exp);
+  } catch (error) {
+    Log.error(
+      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
+    );
+    throw error;
+  }
+
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  let androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
+    androidManifest = AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
+    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, androidManifest);
+  }
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
+    Log.warn(
+      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
+    );
+  }
+}
+
+async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
+
+  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
+    const gradleScriptApply = AndroidConfig.Updates.formatApplyLineForBuildGradle(projectDir);
+    throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
+  }
+
+  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,
+      AndroidConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY
+    );
+    if (!stringifiedRequestHeaders) {
+      return null;
+    }
+    return JSON.parse(stringifiedRequestHeaders)['expo-channel-name'] ?? null;
+  } catch (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__/version-test.ts

@@ -31,7 +31,7 @@ beforeEach(async () => {
   await fs.mkdirp(os.tmpdir());
 });
 
-// bare workflow
+// generic workflow
 describe(bumpVersionAsync, () => {
   it('throws an informative error when multiple flavors are detected in the android project', async () => {
     await initProjectWithGradleFileAsync(
@@ -69,7 +69,7 @@ describe(bumpVersionAsync, () => {
   });
   it('bumps expo.android.versionCode and buildGradle versionCode when strategy = BumpStrategy.VERSION_CODE', async () => {
     const nativeVersionCode = 100; // this should be overwritten by bumpVersionAsync
-    const fakeExp = initBareWorkflowProject({ versionCode: nativeVersionCode });
+    const fakeExp = initGenericProject({ versionCode: nativeVersionCode });
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.VERSION_CODE,
@@ -91,7 +91,7 @@ describe(bumpVersionAsync, () => {
 
   it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
     const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
-    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });
+    const fakeExp = initGenericProject({ versionName: nativeVersionName });
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
@@ -112,7 +112,7 @@ describe(bumpVersionAsync, () => {
   });
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initBareWorkflowProject();
+    const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
@@ -185,9 +185,9 @@ describe(bumpVersionInAppJsonAsync, () => {
 });
 
 describe(maybeResolveVersionsAsync, () => {
-  describe('bare project', () => {
+  describe('generic project', () => {
     it('reads the versions from native code', async () => {
-      const exp = initBareWorkflowProject();
+      const exp = initGenericProject();
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/repo',
         exp,
@@ -211,7 +211,7 @@ describe(maybeResolveVersionsAsync, () => {
   });
 });
 
-function initBareWorkflowProject({
+function initGenericProject({
   versionCode = 123,
   versionName = '3.0.0',
 }: {

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

@@ -11,7 +11,7 @@ import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
 } from '../../project/android/applicationId';
-import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
+import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import {
@@ -20,17 +20,17 @@ import {
   JobData,
   prepareBuildRequestForPlatformAsync,
 } from '../build';
-import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 
-export async function createAndroidContextAsync(
-  ctx: CommonContext<Platform.ANDROID>
-): Promise<AndroidBuildContext> {
+export async function prepareAndroidBuildAsync(
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
   const { buildProfile } = ctx;
 
   if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
@@ -58,26 +58,21 @@ This means that it will most likely produce an AAB and you will not be able to i
     await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
   }
 
-  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
-
-  return { applicationId, gradleContext };
-}
-
-export async function prepareAndroidBuildAsync(
-  ctx: BuildContext<Platform.ANDROID>
-): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
-      return await ensureAndroidCredentialsAsync(ctx);
+      return await ensureAndroidCredentialsAsync(ctx, gradleContext);
     },
-    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+    ensureProjectConfiguredAsync: async () => {
+      await validateAndSyncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
-        buildProfile: ctx.buildProfile,
+        buildProfile,
       });
     },
+    getMetadataContext: () => ({
+      gradleContext,
+    }),
     prepareJobAsync: async (
       ctx: BuildContext<Platform.ANDROID>,
       jobData: JobData<AndroidCredentials>
@@ -105,7 +100,8 @@ function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean
 }
 
 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.ANDROID>
+  ctx: BuildContext<Platform.ANDROID>,
+  gradleContext?: GradleBuildContext
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
   if (!shouldProvideCredentials(ctx)) {
     return;
@@ -113,7 +109,7 @@ async function ensureAndroidCredentialsAsync(
   const androidApplicationIdentifier = await getApplicationIdAsync(
     ctx.projectDir,
     ctx.exp,
-    ctx.android.gradleContext
+    gradleContext
   );
   const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
     app: {

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

@@ -0,0 +1,75 @@
+import { ExpoConfig } from '@expo/config';
+import { AndroidConfig } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json';
+
+import Log from '../../log';
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  warnIfAndroidPackageDefinedInAppConfigForGenericProject,
+} from '../../project/android/applicationId';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import vcs from '../../vcs';
+import { ConfigureContext } from '../context';
+import { isExpoUpdatesInstalled } from '../utils/updates';
+import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+
+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);
+
+  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
+  await vcs.trackFileAsync(easGradlePath);
+
+  if (isExpoUpdatesInstalled(ctx.projectDir)) {
+    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
+  }
+  Log.withTick('Android project configured');
+}
+
+export async function validateAndSyncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  buildProfile,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  buildProfile: AndroidBuildProfile;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
+
+  if (workflow === Workflow.GENERIC) {
+    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);
+    }
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  } else {
+    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  }
+}
+
+function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
+  if (autoIncrement === true) {
+    return BumpStrategy.VERSION_CODE;
+  } else if (autoIncrement === false) {
+    return BumpStrategy.NOOP;
+  } else if (autoIncrement === 'versionCode') {
+    return BumpStrategy.VERSION_CODE;
+  } else {
+    return BumpStrategy.APP_VERSION;
+  }
+}

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

@@ -17,15 +17,15 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     artifactPath: job.artifactPath,
     username: job.username,
     buildType: job.buildType && transformBuildType(job.buildType),
-    developmentClient: job.developmentClient,
-    experimental: job.experimental,
   };
 }
 
 function transformBuildType(buildType: Android.BuildType): AndroidBuildType {
   if (buildType === Android.BuildType.APK) {
     return AndroidBuildType.Apk;
-  } else {
+  } else if (buildType === Android.BuildType.APP_BUNDLE) {
     return AndroidBuildType.AppBundle;
+  } else {
+    return AndroidBuildType.DevelopmentClient;
   }
 }

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

@@ -1,12 +1,12 @@
 import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
+import { AndroidBuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { getVcsClient } from '../../vcs';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -25,9 +25,9 @@ export async function prepareJobAsync(
   jobData: JobData
 ): Promise<Job> {
   const username = getUsername(ctx.exp, await ensureLoggedInAsync());
-  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
+  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
   const projectRootDirectory =
-    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
   const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
@@ -70,14 +70,12 @@ export async function prepareJobAsync(
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
     updates: { channel: ctx.buildProfile.channel },
-    developmentClient: buildProfile.developmentClient,
+
     gradleCommand: buildProfile.gradleCommand,
     artifactPath: buildProfile.artifactPath,
-    buildType,
+
     username,
-    experimental: {
-      prebuildCommand: ctx.buildProfile.prebuildCommand,
-    },
+    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
   };
 
   return sanitizeJob(job);

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

@@ -1,68 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import Log from '../../log';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
-
-export async function syncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  buildProfile,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  buildProfile: BuildProfile<Platform.ANDROID>;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  const { autoIncrement } = buildProfile;
-  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
-
-  if (workflow === Workflow.GENERIC) {
-    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
-    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
-    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  } else {
-    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  }
-}
-
-function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
-  if (autoIncrement === true) {
-    return BumpStrategy.VERSION_CODE;
-  } else if (autoIncrement === false) {
-    return BumpStrategy.NOOP;
-  } else if (autoIncrement === 'versionCode') {
-    return BumpStrategy.VERSION_CODE;
-  } else {
-    return BumpStrategy.APP_VERSION;
-  }
-}
-
-// TODO: remove this after a few months
-export async function cleanUpOldEasBuildGradleScriptAsync(projectDir: string): Promise<void> {
-  const easBuildGradlePath = path.join(projectDir, 'android', 'app', 'eas-build.gradle');
-  if (await fs.pathExists(easBuildGradlePath)) {
-    Log.withTick(`Removing ${chalk.bold('eas-build.gradle')} as it's not longer necessary`);
-    await fs.remove(easBuildGradlePath);
-
-    const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-    const buildGradleContents = await fs.readFile(buildGradlePath, 'utf-8');
-    const buildGradleContentsWithoutApply = buildGradleContents.replace(
-      /apply from: ["'].\/eas-build.gradle["']\n/,
-      ''
-    );
-    if (buildGradleContentsWithoutApply !== buildGradleContents) {
-      await fs.writeFile(buildGradlePath, buildGradleContentsWithoutApply);
-    }
-  }
-}

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

@@ -3,8 +3,6 @@ import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { withAnalyticsAsync } from '../analytics/common';
-import { BuildEvent } from '../analytics/events';
 import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
@@ -15,10 +13,12 @@ import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
-import { getVcsClient } from '../vcs';
+import vcs from '../vcs';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { collectMetadataAsync } from './metadata';
+import { MetadataContext, collectMetadataAsync } from './metadata';
+import { TrackingContext } from './types';
+import Analytics, { Event } from './utils/analytics';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
@@ -38,7 +38,8 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ensureCredentialsAsync(
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
-  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+  getMetadataContext: () => MetadataContext<TPlatform>;
   prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
   sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }
@@ -54,21 +55,20 @@ export async function prepareBuildRequestForPlatformAsync<
   const credentialsResult = await withAnalyticsAsync(
     async () => await builder.ensureCredentialsAsync(ctx),
     {
-      attemptEvent: BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
-      successEvent: BuildEvent.GATHER_CREDENTIALS_SUCCESS,
-      failureEvent: BuildEvent.GATHER_CREDENTIALS_FAIL,
+      successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
+      failureEvent: Event.GATHER_CREDENTIALS_FAIL,
       trackingCtx: ctx.trackingCtx,
     }
   );
+  if (!ctx.skipProjectConfiguration) {
+    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
+      successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
+      failureEvent: Event.CONFIGURE_PROJECT_FAIL,
+      trackingCtx: ctx.trackingCtx,
+    });
+  }
 
-  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
-    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-    trackingCtx: ctx.trackingCtx,
-  });
-
-  if (await getVcsClient().isCommitRequiredAsync()) {
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.addNewLineIfNone();
     await reviewAndCommitChangesAsync(
       `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
@@ -76,7 +76,7 @@ export async function prepareBuildRequestForPlatformAsync<
     );
   }
 
-  const projectArchive = ctx.localBuildOptions.enable
+  const projectArchive = ctx.local
     ? ({
         type: ArchiveSourceType.PATH,
         path: (await makeProjectTarballAsync()).path,
@@ -86,15 +86,16 @@ export async function prepareBuildRequestForPlatformAsync<
         bucketKey: await uploadProjectAsync(ctx),
       } as const);
 
-  const metadata = await collectMetadataAsync(ctx);
+  const metadataContext = builder.getMetadataContext();
+  const metadata = await collectMetadataAsync(ctx, metadataContext);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
   });
 
   return async () => {
-    if (ctx.localBuildOptions.enable) {
-      await runLocalBuildAsync(job, ctx.localBuildOptions);
+    if (ctx.local) {
+      await runLocalBuildAsync(job);
       return undefined;
     } else {
       try {
@@ -165,9 +166,8 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         return bucketKey;
       },
       {
-        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
-        successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
-        failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
+        successEvent: Event.PROJECT_UPLOAD_SUCCESS,
+        failureEvent: Event.PROJECT_UPLOAD_FAIL,
         trackingCtx: ctx.trackingCtx,
       }
     );
@@ -200,14 +200,34 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
       return build;
     },
     {
-      attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
-      successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
-      failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
+      successEvent: Event.BUILD_REQUEST_SUCCESS,
+      failureEvent: Event.BUILD_REQUEST_FAIL,
       trackingCtx: ctx.trackingCtx,
     }
   );
 }
 
+async function withAnalyticsAsync<Result>(
+  fn: () => Promise<Result>,
+  analytics: {
+    successEvent: Event;
+    failureEvent: Event;
+    trackingCtx: TrackingContext;
+  }
+): Promise<Result> {
+  try {
+    const result = await fn();
+    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
+    return result;
+  } catch (error: any) {
+    Analytics.logEvent(analytics.failureEvent, {
+      ...analytics.trackingCtx,
+      reason: error.message,
+    });
+    throw error;
+  }
+}
+
 export async function waitForBuildEndAsync(
   buildIds: string[],
   { timeoutSec = 3600, intervalSec = 30 } = {}
@@ -287,8 +307,7 @@ export async function waitForBuildEndAsync(
         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 unknown =
-          builds.length - newBuilds - inQueue - inProgress - errored - finished - canceled;
+        const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished;
         spinner.text = [
           newBuilds && `Builds created: ${newBuilds}`,
           inQueue && `Builds in queue: ${inQueue}`,

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

@@ -1,74 +1,116 @@
+import { getConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { EasJson, EasJsonReader } from '@expo/eas-json';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import Log from '../log';
+import Log, { learnMore } from '../log';
+import { RequestedPlatform } from '../platform';
 import { resolveWorkflowAsync } from '../project/workflow';
-import { easCliVersion } from '../utils/easCli';
-import { getVcsClient } from '../vcs';
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
+import { confirmAsync, promptAsync } from '../prompts';
+import { ensureLoggedInAsync } from '../user/actions';
+import vcs from '../vcs';
+import { configureAndroidAsync } from './android/configure';
+import { ConfigureContext } from './context';
+import { configureIosAsync } from './ios/configure';
+import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';
 
-interface ConfigureParams {
-  projectDir: string;
-  nonInteractive: boolean;
-}
+const configureCommitMessage = {
+  [RequestedPlatform.Android]: 'Configure EAS Build for Android',
+  [RequestedPlatform.Ios]: 'Configure EAS Build for iOS',
+  [RequestedPlatform.All]: 'Configure EAS Build',
+};
 
-/**
- * Creates eas.json if it does not exist.
- *
- * Returns:
- * - false - if eas.json already exists
- * - true - if eas.json was created by the function
- */
 export async function ensureProjectConfiguredAsync(
-  configureParams: ConfigureParams
-): Promise<boolean> {
-  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(configureParams.projectDir))) {
-    return false;
+  projectDir: string,
+  requestedPlatform: RequestedPlatform
+): Promise<void> {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir))) {
+    return;
   }
 
-  await configureAsync(configureParams);
-  return true;
+  const message = 'This project is not configured to build with EAS. Set it up now?';
+  const confirm = await confirmAsync({ message });
+  if (confirm) {
+    await configureAsync({
+      projectDir,
+      platform: requestedPlatform,
+    });
+    if (await vcs.hasUncommittedChangesAsync()) {
+      error(
+        'Build process requires clean working tree, please commit all your changes and run `eas build` again',
+        { exit: 1 }
+      );
+    }
+  } else {
+    error(
+      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
+        'https://docs.expo.dev/build/eas-json'
+      )})`,
+      { exit: 1 }
+    );
+  }
 }
 
-async function configureAsync({ projectDir, nonInteractive }: ConfigureParams): Promise<void> {
+export async function configureAsync(options: {
+  platform: RequestedPlatform;
+  projectDir: string;
+}): Promise<void> {
+  await vcs.ensureRepoExistsAsync();
   await maybeBailOnRepoStatusAsync();
 
-  await createEasJsonAsync(projectDir);
+  const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
 
-  if (await getVcsClient().isCommitRequiredAsync()) {
+  const ctx: ConfigureContext = {
+    user: await ensureLoggedInAsync(),
+    projectDir: options.projectDir,
+    exp,
+    requestedPlatform: options.platform,
+    shouldConfigureAndroid: [RequestedPlatform.All, RequestedPlatform.Android].includes(
+      options.platform
+    ),
+    shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.Ios].includes(options.platform),
+    hasAndroidNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.ANDROID)) === Workflow.GENERIC,
+    hasIosNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.IOS)) === Workflow.GENERIC,
+  };
+
+  Log.newLine();
+  await ensureEasJsonExistsAsync(ctx);
+  if (ctx.shouldConfigureAndroid) {
+    await configureAndroidAsync(ctx);
+  }
+  if (ctx.shouldConfigureIos) {
+    await configureIosAsync(ctx);
+  }
+
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.newLine();
-    await reviewAndCommitChangesAsync('Configure EAS Build', {
-      nonInteractive,
-    });
+    await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
+  } else {
+    Log.newLine();
+    Log.withTick('No changes were necessary, the project is already configured correctly.');
   }
 }
 
 const EAS_JSON_MANAGED_DEFAULT: EasJson = {
-  cli: {
-    version: `>= ${easCliVersion}`,
-  },
   build: {
+    release: {},
     development: {
       developmentClient: true,
       distribution: 'internal',
     },
-    preview: {
-      distribution: 'internal',
-    },
-    production: {},
   },
   submit: {
-    production: {},
+    release: {},
   },
 };
 
-const EAS_JSON_BARE_DEFAULT: EasJson = {
-  cli: {
-    version: `>= ${easCliVersion}`,
-  },
+const EAS_JSON_GENERIC_DEFAULT: EasJson = {
   build: {
+    release: {},
     development: {
       distribution: 'internal',
       android: {
@@ -78,29 +120,64 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
         buildConfiguration: 'Debug',
       },
     },
-    preview: {
-      distribution: 'internal',
-    },
-    production: {},
   },
   submit: {
-    production: {},
+    release: {},
   },
 };
 
-async function createEasJsonAsync(projectDir: string): Promise<void> {
-  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
+export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
+  const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);
+
+  if (await fs.pathExists(easJsonPath)) {
+    const reader = new EasJsonReader(ctx.projectDir);
+    await reader.readAndValidateAsync();
+
+    Log.withTick('Validated eas.json');
+    return;
+  }
 
-  const hasAndroidNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
-  const hasIosNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
   const easJson =
-    hasAndroidNativeProject || hasIosNativeProject
-      ? EAS_JSON_BARE_DEFAULT
+    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
+      ? EAS_JSON_GENERIC_DEFAULT
       : EAS_JSON_MANAGED_DEFAULT;
 
   await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await getVcsClient().trackFileAsync(easJsonPath);
-  Log.withTick(`Generated ${chalk.bold('eas.json')}`);
+  await vcs.trackFileAsync(easJsonPath);
+  Log.withTick('Generated eas.json');
+}
+
+enum ShouldCommitChanges {
+  Yes,
+  ShowDiffFirst,
+  Skip,
+}
+
+async function reviewAndCommitChangesAsync(
+  initialCommitMessage: string,
+  askedFirstTime: boolean = true
+): Promise<void> {
+  const { selected } = await promptAsync({
+    type: 'select',
+    name: 'selected',
+    message: 'Can we commit these changes to git for you?',
+    choices: [
+      { title: 'Yes', value: ShouldCommitChanges.Yes },
+      ...(askedFirstTime
+        ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
+        : []),
+      {
+        title: 'Skip committing changes, I will do it later on my own',
+        value: ShouldCommitChanges.Skip,
+      },
+    ],
+  });
+
+  if (selected === ShouldCommitChanges.Yes) {
+    await commitPromptAsync({ initialCommitMessage });
+    Log.withTick('Committed changes');
+  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
+    await vcs.showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, false);
+  }
 }

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

@@ -1,29 +1,30 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { AndroidBuildProfile, BuildProfile, IosBuildProfile } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+import resolveFrom from 'resolve-from';
+import { v4 as uuidv4 } from 'uuid';
 
-import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
-import { Target } from '../credentials/ios/types';
-import { GradleBuildContext } from '../project/android/gradle';
-import { XcodeBuildContext } from '../project/ios/scheme';
+import { RequestedPlatform } from '../platform';
+import { getExpoConfig } from '../project/expoConfig';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { findAccountByName } from '../user/Account';
 import { Actor } from '../user/User';
-import { LocalBuildOptions } from './local';
+import { ensureLoggedInAsync } from '../user/actions';
+import { TrackingContext } from './types';
+import Analytics, { Event } from './utils/analytics';
 
-export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
-
-export interface AndroidBuildContext {
-  applicationId: string;
-  gradleContext?: GradleBuildContext;
-}
-
-export interface IosBuildContext {
-  bundleIdentifier: string;
-  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
-  applicationTarget: Target;
-  targets: Target[];
-  xcodeBuildContext: XcodeBuildContext;
+export interface ConfigureContext {
+  user: Actor;
+  projectDir: string;
+  exp: ExpoConfig;
+  requestedPlatform: RequestedPlatform;
+  shouldConfigureAndroid: boolean;
+  shouldConfigureIos: boolean;
+  hasAndroidNativeProject: boolean;
+  hasIosNativeProject: boolean;
 }
 
 export interface BuildContext<T extends Platform> {
@@ -33,15 +34,122 @@ export interface BuildContext<T extends Platform> {
   clearCache: boolean;
   credentialsCtx: CredentialsContext;
   exp: ExpoConfig;
-  localBuildOptions: LocalBuildOptions;
+  local: boolean;
   nonInteractive: boolean;
   platform: T;
   projectDir: string;
   projectId: string;
   projectName: string;
+  skipProjectConfiguration: boolean;
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;
-  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
-  ios: T extends Platform.IOS ? IosBuildContext : undefined;
+}
+
+export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  clearCache = false,
+  local,
+  nonInteractive = false,
+  platform,
+  projectDir,
+  skipProjectConfiguration = false,
+}: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  clearCache: boolean;
+  local: boolean;
+  nonInteractive: boolean;
+  platform: T;
+  projectDir: string;
+  skipProjectConfiguration: boolean;
+}): Promise<BuildContext<T>> {
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
+  const user = await ensureLoggedInAsync();
+  const accountName = getProjectAccountName(exp, user);
+  const projectName = exp.slug;
+  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
+  const accountId = findAccountByName(user.accounts, accountName)?.id;
+
+  const credentialsCtx = new CredentialsContext({
+    exp,
+    nonInteractive,
+    projectDir,
+    user,
+  });
+
+  const devClientProperties = getDevClientEventProperties({
+    platform,
+    projectDir,
+    buildProfile,
+  });
+  const trackingCtx = {
+    tracking_id: uuidv4(),
+    platform,
+    ...(accountId && { account_id: accountId }),
+    account_name: accountName,
+    project_id: projectId,
+    project_type: workflow,
+    ...devClientProperties,
+  };
+  Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
+
+  return {
+    accountName,
+    buildProfile,
+    buildProfileName,
+    clearCache,
+    credentialsCtx,
+    exp,
+    local,
+    nonInteractive,
+    platform,
+    projectDir,
+    projectId,
+    projectName,
+    skipProjectConfiguration,
+    trackingCtx,
+    user,
+    workflow,
+  };
+}
+
+function getDevClientEventProperties({
+  platform,
+  projectDir,
+  buildProfile,
+}: {
+  platform: Platform;
+  projectDir: string;
+  buildProfile: AndroidBuildProfile | IosBuildProfile;
+}): Partial<TrackingContext> {
+  let includesDevClient;
+  const version = tryGetDevClientVersion(projectDir);
+  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
+  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+  } else if (buildProfile.developmentClient) {
+    includesDevClient = true;
+  } 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/createContext.ts

@@ -1,136 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import JsonFile from '@expo/json-file';
-import resolveFrom from 'resolve-from';
-import { v4 as uuidv4 } from 'uuid';
-
-import { TrackingContext } from '../analytics/common';
-import { Analytics, BuildEvent } from '../analytics/events';
-import { CredentialsContext } from '../credentials/context';
-import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { findAccountByName } from '../user/Account';
-import { ensureLoggedInAsync } from '../user/actions';
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-
-export async function createBuildContextAsync<T extends Platform>({
-  buildProfileName,
-  buildProfile,
-  clearCache = false,
-  localBuildOptions,
-  nonInteractive = false,
-  platform,
-  projectDir,
-}: {
-  buildProfileName: string;
-  buildProfile: BuildProfile<T>;
-  clearCache: boolean;
-  localBuildOptions: LocalBuildOptions;
-  nonInteractive: boolean;
-  platform: T;
-  projectDir: string;
-}): Promise<BuildContext<T>> {
-  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
-
-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
-  const projectName = exp.slug;
-  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
-  const workflow = await resolveWorkflowAsync(projectDir, platform);
-  const accountId = findAccountByName(user.accounts, accountName)?.id;
-
-  const credentialsCtx = new CredentialsContext({
-    exp,
-    nonInteractive,
-    projectDir,
-    user,
-    env: buildProfile.env,
-  });
-
-  const devClientProperties = getDevClientEventProperties({
-    platform,
-    projectDir,
-    buildProfile,
-  });
-  const trackingCtx = {
-    tracking_id: uuidv4(),
-    platform,
-    ...(accountId && { account_id: accountId }),
-    project_id: projectId,
-    project_type: workflow,
-    ...devClientProperties,
-  };
-  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
-
-  const commonContext: CommonContext<T> = {
-    accountName,
-    buildProfile,
-    buildProfileName,
-    clearCache,
-    credentialsCtx,
-    exp,
-    localBuildOptions,
-    nonInteractive,
-    platform,
-    projectDir,
-    projectId,
-    projectName,
-    trackingCtx,
-    user,
-    workflow,
-  };
-  if (platform === Platform.ANDROID) {
-    const common = commonContext as CommonContext<Platform.ANDROID>;
-    return {
-      ...common,
-      android: await createAndroidContextAsync(common),
-    } as BuildContext<T>;
-  } else {
-    const common = commonContext as CommonContext<Platform.IOS>;
-    return {
-      ...common,
-      ios: await createIosContextAsync(common),
-    } as BuildContext<T>;
-  }
-}
-
-function getDevClientEventProperties({
-  platform,
-  projectDir,
-  buildProfile,
-}: {
-  platform: Platform;
-  projectDir: string;
-  buildProfile: BuildProfile;
-}): Partial<TrackingContext> {
-  let includesDevClient;
-  const version = tryGetDevClientVersion(projectDir);
-  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
-  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
-  } else if (buildProfile.developmentClient) {
-    includesDevClient = true;
-  } 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/ios/UpdatesModule.ts

@@ -0,0 +1,111 @@
+import { ExpoConfig } from '@expo/config';
+import { IOSConfig } from '@expo/config-plugins';
+import fs from 'fs-extra';
+
+import Log from '../../log';
+import { getProjectAccountName } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import vcs from '../../vcs';
+import { ensureValidVersions } from '../utils/updates';
+import { readPlistAsync, writePlistAsync } from './plist';
+
+export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  let xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+
+  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
+    xcodeProject = IOSConfig.Updates.ensureBundleReactNativePhaseContainsConfigurationScript(
+      projectDir,
+      xcodeProject
+    );
+    await fs.writeFile(
+      IOSConfig.Paths.getPBXProjectPath(projectDir),
+      // eslint-disable-next-line node/no-sync
+      xcodeProject.writeSync()
+    );
+  }
+
+  let expoPlist = await readExpoPlistAsync(projectDir);
+  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
+    expoPlist = IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
+    await writeExpoPlistAsync(projectDir, expoPlist);
+  }
+  // TODO: ensure ExpoPlist in pbxproj
+}
+
+export async function syncUpdatesConfigurationAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  try {
+    await ensureUpdatesConfiguredAsync(projectDir, exp);
+  } catch (error) {
+    Log.error(
+      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
+    );
+    throw error;
+  }
+
+  let expoPlist = await readExpoPlistAsync(projectDir);
+  if (!IOSConfig.Updates.isPlistVersionConfigurationSynced(exp, expoPlist)) {
+    expoPlist = IOSConfig.Updates.setVersionsConfig(exp, expoPlist);
+    await writeExpoPlistAsync(projectDir, expoPlist);
+  }
+
+  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
+    Log.warn(
+      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
+    );
+  }
+}
+
+async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+
+  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
+    const script = 'expo-updates/scripts/create-manifest-ios.sh';
+    const buildPhase = '"Bundle React Native code and images"';
+    throw new Error(`Path to ${script} is missing in a ${buildPhase} build phase.`);
+  }
+
+  const expoPlist = await readExpoPlistAsync(projectDir);
+  if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
+    throw new Error('Missing values in Expo.plist');
+  }
+}
+
+async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
+  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
+  return (await readPlistAsync(expoPlistPath)) as IOSConfig.ExpoPlist;
+}
+
+async function writeExpoPlistAsync(
+  projectDir: string,
+  expoPlist: IOSConfig.ExpoPlist
+): Promise<void> {
+  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
+  await writePlistAsync(expoPlistPath, expoPlist);
+  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__/version-test.ts

@@ -4,7 +4,7 @@ import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
-import { readPlistAsync } from '../../../utils/plist';
+import { readPlistAsync } from '../plist';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -49,10 +49,10 @@ describe(evaluateTemplateString, () => {
   });
 });
 
-// bare workflow
+// generic workflow
 describe(bumpVersionAsync, () => {
   it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
-    const fakeExp = initBareWorkflowProject();
+    const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -74,7 +74,7 @@ describe(bumpVersionAsync, () => {
   });
 
   it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
-    const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });
+    const fakeExp = initGenericProject({ infoPlistName: 'Info2.plist' });
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -98,7 +98,7 @@ describe(bumpVersionAsync, () => {
   });
 
   it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
-    const fakeExp = initBareWorkflowProject();
+    const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
@@ -120,7 +120,7 @@ describe(bumpVersionAsync, () => {
   });
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initBareWorkflowProject();
+    const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
@@ -194,9 +194,9 @@ describe(bumpVersionInAppJsonAsync, () => {
 });
 
 describe(readBuildNumberAsync, () => {
-  describe('bare project', () => {
+  describe('generic project', () => {
     it('reads the build number from native code', async () => {
-      const exp = initBareWorkflowProject();
+      const exp = initGenericProject();
       const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
@@ -212,14 +212,14 @@ describe(readBuildNumberAsync, () => {
 });
 
 describe(readShortVersionAsync, () => {
-  describe('bare project', () => {
+  describe('generic project', () => {
     it('reads the short version from native code', async () => {
-      const exp = initBareWorkflowProject();
+      const exp = initGenericProject();
       const appVersion = await readShortVersionAsync('/repo', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
-      const exp = initBareWorkflowProject({
+      const exp = initGenericProject({
         appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
       const buildNumber = await readShortVersionAsync('/repo', exp, {
@@ -231,7 +231,7 @@ describe(readShortVersionAsync, () => {
 
   describe('managed project', () => {
     it('reads the version from app config', async () => {
-      const exp = initBareWorkflowProject();
+      const exp = initGenericProject();
       const appVersion = await readShortVersionAsync('/repo', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
@@ -286,7 +286,7 @@ describe(getInfoPlistPath, () => {
   });
 });
 
-function initBareWorkflowProject({
+function initGenericProject({
   appVersion = '1.0.0',
   version = '1',
   infoPlistName = 'Info.plist',

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

@@ -8,17 +8,24 @@ import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../pro
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext, CommonContext, IosBuildContext } from '../context';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
+import { IosMetadataContext } from '../metadata';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 
-export async function createIosContextAsync(
-  ctx: CommonContext<Platform.IOS>
-): Promise<IosBuildContext> {
+interface BuildConfiguration {
+  targetName?: string;
+  buildConfiguration?: string;
+  buildSettings: XCBuildConfiguration['buildSettings'];
+}
+
+export async function prepareIosBuildAsync(
+  ctx: BuildContext<Platform.IOS>
+): Promise<BuildRequestSender> {
   const { buildProfile } = ctx;
 
   if (ctx.workflow === Workflow.MANAGED) {
@@ -43,42 +50,29 @@ export async function createIosContextAsync(
     },
     xcodeBuildContext
   );
-  const applicationTarget = findApplicationTarget(targets);
-  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
+  const buildConfiguration = resolveBuildConfiguration(ctx, targets);
 
-  return {
-    bundleIdentifier: applicationTarget.bundleIdentifier,
-    applicationTarget,
-    applicationTargetBuildSettings,
-    targets,
-    xcodeBuildContext,
-  };
-}
-
-export async function prepareIosBuildAsync(
-  ctx: BuildContext<Platform.IOS>
-): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
-      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
+      return ensureIosCredentialsAsync(ctx, targets);
     },
-    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+    ensureProjectConfiguredAsync: async () => {
+      await validateAndSyncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
-        buildProfile: ctx.buildProfile,
-        buildSettings: ctx.ios.applicationTargetBuildSettings,
+        buildProfile,
+        buildSettings: buildConfiguration.buildSettings,
       });
     },
+    getMetadataContext: (): IosMetadataContext => {
+      return buildConfiguration;
+    },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.IOS>,
       jobData: JobData<IosCredentials>
     ): Promise<Job> => {
-      return await prepareJobAsync(ctx, {
-        ...jobData,
-        buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
-      });
+      return await prepareJobAsync(ctx, { ...jobData, buildScheme: xcodeBuildContext.buildScheme });
     },
     sendBuildRequestAsync: async (
       appId: string,
@@ -96,17 +90,23 @@ export async function prepareIosBuildAsync(
   });
 }
 
-function resolveBuildSettings(
-  ctx: CommonContext<Platform.IOS>,
-  applicationTarget: Target
-): XCBuildConfiguration['buildSettings'] {
+function resolveBuildConfiguration(
+  ctx: BuildContext<Platform.IOS>,
+  targets: Target[]
+): BuildConfiguration {
   if (ctx.workflow === Workflow.MANAGED) {
-    return {};
+    return { buildSettings: {} };
   }
+  const applicationTarget = findApplicationTarget(targets);
   const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
   const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
     targetName: applicationTarget.targetName,
     buildConfiguration: applicationTarget.buildConfiguration,
   });
-  return xcBuildConfiguration?.buildSettings ?? {};
+  const buildSettings = xcBuildConfiguration?.buildSettings ?? {};
+  return {
+    buildSettings,
+    targetName: applicationTarget.targetName,
+    buildConfiguration: applicationTarget.buildConfiguration,
+  };
 }

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

@@ -1,14 +1,34 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
+import { IosBuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
-import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import Log from '../../log';
+import {
+  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
+  warnIfBundleIdentifierDefinedInAppConfigForGenericProject,
+} from '../../project/ios/bundleIdentifier';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { ConfigureContext } from '../context';
+import { isExpoUpdatesInstalled } from '../utils/updates';
+import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync({
+export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
+  if (!ctx.hasIosNativeProject) {
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+    return;
+  }
+
+  warnIfBundleIdentifierDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+
+  if (isExpoUpdatesInstalled(ctx.projectDir)) {
+    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
+  }
+  Log.withTick('iOS project configured');
+}
+
+export async function validateAndSyncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
@@ -16,7 +36,7 @@ export async function syncProjectConfigurationAsync({
 }: {
   projectDir: string;
   exp: ExpoConfig;
-  buildProfile: BuildProfile<Platform.IOS>;
+  buildProfile: IosBuildProfile;
   buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);

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

@@ -20,11 +20,7 @@ export async function ensureIosCredentialsAsync(
     app: getAppFromContext(buildCtx.credentialsCtx),
     targets,
     iosCapabilitiesOptions: {
-      entitlements: await resolveEntitlementsJsonAsync(
-        buildCtx.projectDir,
-        buildCtx.workflow,
-        buildCtx.buildProfile.env ?? {}
-      ),
+      entitlements: await resolveEntitlementsJsonAsync(buildCtx.projectDir, buildCtx.workflow),
     },
     distribution: buildCtx.buildProfile.distribution ?? 'store',
     enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,

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

@@ -1,7 +1,12 @@
 import { Env, Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';
 
-import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
+import {
+  DistributionType,
+  IosBuildType,
+  IosJobInput,
+  IosJobSecretsInput,
+} from '../../graphql/generated';
 import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
@@ -11,19 +16,30 @@ export function transformJob(job: Ios.Job): IosJobInput {
     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,
+
+    buildType: job.buildType && transformBuildType(job.buildType),
     username: job.username,
-    developmentClient: job.developmentClient,
-    simulator: job.simulator,
-    experimental: job.experimental,
   };
 }
 
+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;
@@ -45,3 +61,11 @@ function transformIosSecrets(secrets: {
     environmentSecrets: secrets.env,
   };
 }
+
+function transformBuildType(buildType: Ios.BuildType): IosBuildType {
+  if (buildType === Ios.BuildType.DEVELOPMENT_CLIENT) {
+    return IosBuildType.DevelopmentClient;
+  } else {
+    return IosBuildType.Release;
+  }
+}

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

@@ -3,17 +3,12 @@ import plist from '@expo/plist';
 import fs from 'fs-extra';
 import path from 'path';
 
-export async function readPlistAsync(plistPath: string): Promise<object | null> {
+export async function readPlistAsync(plistPath: string): Promise<object> {
   if (await fs.pathExists(plistPath)) {
     const expoPlistContent = await fs.readFile(plistPath, 'utf8');
-    try {
-      return plist.parse(expoPlistContent);
-    } catch (err: any) {
-      err.message = `Failed to parse ${plistPath}. ${err.message}`;
-      throw err;
-    }
+    return plist.parse(expoPlistContent);
   } else {
-    return null;
+    return {};
   }
 }
 

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

@@ -5,7 +5,7 @@ import slash from 'slash';
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { getVcsClient } from '../../vcs';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -25,7 +25,7 @@ export async function prepareJobAsync(
   jobData: JobData
 ): Promise<Job> {
   const projectRootDirectory =
-    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
   const username = getUsername(ctx.exp, await ensureLoggedInAsync());
   const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
   if (jobData.credentials) {
@@ -40,6 +40,7 @@ export async function prepareJobAsync(
     platform: Platform.IOS,
     projectArchive: jobData.projectArchive,
     projectRootDirectory,
+    distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
     builderEnvironment: {
       image: ctx.buildProfile.image,
       node: ctx.buildProfile.node,
@@ -60,15 +61,15 @@ export async function prepareJobAsync(
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
     updates: { channel: ctx.buildProfile.channel },
-    developmentClient: ctx.buildProfile.developmentClient,
-    simulator: ctx.buildProfile.simulator,
+
     scheme: jobData.buildScheme,
     buildConfiguration: ctx.buildProfile.buildConfiguration,
     artifactPath: ctx.buildProfile.artifactPath,
+
+    buildType: ctx.buildProfile.developmentClient
+      ? Ios.BuildType.DEVELOPMENT_CLIENT
+      : Ios.BuildType.RELEASE,
     username,
-    experimental: {
-      prebuildCommand: ctx.buildProfile.prebuildCommand,
-    },
   };
   return sanitizeJob(job);
 }

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

@@ -8,9 +8,9 @@ import type { XCBuildConfiguration } from 'xcode';
 import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
-import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync } from '../utils/version';
+import { readPlistAsync, writePlistAsync } from './plist';
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -128,11 +128,7 @@ export async function maybeResolveVersionsAsync(
       appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
       appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
     };
-  } catch (err: any) {
-    Log.warn('Failed to read app versions.');
-    Log.debug(err);
-    Log.warn(err.message);
-    Log.warn('Proceeding anyway...');
+  } catch {
     return {};
   }
 }
@@ -178,7 +174,7 @@ async function readInfoPlistAsync(
   buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<IOSConfig.InfoPlist> {
   const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
+  return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
 }
 
 async function writeInfoPlistAsync({
@@ -201,12 +197,7 @@ function ensureStaticConfigExists(projectDir: string): void {
   }
 }
 
-export function evaluateTemplateString(
-  s: string,
-  buildSettings: XCBuildConfiguration['buildSettings']
-): string {
-  // necessary because XCBuildConfiguration['buildSettings'] is not a plain object
-  const vars = { ...buildSettings };
+export function evaluateTemplateString(s: string, vars: Record<string, any>): string {
   return s.replace(/\$\((\w+)\)/g, (match, key) => {
     if (vars.hasOwnProperty(key)) {
       const value = String(vars[key]);

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

@@ -1,80 +1,45 @@
 import { Job } from '@expo/eas-build-job';
 import spawnAsync from '@expo/spawn-async';
-import { ChildProcess } from 'child_process';
-import semver from 'semver';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
 
-import { ora } from '../ora';
+import Log from '../log';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.66';
 
-export interface LocalBuildOptions {
-  enable: boolean;
-  skipCleanup?: boolean;
-  skipNativeBuild?: boolean;
-  artifactsDir?: string;
-  artifactPath?: string;
-  workingdir?: string;
-  verbose?: boolean;
-}
-
-export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions): Promise<void> {
-  const { command, args } = await getCommandAndArgsAsync(job);
-  let spinner;
-  if (!options.verbose) {
-    spinner = ora().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
-  }
-  let childProcess: ChildProcess | undefined;
-  const interruptHandler = (): void => {
-    if (childProcess) {
-      childProcess.kill();
-    }
-  };
-  process.on('SIGINT', interruptHandler);
+export async function runLocalBuildAsync(job: Job): Promise<void> {
+  const execNameOrPath =
+    process.env.EAS_LOCAL_BUILD_PLUGIN_PATH ??
+    (await findWithNodeResolutionAsync()) ??
+    PLUGIN_PACKAGE_NAME;
   try {
-    const spawnPromise = spawnAsync(command, args, {
-      stdio: options.verbose ? 'inherit' : 'pipe',
-      env: {
-        ...process.env,
-        EAS_LOCAL_BUILD_WORKINGDIR: options.workingdir ?? process.env.EAS_LOCAL_BUILD_WORKINGDIR,
-        ...(options.skipCleanup || options.skipNativeBuild
-          ? { EAS_LOCAL_BUILD_SKIP_CLEANUP: '1' }
-          : {}),
-        ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
-        ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
-        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
-      },
+    const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
+    await spawnAsync(execNameOrPath, [arg], {
+      stdio: 'inherit',
     });
-    childProcess = spawnPromise.child;
-    await spawnPromise;
-  } finally {
-    process.removeListener('SIGINT', interruptHandler);
-    spinner?.stop();
-  }
-}
-
-async function getCommandAndArgsAsync(job: Job): Promise<{ command: string; args: string[] }> {
-  const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
-  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
-    return {
-      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-      args: [jobBase64],
-    };
-  } else {
-    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
-    if (await isAtLeastNpm7Async()) {
-      // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
-      // prompting the user to install a package that is used for the first time
-      args.unshift('-y');
+  } catch (err: any) {
+    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;
     }
-    return {
-      command: 'npx',
-      args,
-    };
   }
 }
 
-async function isAtLeastNpm7Async(): Promise<boolean> {
-  const version = (await spawnAsync('npm', ['--version'])).stdout.trim();
-  return semver.gte(version, '7.0.0');
+async function findWithNodeResolutionAsync(): 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,28 +1,49 @@
-import { Updates } from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
-import fs from 'fs-extra';
-import resolveFrom from 'resolve-from';
+import type { XCBuildConfiguration } from 'xcode';
 
-import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import { getApplicationIdAsync } from '../project/android/applicationId';
+import { GradleBuildContext } from '../project/android/gradle';
+import { getBundleIdentifierAsync } 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 '../update/android/UpdatesModule';
+} from './android/UpdatesModule';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
 import {
   readChannelSafelyAsync as readIosChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from '../update/ios/UpdatesModule';
-import { ensureLoggedInAsync } from '../user/actions';
-import { easCliVersion } from '../utils/easCli';
-import { getVcsClient } from '../vcs';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
-import { BuildContext } from './context';
+} from './ios/UpdatesModule';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { isExpoUpdatesInstalled } from './utils/updates';
+
+/**
+ * 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');
+
+export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
+  ? AndroidMetadataContext
+  : IosMetadataContext;
+
+export interface AndroidMetadataContext {
+  gradleContext?: GradleBuildContext;
+}
+export interface IosMetadataContext {
+  buildSettings: XCBuildConfiguration['buildSettings'];
+  targetName?: string;
+  buildConfiguration?: string;
+}
 
 export async function collectMetadataAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: BuildContext<T>,
+  platformContext: MetadataContext<T>
 ): Promise<Metadata> {
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   const distribution =
@@ -31,20 +52,18 @@ export async function collectMetadataAsync<T extends Platform>(
       : ctx.buildProfile.distribution) ?? 'store';
   const metadata = {
     trackingContext: ctx.trackingCtx,
-    ...(await maybeResolveVersionsAsync(ctx)),
-    cliVersion: easCliVersion,
+    ...(await maybeResolveVersionsAsync(ctx, platformContext)),
+    cliVersion: packageJSON.version,
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
-    reactNativeVersion: await getReactNativeVersionAsync(ctx),
+    runtimeVersion: ctx.exp.runtimeVersion,
     ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
-    appIdentifier: resolveAppIdentifier(ctx),
+    appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await getVcsClient().getCommitHashAsync(),
-    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
+    gitCommitHash: await vcs.getCommitHashAsync(),
     username: getUsername(ctx.exp, await ensureLoggedInAsync()),
     ...(ctx.platform === Platform.IOS && {
       iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
@@ -56,14 +75,15 @@ export async function collectMetadataAsync<T extends Platform>(
 }
 
 async function maybeResolveVersionsAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: BuildContext<T>,
+  platformContext: MetadataContext<T>
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
-    const iosContext = ctx as BuildContext<Platform.IOS>;
+    const iosContext = platformContext as IosMetadataContext;
     return await maybeResolveIosVersionsAsync(
       ctx.projectDir,
       ctx.exp,
-      iosContext.ios.applicationTargetBuildSettings
+      iosContext?.buildSettings ?? {}
     );
   } else if (ctx.platform === Platform.ANDROID) {
     const androidCtx = ctx as BuildContext<Platform.ANDROID>;
@@ -73,11 +93,19 @@ async function maybeResolveVersionsAsync<T extends Platform>(
   }
 }
 
-function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string {
+async function resolveAppIdentifierAsync<T extends Platform>(
+  ctx: BuildContext<T>,
+  platformContext: MetadataContext<T>
+): Promise<string> {
   if (ctx.platform === Platform.IOS) {
-    return (ctx as BuildContext<Platform.IOS>).ios.bundleIdentifier;
+    const iosContext = platformContext as IosMetadataContext;
+    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp, {
+      targetName: iosContext.targetName,
+      buildConfiguration: iosContext.buildConfiguration,
+    });
   } else {
-    return (ctx as BuildContext<Platform.ANDROID>).android.applicationId;
+    const androidContext = platformContext as AndroidMetadataContext;
+    return await getApplicationIdAsync(ctx.projectDir, ctx.exp, androidContext.gradleContext);
   }
 }
 
@@ -131,19 +159,6 @@ async function getNativeChannelAsync<T extends Platform>(
   return undefined;
 }
 
-async function getReactNativeVersionAsync(
-  ctx: BuildContext<Platform>
-): Promise<string | undefined> {
-  try {
-    const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
-    return (await fs.readJson(reactNativePackageJsonPath)).version;
-  } catch (err) {
-    Log.debug('Failed to resolve react-native version:');
-    Log.debug(err);
-    return undefined;
-  }
-}
-
 function resolveIosEnterpriseProvisioning(
   ctx: BuildContext<Platform.IOS>
 ): IosEnterpriseProvisioning | undefined {

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

@@ -1,262 +0,0 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, SubmitProfile } from '@expo/eas-json';
-import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-
-import { AppPlatform, BuildFragment, BuildStatus, SubmissionFragment } from '../graphql/generated';
-import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
-import Log from '../log';
-import {
-  RequestedPlatform,
-  appPlatformDisplayNames,
-  appPlatformEmojis,
-  toPlatforms,
-} from '../platform';
-import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
-import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
-import { createSubmissionContextAsync } from '../submit/context';
-import {
-  submitAsync,
-  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
-} from '../submit/submit';
-import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { printJsonOnlyOutput } from '../utils/json';
-import { ProfileData, getProfilesAsync } from '../utils/profiles';
-import { getVcsClient } from '../vcs';
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
-
-let metroConfigValidated = false;
-let sdkVersionChecked = false;
-
-export interface BuildFlags {
-  requestedPlatform: RequestedPlatform;
-  profile?: string;
-  nonInteractive: boolean;
-  wait: boolean;
-  clearCache: boolean;
-  json: boolean;
-  autoSubmit: boolean;
-  submitProfile?: string;
-  localBuildOptions: LocalBuildOptions;
-}
-
-export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFlags): Promise<void> {
-  await getVcsClient().ensureRepoExistsAsync();
-  await ensureRepoIsCleanAsync(flags.nonInteractive);
-
-  await ensureProjectConfiguredAsync({
-    projectDir,
-    nonInteractive: flags.nonInteractive,
-  });
-
-  const platforms = toPlatforms(flags.requestedPlatform);
-  const buildProfiles = await getProfilesAsync({
-    type: 'build',
-    projectDir,
-    platforms,
-    profileName: flags.profile ?? undefined,
-  });
-
-  await ensureExpoDevClientInstalledForDevClientBuildsAsync({
-    projectDir,
-    nonInteractive: flags.nonInteractive,
-    buildProfiles,
-  });
-
-  const startedBuilds: {
-    build: BuildFragment;
-    buildProfile: ProfileData<'build'>;
-  }[] = [];
-  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
-
-  for (const buildProfile of buildProfiles) {
-    const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
-      projectDir,
-      flags,
-      moreBuilds: platforms.length > 1,
-      buildProfile,
-    });
-    if (maybeBuild) {
-      startedBuilds.push({ build: maybeBuild, buildProfile });
-    }
-    buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
-  }
-
-  if (flags.localBuildOptions.enable) {
-    return;
-  }
-
-  Log.newLine();
-  printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
-  Log.newLine();
-
-  const submissions: SubmissionFragment[] = [];
-  if (flags.autoSubmit) {
-    const submitProfiles = await getProfilesAsync({
-      projectDir,
-      platforms,
-      profileName: flags.submitProfile,
-      type: 'submit',
-    });
-    for (const startedBuild of startedBuilds) {
-      const submitProfile = nullthrows(
-        submitProfiles.find(
-          ({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
-        )
-      ).profile;
-      const submission = await prepareAndStartSubmissionAsync({
-        build: startedBuild.build,
-        buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
-        moreBuilds: startedBuilds.length > 1,
-        projectDir,
-        buildProfile: startedBuild.buildProfile.profile,
-        submitProfile,
-        nonInteractive: flags.nonInteractive,
-      });
-      submissions.push(submission);
-    }
-
-    Log.newLine();
-    printSubmissionDetailsUrls(submissions);
-    Log.newLine();
-  }
-
-  if (!flags.wait) {
-    if (flags.json) {
-      printJsonOnlyOutput(startedBuilds.map(buildInfo => buildInfo.build));
-    }
-    return;
-  }
-
-  const builds = await waitForBuildEndAsync(startedBuilds.map(({ build }) => build.id));
-  printBuildResults(builds, flags.json);
-
-  const haveAllBuildsFailedOrCanceled = builds.every(
-    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
-  );
-  if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
-    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
-  } else {
-    // the following function also exits with non zero code if any of the submissions failed
-    await waitForSubmissionsToCompleteAsync(submissions);
-  }
-}
-
-async function prepareAndStartBuildAsync({
-  projectDir,
-  flags,
-  moreBuilds,
-  buildProfile,
-}: {
-  projectDir: string;
-  flags: BuildFlags;
-  moreBuilds: boolean;
-  buildProfile: ProfileData<'build'>;
-}): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
-  const buildCtx = await createBuildContextAsync({
-    buildProfileName: buildProfile.profileName,
-    clearCache: flags.clearCache,
-    buildProfile: buildProfile.profile,
-    nonInteractive: flags.nonInteractive,
-    platform: buildProfile.platform,
-    projectDir,
-    localBuildOptions: flags.localBuildOptions,
-  });
-
-  if (moreBuilds) {
-    Log.newLine();
-    const appPlatform = toAppPlatform(buildProfile.platform);
-    Log.log(
-      `${appPlatformEmojis[appPlatform]} ${chalk.bold(
-        `${appPlatformDisplayNames[appPlatform]} build`
-      )}`
-    );
-  }
-
-  if (buildCtx.workflow === Workflow.MANAGED) {
-    if (!sdkVersionChecked) {
-      await checkExpoSdkIsSupportedAsync(buildCtx);
-      sdkVersionChecked = true;
-    }
-    if (!metroConfigValidated) {
-      await validateMetroConfigForManagedWorkflowAsync(buildCtx);
-      metroConfigValidated = true;
-    }
-  }
-
-  const build = await startBuildAsync(buildCtx);
-  return {
-    build,
-    buildCtx,
-  };
-}
-
-async function startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
-  let sendBuildRequestAsync: BuildRequestSender;
-  if (ctx.platform === Platform.ANDROID) {
-    sendBuildRequestAsync = await prepareAndroidBuildAsync(ctx as BuildContext<Platform.ANDROID>);
-  } else {
-    sendBuildRequestAsync = await prepareIosBuildAsync(ctx as BuildContext<Platform.IOS>);
-  }
-  return await sendBuildRequestAsync();
-}
-
-async function prepareAndStartSubmissionAsync({
-  build,
-  buildCtx,
-  moreBuilds,
-  projectDir,
-  buildProfile,
-  submitProfile,
-  nonInteractive,
-}: {
-  build: BuildFragment;
-  buildCtx: BuildContext<Platform>;
-  moreBuilds: boolean;
-  projectDir: string;
-  buildProfile: BuildProfile;
-  submitProfile: SubmitProfile;
-  nonInteractive: boolean;
-}): Promise<SubmissionFragment> {
-  const platform = toPlatform(build.platform);
-  const submissionCtx = await createSubmissionContextAsync({
-    platform,
-    projectDir,
-    projectId: build.project.id,
-    profile: submitProfile,
-    archiveFlags: { id: build.id },
-    nonInteractive,
-    env: buildProfile.env,
-    credentialsCtx: buildCtx.credentialsCtx,
-    applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
-  });
-
-  if (moreBuilds) {
-    Log.newLine();
-    Log.log(
-      `${appPlatformEmojis[build.platform]} ${chalk.bold(
-        `${appPlatformDisplayNames[build.platform]} submission`
-      )}`
-    );
-  }
-
-  return await submitAsync(submissionCtx);
-}
-
-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/types.ts

@@ -12,3 +12,5 @@ export enum BuildDistributionType {
   INTERNAL = 'internal',
   SIMULATOR = 'simulator',
 }
+
+export type TrackingContext = Record<string, string | number | boolean>;

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

@@ -0,0 +1,29 @@
+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',
+
+  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
+}
+
+export default {
+  logEvent(name: Event, properties: Record<string, any>) {
+    logEvent(name, properties);
+  },
+};

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

@@ -1,6 +1,6 @@
 import * as ExpoConfig from '@expo/config';
-import JsonFile from '@expo/json-file';
 import assert from 'assert';
+import fs from 'fs-extra';
 
 export async function updateAppJsonConfigAsync(
   {
@@ -15,19 +15,10 @@ export async function updateAppJsonConfigAsync(
   const paths = ExpoConfig.getConfigFilePaths(projectDir);
   assert(paths.staticConfigPath, "can't update dynamic config");
 
-  const rawStaticConfig = readAppJson(paths.staticConfigPath);
+  const rawStaticConfig = await fs.readJSON(paths.staticConfigPath);
   rawStaticConfig.expo = rawStaticConfig.expo ?? {};
   modifyConfig(rawStaticConfig.expo);
-  await JsonFile.writeAsync(paths.staticConfigPath, rawStaticConfig, { json5: false });
+  await fs.writeJson(paths.staticConfigPath, rawStaticConfig, { spaces: 2 });
 
   modifyConfig(exp);
 }
-
-// TODO: remove this once @expo/config exports getStaticConfig
-export function readAppJson(appJsonPath: string): any {
-  const config = JsonFile.read(appJsonPath, { json5: true });
-  if (config) {
-    return config as any;
-  }
-  throw new Error(`Failed to read app.json`);
-}

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

@@ -1,5 +1,6 @@
-import { Workflow } from '@expo/eas-build-job';
-import { Errors } from '@oclif/core';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
@@ -8,38 +9,40 @@ import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync } from '../../prompts';
-import { expoCommandAsync } from '../../utils/expoCli';
-import { ProfileData } from '../../utils/profiles';
-import { getVcsClient } from '../../vcs';
+import { expoCommandAsync } from '../../utils/expoCommand';
+import zipObject from '../../utils/expodash/zipObject';
 import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,
+  platforms,
+  profile,
   nonInteractive = false,
-  buildProfiles = [],
 }: {
   projectDir: string;
+  platforms: Platform[];
+  profile: string;
   nonInteractive?: boolean;
-  buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
   if (await isExpoDevClientInstalledAsync(projectDir)) {
     return;
   }
 
-  const buildProfilesWithDevelopmentClientRequired = buildProfiles.filter(
-    buildProfile => buildProfile.profile.developmentClient
+  const easJsonReader = new EasJsonReader(projectDir);
+  const devClientPerPlatformList = await Promise.all(
+    platforms.map(async platform => {
+      const buildProfile = await easJsonReader.readBuildProfileAsync(platform, profile);
+      return buildProfile.developmentClient ?? false;
+    })
   );
 
-  const isDevelopmentClientRequired = buildProfilesWithDevelopmentClientRequired.some(Boolean);
-
-  if (!isDevelopmentClientRequired) {
+  const isDevClientRequired = devClientPerPlatformList.some(i => i);
+  if (!isDevClientRequired) {
     return;
   }
 
-  const platformsToCheck = buildProfilesWithDevelopmentClientRequired.map(
-    ({ platform }) => platform
-  );
-
+  const devClientPerPlatform = zipObject(platforms, devClientPerPlatformList);
+  const platformsToCheck = platforms.filter(platform => devClientPerPlatform[platform]);
   const workflowPerPlatformList = await Promise.all(
     platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
   );
@@ -64,15 +67,15 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
     if (install) {
       await installExpoDevClientAsync(projectDir, { nonInteractive });
     } else {
-      Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
+      error(`Install ${chalk.bold('expo-dev-client')} on your own and come back later.`, {
         exit: 1,
       });
     }
   } else {
-    Log.warn(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
+    Log.warn(`Unfortunately, you need to install ${chalk.bold('expo-dev-client')} on your own.`);
     Log.warn(
       learnMore('https://docs.expo.dev/clients/installation/', {
-        learnMoreMessage: 'See installation instructions on how to do it.',
+        learnMoreMessage: 'See installation instructions on how to do it',
         dim: false,
       })
     );
@@ -83,7 +86,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
       initial: false,
     });
     if (!shouldContinue) {
-      Errors.error('Come back later', { exit: 1 });
+      error('Come back later', { exit: 1 });
     }
   }
 }
@@ -107,9 +110,7 @@ async function installExpoDevClientAsync(
   Log.newLine();
   await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
   Log.newLine();
-  if (await getVcsClient().isCommitRequiredAsync()) {
-    await reviewAndCommitChangesAsync('Install expo-dev-client', {
-      nonInteractive,
-    });
-  }
+  await reviewAndCommitChangesAsync('Install expo-dev-client', {
+    nonInteractive,
+  });
 }

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

@@ -120,5 +120,11 @@ export function formatGraphQLBuild(build: BuildFragment): string {
 }
 
 const getActorName = (build: BuildFragment): string => {
-  return build.initiatingActor?.displayName || 'unknown';
+  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/repository.ts

@@ -10,10 +10,10 @@ import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import { getVcsClient } from '../../vcs';
+import vcs from '../../vcs';
 
 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
-  if (!(await getVcsClient().isCommitRequiredAsync())) {
+  if (!(await vcs.hasUncommittedChangesAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -33,7 +33,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
 }
 
 export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (!(await getVcsClient().isCommitRequiredAsync())) {
+  if (!(await vcs.hasUncommittedChangesAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -70,7 +70,7 @@ export async function commitPromptAsync({
     initial: initialCommitMessage,
     validate: (input: string) => input !== '',
   });
-  await getVcsClient().commitAsync({ commitAllFiles, commitMessage: message });
+  await vcs.commitAsync({ commitAllFiles, commitMessage: message });
 }
 
 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -95,7 +95,7 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
   startTimer(compressTimerLabel);
 
   try {
-    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
+    await vcs.makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
@@ -133,11 +133,7 @@ export async function reviewAndCommitChangesAsync(
   { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
   if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await getVcsClient().commitAsync({
-      commitMessage: initialCommitMessage,
-      commitAllFiles: false,
-      nonInteractive,
-    });
+    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
     Log.withTick('Committed changes.');
     return;
   }
@@ -170,7 +166,7 @@ export async function reviewAndCommitChangesAsync(
     await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes.');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await getVcsClient().showDiffAsync();
+    await vcs.showDiffAsync();
     await reviewAndCommitChangesAsync(initialCommitMessage, {
       nonInteractive,
       askedFirstTime: false,

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

@@ -0,0 +1,14 @@
+import { ExpoConfig, getPackageJson } from '@expo/config';
+
+export function isExpoUpdatesInstalled(projectDir: string): boolean {
+  const packageJson = getPackageJson(projectDir);
+  return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
+}
+
+export function ensureValidVersions(exp: ExpoConfig): void {
+  if (!exp.runtimeVersion && !exp.sdkVersion) {
+    throw new Error(
+      "Couldn't find either 'runtimeVersion' or 'sdkVersion' to configure 'expo-updates'. Please specify at least one of these properties under the 'expo' key in 'app.json'"
+    );
+  }
+}

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

@@ -22,7 +22,7 @@ export function getArtifactUrl(artifactId: string): string {
 
 export function getInternalDistributionInstallUrl(build: BuildFragment): string {
   if (build.platform === AppPlatform.Ios) {
-    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/v2/projects/${
+    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/--/api/v2/projects/${
       build.project.id
     }/builds/${build.id}/manifest.plist`;
   }

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

@@ -3,10 +3,10 @@ import fs from 'fs-extra';
 import path from 'path';
 
 import Log, { learnMore } from '../log';
-import { getVcsClient } from '../vcs';
-import { CommonContext } from './context';
+import vcs from '../vcs';
+import { BuildContext } from './context';
 
-export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
+export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {
     Log.warn(
       'You set NODE_ENV=production in the build profile. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
@@ -16,7 +16,7 @@ export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
 }
 
 export async function checkGoogleServicesFileAsync<T extends Platform>(
-  ctx: CommonContext<T>
+  ctx: BuildContext<T>
 ): Promise<void> {
   if (ctx.workflow === Workflow.GENERIC || ctx.buildProfile?.env?.GOOGLE_SERVICES_FILE) {
     return;
@@ -25,12 +25,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
+  const rootDir = path.normalize(await vcs.getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&
     (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await getVcsClient().isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await vcs.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
   ) {
     Log.warn(
       `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
@@ -41,7 +41,7 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
       )}`
     );
     Log.warn(
-      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
+      'If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.'
     );
     Log.newLine();
   }

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

@@ -1,19 +1,13 @@
-import { EasJsonReader } from '@expo/eas-json';
-import { Command } from '@oclif/core';
-import semver from 'semver';
+import { Command } from '@oclif/command';
 
 import {
   AnalyticsEvent,
   flushAsync as flushAnalyticsAsync,
   initAsync as initAnalyticsAsync,
   logEvent,
-} from '../analytics/rudderstackClient';
-import { findProjectRootAsync } from '../project/projectUtils';
+} from '../analytics';
 import { getUserAsync } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
-import { easCliVersion } from '../utils/easCli';
-import { setVcsClient } from '../vcs';
-import GitClient from '../vcs/clients/git';
 
 export default abstract class EasCommand extends Command {
   /**
@@ -21,19 +15,15 @@ export default abstract class EasCommand extends Command {
    * force the user to log in
    */
   protected requiresAuthentication = true;
-  protected mustBeRunInsideProject = true;
 
   protected abstract runAsync(): Promise<any>;
 
   // eslint-disable-next-line async-protect/async-suffix
   async run(): Promise<any> {
     await initAnalyticsAsync();
-    if (this.mustBeRunInsideProject) {
-      await this.applyCliConfigAsync();
-    }
 
     if (this.requiresAuthentication) {
-      const { flags } = await this.parse();
+      const { flags } = this.parse();
       const nonInteractive = (flags as any)['non-interactive'] ?? false;
       await ensureLoggedInAsync({ nonInteractive });
     } else {
@@ -52,18 +42,4 @@ export default abstract class EasCommand extends Command {
     await flushAnalyticsAsync();
     return super.finally(err);
   }
-
-  private async applyCliConfigAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync();
-    const easJsonReader = new EasJsonReader(projectDir);
-    const config = await easJsonReader.getCliConfigAsync();
-    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
-      throw new Error(
-        `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
-      );
-    }
-    if (config?.requireCommit) {
-      setVcsClient(new GitClient());
-    }
-  }
 }

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

@@ -1,5 +1,5 @@
 import { asMock } from '../../__tests__/utils';
-import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
+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';
@@ -10,8 +10,8 @@ TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
 
 jest.mock('../../user/User');
 jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
-jest.mock('../../analytics/rudderstackClient', () => {
-  const { AnalyticsEvent } = jest.requireActual('../../analytics/rudderstackClient');
+jest.mock('../../analytics', () => {
+  const { AnalyticsEvent } = jest.requireActual('../../analytics');
   return {
     AnalyticsEvent,
     logEvent: jest.fn(),

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

@@ -6,7 +6,6 @@ export default class AccountLogin extends EasCommand {
   static description = 'log in with your Expo account';
   static aliases = ['login'];
 
-  protected mustBeRunInsideProject = false;
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {

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

@@ -6,7 +6,6 @@ export default class AccountLogout extends EasCommand {
   static description = 'log out';
   static aliases = ['logout'];
 
-  protected mustBeRunInsideProject = false;
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {

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

@@ -8,7 +8,6 @@ export default class AccountView extends EasCommand {
   static description = 'show the username you are logged in as';
   static aliases = ['whoami'];
 
-  protected mustBeRunInsideProject = false;
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {

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

@@ -3,14 +3,14 @@ import Log from '../log';
 import UserSettings from '../user/UserSettings';
 
 export default class AnalyticsView extends EasCommand {
-  static description = 'display or change analytics settings';
+  static description = 'view or change analytics settings';
 
   static args = [{ name: 'STATUS', options: ['on', 'off'] }];
 
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {
-    const { STATUS: status } = (await this.parse(AnalyticsView)).args;
+    const { STATUS: status } = this.parse(AnalyticsView).args;
     if (status) {
       await UserSettings.setAsync('analyticsEnabled', status === 'on');
       Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -17,8 +17,7 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getVcsClient } from '../../vcs';
+import vcs from '../../vcs';
 
 export async function createUpdateBranchOnAppAsync({
   appId,
@@ -52,7 +51,8 @@ export async function createUpdateBranchOnAppAsync({
 }
 
 export default class BranchCreate extends EasCommand {
-  static description = 'create a branch';
+  static hidden = true;
+  static description = 'Create a branch on the current project.';
 
   static args = [
     {
@@ -63,7 +63,7 @@ export default class BranchCreate extends EasCommand {
   ];
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'return a json with the new branch ID and name.',
       default: false,
     }),
@@ -73,10 +73,7 @@ export default class BranchCreate extends EasCommand {
     let {
       args: { name },
       flags,
-    } = await this.parse(BranchCreate);
-    if (flags.json) {
-      enableJsonOutput();
-    }
+    } = this.parse(BranchCreate);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -93,8 +90,7 @@ export default class BranchCreate extends EasCommand {
         name: 'name',
         message: 'Please name the branch:',
         initial:
-          (await getVcsClient().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),
       }));
     }
@@ -102,11 +98,12 @@ export default class BranchCreate extends EasCommand {
     const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });
 
     if (flags.json) {
-      printJsonOnlyOutput(newBranch);
-    } else {
-      Log.withTick(
-        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
-      );
+      Log.log(newBranch);
+      return;
     }
+
+    Log.withTick(
+      `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
+    );
   }
 }

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -19,7 +19,6 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 async function getBranchInfoAsync({
   appId,
@@ -44,8 +43,7 @@ async function getBranchInfoAsync({
         {
           appId,
           name,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
+        }
       )
       .toPromise()
   );
@@ -77,7 +75,8 @@ async function deleteBranchOnAppAsync({
 }
 
 export default class BranchDelete extends EasCommand {
-  static description = 'delete a branch';
+  static hidden = true;
+  static description = 'Republish an update group';
 
   static args = [
     {
@@ -87,7 +86,7 @@ export default class BranchDelete extends EasCommand {
     },
   ];
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: `return JSON with the edited branch's ID and name.`,
       default: false,
     }),
@@ -97,10 +96,7 @@ export default class BranchDelete extends EasCommand {
     let {
       args: { name },
       flags: { json: jsonFlag },
-    } = await this.parse(BranchDelete);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(BranchDelete);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -145,11 +141,11 @@ export default class BranchDelete extends EasCommand {
     });
 
     if (jsonFlag) {
-      printJsonOnlyOutput(deletionResult);
-    } else {
-      Log.withTick(
-        `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
-      );
+      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,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import CliTable from 'cli-table3';
 import { print } from 'graphql';
@@ -16,7 +16,6 @@ import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 const BRANCHES_LIMIT = 10_000;
 
@@ -45,8 +44,7 @@ export async function listBranchesAsync({
         {
           appId: projectId,
           limit: BRANCHES_LIMIT,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
+        }
       )
       .toPromise()
   );
@@ -55,30 +53,29 @@ export async function listBranchesAsync({
 }
 
 export default class BranchList extends EasCommand {
-  static description = 'list all branches';
+  static hidden = true;
+
+  static description = 'List all branches on this project.';
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'return output as JSON',
       default: false,
     }),
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BranchList);
-    if (flags.json) {
-      enableJsonOutput();
-    }
+    const { flags } = this.parse(BranchList);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const branches = await listBranchesAsync({ projectId });
     if (flags.json) {
-      printJsonOnlyOutput(branches);
+      Log.log(JSON.stringify(branches, null, 2));
     } else {
       const table = new CliTable({
-        head: ['Branch', ...UPDATE_COLUMNS],
+        head: ['branch', ...UPDATE_COLUMNS],
         wordWrap: true,
       });
 

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

@@ -1,10 +1,472 @@
+import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
+import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
+import { flags } from '@oclif/command';
+import assert from 'assert';
+import chalk from 'chalk';
+import dateFormat from 'dateformat';
+import gql from 'graphql-tag';
+
 import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  GetUpdateGroupAsyncQuery,
+  Robot,
+  RootQueryUpdatesByGroupArgs,
+  Update,
+  UpdateInfoGroup,
+  User,
+  ViewBranchQuery,
+} from '../../graphql/generated';
+import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import {
+  PublishPlatform,
+  buildBundlesAsync,
+  buildUnsortedUpdateInfoGroupAsync,
+  collectAssetsAsync,
+  uploadAssetsAsync,
+} from '../../project/publish';
+import { promptAsync, selectAsync } from '../../prompts';
+import { formatUpdate } from '../../update/utils';
+import uniqBy from '../../utils/expodash/uniqBy';
+import formatFields from '../../utils/formatFields';
+import vcs from '../../vcs';
+import { createUpdateBranchOnAppAsync } from './create';
+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;
+}
+
+async function ensureBranchExistsAsync({
+  appId,
+  name: branchName,
+}: {
+  appId: string;
+  name: string;
+}): Promise<{
+  id: string;
+  updates: Exclude<
+    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates'];
+}> {
+  const { app } = await viewUpdateBranchAsync({
+    appId,
+    name: branchName,
+  });
+  const updateBranch = app?.byId.updateBranchByName;
+  if (updateBranch) {
+    const { id, updates } = updateBranch;
+    return { id, updates };
+  }
+
+  const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
+  return { id: newUpdateBranch.id, updates: [] };
+}
 
 export default class BranchPublish extends EasCommand {
-  static description = 'deprecated, use "eas update"';
   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,
+    }),
+    'skip-bundler': flags.boolean({
+      description: `skip running Expo CLI to bundle the app before publishing`,
+      default: false,
+    }),
+    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 new update group.`,
+      default: false,
+    }),
+    auto: flags.boolean({
+      description:
+        'use the current git branch and commit message for the EAS branch and update message',
+      default: false,
+    }),
+  };
 
   async runAsync(): Promise<void> {
-    throw new Error(BranchPublish.description);
+    let {
+      args: { name: branchName },
+      flags: {
+        json: jsonFlag,
+        auto: autoFlag,
+        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();
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+      isPublicConfig: true,
+    });
+
+    const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);
+
+    const projectId = await getProjectIdAsync(exp);
+
+    if (!branchName && autoFlag) {
+      branchName =
+        (await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`;
+    }
+
+    if (!branchName) {
+      const validationMessage = 'branch name may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+
+      const branches = await listBranchesAsync({ projectId });
+      branchName = 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(branchName, 'branch name must be specified.');
+    }
+
+    const { id: branchId, updates } = await ensureBranchExistsAsync({
+      appId: projectId,
+      name: branchName,
+    });
+
+    let unsortedUpdateInfoGroups: 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 "${branchName}" 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 "${branchName}" 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;
+
+        unsortedUpdateInfoGroups[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 = await collectAssetsAsync({ inputDir: inputDir!, platforms });
+        await uploadAssetsAsync(assets);
+        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
+        assetSpinner.succeed('Uploaded assets!');
+      } catch (e) {
+        assetSpinner.fail('Failed to upload assets');
+        throw e;
+      }
+    }
+
+    if (!message && autoFlag) {
+      message = (await vcs.getLastCommitMessageAsync())?.trim();
+    }
+
+    if (!message) {
+      const validationMessage = 'publish message may not be empty.';
+      if (jsonFlag) {
+        throw new Error(validationMessage);
+      }
+      ({ publishMessage: message } = await promptAsync({
+        type: 'text',
+        name: 'publishMessage',
+        message: `Please enter a publication message.`,
+        initial: republish
+          ? `Republish "${oldMessage!}" - group: ${group}`
+          : (await vcs.getLastCommitMessageAsync())?.trim(),
+        validate: value => (value ? true : validationMessage),
+      }));
+    }
+
+    const runtimeToPlatformMapping: Record<string, string[]> = {};
+    for (const runtime of new Set(Object.values(runtimeVersions))) {
+      runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
+        .filter(pair => pair[1] === runtime)
+        .map(pair => pair[0]);
+    }
+
+    // Sort the updates into different groups based on their platform specific runtime versions
+    const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
+      const localUpdateInfoGroup = Object.fromEntries(
+        platforms.map(platform => [
+          platform,
+          unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
+        ])
+      );
+
+      if (republish && !oldRuntimeVersion) {
+        throw new Error(
+          'Can not find the runtime version of the update group that is being republished.'
+        );
+      }
+      return {
+        branchId,
+        updateInfoGroup: localUpdateInfoGroup,
+        runtimeVersion: republish ? oldRuntimeVersion : runtime,
+        message,
+      };
+    });
+    let newUpdates;
+    const publishSpinner = ora('Publishing...').start();
+    try {
+      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
+      publishSpinner.succeed('Published!');
+    } catch (e) {
+      publishSpinner.fail('Failed to published updates');
+      throw e;
+    }
+
+    if (jsonFlag) {
+      Log.log(JSON.stringify(newUpdates));
+    } else {
+      if (new Set(newUpdates.map(update => update.group)).size > 1) {
+        Log.addNewLineIfNone();
+        Log.log(
+          '👉 Since multiple runtime versions are defined, multiple update groups have been published.'
+        );
+      }
+
+      Log.addNewLineIfNone();
+      for (const runtime of new Set(Object.values(runtimeVersions))) {
+        const platforms = newUpdates
+          .filter(update => update.runtimeVersion === runtime)
+          .map(update => update.platform);
+        const newUpdate = newUpdates.find(update => update.runtimeVersion === runtime);
+        if (!newUpdate) {
+          throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
+        }
+        Log.log(
+          formatFields([
+            { label: 'branch', value: branchName },
+            { label: 'runtime version', value: runtime },
+            { label: 'platform', value: platforms.join(',') },
+            { label: 'update group ID', value: newUpdate.group },
+            { label: 'message', value: message },
+          ])
+        );
+        Log.addNewLineIfNone();
+      }
+    }
   }
 }
+
+function getRuntimeVersionObject(
+  exp: ExpoConfig,
+  platformFlag: string,
+  projectDir: string
+): Record<string, string> {
+  let { runtimeVersion: defaultRuntimeVersion, 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 (!defaultRuntimeVersion && sdkVersion && isManagedProject) {
+    Log.withTick('Generating runtime version from sdk version');
+    defaultRuntimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
+  }
+  const iOSRuntimeVersion = (exp as any).ios?.runtimeVersion; // TODO-JJ remove cast to any
+  const androidRuntimeVersion = (exp as any).android?.runtimeVersion; // TODO-JJ remove cast to any
+  let runtimeVersions: Record<string, string>;
+  switch (platformFlag) {
+    case 'ios': {
+      runtimeVersions = {
+        ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
+      };
+      break;
+    }
+    case 'android': {
+      runtimeVersions = {
+        android: androidRuntimeVersion ?? defaultRuntimeVersion,
+      };
+      break;
+    }
+    case 'all': {
+      runtimeVersions = {
+        ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
+        android: androidRuntimeVersion ?? defaultRuntimeVersion,
+      };
+      break;
+    }
+    default:
+      throw new Error('Platform flag must be "ios", "android", or "all"');
+  }
+  if (Object.values(runtimeVersions).some(runtime => !runtime)) {
+    throw new Error(
+      "Couldn't find a 'runtimeVersion' for every platform. Please specify it under the 'expo' key in 'app.json'"
+    );
+  }
+  if (Object.values(runtimeVersions).some(runtime => typeof runtime !== 'string')) {
+    throw new Error(
+      `Please ensure that all of the runtime versions defined in the app.json are strings.`
+    );
+  }
+
+  return runtimeVersions;
+}
+
+function formatUpdateTitle(
+  update: Exclude<
+    Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates'][number]
+): string {
+  const { message, createdAt, actor, runtimeVersion } = update;
+
+  let actorName: string;
+  switch (actor?.__typename) {
+    case 'User': {
+      actorName = (actor as Pick<User, 'username' | 'id'>).username;
+      break;
+    }
+    case 'Robot': {
+      const { firstName, id } = actor as Pick<Robot, 'firstName' | 'id'>;
+      actorName = firstName ?? `robot: ${id.slice(0, 4)}...`;
+      break;
+    }
+    default:
+      actorName = 'unknown';
+  }
+  return `[${dateFormat(
+    createdAt,
+    'mmm dd HH:MM'
+  )} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
+}

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -18,7 +18,6 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 async function renameUpdateBranchOnAppAsync({
   appId,
@@ -52,18 +51,19 @@ async function renameUpdateBranchOnAppAsync({
 }
 
 export default class BranchRename extends EasCommand {
-  static description = 'rename a branch';
+  static hidden = true;
+  static description = 'Rename a branch.';
 
   static flags = {
-    from: Flags.string({
+    from: flags.string({
       description: 'current name of the branch.',
       required: false,
     }),
-    to: Flags.string({
+    to: flags.string({
       description: 'new name of the branch.',
       required: false,
     }),
-    json: Flags.boolean({
+    json: flags.boolean({
       description: `return a json with the edited branch's ID and name.`,
       default: false,
     }),
@@ -72,10 +72,7 @@ export default class BranchRename extends EasCommand {
   async runAsync(): Promise<void> {
     let {
       flags: { json: jsonFlag, from: currentName, to: newName },
-    } = await this.parse(BranchRename);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(BranchRename);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -115,13 +112,14 @@ export default class BranchRename extends EasCommand {
     });
 
     if (jsonFlag) {
-      printJsonOnlyOutput(editedBranch);
-    } else {
-      Log.withTick(
-        `️Renamed branch from ${currentName} to ${chalk.bold(
-          editedBranch.name
-        )} on project ${chalk.bold(fullName)}.`
-      );
+      Log.log(JSON.stringify(editedBranch));
+      return;
     }
+
+    Log.withTick(
+      `️Renamed branch from ${currentName} to ${chalk.bold(
+        editedBranch.name
+      )} on project ${chalk.bold(fullName)}.`
+    );
   }
 }

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

@@ -1,20 +1,73 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import Table from 'cli-table3';
+import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { ViewBranchQuery, ViewBranchQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 import groupBy from '../../utils/expodash/groupBy';
 import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+const PAGE_LIMIT = 10_000;
+
+export async function viewUpdateBranchAsync({
+  appId,
+  name,
+}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<ViewBranchQuery> {
+  const data = await withErrorHandlingAsync(
+    graphqlClient
+      .query<ViewBranchQuery, ViewBranchQueryVariables>(
+        gql`
+          query ViewBranch($appId: String!, $name: String!, $limit: Int!) {
+            app {
+              byId(appId: $appId) {
+                id
+                updateBranchByName(name: $name) {
+                  id
+                  name
+                  updates(offset: 0, limit: $limit) {
+                    id
+                    group
+                    message
+                    createdAt
+                    runtimeVersion
+                    platform
+                    manifestFragment
+                    actor {
+                      id
+                      ... on User {
+                        username
+                      }
+                      ... on Robot {
+                        firstName
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        `,
+        {
+          appId,
+          name,
+          limit: PAGE_LIMIT,
+        }
+      )
+      .toPromise()
+  );
+  return data;
+}
 
 export default class BranchView extends EasCommand {
-  static description = 'view a branch';
+  static hidden = true;
+  static description = 'View a branch.';
 
   static args = [
     {
@@ -25,7 +78,7 @@ export default class BranchView extends EasCommand {
   ];
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: `return a json with the branch's ID name and recent update groups.`,
       default: false,
     }),
@@ -35,10 +88,7 @@ export default class BranchView extends EasCommand {
     let {
       args: { name },
       flags: { json: jsonFlag },
-    } = await this.parse(BranchView);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(BranchView);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -57,7 +107,7 @@ export default class BranchView extends EasCommand {
       }));
     }
 
-    const { app } = await UpdateQuery.viewBranchAsync({
+    const { app } = await viewUpdateBranchAsync({
       appId: projectId,
       name,
     });
@@ -71,36 +121,37 @@ export default class BranchView extends EasCommand {
     );
 
     if (jsonFlag) {
-      printJsonOnlyOutput({ ...UpdateBranch, updates });
-    } else {
-      const groupTable = new Table({
-        head: UPDATE_COLUMNS,
-        wordWrap: true,
-      });
-
-      for (const update of updates) {
-        groupTable.push([
-          formatUpdate(update),
-          update.runtimeVersion,
-          update.group,
-          getPlatformsForGroup({
-            updates: UpdateBranch.updates,
-            group: update.group,
-          }),
-        ]);
-      }
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branch:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: UpdateBranch.name },
-          { label: 'ID', value: UpdateBranch.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Recently published update groups:'));
-      Log.log(groupTable.toString());
+      Log.log(JSON.stringify({ ...UpdateBranch, updates }));
+      return;
     }
+
+    const groupTable = new Table({
+      head: UPDATE_COLUMNS,
+      wordWrap: true,
+    });
+
+    for (const update of updates) {
+      groupTable.push([
+        formatUpdate(update),
+        update.runtimeVersion,
+        update.group,
+        getPlatformsForGroup({
+          updates: UpdateBranch.updates,
+          group: update.group,
+        }),
+      ]);
+    }
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branch:'));
+    Log.log(
+      formatFields([
+        { label: 'Name', value: UpdateBranch.name },
+        { label: 'ID', value: UpdateBranch.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Recently published update groups:'));
+    Log.log(groupTable.toString());
   }
 }

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

@@ -110,12 +110,12 @@ async function ensureBuildExistsAsync(buildId: string): Promise<void> {
 }
 
 export default class BuildCancel extends EasCommand {
-  static description = 'cancel a build';
+  static description = 'Cancel a build.';
 
   static args = [{ name: 'BUILD_ID' }];
 
   async runAsync(): Promise<void> {
-    const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
+    const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });

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

@@ -1,25 +1,18 @@
-import { getConfig } from '@expo/config';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
-import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
-import { ensureProjectConfiguredAsync } from '../../build/configure';
+import { configureAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils';
-import { resolveWorkflowAsync } from '../../project/workflow';
+import { findProjectRootAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
-import { getVcsClient } from '../../vcs';
 
 export default class BuildConfigure extends EasCommand {
-  static description = 'configure the project to support EAS Build';
+  static description = 'Configure the project to support EAS Build.';
 
   static flags = {
-    platform: Flags.enum({
+    platform: flags.enum({
       description: 'Platform to configure',
       char: 'p',
       options: ['android', 'ios', 'all'],
@@ -27,65 +20,47 @@ export default class BuildConfigure extends EasCommand {
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildConfigure);
-
+    const { flags } = this.parse(BuildConfigure);
     Log.log(
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
-
-    await getVcsClient().ensureRepoExistsAsync();
-
-    const projectDir = await findProjectRootAsync();
-    const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
+    Log.newLine();
 
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
-    // clean up old Android configuration
-    if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-      await cleanUpOldEasBuildGradleScriptAsync(projectDir);
-    }
-
-    // ensure eas.json exists
-    Log.newLine();
-    await ensureProjectConfiguredAsync({
-      projectDir,
-      nonInteractive: false,
+    await configureAsync({
+      platform,
+      projectDir: await findProjectRootAsync(),
     });
 
-    // configure expo-updates
-    if (expoUpdatesIsInstalled) {
-      const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-
-      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-        if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
-        }
-      }
-
-      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
-        if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(projectDir, exp);
-        }
-      }
-    }
-
-    Log.addNewLineIfNone();
-
-    Log.log(`🎉 Your project is ready to build.
-
-- 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 app stores.
-- ${learnMore('https://docs.expo.dev/build/introduction', {
-      learnMoreMessage: 'Learn more about other capabilities of EAS Build',
-    })}`);
+    Log.newLine();
+    logSuccess(platform);
   }
 }
 
+function logSuccess(platform: RequestedPlatform): void {
+  let platformsText = 'iOS and Android projects are';
+  let storesText = 'the Apple App Store or Google Play Store';
+
+  if (platform === 'android') {
+    platformsText = 'Android project is';
+    storesText = 'the Google Play Store';
+  } else if (platform === 'ios') {
+    platformsText = 'iOS project is';
+    storesText = 'the Apple App Store';
+  }
+
+  Log.log(`🎉 Your ${platformsText} ready to build.
+
+- 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.dev/build/introduction', {
+    learnMoreMessage: 'Learn more about other capabilities of EAS Build',
+  })}`);
+}
+
 async function promptForPlatformAsync(): Promise<RequestedPlatform> {
-  Log.addNewLineIfNone();
   const { platform } = await promptAsync({
     type: 'select',
     message: 'Which platforms would you like to configure for EAS Build?',

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

@@ -1,30 +1,63 @@
-import { EasJsonReader } from '@expo/eas-json';
-import { Errors, Flags } from '@oclif/core';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import {
+  EasJsonReader,
+  hasMismatchedExtendsAsync,
+  isUsingDeprecatedFormatAsync,
+  migrateAsync,
+} from '@expo/eas-json';
+import { flags } from '@oclif/command';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
-import figures from 'figures';
-import fs from 'fs-extra';
-import path from 'path';
+import nullthrows from 'nullthrows';
 
-import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
+import { prepareAndroidBuildAsync } from '../../build/android/build';
+import { BuildRequestSender, waitForBuildEndAsync } from '../../build/build';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import { BuildContext, createBuildContextAsync } from '../../build/context';
+import { prepareIosBuildAsync } from '../../build/ios/build';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from '../../build/utils/devClient';
+import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import Log, { learnMore, link } from '../../log';
-import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
+import { CredentialsContext } from '../../credentials/context';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus,
+  SubmissionFragment,
+} from '../../graphql/generated';
+import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
+import Log from '../../log';
+import {
+  RequestedPlatform,
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  selectRequestedPlatformAsync,
+  toPlatforms,
+} from '../../platform';
+import {
+  EAS_UNAVAILABLE_MESSAGE,
+  isEasEnabledForProjectAsync,
+} from '../../project/isEasEnabledForProject';
+import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
 import { findProjectRootAsync } from '../../project/projectUtils';
-import { selectAsync } from '../../prompts';
-import { easCliVersion } from '../../utils/easCli';
+import { confirmAsync } from '../../prompts';
+import { createSubmissionContextAsync } from '../../submit/context';
+import {
+  submitAsync,
+  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
+} from '../../submit/submit';
+import { printSubmissionDetailsUrls } from '../../submit/utils/urls';
 import { enableJsonOutput } from '../../utils/json';
-import { getVcsClient, setVcsClient } from '../../vcs';
-import GitClient from '../../vcs/clients/git';
+import vcs from '../../vcs';
 
 interface RawBuildFlags {
   platform?: string;
   'skip-credentials-check': boolean;
   'skip-project-configuration': boolean;
-  profile?: string;
+  profile: string;
   'non-interactive': boolean;
   local: boolean;
-  output?: string;
   wait: boolean;
   'clear-cache': boolean;
   json: boolean;
@@ -32,102 +65,178 @@ interface RawBuildFlags {
   'auto-submit-with-profile'?: string;
 }
 
+interface BuildFlags {
+  requestedPlatform: RequestedPlatform;
+  skipProjectConfiguration: boolean;
+  profile: string;
+  nonInteractive: boolean;
+  local: boolean;
+  wait: boolean;
+  clearCache: boolean;
+  json: boolean;
+  autoSubmit: boolean;
+  submitProfile?: string;
+}
+
 export default class Build extends EasCommand {
   static description = 'start a build';
 
   static flags = {
-    platform: Flags.enum({
+    platform: flags.enum({
       char: 'p',
       options: ['android', 'ios', 'all'],
     }),
-    'skip-credentials-check': Flags.boolean({
+    'skip-credentials-check': flags.boolean({
       default: false,
       hidden: true,
     }),
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'Enable JSON output, non-JSON messages will be printed to stderr',
       default: false,
     }),
-    'skip-project-configuration': Flags.boolean({
+    'skip-project-configuration': flags.boolean({
       default: false,
-      hidden: true,
+      description: 'Skip project configuration',
     }),
-    profile: Flags.string({
-      description:
-        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+    profile: flags.string({
+      default: 'release',
+      description: 'Name of the build profile from eas.json',
       helpValue: 'PROFILE_NAME',
     }),
-    'non-interactive': Flags.boolean({
+    'non-interactive': flags.boolean({
       default: false,
       description: 'Run command in non-interactive mode',
     }),
-    local: Flags.boolean({
+    local: flags.boolean({
       default: false,
       description: 'Run build locally [experimental]',
     }),
-    output: Flags.string({
-      description: 'Output path for local build',
-    }),
-    wait: Flags.boolean({
+    wait: flags.boolean({
       default: true,
       allowNo: true,
       description: 'Wait for build(s) to complete',
     }),
-    'clear-cache': Flags.boolean({
+    'clear-cache': flags.boolean({
       default: false,
       description: 'Clear cache before the build',
     }),
-    'auto-submit': Flags.boolean({
+    'auto-submit': flags.boolean({
       default: false,
       description:
         'Submit on build complete using the submit profile with the same name as the build profile',
       exclusive: ['auto-submit-with-profile'],
     }),
-    'auto-submit-with-profile': Flags.string({
+    'auto-submit-with-profile': flags.string({
       description: 'Submit on build complete using the submit profile with provided name',
       helpValue: 'PROFILE_NAME',
       exclusive: ['auto-submit'],
     }),
   };
 
+  private metroConfigValidated = false;
+
   async runAsync(): Promise<void> {
-    const { flags: rawFlags } = await this.parse(Build);
+    const { flags: rawFlags } = this.parse(Build);
     if (rawFlags.json) {
       enableJsonOutput();
     }
     const flags = await this.sanitizeFlagsAsync(rawFlags);
+    const { requestedPlatform } = flags;
 
     const projectDir = await findProjectRootAsync();
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
-    await runBuildAndSubmitAsync(projectDir, flags);
+    await vcs.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(flags.nonInteractive);
+
+    await ensureProjectConfiguredAsync(projectDir, requestedPlatform);
+
+    const platforms = toPlatforms(requestedPlatform);
+    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+      platforms,
+      projectDir,
+      profile: flags.profile,
+      nonInteractive: flags.nonInteractive,
+    });
+
+    const startedBuilds: BuildFragment[] = [];
+    const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
+    for (const platform of platforms) {
+      const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
+        projectDir,
+        platform,
+        flags,
+        moreBuilds: platforms.length > 1,
+      });
+      if (maybeBuild) {
+        startedBuilds.push(maybeBuild);
+      }
+      buildCtxByPlatform[toAppPlatform(platform)] = buildCtx;
+    }
+    if (flags.local) {
+      return;
+    }
+
+    Log.newLine();
+    printLogsUrls(startedBuilds);
+    Log.newLine();
+
+    const submissions: SubmissionFragment[] = [];
+    if (flags.autoSubmit) {
+      for (const build of startedBuilds) {
+        const submission = await this.prepareAndStartSubmissionAsync({
+          build,
+          credentialsCtx: nullthrows(buildCtxByPlatform[build.platform]?.credentialsCtx),
+          flags,
+          moreBuilds: startedBuilds.length > 1,
+          projectDir,
+        });
+        submissions.push(submission);
+      }
+
+      Log.newLine();
+      printSubmissionDetailsUrls(submissions);
+      Log.newLine();
+    }
+
+    if (!flags.wait) {
+      return;
+    }
+
+    const builds = await waitForBuildEndAsync(startedBuilds.map(build => build.id));
+    printBuildResults(builds, flags.json);
+
+    const haveAllBuildsFailedOrCanceled = builds.every(
+      build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
+    );
+    if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
+      this.exitWithNonZeroCodeIfSomeBuildsFailed(builds);
+    } else {
+      // the following function also exits with non zero code if any of the submissions failed
+      await waitForSubmissionsToCompleteAsync(submissions);
+    }
   }
 
   private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
     const nonInteractive = flags['non-interactive'];
-    if (!flags.local && flags.output) {
-      Errors.error('--output is allowed only for local builds', { exit: 1 });
-    }
     if (!flags.platform && nonInteractive) {
-      Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
+      error('--platform is required when building in non-interactive mode', { exit: 1 });
     }
     if (flags.json && !nonInteractive) {
-      Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
+      error('--json is allowed only when building in non-interactive mode', { exit: 1 });
     }
 
     const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
     if (flags.local) {
       if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
         // TODO: implement this
-        Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
+        error('Auto-submits are not yet supported when building locally', { exit: 1 });
       }
 
       if (requestedPlatform === RequestedPlatform.All) {
-        Errors.error('Builds for multiple platforms are not supported with flag --local', {
-          exit: 1,
-        });
+        error('Builds for multiple platforms are not supported with flag --local', { exit: 1 });
       } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
-        Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+        error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
       }
     }
 
@@ -138,97 +247,167 @@ export default class Build extends EasCommand {
       );
       Log.newLine();
     }
-    if (flags['skip-project-configuration']) {
-      Log.warnDeprecatedFlag(
-        'skip-project-configuration',
-        'Automatic configuration of native code is no longer optional.'
-      );
-      Log.newLine();
-    }
 
     const profile = flags['profile'];
     return {
       requestedPlatform,
+      skipProjectConfiguration: flags['skip-project-configuration'],
       profile,
       nonInteractive,
-      localBuildOptions: flags['local']
-        ? {
-            enable: true,
-            verbose: true,
-            artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
-          }
-        : {
-            enable: false,
-          },
+      local: flags['local'],
       wait: flags['wait'],
       clearCache: flags['clear-cache'],
       json: flags['json'],
-      autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
+      autoSubmit: flags['auto-submit'],
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
     };
   }
+
+  private async prepareAndStartBuildAsync<T extends Platform>({
+    projectDir,
+    platform,
+    flags,
+    moreBuilds,
+  }: {
+    projectDir: string;
+    platform: T;
+    flags: BuildFlags;
+    moreBuilds: boolean;
+  }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<T> }> {
+    const easJsonReader = new EasJsonReader(projectDir);
+    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
+
+    const buildCtx = await createBuildContextAsync({
+      buildProfileName: flags.profile,
+      clearCache: flags.clearCache,
+      buildProfile,
+      local: flags.local,
+      nonInteractive: flags.nonInteractive,
+      platform,
+      projectDir,
+      skipProjectConfiguration: flags.skipProjectConfiguration,
+    });
+
+    if (moreBuilds) {
+      Log.newLine();
+      const appPlatform = toAppPlatform(platform);
+      Log.log(
+        `${appPlatformEmojis[appPlatform]} ${chalk.bold(
+          `${appPlatformDisplayNames[appPlatform]} build`
+        )}`
+      );
+    }
+
+    if (buildCtx.workflow === Workflow.MANAGED && !this.metroConfigValidated) {
+      await validateMetroConfigForManagedWorkflowAsync(buildCtx);
+      this.metroConfigValidated = true;
+    }
+
+    if (!buildCtx.local && !(await isEasEnabledForProjectAsync(buildCtx.projectId))) {
+      error(EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
+    }
+
+    const build = await this.startBuildAsync(buildCtx);
+    return {
+      build,
+      buildCtx,
+    };
+  }
+
+  private async startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
+    let sendBuildRequestAsync: BuildRequestSender;
+    if (ctx.platform === Platform.ANDROID) {
+      sendBuildRequestAsync = await prepareAndroidBuildAsync(ctx as BuildContext<Platform.ANDROID>);
+    } else {
+      sendBuildRequestAsync = await prepareIosBuildAsync(ctx as BuildContext<Platform.IOS>);
+    }
+    return await sendBuildRequestAsync();
+  }
+
+  private async prepareAndStartSubmissionAsync({
+    build,
+    credentialsCtx,
+    flags,
+    moreBuilds,
+    projectDir,
+  }: {
+    build: BuildFragment;
+    credentialsCtx: CredentialsContext;
+    flags: BuildFlags;
+    moreBuilds: boolean;
+    projectDir: string;
+  }): Promise<SubmissionFragment> {
+    const easJsonReader = new EasJsonReader(projectDir);
+    const platform = toPlatform(build.platform);
+    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
+    const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
+    const submissionCtx = await createSubmissionContextAsync({
+      platform,
+      projectDir,
+      projectId: build.project.id,
+      profile: submitProfile,
+      archiveFlags: { id: build.id },
+      nonInteractive: flags.nonInteractive,
+      env: buildProfile.env,
+      credentialsCtx,
+    });
+
+    if (moreBuilds) {
+      Log.newLine();
+      Log.log(
+        `${appPlatformEmojis[build.platform]} ${chalk.bold(
+          `${appPlatformDisplayNames[build.platform]} submission`
+        )}`
+      );
+    }
+
+    return await submitAsync(submissionCtx);
+  }
+
+  private 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);
+    }
+  }
 }
 
 export async function handleDeprecatedEasJsonAsync(
   projectDir: string,
   nonInteractive: boolean
 ): Promise<void> {
-  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
-  if (!(await fs.pathExists(easJsonPath))) {
-    return;
-  }
-  const easJsonReader = new EasJsonReader(projectDir);
-  const rawEasJson = await easJsonReader.readAsync();
-  if (rawEasJson?.cli) {
-    return;
-  }
+  if (await isUsingDeprecatedFormatAsync(projectDir)) {
+    const hasMismatchedExtendsKeys = await hasMismatchedExtendsAsync(projectDir);
+    if (nonInteractive) {
+      Log.error('We detected that your eas.json is using a deprecated format.');
+      Log.error(
+        'We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json'
+      );
+      error('Unsupported eas.json format', { exit: 1 });
+    }
 
-  if (nonInteractive) {
-    Log.warn(
-      `${
-        figures.warning
-      } Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
-        'https://expo.fyi/eas-vcs-workflow'
-      )} for more information.`
-    );
-    Log.warn(
-      'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
-    );
-    setVcsClient(new GitClient());
-    return;
-  }
-  Log.log(
-    `${chalk.bold(
-      'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
-    )} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
-  );
-  Log.log(
-    `If you want to continue using the Git integration, you can opt in with ${chalk.bold(
-      'cli.requireCommit'
-    )} in ${chalk.bold('eas.json')} or with the following prompt.`
-  );
-  Log.newLine();
-
-  const mode = await selectAsync('Select your preferred Git integration', [
-    { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
-    { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
-  ]);
-
-  if (mode === 'requireCommit') {
-    setVcsClient(new GitClient());
-    await ensureRepoIsCleanAsync(nonInteractive);
-  }
-
-  rawEasJson.cli =
-    mode === 'requireCommit'
-      ? { version: `>= ${easCliVersion}`, requireCommit: true }
-      : { version: `>= ${easCliVersion}` };
-  await fs.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
-  Log.withTick('Updated eas.json');
-  if (mode === 'requireCommit') {
-    await getVcsClient().trackFileAsync(easJsonPath);
-    await reviewAndCommitChangesAsync('Set cli.requireCommit to true in eas.json', {
-      nonInteractive,
+    const confirm = await confirmAsync({
+      message:
+        'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
     });
+    if (confirm) {
+      await migrateAsync(projectDir);
+      if (hasMismatchedExtendsKeys) {
+        Log.warn(
+          '"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms'
+        );
+        Log.warn(
+          'Migration was successful, but you need to manually adjust the extend rules for your profiles'
+        );
+        error('Fix eas.json manually', { exit: 1 });
+      }
+    } else {
+      Log.error(
+        "Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again"
+      );
+      error('Unsupported eas.json format', { exit: 1 });
+    }
   }
 }

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

@@ -1,140 +0,0 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-import { v4 as uuidv4 } from 'uuid';
-
-import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import EasCommand from '../../commandUtils/EasCommand';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { RequestedPlatform } from '../../platform';
-import { findProjectRootAsync } from '../../project/projectUtils';
-import { getTmpDirectory } from '../../utils/paths';
-import { getVcsClient } from '../../vcs';
-
-enum InspectStage {
-  ARCHIVE = 'archive',
-  PRE_BUILD = 'pre-build',
-  POST_BUILD = 'post-build',
-}
-
-const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
-    archive - builds the project archive that would be uploaded to EAS when building
-    pre-build - prepares the project to be built with Gradle/Xcode. Does not run the native build.
-    post-build - builds the native project and leaves the output directory for inspection`;
-
-export default class BuildInspect extends EasCommand {
-  static description =
-    'inspect the state of the project at specific build stages, useful for troubleshooting';
-
-  static flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: [RequestedPlatform.Android, RequestedPlatform.Ios],
-      required: true,
-    }),
-    profile: Flags.string({
-      description:
-        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
-    stage: Flags.enum({
-      char: 's',
-      description: STAGE_DESCRIPTION,
-      options: [InspectStage.ARCHIVE, InspectStage.PRE_BUILD, InspectStage.POST_BUILD],
-      required: true,
-    }),
-    output: Flags.string({
-      char: 'o',
-      description: 'Output directory.',
-      required: true,
-      helpValue: 'OUTPUT_DIRECTORY',
-    }),
-    force: Flags.boolean({
-      description: 'Delete OUTPUT_DIRECTORY if it already exists.',
-      default: false,
-    }),
-    verbose: Flags.boolean({
-      char: 'v',
-      default: false,
-    }),
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildInspect);
-    const outputDirectory = path.resolve(process.cwd(), flags.output);
-    const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());
-
-    if (flags.force && process.cwd().startsWith(outputDirectory)) {
-      throw new Error(
-        `This operation is not allowed, it would delete all files in ${outputDirectory} including the current project.`
-      );
-    }
-
-    await this.prepareOutputDirAsync(outputDirectory, flags.force);
-
-    if (flags.stage === InspectStage.ARCHIVE) {
-      const vcs = getVcsClient();
-      await vcs.ensureRepoExistsAsync();
-      await vcs.makeShallowCopyAsync(tmpWorkingdir);
-      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
-    } else {
-      const projectDir = await findProjectRootAsync();
-      try {
-        await runBuildAndSubmitAsync(projectDir, {
-          nonInteractive: false,
-          wait: true,
-          clearCache: false,
-          json: false,
-          autoSubmit: false,
-          requestedPlatform: flags.platform,
-          profile: flags.profile,
-          localBuildOptions: {
-            enable: true,
-            ...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
-            ...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
-            verbose: flags.verbose,
-            workingdir: tmpWorkingdir,
-            artifactsDir: path.join(tmpWorkingdir, 'artifacts'),
-          },
-        });
-        if (!flags.verbose) {
-          Log.log(chalk.green('Build successful'));
-        }
-      } catch (err) {
-        if (!flags.verbose) {
-          Log.error('Build failed');
-          Log.error(`Re-run this command with ${chalk.bold('--verbose')} flag to see the logs`);
-        }
-      } finally {
-        await this.copyToOutputDirAsync(path.join(tmpWorkingdir, 'build'), outputDirectory);
-      }
-    }
-  }
-
-  private async prepareOutputDirAsync(outputDir: string, force: boolean): Promise<void> {
-    if (await fs.pathExists(outputDir)) {
-      if (force) {
-        await fs.remove(outputDir);
-      } else {
-        throw new Error(`Directory ${outputDir} already exists`);
-      }
-    }
-    await fs.mkdirp(outputDir);
-  }
-
-  private async copyToOutputDirAsync(src: string, dst: string): Promise<void> {
-    const spinner = ora().start(`Copying project directory to ${dst}`);
-    try {
-      if (await fs.pathExists(src)) {
-        await fs.copy(src, dst);
-      }
-      await fs.remove(src);
-      spinner.succeed(`Project directory saved to ${dst}`);
-    } catch (err) {
-      spinner.fail();
-      throw err;
-    }
-  }
-}

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
 import { BuildDistributionType, BuildStatus } from '../../build/types';
@@ -25,13 +25,13 @@ export default class BuildList extends EasCommand {
   static description = 'list all builds for your project';
 
   static flags = {
-    platform: Flags.enum({
+    platform: flags.enum({
       options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
     }),
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'Enable JSON output, non-JSON messages will be printed to stderr',
     }),
-    status: Flags.enum({
+    status: flags.enum({
       options: [
         BuildStatus.NEW,
         BuildStatus.IN_QUEUE,
@@ -41,26 +41,26 @@ export default class BuildList extends EasCommand {
         BuildStatus.CANCELED,
       ],
     }),
-    distribution: Flags.enum({
+    distribution: flags.enum({
       options: [
         BuildDistributionType.STORE,
         BuildDistributionType.INTERNAL,
         BuildDistributionType.SIMULATOR,
       ],
     }),
-    channel: Flags.string(),
-    appVersion: Flags.string(),
-    appBuildVersion: Flags.string(),
-    sdkVersion: Flags.string(),
-    runtimeVersion: Flags.string(),
-    appIdentifier: Flags.string(),
-    buildProfile: Flags.string(),
-    gitCommitHash: Flags.string(),
-    limit: Flags.integer(),
+    channel: flags.string(),
+    appVersion: flags.string(),
+    appBuildVersion: flags.string(),
+    sdkVersion: flags.string(),
+    runtimeVersion: flags.string(),
+    appIdentifier: flags.string(),
+    buildProfile: flags.string(),
+    gitCommitHash: flags.string(),
+    limit: flags.integer(),
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildList);
+    const { flags } = this.parse(BuildList);
     const {
       json,
       platform: requestedPlatform,

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -20,7 +20,7 @@ export default class BuildView extends EasCommand {
   static args = [{ name: 'BUILD_ID' }];
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'Enable JSON output, non-JSON messages will be printed to stderr',
     }),
   };
@@ -29,7 +29,7 @@ export default class BuildView extends EasCommand {
     const {
       args: { BUILD_ID: buildId },
       flags,
-    } = await this.parse(BuildView);
+    } = this.parse(BuildView);
     if (flags.json) {
       enableJsonOutput();
     }

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -9,19 +9,18 @@ import {
   CreateUpdateChannelOnAppMutation,
   CreateUpdateChannelOnAppMutationVariables,
 } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
 import {
   findProjectRootAsync,
+  getBranchByNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
 
-export async function createUpdateChannelOnAppAsync({
+async function createUpdateChannelOnAppAsync({
   appId,
   channelName,
   branchId,
@@ -60,7 +59,8 @@ export async function createUpdateChannelOnAppAsync({
 }
 
 export default class ChannelCreate extends EasCommand {
-  static description = 'create a channel';
+  static hidden = true;
+  static description = 'Create a channel on the current project.';
 
   static args = [
     {
@@ -71,7 +71,7 @@ export default class ChannelCreate extends EasCommand {
   ];
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description:
         'print output as a JSON object with the new channel ID, name and branch mapping.',
       default: false,
@@ -82,10 +82,7 @@ export default class ChannelCreate extends EasCommand {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },
-    } = await this.parse(ChannelCreate);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(ChannelCreate);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -106,15 +103,14 @@ export default class ChannelCreate extends EasCommand {
 
     let branchId: string;
     let branchMessage: string;
-    const existingBranch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: channelName,
-    });
-
-    if (existingBranch) {
+    try {
+      const existingBranch = await getBranchByNameAsync({
+        appId: projectId,
+        name: channelName,
+      });
       branchId = existingBranch.id;
       branchMessage = `We found a branch with the same name`;
-    } else {
+    } catch (e) {
       const newBranch = await createUpdateBranchOnAppAsync({
         appId: projectId,
         name: channelName,
@@ -138,29 +134,30 @@ export default class ChannelCreate extends EasCommand {
     }
 
     if (jsonFlag) {
-      printJsonOnlyOutput(newChannel);
-    } else {
-      Log.addNewLineIfNone();
-      Log.withTick(
-        `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
-      );
-      Log.log(
-        formatFields([
-          { label: 'Name', value: newChannel.name },
-          { label: 'ID', value: newChannel.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.withTick(`${branchMessage} and have pointed the channel at it.`);
-      Log.log(
-        formatFields([
-          { label: 'Name', value: newChannel.name },
-          { label: 'ID', value: branchId },
-        ])
-      );
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('You can now update your app by publishing!'));
+      Log.log(JSON.stringify(newChannel));
+      return;
     }
+
+    Log.addNewLineIfNone();
+    Log.withTick(
+      `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
+    );
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: newChannel.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: branchId },
+      ])
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('You can now update your app by publishing!'));
   }
 }

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

@@ -1,163 +0,0 @@
-import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
-import gql from 'graphql-tag';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  DeleteUpdateChannelMutation,
-  DeleteUpdateChannelMutationVariables,
-  DeleteUpdateChannelResult,
-  GetChannelInfoQuery,
-  GetChannelInfoQueryVariables,
-} from '../../graphql/generated';
-import Log from '../../log';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
-import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export default class ChannelDelete extends EasCommand {
-  static hidden = true;
-  static description = 'Delete a channel';
-
-  static args = [
-    {
-      name: 'name',
-      required: false,
-      description: 'Name of the channel to delete',
-    },
-  ];
-  static flags = {
-    json: Flags.boolean({
-      description: 'print output as a JSON object',
-      default: false,
-    }),
-    'non-interactive': Flags.boolean({
-      default: false,
-      description: 'Run command in non-interactive mode',
-    }),
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { name: nameArg },
-      flags: { json: jsonFlag, 'non-interactive': nonInteractiveFlag },
-    } = await this.parse(ChannelDelete);
-    if (jsonFlag && !nonInteractiveFlag) {
-      throw new Error('--json is allowed only in non-interactive mode');
-    }
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
-
-    const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const fullName = await getProjectFullNameAsync(exp);
-    const projectId = await getProjectIdAsync(exp);
-
-    let name;
-    if (nameArg) {
-      name = nameArg;
-    } else {
-      if (nonInteractiveFlag) {
-        throw new Error('Channel name must be set when running in non-interactive mode');
-      }
-      name = (
-        await promptAsync({
-          type: 'text',
-          name: 'name',
-          message: 'Please enter the name of the channel to delete:',
-          validate: (value: any) => (value ? true : 'Channel name may not be empty.'),
-        })
-      ).name;
-    }
-
-    const data = await getChannelInfoAsync({ appId: projectId, name });
-    const channelId = data.app?.byId.updateChannelByName?.id;
-    if (!channelId) {
-      throw new Error(`Could not find channel ${name} on ${fullName}`);
-    }
-
-    if (!nonInteractiveFlag) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `You are about to permamently delete channel: "${name}".\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 channel: "${name}".`);
-        process.exit(1);
-      }
-    }
-
-    const deletionResult = await deleteChannelOnAppAsync({
-      channelId,
-    });
-
-    if (jsonFlag) {
-      printJsonOnlyOutput(deletionResult);
-    } else {
-      Log.withTick(`️Deleted channel "${name}".`);
-    }
-  }
-}
-
-async function getChannelInfoAsync({
-  appId,
-  name,
-}: GetChannelInfoQueryVariables): Promise<GetChannelInfoQuery> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetChannelInfoQuery, GetChannelInfoQueryVariables>(
-        gql`
-          query GetChannelInfo($appId: String!, $name: String!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateChannelByName(name: $name) {
-                  id
-                  name
-                }
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name,
-        },
-        { additionalTypenames: ['UpdateChannel'] }
-      )
-      .toPromise()
-  );
-  return data;
-}
-
-async function deleteChannelOnAppAsync({
-  channelId,
-}: DeleteUpdateChannelMutationVariables): Promise<DeleteUpdateChannelResult> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<DeleteUpdateChannelMutation, DeleteUpdateChannelMutationVariables>(
-        gql`
-          mutation DeleteUpdateChannel($channelId: ID!) {
-            updateChannel {
-              deleteUpdateChannel(channelId: $channelId) {
-                id
-              }
-            }
-          }
-        `,
-        {
-          channelId,
-        }
-      )
-      .toPromise()
-  );
-  return data.updateChannel.deleteUpdateChannel;
-}

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -13,11 +13,13 @@ import {
   UpdateChannelBranchMappingMutation,
   UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getBranchByNameAsync,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 async function getChannelByNameForAppAsync({
   appId,
@@ -47,8 +49,7 @@ async function getChannelByNameForAppAsync({
             }
           }
         `,
-        { appId, channelName },
-        { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] }
+        { appId, channelName }
       )
       .toPromise()
   );
@@ -87,13 +88,14 @@ export async function updateChannelBranchMappingAsync({
   );
   const channel = data.updateChannel.editUpdateChannel;
   if (!channel) {
-    throw new Error(`Could not find a channel with id: ${channelId}`);
+    throw new Error(`Could not fine channel with id ${channelId}`);
   }
   return data.updateChannel.editUpdateChannel!;
 }
 
 export default class ChannelEdit extends EasCommand {
-  static description = 'point a channel at a new branch';
+  static hidden = true;
+  static description = 'Point a channel at a new branch.';
 
   static args = [
     {
@@ -104,26 +106,37 @@ export default class ChannelEdit extends EasCommand {
   ];
 
   static flags = {
-    branch: Flags.string({
+    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',
+    json: flags.boolean({
+      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
       default: false,
     }),
   };
 
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(ChannelEdit);
-    if (flags.json) {
-      enableJsonOutput();
-    }
+    let {
+      args: { name: channelName },
+      flags: { branch: branchName, json: jsonFlag },
+    } = this.parse(ChannelEdit);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
-    const channelName = args.name ?? (await promptForChannelAsync());
+    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) {
@@ -132,19 +145,20 @@ export default class ChannelEdit extends EasCommand {
       );
     }
 
-    const branchName = flags.branch ?? (await promptForBranchAsync());
-
-    const branch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: branchName,
-    });
-    if (!branch) {
-      throw new Error(
-        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
-          'eas branch:list'
-        )}.`
-      );
+    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
@@ -154,38 +168,17 @@ export default class ChannelEdit extends EasCommand {
       }),
     });
 
-    if (flags.json) {
-      printJsonOnlyOutput(channel);
-    } else {
-      Log.withTick(
-        chalk`Channel {bold ${channel.name}} is now set to branch {bold ${branch.name}}.\n`
-      );
-      Log.addNewLineIfNone();
-      Log.log(
-        chalk`Users with builds on channel {bold ${channel.name}} will now receive the active update on {bold ${branch.name}}.`
-      );
+    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.addNewLineIfNone();
+    Log.log(
+      chalk`Users with builds on channel {bold ${channel.name}} will now receive the active update on {bold ${branch.name}}.`
+    );
   }
 }
-
-async function promptForChannelAsync(): Promise<string> {
-  Log.addNewLineIfNone();
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: 'Please enter the name of the channel to edit:',
-    validate: value => (value ? true : 'The channel name may not be empty.'),
-  });
-  return name;
-}
-
-async function promptForBranchAsync(): Promise<string> {
-  Log.addNewLineIfNone();
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: `To which branch should the channel link?`,
-    validate: value => (value ? true : 'The branch name may not be empty.'),
-  });
-  return name;
-}

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
@@ -11,7 +11,6 @@ import {
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { logChannelDetails } from './view';
 
 const CHANNEL_LIMIT = 10_000;
@@ -59,18 +58,18 @@ async function getAllUpdateChannelForAppAsync({
             }
           }
         `,
-        { appId, offset: 0, limit: CHANNEL_LIMIT },
-        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
+        { appId, offset: 0, limit: CHANNEL_LIMIT }
       )
       .toPromise()
   );
 }
 
 export default class ChannelList extends EasCommand {
-  static description = 'list all channels';
+  static hidden = true;
+  static description = 'List all channels on the current project.';
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'print output as a JSON object with the channel ID, name and branch mapping.',
       default: false,
     }),
@@ -79,10 +78,7 @@ export default class ChannelList extends EasCommand {
   async runAsync(): Promise<void> {
     const {
       flags: { json: jsonFlag },
-    } = await this.parse(ChannelList);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(ChannelList);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -97,18 +93,19 @@ export default class ChannelList extends EasCommand {
     }
 
     if (jsonFlag) {
-      printJsonOnlyOutput(channels);
-    } else {
-      for (const channel of channels) {
-        Log.addNewLineIfNone();
-        Log.log(
-          formatFields([
-            { label: 'Name', value: channel.name },
-            { label: 'ID', value: channel.id },
-          ])
-        );
-        logChannelDetails(channel);
-      }
+      Log.log(JSON.stringify(channels));
+      return;
+    }
+
+    for (const channel of channels) {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
+      logChannelDetails(channel);
     }
   }
 }

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

@@ -1,21 +1,19 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import {
   findProjectRootAsync,
+  getBranchByNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { updateChannelBranchMappingAsync } from './edit';
-import { BranchMapping, getBranchMapping } from './view';
+import { BranchMapping, getBranchMapping, getUpdateChannelByNameForAppAsync } from './view';
 
 async function promptForRolloutPercentAsync({
   promptMessage,
@@ -40,20 +38,28 @@ async function promptForRolloutPercentAsync({
   return rolloutPercent;
 }
 
-function getRolloutInfo(
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>
-): {
+function getRolloutInfo(getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery): {
   newBranch: Pick<UpdateBranch, 'name' | 'id'>;
   oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
   currentPercent: number;
 } {
-  const { branchMapping } = getBranchMapping(channel.branchMapping);
+  const { branchMapping } = getBranchMapping(
+    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
+  );
   const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
-  const newBranch = channel.updateBranches.filter(branch => branch.id === newBranchId)[0];
-  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
+  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 "${channel.name}".`);
+    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;
@@ -68,16 +74,16 @@ async function startRolloutAsync({
   projectId,
   fullName,
   currentBranchMapping,
-  channel,
+  getUpdateChannelByNameForAppResult,
 }: {
   channelName?: string;
-  branchName: string;
+  branchName?: string;
   percent?: number;
   jsonFlag: boolean;
   projectId: string;
   fullName: string;
   currentBranchMapping: BranchMapping;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
 }): Promise<{
   newChannelInfo: {
     id: string;
@@ -86,18 +92,19 @@ async function startRolloutAsync({
   };
   logMessage: string;
 }> {
-  const branch = await BranchQuery.getBranchByNameAsync({
-    appId: projectId,
-    name: branchName,
-  });
-  if (!branch) {
-    throw new Error(
-      `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
-        'eas branch:list'
-      )}.`
-    );
+  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(
@@ -130,11 +137,14 @@ async function startRolloutAsync({
     ],
   };
   const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: channel.id,
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
     branchMapping: JSON.stringify(newBranchMapping),
   });
 
-  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
+  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}"`
@@ -157,13 +167,13 @@ async function editRolloutAsync({
   percent,
   jsonFlag,
   currentBranchMapping,
-  channel,
+  getUpdateChannelByNameForAppResult,
 }: {
   channelName?: string;
   percent?: number;
   jsonFlag: boolean;
   currentBranchMapping: BranchMapping;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
 }): Promise<{
   newChannelInfo: {
     id: string;
@@ -172,7 +182,9 @@ async function editRolloutAsync({
   };
   logMessage: string;
 }> {
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
+    getUpdateChannelByNameForAppResult
+  );
 
   if (percent == null) {
     if (jsonFlag) {
@@ -192,7 +204,7 @@ async function editRolloutAsync({
   newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;
 
   const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: channel.id,
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
     branchMapping: JSON.stringify(newBranchMapping),
   });
 
@@ -212,13 +224,13 @@ async function endRolloutAsync({
   branchName,
   jsonFlag,
   projectId,
-  channel,
+  getUpdateChannelByNameForAppResult,
 }: {
   channelName?: string;
   branchName?: string;
   jsonFlag: boolean;
   projectId: string;
-  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
+  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
 }): Promise<{
   newChannelInfo: {
     id: string;
@@ -228,22 +240,13 @@ async function endRolloutAsync({
   logMessage: string;
 }> {
   // end rollout
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
+    getUpdateChannelByNameForAppResult
+  );
 
   let endOnNewBranch;
   if (branchName) {
-    const branch = await BranchQuery.getBranchByNameAsync({
-      appId: projectId,
-      name: branchName,
-    });
-    if (!branch) {
-      throw new Error(
-        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
-          'eas branch:list'
-        )}.`
-      );
-    }
-
+    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
     switch (branch.id) {
       case newBranch.id:
         endOnNewBranch = true;
@@ -291,7 +294,7 @@ async function endRolloutAsync({
   };
 
   const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: channel.id,
+    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
     branchMapping: JSON.stringify(newBranchMapping),
   });
   const logMessage = `️Rollout on channel ${chalk.bold(
@@ -316,19 +319,19 @@ export default class ChannelRollout extends EasCommand {
   ];
 
   static flags = {
-    branch: Flags.string({
+    branch: flags.string({
       description: 'branch to rollout',
       required: false,
     }),
-    percent: Flags.integer({
+    percent: flags.integer({
       description: 'percent of traffic to redirect to the new branch',
       required: false,
     }),
-    end: Flags.boolean({
+    end: flags.boolean({
       description: 'end the rollout',
       default: false,
     }),
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'print output as a JSON object with the new channel ID, name and branch mapping',
       default: false,
     }),
@@ -337,31 +340,23 @@ export default class ChannelRollout extends EasCommand {
   async runAsync(): Promise<void> {
     const {
       args: { channel: channelName },
-      flags: { json: jsonFlag, end: endFlag, branch: branchName, percent },
-    } = await this.parse(ChannelRollout);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+      flags: { json: jsonFlag, end: endFlag },
+    } = this.parse(ChannelRollout);
+    const {
+      flags: { branch: branchName, percent },
+    } = this.parse(ChannelRollout);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
-    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
+    const getUpdateChannelByNameForAppResult = await getUpdateChannelByNameForAppAsync({
       appId: projectId,
       channelName: channelName!,
     });
-    if (!channel) {
-      throw new Error(
-        `Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk.bold(
-          'eas channel:list'
-        )}.`
-      );
-    }
-
     const { branchMapping: currentBranchMapping, isRollout } = getBranchMapping(
-      channel.branchMapping
+      getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
     );
 
     if (currentBranchMapping.data.length === 0) {
@@ -395,13 +390,13 @@ export default class ChannelRollout extends EasCommand {
     if (!isRollout) {
       rolloutMutationResult = await startRolloutAsync({
         channelName,
-        branchName: branchName ?? (await promptForBranchNameAsync(channelName)),
+        branchName,
         percent,
         jsonFlag,
         projectId,
         fullName,
         currentBranchMapping,
-        channel,
+        getUpdateChannelByNameForAppResult,
       });
     } else if (endFlag) {
       rolloutMutationResult = await endRolloutAsync({
@@ -409,7 +404,7 @@ export default class ChannelRollout extends EasCommand {
         branchName,
         jsonFlag,
         projectId,
-        channel,
+        getUpdateChannelByNameForAppResult,
       });
     } else {
       rolloutMutationResult = await editRolloutAsync({
@@ -417,7 +412,7 @@ export default class ChannelRollout extends EasCommand {
         percent,
         jsonFlag,
         currentBranchMapping,
-        channel,
+        getUpdateChannelByNameForAppResult,
       });
     }
     if (!rolloutMutationResult) {
@@ -425,19 +420,9 @@ export default class ChannelRollout extends EasCommand {
     }
     const { newChannelInfo, logMessage } = rolloutMutationResult;
     if (jsonFlag) {
-      printJsonOnlyOutput(newChannelInfo);
-    } else {
-      Log.withTick(logMessage);
+      Log.log(JSON.stringify(newChannelInfo));
+      return;
     }
+    Log.withTick(logMessage);
   }
 }
-
-async function promptForBranchNameAsync(channelName: string): Promise<string> {
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: `Select a branch to rollout onto ${channelName}`,
-    validate: value => (value ? true : 'A branch must be specified.'),
-  });
-  return name;
-}

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

@@ -1,11 +1,16 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
 import Table from 'cli-table3';
+import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  GetChannelByNameForAppQuery,
+  GetChannelByNameForAppQueryVariables,
+} from '../../graphql/generated';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
@@ -16,7 +21,6 @@ import {
   getPlatformsForGroup,
 } from '../../update/utils';
 import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export type BranchMapping = {
   version: number;
@@ -86,6 +90,55 @@ export function getBranchMapping(branchMappingString?: string): {
   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: {
@@ -127,7 +180,7 @@ export function logChannelDetails(channel: {
         : []),
       formatUpdate(update),
       update?.runtimeVersion ?? 'N/A',
-      update?.group ?? 'N/A',
+      update?.group ?? 'N/A,',
       getPlatformsForGroup({
         updates: branch.updates,
         group: branch.updates[0]?.group,
@@ -138,7 +191,8 @@ export function logChannelDetails(channel: {
 }
 
 export default class ChannelView extends EasCommand {
-  static description = 'view a channel';
+  static hidden = true;
+  static description = 'View a channel on the current project.';
 
   static args = [
     {
@@ -149,7 +203,7 @@ export default class ChannelView extends EasCommand {
   ];
 
   static flags = {
-    json: Flags.boolean({
+    json: flags.boolean({
       description: 'print output as a JSON object with the channel ID, name and branch mapping.',
       default: false,
     }),
@@ -159,10 +213,7 @@ export default class ChannelView extends EasCommand {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },
-    } = await this.parse(ChannelView);
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
+    } = this.parse(ChannelView);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -181,28 +232,32 @@ export default class ChannelView extends EasCommand {
       }));
     }
 
-    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
+    const getUpdateChannelByNameForAppresult = await getUpdateChannelByNameForAppAsync({
       appId: projectId,
       channelName,
     });
+    const channel = getUpdateChannelByNameForAppresult.app?.byId.updateChannelByName;
     if (!channel) {
-      throw new Error(`Could not find a channel with name: ${channelName}`);
+      throw new Error(`Could not fine channel with name ${channelName}`);
     }
 
     if (jsonFlag) {
-      printJsonOnlyOutput(channel);
-    } else {
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Channel:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: channel.name },
-          { label: 'ID', value: channel.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
-      logChannelDetails(channel);
+      Log.log(JSON.stringify(channel));
+      return;
     }
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Channel:'));
+    Log.log(
+      formatFields([
+        { label: 'Name', value: channel.name },
+        { label: 'ID', value: channel.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.log(
+      chalk`{bold Branches, pointed at by this channel, and their most recent update group:}`
+    );
+    logChannelDetails(channel);
   }
 }

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

@@ -1,30 +1,27 @@
 import { getProjectConfigDescription } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonReader } from '@expo/eas-json';
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
+import { flags } from '@oclif/command';
 
 import EasCommand from '../commandUtils/EasCommand';
-import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
-import { appPlatformEmojis } from '../platform';
 import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync } from '../project/projectUtils';
 import { selectAsync } from '../prompts';
 import { handleDeprecatedEasJsonAsync } from './build';
 
 export default class Config extends EasCommand {
-  static description = 'display project configuration (app.json + eas.json)';
+  static description = 'show the eas.json config';
 
   static flags = {
-    platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
-    profile: Flags.string(),
+    platform: flags.enum({ char: 'p', options: ['android', 'ios'] }),
+    profile: flags.string(),
   };
 
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {
-    const { flags } = await this.parse(Config);
+    const { flags } = this.parse(Config);
     const { platform: maybePlatform, profile: maybeProfile } = flags as {
       platform?: Platform;
       profile?: string;
@@ -58,18 +55,15 @@ export default class Config extends EasCommand {
         },
       ]));
 
-    const profile = await reader.getBuildProfileAsync(platform, profileName);
+    const profile = await reader.readBuildProfileAsync(platform, profileName);
     const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
 
-    Log.addNewLineIfNone();
-    Log.log(chalk.bold(getProjectConfigDescription(projectDir)));
+    Log.log(getProjectConfigDescription(projectDir));
     Log.newLine();
     Log.log(JSON.stringify(config, null, 2));
     Log.newLine();
     Log.newLine();
-    const appPlatform = toAppPlatform(platform);
-    const platformEmoji = appPlatformEmojis[appPlatform];
-    Log.log(`${platformEmoji} ${chalk.bold(`Build profile "${profileName}"`)}`);
+    Log.log(`Build profile "${profileName}" from eas.json for platform ${platform}`);
     Log.newLine();
     Log.log(JSON.stringify(profile, null, 2));
   }

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

@@ -1,10 +1,16 @@
 import EasCommand from '../commandUtils/EasCommand';
+import { CredentialsContext } from '../credentials/context';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';
+import { ensureLoggedInAsync } from '../user/actions';
 
 export default class Credentials extends EasCommand {
-  static description = 'manage credentials';
+  static description = 'manage your credentials';
 
   async runAsync(): Promise<void> {
-    await new SelectPlatform().runAsync();
+    const ctx = new CredentialsContext({
+      projectDir: process.cwd(),
+      user: await ensureLoggedInAsync(),
+    });
+    await new SelectPlatform().runAsync(ctx);
   }
 }

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

@@ -1,246 +0,0 @@
-import { Device, DeviceStatus } from '@expo/apple-utils';
-import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
-import assert from 'assert';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { chooseDevicesToDeleteAsync } from '../../credentials/ios/actions/DeviceUtils';
-import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
-import {
-  AppleDeviceQuery,
-  AppleDeviceQueryResult,
-  AppleDevicesByTeamIdentifierQueryResult,
-} from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
-import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery';
-import { authenticateAsync, getRequestContext } from '../../credentials/ios/appstore/authenticate';
-import formatDevice from '../../devices/utils/formatDevice';
-import { AppleDevice, Maybe } from '../../graphql/generated';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
-import { promptAsync, toggleConfirmAsync } from '../../prompts';
-
-export default class DeviceDelete extends EasCommand {
-  static description = 'remove a registered device from your account';
-
-  static flags = {
-    'apple-team-id': Flags.string(),
-    udid: Flags.string({ multiple: true }),
-  };
-
-  async runAsync(): Promise<void> {
-    let {
-      flags: { 'apple-team-id': appleTeamIdentifier, udid: udids },
-    } = await this.parse(DeviceDelete);
-
-    const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const accountName = await getProjectAccountNameAsync(exp);
-
-    if (!appleTeamIdentifier) {
-      appleTeamIdentifier = await this.askForAppleTeamAsync(accountName);
-    }
-
-    assert(appleTeamIdentifier, 'No team identifier is specified');
-
-    const appleDevicesResult = await this.getDevicesForTeamAsync(accountName, appleTeamIdentifier);
-
-    if (!appleDevicesResult) {
-      return;
-    }
-
-    const { appleTeamName, appleDevices } = appleDevicesResult;
-
-    const chosenDevices = await this.chooseDevicesToDeleteAsync(appleDevices, udids);
-
-    if (chosenDevices.length === 0) {
-      Log.newLine();
-      Log.warn('No devices were chosen to be removed.');
-      return;
-    }
-
-    this.logChosenDevices(chosenDevices, appleTeamName, appleTeamIdentifier);
-
-    const hasRemoved = await this.askAndRemoveFromExpoAsync(chosenDevices);
-
-    if (!hasRemoved) {
-      return;
-    }
-
-    await this.askAndDisableOnAppleAsync(chosenDevices, appleTeamIdentifier);
-  }
-
-  async askAndDisableOnAppleAsync(
-    chosenDevices: (AppleDevice | AppleDeviceQueryResult)[],
-    appleTeamIdentifier: string
-  ): Promise<void> {
-    Log.newLine();
-    const deleteOnApple = await toggleConfirmAsync({
-      message: 'Do you want to disable these devices on your Apple account as well?',
-    });
-
-    if (!deleteOnApple) {
-      return;
-    }
-
-    const ctx = await authenticateAsync({ teamId: appleTeamIdentifier });
-    const context = getRequestContext(ctx);
-
-    Log.addNewLineIfNone();
-    const removeAppleSpinner = ora('Disabling devices on Apple').start();
-    try {
-      let realDevices = await Device.getAllIOSProfileDevicesAsync(context);
-      realDevices = realDevices.filter(d =>
-        chosenDevices.map(cd => cd.identifier).includes(d.attributes.udid)
-      );
-
-      for (const device of realDevices) {
-        await device.updateAsync({ status: DeviceStatus.DISABLED });
-      }
-
-      removeAppleSpinner.succeed('Disabled devices on Apple');
-    } catch (err) {
-      removeAppleSpinner.fail();
-      throw err;
-    }
-  }
-
-  async askAndRemoveFromExpoAsync(
-    chosenDevices: (AppleDevice | AppleDeviceQueryResult)[]
-  ): Promise<boolean> {
-    Log.warn(
-      `You are about to remove the Apple device${
-        chosenDevices.length > 1 ? 's' : ''
-      } listed above from your Expo account.`
-    );
-    Log.newLine();
-
-    const confirmed = await toggleConfirmAsync({
-      message: 'Are you sure you wish to proceed?',
-    });
-
-    if (confirmed) {
-      const removalSpinner = ora(`Removing Apple devices on Expo`).start();
-      try {
-        for (const chosenDevice of chosenDevices) {
-          await AppleDeviceMutation.deleteAppleDeviceAsync(chosenDevice.id);
-        }
-        removalSpinner.succeed('Removed Apple devices from Expo');
-      } catch (err) {
-        removalSpinner.fail();
-        throw err;
-      }
-    }
-
-    return confirmed;
-  }
-
-  logChosenDevices(
-    chosenDevices: (AppleDevice | AppleDeviceQueryResult)[],
-    appleTeamName: Maybe<string> | undefined,
-    appleTeamIdentifier: string
-  ): void {
-    Log.addNewLineIfNone();
-    chosenDevices.forEach(device => {
-      Log.log(
-        formatDevice(device, {
-          appleTeamName,
-          appleTeamIdentifier: appleTeamIdentifier!,
-        })
-      );
-      Log.newLine();
-    });
-  }
-
-  async chooseDevicesToDeleteAsync(
-    appleDevices: AppleDeviceQueryResult[],
-    udids: string[]
-  ): Promise<(AppleDevice | AppleDeviceQueryResult)[]> {
-    let chosenDevices: (AppleDeviceQueryResult | AppleDevice)[] = [];
-    Log.newLine();
-    if (udids) {
-      udids.forEach(udid => {
-        const foundDevice = appleDevices.find(device => device.identifier === udid);
-        if (foundDevice) {
-          chosenDevices.push(foundDevice);
-        } else {
-          Log.warn(`No device found with UDID ${udid}.`);
-        }
-      });
-    }
-
-    if (chosenDevices.length === 0) {
-      Log.addNewLineIfNone();
-      chosenDevices = await chooseDevicesToDeleteAsync(appleDevices);
-      Log.newLine();
-    }
-
-    return chosenDevices;
-  }
-
-  async getDevicesForTeamAsync(
-    accountName: string,
-    appleTeamIdentifier: string
-  ): Promise<AppleDevicesByTeamIdentifierQueryResult | undefined> {
-    const devicesSpinner = ora().start('Fetching the list of devices for the team…');
-
-    try {
-      const result = await AppleDeviceQuery.getAllForAppleTeamAsync(
-        accountName,
-        appleTeamIdentifier
-      );
-
-      if (result?.appleDevices.length) {
-        const { appleTeamName, appleDevices } = result;
-
-        devicesSpinner.succeed(
-          `Found ${appleDevices.length} devices for team ${appleTeamName ?? appleTeamIdentifier}`
-        );
-
-        return result;
-      } else {
-        devicesSpinner.fail(`Couldn't find any devices for the team ${appleTeamIdentifier}`);
-        return;
-      }
-    } catch (e) {
-      devicesSpinner.fail(`Something went wrong and we couldn't fetch the device list`);
-      throw e;
-    }
-  }
-
-  async askForAppleTeamAsync(accountName: string): Promise<string | undefined> {
-    const teamSpinner = ora().start('Fetching the list of teams for the project…');
-
-    try {
-      const teams = await AppleTeamQuery.getAllForAccountAsync(accountName);
-
-      if (teams.length > 0) {
-        teamSpinner.succeed('Fetched the list of teams for the project');
-
-        if (teams.length === 1) {
-          return teams[0].appleTeamIdentifier;
-        }
-
-        const result = await promptAsync({
-          type: 'select',
-          name: 'appleTeamIdentifier',
-          message: 'What Apple Team would you like to list devices for?',
-          choices: teams.map(team => ({
-            title: team.appleTeamName
-              ? `${team.appleTeamName} (ID: ${team.appleTeamIdentifier})`
-              : team.appleTeamIdentifier,
-            value: team.appleTeamIdentifier,
-          })),
-        });
-
-        return result.appleTeamIdentifier;
-      } else {
-        teamSpinner.fail(`Couldn't find any teams for the account ${accountName}`);
-        return;
-      }
-    } catch (e) {
-      teamSpinner.fail(`Something went wrong and we couldn't fetch the list of teams`);
-      throw e;
-    }
-  }
-}

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
 
@@ -16,11 +16,11 @@ export default class BuildList extends EasCommand {
   static description = 'list all registered devices for your account';
 
   static flags = {
-    'apple-team-id': Flags.string(),
+    'apple-team-id': flags.string(),
   };
 
   async runAsync(): Promise<void> {
-    let appleTeamIdentifier = (await this.parse(BuildList)).flags['apple-team-id'];
+    let appleTeamIdentifier = this.parse(BuildList).flags['apple-team-id'];
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -34,7 +34,7 @@ export default class BuildList extends EasCommand {
       try {
         const teams = await AppleTeamQuery.getAllForAccountAsync(accountName);
 
-        if (teams.length > 0) {
+        if (teams.length) {
           spinner.succeed();
 
           if (teams.length === 1) {

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

@@ -13,7 +13,7 @@ export default class DeviceView extends EasCommand {
   static args = [{ name: 'UDID' }];
 
   async runAsync(): Promise<void> {
-    const { UDID } = (await this.parse(DeviceView)).args;
+    const { UDID } = this.parse(DeviceView).args;
 
     if (!UDID) {
       Log.log(

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

@@ -1,14 +1,12 @@
-import { Platform } from '@expo/eas-build-job';
 import envinfo from 'envinfo';
 
 import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
-import { findProjectRootAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { easCliVersion } from '../utils/easCli';
+
+const packageJSON = require('../../package.json');
 
 export default class Diagnostics extends EasCommand {
-  static description = 'display environment info';
+  static description = 'log environment info to the console';
 
   protected requiresAuthentication = false;
 
@@ -28,31 +26,13 @@ export default class Diagnostics extends EasCommand {
           'react-navigation',
           '@expo/webpack-config',
           'expo-dev-client',
-          'expo-updates',
         ],
         npmGlobalPackages: ['eas-cli', 'expo-cli'],
       },
       {
-        title: `EAS CLI ${easCliVersion} environment info`,
+        title: `EAS CLI ${packageJSON.version} environment info`,
       }
     );
-
-    Log.log(info.trimEnd());
-    await this.printWorkflowAsync();
-    Log.newLine();
-  }
-
-  private async printWorkflowAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync();
-    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
-
-    if (androidWorkflow === iosWorkflow) {
-      Log.log(`    Project workflow: ${androidWorkflow}`);
-    } else {
-      Log.log(`    Project Workflow:`);
-      Log.log(`      Android: ${androidWorkflow}`);
-      Log.log(`      iOS: ${iosWorkflow}`);
-    }
+    Log.log(info);
   }
 }

packages/eas-cli/src/commands/project/info.ts

@@ -22,8 +22,7 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
             }
           }
         `,
-        { appId },
-        { additionalTypenames: ['App'] }
+        { appId }
       )
       .toPromise()
   );

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

@@ -1,5 +1,5 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
@@ -9,6 +9,10 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
+import {
+  isEasEnabledForProjectAsync,
+  warnEasUnavailable,
+} from '../../project/isEasEnabledForProject';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -20,21 +24,21 @@ import { getActorDisplayName } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';
 
 export default class EnvironmentSecretCreate extends EasCommand {
-  static description = 'create an environment secret on the current project or owner account';
+  static description = 'Create an environment secret on the current project or owner account.';
 
   static flags = {
-    scope: Flags.enum({
+    scope: flags.enum({
       description: 'Scope for the secret',
       options: [EnvironmentSecretScope.ACCOUNT, EnvironmentSecretScope.PROJECT],
       default: EnvironmentSecretScope.PROJECT,
     }),
-    name: Flags.string({
+    name: flags.string({
       description: 'Name of the secret',
     }),
-    value: Flags.string({
+    value: flags.string({
       description: 'Value of the secret',
     }),
-    force: Flags.boolean({
+    force: flags.boolean({
       description: 'Delete and recreate existing secrets',
       default: false,
     }),
@@ -44,7 +48,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
     const actor = await ensureLoggedInAsync();
     let {
       flags: { name, value: secretValue, scope, force },
-    } = await this.parse(EnvironmentSecretCreate);
+    } = this.parse(EnvironmentSecretCreate);
 
     const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -53,6 +57,12 @@ export default class EnvironmentSecretCreate extends EasCommand {
     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.';
 

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

@@ -1,5 +1,6 @@
 import { getConfig } from '@expo/config';
-import { Flags } from '@oclif/core';
+import { flags } from '@oclif/command';
+import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
@@ -9,6 +10,10 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
+import {
+  isEasEnabledForProjectAsync,
+  warnEasUnavailable,
+} from '../../project/isEasEnabledForProject';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -17,10 +22,11 @@ import {
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
 
 export default class EnvironmentSecretDelete extends EasCommand {
-  static description = 'delete an environment secret by ID';
+  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({
+    id: flags.string({
       description: 'ID of the secret to delete',
     }),
   };
@@ -31,9 +37,15 @@ export default class EnvironmentSecretDelete extends EasCommand {
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 
+    if (!(await isEasEnabledForProjectAsync(projectId))) {
+      warnEasUnavailable();
+      process.exitCode = 1;
+      return;
+    }
+
     let {
       flags: { id },
-    } = await this.parse(EnvironmentSecretDelete);
+    } = this.parse(EnvironmentSecretDelete);
     let secret: EnvironmentSecretWithScope | undefined;
 
     if (!id) {