test - wip

* upgrade typescript to 4.7.4

* [scripts] add extensions to imports

* [scripts] configure as ESM

* [scripts] fix after converting to ESM

* [scripts] fix lint

* [scripts] require node >= 14.16

* [scripts] add node: protocol

* add scripts/build to .gitignore

* [scripts] add typecheck script

* add workflow for testing scripts

* address PR feedback

.eslintrc.cjs

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

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

.github/workflows/issue-triage.yml

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

.github/workflows/release.yml

@@ -27,20 +27,28 @@ 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
         working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: yarn oclif-dev pack --targets linux-x64,linux-arm
+        run: |
+          yarn pretarball-ci
+          yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
+      - id: x64
+        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+      - id: arm
+        run: echo "::set-output name=filename::$(ls eas-*-arm.tar.gz)"
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
       - name: Upload linux-x64 tarball
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/eas-linux-x64.tar.gz
-          asset_name: eas-linux-x64.tar.gz
+          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
+          asset_name: ${{ steps.x64.outputs.filename }}
           asset_content_type: application/gzip
       - name: Upload linux-arm tarball
         uses: actions/upload-release-asset@v1
@@ -48,8 +56,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/eas-linux-arm.tar.gz
-          asset_name: eas-linux-arm.tar.gz
+          asset_path: packages/eas-cli/dist/${{ steps.arm.outputs.filename }}
+          asset_name: ${{ steps.arm.outputs.filename }}
           asset_content_type: application/gzip
   build-mac:
     name: Build for macOS
@@ -60,20 +68,25 @@ 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
         working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: yarn oclif-dev pack --targets darwin-x64
+        run: |
+          yarn pretarball-ci
+          yarn oclif pack:tarballs --no-xz --targets darwin-x64
+      - id: x64
+        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
       - name: Upload darwin-x64 tarball
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/eas-darwin-x64.tar.gz
-          asset_name: eas-darwin-x64.tar.gz
+          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
+          asset_name: ${{ steps.x64.outputs.filename }}
           asset_content_type: application/gzip
   build-windows:
     name: Build for Windows
