[eas-cli] Pass through platform to export command

* [eas-json] add XCode 14 image

* bump eas-build-job version

* fix eas.schema.json

* update default and latest images

* update eas-build-job package

* update CHANGELOG.md

.eslintrc.js

@@ -1,16 +1,9 @@
 module.exports = {
   root: true,
   extends: ['universe/node'],
-  overrides: [
-    {
-      files: ['**/__tests__/*'],
-    },
-  ],
-  globals: {
-    jasmine: false,
-  },
+  plugins: ['async-protect', 'node'],
   rules: {
-    'no-console':'warn',
+    'no-console': 'warn',
     'no-constant-condition': ['warn', { checkLoops: false }],
     'sort-imports': [
       'warn',
@@ -18,12 +11,40 @@ module.exports = {
         ignoreDeclarationSort: true,
       },
     ],
-    'flowtype/no-types-missing-file-annotation': 'off',
-    'curly': 'warn',
+    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!",
+          },
+        ],
+      },
+    ],
+    '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

@@ -1 +1,2 @@
+* text eol=lf
 **/yarn.lock linguist-generated

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,58 @@
+name: "\U0001F41B Bug Report in EAS CLI"
+labels: 'needs review'
+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: input
+    attributes:
+      label: Build/Submit details page URL
+      description: If you're reporting an issue with EAS Build and/or EAS Submit, please provide the URL to the details page URL. The page can be only viewed by the Expo team members. Providing the URL is optional but it makes debugging the issue easier.
+      placeholder: https://expo.dev/accounts/ACCOUNT_NAME/projects/PROJECT_NAME/builds/BUILD_ID
+  - type: textarea
+    validations:
+      required: true
+    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: input
+    validations:
+      required: true
+    attributes:
+      label: Managed or bare?
+      description: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project. See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: Environment
+      description: Run `npx expo-env-info` and `expo doctor`, 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,needs review'
+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,8 +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 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).
+- [ ] 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.
 
 # 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@v2
+        with:
+          node-version: 18
+      - 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" | sed -e 's/^[[:space:]]*//' )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          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/install.yml

@@ -1,18 +0,0 @@
-name: Installer tests
-on:
-  push:
-    branches: [main]
-  pull_request:
-    types: [opened, synchronize]
-
-jobs:
-  test:
-    name: Run the installer
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
-    steps:
-      - uses: actions/checkout@v2
-      - run: bash bin/install.sh
-      - run: eas --version

.github/workflows/issue-triage.yml

@@ -0,0 +1,146 @@
+name: Issue Triage
+on:
+  issues:
+    types: [labeled]
+
+jobs:
+  needs-repro:
+    runs-on: ubuntu-20.04
+    if: "${{ contains(github.event.label.name, 'incomplete issue: missing or invalid repro') }}"
+    steps:
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Hi there! It looks like your issue requires a minimal reproducible example, but it is invalid or absent. Please prepare such an example and share it in a new issue.
+
+              **The best way to get attention to your issue is to provide a clean and easy way for a developer to reproduce the issue on their own machine.** Please do not provide your entire project, or a project with more code than is necessary to reproduce the issue.
+
+              A side benefit of going through the process of narrowing down the minimal amount of code needed to reproduce the issue is that you may get lucky and discover that the bug is due to a mistake in your application code that you can quickly fix on your own.
+
+              ### Resources
+
+              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
+              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
+
+              ### Common concerns
+
+              #### "I've only been able to reproduce it in private, proprietary code"
+
+              You may not have spent enough time narrowing down the root cause of the issue. Try out the techniques discussed in this [manual debugging guide](https://expo.fyi/manual-debugging) to learn how to isolate the problem from the rest of your codebase.
+
+              #### "I didn't have time to create one"
+
+              That's understandable, it can take some time to prepare. We ask that you hold off on filing an issue until you are able to fully complete the required fields in the issue template.
+
+              #### "You can reproduce it by yourself by creating a project and following these steps"
+
+              This is useful knowledge, but it's still valuable to have the resulting project that is produced from running the steps, where you have verified you can reproduce the issue.
+            `})
+            github.issues.update({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'closed'
+            })
+
+  needs-info:
+    runs-on: ubuntu-20.04
+    if: "${{ contains(github.event.label.name, 'incomplete issue: missing info') }}"
+    steps:
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Hello! There isn't enough information provided in your issue description for us to be able to help you. The best way to get help is to provide information to enable other developers to understand the issue and reproduce it on their own machines.
+
+              Please create a new issue and fill out the entire issue template to the best of your ability. Refer to the following resources for more information on how to create a good issue report.
+
+              ### Resources
+
+              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
+              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
+              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
+            `})
+            github.issues.update({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'closed'
+            })
+
+  issue-accepted:
+    runs-on: ubuntu-20.04
+    if: github.event.label.name == 'issue accepted'
+    steps:
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Thank you for filing this issue!
+              This comment acknowledges we believe this may be a bug and there’s enough information to investigate it.
+              However, we can’t promise any sort of timeline for resolution. We prioritize issues based on severity, breadth of impact, and alignment with our roadmap. If you’d like to help move it more quickly, you can continue to investigate it more deeply and/or you can open a pull request that fixes the cause.
+            `})
+
+  question:
+    runs-on: ubuntu-20.04
+    if: "${{ contains(github.event.label.name, 'invalid issue: question') }}"
+    steps:
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Hello! Our GitHub issues are reserved for bug reports.
+
+              If you have a question about Expo or related tools, please post on our forums at https://forums.expo.dev/ or join our Discord at https://chat.expo.dev/.
+
+              ### Resources
+
+              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
+              - ["Join the community"](https://docs.expo.dev/next-steps/community/)
+            `})
+            github.issues.update({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'closed'
+            })
+
+  feature-request:
+    runs-on: ubuntu-20.04
+    if: "${{ contains(github.event.label.name, 'invalid issue: feature request') }}"
+    steps:
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: `Hello! Our GitHub issues are reserved for bug reports.
+
+              If you would like to request a feature, please post to https://expo.canny.io/feature-requests.
+            `})
+            github.issues.update({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'closed'
+            })

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

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

.github/workflows/stale-issues.yml

@@ -0,0 +1,24 @@
+name: Close inactive issues
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          ascending: false
+          operations-per-run: 300
+          days-before-issue-stale: 30
+          days-before-issue-close: 7
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity. If there is no activity in the next 7 days, the issue will be closed."
+          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale. Please open a new issue if you believe you are encountering a related problem."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          enable-statistics: true
+          exempt-issue-labels: "needs review"
+          exempt-all-assignees: true

.github/workflows/test-scripts.yml

@@ -0,0 +1,26 @@
+name: Test scripts
+
+defaults:
+  run:
+    working-directory: scripts
+
+on:
+  push:
+    branches: [main]
+    paths:
+      - 'scripts/**'
+  pull_request:
+    paths:
+      - 'scripts/**'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 18
+      - run: yarn install --frozen-lockfile --check-files
+      - run: yarn typecheck

.github/workflows/test.yml

@@ -10,15 +10,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['12', '14']
+        node: ['14', '16', '18']
         include:
-          - node: '14'
+          - node: '18'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files
@@ -27,8 +27,11 @@ jobs:
         if: ${{ !matrix.coverage }}
       - run: yarn test --coverage
         if: ${{ matrix.coverage }}
+        env:
+          # Oclif seems to cause OOM errors when testing with coverage enabled.
+          # Remove this whenever we solved those OOM errors.
+          NODE_OPTIONS: --max-old-space-size=4096
       - run: yarn lint --max-warnings=0
