convert to ESM

* eslint - enable no-underscore-dangle

* update CHANGELOG.md

.eslintrc.js

@@ -1,15 +1,9 @@
 module.exports = {
   root: true,
   extends: ['universe/node'],
-  overrides: [
-    {
-      files: ['**/__tests__/*'],
-    },
-  ],
-  globals: {
-    jasmine: false,
-  },
+  plugins: ['async-protect', 'node'],
   rules: {
+    'no-console': 'warn',
     'no-constant-condition': ['warn', { checkLoops: false }],
     'sort-imports': [
       'warn',
@@ -18,10 +12,44 @@ module.exports = {
       },
     ],
     'flowtype/no-types-missing-file-annotation': 'off',
+    curly: 'warn',
+    'import/no-cycle': 'error',
+    'import/no-extraneous-dependencies': [
+      'error',
+      { devDependencies: ['**/__tests__/**/*', '**/__mocks__/**/*'] },
+    ],
+    'import/no-relative-packages': 'error',
+    'no-restricted-imports': [
+      'error',
+      {
+        paths: [
+          {
+            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.',
+          },
+        ],
+      },
+    ],
+    'no-underscore-dangle': ['error', { allow: ['__typename'] }],
+    '@typescript-eslint/explicit-function-return-type': [
+      'warn',
+      {
+        allowExpressions: true,
+      },
+    ],
+    'async-protect/async-suffix': 'error',
+    'node/no-sync': 'error',
   },
-  settings: {
-    react: {
-      version: 'detect',
+  overrides: [
+    {
+      files: ['**/__tests__/**/*.ts', '**/__mocks__/**/*.ts'],
+      rules: {
+        'async-protect/async-suffix': 'off',
+      },
     },
-  },
+  ],
 };

.gitattributes

@@ -0,0 +1 @@
+**/yarn.lock linguist-generated

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,47 @@
+name: "\U0001F41B Bug Report in EAS CLI"
+labels: 'bug'
+description: 'You want to report a reproducible bug or regression in EAS CLI.'
+body:
+  - type: markdown
+    attributes:
+      value: "We're looking to keep questions on our forums and bug reports on the GitHub repo. For questions and help using EAS CLI, post in our [community forums](https://forums.expo.dev/c/help-expo-application-services) (log in with your Expo developer account)."
+  - type: markdown
+    attributes:
+      value: Found a bug in the Expo SDK? Open a bug report [here](https://github.com/expo/expo/issues/new?assignees=&labels=needs+review&template=bug_report.yml) instead.
+  - type: markdown
+    attributes:
+      value: Thanks for taking the time to file a bug report! Please fill out this form as completely as possible.
+  - 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: textarea
+    validations:
+      required: true
+    attributes:
+      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: textarea
+    validations:
+      required: true
+    attributes:
+      label: Environment
+      placeholder: Run `eas diagnostics` and paste the output here
+  - type: textarea
+    validations:
+      required: false
+    attributes:
+      label: Error output
+      placeholder: If you're running into an error message, please run the same command with `EXPO_DEBUG=true <your command here>` and paste output here.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Reproducible demo or steps to reproduce from a blank project
+      description: 'This should include as little code as possible, do not simply link your entire project. Sharing a link to a [Snack](https://snack.expo.dev/) is a GREAT way to provide a reproducible demo :) If a reproducible demo, or a complete list of steps from blank project to bug, are not provided, it is very likely your issue will be closed. Read [here more guidance](https://stackoverflow.com/help/mcve).'
+  - type: markdown
+    attributes:
+      value: Please make sure contributors can follow the steps your provided in order to reproduce the bug.
+  - type: markdown
+    attributes:
+      value: "**Realize that it is up to you to debug your code and be as certain as possible that the bug is with EAS CLI, not with your own app.** [Here's an excellent guide to debugging you can follow](https://github.com/expo/fyi/blob/master/manual-debugging.md#how-to-narrow-down-the-source-of-an-error-a-step-by-step-guide-to-good-old-fashioned-manual-debugging)."

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -0,0 +1,14 @@
+name: "\U0001F64B Enhancement"
+labels: 'enhancement'
+description: 'Want us to add something to EAS CLI?'
+body:
+  - type: markdown
+    attributes:
+      value: Thanks for helping us make EAS even better! 😀 Unfortunately, this is not the right place for feature requests. Please find and upvote your feature (or create a new one) at https://expo.canny.io instead.
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: Do you understand that any feature requests opened in this repository will be closed?
+      options:
+        - 'Yes'

.github/PULL_REQUEST_TEMPLATE

@@ -2,7 +2,7 @@
 
 # Checklist
 
-- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary.
+- [ ] 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

@@ -0,0 +1,46 @@
+on:
+  issue_comment:
+    types: [created]
+
+name: Changelog
+
+jobs:
+  pr-commented:
+    runs-on: ubuntu-latest
+    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@v1
+        with:
+          node-version: '16'
+      - name: Checkout Pull Request
+        run: hub pr checkout ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Add changelog entry
+        working-directory: ./scripts
+        run: |
+          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
+          if [[ ! "$PARAMS" =~ " " ]]; then
+            echo "Invalid /changelog-entry command"
+            exit 1
+          fi
+          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_PR_NUMBER: ${{ github.event.issue.number }}
+          PR_COMMENT_BODY: ${{ github.event.comment.body }}
+      - name: Commit and push
+        run: |
+          # use the last commit author name and email
+          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
       - id: create_release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
           draft: true
@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14'
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -60,7 +60,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14'
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -83,7 +83,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14'
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -112,4 +112,71 @@ jobs:
           upload_url: ${{ needs.release.outputs.upload_url }}
           asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
           asset_name: ${{ steps.x86.outputs.filename }}
-          asset_content_type: application/gzip
+          asset_content_type: application/gzip
+  publish-to-npm:
+    name: Publish to npm
+    runs-on: ubuntu-latest
+    needs: [build-linux, build-mac, build-windows]
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          registry-url: 'https://registry.npmjs.org/'
+          scope: 'expo'
+          node-version: '16'
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --check-files
+      - name: Build
+        run: yarn build
+      - name: Publish packages to npm
+        run: yarn lerna publish from-package --yes --no-verify-access
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
+  release-changelog:
+    name: Update changelog and publish release
+    runs-on: ubuntu-latest
+    needs: publish-to-npm
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '16'
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Resolve version
+        run: echo "EAS_CLI_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
+      - name: Update changelog
+        working-directory: ./scripts
+        run: yarn --silent release-changelog $EAS_CLI_VERSION > /tmp/current-changelog
+      - name: Publish release
+        run: hub release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Commit and push
+        run: |
+          git fetch
+          git checkout main
+          git config --global user.email "[email protected]"
+          git config --global user.name "Expo CI"
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push
+      - name: Prepare changelog for Slack
+        run: |
+          tail -n +3 /tmp/current-changelog > /tmp/changelog.md
+          npx slackmd /tmp/changelog.md
+          echo 'SLACK_CHANGELOG<<EOF' >> $GITHUB_ENV
+          cat /tmp/changelog.slack.md >> $GITHUB_ENV
+          echo 'EOF' >> $GITHUB_ENV
+      - name: Slack Notification
+        uses: rtCamp/action-slack-notify@v2
+        env:
+          SLACK_CHANNEL: eas-cli
+          SLACK_COLOR: ${{ job.status }}
+          SLACK_ICON: https://github.com/expo-ci.png?size=48
+          SLACK_TITLE: 'Released eas-cli@${{ env.EAS_CLI_VERSION }}'
+          SLACK_MESSAGE: ${{ env.SLACK_CHANGELOG }}
+          SLACK_USERNAME: 'Expo CI'
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_FOOTER: ''

.github/workflows/size.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '14'
+          node-version: '16'
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'

.github/workflows/test.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['12', '14']
+        node: ['12', '14', '16']
         include:
-          - node: '14'
+          - node: '16'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:

.gitignore

@@ -11,3 +11,4 @@ tmp
 node_modules
 coverage
 .history
+.DS_Store

CHANGELOG.md

@@ -8,14 +8,396 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Opt out of capability syncing with `EXPO_NO_CAPABILITY_SYNC=1`. ([#426](https://github.com/expo/eas-cli/pull/426) by [@brentvatne](https://github.com/brentvatne))
-- Add more verbose logging around capability syncing to help debug reported issues. ([#426](https://github.com/expo/eas-cli/pull/426) by [@brentvatne](https://github.com/brentvatne))
-- Add managed credentials support for multitarget iOS projects. ([#414](https://github.com/expo/eas-cli/pull/414) by [@dsokal](https://github.com/dsokal))
+### 🐛 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
+
+- 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/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/0.31.0) - 2021-10-08
+
+### 🛠 Breaking changes
+
+- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95) + [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- 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/0.30.1) - 2021-10-06
+
+### 🐛 Bug fixes
+
+- Fix `--json` flag when running EAS CLI on GitHub actions. ([#669](https://github.com/expo/eas-cli/pull/669) by [@dsokal](https://github.com/dsokal))
+- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project.([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
+- Fix building monorepo projects on Windows. ([#671](https://github.com/expo/eas-cli/pull/671) by [@dsokal](https://github.com/dsokal))
+
+## [0.30.0](https://github.com/expo/eas-cli/releases/tag/v0.30.0) - 2021-10-05
+
+### 🛠 Breaking changes
+
+- Enable auto-incrementing on Android. ([#645](https://github.com/expo/eas-cli/pull/645) by [@jkhales](https://github.com/jkhales))
+
 ### 🧹 Chores
 
+- Ports detection for Google Service Account Keys into the credentials service. ([#660](https://github.com/expo/eas-cli/pull/660) by [@quinlanj](https://github.com/quinlanj))
+- Improve iOS credentials printing. ([#657](https://github.com/expo/eas-cli/pull/657) by [@quinlanj](https://github.com/quinlanj))
+- Automate `eas-cli` releases. ([#668](https://github.com/expo/eas-cli/pull/668) by [@dsokal](https://github.com/dsokal))
+
+## [0.29.1](https://github.com/expo/eas-cli/releases/tag/v0.29.1) - 2021-09-29
+
+### 🎉 New features
+
+- More upload support for Google Service Account Keys. ([#649](https://github.com/expo/eas-cli/pull/649) by [@quinlanj](https://github.com/quinlanj))
+- Allow the user to assign an existing Google Service Account Key to their project. ([#650](https://github.com/expo/eas-cli/pull/650) by [@quinlanj](https://github.com/quinlanj))
+- Allow the user to remove a Google Service Account Key from their account. ([#658](https://github.com/expo/eas-cli/pull/658) by [@quinlanj](https://github.com/quinlanj))
+- Adds setup support for Google Service Account Keys. ([#659](https://github.com/expo/eas-cli/pull/659) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix double prompt for Apple credentials when running `eas build --auto-submit`. ([#654](https://github.com/expo/eas-cli/pull/654) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Always use async `fs` functions. ([#652](https://github.com/expo/eas-cli/pull/652) by [@dsokal](https://github.com/dsokal))
+- Improve Android credentials printing. ([#656](https://github.com/expo/eas-cli/pull/656) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.29.0](https://github.com/expo/eas-cli/releases/tag/v0.29.0) - 2021-09-28
+
+### 🎉 New features
+
+- Added upload support for Google Service Account Keys. ([#642](https://github.com/expo/eas-cli/pull/642) by [@quinlanj](https://github.com/quinlanj))
+- Add Xcode 13 image. ([#651](https://github.com/expo/eas-cli/pull/651) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Credentials manager: stop prompting for an Android build profile every iteration. ([#641](https://github.com/expo/eas-cli/pull/641) by [@quinlanj](https://github.com/quinlanj))
+- Don't display prompt in non-interactive mode when the metro config seems invalid. ([#644](https://github.com/expo/eas-cli/pull/644) by [@dsokal](https://github.com/dsokal))
+- Read versions from correct `Info.plist`. ([#635](https://github.com/expo/eas-cli/pull/635) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Move away from weird convention of exports. ([#647](https://github.com/expo/eas-cli/pull/647) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.28.2](https://github.com/expo/eas-cli/releases/tag/v0.28.2) - 2021-09-23
+
+### 🐛 Bug fixes
+
+- Use `log-symbols` to unify green ticks style. ([#639](https://github.com/expo/eas-cli/pull/639) by [@dsokal](https://github.com/dsokal))
+- Fix `eas build --auto-submit` in fresh projects. ([#640](https://github.com/expo/eas-cli/pull/640) by [@dsokal](https://github.com/dsokal))
+
+## [0.28.1](https://github.com/expo/eas-cli/releases/tag/v0.28.1) - 2021-09-22
+
+### 🐛 Bug fixes
+
+- Prevent ora spinners breaking when debug logs are enabled. ([#575](https://github.com/expo/eas-cli/pull/575) by [@EvanBacon](https://github.com/EvanBacon))
+- Do not fail `eas build` when transient network errors occur. ([#638](https://github.com/expo/eas-cli/pull/638) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Add GraphQL support for GoogleServiceAccountKey. ([#632](https://github.com/expo/eas-cli/pull/632) by [@quinlanj](https://github.com/quinlanj))
+- Remove GraphQL support for the App Specific Password. ([#633](https://github.com/expo/eas-cli/pull/633) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.28.0](https://github.com/expo/eas-cli/releases/tag/v0.28.0) - 2021-09-20
+
+### 🎉 New features
+
+- Use envs from build profile to resolve app config when auto-submitting. ([#614](https://github.com/expo/eas-cli/pull/614) by [@dsokal](https://github.com/dsokal))
+- Support multi flavor Android projects. ([#595](https://github.com/expo/eas-cli/pull/595) by [@wkozyra95](https://github.com/wkozyra95))
+- Improve experience when using the build details page as a build artifact URL in `eas submit`. ([#620](https://github.com/expo/eas-cli/pull/620) by [@dsokal](https://github.com/dsokal))
+- Better error message when eas.json is invalid JSON. ([#618](https://github.com/expo/eas-cli/pull/618) by [@dsokal](https://github.com/dsokal))
+- Add warning about the legacy build service IDs in `eas submit`. ([#624](https://github.com/expo/eas-cli/pull/624) by [@dsokal](https://github.com/dsokal))
+- Validate that project includes `expo-dev-client` when building with `developmentClient` flag. ([#627](https://github.com/expo/eas-cli/pull/627) by [@dsokal](https://github.com/dsokal))
+- Better experience when not logged in in non-interactive mode. ([#628](https://github.com/expo/eas-cli/pull/628) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Reduce `eas-cli` size by almost getting rid of `lodash` from dependencies. ([#605](https://github.com/expo/eas-cli/pull/605) by [@dsokal](https://github.com/dsokal))
+- Enforce explicit return type in all functions. ([#619](https://github.com/expo/eas-cli/pull/619) by [@wkozyra95](https://github.com/wkozyra95))
+- Enforce `Async` suffix for async functions. ([#623](https://github.com/expo/eas-cli/pull/623) by [@dsokal](https://github.com/dsokal))
+
+## [0.27.1](https://github.com/expo/eas-cli/releases/tag/v0.27.1) - 2021-09-10
+
+### 🐛 Bug fixes
+
+- Fixed force-creation, app secret creation, and secret deletion mutations. ([#606](https://github.com/expo/eas-cli/pull/606) by [@fiberjw](https://github.com/fiberjw))
+
+## [0.27.0](https://github.com/expo/eas-cli/releases/tag/v0.27.0) - 2021-09-10
+
+### 🎉 New features
+
+- Implement support for `--platform all` in `eas submit`. ([#598](https://github.com/expo/eas-cli/pull/598) by [@dsokal](https://github.com/dsokal))
+- Implement support for `--non-interactive` in `eas submit`. ([#600](https://github.com/expo/eas-cli/pull/600) by [@dsokal](https://github.com/dsokal))
+- Add auto-submit feature. Run `eas build --auto-submit` to submit automatically on build complete. ([#603](https://github.com/expo/eas-cli/pull/603) by [@dsokal](https://github.com/dsokal))
+- Allow using env var for `android.serviceAccountKeyPath` in submit profiles. ([#604](https://github.com/expo/eas-cli/pull/604) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix detecting `googleServicesFile` on Windows. ([#602](https://github.com/expo/eas-cli/pull/602) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.26.0](https://github.com/expo/eas-cli/releases/tag/v0.26.0) - 2021-09-08
+
+### 🛠 Breaking changes
+
+- Require `eas submit` to be configured with eas.json submit profiles (see [https://docs.expo.dev/submit/eas-json/](https://docs.expo.dev/submit/eas-json/) for details). Drop support for CLI params. ([#590](https://github.com/expo/eas-cli/pull/590) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add `eas diagnostics` command. ([#594](https://github.com/expo/eas-cli/pull/594) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix `eas build` from throwing an exception when detecting the git `core.ignorecase` setting. ([#592](https://github.com/expo/eas-cli/pull/592) by [@mwillbanks](https://github.com/mwillbanks))
+- Support app names that consist only of unicode characters. ([#596](https://github.com/expo/eas-cli/pull/596) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.25.0](https://github.com/expo/eas-cli/releases/tag/v0.25.0) - 2021-09-01
+
+### 🛠 Breaking changes
+
+- Drop support for node < 12. ([#581](https://github.com/expo/eas-cli/pull/581) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Support `--no-wait` in `eas submit`. ([#578](https://github.com/expo/eas-cli/pull/578) by [@dsokal](https://github.com/dsokal))
+- Detect changes when `core.ignorecase` is set to true. ([#570](https://github.com/expo/eas-cli/pull/570) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix wrong warning for `metro.config.js` check on Windows. ([#587](https://github.com/expo/eas-cli/pull/588) by [@louisgv](https://github.com/louisgv))
+- Fix detecting `googleServicesFile` with `EAS_NO_VCS=1`. ([#583](https://github.com/expo/eas-cli/pull/583) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Replace `@hapi/joi` with `joi`. Upgrade typescript to 4.4.2. Upgrade dependencies. ([#582](https://github.com/expo/eas-cli/pull/582) by [@dsokal](https://github.com/dsokal))
+- Change typescript target from `ES2017` to `ES2019`. ([#584](https://github.com/expo/eas-cli/pull/584) by [@dsokal](https://github.com/dsokal))
+- Use `ts-jest` instead of `babel-jest`. ([#585](https://github.com/expo/eas-cli/pull/585) by [@dsokal](https://github.com/dsokal))
+
+## [0.24.1](https://github.com/expo/eas-cli/releases/tag/v0.24.1) - 2021-08-25
+
+### 🐛 Bug fixes
+
+- Fix wrong `EasJsonReader` import causing `eas submit` to fail. ([951ee](https://github.com/expo/eas-cli/commit/951eea2396591bd612aa7cb3038da35e45c33bb8) by [@dsokal](https://github.com/dsokal))
+
+## [0.24.0](https://github.com/expo/eas-cli/releases/tag/v0.24.0) - 2021-08-25
+
+### 🛠 Breaking changes
+
+- Allow publishing of multiple update groups. ([#566](https://github.com/expo/eas-cli/pull/566) by [@jkhales](https://github.com/jkhales))
+
+### 🎉 New features
+
+- Retry status code 500-600 server errors from Apple servers with cookies auth. ([#574](https://github.com/expo/eas-cli/pull/574) by [@EvanBacon](https://github.com/EvanBacon))
+- Throw internal server errors when Apple servers fail to authenticate. ([#574](https://github.com/expo/eas-cli/pull/574) by [@EvanBacon](https://github.com/EvanBacon))
+- Add --auto flag for eas branch:publish. ([#549](https://github.com/expo/eas-cli/pull/549) by [@jkhales](https://github.com/jkhales))
+- Add submissions link in output of `eas submit`. ([#553](https://github.com/expo/eas-cli/pull/553) by [@ajsmth](https://github.com/ajsmth))
+- Add submit profiles. ([#555](https://github.com/expo/eas-cli/pull/555) by [@wkozyra95](https://github.com/wkozyra95))
+- Add `changesNotSentForReview` option to android submissions. ([#560](https://github.com/expo/eas-cli/pull/560) by [@wkozyra95](https://github.com/wkozyra95))
+- Support `--json` flag in build commands. ([#567](https://github.com/expo/eas-cli/pull/567) by [@wkozyra95](https://github.com/wkozyra95))
+- Add link to https://expo.fyi/eas-build-archive in `eas build` output to make it easier to understand what is going on in the archive/upload phase of the build. ([#562](https://github.com/expo/eas-cli/pull/562) by [@brentvatne](https://github.com/brentvatne))
+- Update QR code URL for Android internal distribution build and generate smaller QR code. ([#573](https://github.com/expo/eas-cli/pull/573) by [@axeldelafosse](https://github.com/axeldelafosse))
+
+### 🐛 Bug fixes
+
+- Fix `--sku` flag being ignored when running `eas submit -p ios`. ([#559](https://github.com/expo/eas-cli/pull/559) by [@barthap](https://github.com/barthap))
+- Set correct distribution for simulator builds. ([#556](https://github.com/expo/eas-cli/pull/556) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add warnings around common issues (`NODE_ENV=production`, git ignored `googleServicesFile`). ([#569](https://github.com/expo/eas-cli/pull/569) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.23.0](https://github.com/expo/eas-cli/releases/tag/v0.23.0) - 2021-08-05
+
+### 🛠 Breaking changes
+
+- Stop including deprecated storageBucket field when publishing. ([#547](https://github.com/expo/eas-cli/pull/547) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Pass through metadata context to app version resolver. ([#550](https://github.com/expo/eas-cli/pull/550) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.22.4](https://github.com/expo/eas-cli/releases/tag/v0.22.4) - 2021-08-02
+
+### 🐛 Bug fixes
+
+- Fix build profile schema validation when `simulator` key is present for iOS. ([#546](https://github.com/expo/eas-cli/pull/546) by [@sallar](https://github.com/sallar))
+
+## [0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2) - 2021-08-02
+
+### 🛠 Breaking changes
+
+- Introduce new format of eas.json (old eas.json will be migrated automatically). ([#537](https://github.com/expo/eas-cli/pull/537) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- Validate metro config for managed workflow projects. ([#534](https://github.com/expo/eas-cli/pull/534) by [@dsokal](https://github.com/dsokal))
+- Add more filter params to `build:list`. ([#540](https://github.com/expo/eas-cli/pull/540) by [@dsokal](https://github.com/dsokal))
+- Evaluate interpolated iOS version strings for metadata. ([#541](https://github.com/expo/eas-cli/pull/541) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Validate metadata client side to print better errors. ([#542](https://github.com/expo/eas-cli/pull/542) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `new` build status when building both paltforms. ([#543](https://github.com/expo/eas-cli/pull/543) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix link to build details page where previously we used `project.name` instead of `project.slug` - leave out project segment entirely and depend on redirect. ([#554](https://github.com/expo/eas-cli/pull/554) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.22.1](https://github.com/expo/eas-cli/releases/tag/v0.22.1) - 2021-07-28
+
+### 🎉 New features
+
+- Include the file extension for update's assets in the manifest fragment. ([#532](https://github.com/expo/eas-cli/pull/535) by [@jkhales](https://github.com/jkhales))
+- Use env variables from `eas.json` when evaluating `app.config.js`. ([#532](https://github.com/expo/eas-cli/pull/532) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix workflow detection when xcodeproj is an empty directory. ([#531](https://github.com/expo/eas-cli/pull/531) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix Android Keystore upload. ([#538](https://github.com/expo/eas-cli/pull/538) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Upgrade typescript to 4.3.5. ([#533](https://github.com/expo/eas-cli/pull/533) by [@dsokal](https://github.com/dsokal))
+
+## [0.22.0](https://github.com/expo/eas-cli/releases/tag/v0.22.0) - 2021-07-23
+
+### 🎉 New features
+
+- Added support for automatically creating and linking iOS capability identifiers (Apple Pay, iCloud Containers, App Groups). ([#524](https://github.com/expo/eas-cli/pull/524) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `secret:create --force` command to overwrite existing secrets. ([#513](https://github.com/expo/eas-cli/pull/513) by [@bycedric](https://github.com/bycedric))
+- Fall back to APK when building for internal distribution. ([#527](https://github.com/expo/eas-cli/pull/527) by [@dsokal](https://github.com/dsokal))
+- Add `iosEnterpriseProvisioning` to build metadata. ([#522](https://github.com/expo/eas-cli/pull/522) by [@dsokal](https://github.com/dsokal))
+- Autodetect Google Services JSON key path in `eas submit -p android`. ([#520](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fix iOS capability syncing on build. ([#521](https://github.com/expo/eas-cli/pull/521) by [@EvanBacon](https://github.com/EvanBacon))
+- Fix unhandled error when amplitude domains are blocked. ([#512](https://github.com/expo/eas-cli/pull/512) by [@wkozyra95](https://github.com/wkozyra95))
+- Use default value for `appBuildVersion` in build metadata when building an Android managed project. ([#526](https://github.com/expo/eas-cli/pull/526) by [@dsokal](https://github.com/dsokal))
+
+## [0.21.0](https://github.com/expo/eas-cli/releases/tag/v0.21.0) - 2021-07-12
+
+### 🎉 New features
+
+- Add `project:*` commands. ([#500](https://github.com/expo/eas-cli/pull/500) by [@jkhales](https://github.com/jkhales))
+- Added support for iOS 15 capabilities: Communication Notifications, Time Sensitive Notifications, Group Activities, and Family Controls. ([#499](https://github.com/expo/eas-cli/pull/499) by [@EvanBacon](https://github.com/EvanBacon))
+- Show more build metadata in `build:view` and `build:list`. ([#504](https://github.com/expo/eas-cli/pull/504) and [#508](https://github.com/expo/eas-cli/pull/508) by [@dsokal](https://github.com/dsokal))
+- Add runtime version to build metadata. ([#493](https://github.com/expo/eas-cli/pull/493) by [@dsokal](https://github.com/dsokal))
+
+## [0.20.0](https://github.com/expo/eas-cli/releases/tag/v0.20.0) - 2021-07-09
+
+### 🛠 Breaking changes
+
+- Unifify generic and managed workflow, deprecate `workflow` field. ([#497](https://github.com/expo/eas-cli/pull/497) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix runtime version checks. ([#495](https://github.com/expo/eas-cli/pull/495) by [@dsokal](https://github.com/dsokal))
+- Resolve `--android-package` correctly in `eas submit` command. ([#494](https://github.com/expo/eas-cli/pull/494) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.19.1](https://github.com/expo/eas-cli/releases/tag/v0.19.1) - 2021-07-02
+
+### 🎉 New features
+
+- Improve project workflow detection (fixes the case where the `android` and/or `ios` directories are git-ignored). ([#490](https://github.com/expo/eas-cli/pull/490) by [@dsokal](https://github.com/dsokal))
+- Improve credentials workflow with project creation and current working directories ([#491](https://github.com/expo/eas-cli/pull/491) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Better debugging experience ([#492](https://github.com/expo/eas-cli/pull/492) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.19.0](https://github.com/expo/eas-cli/releases/tag/v0.19.0) - 2021-07-01
+
+### 🎉 New features
+
+- Auto-suggest application id and bundle identifier when running `eas build:configure` for a managed project. ([#487](https://github.com/expo/eas-cli/pull/487) by [@dsokal](https://github.com/dsokal))
+- Support configuring one platform at a time when running `eas build`. ([#483](https://github.com/expo/eas-cli/pull/483) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.18.3](https://github.com/expo/eas-cli/releases/tag/v0.18.3) - 2021-06-28
+
+### 🎉 New features
+
+- Support bundle identifiers that begin with `.`. ([#459](https://github.com/expo/eas-cli/pull/459) by [@EvanBacon](https://github.com/EvanBacon))
+- Push Key setup integrated with ios build command ([#473](https://github.com/expo/eas-cli/pull/473) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix android builds for PKCS12 keystores. ([#484](https://github.com/expo/eas-cli/pull/484) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.18.2](https://github.com/expo/eas-cli/releases/tag/v0.18.2) - 2021-06-25
+
+### 🎉 New features
+
+- Change default iOS image for projects with Expo SDK <= 41 (SDK 41 won't build with Xcode 12.5). ([#479](https://github.com/expo/eas-cli/pull/479) by [@dsokal](https://github.com/dsokal))
+- Make Apple team optional in appropriate cases. ([#468](https://github.com/expo/eas-cli/pull/468) by [@quinlanj](https://github.com/quinlanj))
+- Show projects that depend on a push key. ([#472](https://github.com/expo/eas-cli/pull/472) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix inverted conditional so we actually only prompt about commit when index is dirty. ([#481](https://github.com/expo/eas-cli/pull/481) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.18.1](https://github.com/expo/eas-cli/releases/tag/v0.18.1) - 2021-06-24
+
+### 🎉 New features
+
+- Add basic printing support for Apple App Specific Password. ([#474](https://github.com/expo/eas-cli/pull/474) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Fix CLI UI getting blocked on credentials migration, leading to partially migrated state. ([#477](https://github.com/expo/eas-cli/pull/477) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.18.0](https://github.com/expo/eas-cli/releases/tag/v0.18.0) - 2021-06-24
+
+### 🛠 Breaking changes
+
+- Drop support for `experimental.npmToken` in credentials.json, EAS Secrets can be used instead. ([#444](https://github.com/expo/eas-cli/pull/444) by [@dsokal](https://github.com/dsokal))
+- Remove `--allow-experimental` flag from `eas build:configure` as it has no effect now. ([#444](https://github.com/expo/eas-cli/pull/444) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Make credentials manager work with multi-target iOS projects. ([#441](https://github.com/expo/eas-cli/pull/441) by [@dsokal](https://github.com/dsokal))
+- Copy over credentials from Expo Classic to EAS. ([#445](https://github.com/expo/eas-cli/pull/445) by [@quinlanj](https://github.com/quinlanj))
+- Add Big Sur image for iOS builds. ([#457](https://github.com/expo/eas-cli/pull/457) by [@wkozyra95](https://github.com/wkozyra95))
+- New version of Android credentials manager. ([#460](https://github.com/expo/eas-cli/pull/460) by [@quinlanj](https://github.com/quinlanj))
+- Add an internal distribution with dev client to `build:configure` defaults. ([#465](https://github.com/expo/eas-cli/pull/465) by [@fson](https://github.com/fson))
+- Add `updates.channel` to build metadata. ([#461](https://github.com/expo/eas-cli/pull/461) by [@jkhales](https://github.com/jkhales))
+- iOS push key setup and management now available in `eas-cli credentials`. ([#469](https://github.com/expo/eas-cli/pull/469) [#470](https://github.com/expo/eas-cli/pull/470) by [@quinlanj](https://github.com/quinlanj))
+- Support new build status: `new`. ([#475](https://github.com/expo/eas-cli/pull/475) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Deprecate `--skip-credentials-check` flag because it doesn't do anything and is no longer needed. ([#442](https://github.com/expo/eas-cli/pull/442) by [@brentvatne](https://github.com/brentvatne))
+- Move android credentials code to new Graphql API. ([#439](https://github.com/expo/eas-cli/pull/439) [#440](https://github.com/expo/eas-cli/pull/440) [#438](https://github.com/expo/eas-cli/pull/438) [#443](https://github.com/expo/eas-cli/pull/443) [#447](https://github.com/expo/eas-cli/pull/447) [#451](https://github.com/expo/eas-cli/pull/451) [#455](https://github.com/expo/eas-cli/pull/455) by [@quinlanj](https://github.com/quinlanj))
+- Prepare Graphql infra to support iOS push keys. ([#456](https://github.com/expo/eas-cli/pull/456) by [@quinlanj](https://github.com/quinlanj))
+- Improve credentials DX ([#448](https://github.com/expo/eas-cli/pull/448) [#449](https://github.com/expo/eas-cli/pull/449) by [@quinlanj](https://github.com/quinlanj))
+- Add analytics on dev client builds. ([#454](https://github.com/expo/eas-cli/pull/454) by [@fson](https://github.com/fson))
+- Support non-git projects. ([#462](https://github.com/expo/eas-cli/pull/462) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.17.0](https://github.com/expo/eas-cli/releases/tag/v0.17.0) - 2021-06-02
+
+### 🐛 Bug fixes
+
+- Fix bundle identifier resolution when native target is not provided. ([#434](https://github.com/expo/eas-cli/pull/434) by [@dsokal](https://github.com/dsokal))
+- Fix git repo root path getter on Windows. ([#429](https://github.com/expo/eas-cli/pull/429) by [@brentvatne](https://github.com/brentvatne))
+- Fix resolving Android application identifier. ([#431](https://github.com/expo/eas-cli/pull/431) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Android credentials setup now on Graphql API. ([#434](https://github.com/expo/eas-cli/pull/427) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.16.0](https://github.com/expo/eas-cli/releases/tag/v0.16.0) - 2021-05-26
+
+### 🎉 New features
+
+- Opt out of capability syncing with `EXPO_NO_CAPABILITY_SYNC=1`. ([#426](https://github.com/expo/eas-cli/pull/426) by [@brentvatne](https://github.com/brentvatne))
+- Add more verbose logging around capability syncing to help debug reported issues. ([#426](https://github.com/expo/eas-cli/pull/426) by [@brentvatne](https://github.com/brentvatne))
+- Add managed credentials support for multi-target iOS projects. ([#414](https://github.com/expo/eas-cli/pull/414) by [@dsokal](https://github.com/dsokal))
+
 ## [0.15.1](https://github.com/expo/eas-cli/releases/tag/v0.15.1) - 2021-05-25
 
 ### 🎉 New features

CODEOWNERS

@@ -0,0 +1,7 @@
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95
+
+packages/eas-cli/src/submit @barthap @dsokal
+packages/eas-cli/src/commands/submit.ts @barthap @dsokal
+
+packages/eas-json @dsokal @wkozyra95

CODE_OF_CONDUCT.md

@@ -0,0 +1,7 @@
+# Community Code of Conduct
+
+The Expo team is committed to fostering an open and welcoming environment.
+
+**Our Community Guidelines can be found here:**
+
+https://expo.dev/guidelines

CONTRIBUTING.md

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

codecov.yml

@@ -1,4 +1,3 @@
-comment: false
 coverage:
   round: up
   precision: 2

jest/babel.config.js

@@ -1,6 +0,0 @@
-module.exports = function (api) {
-  api.cache(true);
-  return {
-    presets: ['@expo/babel-preset-cli'],
-  };
-};

jest/jest.config.js

@@ -1,9 +1,7 @@
 module.exports = {
+  preset: 'ts-jest',
   testEnvironment: 'node',
   testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
-  transform: {
-    '^.+\\.[jt]sx?$': ['babel-jest', { configFile: require.resolve('./babel.config.js') }],
-  },
   watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
   collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
 };

lerna.json

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

package.json

@@ -1,8 +1,6 @@
 {
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
   "scripts": {
     "build": "lerna run build",
     "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
@@ -10,19 +8,28 @@
     "start": "lerna run watch --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint . --ext .ts --ext .js",
     "release": "lerna version",
-    "test": "jest"
+    "test": "jest",
+    "clean": "lerna run clean"
   },
   "devDependencies": {
     "@expo/oclif-dev-cli": "1.24.0-expo",
-    "@types/jest": "^26.0.13",
-    "eslint": "^6.6.0",
-    "eslint-config-universe": "^4.0.0",
-    "eslint-plugin-graphql": "^4.0.0",
-    "jest": "^26.4.2",
-    "jest-watch-typeahead": "^0.6.1",
-    "lerna": "^3.22.1",
-    "prettier": "^2.0.5"
+    "@types/jest": "27.0.1",
+    "@types/node": "16.7.8",
+    "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.1.0",
+    "jest-watch-typeahead": "0.6.4",
+    "lerna": "4.0.0",
+    "prettier": "2.3.2",
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.2"
+  },
+  "volta": {
+    "node": "16.10.0",
+    "yarn": "1.22.15"
   }
 }

packages/eas-cli/.eslintrc.js

@@ -1,9 +1,18 @@
+const rootEslintrc = require('../../.eslintrc.js');
+
 module.exports = {
   rules: {
-    'import/no-cycle': 'error',
-    'import/no-extraneous-dependencies': [
+    'no-restricted-imports': [
       'error',
-      { devDependencies: ['**/__tests__/**/*', '**/__mocks__/**/*'] },
+      {
+        paths: [
+          ...rootEslintrc.rules['no-restricted-imports'][1].paths,
+          {
+            name: 'ora',
+            message: 'Import ora from src/ora.ts instead.',
+          },
+        ],
+      },
     ],
     'graphql/template-strings': [
       'error',

packages/eas-cli/.gitattributes

@@ -0,0 +1,2 @@
+graphql.schema.json linguist-generated
+src/graphql/generated.ts linguist-generated

packages/eas-cli/README.md

@@ -42,15 +42,19 @@ eas --help COMMAND
 * [`eas build:configure`](#eas-buildconfigure)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
+* [`eas config`](#eas-config)
 * [`eas credentials`](#eas-credentials)
 * [`eas device:create`](#eas-devicecreate)
 * [`eas device:list`](#eas-devicelist)
 * [`eas device:view [UDID]`](#eas-deviceview-udid)
+* [`eas diagnostics`](#eas-diagnostics)
 * [`eas help [COMMAND]`](#eas-help-command)
+* [`eas project:info`](#eas-projectinfo)
+* [`eas project:init`](#eas-projectinit)
 * [`eas secret:create`](#eas-secretcreate)
 * [`eas secret:delete`](#eas-secretdelete)
 * [`eas secret:list`](#eas-secretlist)
-* [`eas submit --platform=(android|ios)`](#eas-submit---platformandroidios)
+* [`eas submit`](#eas-submit)
 * [`eas webhook:create`](#eas-webhookcreate)
 * [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
 * [`eas webhook:list`](#eas-webhooklist)
@@ -69,7 +73,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [build/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/account/login.ts)_
+_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/account/login.js)_
 
 ## `eas account:logout`
 
@@ -83,7 +87,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [build/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/account/logout.js)_
 
 ## `eas account:view`
 
@@ -97,22 +101,22 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [build/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/account/view.ts)_
+_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/account/view.js)_
 
 ## `eas analytics [STATUS]`
 
-View or change analytics settings
+view or change analytics settings
 
 ```
 USAGE
   $ eas analytics [STATUS]
 ```
 
-_See code: [build/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/analytics.ts)_
+_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/analytics.js)_
 
 ## `eas build`
 
-Start a build
+start a build
 
 ```
 USAGE
@@ -120,16 +124,28 @@ USAGE
 
 OPTIONS
   -p, --platform=(android|ios|all)
-  --clear-cache                     Clear cache before the build
-  --local                           Run build locally [experimental]
-  --non-interactive                 Run command in --non-interactive mode
-  --profile=profile                 [default: release] Name of the build profile from eas.json
-  --skip-credentials-check          Skip validation of build credentials
-  --skip-project-configuration      Skip project configuration
-  --[no-]wait                       Wait for build(s) to complete
+
+  --auto-submit                            Submit on build complete using the submit profile with the same name as the
+                                           build profile
+
+  --auto-submit-with-profile=PROFILE_NAME  Submit on build complete using the submit profile with provided name
+
+  --clear-cache                            Clear cache before the build
+
+  --json                                   Enable JSON output, non-JSON messages will be printed to stderr
+
+  --local                                  Run build locally [experimental]
+
+  --non-interactive                        Run command in non-interactive mode
+
+  --profile=PROFILE_NAME                   [default: release] Name of the build profile from eas.json
+
+  --skip-project-configuration             Skip project configuration
+
+  --[no-]wait                              Wait for build(s) to complete
 ```
 
-_See code: [build/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/build/index.ts)_
+_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/index.js)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -140,7 +156,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [build/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/cancel.js)_
 
 ## `eas build:configure`
 
@@ -152,10 +168,9 @@ USAGE
 
 OPTIONS
   -p, --platform=(android|ios|all)  Platform to configure
-  --allow-experimental              Enable experimental configuration steps.
 ```
 
-_See code: [build/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/configure.js)_
 
 ## `eas build:list`
 
@@ -166,12 +181,29 @@ USAGE
   $ eas build:list
 
 OPTIONS
+  --appBuildVersion=appBuildVersion
+  --appIdentifier=appIdentifier
+  --appVersion=appVersion
+  --buildProfile=buildProfile
+  --channel=channel
+  --distribution=(store|internal|simulator)
+  --gitCommitHash=gitCommitHash
+
+  --json                                                         Enable JSON output, non-JSON messages will be printed
+                                                                 to stderr
+
   --limit=limit
+
   --platform=(all|android|ios)
-  --status=(in-queue|in-progress|errored|finished|canceled)
+
+  --runtimeVersion=runtimeVersion
+
+  --sdkVersion=sdkVersion
+
+  --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```
 
-_See code: [build/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/build/list.ts)_
+_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/list.js)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -180,20 +212,38 @@ view a build for your project
 ```
 USAGE
   $ eas build:view [BUILD_ID]
+
+OPTIONS
+  --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```
 
-_See code: [build/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/build/view.ts)_
+_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/build/view.js)_
+
+## `eas config`
+
+show the eas.json config
+
+```
+USAGE
+  $ eas config
+
+OPTIONS
+  -p, --platform=(android|ios)
+  --profile=profile
+```
+
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/config.js)_
 
 ## `eas credentials`
 
-Manage your credentials
+manage your credentials
 
 ```
 USAGE
   $ eas credentials
 ```
 
-_See code: [build/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/credentials.ts)_
+_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/credentials.js)_
 
 ## `eas device:create`
 
@@ -204,7 +254,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [build/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/device/create.ts)_
+_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/device/create.js)_
 
 ## `eas device:list`
 
@@ -218,7 +268,7 @@ OPTIONS
   --apple-team-id=apple-team-id
 ```
 
-_See code: [build/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/device/list.ts)_
+_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/device/list.js)_
 
 ## `eas device:view [UDID]`
 
@@ -229,7 +279,18 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [build/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/device/view.ts)_
+_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/device/view.js)_
+
+## `eas diagnostics`
+
+log environment info to the console
+
+```
+USAGE
+  $ eas diagnostics
+```
+
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/diagnostics.js)_
 
 ## `eas help [COMMAND]`
 
@@ -246,7 +307,32 @@ OPTIONS
   --all  see all commands in CLI
 ```
 
-_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.3/src/commands/help.ts)_
+
+## `eas project:info`
+
+information about the current project
+
+```
+USAGE
+  $ eas project:info
+```
+
+_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/project/info.js)_
+
+## `eas project:init`
+
+create or link an EAS project
+
+```
+USAGE
+  $ eas project:init
+
+ALIASES
+  $ eas init
+```
+
+_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/project/init.js)_
 
 ## `eas secret:create`
 
@@ -257,12 +343,13 @@ USAGE
   $ eas secret:create
 
 OPTIONS
+  --force                    Delete and recreate existing secrets
   --name=name                Name of the secret
   --scope=(account|project)  [default: project] Scope for the secret
   --value=value              Value of the secret
 ```
 
-_See code: [build/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/secret/create.js)_
 
 ## `eas secret:delete`
 
@@ -279,7 +366,7 @@ DESCRIPTION
   Unsure where to find the secret's ID? Run eas secrets:list
 ```
 
-_See code: [build/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/secret/delete.js)_
 
 ## `eas secret:list`
 
@@ -290,86 +377,40 @@ USAGE
   $ eas secret:list
 ```
 
-_See code: [build/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/secret/list.js)_
 
-## `eas submit --platform=(android|ios)`
+## `eas submit`
 
-Submits build artifact to app store
+submit build archive to app store
 
 ```
 USAGE
-  $ eas submit --platform=(android|ios)
+  $ eas submit
 
 OPTIONS
-  -p, --platform=(android|ios)                                       For which platform you want to submit a build
+  -p, --platform=(android|ios|all)
+  --id=id                           ID of the build to submit
+  --latest                          Submit the latest build for specified platform
+  --non-interactive                 Run command in non-interactive mode
+  --path=path                       Path to the .apk/.aab/.ipa file
 
-  Android specific options=android-package                           Android package name (default: expo.android.package
-                                                                     from app config)
+  --profile=profile                 Name of the submit profile from eas.json. Defaults to "release" if defined in
+                                    eas.json.
 
-  iOS specific options=app-name                                      The name of your app as it will appear on the App
-                                                                     Store (default: expo.name from app config)
+  --url=url                         App archive url
 
-  iOS specific options=apple-id                                      Your Apple ID username (you can also set
-                                                                     EXPO_APPLE_ID env variable)
+  --verbose                         Always print logs from Submission Service
 
-  iOS specific options=apple-team-id                                 Your Apple Developer Team ID
+  --[no-]wait                       Wait for submission to complete
 
-  iOS specific options=asc-app-id                                    App Store Connect unique application Apple ID
-                                                                     number. Providing this param results in skipping
-                                                                     app creation step. Learn more.
-
-  iOS specific options=bundle-identifier                             Your iOS Bundle Identifier (default:
-                                                                     expo.ios.bundleIdentifier from app config)
-
-  iOS specific options=company-name                                  The name of your company, needed only for the first
-                                                                     upload of any app to App Store
-
-  --id=id                                                            ID of the build to submit
-
-  Android specific options=key                                       Path to the JSON key used to authenticate with
-                                                                     Google Play
-
-  iOS specific options=language                                      [default: en-US] Primary language (e.g. English,
-                                                                     German, ...)
-
-  --latest                                                           Submit the latest build for specified platform
-
-  --path=path                                                        Path to the .apk/.aab file
-
-  Android specific options=(completed|draft|halted|inProgress)       [default: completed] Release status (used when
-                                                                     uploading new APKs/AABs)
-
-  iOS specific options=sku                                           An unique ID for your app that is not visible on
-                                                                     the App Store, will be generated unless provided
-
-  Android specific options=(production|beta|alpha|internal|rollout)  [default: internal] The track of the application to
-                                                                     use
-
-  Android specific options=(apk|aab)                                 Android archive type
-
-  --url=url                                                          App archive url
-
-  --verbose                                                          Always print logs from Submission Service
+DESCRIPTION
+  See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
 
 ALIASES
   $ eas build:submit
-
-EXAMPLES
-  $ eas submit --platform=ios
-       - Fully interactive iOS submission
-
-  $ eas submit --platform=android
-       - Fully interactive Android submission
-
-  $ eas submit -p android --latest --key=/path/to/google-services.json
-       - Minimal non-interactive Android submission, however it can ask you for other params if not specified
-
-  $ EXPO_APPLE_APP_SPECIFIC_PASSWORD=xxx eas submit -p ios --latest [email protected] --asc-app-id=1234567890,
-       - Minimal non-interactive iOS submission, assuming you already have an app in App Store Connect
-         and provide its App ID
 ```
 
-_See code: [build/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/submit.ts)_
+_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/submit.js)_
 
 ## `eas webhook:create`
 
@@ -388,7 +429,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [build/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/create.js)_
 
 ## `eas webhook:delete [ID]`
 
@@ -402,7 +443,7 @@ ARGUMENTS
   ID  ID of the webhook to delete
 ```
 
-_See code: [build/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/delete.js)_
 
 ## `eas webhook:list`
 
@@ -416,7 +457,7 @@ OPTIONS
   --event=(BUILD)  Event type that triggers the webhook
 ```
 
-_See code: [build/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/list.js)_
 
 ## `eas webhook:update`
 
@@ -436,7 +477,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [build/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/update.js)_
 
 ## `eas webhook:view ID`
 
@@ -450,5 +491,5 @@ ARGUMENTS
   ID  ID of the webhook to view
 ```
 
-_See code: [build/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.16.0/build/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.31.1/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->

packages/eas-cli/__mocks__/fs.ts

@@ -1,2 +1,14 @@
 import { fs } from 'memfs';
+
+// needed because of a weird bug with tempy (dependency of @expo/config-plugins)
+// eslint-disable-next-line node/no-sync
+fs.mkdirSync('/tmp');
+if (process.env.TMPDIR) {
+  // eslint-disable-next-line node/no-sync
+  fs.mkdirSync(process.env.TMPDIR, { recursive: true });
+}
+
+// fs-extra@10 is not compatible with memfs, the following line fixes tests
+(fs.realpath as any).native = jest.fn();
+
 module.exports = fs;

packages/eas-cli/global-setup.ts

@@ -1,3 +0,0 @@
-module.exports = async () => {
-  process.env.TZ = 'UTC';
-};

packages/eas-cli/jest.config.js

@@ -2,5 +2,6 @@ module.exports = {
   ...require('../../jest/jest.config.js'),
   rootDir: __dirname,
   roots: ['src', '__mocks__'],
-  globalSetup: './global-setup.ts',
+  globalSetup: './jest/global-setup.ts',
+  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
 };

packages/eas-cli/jest/global-setup.ts

@@ -0,0 +1,5 @@
+module.exports = async () => {
+  process.env.TZ = 'UTC';
+  process.env.EAS_NO_VCS = '1';
+  process.env.EAS_PROJECT_ROOT = '/app';
+};

packages/eas-cli/jest/setup-after-env.ts

@@ -0,0 +1,6 @@
+/* eslint-disable no-console */
+beforeAll(() => {
+  console.log = jest.fn();
+  console.warn = jest.fn();
+  console.error = jest.fn();
+});

packages/eas-cli/package.json

@@ -1,111 +1,106 @@
 {
   "name": "eas-cli",
+  "type": "module",
   "description": "EAS command line tool",
-  "version": "0.16.0",
-  "author": "Expo <support@expo.io>",
+  "version": "0.31.1",
+  "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@amplitude/identify": "1.5.0",
-    "@amplitude/node": "1.5.0",
-    "@expo/apple-utils": "0.0.0-alpha.20",
-    "@expo/config": "3.3.42",
-    "@expo/config-plugins": "1.0.33",
-    "@expo/eas-build-job": "0.2.35",
-    "@expo/eas-json": "^0.16.0",
-    "@expo/json-file": "8.2.25",
+    "@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.11",
+    "@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.0",
     "@expo/sdk-runtime-versions": "1.0.0",
     "@expo/spawn-async": "1.5.0",
-    "@hapi/joi": "17.1.1",
+    "@expo/timeago.js": "1.0.0",
     "@oclif/command": "1.8.0",
     "@oclif/config": "1.17.0",
-    "@oclif/errors": "1.3.3",
-    "@oclif/plugin-help": "3.2.0",
-    "@urql/core": "2.0.0",
-    "@urql/exchange-retry": "0.2.0",
-    "chalk": "4.1.0",
+    "@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.0",
-    "dateformat": "3.0.3",
+    "dateformat": "4.5.1",
     "env-paths": "2.2.0",
-    "fast-glob": "3.2.4",
+    "envinfo": "7.8.1",
+    "fast-glob": "3.2.7",
     "figures": "3.2.0",
     "form-data": "3.0.0",
-    "fs-extra": "9.0.1",
+    "fs-extra": "10.0.0",
     "getenv": "1.0.0",
-    "got": "11.5.2",
-    "graphql": "15.3.0",
-    "graphql-tag": "2.11.0",
+    "got": "11.8.2",
+    "gradle-to-js": "2.0.0",
+    "graphql": "15.5.1",
+    "graphql-tag": "2.12.5",
+    "ignore": "5.1.8",
     "indent-string": "4.0.0",
-    "jks-js": "1.0.0",
+    "jks-js": "1.0.1",
+    "joi": "17.4.2",
     "keychain": "1.3.0",
-    "lodash": "4.17.20",
-    "mime": "2.4.7",
+    "log-symbols": "4.1.0",
+    "mime": "2.5.2",
     "minimatch": "3.0.4",
-    "nanoid": "3.1.23",
+    "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",
-    "progress": "2.0.3",
     "prompts": "2.3.2",
     "qrcode-terminal": "0.12.0",
-    "semver": "7.3.4",
+    "resolve-from": "5.0.0",
+    "semver": "7.3.5",
+    "slash": "3.0.0",
     "strip-ansi": "6.0.0",
-    "tar": "6.0.5",
-    "tempy": "0.7.0",
+    "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "timeago.js": "4.0.2",
-    "tslib": "1.14.1",
-    "turndown": "7.0.0",
+    "tslib": "2.3.1",
+    "turndown": "7.1.1",
     "untildify": "4.0.0",
-    "uuid": "8.3.0",
+    "uuid": "8.3.2",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.11.6",
-    "@babel/preset-env": "^7.11.5",
-    "@babel/preset-typescript": "^7.10.4",
-    "@expo/babel-preset-cli": "^0.2.17",
     "@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/color-string": "^1.5.0",
-    "@types/dateformat": "^3.0.1",
+    "@types/dateformat": "3.0.1",
+    "@types/envinfo": "7.8.1",
     "@types/form-data": "^2.5.0",
-    "@types/fs-extra": "^9.0.1",
+    "@types/fs-extra": "9.0.12",
     "@types/getenv": "^1.0.0",
-    "@types/lodash": "^4.14.161",
-    "@types/mime": "^2.0.3",
-    "@types/node": "^12",
+    "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
     "@types/node-forge": "^0.9.5",
-    "@types/progress": "^2.0.3",
     "@types/prompts": "^2.0.9",
-    "@types/semver": "^7.3.4",
-    "@types/tar": "^4.0.3",
-    "@types/tough-cookie": "^4.0.0",
-    "@types/uuid": "^8.3.0",
-    "@types/wrap-ansi": "^3.0.0",
-    "@vercel/ncc": "^0.23.0",
-    "axios": "^0.21.0",
-    "babel-jest": "^26.3.0",
-    "memfs": "^3.2.0",
+    "@types/semver": "7.3.8",
+    "@types/tar": "4.0.5",
+    "@types/tough-cookie": "4.0.1",
+    "@types/uuid": "8.3.1",
+    "@types/wrap-ansi": "3.0.0",
+    "axios": "0.21.4",
+    "eslint-plugin-graphql": "4.0.0",
+    "memfs": "3.2.2",
     "mockdate": "^3.0.2",
     "nock": "^13.0.5",
-    "ts-node": "^8",
-    "typescript": "^3.9.7",
-    "wonka": "^4.0.14"
+    "tempy": "0.7.0",
+    "ts-deepmerge": "1.0.8"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=12.0.0"
   },
   "files": [
     "/bin",
@@ -119,7 +114,6 @@
     "cli"
   ],
   "license": "MIT",
-  "main": "build/index.js",
   "oclif": {
     "bin": "eas",
     "commands": "./build/commands",
@@ -127,17 +121,28 @@
       "@oclif/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
-    "helpClass": "./build/help",
     "topics": {
+      "account": {
+        "description": "manage your account"
+      },
       "build": {
         "description": "build app binaries"
       },
       "channel": {
         "description": "manage update channels"
       },
+      "device": {
+        "description": "manage your Apple devices for internal distribution"
+      },
+      "project": {
+        "description": "manage your project"
+      },
       "release": {
         "description": "manage update releases"
       },
+      "secret": {
+        "description": "manage project and account secrets"
+      },
       "update": {
         "description": "manage individual updates"
       },
@@ -166,14 +171,13 @@
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme",
+    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme && node patch-readme",
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",
     "typecheck": "tsc",
     "test": "jest",
-    "version": "yarn oclif-dev readme && git add README.md",
-    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml"
-  },
-  "types": "build/index.d.ts",
-  "gitHead": "161808bc37c255fdea6801d69d23dbc725c056c3"
+    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
+    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
+    "clean": "rm -rf build node_modules"
+  }
 }

packages/eas-cli/patch-readme.js

@@ -0,0 +1,12 @@
+const { promises: fs } = require('fs');
+
+(async () => {
+  // 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');
+  await fs.writeFile('README.md', readmeContent);
+
+  // eslint-disable-next-line no-console
+  console.log('Patched README path generation');
+})();

packages/eas-cli/src/__mocks__/ora.ts

@@ -1,7 +1,9 @@
-export default jest.fn().mockReturnValue({
+export const ora = jest.fn().mockReturnValue({
   start: jest.fn().mockReturnValue({
     fail: jest.fn(),
     succeed: jest.fn(),
   }),
+  stop: jest.fn(),
+  stopAndPersist: jest.fn(),
   succeed: jest.fn(),
 });

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

@@ -24,7 +24,7 @@ describe('apiClient', () => {
     let error: Error | null = null;
     try {
       await apiClient.post('test');
-    } catch (e) {
+    } catch (e: any) {
       error = e;
     }
 
@@ -44,7 +44,7 @@ describe('apiClient', () => {
     let error: Error | null = null;
     try {
       await apiClient.post('test');
-    } catch (e) {
+    } catch (e: any) {
       error = e;
     }
     expect(error).toBeInstanceOf(RequestError);

packages/eas-cli/src/__tests__/project-utils.ts

@@ -25,7 +25,7 @@ interface AppJSON {
   };
 }
 
-function createTestProject(
+export function createTestProject(
   user: Actor,
   appJSONExtraData?: Record<string, object | string>
 ): MockProject {
@@ -58,5 +58,3 @@ function createTestProject(
     },
   };
 }
-
-export { createTestProject };

packages/eas-cli/src/analytics.ts

@@ -1,6 +1,6 @@
-import { Identify } from '@amplitude/identify';
-import * as Amplitude from '@amplitude/node';
+import RudderAnalytics from '@expo/rudder-sdk-node';
 import os from 'os';
+import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
 import UserSettings from './user/UserSettings';
@@ -18,84 +18,118 @@ const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   linux: 'Linux',
 };
 
-let client: Amplitude.NodeClient | null = null;
-let userIdentifyCalled = false;
+let rudderstackClient: RudderAnalytics | null = null;
+let userIdentified = false;
 let identifyData: {
   userId: string;
   deviceId: string;
-  identify: Identify;
+  traits: Record<string, any>;
 } | null = null;
 
 export async function initAsync(): Promise<void> {
-  if (process.env.DISABLE_EAS_ANALYTICS) {
-    await UserSettings.setAsync('amplitudeEnabled', false);
+  // TODO: remove after some time
+  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
+  if (amplitudeEnabled !== null) {
+    await UserSettings.setAsync('analyticsEnabled', amplitudeEnabled);
+    await UserSettings.deleteKeyAsync('amplitudeEnabled');
   }
-  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', true);
-  if (amplitudeEnabled) {
-    const apiKey =
+  const amplitudeDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+  if (amplitudeDeviceId !== null) {
+    await UserSettings.setAsync('analyticsDeviceId', amplitudeDeviceId);
+    await UserSettings.deleteKeyAsync('amplitudeDeviceId');
+  }
+  // TODO: cut here
+  if (process.env.DISABLE_EAS_ANALYTICS) {
+    await UserSettings.setAsync('analyticsEnabled', false);
+  }
+
+  const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', true);
+  if (analyticsEnabled) {
+    const config =
       process.env.EXPO_STAGING || process.env.EXPO_LOCAL
-        ? 'cdebbc678931403439486c4750781544'
-        : '4ac443afd5073c0df6169291db1d3495';
-    client = Amplitude.init(apiKey);
+        ? {
+            // staging environment
+            rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          }
+        : {
+            // prod environment
+            rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          };
+
+    rudderstackClient = new RudderAnalytics(
+      config.rudderstackWriteKey,
+      new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
+      {
+        flushInterval: 300,
+      }
+    );
   }
 }
 
-export async function setUserDataAsync(
-  userId: string,
-  properties: Record<string, any>
-): Promise<void> {
-  const identify = new Identify();
-  Object.entries(properties).forEach(([property, value]) => {
-    identify.set(property, value);
-  });
-  const savedDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+export async function setUserDataAsync(userId: string, traits: Record<string, any>): Promise<void> {
+  const savedDeviceId = await UserSettings.getAsync('analyticsDeviceId', null);
   const deviceId = savedDeviceId ?? uuidv4();
   if (!savedDeviceId) {
-    await UserSettings.setAsync('amplitudeDeviceId', deviceId);
+    await UserSettings.setAsync('analyticsDeviceId', deviceId);
   }
+
   identifyData = {
     userId,
     deviceId,
-    identify,
+    traits,
   };
 
   ensureUserIdentified();
 }
 
 export async function flushAsync(): Promise<void> {
-  if (client) {
-    await client.flush();
+  if (rudderstackClient) {
+    await rudderstackClient.flush();
   }
 }
 
-export function logEvent(name: string, properties: Record<string, any> = {}) {
-  if (client) {
-    ensureUserIdentified();
-    const { userId, deviceId } = identifyData ?? {};
-    client.logEvent({
-      event_type: name,
-      event_properties: properties,
-      ...(userId && { user_id: userId }),
-      ...(deviceId && { device_id: deviceId }),
-      ...getContext(),
-    });
+export function logEvent(name: string, properties: Record<string, any> = {}): void {
+  if (!rudderstackClient) {
+    return;
   }
+  ensureUserIdentified();
+
+  const { userId, deviceId } = identifyData ?? {};
+  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
+
+  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+  rudderstackClient.track({
+    event: name,
+    properties: { ...properties, ...commonEventProperties },
+    ...identity,
+    context: getRudderStackContext(),
+  });
 }
 
-function ensureUserIdentified() {
-  if (client && !userIdentifyCalled && identifyData) {
-    client.identify(identifyData.userId, identifyData.deviceId, identifyData.identify);
-    userIdentifyCalled = true;
+function ensureUserIdentified(): void {
+  if (!rudderstackClient || userIdentified || !identifyData) {
+    return;
   }
+
+  rudderstackClient.identify({
+    userId: identifyData.userId,
+    anonymousId: identifyData.deviceId,
+    traits: identifyData.traits,
+  });
+  userIdentified = true;
 }
 
-function getContext() {
+function getRudderStackContext(): Record<string, any> {
   const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
   return {
-    os_name: platform,
-    os_version: os.release(),
-    device_brand: platform,
-    device_model: platform,
-    app_version: packageJSON?.version,
+    os: { name: platform, version: os.release() },
+    device: { type: platform, model: platform },
+    app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
   };
 }
+
+export enum AnalyticsEvent {
+  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
+}

packages/eas-cli/src/api.ts

@@ -50,10 +50,10 @@ export function getExpoApiBaseUrl(): string {
 
 export function getExpoWebsiteBaseUrl(): string {
   if (process.env.EXPO_STAGING) {
-    return `https://staging.expo.io`;
+    return `https://staging.expo.dev`;
   } else if (process.env.EXPO_LOCAL) {
     return `http://expo.test`;
   } else {
-    return `https://expo.io`;
+    return `https://expo.dev`;
   }
 }

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

@@ -1,5 +1,5 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
+import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
 import fs from 'fs-extra';
 
 import Log from '../../log';
@@ -14,20 +14,16 @@ export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig)
   const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
 
   if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
-    const updatedBuildGradleContents = AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
-      projectDir,
-      buildGradleContents
-    );
+    const updatedBuildGradleContents =
+      AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
+        projectDir,
+        buildGradleContents
+      );
     await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
   }
 
   const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(
-    androidManifestPath
-  );
+  const androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
     const result = AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
@@ -52,10 +48,7 @@ export async function syncUpdatesConfigurationAsync(
   }
 
   const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  let androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(androidManifestPath);
+  let androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
     androidManifest = AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
@@ -78,13 +71,7 @@ async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig)
     throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
   }
 
-  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-  if (!androidManifestPath) {
-    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-  }
-  const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(
-    androidManifestPath
-  );
+  const androidManifest = await getAndroidManifestAsync(projectDir);
 
   if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
     throw new Error('Missing values in AndroidManifest.xml');
@@ -93,13 +80,7 @@ async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig)
 
 export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
   try {
-    const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-    if (!androidManifestPath) {
-      throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
-    }
-    const androidManifest = await AndroidConfig.Manifest.readAndroidManifestAsync(
-      androidManifestPath
-    );
+    const androidManifest = await getAndroidManifestAsync(projectDir);
     return AndroidConfig.Manifest.getMainApplicationMetaDataValue(
       androidManifest,
       AndroidConfig.Updates.Config.RELEASE_CHANNEL
@@ -108,3 +89,27 @@ export async function readReleaseChannelSafelyAsync(projectDir: string): Promise
     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__/UpdatesModule-test.ts

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

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

@@ -1,114 +1,280 @@
 import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import assert from 'assert';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import path from 'path';
 
-import { readVersionCode, readVersionName } from '../version';
+import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
+import {
+  BumpStrategy,
+  bumpVersionAsync,
+  bumpVersionInAppJsonAsync,
+  maybeResolveVersionsAsync,
+} from '../version';
 
+const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
 
-afterAll(() => {
+afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.removeSync(os.tmpdir());
+  await fs.remove(os.tmpdir());
 });
 
-beforeEach(() => {
+beforeEach(async () => {
   vol.reset();
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.mkdirpSync(os.tmpdir());
+  await fs.mkdirp(os.tmpdir());
 });
 
-describe(readVersionCode, () => {
+// generic workflow
+describe(bumpVersionAsync, () => {
+  it('throws an informative error when multiple flavors are detected in the android project', async () => {
+    await initProjectWithGradleFileAsync(
+      /*buildGradlePath*/ path.join(
+        __dirname,
+        '../../../project/android/__tests__/fixtures/multiflavor-build.gradle'
+      )
+    );
+    await expect(
+      bumpVersionAsync({
+        bumpStrategy: BumpStrategy.VERSION_CODE,
+        projectDir: '/multiflavor',
+        exp: {} as any,
+      })
+    ).rejects.toThrow(
+      'Automatic version bumping is not supported for multi-flavor Android projects.'
+    );
+  });
+  it('throws an informative error when multiple flavor dimensions are defined in an android project', async () => {
+    await initProjectWithGradleFileAsync(
+      /*buildGradlePath*/ path.join(
+        __dirname,
+        '../../../project/android/__tests__/fixtures/multiflavor-with-dimensions-build.gradle'
+      )
+    );
+    await expect(
+      bumpVersionAsync({
+        bumpStrategy: BumpStrategy.VERSION_CODE,
+        projectDir: '/multiflavor',
+        exp: {} as any,
+      })
+    ).rejects.toThrow(
+      'Automatic version bumping is not supported for multi-flavor Android projects.'
+    );
+  });
+  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 = initGenericProject({ versionCode: nativeVersionCode });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.VERSION_CODE,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('3.0.0');
+    expect(fakeExp.android?.versionCode).toBe(124);
+    expect(appJSON.expo.version).toBe('3.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(124);
+
+    const buildGradle = await getAppBuildGradleAsync('/repo');
+    assert(buildGradle);
+    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('124');
+    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
+  });
+
+  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 = initGenericProject({ versionName: nativeVersionName });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('3.0.1');
+    expect(fakeExp.android?.versionCode).toBe(123);
+    expect(appJSON.expo.version).toBe('3.0.1');
+    expect(appJSON.expo.android.versionCode).toBe(123);
+
+    const buildGradle = await getAppBuildGradleAsync('/repo');
+    assert(buildGradle);
+    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
+    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.1');
+  });
+
+  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
+    const fakeExp = initGenericProject();
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.NOOP,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('3.0.0');
+    expect(fakeExp.android?.versionCode).toBe(123);
+    expect(appJSON.expo.version).toBe('3.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(123);
+
+    const buildGradle = await getAppBuildGradleAsync('/repo');
+    assert(buildGradle);
+    expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
+    expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
+  });
+});
+
+// managed workflow
+describe(bumpVersionInAppJsonAsync, () => {
+  it('bumps expo.android.versionCode when strategy = BumpStrategy.VERSION_CODE', async () => {
+    const fakeExp = initManagedProject();
+
+    await bumpVersionInAppJsonAsync({
+      bumpStrategy: BumpStrategy.VERSION_CODE,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('5.0.0');
+    expect(fakeExp.android?.versionCode).toBe(127);
+    expect(appJSON.expo.version).toBe('5.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(127);
+  });
+
+  it('bumps expo.version when strategy = BumpStrategy.SHORT_VERSION', async () => {
+    const fakeExp = initManagedProject();
+
+    await bumpVersionInAppJsonAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('5.0.1');
+    expect(fakeExp.android?.versionCode).toBe(126);
+    expect(appJSON.expo.version).toBe('5.0.1');
+    expect(appJSON.expo.android.versionCode).toBe(126);
+  });
+
+  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
+    const fakeExp = initManagedProject();
+
+    await bumpVersionInAppJsonAsync({
+      bumpStrategy: BumpStrategy.NOOP,
+      projectDir: '/repo',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    expect(fakeExp.version).toBe('5.0.0');
+    expect(fakeExp.android?.versionCode).toBe(126);
+    expect(appJSON.expo.version).toBe('5.0.0');
+    expect(appJSON.expo.android.versionCode).toBe(126);
+  });
+});
+
+describe(maybeResolveVersionsAsync, () => {
   describe('generic project', () => {
-    it('reads the version code from native code', () => {
+    it('reads the versions from native code', async () => {
       const exp = initGenericProject();
-      const versionCode = readVersionCode('/repo', exp);
-      expect(versionCode).toBe(123);
+      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
+        '/repo',
+        exp,
+        {} as BuildProfile<Platform.ANDROID>
+      );
+      expect(appVersion).toBe('3.0.0');
+      expect(appBuildVersion).toBe('123');
     });
   });
   describe('managed project', () => {
-    it('reads the version code from expo config', () => {
+    it('reads the versions from expo config', async () => {
       const exp = initManagedProject();
-      const versionCode = readVersionCode('/repo', exp);
-      expect(versionCode).toBe(123);
+      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
+        '/repo',
+        exp,
+        {} as BuildProfile<Platform.ANDROID>
+      );
+      expect(appVersion).toBe('5.0.0');
+      expect(appBuildVersion).toBe('126');
     });
   });
 });
 
-describe(readVersionName, () => {
-  describe('generic project', () => {
-    it('reads the version name from native code', () => {
-      const exp = initGenericProject();
-      const versionName = readVersionName('/repo', exp);
-      expect(versionName).toBe('1.0');
-    });
-  });
-  describe('managed project', () => {
-    it('reads the version from expo config', () => {
-      const exp = initManagedProject();
-      const versionName = readVersionName('/repo', exp);
-      expect(versionName).toBe('1.0.0');
-    });
-  });
-});
-
-function initGenericProject(): ExpoConfig {
+function initGenericProject({
+  versionCode = 123,
+  versionName = '3.0.0',
+}: {
+  versionCode?: number;
+  versionName?: string;
+} = {}): ExpoConfig {
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '3.0.0',
+    android: {
+      versionCode: 123,
+    },
+  };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          android: {
-            versionCode: 1,
-          },
-        },
+        expo: fakeExp,
       }),
       './android/app/build.gradle': `android {
   defaultConfig {
     applicationId "com.expo.testapp"
-    versionCode 123
-    versionName "1.0"
+    versionCode ${versionCode}
+    versionName "${versionName}"
   }
 }`,
+      './android/app/src/main/AndroidManifest.xml': 'fake',
     },
     '/repo'
   );
 
-  const fakeExp: ExpoConfig = {
-    name: 'myproject',
-    slug: 'myproject',
-    version: '1.0.0',
-    android: {
-      versionCode: 123,
-    },
-  };
   return fakeExp;
 }
 
 function initManagedProject(): ExpoConfig {
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '5.0.0',
+    android: {
+      versionCode: 126,
+    },
+  };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          android: {
-            versionCode: 123,
-          },
-        },
+        expo: fakeExp,
       }),
     },
     '/repo'
   );
 
-  const fakeExp: ExpoConfig = {
-    name: 'myproject',
-    slug: 'myproject',
-    version: '1.0.0',
-    android: {
-      versionCode: 123,
-    },
-  };
   return fakeExp;
 }
+
+async function initProjectWithGradleFileAsync(gradleFilePath: string): Promise<void> {
+  vol.fromJSON(
+    {
+      'android/app/build.gradle': await fsReal.readFile(gradleFilePath, 'utf-8'),
+      './app.json': JSON.stringify({
+        expo: {} as any,
+      }),
+    },
+    '/multiflavor'
+  );
+}

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

@@ -1,53 +1,39 @@
-import { Android, Metadata, Workflow } from '@expo/eas-build-job';
-import { EasConfig } from '@expo/eas-json';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
+import nullthrows from 'nullthrows';
 
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
-import { createCredentialsContextAsync } from '../../credentials/context';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
-import { getOrConfigureApplicationIdAsync } from '../../project/android/applicationId';
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  getApplicationIdAsync,
+} from '../../project/android/applicationId';
+import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
-import { CredentialsResult, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext, CommandContext, createBuildContext } from '../context';
+import { findAccountByName } from '../../user/Account';
+import {
+  BuildRequestSender,
+  CredentialsResult,
+  JobData,
+  prepareBuildRequestForPlatformAsync,
+} from '../build';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { Platform } from '../types';
 import { logCredentialsSource } from '../utils/credentials';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
-import { transformGenericJob, transformManagedJob } from './graphql';
+import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
 export async function prepareAndroidBuildAsync(
-  commandCtx: CommandContext,
-  easConfig: EasConfig
-): Promise<() => Promise<string | undefined>> {
-  const buildCtx = createBuildContext<Platform.ANDROID>({
-    commandCtx,
-    platform: Platform.ANDROID,
-    easConfig,
-  });
-  const { buildProfile } = buildCtx;
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
+  const { buildProfile } = ctx;
 
-  if (
-    buildProfile.workflow === Workflow.GENERIC &&
-    !(await fs.pathExists(path.join(commandCtx.projectDir, 'android')))
-  ) {
-    throw new Error(
-      `"android" directory not found. If you're trying to build a managed project, set ${chalk.bold(
-        `builds.android.${commandCtx.profile}.workflow`
-      )} in "eas.json" to "managed".`
-    );
-  }
-
-  if (
-    buildProfile.workflow === Workflow.GENERIC &&
-    buildProfile.distribution === 'internal' &&
-    buildProfile.gradleCommand?.match(/bundle/)
-  ) {
+  if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
     Log.addNewLineIfNone();
     Log.warn(
       `You're building your Android app for internal distribution. However, we've detected that the Gradle command you defined (${chalk.underline(
@@ -63,68 +49,78 @@ This means that it will most likely produce an AAB and you will not be able to i
     }
   }
 
-  // this function throws if application id is invalid
-  await getOrConfigureApplicationIdAsync(commandCtx.projectDir, commandCtx.exp);
+  checkNodeEnvVariable(ctx);
+  await checkGoogleServicesFileAsync(ctx);
+
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
+
+  if (ctx.workflow === Workflow.MANAGED) {
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+  }
 
   return await prepareBuildRequestForPlatformAsync({
-    ctx: buildCtx,
-    ensureCredentialsAsync: ensureAndroidCredentialsAsync,
+    ctx,
+    ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
+      return await ensureAndroidCredentialsAsync(ctx, gradleContext);
+    },
     ensureProjectConfiguredAsync: async () => {
-      if (buildCtx.buildProfile.workflow === Workflow.GENERIC) {
-        await validateAndSyncProjectConfigurationAsync(commandCtx.projectDir, commandCtx.exp);
-      }
+      await validateAndSyncProjectConfigurationAsync({
+        projectDir: ctx.projectDir,
+        exp: ctx.exp,
+        buildProfile,
+      });
+    },
+    getMetadataContext: () => ({
+      gradleContext,
+    }),
+    prepareJobAsync: async (
+      ctx: BuildContext<Platform.ANDROID>,
+      jobData: JobData<AndroidCredentials>
+    ): Promise<Job> => {
+      return await prepareJobAsync(ctx, jobData);
     },
-    prepareJobAsync,
     sendBuildRequestAsync: async (
       appId: string,
       job: Android.Job,
       metadata: Metadata
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
-      if (job.type === Workflow.GENERIC) {
-        const graphqlJob = transformGenericJob(job);
-        return await BuildMutation.createAndroidGenericBuildAsync({
-          appId,
-          job: graphqlJob,
-          metadata: graphqlMetadata,
-        });
-      } else {
-        const graphqlJob = transformManagedJob(job);
-        return await BuildMutation.createAndroidManagedBuildAsync({
-          appId,
-          job: graphqlJob,
-          metadata: graphqlMetadata,
-        });
-      }
+      const graphqlJob = transformJob(job);
+      return await BuildMutation.createAndroidBuildAsync({
+        appId,
+        job: graphqlJob,
+        metadata: graphqlMetadata,
+      });
     },
   });
 }
 
 function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
-  return (
-    ctx.buildProfile.workflow === Workflow.MANAGED ||
-    (ctx.buildProfile.workflow === Workflow.GENERIC && !ctx.buildProfile.withoutCredentials)
-  );
+  return !ctx.buildProfile.withoutCredentials;
 }
 
 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.ANDROID>
+  ctx: BuildContext<Platform.ANDROID>,
+  gradleContext?: GradleBuildContext
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
   if (!shouldProvideCredentials(ctx)) {
     return;
   }
-  const provider = new AndroidCredentialsProvider(
-    await createCredentialsContextAsync(ctx.commandCtx.projectDir, {
-      nonInteractive: ctx.commandCtx.nonInteractive,
-    }),
-    {
-      app: {
-        projectName: ctx.commandCtx.projectName,
-        accountName: ctx.commandCtx.accountName,
-      },
-      skipCredentialsCheck: ctx.commandCtx.skipCredentialsCheck,
-    }
+  const androidApplicationIdentifier = await getApplicationIdAsync(
+    ctx.projectDir,
+    ctx.exp,
+    gradleContext
   );
+  const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
+    app: {
+      account: nullthrows(
+        findAccountByName(ctx.user.accounts, ctx.accountName),
+        `You do not have access to account: ${ctx.accountName}`
+      ),
+      projectName: ctx.projectName,
+      androidApplicationIdentifier,
+    },
+  });
   const { credentialsSource } = ctx.buildProfile;
   logCredentialsSource(credentialsSource, Platform.ANDROID);
   return {

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

@@ -1,19 +1,23 @@
 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 {
-  getOrConfigureApplicationIdAsync,
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
   warnIfAndroidPackageDefinedInAppConfigForGenericProject,
 } from '../../project/android/applicationId';
-import { gitAddAsync } from '../../utils/git';
+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 getOrConfigureApplicationIdAsync(ctx.projectDir, ctx.exp);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
     return;
   }
 
@@ -22,7 +26,7 @@ export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void
   await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
 
   const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await gitAddAsync(easGradlePath, { intentToAdd: true });
+  await vcs.trackFileAsync(easGradlePath);
 
   if (isExpoUpdatesInstalled(ctx.projectDir)) {
     await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -30,16 +34,42 @@ export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void
   Log.withTick('Android project configured');
 }
 
-export async function validateAndSyncProjectConfigurationAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<void> {
-  if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
-    throw new Error(
-      'Project is not configured. Please run "eas build:configure" to configure the project.'
-    );
+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 });
   }
-  if (isExpoUpdatesInstalled(projectDir)) {
-    await syncUpdatesConfigurationAsync(projectDir, exp);
+}
+
+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

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

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

@@ -1,54 +1,34 @@
-import { Android, ArchiveSource, Cache, Job, Workflow, sanitizeJob } from '@expo/eas-build-job';
-import { AndroidGenericBuildProfile, AndroidManagedBuildProfile } from '@expo/eas-json';
+import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
+import { AndroidBuildProfile } from '@expo/eas-json';
 import path from 'path';
+import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { readEnvironmentSecretsAsync } from '../../credentials/credentialsJson/read';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { gitRootDirectoryAsync } from '../../utils/git';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 
 interface JobData {
   projectArchive: ArchiveSource;
   credentials?: AndroidCredentials;
 }
 
+const cacheDefaults = {
+  disabled: false,
+  customPaths: [],
+  cacheDefaultPaths: true,
+};
+
 export async function prepareJobAsync(
   ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData
 ): Promise<Job> {
-  if (ctx.buildProfile.workflow === Workflow.GENERIC) {
-    const partialJob = await prepareGenericJobAsync(ctx, jobData, ctx.buildProfile);
-    return sanitizeJob(partialJob);
-  } else if (ctx.buildProfile.workflow === Workflow.MANAGED) {
-    const partialJob = await prepareManagedJobAsync(ctx, jobData, ctx.buildProfile);
-    return sanitizeJob(partialJob);
-  } else {
-    throw new Error("Unknown workflow. Shouldn't happen");
-  }
-}
-
-interface CommonJobProperties {
-  platform: Platform.ANDROID;
-  projectArchive: ArchiveSource;
-  builderEnvironment: Android.BuilderEnvironment;
-  cache: Cache;
-  secrets: {
-    buildCredentials?: {
-      keystore: Android.Keystore;
-    };
-    environmentSecrets?: Record<string, string>;
-  };
-}
-
-async function prepareJobCommonAsync(
-  ctx: BuildContext<Platform.ANDROID>,
-  jobData: JobData
-): Promise<Partial<CommonJobProperties>> {
-  const environmentSecrets = await readEnvironmentSecretsAsync(ctx.commandCtx.projectDir);
-  const credentials = jobData.credentials;
+  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
+  const projectRootDirectory =
+    slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
+  const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
         buildCredentials: {
@@ -62,59 +42,41 @@ async function prepareJobCommonAsync(
       }
     : {};
 
-  return {
+  let buildType = ctx.buildProfile.buildType;
+  if (!buildType && !buildProfile.gradleCommand && ctx.buildProfile.distribution === 'internal') {
+    buildType = Android.BuildType.APK;
+  }
+
+  const job: Android.Job = {
+    type: ctx.workflow,
     platform: Platform.ANDROID,
+    projectRootDirectory,
     projectArchive: jobData.projectArchive,
     builderEnvironment: {
-      image: ctx.buildProfile.image,
-      node: ctx.buildProfile.node,
-      yarn: ctx.buildProfile.yarn,
-      ndk: ctx.buildProfile.ndk,
-      expoCli: ctx.buildProfile.expoCli,
-      env: ctx.buildProfile.env,
+      image: buildProfile.image,
+      node: buildProfile.node,
+      yarn: buildProfile.yarn,
+      ndk: buildProfile.ndk,
+      expoCli: buildProfile.expoCli,
+      env: buildProfile.env,
     },
     cache: {
-      ...ctx.buildProfile.cache,
-      clear: ctx.commandCtx.clearCache,
+      ...cacheDefaults,
+      ...buildProfile.cache,
+      clear: ctx.clearCache,
     },
     secrets: {
-      ...(environmentSecrets ? { environmentSecrets } : {}),
       ...buildCredentials,
     },
-  };
-}
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
 
-async function prepareGenericJobAsync(
-  ctx: BuildContext<Platform.ANDROID>,
-  jobData: JobData,
-  buildProfile: AndroidGenericBuildProfile
-): Promise<Partial<Android.GenericJob>> {
-  const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
-  return {
-    ...(await prepareJobCommonAsync(ctx, jobData)),
-    type: Workflow.GENERIC,
     gradleCommand: buildProfile.gradleCommand,
     artifactPath: buildProfile.artifactPath,
-    releaseChannel: buildProfile.releaseChannel,
-    projectRootDirectory,
-  };
-}
 
-async function prepareManagedJobAsync(
-  ctx: BuildContext<Platform.ANDROID>,
-  jobData: JobData,
-  buildProfile: AndroidManagedBuildProfile
-): Promise<Partial<Android.ManagedJob>> {
-  const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
-  const username = getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync());
-  return {
-    ...(await prepareJobCommonAsync(ctx, jobData)),
-    type: Workflow.MANAGED,
     username,
-    buildType: buildProfile.buildType,
-    releaseChannel: buildProfile.releaseChannel,
-    projectRootDirectory,
+    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
   };
+
+  return sanitizeJob(job);
 }

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

@@ -1,44 +1,153 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { resolveWorkflow } from '../../project/workflow';
+import Log from '../../log';
+import {
+  getAppBuildGradleAsync,
+  parseGradleCommand,
+  resolveConfigValue,
+} from '../../project/android/gradleUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
-export function readVersionCode(projectDir: string, exp: ExpoConfig): number | undefined {
-  const workflow = resolveWorkflow(projectDir, Platform.ANDROID);
-  if (workflow === Workflow.GENERIC) {
-    const buildGradle = readBuildGradle(projectDir);
-    const matchResult = buildGradle?.match(/versionCode (.*)/);
-    if (matchResult) {
-      return Number(matchResult[1]);
-    } else {
-      return undefined;
-    }
+export enum BumpStrategy {
+  APP_VERSION,
+  VERSION_CODE,
+  NOOP,
+}
+
+export async function bumpVersionAsync({
+  bumpStrategy,
+  projectDir,
+  exp,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  bumpStrategy: BumpStrategy;
+}): Promise<void> {
+  if (bumpStrategy === BumpStrategy.NOOP) {
+    return;
+  }
+  ensureStaticConfigExists(projectDir);
+
+  const buildGradle = await getAppBuildGradleAsync(projectDir);
+  const isMultiFlavor =
+    buildGradle.android?.productFlavors || buildGradle.android?.flavorDimensions;
+  if (isMultiFlavor) {
+    throw new Error(
+      'Automatic version bumping is not supported for multi-flavor Android projects.'
+    );
+  }
+
+  await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
+  Log.log('Updated versions in app.json');
+  await writeVersionsToBuildGradleAsync({
+    projectDir,
+    exp,
+  });
+  Log.log('Synchronized versions with build gradle');
+}
+
+export async function bumpVersionInAppJsonAsync({
+  bumpStrategy,
+  projectDir,
+  exp,
+}: {
+  bumpStrategy: BumpStrategy;
+  projectDir: string;
+  exp: ExpoConfig;
+}): Promise<void> {
+  if (bumpStrategy === BumpStrategy.NOOP) {
+    return;
+  }
+
+  ensureStaticConfigExists(projectDir);
+  Log.addNewLineIfNone();
+
+  if (bumpStrategy === BumpStrategy.APP_VERSION) {
+    const appVersion = AndroidConfig.Version.getVersionName(exp) ?? '1.0.0';
+    await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
-    return AndroidConfig.Version.getVersionCode(exp) ?? undefined;
+    const versionCode = AndroidConfig.Version.getVersionCode(exp);
+    const bumpedVersionCode = versionCode + 1;
+    Log.log(
+      `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
+        versionCode
+      )} to ${chalk.bold(bumpedVersionCode)}`
+    );
+    await updateAppJsonConfigAsync({ projectDir, exp }, config => {
+      config.android = { ...config.android, versionCode: bumpedVersionCode };
+    });
   }
 }
 
-export function readVersionName(projectDir: string, exp: ExpoConfig): string | undefined {
-  const workflow = resolveWorkflow(projectDir, Platform.ANDROID);
+export async function maybeResolveVersionsAsync(
+  projectDir: string,
+  exp: ExpoConfig,
+  buildProfile: BuildProfile<Platform.ANDROID>
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
-    const buildGradle = readBuildGradle(projectDir);
-    const matchResult = buildGradle?.match(/versionName ["'](.*)["']/);
-    if (matchResult) {
-      return matchResult[1];
-    } else {
-      return undefined;
+    const buildGradle = await getAppBuildGradleAsync(projectDir);
+    try {
+      const parsedGradleCommand = buildProfile.gradleCommand
+        ? parseGradleCommand(buildProfile.gradleCommand, buildGradle)
+        : undefined;
+
+      return {
+        appVersion:
+          resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
+        appBuildVersion:
+          resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
+      };
+    } catch (err: any) {
+      return {};
     }
   } else {
-    return exp.version;
+    return {
+      appBuildVersion: String(AndroidConfig.Version.getVersionCode(exp)),
+      appVersion: exp.version,
+    };
   }
 }
 
-function readBuildGradle(projectDir: string): string | undefined {
+async function writeVersionsToBuildGradleAsync({
+  projectDir,
+  exp,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+}): Promise<string> {
+  const buildGradle = await readBuildGradleAsync(projectDir);
+  if (!buildGradle) {
+    throw new Error('This project is missing a build.gradle file.');
+  }
+  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
+  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
+  await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
+  return updatedBuildGradle;
+}
+
+async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {
   const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-  if (!fs.pathExistsSync(buildGradlePath)) {
+  if (!(await fs.pathExists(buildGradlePath))) {
     return undefined;
   }
-  return fs.readFileSync(buildGradlePath, 'utf8');
+  return await fs.readFile(buildGradlePath, 'utf8');
+}
+
+async function writeBuildGradleAsync({
+  projectDir,
+  buildGradle,
+}: {
+  projectDir: string;
+  buildGradle: string;
+}): Promise<void> {
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  await fs.writeFile(buildGradlePath, buildGradle);
 }

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

@@ -1,28 +1,26 @@
-import { ArchiveSource, ArchiveSourceType, Job, Metadata } from '@expo/eas-build-job';
+import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
+import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { UploadSessionType } from '../graphql/generated';
+import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
-import Log from '../log';
-import { promptAsync } from '../prompts';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log, { learnMore } from '../log';
+import { ora } from '../ora';
+import { requestedPlatformDisplayNames } from '../platform';
 import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
-import { requestedPlatformDisplayNames } from './constants';
+import { sleepAsync } from '../utils/promise';
+import vcs from '../vcs';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { collectMetadata } from './metadata';
-import { Platform, TrackingContext } from './types';
+import { MetadataContext, collectMetadataAsync } from './metadata';
+import { TrackingContext } from './types';
 import Analytics, { Event } from './utils/analytics';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
-import {
-  commitChangedFilesAsync,
-  commitPromptAsync,
-  isGitStatusCleanAsync,
-  makeProjectTarballAsync,
-  showDiffAsync,
-} from './utils/repository';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -41,72 +39,85 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
   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>;
 }
 
+export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
+
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
   TJob extends Job
->(builder: Builder<TPlatform, Credentials, TJob>): Promise<() => Promise<string | undefined>> {
+>(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
+  const { ctx } = builder;
   const credentialsResult = await withAnalyticsAsync(
-    async () => await builder.ensureCredentialsAsync(builder.ctx),
+    async () => await builder.ensureCredentialsAsync(ctx),
     {
       successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
       failureEvent: Event.GATHER_CREDENTIALS_FAIL,
-      trackingCtx: builder.ctx.trackingCtx,
+      trackingCtx: ctx.trackingCtx,
     }
   );
-  if (!builder.ctx.commandCtx.skipProjectConfiguration) {
-    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(builder.ctx), {
+  if (!ctx.skipProjectConfiguration) {
+    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
       successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
       failureEvent: Event.CONFIGURE_PROJECT_FAIL,
-      trackingCtx: builder.ctx.trackingCtx,
+      trackingCtx: ctx.trackingCtx,
     });
   }
 
-  if (!(await isGitStatusCleanAsync())) {
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.addNewLineIfNone();
     await reviewAndCommitChangesAsync(
-      `[EAS Build] Run EAS Build for ${
-        requestedPlatformDisplayNames[builder.ctx.platform as Platform]
-      }`,
-      {
-        nonInteractive: builder.ctx.commandCtx.nonInteractive,
-      }
+      `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
+      { nonInteractive: ctx.nonInteractive }
     );
   }
 
-  const projectArchive = builder.ctx.commandCtx.local
+  const projectArchive = ctx.local
     ? ({
         type: ArchiveSourceType.PATH,
         path: (await makeProjectTarballAsync()).path,
       } as const)
     : ({
         type: ArchiveSourceType.S3,
-        bucketKey: await uploadProjectAsync(builder.ctx),
+        bucketKey: await uploadProjectAsync(ctx),
       } as const);
 
-  const metadata = await collectMetadata(builder.ctx, {
-    credentialsSource: credentialsResult?.source,
-  });
-  const job = await builder.prepareJobAsync(builder.ctx, {
+  const metadataContext = builder.getMetadataContext();
+  const metadata = await collectMetadataAsync(ctx, metadataContext);
+  const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
   });
 
   return async () => {
-    if (builder.ctx.commandCtx.local) {
+    if (ctx.local) {
       await runLocalBuildAsync(job);
       return undefined;
     } else {
       try {
         return await sendBuildRequestAsync(builder, job, metadata);
-      } catch (error) {
+      } catch (error: any) {
         if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
           Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
           throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
+        ) {
+          Log.error(
+            'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
+          );
+          throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED'
+        ) {
+          Log.error(
+            'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
+          );
+          throw new Error('Build request failed.');
         } else if (
           error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
         ) {
@@ -146,7 +157,10 @@ async function uploadProjectAsync<TPlatform extends Platform>(
               `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
                 projectTarball.size
               )})`,
-            completedMessage: `Uploaded to EAS`,
+            completedMessage: (duration: string) =>
+              `Uploaded to EAS ${chalk.dim(duration)} ${learnMore(
+                'https://expo.fyi/eas-build-archive'
+              )}`,
           })
         );
         return bucketKey;
@@ -168,7 +182,7 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
   builder: Builder<TPlatform, Credentials, TJob>,
   job: TJob,
   metadata: Metadata
-): Promise<string> {
+): Promise<BuildFragment> {
   const { ctx } = builder;
   return await withAnalyticsAsync(
     async () => {
@@ -177,13 +191,13 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
       }
 
       const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
-        ctx.commandCtx.projectId,
+        ctx.projectId,
         job,
         metadata
       );
 
       printDeprecationWarnings(deprecationInfo);
-      return build.id;
+      return build;
     },
     {
       successEvent: Event.BUILD_REQUEST_SUCCESS,
@@ -205,7 +219,7 @@ async function withAnalyticsAsync<Result>(
     const result = await fn();
     Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
     return result;
-  } catch (error) {
+  } catch (error: any) {
     Analytics.logEvent(analytics.failureEvent, {
       ...analytics.trackingCtx,
       reason: error.message,
@@ -214,54 +228,104 @@ async function withAnalyticsAsync<Result>(
   }
 }
 
-enum ShouldCommitChanges {
-  Yes,
-  ShowDiffFirst,
-  Abort,
-}
-
-async function reviewAndCommitChangesAsync(
-  initialCommitMessage: string,
-  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
-): Promise<void> {
-  if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await commitChangedFilesAsync(initialCommitMessage);
-    Log.withTick('Committed changes.');
-    return;
-  }
-  if (nonInteractive) {
-    throw new Error(
-      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode or set EAS_BUILD_AUTOCOMMIT=1 in your environment.'
+export async function waitForBuildEndAsync(
+  buildIds: string[],
+  { timeoutSec = 3600, intervalSec = 30 } = {}
+): Promise<(BuildFragment | null)[]> {
+  Log.log(
+    `Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`
+  );
+  const spinner = ora().start();
+  let time = new Date().getTime();
+  const endTime = time + timeoutSec * 1000;
+  while (time <= endTime) {
+    const builds: (BuildFragment | null)[] = await Promise.all(
+      buildIds.map(async buildId => {
+        try {
+          return await BuildQuery.byIdAsync(buildId, { useCache: false });
+        } catch (err) {
+          Log.debug('Failed to fetch the build status', err);
+          return null;
+        }
+      })
     );
+    if (builds.length === 1) {
+      const [build] = builds;
+      if (build !== null) {
+        switch (build.status) {
+          case BuildStatus.Finished:
+            spinner.succeed('Build finished');
+            return builds;
+          case BuildStatus.New:
+            spinner.text = 'Build created';
+            break;
+          case BuildStatus.InQueue:
+            spinner.text = 'Build queued...';
+            break;
+          case BuildStatus.Canceled:
+            spinner.text = 'Build canceled';
+            spinner.stopAndPersist();
+            return builds;
+          case BuildStatus.InProgress:
+            spinner.text = 'Build in progress...';
+            break;
+          case BuildStatus.Errored:
+            spinner.fail('Build failed');
+            if (build.error) {
+              return builds;
+            } else {
+              throw new Error(`Standalone build failed!`);
+            }
+          default:
+            spinner.warn('Unknown status');
+            throw new Error(`Unknown build status: ${build.status} - aborting!`);
+        }
+      } else {
+        if (!spinner.text) {
+          spinner.text = 'Could not fetch the build status. Check your network connection.';
+        }
+      }
+    } else {
+      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
+        spinner.succeed('All builds have finished');
+        return builds;
+      } else if (
+        builds.filter(build =>
+          build?.status
+            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
+                build.status
+              )
+            : false
+        ).length === builds.length
+      ) {
+        spinner.fail('Some of the builds were canceled or failed.');
+        return builds;
+      } else {
+        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
+        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
+        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
+        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
+        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
+        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
+        const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished;
+        spinner.text = [
+          newBuilds && `Builds created: ${newBuilds}`,
+          inQueue && `Builds in queue: ${inQueue}`,
+          inProgress && `Builds in progress: ${inProgress}`,
+          canceled && `Builds canceled: ${canceled}`,
+          errored && chalk.red(`Builds failed: ${errored}`),
+          finished && chalk.green(`Builds finished: ${finished}`),
+          unknown && chalk.red(`Builds with unknown status: ${unknown}`),
+        ]
+          .filter(i => i)
+          .join('\t');
+      }
+    }
+    time = new Date().getTime();
+    await sleepAsync(intervalSec * 1000);
   }
-  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: 'Abort build process',
-        value: ShouldCommitChanges.Abort,
-      },
-    ],
-  });
-
-  if (selected === ShouldCommitChanges.Abort) {
-    throw new Error(
-      "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
-    );
-  } else if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync({ initialCommitMessage });
-    Log.withTick('Committed changes.');
-  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await showDiffAsync();
-    await reviewAndCommitChangesAsync(initialCommitMessage, {
-      nonInteractive,
-      askedFirstTime: false,
-    });
-  }
+  spinner.warn('Timed out');
+  throw new Error(
+    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
+  );
 }

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

@@ -1,23 +1,20 @@
 import { getConfig } from '@expo/config';
-import { EasJsonReader } from '@expo/eas-json';
+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 path from 'path';
 
-import Log from '../log';
-import { promptAsync } from '../prompts';
+import Log, { learnMore } from '../log';
+import { RequestedPlatform } from '../platform';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { confirmAsync, promptAsync } from '../prompts';
 import { ensureLoggedInAsync } from '../user/actions';
-import { gitAddAsync } from '../utils/git';
+import vcs from '../vcs';
 import { configureAndroidAsync } from './android/configure';
 import { ConfigureContext } from './context';
 import { configureIosAsync } from './ios/configure';
-import { RequestedPlatform } from './types';
-import {
-  commitPromptAsync,
-  ensureGitRepoExistsAsync,
-  isGitStatusCleanAsync,
-  maybeBailOnGitStatusAsync,
-  showDiffAsync,
-} from './utils/repository';
+import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';
 
 const configureCommitMessage = {
   [RequestedPlatform.Android]: 'Configure EAS Build for Android',
@@ -25,13 +22,43 @@ const configureCommitMessage = {
   [RequestedPlatform.All]: 'Configure EAS Build',
 };
 
+export async function ensureProjectConfiguredAsync(
+  projectDir: string,
+  requestedPlatform: RequestedPlatform
+): Promise<void> {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir))) {
+    return;
+  }
+
+  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 }
+    );
+  }
+}
+
 export async function configureAsync(options: {
   platform: RequestedPlatform;
   projectDir: string;
-  allowExperimental: boolean;
 }): Promise<void> {
-  await ensureGitRepoExistsAsync();
-  await maybeBailOnGitStatusAsync();
+  await vcs.ensureRepoExistsAsync();
+  await maybeBailOnRepoStatusAsync();
 
   const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
 
@@ -39,14 +66,15 @@ export async function configureAsync(options: {
     user: await ensureLoggedInAsync(),
     projectDir: options.projectDir,
     exp,
-    allowExperimental: options.allowExperimental,
     requestedPlatform: options.platform,
     shouldConfigureAndroid: [RequestedPlatform.All, RequestedPlatform.Android].includes(
       options.platform
     ),
     shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.Ios].includes(options.platform),
-    hasAndroidNativeProject: await fs.pathExists(path.join(options.projectDir, 'android')),
-    hasIosNativeProject: await fs.pathExists(path.join(options.projectDir, 'ios')),
+    hasAndroidNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.ANDROID)) === Workflow.GENERIC,
+    hasIosNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.IOS)) === Workflow.GENERIC,
   };
 
   Log.newLine();
@@ -58,7 +86,7 @@ export async function configureAsync(options: {
     await configureIosAsync(ctx);
   }
 
-  if (!(await isGitStatusCleanAsync())) {
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.newLine();
     await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
   } else {
@@ -67,62 +95,56 @@ export async function configureAsync(options: {
   }
 }
 
+const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+  build: {
+    release: {},
+    development: {
+      developmentClient: true,
+      distribution: 'internal',
+    },
+  },
+  submit: {
+    release: {},
+  },
+};
+
+const EAS_JSON_GENERIC_DEFAULT: EasJson = {
+  build: {
+    release: {},
+    development: {
+      distribution: 'internal',
+      android: {
+        gradleCommand: ':app:assembleDebug',
+      },
+      ios: {
+        buildConfiguration: 'Debug',
+      },
+    },
+  },
+  submit: {
+    release: {},
+  },
+};
+
 export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
-  const easJsonPath = path.join(ctx.projectDir, 'eas.json');
-  let existingEasJson;
+  const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);
 
   if (await fs.pathExists(easJsonPath)) {
-    const reader = new EasJsonReader(ctx.projectDir, ctx.requestedPlatform);
-    await reader.validateAsync();
+    const reader = new EasJsonReader(ctx.projectDir);
+    await reader.readAndValidateAsync();
 
-    existingEasJson = await reader.readRawAsync();
     Log.withTick('Validated eas.json');
-
-    // If we have already populated eas.json with the default fields for the
-    // platform then proceed
-    if (ctx.requestedPlatform !== 'all' && existingEasJson.builds[ctx.requestedPlatform]) {
-      return;
-    } else if (
-      ctx.requestedPlatform === 'all' &&
-      existingEasJson.builds.ios &&
-      existingEasJson.builds.android
-    ) {
-      return;
-    }
+    return;
   }
 
-  const shouldInitIOS =
-    ['all', 'ios'].includes(ctx.requestedPlatform) && !existingEasJson?.builds.ios;
-  const shouldInitAndroid =
-    ['all', 'android'].includes(ctx.requestedPlatform) && !existingEasJson?.builds.android;
-
-  const easJson = {
-    builds: {
-      ...existingEasJson,
-      ...(shouldInitAndroid
-        ? {
-            android: {
-              release: {
-                workflow: ctx.hasAndroidNativeProject ? 'generic' : 'managed',
-              },
-            },
-          }
-        : null),
-      ...(shouldInitIOS
-        ? {
-            ios: {
-              release: {
-                workflow: ctx.hasIosNativeProject ? 'generic' : 'managed',
-              },
-            },
-          }
-        : null),
-    },
-  };
+  const easJson =
+    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
+      ? EAS_JSON_GENERIC_DEFAULT
+      : EAS_JSON_MANAGED_DEFAULT;
 
   await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await gitAddAsync(easJsonPath, { intentToAdd: true });
-  Log.withTick(`${existingEasJson ? 'Updated' : 'Generated'} eas.json`);
+  await vcs.trackFileAsync(easJsonPath);
+  Log.withTick('Generated eas.json');
 }
 
 enum ShouldCommitChanges {
@@ -155,7 +177,7 @@ async function reviewAndCommitChangesAsync(
     await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await showDiffAsync();
+    await vcs.showDiffAsync();
     await reviewAndCommitChangesAsync(initialCommitMessage, false);
   }
 }

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

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

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

@@ -1,83 +1,25 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidBuildProfile, EasConfig, IosBuildProfile } from '@expo/eas-json';
+import { Platform, Workflow } from '@expo/eas-build-job';
+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 { getProjectAccountName } from '../project/projectUtils';
+import { CredentialsContext } from '../credentials/context';
+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 { ensureLoggedInAsync } from '../user/actions';
-import { Platform, RequestedPlatform, TrackingContext } from './types';
+import { TrackingContext } from './types';
 import Analytics, { Event } from './utils/analytics';
 
-export interface CommandContext {
-  requestedPlatform: RequestedPlatform;
-  profile: string;
-  projectDir: string;
-  projectId: string;
-  user: Actor;
-  accountName: string;
-  projectName: string;
-  exp: ExpoConfig;
-  nonInteractive: boolean;
-  local: boolean;
-  clearCache: boolean;
-  skipCredentialsCheck: boolean;
-  skipProjectConfiguration: boolean;
-  waitForBuildEnd: boolean;
-}
-
-export async function createCommandContextAsync({
-  requestedPlatform,
-  profile,
-  exp,
-  projectDir,
-  projectId,
-  nonInteractive = false,
-  local,
-  clearCache = false,
-  skipCredentialsCheck = false,
-  skipProjectConfiguration = false,
-  waitForBuildEnd,
-}: {
-  requestedPlatform: RequestedPlatform;
-  profile: string;
-  exp: ExpoConfig;
-  projectId: string;
-  projectDir: string;
-  nonInteractive: boolean;
-  local: boolean;
-  clearCache: boolean;
-  skipCredentialsCheck: boolean;
-  skipProjectConfiguration: boolean;
-  waitForBuildEnd: boolean;
-}): Promise<CommandContext> {
-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
-  const projectName = exp.slug;
-
-  return {
-    requestedPlatform,
-    profile,
-    projectDir,
-    projectId,
-    user,
-    accountName,
-    projectName,
-    exp,
-    nonInteractive,
-    local,
-    clearCache,
-    skipCredentialsCheck,
-    skipProjectConfiguration,
-    waitForBuildEnd,
-  };
-}
-
 export interface ConfigureContext {
   user: Actor;
   projectDir: string;
   exp: ExpoConfig;
-  allowExperimental: boolean;
   requestedPlatform: RequestedPlatform;
   shouldConfigureAndroid: boolean;
   shouldConfigureIos: boolean;
@@ -85,45 +27,129 @@ export interface ConfigureContext {
   hasIosNativeProject: boolean;
 }
 
-type PlatformBuildProfile<T extends Platform> = T extends Platform.ANDROID
-  ? AndroidBuildProfile
-  : IosBuildProfile;
-
 export interface BuildContext<T extends Platform> {
-  commandCtx: CommandContext;
-  trackingCtx: TrackingContext;
+  accountName: string;
+  buildProfile: BuildProfile<T>;
+  buildProfileName: string;
+  clearCache: boolean;
+  credentialsCtx: CredentialsContext;
+  exp: ExpoConfig;
+  local: boolean;
+  nonInteractive: boolean;
   platform: T;
-  buildProfile: PlatformBuildProfile<T>;
+  projectDir: string;
+  projectId: string;
+  projectName: string;
+  skipProjectConfiguration: boolean;
+  trackingCtx: TrackingContext;
+  user: Actor;
+  workflow: Workflow;
 }
 
-export function createBuildContext<T extends Platform>({
+export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  clearCache = false,
+  local,
+  nonInteractive = false,
   platform,
-  easConfig,
-  commandCtx,
+  projectDir,
+  skipProjectConfiguration = false,
 }: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  clearCache: boolean;
+  local: boolean;
+  nonInteractive: boolean;
   platform: T;
-  easConfig: EasConfig;
-  commandCtx: CommandContext;
-}): BuildContext<T> {
-  const buildProfile = easConfig.builds[platform] as PlatformBuildProfile<T> | undefined;
-  if (!buildProfile) {
-    throw new Error(`${platform} build profile does not exist`);
-  }
+  projectDir: string;
+  skipProjectConfiguration: boolean;
+}): Promise<BuildContext<T>> {
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
 
-  const accountId = findAccountByName(commandCtx.user.accounts, commandCtx.accountName)?.id;
+  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: commandCtx.accountName,
-    project_id: commandCtx.projectId,
-    project_type: buildProfile.workflow,
+    account_name: accountName,
+    project_id: projectId,
+    project_type: workflow,
+    ...devClientProperties,
   };
   Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
+
   return {
-    commandCtx,
-    trackingCtx,
-    platform,
+    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/create.ts

@@ -1,167 +0,0 @@
-import { EasJsonReader } from '@expo/eas-json';
-import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import ora from 'ora';
-
-import { BuildFragment, BuildStatus } from '../graphql/generated';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log from '../log';
-import { sleep } from '../utils/promise';
-import { prepareAndroidBuildAsync } from './android/build';
-import { CommandContext } from './context';
-import { prepareIosBuildAsync } from './ios/build';
-import { Platform, RequestedPlatform } from './types';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureGitRepoExistsAsync, ensureGitStatusIsCleanAsync } from './utils/repository';
-
-export async function buildAsync(commandCtx: CommandContext): Promise<void> {
-  await ensureGitRepoExistsAsync();
-  await ensureGitStatusIsCleanAsync(commandCtx.nonInteractive);
-
-  const scheduledBuilds = await startBuildsAsync(commandCtx);
-  if (commandCtx.local) {
-    return;
-  }
-  Log.newLine();
-  printLogsUrls(commandCtx.accountName, scheduledBuilds);
-  Log.newLine();
-
-  if (commandCtx.waitForBuildEnd) {
-    const builds = await waitForBuildEndAsync(scheduledBuilds.map(i => i.buildId));
-    printBuildResults(commandCtx.accountName, builds);
-    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
-  }
-}
-
-async function startBuildsAsync(
-  commandCtx: CommandContext
-): Promise<{ platform: Platform; buildId: string }[]> {
-  const shouldBuildAndroid = [RequestedPlatform.Android, RequestedPlatform.All].includes(
-    commandCtx.requestedPlatform
-  );
-  const shouldBuildIos = [RequestedPlatform.Ios, RequestedPlatform.All].includes(
-    commandCtx.requestedPlatform
-  );
-  const easConfig = await new EasJsonReader(
-    commandCtx.projectDir,
-    commandCtx.requestedPlatform
-  ).readAsync(commandCtx.profile);
-
-  const builds: {
-    platform: Platform;
-    sendBuildRequestAsync: () => Promise<string | undefined>;
-  }[] = [];
-  if (shouldBuildAndroid) {
-    const sendBuildRequestAsync = await prepareAndroidBuildAsync(commandCtx, easConfig);
-    builds.push({ platform: Platform.ANDROID, sendBuildRequestAsync });
-  }
-  if (shouldBuildIos) {
-    const sendBuildRequestAsync = await prepareIosBuildAsync(commandCtx, easConfig);
-    builds.push({ platform: Platform.IOS, sendBuildRequestAsync });
-  }
-  return (
-    await Promise.all(
-      builds.map(async ({ platform, sendBuildRequestAsync }) => ({
-        platform,
-        buildId: await sendBuildRequestAsync(),
-      }))
-    )
-  ).filter((build): build is { platform: Platform; buildId: string } => !!build.buildId);
-}
-
-async function waitForBuildEndAsync(
-  buildIds: string[],
-  { timeoutSec = 3600, intervalSec = 30 } = {}
-): Promise<(BuildFragment | null)[]> {
-  Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
-  const spinner = ora().start();
-  let time = new Date().getTime();
-  const endTime = time + timeoutSec * 1000;
-  while (time <= endTime) {
-    const builds: (BuildFragment | null)[] = await Promise.all(
-      buildIds.map(async buildId => {
-        try {
-          return await BuildQuery.byIdAsync(buildId, { useCache: false });
-        } catch (err) {
-          return null;
-        }
-      })
-    );
-    if (builds.length === 1) {
-      const build = nullthrows(builds[0]);
-      switch (build.status) {
-        case BuildStatus.Finished:
-          spinner.succeed('Build finished');
-          return builds;
-        case BuildStatus.InQueue:
-          spinner.text = 'Build queued...';
-          break;
-        case BuildStatus.Canceled:
-          spinner.text = 'Build canceled';
-          spinner.stopAndPersist();
-          return builds;
-        case BuildStatus.InProgress:
-          spinner.text = 'Build in progress...';
-          break;
-        case BuildStatus.Errored:
-          spinner.fail('Build failed');
-          if (build.error) {
-            return builds;
-          } else {
-            throw new Error(`Standalone build failed!`);
-          }
-        default:
-          spinner.warn('Unknown status.');
-          throw new Error(`Unknown status: ${builds} - aborting!`);
-      }
-    } else {
-      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
-        spinner.succeed('All builds have finished');
-        return builds;
-      } else if (
-        builds.filter(build =>
-          build?.status
-            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
-                build.status
-              )
-            : false
-        ).length === builds.length
-      ) {
-        spinner.fail('Some of the builds were canceled or failed.');
-        return builds;
-      } else {
-        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
-        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
-        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
-        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
-        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
-        const unknownState = builds.length - inQueue - inProgress - errored - finished;
-        spinner.text = [
-          inQueue && `Builds in queue: ${inQueue}`,
-          inProgress && `Builds in progress: ${inProgress}`,
-          canceled && `Builds canceled: ${canceled}`,
-          errored && chalk.red(`Builds failed: ${errored}`),
-          finished && chalk.green(`Builds finished: ${finished}`),
-          unknownState && chalk.red(`Builds in unknown state: ${unknownState}`),
-        ]
-          .filter(i => i)
-          .join('\t');
-      }
-    }
-    time = new Date().getTime();
-    await sleep(intervalSec * 1000);
-  }
-  spinner.warn('Timed out');
-  throw new Error(
-    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
-  );
-}
-
-function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | null)[]): void {
-  const failedBuilds = (maybeBuilds.filter(i => i) as BuildFragment[]).filter(
-    i => i.status === BuildStatus.Errored
-  );
-  if (failedBuilds.length > 0) {
-    process.exit(1);
-  }
-}

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

@@ -2,6 +2,7 @@ import { ArchiveSource, ArchiveSourceType, Metadata, Workflow } from '@expo/eas-
 
 import {
   BuildCredentialsSource,
+  BuildIosEnterpriseProvisioning,
   BuildMetadataInput,
   BuildWorkflow,
   DistributionType,
@@ -32,6 +33,9 @@ export function transformMetadata(metadata: Metadata): BuildMetadataInput {
       metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
     distribution: metadata.distribution && transformDistribution(metadata.distribution),
     workflow: metadata.workflow && transformWorkflow(metadata.workflow),
+    iosEnterpriseProvisioning:
+      metadata.iosEnterpriseProvisioning &&
+      transformIosEnterpriseProvisioning(metadata.iosEnterpriseProvisioning),
   };
 }
 
@@ -55,10 +59,20 @@ function transformDistribution(distribution: Metadata['distribution']): Distribu
   }
 }
 
-function transformWorkflow(workflow: Metadata['workflow']): BuildWorkflow {
+export function transformWorkflow(workflow: Workflow): BuildWorkflow {
   if (workflow === Workflow.GENERIC) {
     return BuildWorkflow.Generic;
   } else {
     return BuildWorkflow.Managed;
   }
 }
+
+export function transformIosEnterpriseProvisioning(
+  enterpriseProvisioning: Metadata['iosEnterpriseProvisioning']
+): BuildIosEnterpriseProvisioning {
+  if (enterpriseProvisioning === 'adhoc') {
+    return BuildIosEnterpriseProvisioning.Adhoc;
+  } else {
+    return BuildIosEnterpriseProvisioning.Universal;
+  }
+}

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

@@ -5,7 +5,7 @@ import fs from 'fs-extra';
 import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { gitAddAsync } from '../../utils/git';
+import vcs from '../../vcs';
 import { ensureValidVersions } from '../utils/updates';
 import { readPlistAsync, writePlistAsync } from './plist';
 
@@ -19,7 +19,11 @@ export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig)
       projectDir,
       xcodeProject
     );
-    await fs.writeFile(IOSConfig.Paths.getPBXProjectPath(projectDir), xcodeProject.writeSync());
+    await fs.writeFile(
+      IOSConfig.Paths.getPBXProjectPath(projectDir),
+      // eslint-disable-next-line node/no-sync
+      xcodeProject.writeSync()
+    );
   }
 
   let expoPlist = await readExpoPlistAsync(projectDir);
@@ -75,7 +79,7 @@ async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig)
 
 async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
   const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  return await readPlistAsync(expoPlistPath);
+  return (await readPlistAsync(expoPlistPath)) as IOSConfig.ExpoPlist;
 }
 
 async function writeExpoPlistAsync(
@@ -84,7 +88,7 @@ async function writeExpoPlistAsync(
 ): Promise<void> {
   const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
   await writePlistAsync(expoPlistPath, expoPlist);
-  await gitAddAsync(expoPlistPath, { intentToAdd: true });
+  await vcs.trackFileAsync(expoPlistPath);
 }
 
 export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
@@ -95,3 +99,13 @@ export async function readReleaseChannelSafelyAsync(projectDir: string): Promise
     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/__mocks__/bundleIdentifier.ts

@@ -1,3 +0,0 @@
-export function getBundleIdentifier(): string {
-  return 'com.bundle.id';
-}

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

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

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

@@ -9,28 +9,44 @@ import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
+  evaluateTemplateString,
+  getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
 } from '../version';
 
 jest.mock('fs');
 
-const originalConsoleLog = console.log;
-beforeAll(() => {
-  console.log = jest.fn();
-});
-afterAll(() => {
-  console.log = originalConsoleLog;
+afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.removeSync(os.tmpdir());
+  await fs.remove(os.tmpdir());
 });
 
-beforeEach(() => {
+beforeEach(async () => {
   vol.reset();
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
-  fs.mkdirpSync(os.tmpdir());
+  await fs.mkdirp(os.tmpdir());
+});
+
+describe(evaluateTemplateString, () => {
+  it('evaluates the template string when value is a number', () => {
+    expect(evaluateTemplateString('$(BLAH_BLAH)', { BLAH_BLAH: 123 })).toBe('123');
+  });
+  it('evaluates the template string when value is a string', () => {
+    expect(evaluateTemplateString('$(BLAH_BLAH)', { BLAH_BLAH: '123' })).toBe('123');
+  });
+  it('evaluates the template string when template is not the only element', () => {
+    expect(evaluateTemplateString('before$(BLAH_BLAH)after', { BLAH_BLAH: '123' })).toBe(
+      'before123after'
+    );
+  });
+  it('evaluates the template string when template value is double quoted', () => {
+    expect(evaluateTemplateString('before$(BLAH_BLAH)after', { BLAH_BLAH: '"123"' })).toBe(
+      'before123after'
+    );
+  });
 });
 
 // generic workflow
@@ -42,6 +58,7 @@ describe(bumpVersionAsync, () => {
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -56,13 +73,38 @@ describe(bumpVersionAsync, () => {
     expect(infoPlist['CFBundleVersion']).toBe('2');
   });
 
+  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
+    const fakeExp = initGenericProject({ infoPlistName: 'Info2.plist' });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.BUILD_NUMBER,
+      projectDir: '/repo',
+      exp: fakeExp,
+      buildSettings: {
+        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+      },
+    });
+
+    const appJSON = await fs.readJSON('/repo/app.json');
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info2.plist'
+    )) as IOSConfig.InfoPlist;
+    expect(fakeExp.version).toBe('1.0.0');
+    expect(fakeExp.ios?.buildNumber).toBe('2');
+    expect(appJSON.expo.version).toBe('1.0.0');
+    expect(appJSON.expo.ios.buildNumber).toBe('2');
+    expect(infoPlist['CFBundleShortVersionString']).toBe('1.0.0');
+    expect(infoPlist['CFBundleVersion']).toBe('2');
+  });
+
   it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
     const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -84,6 +126,7 @@ describe(bumpVersionAsync, () => {
       bumpStrategy: BumpStrategy.NOOP,
       projectDir: '/repo',
       exp: fakeExp,
+      buildSettings: {},
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -121,7 +164,7 @@ describe(bumpVersionInAppJsonAsync, () => {
     const fakeExp = initManagedProject();
 
     await bumpVersionInAppJsonAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
     });
@@ -154,7 +197,7 @@ describe(readBuildNumberAsync, () => {
   describe('generic project', () => {
     it('reads the build number from native code', async () => {
       const exp = initGenericProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp);
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -162,7 +205,7 @@ describe(readBuildNumberAsync, () => {
   describe('managed project', () => {
     it('reads the build number from expo config', async () => {
       const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/repo', exp);
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -172,45 +215,113 @@ describe(readShortVersionAsync, () => {
   describe('generic project', () => {
     it('reads the short version from native code', async () => {
       const exp = initGenericProject();
-      const shortVersion = await readShortVersionAsync('/repo', exp);
-      expect(shortVersion).toBe('1.0.0');
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
+    });
+    it('evaluates interpolated build number', async () => {
+      const exp = initGenericProject({
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
+      });
+      const buildNumber = await readShortVersionAsync('/repo', exp, {
+        CURRENT_PROJECT_VERSION: '1.0.0',
+      });
+      expect(buildNumber).toBe('1.0.0');
     });
   });
 
   describe('managed project', () => {
     it('reads the version from app config', async () => {
       const exp = initGenericProject();
-      const shortVersion = await readShortVersionAsync('/repo', exp);
-      expect(shortVersion).toBe('1.0.0');
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
   });
 });
 
-function initGenericProject(): ExpoConfig {
+describe(getInfoPlistPath, () => {
+  it('returns default path if INFOPLIST_FILE is not specified', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {});
+    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
+  });
+  it('returns INFOPLIST_FILE if specified', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+  it('evaluates SRCROOT in Info.plist', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {
+      INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
+    });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+  it('evaluates BuildSettings in Info.plist', () => {
+    vol.fromJSON(
+      {
+        './ios/testapp/Info.plist': '',
+      },
+      '/repo'
+    );
+    const plistPath = getInfoPlistPath('/repo', {
+      INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
+      TARGET_NAME: 'NotInfo',
+    });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
+  });
+});
+
+function initGenericProject({
+  appVersion = '1.0.0',
+  version = '1',
+  infoPlistName = 'Info.plist',
+}: { appVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
+  const fakeExp: ExpoConfig = {
+    name: 'myproject',
+    slug: 'myproject',
+    version: '1.0.0',
+    ios: {
+      buildNumber: '1',
+    },
+  };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          ios: {
-            buildNumber: '1',
-          },
-        },
+        expo: fakeExp,
       }),
-      './ios/myproject/Info.plist': `<?xml version="1.0" encoding="UTF-8"?>
+      [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
   <key>CFBundleShortVersionString</key>
-  <string>1.0.0</string>
+  <string>${appVersion}</string>
   <key>CFBundleVersion</key>
-  <string>1</string>
+  <string>${version}</string>
 </dict>
 </plist>`,
     },
     '/repo'
   );
 
+  return fakeExp;
+}
+
+function initManagedProject(): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -219,31 +330,15 @@ function initGenericProject(): ExpoConfig {
       buildNumber: '1',
     },
   };
-  return fakeExp;
-}
 
-function initManagedProject(): ExpoConfig {
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          ios: {
-            buildNumber: '1',
-          },
-        },
+        expo: fakeExp,
       }),
     },
     '/repo'
   );
 
-  const fakeExp: ExpoConfig = {
-    name: 'myproject',
-    slug: 'myproject',
-    version: '1.0.0',
-    ios: {
-      buildNumber: '1',
-    },
-  };
   return fakeExp;
 }

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

@@ -1,76 +1,73 @@
 import { IOSConfig } from '@expo/config-plugins';
-import { Ios, Job, Metadata, Workflow } from '@expo/eas-build-job';
-import { EasConfig } from '@expo/eas-json';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import sortBy from 'lodash/sortBy';
-import path from 'path';
+import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import type { XCBuildConfiguration } from 'xcode';
 
-import { IosCredentials } from '../../credentials/ios/types';
+import { IosCredentials, Target } from '../../credentials/ios/types';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
-import Log from '../../log';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
-import { XcodeBuildContext, resolveTargetsAsync } from '../../project/ios/target';
-import { sanitizedProjectName } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext, CommandContext, createBuildContext } from '../context';
+import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
+import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
+import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { Platform } from '../types';
+import { IosMetadataContext } from '../metadata';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
-import { transformGenericJob, transformManagedJob } from './graphql';
+import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 
+interface BuildConfiguration {
+  targetName?: string;
+  buildConfiguration?: string;
+  buildSettings: XCBuildConfiguration['buildSettings'];
+}
+
 export async function prepareIosBuildAsync(
-  commandCtx: CommandContext,
-  easConfig: EasConfig
-): Promise<() => Promise<string | undefined>> {
-  const buildCtx = createBuildContext<Platform.IOS>({
-    commandCtx,
-    platform: Platform.IOS,
-    easConfig,
-  });
+  ctx: BuildContext<Platform.IOS>
+): Promise<BuildRequestSender> {
+  const { buildProfile } = ctx;
 
-  if (
-    buildCtx.buildProfile.workflow === Workflow.GENERIC &&
-    !(await fs.pathExists(path.join(commandCtx.projectDir, 'ios')))
-  ) {
-    throw new Error(
-      `"ios" directory not found. If you're trying to build a managed project, set ${chalk.bold(
-        `builds.ios.${commandCtx.profile}.workflow`
-      )} in "eas.json" to "managed".`
-    );
+  if (ctx.workflow === Workflow.MANAGED) {
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
   }
 
-  if (buildCtx.buildProfile.workflow === Workflow.MANAGED) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(
-      commandCtx.projectDir,
-      commandCtx.exp
-    );
-  }
+  checkNodeEnvVariable(ctx);
+  await checkGoogleServicesFileAsync(ctx);
 
-  const xcodeBuildContext = await resolveXcodeBuildContextAsync(buildCtx);
+  const xcodeBuildContext = await resolveXcodeBuildContextAsync(
+    {
+      projectDir: ctx.projectDir,
+      nonInteractive: ctx.nonInteractive,
+      exp: ctx.exp,
+    },
+    buildProfile
+  );
   const targets = await resolveTargetsAsync(
     {
-      projectDir: commandCtx.projectDir,
-      exp: commandCtx.exp,
+      projectDir: ctx.projectDir,
+      exp: ctx.exp,
     },
     xcodeBuildContext
   );
+  const buildConfiguration = resolveBuildConfiguration(ctx, targets);
 
   return await prepareBuildRequestForPlatformAsync({
-    ctx: buildCtx,
+    ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
       return ensureIosCredentialsAsync(ctx, targets);
     },
     ensureProjectConfiguredAsync: async () => {
       await validateAndSyncProjectConfigurationAsync({
-        projectDir: commandCtx.projectDir,
-        exp: commandCtx.exp,
-        buildProfile: buildCtx.buildProfile,
+        projectDir: ctx.projectDir,
+        exp: ctx.exp,
+        buildProfile,
+        buildSettings: buildConfiguration.buildSettings,
       });
     },
+    getMetadataContext: (): IosMetadataContext => {
+      return buildConfiguration;
+    },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.IOS>,
       jobData: JobData<IosCredentials>
@@ -83,90 +80,33 @@ export async function prepareIosBuildAsync(
       metadata: Metadata
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
-      if (job.type === Workflow.GENERIC) {
-        const graphqlJob = transformGenericJob(job);
-        return await BuildMutation.createIosGenericBuildAsync({
-          appId,
-          job: graphqlJob,
-          metadata: graphqlMetadata,
-        });
-      } else {
-        const graphqlJob = transformManagedJob(job);
-        return await BuildMutation.createIosManagedBuildAsync({
-          appId,
-          job: graphqlJob,
-          metadata: graphqlMetadata,
-        });
-      }
+      const graphqlJob = transformJob(job);
+      return await BuildMutation.createIosBuildAsync({
+        appId,
+        job: graphqlJob,
+        metadata: graphqlMetadata,
+      });
     },
   });
 }
 
-async function resolveXcodeBuildContextAsync(
-  buildCtx: BuildContext<Platform.IOS>
-): Promise<XcodeBuildContext> {
-  if (buildCtx.buildProfile.workflow === Workflow.GENERIC) {
-    const buildScheme = buildCtx.buildProfile.scheme ?? (await resolveSchemeAsync(buildCtx));
-    return {
-      buildScheme,
-      buildConfiguration:
-        buildCtx.buildProfile.schemeBuildConfiguration ??
-        (await IOSConfig.BuildScheme.getArchiveBuildConfigurationForSchemeAsync(
-          buildCtx.commandCtx.projectDir,
-          buildScheme
-        )),
-      applicationTarget: await IOSConfig.BuildScheme.getApplicationTargetNameForSchemeAsync(
-        buildCtx.commandCtx.projectDir,
-        buildScheme
-      ),
-    };
-  } else {
-    const expoName = buildCtx.commandCtx.exp.name;
-    if (!expoName) {
-      throw new Error('"expo.name" is required in your app.json');
-    }
-    const sanitizedExpoName = sanitizedProjectName(expoName);
-    if (!sanitizedExpoName) {
-      throw new Error('"expo.name" needs to contain some alphanumeric characters');
-    }
-    return {
-      buildScheme: sanitizedExpoName,
-    };
-  }
-}
-
-async function resolveSchemeAsync(ctx: BuildContext<Platform.IOS>): Promise<string> {
-  const schemes = IOSConfig.BuildScheme.getSchemesFromXcodeproj(ctx.commandCtx.projectDir);
-  if (schemes.length === 1) {
-    return schemes[0];
-  }
-
-  const sortedSchemes = sortBy(schemes);
-  Log.newLine();
-  Log.log(
-    `We've found multiple schemes in your Xcode project: ${chalk.bold(sortedSchemes.join(', '))}`
-  );
-  Log.log(
-    `You can specify the scheme you want to build at ${chalk.bold(
-      `builds.ios.${ctx.commandCtx.profile}.scheme`
-    )} in eas.json.`
-  );
-  if (ctx.commandCtx.nonInteractive) {
-    const withoutTvOS = sortedSchemes.filter(i => !i.includes('tvOS'));
-    const scheme = withoutTvOS.length > 0 ? withoutTvOS[0] : sortedSchemes[0];
-    Log.log(
-      `You've run Expo CLI in non-interactive mode, choosing the ${chalk.bold(scheme)} scheme.`
-    );
-    Log.newLine();
-    return scheme;
-  } else {
-    const { selectedScheme } = await promptAsync({
-      type: 'select',
-      name: 'selectedScheme',
-      message: 'Which scheme would you like to build now?',
-      choices: sortedSchemes.map(scheme => ({ title: scheme, value: scheme })),
-    });
-    Log.newLine();
-    return selectedScheme as string;
+function resolveBuildConfiguration(
+  ctx: BuildContext<Platform.IOS>,
+  targets: Target[]
+): BuildConfiguration {
+  if (ctx.workflow === Workflow.MANAGED) {
+    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,
+  });
+  const buildSettings = xcBuildConfiguration?.buildSettings ?? {};
+  return {
+    buildSettings,
+    targetName: applicationTarget.targetName,
+    buildConfiguration: applicationTarget.buildConfiguration,
+  };
 }

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

@@ -1,12 +1,14 @@
 import { ExpoConfig } from '@expo/config';
-import { Workflow } from '@expo/eas-build-job';
-import { IosBuildProfile, VersionAutoIncrement } from '@expo/eas-json';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { IosBuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
 import {
   ensureBundleIdentifierIsDefinedForManagedProjectAsync,
   warnIfBundleIdentifierDefinedInAppConfigForGenericProject,
 } from '../../project/ios/bundleIdentifier';
+import { resolveWorkflowAsync } from '../../project/workflow';
 import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
 import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
@@ -30,25 +32,28 @@ export async function validateAndSyncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   buildProfile: IosBuildProfile;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
-  const { workflow, autoIncrement } = buildProfile;
-  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
   } else {
     await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }
 }
 
-function resolveVersionBumpStrategy(autoIncrement: VersionAutoIncrement): BumpStrategy {
+function resolveVersionBumpStrategy(autoIncrement: IosVersionAutoIncrement): BumpStrategy {
   if (autoIncrement === true) {
     return BumpStrategy.BUILD_NUMBER;
   } else if (autoIncrement === false) {
@@ -56,6 +61,6 @@ function resolveVersionBumpStrategy(autoIncrement: VersionAutoIncrement): BumpSt
   } else if (autoIncrement === 'buildNumber') {
     return BumpStrategy.BUILD_NUMBER;
   } else {
-    return BumpStrategy.SHORT_VERSION;
+    return BumpStrategy.APP_VERSION;
   }
 }

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

@@ -1,13 +1,11 @@
-import nullthrows from 'nullthrows';
+import { Platform } from '@expo/eas-build-job';
 
-import { createCredentialsContextAsync } from '../../credentials/context';
 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
+import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
 import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
 import { IosCredentials, Target } from '../../credentials/ios/types';
-import { findAccountByName } from '../../user/Account';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 import { logCredentialsSource } from '../utils/credentials';
 
 export async function ensureIosCredentialsAsync(
@@ -18,26 +16,11 @@ export async function ensureIosCredentialsAsync(
     return;
   }
 
-  const { projectDir } = buildCtx.commandCtx;
-
-  const ctx = await createCredentialsContextAsync(projectDir, {
-    nonInteractive: buildCtx.commandCtx.nonInteractive,
-  });
-
-  const provider = new IosCredentialsProvider(ctx, {
-    app: {
-      account: nullthrows(
-        findAccountByName(ctx.user.accounts, buildCtx.commandCtx.accountName),
-        `You do not have access to account: ${buildCtx.commandCtx.accountName}`
-      ),
-      projectName: buildCtx.commandCtx.projectName,
-    },
+  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
+    app: getAppFromContext(buildCtx.credentialsCtx),
     targets,
     iosCapabilitiesOptions: {
-      entitlements: await resolveEntitlementsJsonAsync(
-        buildCtx.commandCtx.projectDir,
-        buildCtx.buildProfile.workflow
-      ),
+      entitlements: await resolveEntitlementsJsonAsync(buildCtx.projectDir, buildCtx.workflow),
     },
     distribution: buildCtx.buildProfile.distribution ?? 'store',
     enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
@@ -53,5 +36,5 @@ export async function ensureIosCredentialsAsync(
 }
 
 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  return buildCtx.buildProfile.distribution !== 'simulator';
+  return !buildCtx.buildProfile.simulator;
 }

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

@@ -3,37 +3,28 @@ import nullthrows from 'nullthrows';
 
 import {
   DistributionType,
-  IosGenericJobInput,
+  IosBuildType,
+  IosJobInput,
   IosJobSecretsInput,
-  IosManagedBuildType,
-  IosManagedJobInput,
 } from '../../graphql/generated';
-import { transformProjectArchive } from '../graphql';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
-export function transformGenericJob(job: Ios.GenericJob): IosGenericJobInput {
+export function transformJob(job: Ios.Job): IosJobInput {
   return {
+    type: transformWorkflow(job.type),
     projectArchive: transformProjectArchive(job.projectArchive),
     projectRootDirectory: job.projectRootDirectory,
     releaseChannel: job.releaseChannel,
+    updates: job.updates,
     distribution: job.distribution && transformDistributionType(job.distribution),
     secrets: transformIosSecrets(job.secrets),
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
+
     scheme: job.scheme,
     buildConfiguration: job.buildConfiguration,
     artifactPath: job.artifactPath,
-  };
-}
 
-export function transformManagedJob(job: Ios.ManagedJob): IosManagedJobInput {
-  return {
-    projectArchive: transformProjectArchive(job.projectArchive),
-    projectRootDirectory: job.projectRootDirectory,
-    releaseChannel: job.releaseChannel,
-    distribution: job.distribution && transformDistributionType(job.distribution),
-    secrets: transformIosSecrets(job.secrets),
-    builderEnvironment: job.builderEnvironment,
-    cache: job.cache,
     buildType: job.buildType && transformBuildType(job.buildType),
     username: job.username,
   };
@@ -71,10 +62,10 @@ function transformIosSecrets(secrets: {
   };
 }
 
-function transformBuildType(buildType: Ios.ManagedBuildType): IosManagedBuildType {
-  if (buildType === Ios.ManagedBuildType.DEVELOPMENT_CLIENT) {
-    return IosManagedBuildType.DevelopmentClient;
+function transformBuildType(buildType: Ios.BuildType): IosBuildType {
+  if (buildType === Ios.BuildType.DEVELOPMENT_CLIENT) {
+    return IosBuildType.DevelopmentClient;
   } else {
-    return IosManagedBuildType.Release;
+    return IosBuildType.Release;
   }
 }

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

@@ -1,14 +1,12 @@
-import { ArchiveSource, Cache, Ios, Job, Workflow, sanitizeJob } from '@expo/eas-build-job';
-import { IosGenericBuildProfile, IosManagedBuildProfile } from '@expo/eas-json';
+import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
+import slash from 'slash';
 
-import { readEnvironmentSecretsAsync } from '../../credentials/credentialsJson/read';
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import { gitRootDirectoryAsync } from '../../utils/git';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -16,52 +14,33 @@ interface JobData {
   buildScheme: string;
 }
 
+const cacheDefaults = {
+  disabled: false,
+  customPaths: [],
+  cacheDefaultPaths: true,
+};
+
 export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Job> {
-  if (ctx.buildProfile.workflow === Workflow.GENERIC) {
-    const partialJob = await prepareGenericJobAsync(ctx, jobData, ctx.buildProfile);
-    return sanitizeJob(partialJob);
-  } else if (ctx.buildProfile.workflow === Workflow.MANAGED) {
-    const partialJob = await prepareManagedJobAsync(ctx, jobData, ctx.buildProfile);
-    return sanitizeJob(partialJob);
-  } else {
-    throw new Error("Unknown workflow. Shouldn't happen");
-  }
-}
-
-interface CommonJobProperties {
-  platform: Platform.IOS;
-  projectArchive: ArchiveSource;
-  builderEnvironment: Ios.BuilderEnvironment;
-  releaseChannel?: string;
-  distribution?: Ios.DistributionType;
-  cache: Cache;
-  secrets: {
-    buildCredentials: Ios.BuildCredentials;
-    environmentSecrets?: Record<string, string>;
-  };
-}
-
-async function prepareJobCommonAsync(
-  ctx: BuildContext<Platform.IOS>,
-  { credentials, projectArchive }: { credentials?: IosCredentials; projectArchive: ArchiveSource }
-): Promise<Partial<CommonJobProperties>> {
-  const environmentSecrets = await readEnvironmentSecretsAsync(ctx.commandCtx.projectDir);
-
-  const buildCredentials: CommonJobProperties['secrets']['buildCredentials'] = {};
-  if (credentials) {
-    const targetNames = Object.keys(credentials);
+  const projectRootDirectory =
+    slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
+  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
+  if (jobData.credentials) {
+    const targetNames = Object.keys(jobData.credentials);
     for (const targetName of targetNames) {
-      buildCredentials[targetName] = prepareTargetCredentials(credentials[targetName]);
+      buildCredentials[targetName] = prepareTargetCredentials(jobData.credentials[targetName]);
     }
   }
 
-  return {
+  const job: Ios.Job = {
+    type: ctx.workflow,
     platform: Platform.IOS,
-    projectArchive,
-    distribution: ctx.buildProfile.distribution,
+    projectArchive: jobData.projectArchive,
+    projectRootDirectory,
+    distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
     builderEnvironment: {
       image: ctx.buildProfile.image,
       node: ctx.buildProfile.node,
@@ -73,14 +52,26 @@ async function prepareJobCommonAsync(
       env: ctx.buildProfile.env,
     },
     cache: {
+      ...cacheDefaults,
       ...ctx.buildProfile.cache,
-      clear: ctx.commandCtx.clearCache,
+      clear: ctx.clearCache,
     },
     secrets: {
-      ...(environmentSecrets ? { environmentSecrets } : {}),
       buildCredentials,
     },
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
+
+    scheme: jobData.buildScheme,
+    buildConfiguration: ctx.buildProfile.buildConfiguration,
+    artifactPath: ctx.buildProfile.artifactPath,
+
+    buildType: ctx.buildProfile.developmentClient
+      ? Ios.BuildType.DEVELOPMENT_CLIENT
+      : Ios.BuildType.RELEASE,
+    username,
   };
+  return sanitizeJob(job);
 }
 
 function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {
@@ -92,45 +83,3 @@ function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.Tar
     },
   };
 }
-
-async function prepareGenericJobAsync(
-  ctx: BuildContext<Platform.IOS>,
-  jobData: JobData,
-  buildProfile: IosGenericBuildProfile
-): Promise<Partial<Ios.GenericJob>> {
-  const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
-  return {
-    ...(await prepareJobCommonAsync(ctx, {
-      credentials: jobData.credentials,
-      projectArchive: jobData.projectArchive,
-    })),
-    type: Workflow.GENERIC,
-    scheme: jobData.buildScheme,
-    buildConfiguration: buildProfile.schemeBuildConfiguration,
-    artifactPath: buildProfile.artifactPath,
-    releaseChannel: buildProfile.releaseChannel,
-    projectRootDirectory,
-  };
-}
-
-async function prepareManagedJobAsync(
-  ctx: BuildContext<Platform.IOS>,
-  jobData: JobData,
-  buildProfile: IosManagedBuildProfile
-): Promise<Partial<Ios.ManagedJob>> {
-  const projectRootDirectory =
-    path.relative(await gitRootDirectoryAsync(), ctx.commandCtx.projectDir) || '.';
-  const username = getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync());
-  return {
-    ...(await prepareJobCommonAsync(ctx, {
-      credentials: jobData.credentials,
-      projectArchive: jobData.projectArchive,
-    })),
-    type: Workflow.MANAGED,
-    buildType: buildProfile.buildType,
-    username,
-    releaseChannel: buildProfile.releaseChannel,
-    projectRootDirectory,
-  };
-}

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

@@ -2,17 +2,18 @@ import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import semver from 'semver';
+import path from 'path';
+import type { XCBuildConfiguration } from 'xcode';
 
 import Log from '../../log';
-import { resolveWorkflow } from '../../project/workflow';
+import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync } from '../utils/version';
 import { readPlistAsync, writePlistAsync } from './plist';
 
 export enum BumpStrategy {
-  SHORT_VERSION,
+  APP_VERSION,
   BUILD_NUMBER,
   NOOP,
 }
@@ -21,19 +22,21 @@ export async function bumpVersionAsync({
   bumpStrategy,
   projectDir,
   exp,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   bumpStrategy: BumpStrategy;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   if (bumpStrategy === BumpStrategy.NOOP) {
     return;
   }
   ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir);
+  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist });
+  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
   Log.log('Synchronized versions with Info.plist');
 }
 
@@ -51,29 +54,9 @@ export async function bumpVersionInAppJsonAsync({
   }
   ensureStaticConfigExists(projectDir);
   Log.addNewLineIfNone();
-  if (bumpStrategy === BumpStrategy.SHORT_VERSION) {
-    const shortVersion = IOSConfig.Version.getVersion(exp);
-    if (semver.valid(shortVersion)) {
-      const bumpedShortVersion = nullthrows(semver.inc(shortVersion, 'patch'));
-      Log.log(
-        `Bumping ${chalk.bold('expo.version')} from ${chalk.bold(shortVersion)} to ${chalk.bold(
-          bumpedShortVersion
-        )}`
-      );
-      await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-        config.version = bumpedShortVersion;
-      });
-    } else {
-      Log.log(`${chalk.bold('expo.version')} = ${chalk.bold(shortVersion)} is not a valid semver`);
-      const { bumpedShortVersion } = await promptAsync({
-        type: 'text',
-        name: 'bumpedShortVersion',
-        message: 'What is the next version?',
-      });
-      await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-        config.version = bumpedShortVersion;
-      });
-    }
+  if (bumpStrategy === BumpStrategy.APP_VERSION) {
+    const appVersion = IOSConfig.Version.getVersion(exp);
+    await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const buildNumber = IOSConfig.Version.getBuildNumber(exp);
     if (buildNumber.match(/^\d+(\.\d+)*$/)) {
@@ -104,12 +87,16 @@ export async function bumpVersionInAppJsonAsync({
 
 export async function readShortVersionAsync(
   projectDir: string,
-  exp: ExpoConfig
+  exp: ExpoConfig,
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
-  const workflow = resolveWorkflow(projectDir, Platform.IOS);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
-    return infoPlist.CFBundleShortVersionString;
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
+    return (
+      infoPlist.CFBundleShortVersionString &&
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
+    );
   } else {
     return exp.version;
   }
@@ -117,45 +104,89 @@ export async function readShortVersionAsync(
 
 export async function readBuildNumberAsync(
   projectDir: string,
-  exp: ExpoConfig
+  exp: ExpoConfig,
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
-  const workflow = resolveWorkflow(projectDir, Platform.IOS);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
-    return infoPlist.CFBundleVersion;
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
+    return (
+      infoPlist.CFBundleVersion && evaluateTemplateString(infoPlist.CFBundleVersion, buildSettings)
+    );
   } else {
     return IOSConfig.Version.getBuildNumber(exp);
   }
 }
 
+export async function maybeResolveVersionsAsync(
+  projectDir: string,
+  exp: ExpoConfig,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  try {
+    return {
+      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
+      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+    };
+  } catch {
+    return {};
+  }
+}
+
 async function writeVersionsToInfoPlistAsync({
   projectDir,
   exp,
   infoPlist,
+  buildSettings,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<IOSConfig.InfoPlist> {
   let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
   updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist });
+  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
   return updatedInfoPlist;
 }
 
-async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
+export function getInfoPlistPath(
+  projectDir: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): string {
+  if (buildSettings.INFOPLIST_FILE) {
+    const infoPlistFile = buildSettings.INFOPLIST_FILE.startsWith('"')
+      ? buildSettings.INFOPLIST_FILE.slice(1, -1)
+      : buildSettings.INFOPLIST_FILE;
+    const iosDir = path.join(projectDir, 'ios');
+    const plistPath = evaluateTemplateString(infoPlistFile, {
+      ...buildSettings,
+      SRCROOT: iosDir,
+    });
+    return path.isAbsolute(plistPath) ? plistPath : path.resolve(iosDir, plistPath);
+  } else {
+    return IOSConfig.Paths.getInfoPlistPath(projectDir);
+  }
+}
+
+async function readInfoPlistAsync(
+  projectDir: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): Promise<IOSConfig.InfoPlist> {
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
   return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
 }
 
 async function writeInfoPlistAsync({
   projectDir,
   infoPlist,
+  buildSettings,
 }: {
   projectDir: string;
   infoPlist: IOSConfig.InfoPlist;
+  buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
+  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
   await writePlistAsync(infoPlistPath, infoPlist);
 }
 
@@ -165,3 +196,14 @@ function ensureStaticConfigExists(projectDir: string): void {
     throw new Error('autoIncrement option is not supported when using app.config.js');
   }
 }
+
+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]);
+      return value.startsWith('"') ? value.slice(1, -1) : value;
+    } else {
+      return match;
+    }
+  });
+}

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

@@ -11,14 +11,14 @@ const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
 export async function runLocalBuildAsync(job: Job): Promise<void> {
   const execNameOrPath =
     process.env.EAS_LOCAL_BUILD_PLUGIN_PATH ??
-    (await findWithNodeResolution()) ??
+    (await findWithNodeResolutionAsync()) ??
     PLUGIN_PACKAGE_NAME;
   try {
     const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
     await spawnAsync(execNameOrPath, [arg], {
       stdio: 'inherit',
     });
-  } catch (err) {
+  } catch (err: any) {
     if (err.code === 'ENOENT') {
       Log.warn(`Could not resolve executable ${execNameOrPath}.`);
       Log.warn(
@@ -31,7 +31,7 @@ export async function runLocalBuildAsync(job: Job): Promise<void> {
   }
 }
 
-async function findWithNodeResolution(): Promise<string | undefined> {
+async function findWithNodeResolutionAsync(): Promise<string | undefined> {
   try {
     const resolvedPath = path.resolve(
       path.dirname(require.resolve(PLUGIN_PACKAGE_NAME)),

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

@@ -1,17 +1,24 @@
-import { Metadata } from '@expo/eas-build-job';
-import { CredentialsSource } from '@expo/eas-json';
+import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { IosEnterpriseProvisioning } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';
 
-import { getApplicationId } from '../project/android/applicationId';
-import { getBundleIdentifier } from '../project/ios/bundleIdentifier';
+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 { gitCommitHashAsync } from '../utils/git';
-import { readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync } from './android/UpdatesModule';
-import { readVersionCode, readVersionName } from './android/version';
+import vcs from '../vcs';
+import {
+  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
+} from './android/UpdatesModule';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
-import { readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync } from './ios/UpdatesModule';
-import { readBuildNumberAsync, readShortVersionAsync } from './ios/version';
-import { Platform } from './types';
+import {
+  readChannelSafelyAsync as readIosChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
+} from './ios/UpdatesModule';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 import { isExpoUpdatesInstalled } from './utils/updates';
 
 /**
@@ -21,77 +28,139 @@ import { isExpoUpdatesInstalled } from './utils/updates';
  */
 const packageJSON = require('../../package.json');
 
-export async function collectMetadata<T extends Platform>(
+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>,
-  {
-    credentialsSource,
-  }: {
-    credentialsSource?: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
-  }
+  platformContext: MetadataContext<T>
 ): Promise<Metadata> {
-  return {
+  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
+  const distribution =
+    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
+      ? 'simulator'
+      : ctx.buildProfile.distribution) ?? 'store';
+  const metadata = {
     trackingContext: ctx.trackingCtx,
-    appVersion: await resolveAppVersionAsync(ctx),
-    appBuildVersion: await resolveAppBuildVersionAsync(ctx),
+    ...(await maybeResolveVersionsAsync(ctx, platformContext)),
     cliVersion: packageJSON.version,
-    workflow: ctx.buildProfile.workflow,
-    credentialsSource,
-    sdkVersion: ctx.commandCtx.exp.sdkVersion,
-    releaseChannel: await resolveReleaseChannel(ctx),
-    distribution: ctx.buildProfile.distribution ?? 'store',
-    appName: ctx.commandCtx.exp.name,
-    appIdentifier: resolveAppIdentifier(ctx),
-    buildProfile: ctx.commandCtx.profile,
-    gitCommitHash: await gitCommitHashAsync(),
-    username: getUsername(ctx.commandCtx.exp, await ensureLoggedInAsync()),
+    workflow: ctx.workflow,
+    credentialsSource: ctx.buildProfile.credentialsSource,
+    sdkVersion: ctx.exp.sdkVersion,
+    runtimeVersion: ctx.exp.runtimeVersion,
+    ...channelOrReleaseChannel,
+    distribution,
+    appName: ctx.exp.name,
+    appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
+    buildProfile: ctx.buildProfileName,
+    gitCommitHash: await vcs.getCommitHashAsync(),
+    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    ...(ctx.platform === Platform.IOS && {
+      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
+        ctx as BuildContext<Platform.IOS>
+      ),
+    }),
   };
+  return sanitizeMetadata(metadata);
 }
 
-async function resolveAppVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<string | undefined> {
+async function maybeResolveVersionsAsync<T extends Platform>(
+  ctx: BuildContext<T>,
+  platformContext: MetadataContext<T>
+): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
-    return await readShortVersionAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    const iosContext = platformContext as IosMetadataContext;
+    return await maybeResolveIosVersionsAsync(
+      ctx.projectDir,
+      ctx.exp,
+      iosContext?.buildSettings ?? {}
+    );
+  } else if (ctx.platform === Platform.ANDROID) {
+    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
+    return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
   } else {
-    return readVersionName(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    throw new Error(`Unsupported platform ${ctx.platform}`);
   }
 }
 
-async function resolveAppBuildVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<string | undefined> {
+async function resolveAppIdentifierAsync<T extends Platform>(
+  ctx: BuildContext<T>,
+  platformContext: MetadataContext<T>
+): Promise<string> {
   if (ctx.platform === Platform.IOS) {
-    return await readBuildNumberAsync(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
+    const iosContext = platformContext as IosMetadataContext;
+    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp, {
+      targetName: iosContext.targetName,
+      buildConfiguration: iosContext.buildConfiguration,
+    });
   } else {
-    const versionCode = readVersionCode(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
-    return versionCode !== undefined ? String(versionCode) : undefined;
+    const androidContext = platformContext as AndroidMetadataContext;
+    return await getApplicationIdAsync(ctx.projectDir, ctx.exp, androidContext.gradleContext);
   }
 }
 
-function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string {
-  if (ctx.platform === Platform.IOS) {
-    return getBundleIdentifier(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
-  } else {
-    return getApplicationId(ctx.commandCtx.projectDir, ctx.commandCtx.exp);
-  }
-}
-
-async function resolveReleaseChannel<T extends Platform>(
+async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
   ctx: BuildContext<T>
-): Promise<string | undefined> {
-  if (!isExpoUpdatesInstalled(ctx.commandCtx.projectDir)) {
-    return undefined;
+): Promise<{ channel: string } | { releaseChannel: string } | null> {
+  if (!isExpoUpdatesInstalled(ctx.projectDir)) {
+    return null;
+  }
+  if (ctx.buildProfile.channel) {
+    return { channel: ctx.buildProfile.channel };
   }
-
   if (ctx.buildProfile.releaseChannel) {
-    return ctx.buildProfile.releaseChannel;
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
+  const channel = await getNativeChannelAsync(ctx);
+  if (channel) {
+    return { channel };
+  }
+  const releaseChannel = await getNativeReleaseChannelAsync(ctx);
+  return { releaseChannel };
+}
+
+async function getNativeReleaseChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string> {
+  switch (ctx.platform) {
+    case Platform.ANDROID: {
+      return (await readAndroidReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
+    }
+    case Platform.IOS: {
+      return (await readIosReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
+    }
+    default:
+      return 'default';
+  }
+}
+
+async function getNativeChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string | undefined> {
+  switch (ctx.platform) {
+    case Platform.ANDROID: {
+      return (await readAndroidChannelSafelyAsync(ctx.projectDir)) ?? undefined;
+    }
+    case Platform.IOS: {
+      return (await readIosChannelSafelyAsync(ctx.projectDir)) ?? undefined;
+    }
   }
 
-  let maybeReleaseChannel: string | null;
-  if (ctx.platform === Platform.ANDROID) {
-    maybeReleaseChannel = await readAndroidReleaseChannelSafelyAsync(ctx.commandCtx.projectDir);
-  } else {
-    maybeReleaseChannel = await readIosReleaseChannelSafelyAsync(ctx.commandCtx.projectDir);
-  }
-  return maybeReleaseChannel ?? 'default';
+  return undefined;
+}
+
+function resolveIosEnterpriseProvisioning(
+  ctx: BuildContext<Platform.IOS>
+): IosEnterpriseProvisioning | undefined {
+  return ctx.buildProfile.enterpriseProvisioning;
 }

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

@@ -1,12 +1,5 @@
-export { Platform } from '@expo/eas-build-job';
-
-export enum RequestedPlatform {
-  Android = 'android',
-  Ios = 'ios',
-  All = 'all',
-}
-
 export enum BuildStatus {
+  NEW = 'new',
   IN_QUEUE = 'in-queue',
   IN_PROGRESS = 'in-progress',
   ERRORED = 'errored',
@@ -14,4 +7,10 @@ export enum BuildStatus {
   CANCELED = 'canceled',
 }
 
-export type TrackingContext = Record<string, string | number>;
+export enum BuildDistributionType {
+  STORE = 'store',
+  INTERNAL = 'internal',
+  SIMULATOR = 'simulator',
+}
+
+export type TrackingContext = Record<string, string | number | boolean>;

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

@@ -18,6 +18,8 @@ export enum Event {
   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 {

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

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

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

@@ -0,0 +1,116 @@
+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';
+
+import { toAppPlatform } from '../../graphql/types/AppPlatform';
+import Log, { learnMore } from '../../log';
+import { appPlatformDisplayNames } from '../../platform';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { confirmAsync } from '../../prompts';
+import { expoCommandAsync } from '../../utils/expoCommand';
+import zipObject from '../../utils/expodash/zipObject';
+import { reviewAndCommitChangesAsync } from './repository';
+
+export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
+  projectDir,
+  platforms,
+  profile,
+  nonInteractive = false,
+}: {
+  projectDir: string;
+  platforms: Platform[];
+  profile: string;
+  nonInteractive?: boolean;
+}): Promise<void> {
+  if (await isExpoDevClientInstalledAsync(projectDir)) {
+    return;
+  }
+
+  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 isDevClientRequired = devClientPerPlatformList.some(i => i);
+  if (!isDevClientRequired) {
+    return;
+  }
+
+  const devClientPerPlatform = zipObject(platforms, devClientPerPlatformList);
+  const platformsToCheck = platforms.filter(platform => devClientPerPlatform[platform]);
+  const workflowPerPlatformList = await Promise.all(
+    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
+  );
+
+  Log.newLine();
+  Log.error(
+    `You want to build a development client build for platforms: ${platformsToCheck
+      .map(i => chalk.bold(appPlatformDisplayNames[toAppPlatform(i)]))
+      .join(', ')}`
+  );
+  Log.error(
+    `However, we detected that you don't have ${chalk.bold(
+      'expo-dev-client'
+    )} installed for your project.`
+  );
+  const areAllManaged = workflowPerPlatformList.every(i => i === Workflow.MANAGED);
+  if (areAllManaged) {
+    const install = await confirmAsync({
+      message: 'Do you want EAS CLI to install expo-dev-client for you?',
+      instructions: 'The command will abort unless you agree.',
+    });
+    if (install) {
+      await installExpoDevClientAsync(projectDir, { nonInteractive });
+    } else {
+      error(`Install ${chalk.bold('expo-dev-client')} on your own and come back later.`, {
+        exit: 1,
+      });
+    }
+  } else {
+    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',
+        dim: false,
+      })
+    );
+    Log.warn('If you proceed anyway, you might not get the build you want.');
+    Log.newLine();
+    const shouldContinue = await confirmAsync({
+      message: 'Do you want to proceed anyway?',
+      initial: false,
+    });
+    if (!shouldContinue) {
+      error('Come back later', { exit: 1 });
+    }
+  }
+}
+
+async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolean> {
+  try {
+    resolveFrom(projectDir, 'expo-dev-client/package.json');
+    return true;
+  } catch (err: any) {
+    Log.debug(err);
+    return false;
+  }
+}
+
+async function installExpoDevClientAsync(
+  projectDir: string,
+  { nonInteractive }: { nonInteractive: boolean }
+): Promise<void> {
+  Log.newLine();
+  Log.log(`Running ${chalk.bold('expo install expo-dev-client')}`);
+  Log.newLine();
+  await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
+  Log.newLine();
+  await reviewAndCommitChangesAsync('Install expo-dev-client', {
+    nonInteractive,
+  });
+}

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

@@ -1,14 +1,17 @@
 import chalk from 'chalk';
 
-import { BuildFragment, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildStatus as GraphQLBuildStatus,
+} from '../../graphql/generated';
+import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
-import { appPlatformDisplayNames } from '../constants';
 import { getBuildLogsUrl } from './url';
 
-export function formatGraphQLBuild(build: BuildFragment) {
+export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);
-  const account = build.project.__typename === 'App' ? build.project.ownerAccount.name : 'unknown';
-  const fields: { label: string; value: string }[] = [
+  const fields: { label: string; value?: string | null }[] = [
     { label: 'ID', value: build.id },
     {
       label: 'Platform',
@@ -18,6 +21,8 @@ export function formatGraphQLBuild(build: BuildFragment) {
       label: 'Status',
       get value() {
         switch (build.status) {
+          case GraphQLBuildStatus.New:
+            return chalk.blue('new');
           case GraphQLBuildStatus.InQueue:
             return chalk.blue('in queue');
           case GraphQLBuildStatus.InProgress:
@@ -35,53 +40,83 @@ export function formatGraphQLBuild(build: BuildFragment) {
     },
     {
       label: 'Distribution',
-      value: build.distribution?.toLowerCase() ?? chalk.gray('unknown'),
+      value: build.distribution?.toLowerCase(),
+    },
+    {
+      label: 'Enterprise Provisioning',
+      value: build.iosEnterpriseProvisioning?.toLowerCase(),
     },
     {
       label: 'Release Channel',
-      value: build.releaseChannel ?? chalk.gray('unknown'),
+      value: build.releaseChannel,
+    },
+    {
+      label: 'Channel',
+      value: build.channel,
+    },
+    {
+      label: 'SDK Version',
+      value: build.sdkVersion,
+    },
+    {
+      label: 'Runtime Version',
+      value: build.runtimeVersion,
+    },
+    {
+      label: 'Version',
+      value: build.appVersion,
+    },
+    {
+      label: build.platform === AppPlatform.Android ? 'Version code' : 'Build number',
+      value: build.appBuildVersion,
+    },
+    {
+      label: 'Commit',
+      value: build.gitCommitHash,
     },
     {
       label: 'Logs',
-      value: getBuildLogsUrl({ buildId: build.id, account }),
+      value: getBuildLogsUrl(build),
     },
     {
       label: 'Artifact',
       get value() {
-        if (
-          build.status === GraphQLBuildStatus.InQueue ||
-          build.status === GraphQLBuildStatus.InProgress
-        ) {
-        }
         switch (build.status) {
+          case GraphQLBuildStatus.New:
           case GraphQLBuildStatus.InQueue:
           case GraphQLBuildStatus.InProgress:
             return '<in progress>';
           case GraphQLBuildStatus.Canceled:
           case GraphQLBuildStatus.Errored:
-            return '---------';
+            return null;
           case GraphQLBuildStatus.Finished: {
             const url = build.artifacts?.buildUrl;
             return url ? url : chalk.red('not found');
           }
           default:
-            return 'unknown';
+            return null;
         }
       },
     },
     { label: 'Started at', value: new Date(build.createdAt).toLocaleString() },
     {
       label: 'Finished at',
-      value:
-        build.status === GraphQLBuildStatus.InQueue ||
-        build.status === GraphQLBuildStatus.InProgress
-          ? '<in progress>'
-          : new Date(build.updatedAt).toLocaleString(),
+      value: [
+        GraphQLBuildStatus.New,
+        GraphQLBuildStatus.InQueue,
+        GraphQLBuildStatus.InProgress,
+      ].includes(build.status)
+        ? '<in progress>'
+        : new Date(build.updatedAt).toLocaleString(),
     },
     { label: 'Started by', value: actor ?? 'unknown' },
   ];
 
-  return formatFields(fields);
+  const filteredFields = fields.filter(({ value }) => value !== undefined && value !== null) as {
+    label: string;
+    value: string;
+  }[];
+  return formatFields(filteredFields);
 }
 
 const getActorName = (build: BuildFragment): string => {

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

@@ -4,6 +4,7 @@ import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';
 
 import {
+  AppPlatform,
   BuildError,
   BuildFragment,
   BuildStatus,
@@ -12,51 +13,41 @@ import {
   EasBuildDeprecationInfoType,
 } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
-import {
-  appPlatformDisplayNames,
-  appPlatformEmojis,
-  requestedPlatformDisplayNames,
-} from '../constants';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { printJsonOnlyOutput } from '../../utils/json';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
-export function printLogsUrls(
-  accountName: string,
-  builds: { platform: 'android' | 'ios'; buildId: string }[]
-): void {
+export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {
-    const { buildId } = builds[0];
-    const logsUrl = getBuildLogsUrl({
-      buildId,
-      account: accountName,
-    });
-    Log.log(`Build details: ${chalk.underline(logsUrl)}`);
+    Log.log(`Build details: ${chalk.underline(getBuildLogsUrl(builds[0]))}`);
   } else {
-    builds.forEach(({ buildId, platform }) => {
-      const logsUrl = getBuildLogsUrl({
-        buildId,
-        account: accountName,
-      });
+    builds.forEach(build => {
+      const logsUrl = getBuildLogsUrl(build);
       Log.log(
-        `${requestedPlatformDisplayNames[platform]} build details: ${chalk.underline(logsUrl)}`
+        `${appPlatformEmojis[build.platform]} ${
+          appPlatformDisplayNames[build.platform]
+        } build details: ${chalk.underline(logsUrl)}`
       );
     });
   }
 }
 
-export function printBuildResults(accountName: string, builds: (BuildFragment | null)[]): void {
-  Log.newLine();
-  if (builds.length === 1) {
-    const [build] = builds;
-    assert(build, 'Build should be defined');
-    printBuildResult(accountName, build);
+export function printBuildResults(builds: (BuildFragment | null)[], json: boolean): void {
+  if (json) {
+    printJsonOnlyOutput(builds);
   } else {
-    (builds.filter(i => i) as BuildFragment[]).forEach(build =>
-      printBuildResult(accountName, build)
-    );
+    Log.newLine();
+    if (builds.length === 1) {
+      const [build] = builds;
+      assert(build, 'Build should be defined');
+      printBuildResult(build);
+    } else {
+      (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
+    }
   }
 }
 
-function printBuildResult(accountName: string, build: BuildFragment): void {
+function printBuildResult(build: BuildFragment): void {
   Log.addNewLineIfNone();
   if (build.status === BuildStatus.Errored) {
     const userError = build.error;
@@ -80,12 +71,14 @@ function printBuildResult(accountName: string, build: BuildFragment): void {
   }
 
   if (build.distribution === DistributionType.Internal) {
-    const logsUrl = getBuildLogsUrl({
-      buildId: build.id,
-      account: accountName,
-    });
-    const installUrl = getInternalDistributionInstallUrl(build);
-    qrcodeTerminal.generate(installUrl, code => console.log(`${indentString(code, 2)}\n`));
+    const logsUrl = getBuildLogsUrl(build);
+    // It's tricky to install the .apk file directly on Android so let's fallback
+    // to the build details page and let people press the button to download there
+    const qrcodeUrl =
+      build.platform === AppPlatform.Ios ? getInternalDistributionInstallUrl(build) : logsUrl;
+    qrcodeTerminal.generate(qrcodeUrl, { small: true }, code =>
+      Log.log(`${indentString(code, 2)}\n`)
+    );
     Log.log(
       `${appPlatformEmojis[build.platform]} Open this link on your ${
         appPlatformDisplayNames[build.platform]

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

@@ -1,63 +1,23 @@
-import spawnAsync from '@expo/spawn-async';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import ora from 'ora';
 import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';
 
 import Log from '../../log';
+import { ora } from '../../ora';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
-import {
-  doesGitRepoExistAsync,
-  getGitDiffOutputAsync,
-  gitDiffAsync,
-  gitRootDirectoryAsync,
-  gitStatusAsync,
-  isGitInstalledAsync,
-} from '../../utils/git';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
+import vcs from '../../vcs';
 
-async function ensureGitRepoExistsAsync(): Promise<void> {
-  if (!(await isGitInstalledAsync())) {
-    throw new Error('git command not found, install it before proceeding');
-  }
-
-  if (await doesGitRepoExistAsync()) {
-    return;
-  }
-
-  Log.warn("It looks like you haven't initialized the git repository yet.");
-  Log.warn('EAS Build requires you to use a git repository for your project.');
-
-  const confirmInit = await confirmAsync({
-    message: `Would you like to run 'git init' in the current directory?`,
-  });
-  if (!confirmInit) {
-    throw new Error(
-      'A git repository is required for building your project. Initialize it and run this command again.'
-    );
-  }
-  await spawnAsync('git', ['init']);
-
-  Log.log("We're going to make an initial commit for you repository.");
-
-  await commitPromptAsync({ initialCommitMessage: 'Initial commit', commitAllFiles: true });
-}
-
-async function isGitStatusCleanAsync(): Promise<boolean> {
-  const changes = await gitStatusAsync({ showUntracked: true });
-  return changes.length === 0;
-}
-
-async function maybeBailOnGitStatusAsync(): Promise<void> {
-  if (await isGitStatusCleanAsync()) {
+export async function maybeBailOnRepoStatusAsync(): Promise<void> {
+  if (!(await vcs.hasUncommittedChangesAsync())) {
     return;
   }
   Log.addNewLineIfNone();
-  Log.warn(`${chalk.bold('Warning!')} Your git working tree is dirty.`);
+  Log.warn(`${chalk.bold('Warning!')} Your repository working tree is dirty.`);
   Log.log(
     `It's recommended to ${chalk.bold(
       'commit all your changes before proceeding'
@@ -72,12 +32,12 @@ async function maybeBailOnGitStatusAsync(): Promise<void> {
   }
 }
 
-async function ensureGitStatusIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (await isGitStatusCleanAsync()) {
+export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
+  if (!(await vcs.hasUncommittedChangesAsync())) {
     return;
   }
   Log.addNewLineIfNone();
-  Log.warn(`${chalk.bold('Warning!')} Your git working tree is dirty.`);
+  Log.warn(`${chalk.bold('Warning!')} Your repository working tree is dirty.`);
   Log.log(
     `This operation needs to be run on a clean working tree, please ${chalk.bold(
       'commit all your changes before proceeding'
@@ -96,7 +56,24 @@ async function ensureGitStatusIsCleanAsync(nonInteractive = false): Promise<void
   }
 }
 
-async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
+export async function commitPromptAsync({
+  initialCommitMessage,
+  commitAllFiles,
+}: {
+  initialCommitMessage?: string;
+  commitAllFiles?: boolean;
+} = {}): Promise<void> {
+  const { message } = await promptAsync({
+    type: 'text',
+    name: 'message',
+    message: 'Commit message:',
+    initial: initialCommitMessage,
+    validate: (input: string) => input !== '',
+  });
+  await vcs.commitAsync({ commitAllFiles, commitMessage: message });
+}
+
+export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
   const spinner = ora('Compressing project files');
 
   await fs.mkdirp(getTmpDirectory());
@@ -118,14 +95,7 @@ async function makeProjectTarballAsync(): Promise<{ path: string; size: number }
   startTimer(compressTimerLabel);
 
   try {
-    await spawnAsync('git', [
-      'clone',
-      '--no-hardlinks',
-      '--depth',
-      '1',
-      `file://${await gitRootDirectoryAsync()}`,
-      shallowClonePath,
-    ]);
+    await vcs.makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
@@ -152,43 +122,54 @@ async function makeProjectTarballAsync(): Promise<{ path: string; size: number }
   return { size, path: tarPath };
 }
 
-async function showDiffAsync() {
-  const outputTooLarge = (await getGitDiffOutputAsync()).split(/\r\n|\r|\n/).length > 100;
-  await gitDiffAsync({ withPager: outputTooLarge });
+enum ShouldCommitChanges {
+  Yes,
+  ShowDiffFirst,
+  Abort,
 }
 
-async function commitPromptAsync({
-  initialCommitMessage,
-  commitAllFiles,
-}: {
-  initialCommitMessage?: string;
-  commitAllFiles?: boolean;
-} = {}): Promise<void> {
-  const { message } = await promptAsync({
-    type: 'text',
-    name: 'message',
-    message: 'Commit message:',
-    initial: initialCommitMessage,
-    validate: (input: string) => input !== '',
-  });
-  if (commitAllFiles) {
-    await spawnAsync('git', ['add', '-A']);
+export async function reviewAndCommitChangesAsync(
+  initialCommitMessage: string,
+  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
+): Promise<void> {
+  if (process.env.EAS_BUILD_AUTOCOMMIT) {
+    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+    Log.withTick('Committed changes.');
+    return;
   }
-  await commitChangedFilesAsync(message);
-}
+  if (nonInteractive) {
+    throw new Error(
+      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode or set EAS_BUILD_AUTOCOMMIT=1 in your environment.'
+    );
+  }
+  const { selected } = await promptAsync({
+    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: 'Abort build process',
+        value: ShouldCommitChanges.Abort,
+      },
+    ],
+  });
 
-async function commitChangedFilesAsync(message: string): Promise<void> {
-  await spawnAsync('git', ['add', '-u']);
-  await spawnAsync('git', ['commit', '-m', message]);
+  if (selected === ShouldCommitChanges.Abort) {
+    throw new Error(
+      "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
+    );
+  } else if (selected === ShouldCommitChanges.Yes) {
+    await commitPromptAsync({ initialCommitMessage });
+    Log.withTick('Committed changes.');
+  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
+    await vcs.showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, {
+      nonInteractive,
+      askedFirstTime: false,
+    });
+  }
 }
-
-export {
-  isGitStatusCleanAsync,
-  showDiffAsync,
-  commitPromptAsync,
-  commitChangedFilesAsync,
-  ensureGitRepoExistsAsync,
-  ensureGitStatusIsCleanAsync,
-  maybeBailOnGitStatusAsync,
-  makeProjectTarballAsync,
-};

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

@@ -1,8 +1,8 @@
 import { ExpoConfig, getPackageJson } from '@expo/config';
 
-export function isExpoUpdatesInstalled(projectDir: string) {
+export function isExpoUpdatesInstalled(projectDir: string): boolean {
   const packageJson = getPackageJson(projectDir);
-  return packageJson.dependencies && 'expo-updates' in packageJson.dependencies;
+  return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
 }
 
 export function ensureValidVersions(exp: ExpoConfig): void {

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

@@ -3,14 +3,17 @@ import assert from 'assert';
 import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
 import { AppPlatform, BuildFragment } from '../../graphql/generated';
 
-export function getBuildLogsUrl({
-  buildId,
-  account,
-}: {
-  buildId: string;
-  account: string;
-}): string {
-  return `${getExpoWebsiteBaseUrl()}/accounts/${account}/builds/${buildId}`;
+export function getProjectDashboardUrl(accountName: string, projectName: string): string {
+  return `${getExpoWebsiteBaseUrl()}/accounts/${accountName}/projects/${projectName}`;
+}
+
+export function getBuildLogsUrl(build: BuildFragment): string {
+  const { project } = build;
+  if (project.__typename === 'App') {
+    return `${getExpoWebsiteBaseUrl()}/accounts/${project.ownerAccount.name}/builds/${build.id}`;
+  } else {
+    return `${getExpoWebsiteBaseUrl()}/builds/${build.id}`;
+  }
 }
 
 export function getArtifactUrl(artifactId: string): string {

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

@@ -0,0 +1,47 @@
+import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+import semver from 'semver';
+
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+import { updateAppJsonConfigAsync } from './appJson';
+
+export function ensureStaticConfigExists(projectDir: string): void {
+  const paths = getConfigFilePaths(projectDir);
+  if (!paths.staticConfigPath) {
+    throw new Error('autoIncrement option is not supported when using app.config.js');
+  }
+}
+
+export async function bumpAppVersionAsync({
+  appVersion,
+  projectDir,
+  exp,
+}: {
+  appVersion: string;
+  projectDir: string;
+  exp: ExpoConfig;
+}): Promise<void> {
+  let bumpedAppVersion: string;
+  if (semver.valid(appVersion)) {
+    bumpedAppVersion = nullthrows(semver.inc(appVersion, 'patch'));
+    Log.log(
+      `Bumping ${chalk.bold('expo.version')} from ${chalk.bold(appVersion)} to ${chalk.bold(
+        bumpedAppVersion
+      )}`
+    );
+  } else {
+    Log.log(`${chalk.bold('expo.version')} = ${chalk.bold(appVersion)} is not a valid semver`);
+    bumpedAppVersion = (
+      await promptAsync({
+        type: 'text',
+        name: 'bumpedAppVersion',
+        message: 'What is the next version?',
+      })
+    ).bumpedAppVersion;
+  }
+  await updateAppJsonConfigAsync({ projectDir, exp }, config => {
+    config.version = bumpedAppVersion;
+  });
+}

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

@@ -0,0 +1,52 @@
+import { Platform, Workflow } from '@expo/eas-build-job';
+import fs from 'fs-extra';
+import path from 'path';
+
+import Log, { learnMore } from '../log';
+import vcs from '../vcs';
+import { BuildContext } from './context';
+
+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.'
+    );
+    Log.newLine();
+  }
+}
+
+export async function checkGoogleServicesFileAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<void> {
+  if (ctx.workflow === Workflow.GENERIC || ctx.buildProfile?.env?.GOOGLE_SERVICES_FILE) {
+    return;
+  }
+  const googleServicesFilePath = ctx.exp[ctx.platform]?.googleServicesFile;
+  if (!googleServicesFilePath) {
+    return;
+  }
+  const rootDir = path.normalize(await vcs.getRootPathAsync());
+  const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
+  if (
+    (await fs.pathExists(absGoogleServicesFilePath)) &&
+    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
+      (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.`
+    );
+    Log.warn(
+      `Use EAS Secret to pass all values that you don't want to include in your version control. ${learnMore(
+        'https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables'
+      )}`
+    );
+    Log.warn(
+      '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();
+  }
+}
+
+function isInsideDirectory(file: string, directory: string): boolean {
+  return file.startsWith(directory);
+}

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

@@ -0,0 +1,45 @@
+import { Command } from '@oclif/command';
+
+import {
+  AnalyticsEvent,
+  flushAsync as flushAnalyticsAsync,
+  initAsync as initAnalyticsAsync,
+  logEvent,
+} from '../analytics';
+import { getUserAsync } from '../user/User';
+import { ensureLoggedInAsync } from '../user/actions';
+
+export default abstract class EasCommand extends Command {
+  /**
+   * When user data is unavailable locally, determines if the command will
+   * force the user to log in
+   */
+  protected requiresAuthentication = true;
+
+  protected abstract runAsync(): Promise<any>;
+
+  // eslint-disable-next-line async-protect/async-suffix
+  async run(): Promise<any> {
+    await initAnalyticsAsync();
+
+    if (this.requiresAuthentication) {
+      const { flags } = this.parse();
+      const nonInteractive = (flags as any)['non-interactive'] ?? false;
+      await ensureLoggedInAsync({ nonInteractive });
+    } else {
+      await getUserAsync();
+    }
+    logEvent(AnalyticsEvent.ACTION, {
+      // id is assigned by oclif in constructor based on the filepath:
+      // commands/submit === submit, commands/build/list === build:list
+      action: `eas ${this.id}`,
+    });
+    return this.runAsync();
+  }
+
+  // eslint-disable-next-line async-protect/async-suffix
+  async finally(err: Error): Promise<any> {
+    await flushAnalyticsAsync();
+    return super.finally(err);
+  }
+}

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

@@ -0,0 +1,101 @@
+import { asMock } from '../../__tests__/utils';
+import { flushAsync, initAsync, logEvent } from '../../analytics';
+import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
+import { getUserAsync } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';
+import EasCommand from '../EasCommand';
+import TestEasCommand from './TestEasCommand';
+
+TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
+
+jest.mock('../../user/User');
+jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
+jest.mock('../../analytics', () => {
+  const { AnalyticsEvent } = jest.requireActual('../../analytics');
+  return {
+    AnalyticsEvent,
+    logEvent: jest.fn(),
+    initAsync: jest.fn(),
+    flushAsync: jest.fn(),
+  };
+});
+
+let originalProcessArgv: string[];
+
+beforeAll(() => {
+  originalProcessArgv = process.argv;
+  process.argv = [];
+});
+
+afterAll(() => {
+  process.argv = originalProcessArgv;
+});
+
+beforeEach(() => {
+  asMock(getUserAsync)
+    .mockReset()
+    .mockImplementation(() => mockJester);
+  asMock(ensureLoggedInAsync)
+    .mockReset()
+    .mockImplementation(() => mockJester);
+  asMock(initAsync).mockReset();
+  asMock(flushAsync).mockReset();
+  asMock(logEvent).mockReset();
+});
+
+describe(EasCommand.name, () => {
+  describe('without exceptions', () => {
+    // The first test in this suite should have an increased timeout
+    // because of the implementation of Command from @oclif/command.
+    // It seems that loading config takes significant amount of time
+    // and I'm not sure how to mock it.
+    //
+    // See https://github.com/oclif/command/blob/master/src/command.ts#L80
+    // and look for "Config.load"
+    it('ensures the user is logged in', async () => {
+      await TestEasCommand.run();
+
+      expect(ensureLoggedInAsync).toHaveBeenCalled();
+    }, 15_000);
+
+    it('ensures the user data is read from cache', async () => {
+      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
+
+      await TestEasCommand.run();
+
+      expect(getUserAsync).toHaveReturnedWith(mockJester);
+    });
+
+    it('initializes analytics', async () => {
+      await TestEasCommand.run();
+
+      expect(initAsync).toHaveBeenCalled();
+    });
+
+    it('flushes analytics', async () => {
+      await TestEasCommand.run();
+
+      expect(flushAsync).toHaveBeenCalled();
+    });
+
+    it('logs events', async () => {
+      await TestEasCommand.run();
+
+      expect(logEvent).toHaveBeenCalledWith('action', {
+        action: `eas ${TestEasCommand.id}`,
+      });
+    });
+  });
+
+  describe('after exceptions', () => {
+    it('flushes analytics', async () => {
+      try {
+        await TestEasCommand.run().then(() => {
+          throw new Error('foo');
+        });
+      } catch (error) {}
+
+      expect(flushAsync).toHaveBeenCalled();
+    });
+  });
+});

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

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

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

@@ -1,15 +1,14 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { showLoginPromptAsync } from '../../user/actions';
 
-export default class AccountLogin extends Command {
+export default class AccountLogin extends EasCommand {
   static description = 'log in with your Expo account';
-
   static aliases = ['login'];
 
-  async run() {
-    Log.log('Log in to EAS');
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     await showLoginPromptAsync();
     Log.log('Logged in');
   }

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

@@ -1,14 +1,14 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { logoutAsync } from '../../user/User';
 
-export default class AccountLogout extends Command {
+export default class AccountLogout extends EasCommand {
   static description = 'log out';
-
   static aliases = ['logout'];
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     await logoutAsync();
     Log.log('Logged out');
   }

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

@@ -1,15 +1,16 @@
-import { Command } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 import { getActorDisplayName, getUserAsync } from '../../user/User';
 
-export default class AccountView extends Command {
+export default class AccountView extends EasCommand {
   static description = 'show the username you are logged in as';
-
   static aliases = ['whoami'];
 
-  async run() {
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
     const user = await getUserAsync();
     if (user) {
       Log.log(chalk.green(getActorDisplayName(user)));

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

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

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   CreateUpdateBranchForAppMutation,
@@ -16,7 +17,7 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { getBranchNameAsync } from '../../utils/git';
+import vcs from '../../vcs';
 
 export async function createUpdateBranchOnAppAsync({
   appId,
@@ -49,7 +50,7 @@ export async function createUpdateBranchOnAppAsync({
   return newBranch;
 }
 
-export default class BranchCreate extends Command {
+export default class BranchCreate extends EasCommand {
   static hidden = true;
   static description = 'Create a branch on the current project.';
 
@@ -68,17 +69,13 @@ export default class BranchCreate extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name },
       flags,
     } = this.parse(BranchCreate);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
@@ -93,7 +90,7 @@ export default class BranchCreate extends Command {
         name: 'name',
         message: 'Please name the branch:',
         initial:
-          (await getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
+          (await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
         validate: value => (value ? true : validationMessage),
       }));
     }

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   DeleteUpdateBranchMutation,
@@ -22,7 +23,7 @@ import { promptAsync, toggleConfirmAsync } from '../../prompts';
 async function getBranchInfoAsync({
   appId,
   name,
-}: GetBranchInfoQueryVariables): Promise<{ branchId: string }> {
+}: GetBranchInfoQueryVariables): Promise<GetBranchInfoQuery> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .query<GetBranchInfoQuery, GetBranchInfoQueryVariables>(
@@ -46,11 +47,7 @@ async function getBranchInfoAsync({
       )
       .toPromise()
   );
-  const branchId = data.app?.byId.updateBranchByName?.id;
-  if (!branchId) {
-    throw new Error(`Could not find branch ${name} on ${appId}`);
-  }
-  return { branchId };
+  return data;
 }
 
 async function deleteBranchOnAppAsync({
@@ -77,7 +74,7 @@ async function deleteBranchOnAppAsync({
   return data.updateBranch.deleteUpdateBranch;
 }
 
-export default class BranchDelete extends Command {
+export default class BranchDelete extends EasCommand {
   static hidden = true;
   static description = 'Republish an update group';
 
@@ -95,16 +92,13 @@ export default class BranchDelete extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name },
       flags: { json: jsonFlag },
     } = this.parse(BranchDelete);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
@@ -122,7 +116,11 @@ export default class BranchDelete extends Command {
       }));
     }
 
-    const { branchId } = await getBranchInfoAsync({ appId: projectId, name });
+    const data = await getBranchInfoAsync({ appId: projectId, name });
+    const branchId = data.app?.byId.updateBranchByName?.id;
+    if (!branchId) {
+      throw new Error(`Could not find branch ${name} on ${fullName}`);
+    }
 
     if (!jsonFlag) {
       Log.addNewLineIfNone();

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

@@ -1,18 +1,29 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import CliTable from 'cli-table3';
+import { print } from 'graphql';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import { BranchesByAppQuery, BranchesByAppQueryVariables } from '../../graphql/generated';
+import {
+  BranchesByAppQuery,
+  BranchesByAppQueryVariables,
+  UpdateBranchFragment,
+} from '../../graphql/generated';
+import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 
 const BRANCHES_LIMIT = 10_000;
 
-export async function listBranchesAsync({ projectId }: { projectId: string }) {
+export async function listBranchesAsync({
+  projectId,
+}: {
+  projectId: string;
+}): Promise<UpdateBranchFragment[]> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
@@ -23,29 +34,12 @@ export async function listBranchesAsync({ projectId }: { projectId: string }) {
                 id
                 updateBranches(offset: 0, limit: $limit) {
                   id
-                  name
-                  updates(offset: 0, limit: 10) {
-                    id
-                    actor {
-                      __typename
-                      id
-                      ... on User {
-                        username
-                      }
-                      ... on Robot {
-                        firstName
-                      }
-                    }
-                    createdAt
-                    message
-                    runtimeVersion
-                    group
-                    platform
-                  }
+                  ...UpdateBranchFragment
                 }
               }
             }
           }
+          ${print(UpdateBranchFragmentNode)}
         `,
         {
           appId: projectId,
@@ -58,7 +52,7 @@ export async function listBranchesAsync({ projectId }: { projectId: string }) {
   return data?.app?.byId.updateBranches ?? [];
 }
 
-export default class BranchList extends Command {
+export default class BranchList extends EasCommand {
   static hidden = true;
 
   static description = 'List all branches on this project.';
@@ -70,13 +64,10 @@ export default class BranchList extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { flags } = this.parse(BranchList);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const branches = await listBranchesAsync({ projectId });
@@ -100,6 +91,8 @@ export default class BranchList extends Command {
           }),
         ])
       );
+
+      Log.addNewLineIfNone();
       Log.log(chalk.bold('Branches with their most recent update group:'));
       Log.log(table.toString());
       if (branches.length >= BRANCHES_LIMIT) {

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

@@ -1,39 +1,39 @@
-import { getConfig, getDefaultTarget } from '@expo/config';
+import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
 import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
-import Table from 'cli-table3';
 import dateFormat from 'dateformat';
 import gql from 'graphql-tag';
-import { uniqBy } from 'lodash';
-import ora from 'ora';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
-  Actor,
   GetUpdateGroupAsyncQuery,
+  Robot,
   RootQueryUpdatesByGroupArgs,
   Update,
   UpdateInfoGroup,
+  User,
+  ViewBranchQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log from '../../log';
-import {
-  findProjectRootAsync,
-  getProjectAccountNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+import { ora } from '../../ora';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import {
   PublishPlatform,
   buildBundlesAsync,
-  buildUpdateInfoGroupAsync,
-  collectAssets,
+  buildUnsortedUpdateInfoGroupAsync,
+  collectAssetsAsync,
   uploadAssetsAsync,
 } from '../../project/publish';
 import { promptAsync, selectAsync } from '../../prompts';
 import { formatUpdate } from '../../update/utils';
-import { getLastCommitMessageAsync } from '../../utils/git';
+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';
 
@@ -67,7 +67,34 @@ async function getUpdateGroupAsync({
   return updatesByGroup;
 }
 
-export default class BranchPublish extends Command {
+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 hidden = true;
   static description = 'Publish an update group to a branch.';
 
@@ -80,7 +107,7 @@ export default class BranchPublish extends Command {
 
   static flags = {
     message: flags.string({
-      description: 'Short message describing the updates.',
+      description: 'short message describing the updates.',
       required: false,
     }),
     republish: flags.boolean({
@@ -102,7 +129,7 @@ export default class BranchPublish extends Command {
     }),
     platform: flags.enum({
       char: 'p',
-      description: `Only publish to a single platform`,
+      description: `only publish to a single platform`,
       options: [...defaultPublishPlatforms, 'all'],
       default: 'all',
       required: false,
@@ -111,13 +138,19 @@ export default class BranchPublish extends Command {
       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 run() {
+  async runAsync(): Promise<void> {
     let {
-      args: { name },
+      args: { name: branchName },
       flags: {
         json: jsonFlag,
+        auto: autoFlag,
         message,
         republish,
         group,
@@ -129,39 +162,29 @@ export default class BranchPublish extends Command {
     // If a group was specified, that means we are republishing it.
     republish = group ? true : republish;
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+      isPublicConfig: true,
+    });
 
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const accountName = await getProjectAccountNameAsync(exp);
-    let { slug, runtimeVersion, sdkVersion } = exp;
+    const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);
 
-    // When a SDK version is supplied instead of a runtime version and we're in the managed workflow
-    // construct the runtimeVersion with special meaning indicating that the runtime is an
-    // Expo SDK preset runtime that can be launched in Expo Go.
-    const isManagedProject = getDefaultTarget(projectDir) === 'managed';
-    if (!runtimeVersion && sdkVersion && isManagedProject) {
-      Log.withTick('Generating runtime version from sdk version');
-      runtimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
-    }
-
-    if (!runtimeVersion) {
-      throw new Error(
-        "Couldn't find 'runtimeVersion'. Please specify it under the 'expo' key in 'app.json'"
-      );
-    }
     const projectId = await getProjectIdAsync(exp);
 
-    if (!name) {
+    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 });
-      name = await selectAsync<string>(
+      branchName = await selectAsync<string>(
         'which branch would you like to publish on?',
         branches.map(branch => {
           return {
@@ -172,15 +195,15 @@ export default class BranchPublish extends Command {
           };
         })
       );
+      assert(branchName, 'branch name must be specified.');
     }
-    assert(name, 'branch name must be specified.');
 
-    const { id: branchId, updates } = await viewUpdateBranchAsync({
+    const { id: branchId, updates } = await ensureBranchExistsAsync({
       appId: projectId,
-      name,
+      name: branchName,
     });
 
-    let updateInfoGroup: UpdateInfoGroup = {};
+    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.
@@ -208,7 +231,7 @@ export default class BranchPublish extends Command {
           }));
         if (updateGroups.length === 0) {
           throw new Error(
-            `There are no updates on branch "${name}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
+            `There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
           );
         }
 
@@ -224,7 +247,7 @@ export default class BranchPublish extends Command {
       );
       if (updatesToRepublishFilteredByPlatform.length === 0) {
         throw new Error(
-          `There are no updates on branch "${name}" published on the platform(s) "${platformFlag}" with group ID "${
+          `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?`
         );
@@ -247,7 +270,7 @@ export default class BranchPublish extends Command {
         const { manifestFragment } = update;
         const platform = update.platform as PublishPlatform;
 
-        updateInfoGroup[platform] = JSON.parse(manifestFragment);
+        unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
       }
 
       // These are the same for each member of an update group
@@ -263,9 +286,9 @@ export default class BranchPublish extends Command {
       const assetSpinner = ora('Uploading assets...').start();
       try {
         const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
-        const assets = collectAssets({ inputDir: inputDir!, platforms });
+        const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
         await uploadAssetsAsync(assets);
-        updateInfoGroup = await buildUpdateInfoGroupAsync(assets);
+        unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
         assetSpinner.succeed('Uploaded assets!');
       } catch (e) {
         assetSpinner.fail('Failed to upload assets');
@@ -273,6 +296,10 @@ export default class BranchPublish extends Command {
       }
     }
 
+    if (!message && autoFlag) {
+      message = (await vcs.getLastCommitMessageAsync())?.trim();
+    }
+
     if (!message) {
       const validationMessage = 'publish message may not be empty.';
       if (jsonFlag) {
@@ -284,20 +311,43 @@ export default class BranchPublish extends Command {
         message: `Please enter a publication message.`,
         initial: republish
           ? `Republish "${oldMessage!}" - group: ${group}`
-          : (await getLastCommitMessageAsync())?.trim(),
+          : (await vcs.getLastCommitMessageAsync())?.trim(),
         validate: value => (value ? true : validationMessage),
       }));
     }
 
-    let newUpdateGroup;
+    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 {
-      newUpdateGroup = await PublishMutation.publishUpdateGroupAsync({
-        branchId,
-        updateInfoGroup,
-        runtimeVersion: republish ? oldRuntimeVersion! : runtimeVersion,
-        message,
-      });
+      newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
       publishSpinner.succeed('Published!');
     } catch (e) {
       publishSpinner.fail('Failed to published updates');
@@ -305,48 +355,118 @@ export default class BranchPublish extends Command {
     }
 
     if (jsonFlag) {
-      Log.log(JSON.stringify(newUpdateGroup));
+      Log.log(JSON.stringify(newUpdates));
     } else {
-      const outputMessage = new Table({
-        wordWrap: true,
-        chars: {
-          top: '',
-          'top-mid': '',
-          'top-left': '',
-          'top-right': '',
-          bottom: '',
-          'bottom-mid': '',
-          'bottom-left': '',
-          'bottom-right': '',
-          left: '',
-          'left-mid': '',
-          mid: '',
-          'mid-mid': '',
-          right: '',
-          'right-mid': '',
-          middle: ' ',
-        },
-        style: { 'padding-left': 0, 'padding-right': 0 },
-      });
-      outputMessage.push(
-        [chalk.dim('project'), `@${accountName}/${slug}`],
-        [chalk.dim('branch'), name],
-        [chalk.dim('runtimeVersion'), runtimeVersion],
-        [chalk.dim('groupID'), newUpdateGroup.group],
-        [chalk.dim('message'), message]
-      );
-      Log.log(outputMessage.toString());
+      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 formatUpdateTitle(
-  update: Pick<Update, 'message' | 'createdAt' | 'runtimeVersion'> & {
-    actor?: Pick<Actor, 'firstName'> | null;
+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;
-  return `[${dateFormat(createdAt, 'mmm dd HH:MM')} by ${
-    actor?.firstName ?? 'unknown'
-  }, runtimeVersion: ${runtimeVersion}] ${message}`;
+
+  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,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   EditUpdateBranchInput,
@@ -49,7 +50,7 @@ async function renameUpdateBranchOnAppAsync({
   return data.updateBranch.editUpdateBranch;
 }
 
-export default class BranchRename extends Command {
+export default class BranchRename extends EasCommand {
   static hidden = true;
   static description = 'Rename a branch.';
 
@@ -68,15 +69,12 @@ export default class BranchRename extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       flags: { json: jsonFlag, from: currentName, to: newName },
     } = this.parse(BranchRename);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);

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

@@ -1,46 +1,25 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 import gql from 'graphql-tag';
-import { groupBy } from 'lodash';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  Maybe,
-  Robot,
-  Update,
-  UpdateBranch,
-  User,
-  ViewBranchQuery,
-  ViewBranchQueryVariables,
-} from '../../graphql/generated';
+import { ViewBranchQuery, ViewBranchQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+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';
 
 const PAGE_LIMIT = 10_000;
 
-type TruncatedUpdate = Pick<Update, 'group' | 'message' | 'createdAt' | 'actor'>;
-
 export async function viewUpdateBranchAsync({
   appId,
   name,
-}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<
-  Pick<UpdateBranch, 'id' | 'name'> & {
-    updates: (Pick<
-      Update,
-      'id' | 'group' | 'message' | 'createdAt' | 'runtimeVersion' | 'platform' | 'manifestFragment'
-    > & {
-      actor?: Maybe<Pick<User, 'firstName' | 'id'> | Pick<Robot, 'firstName' | 'id'>>;
-    })[];
-  }
-> {
+}: Pick<ViewBranchQueryVariables, 'appId' | 'name'>): Promise<ViewBranchQuery> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .query<ViewBranchQuery, ViewBranchQueryVariables>(
@@ -83,14 +62,10 @@ export async function viewUpdateBranchAsync({
       )
       .toPromise()
   );
-  const updateBranch = data.app?.byId.updateBranchByName;
-  if (!updateBranch) {
-    throw new Error(`Could not find branch "${name}"`);
-  }
-  return updateBranch;
+  return data;
 }
 
-export default class BranchView extends Command {
+export default class BranchView extends EasCommand {
   static hidden = true;
   static description = 'View a branch.';
 
@@ -109,19 +84,14 @@ export default class BranchView extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name },
       flags: { json: jsonFlag },
     } = this.parse(BranchView);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
     if (!name) {
@@ -137,10 +107,14 @@ export default class BranchView extends Command {
       }));
     }
 
-    const UpdateBranch = await viewUpdateBranchAsync({
+    const { app } = await viewUpdateBranchAsync({
       appId: projectId,
       name,
     });
+    const UpdateBranch = app?.byId.updateBranchByName;
+    if (!UpdateBranch) {
+      throw new Error(`Could not find branch "${name}"`);
+    }
 
     const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
       group => group[0]
@@ -168,12 +142,16 @@ export default class BranchView extends Command {
       ]);
     }
 
-    Log.withTick(
-      `️Branch: ${chalk.bold(UpdateBranch.name)} on project ${chalk.bold(
-        fullName
-      )}. Branch ID: ${chalk.bold(UpdateBranch.id)}`
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branch:'));
+    Log.log(
+      formatFields([
+        { label: 'Name', value: UpdateBranch.name },
+        { label: 'ID', value: UpdateBranch.id },
+      ])
     );
-    Log.log(chalk.bold('Recent update groups published on this branch:'));
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Recently published update groups:'));
     Log.log(groupTable.toString());
   }
 }

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

@@ -1,10 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
-import ora from 'ora';
 
-import { appPlatformEmojis } from '../../build/constants';
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   Build,
@@ -14,6 +12,8 @@ import {
 } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
+import { appPlatformEmojis } from '../../platform';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -47,7 +47,15 @@ function formatUnfinishedBuild(
 ): string {
   const platform = appPlatformEmojis[build.platform];
   const startTime = new Date(build.createdAt).toLocaleString();
-  const status = chalk.blue(build.status === BuildStatus.InQueue ? 'in-queue' : 'in-progress');
+  let statusText: string;
+  if (build.status === BuildStatus.New) {
+    statusText = 'new';
+  } else if (build.status === BuildStatus.InQueue) {
+    statusText = 'in queue';
+  } else {
+    statusText = 'in progress';
+  }
+  const status = chalk.blue(statusText);
   return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
 }
 
@@ -58,12 +66,13 @@ async function selectBuildToCancelAsync(
   const spinner = ora().start('Fetching the uncompleted builds…');
   let builds;
   try {
-    const [inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.allForAppAsync(projectId, { status: BuildStatus.InQueue }),
-      BuildQuery.allForAppAsync(projectId, { status: BuildStatus.InProgress }),
+    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
+      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.New } }),
+      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InQueue } }),
+      BuildQuery.allForAppAsync(projectId, { filter: { status: BuildStatus.InProgress } }),
     ]);
     spinner.stop();
-    builds = [...inQueueBuilds, ...inProgressBuilds];
+    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
   } catch (error) {
     spinner.fail(
       `Something went wrong and we couldn't fetch the builds for the project ${projectFullName}.`
@@ -100,15 +109,15 @@ async function ensureBuildExistsAsync(buildId: string): Promise<void> {
   }
 }
 
-export default class BuildCancel extends Command {
+export default class BuildCancel extends EasCommand {
   static description = 'Cancel a build.';
 
   static args = [{ name: 'BUILD_ID' }];
 
-  async run() {
+  async runAsync(): Promise<void> {
     const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);

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

@@ -1,14 +1,14 @@
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
 import { configureAsync } from '../../build/configure';
-import { RequestedPlatform } from '../../build/types';
+import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
+import { RequestedPlatform } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class BuildConfigure extends Command {
+export default class BuildConfigure extends EasCommand {
   static description = 'Configure the project to support EAS Build.';
 
   static flags = {
@@ -17,13 +17,9 @@ export default class BuildConfigure extends Command {
       char: 'p',
       options: ['android', 'ios', 'all'],
     }),
-    'allow-experimental': flags.boolean({
-      description: 'Enable experimental configuration steps.',
-      default: false,
-    }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     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.'
@@ -32,21 +28,10 @@ export default class BuildConfigure extends Command {
 
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
-    const allowExperimental = flags['allow-experimental'];
 
-    if (allowExperimental) {
-      Log.warn(
-        `Project configuration will execute some additional steps that might fail if structure of your native project is significantly different from ${chalk.bold(
-          'expo eject'
-        )} or ${chalk.bold('expo init')}`
-      );
-    }
-
-    await ensureLoggedInAsync();
     await configureAsync({
       platform,
-      allowExperimental,
-      projectDir: (await findProjectRootAsync()) ?? process.cwd(),
+      projectDir: await findProjectRootAsync(),
     });
 
     Log.newLine();
@@ -54,7 +39,7 @@ export default class BuildConfigure extends Command {
   }
 }
 
-function logSuccess(platform: RequestedPlatform) {
+function logSuccess(platform: RequestedPlatform): void {
   let platformsText = 'iOS and Android projects are';
   let storesText = 'the Apple App Store or Google Play Store';
 
@@ -70,7 +55,7 @@ function logSuccess(platform: RequestedPlatform) {
 
 - Run ${chalk.bold('eas build')} when you are ready to create your first build.
 - Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to ${storesText}
-- ${learnMore('https://docs.expo.io/build/introduction', {
+- ${learnMore('https://docs.expo.dev/build/introduction', {
     learnMoreMessage: 'Learn more about other capabilities of EAS Build',
   })}`);
 }

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

@@ -1,35 +1,98 @@
-import { ExpoConfig, getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+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 fs from 'fs-extra';
-import path from 'path';
+import nullthrows from 'nullthrows';
 
+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 { CredentialsContext } from '../../credentials/context';
 import {
-  flushAsync as flushAnalyticsAsync,
-  initAsync as initAnalyticsAsync,
-} from '../../analytics';
-import { configureAsync } from '../../build/configure';
-import { createCommandContextAsync } from '../../build/context';
-import { buildAsync } from '../../build/create';
-import { RequestedPlatform } from '../../build/types';
-import { isGitStatusCleanAsync } from '../../build/utils/repository';
-import Log, { learnMore } from '../../log';
+  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,
-  warnEasUnavailable,
 } from '../../project/isEasEnabledForProject';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { confirmAsync, promptAsync } from '../../prompts';
-import { ensureLoggedInAsync } from '../../user/actions';
+import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
+import { findProjectRootAsync } from '../../project/projectUtils';
+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 vcs from '../../vcs';
 
-export default class Build extends Command {
-  static description = 'Start a build';
+interface RawBuildFlags {
+  platform?: string;
+  'skip-credentials-check': boolean;
+  'skip-project-configuration': boolean;
+  profile: string;
+  'non-interactive': boolean;
+  local: boolean;
+  wait: boolean;
+  'clear-cache': boolean;
+  json: boolean;
+  'auto-submit': boolean;
+  '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({ char: 'p', options: ['android', 'ios', 'all'] }),
+    platform: flags.enum({
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+    }),
     'skip-credentials-check': flags.boolean({
       default: false,
-      description: 'Skip validation of build credentials',
+      hidden: true,
+    }),
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+      default: false,
     }),
     'skip-project-configuration': flags.boolean({
       default: false,
@@ -38,10 +101,11 @@ export default class Build extends Command {
     profile: flags.string({
       default: 'release',
       description: 'Name of the build profile from eas.json',
+      helpValue: 'PROFILE_NAME',
     }),
     'non-interactive': flags.boolean({
       default: false,
-      description: 'Run command in --non-interactive mode',
+      description: 'Run command in non-interactive mode',
     }),
     local: flags.boolean({
       default: false,
@@ -56,118 +120,294 @@ export default class Build extends Command {
       default: false,
       description: 'Clear cache before the build',
     }),
+    '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({
+      description: 'Submit on build complete using the submit profile with provided name',
+      helpValue: 'PROFILE_NAME',
+      exclusive: ['auto-submit'],
+    }),
   };
 
-  async run(): Promise<void> {
-    const { flags } = this.parse(Build);
-    await initAnalyticsAsync(); // TODO: run in oclif hook for every command
-    try {
-      await ensureLoggedInAsync();
+  private metroConfigValidated = false;
 
-      const nonInteractive = flags['non-interactive'];
-      if (!flags.platform && nonInteractive) {
-        throw new Error('--platform is required when building in non-interactive mode');
-      }
-      const platform =
-        (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
+  async runAsync(): Promise<void> {
+    const { flags: rawFlags } = this.parse(Build);
+    if (rawFlags.json) {
+      enableJsonOutput();
+    }
+    const flags = await this.sanitizeFlagsAsync(rawFlags);
+    const { requestedPlatform } = flags;
 
-      const projectDir = (await findProjectRootAsync()) ?? process.cwd();
-      let { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-      const projectId = await getProjectIdAsync(exp);
+    const projectDir = await findProjectRootAsync();
+    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
-      if (!flags.local && !(await isEasEnabledForProjectAsync(projectId))) {
-        warnEasUnavailable();
-        process.exitCode = 1;
-        return;
-      }
+    await vcs.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(flags.nonInteractive);
 
-      if (flags.local && !verifyOptionsForLocalBuilds(platform)) {
-        process.exitCode = 1;
-        return;
-      }
+    await ensureProjectConfiguredAsync(projectDir, requestedPlatform);
 
-      exp = (await ensureProjectConfiguredAsync(projectDir)) ?? exp;
+    const platforms = toPlatforms(requestedPlatform);
+    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+      platforms,
+      projectDir,
+      profile: flags.profile,
+      nonInteractive: flags.nonInteractive,
+    });
 
-      const commandCtx = await createCommandContextAsync({
-        requestedPlatform: platform,
-        profile: flags.profile,
-        exp,
+    const startedBuilds: BuildFragment[] = [];
+    const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
+    for (const platform of platforms) {
+      const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
         projectDir,
-        projectId,
-        nonInteractive,
-        clearCache: flags['clear-cache'],
-        skipCredentialsCheck: flags['skip-credentials-check'],
-        local: flags.local,
-        skipProjectConfiguration: flags['skip-project-configuration'],
-        waitForBuildEnd: flags.wait,
+        platform,
+        flags,
+        moreBuilds: platforms.length > 1,
       });
-      await buildAsync(commandCtx);
-    } finally {
-      await flushAnalyticsAsync(); // TODO: run in oclif hook for every command
+      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);
     }
   }
-}
 
-function verifyOptionsForLocalBuilds(platform: RequestedPlatform): boolean {
-  if (platform === RequestedPlatform.All) {
-    Log.error('Builds for multiple platforms are not supported with flag --local');
-    return false;
-  } else if (process.platform !== 'darwin' && platform === RequestedPlatform.Ios) {
-    Log.error('Unsupported platform, macOS is required to build apps for iOS');
-    return false;
-  } else {
-    return true;
+  private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
+    const nonInteractive = flags['non-interactive'];
+    if (!flags.platform && nonInteractive) {
+      error('--platform is required when building in non-interactive mode', { exit: 1 });
+    }
+    if (flags.json && !nonInteractive) {
+      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
+        error('Auto-submits are not yet supported when building locally', { exit: 1 });
+      }
+
+      if (requestedPlatform === RequestedPlatform.All) {
+        error('Builds for multiple platforms are not supported with flag --local', { exit: 1 });
+      } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
+        error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+      }
+    }
+
+    if (flags['skip-credentials-check']) {
+      Log.warnDeprecatedFlag(
+        'skip-credentials-check',
+        'Build credentials validation is always skipped with the --non-interactive flag. You can also skip interactively.'
+      );
+      Log.newLine();
+    }
+
+    const profile = flags['profile'];
+    return {
+      requestedPlatform,
+      skipProjectConfiguration: flags['skip-project-configuration'],
+      profile,
+      nonInteractive,
+      local: flags['local'],
+      wait: flags['wait'],
+      clearCache: flags['clear-cache'],
+      json: flags['json'],
+      autoSubmit: flags['auto-submit'],
+      submitProfile: flags['auto-submit-with-profile'] ?? profile,
+    };
   }
-}
 
-async function promptForPlatformAsync(): Promise<RequestedPlatform> {
-  const { platform } = await promptAsync({
-    type: 'select',
-    message: 'Build for platforms',
-    name: 'platform',
-    choices: [
-      {
-        title: 'All',
-        value: RequestedPlatform.All,
-      },
-      {
-        title: 'iOS',
-        value: RequestedPlatform.Ios,
-      },
-      {
-        title: 'Android',
-        value: RequestedPlatform.Android,
-      },
-    ],
-  });
-  return platform;
-}
+  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);
 
-async function ensureProjectConfiguredAsync(projectDir: string): Promise<ExpoConfig | null> {
-  if (await fs.pathExists(path.join(projectDir, 'eas.json'))) {
-    return null;
-  }
-  const confirm = await confirmAsync({
-    message: 'This app is not set up for building with EAS. Set it up now?',
-  });
-  if (confirm) {
-    await configureAsync({
+    const buildCtx = await createBuildContextAsync({
+      buildProfileName: flags.profile,
+      clearCache: flags.clearCache,
+      buildProfile,
+      local: flags.local,
+      nonInteractive: flags.nonInteractive,
+      platform,
       projectDir,
-      platform: RequestedPlatform.All,
-      allowExperimental: false,
+      skipProjectConfiguration: flags.skipProjectConfiguration,
     });
-    if (!(await isGitStatusCleanAsync())) {
-      throw new Error(
-        'Build process requires clean git working tree, please commit all your changes and run `eas build` again'
+
+    if (moreBuilds) {
+      Log.newLine();
+      const appPlatform = toAppPlatform(platform);
+      Log.log(
+        `${appPlatformEmojis[appPlatform]} ${chalk.bold(
+          `${appPlatformDisplayNames[appPlatform]} build`
+        )}`
       );
     }
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    return exp;
-  } else {
-    throw new Error(
-      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
-        'https://docs.expo.io/build/eas-json'
-      )})`
+
+    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> {
+  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 });
+    }
+
+    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/list.ts

@@ -1,28 +1,39 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
-import ora from 'ora';
 
-import { BuildStatus, RequestedPlatform } from '../../build/types';
+import { BuildDistributionType, BuildStatus } from '../../build/types';
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
-import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import EasCommand from '../../commandUtils/EasCommand';
+import {
+  AppPlatform,
+  DistributionType,
+  BuildStatus as GraphQLBuildStatus,
+} from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-export default class BuildList extends Command {
+export default class BuildList extends EasCommand {
   static description = 'list all builds for your project';
 
   static flags = {
     platform: flags.enum({
       options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
     }),
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+    }),
     status: flags.enum({
       options: [
+        BuildStatus.NEW,
         BuildStatus.IN_QUEUE,
         BuildStatus.IN_PROGRESS,
         BuildStatus.ERRORED,
@@ -30,18 +41,42 @@ export default class BuildList extends Command {
         BuildStatus.CANCELED,
       ],
     }),
+    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(),
   };
 
-  async run() {
-    const { platform: requestedPlatform, status: buildStatus, limit = 10 } = this.parse(
-      BuildList
-    ).flags;
+  async runAsync(): Promise<void> {
+    const { flags } = this.parse(BuildList);
+    const {
+      json,
+      platform: requestedPlatform,
+      status: buildStatus,
+      distribution: buildDistribution,
+      limit = 10,
+    } = flags;
+    if (json) {
+      enableJsonOutput();
+    }
 
     const platform = toAppPlatform(requestedPlatform);
     const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
+    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);
@@ -51,8 +86,19 @@ export default class BuildList extends Command {
     try {
       const builds = await BuildQuery.allForAppAsync(projectId, {
         limit,
-        platform,
-        status: graphqlBuildStatus,
+        filter: {
+          platform,
+          status: graphqlBuildStatus,
+          distribution: graphqlBuildDistribution,
+          channel: flags.channel,
+          appVersion: flags.appVersion,
+          appBuildVersion: flags.appBuildVersion,
+          sdkVersion: flags.sdkVersion,
+          runtimeVersion: flags.runtimeVersion,
+          appIdentifier: flags.appIdentifier,
+          buildProfile: flags.buildProfile,
+          gitCommitHash: flags.gitCommitHash,
+        },
       });
 
       if (builds.length) {
@@ -64,11 +110,15 @@ export default class BuildList extends Command {
           spinner.succeed(`Showing last ${builds.length} builds for the project ${projectName}`);
         }
 
-        const list = builds
-          .map(build => formatGraphQLBuild(build))
-          .join(`\n\n${chalk.dim('———')}\n\n`);
+        if (json) {
+          printJsonOnlyOutput(builds);
+        } else {
+          const list = builds
+            .map(build => formatGraphQLBuild(build))
+            .join(`\n\n${chalk.dim('———')}\n\n`);
 
-        Log.log(`\n${list}`);
+          Log.log(`\n${list}`);
+        }
       } else {
         spinner.fail(`Couldn't find any builds for the project ${projectName}`);
       }
@@ -89,9 +139,11 @@ const toAppPlatform = (requestedPlatform?: RequestedPlatform): AppPlatform | und
   }
 };
 
-const toGraphQLBuildStatus = (buildStatus: BuildStatus): GraphQLBuildStatus | undefined => {
+const toGraphQLBuildStatus = (buildStatus?: BuildStatus): GraphQLBuildStatus | undefined => {
   if (!buildStatus) {
     return undefined;
+  } else if (buildStatus === BuildStatus.NEW) {
+    return GraphQLBuildStatus.New;
   } else if (buildStatus === BuildStatus.IN_QUEUE) {
     return GraphQLBuildStatus.InQueue;
   } else if (buildStatus === BuildStatus.IN_PROGRESS) {
@@ -104,3 +156,17 @@ const toGraphQLBuildStatus = (buildStatus: BuildStatus): GraphQLBuildStatus | un
     return GraphQLBuildStatus.Canceled;
   }
 };
+
+const toGraphQLBuildDistribution = (
+  buildDistribution?: BuildDistributionType
+): DistributionType | undefined => {
+  if (buildDistribution === BuildDistributionType.STORE) {
+    return DistributionType.Store;
+  } else if (buildDistribution === BuildDistributionType.INTERNAL) {
+    return DistributionType.Internal;
+  } else if (buildDistribution === BuildDistributionType.SIMULATOR) {
+    return DistributionType.Simulator;
+  } else {
+    return undefined;
+  }
+};

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

@@ -1,26 +1,40 @@
 import { getConfig } from '@expo/config';
-import { Command } from '@oclif/command';
-import ora from 'ora';
+import { flags } from '@oclif/command';
 
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import EasCommand from '../../commandUtils/EasCommand';
 import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-export default class BuildView extends Command {
+export default class BuildView extends EasCommand {
   static description = 'view a build for your project';
 
   static args = [{ name: 'BUILD_ID' }];
 
-  async run() {
-    const { BUILD_ID: buildId } = this.parse(BuildView).args;
+  static flags = {
+    json: flags.boolean({
+      description: 'Enable JSON output, non-JSON messages will be printed to stderr',
+    }),
+  };
 
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+  async runAsync(): Promise<void> {
+    const {
+      args: { BUILD_ID: buildId },
+      flags,
+    } = this.parse(BuildView);
+    if (flags.json) {
+      enableJsonOutput();
+    }
+
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);
@@ -47,7 +61,11 @@ export default class BuildView extends Command {
         spinner.succeed(`Showing the last build for the project ${projectName}`);
       }
 
-      Log.log(`\n${formatGraphQLBuild(build)}`);
+      if (flags.json) {
+        printJsonOnlyOutput(build);
+      } else {
+        Log.log(`\n${formatGraphQLBuild(build)}`);
+      }
     } catch (err) {
       if (buildId) {
         spinner.fail(`Something went wrong and we couldn't fetch the build with id ${buildId}`);

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

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   CreateUpdateChannelOnAppMutation,
@@ -16,6 +17,7 @@ import {
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
+import formatFields from '../../utils/formatFields';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
 
 async function createUpdateChannelOnAppAsync({
@@ -56,7 +58,7 @@ async function createUpdateChannelOnAppAsync({
   );
 }
 
-export default class ChannelCreate extends Command {
+export default class ChannelCreate extends EasCommand {
   static hidden = true;
   static description = 'Create a channel on the current project.';
 
@@ -76,18 +78,14 @@ export default class ChannelCreate extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },
     } = this.parse(ChannelCreate);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {
@@ -140,10 +138,26 @@ export default class ChannelCreate extends Command {
       return;
     }
 
+    Log.addNewLineIfNone();
     Log.withTick(
-      `️Created a new channel ${chalk.bold(newChannel.name)} on project ${chalk.bold(
-        fullName
-      )}. ${branchMessage} and have pointed the channel at it. You can now update your app by publishing!`
+      `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/edit.ts

@@ -1,8 +1,9 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetChannelByNameToEditQuery,
@@ -92,7 +93,7 @@ export async function updateChannelBranchMappingAsync({
   return data.updateChannel.editUpdateChannel!;
 }
 
-export default class ChannelEdit extends Command {
+export default class ChannelEdit extends EasCommand {
   static hidden = true;
   static description = 'Point a channel at a new branch.';
 
@@ -114,16 +115,13 @@ export default class ChannelEdit extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: channelName },
       flags: { branch: branchName, json: jsonFlag },
     } = this.parse(ChannelEdit);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
@@ -146,13 +144,6 @@ export default class ChannelEdit extends Command {
         'There is a rollout in progress. Please manage it with "channel:rollout" instead.'
       );
     }
-    const existingBranch = existingChannel.updateBranches[0];
-
-    Log.addNewLineIfNone();
-    Log.log(
-      chalk`Channel {bold ${existingChannel.name}} is currently set to branch {bold ${existingBranch.name}}`
-    );
-    Log.addNewLineIfNone();
 
     if (!branchName) {
       const validationMessage = 'branch name may not be empty.';
@@ -185,6 +176,7 @@ export default class ChannelEdit extends Command {
     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}}.`
     );

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

@@ -1,8 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
-import chalk from 'chalk';
+import { flags } from '@oclif/command';
 import gql from 'graphql-tag';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetAllChannelsForAppQuery,
@@ -10,6 +10,7 @@ import {
 } from '../../graphql/generated';
 import Log from '../../log';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import formatFields from '../../utils/formatFields';
 import { logChannelDetails } from './view';
 
 const CHANNEL_LIMIT = 10_000;
@@ -63,7 +64,7 @@ async function getAllUpdateChannelForAppAsync({
   );
 }
 
-export default class ChannelList extends Command {
+export default class ChannelList extends EasCommand {
   static hidden = true;
   static description = 'List all channels on the current project.';
 
@@ -74,15 +75,12 @@ export default class ChannelList extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       flags: { json: jsonFlag },
     } = this.parse(ChannelList);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
@@ -99,9 +97,14 @@ export default class ChannelList extends Command {
       return;
     }
 
-    Log.log(); // spacing
     for (const channel of channels) {
-      Log.log(`Details of channel ${chalk.bold(chalk.cyan(channel.name))}:`);
+      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,7 +1,8 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import chalk from 'chalk';
 
+import EasCommand from '../../commandUtils/EasCommand';
 import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
 import Log from '../../log';
 import {
@@ -37,9 +38,7 @@ async function promptForRolloutPercentAsync({
   return rolloutPercent;
 }
 
-function getRolloutInfo(
-  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery
-): {
+function getRolloutInfo(getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery): {
   newBranch: Pick<UpdateBranch, 'name' | 'id'>;
   oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
   currentPercent: number;
@@ -48,12 +47,14 @@ function getRolloutInfo(
     getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
   );
   const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
-  const newBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
-    branch => branch.id === newBranchId
-  )[0];
-  const oldBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
-    branch => branch.id === oldBranchId
-  )[0];
+  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(
@@ -140,9 +141,10 @@ async function startRolloutAsync({
     branchMapping: JSON.stringify(newBranchMapping),
   });
 
-  const oldBranch = getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.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}"`
@@ -304,7 +306,7 @@ async function endRolloutAsync({
   return { newChannelInfo, logMessage };
 }
 
-export default class ChannelRollout extends Command {
+export default class ChannelRollout extends EasCommand {
   static hidden = true;
   static description = 'Rollout a new branch out to a channel incrementally.';
 
@@ -335,7 +337,7 @@ export default class ChannelRollout extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     const {
       args: { channel: channelName },
       flags: { json: jsonFlag, end: endFlag },
@@ -344,10 +346,7 @@ export default class ChannelRollout extends Command {
       flags: { branch: branchName, percent },
     } = this.parse(ChannelRollout);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);

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

@@ -1,21 +1,18 @@
 import { getConfig } from '@expo/config';
-import { Command, flags } from '@oclif/command';
+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 { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetChannelByNameForAppQuery,
   GetChannelByNameForAppQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
-import {
-  findProjectRootAsync,
-  getProjectFullNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import {
   FormatUpdateParameter,
@@ -23,6 +20,7 @@ import {
   formatUpdate,
   getPlatformsForGroup,
 } from '../../update/utils';
+import formatFields from '../../utils/formatFields';
 
 export type BranchMapping = {
   version: number;
@@ -40,9 +38,11 @@ export type BranchMapping = {
  * Get the branch mapping and determine whether it is a rollout.
  * Ensure that the branch mapping is properly formatted.
  */
-export function getBranchMapping(
-  branchMappingString?: string
-): { branchMapping: BranchMapping; isRollout: boolean; rolloutPercent?: number } {
+export function getBranchMapping(branchMappingString?: string): {
+  branchMapping: BranchMapping;
+  isRollout: boolean;
+  rolloutPercent?: number;
+} {
   if (!branchMappingString) {
     throw new Error('Missing branch mapping.');
   }
@@ -190,7 +190,7 @@ export function logChannelDetails(channel: {
   Log.log(table.toString());
 }
 
-export default class ChannelView extends Command {
+export default class ChannelView extends EasCommand {
   static hidden = true;
   static description = 'View a channel on the current project.';
 
@@ -209,18 +209,14 @@ export default class ChannelView extends Command {
     }),
   };
 
-  async run() {
+  async runAsync(): Promise<void> {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },
     } = this.parse(ChannelView);
 
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
     const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
-    const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {
@@ -250,9 +246,15 @@ export default class ChannelView extends Command {
       return;
     }
 
-    Log.withTick(
-      chalk`Channel: {bold ${channel.name}} on project {bold ${fullName}}. Channel ID: {bold ${channel.id}}`
+    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:}`
     );

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

@@ -0,0 +1,70 @@
+import { getProjectConfigDescription } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+import { flags } from '@oclif/command';
+
+import EasCommand from '../commandUtils/EasCommand';
+import Log from '../log';
+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 = 'show the eas.json config';
+
+  static flags = {
+    platform: flags.enum({ char: 'p', options: ['android', 'ios'] }),
+    profile: flags.string(),
+  };
+
+  protected requiresAuthentication = false;
+
+  async runAsync(): Promise<void> {
+    const { flags } = this.parse(Config);
+    const { platform: maybePlatform, profile: maybeProfile } = flags as {
+      platform?: Platform;
+      profile?: string;
+    };
+
+    const projectDir = await findProjectRootAsync();
+    await handleDeprecatedEasJsonAsync(projectDir, false);
+
+    const reader = new EasJsonReader(projectDir);
+    const profileName =
+      maybeProfile ??
+      (await selectAsync(
+        'Select build profile',
+        (
+          await reader.getBuildProfileNamesAsync()
+        ).map(profileName => ({
+          title: profileName,
+          value: profileName,
+        }))
+      ));
+    const platform =
+      maybePlatform ??
+      (await selectAsync('Select platform', [
+        {
+          title: 'Android',
+          value: Platform.ANDROID,
+        },
+        {
+          title: 'iOS',
+          value: Platform.IOS,
+        },
+      ]));
+
+    const profile = await reader.readBuildProfileAsync(platform, profileName);
+    const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
+
+    Log.log(getProjectConfigDescription(projectDir));
+    Log.newLine();
+    Log.log(JSON.stringify(config, null, 2));
+    Log.newLine();
+    Log.newLine();
+    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,14 +1,16 @@
-import { Command } from '@oclif/command';
-
-import { CredentialsManager } from '../credentials/CredentialsManager';
-import { createCredentialsContextAsync } from '../credentials/context';
+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 Command {
-  static description = 'Manage your credentials';
+export default class Credentials extends EasCommand {
+  static description = 'manage your credentials';
 
-  async run() {
-    const ctx = await createCredentialsContextAsync(process.cwd(), {});
-    new CredentialsManager(ctx).runActionAsync(new SelectPlatform());
+  async runAsync(): Promise<void> {
+    const ctx = new CredentialsContext({
+      projectDir: process.cwd(),
+      user: await ensureLoggedInAsync(),
+    });
+    await new SelectPlatform().runAsync(ctx);
   }
 }

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

@@ -1,17 +1,16 @@
-import { Command } from '@oclif/command';
-
+import EasCommand from '../../commandUtils/EasCommand';
 import AppStoreApi from '../../credentials/ios/appstore/AppStoreApi';
-import { createContext } from '../../devices/context';
+import { createContextAsync } from '../../devices/context';
 import DeviceManager from '../../devices/manager';
 import { ensureLoggedInAsync } from '../../user/actions';
 
-export default class DeviceCreate extends Command {
+export default class DeviceCreate extends EasCommand {
   static description = 'register new Apple Devices to use for internal distribution';
 
-  async run() {
+  async runAsync(): Promise<void> {
     const user = await ensureLoggedInAsync();
 
-    const ctx = await createContext({ appStore: new AppStoreApi(), user });
+    const ctx = await createContextAsync({ appStore: new AppStoreApi(), user });
     const manager = new DeviceManager(ctx);
     await manager.createAsync();
   }