random change

* allow applicationId override

* Apply suggestions from code review

Co-authored-by: Dominik Sokal <[email protected]>

* update CHANGELOG.md

* update CHANGELOG.md

Co-authored-by: Dominik Sokal <[email protected]>

.eslintrc.js

@@ -26,10 +26,6 @@ module.exports = {
             name: 'lodash',
             message: "Don't use lodash, it's heavy!",
           },
-          {
-            name: 'node-fetch',
-            message: 'Use got instead, node-fetch is used only for the GraphQL client.',
-          },
         ],
       },
     ],

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: "\U0001F41B Bug Report in EAS CLI"
-labels: 'bug'
+labels: 'needs review'
 description: 'You want to report a reproducible bug or regression in EAS CLI.'
 body:
   - type: markdown
@@ -37,7 +37,7 @@ body:
       required: true
     attributes:
       label: Environment
-      description: Run `eas diagnostics` and paste the output here.
+      description: Run `npx expo-env-info` and `expo doctor`, and paste the output here.
   - type: textarea
     validations:
       required: false

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,5 +1,5 @@
 name: "\U0001F64B Enhancement"
-labels: 'enhancement'
+labels: 'enhancement,needs review'
 description: 'Want us to add something to EAS CLI?'
 body:
   - type: markdown

.github/workflows/changelog.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: 18
       - name: Checkout Pull Request
         run: hub pr checkout ${{ github.event.issue.number }}
         env:

.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

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -96,7 +96,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -138,7 +138,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: '16'
+          node-version: 18
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -155,7 +155,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '16'
+          node-version: 18
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files

.github/workflows/size.yml

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

.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,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['12', '14', '16']
+        node: ['14', '16', '18']
         include:
-          - node: '16'
+          - node: '18'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:
@@ -27,6 +27,10 @@ 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

.gitignore