-      - run: shellcheck bin/*.sh
       - uses: codecov/codecov-action@v1
         if: ${{ matrix.coverage }}
         with:

.gitignore

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

.prettierrc

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

CHANGELOG.md

@@ -6,19 +6,907 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- Allow publishing of multiple update groups ([#566](https://github.com/expo/eas-cli/pull/566) by [@jkhales](https://github.com/jkhales))
+- Prompt before configuring EAS project. ([#1356](https://github.com/expo/eas-cli/pull/1356) by [@wschurman](https://github.com/wschurman))
+
+### 🎉 New features
+
+- Add `-e` as a shortcut for `--profile` flag. ([#1342](https://github.com/expo/eas-cli/pull/1342) by [@szdziedzic](https://github.com/szdziedzic))
+- Support JSON5 in **eas.json**. ([#1350](https://github.com/expo/eas-cli/pull/1350) by [@dsokal](https://github.com/dsokal))
+- Add pagination and interactivity to update commands. ([#1323](https://github.com/expo/eas-cli/pull/1323) by [@kgc00](https://github.com/kgc00))
+- Add support for uploading files to EAS Secret. ([#1354](https://github.com/expo/eas-cli/pull/1354) by [@dsokal](https://github.com/dsokal))
+- Add pagination to channel commands. ([#1352](https://github.com/expo/eas-cli/pull/1352) by [@kgc00](https://github.com/kgc00))
+- Add pagination to build commands. ([#1353](https://github.com/expo/eas-cli/pull/1353) by [@kgc00](https://github.com/kgc00))
+- Provide suggestions for developers when archive size is large. ([#1363](https://github.com/expo/eas-cli/pull/1363) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+- Standardize the GQL 'Update' schema using UpdateFragmentNode. ([#1348](https://github.com/expo/eas-cli/pull/1348) by [@kgc00](https://github.com/kgc00))
+- Remove 'owner' app config field dependency. ([#1368](https://github.com/expo/eas-cli/pull/1368), [#1369](https://github.com/expo/eas-cli/pull/1369), [#1371](https://github.com/expo/eas-cli/pull/1371), [#1372](https://github.com/expo/eas-cli/pull/1372), [#1373](https://github.com/expo/eas-cli/pull/1373), by [@wschurman](https://github.com/wschurman))
+- Add Xcode 14 image. ([#1365](https://github.com/expo/eas-cli/pull/1365) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [2.1.0](https://github.com/expo/eas-cli/releases/tag/v2.1.0) - 2022-09-05
+
+### 🎉 New features
+
+- Add tvOS credentials compatibility for Adhoc and App store builds. ([#1325](https://github.com/expo/eas-cli/pull/1325) by [@quinlanj](https://github.com/quinlanj))
+- Add `eas open` command for opening project page in web browser. ([#1337](https://github.com/expo/eas-cli/pull/1337) by [@dsokal](https://github.com/dsokal))
+- Add support for buildArtifactPaths. Rename artifactPath to applicationArchivePath. ([#1321](https://github.com/expo/eas-cli/pull/1321) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix viewing branch list when a branch has no associated platforms. ([#1326](https://github.com/expo/eas-cli/pull/1326) by [@hbiede](https://github.com/hbiede))
+- Fix description of `help` command in help prompt. ([#1341](https://github.com/expo/eas-cli/pull/1341) by [@Simek](https://github.com/Simek))
+- Resolve paths from the root when checking for gitignored values. ([#1336](https://github.com/expo/eas-cli/pull/1336) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add noImplicitOverride to tsconfigs. ([#1327](https://github.com/expo/eas-cli/pull/1327) by [@wschurman](https://github.com/wschurman))
+- Fix typos. ([#1340](https://github.com/expo/eas-cli/pull/1340) by [@hbiede](https://github.com/hbiede))
+
+## [2.0.0](https://github.com/expo/eas-cli/releases/tag/v2.0.0) - 2022-09-01
+
+### 🛠 Breaking changes
+
+- Fix typo in `cli.promptToConfigurePushNotifications` field in **eas.json**. EAS CLI will throw an error if the old field name is in **eas.json**. ([#1332](https://github.com/expo/eas-cli/pull/1332) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix dynamic config update warning. ([#1322](https://github.com/expo/eas-cli/pull/1322) by [@wschurman](https://github.com/wschurman))
+
+## [1.2.0](https://github.com/expo/eas-cli/releases/tag/v1.2.0) - 2022-08-29
+
+### 🎉 New features
+
+- Add 2022 Apple capabilities. ([#1307](https://github.com/expo/eas-cli/pull/1307) by [@EvanBacon](https://github.com/EvanBacon))
+- Print warning when eas-cli is installed as project dependency. ([#1310](https://github.com/expo/eas-cli/pull/1310) by [@dsokal](https://github.com/dsokal))
+- Add eas.json to skip push notifications credentials setup. ([#1315](https://github.com/expo/eas-cli/pull/1315) by [@dsokal](https://github.com/dsokal))
+- Warn about EAS outages when running `build`, `submit`, and `update` commands. ([#1312](https://github.com/expo/eas-cli/pull/1312) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+- Replace promptToCreateProjectIfNotExistsAsync with getProjectIdAsync. ([#1303](https://github.com/expo/eas-cli/pull/1303) by [@wschurman](https://github.com/wschurman))
+- Use AppQuery instead of ProjectQuery. ([#1304](https://github.com/expo/eas-cli/pull/1304) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Improve instructions on setting `extra.eas.projectId` in app configuration. ([#1316](https://github.com/expo/eas-cli/pull/1316) by [@dsokal](https://github.com/dsokal))
+- Improve copy in EAS Submit - "e-mail" -> email, and make the link to app on App Store go directly to the TestFlight tab. ([#1318](https://github.com/expo/eas-cli/pull/1318) by [@brentvatne](https://github.com/brentvatne))
+
+## [1.1.1](https://github.com/expo/eas-cli/releases/tag/v1.1.1) - 2022-08-23
+
+### 🎉 New features
+
+- Add support for `autoIncrement` option at the root of the build profile. ([#1298](https://github.com/expo/eas-cli/pull/1298) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🐛 Bug fixes
+
+- Handle trailing backslash in `.gitignore`. ([#1306](https://github.com/expo/eas-cli/pull/1306) by [@wkozyra95](https://github.com/wkozyra95))
+- Retry ASC Api Key downloads if it has not fully propagated on Apple's infrastructure. ([#1302](https://github.com/expo/eas-cli/pull/1302) by [@quinlanj](https://github.com/quinlanj))
+
+## [1.1.0](https://github.com/expo/eas-cli/releases/tag/v1.1.0) - 2022-08-23
+
+### 🎉 New features
+
+- Add support for passing platform flag to `credentials` command. ([#1277](https://github.com/expo/eas-cli/pull/1277) by [@Simek](https://github.com/Simek))
+
+### 🐛 Bug fixes
+
+- Prevent throwing dynamic app config write error when configuring project ID. ([#1301](https://github.com/expo/eas-cli/pull/1301) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove unused dependency and devDependency from the CLI. ([#1297](https://github.com/expo/eas-cli/pull/1297) by [@Simek](https://github.com/Simek))
+
+## [1.0.0](https://github.com/expo/eas-cli/releases/tag/v1.0.0) - 2022-08-22
+
+### 🛠 Breaking changes
+
+- Remove timeout when waiting for build / submission. ([#1289](https://github.com/expo/eas-cli/pull/1289) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add metadata support for dynamic store.config.js files. ([#1270](https://github.com/expo/eas-cli/pull/1270) by [@byCedric](https://github.com/byCedric))
+- Improve reliability of update asset presigned upload requests. ([#1278](https://github.com/expo/eas-cli/pull/1278) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Rebind `console.info` correctly after `ora` instance stops. ([#1113](https://github.com/expo/eas-cli/pull/1113) by [@EvanBacon](https://github.com/EvanBacon))
+- Fix initializing git repository in monorepo. ([#1279](https://github.com/expo/eas-cli/pull/1279) by [@dsokal](https://github.com/dsokal))
+- Limit the number of SignedAssetUploadSpecifications fetched at a time. ([#1287](https://github.com/expo/eas-cli/pull/1287) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove unused install script. ([#1280](https://github.com/expo/eas-cli/pull/1280), [#1281](https://github.com/expo/eas-cli/pull/1281) by [@wkozyra95](https://github.com/wkozyra95))
+- Remove "please" from output ([#1250](https://github.com/expo/eas-cli/pull/1250) by [@jonsamp](https://github.com/jonsamp))
+
+## [0.60.0](https://github.com/expo/eas-cli/releases/tag/v0.60.0) - 2022-08-12
+
+### 🎉 New features
+
+- Add `appVersion` runtime policy. ([#1267](https://github.com/expo/eas-cli/pull/1267) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add JSON Schema `metadataPath` to iOS submission profile. ([#1269](https://github.com/expo/eas-cli/pull/1269) by [@byCedric](https://github.com/byCedric))
+- Add warning when `appVersion` runtime policy is not supported. ([#1271](https://github.com/expo/eas-cli/pull/1271) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.59.0](https://github.com/expo/eas-cli/releases/tag/v0.59.0) - 2022-08-10
+
+### 🐛 Bug fixes
+
+- Fix building Android projects locally that don't have execute permissions set for `gradlew`. ([82231](https://github.com/expo/eas-cli/commit/822313e90e94bd6ddd3872061a0c25a8aa4db7cd) by [@dsokal](https://github.com/dsokal))
+- Disable `nativeVersion` policy only for remote version source. ([#1261](https://github.com/expo/eas-cli/pull/1261) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Improve wording on version auto-increment. ([#1260](https://github.com/expo/eas-cli/pull/1260) by [@wkozyra95](https://github.com/wkozyra95))
+- Upgrade dependencies. ([#1262](https://github.com/expo/eas-cli/pull/1262) by [@dsokal](https://github.com/dsokal))
+
+## [0.58.0](https://github.com/expo/eas-cli/releases/tag/v0.58.0) - 2022-08-09
+
+### 🎉 New features
+
+- Managed app versions support. ([#1209](https://github.com/expo/eas-cli/pull/1209), [#1219](https://github.com/expo/eas-cli/pull/1219), [#1232](https://github.com/expo/eas-cli/pull/1232) by [@wkozyra95](https://github.com/wkozyra95))
+- Add a warning when publishing an update with too many assets. ([#1243](https://github.com/expo/eas-cli/pull/1243) by [@kgc00](https://github.com/kgc00))
+- Add submission info when building with `--json` option. ([#1246](https://github.com/expo/eas-cli/pull/1246) by [@wkozyra95](https://github.com/wkozyra95))
+- Set all environment variables (documented in https://docs.expo.dev/build-reference/variables/) when running local build. ([#1256](https://github.com/expo/eas-cli/pull/1256) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Do not include sources in `eas-json` npm package. ([#1248](https://github.com/expo/eas-cli/pull/1248) by [@wkozyra95](https://github.com/wkozyra95))
+- Swallow error when unable to track file in no commit workflow. ([#1109](https://github.com/expo/eas-cli/pull/1109) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.57.0](https://github.com/expo/eas-cli/releases/tag/v0.57.0) - 2022-08-03
+
+### 🎉 New features
+
+- Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
+- Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
+- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
+
+## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
+
+### 🎉 New features
+
+- Display build queue type when waiting. ([#1217](https://github.com/expo/eas-cli/pull/1217) by [@dsokal](https://github.com/dsokal))
+- Add better message on how to upgrade EAS CLI. ([#1222](https://github.com/expo/eas-cli/pull/1222) by [@jeremybarbet](https://github.com/jeremybarbet), [#1231](https://github.com/expo/eas-cli/pull/1231) by [@wkozyra95](https://github.com/wkozyra95))
+- Invoke export with sourcemaps on update. ([#1228](https://github.com/expo/eas-cli/pull/1228) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🐛 Bug fixes
+
+- Show spinner instead of silently timing out during asset upload. ([#1206](https://github.com/expo/eas-cli/pull/1206) by [@wschurman](https://github.com/wschurman))
+- Fix build archive S3 URLs. ([#1207](https://github.com/expo/eas-cli/pull/1207) by [@dsokal](https://github.com/dsokal))
+- `autoIncrement` option on iOS will update versions of all targets that depend on an application target. ([#1219](https://github.com/expo/eas-cli/pull/1219) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Increase max number of chained "extends" in build profiles. ([#1208](https://github.com/expo/eas-cli/pull/1208) by [@wkozyra95](https://github.com/wkozyra95))
+- Change wording on build warning for bundle id/package name. ([#1211](https://github.com/expo/eas-cli/pull/1211) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+## [0.55.1](https://github.com/expo/eas-cli/releases/tag/v0.55.1) - 2022-07-12
+
+### 🐛 Bug fixes
+
+- Fix asset upload crash. ([#1205](https://github.com/expo/eas-cli/pull/1205) by [@wschurman](https://github.com/wschurman))
+
+## [0.55.0](https://github.com/expo/eas-cli/releases/tag/v0.55.0) - 2022-07-11
+
+### 🎉 New features
+
+- Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00/))
+- Allow users to skip metadata validation. ([#1175](https://github.com/expo/eas-cli/pull/1175) by [@byCedric](https://github.com/byCedric))
+- Add experimental `--resource-class` flag for Build commands. ([#1138](https://github.com/expo/eas-cli/pull/1138) by [@christopherwalter](https://github.com/christopherwalter))
+- Truncate long messages for `eas update` command, rather than failing. ([#1178](https://github.com/expo/eas-cli/pull/1178) by [@kgc00](https://github.com/kgc00))
+- Add review details to metadata store configuration. ([#1184](https://github.com/expo/eas-cli/pull/1184) by [@byCedric](https://github.com/byCedric))
+- Override applicationId via env. ([#1203](https://github.com/expo/eas-cli/pull/1203) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix submission archive URLs. ([#1179](https://github.com/expo/eas-cli/pull/1179) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Update validation rules for metadata info locales. ([#1174](https://github.com/expo/eas-cli/pull/1174) by [@byCedric](https://github.com/byCedric))
+- Improve store configuration defaults and schema documentation. ([#1183](https://github.com/expo/eas-cli/pull/1183) by [@byCedric](https://github.com/byCedric))
+- Improve store config categories configuration. ([#1187](https://github.com/expo/eas-cli/pull/1187) by [@byCedric](https://github.com/byCedric))
+- Remove deprecated idfa and price tier from store config. ([#1193](https://github.com/expo/eas-cli/pull/1193) by [@byCedric](https://github.com/byCedric))
+
+## [0.54.1](https://github.com/expo/eas-cli/releases/tag/v0.54.1) - 2022-06-15
+
+### 🎉 New features
+
+- Add App Store Connect link after `eas metadata:push`. ([#1168](https://github.com/expo/eas-cli/pull/1168) by [@byCedric](https://github.com/byCedric))
+
+### 🐛 Bug fixes
+
+- Surface ASC errors in metadata for normal API rejections. ([#1167](https://github.com/expo/eas-cli/pull/1167) by [@byCedric](https://github.com/byCedric))
+- Add metadata schema to bundled eas-cli package. ([#1166](https://github.com/expo/eas-cli/pull/1166) by [@byCedric](https://github.com/byCedric))
+
+## [0.54.0](https://github.com/expo/eas-cli/releases/tag/v0.54.0) - 2022-06-15
+
+### 🛠 Breaking changes
+
+- Remove fallback for legacy format in `eas.json`. ([#1158](https://github.com/expo/eas-cli/pull/1158), [#1163](https://github.com/expo/eas-cli/pull/1163) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- `eas update` now provides more information about the publish process including real-time feedback on asset uploads, update ids, and website links. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
+- Added first beta of `eas metadata` to sync store information using store configuration files ([#1136](https://github.com/expo/eas-cli/pull/1136) by [@bycedric](https://github.com/bycedric))
+
+### 🐛 Bug fixes
+
+- Improved support for working on branches with many updates. ([#1144](https://github.com/expo/eas-cli/pull/1144), [#1148](https://github.com/expo/eas-cli/pull/1148) by [@kgc00](https://github.com/kgc00/))
+- `eas update` project links no longer contain a `)` on unsupported terminals. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
+
+### 🧹 Chores
+
+- Update `eas-build-job`. ([#1162](https://github.com/expo/eas-cli/pull/1162) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.53.1](https://github.com/expo/eas-cli/releases/tag/v0.53.1) - 2022-06-07
+
+### 🐛 Bug fixes
+
+- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119) by [@kgc00](https://github.com/kgc00/))
+
+### 🧹 Chores
+
+- Display project archive docs before compressing/uploading to EAS Build. ([#1127](https://github.com/expo/eas-cli/pull/1127) by [@dsokal](https://github.com/dsokal))
+- Add new common error code for submits. ([#1129](https://github.com/expo/eas-cli/pull/1129) by [@dsokal](https://github.com/dsokal))
+
+## [0.53.0](https://github.com/expo/eas-cli/releases/tag/v0.53.0) - 2022-05-30
+
+### 🛠 Breaking changes
+
+- Drop support for Node < 14. ([#1098](https://github.com/expo/eas-cli/pull/1098) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Match bundle identifier capabilities more accurately. ([#1112](https://github.com/expo/eas-cli/pull/1112) by [@EvanBacon](https://github.com/EvanBacon))
+- Limit concurrent asset uploads. ([#1153](https://github.com/expo/eas-cli/pull/1153) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Update dependencies. ([#1095](https://github.com/expo/eas-cli/pull/1095), [#1115](https://github.com/expo/eas-cli/pull/1115) by [@dsokal](https://github.com/dsokal))
+- Better spinner placement for multiple builds. ([#1105](https://github.com/expo/eas-cli/pull/1105) by [@dsokal](https://github.com/dsokal))
+- Use getExpoConfig to access config. ([#1122](https://github.com/expo/eas-cli/pull/1122) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.52.0](https://github.com/expo/eas-cli/releases/tag/v0.52.0) - 2022-04-26
+
+### 🎉 New features
+
+- Support target specific entitlements. ([#1078](https://github.com/expo/eas-cli/pull/1078) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.51.0](https://github.com/expo/eas-cli/releases/tag/v0.51.0) - 2022-04-19
+
+### 🎉 New features
+
+- Add non-interactive flag to eas update command. ([#1066](https://github.com/expo/eas-cli/pull/1066) by [@wschurman](https://github.com/wschurman))
+- Handle new EAS Submit common error - expired Apple's certificates. ([#1068](https://github.com/expo/eas-cli/pull/1068) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Enable full bundling logging for eas update when debugging. ([#1070](https://github.com/expo/eas-cli/pull/1070) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Upgrade `@expo/[email protected]` (now with license). ([#1064](https://github.com/expo/eas-cli/pull/1064) by [@EvanBacon](https://github.com/EvanBacon))
+- Unify Google Service Account key prompts. ([#1063](https://github.com/expo/eas-cli/pull/1063) by [@dsokal](https://github.com/dsokal))
+
+## [0.50.0](https://github.com/expo/eas-cli/releases/tag/v0.50.0) - 2022-04-11
+
+### 🎉 New features
+
+- Provide queue position progress and estimated wait time. ([#1049](https://github.com/expo/eas-cli/pull/1049), [#1058](https://github.com/expo/eas-cli/pull/1058) by [@dsokal](https://github.com/dsokal))
+- Enable App Store authentication for ASC Api Keys with environment variables. ([#1051](https://github.com/expo/eas-cli/pull/1051) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Prompt for user/password authentication where required. ([#1055](https://github.com/expo/eas-cli/pull/1055) by [@quinlanj](https://github.com/quinlanj))
+- Require private-key-path to be specified for updating when code signing configured. ([#1059](https://github.com/expo/eas-cli/pull/1059) by [@wschurman](https://github.com/wschurman))
+
+## [0.49.0](https://github.com/expo/eas-cli/releases/tag/v0.49.0) - 2022-04-05
+
+### 🎉 New features
+
+- Added experimental App Store Connect API provisioning profile regeneration. ([#1038](https://github.com/expo/eas-cli/pull/1038) by [@EvanBacon](https://github.com/EvanBacon))
+- Experimental support for iOS App Extensions in managed projects. ([#1039](https://github.com/expo/eas-cli/pull/1039) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix proxy support. ([#1032](https://github.com/expo/eas-cli/pull/1032) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add annotations regarding App Store Connect Token session support. ([#1029](https://github.com/expo/eas-cli/pull/1029) by [@EvanBacon](https://github.com/EvanBacon))
+- Upgrade dependencies. ([#1043](https://github.com/expo/eas-cli/pull/1043) by [@dsokal](https://github.com/dsokal))
+- Make default deprecation message more generic. ([#1047](https://github.com/expo/eas-cli/pull/1047) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.2](https://github.com/expo/eas-cli/releases/tag/v0.48.2) - 2022-03-21
+
+### 🎉 New features
+
+- Add proxy support. ([#1005](https://github.com/expo/eas-cli/pull/1005) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Do not retry build requests. ([#1024](https://github.com/expo/eas-cli/pull/1024) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.1](https://github.com/expo/eas-cli/releases/tag/v0.48.1) - 2022-03-15
+
+### 🐛 Bug fixes
+
+- Fix code signing error when not yet configured. ([#1018](https://github.com/expo/eas-cli/pull/1018) by [@wschurman](https://github.com/wschurman))
+- Fix link to build details page to use `project.slug`. ([#1021](https://github.com/expo/eas-cli/pull/1021) by [@giautm](https://github.com/giautm))
+
+### 🧹 Chores
+
+- Improve apple login prompt for internal distribution builds. ([#1016](https://github.com/expo/eas-cli/pull/1016) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.0](https://github.com/expo/eas-cli/releases/tag/v0.48.0) - 2022-03-14
+
+### 🎉 New features
+
+- Add code signing. ([#964](https://github.com/expo/eas-cli/pull/964) by [@wschurman](https://github.com/wschurman))
+- Install expo-updates when running update:configure. ([#977](https://github.com/expo/eas-cli/pull/977) by [@jkhales](https://github.com/jkhales))
+- Make `update:configure` work on native files. ([#978](https://github.com/expo/eas-cli/pull/978) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Fix `"Unknown status"` error when a build is canceled. ([#1012](https://github.com/expo/eas-cli/pull/1012) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add error message when package.json is outside git repository. ([#971](https://github.com/expo/eas-cli/pull/971) by [@wkozyra95](https://github.com/wkozyra95))
+- Make runtime version policy warning on the update command more descriptive. ([#979](https://github.com/expo/eas-cli/pull/979) by [@kbrandwijk](https://github.com/kbrandwijk))
+- Remove unused flag. ([#995](https://github.com/expo/eas-cli/pull/995) by [@wkozyra95](https://github.com/wkozyra95))
+- Replace `got` with `node-fetch`. ([#1000](https://github.com/expo/eas-cli/pull/1000) by [@wkozyra95](https://github.com/wkozyra95))
+- Upgrade dependencies. ([#1015](https://github.com/expo/eas-cli/pull/1015) by [@dsokal](https://github.com/dsokal))
+
+## [0.47.0](https://github.com/expo/eas-cli/releases/tag/v0.47.0) - 2022-02-08
+
+### 🐛 Bug fixes
+
+- Return informative error when running `eas channel:rollout` with a channel that does not exist. ([#930](https://github.com/expo/eas-cli/pull/930) by [@jkhales](https://github.com/jkhales))
+- Check if `expo-updates` is installed before publish. ([#953](https://github.com/expo/eas-cli/pull/953) by [@jkhales](https://github.com/jkhales))
+
+### 🧹 Chores
+
+- Upgrade dependencies. ([#946](https://github.com/expo/eas-cli/pull/946) by [@dsokal](https://github.com/dsokal))
+
+## [0.46.0](https://github.com/expo/eas-cli/releases/tag/v0.46.0) - 2022-01-26
+
+### 🛠 Breaking changes
+
+- Drop support for building iOS builds on macOS Catalina. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix URL placeholder for iOS submits. ([#941](https://github.com/expo/eas-cli/pull/941) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Unify EAS command descriptions style. ([#925](https://github.com/expo/eas-cli/pull/925) by [@dsokal](https://github.com/dsokal))
+- Upgrade dependencies. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
+
+## [0.45.1](https://github.com/expo/eas-cli/releases/tag/v0.45.1) - 2022-01-19
+
+### 🎉 New features
+
+- Add json output for started builds when using `--no-wait`. ([#921](https://github.com/expo/eas-cli/pull/921) by [@kbrandwijk](https://github.com/kbrandwijk))
+- Add support to `eas build` for specifying a custom `prebuildCommand` in `eas.json`. ([#919](https://github.com/expo/eas-cli/pull/919) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🧹 Chores
+
+- Add macOS Monterey image. ([#922](https://github.com/expo/eas-cli/pull/922) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.45.0](https://github.com/expo/eas-cli/releases/tag/v0.45.0) - 2022-01-18
+
+### 🎉 New features
+
+- Add `eas device:delete`. ([#890](https://github.com/expo/eas-cli/pull/890) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🧹 Chores
+
+- Upgrade dependencies. ([#872](https://github.com/expo/eas-cli/pull/872) by [@dsokal](https://github.com/dsokal))
+
+## [0.44.1](https://github.com/expo/eas-cli/releases/tag/v0.44.1) - 2022-01-11
+
+### 🐛 Bug fixes
+
+- Fix build:configure expo-updates configuration to only run on generic projects. ([#904](https://github.com/expo/eas-cli/pull/904) by [@brentvatne](https://github.com/brentvatne))
+
+### 🧹 Chores
+
+- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot) + [@dsokal](https://github.com/dsokal))
+- Replace `@expo/plugin-autocomplete` with `@oclif/plugin-autocomplete`. Upgrade oclif deps. ([#903](https://github.com/expo/eas-cli/pull/903) by [@dsokal](https://github.com/dsokal))
+
+## [0.44.0](https://github.com/expo/eas-cli/releases/tag/v0.44.0) - 2022-01-11
+
+### 🛠 Breaking changes
+
+- No longer enable APNS (iOS Push Notifications) capability by default anymore. ([#797](https://github.com/expo/eas-cli/pull/797) by [@EvanBacon](https://github.com/EvanBacon))
+- Don't configure Android projects locally. Clean up old Gradle signing config. Streamline `expo-updates` configuration. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add `update:list` command. ([#884](https://github.com/expo/eas-cli/pull/884) by [@jkhales](https://github.com/jkhales))
+- Improve error message for outdated Apple PLA error. ([#889](https://github.com/expo/eas-cli/pull/889) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `--output` flag to the build command. ([#885](https://github.com/expo/eas-cli/pull/885) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix creating project archive with symlink cycle. ([#891](https://github.com/expo/eas-cli/pull/891) by [@wkozyra95](https://github.com/wkozyra95))
+- Sign Android debug builds with the correct keystore. Previously, all debug builds would be signed with a default debug keystore. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
+
+## [0.43.0](https://github.com/expo/eas-cli/releases/tag/v0.43.0) - 2022-01-03
+
+### 🎉 New features
+
+- Add `eas channel:delete`. ([#846](https://github.com/expo/eas-cli/pull/846), [#869](https://github.com/expo/eas-cli/pull/869) by [@jkhales](https://github.com/jkhales))
+- Add `eas autocomplete`. ([#870](https://github.com/expo/eas-cli/pull/870) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix saving `build:inspect` results to project subdirectory. ([#863](https://github.com/expo/eas-cli/pull/863) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.42.4](https://github.com/expo/eas-cli/releases/tag/v0.42.4) - 2021-12-21
+
+### 🐛 Bug fixes
+
+- Add missing dependency - `@oclif/plugin-help`. ([#865](https://github.com/expo/eas-cli/pull/865) by [@dsokal](https://github.com/dsokal))
+
+## [0.42.3](https://github.com/expo/eas-cli/releases/tag/v0.42.3) - 2021-12-21
+
+### 🐛 Bug fixes
+
+- Allow select eas commands to be run outside of a project. ([#851](https://github.com/expo/eas-cli/pull/851) by [@jkhales](https://github.com/jkhales))
+
+### 🧹 Chores
+
+- Replace all oclif dependencies with `@oclif/core`. ([#858](https://github.com/expo/eas-cli/pull/858) by [@dsokal](https://github.com/dsokal))
+
+## [0.41.1](https://github.com/expo/eas-cli/releases/tag/v0.41.1) - 2021-12-16
+
+### 🎉 New features
+
+- Adds commands for EAS Update, which is now in preview for subscribers. EAS Update makes fixing small bugs and pushing quick fixes a snap in between app store submissions. It accomplishes this by allowing an end-user's app to swap out the non-native parts of their app (for example, JS, styling, and image changes) with a new update that contains bug fixes and other updates.
+  - Adds `eas update`, which can bundle and publish updates on a branch.
+  - Adds `eas branch`, which manages branches. Branches contain a list of updates and are linked to channels.
+  - Adds `eas channel`, which manages channels. Channels are specified inside builds and are linked to branches, allowing us to link specific updates with specific builds.
+  - Read more in our [feature preview docs](https://docs.expo.dev/eas-update/introduction/).
+
+### 🐛 Bug fixes
+
+- Fix `eas submit` displaying a prompt in non-interactive mode when some ASC API credentials are missing in `eas.json`. ([#841](https://github.com/expo/eas-cli/pull/841) by [@barthap](https://github.com/barthap))
+
+## [0.41.0](https://github.com/expo/eas-cli/releases/tag/v0.41.0) - 2021-12-13
+
+### 🎉 New features
+
+- Ask user to select profile if `release` does not exist. ([#829](https://github.com/expo/eas-cli/pull/829) by [@dsokal](https://github.com/dsokal))
+- Add `build:inspect` command. ([#834](https://github.com/expo/eas-cli/pull/834) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix validating tool versions in eas.json. ([#832](https://github.com/expo/eas-cli/pull/832) by [@dsokal](https://github.com/dsokal))
+- Fix submission URL. ([#845](https://github.com/expo/eas-cli/pull/845) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Warn when building managed project with SDK < 41. ([#833](https://github.com/expo/eas-cli/pull/833) by [@dsokal](https://github.com/dsokal))
+
+## [0.40.0](https://github.com/expo/eas-cli/releases/tag/v0.40.0) - 2021-12-08
+
+### 🛠 Breaking changes
+
+- [eas-cli] change eas update:publish to eas update. ([#830](https://github.com/expo/eas-cli/pull/830) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Pass build profile environment to credentials command. ([#828](https://github.com/expo/eas-cli/pull/828) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.39.0](https://github.com/expo/eas-cli/releases/tag/v0.39.0) - 2021-12-06
+
+### 🎉 New features
+
+- Set runtime version in `eas update:configure`. ([#811](https://github.com/expo/eas-cli/pull/811) by [@jkhales](https://github.com/jkhales))
+- Print project workflow in `eas diagnostics`. ([#822](https://github.com/expo/eas-cli/pull/822) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Improve error message for missing ascAppId. ([#813](https://github.com/expo/eas-cli/pull/813) by [@wkozyra95](https://github.com/wkozyra95))
+- Add `react-native` version to metadata. ([#823](https://github.com/expo/eas-cli/pull/823) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.38.3](https://github.com/expo/eas-cli/releases/tag/v0.38.3) - 2021-11-29
+
+### 🐛 Bug fixes
+
+- Print warning about outdated version to stderr. ([#805](https://github.com/expo/eas-cli/pull/805) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix Apple sign in capabilities. ([#806](https://github.com/expo/eas-cli/pull/806) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.38.2](https://github.com/expo/eas-cli/releases/tag/v0.38.2) - 2021-11-26
+
+### 🎉 New features
+
+- Add support for extending submit profiles. ([#794](https://github.com/expo/eas-cli/pull/794) by [@dsokal](https://github.com/dsokal))
+- Add command: `eas update:configure`. ([#800](https://github.com/expo/eas-cli/pull/800) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Fix reading app version and app build version of iOS projects. ([#798](https://github.com/expo/eas-cli/pull/798) by [@dsokal](https://github.com/dsokal))
+- Fix push notifications entitlements. ([#801](https://github.com/expo/eas-cli/pull/801) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.38.1](https://github.com/expo/eas-cli/releases/tag/v0.38.1) - 2021-11-25
+
+### 🐛 Bug fixes
+
+- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
+
+## [0.38.0](https://github.com/expo/eas-cli/releases/tag/v0.38.0) - 2021-11-24
+
+### 🎉 New features
+
+- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
+- Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Compute runtime version policies. ([#783](https://github.com/expo/eas-cli/pull/783), [#785](https://github.com/expo/eas-cli/pull/785) by [@jkhales](https://github.com/jkhales))
+- Fix local builds with npm < 7. ([#787](https://github.com/expo/eas-cli/pull/787) by [@dsokal](https://github.com/dsokal))
+- Override `applicationId`/`bundleIdentifier` when auto-submitting after build. ([#780](https://github.com/expo/eas-cli/pull/780) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Upgrade `typescript` to 4.5.2. Upgrade oclif dependencies. ([#781](https://github.com/expo/eas-cli/pull/781) by [@dsokal](https://github.com/dsokal))
+- Make missing `git` command error message more descriptive. ([#784](https://github.com/expo/eas-cli/pull/784) by [@dsokal](https://github.com/dsokal))
+
+## [0.37.0](https://github.com/expo/eas-cli/releases/tag/v0.37.0) - 2021-11-18
+
+### 🛠 Breaking changes
+
+- Require explicitly defined applicationId/bundleIdentifier for EAS Submit in case of bare projects consisting of multiple product flavors on Android or multiple schemes/targets on iOS. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- Auto create channel on publish. ([#766](https://github.com/expo/eas-cli/pull/766) by [@jkhales](https://github.com/jkhales))
+- Interactively configure Git `user.name` and `user.email`. ([#772](https://github.com/expo/eas-cli/pull/772) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Validate release channel in eas.json. ([#764](https://github.com/expo/eas-cli/pull/764) by [@dsokal](https://github.com/dsokal))
+- Make the missing profile error message more descriptive. ([#761](https://github.com/expo/eas-cli/pull/761) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Better error message when missing eas.json. ([#770](https://github.com/expo/eas-cli/pull/770) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.36.1](https://github.com/expo/eas-cli/releases/tag/v0.36.1) - 2021-11-15
+
+### 🐛 Bug fixes
+
+- Fix `dateformat` import issue when building with `--local` flag. ([a520d](https://github.com/expo/eas-cli/commit/a520d1750736d61d6489da6487879f35ed3deb23) by [@dsokal](https://github.com/dsokal))
+
+## [0.36.0](https://github.com/expo/eas-cli/releases/tag/v0.36.0) - 2021-11-15
+
+### 🛠 Breaking changes
+
+- Do not require manual `eas-cli-local-build-plugin` installation. An existing global installation (either with `yarn global add` or `npm install -g`) will not be used anymore. ([#753](https://github.com/expo/eas-cli/pull/753) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Use Keystore Service when `keytool` is not installed. ([#754](https://github.com/expo/eas-cli/pull/754) by [@dsokal](https://github.com/dsokal))
+- Add applicationId/bundleIdentifier fields to the submit profile. ([#765](https://github.com/expo/eas-cli/pull/765) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix auto-submitting with `--auto-submit-with-profile`. ([#748](https://github.com/expo/eas-cli/pull/748) by [@dsokal](https://github.com/dsokal))
+- Pass env from build profile when resolving entitlements. ([#751](https://github.com/expo/eas-cli/pull/751) by [@wkozyra95](https://github.com/wkozyra95))
+- Only prompt for Apple Id username if authenticating with an App Specific Password. ([#745](https://github.com/expo/eas-cli/pull/745) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Use same URL paths for local development of EAS CLI as production. ([#750](https://github.com/expo/eas-cli/pull/750) by [@ide](https://github.com/ide))
+- Grammar: Api -> API. ([#755](https://github.com/expo/eas-cli/pull/755) by [@quinlanj](https://github.com/quinlanj))
+- Add analytics for EAS Submit. ([#752](https://github.com/expo/eas-cli/pull/752) by [@quinlanj](https://github.com/quinlanj))
+- Add an 'attempt' event to build and submit analytics. ([#757](https://github.com/expo/eas-cli/pull/757) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.35.0](https://github.com/expo/eas-cli/releases/tag/v0.35.0) - 2021-11-08
+
+### 🎉 New features
+
+- Add ASC API Key generation workflow. ([#718](https://github.com/expo/eas-cli/pull/718) by [@quinlanj](https://github.com/quinlanj))
+- Add support for removal of ASC API Keys. ([#721](https://github.com/expo/eas-cli/pull/721) by [@quinlanj](https://github.com/quinlanj))
+- Allow users to assign an ASC API Key to their project. ([#719](https://github.com/expo/eas-cli/pull/719) by [@quinlanj](https://github.com/quinlanj))
+- Add setup support for ASC API Keys. ([#733](https://github.com/expo/eas-cli/pull/733) by [@quinlanj](https://github.com/quinlanj))
+- Show initiating user display name when selecting a build to submit. ([#730](https://github.com/expo/eas-cli/pull/730) by [@barthap](https://github.com/barthap))
+- Handle Apple servers maintenance error in `eas submit`. ([#738](https://github.com/expo/eas-cli/pull/738) by [@barthap](https://github.com/barthap))
+- Integrate ASC API Key with submissions workflow. ([#737](https://github.com/expo/eas-cli/pull/737) by [@quinlanj](https://github.com/quinlanj))
+- Change EAS API server domain. ([#744](https://github.com/expo/eas-cli/pull/744) by [@ide](https://github.com/ide))
+
+### 🧹 Chores
+
+- Clean up credentials prompt method. ([#728](https://github.com/expo/eas-cli/pull/728) by [@quinlanj](https://github.com/quinlanj))
+- Bump `@expo/apple-utils` to 0.0.0-alpha.26. ([#723](https://github.com/expo/eas-cli/pull/723) by [@brentvatne](https://github.com/brentvatne))
+- Grammar: replace setup with set up. ([#735](https://github.com/expo/eas-cli/pull/735) by [@quinlanj](https://github.com/quinlanj))
+- Improve VCS workflow migration experience. ([#732](https://github.com/expo/eas-cli/pull/732) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.34.1](https://github.com/expo/eas-cli/releases/tag/v0.34.1) - 2021-11-02
+
+### 🐛 Bug fixes
+
+- Don't show commit prompt in no-commit workflow after installing `expo-dev-client`. ([#722](https://github.com/expo/eas-cli/pull/722) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add App Store Connect API Key graphql type and print support. ([#717](https://github.com/expo/eas-cli/pull/717) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.34.0](https://github.com/expo/eas-cli/releases/tag/v0.34.0) - 2021-11-01
+
+### 🛠 Breaking changes
+
+- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
+- Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
+- Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
+- Implement no-commit build workflow. Add required `cli` field in root of `eas.json`. ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Better error message when eas.json is invalid. ([#707](https://github.com/expo/eas-cli/pull/707) by [@dsokal](https://github.com/dsokal))
+- Fix credentials workflow for new users: add additionalTypenames for credentials. ([#703](https://github.com/expo/eas-cli/pull/703) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Add additionalTypenames for other queries. ([#704](https://github.com/expo/eas-cli/pull/704) by [@quinlanj](https://github.com/quinlanj))
+- Fix errors after pulling down most recent graphql schema changes. ([#713](https://github.com/expo/eas-cli/pull/713) by [@quinlanj](https://github.com/quinlanj))
+- Refactor credentials manager. ([#712](https://github.com/expo/eas-cli/pull/712) by [@quinlanj](https://github.com/quinlanj))
+- Remove unneeded parameters. ([#710](https://github.com/expo/eas-cli/pull/710) by [@quinlanj](https://github.com/quinlanj))
+- Enforce additionalTypenames for graphql queries. ([#709](https://github.com/expo/eas-cli/pull/709) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.33.1](https://github.com/expo/eas-cli/releases/tag/v0.33.1) - 2021-10-22
+
+### 🎉 New features
+
+- Compute runtime version using config-plugins. ([#697](https://github.com/expo/eas-cli/pull/697) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- [eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ ([#706](https://github.com/expo/eas-cli/pull/706) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.33.0](https://github.com/expo/eas-cli/releases/tag/v0.33.0) - 2021-10-20
+
+### 🎉 New features
+
+- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
+  - Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
+  - To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
+    ```json
+      {
+        "build": {
+          "production": { ... }
+        },
+        "submit": {
+          "production": { ... }
+        }
+      }
+    ```
+
+### 🐛 Bug fixes
+
+- Skip the second prompt for Apple ID if the user is already signed in with Apple. ([#691](https://github.com/expo/eas-cli/pull/691) by [@dsokal](https://github.com/dsokal))
+- Unify reading `app.json`. ([#692](https://github.com/expo/eas-cli/pull/692) by [@dsokal](https://github.com/dsokal))
+
+## [0.32.0](https://github.com/expo/eas-cli/releases/tag/v0.32.0) - 2021-10-15
+
+### 🎉 New features
+
+- Add App Store Connect API Key support to iOS submissions. ([#678](https://github.com/expo/eas-cli/pull/678) by [@quinlanj](https://github.com/quinlanj))
+- Create/list/revoke App Store Connect Api keys via Apple apis. ([#687](https://github.com/expo/eas-cli/pull/687) by [@quinlanj](https://github.com/quinlanj))
+- Add ability to select a build from a list in `eas submit` interactive mode. ([#688](https://github.com/expo/eas-cli/pull/688) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fix printing App Store Connect URL after submission. ([#683](https://github.com/expo/eas-cli/pull/683) by [@brentvatne](https://github.com/brentvatne))
+
+### 🧹 Chores
+
+- Add App Store Connect API Key fields to `eas.json`. ([#684](https://github.com/expo/eas-cli/pull/684) by [@quinlanj](https://github.com/quinlanj))
+- Enable no-underscore-dangle eslint rule. ([#686](https://github.com/expo/eas-cli/pull/686) by [@dsokal](https://github.com/dsokal))
+
+## [0.31.1](https://github.com/expo/eas-cli/releases/tag/v0.31.1) - 2021-10-08
+
+### 🐛 Bug fixes
+
+- Google Service Account Keys: Fix non-interactive bug in credentials service workflow ([#682](https://github.com/expo/eas-cli/pull/682) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.31.0](https://github.com/expo/eas-cli/releases/tag/v0.31.0) - 2021-10-08
+
+### 🛠 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/v0.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 --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))
+- 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
 
@@ -33,7 +921,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- Stop including deprecated storageBucket field when publishing ([#547](https://github.com/expo/eas-cli/pull/547) by [@jkhales](https://github.com/jkhales))
+- Stop including deprecated storageBucket field when publishing. ([#547](https://github.com/expo/eas-cli/pull/547) by [@jkhales](https://github.com/jkhales))
 
 ### 🐛 Bug fixes
 
@@ -43,7 +931,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 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))
+- 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
 
@@ -227,7 +1115,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- `[EAS BUILD API]` Remove "Auto" option for `schemeBuildConfiguration` and make the old "Auto" behaviour the default. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
+- Remove "Auto" option for `schemeBuildConfiguration` and make the old "Auto" behaviour the default. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
 - Remove `experimental.disableIosBundleIdentifierValidation` flag from eas.json. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
 - Deprecate `android.package` and `ios.bundleIdentifier` in app config for generic projects. EAS CLI depends on the values in native code now. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))
 - Remove application id synchronization (`android.package` and `ios.bundleIdentifier`) between app.json and native code when running builds. ([#407](https://github.com/expo/eas-cli/pull/407) by [@dsokal](https://github.com/dsokal))

CODEOWNERS

@@ -0,0 +1,16 @@
+* @dsokal @wkozyra95
+
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95
+
+packages/eas-cli/src/submit @dsokal
+packages/eas-cli/src/commands/submit.ts @dsokal
+
+packages/eas-cli/src/update @kgc00 @wschurman
+packages/eas-cli/src/commands/update @kgc00 @wschurman
+
+packages/eas-cli/schema @bycedric
+packages/eas-cli/src/metadata @bycedric
+packages/eas-cli/src/commands/metadata @bycedric
+
+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,39 +1,4 @@
 ## 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]`
-   - Open `package.json` and note the version of `@expo/eas-build-job` used in the eas-cli.
-   - Find the `Publish` commit in [expo/eas-build](https://github.com/expo/eas-build/commit/) for that version. In most cases, it will be the latest `Publish` commit.
-   - Find the `eas-cli-local-build-plugin` version published in that commit.
-     ![example publish commit](./.gh-assets/eas-build-publish-commit.png)
-   - Run `npm dist-tags add eas-cli-local-build-plugin@VERSION latest` with the version from the previous step.
+1. Run `yarn release` in the repository root folder.
+2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.

bin/install.sh

@@ -1,131 +0,0 @@
-#!/bin/bash
-
-# This script downloads the latest release version of EAS CLI from GitHub and
-# installs it in /usr/local/bin
-
-{
-  # All code is inside a block to ensure the script executes only when
-  # downloaded completely.
-
-  set -euo pipefail
-
-  prefix="${EAS_PREFIX:-/usr/local}"
-  temp_dir="$(mktemp -d)"
-  
-  if  [ -t 1 ] && [ -z "${NO_COLOR:-}" ]
-  then
-    # Use colors when stdout is a terminal and NO_COLOR isn't set.
-    text_bold=$'\033[1m'
-    text_normal=$'\033[22m'
-    text_red=$'\033[31m'
-    text_default_color=$'\033[39m'
-  else
-    # Disable colors
-    text_bold=""
-    text_normal=""
-    text_red=""
-    text_default_color=""
-  fi
-
-  abort() {
-    echo -e "$text_bold$text_red$1$text_normal$text_default_color"
-    exit 1
-  }
-
-  install() {
-    needs_sudo=""
-    # Make sure path exists and can be written to by the current user.
-    if ! mkdir -p "$prefix/lib" || [[ ! -w "$prefix/lib" ]]
-    then
-      needs_sudo=true
-    fi
-    if ! mkdir -p "$prefix/bin" || [[ ! -w "$prefix/bin" ]]
-    then
-      needs_sudo=true
-    fi
-    if ! rm -rf "$prefix/lib/eas"
-    then
-      needs_sudo=true
-    fi
-    # Run commands with sudo if necessary.
-    if [ -n "$needs_sudo" ]
-    then
-      if [ "$EUID" -ne 0 ]
-      then
-        echo "Installing requires superuser access."
-        echo "The sudo command will prompt for your password."
-      fi
-      sudo rm -rf "$prefix/lib/eas"
-      sudo mv "$temp_dir/eas" "$prefix/lib/eas"
-      sudo ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
-    else
-      mv "$temp_dir/eas" "$prefix/lib/eas"
-      ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
-    fi
-  }
-
-  if [[ ! ":$PATH:" == *":$prefix/bin:"* ]]; then
-    abort "Your path is missing $prefix/bin, you need to add this to \$PATH use this installer."
-  fi
-  
-  hardware="$(uname -m)"
-  case "$hardware" in
-    x86_64)
-      arch="x64"
-      ;;
-    arm*)
-      arch="arm"
-      ;;
-    *)
-      abort "Unsupported CPU architecture $hardware."
-      ;;
-  esac
-
-  case "$(uname -s)" in
-    Darwin*)
-      platform="darwin"
-      if [[ "$arch" != "x64" ]]; then
-        abort "Unsupported CPU architecture $hardware on macOS."
-      fi
-      ;;
-    Linux*)
-      platform="linux"
-      ;;
-    *)
-      abort "This installer is supported only on macOS, Linux, and Windows Subsystem for Linux."
-      ;;
-  esac
-
-  url="https://github.com/expo/eas-cli/releases/latest/download/eas-$platform-$arch.tar.gz"
-  echo "Installing EAS CLI from $url"
-
-  mkdir -p "$temp_dir"
-  cd "$temp_dir"
-  
-  echo
-  echo "Downloading..."
-  if [ "$(command -v curl)" ]
-  then
-    curl --location --progress-bar "$url" | tar xz
-  else
-    wget -O- "$url" | tar xz
-  fi
-
-  # Move the installation over and link the executable (may require sudo)
-  install
-
-  # Test the bundled node binary and if it doesn't work remove it (fall back to
-  # node installed in path).
-  "$prefix/lib/eas/bin/node" -v > /dev/null || {
-    rm "$prefix/lib/eas/bin/node"
-  }
-
-  # Test the CLI
-  executable=$(command -v eas) || abort "Could not run eas after installation."
-  echo
-  echo -e "EAS CLI is installed to ${executable}"
-  eas --version
-
-  echo
-  echo -e "Type ${text_bold}eas --help${text_normal} to get started."
-}

bin/run

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

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.24.0"
+  "version": "2.1.0"
 }

package.json

@@ -5,24 +5,34 @@
   ],
   "scripts": {
     "build": "lerna run build",
-    "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
+    "build:tarballs:linux": "yarn build-for-size-check",
+    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
     "typecheck": "lerna run typecheck",
     "start": "lerna run watch --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
-    "lint": "eslint . --ext .ts",
-    "release": "lerna version",
-    "test": "jest"
+    "lint": "eslint .",
+    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
+    "test": "jest",
+    "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@expo/oclif-dev-cli": "1.24.0-expo",
-    "@types/jest": "^26.0.13",
-    "eslint": "7.31.0",
-    "eslint-config-universe": "7.0.1",
-    "eslint-plugin-graphql": "4.0.0",
-    "jest": "^26.4.2",
-    "jest-watch-typeahead": "^0.6.1",
-    "lerna": "^3.22.1",
-    "prettier": "2.3.2"
+    "@types/jest": "28.1.6",
+    "@types/node": "18.6.5",
+    "eslint": "8.21.0",
+    "eslint-config-universe": "11.1.0",
+    "eslint-plugin-async-protect": "2.1.0",
+    "eslint-plugin-node": "11.1.0",
+    "jest": "28.1.3",
+    "jest-watch-typeahead": "2.0.0",
+    "lerna": "4.0.0",
+    "oclif": "3.1.2",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.7",
+    "typescript": "4.7.4"
+  },
+  "volta": {
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

packages/eas-cli/.eslintrc.js

@@ -1,9 +1,36 @@
+const rootEslintrc = require('../../.eslintrc.js');
+
 module.exports = {
   rules: {
-    'import/no-cycle': 'error',
-    'import/no-extraneous-dependencies': [
+    'no-restricted-properties': [
+      'warn',
+      {
+        object: 'it',
+        property: 'only',
+        message: 'it.only should not be committed to main.',
+      },
+      {
+        object: 'test',
+        property: 'only',
+        message: 'test.only should not be committed to main.',
+      },
+      {
+        object: 'describe',
+        property: 'only',
+        message: 'describe.only should not be committed to main.',
+      },
+    ],
+    '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/__mocks__/fs.ts

@@ -1,9 +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/bin/dev

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

packages/eas-cli/bin/dev.cmd

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

packages/eas-cli/bin/run

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

packages/eas-cli/graphql-codegen.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://staging.exp.host/--/graphql'
+schema: 'https://staging-api.expo.dev/graphql'
 documents:
   - 'src/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
@@ -14,7 +14,7 @@ generates:
       dedupeOperationSuffix: true
     hooks:
       afterOneFileWrite:
-        - ./annotate-graphql-codegen.sh
+        - 'node ./scripts/annotate-graphql-codegen.js'
   ./graphql.schema.json:
     plugins:
       - 'introspection'

packages/eas-cli/package.json

@@ -1,115 +1,122 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.24.0",
+  "version": "2.1.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@amplitude/identify": "1.7.0",
-    "@amplitude/node": "1.7.0",
-    "@expo/apple-utils": "0.0.0-alpha.25",
-    "@expo/config": "3.3.42",
-    "@expo/config-plugins": "3.0.3",
-    "@expo/eas-build-job": "0.2.45",
-    "@expo/eas-json": "^0.24.0",
-    "@expo/json-file": "8.2.25",
-    "@expo/pkcs12": "0.0.4",
-    "@expo/plist": "0.0.11",
-    "@expo/plugin-warn-if-update-available": "1.7.0",
+    "@expo/apple-utils": "0.0.0-alpha.34",
+    "@expo/code-signing-certificates": "0.0.2",
+    "@expo/config": "7.0.1",
+    "@expo/config-plugins": "5.0.1",
+    "@expo/config-types": "46.0.2",
+    "@expo/eas-build-job": "0.2.94",
+    "@expo/eas-json": "2.1.0",
+    "@expo/json-file": "8.2.36",
+    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/package-manager": "0.0.56",
+    "@expo/pkcs12": "0.0.8",
+    "@expo/plist": "0.0.18",
+    "@expo/plugin-autocomplete": "1.4.0",
+    "@expo/plugin-help": "5.3.0",
+    "@expo/plugin-warn-if-update-available": "2.3.0",
+    "@expo/prebuild-config": "5.0.3",
     "@expo/results": "1.0.0",
-    "@expo/rudder-sdk-node": "1.0.7",
-    "@expo/sdk-runtime-versions": "1.0.0",
-    "@expo/spawn-async": "1.5.0",
-    "@hapi/joi": "17.1.1",
-    "@oclif/command": "1.8.0",
-    "@oclif/config": "1.17.0",
-    "@oclif/errors": "1.3.3",
-    "@oclif/plugin-help": "3.2.0",
-    "@urql/core": "2.0.0",
-    "@urql/exchange-retry": "0.2.0",
-    "chalk": "4.1.0",
-    "cli-table3": "0.6.0",
-    "dateformat": "3.0.3",
+    "@expo/rudder-sdk-node": "1.1.1",
+    "@expo/spawn-async": "1.7.0",
+    "@expo/timeago.js": "1.0.0",
+    "@oclif/core": "1.13.10",
+    "@urql/core": "2.6.1",
+    "@urql/exchange-retry": "0.3.3",
+    "ajv": "^6.12.6",
+    "better-opn": "3.0.2",
+    "chalk": "4.1.2",
+    "cli-progress": "3.11.2",
+    "cli-table3": "0.6.2",
+    "dateformat": "4.6.3",
     "env-paths": "2.2.0",
-    "fast-glob": "3.2.7",
+    "envinfo": "7.8.1",
+    "fast-deep-equal": "3.1.3",
+    "fast-glob": "3.2.11",
     "figures": "3.2.0",
-    "form-data": "3.0.0",
-    "fs-extra": "9.0.1",
+    "form-data": "4.0.0",
+    "fs-extra": "10.1.0",
     "getenv": "1.0.0",
-    "got": "11.5.2",
-    "graphql": "15.3.0",
-    "graphql-tag": "2.11.0",
-    "ignore": "5.1.8",
+    "gradle-to-js": "2.0.1",
+    "graphql": "16.5.0",
+    "graphql-tag": "2.12.6",
+    "https-proxy-agent": "5.0.1",
+    "ignore": "5.2.0",
     "indent-string": "4.0.0",
-    "jks-js": "1.0.0",
+    "jks-js": "1.0.2",
+    "joi": "17.6.0",
     "keychain": "1.3.0",
-    "lodash": "4.17.20",
-    "mime": "2.4.7",
-    "minimatch": "3.0.4",
-    "nanoid": "3.1.23",
-    "node-fetch": "2.6.1",
-    "node-forge": "0.10.0",
+    "log-symbols": "4.1.0",
+    "mime": "3.0.0",
+    "minimatch": "5.1.0",
+    "nanoid": "3.3.4",
+    "node-fetch": "2.6.7",
+    "node-forge": "1.3.1",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "progress": "2.0.3",
-    "prompts": "2.3.2",
+    "promise-limit": "2.7.0",
+    "promise-retry": "2.0.1",
+    "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.3.4",
-    "strip-ansi": "6.0.0",
-    "tar": "6.0.5",
-    "tempy": "0.7.0",
+    "semver": "7.3.7",
+    "slash": "3.0.0",
+    "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "timeago.js": "4.0.2",
-    "tslib": "2.3.0",
-    "turndown": "7.0.0",
+    "tslib": "2.4.0",
+    "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/dateformat": "^3.0.1",
-    "@types/form-data": "^2.5.0",
-    "@types/fs-extra": "^9.0.1",
+    "@graphql-codegen/cli": "2.11.5",
+    "@graphql-codegen/introspection": "2.2.1",
+    "@graphql-codegen/typescript": "2.7.3",
+    "@graphql-codegen/typescript-operations": "2.5.3",
+    "@types/cli-progress": "3.11.0",
+    "@types/dateformat": "3.0.1",
+    "@types/envinfo": "7.8.1",
+    "@types/fs-extra": "9.0.13",
     "@types/getenv": "^1.0.0",
-    "@types/lodash": "^4.14.161",
-    "@types/mime": "^2.0.3",
-    "@types/node": "^12",
-    "@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.1",
-    "@types/uuid": "^8.3.0",
-    "@types/wrap-ansi": "^3.0.0",
-    "axios": "0.21.1",
-    "babel-jest": "^26.3.0",
-    "memfs": "^3.2.0",
-    "mockdate": "^3.0.2",
-    "nock": "^13.0.5",
-    "typescript": "4.3.5"
+    "@types/mime": "2.0.3",
+    "@types/node-fetch": "2.6.2",
+    "@types/node-forge": "1.0.4",
+    "@types/promise-retry": "1.1.3",
+    "@types/prompts": "2.0.14",
+    "@types/semver": "7.3.10",
+    "@types/tar": "6.1.2",
+    "@types/tough-cookie": "4.0.2",
+    "@types/uuid": "8.3.4",
+    "@types/wrap-ansi": "3.0.0",
+    "axios": "0.27.2",
+    "eslint-plugin-graphql": "4.0.0",
+    "memfs": "3.4.7",
+    "mockdate": "3.0.5",
+    "nock": "13.2.9",
+    "rimraf": "3.0.2",
+    "ts-deepmerge": "2.0.5",
+    "ts-mockito": "2.6.1",
+    "ts-node": "10.9.1",
+    "typescript": "4.7.4"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
     "/build",
-    "/oclif.manifest.json"
+    "/oclif.manifest.json",
+    "/schema"
   ],
   "homepage": "https://github.com/expo/eas-cli",
   "keywords": [
@@ -118,18 +125,20 @@
     "cli"
   ],
   "license": "MIT",
-  "main": "build/index.js",
   "oclif": {
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@oclif/plugin-help",
+      "@expo/plugin-autocomplete",
+      "@expo/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
-    "helpClass": "./build/help",
     "topics": {
       "account": {
-        "description": "manage your account"
+        "description": "manage account"
+      },
+      "branch": {
+        "description": "manage update branches"
       },
       "build": {
         "description": "build app binaries"
@@ -138,10 +147,13 @@
         "description": "manage update channels"
       },
       "device": {
-        "description": "manage your Apple devices for internal distribution"
+        "description": "manage Apple devices for Internal Distribution"
+      },
+      "metadata": {
+        "description": "manage store configuration"
       },
       "project": {
-        "description": "manage your project"
+        "description": "manage project"
       },
       "release": {
         "description": "manage update releases"
@@ -158,11 +170,11 @@
     },
     "warn-if-update-available": {
       "timeoutInDays": 0.5,
-      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
+      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
     },
     "update": {
       "node": {
-        "version": "12.13.0"
+        "version": "18.6.0"
       },
       "s3": {
         "templates": {
@@ -172,19 +184,29 @@
           }
         }
       }
-    }
+    },
+    "additionalHelpFlags": [
+      "-h"
+    ],
+    "additionalVersionFlags": [
+      "-v"
+    ]
   },
   "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 && node patch-readme",
+    "postpack": "rimraf oclif.manifest.json",
+    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
+    "pretarball-ci": "./scripts/pretarball-ci.sh",
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",
     "typecheck": "tsc",
     "test": "jest",
-    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
-    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml"
+    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
+    "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
+    "clean": "rimraf dist build tmp node_modules yarn-error.log"
   },
-  "types": "build/index.d.ts",
-  "gitHead": "161808bc37c255fdea6801d69d23dbc725c056c3"
+  "volta": {
+    "node": "18.6.0",
+    "yarn": "1.22.19"
+  }
 }

packages/eas-cli/patch-readme.js

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

packages/eas-cli/schema/metadata-0.json

@@ -0,0 +1,793 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema",
+  "type": "object",
+  "definitions": {
+    "apple": {
+      "AppleKidsAge": {
+        "enum": [
+          "FIVE_AND_UNDER",
+          "SIX_TO_EIGHT",
+          "NINE_TO_ELEVEN"
+        ]
+      },
+      "AppleRating": {
+        "enum": [
+          "NONE",
+          "INFREQUENT_OR_MILD",
+          "FREQUENT_OR_INTENSE"
+        ]
+      },
+      "AppleCategory": {
+        "type": "array",
+        "description": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array.",
+        "markdownDescription": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array. E.g.\n\n- `[\"SPORTS\"]`\n- `[\"SPORTS\", \"LIFESTYLE\"]`\n- `[[\"GAMES\", \"GAMES_CARD\"], \"ENTERTAINMENT\"]`\n- `[\"GAMES\", \"WEATHER\"]`",
+        "minItems": 1,
+        "maxItems": 2,
+        "uniqueItems": true,
+        "defaultSnippets": [
+          {
+            "label": "Basic categories",
+            "description": "Add two simple categories",
+            "body": [
+              "$1",
+              "$2"
+            ]
+          },
+          {
+            "label": "Category with subcategories",
+            "description": "Add a category containing subcategories",
+            "body": [
+              [
+                "${1|GAMES,STICKERS|}",
+                "$3",
+                "$4"
+              ]
+            ]
+          }
+        ],
+        "items": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/apple/AppleCategory/categories/root"
+            },
+            {
+              "$ref": "#/definitions/apple/AppleCategory/categories/parent"
+            },
+            {
+              "type": "array",
+              "description": "The GAMES category can have additional subcategories",
+              "minItems": 1,
+              "maxItems": 3,
+              "uniqueItems": true,
+              "items": [
+                {
+                  "const": "GAMES"
+                },
+                {
+                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
+                },
+                {
+                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
+                }
+              ]
+            },
+            {
+              "type": "array",
+              "description": "The STICKERS category can have additional subcategories",
+              "minItems": 1,
+              "maxItems": 3,
+              "uniqueItems": true,
+              "items": [
+                {
+                  "const": "STICKERS"
+                },
+                {
+                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
+                },
+                {
+                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
+                }
+              ]
+            }
+          ]
+        },
+        "categories": {
+          "root": {
+            "enum": [
+              "BUSINESS",
+              "SOCIAL_NETWORKING",
+              "MEDICAL",
+              "FOOD_AND_DRINK",
+              "EDUCATION",
+              "BOOKS",
+              "SPORTS",
+              "FINANCE",
+              "REFERENCE",
+              "GRAPHICS_AND_DESIGN",
+              "DEVELOPER_TOOLS",
+              "HEALTH_AND_FITNESS",
+              "MUSIC",
+              "WEATHER",
+              "TRAVEL",
+              "ENTERTAINMENT",
+              "LIFESTYLE",
+              "MAGAZINES_AND_NEWSPAPERS",
+              "UTILITIES",
+              "SHOPPING",
+              "PRODUCTIVITY",
+              "NEWS",
+              "PHOTO_AND_VIDEO",
+              "NAVIGATION"
+            ]
+          },
+          "parent": {
+            "enum": [
+              "GAMES",
+              "STICKERS"
+            ]
+          },
+          "games": {
+            "enum": [
+              "GAMES_SPORTS",
+              "GAMES_WORD",
+              "GAMES_MUSIC",
+              "GAMES_ADVENTURE",
+              "GAMES_ACTION",
+              "GAMES_ROLE_PLAYING",
+              "GAMES_CASUAL",
+              "GAMES_BOARD",
+              "GAMES_TRIVIA",
+              "GAMES_CARD",
+              "GAMES_PUZZLE",
+              "GAMES_CASINO",
+              "GAMES_STRATEGY",
+              "GAMES_SIMULATION",
+              "GAMES_RACING",
+              "GAMES_FAMILY"
+            ]
+          },
+          "stickers": {
+            "enum": [
+              "STICKERS_PLACES_AND_OBJECTS",
+              "STICKERS_EMOJI_AND_EXPRESSIONS",
+              "STICKERS_CELEBRATIONS",
+              "STICKERS_CELEBRITIES",
+              "STICKERS_MOVIES_AND_TV",
+              "STICKERS_SPORTS_AND_ACTIVITIES",
+              "STICKERS_EATING_AND_DRINKING",
+              "STICKERS_CHARACTERS",
+              "STICKERS_ANIMALS",
+              "STICKERS_FASHION",
+              "STICKERS_ART",
+              "STICKERS_GAMING",
+              "STICKERS_KIDS_AND_FAMILY",
+              "STICKERS_PEOPLE",
+              "STICKERS_MUSIC"
+            ]
+          }
+        }
+      },
+      "AppleInfo": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "title",
+          "privacyPolicyUrl"
+        ],
+        "defaultSnippets": [
+          {
+            "label": "Basic",
+            "description": "Create the minimum required locale properties",
+            "body": {
+              "title": "${1:App title}",
+              "privacyPolicyUrl": "https://${3:www.}"
+            }
+          },
+          {
+            "label": "Full",
+            "description": "Create all available locale properties",
+            "body": {
+              "title": "${1:App title}",
+              "subtitle": "${2:Subtitle for your app}",
+              "description": "${3:A longer description of what your app does}",
+              "keywords": [
+                "${4:keyword}"
+              ],
+              "releaseNotes": "${5:Bug fixes and improved stability}",
+              "promoText": "${6:Short tagline for your app}",
+              "marketingUrl": "https://${7:www.}",
+              "supportUrl": "https://${8:www.}",
+              "privacyPolicyUrl": "https://${9:www.}",
+              "privacyChoicesUrl": "https://${10:www.}"
+            }
+          }
+        ],
+        "properties": {
+          "title": {
+            "type": "string",
+            "description": "Name of the app in the store. This should be similar to the installed app name.",
+            "minLength": 2,
+            "maxLength": 30,
+            "meta": {
+              "storeInfo": "The name will be reviewed before it is made available on the App Store."
+            }
+          },
+          "subtitle": {
+            "type": "string",
+            "description": "Subtext for the app. Example: 'A Fun Game For Friends'",
+            "maxLength": 30,
+            "meta": {
+              "storeInfo": "The subtitle will be reviewed before it is made available on the App Store."
+            }
+          },
+          "description": {
+            "type": "string",
+            "description": "Main description of what the app does",
+            "minLength": 10,
+            "maxLength": 4000,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true
+            }
+          },
+          "keywords": {
+            "type": "array",
+            "description": "List of keywords to help users find the app in the App Store",
+            "uniqueItems": true,
+            "items": {
+              "maxLength": 100,
+              "type": "string"
+            },
+            "meta": {
+              "versioned": true
+            }
+          },
+          "releaseNotes": {
+            "type": "string",
+            "description": "Changes since the last public version",
+            "maxLength": 4000,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true
+            }
+          },
+          "promoText": {
+            "type": "string",
+            "description": "Short tagline for the app",
+            "maxLength": 170,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true,
+              "aso": false
+            }
+          },
+          "marketingUrl": {
+            "type": "string",
+            "description": "URL to the app marketing page",
+            "maxLength": 255,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true
+            }
+          },
+          "supportUrl": {
+            "type": "string",
+            "description": "URL to the app support page",
+            "maxLength": 255,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true
+            }
+          },
+          "privacyPolicyText": {
+            "type": "string",
+            "description": "Privacy policy for Apple TV"
+          },
+          "privacyPolicyUrl": {
+            "type": "string",
+            "description": "A URL that links to your privacy policy. A privacy policy is required for all apps.",
+            "maxLength": 255,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true
+            }
+          },
+          "privacyChoicesUrl": {
+            "type": "string",
+            "description": "A URL where users can modify and delete the data collected from the app, or decide how their data is used and shared.",
+            "maxLength": 255,
+            "meta": {
+              "versioned": true,
+              "liveEdits": true,
+              "optional": true
+            }
+          }
+        }
+      },
+      "AppleAdvisory": {
+        "type": "object",
+        "additionalProperties": false,
+        "required": [
+          "alcoholTobaccoOrDrugUseOrReferences",
+          "contests",
+          "gamblingSimulated",
+          "horrorOrFearThemes",
+          "matureOrSuggestiveThemes",
+          "medicalOrTreatmentInformation",
+          "profanityOrCrudeHumor",
+          "sexualContentGraphicAndNudity",
+          "sexualContentOrNudity",
+          "violenceCartoonOrFantasy",
+          "violenceRealistic",
+          "violenceRealisticProlongedGraphicOrSadistic",
+          "gambling",
+          "unrestrictedWebAccess",
+          "kidsAgeBand",
+          "seventeenPlus"
+        ],
+        "defaultSnippets": [
+          {
+            "label": "Basic",
+            "description": "Create an advisory that disables all age-rated properties, for when your app does nothing",
+            "body": {
+              "alcoholTobaccoOrDrugUseOrReferences": "NONE",
+              "contests": "NONE",
+              "gamblingSimulated": "NONE",
+              "horrorOrFearThemes": "NONE",
+              "matureOrSuggestiveThemes": "NONE",
+              "medicalOrTreatmentInformation": "NONE",
+              "profanityOrCrudeHumor": "NONE",
+              "sexualContentGraphicAndNudity": "NONE",
+              "sexualContentOrNudity": "NONE",
+              "violenceCartoonOrFantasy": "NONE",
+              "violenceRealistic": "NONE",
+              "violenceRealisticProlongedGraphicOrSadistic": "NONE",
+              "gambling": false,
+              "unrestrictedWebAccess": false,
+              "kidsAgeBand": null,
+              "seventeenPlus": false
+            }
+          },
+          {
+            "label": "Full",
+            "description": "Create an advisory that enables some of the age-rated properties",
+            "body": {
+              "alcoholTobaccoOrDrugUseOrReferences": "${1|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "contests": "${2|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "gamblingSimulated": "${3|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "horrorOrFearThemes": "${4|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "matureOrSuggestiveThemes": "${5|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "medicalOrTreatmentInformation": "${6|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "profanityOrCrudeHumor": "${7|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "sexualContentGraphicAndNudity": "${8|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "sexualContentOrNudity": "${9|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "violenceCartoonOrFantasy": "${10|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "violenceRealistic": "${11|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "violenceRealisticProlongedGraphicOrSadistic": "${12|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
+              "unrestrictedWebAccess": false,
+              "gambling": false,
+              "kidsAgeBand": null,
+              "seventeenPlus": false
+            }
+          }
+        ],
+        "properties": {
+          "alcoholTobaccoOrDrugUseOrReferences": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain alcohol, tobacco, or drug use or references?"
+          },
+          "contests": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain contests?"
+          },
+          "gamblingSimulated": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain simulated gambling?"
+          },
+          "medicalOrTreatmentInformation": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain medical or treatment information?"
+          },
+          "profanityOrCrudeHumor": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain profanity or crude humor?"
+          },
+          "sexualContentGraphicAndNudity": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain graphic sexual content and nudity?"
+          },
+          "sexualContentOrNudity": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain sexual content or nudity?"
+          },
+          "horrorOrFearThemes": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain horror or fear themes?"
+          },
+          "matureOrSuggestiveThemes": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain mature or suggestive themes?"
+          },
+          "violenceCartoonOrFantasy": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain cartoon or fantasy violence?"
+          },
+          "violenceRealisticProlongedGraphicOrSadistic": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain prolonged graphic or sadistic realistic violence?"
+          },
+          "violenceRealistic": {
+            "$ref": "#/definitions/apple/AppleRating",
+            "description": "Does the app contain realistic violence?"
+          },
+          "unrestrictedWebAccess": {
+            "type": "boolean",
+            "description": "Does your app contain unrestricted web access, such as with an embedded browser?"
+          },
+          "gambling": {
+            "type": "boolean",
+            "description": "Does your app contain gambling?"
+          },
+          "kidsAgeBand": {
+            "oneOf": [
+              {
+                "type": "null"
+              },
+              {
+                "$ref": "#/definitions/apple/AppleKidsAge"
+              }
+            ],
+            "description": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n@see https://developer.apple.com/news/?id=091202019a",
+            "markdownDescription": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n\n[Learn more](https://developer.apple.com/news/?id=091202019a)"
+          },
+          "seventeenPlus": {
+            "type": "boolean",
+            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
+            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
+          }
+        }
+      },
+      "AppleRelease": {
+        "type": "object",
+        "description": "Configure how the app is released in the app store.",
+        "additionalProperties": false,
+        "properties": {
+          "automaticRelease": {
+            "description": "If and how the app should automatically be released when approved by App Store review.",
+            "markdownDescription": "If and how the app should automatically be released when approved by App Store review.\n- `false` - Manually release the app after store approval. (default behavior)\n- `true` - Automatically release after store approval.\n- `Date` - Automatically schedule release on this date, after store approval.\n\nApple does not guarantee that your app is available at the chosen scheduled release date.",
+            "oneOf": [
+              {
+                "type": "string",
+                "format": "date-time"
+              },
+              {
+                "type": "boolean"
+              }
+            ],
+            "defaultSnippets": [
+              {
+                "label": "Manual release",
+                "description": "Manually release the app after store approval",
+                "body": false
+              },
+              {
+                "label": "Automatic release",
+                "description": "Automatically release the app after store approval",
+                "body": true
+              },
+              {
+                "label": "Scheduled release",
+                "description": "Automatically release the app on this date, and store approval",
+                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}T${3:$CURRENT_HOUR}:00:00+00:00"
+              }
+            ]
+          },
+          "phasedRelease": {
+            "type": "boolean",
+            "description": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time.\n@see https://help.apple.com/app-store-connect/#/dev3d65fcee1",
+            "markdownDescription": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates.\n\nKeep in mind that this version will still be available to all users as a manual update from the App Store.\n\nYou can pause the phased release for up to 30 days or release this update to all users at any time.\n\n[Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)"
+          }
+        }
+      },
+      "AppleReview": {
+        "type": "object",
+        "description": "Info provided to the App Store review team to help them understand how to use your app.",
+        "required": [
+          "firstName",
+          "lastName",
+          "email",
+          "phone"
+        ],
+        "defaultSnippets": [
+          {
+            "label": "Basic",
+            "description": "Only define the contact details in case communcation is needed with the App Store review team.",
+            "body": {
+              "firstName": "$1",
+              "lastName": "$2",
+              "email": "$3",
+              "phone": "+$4"
+            }
+          },
+          {
+            "label": "Full",
+            "description": "Define the demo account credentials, additional info, and contact details for the App Store review team.",
+            "body": {
+              "firstName": "$1",
+              "lastName": "$2",
+              "email": "$3",
+              "phone": "+$4",
+              "demoUsername": "$5",
+              "demoPassword": "$6",
+              "demoRequired": true,
+              "notes": "$7"
+            }
+          }
+        ],
+        "properties": {
+          "firstName": {
+            "type": "string",
+            "description": "First name of contact in case communication is needed with the App Store review team.",
+            "minLength": 1
+          },
+          "lastName": {
+            "type": "string",
+            "description": "Last name of contact in case communication is needed with the App Store review team.",
+            "minLength": 1
+          },
+          "email": {
+            "type": "string",
+            "description": "Email address of contact in case communication is needed with the App Store review team.",
+            "format": "email"
+          },
+          "phone": {
+            "type": "string",
+            "description": "Phone number of contact in case communication is needed with the App Store review team. Preface the phone number with ‘+’ followed by the country code (for example, +44 844 209 0611)"
+          },
+          "demoUsername": {
+            "type": "string",
+            "description": "The user name to sign in to your app to review its features."
+          },
+          "demoPassword": {
+            "type": "string",
+            "description": "The password to sign in to your app to review its features."
+          },
+          "demoRequired": {
+            "type": "boolean",
+            "description": "A Boolean value that indicates if sign-in information is required to review all the features of your app. If users sign in using social media, provide information for an account for review. Credentials must be valid and active for duration of review.",
+            "markdownDescription": "A Boolean value that indicates if sign-in information is required to review all the features of your app. If users sign in using social media, provide information for an account for review.\n\n**Credentials must be valid and active for duration of review.**"
+          },
+          "notes": {
+            "type": "string",
+            "description": "Additional information about your app that can help during the review process. Do not include demo account details.",
+            "markdownDescription": "Additional information about your app that can help during the review process.\n\n**Do not include demo account details.**",
+            "minLength": 2,
+            "maxLength": 4000
+          }
+        }
+      }
+    },
+    "AppleConfig": {
+      "type": "object",
+      "description": "Configuration that is specific to the Apple App Store.",
+      "additionalProperties": false,
+      "properties": {
+        "version": {
+          "type": "string",
+          "description": "The version string to edit, or create, if it doesn't exist. All the metadata will be stored on this app version.",
+          "minLength": 1,
+          "defaultSnippets": [
+            {
+              "body": "${1:1}.${2:0}"
+            }
+          ]
+        },
+        "copyright": {
+          "type": "string",
+          "description": "The updated company copyright. Example: 2021 Evan Bacon",
+          "defaultSnippets": [
+            {
+              "body": "$CURRENT_YEAR ${1:name}"
+            }
+          ],
+          "meta": {
+            "versioned": true,
+            "liveEdits": true,
+            "storeInfo": "The name of the person or entity that owns the exclusive rights to your app, preceded by the year the rights were obtained (for example, \"2008 Acme Inc.\"). Do not provide a URL."
+          }
+        },
+        "advisory": {
+          "$ref": "#/definitions/apple/AppleAdvisory"
+        },
+        "categories": {
+          "$ref": "#/definitions/apple/AppleCategory"
+        },
+        "info": {
+          "description": "Localized core app info",
+          "type": "object",
+          "additionalProperties": false,
+          "properties": {
+            "ar-SA": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Arabic"
+            },
+            "ca": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Catalan"
+            },
+            "zh-Hans": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Chinese (Simplified)"
+            },
+            "zh-Hant": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Chinese (Traditional)"
+            },
+            "hr": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Croatian"
+            },
+            "cs": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Czech"
+            },
+            "da": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Danish"
+            },
+            "nl-NL": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Dutch"
+            },
+            "en-AU": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "English (Australia)"
+            },
+            "en-CA": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "English (Canada)"
+            },
+            "en-GB": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "English (U.K.)"
+            },
+            "en-US": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "English (U.S.)"
+            },
+            "fi": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Finnish"
+            },
+            "fr-FR": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "French"
+            },
+            "fr-CA": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "French (Canada)"
+            },
+            "de-DE": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "German"
+            },
+            "el": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Greek"
+            },
+            "he": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Hebrew"
+            },
+            "hi": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Hindi"
+            },
+            "hu": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Hungarian"
+            },
+            "id": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Indonesian"
+            },
+            "it": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Italian"
+            },
+            "ja": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Japanese"
+            },
+            "ko": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Korean"
+            },
+            "ms": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Malay"
+            },
+            "no": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Norwegian"
+            },
+            "pl": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Polish"
+            },
+            "pt-BR": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Portuguese (Brazil)"
+            },
+            "pt-PT": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Portuguese (Portugal)"
+            },
+            "ro": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Romanian"
+            },
+            "ru": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Russian"
+            },
+            "sk": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Slovak"
+            },
+            "es-MX": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Spanish (Mexico)"
+            },
+            "es-ES": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Spanish (Spain)"
+            },
+            "sv": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Swedish"
+            },
+            "th": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Thai"
+            },
+            "tr": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Turkish"
+            },
+            "uk": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Ukrainian"
+            },
+            "vi": {
+              "$ref": "#/definitions/apple/AppleInfo",
+              "description": "Vietnamese"
+            }
+          }
+        },
+        "release": {
+          "$ref": "#/definitions/apple/AppleRelease",
+          "description": "Release strategy"
+        },
+        "review": {
+          "$ref": "#/definitions/apple/AppleReview",
+          "description": "Info for the App Store reviewer"
+        }
+      }
+    }
+  },
+  "properties": {
+    "configVersion": {
+      "const": 0,
+      "description": "The EAS metadata store configuration version"
+    },
+    "apple": {
+      "$ref": "#/definitions/AppleConfig"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "configVersion",
+    "apple"
+  ]
+}

packages/eas-cli/scripts/annotate-graphql-codegen.js

@@ -1,13 +1,15 @@
-#!/usr/bin/env sh
+const fs = require('fs/promises');
 
-OUTFILE="src/graphql/generated.ts"
+const path = './src/graphql/generated.ts';
 
-content="/**
+(async () => {
+  const generatedCode = await fs.readFile(path, 'utf8');
+  const comment = `/**
  * This file was generated using GraphQL Codegen
  * Command: yarn generate-graphql-code
  * Run this during development for automatic type generation when editing GraphQL documents
  * For more info and docs, visit https://graphql-code-generator.com/
- */
-"
+ */\n\n`;
 
-printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE
+  await fs.writeFile(path, comment + generatedCode);
+})();

packages/eas-cli/scripts/patch-readme.js

@@ -0,0 +1,12 @@
+const fs = require('fs/promises');
+
+(async () => {
+  // Patch `oclif 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/scripts/prepack.js