@@ -83,25 +96,27 @@ 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
-      - run: yarn oclif-dev pack:win
+      - run: |
+          yarn pretarball-ci
+          yarn oclif pack:win
         working-directory: ${{ github.workspace }}/packages/eas-cli
       - id: x64
         run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
       - id: x86
         run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
       - name: Upload x64 installer
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win/${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win32/${{ steps.x64.outputs.filename }}
           asset_name: ${{ steps.x64.outputs.filename }}
           asset_content_type: application/gzip
       - name: Upload x86 installer
@@ -110,7 +125,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win32/${{ steps.x86.outputs.filename }}
           asset_name: ${{ steps.x86.outputs.filename }}
           asset_content_type: application/gzip
   publish-to-npm:
@@ -123,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
@@ -140,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,10 +9,12 @@ 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'
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           pattern: './packages/eas-cli/dist/*.tar.gz'
           compression: 'none'
+          strip-hash: "v\\d+.\\d+.\\d+-\\w+-"
+          clean-script: 'clean'

.github/workflows/stale-issues.yml

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

.github/workflows/test-scripts.yml

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

.github/workflows/test.yml

@@ -10,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:

.gitignore

@@ -1,10 +1,13 @@
 # Build directories
 packages/*/build
 packages/eas-cli/dist
+packages/eas-cli/tmp
+scripts/build
 
 # Code editors
 .idea
 .history
+.vscode
 
 # macOS
 .DS_Store
@@ -16,3 +19,6 @@ node_modules
 
 # Tests
 coverage
+
+# Copies of script for testing ESM imports
+packages/*/scripts/testESMImports.ts

CHANGELOG.md

@@ -8,6 +8,295 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 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))
+
+### 🐛 Bug fixes
+
+- Fix submission archive URLs. ([#1179](https://github.com/expo/eas-cli/pull/1179) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Update validation rules for metadata info locales. ([#1174](https://github.com/expo/eas-cli/pull/1174) by [@byCedric](https://github.com/byCedric))
+- Improve store configuration defaults and schema documentation. ([#1183](https://github.com/expo/eas-cli/pull/1183) by [@byCedric](https://github.com/byCedric))
+- Improve store config categories configuration. ([#1187](https://github.com/expo/eas-cli/pull/1187) by [@byCedric](https://github.com/byCedric))
+- Remove deprecated idfa and price tier from store config. ([#1193](https://github.com/expo/eas-cli/pull/1193) by [@byCedric](https://github.com/byCedric))
+
+## [0.54.1](https://github.com/expo/eas-cli/releases/tag/v0.54.1) - 2022-06-15
+
+### 🎉 New features
+
+- Add App Store Connect link after `eas metadata:push`. ([#1168](https://github.com/expo/eas-cli/pull/1168) by [@byCedric](https://github.com/byCedric))
+
+### 🐛 Bug fixes
+
+- Surface ASC errors in metadata for normal API rejections. ([#1167](https://github.com/expo/eas-cli/pull/1167) by [@byCedric](https://github.com/byCedric))
+- Add metadata schema to bundled eas-cli package. ([#1166](https://github.com/expo/eas-cli/pull/1166) by [@byCedric](https://github.com/byCedric))
+
+## [0.54.0](https://github.com/expo/eas-cli/releases/tag/v0.54.0) - 2022-06-15
+
+### 🛠 Breaking changes
+
+- Remove fallback for legacy format in `eas.json`. ([#1158](https://github.com/expo/eas-cli/pull/1158), [#1163](https://github.com/expo/eas-cli/pull/1163) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🎉 New features
+
+- `eas update` now provides more information about the publish process including real-time feedback on asset uploads, update ids, and website links. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
+- Added first beta of `eas metadata` to sync store information using store configuration files ([#1136](https://github.com/expo/eas-cli/pull/1136) by [@bycedric](https://github.com/bycedric))
+
+### 🐛 Bug fixes
+
+- Improved support for working on branches with many updates. ([#1144](https://github.com/expo/eas-cli/pull/1144), [#1148](https://github.com/expo/eas-cli/pull/1148) by [@kgc00](https://github.com/kgc00/))
+- `eas update` project links no longer contain a `)` on unsupported terminals. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
+
+### 🧹 Chores
+
+- Update `eas-build-job`. ([#1162](https://github.com/expo/eas-cli/pull/1162) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.53.1](https://github.com/expo/eas-cli/releases/tag/v0.53.1) - 2022-06-07
+
+### 🐛 Bug fixes
+
+- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119) by [@kgc00](https://github.com/kgc00/))
+
+### 🧹 Chores
+
+- Display project archive docs before compressing/uploading to EAS Build. ([#1127](https://github.com/expo/eas-cli/pull/1127) by [@dsokal](https://github.com/dsokal))
+- Add new common error code for submits. ([#1129](https://github.com/expo/eas-cli/pull/1129) by [@dsokal](https://github.com/dsokal))
+
+## [0.53.0](https://github.com/expo/eas-cli/releases/tag/v0.53.0) - 2022-05-30
+
+### 🛠 Breaking changes
+
+- Drop support for Node < 14. ([#1098](https://github.com/expo/eas-cli/pull/1098) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Match bundle identifier capabilities more accurately. ([#1112](https://github.com/expo/eas-cli/pull/1112) by [@EvanBacon](https://github.com/EvanBacon))
+- Limit concurrent asset uploads. ([#1153](https://github.com/expo/eas-cli/pull/1153) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Update dependencies. ([#1095](https://github.com/expo/eas-cli/pull/1095), [#1115](https://github.com/expo/eas-cli/pull/1115) by [@dsokal](https://github.com/dsokal))
+- Better spinner placement for multiple builds. ([#1105](https://github.com/expo/eas-cli/pull/1105) by [@dsokal](https://github.com/dsokal))
+- Use getExpoConfig to access config. ([#1122](https://github.com/expo/eas-cli/pull/1122) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.52.0](https://github.com/expo/eas-cli/releases/tag/v0.52.0) - 2022-04-26
+
+### 🎉 New features
+
+- Support target specific entitlements. ([#1078](https://github.com/expo/eas-cli/pull/1078) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.51.0](https://github.com/expo/eas-cli/releases/tag/v0.51.0) - 2022-04-19
+
+### 🎉 New features
+
+- Add non-interactive flag to eas update command. ([#1066](https://github.com/expo/eas-cli/pull/1066) by [@wschurman](https://github.com/wschurman))
+- Handle new EAS Submit common error - expired Apple's certificates. ([#1068](https://github.com/expo/eas-cli/pull/1068) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Enable full bundling logging for eas update when debugging. ([#1070](https://github.com/expo/eas-cli/pull/1070) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Upgrade `@expo/[email protected]` (now with license). ([#1064](https://github.com/expo/eas-cli/pull/1064) by [@EvanBacon](https://github.com/EvanBacon))
+- Unify Google Service Account key prompts. ([#1063](https://github.com/expo/eas-cli/pull/1063) by [@dsokal](https://github.com/dsokal))
+
+## [0.50.0](https://github.com/expo/eas-cli/releases/tag/v0.50.0) - 2022-04-11
+
+### 🎉 New features
+
+- Provide queue position progress and estimated wait time. ([#1049](https://github.com/expo/eas-cli/pull/1049), [#1058](https://github.com/expo/eas-cli/pull/1058) by [@dsokal](https://github.com/dsokal))
+- Enable App Store authentication for ASC Api Keys with environment variables. ([#1051](https://github.com/expo/eas-cli/pull/1051) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Prompt for user/password authentication where required. ([#1055](https://github.com/expo/eas-cli/pull/1055) by [@quinlanj](https://github.com/quinlanj))
+- Require private-key-path to be specified for updating when code signing configured. ([#1059](https://github.com/expo/eas-cli/pull/1059) by [@wschurman](https://github.com/wschurman))
+
+## [0.49.0](https://github.com/expo/eas-cli/releases/tag/v0.49.0) - 2022-04-05
+
+### 🎉 New features
+
+- Added experimental App Store Connect API provisioning profile regeneration. ([#1038](https://github.com/expo/eas-cli/pull/1038) by [@EvanBacon](https://github.com/EvanBacon))
+- Experimental support for iOS App Extensions in managed projects. ([#1039](https://github.com/expo/eas-cli/pull/1039) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix proxy support. ([#1032](https://github.com/expo/eas-cli/pull/1032) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add annotations regarding App Store Connect Token session support. ([#1029](https://github.com/expo/eas-cli/pull/1029) by [@EvanBacon](https://github.com/EvanBacon))
+- Upgrade dependencies. ([#1043](https://github.com/expo/eas-cli/pull/1043) by [@dsokal](https://github.com/dsokal))
+- Make default deprecation message more generic. ([#1047](https://github.com/expo/eas-cli/pull/1047) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.2](https://github.com/expo/eas-cli/releases/tag/v0.48.2) - 2022-03-21
+
+### 🎉 New features
+
+- Add proxy support. ([#1005](https://github.com/expo/eas-cli/pull/1005) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Do not retry build requests. ([#1024](https://github.com/expo/eas-cli/pull/1024) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.1](https://github.com/expo/eas-cli/releases/tag/v0.48.1) - 2022-03-15
+
+### 🐛 Bug fixes
+
+- Fix code signing error when not yet configured. ([#1018](https://github.com/expo/eas-cli/pull/1018) by [@wschurman](https://github.com/wschurman))
+- Fix link to build details page to use `project.slug`. ([#1021](https://github.com/expo/eas-cli/pull/1021) by [@giautm](https://github.com/giautm))
+
+### 🧹 Chores
+
+- Improve apple login prompt for internal distribution builds. ([#1016](https://github.com/expo/eas-cli/pull/1016) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.0](https://github.com/expo/eas-cli/releases/tag/v0.48.0) - 2022-03-14
+
+### 🎉 New features
+
+- Add code signing. ([#964](https://github.com/expo/eas-cli/pull/964) by [@wschurman](https://github.com/wschurman))
+- Install expo-updates when running update:configure. ([#977](https://github.com/expo/eas-cli/pull/977) by [@jkhales](https://github.com/jkhales))
+- Make `update:configure` work on native files. ([#978](https://github.com/expo/eas-cli/pull/978) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- Fix `"Unknown status"` error when a build is canceled. ([#1012](https://github.com/expo/eas-cli/pull/1012) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add error message when package.json is outside git repository. ([#971](https://github.com/expo/eas-cli/pull/971) by [@wkozyra95](https://github.com/wkozyra95))
+- Make runtime version policy warning on the update command more descriptive. ([#979](https://github.com/expo/eas-cli/pull/979) by [@kbrandwijk](https://github.com/kbrandwijk))
+- Remove unused flag. ([#995](https://github.com/expo/eas-cli/pull/995) by [@wkozyra95](https://github.com/wkozyra95))
+- Replace `got` with `node-fetch`. ([#1000](https://github.com/expo/eas-cli/pull/1000) by [@wkozyra95](https://github.com/wkozyra95))
+- Upgrade dependencies. ([#1015](https://github.com/expo/eas-cli/pull/1015) by [@dsokal](https://github.com/dsokal))
+
+## [0.47.0](https://github.com/expo/eas-cli/releases/tag/v0.47.0) - 2022-02-08
+
+### 🐛 Bug fixes
+
+- Return informative error when running `eas channel:rollout` with a channel that does not exist. ([#930](https://github.com/expo/eas-cli/pull/930) by [@jkhales](https://github.com/jkhales))
+- Check if `expo-updates` is installed before publish. ([#953](https://github.com/expo/eas-cli/pull/953) by [@jkhales](https://github.com/jkhales))
+
+### 🧹 Chores
+
+- Upgrade dependencies. ([#946](https://github.com/expo/eas-cli/pull/946) by [@dsokal](https://github.com/dsokal))
+
+## [0.46.0](https://github.com/expo/eas-cli/releases/tag/v0.46.0) - 2022-01-26
+
+### 🛠 Breaking changes
+
+- Drop support for building iOS builds on macOS Catalina. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix URL placeholder for iOS submits. ([#941](https://github.com/expo/eas-cli/pull/941) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Unify EAS command descriptions style. ([#925](https://github.com/expo/eas-cli/pull/925) by [@dsokal](https://github.com/dsokal))
+- Upgrade dependencies. ([#939](https://github.com/expo/eas-cli/pull/939) by [@dsokal](https://github.com/dsokal))
+
+## [0.45.1](https://github.com/expo/eas-cli/releases/tag/v0.45.1) - 2022-01-19
+
+### 🎉 New features
+
+- Add json output for started builds when using `--no-wait`. ([#921](https://github.com/expo/eas-cli/pull/921) by [@kbrandwijk](https://github.com/kbrandwijk))
+- Add support to `eas build` for specifying a custom `prebuildCommand` in `eas.json`. ([#919](https://github.com/expo/eas-cli/pull/919) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🧹 Chores
+
+- Add macOS Monterey image. ([#922](https://github.com/expo/eas-cli/pull/922) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.45.0](https://github.com/expo/eas-cli/releases/tag/v0.45.0) - 2022-01-18
+
+### 🎉 New features
+
+- Add `eas device:delete`. ([#890](https://github.com/expo/eas-cli/pull/890) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🧹 Chores
+
+- Upgrade dependencies. ([#872](https://github.com/expo/eas-cli/pull/872) by [@dsokal](https://github.com/dsokal))
+
+## [0.44.1](https://github.com/expo/eas-cli/releases/tag/v0.44.1) - 2022-01-11
+
+### 🐛 Bug fixes
+
+- Fix build:configure expo-updates configuration to only run on generic projects. ([#904](https://github.com/expo/eas-cli/pull/904) by [@brentvatne](https://github.com/brentvatne))
+
+### 🧹 Chores
+
+- Upgrade `node-forge` to 1.0.0. ([#902](https://github.com/expo/eas-cli/pull/902) by [@dependabot](https://github.com/apps/dependabot) + [@dsokal](https://github.com/dsokal))
+- Replace `@expo/plugin-autocomplete` with `@oclif/plugin-autocomplete`. Upgrade oclif deps. ([#903](https://github.com/expo/eas-cli/pull/903) by [@dsokal](https://github.com/dsokal))
+
+## [0.44.0](https://github.com/expo/eas-cli/releases/tag/v0.44.0) - 2022-01-11
+
+### 🛠 Breaking changes
+
+- No longer enable APNS (iOS Push Notifications) capability by default anymore. ([#797](https://github.com/expo/eas-cli/pull/797) by [@EvanBacon](https://github.com/EvanBacon))
+- Don't configure Android projects locally. Clean up old Gradle signing config. Streamline `expo-updates` configuration. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Add `update:list` command. ([#884](https://github.com/expo/eas-cli/pull/884) by [@jkhales](https://github.com/jkhales))
+- Improve error message for outdated Apple PLA error. ([#889](https://github.com/expo/eas-cli/pull/889) by [@EvanBacon](https://github.com/EvanBacon))
+- Add `--output` flag to the build command. ([#885](https://github.com/expo/eas-cli/pull/885) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix creating project archive with symlink cycle. ([#891](https://github.com/expo/eas-cli/pull/891) by [@wkozyra95](https://github.com/wkozyra95))
+- Sign Android debug builds with the correct keystore. Previously, all debug builds would be signed with a default debug keystore. ([#888](https://github.com/expo/eas-cli/pull/888) by [@dsokal](https://github.com/dsokal))
+
+## [0.43.0](https://github.com/expo/eas-cli/releases/tag/v0.43.0) - 2022-01-03
+
+### 🎉 New features
+
+- Add `eas channel:delete`. ([#846](https://github.com/expo/eas-cli/pull/846), [#869](https://github.com/expo/eas-cli/pull/869) by [@jkhales](https://github.com/jkhales))
+- Add `eas autocomplete`. ([#870](https://github.com/expo/eas-cli/pull/870) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Fix saving `build:inspect` results to project subdirectory. ([#863](https://github.com/expo/eas-cli/pull/863) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.42.4](https://github.com/expo/eas-cli/releases/tag/v0.42.4) - 2021-12-21
+
+### 🐛 Bug fixes
+
+- Add missing dependency - `@oclif/plugin-help`. ([#865](https://github.com/expo/eas-cli/pull/865) by [@dsokal](https://github.com/dsokal))
+
+## [0.42.3](https://github.com/expo/eas-cli/releases/tag/v0.42.3) - 2021-12-21
+
+### 🐛 Bug fixes
+
+- Allow select eas commands to be run outside of a project. ([#851](https://github.com/expo/eas-cli/pull/851) by [@jkhales](https://github.com/jkhales))
+
+### 🧹 Chores
+
+- Replace all oclif dependencies with `@oclif/core`. ([#858](https://github.com/expo/eas-cli/pull/858) by [@dsokal](https://github.com/dsokal))
+
+## [0.41.1](https://github.com/expo/eas-cli/releases/tag/v0.41.1) - 2021-12-16
+
+### 🎉 New features
+
+- Adds commands for EAS Update, which is now in preview for subscribers. EAS Update makes fixing small bugs and pushing quick fixes a snap in between app store submissions. It accomplishes this by allowing an end-user's app to swap out the non-native parts of their app (for example, JS, styling, and image changes) with a new update that contains bug fixes and other updates.
+  - Adds `eas update`, which can bundle and publish updates on a branch.
+  - Adds `eas branch`, which manages branches. Branches contain a list of updates and are linked to channels.
+  - Adds `eas channel`, which manages channels. Channels are specified inside builds and are linked to branches, allowing us to link specific updates with specific builds.
+  - Read more in our [feature preview docs](https://docs.expo.dev/eas-update/introduction/).
+
+### 🐛 Bug fixes
+
+- Fix `eas submit` displaying a prompt in non-interactive mode when some ASC API credentials are missing in `eas.json`. ([#841](https://github.com/expo/eas-cli/pull/841) by [@barthap](https://github.com/barthap))
+
+## [0.41.0](https://github.com/expo/eas-cli/releases/tag/v0.41.0) - 2021-12-13
+
+### 🎉 New features
+
 - Ask user to select profile if `release` does not exist. ([#829](https://github.com/expo/eas-cli/pull/829) by [@dsokal](https://github.com/dsokal))
 - Add `build:inspect` command. ([#834](https://github.com/expo/eas-cli/pull/834) by [@wkozyra95](https://github.com/wkozyra95))
 

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

bin/install.sh

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

bin/run

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

jest.config.cjs

@@ -0,0 +1,7 @@
+module.exports = {
+  projects: [
+    require('./packages/eas-cli/jest.config.cjs'),
+    require('./packages/eas-json/jest.config.cjs'),
+  ],
+  testPathIgnorePatterns: ['.*'],
+};

jest.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  projects: [
-    require('./packages/eas-cli/jest.config.js'),
-    require('./packages/eas-json/jest.config.js'),
-  ],
-  testPathIgnorePatterns: ['.*'],
-};

jest/jest.config.cjs

@@ -1,7 +1,15 @@
 module.exports = {
-  preset: 'ts-jest',
+  preset: 'ts-jest/presets/default-esm',
   testEnvironment: 'node',
   testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
   watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
   collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
+  globals: {
+    'ts-jest': {
+      useESM: true,
+    },
+  },
+  moduleNameMapper: {
+    '^(\\.{1,2}/.*)\\.js$': '$1',
+  },
 };

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.41.0"
+  "version": "0.54.1"
 }

package.json

@@ -1,37 +1,40 @@
 {
   "private": true,
+  "type": "module",
   "workspaces": [
     "packages/*"
   ],
   "scripts": {
     "build": "lerna run build",
-    "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
+    "build:tarballs:linux": "yarn build-for-size-check",
+    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
     "typecheck": "lerna run typecheck",
     "start": "lerna run watch --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint .",
-    "release": "./scripts/bin/run update-local-plugin && lerna version",
-    "test": "jest",
-    "clean": "lerna run clean && rm -rf node_modules coverage"
+    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
+    "clean": "lerna run clean && rm -rf node_modules coverage",
+    "test-esm-imports": "lerna run test-esm-imports"
   },
   "devDependencies": {
-    "@expo/oclif-dev-cli": "1.24.0-expo",
-    "@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",
-    "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/.eslintrc.cjs

@@ -1,4 +1,4 @@
-const rootEslintrc = require('../../.eslintrc.js');
+const rootEslintrc = require('../../.eslintrc.cjs');
 
 module.exports = {
   rules: {

packages/eas-cli/bin/dev

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

packages/eas-cli/bin/dev.cmd

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

packages/eas-cli/bin/run

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

packages/eas-cli/bin/run.js

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+import { Errors, flush, run } from '@oclif/core';
+
+run(undefined, import.meta.url)
+  .then(flush)
+  .catch(Errors.handle);

packages/eas-cli/jest.config.cjs

@@ -1,5 +1,5 @@
 module.exports = {
-  ...require('../../jest/jest.config.js'),
+  ...require('../../jest/jest.config.cjs'),
   rootDir: __dirname,
   roots: ['src', '__mocks__'],
   globalSetup: './jest/global-setup.ts',

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

@@ -1,3 +1,5 @@
+import { jest } from '@jest/globals';
+
 /* eslint-disable no-console */
 beforeAll(() => {
   console.log = jest.fn();

packages/eas-cli/package.json

@@ -1,110 +1,122 @@
 {
   "name": "eas-cli",
+  "type": "module",
   "description": "EAS command line tool",
-  "version": "0.41.0",
+  "version": "0.54.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.26",
-    "@expo/config": "6.0.11",
-    "@expo/config-plugins": "4.0.11",
-    "@expo/eas-build-job": "0.2.61",
-    "@expo/eas-json": "^0.41.0",
-    "@expo/json-file": "8.2.34",
-    "@expo/pkcs12": "0.0.6",
-    "@expo/plist": "0.0.16",
-    "@expo/plugin-warn-if-update-available": "1.7.1",
-    "@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.54.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/command": "1.8.3",
-    "@oclif/config": "1.17.1",
-    "@oclif/errors": "1.3.5",
-    "@oclif/plugin-help": "3.2.5",
-    "@urql/core": "2.3.1",
-    "@urql/exchange-retry": "0.3.0",
+    "@oclif/core": "1.9.5",
+    "@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": "0.10.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",
+    "@jest/globals": "28.1.2",
+    "@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": "^0.9.5",
-    "@types/prompts": "^2.0.9",
-    "@types/semver": "7.3.8",
-    "@types/tar": "4.0.5",
-    "@types/tough-cookie": "4.0.1",
-    "@types/uuid": "8.3.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",
+    "globby": "13.1.2",
+    "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",
+    "ts-node": "10.8.2",
+    "typescript": "4.7.4"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=14.16"
   },
   "files": [
     "/bin",
     "/build",
-    "/oclif.manifest.json"
+    "/oclif.manifest.json",
+    "/schema"
   ],
   "homepage": "https://github.com/expo/eas-cli",
   "keywords": [
@@ -117,12 +129,16 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@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 +147,13 @@
         "description": "manage update channels"
       },
       "device": {
-        "description": "manage your Apple devices for internal distribution"
+        "description": "manage Apple devices for Internal Distribution"
+      },
+      "metadata": {
+        "description": "manage store configuration"
       },
       "project": {
-        "description": "manage your project"
+        "description": "manage project"
       },
       "release": {
         "description": "manage update releases"
@@ -165,18 +184,30 @@
           }
         }
       }
-    }
+    },
+    "additionalHelpFlags": [
+      "-h"
+    ],
+    "additionalVersionFlags": [
+      "-v"
+    ]
   },
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rm -f oclif.manifest.json",
-    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme && node patch-readme",
+    "prepack": "./scripts/prepack.sh",
+    "pretarball-ci": "./scripts/pretarball-ci.sh",
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",
     "typecheck": "tsc",
-    "test": "jest",
-    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
+    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
+    "version": "yarn oclif readme && node scripts/patch-readme.cjs && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rm -rf dist build node_modules yarn-error.log"
+    "clean": "rm -rf dist build tmp node_modules yarn-error.log",
+    "test-esm-imports": "cp ../../scripts/src/testESMImports.ts scripts/ && ts-node-esm ./scripts/testESMImports.ts 'build/**/*.js'"
+  },
+  "volta": {
+    "node": "18.2.0",
+    "yarn": "1.22.18"
   }
 }

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/scripts/patch-readme.cjs

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

packages/eas-cli/scripts/prepack.sh

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

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

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

packages/eas-cli/src/ApiV2Error.ts

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

packages/eas-cli/src/__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.js';
 
 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__/project-utils.ts

@@ -1,4 +1,4 @@
-import { Actor } from '../user/User';
+import { Actor } from '../user/User.js';
 
 interface MockProject {
   projectRoot: string;

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

@@ -0,0 +1,17 @@
+import { fixArchiveUrl } from '../uploads.js';
+
+describe(fixArchiveUrl, () => {
+  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(fixArchiveUrl(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(fixArchiveUrl(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/common.ts

@@ -1,4 +1,4 @@
-import { Analytics, Event } from './events';
+import { Analytics, Event } from './events.js';
 
 export type TrackingContext = Record<string, string | number | boolean>;
 

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

@@ -1,5 +1,5 @@
-import { logEvent } from './rudderstackClient';
-export type Event = BuildEvent | SubmissionEvent;
+import { logEvent } from './rudderstackClient.js';
+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/analytics/rudderstackClient.ts

@@ -1,10 +1,12 @@
-import RudderAnalytics from '@expo/rudder-sdk-node';
+import RudderAnalyticsModule from '@expo/rudder-sdk-node';
 import os from 'os';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
-import UserSettings from '../user/UserSettings';
-import { easCliVersion } from '../utils/easCli';
+import UserSettings from '../user/UserSettings.js';
+import { easCliVersion } from '../utils/easCli.js';
+
+const RudderAnalytics = RudderAnalyticsModule.default;
 
 const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   darwin: 'Mac',
@@ -12,7 +14,7 @@ const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   linux: 'Linux',
 };
 
-let rudderstackClient: RudderAnalytics | null = null;
+let rudderstackClient: RudderAnalyticsModule.default | null = null;
 let userIdentified = false;
 let identifyData: {
   userId: string;

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 { getAccessToken, getSessionSecret } from './user/sessionStorage';
+import fetch, { RequestError, RequestInit } from './fetch.js';
+import { getAccessToken, getSessionSecret } from './user/sessionStorage.js';
 
-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) {
@@ -57,3 +109,13 @@ export function getExpoWebsiteBaseUrl(): string {
     return `https://expo.dev`;
   }
 }
+
+export function getEASUpdateURL(projectId: string): string {
+  if (process.env.EXPO_STAGING) {
+    return new URL(projectId, `https://staging-u.expo.dev`).href;
+  } else if (process.env.EXPO_LOCAL) {
+    return new URL(`expo-updates/${projectId}`, `http://127.0.0.1:3000`).href;
+  } else {
+    return new URL(projectId, `https://u.expo.dev`).href;
+  }
+}

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

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

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

@@ -7,13 +7,16 @@ import { vol } from 'memfs';
 import os from 'os';
 import path from 'path';
 
-import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
+import {
+  getAppBuildGradleAsync,
+  resolveConfigValue,
+} from '../../../project/android/gradleUtils.js';
 import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
   maybeResolveVersionsAsync,
-} from '../version';
+} from '../version.js';
 
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');

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

@@ -1,32 +1,33 @@
 import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';
 
 import AndroidCredentialsProvider, {
   AndroidCredentials,
-} from '../../credentials/android/AndroidCredentialsProvider';
-import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
-import Log from '../../log';
+} from '../../credentials/android/AndroidCredentialsProvider.js';
+import { BuildParamsInput } from '../../graphql/generated.js';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation.js';
+import Log from '../../log.js';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
-} from '../../project/android/applicationId';
-import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
-import { toggleConfirmAsync } from '../../prompts';
-import { findAccountByName } from '../../user/Account';
+} from '../../project/android/applicationId.js';
+import { resolveGradleBuildContextAsync } from '../../project/android/gradle.js';
+import { toggleConfirmAsync } from '../../prompts.js';
+import { findAccountByName } from '../../user/Account.js';
+import { nullthrows } from '../../utils/nullthrows.js';
 import {
   BuildRequestSender,
   CredentialsResult,
   JobData,
   prepareBuildRequestForPlatformAsync,
-} from '../build';
-import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
-import { transformMetadata } from '../graphql';
-import { logCredentialsSource } from '../utils/credentials';
-import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
-import { validateAndSyncProjectConfigurationAsync } from './configure';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
+} from '../build.js';
+import { AndroidBuildContext, BuildContext, CommonContext } from '../context.js';
+import { transformMetadata } from '../graphql.js';
+import { logCredentialsSource } from '../utils/credentials.js';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate.js';
+import { transformJob } from './graphql.js';
+import { prepareJobAsync } from './prepareJob.js';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration.js';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>
@@ -71,8 +72,8 @@ export async function prepareAndroidBuildAsync(
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
       return await ensureAndroidCredentialsAsync(ctx);
     },
-    ensureProjectConfiguredAsync: async () => {
-      await validateAndSyncProjectConfigurationAsync({
+    syncProjectConfigurationAsync: async () => {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile: ctx.buildProfile,
@@ -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/configure.ts

@@ -1,75 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
-
-import Log from '../../log';
-import {
-  ensureApplicationIdIsDefinedForManagedProjectAsync,
-  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject,
-} from '../../project/android/applicationId';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { getVcsClient } from '../../vcs';
-import { ConfigureContext } from '../context';
-import { isExpoUpdatesInstalled } from '../utils/updates';
-import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
-
-export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
-  if (!ctx.hasAndroidNativeProject) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
-    return;
-  }
-
-  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
-
-  await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
-
-  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await getVcsClient().trackFileAsync(easGradlePath);
-
-  if (isExpoUpdatesInstalled(ctx.projectDir)) {
-    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
-  }
-  Log.withTick('Android project configured');
-}
-
-export async function validateAndSyncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  buildProfile,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  buildProfile: BuildProfile<Platform.ANDROID>;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
-  const { autoIncrement } = buildProfile;
-  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
-
-  if (workflow === Workflow.GENERIC) {
-    if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
-      throw new Error(
-        'Project is not configured. Please run "eas build:configure" to configure the project.'
-      );
-    }
-    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(projectDir, exp);
-    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  } else {
-    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  }
-}
-
-function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
-  if (autoIncrement === true) {
-    return BumpStrategy.VERSION_CODE;
-  } else if (autoIncrement === false) {
-    return BumpStrategy.NOOP;
-  } else if (autoIncrement === 'versionCode') {
-    return BumpStrategy.VERSION_CODE;
-  } else {
-    return BumpStrategy.APP_VERSION;
-  }
-}

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

@@ -1,7 +1,7 @@
 import { Android } from '@expo/eas-build-job';
 
-import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
-import { transformProjectArchive, transformWorkflow } from '../graphql';
+import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated.js';
+import { transformProjectArchive, transformWorkflow } from '../graphql.js';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {
@@ -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

@@ -3,11 +3,11 @@ import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';
 
-import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getUsername } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
-import { getVcsClient } from '../../vcs';
-import { BuildContext } from '../context';
+import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider.js';
+import { getUsername } from '../../project/projectUtils.js';
+import { ensureLoggedInAsync } from '../../user/actions.js';
+import { getVcsClient } from '../../vcs/index.js';
+import { BuildContext } from '../context.js';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -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

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

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

@@ -1,19 +1,21 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
+import ConfigPlugins from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import Log from '../../log';
+import Log from '../../log.js';
 import {
   getAppBuildGradleAsync,
   parseGradleCommand,
   resolveConfigValue,
-} from '../../project/android/gradleUtils';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
+} from '../../project/android/gradleUtils.js';
+import { resolveWorkflowAsync } from '../../project/workflow.js';
+import { updateAppJsonConfigAsync } from '../utils/appJson.js';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version.js';
+
+const { AndroidConfig } = ConfigPlugins;
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -105,7 +107,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,26 +1,40 @@
 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 { withAnalyticsAsync } from '../analytics/common';
-import { BuildEvent } from '../analytics/events';
-import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
-import { BuildResult } from '../graphql/mutations/BuildMutation';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log, { learnMore } from '../log';
-import { ora } from '../ora';
-import { requestedPlatformDisplayNames } from '../platform';
-import { uploadAsync } from '../uploads';
-import { formatBytes } from '../utils/files';
-import { createProgressTracker } from '../utils/progress';
-import { sleepAsync } from '../utils/promise';
-import { getVcsClient } from '../vcs';
-import { BuildContext } from './context';
-import { runLocalBuildAsync } from './local';
-import { collectMetadataAsync } from './metadata';
-import { printDeprecationWarnings } from './utils/printBuildInfo';
-import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
+import { withAnalyticsAsync } from '../analytics/common.js';
+import { BuildEvent } from '../analytics/events.js';
+import { getExpoWebsiteBaseUrl } from '../api.js';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildParamsInput,
+  BuildPriority,
+  BuildStatus,
+  UploadSessionType,
+} from '../graphql/generated.js';
+import { BuildResult } from '../graphql/mutations/BuildMutation.js';
+import { BuildQuery } from '../graphql/queries/BuildQuery.js';
+import Log, { learnMore } from '../log.js';
+import { Ora, ora } from '../ora.js';
+import {
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  requestedPlatformDisplayNames,
+} from '../platform.js';
+import { uploadAsync } from '../uploads.js';
+import { formatBytes } from '../utils/files.js';
+import { nullthrows } from '../utils/nullthrows.js';
+import { createProgressTracker } from '../utils/progress.js';
+import { sleepAsync } from '../utils/promise.js';
+import { getVcsClient } from '../vcs/index.js';
+import { BuildContext } from './context.js';
+import { runLocalBuildAsync } from './local.js';
+import { collectMetadataAsync } from './metadata.js';
+import { printDeprecationWarnings } from './utils/printBuildInfo.js';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository.js';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -38,13 +52,24 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ensureCredentialsAsync(
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
-  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+  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,
@@ -60,14 +85,13 @@ export async function prepareBuildRequestForPlatformAsync<
       trackingCtx: ctx.trackingCtx,
     }
   );
-  if (!ctx.skipProjectConfiguration) {
-    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
-      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-      trackingCtx: ctx.trackingCtx,
-    });
-  }
+
+  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
+    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
+    trackingCtx: ctx.trackingCtx,
+  });
 
   if (await getVcsClient().isCommitRequiredAsync()) {
     Log.addNewLineIfNone();
@@ -88,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,
@@ -99,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> {
@@ -145,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;
 
@@ -157,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;
@@ -182,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(
@@ -194,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);
@@ -209,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/configure.ts

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

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

@@ -3,25 +3,14 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
-import { TrackingContext } from '../analytics/common';
-import { CredentialsContext } from '../credentials/context';
-import { Target } from '../credentials/ios/types';
-import { RequestedPlatform } from '../platform';
-import { GradleBuildContext } from '../project/android/gradle';
-import { XcodeBuildContext } from '../project/ios/scheme';
-import { Actor } from '../user/User';
-import { LocalBuildOptions } from './local';
-
-export interface ConfigureContext {
-  user: Actor;
-  projectDir: string;
-  exp: ExpoConfig;
-  requestedPlatform: RequestedPlatform;
-  shouldConfigureAndroid: boolean;
-  shouldConfigureIos: boolean;
-  hasAndroidNativeProject: boolean;
-  hasIosNativeProject: boolean;
-}
+import { TrackingContext } from '../analytics/common.js';
+import { CredentialsContext } from '../credentials/context.js';
+import { Target } from '../credentials/ios/types.js';
+import { BuildResourceClass } from '../graphql/generated.js';
+import { GradleBuildContext } from '../project/android/gradle.js';
+import { XcodeBuildContext } from '../project/ios/scheme.js';
+import { Actor } from '../user/User.js';
+import { LocalBuildOptions } from './local.js';
 
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 
@@ -42,6 +31,7 @@ export interface BuildContext<T extends Platform> {
   accountName: string;
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
+  resourceClass: BuildResourceClass;
   clearCache: boolean;
   credentialsCtx: CredentialsContext;
   exp: ExpoConfig;
@@ -51,7 +41,6 @@ export interface BuildContext<T extends Platform> {
   projectDir: string;
   projectId: string;
   projectName: string;
-  skipProjectConfiguration: boolean;
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;

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

@@ -1,21 +1,24 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
-import JsonFile from '@expo/json-file';
+import JsonFileModule from '@expo/json-file';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
-import { TrackingContext } from '../analytics/common';
-import { Analytics, BuildEvent } from '../analytics/events';
-import { CredentialsContext } from '../credentials/context';
-import { getExpoConfig } from '../project/expoConfig';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { findAccountByName } from '../user/Account';
-import { ensureLoggedInAsync } from '../user/actions';
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
+import { TrackingContext } from '../analytics/common.js';
+import { Analytics, BuildEvent } from '../analytics/events.js';
+import { CredentialsContext } from '../credentials/context.js';
+import { BuildResourceClass } from '../graphql/generated.js';
+import { getExpoConfig } from '../project/expoConfig.js';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils.js';
+import { resolveWorkflowAsync } from '../project/workflow.js';
+import { findAccountByName } from '../user/Account.js';
+import { ensureLoggedInAsync } from '../user/actions.js';
+import { createAndroidContextAsync } from './android/build.js';
+import { BuildContext, CommonContext } from './context.js';
+import { createIosContextAsync } from './ios/build.js';
+import { LocalBuildOptions } from './local.js';
+
+const JsonFile = JsonFileModule.default;
 
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,
@@ -25,7 +28,7 @@ export async function createBuildContextAsync<T extends Platform>({
   nonInteractive = false,
   platform,
   projectDir,
-  skipProjectConfiguration = false,
+  resourceClass,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
@@ -34,7 +37,7 @@ export async function createBuildContextAsync<T extends Platform>({
   nonInteractive: boolean;
   platform: T;
   projectDir: string;
-  skipProjectConfiguration: boolean;
+  resourceClass: BuildResourceClass;
 }): Promise<BuildContext<T>> {
   const exp = getExpoConfig(projectDir, { env: buildProfile.env });
 
@@ -72,6 +75,7 @@ export async function createBuildContextAsync<T extends Platform>({
     accountName,
     buildProfile,
     buildProfileName,
+    resourceClass,
     clearCache,
     credentialsCtx,
     exp,
@@ -81,7 +85,6 @@ export async function createBuildContextAsync<T extends Platform>({
     projectDir,
     projectId,
     projectName,
-    skipProjectConfiguration,
     trackingCtx,
     user,
     workflow,

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

@@ -8,7 +8,7 @@ import {
   DistributionType,
   ProjectArchiveSourceInput,
   ProjectArchiveSourceType,
-} from '../graphql/generated';
+} from '../graphql/generated.js';
 
 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
   if (archiveSource.type === ArchiveSourceType.S3) {

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

@@ -1,91 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
-
-import Log from '../../log';
-import { getProjectAccountName } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
-import { readPlistAsync, writePlistAsync } from '../../utils/plist';
-import { getVcsClient } from '../../vcs';
-import { ensureValidVersions } from '../utils/updates';
-
-export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  ensureValidVersions(exp);
-  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-
-  let expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-    expoPlist = IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
-    await writeExpoPlistAsync(projectDir, expoPlist);
-  }
-  // TODO: ensure ExpoPlist in pbxproj
-}
-
-export async function syncUpdatesConfigurationAsync(
-  projectDir: string,
-  exp: ExpoConfig
-): Promise<void> {
-  ensureValidVersions(exp);
-  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  try {
-    await ensureUpdatesConfiguredAsync(projectDir);
-  } catch (error) {
-    Log.error(
-      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
-    );
-    throw error;
-  }
-
-  let expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistVersionConfigurationSynced(exp, expoPlist)) {
-    expoPlist = IOSConfig.Updates.setVersionsConfig(exp, expoPlist);
-    await writeExpoPlistAsync(projectDir, expoPlist);
-  }
-
-  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-    Log.warn(
-      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
-    );
-  }
-}
-
-// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
-// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
-async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
-  const expoPlist = await readExpoPlistAsync(projectDir);
-  if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
-    throw new Error('Missing values in Expo.plist');
-  }
-}
-
-async function readExpoPlistAsync(projectDir: string): Promise<IOSConfig.ExpoPlist> {
-  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  return ((await readPlistAsync(expoPlistPath)) ?? {}) as IOSConfig.ExpoPlist;
-}
-
-async function writeExpoPlistAsync(
-  projectDir: string,
-  expoPlist: IOSConfig.ExpoPlist
-): Promise<void> {
-  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
-  await writePlistAsync(expoPlistPath, expoPlist);
-  await getVcsClient().trackFileAsync(expoPlistPath);
-}
-
-export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
-  try {
-    const expoPlist = await readExpoPlistAsync(projectDir);
-    return expoPlist[IOSConfig.Updates.Config.RELEASE_CHANNEL] ?? null;
-  } catch (err) {
-    return null;
-  }
-}
-
-export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
-  try {
-    const expoPlist: any = await readExpoPlistAsync(projectDir); // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
-    const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'] ?? {}; //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
-    return updatesRequestHeaders['expo-channel-name'] ?? null;
-  } catch (err) {
-    return null;
-  }
-}

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

@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
+import { InfoPlist } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
-import { readPlistAsync } from '../../../utils/plist';
+import { readPlistAsync } from '../../../utils/plist.js';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -13,7 +13,7 @@ import {
   getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
-} from '../version';
+} from '../version.js';
 
 jest.mock('fs');
 
@@ -62,9 +62,7 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
-    )) as IOSConfig.InfoPlist;
+    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -86,9 +84,7 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info2.plist'
-    )) as IOSConfig.InfoPlist;
+    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info2.plist')) as InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -108,9 +104,7 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
-    )) as IOSConfig.InfoPlist;
+    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
     expect(fakeExp.version).toBe('1.0.1');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.1');
@@ -130,9 +124,7 @@ describe(bumpVersionAsync, () => {
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync(
-      '/repo/ios/myproject/Info.plist'
-    )) as IOSConfig.InfoPlist;
+    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.0');

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

@@ -1,20 +1,23 @@
-import { IOSConfig } from '@expo/config-plugins';
+import ConfigPlugins from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import type { XCBuildConfiguration } from 'xcode';
 
-import { IosCredentials, Target } from '../../credentials/ios/types';
-import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
-import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
-import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
-import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
-import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
-import { BuildContext, CommonContext, IosBuildContext } from '../context';
-import { transformMetadata } from '../graphql';
-import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
-import { validateAndSyncProjectConfigurationAsync } from './configure';
-import { ensureIosCredentialsAsync } from './credentials';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
+import { IosCredentials, Target } from '../../credentials/ios/types.js';
+import { BuildParamsInput } from '../../graphql/generated.js';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation.js';
+import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier.js';
+import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme.js';
+import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target.js';
+import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build.js';
+import { BuildContext, CommonContext, IosBuildContext } from '../context.js';
+import { transformMetadata } from '../graphql.js';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate.js';
+import { ensureIosCredentialsAsync } from './credentials.js';
+import { transformJob } from './graphql.js';
+import { prepareJobAsync } from './prepareJob.js';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration.js';
+
+const { IOSConfig } = ConfigPlugins;
 
 export async function createIosContextAsync(
   ctx: CommonContext<Platform.IOS>
@@ -36,13 +39,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);
 
@@ -63,8 +65,8 @@ export async function prepareIosBuildAsync(
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
       return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
-    ensureProjectConfiguredAsync: async () => {
-      await validateAndSyncProjectConfigurationAsync({
+    syncProjectConfigurationAsync: async () => {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile: ctx.buildProfile,
@@ -83,7 +85,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 +94,7 @@ export async function prepareIosBuildAsync(
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
+        buildParams,
       });
     },
   });

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

@@ -1,12 +1,11 @@
 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';
-import { logCredentialsSource } from '../utils/credentials';
+import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider.js';
+import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils.js';
+import { IosCredentials, Target } from '../../credentials/ios/types.js';
+import { CredentialsResult } from '../build.js';
+import { BuildContext } from '../context.js';
+import { logCredentialsSource } from '../utils/credentials.js';
 
 export async function ensureIosCredentialsAsync(
   buildCtx: BuildContext<Platform.IOS>,
@@ -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

@@ -1,8 +1,8 @@
 import { Env, Ios } from '@expo/eas-build-job';
-import nullthrows from 'nullthrows';
 
-import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
-import { transformProjectArchive, transformWorkflow } from '../graphql';
+import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated.js';
+import { nullthrows } from '../../utils/nullthrows.js';
+import { transformProjectArchive, transformWorkflow } from '../graphql.js';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {
@@ -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

@@ -2,11 +2,11 @@ import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-
 import path from 'path';
 import slash from 'slash';
 
-import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
-import { getUsername } from '../../project/projectUtils';
-import { ensureLoggedInAsync } from '../../user/actions';
-import { getVcsClient } from '../../vcs';
-import { BuildContext } from '../context';
+import { IosCredentials, TargetCredentials } from '../../credentials/ios/types.js';
+import { getUsername } from '../../project/projectUtils.js';
+import { ensureLoggedInAsync } from '../../user/actions.js';
+import { getVcsClient } from '../../vcs/index.js';
+import { BuildContext } from '../context.js';
 
 interface JobData {
   projectArchive: ArchiveSource;
@@ -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,32 +3,12 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 
-import Log from '../../log';
-import {
-  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
-  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject,
-} from '../../project/ios/bundleIdentifier';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { ConfigureContext } from '../context';
-import { isExpoUpdatesInstalled } from '../utils/updates';
-import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils.js';
+import { resolveWorkflowAsync } from '../../project/workflow.js';
+import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule.js';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version.js';
 
-export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
-  if (!ctx.hasIosNativeProject) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
-    return;
-  }
-
-  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);
-
-  if (isExpoUpdatesInstalled(ctx.projectDir)) {
-    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
-  }
-  Log.withTick('iOS project configured');
-}
-
-export async function validateAndSyncProjectConfigurationAsync({
+export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,

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

@@ -1,16 +1,18 @@
 import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
+import ConfigPlugins, { InfoPlist } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';
 
-import Log from '../../log';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { promptAsync } from '../../prompts';
-import { readPlistAsync, writePlistAsync } from '../../utils/plist';
-import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { bumpAppVersionAsync } from '../utils/version';
+import Log from '../../log.js';
+import { resolveWorkflowAsync } from '../../project/workflow.js';
+import { promptAsync } from '../../prompts.js';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist.js';
+import { updateAppJsonConfigAsync } from '../utils/appJson.js';
+import { bumpAppVersionAsync } from '../utils/version.js';
+
+const { IOSConfig } = ConfigPlugins;
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -145,9 +147,9 @@ async function writeVersionsToInfoPlistAsync({
 }: {
   projectDir: string;
   exp: ExpoConfig;
-  infoPlist: IOSConfig.InfoPlist;
+  infoPlist: InfoPlist;
   buildSettings: XCBuildConfiguration['buildSettings'];
-}): Promise<IOSConfig.InfoPlist> {
+}): Promise<InfoPlist> {
   let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
   updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
   await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
@@ -176,9 +178,9 @@ export function getInfoPlistPath(
 async function readInfoPlistAsync(
   projectDir: string,
   buildSettings: XCBuildConfiguration['buildSettings']
-): Promise<IOSConfig.InfoPlist> {
+): Promise<InfoPlist> {
   const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
+  return ((await readPlistAsync(infoPlistPath)) ?? {}) as InfoPlist;
 }
 
 async function writeInfoPlistAsync({
@@ -187,7 +189,7 @@ async function writeInfoPlistAsync({
   buildSettings,
 }: {
   projectDir: string;
-  infoPlist: IOSConfig.InfoPlist;
+  infoPlist: InfoPlist;
   buildSettings: XCBuildConfiguration['buildSettings'];
 }): Promise<void> {
   const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);

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

@@ -1,18 +1,19 @@
 import { Job } from '@expo/eas-build-job';
-import spawnAsync from '@expo/spawn-async';
+import { default as spawnAsync } from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';
 
-import { ora } from '../ora';
+import { ora } from '../ora.js';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.56';
+const PLUGIN_PACKAGE_VERSION = '0.0.85';
 
 export interface LocalBuildOptions {
   enable: boolean;
   skipCleanup?: boolean;
   skipNativeBuild?: boolean;
   artifactsDir?: string;
+  artifactPath?: string;
   workingdir?: string;
   verbose?: boolean;
 }
@@ -41,6 +42,7 @@ export async function runLocalBuildAsync(job: Job, options: LocalBuildOptions):
           : {}),
         ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
         ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
+        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
       },
     });
     childProcess = spawnPromise.child;

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

@@ -1,38 +1,27 @@
-import { Updates } from '@expo/config-plugins';
+import ConfigPlugins from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
-import Log from '../log';
-import { getUsername } from '../project/projectUtils';
-import { ensureLoggedInAsync } from '../user/actions';
-import { easCliVersion } from '../utils/easCli';
-import { getVcsClient } from '../vcs';
+import Log from '../log.js';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils.js';
 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.js';
 import {
   readChannelSafelyAsync as readIosChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from './ios/UpdatesModule';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { isExpoUpdatesInstalled } from './utils/updates';
+} from '../update/ios/UpdatesModule.js';
+import { ensureLoggedInAsync } from '../user/actions.js';
+import { easCliVersion } from '../utils/easCli.js';
+import { getVcsClient } from '../vcs/index.js';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version.js';
+import { BuildContext } from './context.js';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version.js';
 
-// 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;
-  }
-}
+const { Updates } = ConfigPlugins;
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
@@ -49,7 +38,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,44 +1,51 @@
 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 { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
-import Log from '../log';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildResourceClass,
+  BuildStatus,
+  SubmissionFragment,
+} from '../graphql/generated.js';
+import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform.js';
+import Log from '../log.js';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
   appPlatformEmojis,
   toPlatforms,
-} from '../platform';
-import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
-import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
-import { createSubmissionContextAsync } from '../submit/context';
+} from '../platform.js';
+import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk.js';
+import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig.js';
+import { createSubmissionContextAsync } from '../submit/context.js';
 import {
   submitAsync,
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
-} from '../submit/submit';
-import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { ProfileData, getProfilesAsync } from '../utils/profiles';
-import { getVcsClient } from '../vcs';
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
+} from '../submit/submit.js';
+import { printSubmissionDetailsUrls } from '../submit/utils/urls.js';
+import { printJsonOnlyOutput } from '../utils/json.js';
+import { nullthrows } from '../utils/nullthrows.js';
+import { ProfileData, getProfilesAsync } from '../utils/profiles.js';
+import { getVcsClient } from '../vcs/index.js';
+import { prepareAndroidBuildAsync } from './android/build.js';
+import { BuildRequestSender, waitForBuildEndAsync } from './build.js';
+import { ensureProjectConfiguredAsync } from './configure.js';
+import { BuildContext } from './context.js';
+import { createBuildContextAsync } from './createContext.js';
+import { prepareIosBuildAsync } from './ios/build.js';
+import { LocalBuildOptions } from './local.js';
+import { UserInputResourceClass } from './types.js';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient.js';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo.js';
+import { ensureRepoIsCleanAsync } from './utils/repository.js';
 
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
 
 export interface BuildFlags {
   requestedPlatform: RequestedPlatform;
-  skipProjectConfiguration: boolean;
   profile?: string;
   nonInteractive: boolean;
   wait: boolean;
@@ -47,18 +54,37 @@ 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);
 
-  await ensureProjectConfiguredAsync(projectDir, flags.requestedPlatform);
+  await ensureProjectConfiguredAsync({
+    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,
   });
@@ -81,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 });
@@ -99,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',
@@ -128,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(
@@ -150,20 +187,22 @@ 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,
     platform: buildProfile.platform,
     projectDir,
-    skipProjectConfiguration: flags.skipProjectConfiguration,
     localBuildOptions: flags.localBuildOptions,
   });
 

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/appJson.ts

@@ -1,7 +1,9 @@
 import * as ExpoConfig from '@expo/config';
-import JsonFile from '@expo/json-file';
+import JsonFileModule from '@expo/json-file';
 import assert from 'assert';
 
+const JsonFile = JsonFileModule.default;
+
 export async function updateAppJsonConfigAsync(
   {
     projectDir,

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

@@ -2,8 +2,8 @@ import { Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 
-import Log from '../../log';
-import { requestedPlatformDisplayNames } from '../../platform';
+import Log from '../../log.js';
+import { requestedPlatformDisplayNames } from '../../platform.js';
 
 export function logCredentialsSource(
   credentialsSource: CredentialsSource,

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

@@ -1,17 +1,17 @@
 import { Workflow } from '@expo/eas-build-job';
-import { error } from '@oclif/errors';
+import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
-import { toAppPlatform } from '../../graphql/types/AppPlatform';
-import Log, { learnMore } from '../../log';
-import { appPlatformDisplayNames } from '../../platform';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { confirmAsync } from '../../prompts';
-import { expoCommandAsync } from '../../utils/expoCli';
-import { ProfileData } from '../../utils/profiles';
-import { getVcsClient } from '../../vcs';
-import { reviewAndCommitChangesAsync } from './repository';
+import { toAppPlatform } from '../../graphql/types/AppPlatform.js';
+import Log, { learnMore } from '../../log.js';
+import { appPlatformDisplayNames } from '../../platform.js';
+import { resolveWorkflowAsync } from '../../project/workflow.js';
+import { confirmAsync } from '../../prompts.js';
+import { expoCommandAsync } from '../../utils/expoCli.js';
+import { ProfileData } from '../../utils/profiles.js';
+import { getVcsClient } from '../../vcs/index.js';
+import { reviewAndCommitChangesAsync } from './repository.js';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,
@@ -64,7 +64,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
     if (install) {
       await installExpoDevClientAsync(projectDir, { nonInteractive });
     } else {
-      error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
+      Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
         exit: 1,
       });
     }
@@ -83,7 +83,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
       initial: false,
     });
     if (!shouldContinue) {
-      error('Come back later', { exit: 1 });
+      Errors.error('Come back later', { exit: 1 });
     }
   }
 }

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

@@ -4,10 +4,10 @@ import {
   AppPlatform,
   BuildFragment,
   BuildStatus as GraphQLBuildStatus,
-} from '../../graphql/generated';
-import { appPlatformDisplayNames } from '../../platform';
-import formatFields from '../../utils/formatFields';
-import { getBuildLogsUrl } from './url';
+} from '../../graphql/generated.js';
+import { appPlatformDisplayNames } from '../../platform.js';
+import formatFields from '../../utils/formatFields.js';
+import { getBuildLogsUrl } from './url.js';
 
 export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);

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

@@ -11,11 +11,11 @@ import {
   DistributionType,
   EasBuildDeprecationInfo,
   EasBuildDeprecationInfoType,
-} from '../../graphql/generated';
-import Log, { learnMore } from '../../log';
-import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
-import { printJsonOnlyOutput } from '../../utils/json';
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
+} from '../../graphql/generated.js';
+import Log, { learnMore } from '../../log.js';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform.js';
+import { printJsonOnlyOutput } from '../../utils/json.js';
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url.js';
 
 export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {
@@ -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/repository.ts

@@ -4,13 +4,13 @@ import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';
 
-import Log from '../../log';
-import { ora } from '../../ora';
-import { confirmAsync, promptAsync } from '../../prompts';
-import { formatBytes } from '../../utils/files';
-import { getTmpDirectory } from '../../utils/paths';
-import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import { getVcsClient } from '../../vcs';
+import Log from '../../log.js';
+import { ora } from '../../ora.js';
+import { confirmAsync, promptAsync } from '../../prompts.js';
+import { formatBytes } from '../../utils/files.js';
+import { getTmpDirectory } from '../../utils/paths.js';
+import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer.js';
+import { getVcsClient } from '../../vcs/index.js';
 
 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
   if (!(await getVcsClient().isCommitRequiredAsync())) {

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

@@ -1,23 +1,27 @@
 import assert from 'assert';
 
-import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
-import { AppPlatform, BuildFragment } from '../../graphql/generated';
+import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api.js';
+import { AppPlatform, BuildFragment } from '../../graphql/generated.js';
 
 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/build/utils/version.ts

@@ -1,11 +1,11 @@
 import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import chalk from 'chalk';
-import nullthrows from 'nullthrows';
 import semver from 'semver';
 
-import Log from '../../log';
-import { promptAsync } from '../../prompts';
-import { updateAppJsonConfigAsync } from './appJson';
+import Log from '../../log.js';
+import { promptAsync } from '../../prompts.js';
+import { nullthrows } from '../../utils/nullthrows.js';
+import { updateAppJsonConfigAsync } from './appJson.js';
 
 export function ensureStaticConfigExists(projectDir: string): void {
   const paths = getConfigFilePaths(projectDir);

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

@@ -2,9 +2,9 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import fs from 'fs-extra';
 import path from 'path';
 
-import Log, { learnMore } from '../log';
-import { getVcsClient } from '../vcs';
-import { CommonContext } from './context';
+import Log, { learnMore } from '../log.js';
+import { getVcsClient } from '../vcs/index.js';
+import { CommonContext } from './context.js';
 
 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {

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

@@ -1,5 +1,5 @@
 import { EasJsonReader } from '@expo/eas-json';
-import { Command } from '@oclif/command';
+import { Command } from '@oclif/core';
 import semver from 'semver';
 
 import {
@@ -7,13 +7,13 @@ import {
   flushAsync as flushAnalyticsAsync,
   initAsync as initAnalyticsAsync,
   logEvent,
-} from '../analytics/rudderstackClient';
-import { findProjectRootAsync } from '../project/projectUtils';
-import { getUserAsync } from '../user/User';
-import { ensureLoggedInAsync } from '../user/actions';
-import { easCliVersion } from '../utils/easCli';
-import { setVcsClient } from '../vcs';
-import GitClient from '../vcs/clients/git';
+} from '../analytics/rudderstackClient.js';
+import { findProjectRootAsync } from '../project/projectUtils.js';
+import { getUserAsync } from '../user/User.js';
+import { ensureLoggedInAsync } from '../user/actions.js';
+import { easCliVersion } from '../utils/easCli.js';
+import GitClient from '../vcs/clients/git.js';
+import { setVcsClient } from '../vcs/index.js';
 
 export default abstract class EasCommand extends Command {
   /**
@@ -21,16 +21,19 @@ export default abstract class EasCommand extends Command {
    * force the user to log in
    */
   protected requiresAuthentication = true;
+  protected mustBeRunInsideProject = true;
 
   protected abstract runAsync(): Promise<any>;
 
   // eslint-disable-next-line async-protect/async-suffix
   async run(): Promise<any> {
     await initAnalyticsAsync();
-    await this.applyCliConfigAsync();
+    if (this.mustBeRunInsideProject) {
+      await this.applyCliConfigAsync();
+    }
 
     if (this.requiresAuthentication) {
-      const { flags } = this.parse();
+      const { flags } = await this.parse();
       const nonInteractive = (flags as any)['non-interactive'] ?? false;
       await ensureLoggedInAsync({ nonInteractive });
     } else {

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);
+import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient.js';
+import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants.js';
+import { getUserAsync } from '../../user/User.js';
+import { ensureLoggedInAsync } from '../../user/actions.js';
+import EasCommand from '../EasCommand.js';
 
 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/account/login.ts

@@ -1,11 +1,12 @@
-import EasCommand from '../../commandUtils/EasCommand';
-import Log from '../../log';
-import { showLoginPromptAsync } from '../../user/actions';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import Log from '../../log.js';
+import { showLoginPromptAsync } from '../../user/actions.js';
 
 export default class AccountLogin extends EasCommand {
   static description = 'log in with your Expo account';
   static aliases = ['login'];
 
+  protected mustBeRunInsideProject = false;
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {

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

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

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

@@ -1,13 +1,14 @@
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import Log from '../../log';
-import { getActorDisplayName, getUserAsync } from '../../user/User';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import Log from '../../log.js';
+import { getActorDisplayName, getUserAsync } from '../../user/User.js';
 
 export default class AccountView extends EasCommand {
   static description = 'show the username you are logged in as';
   static aliases = ['whoami'];
 
+  protected mustBeRunInsideProject = false;
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {

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

@@ -1,16 +1,16 @@
-import EasCommand from '../commandUtils/EasCommand';
-import Log from '../log';
-import UserSettings from '../user/UserSettings';
+import EasCommand from '../commandUtils/EasCommand.js';
+import Log from '../log.js';
+import UserSettings from '../user/UserSettings.js';
 
 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'] }];
 
   protected requiresAuthentication = false;
 
   async runAsync(): Promise<void> {
-    const { STATUS: status } = this.parse(AnalyticsView).args;
+    const { STATUS: status } = (await this.parse(AnalyticsView)).args;
     if (status) {
       await UserSettings.setAsync('analyticsEnabled', status === 'on');
       Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);

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

@@ -1,23 +1,24 @@
-import { getConfig } from '@expo/config';
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import gql from 'graphql-tag';
+import { gql } from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
 import {
   CreateUpdateBranchForAppMutation,
   CreateUpdateBranchForAppMutationVariables,
   UpdateBranch,
-} from '../../graphql/generated';
-import Log from '../../log';
+} from '../../graphql/generated.js';
+import Log from '../../log.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { getVcsClient } from '../../vcs';
+} from '../../project/projectUtils.js';
+import { promptAsync } from '../../prompts.js';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+import { getVcsClient } from '../../vcs/index.js';
 
 export async function createUpdateBranchOnAppAsync({
   appId,
@@ -51,8 +52,7 @@ export async function createUpdateBranchOnAppAsync({
 }
 
 export default class BranchCreate extends EasCommand {
-  static hidden = true;
-  static description = 'Create a branch on the current project.';
+  static description = 'create a branch';
 
   static args = [
     {
@@ -63,7 +63,7 @@ export default class BranchCreate extends EasCommand {
   ];
 
   static flags = {
-    json: flags.boolean({
+    json: Flags.boolean({
       description: 'return a json with the new branch ID and name.',
       default: false,
     }),
@@ -73,10 +73,13 @@ export default class BranchCreate extends EasCommand {
     let {
       args: { name },
       flags,
-    } = this.parse(BranchCreate);
+    } = await this.parse(BranchCreate);
+    if (flags.json) {
+      enableJsonOutput();
+    }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
@@ -99,12 +102,11 @@ export default class BranchCreate extends EasCommand {
     const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });
 
     if (flags.json) {
-      Log.log(newBranch);
-      return;
+      printJsonOnlyOutput(newBranch);
+    } else {
+      Log.withTick(
+        `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
+      );
     }
-
-    Log.withTick(
-      `️Created a new branch: ${chalk.bold(newBranch.name)} on project ${chalk.bold(fullName)}.`
-    );
   }
 }

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

@@ -1,24 +1,25 @@
-import { getConfig } from '@expo/config';
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import gql from 'graphql-tag';
+import { gql } from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
 import {
   DeleteUpdateBranchMutation,
   DeleteUpdateBranchMutationVariables,
   DeleteUpdateBranchResult,
   GetBranchInfoQuery,
   GetBranchInfoQueryVariables,
-} from '../../graphql/generated';
-import Log from '../../log';
+} from '../../graphql/generated.js';
+import Log from '../../log.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils';
-import { promptAsync, toggleConfirmAsync } from '../../prompts';
+} from '../../project/projectUtils.js';
+import { promptAsync, toggleConfirmAsync } from '../../prompts.js';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
 
 async function getBranchInfoAsync({
   appId,
@@ -76,8 +77,7 @@ async function deleteBranchOnAppAsync({
 }
 
 export default class BranchDelete extends EasCommand {
-  static hidden = true;
-  static description = 'Republish an update group';
+  static description = 'delete a branch';
 
   static args = [
     {
@@ -87,7 +87,7 @@ export default class BranchDelete extends EasCommand {
     },
   ];
   static flags = {
-    json: flags.boolean({
+    json: Flags.boolean({
       description: `return JSON with the edited branch's ID and name.`,
       default: false,
     }),
@@ -97,10 +97,13 @@ export default class BranchDelete extends EasCommand {
     let {
       args: { name },
       flags: { json: jsonFlag },
-    } = this.parse(BranchDelete);
+    } = await this.parse(BranchDelete);
+    if (jsonFlag) {
+      enableJsonOutput();
+    }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 
@@ -142,11 +145,11 @@ export default class BranchDelete extends EasCommand {
     });
 
     if (jsonFlag) {
-      Log.log(JSON.stringify(deletionResult));
+      printJsonOnlyOutput(deletionResult);
+    } else {
+      Log.withTick(
+        `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
+      );
     }
-
-    Log.withTick(
-      `️Deleted branch "${name}" and all of its updates on project ${chalk.bold(fullName)}.`
-    );
   }
 }

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

@@ -1,21 +1,22 @@
-import { getConfig } from '@expo/config';
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import CliTable from 'cli-table3';
 import { print } from 'graphql';
-import gql from 'graphql-tag';
+import { gql } from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
 import {
   BranchesByAppQuery,
   BranchesByAppQueryVariables,
   UpdateBranchFragment,
-} from '../../graphql/generated';
-import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
-import Log from '../../log';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
+} from '../../graphql/generated.js';
+import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch.js';
+import Log from '../../log.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils.js';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
 
 const BRANCHES_LIMIT = 10_000;
 
@@ -54,26 +55,27 @@ export async function listBranchesAsync({
 }
 
 export default class BranchList extends EasCommand {
-  static hidden = true;
-
-  static description = 'List all branches on this project.';
+  static description = 'list all branches';
 
   static flags = {
-    json: flags.boolean({
+    json: Flags.boolean({
       description: 'return output as JSON',
       default: false,
     }),
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = this.parse(BranchList);
+    const { flags } = await this.parse(BranchList);
+    if (flags.json) {
+      enableJsonOutput();
+    }
 
     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) {
-      Log.log(JSON.stringify(branches, null, 2));
+      printJsonOnlyOutput(branches);
     } else {
       const table = new CliTable({
         head: ['Branch', ...UPDATE_COLUMNS],

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

@@ -1,4 +1,4 @@
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand from '../../commandUtils/EasCommand.js';
 
 export default class BranchPublish extends EasCommand {
   static description = 'deprecated, use "eas update"';

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

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

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

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

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

@@ -1,25 +1,25 @@
-import { getConfig } from '@expo/config';
 import chalk from 'chalk';
-import gql from 'graphql-tag';
+import { gql } from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
 import {
   Build,
   BuildStatus,
   CancelBuildMutation,
   CancelBuildMutationVariables,
-} from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { appPlatformEmojis } from '../../platform';
+} from '../../graphql/generated.js';
+import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
+import Log from '../../log.js';
+import { ora } from '../../ora.js';
+import { appPlatformEmojis } from '../../platform.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils';
-import { confirmAsync, selectAsync } from '../../prompts';
+} from '../../project/projectUtils.js';
+import { confirmAsync, selectAsync } from '../../prompts.js';
 
 async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
   const data = await withErrorHandlingAsync(
@@ -104,21 +104,21 @@ 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' }];
 
   async runAsync(): Promise<void> {
-    const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;
+    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,19 +1,25 @@
-import { flags } from '@oclif/command';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { configureAsync } from '../../build/configure';
-import EasCommand from '../../commandUtils/EasCommand';
-import Log, { learnMore } from '../../log';
-import { RequestedPlatform } from '../../platform';
-import { findProjectRootAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { getVcsClient } from '../../vcs';
+import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration.js';
+import { ensureProjectConfiguredAsync } from '../../build/configure.js';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import Log, { learnMore } from '../../log.js';
+import { RequestedPlatform } from '../../platform.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
+import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils.js';
+import { resolveWorkflowAsync } from '../../project/workflow.js';
+import { promptAsync } from '../../prompts.js';
+import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule.js';
+import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule.js';
+import { getVcsClient } from '../../vcs/index.js';
 
 export default class BuildConfigure extends EasCommand {
-  static description = 'Configure the project to support EAS Build.';
+  static description = 'configure the project to support EAS Build';
 
   static flags = {
-    platform: flags.enum({
+    platform: Flags.enum({
       description: 'Platform to configure',
       char: 'p',
       options: ['android', 'ios', 'all'],
@@ -21,50 +27,65 @@ export default class BuildConfigure extends EasCommand {
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = this.parse(BuildConfigure);
+    const { flags } = await this.parse(BuildConfigure);
 
     Log.log(
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
-    Log.newLine();
 
     await getVcsClient().ensureRepoExistsAsync();
 
+    const projectDir = await findProjectRootAsync();
+    const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
+
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
-    await configureAsync({
-      platform,
-      projectDir: await findProjectRootAsync(),
+    // clean up old Android configuration
+    if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
+      await cleanUpOldEasBuildGradleScriptAsync(projectDir);
+    }
+
+    // ensure eas.json exists
+    Log.newLine();
+    await ensureProjectConfiguredAsync({
+      projectDir,
+      nonInteractive: false,
     });
 
-    Log.newLine();
-    logSuccess(platform);
-  }
-}
+    // configure expo-updates
+    if (expoUpdatesIsInstalled) {
+      const exp = getExpoConfig(projectDir);
 
-function logSuccess(platform: RequestedPlatform): void {
-  let platformsText = 'iOS and Android projects are';
-  let storesText = 'the Apple App Store or Google Play Store';
+      if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+        if (workflow === Workflow.GENERIC) {
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
+        }
+      }
 
-  if (platform === 'android') {
-    platformsText = 'Android project is';
-    storesText = 'the Google Play Store';
-  } else if (platform === 'ios') {
-    platformsText = 'iOS project is';
-    storesText = 'the Apple App Store Connect';
-  }
+      if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+        if (workflow === Workflow.GENERIC) {
+          await syncIosUpdatesConfigurationAsync(projectDir, exp);
+        }
+      }
+    }
 
-  Log.log(`🎉 Your ${platformsText} ready to build.
+    Log.addNewLineIfNone();
+
+    Log.log(`🎉 Your project is ready to build.
 
 - Run ${chalk.bold('eas build')} when you are ready to create your first build.
-- Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to ${storesText}
+- Once the build is completed, run ${chalk.bold('eas submit')} to upload the app to app stores.
 - ${learnMore('https://docs.expo.dev/build/introduction', {
-    learnMoreMessage: 'Learn more about other capabilities of EAS Build',
-  })}`);
+      learnMoreMessage: 'Learn more about other capabilities of EAS Build',
+    })}`);
+  }
 }
 
 async function promptForPlatformAsync(): Promise<RequestedPlatform> {
+  Log.addNewLineIfNone();
   const { platform } = await promptAsync({
     type: 'select',
     message: 'Which platforms would you like to configure for EAS Build?',

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

@@ -1,21 +1,13 @@
-import { EasJsonReader } from '@expo/eas-json';
-import { flags } from '@oclif/command';
-import { error } from '@oclif/errors';
-import chalk from 'chalk';
-import figures from 'figures';
-import fs from 'fs-extra';
+import { Errors, Flags } from '@oclif/core';
+import path from 'path';
 
-import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
-import EasCommand from '../../commandUtils/EasCommand';
-import Log, { learnMore, link } 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';
+import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit.js';
+import { UserInputResourceClass } from '../../build/types.js';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import Log from '../../log.js';
+import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform.js';
+import { findProjectRootAsync } from '../../project/projectUtils.js';
+import { enableJsonOutput } from '../../utils/json.js';
 
 interface RawBuildFlags {
   platform?: string;
@@ -24,101 +16,115 @@ interface RawBuildFlags {
   profile?: string;
   'non-interactive': boolean;
   local: boolean;
+  output?: string;
   wait: boolean;
   'clear-cache': boolean;
   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({
+    platform: Flags.enum({
       char: 'p',
       options: ['android', 'ios', 'all'],
     }),
-    'skip-credentials-check': flags.boolean({
+    'skip-credentials-check': Flags.boolean({
       default: false,
       hidden: true,
     }),
-    json: flags.boolean({
+    json: Flags.boolean({
       description: 'Enable JSON output, non-JSON messages will be printed to stderr',
       default: false,
     }),
-    'skip-project-configuration': flags.boolean({
+    'skip-project-configuration': Flags.boolean({
       default: false,
-      description: 'Skip project configuration',
+      hidden: true,
     }),
-    profile: flags.string({
+    profile: Flags.string({
       description:
         'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
       helpValue: 'PROFILE_NAME',
     }),
-    'non-interactive': flags.boolean({
+    'non-interactive': Flags.boolean({
       default: false,
       description: 'Run command in non-interactive mode',
     }),
-    local: flags.boolean({
+    local: Flags.boolean({
       default: false,
       description: 'Run build locally [experimental]',
     }),
-    wait: flags.boolean({
+    output: Flags.string({
+      description: 'Output path for local build',
+    }),
+    wait: Flags.boolean({
       default: true,
       allowNo: true,
       description: 'Wait for build(s) to complete',
     }),
-    'clear-cache': flags.boolean({
+    'clear-cache': Flags.boolean({
       default: false,
       description: 'Clear cache before the build',
     }),
-    'auto-submit': flags.boolean({
+    'auto-submit': Flags.boolean({
       default: false,
       description:
         'Submit on build complete using the submit profile with the same name as the build profile',
       exclusive: ['auto-submit-with-profile'],
     }),
-    'auto-submit-with-profile': flags.string({
+    'auto-submit-with-profile': Flags.string({
       description: 'Submit on build complete using the submit profile with provided name',
       helpValue: 'PROFILE_NAME',
       exclusive: ['auto-submit'],
     }),
+    '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> {
-    const { flags: rawFlags } = this.parse(Build);
+    const { flags: rawFlags } = await this.parse(Build);
     if (rawFlags.json) {
       enableJsonOutput();
     }
     const flags = await this.sanitizeFlagsAsync(rawFlags);
 
     const projectDir = await findProjectRootAsync();
-    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
     await runBuildAndSubmitAsync(projectDir, flags);
   }
 
   private async sanitizeFlagsAsync(flags: RawBuildFlags): Promise<BuildFlags> {
     const nonInteractive = flags['non-interactive'];
+    if (!flags.local && flags.output) {
+      Errors.error('--output is allowed only for local builds', { exit: 1 });
+    }
     if (!flags.platform && nonInteractive) {
-      error('--platform is required when building in non-interactive mode', { exit: 1 });
+      Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
     }
     if (flags.json && !nonInteractive) {
-      error('--json is allowed only when building in non-interactive mode', { exit: 1 });
+      Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
     }
 
     const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
     if (flags.local) {
       if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
         // TODO: implement this
-        error('Auto-submits are not yet supported when building locally', { exit: 1 });
+        Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
       }
 
       if (requestedPlatform === RequestedPlatform.All) {
-        error('Builds for multiple platforms are not supported with flag --local', { exit: 1 });
+        Errors.error('Builds for multiple platforms are not supported with flag --local', {
+          exit: 1,
+        });
       } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
-        error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+        Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
       }
     }
 
@@ -129,15 +135,25 @@ export default class Build extends EasCommand {
       );
       Log.newLine();
     }
+    if (flags['skip-project-configuration']) {
+      Log.warnDeprecatedFlag(
+        'skip-project-configuration',
+        'Automatic configuration of native code is no longer optional.'
+      );
+      Log.newLine();
+    }
 
     const profile = flags['profile'];
     return {
       requestedPlatform,
-      skipProjectConfiguration: flags['skip-project-configuration'],
       profile,
       nonInteractive,
       localBuildOptions: flags['local']
-        ? { enable: true, verbose: true }
+        ? {
+            enable: true,
+            verbose: true,
+            artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
+          }
         : {
             enable: false,
           },
@@ -146,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

@@ -1,17 +1,17 @@
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 
-import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import EasCommand from '../../commandUtils/EasCommand';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { RequestedPlatform } from '../../platform';
-import { findProjectRootAsync } from '../../project/projectUtils';
-import { getTmpDirectory } from '../../utils/paths';
-import { getVcsClient } from '../../vcs';
+import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit.js';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import Log from '../../log.js';
+import { ora } from '../../ora.js';
+import { RequestedPlatform } from '../../platform.js';
+import { findProjectRootAsync } from '../../project/projectUtils.js';
+import { getTmpDirectory } from '../../utils/paths.js';
+import { getVcsClient } from '../../vcs/index.js';
 
 enum InspectStage {
   ARCHIVE = 'archive',
@@ -26,54 +26,63 @@ 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({
+    platform: Flags.enum({
       char: 'p',
       options: [RequestedPlatform.Android, RequestedPlatform.Ios],
       required: true,
     }),
-    profile: flags.string({
+    profile: Flags.string({
       description:
         'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
       helpValue: 'PROFILE_NAME',
     }),
-    stage: flags.enum({
+    stage: Flags.enum({
       char: 's',
       description: STAGE_DESCRIPTION,
       options: [InspectStage.ARCHIVE, InspectStage.PRE_BUILD, InspectStage.POST_BUILD],
       required: true,
     }),
-    output: flags.string({
+    output: Flags.string({
+      char: 'o',
       description: 'Output directory.',
       required: true,
       helpValue: 'OUTPUT_DIRECTORY',
     }),
-    force: flags.boolean({
+    force: Flags.boolean({
       description: 'Delete OUTPUT_DIRECTORY if it already exists.',
       default: false,
     }),
-    verbose: flags.boolean({
+    verbose: Flags.boolean({
+      char: 'v',
       default: false,
     }),
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = this.parse(BuildInspect);
+    const { flags } = await this.parse(BuildInspect);
     const outputDirectory = path.resolve(process.cwd(), flags.output);
+    const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());
+
+    if (flags.force && process.cwd().startsWith(outputDirectory)) {
+      throw new Error(
+        `This operation is not allowed, it would delete all files in ${outputDirectory} including the current project.`
+      );
+    }
+
     await this.prepareOutputDirAsync(outputDirectory, flags.force);
+
     if (flags.stage === InspectStage.ARCHIVE) {
       const vcs = getVcsClient();
       await vcs.ensureRepoExistsAsync();
-      await vcs.makeShallowCopyAsync(outputDirectory);
-      Log.withTick(`Project saved to ${outputDirectory}`);
+      await vcs.makeShallowCopyAsync(tmpWorkingdir);
+      await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {
       const projectDir = await findProjectRootAsync();
-      const tmpWorkingdir = path.join(getTmpDirectory(), uuidv4());
       try {
         await runBuildAndSubmitAsync(projectDir, {
-          skipProjectConfiguration: false,
           nonInteractive: false,
           wait: true,
           clearCache: false,
@@ -93,24 +102,13 @@ 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`);
         }
       } finally {
-        const spinner = ora().start(`Copying project build directory to ${outputDirectory}`);
-        try {
-          const tmpBuildDirectory = path.join(tmpWorkingdir, 'build');
-          if (await fs.pathExists(tmpBuildDirectory)) {
-            await fs.copy(tmpBuildDirectory, outputDirectory);
-          }
-          await fs.remove(tmpWorkingdir);
-          spinner.succeed(`Project build directory saved to ${outputDirectory}`);
-        } catch (err) {
-          spinner.fail();
-          throw err;
-        }
+        await this.copyToOutputDirAsync(path.join(tmpWorkingdir, 'build'), outputDirectory);
       }
     }
   }
@@ -125,4 +123,18 @@ export default class BuildInspect extends EasCommand {
     }
     await fs.mkdirp(outputDir);
   }
+
+  private async copyToOutputDirAsync(src: string, dst: string): Promise<void> {
+    const spinner = ora().start(`Copying project directory to ${dst}`);
+    try {
+      if (await fs.pathExists(src)) {
+        await fs.copy(src, dst);
+      }
+      await fs.remove(src);
+      spinner.succeed(`Project directory saved to ${dst}`);
+    } catch (err) {
+      spinner.fail();
+      throw err;
+    }
+  }
 }

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

@@ -1,37 +1,37 @@
-import { getConfig } from '@expo/config';
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { BuildDistributionType, BuildStatus } from '../../build/types';
-import { formatGraphQLBuild } from '../../build/utils/formatBuild';
-import EasCommand from '../../commandUtils/EasCommand';
+import { BuildDistributionType, BuildStatus } from '../../build/types.js';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild.js';
+import EasCommand from '../../commandUtils/EasCommand.js';
 import {
   AppPlatform,
   DistributionType,
   BuildStatus as GraphQLBuildStatus,
-} from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { RequestedPlatform } from '../../platform';
+} from '../../graphql/generated.js';
+import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
+import Log from '../../log.js';
+import { ora } from '../../ora.js';
+import { RequestedPlatform } from '../../platform.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+} from '../../project/projectUtils.js';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
 
 export default class BuildList extends EasCommand {
   static description = 'list all builds for your project';
 
   static flags = {
-    platform: flags.enum({
+    platform: Flags.enum({
       options: [RequestedPlatform.All, RequestedPlatform.Android, RequestedPlatform.Ios],
     }),
-    json: flags.boolean({
+    json: Flags.boolean({
       description: 'Enable JSON output, non-JSON messages will be printed to stderr',
     }),
-    status: flags.enum({
+    status: Flags.enum({
       options: [
         BuildStatus.NEW,
         BuildStatus.IN_QUEUE,
@@ -41,26 +41,26 @@ export default class BuildList extends EasCommand {
         BuildStatus.CANCELED,
       ],
     }),
-    distribution: flags.enum({
+    distribution: Flags.enum({
       options: [
         BuildDistributionType.STORE,
         BuildDistributionType.INTERNAL,
         BuildDistributionType.SIMULATOR,
       ],
     }),
-    channel: flags.string(),
-    appVersion: flags.string(),
-    appBuildVersion: flags.string(),
-    sdkVersion: flags.string(),
-    runtimeVersion: flags.string(),
-    appIdentifier: flags.string(),
-    buildProfile: flags.string(),
-    gitCommitHash: flags.string(),
-    limit: flags.integer(),
+    channel: Flags.string(),
+    appVersion: Flags.string(),
+    appBuildVersion: Flags.string(),
+    sdkVersion: Flags.string(),
+    runtimeVersion: Flags.string(),
+    appIdentifier: Flags.string(),
+    buildProfile: Flags.string(),
+    gitCommitHash: Flags.string(),
+    limit: Flags.integer(),
   };
 
   async runAsync(): Promise<void> {
-    const { flags } = this.parse(BuildList);
+    const { flags } = await this.parse(BuildList);
     const {
       json,
       platform: requestedPlatform,
@@ -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,18 +1,18 @@
-import { getConfig } from '@expo/config';
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 
-import { formatGraphQLBuild } from '../../build/utils/formatBuild';
-import EasCommand from '../../commandUtils/EasCommand';
-import { BuildFragment } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import Log from '../../log';
-import { ora } from '../../ora';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild.js';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import { BuildFragment } from '../../graphql/generated.js';
+import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
+import Log from '../../log.js';
+import { ora } from '../../ora.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+} from '../../project/projectUtils.js';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
 
 export default class BuildView extends EasCommand {
   static description = 'view a build for your project';
@@ -20,7 +20,7 @@ export default class BuildView extends EasCommand {
   static args = [{ name: 'BUILD_ID' }];
 
   static flags = {
-    json: flags.boolean({
+    json: Flags.boolean({
       description: 'Enable JSON output, non-JSON messages will be printed to stderr',
     }),
   };
@@ -29,13 +29,13 @@ export default class BuildView extends EasCommand {
     const {
       args: { BUILD_ID: buildId },
       flags,
-    } = this.parse(BuildView);
+    } = await this.parse(BuildView);
     if (flags.json) {
       enableJsonOutput();
     }
 
     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,24 +1,25 @@
-import { getConfig } from '@expo/config';
-import { flags } from '@oclif/command';
+import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import gql from 'graphql-tag';
+import { gql } from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import EasCommand from '../../commandUtils/EasCommand.js';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
 import {
   CreateUpdateChannelOnAppMutation,
   CreateUpdateChannelOnAppMutationVariables,
-} from '../../graphql/generated';
-import Log from '../../log';
+} from '../../graphql/generated.js';
+import { BranchQuery } from '../../graphql/queries/BranchQuery.js';
+import Log from '../../log.js';
+import { getExpoConfig } from '../../project/expoConfig.js';
 import {
   findProjectRootAsync,
-  getBranchByNameAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import formatFields from '../../utils/formatFields';
-import { createUpdateBranchOnAppAsync } from '../branch/create';
+} from '../../project/projectUtils.js';
+import { promptAsync } from '../../prompts.js';
+import formatFields from '../../utils/formatFields.js';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+import { createUpdateBranchOnAppAsync } from '../branch/create.js';
 
 export async function createUpdateChannelOnAppAsync({
   appId,
@@ -59,8 +60,7 @@ export async function createUpdateChannelOnAppAsync({
 }
 
 export default class ChannelCreate extends EasCommand {
-  static hidden = true;
-  static description = 'Create a channel on the current project.';
+  static description = 'create a channel';
 
   static args = [
     {
@@ -71,7 +71,7 @@ export default class ChannelCreate extends EasCommand {
   ];
 
   static flags = {
-    json: flags.boolean({
+    json: Flags.boolean({
       description:
         'print output as a JSON object with the new channel ID, name and branch mapping.',
       default: false,
@@ -82,10 +82,13 @@ export default class ChannelCreate extends EasCommand {
     let {
       args: { name: channelName },
       flags: { json: jsonFlag },
-    } = this.parse(ChannelCreate);
+    } = await this.parse(ChannelCreate);
+    if (jsonFlag) {
+      enableJsonOutput();
+    }
 
     const projectDir = await findProjectRootAsync();
-    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {
@@ -103,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,
@@ -134,30 +138,29 @@ export default class ChannelCreate extends EasCommand {
     }
 
     if (jsonFlag) {
-      Log.log(JSON.stringify(newChannel));
-      return;
+      printJsonOnlyOutput(newChannel);
+    } else {
+      Log.addNewLineIfNone();
+      Log.withTick(
+        `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
+      );
+      Log.log(
+        formatFields([
+          { label: 'Name', value: newChannel.name },
+          { label: 'ID', value: newChannel.id },
+        ])
+      );
+      Log.addNewLineIfNone();
+      Log.withTick(`${branchMessage} and have pointed the channel at it.`);
+      Log.log(
+        formatFields([
+          { label: 'Name', value: newChannel.name },
+          { label: 'ID', value: branchId },
+        ])
+      );
+
+      Log.addNewLineIfNone();
+      Log.log(chalk.bold('You can now update your app by publishing!'));
     }
-
-    Log.addNewLineIfNone();
-    Log.withTick(
-      `Created a new channel on project ${chalk.bold(await getProjectFullNameAsync(exp))}`
-    );
-    Log.log(
-      formatFields([
-        { label: 'Name', value: newChannel.name },
-        { label: 'ID', value: newChannel.id },
-      ])
-    );
-    Log.addNewLineIfNone();
-    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
-    Log.log(
-      formatFields([
-        { label: 'Name', value: newChannel.name },
-        { label: 'ID', value: branchId },
-      ])
-    );
-
-    Log.addNewLineIfNone();
-    Log.log(chalk.bold('You can now update your app by publishing!'));
   }
 }

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

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