@@ -2,10 +2,12 @@
 packages/*/build
 packages/eas-cli/dist
 packages/eas-cli/tmp
+scripts/build
 
 # Code editors
 .idea
 .history
+.vscode
 
 # macOS
 .DS_Store

CHANGELOG.md

@@ -10,6 +10,243 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 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))
+
+### 🧹 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))
+
+## [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

CODEOWNERS

@@ -1,7 +1,13 @@
+* @dsokal @wkozyra95
+
 packages/eas-cli/src/build @dsokal @wkozyra95
 packages/eas-cli/src/commands/build @dsokal @wkozyra95
 
 packages/eas-cli/src/submit @barthap @dsokal
 packages/eas-cli/src/commands/submit.ts @barthap @dsokal
 
+packages/eas-cli/schema @bycedric
+packages/eas-cli/src/metadata @bycedric
+packages/eas-cli/src/commands/metadata @bycedric
+
 packages/eas-json @dsokal @wkozyra95

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.44.1"
+  "version": "0.55.1"
 }

package.json

@@ -17,22 +17,22 @@
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@types/jest": "27.0.1",
-    "@types/node": "16.7.8",
-    "eslint": "7.32.0",
-    "eslint-config-universe": "8.0.0",
+    "@types/jest": "27.5.0",
+    "@types/node": "17.0.32",
+    "eslint": "8.15.0",
+    "eslint-config-universe": "11.0.0",
     "eslint-plugin-async-protect": "1.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "27.1.0",
-    "jest-watch-typeahead": "0.6.4",
+    "jest": "28.1.0",
+    "jest-watch-typeahead": "1.1.0",
     "lerna": "4.0.0",
-    "oclif": "2.1.5",
-    "prettier": "2.4.1",
-    "ts-jest": "27.0.5",
-    "typescript": "4.5.2"
+    "oclif": "3.0.1",
+    "prettier": "2.6.2",
+    "ts-jest": "28.0.2",
+    "typescript": "4.7.4"
   },
   "volta": {
-    "node": "16.10.0",
-    "yarn": "1.22.15"
+    "node": "18.2.0",
+    "yarn": "1.22.18"
   }
 }

packages/eas-cli/package.json

@@ -1,109 +1,118 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.44.1",
+  "version": "0.55.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.27",
-    "@expo/config": "6.0.11",
-    "@expo/config-plugins": "4.0.11",
-    "@expo/eas-build-job": "0.2.61",
-    "@expo/eas-json": "0.44.0",
-    "@expo/json-file": "8.2.34",
-    "@expo/pkcs12": "0.0.6",
-    "@expo/plist": "0.0.16",
-    "@expo/plugin-warn-if-update-available": "2.0.4",
-    "@expo/prebuild-config": "3.0.11",
+    "@expo/apple-utils": "0.0.0-alpha.33",
+    "@expo/code-signing-certificates": "0.0.2",
+    "@expo/config": "6.0.23",
+    "@expo/config-plugins": "4.1.4",
+    "@expo/config-types": "45.0.0",
+    "@expo/eas-build-job": "0.2.77",
+    "@expo/eas-json": "0.55.0",
+    "@expo/json-file": "8.2.36",
+    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/pkcs12": "0.0.8",
+    "@expo/plist": "0.0.18",
+    "@expo/plugin-autocomplete": "1.4.0",
+    "@expo/plugin-help": "5.2.0",
+    "@expo/plugin-warn-if-update-available": "2.3.0",
+    "@expo/prebuild-config": "3.1.6",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.5.0",
+    "@expo/spawn-async": "1.6.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.1.2",
-    "@oclif/plugin-autocomplete": "1.1.1",
-    "@oclif/plugin-help": "5.1.10",
-    "@urql/core": "2.3.1",
-    "@urql/exchange-retry": "0.3.0",
+    "@oclif/core": "1.9.0",
+    "@urql/core": "2.4.4",
+    "@urql/exchange-retry": "0.3.3",
+    "ajv": "^6.12.6",
     "chalk": "4.1.2",
-    "cli-table3": "0.6.0",
-    "dateformat": "4.5.1",
+    "cli-progress": "3.11.0",
+    "cli-table3": "0.6.2",
+    "dateformat": "4.6.3",
     "env-paths": "2.2.0",
     "envinfo": "7.8.1",
-    "fast-glob": "3.2.7",
+    "fast-deep-equal": "3.1.3",
+    "fast-glob": "3.2.11",
     "figures": "3.2.0",
-    "form-data": "3.0.0",
-    "fs-extra": "10.0.0",
+    "form-data": "4.0.0",
+    "fs-extra": "10.1.0",
     "getenv": "1.0.0",
-    "got": "11.8.2",
-    "gradle-to-js": "2.0.0",
-    "graphql": "15.5.1",
-    "graphql-tag": "2.12.5",
-    "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.1",
-    "joi": "17.4.2",
+    "jks-js": "1.0.2",
+    "joi": "17.6.0",
     "keychain": "1.3.0",
     "log-symbols": "4.1.0",
-    "mime": "2.5.2",
-    "minimatch": "3.0.4",
-    "nanoid": "3.1.25",
-    "node-fetch": "2.6.1",
-    "node-forge": "1.0.0",
+    "mime": "3.0.0",
+    "minimatch": "5.0.1",
+    "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",
-    "prompts": "2.3.2",
+    "promise-limit": "2.7.0",
+    "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.3.5",
+    "semver": "7.3.7",
     "slash": "3.0.0",
     "strip-ansi": "6.0.0",
     "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "tslib": "2.3.1",
+    "tslib": "2.4.0",
     "turndown": "7.1.1",
     "untildify": "4.0.0",
     "uuid": "8.3.2",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@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",
+    "@graphql-codegen/cli": "2.6.2",
+    "@graphql-codegen/introspection": "2.1.1",
+    "@graphql-codegen/typescript": "2.4.11",
+    "@graphql-codegen/typescript-operations": "2.4.0",
+    "@types/cli-progress": "3.9.2",
     "@types/dateformat": "3.0.1",
     "@types/envinfo": "7.8.1",
-    "@types/form-data": "^2.5.0",
-    "@types/fs-extra": "9.0.12",
+    "@types/fs-extra": "9.0.13",
     "@types/getenv": "^1.0.0",
     "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
-    "@types/node-forge": "1.0.0",
-    "@types/prompts": "^2.0.9",
-    "@types/semver": "7.3.8",
-    "@types/tar": "4.0.5",
-    "@types/tough-cookie": "4.0.1",
-    "@types/uuid": "8.3.1",
+    "@types/node-forge": "1.0.2",
+    "@types/prompts": "2.0.14",
+    "@types/semver": "7.3.9",
+    "@types/tar": "6.1.1",
+    "@types/tough-cookie": "4.0.2",
+    "@types/uuid": "8.3.4",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "0.21.4",
+    "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
-    "memfs": "3.2.2",
-    "mockdate": "^3.0.2",
-    "nock": "^13.0.5",
+    "form-data": "4.0.0",
+    "memfs": "3.4.3",
+    "mockdate": "3.0.5",
+    "nock": "13.2.4",
     "tempy": "0.7.0",
-    "ts-deepmerge": "1.0.8",
-    "typescript": "4.5.2"
+    "ts-deepmerge": "2.0.1",
+    "typescript": "4.7.4"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
     "/build",
-    "/oclif.manifest.json"
+    "/oclif.manifest.json",
+    "/schema"
   ],
   "homepage": "https://github.com/expo/eas-cli",
   "keywords": [
@@ -116,13 +125,16 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@oclif/plugin-autocomplete",
-      "@oclif/plugin-help",
+      "@expo/plugin-autocomplete",
+      "@expo/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
     "topics": {
       "account": {
-        "description": "manage your account"
+        "description": "manage account"
+      },
+      "branch": {
+        "description": "manage update branches"
       },
       "build": {
         "description": "build app binaries"
@@ -131,10 +143,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"

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

@@ -0,0 +1,988 @@
+{
+  "$schema": "http://json-schema.org/draft-06/schema",
+  "type": "object",
+  "definitions": {
+    "apple": {
+      "AppleLocalizedPreviewFolder": {
+        "anyOf": [
+          {
+            "description": "Path to folder containing preview files",
+            "type": "string"
+          },
+          {
+            "type": "array",
+            "uniqueItems": true,
+            "items": {
+              "type": "string"
+            }
+          }
+        ]
+      },
+      "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",
+        "additionalProperties": false,
+        "defaultSnippets": [
+          {
+            "body": {
+              "automaticRelease": true,
+              "usesThirdPartyContent": false,
+              "usesNonExemptEncryption": false
+            }
+          }
+        ],
+        "properties": {
+          "autoReleaseDate": {
+            "description": "ISO Date to release the app automatically. Leave undefined to manually release the app to the public.",
+            "defaultSnippets": [
+              {
+                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}"
+              }
+            ],
+            "anyOf": [
+              {
+                "type": "string",
+                "format": "date-time"
+              },
+              {
+                "type": "string",
+                "format": "date"
+              },
+              {
+                "type": "number"
+              }
+            ]
+          },
+          "isPhasedReleaseEnabled": {
+            "type": "boolean",
+            "description": "Release update over 7-day period instead of instantly.",
+            "meta": {
+              "storeInfo": "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. [Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)."
+            }
+          },
+          "shouldResetRatings": {
+            "type": "boolean",
+            "description": "Should App Store ratings be reset for this version of the app.",
+            "meta": {
+              "storeInfo": "You can reset your app’s summary rating for all countries or regions when you release this version. Keep in mind that once this version is released, you won’t be able to restore the rating. Your app’s existing customer reviews will still appear on the App Store."
+            }
+          },
+          "usesThirdPartyContent": {
+            "type": "boolean"
+          },
+          "automaticRelease": {
+            "type": "boolean",
+            "description": "Should the app automatically be released when approved by App Store review."
+          },
+          "usesNonExemptEncryption": {
+            "type": "boolean",
+            "description": "Alternative to setting `ITSAppUsesNonExemptEncryption` in the binary's `Info.plist`."
+          }
+        }
+      },
+      "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": {
+        "advisory": {
+          "$ref": "#/definitions/apple/AppleAdvisory"
+        },
+        "categories": {
+          "$ref": "#/definitions/apple/AppleCategory"
+        },
+        "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."
+          }
+        },
+        "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"
+            }
+          }
+        },
+        "preview": {
+          "anyOf": [
+            {
+              "description": "Path to localized folders containing preview files",
+              "type": "string"
+            },
+            {
+              "description": "Localized previews object. Ex: `\"en-US\": [\"image.png\"]`",
+              "type": "object",
+              "additionalProperties": false,
+              "properties": {
+                "ar-SA": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Arabic"
+                },
+                "ca": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Catalan"
+                },
+                "zh-Hans": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Chinese (Simplified)"
+                },
+                "zh-Hant": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Chinese (Traditional)"
+                },
+                "hr": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Croatian"
+                },
+                "cs": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Czech"
+                },
+                "da": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Danish"
+                },
+                "nl-NL": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Dutch"
+                },
+                "en-AU": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (Australia)"
+                },
+                "en-CA": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (Canada)"
+                },
+                "en-GB": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (U.K.)"
+                },
+                "en-US": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "English (U.S.)"
+                },
+                "fi": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Finnish"
+                },
+                "fr-FR": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "French"
+                },
+                "fr-CA": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "French (Canada)"
+                },
+                "de-DE": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "German"
+                },
+                "el": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Greek"
+                },
+                "he": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Hebrew"
+                },
+                "hi": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Hindi"
+                },
+                "hu": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Hungarian"
+                },
+                "id": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Indonesian"
+                },
+                "it": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Italian"
+                },
+                "ja": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Japanese"
+                },
+                "ko": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Korean"
+                },
+                "ms": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Malay"
+                },
+                "no": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Norwegian"
+                },
+                "pl": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Polish"
+                },
+                "pt-BR": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Portuguese (Brazil)"
+                },
+                "pt-PT": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Portuguese (Portugal)"
+                },
+                "ro": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Romanian"
+                },
+                "ru": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Russian"
+                },
+                "sk": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Slovak"
+                },
+                "es-MX": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Spanish (Mexico)"
+                },
+                "es-ES": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Spanish (Spain)"
+                },
+                "sv": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Swedish"
+                },
+                "th": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Thai"
+                },
+                "tr": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Turkish"
+                },
+                "uk": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "description": "Ukrainian"
+                },
+                "vi": {
+                  "$ref": "#/definitions/apple/AppleLocalizedPreviewFolder",
+                  "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/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/__tests__/api-test.ts

@@ -1,9 +1,7 @@
 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 () => {
@@ -23,7 +21,7 @@ describe('apiClient', () => {
 
     let error: Error | null = null;
     try {
-      await apiClient.post('test');
+      await api.postAsync('test', { body: {} });
     } catch (e: any) {
       error = e;
     }
@@ -43,11 +41,11 @@ describe('apiClient', () => {
 
     let error: Error | null = null;
     try {
-      await apiClient.post('test');
+      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__/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/events.ts

@@ -1,5 +1,5 @@
 import { logEvent } from './rudderstackClient';
-export type Event = BuildEvent | SubmissionEvent;
+export type Event = BuildEvent | SubmissionEvent | MetadataEvent;
 
 export enum SubmissionEvent {
   SUBMIT_COMMAND = 'submit cli submit command',
@@ -45,6 +45,11 @@ export enum BuildEvent {
   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/api.ts

@@ -1,42 +1,94 @@
-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() + '/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 {
+  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) {

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

@@ -5,6 +5,7 @@ import nullthrows from 'nullthrows';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
+import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
 import {
@@ -87,7 +88,8 @@ export async function prepareAndroidBuildAsync(
     sendBuildRequestAsync: async (
       appId: string,
       job: Android.Job,
-      metadata: Metadata
+      metadata: Metadata,
+      buildParams: BuildParamsInput
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
@@ -95,6 +97,7 @@ export async function prepareAndroidBuildAsync(
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
+        buildParams,
       });
     },
   });

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

@@ -18,6 +18,7 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     username: job.username,
     buildType: job.buildType && transformBuildType(job.buildType),
     developmentClient: job.developmentClient,
+    experimental: job.experimental,
   };
 }
 

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

@@ -75,6 +75,9 @@ export async function prepareJobAsync(
     artifactPath: buildProfile.artifactPath,
     buildType,
     username,
+    experimental: {
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
+    },
   };
 
   return sanitizeJob(job);

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

@@ -7,9 +7,9 @@ import fs from 'fs-extra';
 import path from 'path';
 
 import Log from '../../log';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { isExpoUpdatesInstalled } from '../utils/updates';
-import { syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function syncProjectConfigurationAsync({

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

@@ -105,7 +105,7 @@ export async function maybeResolveVersionsAsync(
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
       };
-    } catch (err: any) {
+    } catch {
       return {};
     }
   } else {

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

@@ -1,16 +1,30 @@
 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 { withAnalyticsAsync } from '../analytics/common';
 import { BuildEvent } from '../analytics/events';
-import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
+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 { ora } from '../ora';
-import { requestedPlatformDisplayNames } from '../platform';
+import { Ora, ora } from '../ora';
+import {
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  requestedPlatformDisplayNames,
+} from '../platform';
 import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
@@ -40,11 +54,22 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ): Promise<CredentialsResult<Credentials> | undefined>;
   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,
@@ -87,6 +112,7 @@ export async function prepareBuildRequestForPlatformAsync<
       } as const);
 
   const metadata = await collectMetadataAsync(ctx);
+  const buildParams = resolveBuildParamsInput(ctx);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
@@ -98,45 +124,45 @@ export async function prepareBuildRequestForPlatformAsync<
       return undefined;
     } else {
       try {
-        return await sendBuildRequestAsync(builder, job, metadata);
+        return await sendBuildRequestAsync(builder, job, metadata, buildParams);
       } catch (error: any) {
-        if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-          Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
-        ) {
-          Log.error(
-            'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
-          );
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED'
-        ) {
-          Log.error(
-            'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
-          );
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
-        ) {
-          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;
+        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, 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[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;
+}
+
 async function uploadProjectAsync<TPlatform extends Platform>(
   ctx: BuildContext<TPlatform>
 ): Promise<string> {
@@ -144,6 +170,12 @@ 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();
         projectTarballPath = projectTarball.path;
 
@@ -156,10 +188,7 @@ 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;
@@ -181,7 +210,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(
@@ -193,7 +223,8 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
       const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
         ctx.projectId,
         job,
-        metadata
+        metadata,
+        buildParams
       );
 
       printDeprecationWarnings(deprecationInfo);
@@ -208,104 +239,250 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
   );
 }
 
+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) {
-          Log.debug('Failed to fetch the build status', err);
-          return null;
-        }
-      })
-    );
-    if (builds.length === 1) {
-      const [build] = builds;
-      if (build !== null) {
-        switch (build.status) {
-          case BuildStatus.Finished:
-            spinner.succeed('Build finished');
-            return builds;
-          case BuildStatus.New:
-            spinner.text = 'Build created';
-            break;
-          case BuildStatus.InQueue:
-            spinner.text = 'Build queued...';
-            break;
-          case BuildStatus.Canceled:
-            spinner.text = 'Build canceled';
-            spinner.stopAndPersist();
-            return builds;
-          case BuildStatus.InProgress:
-            spinner.text = 'Build in progress...';
-            break;
-          case BuildStatus.Errored:
-            spinner.fail('Build failed');
-            if (build.error) {
-              return builds;
-            } else {
-              throw new Error(`Standalone build failed!`);
-            }
-          default:
-            spinner.warn('Unknown status');
-            throw new Error(`Unknown build status: ${build.status} - aborting!`);
-        }
-      } else {
-        if (!spinner.text) {
-          spinner.text = 'Could not fetch the build status. Check your network connection.';
-        }
-      }
-    } else {
-      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
-        spinner.succeed('All builds have finished');
-        return builds;
-      } else if (
-        builds.filter(build =>
-          build?.status
-            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
-                build.status
-              )
-            : false
-        ).length === builds.length
-      ) {
-        spinner.fail('Some of the builds were canceled or failed.');
-        return builds;
-      } else {
-        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
-        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
-        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
-        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
-        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
-        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
-        const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished;
-        spinner.text = [
-          newBuilds && `Builds created: ${newBuilds}`,
-          inQueue && `Builds in queue: ${inQueue}`,
-          inProgress && `Builds in progress: ${inProgress}`,
-          canceled && `Builds canceled: ${canceled}`,
-          errored && chalk.red(`Builds failed: ${errored}`),
-          finished && chalk.green(`Builds finished: ${finished}`),
-          unknown && chalk.red(`Builds with unknown status: ${unknown}`),
-        ]
-          .filter(i => i)
-          .join('\t');
-      }
+  { buildIds, accountName }: { buildIds: string[]; accountName: string },
+  {
+    // 2 hours (max build time limit) + 10 minutes (possible queue time)
+    timeoutSec = 2 * 60 * 60 + 10 * 60,
+    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();
+  }
+  const endTime = new Date().getTime() + timeoutSec * 1000;
+  while (new Date().getTime() <= endTime) {
+    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 sleepAsync(intervalSec * 1000);
   }
-  spinner.warn('Timed out');
+  spinner.fail('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 queue');
+        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 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/context.ts

@@ -6,6 +6,7 @@ import type { XCBuildConfiguration } from 'xcode';
 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';
@@ -30,6 +31,7 @@ export interface BuildContext<T extends Platform> {
   accountName: string;
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
+  resourceClass: BuildResourceClass;
   clearCache: boolean;
   credentialsCtx: CredentialsContext;
   exp: ExpoConfig;

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

@@ -7,6 +7,7 @@ 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 { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
@@ -25,6 +26,7 @@ export async function createBuildContextAsync<T extends Platform>({
   nonInteractive = false,
   platform,
   projectDir,
+  resourceClass,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
@@ -33,6 +35,7 @@ export async function createBuildContextAsync<T extends Platform>({
   nonInteractive: boolean;
   platform: T;
   projectDir: string;
+  resourceClass: BuildResourceClass;
 }): Promise<BuildContext<T>> {
   const exp = getExpoConfig(projectDir, { env: buildProfile.env });
 
@@ -70,6 +73,7 @@ export async function createBuildContextAsync<T extends Platform>({
     accountName,
     buildProfile,
     buildProfileName,
+    resourceClass,
     clearCache,
     credentialsCtx,
     exp,

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

@@ -3,6 +3,7 @@ import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import type { XCBuildConfiguration } from 'xcode';
 
 import { IosCredentials, Target } 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';
@@ -36,13 +37,12 @@ export async function createIosContextAsync(
     },
     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 applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
 
@@ -83,7 +83,8 @@ export async function prepareIosBuildAsync(
     sendBuildRequestAsync: async (
       appId: string,
       job: Ios.Job,
-      metadata: Metadata
+      metadata: Metadata,
+      buildParams: BuildParamsInput
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
@@ -91,6 +92,7 @@ export async function prepareIosBuildAsync(
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
+        buildParams,
       });
     },
   });

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

@@ -2,7 +2,6 @@ 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 { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
@@ -19,13 +18,6 @@ export async function ensureIosCredentialsAsync(
   const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
     app: getAppFromContext(buildCtx.credentialsCtx),
     targets,
-    iosCapabilitiesOptions: {
-      entitlements: await resolveEntitlementsJsonAsync(
-        buildCtx.projectDir,
-        buildCtx.workflow,
-        buildCtx.buildProfile.env ?? {}
-      ),
-    },
     distribution: buildCtx.buildProfile.distribution ?? 'store',
     enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
   });

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

@@ -20,6 +20,7 @@ export function transformJob(job: Ios.Job): IosJobInput {
     username: job.username,
     developmentClient: job.developmentClient,
     simulator: job.simulator,
+    experimental: job.experimental,
   };
 }
 

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

@@ -66,6 +66,9 @@ export async function prepareJobAsync(
     buildConfiguration: ctx.buildProfile.buildConfiguration,
     artifactPath: ctx.buildProfile.artifactPath,
     username,
+    experimental: {
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
+    },
   };
   return sanitizeJob(job);
 }

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

@@ -3,9 +3,9 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { isExpoUpdatesInstalled } from '../utils/updates';
-import { syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function syncProjectConfigurationAsync({

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

@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.58';
+const PLUGIN_PACKAGE_VERSION = '0.0.85';
 
 export interface LocalBuildOptions {
   enable: boolean;

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

@@ -5,34 +5,21 @@ import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
 import Log from '../log';
-import { getUsername } from '../project/projectUtils';
-import { ensureLoggedInAsync } from '../user/actions';
-import { easCliVersion } from '../utils/easCli';
-import { getVcsClient } from '../vcs';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
-} from './android/UpdatesModule';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
-import { BuildContext } from './context';
+} from '../update/android/UpdatesModule';
 import {
   readChannelSafelyAsync as readIosChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from './ios/UpdatesModule';
+} 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';
-import { isExpoUpdatesInstalled } from './utils/updates';
-
-// TODO(JJ): Replace this with the getRuntimeVersionNullable function in @expo/config-plugins
-function getRuntimeVersionNullable(
-  ...[config, platform]: Parameters<typeof Updates.getRuntimeVersion>
-): string | null {
-  try {
-    return Updates.getRuntimeVersion(config, platform);
-  } catch (e) {
-    Log.debug(e);
-    return null;
-  }
-}
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
@@ -49,7 +36,7 @@ export async function collectMetadataAsync<T extends Platform>(
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
     reactNativeVersion: await getReactNativeVersionAsync(ctx),
     ...channelOrReleaseChannel,
     distribution,

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

@@ -1,9 +1,15 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, SubmitProfile } from '@expo/eas-json';
+import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { AppPlatform, BuildFragment, BuildStatus, SubmissionFragment } from '../graphql/generated';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildResourceClass,
+  BuildStatus,
+  SubmissionFragment,
+} from '../graphql/generated';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
 import {
@@ -20,6 +26,7 @@ import {
   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';
@@ -29,6 +36,7 @@ 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';
@@ -46,8 +54,23 @@ export interface BuildFlags {
   autoSubmit: boolean;
   submitProfile?: string;
   localBuildOptions: LocalBuildOptions;
+  userInputResourceClass?: UserInputResourceClass;
 }
 
+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);
@@ -56,11 +79,12 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
     projectDir,
     nonInteractive: flags.nonInteractive,
   });
+  const easJsonReader = new EasJsonReader(projectDir);
 
   const platforms = toPlatforms(flags.requestedPlatform);
   const buildProfiles = await getProfilesAsync({
     type: 'build',
-    projectDir,
+    easJsonReader,
     platforms,
     profileName: flags.profile ?? undefined,
   });
@@ -83,6 +107,10 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
       flags,
       moreBuilds: platforms.length > 1,
       buildProfile,
+      resourceClass:
+        platformToGraphQLResourceClassMapping[buildProfile.platform][
+          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
+        ],
     });
     if (maybeBuild) {
       startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -101,7 +129,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
   const submissions: SubmissionFragment[] = [];
   if (flags.autoSubmit) {
     const submitProfiles = await getProfilesAsync({
-      projectDir,
+      easJsonReader,
       platforms,
       profileName: flags.submitProfile,
       type: 'submit',
@@ -130,10 +158,17 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
   }
 
   if (!flags.wait) {
+    if (flags.json) {
+      printJsonOnlyOutput(startedBuilds.map(buildInfo => buildInfo.build));
+    }
     return;
   }
 
-  const builds = await waitForBuildEndAsync(startedBuilds.map(({ build }) => build.id));
+  const { accountName } = Object.values(buildCtxByPlatform)[0];
+  const builds = await waitForBuildEndAsync({
+    buildIds: startedBuilds.map(({ build }) => build.id),
+    accountName,
+  });
   printBuildResults(builds, flags.json);
 
   const haveAllBuildsFailedOrCanceled = builds.every(
@@ -152,14 +187,17 @@ async function prepareAndStartBuildAsync({
   flags,
   moreBuilds,
   buildProfile,
+  resourceClass,
 }: {
   projectDir: string;
   flags: BuildFlags;
   moreBuilds: boolean;
   buildProfile: ProfileData<'build'>;
+  resourceClass: BuildResourceClass;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
     buildProfileName: buildProfile.profileName,
+    resourceClass,
     clearCache: flags.clearCache,
     buildProfile: buildProfile.profile,
     nonInteractive: flags.nonInteractive,

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

@@ -12,3 +12,8 @@ export enum BuildDistributionType {
   INTERNAL = 'internal',
   SIMULATOR = 'simulator',
 }
+
+export enum UserInputResourceClass {
+  DEFAULT = 'default',
+  LARGE = 'large',
+}

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

@@ -103,10 +103,7 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
     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:');

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

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

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

@@ -4,20 +4,24 @@ 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 {
@@ -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/commandUtils/__tests__/EasCommand-test.ts

@@ -1,12 +1,8 @@
-import { asMock } from '../../__tests__/utils';
 import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
 import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
 import { getUserAsync } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';
 import EasCommand from '../EasCommand';
-import TestEasCommand from './TestEasCommand';
-
-TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
 
 jest.mock('../../user/User');
 jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
@@ -32,17 +28,30 @@ afterAll(() => {
 });
 
 beforeEach(() => {
-  asMock(getUserAsync)
+  jest
+    .mocked(getUserAsync)
     .mockReset()
-    .mockImplementation(() => mockJester);
-  asMock(ensureLoggedInAsync)
+    .mockImplementation(async () => mockJester);
+  jest
+    .mocked(ensureLoggedInAsync)
     .mockReset()
-    .mockImplementation(() => mockJester);
-  asMock(initAsync).mockReset();
-  asMock(flushAsync).mockReset();
-  asMock(logEvent).mockReset();
+    .mockImplementation(async () => mockJester);
+  jest.mocked(initAsync).mockReset();
+  jest.mocked(flushAsync).mockReset();
+  jest.mocked(logEvent).mockReset();
 });
 
+const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
+  class TestEasCommand extends EasCommand {
+    requiresAuthentication = authValue;
+
+    async runAsync(): Promise<void> {}
+  }
+
+  TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
+  return TestEasCommand;
+};
+
 describe(EasCommand.name, () => {
   describe('without exceptions', () => {
     // The first test in this suite should have an increased timeout
@@ -53,32 +62,36 @@ describe(EasCommand.name, () => {
     // See https://github.com/oclif/command/blob/master/src/command.ts#L80
     // and look for "Config.load"
     it('ensures the user is logged in', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(ensureLoggedInAsync).toHaveBeenCalled();
     }, 15_000);
 
     it('ensures the user data is read from cache', async () => {
-      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
-
+      const TestEasCommand = createTestEasCommand(false);
       await TestEasCommand.run();
 
-      expect(getUserAsync).toHaveReturnedWith(mockJester);
+      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
+      expect(jest.mocked(ensureLoggedInAsync)).not.toBeCalled();
     });
 
     it('initializes analytics', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(initAsync).toHaveBeenCalled();
     });
 
     it('flushes analytics', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(flushAsync).toHaveBeenCalled();
     });
 
     it('logs events', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(logEvent).toHaveBeenCalledWith('action', {
@@ -89,11 +102,12 @@ describe(EasCommand.name, () => {
 
   describe('after exceptions', () => {
     it('flushes analytics', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       try {
         await TestEasCommand.run().then(() => {
           throw new Error('foo');
         });
-      } catch (error) {}
+      } catch {}
 
       expect(flushAsync).toHaveBeenCalled();
     });

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

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

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

@@ -3,7 +3,7 @@ import Log from '../log';
 import UserSettings from '../user/UserSettings';
 
 export default class AnalyticsView extends EasCommand {
-  static description = 'view or change analytics settings';
+  static description = 'display or change analytics settings';
 
   static args = [{ name: 'STATUS', options: ['on', 'off'] }];
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -11,6 +10,7 @@ import {
   UpdateBranch,
 } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -52,7 +52,7 @@ export async function createUpdateBranchOnAppAsync({
 }
 
 export default class BranchCreate extends EasCommand {
-  static description = 'Create a branch on the current project.';
+  static description = 'create a branch';
 
   static args = [
     {
@@ -79,7 +79,7 @@ export default class BranchCreate extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -13,6 +12,7 @@ import {
   GetBranchInfoQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -77,7 +77,7 @@ async function deleteBranchOnAppAsync({
 }
 
 export default class BranchDelete extends EasCommand {
-  static description = 'Delete a branch on the current project';
+  static description = 'delete a branch';
 
   static args = [
     {
@@ -103,7 +103,7 @@ export default class BranchDelete extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import CliTable from 'cli-table3';
@@ -14,6 +13,7 @@ import {
 } from '../../graphql/generated';
 import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -55,7 +55,7 @@ export async function listBranchesAsync({
 }
 
 export default class BranchList extends EasCommand {
-  static description = 'List all branches on this project.';
+  static description = 'list all branches';
 
   static flags = {
     json: Flags.boolean({
@@ -71,7 +71,7 @@ export default class BranchList extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const branches = await listBranchesAsync({ projectId });
     if (flags.json) {

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -12,6 +11,7 @@ import {
   UpdateBranch,
 } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -52,7 +52,7 @@ async function renameUpdateBranchOnAppAsync({
 }
 
 export default class BranchRename extends EasCommand {
-  static description = 'Rename a branch.';
+  static description = 'rename a branch';
 
   static flags = {
     from: Flags.string({
@@ -78,7 +78,7 @@ export default class BranchRename extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import Table from 'cli-table3';
@@ -6,6 +5,7 @@ import Table from 'cli-table3';
 import EasCommand from '../../commandUtils/EasCommand';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
@@ -14,7 +14,7 @@ import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export default class BranchView extends EasCommand {
-  static description = 'View a branch.';
+  static description = 'view a branch';
 
   static args = [
     {
@@ -41,7 +41,7 @@ export default class BranchView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     if (!name) {

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -14,6 +13,7 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { appPlatformEmojis } from '../../platform';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -104,13 +104,13 @@ async function selectBuildToCancelAsync(
 async function ensureBuildExistsAsync(buildId: string): Promise<void> {
   try {
     await BuildQuery.byIdAsync(buildId);
-  } catch (err) {
+  } catch {
     throw new Error(`Couldn't find a build matching the id ${buildId}`);
   }
 }
 
 export default class BuildCancel extends EasCommand {
-  static description = 'Cancel a build.';
+  static description = 'cancel a build';
 
   static args = [{ name: 'BUILD_ID' }];
 
@@ -118,7 +118,7 @@ export default class BuildCancel extends EasCommand {
     const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);
 

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

@@ -1,23 +1,22 @@
-import { getConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../build/android/UpdatesModule';
 import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
 import { ensureProjectConfiguredAsync } from '../../build/configure';
-import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../build/ios/UpdatesModule';
-import { isExpoUpdatesInstalled } from '../../build/utils/updates';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { findProjectRootAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
+import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
+import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { getVcsClient } from '../../vcs';
 
 export default class BuildConfigure extends EasCommand {
-  static description = 'Configure the project to support EAS Build.';
+  static description = 'configure the project to support EAS Build';
 
   static flags = {
     platform: Flags.enum({
@@ -56,7 +55,7 @@ export default class BuildConfigure extends EasCommand {
 
     // configure expo-updates
     if (expoUpdatesIsInstalled) {
-      const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+      const exp = getExpoConfig(projectDir);
 
       if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
         const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);

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

@@ -1,21 +1,13 @@
-import { EasJsonReader } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import figures from 'figures';
-import fs from 'fs-extra';
 import path from 'path';
 
 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
+import { UserInputResourceClass } from '../../build/types';
 import EasCommand from '../../commandUtils/EasCommand';
-import Log, { learnMore, link } from '../../log';
+import Log from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
 import { findProjectRootAsync } from '../../project/projectUtils';
-import { selectAsync } from '../../prompts';
-import { easCliVersion } from '../../utils/easCli';
 import { enableJsonOutput } from '../../utils/json';
-import { getVcsClient, setVcsClient } from '../../vcs';
-import GitClient from '../../vcs/clients/git';
 
 interface RawBuildFlags {
   platform?: string;
@@ -30,10 +22,11 @@ interface RawBuildFlags {
   json: boolean;
   'auto-submit': boolean;
   'auto-submit-with-profile'?: string;
+  'resource-class'?: UserInputResourceClass;
 }
 
 export default class Build extends EasCommand {
-  static description = 'Start a build';
+  static description = 'start a build';
 
   static flags = {
     platform: Flags.enum({
@@ -50,7 +43,7 @@ export default class Build extends EasCommand {
     }),
     'skip-project-configuration': Flags.boolean({
       default: false,
-      description: 'Skip project configuration',
+      hidden: true,
     }),
     profile: Flags.string({
       description:
@@ -88,6 +81,11 @@ export default class Build extends EasCommand {
       helpValue: 'PROFILE_NAME',
       exclusive: ['auto-submit'],
     }),
+    'resource-class': Flags.enum({
+      options: Object.values(UserInputResourceClass),
+      hidden: true,
+      description: 'The instance type that will be used to run this build [experimental]',
+    }),
   };
 
   async runAsync(): Promise<void> {
@@ -98,7 +96,6 @@ export default class Build extends EasCommand {
     const flags = await this.sanitizeFlagsAsync(rawFlags);
 
     const projectDir = await findProjectRootAsync();
-    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
     await runBuildAndSubmitAsync(projectDir, flags);
   }
@@ -138,6 +135,13 @@ export default class Build extends EasCommand {
       );
       Log.newLine();
     }
+    if (flags['skip-project-configuration']) {
+      Log.warnDeprecatedFlag(
+        'skip-project-configuration',
+        'Automatic configuration of native code is no longer optional.'
+      );
+      Log.newLine();
+    }
 
     const profile = flags['profile'];
     return {
@@ -158,70 +162,7 @@ export default class Build extends EasCommand {
       json: flags['json'],
       autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
+      userInputResourceClass: flags['resource-class'] ?? UserInputResourceClass.DEFAULT,
     };
   }
 }
-
-export async function handleDeprecatedEasJsonAsync(
-  projectDir: string,
-  nonInteractive: boolean
-): Promise<void> {
-  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
-  if (!(await fs.pathExists(easJsonPath))) {
-    return;
-  }
-  const easJsonReader = new EasJsonReader(projectDir);
-  const rawEasJson = await easJsonReader.readAsync();
-  if (rawEasJson?.cli) {
-    return;
-  }
-
-  if (nonInteractive) {
-    Log.warn(
-      `${
-        figures.warning
-      } Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
-        'https://expo.fyi/eas-vcs-workflow'
-      )} for more information.`
-    );
-    Log.warn(
-      'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
-    );
-    setVcsClient(new GitClient());
-    return;
-  }
-  Log.log(
-    `${chalk.bold(
-      'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
-    )} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
-  );
-  Log.log(
-    `If you want to continue using the Git integration, you can opt in with ${chalk.bold(
-      'cli.requireCommit'
-    )} in ${chalk.bold('eas.json')} or with the following prompt.`
-  );
-  Log.newLine();
-
-  const mode = await selectAsync('Select your preferred Git integration', [
-    { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
-    { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
-  ]);
-
-  if (mode === 'requireCommit') {
-    setVcsClient(new GitClient());
-    await ensureRepoIsCleanAsync(nonInteractive);
-  }
-
-  rawEasJson.cli =
-    mode === 'requireCommit'
-      ? { version: `>= ${easCliVersion}`, requireCommit: true }
-      : { version: `>= ${easCliVersion}` };
-  await fs.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
-  Log.withTick('Updated eas.json');
-  if (mode === 'requireCommit') {
-    await getVcsClient().trackFileAsync(easJsonPath);
-    await reviewAndCommitChangesAsync('Set cli.requireCommit to true in eas.json', {
-      nonInteractive,
-    });
-  }
-}

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

@@ -26,7 +26,7 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
 
 export default class BuildInspect extends EasCommand {
   static description =
-    'Inspect the state of the project at specific build stages. Useful for troubleshooting.';
+    'inspect the state of the project at specific build stages, useful for troubleshooting';
 
   static flags = {
     platform: Flags.enum({
@@ -102,7 +102,7 @@ export default class BuildInspect extends EasCommand {
         if (!flags.verbose) {
           Log.log(chalk.green('Build successful'));
         }
-      } catch (err) {
+      } catch {
         if (!flags.verbose) {
           Log.error('Build failed');
           Log.error(`Re-run this command with ${chalk.bold('--verbose')} flag to see the logs`);

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -14,6 +13,7 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -77,7 +77,7 @@ export default class BuildList extends EasCommand {
     const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
@@ -7,6 +6,7 @@ import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -35,7 +35,7 @@ export default class BuildView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -9,10 +8,11 @@ import {
   CreateUpdateChannelOnAppMutation,
   CreateUpdateChannelOnAppMutationVariables,
 } from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
-  getBranchByNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
@@ -60,7 +60,7 @@ export async function createUpdateChannelOnAppAsync({
 }
 
 export default class ChannelCreate extends EasCommand {
-  static description = 'Create a channel on the current project.';
+  static description = 'create a channel';
 
   static args = [
     {
@@ -88,7 +88,7 @@ export default class ChannelCreate extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {
@@ -106,14 +106,15 @@ export default class ChannelCreate extends EasCommand {
 
     let branchId: string;
     let branchMessage: string;
-    try {
-      const existingBranch = await getBranchByNameAsync({
-        appId: projectId,
-        name: channelName,
-      });
+    const existingBranch = await BranchQuery.getBranchByNameAsync({
+      appId: projectId,
+      name: channelName,
+    });
+
+    if (existingBranch) {
       branchId = existingBranch.id;
       branchMessage = `We found a branch with the same name`;
-    } catch (e) {
+    } else {
       const newBranch = await createUpdateBranchOnAppAsync({
         appId: projectId,
         name: channelName,

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';
 
@@ -12,6 +11,7 @@ import {
   GetChannelInfoQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -22,7 +22,7 @@ import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export default class ChannelDelete extends EasCommand {
   static hidden = true;
-  static description = 'Delete a channel on the current project';
+  static description = 'Delete a channel';
 
   static args = [
     {
@@ -33,7 +33,7 @@ export default class ChannelDelete extends EasCommand {
   ];
   static flags = {
     json: Flags.boolean({
-      description: `Delete a channel on the current project`,
+      description: 'print output as a JSON object',
       default: false,
     }),
     'non-interactive': Flags.boolean({
@@ -55,7 +55,7 @@ export default class ChannelDelete extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -13,12 +12,10 @@ import {
   UpdateChannelBranchMappingMutation,
   UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import {
-  findProjectRootAsync,
-  getBranchByNameAsync,
-  getProjectIdAsync,
-} from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
@@ -96,7 +93,7 @@ export async function updateChannelBranchMappingAsync({
 }
 
 export default class ChannelEdit extends EasCommand {
-  static description = 'Point a channel at a new branch.';
+  static description = 'point a channel at a new branch';
 
   static args = [
     {
@@ -111,36 +108,22 @@ export default class ChannelEdit extends EasCommand {
       description: 'Name of the branch to point to',
     }),
     json: Flags.boolean({
-      description: 'print output as a JSON object with the channel ID, name and branch mapping.',
+      description: 'Print output as a JSON object with the channel ID, name and branch mapping',
       default: false,
     }),
   };
 
   async runAsync(): Promise<void> {
-    let {
-      args: { name: channelName },
-      flags: { branch: branchName, json: jsonFlag },
-    } = await this.parse(ChannelEdit);
-    if (jsonFlag) {
+    const { args, flags } = await this.parse(ChannelEdit);
+    if (flags.json) {
       enableJsonOutput();
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
-    if (!channelName) {
-      const validationMessage = 'A channel name is required to edit a specific channel.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ name: channelName } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Please enter the name of the channel to edit:',
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
+    const channelName = args.name ?? (await promptForChannelAsync());
 
     const existingChannel = await getChannelByNameForAppAsync({ appId: projectId, channelName });
     if (existingChannel.updateBranches.length > 1) {
@@ -149,20 +132,19 @@ export default class ChannelEdit extends EasCommand {
       );
     }
 
-    if (!branchName) {
-      const validationMessage = 'branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ name: branchName } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: chalk`What branch should it change to?`,
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
+    const branchName = flags.branch ?? (await promptForBranchAsync());
 
-    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
+    const branch = await BranchQuery.getBranchByNameAsync({
+      appId: projectId,
+      name: branchName,
+    });
+    if (!branch) {
+      throw new Error(
+        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+          'eas branch:list'
+        )}.`
+      );
+    }
     const channel = await updateChannelBranchMappingAsync({
       channelId: existingChannel.id,
       // todo: move branch mapping logic to utility
@@ -172,7 +154,7 @@ export default class ChannelEdit extends EasCommand {
       }),
     });
 
-    if (jsonFlag) {
+    if (flags.json) {
       printJsonOnlyOutput(channel);
     } else {
       Log.withTick(
@@ -185,3 +167,25 @@ export default class ChannelEdit extends EasCommand {
     }
   }
 }
+
+async function promptForChannelAsync(): Promise<string> {
+  Log.addNewLineIfNone();
+  const { name } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    message: 'Please enter the name of the channel to edit:',
+    validate: value => (value ? true : 'The channel name may not be empty.'),
+  });
+  return name;
+}
+
+async function promptForBranchAsync(): Promise<string> {
+  Log.addNewLineIfNone();
+  const { name } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    message: `To which branch should the channel link?`,
+    validate: value => (value ? true : 'The branch name may not be empty.'),
+  });
+  return name;
+}

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';
 
@@ -9,6 +8,7 @@ import {
   GetAllChannelsForAppQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -67,7 +67,7 @@ async function getAllUpdateChannelForAppAsync({
 }
 
 export default class ChannelList extends EasCommand {
-  static description = 'List all channels on the current project.';
+  static description = 'list all channels';
 
   static flags = {
     json: Flags.boolean({
@@ -85,7 +85,7 @@ export default class ChannelList extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({

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

@@ -1,20 +1,21 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
-  getBranchByNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { updateChannelBranchMappingAsync } from './edit';
-import { BranchMapping, getBranchMapping, getUpdateChannelByNameForAppAsync } from './view';
+import { BranchMapping, getBranchMapping } from './view';
 
 async function promptForRolloutPercentAsync({
   promptMessage,
@@ -39,28 +40,20 @@ async function promptForRolloutPercentAsync({
   return rolloutPercent;
 }
 
-function getRolloutInfo(getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery): {
+function getRolloutInfo(
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>
+): {
   newBranch: Pick<UpdateBranch, 'name' | 'id'>;
   oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
   currentPercent: number;
 } {
-  const { branchMapping } = getBranchMapping(
-    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
-  );
+  const { branchMapping } = getBranchMapping(channel.branchMapping);
   const [newBranchId, oldBranchId] = branchMapping.data.map(d => d.branchId);
-  const newBranch =
-    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
-      branch => branch.id === newBranchId
-    )[0];
-  const oldBranch =
-    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
-      branch => branch.id === oldBranchId
-    )[0];
+  const newBranch = channel.updateBranches.filter(branch => branch.id === newBranchId)[0];
+  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
 
   if (!newBranch || !oldBranch) {
-    throw new Error(
-      `Branch mapping rollout is missing a branch for channel "${getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.name}".`
-    );
+    throw new Error(`Branch mapping rollout is missing a branch for channel "${channel.name}".`);
   }
 
   const currentPercent = 100 * branchMapping.data[0].branchMappingLogic.operand;
@@ -75,16 +68,16 @@ async function startRolloutAsync({
   projectId,
   fullName,
   currentBranchMapping,
-  getUpdateChannelByNameForAppResult,
+  channel,
 }: {
   channelName?: string;
-  branchName?: string;
+  branchName: string;
   percent?: number;
   jsonFlag: boolean;
   projectId: string;
   fullName: string;
   currentBranchMapping: BranchMapping;
-  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
 }): Promise<{
   newChannelInfo: {
     id: string;
@@ -93,19 +86,18 @@ async function startRolloutAsync({
   };
   logMessage: string;
 }> {
-  if (!branchName) {
-    const validationMessage = 'A branch must be specified.';
-    if (jsonFlag) {
-      throw new Error(validationMessage);
-    }
-    ({ name: branchName } = await promptAsync({
-      type: 'text',
-      name: 'name',
-      message: `Select a branch to rollout onto ${channelName}`,
-      validate: value => (value ? true : validationMessage),
-    }));
+  const branch = await BranchQuery.getBranchByNameAsync({
+    appId: projectId,
+    name: branchName,
+  });
+  if (!branch) {
+    throw new Error(
+      `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+        'eas branch:list'
+      )}.`
+    );
   }
-  const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
+
   const oldBranchId = currentBranchMapping.data[0].branchId;
   if (branch.id === oldBranchId) {
     throw new Error(
@@ -138,14 +130,11 @@ async function startRolloutAsync({
     ],
   };
   const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
+    channelId: channel.id,
     branchMapping: JSON.stringify(newBranchMapping),
   });
 
-  const oldBranch =
-    getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.updateBranches.filter(
-      branch => branch.id === oldBranchId
-    )[0];
+  const oldBranch = channel.updateBranches.filter(branch => branch.id === oldBranchId)[0];
   if (!oldBranch) {
     throw new Error(
       `Branch mapping is missing its only branch for channel "${channelName}" on app "${fullName}"`
@@ -168,13 +157,13 @@ async function editRolloutAsync({
   percent,
   jsonFlag,
   currentBranchMapping,
-  getUpdateChannelByNameForAppResult,
+  channel,
 }: {
   channelName?: string;
   percent?: number;
   jsonFlag: boolean;
   currentBranchMapping: BranchMapping;
-  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
 }): Promise<{
   newChannelInfo: {
     id: string;
@@ -183,9 +172,7 @@ async function editRolloutAsync({
   };
   logMessage: string;
 }> {
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
-    getUpdateChannelByNameForAppResult
-  );
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
 
   if (percent == null) {
     if (jsonFlag) {
@@ -205,7 +192,7 @@ async function editRolloutAsync({
   newBranchMapping.data[0].branchMappingLogic.operand = percent / 100;
 
   const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
+    channelId: channel.id,
     branchMapping: JSON.stringify(newBranchMapping),
   });
 
@@ -225,13 +212,13 @@ async function endRolloutAsync({
   branchName,
   jsonFlag,
   projectId,
-  getUpdateChannelByNameForAppResult,
+  channel,
 }: {
   channelName?: string;
   branchName?: string;
   jsonFlag: boolean;
   projectId: string;
-  getUpdateChannelByNameForAppResult: GetChannelByNameForAppQuery;
+  channel: NonNullable<GetChannelByNameForAppQuery['app']['byId']['updateChannelByName']>;
 }): Promise<{
   newChannelInfo: {
     id: string;
@@ -241,13 +228,22 @@ async function endRolloutAsync({
   logMessage: string;
 }> {
   // end rollout
-  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(
-    getUpdateChannelByNameForAppResult
-  );
+  const { newBranch, oldBranch, currentPercent } = getRolloutInfo(channel);
 
   let endOnNewBranch;
   if (branchName) {
-    const branch = await getBranchByNameAsync({ appId: projectId, name: branchName! });
+    const branch = await BranchQuery.getBranchByNameAsync({
+      appId: projectId,
+      name: branchName,
+    });
+    if (!branch) {
+      throw new Error(
+        `Could not find a branch named "${branchName}". Please check what branches exist on this project with ${chalk.bold(
+          'eas branch:list'
+        )}.`
+      );
+    }
+
     switch (branch.id) {
       case newBranch.id:
         endOnNewBranch = true;
@@ -295,7 +291,7 @@ async function endRolloutAsync({
   };
 
   const newChannelInfo = await updateChannelBranchMappingAsync({
-    channelId: getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.id!,
+    channelId: channel.id,
     branchMapping: JSON.stringify(newBranchMapping),
   });
   const logMessage = `️Rollout on channel ${chalk.bold(
@@ -348,16 +344,24 @@ export default class ChannelRollout extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
-    const getUpdateChannelByNameForAppResult = await getUpdateChannelByNameForAppAsync({
+    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
       appId: projectId,
       channelName: channelName!,
     });
+    if (!channel) {
+      throw new Error(
+        `Could not find a channel named "${channelName}". Please check what channels exist on this project with ${chalk.bold(
+          'eas channel:list'
+        )}.`
+      );
+    }
+
     const { branchMapping: currentBranchMapping, isRollout } = getBranchMapping(
-      getUpdateChannelByNameForAppResult.app?.byId.updateChannelByName?.branchMapping
+      channel.branchMapping
     );
 
     if (currentBranchMapping.data.length === 0) {
@@ -391,13 +395,13 @@ export default class ChannelRollout extends EasCommand {
     if (!isRollout) {
       rolloutMutationResult = await startRolloutAsync({
         channelName,
-        branchName,
+        branchName: branchName ?? (await promptForBranchNameAsync(channelName)),
         percent,
         jsonFlag,
         projectId,
         fullName,
         currentBranchMapping,
-        getUpdateChannelByNameForAppResult,
+        channel,
       });
     } else if (endFlag) {
       rolloutMutationResult = await endRolloutAsync({
@@ -405,7 +409,7 @@ export default class ChannelRollout extends EasCommand {
         branchName,
         jsonFlag,
         projectId,
-        getUpdateChannelByNameForAppResult,
+        channel,
       });
     } else {
       rolloutMutationResult = await editRolloutAsync({
@@ -413,7 +417,7 @@ export default class ChannelRollout extends EasCommand {
         percent,
         jsonFlag,
         currentBranchMapping,
-        getUpdateChannelByNameForAppResult,
+        channel,
       });
     }
     if (!rolloutMutationResult) {
@@ -427,3 +431,13 @@ export default class ChannelRollout extends EasCommand {
     }
   }
 }
+
+async function promptForBranchNameAsync(channelName: string): Promise<string> {
+  const { name } = await promptAsync({
+    type: 'text',
+    name: 'name',
+    message: `Select a branch to rollout onto ${channelName}`,
+    validate: value => (value ? true : 'A branch must be specified.'),
+  });
+  return name;
+}

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

@@ -1,17 +1,12 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
 import Table from 'cli-table3';
-import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  GetChannelByNameForAppQuery,
-  GetChannelByNameForAppQueryVariables,
-} from '../../graphql/generated';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import {
@@ -50,7 +45,7 @@ export function getBranchMapping(branchMappingString?: string): {
   let branchMapping: BranchMapping;
   try {
     branchMapping = JSON.parse(branchMappingString);
-  } catch (e) {
+  } catch {
     throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
   }
   assert(branchMapping, 'Branch Mapping must be defined.');
@@ -91,56 +86,6 @@ export function getBranchMapping(branchMappingString?: string): {
   return { branchMapping, isRollout, rolloutPercent };
 }
 
-export async function getUpdateChannelByNameForAppAsync({
-  appId,
-  channelName,
-}: GetChannelByNameForAppQueryVariables): Promise<GetChannelByNameForAppQuery> {
-  return await withErrorHandlingAsync(
-    graphqlClient
-      .query<GetChannelByNameForAppQuery, GetChannelByNameForAppQueryVariables>(
-        gql`
-          query GetChannelByNameForApp($appId: String!, $channelName: String!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateChannelByName(name: $channelName) {
-                  id
-                  name
-                  createdAt
-                  branchMapping
-                  updateBranches(offset: 0, limit: 1000) {
-                    id
-                    name
-                    updates(offset: 0, limit: 10) {
-                      id
-                      group
-                      message
-                      runtimeVersion
-                      createdAt
-                      platform
-                      actor {
-                        id
-                        ... on User {
-                          username
-                        }
-                        ... on Robot {
-                          firstName
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        `,
-        { appId, channelName },
-        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
-      )
-      .toPromise()
-  );
-}
-
 export function logChannelDetails(channel: {
   branchMapping: string;
   updateBranches: {
@@ -193,7 +138,7 @@ export function logChannelDetails(channel: {
 }
 
 export default class ChannelView extends EasCommand {
-  static description = 'View a channel on the current project.';
+  static description = 'view a channel';
 
   static args = [
     {
@@ -220,7 +165,7 @@ export default class ChannelView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {
@@ -236,11 +181,10 @@ export default class ChannelView extends EasCommand {
       }));
     }
 
-    const getUpdateChannelByNameForAppresult = await getUpdateChannelByNameForAppAsync({
+    const channel = await ChannelQuery.getUpdateChannelByNameForAppAsync({
       appId: projectId,
       channelName,
     });
-    const channel = getUpdateChannelByNameForAppresult.app?.byId.updateChannelByName;
     if (!channel) {
       throw new Error(`Could not find a channel with name: ${channelName}`);
     }

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

@@ -2,16 +2,18 @@ import { getProjectConfigDescription } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonReader } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
+import chalk from 'chalk';
 
 import EasCommand from '../commandUtils/EasCommand';
+import { toAppPlatform } from '../graphql/types/AppPlatform';
 import Log from '../log';
+import { appPlatformEmojis } from '../platform';
 import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync } from '../project/projectUtils';
 import { selectAsync } from '../prompts';
-import { handleDeprecatedEasJsonAsync } from './build';
 
 export default class Config extends EasCommand {
-  static description = 'show the eas.json config';
+  static description = 'display project configuration (app.json + eas.json)';
 
   static flags = {
     platform: Flags.enum({ char: 'p', options: ['android', 'ios'] }),
@@ -28,7 +30,6 @@ export default class Config extends EasCommand {
     };
 
     const projectDir = await findProjectRootAsync();
-    await handleDeprecatedEasJsonAsync(projectDir, false);
 
     const reader = new EasJsonReader(projectDir);
     const profileName =
@@ -58,12 +59,15 @@ export default class Config extends EasCommand {
     const profile = await reader.getBuildProfileAsync(platform, profileName);
     const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
 
-    Log.log(getProjectConfigDescription(projectDir));
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold(getProjectConfigDescription(projectDir)));
     Log.newLine();
     Log.log(JSON.stringify(config, null, 2));
     Log.newLine();
     Log.newLine();
-    Log.log(`Build profile "${profileName}" from eas.json for platform ${platform}`);
+    const appPlatform = toAppPlatform(platform);
+    const platformEmoji = appPlatformEmojis[appPlatform];
+    Log.log(`${platformEmoji} ${chalk.bold(`Build profile "${profileName}"`)}`);
     Log.newLine();
     Log.log(JSON.stringify(profile, null, 2));
   }

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

@@ -2,7 +2,7 @@ import EasCommand from '../commandUtils/EasCommand';
 import { SelectPlatform } from '../credentials/manager/SelectPlatform';
 
 export default class Credentials extends EasCommand {
-  static description = 'manage your credentials';
+  static description = 'manage credentials';
 
   async runAsync(): Promise<void> {
     await new SelectPlatform().runAsync();

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

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

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -9,6 +8,7 @@ import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleT
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { Ora, ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 
@@ -23,7 +23,7 @@ export default class BuildList extends EasCommand {
     let appleTeamIdentifier = (await this.parse(BuildList)).flags['apple-team-id'];
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const accountName = await getProjectAccountNameAsync(exp);
 
     let spinner: Ora;
@@ -34,7 +34,7 @@ export default class BuildList extends EasCommand {
       try {
         const teams = await AppleTeamQuery.getAllForAccountAsync(accountName);
 
-        if (teams.length) {
+        if (teams.length > 0) {
           spinner.succeed();
 
           if (teams.length === 1) {

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

@@ -1,10 +1,9 @@
-import { getConfig } from '@expo/config';
-
 import EasCommand from '../../commandUtils/EasCommand';
 import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 
 export default class DeviceView extends EasCommand {
@@ -30,7 +29,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const accountName = await getProjectAccountNameAsync(exp);
 
     const spinner = ora().start(`Fetching device details for ${UDID}…`);

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

@@ -8,7 +8,7 @@ import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
 
 export default class Diagnostics extends EasCommand {
-  static description = 'log environment info to the console';
+  static description = 'display environment info';
 
   protected requiresAuthentication = false;
 

packages/eas-cli/src/commands/metadata/pull.ts

@@ -0,0 +1,64 @@
+import { getConfig } from '@expo/config';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+import path from 'path';
+
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import EasCommand from '../../commandUtils/EasCommand';
+import { CredentialsContext } from '../../credentials/context';
+import Log, { learnMore } from '../../log';
+import { createMetadataContextAsync } from '../../metadata/context';
+import { downloadMetadataAsync } from '../../metadata/download';
+import { handleMetadataError } from '../../metadata/errors';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+
+export default class MetadataPull extends EasCommand {
+  static description = 'generate the local store configuration from the app stores';
+
+  static flags = {
+    profile: Flags.string({
+      description:
+        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    Log.warn('EAS Metadata is in beta and subject to breaking changes.');
+
+    const { flags } = await this.parse(MetadataPull);
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    await getProjectIdAsync(exp);
+    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
+
+    const credentialsCtx = new CredentialsContext({
+      exp,
+      projectDir,
+      user: await ensureLoggedInAsync(),
+      nonInteractive: false,
+    });
+
+    const metadataCtx = await createMetadataContextAsync({
+      credentialsCtx,
+      projectDir,
+      exp,
+      profileName: flags.profile,
+    });
+
+    try {
+      const filePath = await downloadMetadataAsync(metadataCtx);
+      const relativePath = path.relative(process.cwd(), filePath);
+
+      Log.addNewLineIfNone();
+      Log.log(`🎉 Your store configuration is ready.
+
+- Update the ${chalk.bold(relativePath)} file to prepare the app information.
+- Run ${chalk.bold('eas submit')} or manually upload a new app version to the app stores.
+- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store configuration.
+- ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
+    } catch (error: any) {
+      handleMetadataError(error);
+    }
+  }
+}

packages/eas-cli/src/commands/metadata/push.ts

@@ -0,0 +1,57 @@
+import { getConfig } from '@expo/config';
+import { Flags } from '@oclif/core';
+
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import EasCommand from '../../commandUtils/EasCommand';
+import { CredentialsContext } from '../../credentials/context';
+import Log, { learnMore } from '../../log';
+import { createMetadataContextAsync } from '../../metadata/context';
+import { handleMetadataError } from '../../metadata/errors';
+import { uploadMetadataAsync } from '../../metadata/upload';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+
+export default class MetadataPush extends EasCommand {
+  static description = 'sync the local store configuration to the app stores';
+
+  static flags = {
+    profile: Flags.string({
+      description:
+        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    Log.warn('EAS Metadata is in beta and subject to breaking changes.');
+
+    const { flags } = await this.parse(MetadataPush);
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    await getProjectIdAsync(exp);
+    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
+
+    const credentialsCtx = new CredentialsContext({
+      exp,
+      projectDir,
+      user: await ensureLoggedInAsync(),
+      nonInteractive: false,
+    });
+
+    const metadataCtx = await createMetadataContextAsync({
+      credentialsCtx,
+      projectDir,
+      exp,
+      profileName: flags.profile,
+    });
+
+    try {
+      const { appleLink } = await uploadMetadataAsync(metadataCtx);
+      Log.addNewLineIfNone();
+      Log.log(`🎉 Store configuration is synced with the app stores.
+
+${learnMore(appleLink, { learnMoreMessage: 'See the changes in App Store Connect' })}`);
+    } catch (error: any) {
+      handleMetadataError(error);
+    }
+  }
+}

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

@@ -1,10 +1,10 @@
-import { getConfig } from '@expo/config';
 import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
 
@@ -36,7 +36,7 @@ export default class ProjectInfo extends EasCommand {
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const { app } = await projectInfoByIdAsync(projectId);
     if (!app) {

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

@@ -1,8 +1,8 @@
-import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';
 
 export default class ProjectInit extends EasCommand {
@@ -11,7 +11,7 @@ export default class ProjectInit extends EasCommand {
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
 
     if (exp.extra?.eas?.projectId) {
       Log.error(

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -9,6 +8,7 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -20,7 +20,7 @@ import { getActorDisplayName } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';
 
 export default class EnvironmentSecretCreate extends EasCommand {
-  static description = 'Create an environment secret on the current project or owner account.';
+  static description = 'create an environment secret on the current project or owner account';
 
   static flags = {
     scope: Flags.enum({
@@ -47,7 +47,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
     } = await this.parse(EnvironmentSecretCreate);
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const accountName = await getProjectAccountNameAsync(exp);
 
     const { slug } = exp;

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

@@ -1,6 +1,4 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
-import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
@@ -10,6 +8,7 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -18,8 +17,7 @@ import {
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
 
 export default class EnvironmentSecretDelete extends EasCommand {
-  static description = `Delete an environment secret by ID.
-Unsure where to find the secret's ID? Run ${chalk.bold('eas secret:list')}`;
+  static description = 'delete an environment secret by ID';
 
   static flags = {
     id: Flags.string({
@@ -29,7 +27,7 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secret:list')}`;
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 import dateFormat from 'dateformat';
@@ -6,6 +5,7 @@ import dateFormat from 'dateformat';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -13,11 +13,11 @@ import {
 } from '../../project/projectUtils';
 
 export default class EnvironmentSecretList extends EasCommand {
-  static description = 'Lists environment secrets available for your current app';
+  static description = 'list environment secrets available for your current app';
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 

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

@@ -1,11 +1,11 @@
-import { getConfig } from '@expo/config';
+import { EasJsonReader } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 
 import EasCommand from '../commandUtils/EasCommand';
 import { SubmissionFragment } from '../graphql/generated';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
-import Log, { link } from '../log';
+import Log from '../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
@@ -13,6 +13,7 @@ import {
   selectRequestedPlatformAsync,
   toPlatforms,
 } from '../platform';
+import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
 import { submitAsync, waitToCompleteAsync } from '../submit/submit';
@@ -41,8 +42,7 @@ interface CommandFlags {
 }
 
 export default class Submit extends EasCommand {
-  static description = `Submit build archive to App Store Connect
-See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit/eas-json/')}`;
+  static description = 'submit app binary to App Store and/or Play Store';
   static aliases = ['build:submit'];
 
   static flags = {
@@ -90,13 +90,13 @@ See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit
     const flags = await this.sanitizeFlagsAsync(rawFlags);
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     const platforms = toPlatforms(flags.requestedPlatform);
     const submissionProfiles = await getProfilesAsync({
       type: 'submit',
-      projectDir,
+      easJsonReader: new EasJsonReader(projectDir),
       platforms,
       profileName: flags.profile,
     });

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

@@ -1,32 +1,179 @@
-import { ExpoConfig, getConfig, modifyConfigAsync } from '@expo/config';
+import { ExpoConfig, modifyConfigAsync } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
+import { Flags } from '@oclif/core';
+import assert from 'assert';
 import chalk from 'chalk';
 
 import { getEASUpdateURL } from '../../api';
 import EasCommand from '../../commandUtils/EasCommand';
+import { AppPlatform } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { RequestedPlatform, appPlatformDisplayNames } from '../../platform';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectIdAsync,
+  installExpoUpdatesAsync,
+  isExpoUpdatesInstalledOrAvailable,
+} from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
+import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
+import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 
 const DEFAULT_MANAGED_RUNTIME_VERSION = { policy: 'sdkVersion' } as const;
-const DEFAULT_BARE_RUNTIME_VERSION = '1.0.0';
+const DEFAULT_BARE_RUNTIME_VERSION = '1.0.0' as const;
 
-async function configureProjectForEASUpdateAsync(
-  projectDir: string,
-  exp: ExpoConfig,
-  isBare: boolean
-): Promise<void> {
+export default class UpdateConfigure extends EasCommand {
+  static description = 'configure the project to support EAS Update';
+
+  static flags = {
+    platform: Flags.enum({
+      description: 'Platform to configure',
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+      default: 'all',
+    }),
+  };
+
+  async runAsync(): Promise<void> {
+    Log.log(
+      '💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
+    );
+    const { flags } = await this.parse(UpdateConfigure);
+    const platform = flags.platform as RequestedPlatform;
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+
+    if (!isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion)) {
+      await installExpoUpdatesAsync(projectDir);
+    }
+
+    const [androidWorkflow, iosWorkflow] = await Promise.all([
+      resolveWorkflowAsync(projectDir, Platform.ANDROID),
+      resolveWorkflowAsync(projectDir, Platform.IOS),
+    ]);
+
+    const updatedExp = await configureAppJSONForEASUpdateAsync({
+      projectDir,
+      exp,
+      platform,
+      workflows: {
+        android: androidWorkflow,
+        ios: iosWorkflow,
+      },
+    });
+    Log.withTick(`Configured ${chalk.bold('app.json')} for EAS Update`);
+
+    // configure native files for EAS Update
+    if (
+      [RequestedPlatform.Android, RequestedPlatform.All].includes(platform) &&
+      androidWorkflow === Workflow.GENERIC
+    ) {
+      await syncAndroidUpdatesConfigurationAsync(projectDir, updatedExp);
+      Log.withTick(`Configured ${chalk.bold('AndroidManifest.xml')} for EAS Update`);
+    }
+    if (
+      [RequestedPlatform.Ios, RequestedPlatform.All].includes(platform) &&
+      iosWorkflow === Workflow.GENERIC
+    ) {
+      await syncIosUpdatesConfigurationAsync(projectDir, updatedExp);
+      Log.withTick(`Configured ${chalk.bold('Expo.plist')} for EAS Update`);
+    }
+
+    Log.addNewLineIfNone();
+    Log.log(`🎉 Your app is configured to run EAS Update!`);
+  }
+}
+
+async function configureAppJSONForEASUpdateAsync({
+  projectDir,
+  exp,
+  platform,
+  workflows,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  platform: RequestedPlatform;
+  workflows: {
+    [key in RequestedPlatform.Android | RequestedPlatform.Ios]: Workflow;
+  };
+}): Promise<ExpoConfig> {
   const projectId = await getProjectIdAsync(exp);
   const easUpdateURL = getEASUpdateURL(projectId);
-  const preexistingRuntimeVersion = exp.runtimeVersion;
-  const defaultRuntimeVersion = isBare
-    ? DEFAULT_BARE_RUNTIME_VERSION
-    : DEFAULT_MANAGED_RUNTIME_VERSION;
-  const result = await modifyConfigAsync(projectDir, {
-    runtimeVersion: preexistingRuntimeVersion ?? defaultRuntimeVersion,
-    updates: { ...exp.updates, url: easUpdateURL },
-  });
+  const updates = { ...exp.updates, url: easUpdateURL };
 
+  const androidDefaultRuntimeVersion =
+    workflows['android'] === Workflow.GENERIC
+      ? DEFAULT_BARE_RUNTIME_VERSION
+      : DEFAULT_MANAGED_RUNTIME_VERSION;
+  const iosDefaultRuntimeVersion =
+    workflows['ios'] === Workflow.GENERIC
+      ? DEFAULT_BARE_RUNTIME_VERSION
+      : DEFAULT_MANAGED_RUNTIME_VERSION;
+
+  const newAndroidRuntimeVersion =
+    exp.android?.runtimeVersion ?? exp.runtimeVersion ?? androidDefaultRuntimeVersion;
+  const newIosRuntimeVersion =
+    exp.ios?.runtimeVersion ?? exp.runtimeVersion ?? iosDefaultRuntimeVersion;
+
+  let newConfig: Partial<ExpoConfig>;
+  switch (platform) {
+    case RequestedPlatform.All: {
+      if (isRuntimeEqual(newAndroidRuntimeVersion, newIosRuntimeVersion)) {
+        newConfig = {
+          runtimeVersion: newAndroidRuntimeVersion,
+          android: {
+            ...exp.android,
+            runtimeVersion: undefined,
+          },
+          ios: { ...exp.ios, runtimeVersion: undefined },
+          updates,
+        };
+      } else {
+        newConfig = {
+          runtimeVersion: undefined, // top level runtime is redundant if it is specified in both android and ios
+          android: {
+            ...exp.android,
+            runtimeVersion: newAndroidRuntimeVersion,
+          },
+          ios: {
+            ...exp.ios,
+            runtimeVersion: newIosRuntimeVersion,
+          },
+          updates,
+        };
+      }
+      break;
+    }
+    case RequestedPlatform.Android: {
+      newConfig = {
+        android: {
+          ...exp.android,
+          runtimeVersion: newAndroidRuntimeVersion,
+        },
+        updates,
+      };
+      break;
+    }
+    case RequestedPlatform.Ios: {
+      newConfig = {
+        ios: {
+          ...exp.ios,
+          runtimeVersion: newIosRuntimeVersion,
+        },
+        updates,
+      };
+      break;
+    }
+    default: {
+      throw new Error(`Unsupported platform: ${platform}`);
+    }
+  }
+
+  const result = await modifyConfigAsync(projectDir, newConfig);
+
+  const prexistingAndroidRuntimeVersion = exp.android?.runtimeVersion ?? exp.runtimeVersion;
+  const prexistingIosRuntimeVersion = exp.ios?.runtimeVersion ?? exp.runtimeVersion;
   switch (result.type) {
     case 'success':
       if (exp.updates?.url) {
@@ -38,12 +185,27 @@ async function configureProjectForEASUpdateAsync(
       } else {
         Log.withTick(`Set updates.url value, to "${easUpdateURL}" in app.json`);
       }
-      if (!preexistingRuntimeVersion) {
+
+      if (
+        !prexistingAndroidRuntimeVersion &&
+        [RequestedPlatform.Android, RequestedPlatform.All].includes(platform)
+      ) {
         Log.withTick(
-          `Set runtimeVersion to "${JSON.stringify(defaultRuntimeVersion)}" in app.json`
+          `Set ${appPlatformDisplayNames[AppPlatform.Android]} runtimeVersion to "${JSON.stringify(
+            newConfig.android?.runtimeVersion ?? newConfig.runtimeVersion
+          )}" in app.json`
+        );
+      }
+      if (
+        !prexistingIosRuntimeVersion &&
+        [RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)
+      ) {
+        Log.withTick(
+          `Set ${appPlatformDisplayNames[AppPlatform.Ios]} runtimeVersion to "${JSON.stringify(
+            newConfig.ios?.runtimeVersion ?? newConfig.runtimeVersion
+          )}" in app.json`
         );
       }
-
       break;
     case 'warn': {
       Log.addNewLineIfNone();
@@ -57,11 +219,15 @@ async function configureProjectForEASUpdateAsync(
           'https://expo.fyi/eas-update-config.md'
         )}\n`
       );
-      Log.log(
-        chalk.bold(
-          `{\n  "updates": {\n    "url": "${easUpdateURL}"\n  },\n  "runtimeVersion": {\n    "policy": "sdkVersion"\n  }\n}`
-        )
-      );
+      Log.log(chalk.bold(JSON.stringify(newConfig, null, 2)));
+      Log.addNewLineIfNone();
+      if (workflows['android'] === Workflow.GENERIC || workflows['ios'] === Workflow.GENERIC) {
+        Log.warn(
+          `You will also have to manually edit the projects ${chalk.bold(
+            'Expo.plist/AndroidManifest.xml'
+          )}. ${learnMore('https://expo.fyi/eas-update-config.md#native-configuration')}`
+        );
+      }
       Log.addNewLineIfNone();
       throw new Error(result.message);
     }
@@ -70,40 +236,20 @@ async function configureProjectForEASUpdateAsync(
     default:
       throw new Error('Unexpected result type from modifyConfigAsync');
   }
+  assert(result.config, 'A successful result should have a config');
+
+  return result.config.expo;
 }
 
-export default class UpdateConfigure extends EasCommand {
-  static description = 'Configure the project to support EAS Update.';
-
-  async runAsync(): Promise<void> {
-    Log.log(
-      '💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
-    );
-
-    const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, {
-      skipSDKVersionRequirement: true,
-    });
-
-    const hasAndroidNativeProject =
-      (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
-    const hasIosNativeProject =
-      (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
-    const isBare = hasAndroidNativeProject || hasIosNativeProject;
-
-    await configureProjectForEASUpdateAsync(projectDir, exp, isBare);
-
-    Log.addNewLineIfNone();
-    if (isBare) {
-      Log.log(
-        `🧐 It seems you are on the bare workflow! Please also update your native files. You can do this by either running ${chalk.bold(
-          'eas build:configure'
-        )} or manually editing Expo.plist/AndroidManifest.xml. ${learnMore(
-          'https://expo.fyi/eas-update-config.md#native-configuration'
-        )}`
-      );
-    } else {
-      Log.log(`🎉 Your app is configured to run EAS Update!`);
-    }
+function isRuntimeEqual(
+  runtimeVersionA: string | { policy: 'sdkVersion' | 'nativeVersion' },
+  runtimeVersionB: string | { policy: 'sdkVersion' | 'nativeVersion' }
+): boolean {
+  if (typeof runtimeVersionA === 'string' && typeof runtimeVersionB === 'string') {
+    return runtimeVersionA === runtimeVersionB;
+  } else if (typeof runtimeVersionA === 'object' && typeof runtimeVersionB === 'object') {
+    return runtimeVersionA.policy === runtimeVersionB.policy;
+  } else {
+    return false;
   }
 }

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

@@ -36,7 +36,7 @@ async function deleteUpdateGroupAsync({
 }
 
 export default class UpdateDelete extends EasCommand {
-  static description = 'Delete all the updates in an update Group.';
+  static description = 'delete all the updates in an update group';
 
   static args = [
     {
@@ -68,8 +68,8 @@ export default class UpdateDelete extends EasCommand {
           `${chalk.yellow(`This will delete all of the updates in group "${group}".`)} ${chalk.red(
             'This is a permanent operation.'
           )}\n\n` +
-          `If you want to revert to a previous publish, you should use 'branch:publish --republish' targeted at the last working update group instead.\n\n` +
-          `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'branch:publish --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent cacheing behavior by clients.\n\n` +
+          `If you want to revert to a previous publish, you should use 'update --republish' targeted at the last working update group instead.\n\n` +
+          `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'update --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent cacheing behavior by clients.\n\n` +
           `Would you like to abort?`,
       });
 

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

@@ -1,29 +1,41 @@
-import { ExpoConfig, getConfig } from '@expo/config';
+import { ExpoConfig } from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { Flags } from '@oclif/core';
+import { Errors, Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
 import dateFormat from 'dateformat';
 import gql from 'graphql-tag';
+import nullthrows from 'nullthrows';
 
 import { getEASUpdateURL } from '../../api';
+import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
+import fetch from '../../fetch';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetUpdateGroupAsyncQuery,
+  PublishUpdateGroupInput,
   Robot,
   RootQueryUpdatesByGroupArgs,
   Update,
   UpdateInfoGroup,
+  UpdatePublishMutation,
   User,
   ViewBranchUpdatesQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log from '../../log';
+import Log, { link } from '../../log';
 import { ora } from '../../ora';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import {
+  findProjectRootAsync,
+  getProjectAccountName,
+  getProjectIdAsync,
+  installExpoUpdatesAsync,
+  isExpoUpdatesInstalledOrAvailable,
+} from '../../project/projectUtils';
 import {
   PublishPlatform,
   buildBundlesAsync,
@@ -32,8 +44,15 @@ import {
   uploadAssetsAsync,
 } from '../../project/publish';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { promptAsync, selectAsync } from '../../prompts';
+import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
 import { formatUpdate } from '../../update/utils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import {
+  checkManifestBodyAgainstUpdateInfoGroup,
+  getCodeSigningInfoAsync,
+  getManifestBodyAsync,
+  signManifestBody,
+} from '../../utils/code-signing';
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -43,7 +62,7 @@ import { listBranchesAsync } from '../branch/list';
 import { createUpdateChannelOnAppAsync } from '../channel/create';
 
 export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
-type PlatformFlag = PublishPlatform | 'all';
+export type PublishPlatformFlag = PublishPlatform | 'all';
 
 async function getUpdateGroupAsync({
   group,
@@ -101,12 +120,16 @@ async function ensureChannelExistsAsync({
   }
 }
 
-async function ensureBranchExistsAsync({
+export async function ensureBranchExistsAsync({
   appId,
   name: branchName,
+  limit,
+  offset,
 }: {
   appId: string;
   name: string;
+  limit?: number;
+  offset?: number;
 }): Promise<{
   id: string;
   updates: Exclude<
@@ -117,6 +140,8 @@ async function ensureBranchExistsAsync({
   const { app } = await UpdateQuery.viewBranchAsync({
     appId,
     name: branchName,
+    limit,
+    offset,
   });
   const updateBranch = app?.byId.updateBranchByName;
   if (updateBranch) {
@@ -132,7 +157,7 @@ async function ensureBranchExistsAsync({
 }
 
 export default class UpdatePublish extends EasCommand {
-  static description = 'Publish an update group.';
+  static description = 'publish an update group';
 
   static flags = {
     branch: Flags.string({
@@ -175,6 +200,14 @@ export default class UpdatePublish extends EasCommand {
         'Use the current git branch and commit message for the EAS branch and update message',
       default: false,
     }),
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+      required: false,
+    }),
+    'non-interactive': Flags.boolean({
+      default: false,
+      description: 'Run command in non-interactive mode',
+    }),
   };
 
   async runAsync(): Promise<void> {
@@ -189,21 +222,55 @@ export default class UpdatePublish extends EasCommand {
         'input-dir': inputDir,
         'skip-bundler': skipBundler,
         platform,
+        'private-key-path': privateKeyPath,
+        'non-interactive': nonInteractive,
       },
     } = await this.parse(UpdatePublish);
     if (jsonFlag) {
       enableJsonOutput();
     }
-    const platformFlag = platform as PlatformFlag;
+
+    const platformFlag = platform as PublishPlatformFlag;
     // If a group was specified, that means we are republishing it.
     republish = group ? true : republish;
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, {
-      skipSDKVersionRequirement: true,
+    const exp = getExpoConfig(projectDir, {
       isPublicConfig: true,
     });
 
+    const expPrivate = getExpoConfig(projectDir, {
+      isPublicConfig: false,
+    });
+
+    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
+
+    const hasExpoUpdates = isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion);
+    if (!hasExpoUpdates && nonInteractive) {
+      Errors.error(
+        `${chalk.bold(
+          'expo-updates'
+        )} must already be installed when executing in non-interactive mode`,
+        { exit: 1 }
+      );
+    }
+
+    if (!hasExpoUpdates) {
+      const install = await confirmAsync({
+        message: `You are creating an update which requires ${chalk.bold(
+          'expo-updates'
+        )} to be installed in your app.\n  Do you want EAS CLI to install it for you?`,
+        instructions: 'The command will abort unless you agree.',
+      });
+      if (install) {
+        await installExpoUpdatesAsync(projectDir);
+      } else {
+        Errors.error(`Install ${chalk.bold('expo-updates')} manually and come back later.`, {
+          exit: 1,
+        });
+      }
+    }
+
     const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
     const projectId = await getProjectIdAsync(exp);
     await checkEASUpdateURLIsSetAsync(exp);
@@ -215,6 +282,10 @@ export default class UpdatePublish extends EasCommand {
     }
 
     if (!branchName) {
+      if (nonInteractive) {
+        throw new Error('Must supply --branch or use --auto when in non-interactive mode');
+      }
+
       const validationMessage = 'Branch name may not be empty.';
       if (jsonFlag) {
         throw new Error(validationMessage);
@@ -247,13 +318,10 @@ export default class UpdatePublish extends EasCommand {
       assert(branchName, 'Branch name must be specified.');
     }
 
-    const { id: branchId, updates } = await ensureBranchExistsAsync({
-      appId: projectId,
-      name: branchName,
-    });
-
     let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
     let oldMessage: string, oldRuntimeVersion: string;
+    let uploadedAssetCount = 0;
+
     if (republish) {
       // If we are republishing, we don't need to worry about building the bundle or uploading the assets.
       // Instead we get the `updateInfoGroup` from the update we wish to republish.
@@ -264,31 +332,21 @@ export default class UpdatePublish extends EasCommand {
       if (group) {
         updatesToRepublish = await getUpdateGroupAsync({ group });
       } else {
+        if (nonInteractive) {
+          throw new Error('Must supply --group when in non-interactive mode');
+        }
+
         // Drop into interactive mode if the user has not specified an update group to republish.
         if (jsonFlag) {
           throw new Error('You must specify the update group to republish.');
         }
 
-        const updateGroups = uniqBy(updates, u => u.group)
-          .filter(update => {
-            // Only show groups that have updates on the specified platform(s).
-            return platformFlag === 'all' || update.platform === platformFlag;
-          })
-          .map(update => ({
-            title: formatUpdateTitle(update),
-            value: update.group,
-          }));
-        if (updateGroups.length === 0) {
-          throw new Error(
-            `There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
-          );
-        }
-
-        const selectedUpdateGroup = await selectAsync<string>(
-          'which update would you like to republish?',
-          updateGroups
+        updatesToRepublish = await getUpdatesToRepublishInteractiveAsync(
+          projectId,
+          branchName,
+          platformFlag,
+          50
         );
-        updatesToRepublish = updates.filter(update => update.group === selectedUpdateGroup);
       }
       const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
         // Only republish to the specified platforms
@@ -296,7 +354,7 @@ export default class UpdatePublish extends EasCommand {
       );
       if (updatesToRepublishFilteredByPlatform.length === 0) {
         throw new Error(
-          `There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
+          `There are no updates on branch "${branchName}" published for the platform(s) "${platformFlag}" with group ID "${
             group ? group : updatesToRepublish[0].group
           }". Did you mean to publish a new update instead?`
         );
@@ -328,6 +386,10 @@ export default class UpdatePublish extends EasCommand {
       oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
 
       if (!message) {
+        if (nonInteractive) {
+          throw new Error('Must supply --message when in non-interactive mode');
+        }
+
         const validationMessage = 'publish message may not be empty.';
         if (jsonFlag) {
           throw new Error(validationMessage);
@@ -346,6 +408,10 @@ export default class UpdatePublish extends EasCommand {
       }
 
       if (!message) {
+        if (nonInteractive) {
+          throw new Error('Must supply --message or use --auto when in non-interactive mode');
+        }
+
         const validationMessage = 'publish message may not be empty.';
         if (jsonFlag) {
           throw new Error(validationMessage);
@@ -375,15 +441,28 @@ export default class UpdatePublish extends EasCommand {
       try {
         const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
         const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
-        await uploadAssetsAsync(assets);
+        const { uniqueUploadedAssetCount } = await uploadAssetsAsync(
+          assets,
+          (totalAssets, missingAssets) => {
+            assetSpinner.text = `Uploading assets. Finished (${
+              totalAssets - missingAssets
+            }/${totalAssets})`;
+          }
+        );
+        uploadedAssetCount = uniqueUploadedAssetCount;
         unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
-        assetSpinner.succeed('Uploaded assets!');
+        const uploadAssetSuccessMessage = uploadedAssetCount
+          ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'asset' : 'assets'}!`
+          : `Uploading assets skipped -- no new assets found!`;
+        assetSpinner.succeed(uploadAssetSuccessMessage);
       } catch (e) {
         assetSpinner.fail('Failed to upload assets');
         throw e;
       }
     }
 
+    const truncatedMessage = truncatePublishUpdateMessage(message!);
+
     const runtimeToPlatformMapping: Record<string, string[]> = {};
     for (const runtime of new Set(Object.values(runtimeVersions))) {
       runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
@@ -391,31 +470,83 @@ export default class UpdatePublish extends EasCommand {
         .map(pair => pair[0]);
     }
 
-    // Sort the updates into different groups based on their platform specific runtime versions
-    const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
-      const localUpdateInfoGroup = Object.fromEntries(
-        platforms.map(platform => [
-          platform,
-          unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
-        ])
-      );
-
-      if (republish && !oldRuntimeVersion) {
-        throw new Error(
-          'Can not find the runtime version of the update group that is being republished.'
-        );
-      }
-      return {
-        branchId,
-        updateInfoGroup: localUpdateInfoGroup,
-        runtimeVersion: republish ? oldRuntimeVersion : runtime,
-        message,
-      };
+    const { id: branchId } = await ensureBranchExistsAsync({
+      appId: projectId,
+      name: branchName,
+      limit: 0,
     });
-    let newUpdates;
+
+    // Sort the updates into different groups based on their platform specific runtime versions
+    const updateGroups: PublishUpdateGroupInput[] = Object.entries(runtimeToPlatformMapping).map(
+      ([runtime, platforms]) => {
+        const localUpdateInfoGroup = Object.fromEntries(
+          platforms.map(platform => [
+            platform,
+            unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
+          ])
+        );
+
+        if (republish && !oldRuntimeVersion) {
+          throw new Error(
+            'Cannot find the runtime version of the update group that is being republished.'
+          );
+        }
+        return {
+          branchId,
+          updateInfoGroup: localUpdateInfoGroup,
+          runtimeVersion: republish ? oldRuntimeVersion : runtime,
+          message: truncatedMessage,
+          awaitingCodeSigningInfo: !!codeSigningInfo,
+        };
+      }
+    );
+    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
     const publishSpinner = ora('Publishing...').start();
     try {
       newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
+
+      if (codeSigningInfo) {
+        Log.log('🔒 Signing updates');
+
+        const updatesTemp = [...newUpdates];
+        const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
+          const newUpdates = updatesTemp.splice(0, Object.keys(updateGroup.updateInfoGroup).length);
+          return {
+            updateGroup,
+            newUpdates,
+          };
+        });
+
+        await Promise.all(
+          updateGroupsAndTheirUpdates.map(async ({ updateGroup, newUpdates }) => {
+            await Promise.all(
+              newUpdates.map(async newUpdate => {
+                const response = await fetch(newUpdate.manifestPermalink, {
+                  method: 'GET',
+                  headers: { accept: 'multipart/mixed' },
+                });
+                const manifestBody = nullthrows(await getManifestBodyAsync(response));
+
+                checkManifestBodyAgainstUpdateInfoGroup(
+                  manifestBody,
+                  nullthrows(
+                    updateGroup.updateInfoGroup[newUpdate.platform as keyof UpdateInfoGroup]
+                  )
+                );
+
+                const manifestSignature = signManifestBody(manifestBody, codeSigningInfo);
+
+                await PublishMutation.setCodeSigningInfoAsync(newUpdate.id, {
+                  alg: codeSigningInfo.codeSigningMetadata.alg,
+                  keyid: codeSigningInfo.codeSigningMetadata.keyid,
+                  sig: manifestSignature,
+                });
+              })
+            );
+          })
+        );
+      }
+
       publishSpinner.succeed('Published!');
     } catch (e) {
       publishSpinner.fail('Failed to published updates');
@@ -434,20 +565,36 @@ export default class UpdatePublish extends EasCommand {
 
       Log.addNewLineIfNone();
       for (const runtime of new Set(Object.values(runtimeVersions))) {
-        const platforms = newUpdates
-          .filter(update => update.runtimeVersion === runtime)
-          .map(update => update.platform);
-        const newUpdate = newUpdates.find(update => update.runtimeVersion === runtime);
-        if (!newUpdate) {
+        const newUpdatesForRuntimeVersion = newUpdates.filter(
+          update => update.runtimeVersion === runtime
+        );
+        if (!newUpdatesForRuntimeVersion.length) {
           throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
         }
+        const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
+        const newAndroidUpdate = newUpdatesForRuntimeVersion.find(
+          update => update.platform === 'android'
+        );
+        const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
+        const updateGroupId = newUpdatesForRuntimeVersion[0].group;
+
+        const projectName = exp.slug;
+        const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+        const updateGroupUrl = getUpdateGroupUrl(accountName, projectName, updateGroupId);
+        const updateGroupLink = link(updateGroupUrl, { dim: false });
+
         Log.log(
           formatFields([
-            { label: 'branch', value: branchName },
-            { label: 'runtime version', value: runtime },
-            { label: 'platform', value: platforms.join(', ') },
-            { label: 'update group ID', value: newUpdate.group },
-            { label: 'message', value: message! },
+            { label: 'Branch', value: branchName },
+            { label: 'Runtime version', value: runtime },
+            { label: 'Platform', value: platforms.join(', ') },
+            { label: 'Update group ID', value: updateGroupId },
+            ...(newAndroidUpdate
+              ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
+              : []),
+            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
+            { label: 'Message', value: truncatedMessage },
+            { label: 'Website link', value: updateGroupLink },
           ])
         );
         Log.addNewLineIfNone();
@@ -456,9 +603,76 @@ export default class UpdatePublish extends EasCommand {
   }
 }
 
+export async function getUpdatesToRepublishInteractiveAsync(
+  projectId: string,
+  branchName: string,
+  platformFlag: string,
+  pageSize: number,
+  offset: number = 0,
+  cumulativeUpdates: Exclude<
+    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates'] = []
+): Promise<
+  Exclude<
+    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
+    null | undefined
+  >['updates']
+> {
+  const fetchMoreValue = '_fetchMore';
+
+  const { updates } = await ensureBranchExistsAsync({
+    appId: projectId,
+    name: branchName,
+    limit: pageSize + 1, // fetch an extra item so we know if there are additional pages
+    offset,
+  });
+  cumulativeUpdates = [
+    ...cumulativeUpdates,
+    // drop that extra item used for pagination from our render logic
+    ...updates.slice(0, updates.length - 1),
+  ];
+  const cumulativeUpdatesForTargetPlatforms =
+    platformFlag === 'all'
+      ? cumulativeUpdates
+      : cumulativeUpdates.filter(update => {
+          // Only show groups that have updates on the specified platform(s).
+          return update.platform === platformFlag;
+        });
+  const updateGroups = uniqBy(cumulativeUpdatesForTargetPlatforms, u => u.group).map(update => ({
+    title: formatUpdateTitle(update),
+    value: update.group,
+  }));
+  if (!updateGroups.length) {
+    throw new Error(
+      `There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
+    );
+  }
+
+  if (updates.length > pageSize) {
+    updateGroups.push({ title: 'Next page...', value: fetchMoreValue });
+  }
+
+  const selectedUpdateGroup = await selectAsync<string>(
+    'Which update would you like to republish?',
+    updateGroups
+  );
+  if (selectedUpdateGroup === fetchMoreValue) {
+    return await getUpdatesToRepublishInteractiveAsync(
+      projectId,
+      branchName,
+      platformFlag,
+      pageSize,
+      offset + pageSize,
+      cumulativeUpdates
+    );
+  }
+  return cumulativeUpdates.filter(update => update.group === selectedUpdateGroup);
+}
+
 async function getRuntimeVersionObjectAsync(
   exp: ExpoConfig,
-  platformFlag: PlatformFlag,
+  platformFlag: PublishPlatformFlag,
   projectDir: string
 ): Promise<Record<string, string>> {
   const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
@@ -468,13 +682,21 @@ async function getRuntimeVersionObjectAsync(
     if (isPolicy) {
       const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
       if (!isManaged) {
-        throw new Error('Runtime version policies are only supported in the managed workflow.');
+        throw new Error(
+          'Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.'
+        );
       }
     }
   }
 
   return Object.fromEntries(
-    platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
+    platforms.map(platform => [
+      platform,
+      nullthrows(
+        Updates.getRuntimeVersion(exp, platform),
+        `Unable to determine runtime version for ${platform}`
+      ),
+    ])
   );
 }
 
@@ -517,3 +739,11 @@ async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
     );
   }
 }
+
+export const truncatePublishUpdateMessage = (originalMessage: string): string => {
+  if (originalMessage.length > 1024) {
+    Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
+    return originalMessage.substring(0, 1021) + '...';
+  }
+  return originalMessage;
+};

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -8,6 +7,7 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { ViewAllUpdatesQuery } from '../../graphql/generated';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { FormatUpdateParameter, UPDATE_COLUMNS, formatUpdate } from '../../update/utils';
@@ -23,7 +23,7 @@ type UpdateGroupDescription = FormatUpdateParameter & {
 };
 
 export default class BranchView extends EasCommand {
-  static description = 'View the recent updates for a branch';
+  static description = 'view the recent updates for a branch';
 
   static flags = {
     branch: Flags.string({
@@ -50,7 +50,7 @@ export default class BranchView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     let updateGroupDescriptions: UpdateGroupDescription[];

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

@@ -51,7 +51,7 @@ export async function viewUpdateAsync({
   return data;
 }
 export default class UpdateView extends EasCommand {
-  static description = 'Update group details.';
+  static description = 'update group details';
 
   static args = [
     {

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

@@ -1,15 +1,15 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { prepareInputParamsAsync } from '../../webhooks/input';
 
 export default class WebhookCreate extends EasCommand {
-  static description = 'Create a webhook on the current project.';
+  static description = 'create a webhook';
 
   static flags = {
     event: Flags.enum({
@@ -30,7 +30,7 @@ export default class WebhookCreate extends EasCommand {
     const webhookInputParams = await prepareInputParamsAsync(flags);
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     const spinner = ora('Creating a webhook').start();

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -9,12 +8,13 @@ import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
 import { formatWebhook } from '../../webhooks/formatWebhook';
 
 export default class WebhookDelete extends EasCommand {
-  static description = 'Delete a webhook on the current project.';
+  static description = 'delete a webhook';
 
   static args = [
     {
@@ -30,7 +30,7 @@ export default class WebhookDelete extends EasCommand {
     } = await this.parse(WebhookDelete);
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     let webhook: WebhookFragment | undefined =

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

@@ -1,4 +1,3 @@
-import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -7,6 +6,7 @@ import { WebhookType } from '../../graphql/generated';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -15,7 +15,7 @@ import {
 import { formatWebhook } from '../../webhooks/formatWebhook';
 
 export default class WebhookList extends EasCommand {
-  static description = 'List webhooks on the current project.';
+  static description = 'list webhooks';
 
   static flags = {
     event: Flags.enum({
@@ -30,7 +30,7 @@ export default class WebhookList extends EasCommand {
     } = await this.parse(WebhookList);
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);
 

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

@@ -9,7 +9,7 @@ import pick from '../../utils/expodash/pick';
 import { prepareInputParamsAsync } from '../../webhooks/input';
 
 export default class WebhookUpdate extends EasCommand {
-  static description = 'Create a webhook on the current project.';
+  static description = 'update a webhook';
 
   static flags = {
     id: Flags.string({

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

@@ -5,7 +5,7 @@ import { ora } from '../../ora';
 import { formatWebhook } from '../../webhooks/formatWebhook';
 
 export default class WebhookView extends EasCommand {
-  static description = 'View a webhook on the current project.';
+  static description = 'view a webhook';
 
   static args = [
     {

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

@@ -1,5 +1,5 @@
 import AppStoreApi from '../ios/appstore/AppStoreApi';
-import { AuthCtx } from '../ios/appstore/authenticate';
+import { AuthCtx } from '../ios/appstore/authenticateTypes';
 
 export const testAuthCtx: AuthCtx = {
   appleId: 'test-apple-id',

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

@@ -76,7 +76,9 @@ export const testPushKey: ApplePushKeyFragment = {
   iosAppCredentialsList: [],
 };
 
-export const testTargets: Target[] = [{ targetName: 'testapp', bundleIdentifier: 'foo.bar.com' }];
+export const testTargets: Target[] = [
+  { targetName: 'testapp', bundleIdentifier: 'foo.bar.com', entitlements: {} },
+];
 
 export const testProvisioningProfileFragment: AppleProvisioningProfileFragment = {
   id: 'test-prov-prof-id-1',

packages/eas-cli/src/credentials/android/actions/CreateGoogleServiceAccountKey.ts

@@ -1,5 +1,8 @@
+import chalk from 'chalk';
+import fs from 'fs-extra';
+
 import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
-import Log from '../../../log';
+import Log, { learnMore } from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { Account } from '../../../user/Account';
 import { CredentialsContext } from '../../context';
@@ -41,14 +44,33 @@ export class CreateGoogleServiceAccountKey {
       return detectedPath;
     }
 
-    const { keyJsonPath } = await promptAsync([
-      {
-        type: 'text',
-        name: 'keyJsonPath',
-        message: 'Path to Google Service Account Key JSON file:',
-        validate: (value: string) => value.length > 0 || "Path can't be empty",
+    Log.log(
+      `${chalk.bold(
+        'A Google Service Account JSON key is required to upload your app to Google Play Store'
+      )}.\n` +
+        `If you're not sure what this is or how to create one, ${learnMore(
+          'https://expo.fyi/creating-google-service-account',
+          { learnMoreMessage: 'learn more' }
+        )}`
+    );
+    const { filePath } = await promptAsync({
+      name: 'filePath',
+      message: 'Path to Google Service Account file:',
+      initial: 'api-0000000000000000000-111111-aaaaaabbbbbb.json',
+      type: 'text',
+      // eslint-disable-next-line async-protect/async-suffix
+      validate: async (filePath: string) => {
+        try {
+          const stats = await fs.stat(filePath);
+          if (stats.isFile()) {
+            return true;
+          }
+          return 'Input is not a file.';
+        } catch {
+          return 'File does not exist.';
+        }
       },
-    ]);
-    return keyJsonPath;
+    });
+    return filePath;
   }
 }

packages/eas-cli/src/credentials/android/actions/__tests__/BuildCredentialsUtils-test.ts

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -17,7 +16,7 @@ import {
 
 jest.mock('../../../../ora');
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe('BuildCredentialsUtils', () => {
   describe(canCopyLegacyCredentialsAsync, () => {
@@ -84,7 +83,9 @@ describe('BuildCredentialsUtils', () => {
   });
   describe(promptUserAndCopyLegacyCredentialsAsync, () => {
     it('copies all legacy credentials to EAS if the user is eligible', async () => {
-      asMock(promptAsync).mockImplementation(() => ({ providedName: 'test-provided-name' }));
+      jest
+        .mocked(promptAsync)
+        .mockImplementation(async () => ({ providedName: 'test-provided-name' }));
       const ctx = createCtxMock({
         nonInteractive: false,
         android: {

packages/eas-cli/src/credentials/android/actions/__tests__/CreateFcm-test.ts

@@ -1,11 +1,10 @@
-import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateFcm } from '../CreateFcm';
 
 jest.mock('../../../../prompts');
-asMock(promptAsync).mockImplementation(() => ({ fcmApiKey: 'blah' }));
+jest.mocked(promptAsync).mockImplementation(async () => ({ fcmApiKey: 'blah' }));
 
 describe(CreateFcm, () => {
   it('creates an fcm api key in Interactive Mode', async () => {

packages/eas-cli/src/credentials/android/actions/__tests__/CreateGoogleServiceAccountKey-test.ts

@@ -1,6 +1,5 @@
 import { vol } from 'memfs';
 
-import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
@@ -8,8 +7,8 @@ import { CreateGoogleServiceAccountKey } from '../CreateGoogleServiceAccountKey'
 
 jest.mock('../../../../prompts');
 jest.mock('fs');
-asMock(promptAsync).mockImplementation(() => ({
-  keyJsonPath: '/google-service-account-key.json',
+jest.mocked(promptAsync).mockImplementation(async () => ({
+  filePath: '/google-service-account-key.json',
 }));
 
 beforeEach(() => {

packages/eas-cli/src/credentials/android/actions/__tests__/CreateKeystore-test.ts

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { jester as mockJester } from '../../../../credentials/__tests__/fixtures-constants';
 import { testKeystore } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -15,7 +14,7 @@ jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn(
 
 describe('CreateKeystore', () => {
   beforeEach(() => {
-    asMock(generateRandomKeystoreAsync).mockReset();
+    jest.mocked(generateRandomKeystoreAsync).mockReset();
   });
   it('creates a keystore in Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: false });
@@ -28,7 +27,7 @@ describe('CreateKeystore', () => {
     expect(generateRandomKeystoreAsync).toHaveBeenCalled();
   });
   it('creates a keystore by uploading', async () => {
-    asMock(askForUserProvidedAsync).mockImplementationOnce(() => testKeystore);
+    jest.mocked(askForUserProvidedAsync).mockImplementationOnce(async () => testKeystore);
     const ctx = createCtxMock({ nonInteractive: false });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
     const createKeystoreAction = new CreateKeystore(appLookupParams.account);

packages/eas-cli/src/credentials/android/actions/__tests__/RemoveFcm-test.ts

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -9,7 +8,7 @@ import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveFcm } from '../RemoveFcm';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(RemoveFcm, () => {
   it('removes an FCM API Key', async () => {

packages/eas-cli/src/credentials/android/actions/__tests__/RemoveGoogleServiceAccountKey-test.ts

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -8,7 +7,7 @@ import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { RemoveGoogleServiceAccountKey } from '../RemoveGoogleServiceAccountKey';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(RemoveGoogleServiceAccountKey, () => {
   it('removes an Google Service Account Key', async () => {

packages/eas-cli/src/credentials/android/actions/__tests__/RemoveKeystore-test.ts

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import { testAndroidBuildCredentialsFragment } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -7,7 +6,7 @@ import { RemoveKeystore } from '../RemoveKeystore';
 
 jest.mock('fs-extra');
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(RemoveKeystore, () => {
   it('removes a keystore', async () => {

packages/eas-cli/src/credentials/android/actions/__tests__/SetUpBuildCredentials-test.ts

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import {
   getNewAndroidApiMock,
   testAndroidBuildCredentialsFragment,
@@ -19,7 +18,7 @@ jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn(
 
 describe('SetUpBuildCredentials', () => {
   beforeEach(() => {
-    asMock(generateRandomKeystoreAsync).mockReset();
+    jest.mocked(generateRandomKeystoreAsync).mockReset();
   });
 
   it('skips setup when there are prior credentials', async () => {