@@ -0,0 +1,7 @@
+const spawn = require('@expo/spawn-async');
+
+(async () => {
+  if (!process.env.CLI_SIZE_CHECK) {
+    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
+  }
+})();

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

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

packages/eas-cli/src/ApiV2Error.ts

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

packages/eas-cli/src/__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

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

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

@@ -1,62 +0,0 @@
-import { Actor } from '../user/User';
-
-interface MockProject {
-  projectRoot: string;
-  projectTree: Record<string, string>;
-  appJSON: AppJSON;
-  packageJSON: PackageJSON;
-}
-
-interface PackageJSON {
-  name: string;
-  version: string;
-  description: string;
-  main: string;
-}
-
-interface AppJSON {
-  expo: {
-    name: string;
-    version: string;
-    slug: string;
-    sdkVersion: string;
-    owner?: string;
-    [key: string]: any;
-  };
-}
-
-function createTestProject(
-  user: Actor,
-  appJSONExtraData?: Record<string, object | string>
-): MockProject {
-  const projectRoot = '/test-project';
-  const packageJSON: PackageJSON = {
-    name: 'testing123',
-    version: '0.1.0',
-    description: 'fake description',
-    main: 'index.js',
-  };
-
-  const owner = appJSONExtraData?.owner as string | undefined;
-  const appJSON: AppJSON = {
-    expo: {
-      name: 'testing 123',
-      version: '0.1.0',
-      slug: 'testing-123',
-      sdkVersion: '33.0.0',
-      owner: owner ?? (user.__typename === 'User' ? user.username : undefined),
-      ...appJSONExtraData,
-    },
-  };
-  return {
-    appJSON,
-    packageJSON,
-    projectRoot,
-    projectTree: {
-      [projectRoot + '/package.json']: JSON.stringify(packageJSON, null, 2),
-      [projectRoot + '/app.json']: JSON.stringify(appJSON, null, 2),
-    },
-  };
-}
-
-export { createTestProject };

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

@@ -0,0 +1,17 @@
+import { fixS3Url } from '../uploads';
+
+describe(fixS3Url, () => {
+  it('fixes broken links', () => {
+    const input =
+      'https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c';
+    const expectedOutput =
+      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
+    expect(fixS3Url(input)).toBe(expectedOutput);
+  });
+
+  it('does not change correct urls', () => {
+    const correctUrl =
+      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
+    expect(fixS3Url(correctUrl)).toBe(correctUrl);
+  });
+});

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

@@ -1,3 +0,0 @@
-export function asMock(fn: any): jest.Mock {
-  return fn as jest.Mock;
-}

packages/eas-cli/src/analytics.ts

@@ -1,169 +0,0 @@
-import { Identify } from '@amplitude/identify';
-import * as Amplitude from '@amplitude/node';
-import RudderAnalytics from '@expo/rudder-sdk-node';
-import os from 'os';
-import { v4 as uuidv4 } from 'uuid';
-
-import UserSettings from './user/UserSettings';
-
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../package.json');
-
-const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
-  darwin: 'Mac',
-  win32: 'Windows',
-  linux: 'Linux',
-};
-
-let amplitudeClient: Amplitude.NodeClient | null = null;
-let rudderstackClient: RudderAnalytics | null = null;
-let userIdentified = false;
-let identifyData: {
-  userId: string;
-  deviceId: string;
-  identify: Identify;
-} | null = null;
-
-export async function initAsync(): Promise<void> {
-  if (process.env.DISABLE_EAS_ANALYTICS) {
-    await UserSettings.setAsync('amplitudeEnabled', false);
-  }
-  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', true);
-  if (amplitudeEnabled) {
-    const config =
-      process.env.EXPO_STAGING || process.env.EXPO_LOCAL
-        ? {
-            // staging environment
-            amplitudeWriteKey: 'cdebbc678931403439486c4750781544',
-            rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
-            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-          }
-        : {
-            // prod environment
-            amplitudeWriteKey: '4ac443afd5073c0df6169291db1d3495',
-            rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
-            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-          };
-
-    amplitudeClient = Amplitude.init(config.amplitudeWriteKey, {
-      retryClass: new Amplitude.OfflineRetryHandler(config.amplitudeWriteKey),
-    });
-
-    rudderstackClient = new RudderAnalytics(
-      config.rudderstackWriteKey,
-      new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
-      {
-        flushInterval: 300,
-      }
-    );
-    rudderstackClient.logger.silent = true;
-  }
-}
-
-export async function setUserDataAsync(
-  userId: string,
-  properties: Record<string, any>
-): Promise<void> {
-  const identify = new Identify();
-  Object.entries(properties).forEach(([property, value]) => {
-    identify.set(property, value);
-  });
-  const savedDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
-  const deviceId = savedDeviceId ?? uuidv4();
-  if (!savedDeviceId) {
-    await UserSettings.setAsync('amplitudeDeviceId', deviceId);
-  }
-
-  identifyData = {
-    userId,
-    deviceId,
-    identify,
-  };
-
-  ensureUserIdentified();
-}
-
-export async function flushAsync(): Promise<void> {
-  if (rudderstackClient) {
-    rudderstackClient.flush();
-  }
-
-  if (amplitudeClient) {
-    await amplitudeClient.flush();
-  }
-}
-
-export function logEvent(name: string, properties: Record<string, any> = {}) {
-  if (!amplitudeClient && !rudderstackClient) {
-    return;
-  }
-  ensureUserIdentified();
-
-  const { userId, deviceId } = identifyData ?? {};
-  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
-
-  if (amplitudeClient) {
-    amplitudeClient.logEvent({
-      event_type: name,
-      event_properties: { ...properties, ...commonEventProperties },
-      ...(userId && { user_id: userId }),
-      ...(deviceId && { device_id: deviceId }),
-      ...getAmplitudeContext(),
-    });
-  }
-
-  if (rudderstackClient) {
-    const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
-    rudderstackClient.track({
-      event: name,
-      properties: { ...properties, ...commonEventProperties },
-      ...identity,
-      context: getRudderStackContext(),
-    });
-  }
-}
-
-function ensureUserIdentified() {
-  if (!(rudderstackClient || amplitudeClient) || userIdentified || !identifyData) {
-    return;
-  }
-
-  if (amplitudeClient) {
-    amplitudeClient.identify(identifyData.userId, identifyData.deviceId, identifyData.identify);
-  }
-
-  if (rudderstackClient) {
-    rudderstackClient.identify({
-      userId: identifyData.userId,
-      anonymousId: identifyData.deviceId,
-    });
-  }
-  userIdentified = true;
-}
-
-function getAmplitudeContext() {
-  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
-  return {
-    os_name: platform,
-    os_version: os.release(),
-    device_brand: platform,
-    device_model: platform,
-  };
-}
-
-function getRudderStackContext() {
-  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
-  return {
-    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/analytics/common.ts

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

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

@@ -0,0 +1,60 @@
+import { logEvent } from './rudderstackClient';
+export type Event = BuildEvent | SubmissionEvent | MetadataEvent;
+
+export enum SubmissionEvent {
+  SUBMIT_COMMAND = 'submit cli submit command',
+  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
+  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
+  SUBMIT_COMMAND_FAIL = 'submit cli fail',
+  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
+  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
+  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
+  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
+  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
+  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
+  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
+  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
+  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
+  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
+  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
+}
+
+export enum BuildEvent {
+  BUILD_COMMAND = 'build cli build command',
+  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
+  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
+  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
+  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
+  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
+  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
+  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
+  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
+  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
+  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
+  BUILD_REQUEST_SUCCESS = 'build cli build request success',
+  BUILD_REQUEST_FAIL = 'build cli build request fail',
+
+  BUILD_STATUS_COMMAND = 'build cli build status',
+
+  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = 'build cli credentials sync update local attempt',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
+  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = 'build cli credentials sync update remote attempt',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
+  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
+
+  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
+}
+
+export enum MetadataEvent {
+  APPLE_METADATA_DOWNLOAD = 'metadata cli download apple response',
+  APPLE_METADATA_UPLOAD = 'metadata cli upload apple response',
+}
+
+export class Analytics {
+  static logEvent(name: Event, properties: Record<string, any>): void {
+    logEvent(name, properties);
+  }
+}

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

@@ -0,0 +1,129 @@
+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';
+import { easCliVersion } from '../utils/easCli';
+
+const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
+  darwin: 'Mac',
+  win32: 'Windows',
+  linux: 'Linux',
+};
+
+let rudderstackClient: RudderAnalytics | null = null;
+let userIdentified = false;
+let identifyData: {
+  userId: string;
+  deviceId: string;
+  traits: Record<string, any>;
+} | null = null;
+
+export async function initAsync(): Promise<void> {
+  // 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 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
+        ? {
+            // 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, traits: Record<string, any>): Promise<void> {
+  const savedDeviceId = await UserSettings.getAsync('analyticsDeviceId', null);
+  const deviceId = savedDeviceId ?? uuidv4();
+  if (!savedDeviceId) {
+    await UserSettings.setAsync('analyticsDeviceId', deviceId);
+  }
+
+  identifyData = {
+    userId,
+    deviceId,
+    traits,
+  };
+
+  ensureUserIdentified();
+}
+
+export async function flushAsync(): Promise<void> {
+  if (rudderstackClient) {
+    await rudderstackClient.flush();
+  }
+}
+
+export function logEvent(name: string, properties: Record<string, any> = {}): void {
+  if (!rudderstackClient) {
+    return;
+  }
+  ensureUserIdentified();
+
+  const { userId, deviceId } = identifyData ?? {};
+  const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
+
+  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+  rudderstackClient.track({
+    event: name,
+    properties: { ...properties, ...commonEventProperties },
+    ...identity,
+    context: getRudderStackContext(),
+  });
+}
+
+function ensureUserIdentified(): void {
+  if (!rudderstackClient || userIdentified || !identifyData) {
+    return;
+  }
+
+  rudderstackClient.identify({
+    userId: identifyData.userId,
+    anonymousId: identifyData.deviceId,
+    traits: identifyData.traits,
+  });
+  userIdentified = true;
+}
+
+function getRudderStackContext(): Record<string, any> {
+  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
+  return {
+    os: { name: platform, version: os.release() },
+    device: { type: platform, model: platform },
+    app: { name: 'eas cli', version: easCliVersion ?? 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

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

packages/eas-cli/src/branch/queries.ts

@@ -0,0 +1,124 @@
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { UpdateBranchFragment } from '../graphql/generated';
+import { BranchQuery } from '../graphql/queries/BranchQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, formatUpdateMessage, getPlatformsForGroup } from '../update/utils';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+
+export const BRANCHES_LIMIT = 50;
+
+export async function selectBranchOnAppAsync({
+  projectId,
+  promptTitle,
+  displayTextForListItem,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
+  promptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateBranchFragment> {
+  if (paginatedQueryOptions.nonInteractive) {
+    throw new Error('Unable to select a branch in non-interactive mode.');
+  }
+
+  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
+    limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+    offset: paginatedQueryOptions.offset,
+    queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
+    promptOptions: {
+      title: promptTitle,
+      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
+      createDisplayTextForSelectionPromptListItem: displayTextForListItem,
+    },
+  });
+  if (!selectedBranch) {
+    throw new Error(`Could not find any branches for project "${projectId}"`);
+  }
+  return selectedBranch;
+}
+
+export async function listAndRenderBranchesOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const branches = await queryBranchesOnProjectAsync(
+      paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+      paginatedQueryOptions.offset,
+      projectId
+    );
+    renderPageOfBranches(branches, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
+      promptOptions: {
+        title: 'Load more branches?',
+        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+async function queryBranchesOnProjectAsync(
+  limit: number,
+  offset: number,
+  projectId: string
+): Promise<UpdateBranchFragment[]> {
+  return await BranchQuery.listBranchesOnAppAsync({
+    appId: projectId,
+    limit,
+    offset,
+  });
+}
+
+function renderPageOfBranches(
+  currentPage: UpdateBranchFragment[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput(currentPage);
+  } else {
+    const table = new CliTable({
+      head: ['Branch', ...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    table.push(
+      ...currentPage.map(branch => {
+        if (branch.updates.length === 0) {
+          return [branch.name, 'N/A', 'N/A', 'N/A', 'N/A'];
+        }
+
+        const latestUpdateOnBranch = branch.updates[0];
+        return [
+          branch.name,
+          formatUpdateMessage(latestUpdateOnBranch),
+          latestUpdateOnBranch.runtimeVersion,
+          latestUpdateOnBranch.group,
+          getPlatformsForGroup({
+            group: latestUpdateOnBranch.group,
+            updates: branch.updates,
+          }),
+        ];
+      })
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branches:'));
+    Log.addNewLineIfNone();
+    Log.log(table.toString());
+  }
+}

packages/eas-cli/src/branch/utils.ts

@@ -0,0 +1,14 @@
+import { getVcsClient } from '../vcs';
+
+export async function getDefaultBranchNameAsync(): Promise<string> {
+  return (
+    (await getVcsClient().getBranchNameAsync()) ||
+    `branch-${Math.random().toString(36).substring(2, 4)}`
+  );
+}
+
+export class BranchNotFoundError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Branch not found.');
+  }
+}

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

@@ -0,0 +1,83 @@
+import { v4 as uuid } from 'uuid';
+
+import { selectBuildToCancelAsync } from '../../commands/build/cancel';
+import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import { confirmAsync, selectAsync } from '../../prompts';
+
+jest.mock('../../ora', () => ({
+  ora: jest.fn().mockImplementation(() => ({
+    start: jest.fn().mockImplementation(() => ({
+      stop: jest.fn(),
+      fail: jest.fn(),
+    })),
+  })),
+}));
+jest.mock('../../prompts', () => {
+  return {
+    selectAsync: jest.fn(),
+    confirmAsync: jest.fn(),
+  };
+});
+
+jest.mock('../../graphql/queries/BuildQuery', () => {
+  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
+  return {
+    BuildQuery: {
+      ...actual.BuildQuery,
+      viewBuildsOnAppAsync: jest.fn(),
+    },
+  };
+});
+
+describe(selectBuildToCancelAsync.name, () => {
+  const selectedBuildId = uuid();
+  const projectId = uuid();
+
+  beforeEach(() => {
+    jest
+      .mocked(BuildQuery.viewBuildsOnAppAsync)
+      .mockImplementation(async () => [
+        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
+      ]);
+  });
+
+  it('does not return build id when confirmation is rejected', async () => {
+    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(null);
+  });
+
+  it('returns build id when confirmation is confirmed', async () => {
+    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
+    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(selectedBuildId);
+  });
+});
+
+function createMockBuildFragment({
+  projectId,
+  buildId,
+}: {
+  projectId: string;
+  buildId?: string;
+}): BuildFragment {
+  return {
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+    platform: AppPlatform.Android,
+    id: buildId ?? uuid(),
+    priority: BuildPriority.Normal,
+    project: {
+      __typename: 'App',
+      slug: 'test-project',
+      id: projectId,
+      name: 'test-project',
+      ownerAccount: {
+        __typename: 'Account',
+        id: uuid(),
+        name: 'test-account',
+      },
+    },
+    status: BuildStatus.InQueue,
+  };
+}

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

@@ -0,0 +1,14 @@
+import { truncateGitCommitMessage } from '../metadata';
+
+describe(truncateGitCommitMessage, () => {
+  it('returns undefined if no message was passed', () => {
+    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
+  });
+  it('returns commit message', () => {
+    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
+  });
+
+  it('truncates long commit messages', () => {
+    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
+  });
+});

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

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

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

@@ -1,115 +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 { readVersionCodeAsync, readVersionNameAsync } 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(readVersionCodeAsync, () => {
-  describe('generic project', () => {
-    it('reads the version code from native code', async () => {
-      const exp = initGenericProject();
-      const versionCode = await readVersionCodeAsync('/repo', exp);
-      expect(versionCode).toBe(123);
+// bare 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 = initBareWorkflowProject({ versionCode: nativeVersionCode });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.VERSION_CODE,
+      projectDir: '/app',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/app/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('/app');
+    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.APP_VERSION', async () => {
+    const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
+    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/app',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/app/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('/app');
+    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 = initBareWorkflowProject();
+
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.NOOP,
+      projectDir: '/app',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/app/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('/app');
+    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: '/app',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/app/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: '/app',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/app/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: '/app',
+      exp: fakeExp,
+    });
+
+    const appJSON = await fs.readJSON('/app/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('bare project', () => {
+    it('reads the versions from native code', async () => {
+      const exp = initBareWorkflowProject();
+      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
+        '/app',
+        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', async () => {
+    it('reads the versions from expo config', async () => {
       const exp = initManagedProject();
-      const versionCode = await readVersionCodeAsync('/repo', exp);
-      expect(versionCode).toBe(123);
+      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
+        '/app',
+        exp,
+        {} as BuildProfile<Platform.ANDROID>
+      );
+      expect(appVersion).toBe('5.0.0');
+      expect(appBuildVersion).toBe('126');
     });
   });
 });
 
-describe(readVersionNameAsync, () => {
-  describe('generic project', () => {
-    it('reads the version name from native code', async () => {
-      const exp = initGenericProject();
-      const versionName = await readVersionNameAsync('/repo', exp);
-      expect(versionName).toBe('1.0');
-    });
-  });
-  describe('managed project', () => {
-    it('reads the version from expo config', async () => {
-      const exp = initManagedProject();
-      const versionName = await readVersionNameAsync('/repo', exp);
-      expect(versionName).toBe('1.0.0');
-    });
-  });
-});
-
-function initGenericProject(): ExpoConfig {
+function initBareWorkflowProject({
+  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'
+    '/app'
   );
 
-  const fakeExp: ExpoConfig = {
-    name: 'myproject',
-    slug: 'myproject',
-    version: '1.0.0',
-    android: {
-      versionCode: 123,
-    },
-  };
   return fakeExp;
 }
 
 function initManagedProject(): ExpoConfig {
-  vol.fromJSON(
-    {
-      './app.json': JSON.stringify({
-        expo: {
-          version: '1.0.0',
-          android: {
-            versionCode: 123,
-          },
-        },
-      }),
-    },
-    '/repo'
-  );
-
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
-    version: '1.0.0',
+    version: '5.0.0',
     android: {
-      versionCode: 123,
+      versionCode: 126,
     },
   };
+  vol.fromJSON(
+    {
+      './app.json': JSON.stringify({
+        expo: fakeExp,
+      }),
+    },
+    '/app'
+  );
+
   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,36 +1,39 @@
-import { Android, Metadata, Workflow } from '@expo/eas-build-job';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
-import { createCredentialsContextAsync } from '../../credentials/context';
+import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
 } from '../../project/android/applicationId';
+import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
 import { findAccountByName } from '../../user/Account';
 import {
   BuildRequestSender,
   CredentialsResult,
+  JobData,
   prepareBuildRequestForPlatformAsync,
 } from '../build';
-import { BuildContext } from '../context';
+import { AndroidBuildContext, BuildContext, CommonContext } 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 { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteVersionCodeAsync } from './version';
 
-export async function prepareAndroidBuildAsync(
-  ctx: BuildContext<Platform.ANDROID>
-): Promise<BuildRequestSender> {
+export async function createAndroidContextAsync(
+  ctx: CommonContext<Platform.ANDROID>
+): Promise<AndroidBuildContext> {
   const { buildProfile } = ctx;
 
   if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
@@ -44,7 +47,7 @@ This means that it will most likely produce an AAB and you will not be able to i
     Log.newLine();
     const confirmed = await toggleConfirmAsync({ message: 'Would you like to proceed?' });
     if (!confirmed) {
-      Log.error('Please update eas.json and come back again.');
+      Log.error('Update eas.json and come back again.');
       process.exit(1);
     }
   }
@@ -52,24 +55,57 @@ This means that it will most likely produce an AAB and you will not be able to i
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
 
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
+
   if (ctx.workflow === Workflow.MANAGED) {
     await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
   }
 
+  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
+  const versionCodeOverride =
+    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+      ? await resolveRemoteVersionCodeAsync({
+          projectDir: ctx.projectDir,
+          projectId: ctx.projectId,
+          exp: ctx.exp,
+          applicationId,
+          buildProfile,
+        })
+      : undefined;
+
+  return { applicationId, gradleContext, versionCodeOverride };
+}
+
+export async function prepareAndroidBuildAsync(
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
-    ensureCredentialsAsync: ensureAndroidCredentialsAsync,
-    ensureProjectConfiguredAsync: async () => {
-      if (ctx.workflow === Workflow.GENERIC) {
-        await validateAndSyncProjectConfigurationAsync(ctx.projectDir, ctx.exp);
-      }
+    ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
+      return await ensureAndroidCredentialsAsync(ctx);
+    },
+    syncProjectConfigurationAsync: async () => {
+      await syncProjectConfigurationAsync({
+        projectDir: ctx.projectDir,
+        exp: ctx.exp,
+        localAutoIncrement:
+          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+            ? false
+            : ctx.buildProfile.autoIncrement,
+        nonInteractive: ctx.nonInteractive,
+      });
+    },
+    prepareJobAsync: async (
+      ctx: BuildContext<Platform.ANDROID>,
+      jobData: JobData<AndroidCredentials>
+    ): Promise<Job> => {
+      return await prepareJobAsync(ctx, jobData);
     },
-    getMetadataContext: () => ({}),
-    prepareJobAsync,
     sendBuildRequestAsync: async (
       appId: string,
       job: Android.Job,
-      metadata: Metadata
+      metadata: Metadata,
+      buildParams: BuildParamsInput
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
@@ -77,6 +113,7 @@ This means that it will most likely produce an AAB and you will not be able to i
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
+        buildParams,
       });
     },
   });
@@ -92,23 +129,21 @@ async function ensureAndroidCredentialsAsync(
   if (!shouldProvideCredentials(ctx)) {
     return;
   }
-  const androidApplicationIdentifier = await getApplicationIdAsync(ctx.projectDir, ctx.exp);
-  const provider = new AndroidCredentialsProvider(
-    await createCredentialsContextAsync(ctx.projectDir, {
-      exp: ctx.exp,
-      nonInteractive: ctx.nonInteractive,
-    }),
-    {
-      app: {
-        account: nullthrows(
-          findAccountByName(ctx.user.accounts, ctx.accountName),
-          `You do not have access to account: ${ctx.accountName}`
-        ),
-        projectName: ctx.projectName,
-        androidApplicationIdentifier,
-      },
-    }
+  const androidApplicationIdentifier = await getApplicationIdAsync(
+    ctx.projectDir,
+    ctx.exp,
+    ctx.android.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,45 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
-
-import Log from '../../log';
-import {
-  ensureApplicationIdIsDefinedForManagedProjectAsync,
-  warnIfAndroidPackageDefinedInAppConfigForGenericProject,
-} from '../../project/android/applicationId';
-import vcs from '../../vcs';
-import { ConfigureContext } from '../context';
-import { isExpoUpdatesInstalled } from '../utils/updates';
-import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
-
-export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
-  if (!ctx.hasAndroidNativeProject) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
-    return;
-  }
-
-  warnIfAndroidPackageDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
-
-  await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
-
-  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await vcs.trackFileAsync(easGradlePath);
-
-  if (isExpoUpdatesInstalled(ctx.projectDir)) {
-    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
-  }
-  Log.withTick('Android project configured');
-}
-
-export async function validateAndSyncProjectConfigurationAsync(
-  projectDir: 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.'
-    );
-  }
-  if (isExpoUpdatesInstalled(projectDir)) {
-    await syncUpdatesConfigurationAsync(projectDir, exp);
-  }
-}

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

@@ -13,19 +13,21 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     secrets: job.secrets,
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
+    version: job.version?.versionCode ? { versionCode: job.version.versionCode } : undefined,
     gradleCommand: job.gradleCommand,
-    artifactPath: job.artifactPath,
+    applicationArchivePath: job.applicationArchivePath,
+    buildArtifactPaths: job.buildArtifactPaths,
     username: job.username,
     buildType: job.buildType && transformBuildType(job.buildType),
+    developmentClient: job.developmentClient,
+    experimental: job.experimental,
   };
 }
 
 function transformBuildType(buildType: Android.BuildType): AndroidBuildType {
   if (buildType === Android.BuildType.APK) {
     return AndroidBuildType.Apk;
-  } else if (buildType === Android.BuildType.APP_BUNDLE) {
-    return AndroidBuildType.AppBundle;
   } else {
-    return AndroidBuildType.DevelopmentClient;
+    return AndroidBuildType.AppBundle;
   }
 }

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

@@ -1,13 +1,13 @@
-import { Android, ArchiveSource, Job, sanitizeJob } from '@expo/eas-build-job';
-import { AndroidBuildProfile } from '@expo/eas-json';
+import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
+import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -24,9 +24,13 @@ export async function prepareJobAsync(
   ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData
 ): Promise<Job> {
-  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
-  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const username = getUsername(
+    ctx.exp,
+    await ensureLoggedInAsync({ nonInteractive: ctx.nonInteractive })
+  );
+  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
+  const projectRootDirectory =
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
   const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
@@ -52,7 +56,7 @@ export async function prepareJobAsync(
     projectRootDirectory,
     projectArchive: jobData.projectArchive,
     builderEnvironment: {
-      image: buildProfile.image ?? 'default',
+      image: buildProfile.image,
       node: buildProfile.node,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
@@ -69,12 +73,20 @@ export async function prepareJobAsync(
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
     updates: { channel: ctx.buildProfile.channel },
-
+    developmentClient: buildProfile.developmentClient,
     gradleCommand: buildProfile.gradleCommand,
-    artifactPath: buildProfile.artifactPath,
-
+    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
+    buildArtifactPaths: buildProfile.buildArtifactPaths,
+    buildType,
     username,
-    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
+    ...(ctx.android.versionCodeOverride && {
+      version: {
+        versionCode: ctx.android.versionCodeOverride,
+      },
+    }),
+    experimental: {
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
+    },
   };
 
   return sanitizeJob(job);

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

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

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

@@ -1,50 +1,265 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
+import { AndroidConfig, Updates } 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 { AppPlatform } from '../../graphql/generated';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import {
+  getAppBuildGradleAsync,
+  parseGradleCommand,
+  resolveConfigValue,
+} from '../../project/android/gradleUtils';
+import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
-export async function readVersionCodeAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<number | undefined> {
-  const workflow = await resolveWorkflowAsync(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 updateNativeVersionsAsync({
+    projectDir,
+    version: exp.version,
+    versionCode: exp.android?.versionCode,
+  });
+  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) ?? 1;
+    const versionCode = AndroidConfig.Version.getVersionCode(exp);
+    const bumpedVersionCode = getNextVersionCode(versionCode);
+    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 async function readVersionNameAsync(
+export async function maybeResolveVersionsAsync(
   projectDir: string,
-  exp: ExpoConfig
-): Promise<string | undefined> {
+  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 {
+      return {};
     }
   } else {
-    return exp.version;
+    return {
+      appBuildVersion: String(AndroidConfig.Version.getVersionCode(exp)),
+      appVersion: exp.version,
+    };
   }
 }
 
-function readBuildGradle(projectDir: string): string | undefined {
+export async function updateNativeVersionsAsync({
+  projectDir,
+  version,
+  versionCode,
+}: {
+  projectDir: string;
+  version?: string;
+  versionCode?: number;
+}): Promise<void> {
+  const buildGradle = await readBuildGradleAsync(projectDir);
+  if (!buildGradle) {
+    throw new Error('This project is missing a build.gradle file.');
+  }
+  let updatedBuildGradle = buildGradle;
+  if (version !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionName ".*"`),
+      `versionName "${version}"`
+    );
+  }
+  if (versionCode !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionCode.*`),
+      `versionCode ${versionCode}`
+    );
+  }
+  await writeBuildGradleAsync({ projectDir, buildGradle: 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);
+}
+
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+export async function resolveRemoteVersionCodeAsync({
+  projectDir,
+  projectId,
+  exp,
+  applicationId,
+  buildProfile,
+}: {
+  projectDir: string;
+  projectId: string;
+  exp: ExpoConfig;
+  applicationId: string;
+  buildProfile: BuildProfile<Platform.ANDROID>;
+}): Promise<string> {
+  const remoteVersions = await AppVersionQuery.latestVersionAsync(
+    projectId,
+    AppPlatform.Android,
+    applicationId
+  );
+
+  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
+  let currentBuildVersion: string;
+  if (remoteVersions?.buildVersion) {
+    currentBuildVersion = remoteVersions.buildVersion;
+  } else {
+    if (localVersions.appBuildVersion) {
+      Log.warn(
+        'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
+      );
+      currentBuildVersion = localVersions.appBuildVersion;
+    } else {
+      Log.error(
+        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
+      );
+      throw new Error('Remote versions are not configured.');
+    }
+  }
+  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
+    return currentBuildVersion;
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+    const spinner = ora(
+      `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Android,
+        applicationIdentifier: applicationId,
+        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
+        buildVersion: currentBuildVersion,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+      });
+      spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
+    } catch (err) {
+      spinner.fail(`Failed to initialize versionCode with ${chalk.bold(currentBuildVersion)}.`);
+      throw err;
+    }
+    return currentBuildVersion;
+  } else {
+    const nextBuildVersion = getNextVersionCode(currentBuildVersion);
+    const spinner = ora(
+      `Incrementing versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+        nextBuildVersion
+      )}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Android,
+        applicationIdentifier: applicationId,
+        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
+        buildVersion: String(nextBuildVersion),
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+      });
+      spinner.succeed(
+        `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+    } catch (err) {
+      spinner.fail(
+        `Failed to increment versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+      throw err;
+    }
+    return String(nextBuildVersion);
+  }
 }

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

@@ -1,28 +1,40 @@
-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 cliProgress from 'cli-progress';
 import fs from 'fs-extra';
 import nullthrows from 'nullthrows';
-import ora from 'ora';
 
-import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
+import { withAnalyticsAsync } from '../analytics/common';
+import { BuildEvent } from '../analytics/events';
+import { getExpoWebsiteBaseUrl } from '../api';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildParamsInput,
+  BuildPriority,
+  BuildStatus,
+  UploadSessionType,
+} from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log, { learnMore } from '../log';
-import { promptAsync } from '../prompts';
-import { uploadAsync } from '../uploads';
+import { Ora, ora } from '../ora';
+import {
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  requestedPlatformDisplayNames,
+} from '../platform';
+import { uploadFileAtPathToS3Async } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
-import { sleep } from '../utils/promise';
-import vcs from '../vcs';
-import { requestedPlatformDisplayNames } from './constants';
+import { sleepAsync } from '../utils/promise';
+import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
-import { MetadataContext, collectMetadata } from './metadata';
-import { Platform, TrackingContext } from './types';
-import Analytics, { Event } from './utils/analytics';
+import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
-import { commitPromptAsync, makeProjectTarballAsync } from './utils/repository';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -40,14 +52,24 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ensureCredentialsAsync(
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
-  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  getMetadataContext: () => MetadataContext<TPlatform>;
+  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
   prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
-  sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
+  sendBuildRequestAsync(
+    appId: string,
+    job: TJob,
+    metadata: Metadata,
+    buildParams: BuildParamsInput
+  ): Promise<BuildResult>;
 }
 
 export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
 
+function resolveBuildParamsInput<T extends Platform>(ctx: BuildContext<T>): BuildParamsInput {
+  return {
+    resourceClass: ctx.resourceClass,
+  };
+}
+
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
@@ -57,20 +79,21 @@ export async function prepareBuildRequestForPlatformAsync<
   const credentialsResult = await withAnalyticsAsync(
     async () => await builder.ensureCredentialsAsync(ctx),
     {
-      successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
-      failureEvent: Event.GATHER_CREDENTIALS_FAIL,
+      attemptEvent: BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
+      successEvent: BuildEvent.GATHER_CREDENTIALS_SUCCESS,
+      failureEvent: BuildEvent.GATHER_CREDENTIALS_FAIL,
       trackingCtx: ctx.trackingCtx,
     }
   );
-  if (!ctx.skipProjectConfiguration) {
-    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
-      successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: Event.CONFIGURE_PROJECT_FAIL,
-      trackingCtx: ctx.trackingCtx,
-    });
-  }
 
-  if (await vcs.hasUncommittedChangesAsync()) {
+  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
+    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
+    trackingCtx: ctx.trackingCtx,
+  });
+
+  if (await getVcsClient().isCommitRequiredAsync()) {
     Log.addNewLineIfNone();
     await reviewAndCommitChangesAsync(
       `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
@@ -78,7 +101,7 @@ export async function prepareBuildRequestForPlatformAsync<
     );
   }
 
-  const projectArchive = ctx.local
+  const projectArchive = ctx.localBuildOptions.enable
     ? ({
         type: ArchiveSourceType.PATH,
         path: (await makeProjectTarballAsync()).path,
@@ -88,58 +111,58 @@ export async function prepareBuildRequestForPlatformAsync<
         bucketKey: await uploadProjectAsync(ctx),
       } as const);
 
-  const metadataContext = builder.getMetadataContext();
-  const metadata = await collectMetadata(ctx, metadataContext);
+  const metadata = await collectMetadataAsync(ctx);
+  const buildParams = resolveBuildParamsInput(ctx);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
   });
 
   return async () => {
-    if (ctx.local) {
-      await runLocalBuildAsync(job);
+    if (ctx.localBuildOptions.enable) {
+      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
       return undefined;
     } else {
       try {
-        return await sendBuildRequestAsync(builder, job, metadata);
-      } catch (error) {
-        if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-          Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_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'
-        ) {
-          Log.error(
-            `You have already reached the maximum number of pending ${
-              requestedPlatformDisplayNames[job.platform]
-            } builds for your account. Try again later.`
-          );
-          throw new Error('Build request failed.');
-        } else if (error?.graphQLErrors) {
-          Log.error(
-            'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
-          );
-        }
-        throw error;
+        return await sendBuildRequestAsync(builder, job, metadata, buildParams);
+      } catch (error: any) {
+        handleBuildRequestError(error, job.platform);
       }
     }
   };
 }
 
+function handleBuildRequestError(error: any, platform: Platform): never {
+  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+    Log.error('EAS Build API has changed. 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. 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. 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'
+  ) {
+    Log.error(
+      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
+    );
+    throw new Error('Build request failed.');
+  } else if (error?.graphQLErrors) {
+    Log.error(
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
+    );
+  }
+  throw error;
+}
+
 async function uploadProjectAsync<TPlatform extends Platform>(
   ctx: BuildContext<TPlatform>
 ): Promise<string> {
@@ -147,10 +170,27 @@ async function uploadProjectAsync<TPlatform extends Platform>(
   try {
     return await withAnalyticsAsync(
       async () => {
+        Log.newLine();
+        Log.log(
+          `Compressing project files and uploading to EAS Build. ${learnMore(
+            'https://expo.fyi/eas-build-archive'
+          )}`
+        );
         const projectTarball = await makeProjectTarballAsync();
+
+        if (projectTarball.size > 1024 * 1024 * 100) {
+          Log.warn(
+            `Your project archive is ${formatBytes(
+              projectTarball.size
+            )}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk.bold(
+              '.easignore'
+            )} file. ${learnMore('https://expo.fyi/eas-build-archive')}`
+          );
+        }
+
         projectTarballPath = projectTarball.path;
 
-        const { bucketKey } = await uploadAsync(
+        const { bucketKey } = await uploadFileAtPathToS3Async(
           UploadSessionType.EasBuildProjectSources,
           projectTarball.path,
           createProgressTracker({
@@ -159,17 +199,15 @@ async function uploadProjectAsync<TPlatform extends Platform>(
               `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
                 projectTarball.size
               )})`,
-            completedMessage: (duration: string) =>
-              `Uploaded to EAS ${chalk.dim(duration)} ${learnMore(
-                'https://expo.fyi/eas-build-archive'
-              )}`,
+            completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
           })
         );
         return bucketKey;
       },
       {
-        successEvent: Event.PROJECT_UPLOAD_SUCCESS,
-        failureEvent: Event.PROJECT_UPLOAD_FAIL,
+        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
+        successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
+        failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
         trackingCtx: ctx.trackingCtx,
       }
     );
@@ -183,7 +221,8 @@ async function uploadProjectAsync<TPlatform extends Platform>(
 async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJob extends Job>(
   builder: Builder<TPlatform, Credentials, TJob>,
   job: TJob,
-  metadata: Metadata
+  metadata: Metadata,
+  buildParams: BuildParamsInput
 ): Promise<BuildFragment> {
   const { ctx } = builder;
   return await withAnalyticsAsync(
@@ -195,184 +234,263 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
       const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
         ctx.projectId,
         job,
-        metadata
+        metadata,
+        buildParams
       );
 
       printDeprecationWarnings(deprecationInfo);
       return build;
     },
     {
-      successEvent: Event.BUILD_REQUEST_SUCCESS,
-      failureEvent: Event.BUILD_REQUEST_FAIL,
+      attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
+      successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
+      failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
       trackingCtx: ctx.trackingCtx,
     }
   );
 }
 
-async function withAnalyticsAsync<Result>(
-  fn: () => Promise<Result>,
-  analytics: {
-    successEvent: Event;
-    failureEvent: Event;
-    trackingCtx: TrackingContext;
-  }
-): Promise<Result> {
-  try {
-    const result = await fn();
-    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
-    return result;
-  } catch (error) {
-    Analytics.logEvent(analytics.failureEvent, {
-      ...analytics.trackingCtx,
-      reason: error.message,
-    });
-    throw error;
-  }
-}
-
-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 vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
-    Log.withTick('Committed changes.');
-    return;
-  }
-  if (nonInteractive) {
-    throw new Error(
-      'Cannot commit changes when --non-interactive is specified. Run the command in interactive mode 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,
-      },
-    ],
-  });
-
-  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,
-    });
-  }
-}
+type MaybeBuildFragment = BuildFragment | null;
 
 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) {
-          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.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 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 newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
-        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
-        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
-        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
-        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
-        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
-        const unknownState = builds.length - 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}`),
-          unknownState && chalk.red(`Builds in unknown state: ${unknownState}`),
-        ]
-          .filter(i => i)
-          .join('\t');
-      }
+  { buildIds, accountName }: { buildIds: string[]; accountName: string },
+  { intervalSec = 10 } = {}
+): Promise<MaybeBuildFragment[]> {
+  let spinner;
+  let originalSpinnerText;
+  if (buildIds.length === 1) {
+    Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
+    originalSpinnerText = 'Waiting for build to complete.';
+    spinner = ora(originalSpinnerText).start();
+  } else {
+    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
+    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
+  }
+  while (true) {
+    const builds = await getBuildsSafelyAsync(buildIds);
+    const { refetch } =
+      builds.length === 1
+        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
+        : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
+    if (!refetch) {
+      return builds;
     }
-    time = new Date().getTime();
-    await sleep(intervalSec * 1000);
+    await sleepAsync(intervalSec * 1000);
   }
-  spinner.warn('Timed out');
-  throw new Error(
-    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
-  );
+}
+
+async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
+  const promises = 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;
+    }
+  });
+  return await Promise.all(promises);
+}
+
+interface BuildProgressResult {
+  refetch: boolean;
+}
+
+let queueProgressBarStarted = false;
+const queueProgressBar = new cliProgress.SingleBar(
+  { format: '|{bar}| {estimatedWaitTime}' },
+  cliProgress.Presets.rect
+);
+
+async function handleSingleBuildProgressAsync(
+  { build, accountName }: { build: MaybeBuildFragment; accountName: string },
+  { spinner }: { spinner: Ora }
+): Promise<BuildProgressResult> {
+  if (build === null) {
+    spinner.text = 'Could not fetch the build status. Check your network connection.';
+    return { refetch: true };
+  }
+
+  if (queueProgressBarStarted && build?.status && build.status !== BuildStatus.InQueue) {
+    if (build.status === BuildStatus.InProgress) {
+      queueProgressBar.update(queueProgressBar.getTotal(), {
+        estimatedWaitTime: '',
+      });
+    }
+    queueProgressBar.stop();
+    Log.newLine();
+    queueProgressBarStarted = false;
+    spinner.start('Build is about to start');
+  }
+
+  switch (build.status) {
+    case BuildStatus.Finished:
+      spinner.succeed('Build finished');
+      return { refetch: false };
+    case BuildStatus.New:
+      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${chalk.underline(
+        formatAccountSubscriptionsUrl(accountName)
+      )}.`;
+      break;
+    case BuildStatus.InQueue: {
+      spinner.text = 'Build queued...';
+      const progressBarPayload =
+        typeof build.estimatedWaitTimeLeftSeconds === 'number'
+          ? { estimatedWaitTime: formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds) }
+          : { estimatedWaitTime: '' };
+
+      if (
+        !queueProgressBarStarted &&
+        typeof build.initialQueuePosition === 'number' &&
+        typeof build.queuePosition === 'number'
+      ) {
+        spinner.stopAndPersist();
+        if (build.priority !== BuildPriority.High) {
+          Log.newLine();
+          Log.log('Start builds sooner in the priority queue.');
+          Log.log(
+            `Sign up for EAS Production or Enterprise at ${chalk.underline(
+              formatAccountSubscriptionsUrl(accountName)
+            )}`
+          );
+        }
+        Log.newLine();
+        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
+        queueProgressBar.start(
+          build.initialQueuePosition + 1,
+          build.initialQueuePosition - build.queuePosition + 1,
+          progressBarPayload
+        );
+        queueProgressBarStarted = true;
+      }
+      if (typeof build.queuePosition === 'number') {
+        queueProgressBar.update(build.queuePosition, progressBarPayload);
+      }
+      break;
+    }
+    case BuildStatus.Canceled:
+      spinner.fail('Build canceled');
+      return { refetch: false };
+    case BuildStatus.InProgress:
+      spinner.text = 'Build in progress...';
+      break;
+    case BuildStatus.Errored:
+      spinner.fail('Build failed');
+      if (build.error) {
+        return { refetch: false };
+      } else {
+        throw new Error('Standalone build failed!');
+      }
+    default:
+      spinner.warn('Unknown status');
+      throw new Error(`Unknown build status: ${build.status} - aborting!`);
+  }
+  return { refetch: true };
+}
+
+const priorityToQueueDisplayName: Record<BuildPriority, string> = {
+  [BuildPriority.Normal]: 'queue',
+  [BuildPriority.NormalPlus]: 'queue',
+  [BuildPriority.High]: 'priority queue',
+};
+
+const statusToDisplayName: Record<BuildStatus, string> = {
+  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
+  [BuildStatus.InQueue]: 'in queue',
+  [BuildStatus.InProgress]: 'in progress',
+  [BuildStatus.Canceled]: 'canceled',
+  [BuildStatus.Finished]: 'finished',
+  [BuildStatus.Errored]: 'failed',
+};
+
+const platforms = [AppPlatform.Android, AppPlatform.Ios];
+
+async function handleMultipleBuildsProgressAsync(
+  { builds: maybeBuilds }: { builds: MaybeBuildFragment[] },
+  { spinner, originalSpinnerText }: { spinner: Ora; originalSpinnerText: string }
+): Promise<BuildProgressResult> {
+  const buildCount = maybeBuilds.length;
+  const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);
+
+  const allFinished =
+    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
+  const allSettled =
+    builds.filter(build =>
+      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
+    ).length === buildCount;
+
+  if (allSettled) {
+    if (allFinished) {
+      spinner.succeed(formatSettledBuildsText(builds));
+    } else {
+      spinner.fail(formatSettledBuildsText(builds));
+    }
+    return { refetch: false };
+  } else {
+    spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
+    return { refetch: true };
+  }
+}
+
+function formatSettledBuildsText(builds: BuildFragment[]): string {
+  return platforms
+    .map(platform => {
+      const build = nullthrows(
+        builds.find(build => build.platform === platform),
+        `Build for platform ${platform} must be defined in this context`
+      );
+      return `${appPlatformEmojis[platform]} ${
+        appPlatformDisplayNames[platform]
+      } build - status: ${chalk.bold(statusToDisplayName[build.status])}`;
+    })
+    .join('\n  ');
+}
+
+function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragment[]): string {
+  return [
+    originalSpinnerText,
+    ...platforms.map(platform => {
+      const build = builds.find(build => build.platform === platform);
+      const status = build ? statusToDisplayName[build.status] : 'unknown';
+      let extraInfo = '';
+      if (
+        build?.status === BuildStatus.InQueue &&
+        typeof build.initialQueuePosition === 'number' &&
+        typeof build.queuePosition === 'number'
+      ) {
+        const percent = Math.floor(
+          ((build.initialQueuePosition - build.queuePosition + 1) /
+            (build.initialQueuePosition + 1)) *
+            100
+        );
+        const estimatedWaitTime =
+          typeof build.estimatedWaitTimeLeftSeconds === 'number'
+            ? ` - ${formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds)}`
+            : '';
+        extraInfo = ` - queue progress: ${chalk.bold(`${percent}%`)}${estimatedWaitTime}`;
+      }
+      return `${appPlatformEmojis[platform]} ${
+        appPlatformDisplayNames[platform]
+      } build - status: ${chalk.bold(status)}${extraInfo}`;
+    }),
+  ].join('\n  ');
+}
+
+function isBuildFragment(maybeBuild: MaybeBuildFragment): maybeBuild is BuildFragment {
+  return maybeBuild !== null;
+}
+
+function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
+  if (estimatedWaitTimeLeftSeconds < 5 * 60) {
+    return 'starting soon...';
+  } else {
+    const n = Math.floor(estimatedWaitTimeLeftSeconds / (10 * 60)) + 1;
+    return `starting in about ${n}0 minutes...`;
+  }
+}
+
+function formatAccountSubscriptionsUrl(accountName: string): string {
+  return new URL(
+    `/accounts/${accountName}/settings/subscriptions`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
 }

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

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

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,143 +1,53 @@
 import { ExpoConfig } from '@expo/config';
-import { 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 { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 
-import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { findAccountByName } from '../user/Account';
+import { TrackingContext } from '../analytics/common';
+import { CredentialsContext } from '../credentials/context';
+import { Target } from '../credentials/ios/types';
+import { BuildResourceClass } from '../graphql/generated';
+import { GradleBuildContext } from '../project/android/gradle';
+import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
-import { ensureLoggedInAsync } from '../user/actions';
-import { Platform, RequestedPlatform, TrackingContext } from './types';
-import Analytics, { Event } from './utils/analytics';
+import { LocalBuildOptions } from './local';
 
-export interface ConfigureContext {
-  user: Actor;
-  projectDir: string;
-  exp: ExpoConfig;
-  requestedPlatform: RequestedPlatform;
-  shouldConfigureAndroid: boolean;
-  shouldConfigureIos: boolean;
-  hasAndroidNativeProject: boolean;
-  hasIosNativeProject: boolean;
+export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
+
+export interface AndroidBuildContext {
+  applicationId: string;
+  gradleContext?: GradleBuildContext;
+  versionCodeOverride?: string;
+}
+
+export interface IosBuildContext {
+  bundleIdentifier: string;
+  applicationTarget: Target;
+  targets: Target[];
+  xcodeBuildContext: XcodeBuildContext;
+  buildNumberOverride?: string;
 }
 
 export interface BuildContext<T extends Platform> {
   accountName: string;
+  easJsonCliConfig: EasJson['cli'];
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
+  resourceClass: BuildResourceClass;
   clearCache: boolean;
+  credentialsCtx: CredentialsContext;
   exp: ExpoConfig;
-  local: boolean;
+  localBuildOptions: LocalBuildOptions;
   nonInteractive: boolean;
+  noWait: boolean;
+  runFromCI: boolean;
   platform: T;
   projectDir: string;
   projectId: string;
   projectName: string;
-  skipProjectConfiguration: boolean;
+  message?: string;
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;
-}
-
-export async function createBuildContextAsync<T extends Platform>({
-  buildProfileName,
-  buildProfile,
-  clearCache = false,
-  local,
-  nonInteractive = false,
-  platform,
-  projectDir,
-  skipProjectConfiguration = false,
-}: {
-  buildProfileName: string;
-  buildProfile: BuildProfile<T>;
-  clearCache: boolean;
-  local: boolean;
-  nonInteractive: boolean;
-  platform: T;
-  projectDir: string;
-  skipProjectConfiguration: boolean;
-}): Promise<BuildContext<T>> {
-  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
-
-  const user = await ensureLoggedInAsync();
-  const accountName = getProjectAccountName(exp, user);
-  const projectName = exp.slug;
-  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
-
-  const workflow = await resolveWorkflowAsync(projectDir, platform);
-  const accountId = findAccountByName(user.accounts, accountName)?.id;
-  const devClientProperties = getDevClientEventProperties({
-    platform,
-    projectDir,
-    buildProfile,
-  });
-  const trackingCtx = {
-    tracking_id: uuidv4(),
-    platform,
-    ...(accountId && { account_id: accountId }),
-    account_name: accountName,
-    project_id: projectId,
-    project_type: workflow,
-    ...devClientProperties,
-  };
-  Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
-  return {
-    accountName,
-    buildProfile,
-    buildProfileName,
-    clearCache,
-    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;
-  }
+  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
+  ios: T extends Platform.IOS ? IosBuildContext : undefined;
 }

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

@@ -0,0 +1,157 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile, EasJson } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+import getenv from 'getenv';
+import resolveFrom from 'resolve-from';
+import { v4 as uuidv4 } from 'uuid';
+
+import { TrackingContext } from '../analytics/common';
+import { Analytics, BuildEvent } from '../analytics/events';
+import { CredentialsContext } from '../credentials/context';
+import { BuildResourceClass } from '../graphql/generated';
+import { getExpoConfig } from '../project/expoConfig';
+import { getOwnerAccountForProjectIdAsync, getProjectIdAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { ensureLoggedInAsync } from '../user/actions';
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+
+export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  easJsonCliConfig,
+  clearCache = false,
+  localBuildOptions,
+  nonInteractive,
+  noWait,
+  platform,
+  projectDir,
+  resourceClass,
+  message,
+}: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  easJsonCliConfig: EasJson['cli'];
+  clearCache: boolean;
+  localBuildOptions: LocalBuildOptions;
+  nonInteractive: boolean;
+  noWait: boolean;
+  platform: T;
+  projectDir: string;
+  resourceClass: BuildResourceClass;
+  message?: string;
+}): Promise<BuildContext<T>> {
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
+  const user = await ensureLoggedInAsync({ nonInteractive });
+  const projectName = exp.slug;
+  const projectId = await getProjectIdAsync(exp, {
+    env: buildProfile.env,
+    nonInteractive,
+  });
+  const account = await getOwnerAccountForProjectIdAsync(projectId);
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
+  const accountId = account.id;
+  const runFromCI = getenv.boolish('CI', false);
+
+  const credentialsCtx = new CredentialsContext({
+    exp,
+    nonInteractive,
+    projectDir,
+    user,
+    env: buildProfile.env,
+    easJsonCliConfig,
+  });
+
+  const devClientProperties = getDevClientEventProperties({
+    platform,
+    projectDir,
+    buildProfile,
+  });
+  const trackingCtx = {
+    tracking_id: uuidv4(),
+    platform,
+    ...(accountId && { account_id: accountId }),
+    project_id: projectId,
+    project_type: workflow,
+    ...devClientProperties,
+    no_wait: noWait,
+    run_from_ci: runFromCI,
+  };
+  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
+
+  const commonContext: CommonContext<T> = {
+    accountName: account.name,
+    buildProfile,
+    buildProfileName,
+    resourceClass,
+    easJsonCliConfig,
+    clearCache,
+    credentialsCtx,
+    exp,
+    localBuildOptions,
+    nonInteractive,
+    noWait,
+    platform,
+    projectDir,
+    projectId,
+    projectName,
+    trackingCtx,
+    user,
+    workflow,
+    message,
+    runFromCI,
+  };
+  if (platform === Platform.ANDROID) {
+    const common = commonContext as CommonContext<Platform.ANDROID>;
+    return {
+      ...common,
+      android: await createAndroidContextAsync(common),
+    } as BuildContext<T>;
+  } else {
+    const common = commonContext as CommonContext<Platform.IOS>;
+    return {
+      ...common,
+      ios: await createIosContextAsync(common),
+    } as BuildContext<T>;
+  }
+}
+
+function getDevClientEventProperties({
+  platform,
+  projectDir,
+  buildProfile,
+}: {
+  platform: Platform;
+  projectDir: string;
+  buildProfile: BuildProfile;
+}): Partial<TrackingContext> {
+  let includesDevClient;
+  const version = tryGetDevClientVersion(projectDir);
+  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
+  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+  } else if (buildProfile.developmentClient) {
+    includesDevClient = true;
+  } else {
+    includesDevClient = false;
+  }
+
+  if (version) {
+    return { dev_client: includesDevClient, dev_client_version: version };
+  } else {
+    return { dev_client: includesDevClient };
+  }
+}
+
+function tryGetDevClientVersion(projectDir: string): string | null {
+  try {
+    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
+    return pkg.version?.toString() ?? null;
+  } catch {
+    return null;
+  }
+}

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

@@ -1,107 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
-import fs from 'fs-extra';
-
-import Log from '../../log';
-import { getProjectAccountName } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
-import { ensureValidVersions } from '../utils/updates';
-import { readPlistAsync, writePlistAsync } from './plist';
-
-export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  ensureValidVersions(exp);
-  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  let xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-
-  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
-    xcodeProject = IOSConfig.Updates.ensureBundleReactNativePhaseContainsConfigurationScript(
-      projectDir,
-      xcodeProject
-    );
-    await fs.writeFile(IOSConfig.Paths.getPBXProjectPath(projectDir), xcodeProject.writeSync());
-  }
-
-  let expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-    expoPlist = IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
-    await writeExpoPlistAsync(projectDir, expoPlist);
-  }
-  // TODO: ensure ExpoPlist in pbxproj
-}
-
-export async function syncUpdatesConfigurationAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<void> {
-  ensureValidVersions(exp);
-  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  try {
-    await ensureUpdatesConfiguredAsync(projectDir, exp);
-  } catch (error) {
-    Log.error(
-      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
-    );
-    throw error;
-  }
-
-  let expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistVersionConfigurationSynced(exp, expoPlist)) {
-    expoPlist = IOSConfig.Updates.setVersionsConfig(exp, expoPlist);
-    await writeExpoPlistAsync(projectDir, expoPlist);
-  }
-
-  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-    Log.warn(
-      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
-    );
-  }
-}
-
-async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-
-  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
-    const script = 'expo-updates/scripts/create-manifest-ios.sh';
-    const buildPhase = '"Bundle React Native code and images"';
-    throw new Error(`Path to ${script} is missing in a ${buildPhase} build phase.`);
-  }
-
-  const expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
-    throw new Error('Missing values in Expo.plist');
-  }
-}
-
-async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
-  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  return (await readPlistAsync(expoPlistPath)) as IOSConfig.ExpoPlist;
-}
-
-async function writeExpoPlistAsync(
-  projectDir: string,
-  expoPlist: IOSConfig.ExpoPlist
-): Promise<void> {
-  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  await writePlistAsync(expoPlistPath, expoPlist);
-  await vcs.trackFileAsync(expoPlistPath);
-}
-
-export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
-  try {
-    const expoPlist = await readExpoPlistAsync(projectDir);
-    return expoPlist[IOSConfig.Updates.Config.RELEASE_CHANNEL] ?? null;
-  } catch (err) {
-    return null;
-  }
-}
-
-export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
-  try {
-    const expoPlist: any = await readExpoPlistAsync(projectDir); // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
-    const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'] ?? {}; //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
-    return updatesRequestHeaders['expo-channel-name'] ?? null;
-  } catch (err) {
-    return null;
-  }
-}

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

@@ -3,40 +3,89 @@ import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import type { XCBuildConfiguration } from 'xcode';
 
-import { readPlistAsync } from '../plist';
+import { readPlistAsync } from '../../../utils/plist';
 import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
+  evaluateTemplateString,
+  getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
 } from '../version';
 
 jest.mock('fs');
 
-afterAll(() => {
+const getXCBuildConfigurationFromPbxproj = jest.spyOn(
+  IOSConfig.Target,
+  'getXCBuildConfigurationFromPbxproj'
+);
+const getPbxproj = jest.spyOn(IOSConfig.XcodeUtils, 'getPbxproj');
+
+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());
 });
 
-// generic workflow
-describe(bumpVersionAsync, () => {
-  it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
-    const fakeExp = initGenericProject();
+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'
+    );
+  });
+});
 
+// bare workflow
+describe(bumpVersionAsync, () => {
+  beforeEach(() => {
+    getPbxproj.mockImplementation(() => ({} as any));
+  });
+  afterEach(() => {
+    getXCBuildConfigurationFromPbxproj.mockReset();
+    getPbxproj.mockReset();
+  });
+  it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
+    const fakeExp = initBareWorkflowProject();
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -51,13 +100,63 @@ describe(bumpVersionAsync, () => {
     expect(infoPlist['CFBundleVersion']).toBe('2');
   });
 
-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
-    const fakeExp = initGenericProject();
+  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
+    const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });
 
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
+    });
+
+    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.APP_VERSION', async () => {
+    const fakeExp = initBareWorkflowProject();
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
+    await bumpVersionAsync({
+      bumpStrategy: BumpStrategy.APP_VERSION,
+      projectDir: '/repo',
+      exp: fakeExp,
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -73,12 +172,26 @@ describe(bumpVersionAsync, () => {
   });
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initGenericProject();
-
+    const fakeExp = initBareWorkflowProject();
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
       projectDir: '/repo',
       exp: fakeExp,
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -116,7 +229,7 @@ describe(bumpVersionInAppJsonAsync, () => {
     const fakeExp = initManagedProject();
 
     await bumpVersionInAppJsonAsync({
-      bumpStrategy: BumpStrategy.SHORT_VERSION,
+      bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
     });
@@ -146,9 +259,9 @@ describe(bumpVersionInAppJsonAsync, () => {
 });
 
 describe(readBuildNumberAsync, () => {
-  describe('generic project', () => {
+  describe('bare project', () => {
     it('reads the build number from native code', async () => {
-      const exp = initGenericProject();
+      const exp = initBareWorkflowProject();
       const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
@@ -164,15 +277,15 @@ describe(readBuildNumberAsync, () => {
 });
 
 describe(readShortVersionAsync, () => {
-  describe('generic project', () => {
+  describe('bare 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 exp = initBareWorkflowProject();
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
-      const exp = initGenericProject({
-        shortVersion: '$(CURRENT_PROJECT_VERSION)',
+      const exp = initBareWorkflowProject({
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
       const buildNumber = await readShortVersionAsync('/repo', exp, {
         CURRENT_PROJECT_VERSION: '1.0.0',
@@ -183,41 +296,97 @@ describe(readShortVersionAsync, () => {
 
   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 exp = initBareWorkflowProject();
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
+      expect(appVersion).toBe('1.0.0');
     });
   });
 });
 
-function initGenericProject({
-  shortVersion = '1.0.0',
-  version = '1',
-}: { shortVersion?: string; version?: string } = {}): 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 initBareWorkflowProject({
+  appVersion = '1.0.0',
+  buildNumber = '1',
+  infoPlistName = 'Info.plist',
+}: { appVersion?: string; buildNumber?: 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>${shortVersion}</string>
+  <string>${appVersion}</string>
   <key>CFBundleVersion</key>
-  <string>${version}</string>
+  <string>${buildNumber}</string>
 </dict>
 </plist>`,
     },
     '/repo'
   );
 
+  return fakeExp;
+}
+
+function initManagedProject(): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -226,31 +395,15 @@ function initGenericProject({
       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,25 +1,25 @@
-import { IOSConfig } from '@expo/config-plugins';
-import { Ios, Job, Metadata, Workflow } from '@expo/eas-build-job';
+import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { AppVersionSource } from '@expo/eas-json';
 
 import { IosCredentials } from '../../credentials/ios/types';
+import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext } from '../context';
+import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import { IosMetadataContext } from '../metadata';
-import { Platform } from '../types';
 import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
-import { validateAndSyncProjectConfigurationAsync } from './configure';
 import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteBuildNumberAsync } from './version';
 
-export async function prepareIosBuildAsync(
-  ctx: BuildContext<Platform.IOS>
-): Promise<BuildRequestSender> {
+export async function createIosContextAsync(
+  ctx: CommonContext<Platform.IOS>
+): Promise<IosBuildContext> {
   const { buildProfile } = ctx;
 
   if (ctx.workflow === Workflow.MANAGED) {
@@ -37,49 +37,66 @@ export async function prepareIosBuildAsync(
     },
     buildProfile
   );
-  const targets = await resolveTargetsAsync(
-    {
-      projectDir: ctx.projectDir,
-      exp: ctx.exp,
-    },
-    xcodeBuildContext
-  );
+  const targets = await resolveTargetsAsync({
+    projectDir: ctx.projectDir,
+    exp: ctx.exp,
+    xcodeBuildContext,
+    env: buildProfile.env,
+  });
+  const applicationTarget = findApplicationTarget(targets);
+  const buildNumberOverride =
+    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+      ? await resolveRemoteBuildNumberAsync({
+          projectDir: ctx.projectDir,
+          projectId: ctx.projectId,
+          exp: ctx.exp,
+          applicationTarget,
+          buildProfile,
+        })
+      : undefined;
+  return {
+    bundleIdentifier: applicationTarget.bundleIdentifier,
+    applicationTarget,
+    targets,
+    xcodeBuildContext,
+    buildNumberOverride,
+  };
+}
 
+export async function prepareIosBuildAsync(
+  ctx: BuildContext<Platform.IOS>
+): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
-      return ensureIosCredentialsAsync(ctx, targets);
+      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
-    ensureProjectConfiguredAsync: async () => {
-      await validateAndSyncProjectConfigurationAsync({
+    syncProjectConfigurationAsync: async () => {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
-        buildProfile,
+        targets: ctx.ios.targets,
+        localAutoIncrement:
+          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
+            ? false
+            : ctx.buildProfile.autoIncrement,
+        nonInteractive: ctx.nonInteractive,
       });
     },
-    getMetadataContext: (): IosMetadataContext => {
-      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 };
-    },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.IOS>,
       jobData: JobData<IosCredentials>
     ): Promise<Job> => {
-      return await prepareJobAsync(ctx, { ...jobData, buildScheme: xcodeBuildContext.buildScheme });
+      return await prepareJobAsync(ctx, {
+        ...jobData,
+        buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
+      });
     },
     sendBuildRequestAsync: async (
       appId: string,
       job: Ios.Job,
-      metadata: Metadata
+      metadata: Metadata,
+      buildParams: BuildParamsInput
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
@@ -87,6 +104,7 @@ export async function prepareIosBuildAsync(
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
+        buildParams,
       });
     },
   });

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

@@ -1,63 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { IosBuildProfile, VersionAutoIncrement } from '@expo/eas-json';
-
-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';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
-
-export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
-  if (!ctx.hasIosNativeProject) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
-    return;
-  }
-
-  warnIfBundleIdentifierDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
-
-  if (isExpoUpdatesInstalled(ctx.projectDir)) {
-    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
-  }
-  Log.withTick('iOS project configured');
-}
-
-export async function validateAndSyncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  buildProfile,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  buildProfile: IosBuildProfile;
-}): Promise<void> {
-  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 });
-  } else {
-    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  }
-}
-
-function resolveVersionBumpStrategy(autoIncrement: VersionAutoIncrement): BumpStrategy {
-  if (autoIncrement === true) {
-    return BumpStrategy.BUILD_NUMBER;
-  } else if (autoIncrement === false) {
-    return BumpStrategy.NOOP;
-  } else if (autoIncrement === 'buildNumber') {
-    return BumpStrategy.BUILD_NUMBER;
-  } else {
-    return BumpStrategy.SHORT_VERSION;
-  }
-}

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

@@ -1,11 +1,10 @@
-import { createCredentialsContextAsync } from '../../credentials/context';
+import { Platform } from '@expo/eas-build-job';
+
 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
-import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
-import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
+import { getAppFromContextAsync } from '../../credentials/ios/actions/BuildCredentialsUtils';
 import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 import { logCredentialsSource } from '../utils/credentials';
 
 export async function ensureIosCredentialsAsync(
@@ -16,17 +15,9 @@ export async function ensureIosCredentialsAsync(
     return;
   }
 
-  const credentialsCtx = await createCredentialsContextAsync(buildCtx.projectDir, {
-    exp: buildCtx.exp,
-    nonInteractive: buildCtx.nonInteractive,
-  });
-
-  const provider = new IosCredentialsProvider(credentialsCtx, {
-    app: getAppFromContext(credentialsCtx),
+  const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
+    app: await getAppFromContextAsync(buildCtx.credentialsCtx),
     targets,
-    iosCapabilitiesOptions: {
-      entitlements: await resolveEntitlementsJsonAsync(buildCtx.projectDir, buildCtx.workflow),
-    },
     distribution: buildCtx.buildProfile.distribution ?? 'store',
     enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
   });

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

@@ -1,12 +1,7 @@
-import { Env, Ios } from '@expo/eas-build-job';
+import { Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';
 
-import {
-  DistributionType,
-  IosBuildType,
-  IosJobInput,
-  IosJobSecretsInput,
-} from '../../graphql/generated';
+import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
 import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
@@ -16,33 +11,23 @@ export function transformJob(job: Ios.Job): IosJobInput {
     projectRootDirectory: job.projectRootDirectory,
     releaseChannel: job.releaseChannel,
     updates: job.updates,
-    distribution: job.distribution && transformDistributionType(job.distribution),
     secrets: transformIosSecrets(job.secrets),
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
-
+    version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
     scheme: job.scheme,
     buildConfiguration: job.buildConfiguration,
-    artifactPath: job.artifactPath,
-
-    buildType: job.buildType && transformBuildType(job.buildType),
+    applicationArchivePath: job.applicationArchivePath,
+    buildArtifactPaths: job.buildArtifactPaths,
     username: job.username,
+    developmentClient: job.developmentClient,
+    simulator: job.simulator,
+    experimental: job.experimental,
   };
 }
 
-function transformDistributionType(distributionType: Ios.DistributionType): DistributionType {
-  if (distributionType === 'store') {
-    return DistributionType.Store;
-  } else if (distributionType === 'internal') {
-    return DistributionType.Internal;
-  } else {
-    return DistributionType.Simulator;
-  }
-}
-
 function transformIosSecrets(secrets: {
   buildCredentials?: Ios.BuildCredentials;
-  env?: Env;
 }): IosJobSecretsInput {
   const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];
 
@@ -58,14 +43,5 @@ function transformIosSecrets(secrets: {
 
   return {
     buildCredentials,
-    environmentSecrets: secrets.env,
   };
 }
-
-function transformBuildType(buildType: Ios.BuildType): IosBuildType {
-  if (buildType === Ios.BuildType.DEVELOPMENT_CLIENT) {
-    return IosBuildType.DevelopmentClient;
-  } else {
-    return IosBuildType.Release;
-  }
-}

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

@@ -1,13 +1,12 @@
-import { ArchiveSource, Ios, Job, sanitizeJob } from '@expo/eas-build-job';
+import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
-import semver from 'semver';
+import slash from 'slash';
 
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
-import { Platform } from '../types';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -25,8 +24,12 @@ export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Job> {
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
-  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const projectRootDirectory =
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
+  const username = getUsername(
+    ctx.exp,
+    await ensureLoggedInAsync({ nonInteractive: ctx.nonInteractive })
+  );
   const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
   if (jobData.credentials) {
     const targetNames = Object.keys(jobData.credentials);
@@ -40,9 +43,8 @@ export async function prepareJobAsync(
     platform: Platform.IOS,
     projectArchive: jobData.projectArchive,
     projectRootDirectory,
-    distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
     builderEnvironment: {
-      image: resolveImage(ctx),
+      image: ctx.buildProfile.image,
       node: ctx.buildProfile.node,
       yarn: ctx.buildProfile.yarn,
       bundler: ctx.buildProfile.bundler,
@@ -61,30 +63,26 @@ export async function prepareJobAsync(
     },
     releaseChannel: ctx.buildProfile.releaseChannel,
     updates: { channel: ctx.buildProfile.channel },
-
+    developmentClient: ctx.buildProfile.developmentClient,
+    simulator: ctx.buildProfile.simulator,
     scheme: jobData.buildScheme,
     buildConfiguration: ctx.buildProfile.buildConfiguration,
-    artifactPath: ctx.buildProfile.artifactPath,
-
-    buildType: ctx.buildProfile.developmentClient
-      ? Ios.BuildType.DEVELOPMENT_CLIENT
-      : Ios.BuildType.RELEASE,
+    applicationArchivePath:
+      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
+    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
     username,
+    ...(ctx.ios.buildNumberOverride && {
+      version: {
+        buildNumber: ctx.ios.buildNumberOverride,
+      },
+    }),
+    experimental: {
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
+    },
   };
   return sanitizeJob(job);
 }
 
-function resolveImage(ctx: BuildContext<Platform.IOS>): Ios.BuilderEnvironment['image'] {
-  // see https://linear.app/expo/issue/ENG-1396/make-default-image-dependent-on-sdk-version
-  if (!ctx.buildProfile.image && ctx.exp.sdkVersion) {
-    const majorSdkVersion = semver.major(ctx.exp.sdkVersion);
-    if (majorSdkVersion <= 41) {
-      return 'macos-catalina-10.15-xcode-12.4';
-    }
-  }
-  return ctx.buildProfile.image ?? 'default';
-}
-
 function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {
   return {
     provisioningProfileBase64: targetCredentials.provisioningProfile,

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

@@ -0,0 +1,47 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { IosVersionAutoIncrement } from '@expo/eas-json';
+
+import { Target } from '../../credentials/ios/types';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  targets,
+  localAutoIncrement,
+  nonInteractive,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  targets: Target[];
+  localAutoIncrement?: IosVersionAutoIncrement;
+  nonInteractive: boolean;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
+
+  if (workflow === Workflow.GENERIC) {
+    if (isExpoUpdatesInstalled(projectDir)) {
+      await syncUpdatesConfigurationAsync(projectDir, exp, { nonInteractive });
+    }
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
+  } else {
+    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  }
+}
+
+function resolveVersionBumpStrategy(autoIncrement: IosVersionAutoIncrement): BumpStrategy {
+  if (autoIncrement === true) {
+    return BumpStrategy.BUILD_NUMBER;
+  } else if (autoIncrement === false) {
+    return BumpStrategy.NOOP;
+  } else if (autoIncrement === 'buildNumber') {
+    return BumpStrategy.BUILD_NUMBER;
+  } else {
+    return BumpStrategy.APP_VERSION;
+  }
+}

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

@@ -1,20 +1,28 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
+import { ExpoConfig } from '@expo/config';
+import { IOSConfig, Updates } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';
-import semver from 'semver';
+import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';
 
+import { Target } from '../../credentials/ios/types';
+import { AppPlatform } from '../../graphql/generated';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
+import { ora } from '../../ora';
+import { findApplicationTarget } from '../../project/ios/target';
+import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
+import uniqBy from '../../utils/expodash/uniqBy';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { evaluateString } from '../utils/template';
-import { readPlistAsync, writePlistAsync } from './plist';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
 export enum BumpStrategy {
-  SHORT_VERSION,
+  APP_VERSION,
   BUILD_NUMBER,
   NOOP,
 }
@@ -23,19 +31,25 @@ export async function bumpVersionAsync({
   bumpStrategy,
   projectDir,
   exp,
+  targets,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   bumpStrategy: BumpStrategy;
+  targets: Target[];
 }): Promise<void> {
   if (bumpStrategy === BumpStrategy.NOOP) {
     return;
   }
   ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist });
+  await updateNativeVersionsAsync({
+    projectDir,
+    version: exp.version,
+    buildNumber: exp.ios?.buildNumber,
+    targets,
+  });
   Log.log('Synchronized versions with Info.plist');
 }
 
@@ -53,35 +67,13 @@ 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+)*$/)) {
-      const comps = buildNumber.split('.');
-      comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
-      const bumpedBuildNumber = comps.join('.');
+    if (isValidBuildNumber(buildNumber)) {
+      const bumpedBuildNumber = getNextBuildNumber(buildNumber);
       Log.log(
         `Bumping ${chalk.bold('expo.ios.buildNumber')} from ${chalk.bold(
           buildNumber
@@ -111,10 +103,10 @@ export async function readShortVersionAsync(
 ): Promise<string | undefined> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
       infoPlist.CFBundleShortVersionString &&
-      evaluateString(infoPlist.CFBundleShortVersionString, buildSettings)
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
     );
   } else {
     return exp.version;
@@ -128,47 +120,236 @@ export async function readBuildNumberAsync(
 ): Promise<string | undefined> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
-    const infoPlist = await readInfoPlistAsync(projectDir);
-    return infoPlist.CFBundleVersion && evaluateString(infoPlist.CFBundleVersion, buildSettings);
+    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
+    return (
+      infoPlist.CFBundleVersion && evaluateTemplateString(infoPlist.CFBundleVersion, buildSettings)
+    );
   } else {
     return IOSConfig.Version.getBuildNumber(exp);
   }
 }
 
-async function writeVersionsToInfoPlistAsync({
+export async function maybeResolveVersionsAsync(
+  projectDir: string,
+  exp: ExpoConfig,
+  targets: Target[]
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  const applicationTarget = findApplicationTarget(targets);
+  try {
+    return {
+      appBuildVersion: await readBuildNumberAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
+      appVersion: await readShortVersionAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
+    };
+  } catch (err: any) {
+    Log.warn('Failed to read app versions.');
+    Log.debug(err);
+    Log.warn(err.message);
+    Log.warn('Proceeding anyway...');
+    return {};
+  }
+}
+
+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;
+}
+
+export async function updateNativeVersionsAsync({
   projectDir,
-  exp,
-  infoPlist,
+  version,
+  buildNumber,
+  targets,
 }: {
   projectDir: string;
-  exp: ExpoConfig;
-  infoPlist: IOSConfig.InfoPlist;
-}): Promise<IOSConfig.InfoPlist> {
-  let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
-  updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist });
-  return updatedInfoPlist;
+  version?: string;
+  buildNumber?: string;
+  targets: Target[];
+}): Promise<void> {
+  const project = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+  const iosDir = path.join(projectDir, 'ios');
+
+  const infoPlistFiles: string[] = [];
+  for (const target of targets) {
+    const { targetName, buildConfiguration } = target;
+    const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+      targetName,
+      buildConfiguration,
+    });
+    const infoPlist = xcBuildConfiguration?.buildSettings?.INFOPLIST_FILE;
+    if (infoPlist) {
+      const evaluatedInfoPlistPath = trimQuotes(
+        evaluateTemplateString(infoPlist, {
+          SRCROOT: iosDir,
+        })
+      );
+      const absolutePath = path.isAbsolute(evaluatedInfoPlistPath)
+        ? evaluatedInfoPlistPath
+        : path.join(iosDir, evaluatedInfoPlistPath);
+      infoPlistFiles.push(path.normalize(absolutePath));
+    }
+  }
+  const uniqueInfoPlistPaths = uniqBy(infoPlistFiles, i => i);
+  for (const infoPlistPath of uniqueInfoPlistPaths) {
+    const infoPlist = (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+    if (buildNumber) {
+      infoPlist.CFBundleVersion = buildNumber;
+    }
+    if (version) {
+      infoPlist.CFBundleShortVersionString = version;
+    }
+    await writePlistAsync(infoPlistPath, infoPlist);
+  }
+}
+
+function trimQuotes(s: string): string {
+  return s?.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s;
 }
 
-async function readInfoPlistAsync(projectDir: string): Promise<IOSConfig.InfoPlist> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
-  return (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+export function evaluateTemplateString(
+  s: string,
+  buildSettings: XCBuildConfiguration['buildSettings']
+): string {
+  // necessary because XCBuildConfiguration['buildSettings'] is not a plain object
+  const vars = { ...buildSettings };
+  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;
+    }
+  });
 }
 
-async function writeInfoPlistAsync({
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+export async function resolveRemoteBuildNumberAsync({
   projectDir,
-  infoPlist,
+  projectId,
+  exp,
+  applicationTarget,
+  buildProfile,
 }: {
   projectDir: string;
-  infoPlist: IOSConfig.InfoPlist;
-}): Promise<void> {
-  const infoPlistPath = IOSConfig.Paths.getInfoPlistPath(projectDir);
-  await writePlistAsync(infoPlistPath, infoPlist);
-}
+  projectId: string;
+  exp: ExpoConfig;
+  applicationTarget: Target;
+  buildProfile: BuildProfile<Platform.IOS>;
+}): Promise<string> {
+  const remoteVersions = await AppVersionQuery.latestVersionAsync(
+    projectId,
+    AppPlatform.Ios,
+    applicationTarget.bundleIdentifier
+  );
 
-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');
+  const localBuildNumber = await readBuildNumberAsync(
+    projectDir,
+    exp,
+    applicationTarget.buildSettings ?? {}
+  );
+  const localShortVersion = await readShortVersionAsync(
+    projectDir,
+    exp,
+    applicationTarget.buildSettings ?? {}
+  );
+  let currentBuildVersion: string;
+  if (remoteVersions?.buildVersion) {
+    currentBuildVersion = remoteVersions.buildVersion;
+  } else {
+    if (localBuildNumber) {
+      Log.warn(
+        'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
+      );
+      currentBuildVersion = localBuildNumber;
+    } else {
+      Log.error(
+        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
+      );
+      throw new Error('Remote versions are not configured.');
+    }
+  }
+  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
+    return currentBuildVersion;
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
+    const spinner = ora(
+      `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Ios,
+        applicationIdentifier: applicationTarget.bundleIdentifier,
+        storeVersion: localShortVersion ?? '1.0.0',
+        buildVersion: currentBuildVersion,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+      });
+      spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
+    } catch (err) {
+      spinner.fail(`Failed to initialize buildNumber with ${chalk.bold(currentBuildVersion)}.`);
+      throw err;
+    }
+    return currentBuildVersion;
+  } else {
+    const nextBuildVersion = getNextBuildNumber(currentBuildVersion);
+    const spinner = ora(
+      `Incrementing buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+        nextBuildVersion
+      )}.`
+    ).start();
+    try {
+      await AppVersionMutation.createAppVersionAsync({
+        appId: projectId,
+        platform: AppPlatform.Ios,
+        applicationIdentifier: applicationTarget.bundleIdentifier,
+        storeVersion: localShortVersion ?? '1.0.0',
+        buildVersion: nextBuildVersion,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+      });
+      spinner.succeed(
+        `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+    } catch (err) {
+      spinner.fail(
+        `Failed to increment buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
+          nextBuildVersion
+        )}.`
+      );
+      throw err;
+    }
+    return nextBuildVersion;
   }
 }

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

@@ -1,45 +1,87 @@
-import { Job } from '@expo/eas-build-job';
+import { Job, Metadata } from '@expo/eas-build-job';
 import spawnAsync from '@expo/spawn-async';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
+import { ChildProcess } from 'child_process';
+import semver from 'semver';
 
-import Log from '../log';
+import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
+const PLUGIN_PACKAGE_VERSION = '0.0.99';
 
-export async function runLocalBuildAsync(job: Job): Promise<void> {
-  const execNameOrPath =
-    process.env.EAS_LOCAL_BUILD_PLUGIN_PATH ??
-    (await findWithNodeResolution()) ??
-    PLUGIN_PACKAGE_NAME;
-  try {
-    const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
-    await spawnAsync(execNameOrPath, [arg], {
-      stdio: 'inherit',
-    });
-  } catch (err) {
-    if (err.code === 'ENOENT') {
-      Log.warn(`Could not resolve executable ${execNameOrPath}.`);
-      Log.warn(
-        `Install ${PLUGIN_PACKAGE_NAME} package from npm e.g. ${chalk.bold(
-          `npm install -g ${PLUGIN_PACKAGE_NAME}`
-        )} and make sure it's in PATH.`
-      );
-      throw err;
+export interface LocalBuildOptions {
+  enable: boolean;
+  skipCleanup?: boolean;
+  skipNativeBuild?: boolean;
+  artifactsDir?: string;
+  artifactPath?: string;
+  workingdir?: string;
+  verbose?: boolean;
+}
+
+export async function runLocalBuildAsync(
+  job: Job,
+  metadata: Metadata,
+  options: LocalBuildOptions
+): Promise<void> {
+  const { command, args } = await getCommandAndArgsAsync(job, metadata);
+  let spinner;
+  if (!options.verbose) {
+    spinner = ora().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
+  }
+  let childProcess: ChildProcess | undefined;
+  const interruptHandler = (): void => {
+    if (childProcess) {
+      childProcess.kill();
     }
+  };
+  process.on('SIGINT', interruptHandler);
+  try {
+    const spawnPromise = spawnAsync(command, args, {
+      stdio: options.verbose ? 'inherit' : 'pipe',
+      env: {
+        ...process.env,
+        EAS_LOCAL_BUILD_WORKINGDIR: options.workingdir ?? process.env.EAS_LOCAL_BUILD_WORKINGDIR,
+        ...(options.skipCleanup || options.skipNativeBuild
+          ? { EAS_LOCAL_BUILD_SKIP_CLEANUP: '1' }
+          : {}),
+        ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
+        ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
+        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
+      },
+    });
+    childProcess = spawnPromise.child;
+    await spawnPromise;
+  } finally {
+    process.removeListener('SIGINT', interruptHandler);
+    spinner?.stop();
   }
 }
 
-async function findWithNodeResolution(): Promise<string | undefined> {
-  try {
-    const resolvedPath = path.resolve(
-      path.dirname(require.resolve(PLUGIN_PACKAGE_NAME)),
-      '../bin/run'
-    );
-    if (await fs.pathExists(resolvedPath)) {
-      return resolvedPath;
+async function getCommandAndArgsAsync(
+  job: Job,
+  metadata: Metadata
+): Promise<{ command: string; args: string[] }> {
+  const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
+  if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
+    return {
+      command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
+      args: [jobAndMetadataBase64],
+    };
+  } else {
+    const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
+    if (await isAtLeastNpm7Async()) {
+      // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
+      // prompting the user to install a package that is used for the first time
+      args.unshift('-y');
     }
-  } catch {}
-  return undefined;
+    return {
+      command: 'npx',
+      args,
+    };
+  }
+}
+
+async function isAtLeastNpm7Async(): Promise<boolean> {
+  const version = (await spawnAsync('npm', ['--version'])).stdout.trim();
+  return semver.gte(version, '7.0.0');
 }

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

@@ -1,107 +1,111 @@
-import { Metadata, sanitizeMetadata } from '@expo/eas-build-job';
+import { Updates } from '@expo/config-plugins';
+import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import fs from 'fs-extra';
+import resolveFrom from 'resolve-from';
 
-import { getApplicationIdAsync } from '../project/android/applicationId';
-import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
-import { getUsername } from '../project/projectUtils';
-import { ensureLoggedInAsync } from '../user/actions';
-import vcs from '../vcs';
+import Log from '../log';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
-} from './android/UpdatesModule';
-import { readVersionCodeAsync, readVersionNameAsync } from './android/version';
-import { BuildContext } from './context';
+} from '../update/android/UpdatesModule';
 import {
   readChannelSafelyAsync as readIosChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from './ios/UpdatesModule';
-import { readBuildNumberAsync, readShortVersionAsync } from './ios/version';
-import { Platform } from './types';
-import { isExpoUpdatesInstalled } from './utils/updates';
+} from '../update/ios/UpdatesModule';
+import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../../package.json');
-
-export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
-  ? object
-  : IosMetadataContext;
-
-export interface IosMetadataContext {
-  buildSettings: XCBuildConfiguration['buildSettings'];
-}
-
-export async function collectMetadata<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext?: MetadataContext<T>
+export async function collectMetadataAsync<T extends Platform>(
+  ctx: BuildContext<T>
 ): Promise<Metadata> {
+  const vcsClient = getVcsClient();
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   const distribution =
     ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
       ? 'simulator'
       : ctx.buildProfile.distribution) ?? 'store';
-  const metadata = {
+  const metadata: Metadata = {
     trackingContext: ctx.trackingCtx,
-    appVersion: await resolveAppVersionAsync(ctx, platformContext),
-    appBuildVersion: await resolveAppBuildVersionAsync(ctx, platformContext),
-    cliVersion: packageJSON.version,
+    ...(await maybeResolveVersionsAsync(ctx)),
+    cliVersion: easCliVersion,
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: ctx.exp.runtimeVersion,
+    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    reactNativeVersion: await getReactNativeVersionAsync(ctx),
     ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
-    appIdentifier: await resolveAppIdentifierAsync(ctx),
+    appIdentifier: resolveAppIdentifier(ctx),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await vcs.getCommitHashAsync(),
-    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
+    gitCommitMessage: truncateGitCommitMessage(
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
+    ),
+    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
+    username: getUsername(
+      ctx.exp,
+      await ensureLoggedInAsync({ nonInteractive: ctx.nonInteractive })
+    ),
+    message: ctx.message,
     ...(ctx.platform === Platform.IOS && {
       iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
         ctx as BuildContext<Platform.IOS>
       ),
     }),
+    runWithNoWaitFlag: ctx.noWait,
+    runFromCI: ctx.runFromCI,
   };
   return sanitizeMetadata(metadata);
 }
 
-async function resolveAppVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext?: MetadataContext<T>
-): Promise<string | undefined> {
-  if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext | undefined;
-    return await readShortVersionAsync(ctx.projectDir, ctx.exp, iosContext?.buildSettings ?? {});
-  } else {
-    return await readVersionNameAsync(ctx.projectDir, ctx.exp);
-  }
-}
-
-async function resolveAppBuildVersionAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  platformContext?: MetadataContext<T>
-): Promise<string | undefined> {
-  if (ctx.platform === Platform.IOS) {
-    const iosContext = platformContext as IosMetadataContext | undefined;
-    return await readBuildNumberAsync(ctx.projectDir, ctx.exp, iosContext?.buildSettings ?? {});
-  } else {
-    const versionCode = await readVersionCodeAsync(ctx.projectDir, ctx.exp);
-    return versionCode !== undefined ? String(versionCode) : undefined;
-  }
-}
-
-async function resolveAppIdentifierAsync<T extends Platform>(
+async function maybeResolveVersionsAsync<T extends Platform>(
   ctx: BuildContext<T>
-): Promise<string> {
+): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
-    return await getBundleIdentifierAsync(ctx.projectDir, ctx.exp);
+    const iosContext = ctx as BuildContext<Platform.IOS>;
+    const resolvedVersion = await maybeResolveIosVersionsAsync(
+      ctx.projectDir,
+      ctx.exp,
+      iosContext.ios.targets
+    );
+    if (iosContext.ios.buildNumberOverride) {
+      return {
+        ...resolvedVersion,
+        appBuildVersion: iosContext.ios.buildNumberOverride,
+      };
+    }
+    return resolvedVersion;
+  } else if (ctx.platform === Platform.ANDROID) {
+    const androidCtx = ctx as BuildContext<Platform.ANDROID>;
+    const resolvedVersion = await maybeResolveAndroidVersionsAsync(
+      ctx.projectDir,
+      ctx.exp,
+      androidCtx.buildProfile
+    );
+    if (androidCtx.android.versionCodeOverride) {
+      return {
+        ...resolvedVersion,
+        appBuildVersion: androidCtx.android.versionCodeOverride,
+      };
+    }
+    return resolvedVersion;
   } else {
-    return await getApplicationIdAsync(ctx.projectDir, ctx.exp);
+    throw new Error(`Unsupported platform ${ctx.platform}`);
+  }
+}
+
+function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string {
+  if (ctx.platform === Platform.IOS) {
+    return (ctx as BuildContext<Platform.IOS>).ios.bundleIdentifier;
+  } else {
+    return (ctx as BuildContext<Platform.ANDROID>).android.applicationId;
   }
 }
 
@@ -155,8 +159,31 @@ async function getNativeChannelAsync<T extends Platform>(
   return undefined;
 }
 
+async function getReactNativeVersionAsync(
+  ctx: BuildContext<Platform>
+): Promise<string | undefined> {
+  try {
+    const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
+    return (await fs.readJson(reactNativePackageJsonPath)).version;
+  } catch (err) {
+    Log.debug('Failed to resolve react-native version:');
+    Log.debug(err);
+    return undefined;
+  }
+}
+
 function resolveIosEnterpriseProvisioning(
   ctx: BuildContext<Platform.IOS>
 ): IosEnterpriseProvisioning | undefined {
   return ctx.buildProfile.enterpriseProvisioning;
 }
+
+export function truncateGitCommitMessage(
+  msg: string | undefined,
+  maxLength: number = 4096
+): string | undefined {
+  if (msg === undefined) {
+    return undefined;
+  }
+  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
+}

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

@@ -0,0 +1,70 @@
+import chalk from 'chalk';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { BuildFilter, BuildFragment } from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log from '../log';
+import { printJsonOnlyOutput } from '../utils/json';
+import { paginatedQueryWithConfirmPromptAsync } from '../utils/queries';
+import { formatGraphQLBuild } from './utils/formatBuild';
+
+export const BUILDS_LIMIT = 50;
+
+export async function listAndRenderBuildsOnAppAsync({
+  projectId,
+  projectDisplayName,
+  filter,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  projectDisplayName: string;
+  filter?: BuildFilter;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const builds = await BuildQuery.viewBuildsOnAppAsync({
+      appId: projectId,
+      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      filter,
+    });
+    renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions });
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        BuildQuery.viewBuildsOnAppAsync({
+          appId: projectId,
+          limit,
+          offset,
+          filter,
+        }),
+      promptOptions: {
+        title: 'Load more builds?',
+        renderListItems: builds =>
+          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions }),
+      },
+    });
+  }
+}
+
+function renderPageOfBuilds({
+  builds,
+  projectDisplayName,
+  paginatedQueryOptions,
+}: {
+  builds: BuildFragment[];
+  projectDisplayName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): void {
+  if (paginatedQueryOptions.json) {
+    printJsonOnlyOutput(builds);
+  } else {
+    const list = builds.map(build => formatGraphQLBuild(build)).join(`\n\n${chalk.dim('———')}\n\n`);
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold(`Builds for ${projectDisplayName}:`));
+    Log.log(`\n${list}`);
+  }
+}

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

@@ -0,0 +1,342 @@
+import { Platform, Workflow } from '@expo/eas-build-job';
+import {
+  AppVersionSource,
+  BuildProfile,
+  EasJson,
+  EasJsonAccessor,
+  EasJsonUtils,
+  SubmitProfile,
+} from '@expo/eas-json';
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildResourceClass,
+  BuildStatus,
+  BuildWithSubmissionsFragment,
+  SubmissionFragment,
+} from '../graphql/generated';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
+import Log from '../log';
+import {
+  RequestedPlatform,
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  toPlatforms,
+} from '../platform';
+import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
+import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
+import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
+import {
+  validateAppConfigForRemoteVersionSource,
+  validateBuildProfileVersionSettings,
+} from '../project/remoteVersionSource';
+import { createSubmissionContextAsync } from '../submit/context';
+import {
+  exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
+  submitAsync,
+  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
+} from '../submit/submit';
+import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { printJsonOnlyOutput } from '../utils/json';
+import { ProfileData, getProfilesAsync } from '../utils/profiles';
+import { getVcsClient } from '../vcs';
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { UserInputResourceClass } from './types';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
+
+let metroConfigValidated = false;
+let sdkVersionChecked = false;
+
+export interface BuildFlags {
+  requestedPlatform: RequestedPlatform;
+  profile?: string;
+  nonInteractive: boolean;
+  wait: boolean;
+  clearCache: boolean;
+  json: boolean;
+  autoSubmit: boolean;
+  submitProfile?: string;
+  localBuildOptions: LocalBuildOptions;
+  userInputResourceClass?: UserInputResourceClass;
+  message?: string;
+}
+
+const platformToGraphQLResourceClassMapping: Record<
+  Platform,
+  Record<UserInputResourceClass, BuildResourceClass>
+> = {
+  [Platform.ANDROID]: {
+    [UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
+    [UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
+  },
+  [Platform.IOS]: {
+    [UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
+    [UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
+  },
+};
+
+export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFlags): Promise<void> {
+  await getVcsClient().ensureRepoExistsAsync();
+  await ensureRepoIsCleanAsync(flags.nonInteractive);
+
+  await ensureProjectConfiguredAsync({
+    projectDir,
+    nonInteractive: flags.nonInteractive,
+  });
+  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const easJsonCliConfig: EasJson['cli'] =
+    (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
+
+  const platforms = toPlatforms(flags.requestedPlatform);
+  const buildProfiles = await getProfilesAsync({
+    type: 'build',
+    easJsonAccessor,
+    platforms,
+    profileName: flags.profile ?? undefined,
+  });
+
+  await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+    projectDir,
+    nonInteractive: flags.nonInteractive,
+    buildProfiles,
+  });
+
+  for (const buildProfile of buildProfiles) {
+    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
+  }
+
+  const startedBuilds: {
+    build: BuildWithSubmissionsFragment | BuildFragment;
+    buildProfile: ProfileData<'build'>;
+  }[] = [];
+  const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
+
+  for (const buildProfile of buildProfiles) {
+    const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
+      projectDir,
+      flags,
+      moreBuilds: platforms.length > 1,
+      buildProfile,
+      resourceClass:
+        platformToGraphQLResourceClassMapping[buildProfile.platform][
+          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
+        ],
+      easJsonCliConfig,
+    });
+    if (maybeBuild) {
+      startedBuilds.push({ build: maybeBuild, buildProfile });
+    }
+    buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
+  }
+
+  if (flags.localBuildOptions.enable) {
+    return;
+  }
+
+  Log.newLine();
+  printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
+  Log.newLine();
+
+  const submissions: SubmissionFragment[] = [];
+  if (flags.autoSubmit) {
+    const submitProfiles = await getProfilesAsync({
+      easJsonAccessor,
+      platforms,
+      profileName: flags.submitProfile,
+      type: 'submit',
+    });
+    for (const startedBuild of startedBuilds) {
+      const submitProfile = nullthrows(
+        submitProfiles.find(
+          ({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
+        )
+      ).profile;
+      const submission = await prepareAndStartSubmissionAsync({
+        build: startedBuild.build,
+        buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
+        moreBuilds: startedBuilds.length > 1,
+        projectDir,
+        buildProfile: startedBuild.buildProfile.profile,
+        submitProfile,
+        nonInteractive: flags.nonInteractive,
+      });
+      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
+      submissions.push(submission);
+    }
+
+    Log.newLine();
+    printSubmissionDetailsUrls(submissions);
+    Log.newLine();
+  }
+
+  if (!flags.wait) {
+    if (flags.json) {
+      printJsonOnlyOutput(startedBuilds.map(buildInfo => buildInfo.build));
+    }
+    return;
+  }
+
+  const { accountName } = Object.values(buildCtxByPlatform)[0];
+  const builds = await waitForBuildEndAsync({
+    buildIds: startedBuilds.map(({ build }) => build.id),
+    accountName,
+  });
+  if (!flags.json) {
+    printBuildResults(builds);
+  }
+
+  const haveAllBuildsFailedOrCanceled = builds.every(
+    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
+  );
+  if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
+    if (flags.json) {
+      printJsonOnlyOutput(builds);
+    }
+    exitWithNonZeroCodeIfSomeBuildsFailed(builds);
+  } else {
+    const completedSubmissions = await waitForSubmissionsToCompleteAsync(submissions);
+    if (flags.json) {
+      printJsonOnlyOutput(
+        await Promise.all(
+          builds
+            .filter((i): i is BuildWithSubmissionsFragment => !!i)
+            .map(build => BuildQuery.withSubmissionsByIdAsync(build.id))
+        )
+      );
+    }
+    exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
+  }
+}
+
+async function prepareAndStartBuildAsync({
+  projectDir,
+  flags,
+  moreBuilds,
+  buildProfile,
+  resourceClass,
+  easJsonCliConfig,
+}: {
+  projectDir: string;
+  flags: BuildFlags;
+  moreBuilds: boolean;
+  buildProfile: ProfileData<'build'>;
+  resourceClass: BuildResourceClass;
+  easJsonCliConfig: EasJson['cli'];
+}): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
+  const buildCtx = await createBuildContextAsync({
+    buildProfileName: buildProfile.profileName,
+    resourceClass,
+    clearCache: flags.clearCache,
+    buildProfile: buildProfile.profile,
+    nonInteractive: flags.nonInteractive,
+    noWait: !flags.wait,
+    platform: buildProfile.platform,
+    projectDir,
+    localBuildOptions: flags.localBuildOptions,
+    easJsonCliConfig,
+    message: flags.message,
+  });
+
+  if (moreBuilds) {
+    Log.newLine();
+    const appPlatform = toAppPlatform(buildProfile.platform);
+    Log.log(
+      `${appPlatformEmojis[appPlatform]} ${chalk.bold(
+        `${appPlatformDisplayNames[appPlatform]} build`
+      )}`
+    );
+  }
+  await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
+  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
+    validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
+  }
+  if (buildCtx.workflow === Workflow.MANAGED) {
+    if (!sdkVersionChecked) {
+      await checkExpoSdkIsSupportedAsync(buildCtx);
+      sdkVersionChecked = true;
+    }
+    if (!metroConfigValidated) {
+      await validateMetroConfigForManagedWorkflowAsync(buildCtx);
+      metroConfigValidated = true;
+    }
+  }
+
+  const build = await startBuildAsync(buildCtx);
+  return {
+    build,
+    buildCtx,
+  };
+}
+
+async function startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragment | undefined> {
+  let sendBuildRequestAsync: BuildRequestSender;
+  if (ctx.platform === Platform.ANDROID) {
+    sendBuildRequestAsync = await prepareAndroidBuildAsync(ctx as BuildContext<Platform.ANDROID>);
+  } else {
+    sendBuildRequestAsync = await prepareIosBuildAsync(ctx as BuildContext<Platform.IOS>);
+  }
+  return await sendBuildRequestAsync();
+}
+
+async function prepareAndStartSubmissionAsync({
+  build,
+  buildCtx,
+  moreBuilds,
+  projectDir,
+  buildProfile,
+  submitProfile,
+  nonInteractive,
+}: {
+  build: BuildFragment;
+  buildCtx: BuildContext<Platform>;
+  moreBuilds: boolean;
+  projectDir: string;
+  buildProfile: BuildProfile;
+  submitProfile: SubmitProfile;
+  nonInteractive: boolean;
+}): Promise<SubmissionFragment> {
+  const platform = toPlatform(build.platform);
+  const submissionCtx = await createSubmissionContextAsync({
+    platform,
+    projectDir,
+    projectId: build.project.id,
+    profile: submitProfile,
+    archiveFlags: { id: build.id },
+    nonInteractive,
+    env: buildProfile.env,
+    credentialsCtx: buildCtx.credentialsCtx,
+    applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
+  });
+
+  if (moreBuilds) {
+    Log.newLine();
+    Log.log(
+      `${appPlatformEmojis[build.platform]} ${chalk.bold(
+        `${appPlatformDisplayNames[build.platform]} submission`
+      )}`
+    );
+  }
+
+  return await submitAsync(submissionCtx);
+}
+
+function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | null)[]): void {
+  const failedBuilds = (maybeBuilds.filter(i => i) as BuildFragment[]).filter(
+    i => i.status === BuildStatus.Errored
+  );
+  if (failedBuilds.length > 0) {
+    process.exit(1);
+  }
+}

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

@@ -1,11 +1,3 @@
-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',
@@ -21,4 +13,7 @@ export enum BuildDistributionType {
   SIMULATOR = 'simulator',
 }
 
-export type TrackingContext = Record<string, string | number | boolean>;
+export enum UserInputResourceClass {
+  DEFAULT = 'default',
+  LARGE = 'large',
+}

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

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

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

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

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

@@ -3,9 +3,12 @@ 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) {
     message += ` ${chalk.dim('(credentials.json)')}`;

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

@@ -0,0 +1,115 @@
+import { Workflow } from '@expo/eas-build-job';
+import { Errors } from '@oclif/core';
+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/expoCli';
+import { ProfileData } from '../../utils/profiles';
+import { getVcsClient } from '../../vcs';
+import { reviewAndCommitChangesAsync } from './repository';
+
+export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
+  projectDir,
+  nonInteractive = false,
+  buildProfiles = [],
+}: {
+  projectDir: string;
+  nonInteractive?: boolean;
+  buildProfiles?: ProfileData<'build'>[];
+}): Promise<void> {
+  if (await isExpoDevClientInstalledAsync(projectDir)) {
+    return;
+  }
+
+  const buildProfilesWithDevelopmentClientRequired = buildProfiles.filter(
+    buildProfile => buildProfile.profile.developmentClient
+  );
+
+  const isDevelopmentClientRequired = buildProfilesWithDevelopmentClientRequired.some(Boolean);
+
+  if (!isDevelopmentClientRequired) {
+    return;
+  }
+
+  const platformsToCheck = buildProfilesWithDevelopmentClientRequired.map(
+    ({ platform }) => 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 {
+      Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
+        exit: 1,
+      });
+    }
+  } else {
+    Log.warn(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
+    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) {
+      Errors.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();
+  if (await getVcsClient().isCommitRequiredAsync()) {
+    await reviewAndCommitChangesAsync('Install expo-dev-client', {
+      nonInteractive,
+    });
+  }
+}

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

@@ -5,11 +5,11 @@ import {
   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 fields: { label: string; value?: string | null }[] = [
     { label: 'ID', value: build.id },
@@ -120,11 +120,5 @@ export function formatGraphQLBuild(build: BuildFragment) {
 }
 
 const getActorName = (build: BuildFragment): string => {
-  if (!build.initiatingActor) {
-    return 'unknown';
-  } else if (build.initiatingActor.__typename === 'User') {
-    return build.initiatingActor.username;
-  } else {
-    return build.initiatingActor.firstName ?? 'unknown';
-  }
+  return build.initiatingActor?.displayName || 'unknown';
 };

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

@@ -13,8 +13,7 @@ import {
   EasBuildDeprecationInfoType,
 } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
-import { printJsonOnlyOutput } from '../../utils/json';
-import { appPlatformDisplayNames, appPlatformEmojis } from '../constants';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
 export function printLogsUrls(builds: BuildFragment[]): void {
@@ -24,24 +23,22 @@ export function printLogsUrls(builds: BuildFragment[]): void {
     builds.forEach(build => {
       const logsUrl = getBuildLogsUrl(build);
       Log.log(
-        `${appPlatformDisplayNames[build.platform]} build details: ${chalk.underline(logsUrl)}`
+        `${appPlatformEmojis[build.platform]} ${
+          appPlatformDisplayNames[build.platform]
+        } build details: ${chalk.underline(logsUrl)}`
       );
     });
   }
 }
 
-export function printBuildResults(builds: (BuildFragment | null)[], json: boolean): void {
-  if (json) {
-    printJsonOnlyOutput(builds);
+export function printBuildResults(builds: (BuildFragment | null)[]): void {
+  Log.newLine();
+  if (builds.length === 1) {
+    const [build] = builds;
+    assert(build, 'Build should be defined');
+    printBuildResult(build);
   } else {
-    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));
-    }
+    (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
   }
 }
 
@@ -97,17 +94,14 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
     return;
   }
   if (deprecationInfo.type === EasBuildDeprecationInfoType.Internal) {
-    Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
+    Log.warn('This command is using API that soon will be deprecated. Upgrade EAS CLI.');
     Log.warn("Changes won't affect your project config.");
     Log.warn(deprecationInfo.message);
   } else if (deprecationInfo.type === EasBuildDeprecationInfoType.UserFacing) {
-    Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
-    Log.warn(
-      'There might be some changes necessary to your project config, latest eas-cli will provide more specific error messages.'
-    );
+    Log.warn('This command is using API that soon will be deprecated.');
     Log.warn(deprecationInfo.message);
   } else {
-    Log.warn('An unexpected warning was encountered. Please report it as a bug:');
+    Log.warn('An unexpected warning was encountered. Report it as a bug:');
     Log.warn(deprecationInfo);
   }
 }

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

@@ -1,19 +1,19 @@
 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 { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 
 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
-  if (!(await vcs.hasUncommittedChangesAsync())) {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -28,23 +28,23 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
   });
 
   if (!answer) {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
   }
 }
 
 export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (!(await vcs.hasUncommittedChangesAsync())) {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
   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'
+    `This operation needs to be run on a clean working tree. ${chalk.bold(
+      'Commit all your changes before proceeding'
     )}.`
   );
   if (nonInteractive) {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
   }
   const answer = await confirmAsync({
     message: `Commit changes to git?`,
@@ -52,7 +52,7 @@ export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<vo
   if (answer) {
     await commitPromptAsync({ commitAllFiles: true });
   } else {
-    throw new Error('Please commit all changes. Aborting...');
+    throw new Error('Commit all changes. Aborting...');
   }
 }
 
@@ -70,7 +70,11 @@ export async function commitPromptAsync({
     initial: initialCommitMessage,
     validate: (input: string) => input !== '',
   });
-  await vcs.commitAsync({ commitAllFiles, commitMessage: message });
+  await getVcsClient().commitAsync({
+    commitAllFiles,
+    commitMessage: message,
+    nonInteractive: false,
+  });
 }
 
 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -95,7 +99,7 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
   startTimer(compressTimerLabel);
 
   try {
-    await vcs.makeShallowCopyAsync(shallowClonePath);
+    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
@@ -121,3 +125,59 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
 
   return { size, path: tarPath };
 }
+
+enum ShouldCommitChanges {
+  Yes,
+  ShowDiffFirst,
+  Abort,
+}
+
+export async function reviewAndCommitChangesAsync(
+  initialCommitMessage: string,
+  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
+): Promise<void> {
+  if (process.env.EAS_BUILD_AUTOCOMMIT) {
+    await getVcsClient().commitAsync({
+      commitMessage: initialCommitMessage,
+      commitAllFiles: false,
+      nonInteractive,
+    });
+    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.'
+    );
+  }
+  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 getVcsClient().showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, {
+      nonInteractive,
+      askedFirstTime: false,
+    });
+  }
+}

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

@@ -1,5 +0,0 @@
-import template from 'lodash/template';
-
-export function evaluateString(s: string, vars: Record<string, any>): string {
-  return template(s, { interpolate: /\$\(([\s\S]+?)\)/g })(vars);
-}

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

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

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

@@ -4,25 +4,29 @@ import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
 import { AppPlatform, BuildFragment } from '../../graphql/generated';
 
 export function getProjectDashboardUrl(accountName: string, projectName: string): string {
-  return `${getExpoWebsiteBaseUrl()}/accounts/${accountName}/projects/${projectName}`;
+  return new URL(
+    `/accounts/${accountName}/projects/${projectName}`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
 }
 
 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}`;
-  }
+  const url =
+    project.__typename !== 'App'
+      ? `/builds/${build.id}`
+      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
+
+  return new URL(url, getExpoWebsiteBaseUrl()).toString();
 }
 
 export function getArtifactUrl(artifactId: string): string {
-  return `${getExpoWebsiteBaseUrl()}/artifacts/${artifactId}`;
+  return new URL(`/artifacts/${artifactId}`, getExpoWebsiteBaseUrl()).toString();
 }
 
 export function getInternalDistributionInstallUrl(build: BuildFragment): string {
   if (build.platform === AppPlatform.Ios) {
-    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/--/api/v2/projects/${
+    return `itms-services://?action=download-manifest;url=${getExpoApiBaseUrl()}/v2/projects/${
       build.project.id
     }/builds/${build.id}/manifest.plist`;
   }
@@ -31,3 +35,16 @@ export function getInternalDistributionInstallUrl(build: BuildFragment): string
 
   return build.artifacts.buildUrl;
 }
+
+export function getUpdateGroupUrl(
+  accountName: string,
+  projectName: string,
+  updateGroupId: string
+): string {
+  return new URL(
+    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
+      projectName
+    )}/updates/${encodeURIComponent(updateGroupId)}`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
+}

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

@@ -1,13 +1,12 @@
-import { Workflow } from '@expo/eas-build-job';
+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';
-import { Platform } from './types';
+import { getVcsClient } from '../vcs';
+import { CommonContext } from './context';
 
-export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
+export function checkNodeEnvVariable(ctx: CommonContext<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.'
@@ -17,7 +16,7 @@ export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
 }
 
 export async function checkGoogleServicesFileAsync<T extends Platform>(
-  ctx: BuildContext<T>
+  ctx: CommonContext<T>
 ): Promise<void> {
   if (ctx.workflow === Workflow.GENERIC || ctx.buildProfile?.env?.GOOGLE_SERVICES_FILE) {
     return;
@@ -26,12 +25,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const rootDir = await vcs.getRootPathAsync();
+  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
-    (await fs.pathExists(googleServicesFilePath)) &&
-    ((await vcs.isFileIgnoredAsync(googleServicesFilePath)) ||
-      !isInsideDirectory(absGoogleServicesFilePath, rootDir))
+    (await fs.pathExists(absGoogleServicesFilePath)) &&
+    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
+      (await getVcsClient().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.`
@@ -42,7 +41,7 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
       )}`
     );
     Log.warn(
-      'If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.'
+      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
     );
     Log.newLine();
   }

packages/eas-cli/src/channel/queries.ts

@@ -0,0 +1,194 @@
+import chalk from 'chalk';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import {
+  ViewBranchesOnUpdateChannelQueryVariables,
+  ViewUpdateChannelsOnAppQueryVariables,
+} from '../graphql/generated';
+import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
+import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import formatFields from '../utils/formatFields';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+import { logChannelDetails } from './utils';
+
+export const CHANNELS_LIMIT = 25;
+
+export async function selectChannelOnAppAsync({
+  projectId,
+  selectionPromptTitle,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  selectionPromptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateChannelObject> {
+  if (paginatedQueryOptions.nonInteractive) {
+    throw new Error('Unable to select a channel in non-interactive mode.');
+  }
+
+  const updateChannel = await paginatedQueryWithSelectPromptAsync({
+    limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+    offset: paginatedQueryOptions.offset,
+    queryToPerform: (limit, offset) => queryChannelsOnAppAsync({ appId: projectId, limit, offset }),
+    promptOptions: {
+      title: selectionPromptTitle,
+      createDisplayTextForSelectionPromptListItem: updateChannel => updateChannel.name,
+      getIdentifierForQueryItem: updateChannel => updateChannel.id,
+    },
+  });
+
+  if (!updateChannel) {
+    throw new Error(`Could not find any channels for app "${projectId}"`);
+  }
+  return updateChannel;
+}
+
+export async function listAndRenderChannelsOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  if (paginatedQueryOptions.nonInteractive) {
+    const channels = await queryChannelsOnAppAsync({
+      appId: projectId,
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+    });
+    renderPageOfChannels(channels, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        queryChannelsOnAppAsync({ limit, offset, appId: projectId }),
+      promptOptions: {
+        title: 'Load more channels?',
+        renderListItems: channels => renderPageOfChannels(channels, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
+  projectId: appId,
+  channelName,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  channelName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  const channel = await ChannelQuery.viewUpdateChannelAsync({ appId, channelName });
+  renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });
+
+  if (paginatedQueryOptions.nonInteractive) {
+    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync({
+      appId,
+      channelName,
+      offset: paginatedQueryOptions.offset,
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+    });
+    renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
+      offset: paginatedQueryOptions.offset,
+      queryToPerform: (limit, offset) =>
+        queryBranchesAndUpdateGroupsOnChannelAsync({
+          channelName,
+          appId,
+          offset,
+          limit,
+        }),
+      promptOptions: {
+        title: 'Load more channels?',
+        renderListItems: branches =>
+          renderPageOfBranchesOnChannel(channel, branches, paginatedQueryOptions),
+      },
+    });
+  }
+}
+
+async function queryChannelsOnAppAsync({
+  appId,
+  offset,
+  limit,
+}: ViewUpdateChannelsOnAppQueryVariables): Promise<UpdateChannelObject[]> {
+  return await ChannelQuery.viewUpdateChannelsOnAppAsync({
+    appId,
+    offset,
+    limit,
+  });
+}
+
+async function queryBranchesAndUpdateGroupsOnChannelAsync(
+  args: ViewBranchesOnUpdateChannelQueryVariables
+): Promise<UpdateBranchOnChannelObject[]> {
+  return await BranchQuery.listBranchesOnChannelAsync(args);
+}
+
+function renderPageOfChannels(
+  currentPage: UpdateChannelObject[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput({ currentPage });
+  } else {
+    for (const channel of currentPage) {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
+      logChannelDetails(channel);
+    }
+  }
+}
+
+function renderPageOfBranchesOnChannel(
+  channel: UpdateChannelObject,
+  currentPage: UpdateBranchOnChannelObject[],
+  { json }: PaginatedQueryOptions
+): void {
+  const channelWithNewBranches = { ...channel, updateBranches: currentPage };
+  if (json) {
+    printJsonOnlyOutput({ currentPage: channelWithNewBranches });
+  } else {
+    Log.addNewLineIfNone();
+    Log.log(
+      formatFields([
+        { label: 'Name', value: channel.name },
+        { label: 'ID', value: channel.id },
+      ])
+    );
+    logChannelDetails(channelWithNewBranches);
+  }
+}
+
+function renderChannelHeaderContent({
+  channelName,
+  channelId,
+}: {
+  channelName: string;
+  channelId: string;
+}): void {
+  Log.addNewLineIfNone();
+  Log.log(chalk.bold('Channel:'));
+  Log.log(
+    formatFields([
+      { label: 'Name', value: channelName },
+      { label: 'ID', value: channelId },
+    ])
+  );
+  Log.addNewLineIfNone();
+  Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
+}

packages/eas-cli/src/channel/utils.ts

@@ -0,0 +1,112 @@
+import assert from 'assert';
+import CliTable from 'cli-table3';
+
+import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, getUpdateGroupDescriptionsWithBranch } from '../update/utils';
+
+export type BranchMapping = {
+  version: number;
+  data: {
+    branchId: string;
+    branchMappingLogic: {
+      operand: number;
+      clientKey: string;
+      branchMappingOperator: string;
+    } & string;
+  }[];
+};
+
+/**
+ * Get the branch mapping and determine whether it is a rollout.
+ * Ensure that the branch mapping is properly formatted.
+ */
+export function getBranchMapping(branchMappingString?: string): {
+  branchMapping: BranchMapping;
+  isRollout: boolean;
+  rolloutPercent?: number;
+} {
+  if (!branchMappingString) {
+    throw new Error('Missing branch mapping.');
+  }
+  let branchMapping: BranchMapping;
+  try {
+    branchMapping = JSON.parse(branchMappingString);
+  } catch {
+    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
+  }
+  assert(branchMapping, 'Branch Mapping must be defined.');
+
+  if (branchMapping.version !== 0) {
+    throw new Error('Branch mapping must be version 0.');
+  }
+
+  const isRollout = branchMapping.data.length === 2;
+  const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
+
+  switch (branchMapping.data.length) {
+    case 0:
+      break;
+    case 1:
+      if (branchMapping.data[0].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a single branch must be "true"');
+      }
+      break;
+    case 2:
+      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
+      }
+      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
+      }
+      if (rolloutPercent == null) {
+        throw new Error('Branch mapping is missing a "rolloutPercent"');
+      }
+      if (branchMapping.data[1].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
+      }
+      break;
+    default:
+      throw new Error('Branch mapping data must have length less than or equal to 2.');
+  }
+
+  return { branchMapping, isRollout, rolloutPercent };
+}
+
+export function logChannelDetails(channel: UpdateChannelObject): void {
+  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+
+  const updateChannelsTable = new CliTable({
+    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+
+  if (branchMapping.data.length > 2) {
+    throw new Error('Branch Mapping data must have length less than or equal to 2.');
+  }
+
+  const rolloutBranchIds = branchMapping.data.map(data => data.branchId);
+
+  for (const currentBranch of channel.updateBranches) {
+    const updateGroupDescriptions = getUpdateGroupDescriptionsWithBranch(
+      currentBranch.updateGroups
+    );
+
+    const isRolloutBranch = isRollout && rolloutBranchIds.includes(currentBranch.id);
+    const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === currentBranch.id;
+
+    updateGroupDescriptions.forEach(({ branch, message, runtimeVersion, group, platforms }) => {
+      updateChannelsTable.push([
+        branch,
+        ...(isRolloutBranch
+          ? [isBaseBranch ? `${rolloutPercent! * 100}%` : `${(1 - rolloutPercent!) * 100}%`]
+          : []),
+        message,
+        runtimeVersion,
+        group,
+        platforms,
+      ]);
+    });
+  }
+  Log.log(updateChannelsTable.toString());
+}