[14/n][eas-cli] Simplify credentials manager and device create for within-project-only running

.gitattributes

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

.github/workflows/changelog.yml

@@ -10,8 +10,6 @@ jobs:
     if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
     steps:
       - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
           node-version: 18

.github/workflows/release.yml

@@ -36,10 +36,10 @@ jobs:
           yarn pretarball-ci
           yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
       - id: x64
-        run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist
       - id: arm
-        run: echo "filename=$(ls eas-*-arm.tar.gz)" >> $GITHUB_OUTPUT
+        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
@@ -77,7 +77,7 @@ jobs:
           yarn pretarball-ci
           yarn oclif pack:tarballs --no-xz --targets darwin-x64
       - id: x64
-        run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
+        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
@@ -105,10 +105,10 @@ jobs:
           yarn oclif pack:win
         working-directory: ${{ github.workspace }}/packages/eas-cli
       - id: x64
-        run: echo "filename=$(ls eas-*-x64.exe)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
       - id: x86
-        run: echo "filename=$(ls eas-*-x86.exe)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
       - name: Upload x64 installer
         uses: actions/upload-release-asset@v1
@@ -147,22 +147,12 @@ jobs:
         run: yarn lerna publish from-package --yes --no-verify-access
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-      - name: Add latest-eas-build-staging tag
-        run: |
-          VERSION=$(cat lerna.json | jq -r .version)
-          echo //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN > ~/.npmrc
-          npm dist-tag add eas-cli@$VERSION latest-eas-build-staging
-          echo "Run \"npm dist-tag add eas-cli@$VERSION latest-eas-build\" to promote it to production."
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
   release-changelog:
     name: Update changelog and publish release
     runs-on: ubuntu-latest
     needs: publish-to-npm
     steps:
       - uses: actions/checkout@v2
-        with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
           node-version: 18

.github/workflows/test.yml

@@ -32,9 +32,6 @@ jobs:
           # Remove this whenever we solved those OOM errors.
           NODE_OPTIONS: --max-old-space-size=4096
       - run: yarn lint --max-warnings=0
-      - run: yarn install --frozen-lockfile --check-files
-        working-directory: ./scripts
-      - run: yarn lint-changelog
       - uses: codecov/codecov-action@v1
         if: ${{ matrix.coverage }}
         with:

CHANGELOG.md

@@ -6,328 +6,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-### 🎉 New features
-
-### 🐛 Bug fixes
-
-- Bump `@expo/apple-utils` to fix Apple developer auth
-
-### 🧹 Chores
-
-## [3.7.0](https://github.com/expo/eas-cli/releases/tag/v3.7.0) - 2023-02-23
-
-### 🎉 New features
-
-- Support variant detection for package*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))
-
-## [3.6.1](https://github.com/expo/eas-cli/releases/tag/v3.6.1) - 2023-02-20
-
-### 🐛 Bug fixes
-
-- Disable analytics when running behind a proxy. ([#1696](https://github.com/expo/eas-cli/pull/1696) by [@wkozyra95](https://github.com/wkozyra95))
-- Clarify missing owner field error message for Robot users. ([#1702](https://github.com/expo/eas-cli/pull/1702) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Validate the platform for local builds earlier. ([#1698](https://github.com/expo/eas-cli/pull/1698) by [@wkozyra95](https://github.com/wkozyra95))
-- Display build message when picking build in `eas submit`, `eas build:resign`, and `eas build:run` commands. ([#1700](https://github.com/expo/eas-cli/pull/1700) by [@szdziedzic](https://github.com/szdziedzic))
-- Add a link directly to a build phase logs in the EAS CLI build error message. ([#1699](https://github.com/expo/eas-cli/pull/1699) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.6.0](https://github.com/expo/eas-cli/releases/tag/v3.6.0) - 2023-02-14
-
-### 🎉 New features
-
-- Use `sdkVersion` as default runtime version policy when running `eas update:configure`. ([#1669](https://github.com/expo/eas-cli/pull/1669) by [@jonsamp](https://github.com/jonsamp))
-- Warn when project ID but no owner specified and mismatch logged in user. ([#1667](https://github.com/expo/eas-cli/pull/1667) by [@wschurman](https://github.com/wschurman))
-- Return the build `message` if one is available. ([#1691](https://github.com/expo/eas-cli/pull/1691) by [@raulriera](https://github.com/raulriera))
-
-### 🐛 Bug fixes
-
-- Fix suggested application identifier to match owning account name. ([#1670](https://github.com/expo/eas-cli/pull/1670) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Add Xcode 14.2 image to the VSCode schema. ([#1693](https://github.com/expo/eas-cli/pull/1693) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.5.2](https://github.com/expo/eas-cli/releases/tag/v3.5.2) - 2023-02-05
-
-### 🐛 Bug fixes
-
-- Use the new developer-mdn.apple.com subdomain instead of developer.apple.com. ([#1673](https://github.com/expo/eas-cli/pull/1673) by [@brentvatne](https://github.com/brentvatne))
-
-## [3.5.1](https://github.com/expo/eas-cli/releases/tag/v3.5.1) - 2023-02-01
-
-### 🐛 Bug fixes
-
-- Fix the issue with the `eas.json` envs being not available when resolving dynamic config. ([#1666](https://github.com/expo/eas-cli/pull/1666) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.5.0](https://github.com/expo/eas-cli/releases/tag/v3.5.0) - 2023-01-31
-
-### 🎉 New features
-
-- Set `m1-medium` resource class for SDK version `>=48` and RN version `>=0.71` builds with unspecified resource class. ([#1655](https://github.com/expo/eas-cli/pull/1655) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- Fix undefined branchMappingLogic. ([#1653](https://github.com/expo/eas-cli/pull/1653) by [@quinlanj](https://github.com/quinlanj))
-- Fix using local credentials for internal distribution builds with universal provisioning. ([#1657](https://github.com/expo/eas-cli/pull/1657) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
-- Move image validation to the server side and better handle server validation errors in the eas-cli. ([#1650](https://github.com/expo/eas-cli/pull/1650) by [@szdziedzic](https://github.com/szdziedzic))
-- Update metadata on the worker when using git-based builds. ([#1651](https://github.com/expo/eas-cli/pull/1651) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [3.4.1](https://github.com/expo/eas-cli/releases/tag/v3.4.1) - 2023-01-23
-
-### 🐛 Bug fixes
-
-- Fix incorrect exit code for successful local builds. ([#1649](https://github.com/expo/eas-cli/pull/1649) by [@dsokal](https://github.com/dsokal))
-
-## [3.4.0](https://github.com/expo/eas-cli/releases/tag/v3.4.0) - 2023-01-20
-
-### 🎉 New features
-
-- Add `--json` flag to `eas config` command. ([#1568](https://github.com/expo/eas-cli/pull/1568) by [@wkozyra95](https://github.com/wkozyra95))
-- Add M1 resource class configuration to default eas.json when running eas build:configure on a new project. ([#1637](https://github.com/expo/eas-cli/pull/1637) by [@brentvatne](https://github.com/brentvatne))
-- Add prompt to switch iOS builds to M1 if the build queue is long. ([#1642](https://github.com/expo/eas-cli/pull/1642) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Fix running commands with `--json` flag when EAS_NO_VCS is set. ([#1641](https://github.com/expo/eas-cli/pull/1641) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
-- Remove unnecessary workaround for trailing backslash in .gitignore. ([#1622](https://github.com/expo/eas-cli/pull/1622) by [@wkozyra95](https://github.com/wkozyra95))
-- Internal command that will be run on EAS worker when building from GitHub. ([#1568](https://github.com/expo/eas-cli/pull/1568) by [@wkozyra95](https://github.com/wkozyra95))
-- Make the disabled tier error message more descriptive. ([#1635](https://github.com/expo/eas-cli/pull/1635) by [@dsokal](https://github.com/dsokal))
-- Control some of the EAS Build error messages server-side. ([#1639](https://github.com/expo/eas-cli/pull/1639) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [3.3.2](https://github.com/expo/eas-cli/releases/tag/v3.3.2) - 2023-01-12
-
-### 🐛 Bug fixes
-
-- Add missing key information about updates in `eas update --json` and `eas update:view --json`. ([#1619](https://github.com/expo/eas-cli/pull/1619) by [@byCedric](https://github.com/byCedric))
-
-### 🧹 Chores
-
-- Upgrade dependencies. ([#1617](https://github.com/expo/eas-cli/pull/1617) by [@dsokal](https://github.com/dsokal))
-- Improve handling `SSOUser` type. ([#1621](https://github.com/expo/eas-cli/pull/1621) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.3.1](https://github.com/expo/eas-cli/releases/tag/v3.3.1) - 2023-01-11
-
-### 🐛 Bug fixes
-
-- Revert missing key information about updates in `eas update --json` and `eas update:view --json`. ([d20db0f](https://github.com/expo/eas-cli/commit/d20db0fff42a6f4512fea426a66cb6f168e37f7c) by [@ide](https://github.com/ide))
-
-## [3.3.0](https://github.com/expo/eas-cli/releases/tag/v3.3.0) - 2023-01-11
-
-### 🎉 New features
-
-- Add ability to select resource class for a build in build profile. ([#1609](https://github.com/expo/eas-cli/pull/1609) by [@dsokal](https://github.com/dsokal))
-- Deprecate `--resource-class` flag. ([#1615](https://github.com/expo/eas-cli/pull/1615) by [@dsokal](https://github.com/dsokal))
-- Add new resource classes and update already available. ([#1616](https://github.com/expo/eas-cli/pull/1616) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- Add missing key information about updates in `eas update --json` and `eas update:view --json`. ([#1611](https://github.com/expo/eas-cli/pull/1611) by [@byCedric](https://github.com/byCedric))
-
-## [3.2.1](https://github.com/expo/eas-cli/releases/tag/v3.2.1) - 2023-01-09
-
-### 🐛 Bug fixes
-
-- Validate chosen build in the `eas build:run` command. ([#1614](https://github.com/expo/eas-cli/pull/1614) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.2.0](https://github.com/expo/eas-cli/releases/tag/v3.2.0) - 2023-01-09
-
-### 🎉 New features
-
-- Add `--channel` option to `update:republish`. ([#1580](https://github.com/expo/eas-cli/pull/1580) by [@byCedric](https://github.com/byCedric))
-- Use `appVersion` as default runtime version policy when running `eas update:configure`. ([#1588](https://github.com/expo/eas-cli/pull/1588) by [@jonsamp](https://github.com/jonsamp))
-- Support `--json` flag in webhook list command. ([#1605](https://github.com/expo/eas-cli/pull/1605) by [@sheddy7](https://github.com/sheddy7))
-
-### 🐛 Bug fixes
-
-- Makes eas.json configuration to only run on `update:configure`. ([#1598](https://github.com/expo/eas-cli/pull/1598) by [@jonsamp](https://github.com/jonsamp))
-- Fix issue with invisible build info in some terminals in the `eas build:run` and `eas build:resign` commands. ([#1602](https://github.com/expo/eas-cli/pull/1602) by [@szdziedzic](https://github.com/szdziedzic))
-- Fix issues with invisible build info in some terminals while using the `eas submit` command. ([#1603](https://github.com/expo/eas-cli/pull/1603) by [@szdziedzic](https://github.com/szdziedzic))
-- Use the `completedAt` timestamp as the build finish date instead of the `updatedAt` timestamp in the `eas build:run` command. ([#1604](https://github.com/expo/eas-cli/pull/1604) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Make all URLs in logs clickable in terminals supporting hyperlinks. ([#1591](https://github.com/expo/eas-cli/pull/1591) by [@Simek](https://github.com/Simek))
-- Use paginated select prompt for the `eas build:run` command. ([#1601](https://github.com/expo/eas-cli/pull/1601) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.1.1](https://github.com/expo/eas-cli/releases/tag/v3.1.1) - 2022-12-19
-
-### 🐛 Bug fixes
-
-- Fix update `--channel` and `--branch` flag validation. ([#1579](https://github.com/expo/eas-cli/pull/1579) by [@byCedric](https://github.com/byCedric))
-
-## [3.1.0](https://github.com/expo/eas-cli/releases/tag/v3.1.0) - 2022-12-17
-
-### 🎉 New features
-
-- Adds `--channel` flag to `eas update`. ([#1567](https://github.com/expo/eas-cli/pull/1567) by [@jonsamp](https://github.com/jonsamp))
-- Add channel configurations to **eas.json** during `eas update:configure`. ([#1570](https://github.com/expo/eas-cli/pull/1570) by [@jonsamp](https://github.com/jonsamp))
-- Add `build:resign` command. ([#1575](https://github.com/expo/eas-cli/pull/1575) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [3.0.0](https://github.com/expo/eas-cli/releases/tag/v3.0.0) - 2022-12-07
-
-### 🛠 Breaking changes
-
-- Move update republish to separate command. ([#1533](https://github.com/expo/eas-cli/pull/1533) by [@byCedric](https://github.com/byCedric))
-
-### 🐛 Bug fixes
-
-- Make the not recognized image error handler run only if the image is present under a valid key and has an invalid value. ([#1565](https://github.com/expo/eas-cli/pull/1565) by [@szdziedzic](https://github.com/szdziedzic))
-- Fix the `node:assert` import error by using imports from `assert` instead of from `node:assert`. ([#1569](https://github.com/expo/eas-cli/pull/1569) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Remove old republish code from the update command. ([#1535](https://github.com/expo/eas-cli/pull/1535) by [@byCedric](https://github.com/byCedric))
-
-## [2.9.0](https://github.com/expo/eas-cli/releases/tag/v2.9.0) - 2022-12-05
-
-### 🎉 New features
-
-- Add caching for `eas build:run` command. ([#1542](https://github.com/expo/eas-cli/pull/1542) by [@szdziedzic](https://github.com/szdziedzic))
-- Add `isGitWorkingTreeDirty` to EAS Update records. ([#1550](https://github.com/expo/eas-cli/pull/1550) by [@FiberJW](https://github.com/FiberJW))
-- Prompt developer to download the app after the simulator build is finished. ([#1554](https://github.com/expo/eas-cli/pull/1554) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- Ask for the missing application identifier consistently in `eas build:version:sync` command. ([#1543](https://github.com/expo/eas-cli/pull/1543) by [@wkozyra95](https://github.com/wkozyra95))
-- Disable selecting builds whose artifacts have expired in the `eas build:run` command. ([#1547](https://github.com/expo/eas-cli/pull/1547) by [@szdziedzic](https://github.com/szdziedzic))
-- Change intent with which the `eas build:run` command opens an Android app to `android.intent.action.MAIN`. ([#1556](https://github.com/expo/eas-cli/pull/1556) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [2.8.0](https://github.com/expo/eas-cli/releases/tag/v2.8.0) - 2022-11-28
-
-### 🎉 New features
-
-- Add `eas build:run` support for Android. ([#1485](https://github.com/expo/eas-cli/pull/1485) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- Only create a new channel when update branch is new. ([#1507](https://github.com/expo/eas-cli/pull/1507) by [@byCedric](https://github.com/byCedric))
-
-### 🧹 Chores
-
-- Better wording in eas submit. ([#1527](https://github.com/expo/eas-cli/pull/1527) by [@dsokal](https://github.com/dsokal))
-- Upload project sources for EAS Build and archives for EAS Submit to GCS. ([#1524](https://github.com/expo/eas-cli/pull/1524) by [@wkozyra95](https://github.com/wkozyra95))
-- Add a better error message for when an invalid `image` is set in `eas-json`. ([#1531](https://github.com/expo/eas-cli/pull/1531) by [@szdziedzic](https://github.com/szdziedzic))
-- Remove internal expo id from device formatter. ([#1541](https://github.com/expo/eas-cli/pull/1541) by [@dsokal](https://github.com/dsokal))
-
-## [2.7.1](https://github.com/expo/eas-cli/releases/tag/v2.7.1) - 2022-11-16
-
-### 🐛 Bug fixes
-
-- Use envs from the build profile to resolve credentials in `eas credentials`. ([#1520](https://github.com/expo/eas-cli/pull/1520) by [@wkozyra95](https://github.com/wkozyra95))
-
-### 🧹 Chores
-
-- Print prompt message when failing because of the non-interactive shell. ([#1523](https://github.com/expo/eas-cli/pull/1523) by [@wkozyra95](https://github.com/wkozyra95))
-- Add SDK version to the analytics build events. ([#1529](https://github.com/expo/eas-cli/pull/1529) by [@wkozyra95](https://github.com/wkozyra95))
-- Add Xcode 14.1 image to `eas-json`. ([#1511](https://github.com/expo/eas-cli/pull/1511) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [2.7.0](https://github.com/expo/eas-cli/releases/tag/v2.7.0) - 2022-11-11
-
-### 🎉 New features
-
-- Support uploading different platform combinations in `eas update`. ([#1461](https://github.com/expo/eas-cli/pull/1461) by [@EvanBacon](https://github.com/EvanBacon))
-- Add Git commit to EAS Update record. ([#1499](https://github.com/expo/eas-cli/pull/1499) by [@fiberjw](https://github.com/fiberjw))
-- Use local CLI for `expo export` in SDK +46. ([#1474](https://github.com/expo/eas-cli/pull/1474) by [@EvanBacon](https://github.com/EvanBacon))
-- Validate icon PNGs before running Android build. ([#1477](https://github.com/expo/eas-cli/pull/1477) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Fixed the values of the distribution enum on the build profile schema receiving the incorrect descriptions. ([#1504](https://github.com/expo/eas-cli/pull/1504) by [@macksal](https://github.com/macksal))
-- Remove hard dependency on expo package being installed to init a project. ([#1517](https://github.com/expo/eas-cli/pull/1517) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
-- Remove friction from the initial EAS update setup. ([#1479](https://github.com/expo/eas-cli/pull/1479) by [@byCedric](https://github.com/byCedric))
-- Improve choice formatting when selecting a build to submit in the `eas submit` command. ([#1502](https://github.com/expo/eas-cli/pull/1502) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [2.6.0](https://github.com/expo/eas-cli/releases/tag/v2.6.0) - 2022-10-27
-
-### 🎉 New features
-
-- Add custom metadata validation command with more complex rules. ([#1416](https://github.com/expo/eas-cli/pull/1416) by [@byCedric](https://github.com/byCedric))
-- Add `eas build:run` command which runs iOS simulator builds from the CLI. ([#1447](https://github.com/expo/eas-cli/pull/1447) by [@szdziedzic](https://github.com/szdziedzic))
-- Add feature gate support. ([#1475](https://github.com/expo/eas-cli/pull/1475) by [@wschurman](https://github.com/wschurman))
-- Warn about outdated build deployment when configuring EAS Update. ([#1467](https://github.com/expo/eas-cli/pull/1467) by [@fiberjw](https://github.com/fiberjw))
-
-### 🧹 Chores
-
-- Replace `secret:list` table with formatted fields. ([#1464](https://github.com/expo/eas-cli/pull/1464) by [@byCedric](https://github.com/byCedric))
-- Replace `device:create` input table with formatted fields. ([#1465](https://github.com/expo/eas-cli/pull/1465) by [@byCedric](https://github.com/byCedric))
-- Replace `channel:view` table with formatted fields. ([#1466](https://github.com/expo/eas-cli/pull/1466) by [@byCedric](https://github.com/byCedric))
-- Upgrade dependencies. ([#1480](https://github.com/expo/eas-cli/pull/1480) by [@dsokal](https://github.com/dsokal))
-- Replace all remaining tables with formatted fields. ([#1481](https://github.com/expo/eas-cli/pull/1481) by [@byCedric](https://github.com/byCedric))
-
-## [2.5.1](https://github.com/expo/eas-cli/releases/tag/v2.5.1) - 2022-10-24
-
-### 🐛 Bug fixes
-
-- Revert using local CLI for `expo export` ([#1460](https://github.com/expo/eas-cli/pull/1460)). ([#1472](https://github.com/expo/eas-cli/pull/1472) by [@dsokal](https://github.com/dsokal))
-
-## [2.5.0](https://github.com/expo/eas-cli/releases/tag/v2.5.0) - 2022-10-24
-
-### 🎉 New features
-
-- Update init command to handle slug and owner. ([#1452](https://github.com/expo/eas-cli/pull/1452) by [@wschurman](https://github.com/wschurman))
-- Add `eas secret:push`. ([#1457](https://github.com/expo/eas-cli/pull/1457) by [@dsokal](https://github.com/dsokal))
-
-### 🐛 Bug fixes
-
-- Initialize analytics consistently and move analytics into context. ([#1444](https://github.com/expo/eas-cli/pull/1444) by [@wschurman](https://github.com/wschurman))
-- - Skip using `--non-interactive` and `--experimental-bundle` flags when local Expo CLI is installed. ([#1460](https://github.com/expo/eas-cli/pull/1460) by [@EvanBacon](https://github.com/EvanBacon))
-
-### 🧹 Chores
-
-- Handle case where git is installed but not working properly. ([#1454](https://github.com/expo/eas-cli/pull/1454) by [@brentvatne](https://github.com/brentvatne))
-- Remove table logging in `update:view`. ([#1463](https://github.com/expo/eas-cli/pull/1463) by [@EvanBacon](https://github.com/EvanBacon))
-- Fix install prompt language. ([#1462](https://github.com/expo/eas-cli/pull/1462) by [@EvanBacon](https://github.com/EvanBacon))
-
-## [2.4.1](https://github.com/expo/eas-cli/releases/tag/v2.4.1) - 2022-10-17
-
-### 🐛 Bug fixes
-
-- Bump `eas-cli-local-build-plugin` to 0.0.144 to not require `yarn` for local builds. ([c05ef](https://github.com/expo/eas-cli/commit/c05ef9cccaa819d8e5fb84858cb09cadaae90134) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
-- Remove EAS Submit errors from codebase. The errors have been moved to the server side. ([#1443](https://github.com/expo/eas-cli/pull/1443) by [@dsokal](https://github.com/dsokal))
-
-## [2.4.0](https://github.com/expo/eas-cli/releases/tag/v2.4.0) - 2022-10-14
-
-### 🎉 New features
-
-- Handle more common errors for EAS Submit. ([#1440](https://github.com/expo/eas-cli/pull/1440) by [@dsokal](https://github.com/dsokal))
-
-### 🧹 Chores
-
-- Move graphql and session into command context. ([#1435](https://github.com/expo/eas-cli/pull/1435), [#1436](https://github.com/expo/eas-cli/pull/1436) by [@wschurman](https://github.com/wschurman))
-
-## [2.3.0](https://github.com/expo/eas-cli/releases/tag/v2.3.0) - 2022-10-10
-
-### 🎉 New features
-
-- Add new experimental resource class for M1 Macs. ([#1425](https://github.com/expo/eas-cli/pull/1425) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [2.2.1](https://github.com/expo/eas-cli/releases/tag/v2.2.1) - 2022-10-05
-
-### 🐛 Bug fixes
-
-- Make Apple Platform detection more robust. ([#1417](https://github.com/expo/eas-cli/pull/1417) by [@quinlanj](https://github.com/quinlanj))
-- Fix creating EAS secret from file. ([#1423](https://github.com/expo/eas-cli/pull/1423) by [@dsokal](https://github.com/dsokal))
-
-## [2.2.0](https://github.com/expo/eas-cli/releases/tag/v2.2.0) - 2022-10-04
-
-### 🛠 Breaking changes
-
 - Prompt before configuring EAS project. ([#1356](https://github.com/expo/eas-cli/pull/1356) by [@wschurman](https://github.com/wschurman))
-- Adds paginated support to device commands. Removes the ability to delete multiple devices at once. ([#1381](https://github.com/expo/eas-cli/pull/1381) by [@kgc00](https://github.com/kgc00))
 
 ### 🎉 New features
 
@@ -339,25 +18,14 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add pagination to build commands. ([#1353](https://github.com/expo/eas-cli/pull/1353) by [@kgc00](https://github.com/kgc00))
 - Provide suggestions for developers when archive size is large. ([#1363](https://github.com/expo/eas-cli/pull/1363) by [@szdziedzic](https://github.com/szdziedzic))
 - Improve `eas init` command. ([#1376](https://github.com/expo/eas-cli/pull/1376) by [@wschurman](https://github.com/wschurman))
-- Warn about outdated channel configuration before build when using eas update. ([#1397](https://github.com/expo/eas-cli/pull/1397) by [@kbrandwijk](https://github.com/kbrandwijk))
-- Validate that owner and projectId and slug all are in alignment. ([#1405](https://github.com/expo/eas-cli/pull/1405) by [@wschurman](https://github.com/wschurman))
 
 ### 🐛 Bug fixes
 
-- Fix automatic eas.json generation when running `eas build`. ([#1415](https://github.com/expo/eas-cli/pull/1415) by [@wkozyra95](https://github.com/wkozyra95))
-
 ### 🧹 Chores
 
 - Standardize the GQL 'Update' schema using UpdateFragmentNode. ([#1348](https://github.com/expo/eas-cli/pull/1348) by [@kgc00](https://github.com/kgc00))
-- Remove 'owner' app config field dependency. ([#1368](https://github.com/expo/eas-cli/pull/1368), [#1369](https://github.com/expo/eas-cli/pull/1369), [#1371](https://github.com/expo/eas-cli/pull/1371), [#1372](https://github.com/expo/eas-cli/pull/1372), [#1373](https://github.com/expo/eas-cli/pull/1373) by [@wschurman](https://github.com/wschurman))
+- Remove 'owner' app config field dependency. ([#1368](https://github.com/expo/eas-cli/pull/1368), [#1369](https://github.com/expo/eas-cli/pull/1369), [#1371](https://github.com/expo/eas-cli/pull/1371), [#1372](https://github.com/expo/eas-cli/pull/1372), [#1373](https://github.com/expo/eas-cli/pull/1373), by [@wschurman](https://github.com/wschurman))
 - Add Xcode 14 image. ([#1365](https://github.com/expo/eas-cli/pull/1365) by [@szdziedzic](https://github.com/szdziedzic))
-- Update max `versionCode` for Android. ([#1400](https://github.com/expo/eas-cli/pull/1400) by [@wkozyra95](https://github.com/wkozyra95))
-- Add and use command context to declare command dependencies. ([#1383](https://github.com/expo/eas-cli/pull/1383), [#1384](https://github.com/expo/eas-cli/pull/1384), [#1387](https://github.com/expo/eas-cli/pull/1387), [#1388](https://github.com/expo/eas-cli/pull/1388), [#1390](https://github.com/expo/eas-cli/pull/1390), [#1391](https://github.com/expo/eas-cli/pull/1391), [#1394](https://github.com/expo/eas-cli/pull/1394), [#1402](https://github.com/expo/eas-cli/pull/1402), [#1403](https://github.com/expo/eas-cli/pull/1403) by [@wschurman](https://github.com/wschurman))
-- Fix typo in the ad hoc build message. ([#1407](https://github.com/expo/eas-cli/pull/1407) by [@Simek](https://github.com/Simek))
-- Improve errors and error messages formatting related to **eas.json**. ([#1414](https://github.com/expo/eas-cli/pull/1414) by [@Simek](https://github.com/Simek))
-- Handle errors from platform-specific kill switches to disable free tier builds. ([#1401](https://github.com/expo/eas-cli/pull/1401) by [@szdziedzic](https://github.com/szdziedzic))
-- Surface invalid eas.json errors in an optional project context. ([#1418](https://github.com/expo/eas-cli/pull/1418) by [@quinlanj](https://github.com/quinlanj))
-- Improve message when project ID doesn't match either slug or owner. ([#1420](https://github.com/expo/eas-cli/pull/1420) by [@brentvatne](https://github.com/brentvatne))
 
 ## [2.1.0](https://github.com/expo/eas-cli/releases/tag/v2.1.0) - 2022-09-05
 
@@ -497,7 +165,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
 - Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
-- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
+- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
 
 ## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
 
@@ -528,7 +196,7 @@ 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))
+- 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))
@@ -565,13 +233,13 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 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))
+- `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))
+- 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
 
@@ -581,7 +249,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 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))
+- 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
 
@@ -752,7 +420,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 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))
+- 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
@@ -804,7 +472,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 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. ([#854](https://github.com/expo/eas-cli/pull/854) by [@jonsamp](https://github.com/jonsamp))
+- 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.
@@ -850,7 +518,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes
 
 - Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
-- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales), [@dsokal](https://github.com/dsokal))
+- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
 
 ### 🧹 Chores
 
@@ -886,7 +554,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pull/775) by [@EvanBacon](https://github.com/EvanBacon))
+- Improve unknown capability syncing error message. ([#775](https://github.com/expo/eas-cli/pulls/775) by [@EvanBacon](https://github.com/EvanBacon))
 - Add submit webhooks. ([#777](https://github.com/expo/eas-cli/pull/777) by [@dsokal](https://github.com/dsokal))
 
 ### 🐛 Bug fixes
@@ -984,7 +652,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701), [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
+- Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
 - Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
 - Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
 - Implement no-commit build workflow. Add required `cli` field in root of `eas.json`. ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
@@ -1016,7 +684,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677) by [@jonsamp](https://github.com/jonsamp))
+- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
   - Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
   - To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
     ```json
@@ -1062,7 +730,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
-- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95), [@dsokal](https://github.com/dsokal))
+- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95) + [@dsokal](https://github.com/dsokal))
 
 ### 🎉 New features
 
@@ -1074,7 +742,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes
 
 - Fix `--json` flag when running EAS CLI on GitHub actions. ([#669](https://github.com/expo/eas-cli/pull/669) by [@dsokal](https://github.com/dsokal))
-- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project. ([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
+- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project.([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
 - Fix building monorepo projects on Windows. ([#671](https://github.com/expo/eas-cli/pull/671) by [@dsokal](https://github.com/dsokal))
 
 ## [0.30.0](https://github.com/expo/eas-cli/releases/tag/v0.30.0) - 2021-10-05
@@ -1208,7 +876,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- Fix wrong warning for `metro.config.js` check on Windows. ([#588](https://github.com/expo/eas-cli/pull/588) by [@louisgv](https://github.com/louisgv))
+- Fix wrong warning for `metro.config.js` check on Windows. ([#587](https://github.com/expo/eas-cli/pull/588) by [@louisgv](https://github.com/louisgv))
 - Fix detecting `googleServicesFile` with `EAS_NO_VCS=1`. ([#583](https://github.com/expo/eas-cli/pull/583) by [@wkozyra95](https://github.com/wkozyra95))
 
 ### 🧹 Chores
@@ -1288,7 +956,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Include the file extension for update's assets in the manifest fragment. ([#535](https://github.com/expo/eas-cli/pull/535) by [@jkhales](https://github.com/jkhales))
+- Include the file extension for update's assets in the manifest fragment. ([#532](https://github.com/expo/eas-cli/pull/535) by [@jkhales](https://github.com/jkhales))
 - Use env variables from `eas.json` when evaluating `app.config.js`. ([#532](https://github.com/expo/eas-cli/pull/532) by [@dsokal](https://github.com/dsokal))
 
 ### 🐛 Bug fixes
@@ -1308,7 +976,7 @@ This is the log of notable changes to EAS CLI and related packages.
 - Add `secret:create --force` command to overwrite existing secrets. ([#513](https://github.com/expo/eas-cli/pull/513) by [@bycedric](https://github.com/bycedric))
 - Fall back to APK when building for internal distribution. ([#527](https://github.com/expo/eas-cli/pull/527) by [@dsokal](https://github.com/dsokal))
 - Add `iosEnterpriseProvisioning` to build metadata. ([#522](https://github.com/expo/eas-cli/pull/522) by [@dsokal](https://github.com/dsokal))
-- Autodetect Google Services JSON key path in `eas submit -p android`. ([#520](https://github.com/expo/eas-cli/pull/520) by [@barthap](https://github.com/barthap))
+- Autodetect Google Services JSON key path in `eas submit -p android`. ([#520](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
 
 ### 🐛 Bug fixes
 
@@ -1322,7 +990,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Add `project:*` commands. ([#500](https://github.com/expo/eas-cli/pull/500) by [@jkhales](https://github.com/jkhales))
 - Added support for iOS 15 capabilities: Communication Notifications, Time Sensitive Notifications, Group Activities, and Family Controls. ([#499](https://github.com/expo/eas-cli/pull/499) by [@EvanBacon](https://github.com/EvanBacon))
-- Show more build metadata in `build:view` and `build:list`. ([#504](https://github.com/expo/eas-cli/pull/504), [#508](https://github.com/expo/eas-cli/pull/508) by [@dsokal](https://github.com/dsokal))
+- Show more build metadata in `build:view` and `build:list`. ([#504](https://github.com/expo/eas-cli/pull/504) and [#508](https://github.com/expo/eas-cli/pull/508) by [@dsokal](https://github.com/dsokal))
 - Add runtime version to build metadata. ([#493](https://github.com/expo/eas-cli/pull/493) by [@dsokal](https://github.com/dsokal))
 
 ## [0.20.0](https://github.com/expo/eas-cli/releases/tag/v0.20.0) - 2021-07-09
@@ -1402,15 +1070,15 @@ This is the log of notable changes to EAS CLI and related packages.
 - New version of Android credentials manager. ([#460](https://github.com/expo/eas-cli/pull/460) by [@quinlanj](https://github.com/quinlanj))
 - Add an internal distribution with dev client to `build:configure` defaults. ([#465](https://github.com/expo/eas-cli/pull/465) by [@fson](https://github.com/fson))
 - Add `updates.channel` to build metadata. ([#461](https://github.com/expo/eas-cli/pull/461) by [@jkhales](https://github.com/jkhales))
-- iOS push key setup and management now available in `eas-cli credentials`. ([#469](https://github.com/expo/eas-cli/pull/469), [#470](https://github.com/expo/eas-cli/pull/470) by [@quinlanj](https://github.com/quinlanj))
+- iOS push key setup and management now available in `eas-cli credentials`. ([#469](https://github.com/expo/eas-cli/pull/469) [#470](https://github.com/expo/eas-cli/pull/470) by [@quinlanj](https://github.com/quinlanj))
 - Support new build status: `new`. ([#475](https://github.com/expo/eas-cli/pull/475) by [@dsokal](https://github.com/dsokal))
 
 ### 🧹 Chores
 
 - Deprecate `--skip-credentials-check` flag because it doesn't do anything and is no longer needed. ([#442](https://github.com/expo/eas-cli/pull/442) by [@brentvatne](https://github.com/brentvatne))
-- Move android credentials code to new Graphql API. ([#439](https://github.com/expo/eas-cli/pull/439), [#440](https://github.com/expo/eas-cli/pull/440), [#438](https://github.com/expo/eas-cli/pull/438), [#443](https://github.com/expo/eas-cli/pull/443), [#447](https://github.com/expo/eas-cli/pull/447), [#451](https://github.com/expo/eas-cli/pull/451), [#455](https://github.com/expo/eas-cli/pull/455) by [@quinlanj](https://github.com/quinlanj))
+- Move android credentials code to new Graphql API. ([#439](https://github.com/expo/eas-cli/pull/439) [#440](https://github.com/expo/eas-cli/pull/440) [#438](https://github.com/expo/eas-cli/pull/438) [#443](https://github.com/expo/eas-cli/pull/443) [#447](https://github.com/expo/eas-cli/pull/447) [#451](https://github.com/expo/eas-cli/pull/451) [#455](https://github.com/expo/eas-cli/pull/455) by [@quinlanj](https://github.com/quinlanj))
 - Prepare Graphql infra to support iOS push keys. ([#456](https://github.com/expo/eas-cli/pull/456) by [@quinlanj](https://github.com/quinlanj))
-- Improve credentials DX ([#448](https://github.com/expo/eas-cli/pull/448), [#449](https://github.com/expo/eas-cli/pull/449) by [@quinlanj](https://github.com/quinlanj))
+- Improve credentials DX ([#448](https://github.com/expo/eas-cli/pull/448) [#449](https://github.com/expo/eas-cli/pull/449) by [@quinlanj](https://github.com/quinlanj))
 - Add analytics on dev client builds. ([#454](https://github.com/expo/eas-cli/pull/454) by [@fson](https://github.com/fson))
 - Support non-git projects. ([#462](https://github.com/expo/eas-cli/pull/462) by [@wkozyra95](https://github.com/wkozyra95))
 
@@ -1424,7 +1092,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
-- Android credentials setup now on Graphql API. ([#427](https://github.com/expo/eas-cli/pull/427) by [@quinlanj](https://github.com/quinlanj))
+- Android credentials setup now on Graphql API. ([#434](https://github.com/expo/eas-cli/pull/427) by [@quinlanj](https://github.com/quinlanj))
 
 ## [0.16.0](https://github.com/expo/eas-cli/releases/tag/v0.16.0) - 2021-05-26
 
@@ -1456,7 +1124,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🎉 New features
 
 - Auto sync associated domains capability before building. ([#384](https://github.com/expo/eas-cli/pull/384) by [@EvanBacon](https://github.com/EvanBacon))
-- Add eas init command. ([#402](https://github.com/expo/eas-cli/pull/402) by [@jkhales](https://github.com/jkhales))
+- Add eas init command. [#402](https://github.com/expo/eas-cli/pull/402) by [@jkhales](https://github.com/jkhales))
 - Allow for arbitrary string values in `schemeBuildConfiguration`. ([#394](https://github.com/expo/eas-cli/pull/394) by [@randomhajile](https://github.com/randomhajile))
 - Allow for installing custom `expo-cli` version on EAS Build. ([#409](https://github.com/expo/eas-cli/pull/409) by [@randomhajile](https://github.com/randomhajile))
 - Support PKCS kesytores for Android. ([#398](https://github.com/expo/eas-cli/pull/398) by [@wkozyra95](https://github.com/wkozyra95))
@@ -1467,7 +1135,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Fix failure when publishing without the platform flag. ([#415](https://github.com/expo/eas-cli/pull/415) by [@jkhales](https://github.com/jkhales))
 - Pin versions in package.json. ([#399](https://github.com/expo/eas-cli/pull/399) by [@dsokal](https://github.com/dsokal))
-  - Revert [0ac2f](https://github.com/expo/eas-cli/commit/0ac2fb77a118df609381c4e350aa68609340c3cd) as the root cause of the issue has been fixed in [#399](https://github.com/expo/eas-cli/pull/399).
+- Revert [0ac2f](https://github.com/expo/eas-cli/commit/0ac2fb77a118df609381c4e350aa68609340c3cd) as the root cause of the issue has been fixed in [#399](https://github.com/expo/eas-cli/pull/399).
 - Include development-client in valid buildType for internal distribution. ([#410](https://github.com/expo/eas-cli/pull/410) by [@brentvatne](https://github.com/brentvatne))
 
 ## [0.14.1](https://github.com/expo/eas-cli/releases/tag/v0.14.1) - 2021-05-11
@@ -1494,7 +1162,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - Cleanup unused code. ([#364](https://github.com/expo/eas-cli/pull/364), [#365](https://github.com/expo/eas-cli/pull/365) by [@quinlanj](https://github.com/quinlanj))
 - Redesign UX in beta credentials manager. ([#360](https://github.com/expo/eas-cli/pull/360) by [@quinlanj](https://github.com/quinlanj))
-- Port more options to the beta credentials manager. ([#352](https://github.com/expo/eas-cli/pull/352), [#357](https://github.com/expo/eas-cli/pull/357), [#361](https://github.com/expo/eas-cli/pull/361) by [@quinlanj](https://github.com/quinlanj))
+- Port more options to the beta credentials manager. ([#352](https://github.com/expo/eas-cli/pull/352), [357](https://github.com/expo/eas-cli/pull/357), [361](https://github.com/expo/eas-cli/pull/361) by [@quinlanj](https://github.com/quinlanj))
 - Add getBuildProfileNamesAsync helper to EasJsonReader. ([#351](https://github.com/expo/eas-cli/pull/351) by [@quinlanj](https://github.com/quinlanj))
 - Increase build timeout to 1 hour. ([#370](https://github.com/expo/eas-cli/pull/370) by [@wkozyra95](https://github.com/wkozyra95))
 - Remove check for pending builds. ([#373](https://github.com/expo/eas-cli/pull/373) by [@wkozyra95](https://github.com/wkozyra95))
@@ -1555,7 +1223,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Use special Expo SDK runtime version for managed projects ([#336](https://github.com/expo/eas-cli/pull/336) by [@wschurman](https://github.com/wschurman))
+- Use special Expo SDK runtime version for managed projects ([#336](https://github.com/expo/eas-cli/pull/336)) by [@wschurman](https://github.com/wschurman))
 
 ### 🐛 Bug fixes
 
@@ -1580,7 +1248,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🎉 New features
 
 - Retry graphQL call on network or transient server errors. ([#320](https://github.com/expo/eas-cli/pull/320) by [@jkhales](https://github.com/jkhales))
-- Display more friendly error messages when `eas submit` fails. ([#311](https://github.com/expo/eas-cli/pull/311) by [@barthap](https://github.com/barthap))
+- Display more friendly error messages when `eas submit` fails. ([#311](https://github.com/expo/eas-cli/pull/297) by [@barthap](https://github.com/barthap))
 - Add support for managing webhooks (new commands: `webhook:create`, `webhook:view`, `webhook:list`, `webhook:update`, and `webhook:delete`). ([#314](https://github.com/expo/eas-cli/pull/314) by [@dsokal](https://github.com/dsokal))
 - Support for local builds [experimental]. ([#305](https://github.com/expo/eas-cli/pull/305) by [@wkozyra95](https://github.com/wkozyra95))
 
@@ -1664,7 +1332,7 @@ This is the log of notable changes to EAS CLI and related packages.
 ### 🐛 Bug fixes
 
 - Make sure all files are committed before build. ([#251](https://github.com/expo/eas-cli/pull/251) by [@wkozyra95](https://github.com/wkozyra95))
-- Fix `eas submit` support for tar.gz files. ([#257](https://github.com/expo/eas-cli/pull/257) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `eas submit` support for tar.gz files. ([#257](https://github.com/expo/eas-cli/pull/257)) by [@wkozyra95](https://github.com/wkozyra95))
 - Show untracked files when checking `git status`. ([#259](https://github.com/expo/eas-cli/pull/259) by [@wkozyra95](https://github.com/wkozyra95))
 
 ### 🧹 Chores
@@ -1691,7 +1359,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- Fix `"buildType" is not allowed` error. ([595bf](https://github.com/expo/eas-cli/commit/595bfecf1cbff0f76e7fd2049fe16f6f38bbe150) by [@wkozyra95](https://github.com/wkozyra95))
+- Fix `"buildType" is not allowed` error. ([#595bf](https://github.com/expo/eas-cli/commit/595bfecf1cbff0f76e7fd2049fe16f6f38bbe150) by [@wkozyra95](https://github.com/wkozyra95))
 
 ## [0.4.0](https://github.com/expo/eas-cli/releases/tag/v0.4.0) - 2021-02-16
 

CODEOWNERS

@@ -6,8 +6,8 @@ packages/eas-cli/src/commands/build @dsokal @wkozyra95
 packages/eas-cli/src/submit @dsokal
 packages/eas-cli/src/commands/submit.ts @dsokal
 
-packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
-packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
+packages/eas-cli/src/update @kgc00 @wschurman
+packages/eas-cli/src/commands/update @kgc00 @wschurman
 
 packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric

CONTRIBUTING.md

@@ -1,48 +1,4 @@
-# Development
+## Releasing a new version
 
-Set up an alias for the EAS CLI so you can try it in projects all around your computer. The project is compiled on the fly so you don't need to run a build (watch) command.
-
-> The only exception is when you just cloned the repository or there have been changes in `packages/eas-json`. In that case, you'll have to run `yarn build` in the root.
-
-Open your `.zshrc` or other config file and add:
-
-```
-alias easd="/PATH/TO/eas-cli/bin/run"
-```
-
-Then use it with `easd` like `easd build`.
-
-If you're making changes to `packages/eas-json` or prefer/need to work with production code, start the build command in watch mode with:
-
-```
-yarn start
-```
-
-## Format
-
-- Be sure to update the [`CHANGELOG.md`](./CHANGELOG.md) with changes for every PR. There is a changelog bot that can generate the proper entry for you. The instructions on how to use it are in the PR description placeholder.
-- End `async` functions with `Async` like `runAsync`. This is just how we format functions at Expo.
-- Utilize the unified `Log` module instead of `console.log`.
-
-## Using local and staging API
-
-For development against local API:
-
-- Set up the API server as described at https://github.com/expo/universe/tree/main/server/www.
-- Set the `EXPO_LOCAL=1` env variable either on every command run (e.g. `EXPO_LOCAL=1 easd ...`) or more permamently with `export EXPO_LOCAL=1` (works in a current shell session).
-
-For development against staging API:
-
-- Set the `EXPO_STAGING=1` env variable either on every command run (e.g. `EXPO_STAGING=1 easd ...`) or more permamently with `export EXPO_STAGING=1` (works in a current shell session).
-
-## Working on local builds (`eas build --local`)
-
-See https://github.com/expo/eas-build/blob/main/DEVELOPMENT.md for how to set up your environment when making changes to [`eas-cli-local-build-plugin`](https://github.com/expo/eas-build/tree/main/packages/local-build-plugin) and/or [`build-tools`](https://github.com/expo/eas-build/tree/main/packages/build-tools).
-
-## Testing
-
-Run `yarn test` either in the repository root or in a package directory that you're working on.
-
-## Releasing
-
-See [RELEASING.md](./RELEASING.md).
+1. Run `yarn release` in the repository root folder.
+2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.

RELEASING.md

@@ -1,18 +0,0 @@
-# Releasing EAS CLI
-
-1. Run `yarn release` in the repository root folder. The next version is chosen automatically based on the changelog entries. If you want to use different version, pass the version string as a positional argument to the command, e.g. `yarn release 1.2.3`.
-2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
-
-## Choosing the next version
-
-As stated above, the next EAS CLI version is chosen automatically based on the existing changelog entries under the unreleased section in **CHANGELOG.md**.
-
-The algorithm works as follows:
-
-- If there are any entries in the "🛠 Breaking changes" section, bump the MAJOR version.
-- Otherwise, if there are any entries in the "🎉 New features", bump the MINOR version.
-- Otherwise, bump the PATCH version.
-
-## Updating EAS CLI version on EAS Build
-
-The release process promotes the new version to staging. After verifying it works there, you can promote it to production with `npm dist-tag add eas-cli@{version} latest-eas-build`.

lerna.json

@@ -1,6 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "3.7.1",
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+  "version": "2.1.0"
 }

package.json

@@ -1,5 +1,4 @@
 {
-  "name": "eas-cli-root",
   "private": true,
   "workspaces": [
     "packages/*"
@@ -9,29 +8,28 @@
     "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 --stream --parallel",
+    "start": "lerna run watch --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint .",
-    "lint-changelog": "./scripts/bin/run lint-changelog",
-    "release": "lerna run rebuild && ./scripts/bin/run release",
+    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
     "test": "jest",
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@types/jest": "29.2.5",
-    "@types/node": "18.11.18",
-    "eslint": "8.31.0",
-    "eslint-config-universe": "11.1.1",
-    "eslint-plugin-async-protect": "3.0.0",
+    "@types/jest": "28.1.6",
+    "@types/node": "18.6.5",
+    "eslint": "8.21.0",
+    "eslint-config-universe": "11.1.0",
+    "eslint-plugin-async-protect": "2.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "29.3.1",
-    "jest-watch-typeahead": "2.2.1",
-    "lerna": "6.4.1",
-    "oclif": "3.4.3",
-    "prettier": "2.8.2",
-    "ts-jest": "29.0.3",
-    "typescript": "4.9.4"
+    "jest": "28.1.3",
+    "jest-watch-typeahead": "2.0.0",
+    "lerna": "4.0.0",
+    "oclif": "3.1.2",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.7",
+    "typescript": "4.7.4"
   },
   "volta": {
     "node": "18.6.0",

packages/eas-cli/graphql-codegen.yml

@@ -5,8 +5,6 @@ documents:
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/android/api/graphql/**/!(*.d).{ts,tsx}'
   - 'src/commands/**/*.ts'
-  - 'src/branch/**/*.ts'
-  - 'src/channel/**/*.ts'
 generates:
   src/graphql/generated.ts:
     plugins:

packages/eas-cli/package.json

@@ -1,120 +1,113 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "3.7.1",
+  "version": "2.1.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.0.0",
-    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "7.0.3",
-    "@expo/config-plugins": "5.0.4",
-    "@expo/config-types": "47.0.0",
-    "@expo/eas-build-job": "0.2.106",
-    "@expo/eas-json": "3.7.0",
-    "@expo/json-file": "8.2.37",
+    "@expo/apple-utils": "0.0.0-alpha.34",
+    "@expo/code-signing-certificates": "0.0.2",
+    "@expo/config": "7.0.1",
+    "@expo/config-plugins": "5.0.1",
+    "@expo/config-types": "46.0.2",
+    "@expo/eas-build-job": "0.2.94",
+    "@expo/eas-json": "2.1.0",
+    "@expo/json-file": "8.2.36",
     "@expo/multipart-body-parser": "1.1.0",
-    "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "0.0.57",
+    "@expo/package-manager": "0.0.56",
     "@expo/pkcs12": "0.0.8",
-    "@expo/plist": "0.0.20",
-    "@expo/plugin-help": "5.1.22",
-    "@expo/plugin-warn-if-update-available": "2.5.0",
-    "@expo/prebuild-config": "5.0.7",
+    "@expo/plist": "0.0.18",
+    "@expo/plugin-autocomplete": "1.4.0",
+    "@expo/plugin-help": "5.3.0",
+    "@expo/plugin-warn-if-update-available": "2.3.0",
+    "@expo/prebuild-config": "5.0.3",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.23.2",
-    "@oclif/plugin-autocomplete": "1.3.10",
-    "@segment/ajv-human-errors": "^2.1.2",
-    "@urql/core": "3.1.1",
-    "@urql/exchange-retry": "1.0.0",
-    "ajv": "8.11.0",
-    "ajv-formats": "2.1.1",
+    "@oclif/core": "1.13.10",
+    "@urql/core": "2.6.1",
+    "@urql/exchange-retry": "0.3.3",
+    "ajv": "^6.12.6",
     "better-opn": "3.0.2",
     "chalk": "4.1.2",
     "cli-progress": "3.11.2",
+    "cli-table3": "0.6.2",
     "dateformat": "4.6.3",
-    "dotenv": "16.0.3",
     "env-paths": "2.2.0",
     "envinfo": "7.8.1",
     "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.2.12",
+    "fast-glob": "3.2.11",
     "figures": "3.2.0",
     "form-data": "4.0.0",
     "fs-extra": "10.1.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
-    "graphql": "16.6.0",
+    "graphql": "16.5.0",
     "graphql-tag": "2.12.6",
     "https-proxy-agent": "5.0.1",
-    "ignore": "5.2.4",
+    "ignore": "5.2.0",
     "indent-string": "4.0.0",
-    "jks-js": "1.1.0",
-    "joi": "17.7.0",
+    "jks-js": "1.0.2",
+    "joi": "17.6.0",
     "keychain": "1.3.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
-    "minimatch": "5.1.2",
+    "minimatch": "5.1.0",
     "nanoid": "3.3.4",
     "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "pngjs": "6.0.0",
     "promise-limit": "2.7.0",
     "promise-retry": "2.0.1",
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.3.8",
+    "semver": "7.3.7",
     "slash": "3.0.0",
-    "tar": "6.1.13",
+    "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "tslib": "2.4.1",
+    "tslib": "2.4.0",
     "turndown": "7.1.1",
     "untildify": "4.0.0",
-    "uuid": "9.0.0",
+    "uuid": "8.3.2",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "2.16.3",
-    "@graphql-codegen/introspection": "2.2.3",
-    "@graphql-codegen/typescript": "2.8.7",
-    "@graphql-codegen/typescript-operations": "2.5.12",
+    "@graphql-codegen/cli": "2.11.5",
+    "@graphql-codegen/introspection": "2.2.1",
+    "@graphql-codegen/typescript": "2.7.3",
+    "@graphql-codegen/typescript-operations": "2.5.3",
     "@types/cli-progress": "3.11.0",
     "@types/dateformat": "3.0.1",
     "@types/envinfo": "7.8.1",
-    "@types/express": "4.17.15",
     "@types/fs-extra": "9.0.13",
     "@types/getenv": "^1.0.0",
-    "@types/mime": "3.0.1",
+    "@types/mime": "2.0.3",
     "@types/node-fetch": "2.6.2",
-    "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.1",
+    "@types/node-forge": "1.0.4",
     "@types/promise-retry": "1.1.3",
-    "@types/prompts": "2.4.2",
-    "@types/semver": "7.3.13",
-    "@types/tar": "6.1.3",
+    "@types/prompts": "2.0.14",
+    "@types/semver": "7.3.10",
+    "@types/tar": "6.1.2",
     "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.0",
+    "@types/uuid": "8.3.4",
     "@types/wrap-ansi": "3.0.0",
     "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
-    "express": "4.18.2",
-    "memfs": "3.4.13",
+    "memfs": "3.4.7",
     "mockdate": "3.0.5",
     "nock": "13.2.9",
     "rimraf": "3.0.2",
-    "ts-deepmerge": "4.0.0",
+    "ts-deepmerge": "2.0.5",
     "ts-mockito": "2.6.1",
     "ts-node": "10.9.1",
-    "typescript": "4.9.4"
+    "typescript": "4.7.4"
   },
   "engines": {
     "node": ">=14.0.0"
@@ -136,7 +129,7 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@oclif/plugin-autocomplete",
+      "@expo/plugin-autocomplete",
       "@expo/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
@@ -202,8 +195,7 @@
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rimraf oclif.manifest.json",
-    "prepack": "yarn rebuild && node ./scripts/prepack.js",
-    "rebuild": "rimraf build && yarn build",
+    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
     "pretarball-ci": "./scripts/pretarball-ci.sh",
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",

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

@@ -437,8 +437,8 @@
                 "$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-mdn.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-mdn.apple.com/news/?id=091202019a)"
+            "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",
@@ -778,7 +778,7 @@
   },
   "properties": {
     "configVersion": {
-      "enum": [0],
+      "const": 0,
       "description": "The EAS metadata store configuration version"
     },
     "apple": {

packages/eas-cli/src/ApiV2Error.ts

@@ -1,23 +0,0 @@
-import { JSONValue } from '@expo/json-file';
-
-export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
-  readonly expoApiV2ErrorCode: string;
-  readonly expoApiV2ErrorDetails?: JSONValue;
-  readonly expoApiV2ErrorServerStack?: string;
-  readonly expoApiV2ErrorMetadata?: object;
-
-  constructor(response: {
-    message: string;
-    code: string;
-    stack?: string;
-    details?: JSONValue;
-    metadata?: object;
-  }) {
-    super(response.message);
-    this.expoApiV2ErrorCode = response.code;
-    this.expoApiV2ErrorDetails = response.details;
-    this.expoApiV2ErrorServerStack = response.stack;
-    this.expoApiV2ErrorMetadata = response.metadata;
-  }
-}

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

@@ -1,10 +1,9 @@
 import assert from 'assert';
 import nock from 'nock';
 
-import { ApiV2Error } from '../ApiV2Error';
-import { ApiV2Client, getExpoApiBaseUrl } from '../api';
+import { ApiV2Error, api, getExpoApiBaseUrl } from '../api';
 
-describe(ApiV2Client, () => {
+describe('apiClient', () => {
   it('converts Expo APIv2 error to ApiV2Error', async () => {
     nock(getExpoApiBaseUrl())
       .post('/v2/test')
@@ -22,9 +21,7 @@ describe(ApiV2Client, () => {
 
     let error: Error | null = null;
     try {
-      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
-        body: {},
-      });
+      await api.postAsync('test', { body: {} });
     } catch (e: any) {
       error = e;
     }
@@ -44,9 +41,7 @@ describe(ApiV2Client, () => {
 
     let error: Error | null = null;
     try {
-      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
-        body: {},
-      });
+      await api.postAsync('test', { body: {} });
     } catch (e: any) {
       error = e;
     }

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

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

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

@@ -1,234 +0,0 @@
-import RudderAnalytics from '@expo/rudder-sdk-node';
-import os from 'os';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import { Actor, getActorDisplayName } from '../user/User';
-import UserSettings from '../user/UserSettings';
-import { easCliVersion } from '../utils/easCli';
-
-const PLATFORM_TO_ANALYTICS_PLATFORM: Partial<Record<NodeJS.Platform, string>> = {
-  darwin: 'Mac',
-  win32: 'Windows',
-  linux: 'Linux',
-};
-
-export type AnalyticsEvent = CommandEvent | BuildEvent | SubmissionEvent | MetadataEvent;
-
-export enum CommandEvent {
-  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
-}
-
-export enum SubmissionEvent {
-  SUBMIT_COMMAND = 'submit cli submit command',
-  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
-  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
-  SUBMIT_COMMAND_FAIL = 'submit cli fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
-  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
-  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
-  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
-  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
-  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
-  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
-  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
-  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
-  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
-}
-
-export enum BuildEvent {
-  BUILD_COMMAND = 'build cli build command',
-  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
-  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
-  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
-  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
-  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
-  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
-  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
-  BUILD_REQUEST_SUCCESS = 'build cli build request success',
-  BUILD_REQUEST_FAIL = 'build cli build request fail',
-
-  BUILD_STATUS_COMMAND = 'build cli build status',
-
-  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = 'build cli credentials sync update local attempt',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = 'build cli credentials sync update remote attempt',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
-
-  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
-}
-
-export enum MetadataEvent {
-  APPLE_METADATA_DOWNLOAD = 'metadata cli download apple response',
-  APPLE_METADATA_UPLOAD = 'metadata cli upload apple response',
-}
-
-export type AnalyticsEventProperties = Record<string, string | number | boolean>;
-
-/**
- * The interface for commands to use to log events to analytics.
- */
-export interface Analytics {
-  logEvent(name: AnalyticsEvent, properties: AnalyticsEventProperties): void;
-}
-
-/**
- * The interface for commands to use to orchestrate the analytics system. Should only be necessary to use
- * this within EASCommand.
- */
-export interface AnalyticsWithOrchestration extends Analytics {
-  setActor(actor: Actor): void;
-  flushAsync(): Promise<void>;
-}
-
-const USER_SETTINGS_KEY_AMPLITUDE_ENABLED = 'amplitudeEnabled';
-const USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID = 'amplitudeDeviceId';
-const USER_SETTINGS_KEY_ANALYTICS_ENABLED = 'analyticsEnabled';
-const USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID = 'analyticsDeviceId';
-
-/**
- * Sets the user's analytics enabled preference. Note that this will only take effect
- * upon the next run of the CLI.
- */
-export async function setAnalyticsEnabledAsync(enabled: boolean): Promise<void> {
-  await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, enabled);
-}
-
-/**
- * Returns the user's analytics enabled preference.
- */
-export async function getAnalyticsEnabledAsync(): Promise<boolean> {
-  const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, null);
-  return !!analyticsEnabled;
-}
-
-/**
- * Create an instance of Analytics based on the user's analytics enabled preferences.
- */
-export async function createAnalyticsAsync(): Promise<AnalyticsWithOrchestration> {
-  // TODO: remove after some time
-  const amplitudeEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_AMPLITUDE_ENABLED, null);
-  if (amplitudeEnabled !== null) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, amplitudeEnabled);
-    await UserSettings.deleteKeyAsync(USER_SETTINGS_KEY_AMPLITUDE_ENABLED);
-  }
-  const amplitudeDeviceId = await UserSettings.getAsync(
-    USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID,
-    null
-  );
-  if (amplitudeDeviceId !== null) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID, amplitudeDeviceId);
-    await UserSettings.deleteKeyAsync(USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID);
-  }
-
-  if (process.env.DISABLE_EAS_ANALYTICS) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, false);
-  }
-
-  const analyticsEnabled =
-    !process.env.https_proxy && // disable analytics if running behind proxy
-    (await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true));
-  if (!analyticsEnabled) {
-    return new NoOpAnalytics();
-  }
-
-  const persistedDeviceId = await UserSettings.getAsync(
-    USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID,
-    null
-  );
-  const deviceId = persistedDeviceId ?? uuidv4();
-  if (!persistedDeviceId) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID, deviceId);
-  }
-  return new RudderstackAnalytics(deviceId);
-}
-
-class NoOpAnalytics implements AnalyticsWithOrchestration {
-  logEvent(): void {}
-  setActor(): void {}
-  async flushAsync(): Promise<void> {}
-}
-
-const RudderstackAnalyticsConfig =
-  process.env.EXPO_STAGING || process.env.EXPO_LOCAL
-    ? {
-        // staging environment
-        rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
-        rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-      }
-    : {
-        // prod environment
-        rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
-        rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-      };
-
-class RudderstackAnalytics implements AnalyticsWithOrchestration {
-  private readonly rudderstackClient = new RudderAnalytics(
-    RudderstackAnalyticsConfig.rudderstackWriteKey,
-    new URL('/v1/batch', RudderstackAnalyticsConfig.rudderstackDataPlaneURL).toString(),
-    {
-      flushInterval: 300,
-    }
-  );
-
-  private identifiedActor: Actor | null = null;
-
-  constructor(private readonly persistentDeviceId: string) {
-    // identify once with just anonymous ID. Once the actor is fetched, re-indentify with
-    // both so that they can be associated
-    this.rudderstackClient.identify({
-      anonymousId: persistentDeviceId,
-    });
-  }
-
-  public setActor(actor: Actor): void {
-    if (this.identifiedActor) {
-      return;
-    }
-
-    this.rudderstackClient.identify({
-      userId: actor.id,
-      anonymousId: this.persistentDeviceId,
-      traits: {
-        username: getActorDisplayName(actor),
-        user_id: actor.id,
-        user_type: actor.__typename,
-      },
-    });
-    this.identifiedActor = actor;
-  }
-
-  public logEvent(name: AnalyticsEvent, properties: AnalyticsEventProperties): void {
-    const userId = this.identifiedActor?.id;
-    const deviceId = this.persistentDeviceId;
-    const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
-    const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
-    this.rudderstackClient.track({
-      event: name,
-      properties: { ...properties, ...commonEventProperties },
-      ...identity,
-      context: this.getRudderStackContext(),
-    });
-  }
-
-  public async flushAsync(): Promise<void> {
-    await this.rudderstackClient.flush();
-  }
-
-  private getRudderStackContext(): Record<string, any> {
-    const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
-    return {
-      os: { name: platform, version: os.release() },
-      device: { type: platform, model: platform },
-      app: { name: 'eas cli', version: easCliVersion ?? undefined },
-    };
-  }
-}

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

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

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

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

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

@@ -0,0 +1,129 @@
+import RudderAnalytics from '@expo/rudder-sdk-node';
+import os from 'os';
+import { URL } from 'url';
+import { v4 as uuidv4 } from 'uuid';
+
+import UserSettings from '../user/UserSettings';
+import { easCliVersion } from '../utils/easCli';
+
+const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
+  darwin: 'Mac',
+  win32: 'Windows',
+  linux: 'Linux',
+};
+
+let rudderstackClient: RudderAnalytics | null = null;
+let userIdentified = false;
+let identifyData: {
+  userId: string;
+  deviceId: string;
+  traits: Record<string, any>;
+} | null = null;
+
+export async function initAsync(): Promise<void> {
+  // TODO: remove after some time
+  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
+  if (amplitudeEnabled !== null) {
+    await UserSettings.setAsync('analyticsEnabled', amplitudeEnabled);
+    await UserSettings.deleteKeyAsync('amplitudeEnabled');
+  }
+  const amplitudeDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+  if (amplitudeDeviceId !== null) {
+    await UserSettings.setAsync('analyticsDeviceId', amplitudeDeviceId);
+    await UserSettings.deleteKeyAsync('amplitudeDeviceId');
+  }
+  // TODO: cut here
+  if (process.env.DISABLE_EAS_ANALYTICS) {
+    await UserSettings.setAsync('analyticsEnabled', false);
+  }
+
+  const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', true);
+  if (analyticsEnabled) {
+    const config =
+      process.env.EXPO_STAGING || process.env.EXPO_LOCAL
+        ? {
+            // staging environment
+            rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          }
+        : {
+            // prod environment
+            rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          };
+
+    rudderstackClient = new RudderAnalytics(
+      config.rudderstackWriteKey,
+      new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
+      {
+        flushInterval: 300,
+      }
+    );
+  }
+}
+
+export async function setUserDataAsync(userId: string, traits: Record<string, any>): Promise<void> {
+  const savedDeviceId = await UserSettings.getAsync('analyticsDeviceId', null);
+  const deviceId = savedDeviceId ?? uuidv4();
+  if (!savedDeviceId) {
+    await UserSettings.setAsync('analyticsDeviceId', deviceId);
+  }
+
+  identifyData = {
+    userId,
+    deviceId,
+    traits,
+  };
+
+  ensureUserIdentified();
+}
+
+export async function flushAsync(): Promise<void> {
+  if (rudderstackClient) {
+    await rudderstackClient.flush();
+  }
+}
+
+export function logEvent(name: string, properties: Record<string, any> = {}): void {
+  if (!rudderstackClient) {
+    return;
+  }
+  ensureUserIdentified();
+
+  const { userId, deviceId } = identifyData ?? {};
+  const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
+
+  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+  rudderstackClient.track({
+    event: name,
+    properties: { ...properties, ...commonEventProperties },
+    ...identity,
+    context: getRudderStackContext(),
+  });
+}
+
+function ensureUserIdentified(): void {
+  if (!rudderstackClient || userIdentified || !identifyData) {
+    return;
+  }
+
+  rudderstackClient.identify({
+    userId: identifyData.userId,
+    anonymousId: identifyData.deviceId,
+    traits: identifyData.traits,
+  });
+  userIdentified = true;
+}
+
+function getRudderStackContext(): Record<string, any> {
+  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
+  return {
+    os: { name: platform, version: os.release() },
+    device: { type: platform, model: platform },
+    app: { name: 'eas cli', version: easCliVersion ?? undefined },
+  };
+}
+
+export enum AnalyticsEvent {
+  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
+}

packages/eas-cli/src/api.ts

@@ -1,78 +1,93 @@
 import { JSONValue } from '@expo/json-file';
 
-import { ApiV2Error } from './ApiV2Error';
 import fetch, { RequestError, RequestInit } from './fetch';
+import { getAccessToken, getSessionSecret } from './user/sessionStorage';
+
+export class ApiV2Error extends Error {
+  override readonly name = 'ApiV2Error';
+  readonly expoApiV2ErrorCode: string;
+  readonly expoApiV2ErrorDetails?: JSONValue;
+  readonly expoApiV2ErrorServerStack?: string;
+  readonly expoApiV2ErrorMetadata?: object;
+
+  constructor(response: {
+    message: string;
+    code: string;
+    stack?: string;
+    details?: JSONValue;
+    metadata?: object;
+  }) {
+    super(response.message);
+    this.expoApiV2ErrorCode = response.code;
+    this.expoApiV2ErrorDetails = response.details;
+    this.expoApiV2ErrorServerStack = response.stack;
+    this.expoApiV2ErrorMetadata = response.metadata;
+  }
+}
 
 interface RequestOptions {
   body: JSONValue;
 }
 
-export class ApiV2Client {
-  constructor(
-    private readonly authInfo: {
-      accessToken: string | null;
-      sessionSecret: string | null;
-    }
-  ) {}
+export const api = {
+  async putAsync(path: string, options: RequestOptions): Promise<any> {
+    return await requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
+  },
 
-  public async putAsync(path: string, options: RequestOptions): Promise<any> {
-    return await this.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);
   }
+}
 
-  public async postAsync(path: string, options: RequestOptions): Promise<any> {
-    return await this.requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
-  }
-
-  public async deleteAsync(path: string): Promise<any> {
-    return await this.requestAsync(path, { method: 'DELETE' });
-  }
-
-  public async getAsync(path: string): Promise<any> {
-    return await this.requestAsync(path, { method: 'GET' });
-  }
-
-  private getAuthHeaders(): Record<string, string> {
-    const token = this.authInfo.accessToken;
-    if (token) {
-      return { authorization: `Bearer ${token}` };
-    }
-    const sessionSecret = this.authInfo.sessionSecret;
-    if (sessionSecret) {
-      return { 'expo-session': sessionSecret };
-    }
-    return {};
-  }
-
-  private async requestAsync(path: string, options: RequestInit): Promise<any> {
+async function handleApiErrorAsync(err: any): Promise<void> {
+  if (err instanceof RequestError) {
+    let result: { [key: string]: any };
     try {
-      const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
-        ...options,
-        headers: {
-          'Content-Type': 'application/json',
-          ...this.getAuthHeaders(),
-        },
-      });
-      return await response.json();
-    } catch (err) {
-      await ApiV2Client.handleApiErrorAsync(err);
+      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;
   }
+}
 
-  private static async 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 {

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

@@ -1,42 +1,30 @@
 import chalk from 'chalk';
-import gql from 'graphql-tag';
+import CliTable from 'cli-table3';
 
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { withErrorHandlingAsync } from '../graphql/client';
-import {
-  CreateUpdateBranchForAppMutation,
-  CreateUpdateBranchForAppMutationVariables,
-  UpdateBranch,
-  UpdateBranchFragment,
-} from '../graphql/generated';
+import { UpdateBranchFragment } from '../graphql/generated';
 import { BranchQuery } from '../graphql/queries/BranchQuery';
 import Log from '../log';
-import { formatBranch, getBranchDescription } from '../update/utils';
+import { UPDATE_COLUMNS, formatUpdateMessage, getPlatformsForGroup } from '../update/utils';
 import { printJsonOnlyOutput } from '../utils/json';
 import {
-  SelectPromptEntry,
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { BranchNotFoundError } from './utils';
 
 export const BRANCHES_LIMIT = 50;
 
-export async function selectBranchOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    promptTitle,
-    displayTextForListItem,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    displayTextForListItem: (queryItem: UpdateBranchFragment) => SelectPromptEntry;
-    promptTitle: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<UpdateBranchFragment> {
+export async function selectBranchOnAppAsync({
+  projectId,
+  promptTitle,
+  displayTextForListItem,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
+  promptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateBranchFragment> {
   if (paginatedQueryOptions.nonInteractive) {
     throw new Error('Unable to select a branch in non-interactive mode.');
   }
@@ -44,12 +32,11 @@ export async function selectBranchOnAppAsync(
   const selectedBranch = await paginatedQueryWithSelectPromptAsync({
     limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
     offset: paginatedQueryOptions.offset,
-    queryToPerform: (limit, offset) =>
-      queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
+    queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
     promptOptions: {
       title: promptTitle,
       getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      makePartialChoiceObject: displayTextForListItem,
+      createDisplayTextForSelectionPromptListItem: displayTextForListItem,
     },
   });
   if (!selectedBranch) {
@@ -58,19 +45,15 @@ export async function selectBranchOnAppAsync(
   return selectedBranch;
 }
 
-export async function listAndRenderBranchesOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<void> {
+export async function listAndRenderBranchesOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
   if (paginatedQueryOptions.nonInteractive) {
     const branches = await queryBranchesOnProjectAsync(
-      graphqlClient,
       paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
       paginatedQueryOptions.offset,
       projectId
@@ -80,8 +63,7 @@ export async function listAndRenderBranchesOnAppAsync(
     await paginatedQueryWithConfirmPromptAsync({
       limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
       offset: paginatedQueryOptions.offset,
-      queryToPerform: (limit, offset) =>
-        queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
+      queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
       promptOptions: {
         title: 'Load more branches?',
         renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
@@ -91,12 +73,11 @@ export async function listAndRenderBranchesOnAppAsync(
 }
 
 async function queryBranchesOnProjectAsync(
-  graphqlClient: ExpoGraphqlClient,
   limit: number,
   offset: number,
   projectId: string
 ): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesOnAppAsync(graphqlClient, {
+  return await BranchQuery.listBranchesOnAppAsync({
     appId: projectId,
     limit,
     offset,
@@ -110,75 +91,34 @@ function renderPageOfBranches(
   if (json) {
     printJsonOnlyOutput(currentPage);
   } else {
+    const table = new CliTable({
+      head: ['Branch', ...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    table.push(
+      ...currentPage.map(branch => {
+        if (branch.updates.length === 0) {
+          return [branch.name, 'N/A', 'N/A', 'N/A', 'N/A'];
+        }
+
+        const latestUpdateOnBranch = branch.updates[0];
+        return [
+          branch.name,
+          formatUpdateMessage(latestUpdateOnBranch),
+          latestUpdateOnBranch.runtimeVersion,
+          latestUpdateOnBranch.group,
+          getPlatformsForGroup({
+            group: latestUpdateOnBranch.group,
+            updates: branch.updates,
+          }),
+        ];
+      })
+    );
+
     Log.addNewLineIfNone();
     Log.log(chalk.bold('Branches:'));
     Log.addNewLineIfNone();
-    Log.log(
-      currentPage
-        .map(branch => formatBranch(getBranchDescription(branch)))
-        .join(`\n\n${chalk.dim('———')}\n\n`)
-    );
-  }
-}
-
-export async function createUpdateBranchOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, name }: CreateUpdateBranchForAppMutationVariables
-): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
-  const result = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
-        gql`
-          mutation CreateUpdateBranchForApp($appId: ID!, $name: String!) {
-            updateBranch {
-              createUpdateBranchForApp(appId: $appId, name: $name) {
-                id
-                name
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name,
-        }
-      )
-      .toPromise()
-  );
-  const newBranch = result.updateBranch.createUpdateBranchForApp;
-  if (!newBranch) {
-    throw new Error(`Could not create branch ${name}.`);
-  }
-  return newBranch;
-}
-
-export async function ensureBranchExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    appId,
-    branchName,
-  }: {
-    appId: string;
-    branchName: string;
-  }
-): Promise<{ branchId: string; createdBranch: boolean }> {
-  try {
-    const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
-      appId,
-      name: branchName,
-    });
-
-    const { id } = updateBranch;
-    return { branchId: id, createdBranch: false };
-  } catch (error) {
-    if (error instanceof BranchNotFoundError) {
-      const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
-        appId,
-        name: branchName,
-      });
-      return { branchId: newUpdateBranch.id, createdBranch: true };
-    } else {
-      throw error;
-    }
+    Log.log(table.toString());
   }
 }

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

@@ -1,15 +1,7 @@
-import { instance, mock } from 'ts-mockito';
 import { v4 as uuid } from 'uuid';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectBuildToCancelAsync } from '../../commands/build/cancel';
-import {
-  AppPlatform,
-  BuildFragment,
-  BuildPriority,
-  BuildResourceClass,
-  BuildStatus,
-} from '../../graphql/generated';
+import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { confirmAsync, selectAsync } from '../../prompts';
 
@@ -51,18 +43,14 @@ describe(selectBuildToCancelAsync.name, () => {
   });
 
   it('does not return build id when confirmation is rejected', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
     jest.mocked(confirmAsync).mockResolvedValueOnce(false);
-    expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(null);
   });
 
   it('returns build id when confirmation is confirmed', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
     jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
     jest.mocked(confirmAsync).mockResolvedValueOnce(true);
-    expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
-      selectedBuildId
-    );
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(selectedBuildId);
   });
 });
 
@@ -91,6 +79,5 @@ function createMockBuildFragment({
       },
     },
     status: BuildStatus.InQueue,
-    resourceClass: BuildResourceClass.AndroidMedium,
   };
 }

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

@@ -1,142 +0,0 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { ExitError } from '@oclif/core/lib/errors';
-import path from 'path';
-import { instance, mock, when } from 'ts-mockito';
-
-import { CommonContext } from '../context';
-import { validatePNGsForManagedProjectAsync } from '../validate';
-
-const fixturesPath = path.join(__dirname, 'fixtures');
-
-describe(validatePNGsForManagedProjectAsync, () => {
-  it('does not validate PNGs for generic projects', async () => {
-    const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-    when(ctxMock.workflow).thenReturn(Workflow.GENERIC);
-    const ctx = instance(ctxMock);
-    await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-  });
-
-  it('does not validate PNGs for projects with SDK >= 47', async () => {
-    const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-    when(ctxMock.workflow).thenReturn(Workflow.GENERIC);
-    when(ctxMock.exp).thenReturn({
-      name: 'blah',
-      slug: 'blah',
-      android: { adaptiveIcon: { foregroundImage: 'assets/icon.jpg' } },
-      sdkVersion: '47.0.0',
-    });
-    const ctx = instance(ctxMock);
-    await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-  });
-
-  describe(Platform.ANDROID, () => {
-    it('exits if foregroundImage is not a file with .png extension', async () => {
-      const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.ANDROID);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        android: { adaptiveIcon: { foregroundImage: 'assets/icon.jpg' } },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('exits if foregroundImage is not a png file', async () => {
-      const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.ANDROID);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        android: { adaptiveIcon: { foregroundImage: path.join(fixturesPath, 'icon-jpg.png') } },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('does not throw if foregroundImage is a png file', async () => {
-      const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.ANDROID);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        android: { adaptiveIcon: { foregroundImage: path.join(fixturesPath, 'icon-alpha.png') } },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-    });
-  });
-
-  // Validating iOS PNGs is currently disabled
-  // See https://github.com/expo/eas-cli/pull/1477 for context
-  xdescribe(Platform.IOS, () => {
-    it('exits if icon is not a file with .png extension', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'assets/icon.jpg') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('exits if icon is not a png file', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'icon-jpg.png') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('exits if icon has alpha channel (transparency)', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'icon-alpha.png') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('does not throw if icon is a png file and does not have alpha channel', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'icon-no-alpha.png') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-    });
-  });
-});

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

@@ -24,11 +24,7 @@ import {
 import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
-import {
-  checkGoogleServicesFileAsync,
-  checkNodeEnvVariable,
-  validatePNGsForManagedProjectAsync,
-} from '../validate';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
 import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
@@ -57,18 +53,17 @@ This means that it will most likely produce an AAB and you will not be able to i
 
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
-  await validatePNGsForManagedProjectAsync(ctx);
 
   const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
 
   if (ctx.workflow === Workflow.MANAGED) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
   }
 
   const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
   const versionCodeOverride =
     ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
+      ? await resolveRemoteVersionCodeAsync({
           projectDir: ctx.projectDir,
           projectId: ctx.projectId,
           exp: ctx.exp,
@@ -89,7 +84,7 @@ export async function prepareAndroidBuildAsync(
       return await ensureAndroidCredentialsAsync(ctx);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         localAutoIncrement:
@@ -113,7 +108,7 @@ export async function prepareAndroidBuildAsync(
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
-      return await BuildMutation.createAndroidBuildAsync(ctx.graphqlClient, {
+      return await BuildMutation.createAndroidBuildAsync({
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
@@ -124,8 +119,7 @@ export async function prepareAndroidBuildAsync(
 }
 
 function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
-  const isCustomBuild = ctx.buildProfile.config !== undefined;
-  return !ctx.buildProfile.withoutCredentials && !isCustomBuild;
+  return !ctx.buildProfile.withoutCredentials;
 }
 
 async function ensureAndroidCredentialsAsync(

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

@@ -1,17 +1,11 @@
 import { Android } from '@expo/eas-build-job';
 
 import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
-import {
-  transformBuildMode,
-  transformBuildTrigger,
-  transformProjectArchive,
-  transformWorkflow,
-} from '../graphql';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {
     type: transformWorkflow(job.type),
-    triggeredBy: transformBuildTrigger(job.triggeredBy),
     projectArchive: transformProjectArchive(job.projectArchive),
     projectRootDirectory: job.projectRootDirectory,
     releaseChannel: job.releaseChannel,
@@ -27,8 +21,6 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     buildType: job.buildType && transformBuildType(job.buildType),
     developmentClient: job.developmentClient,
     experimental: job.experimental,
-    mode: transformBuildMode(job.mode),
-    customBuildConfig: job.customBuildConfig,
   };
 }
 

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

@@ -1,18 +1,9 @@
-import {
-  Android,
-  ArchiveSource,
-  BuildMode,
-  BuildTrigger,
-  Job,
-  Platform,
-  sanitizeJob,
-} from '@expo/eas-build-job';
+import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
@@ -50,15 +41,11 @@ export async function prepareJobAsync(
       }
     : {};
 
-  let buildType = buildProfile.buildType;
-  if (!buildType && !buildProfile.gradleCommand && buildProfile.distribution === 'internal') {
+  let buildType = ctx.buildProfile.buildType;
+  if (!buildType && !buildProfile.gradleCommand && ctx.buildProfile.distribution === 'internal') {
     buildType = Android.BuildType.APK;
   }
 
-  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPath(buildProfile.config)
-    : undefined;
-
   const job: Android.Job = {
     type: ctx.workflow,
     platform: Platform.ANDROID,
@@ -80,8 +67,8 @@ export async function prepareJobAsync(
     secrets: {
       ...buildCredentials,
     },
-    releaseChannel: buildProfile.releaseChannel,
-    updates: { channel: buildProfile.channel },
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
     developmentClient: buildProfile.developmentClient,
     gradleCommand: buildProfile.gradleCommand,
     applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
@@ -94,15 +81,8 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
     },
-    mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
   };
 
   return sanitizeJob(job);

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

@@ -6,34 +6,30 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import Log from '../../log';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    exp,
-    localAutoIncrement,
-    projectId,
-  }: {
-    projectDir: string;
-    exp: ExpoConfig;
-    localAutoIncrement?: AndroidVersionAutoIncrement;
-    projectId: string;
-  }
-): Promise<void> {
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  localAutoIncrement,
+  projectId,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  localAutoIncrement?: AndroidVersionAutoIncrement;
+  projectId: string;
+}): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     await cleanUpOldEasBuildGradleScriptAsync(projectDir);
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   } else {

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

@@ -5,7 +5,6 @@ import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppPlatform } from '../../graphql/generated';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
@@ -175,24 +174,20 @@ async function writeBuildGradleAsync({
  * Returns buildNumber that will be used for the next build. If current build profile
  * has an 'autoIncrement' option set, it increments the version on server.
  */
-export async function resolveRemoteVersionCodeAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    projectId,
-    exp,
-    applicationId,
-    buildProfile,
-  }: {
-    projectDir: string;
-    projectId: string;
-    exp: ExpoConfig;
-    applicationId: string;
-    buildProfile: BuildProfile<Platform.ANDROID>;
-  }
-): Promise<string> {
+export async function resolveRemoteVersionCodeAsync({
+  projectDir,
+  projectId,
+  exp,
+  applicationId,
+  buildProfile,
+}: {
+  projectDir: string;
+  projectId: string;
+  exp: ExpoConfig;
+  applicationId: string;
+  buildProfile: BuildProfile<Platform.ANDROID>;
+}): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
-    graphqlClient,
     projectId,
     AppPlatform.Android,
     applicationId
@@ -222,7 +217,7 @@ export async function resolveRemoteVersionCodeAsync(
       `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
     ).start();
     try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+      await AppVersionMutation.createAppVersionAsync({
         appId: projectId,
         platform: AppPlatform.Android,
         applicationIdentifier: applicationId,
@@ -244,7 +239,7 @@ export async function resolveRemoteVersionCodeAsync(
       )}.`
     ).start();
     try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+      await AppVersionMutation.createAppVersionAsync({
         appId: projectId,
         platform: AppPlatform.Android,
         applicationIdentifier: applicationId,

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

@@ -1,43 +1,37 @@
 import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
-import { CredentialsSource, EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
-import assert from 'assert';
+import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
 import nullthrows from 'nullthrows';
 
-import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
+import { BuildEvent } from '../analytics/events';
 import { getExpoWebsiteBaseUrl } from '../api';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   AppPlatform,
   BuildFragment,
   BuildParamsInput,
   BuildPriority,
-  BuildResourceClass,
   BuildStatus,
   UploadSessionType,
 } from '../graphql/generated';
-import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
+import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log, { learnMore, link } from '../log';
+import Log, { learnMore } from '../log';
 import { Ora, ora } from '../ora';
 import {
   appPlatformDisplayNames,
   appPlatformEmojis,
   requestedPlatformDisplayNames,
 } from '../platform';
-import { confirmAsync } from '../prompts';
-import { uploadFileAtPathToGCSAsync } from '../uploads';
+import { uploadFileAtPathToS3Async } from '../uploads';
 import { formatBytes } from '../utils/files';
-import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
 import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
-import { transformMetadata } from './graphql';
-import { LocalBuildMode, runLocalBuildAsync } from './local';
+import { runLocalBuildAsync } from './local';
 import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
@@ -83,26 +77,21 @@ export async function prepareBuildRequestForPlatformAsync<
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
   const { ctx } = builder;
   const credentialsResult = await withAnalyticsAsync(
-    ctx.analytics,
     async () => await builder.ensureCredentialsAsync(ctx),
     {
       attemptEvent: BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
       successEvent: BuildEvent.GATHER_CREDENTIALS_SUCCESS,
       failureEvent: BuildEvent.GATHER_CREDENTIALS_FAIL,
-      properties: ctx.analyticsEventProperties,
+      trackingCtx: ctx.trackingCtx,
     }
   );
 
-  await withAnalyticsAsync(
-    ctx.analytics,
-    async () => await builder.syncProjectConfigurationAsync(ctx),
-    {
-      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-      properties: ctx.analyticsEventProperties,
-    }
-  );
+  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();
@@ -112,24 +101,15 @@ export async function prepareBuildRequestForPlatformAsync<
     );
   }
 
-  let projectArchive: ArchiveSource | undefined;
-  if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-    projectArchive = {
-      type: ArchiveSourceType.PATH,
-      path: (await makeProjectTarballAsync()).path,
-    };
-  } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
-    projectArchive = {
-      type: ArchiveSourceType.PATH,
-      path: process.cwd(),
-    };
-  } else if (!ctx.localBuildOptions.localBuildMode) {
-    projectArchive = {
-      type: ArchiveSourceType.GCS,
-      bucketKey: await uploadProjectAsync(ctx),
-    };
-  }
-  assert(projectArchive);
+  const projectArchive = ctx.localBuildOptions.enable
+    ? ({
+        type: ArchiveSourceType.PATH,
+        path: (await makeProjectTarballAsync()).path,
+      } as const)
+    : ({
+        type: ArchiveSourceType.S3,
+        bucketKey: await uploadProjectAsync(ctx),
+      } as const);
 
   const metadata = await collectMetadataAsync(ctx);
   const buildParams = resolveBuildParamsInput(ctx);
@@ -139,49 +119,33 @@ export async function prepareBuildRequestForPlatformAsync<
   });
 
   return async () => {
-    if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
+    if (ctx.localBuildOptions.enable) {
       await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
       return undefined;
-    } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
-      await BuildMutation.updateBuildMetadataAsync(ctx.graphqlClient, {
-        buildId: nullthrows(process.env.EAS_BUILD_ID),
-        metadata: transformMetadata(metadata),
-      });
-      printJsonOnlyOutput({ job, metadata });
-      return undefined;
-    } else if (!ctx.localBuildOptions.localBuildMode) {
+    } else {
       try {
         return await sendBuildRequestAsync(builder, job, metadata, buildParams);
       } catch (error: any) {
         handleBuildRequestError(error, job.platform);
       }
-    } else {
-      throw new Error('Unknown localBuildMode.');
     }
   };
 }
 
-const SERVER_SIDE_DEFINED_ERRORS = [
-  'TURTLE_DEPRECATED_JOB_FORMAT',
-  'EAS_BUILD_FREE_TIER_DISABLED',
-  'EAS_BUILD_FREE_TIER_DISABLED_IOS',
-  'EAS_BUILD_FREE_TIER_DISABLED_ANDROID',
-  'VALIDATION_ERROR',
-];
-
 function handleBuildRequestError(error: any, platform: Platform): never {
-  Log.debug(JSON.stringify(error.graphQLErrors, null, 2));
-
-  if (SERVER_SIDE_DEFINED_ERRORS.includes(error?.graphQLErrors?.[0]?.extensions?.errorCode)) {
-    Log.error(error?.graphQLErrors?.[0]?.message);
+  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+    Log.error('EAS Build API has changed. Upgrade to the latest eas-cli version.');
     throw new Error('Build request failed.');
   } else if (
     error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
   ) {
     Log.error(
-      `EAS Build is down for maintenance. Try again later. Check ${link(
-        'https://status.expo.dev/'
-      )} for updates.`
+      'EAS Build is down for maintenance. Try again later. Check https://status.expo.dev/ for updates.'
+    );
+    throw new Error('Build request failed.');
+  } else if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED') {
+    Log.error(
+      'EAS Build free tier is temporarily disabled. Try again later. Check https://status.expo.dev/ for updates.'
     );
     throw new Error('Build request failed.');
   } else if (
@@ -205,7 +169,6 @@ async function uploadProjectAsync<TPlatform extends Platform>(
   let projectTarballPath;
   try {
     return await withAnalyticsAsync(
-      ctx.analytics,
       async () => {
         Log.newLine();
         Log.log(
@@ -227,9 +190,8 @@ async function uploadProjectAsync<TPlatform extends Platform>(
 
         projectTarballPath = projectTarball.path;
 
-        const bucketKey = await uploadFileAtPathToGCSAsync(
-          ctx.graphqlClient,
-          UploadSessionType.EasBuildGcsProjectSources,
+        const { bucketKey } = await uploadFileAtPathToS3Async(
+          UploadSessionType.EasBuildProjectSources,
           projectTarball.path,
           createProgressTracker({
             total: projectTarball.size,
@@ -246,7 +208,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
         successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
         failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
-        properties: ctx.analyticsEventProperties,
+        trackingCtx: ctx.trackingCtx,
       }
     );
   } finally {
@@ -264,7 +226,6 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
 ): Promise<BuildFragment> {
   const { ctx } = builder;
   return await withAnalyticsAsync(
-    ctx.analytics,
     async () => {
       if (Log.isDebug) {
         Log.log(`Starting ${requestedPlatformDisplayNames[job.platform]} build`);
@@ -284,21 +245,15 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
       attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
       successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
       failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
-      properties: ctx.analyticsEventProperties,
+      trackingCtx: ctx.trackingCtx,
     }
   );
 }
 
-export type MaybeBuildFragment = BuildFragment | null;
+type MaybeBuildFragment = BuildFragment | null;
 
 export async function waitForBuildEndAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    buildIds,
-    accountName,
-    projectDir,
-    nonInteractive,
-  }: { buildIds: string[]; accountName: string; projectDir: string; nonInteractive: boolean },
+  { buildIds, accountName }: { buildIds: string[]; accountName: string },
   { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
   let spinner;
@@ -312,13 +267,10 @@ export async function waitForBuildEndAsync(
     spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
   }
   while (true) {
-    const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
+    const builds = await getBuildsSafelyAsync(buildIds);
     const { refetch } =
       builds.length === 1
-        ? await handleSingleBuildProgressAsync(
-            { build: builds[0], accountName, projectDir, nonInteractive },
-            { spinner }
-          )
+        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
         : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
     if (!refetch) {
       return builds;
@@ -327,13 +279,10 @@ export async function waitForBuildEndAsync(
   }
 }
 
-async function getBuildsSafelyAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildIds: string[]
-): Promise<MaybeBuildFragment[]> {
+async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
   const promises = buildIds.map(async buildId => {
     try {
-      return await BuildQuery.byIdAsync(graphqlClient, buildId, { useCache: false });
+      return await BuildQuery.byIdAsync(buildId, { useCache: false });
     } catch (err) {
       Log.debug('Failed to fetch the build status', err);
       return null;
@@ -353,17 +302,7 @@ const queueProgressBar = new cliProgress.SingleBar(
 );
 
 async function handleSingleBuildProgressAsync(
-  {
-    build,
-    accountName,
-    projectDir,
-    nonInteractive,
-  }: {
-    build: MaybeBuildFragment;
-    accountName: string;
-    projectDir: string;
-    nonInteractive: boolean;
-  },
+  { build, accountName }: { build: MaybeBuildFragment; accountName: string },
   { spinner }: { spinner: Ora }
 ): Promise<BuildProgressResult> {
   if (build === null) {
@@ -388,7 +327,7 @@ async function handleSingleBuildProgressAsync(
       spinner.succeed('Build finished');
       return { refetch: false };
     case BuildStatus.New:
-      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${link(
+      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${chalk.underline(
         formatAccountSubscriptionsUrl(accountName)
       )}.`;
       break;
@@ -402,68 +341,18 @@ async function handleSingleBuildProgressAsync(
       if (
         !queueProgressBarStarted &&
         typeof build.initialQueuePosition === 'number' &&
-        typeof build.queuePosition === 'number' &&
-        typeof build.estimatedWaitTimeLeftSeconds === '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 ${link(
+            `Sign up for EAS Production or Enterprise at ${chalk.underline(
               formatAccountSubscriptionsUrl(accountName)
             )}`
           );
         }
-
-        if (
-          build.platform === AppPlatform.Ios &&
-          [BuildResourceClass.IosIntelLarge, BuildResourceClass.IosIntelMedium].includes(
-            build.resourceClass
-          )
-        ) {
-          let askToSwitchToM1 = false;
-          if (
-            build.priority === BuildPriority.High &&
-            build.estimatedWaitTimeLeftSeconds >= /* 10 minutes */ 10 * 60
-          ) {
-            Log.newLine();
-            Log.warn(
-              `Warning: Priority queue wait time for legacy iOS Intel workers is longer than usual (more than 10 minutes).`
-            );
-            Log.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
-            Log.warn(
-              learnMore('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
-                learnMoreMessage: 'Learn more on switching to M1 workers.',
-              })
-            );
-            askToSwitchToM1 = true;
-          } else if (
-            build.priority !== BuildPriority.High &&
-            build.estimatedWaitTimeLeftSeconds >= /* 120 minutes */ 120 * 60
-          ) {
-            Log.newLine();
-            Log.warn(
-              `Warning: Free tier queue wait time for legacy iOS Intel workers is longer than usual.`
-            );
-            Log.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
-            Log.warn(
-              learnMore('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
-                learnMoreMessage: 'Learn more on switching to M1 workers.',
-              })
-            );
-            askToSwitchToM1 = true;
-          }
-          if (!nonInteractive && askToSwitchToM1) {
-            const shouldSwitchToM1 = await confirmAsync({
-              message: `Switch iOS builds to M1 workers (modifies build profiles in eas.json)?`,
-            });
-            if (shouldSwitchToM1) {
-              await updateIosBuildProfilesToUseM1WorkersAsync(projectDir);
-            }
-          }
-        }
-
         Log.newLine();
         Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
         queueProgressBar.start(
@@ -499,8 +388,8 @@ async function handleSingleBuildProgressAsync(
 }
 
 const priorityToQueueDisplayName: Record<BuildPriority, string> = {
-  [BuildPriority.Normal]: 'Free tier queue',
-  [BuildPriority.NormalPlus]: 'Free tier queue',
+  [BuildPriority.Normal]: 'queue',
+  [BuildPriority.NormalPlus]: 'queue',
   [BuildPriority.High]: 'priority queue',
 };
 
@@ -605,21 +494,3 @@ function formatAccountSubscriptionsUrl(accountName: string): string {
     getExpoWebsiteBaseUrl()
   ).toString();
 }
-
-async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir: string): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  await easJsonAccessor.readRawJsonAsync();
-
-  const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
-  easJsonAccessor.patch(easJsonRawObject => {
-    for (const profileName of profileNames) {
-      easJsonRawObject.build[profileName].ios = {
-        ...easJsonRawObject.build[profileName].ios,
-        resourceClass: ResourceClass.M1_MEDIUM,
-      };
-    }
-    return easJsonRawObject;
-  });
-  await easJsonAccessor.writeAsync();
-  Log.withTick('Updated eas.json. Your next builds will run on M1 workers.');
-}

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

@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor, ResourceClass } from '@expo/eas-json';
+import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
@@ -53,21 +53,11 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
     development: {
       developmentClient: true,
       distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
     },
     preview: {
       distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
-    },
-    production: {
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
     },
+    production: {},
   },
   submit: {
     production: {},
@@ -86,20 +76,12 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
       },
       ios: {
         buildConfiguration: 'Debug',
-        resourceClass: ResourceClass.M1_MEDIUM,
       },
     },
     preview: {
       distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
-    },
-    production: {
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
     },
+    production: {},
   },
   submit: {
     production: {},

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

@@ -2,8 +2,7 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
 
-import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
 import { BuildResourceClass } from '../graphql/generated';
@@ -46,10 +45,8 @@ export interface BuildContext<T extends Platform> {
   projectId: string;
   projectName: string;
   message?: string;
-  analyticsEventProperties: AnalyticsEventProperties;
+  trackingCtx: TrackingContext;
   user: Actor;
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
   workflow: Workflow;
   android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
   ios: T extends Platform.IOS ? IosBuildContext : undefined;

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

@@ -1,14 +1,15 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
 import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
-import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
-import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { TrackingContext } from '../analytics/common';
+import { Analytics, BuildEvent } from '../analytics/events';
 import { CredentialsContext } from '../credentials/context';
+import { BuildResourceClass } from '../graphql/generated';
+import { getExpoConfig } from '../project/expoConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
@@ -16,7 +17,6 @@ import { createAndroidContextAsync } from './android/build';
 import { BuildContext, CommonContext } from './context';
 import { createIosContextAsync } from './ios/build';
 import { LocalBuildOptions } from './local';
-import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,
@@ -28,12 +28,10 @@ export async function createBuildContextAsync<T extends Platform>({
   noWait,
   platform,
   projectDir,
-  resourceClassFlag,
+  resourceClass,
   message,
   actor,
-  graphqlClient,
-  analytics,
-  getDynamicProjectConfigAsync,
+  projectId,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
@@ -44,16 +42,15 @@ export async function createBuildContextAsync<T extends Platform>({
   noWait: boolean;
   platform: T;
   projectDir: string;
-  resourceClassFlag?: ResourceClass;
+  resourceClass: BuildResourceClass;
   message?: string;
   actor: Actor;
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
-  getDynamicProjectConfigAsync: DynamicConfigContextFn;
+  projectId: string;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
   const projectName = exp.slug;
-  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
+  const account = await getOwnerAccountForProjectIdAsync(projectId);
   const workflow = await resolveWorkflowAsync(projectDir, platform);
   const accountId = account.id;
   const runFromCI = getenv.boolish('CI', false);
@@ -63,8 +60,6 @@ export async function createBuildContextAsync<T extends Platform>({
     nonInteractive,
     projectDir,
     user: actor,
-    graphqlClient,
-    analytics,
     env: buildProfile.env,
     easJsonCliConfig,
   });
@@ -74,10 +69,9 @@ export async function createBuildContextAsync<T extends Platform>({
     projectDir,
     buildProfile,
   });
-  const analyticsEventProperties = {
+  const trackingCtx = {
     tracking_id: uuidv4(),
     platform,
-    ...(exp.sdkVersion && { sdk_version: exp.sdkVersion }),
     ...(accountId && { account_id: accountId }),
     project_id: projectId,
     project_type: workflow,
@@ -85,15 +79,7 @@ export async function createBuildContextAsync<T extends Platform>({
     no_wait: noWait,
     run_from_ci: runFromCI,
   };
-  analytics.logEvent(BuildEvent.BUILD_COMMAND, analyticsEventProperties);
-
-  const resourceClass = await resolveBuildResourceClassAsync(
-    buildProfile,
-    platform,
-    projectDir,
-    exp,
-    resourceClassFlag
-  );
+  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
 
   const commonContext: CommonContext<T> = {
     accountName: account.name,
@@ -111,10 +97,8 @@ export async function createBuildContextAsync<T extends Platform>({
     projectDir,
     projectId,
     projectName,
-    analyticsEventProperties,
+    trackingCtx,
     user: actor,
-    graphqlClient,
-    analytics,
     workflow,
     message,
     runFromCI,
@@ -142,7 +126,7 @@ function getDevClientEventProperties({
   platform: Platform;
   projectDir: string;
   buildProfile: BuildProfile;
-}): Partial<AnalyticsEventProperties> {
+}): Partial<TrackingContext> {
   let includesDevClient;
   const version = tryGetDevClientVersion(projectDir);
   if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {

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

@@ -1,19 +1,11 @@
-import {
-  ArchiveSource,
-  ArchiveSourceType,
-  BuildTrigger,
-  Metadata,
-  Workflow,
-} from '@expo/eas-build-job';
+import { ArchiveSource, ArchiveSourceType, Metadata, Workflow } from '@expo/eas-build-job';
 
 import {
   BuildCredentialsSource,
   BuildIosEnterpriseProvisioning,
   BuildMetadataInput,
-  BuildMode,
   BuildWorkflow,
   DistributionType,
-  BuildTrigger as GraphQLBuildTrigger,
   ProjectArchiveSourceInput,
   ProjectArchiveSourceType,
 } from '../graphql/generated';
@@ -24,11 +16,6 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
       type: ProjectArchiveSourceType.S3,
       bucketKey: archiveSource.bucketKey,
     };
-  } else if (archiveSource.type === ArchiveSourceType.GCS) {
-    return {
-      type: ProjectArchiveSourceType.Gcs,
-      bucketKey: archiveSource.bucketKey,
-    };
   } else if (archiveSource.type === ArchiveSourceType.URL) {
     return {
       type: ProjectArchiveSourceType.Url,
@@ -42,7 +29,6 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
 export function transformMetadata(metadata: Metadata): BuildMetadataInput {
   return {
     ...metadata,
-    buildMode: metadata.buildMode && transformBuildMode(metadata.buildMode),
     credentialsSource:
       metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
     distribution: metadata.distribution && transformDistribution(metadata.distribution),
@@ -90,25 +76,3 @@ export function transformIosEnterpriseProvisioning(
     return BuildIosEnterpriseProvisioning.Universal;
   }
 }
-
-// TODO: check what in metadata
-export function transformBuildMode(buildMode: string): BuildMode {
-  if (buildMode === 'build') {
-    return BuildMode.Build;
-  } else if (buildMode === 'resign') {
-    return BuildMode.Resign;
-  } else if (buildMode === 'custom') {
-    return BuildMode.Custom;
-  } else {
-    throw new Error(`Unsupported build mode: ${buildMode}`);
-  }
-}
-
-export function transformBuildTrigger(buildTrigger: BuildTrigger): GraphQLBuildTrigger {
-  if (buildTrigger === BuildTrigger.EAS_CLI) {
-    return GraphQLBuildTrigger.EasCli;
-  } else if (buildTrigger === BuildTrigger.GIT_BASED_INTEGRATION) {
-    return GraphQLBuildTrigger.GitBasedIntegration;
-  }
-  throw new Error('Unknown build trigger');
-}

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

@@ -10,11 +10,7 @@ import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/ta
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
 import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import {
-  checkGoogleServicesFileAsync,
-  checkNodeEnvVariable,
-  validatePNGsForManagedProjectAsync,
-} from '../validate';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
 import { ensureIosCredentialsAsync } from './credentials';
 import { transformJob } from './graphql';
 import { prepareJobAsync } from './prepareJob';
@@ -27,12 +23,11 @@ export async function createIosContextAsync(
   const { buildProfile } = ctx;
 
   if (ctx.workflow === Workflow.MANAGED) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx);
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
   }
 
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
-  await validatePNGsForManagedProjectAsync(ctx);
 
   const xcodeBuildContext = await resolveXcodeBuildContextAsync(
     {
@@ -51,7 +46,7 @@ export async function createIosContextAsync(
   const applicationTarget = findApplicationTarget(targets);
   const buildNumberOverride =
     ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteBuildNumberAsync(ctx.graphqlClient, {
+      ? await resolveRemoteBuildNumberAsync({
           projectDir: ctx.projectDir,
           projectId: ctx.projectId,
           exp: ctx.exp,
@@ -77,7 +72,7 @@ export async function prepareIosBuildAsync(
       return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         targets: ctx.ios.targets,
@@ -105,7 +100,7 @@ export async function prepareIosBuildAsync(
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
-      return await BuildMutation.createIosBuildAsync(ctx.graphqlClient, {
+      return await BuildMutation.createIosBuildAsync({
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,

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

@@ -1,7 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
 
-import { CredentialsContext } from '../../credentials/context';
 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
 import { getAppFromContextAsync } from '../../credentials/ios/actions/BuildCredentialsUtils';
 import { IosCredentials, Target } from '../../credentials/ios/types';
@@ -33,28 +31,6 @@ export async function ensureIosCredentialsAsync(
   };
 }
 
-export async function ensureIosCredentialsForBuildResignAsync(
-  credentialsCtx: CredentialsContext,
-  targets: Target[],
-  buildProfile: BuildProfile<Platform.IOS>
-): Promise<CredentialsResult<IosCredentials>> {
-  const provider = new IosCredentialsProvider(credentialsCtx, {
-    app: await getAppFromContextAsync(credentialsCtx),
-    targets,
-    distribution: 'internal',
-    enterpriseProvisioning: buildProfile.enterpriseProvisioning,
-  });
-
-  const { credentialsSource } = buildProfile;
-
-  logCredentialsSource(credentialsSource, Platform.IOS);
-  return {
-    credentials: await provider.getCredentialsAsync(credentialsSource),
-    source: credentialsSource,
-  };
-}
-
 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  const isCustomBuild = buildCtx.buildProfile.config !== undefined;
-  return !buildCtx.buildProfile.simulator && !isCustomBuild;
+  return !buildCtx.buildProfile.simulator;
 }

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

@@ -2,22 +2,16 @@ import { Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';
 
 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
-import {
-  transformBuildMode,
-  transformBuildTrigger,
-  transformProjectArchive,
-  transformWorkflow,
-} from '../graphql';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {
     type: transformWorkflow(job.type),
-    triggeredBy: transformBuildTrigger(job.triggeredBy),
     projectArchive: transformProjectArchive(job.projectArchive),
-    projectRootDirectory: nullthrows(job.projectRootDirectory),
+    projectRootDirectory: job.projectRootDirectory,
     releaseChannel: job.releaseChannel,
     updates: job.updates,
-    secrets: job.secrets ? transformIosSecrets(job.secrets) : undefined,
+    secrets: transformIosSecrets(job.secrets),
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
     version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
@@ -29,12 +23,10 @@ export function transformJob(job: Ios.Job): IosJobInput {
     developmentClient: job.developmentClient,
     simulator: job.simulator,
     experimental: job.experimental,
-    mode: transformBuildMode(job.mode),
-    customBuildConfig: job.customBuildConfig,
   };
 }
 
-export function transformIosSecrets(secrets: {
+function transformIosSecrets(secrets: {
   buildCredentials?: Ios.BuildCredentials;
 }): IosJobSecretsInput {
   const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];

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

@@ -1,20 +1,8 @@
-import {
-  ArchiveSource,
-  BuildMode,
-  BuildTrigger,
-  Ios,
-  Job,
-  Platform,
-  sanitizeJob,
-} from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import nullthrows from 'nullthrows';
+import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
 import slash from 'slash';
 
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
-import { IosJobSecretsInput } from '../../graphql/generated';
-import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
@@ -35,11 +23,10 @@ export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Job> {
-  const username = getUsername(ctx.exp, ctx.user);
-  const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
   const projectRootDirectory =
     slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
-  const buildCredentials: Ios.BuildSecrets['buildCredentials'] = {};
+  const username = getUsername(ctx.exp, ctx.user);
+  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
   if (jobData.credentials) {
     const targetNames = Object.keys(jobData.credentials);
     for (const targetName of targetNames) {
@@ -47,41 +34,38 @@ export async function prepareJobAsync(
     }
   }
 
-  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPath(buildProfile.config)
-    : undefined;
-
   const job: Ios.Job = {
     type: ctx.workflow,
     platform: Platform.IOS,
     projectArchive: jobData.projectArchive,
     projectRootDirectory,
     builderEnvironment: {
-      image: buildProfile.image,
-      node: buildProfile.node,
-      yarn: buildProfile.yarn,
-      bundler: buildProfile.bundler,
-      cocoapods: buildProfile.cocoapods,
-      fastlane: buildProfile.fastlane,
-      expoCli: buildProfile.expoCli,
-      env: buildProfile.env,
+      image: ctx.buildProfile.image,
+      node: ctx.buildProfile.node,
+      yarn: ctx.buildProfile.yarn,
+      bundler: ctx.buildProfile.bundler,
+      cocoapods: ctx.buildProfile.cocoapods,
+      fastlane: ctx.buildProfile.fastlane,
+      expoCli: ctx.buildProfile.expoCli,
+      env: ctx.buildProfile.env,
     },
     cache: {
       ...cacheDefaults,
-      ...buildProfile.cache,
+      ...ctx.buildProfile.cache,
       clear: ctx.clearCache,
     },
     secrets: {
       buildCredentials,
     },
-    releaseChannel: buildProfile.releaseChannel,
-    updates: { channel: buildProfile.channel },
-    developmentClient: buildProfile.developmentClient,
-    simulator: buildProfile.simulator,
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
+    developmentClient: ctx.buildProfile.developmentClient,
+    simulator: ctx.buildProfile.simulator,
     scheme: jobData.buildScheme,
-    buildConfiguration: buildProfile.buildConfiguration,
-    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
-    buildArtifactPaths: buildProfile.buildArtifactPaths,
+    buildConfiguration: ctx.buildProfile.buildConfiguration,
+    applicationArchivePath:
+      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
+    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
     username,
     ...(ctx.ios.buildNumberOverride && {
       version: {
@@ -89,35 +73,12 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
     },
-    mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
   };
   return sanitizeJob(job);
 }
 
-export function prepareCredentialsToResign(credentials: IosCredentials): IosJobSecretsInput {
-  const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];
-  for (const targetName of Object.keys(credentials ?? {})) {
-    buildCredentials.push({
-      targetName,
-      provisioningProfileBase64: nullthrows(credentials?.[targetName].provisioningProfile),
-      distributionCertificate: {
-        dataBase64: nullthrows(credentials?.[targetName].distributionCertificate.certificateP12),
-        password: nullthrows(credentials?.[targetName].distributionCertificate.certificatePassword),
-      },
-    });
-  }
-
-  return { buildCredentials };
-}
-
 function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {
   return {
     provisioningProfileBase64: targetCredentials.provisioningProfile,

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

@@ -2,35 +2,31 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    exp,
-    targets,
-    localAutoIncrement,
-    projectId,
-  }: {
-    projectDir: string;
-    exp: ExpoConfig;
-    targets: Target[];
-    localAutoIncrement?: IosVersionAutoIncrement;
-    projectId: string;
-  }
-): Promise<void> {
+export async function syncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  targets,
+  localAutoIncrement,
+  projectId,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  targets: Target[];
+  localAutoIncrement?: IosVersionAutoIncrement;
+  projectId: string;
+}): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {

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

@@ -6,7 +6,6 @@ import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Target } from '../../credentials/ios/types';
 import { AppPlatform } from '../../graphql/generated';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
@@ -256,24 +255,20 @@ export function evaluateTemplateString(
  * Returns buildNumber that will be used for the next build. If current build profile
  * has an 'autoIncrement' option set, it increments the version on server.
  */
-export async function resolveRemoteBuildNumberAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    projectId,
-    exp,
-    applicationTarget,
-    buildProfile,
-  }: {
-    projectDir: string;
-    projectId: string;
-    exp: ExpoConfig;
-    applicationTarget: Target;
-    buildProfile: BuildProfile<Platform.IOS>;
-  }
-): Promise<string> {
+export async function resolveRemoteBuildNumberAsync({
+  projectDir,
+  projectId,
+  exp,
+  applicationTarget,
+  buildProfile,
+}: {
+  projectDir: string;
+  projectId: string;
+  exp: ExpoConfig;
+  applicationTarget: Target;
+  buildProfile: BuildProfile<Platform.IOS>;
+}): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
-    graphqlClient,
     projectId,
     AppPlatform.Ios,
     applicationTarget.bundleIdentifier
@@ -312,7 +307,7 @@ export async function resolveRemoteBuildNumberAsync(
       `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
     ).start();
     try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+      await AppVersionMutation.createAppVersionAsync({
         appId: projectId,
         platform: AppPlatform.Ios,
         applicationIdentifier: applicationTarget.bundleIdentifier,
@@ -334,7 +329,7 @@ export async function resolveRemoteBuildNumberAsync(
       )}.`
     ).start();
     try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+      await AppVersionMutation.createAppVersionAsync({
         appId: projectId,
         platform: AppPlatform.Ios,
         applicationIdentifier: applicationTarget.bundleIdentifier,

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

@@ -6,28 +6,10 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.128';
-
-export enum LocalBuildMode {
-  /**
-   * Local build that users can run on their own machines. Instead
-   * of sending build request to EAS Servers it's passing it as an argument
-   * to local-build-plugin, that will run the build locally.
-   *
-   * Triggered when running `eas build --local`.
-   */
-  LOCAL_BUILD_PLUGIN = 'local-build-plugin',
-  /**
-   * Type of local build that is not accessible to users directly. When
-   * cloud build is triggered by git based integration, we are running
-   * in this mode. Instead of sending build request to EAS Servers it's
-   * printing it to the stdout as JSON, so EAS Build worker can read it.
-   */
-  INTERNAL = 'internal',
-}
+const PLUGIN_PACKAGE_VERSION = '0.0.99';
 
 export interface LocalBuildOptions {
-  localBuildMode?: LocalBuildMode;
+  enable: boolean;
   skipCleanup?: boolean;
   skipNativeBuild?: boolean;
   artifactsDir?: string;

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

@@ -1,5 +1,5 @@
 import { Updates } from '@expo/config-plugins';
-import { BuildMode, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+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';
@@ -30,14 +30,14 @@ export async function collectMetadataAsync<T extends Platform>(
       ? 'simulator'
       : ctx.buildProfile.distribution) ?? 'store';
   const metadata: Metadata = {
-    trackingContext: ctx.analyticsEventProperties,
+    trackingContext: ctx.trackingCtx,
     ...(await maybeResolveVersionsAsync(ctx)),
     cliVersion: easCliVersion,
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
     runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
-    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
+    reactNativeVersion: await getReactNativeVersionAsync(ctx),
     ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
@@ -57,7 +57,6 @@ export async function collectMetadataAsync<T extends Platform>(
     }),
     runWithNoWaitFlag: ctx.noWait,
     runFromCI: ctx.runFromCI,
-    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
   };
   return sanitizeMetadata(metadata);
 }
@@ -156,9 +155,11 @@ async function getNativeChannelAsync<T extends Platform>(
   return undefined;
 }
 
-export async function getReactNativeVersionAsync(projectDir: string): Promise<string | undefined> {
+async function getReactNativeVersionAsync(
+  ctx: BuildContext<Platform>
+): Promise<string | undefined> {
   try {
-    const reactNativePackageJsonPath = resolveFrom(projectDir, 'react-native/package.json');
+    const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
     return (await fs.readJson(reactNativePackageJsonPath)).version;
   } catch (err) {
     Log.debug('Failed to resolve react-native version:');

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

@@ -1,36 +1,28 @@
 import chalk from 'chalk';
 
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { AppPlatform, BuildFilter, BuildFragment } from '../graphql/generated';
+import { BuildFilter, BuildFragment } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log from '../log';
-import { fromNow } from '../utils/date';
 import { printJsonOnlyOutput } from '../utils/json';
-import {
-  paginatedQueryWithConfirmPromptAsync,
-  paginatedQueryWithSelectPromptAsync,
-} from '../utils/queries';
+import { paginatedQueryWithConfirmPromptAsync } from '../utils/queries';
 import { formatGraphQLBuild } from './utils/formatBuild';
 
 export const BUILDS_LIMIT = 50;
 
-export async function listAndRenderBuildsOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    projectDisplayName,
-    filter,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    projectDisplayName: string;
-    filter?: BuildFilter;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<void> {
+export async function listAndRenderBuildsOnAppAsync({
+  projectId,
+  projectDisplayName,
+  filter,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  projectDisplayName: string;
+  filter?: BuildFilter;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
   if (paginatedQueryOptions.nonInteractive) {
-    const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+    const builds = await BuildQuery.viewBuildsOnAppAsync({
       appId: projectId,
       limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
       offset: paginatedQueryOptions.offset,
@@ -42,7 +34,7 @@ export async function listAndRenderBuildsOnAppAsync(
       limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
       offset: paginatedQueryOptions.offset,
       queryToPerform: (limit, offset) =>
-        BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+        BuildQuery.viewBuildsOnAppAsync({
           appId: projectId,
           limit,
           offset,
@@ -57,121 +49,6 @@ export async function listAndRenderBuildsOnAppAsync(
   }
 }
 
-export async function listAndSelectBuildOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    title,
-    filter,
-    paginatedQueryOptions,
-    selectPromptDisabledFunction,
-    selectPromptWarningMessage,
-  }: {
-    projectId: string;
-    title: string;
-    filter?: BuildFilter;
-    paginatedQueryOptions: PaginatedQueryOptions;
-    selectPromptDisabledFunction?: (build: BuildFragment) => boolean;
-    selectPromptWarningMessage?: string;
-  }
-): Promise<BuildFragment | null> {
-  if (paginatedQueryOptions.nonInteractive) {
-    throw new Error('Unable to select a build in non-interactive mode.');
-  } else {
-    const selectedBuild = await paginatedQueryWithSelectPromptAsync({
-      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
-      offset: paginatedQueryOptions.offset,
-      queryToPerform: (limit, offset) =>
-        BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-          appId: projectId,
-          limit,
-          offset,
-          filter,
-        }),
-      promptOptions: {
-        title,
-        getIdentifierForQueryItem: build => build.id,
-        makePartialChoiceObject: createBuildToPartialChoiceMaker(selectPromptDisabledFunction),
-        selectPromptWarningMessage,
-      },
-    });
-    return selectedBuild ?? null;
-  }
-}
-
-function createBuildToPartialChoiceMaker(
-  selectPromptDisabledFunction?: (build: BuildFragment) => boolean
-) {
-  return (
-    build: BuildFragment
-  ): {
-    title: string;
-    description: string;
-    disabled?: boolean;
-  } => {
-    const splitCommitMessage = build.gitCommitMessage?.split('\n');
-    const formattedCommitData =
-      build.gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
-        ? `${build.gitCommitHash.slice(0, 7)} "${chalk.bold(
-            splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
-          )}"`
-        : null;
-
-    const descriptionItems: { name: string; value: string | null }[] = [
-      { name: 'Version', value: build.appVersion ? chalk.bold(build.appVersion) : null },
-      { name: 'Commit', value: formattedCommitData },
-      {
-        name: 'Message',
-        value: build.message
-          ? chalk.bold(
-              build.message.length > 200 ? `${build.message.slice(0, 200)}...` : build.message
-            )
-          : null,
-      },
-      {
-        name: build.platform === AppPlatform.Ios ? 'Build number' : 'Version code',
-        value: build.appBuildVersion ? chalk.bold(build.appBuildVersion) : null,
-      },
-    ];
-
-    const filteredDescriptionArray: string[] = descriptionItems
-      .filter(item => item.value)
-      .map(item => `${chalk.bold(item.name)}: ${item.value}`);
-
-    return {
-      title: `${chalk.bold(`ID:`)} ${build.id} (${chalk.bold(
-        `${fromNow(new Date(build.completedAt))} ago`
-      )})`,
-      description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
-      disabled: selectPromptDisabledFunction?.(build),
-    };
-  };
-}
-
-export async function getLatestBuildAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    filter,
-  }: {
-    projectId: string;
-    filter?: BuildFilter;
-  }
-): Promise<BuildFragment | null> {
-  const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-    appId: projectId,
-    limit: 1,
-    offset: 0,
-    filter,
-  });
-
-  if (builds.length === 0) {
-    return null;
-  }
-
-  return builds[0];
-}
-
 function renderPageOfBuilds({
   builds,
   projectDisplayName,

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

@@ -5,19 +5,15 @@ import {
   EasJson,
   EasJsonAccessor,
   EasJsonUtils,
-  ResourceClass,
   SubmitProfile,
 } from '@expo/eas-json';
-import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { Analytics } from '../analytics/AnalyticsManager';
-import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   AppPlatform,
   BuildFragment,
+  BuildResourceClass,
   BuildStatus,
   BuildWithSubmissionsFragment,
   SubmissionFragment,
@@ -31,7 +27,6 @@ import {
   appPlatformEmojis,
   toPlatforms,
 } from '../platform';
-import { validateCustomBuildConfigAsync } from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
 import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
@@ -39,9 +34,6 @@ import {
   validateAppConfigForRemoteVersionSource,
   validateBuildProfileVersionSettings,
 } from '../project/remoteVersionSource';
-import { confirmAsync } from '../prompts';
-import { runAsync } from '../run/run';
-import { isRunnableOnSimulatorOrEmulator } from '../run/utils';
 import { createSubmissionContextAsync } from '../submit/context';
 import {
   exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
@@ -49,20 +41,18 @@ import {
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { validateBuildProfileConfigMatchesProjectConfigAsync } from '../update/utils';
 import { Actor } from '../user/User';
-import { downloadAndMaybeExtractAppAsync } from '../utils/download';
-import { truthy } from '../utils/expodash/filter';
 import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
 import { getVcsClient } from '../vcs';
 import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
+import { BuildRequestSender, waitForBuildEndAsync } from './build';
 import { ensureProjectConfiguredAsync } from './configure';
 import { BuildContext } from './context';
 import { createBuildContextAsync } from './createContext';
 import { prepareIosBuildAsync } from './ios/build';
 import { LocalBuildOptions } from './local';
+import { UserInputResourceClass } from './types';
 import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
 import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
 import { ensureRepoIsCleanAsync } from './utils/repository';
@@ -80,17 +70,29 @@ export interface BuildFlags {
   autoSubmit: boolean;
   submitProfile?: string;
   localBuildOptions: LocalBuildOptions;
-  resourceClass?: ResourceClass;
+  userInputResourceClass?: UserInputResourceClass;
   message?: string;
 }
 
+const platformToGraphQLResourceClassMapping: Record<
+  Platform,
+  Record<UserInputResourceClass, BuildResourceClass>
+> = {
+  [Platform.ANDROID]: {
+    [UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
+    [UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
+  },
+  [Platform.IOS]: {
+    [UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
+    [UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
+  },
+};
+
 export async function runBuildAndSubmitAsync(
-  graphqlClient: ExpoGraphqlClient,
-  analytics: Analytics,
   projectDir: string,
   flags: BuildFlags,
   actor: Actor,
-  getDynamicProjectConfigAsync: DynamicConfigContextFn
+  projectId: string
 ): Promise<void> {
   await getVcsClient().ensureRepoExistsAsync();
   await ensureRepoIsCleanAsync(flags.nonInteractive);
@@ -119,7 +121,6 @@ export async function runBuildAndSubmitAsync(
 
   for (const buildProfile of buildProfiles) {
     validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-    await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
   }
 
   const startedBuilds: {
@@ -134,11 +135,13 @@ export async function runBuildAndSubmitAsync(
       flags,
       moreBuilds: platforms.length > 1,
       buildProfile,
+      resourceClass:
+        platformToGraphQLResourceClassMapping[buildProfile.platform][
+          flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
+        ],
       easJsonCliConfig,
       actor,
-      graphqlClient,
-      analytics,
-      getDynamicProjectConfigAsync,
+      projectId,
     });
     if (maybeBuild) {
       startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -146,7 +149,7 @@ export async function runBuildAndSubmitAsync(
     buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
   }
 
-  if (flags.localBuildOptions.localBuildMode) {
+  if (flags.localBuildOptions.enable) {
     return;
   }
 
@@ -177,10 +180,7 @@ export async function runBuildAndSubmitAsync(
         submitProfile,
         nonInteractive: flags.nonInteractive,
       });
-      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(
-        graphqlClient,
-        startedBuild.build.id
-      );
+      startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
       submissions.push(submission);
     }
 
@@ -197,11 +197,9 @@ export async function runBuildAndSubmitAsync(
   }
 
   const { accountName } = Object.values(buildCtxByPlatform)[0];
-  const builds = await waitForBuildEndAsync(graphqlClient, {
+  const builds = await waitForBuildEndAsync({
     buildIds: startedBuilds.map(({ build }) => build.id),
     accountName,
-    projectDir,
-    nonInteractive: flags.nonInteractive,
   });
   if (!flags.json) {
     printBuildResults(builds);
@@ -210,25 +208,19 @@ export async function runBuildAndSubmitAsync(
   const haveAllBuildsFailedOrCanceled = builds.every(
     build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
   );
-
-  await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags);
-
   if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
     if (flags.json) {
       printJsonOnlyOutput(builds);
     }
     exitWithNonZeroCodeIfSomeBuildsFailed(builds);
   } else {
-    const completedSubmissions = await waitForSubmissionsToCompleteAsync(
-      graphqlClient,
-      submissions
-    );
+    const completedSubmissions = await waitForSubmissionsToCompleteAsync(submissions);
     if (flags.json) {
       printJsonOnlyOutput(
         await Promise.all(
           builds
             .filter((i): i is BuildWithSubmissionsFragment => !!i)
-            .map(build => BuildQuery.withSubmissionsByIdAsync(graphqlClient, build.id))
+            .map(build => BuildQuery.withSubmissionsByIdAsync(build.id))
         )
       );
     }
@@ -241,25 +233,23 @@ async function prepareAndStartBuildAsync({
   flags,
   moreBuilds,
   buildProfile,
+  resourceClass,
   easJsonCliConfig,
   actor,
-  graphqlClient,
-  analytics,
-  getDynamicProjectConfigAsync,
+  projectId,
 }: {
   projectDir: string;
   flags: BuildFlags;
   moreBuilds: boolean;
   buildProfile: ProfileData<'build'>;
+  resourceClass: BuildResourceClass;
   easJsonCliConfig: EasJson['cli'];
   actor: Actor;
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
-  getDynamicProjectConfigAsync: DynamicConfigContextFn;
+  projectId: string;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
     buildProfileName: buildProfile.profileName,
-    resourceClassFlag: flags.resourceClass,
+    resourceClass,
     clearCache: flags.clearCache,
     buildProfile: buildProfile.profile,
     nonInteractive: flags.nonInteractive,
@@ -270,9 +260,7 @@ async function prepareAndStartBuildAsync({
     easJsonCliConfig,
     message: flags.message,
     actor,
-    graphqlClient,
-    analytics,
-    getDynamicProjectConfigAsync,
+    projectId,
   });
 
   if (moreBuilds) {
@@ -284,14 +272,6 @@ async function prepareAndStartBuildAsync({
       )}`
     );
   }
-
-  await validateBuildProfileConfigMatchesProjectConfigAsync(
-    buildCtx.exp,
-    buildProfile,
-    buildCtx.projectId,
-    flags.nonInteractive
-  );
-
   await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
   if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
     validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
@@ -345,6 +325,7 @@ async function prepareAndStartSubmissionAsync({
   const submissionCtx = await createSubmissionContextAsync({
     platform,
     projectDir,
+    projectId: build.project.id,
     profile: submitProfile,
     archiveFlags: { id: build.id },
     nonInteractive,
@@ -352,10 +333,6 @@ async function prepareAndStartSubmissionAsync({
     credentialsCtx: buildCtx.credentialsCtx,
     applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
     actor: buildCtx.user,
-    graphqlClient: buildCtx.graphqlClient,
-    analytics: buildCtx.analytics,
-    projectId: buildCtx.projectId,
-    exp: buildCtx.exp,
   });
 
   if (moreBuilds) {
@@ -378,35 +355,3 @@ function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | nul
     process.exit(1);
   }
 }
-
-async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
-  assert(build.artifacts?.applicationArchiveUrl);
-  const buildPath = await downloadAndMaybeExtractAppAsync(
-    build.artifacts.applicationArchiveUrl,
-    build.platform
-  );
-  await runAsync(buildPath, build.platform);
-}
-
-async function maybeDownloadAndRunSimulatorBuildsAsync(
-  builds: MaybeBuildFragment[],
-  flags: BuildFlags
-): Promise<void> {
-  const simBuilds = builds.filter(truthy).filter(isRunnableOnSimulatorOrEmulator);
-
-  if (simBuilds.length > 0 && !flags.autoSubmit && !flags.nonInteractive) {
-    for (const simBuild of simBuilds) {
-      if (simBuild.platform === AppPlatform.Android || process.platform === 'darwin') {
-        Log.newLine();
-        const confirm = await confirmAsync({
-          message: `Install and run the ${
-            simBuild.platform === AppPlatform.Android ? 'Android' : 'iOS'
-          } build on ${simBuild.platform === AppPlatform.Android ? 'an emulator' : 'a simulator'}?`,
-        });
-        if (confirm) {
-          await downloadAndRunAsync(simBuild);
-        }
-      }
-    }
-  }
-}

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

@@ -38,10 +38,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
         }
       },
     },
-    {
-      label: 'Message',
-      value: build.message,
-    },
     {
       label: 'Distribution',
       value: build.distribution?.toLowerCase(),

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

@@ -1,4 +1,5 @@
 import assert from 'assert';
+import chalk from 'chalk';
 import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';
 
@@ -11,52 +12,27 @@ import {
   EasBuildDeprecationInfo,
   EasBuildDeprecationInfoType,
 } from '../../graphql/generated';
-import Log, { learnMore, link } from '../../log';
+import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
-function terminalLinkFallback(url: string, text: string): string {
-  return `${text} (${url})`;
-}
-
-const errorCodeToErrorMessageOverride: Record<string, (build: BuildFragment) => string> = {
-  EAS_BUILD_UNKNOWN_FASTLANE_ERROR: build =>
-    `The ${link(getBuildLogsUrl(build, 'run-fastlane'), {
-      text: '"Run fastlane"',
-      fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-fastlane'), '"Run fastlane"'),
-    })} step failed with an unknown error. Refer to the ${link(
-      getBuildLogsUrl(build, 'xcode-logs'),
-      {
-        text: '"Xcode logs"',
-        fallback: terminalLinkFallback(getBuildLogsUrl(build, 'xcode-logs'), '"Xcode logs"'),
-      }
-    )} phase for additional, more detailed logs`,
-  EAS_BUILD_UNKNOWN_GRADLE_ERROR: build =>
-    `Gradle build failed with unknown error. See logs for the ${link(
-      getBuildLogsUrl(build, 'run-gradlew'),
-      {
-        text: '"Run gradlew"',
-        fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-gradlew'), '"Run gradlew"'),
-      }
-    )} phase for more information.`,
-};
-
 export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {
-    Log.log(`Build details: ${link(getBuildLogsUrl(builds[0]))}`);
+    Log.log(`Build details: ${chalk.underline(getBuildLogsUrl(builds[0]))}`);
   } else {
     builds.forEach(build => {
       const logsUrl = getBuildLogsUrl(build);
       Log.log(
         `${appPlatformEmojis[build.platform]} ${
           appPlatformDisplayNames[build.platform]
-        } build details: ${link(logsUrl)}`
+        } build details: ${chalk.underline(logsUrl)}`
       );
     });
   }
 }
 
 export function printBuildResults(builds: (BuildFragment | null)[]): void {
+  Log.newLine();
   if (builds.length === 1) {
     const [build] = builds;
     assert(build, 'Build should be defined');
@@ -67,8 +43,8 @@ export function printBuildResults(builds: (BuildFragment | null)[]): void {
 }
 
 function printBuildResult(build: BuildFragment): void {
+  Log.addNewLineIfNone();
   if (build.status === BuildStatus.Errored) {
-    Log.addNewLineIfNone();
     const userError = build.error;
     Log.error(
       `${appPlatformEmojis[build.platform]} ${
@@ -76,12 +52,11 @@ function printBuildResult(build: BuildFragment): void {
       } build failed${userError ? ':' : ''}`
     );
     if (userError) {
-      printUserError(userError, build);
+      printUserError(userError);
     }
     return;
   }
   if (build.status === BuildStatus.Canceled) {
-    Log.addNewLineIfNone();
     Log.error(
       `${appPlatformEmojis[build.platform]} ${
         appPlatformDisplayNames[build.platform]
@@ -91,7 +66,6 @@ function printBuildResult(build: BuildFragment): void {
   }
 
   if (build.distribution === DistributionType.Internal) {
-    Log.addNewLineIfNone();
     const logsUrl = getBuildLogsUrl(build);
     // It's tricky to install the .apk file directly on Android so let's fallback
     // to the build details page and let people press the button to download there
@@ -105,18 +79,13 @@ function printBuildResult(build: BuildFragment): void {
         appPlatformDisplayNames[build.platform]
       } devices (or scan the QR code) to install the app:`
     );
-    Log.log(`${link(logsUrl)}`);
+    Log.log(`${chalk.underline(logsUrl)}`);
   } else {
     // TODO: it looks like buildUrl could possibly be undefined, based on the code below.
     // we should account for this case better if it is possible
-    const url = build.artifacts?.buildUrl;
-    if (url) {
-      Log.addNewLineIfNone();
-      Log.log(
-        `${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`
-      );
-      Log.log(link(url));
-    }
+    const url = build.artifacts?.buildUrl ?? '';
+    Log.log(`${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`);
+    Log.log(`${chalk.underline(url)}`);
   }
 }
 
@@ -137,22 +106,9 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
   }
 }
 
-export function printUserError(error: BuildError, build: BuildFragment): void {
-  const maybeErrorMessageOverride = maybeGetErrorMessageOverride(error, build);
-  if (maybeErrorMessageOverride) {
-    Log.error(maybeErrorMessageOverride);
-  } else {
-    Log.error(error.message);
-    if (error.docsUrl) {
-      Log.error(learnMore(error.docsUrl, { dim: false }));
-    }
+export function printUserError(error: BuildError): void {
+  Log.error(error.message);
+  if (error.docsUrl) {
+    Log.error(learnMore(error.docsUrl, { dim: false }));
   }
 }
-
-function maybeGetErrorMessageOverride(error: BuildError, build: BuildFragment): string | null {
-  if (!(error.errorCode in errorCodeToErrorMessageOverride)) {
-    return null;
-  }
-
-  return errorCodeToErrorMessageOverride[error.errorCode](build);
-}

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

@@ -1,113 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, ResourceClass } from '@expo/eas-json';
-import chalk from 'chalk';
-import semver from 'semver';
-
-import { BuildResourceClass } from '../../graphql/generated';
-import Log from '../../log';
-import { getReactNativeVersionAsync } from '../metadata';
-
-const iosResourceClassToBuildResourceClassMapping: Record<ResourceClass, BuildResourceClass> = {
-  [ResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
-  [ResourceClass.LARGE]: BuildResourceClass.IosLarge,
-  [ResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosM1Large,
-  [ResourceClass.M1_MEDIUM]: BuildResourceClass.IosM1Medium,
-  [ResourceClass.M1_LARGE]: BuildResourceClass.IosM1Large,
-  [ResourceClass.INTEL_MEDIUM]: BuildResourceClass.IosIntelMedium,
-  [ResourceClass.MEDIUM]: BuildResourceClass.IosMedium,
-};
-
-const androidResourceClassToBuildResourceClassMapping: Record<
-  Exclude<
-    ResourceClass,
-    | ResourceClass.M1_EXPERIMENTAL
-    | ResourceClass.M1_MEDIUM
-    | ResourceClass.M1_LARGE
-    | ResourceClass.INTEL_MEDIUM
-  >,
-  BuildResourceClass
-> = {
-  [ResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
-  [ResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
-  [ResourceClass.MEDIUM]: BuildResourceClass.AndroidMedium,
-};
-
-export async function resolveBuildResourceClassAsync<T extends Platform>(
-  profile: BuildProfile<T>,
-  platform: Platform,
-  projectDir: string,
-  exp: ExpoConfig,
-  resourceClassFlag?: ResourceClass
-): Promise<BuildResourceClass> {
-  const profileResourceClass = profile.resourceClass;
-
-  if (profileResourceClass && resourceClassFlag && resourceClassFlag !== profileResourceClass) {
-    Log.warn(
-      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing the  "${resourceClassFlag}" as the override.`
-    );
-  }
-
-  const selectedResourceClass = resourceClassFlag ?? profileResourceClass;
-
-  return platform === Platform.IOS
-    ? await resolveIosResourceClassAsync(exp, projectDir, resourceClassFlag ?? profileResourceClass)
-    : resolveAndroidResourceClass(selectedResourceClass);
-}
-
-function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): BuildResourceClass {
-  if (
-    selectedResourceClass &&
-    [
-      ResourceClass.M1_EXPERIMENTAL,
-      ResourceClass.M1_MEDIUM,
-      ResourceClass.M1_LARGE,
-      ResourceClass.INTEL_MEDIUM,
-    ].includes(selectedResourceClass)
-  ) {
-    throw new Error(`Resource class ${selectedResourceClass} is only available for iOS builds`);
-  }
-
-  const resourceClass = selectedResourceClass ?? ResourceClass.DEFAULT;
-
-  return androidResourceClassToBuildResourceClassMapping[
-    resourceClass as Exclude<
-      ResourceClass,
-      | ResourceClass.M1_EXPERIMENTAL
-      | ResourceClass.M1_MEDIUM
-      | ResourceClass.M1_LARGE
-      | ResourceClass.INTEL_MEDIUM
-    >
-  ];
-}
-
-async function resolveIosResourceClassAsync(
-  exp: ExpoConfig,
-  projectDir: string,
-  selectedResourceClass?: ResourceClass
-): Promise<BuildResourceClass> {
-  const resourceClass =
-    selectedResourceClass ?? (await resolveIosDefaultRequestedResourceClassAsync(exp, projectDir));
-
-  if (resourceClass === ResourceClass.M1_EXPERIMENTAL) {
-    Log.warn(`Resource class ${chalk.bold('m1-experimental')} is deprecated.`);
-  }
-
-  return iosResourceClassToBuildResourceClassMapping[resourceClass];
-}
-
-async function resolveIosDefaultRequestedResourceClassAsync(
-  exp: ExpoConfig,
-  projectDir: string
-): Promise<ResourceClass> {
-  const { sdkVersion } = exp;
-  const reactNativeVersion = await getReactNativeVersionAsync(projectDir);
-  if (
-    (sdkVersion && semver.satisfies(sdkVersion, '>=48')) ||
-    (reactNativeVersion && semver.satisfies(reactNativeVersion, '>=0.71.0'))
-  ) {
-    return ResourceClass.M1_MEDIUM;
-  } else {
-    return ResourceClass.DEFAULT;
-  }
-}

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

@@ -10,14 +10,12 @@ export function getProjectDashboardUrl(accountName: string, projectName: string)
   ).toString();
 }
 
-export function getBuildLogsUrl(build: BuildFragment, hash?: string): string {
+export function getBuildLogsUrl(build: BuildFragment): string {
   const { project } = build;
   const url =
     project.__typename !== 'App'
       ? `/builds/${build.id}`
-      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}${
-          hash ? `#${hash}` : ''
-        }`;
+      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
 
   return new URL(url, getExpoWebsiteBaseUrl()).toString();
 }

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

@@ -1,11 +1,8 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { Errors } from '@oclif/core';
 import fs from 'fs-extra';
 import path from 'path';
-import semver from 'semver';
 
 import Log, { learnMore } from '../log';
-import { isPNGAsync } from '../utils/image';
 import { getVcsClient } from '../vcs';
 import { CommonContext } from './context';
 
@@ -53,137 +50,3 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
 function isInsideDirectory(file: string, directory: string): boolean {
   return file.startsWith(directory);
 }
-
-export async function validatePNGsForManagedProjectAsync<T extends Platform>(
-  ctx: CommonContext<T>
-): Promise<void> {
-  if (ctx.workflow !== Workflow.MANAGED) {
-    return;
-  }
-
-  // don't run PNG checks on SDK 47 and newer
-  // see https://github.com/expo/eas-cli/pull/1477#issuecomment-1293914917
-  if (!ctx.exp.sdkVersion || semver.satisfies(ctx.exp.sdkVersion, '>= 47.0.0')) {
-    return;
-  }
-
-  if (ctx.platform === Platform.ANDROID) {
-    await validateAndroidPNGsAsync(ctx as CommonContext<Platform.ANDROID>);
-  }
-  // Validating iOS PNGs is currently disabled
-  // See https://github.com/expo/eas-cli/pull/1477 for context
-  //
-  // else {
-  //   await validateIosPNGsAsync(ctx as CommonContext<Platform.IOS>);
-  // }
-}
-
-type ConfigPng = { configPath: string; pngPath: string | undefined };
-
-async function validateAndroidPNGsAsync(ctx: CommonContext<Platform.ANDROID>): Promise<void> {
-  const pngs: ConfigPng[] = [
-    {
-      configPath: 'exp.icon',
-      pngPath: ctx.exp.icon,
-    },
-    {
-      configPath: 'exp.android.icon',
-      pngPath: ctx.exp.android?.icon,
-    },
-    {
-      configPath: 'exp.android.adaptiveIcon.foregroundImage',
-      pngPath: ctx.exp.android?.adaptiveIcon?.foregroundImage,
-    },
-    {
-      configPath: 'exp.android.adaptiveIcon.backgroundImage',
-      pngPath: ctx.exp.android?.adaptiveIcon?.backgroundImage,
-    },
-    {
-      configPath: 'exp.splash.image',
-      pngPath: ctx.exp.splash?.image,
-    },
-    {
-      configPath: 'exp.notification.icon',
-      pngPath: ctx.exp.notification?.icon,
-    },
-  ];
-  await validatePNGsAsync(pngs);
-}
-
-// Validating iOS PNGs is currently disabled
-// See https://github.com/expo/eas-cli/pull/1477 for context
-//
-// async function validateIosPNGsAsync(ctx: CommonContext<Platform.IOS>): Promise<void> {
-//   const pngs: ConfigPng[] = [
-//     {
-//       configPath: 'exp.icon',
-//       pngPath: ctx.exp.icon,
-//     },
-//     {
-//       configPath: 'exp.ios.icon',
-//       pngPath: ctx.exp.ios?.icon,
-//     },
-//     {
-//       configPath: 'exp.splash.image',
-//       pngPath: ctx.exp.splash?.image,
-//     },
-//     {
-//       configPath: 'exp.notification.icon',
-//       pngPath: ctx.exp.notification?.icon,
-//     },
-//   ];
-//   await validatePNGsAsync(pngs);
-
-//   const icon = ctx.exp.ios?.icon ?? ctx.exp.icon;
-//   if (!icon) {
-//     return;
-//   }
-//   const iconConfigPath = `expo${ctx.exp.ios?.icon ? '.ios' : ''}.icon`;
-
-//   try {
-//     await ensurePNGIsNotTransparentAsync(icon);
-//   } catch (err: any) {
-//     if (err instanceof ImageTransparencyError) {
-//       Log.error(
-//         `Your iOS app icon (${iconConfigPath}) can't have transparency if you wish to upload your app to the Apple App Store.`
-//       );
-//       Log.error(learnMore('https://expo.fyi/remove-alpha-channel', { dim: false }));
-//       Errors.exit(1);
-//     } else {
-//       throw err;
-//     }
-//   }
-// }
-
-async function validatePNGsAsync(configPngs: ConfigPng[]): Promise<void> {
-  const validationPromises = configPngs.map(configPng => validatePNGAsync(configPng));
-  const validationResults = await Promise.allSettled(validationPromises);
-  const failedValidations = validationResults.filter(
-    (result): result is PromiseRejectedResult => result.status === 'rejected'
-  );
-
-  if (failedValidations.length === 0) {
-    return;
-  }
-
-  Log.error('PNG images validation failed:');
-  for (const { reason } of failedValidations) {
-    const error: Error = reason;
-    Log.error(`- ${error.message}`);
-  }
-  Errors.exit(1);
-}
-
-async function validatePNGAsync({ configPath, pngPath }: ConfigPng): Promise<void> {
-  if (!pngPath) {
-    return;
-  }
-
-  if (!pngPath.endsWith('.png')) {
-    throw new Error(`"${configPath}" is not a PNG file`);
-  }
-
-  if (!(await isPNGAsync(pngPath))) {
-    throw new Error(`"${configPath}" is not valid PNG`);
-  }
-}

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

@@ -1,5 +0,0 @@
-export class ChannelNotFoundError extends Error {
-  constructor(message?: string) {
-    super(message ?? 'Channel not found.');
-  }
-}

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

@@ -1,12 +1,7 @@
 import chalk from 'chalk';
-import gql from 'graphql-tag';
 
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { withErrorHandlingAsync } from '../graphql/client';
 import {
-  CreateUpdateChannelOnAppMutation,
-  CreateUpdateChannelOnAppMutationVariables,
   ViewBranchesOnUpdateChannelQueryVariables,
   ViewUpdateChannelsOnAppQueryVariables,
 } from '../graphql/generated';
@@ -23,18 +18,15 @@ import { logChannelDetails } from './utils';
 
 export const CHANNELS_LIMIT = 25;
 
-export async function selectChannelOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    selectionPromptTitle,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    selectionPromptTitle: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<UpdateChannelObject> {
+export async function selectChannelOnAppAsync({
+  projectId,
+  selectionPromptTitle,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  selectionPromptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateChannelObject> {
   if (paginatedQueryOptions.nonInteractive) {
     throw new Error('Unable to select a channel in non-interactive mode.');
   }
@@ -42,11 +34,10 @@ export async function selectChannelOnAppAsync(
   const updateChannel = await paginatedQueryWithSelectPromptAsync({
     limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
     offset: paginatedQueryOptions.offset,
-    queryToPerform: (limit, offset) =>
-      queryChannelsOnAppAsync(graphqlClient, { appId: projectId, limit, offset }),
+    queryToPerform: (limit, offset) => queryChannelsOnAppAsync({ appId: projectId, limit, offset }),
     promptOptions: {
       title: selectionPromptTitle,
-      makePartialChoiceObject: updateChannel => ({ title: updateChannel.name }),
+      createDisplayTextForSelectionPromptListItem: updateChannel => updateChannel.name,
       getIdentifierForQueryItem: updateChannel => updateChannel.id,
     },
   });
@@ -57,18 +48,15 @@ export async function selectChannelOnAppAsync(
   return updateChannel;
 }
 
-export async function listAndRenderChannelsOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<void> {
+export async function listAndRenderChannelsOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
   if (paginatedQueryOptions.nonInteractive) {
-    const channels = await queryChannelsOnAppAsync(graphqlClient, {
+    const channels = await queryChannelsOnAppAsync({
       appId: projectId,
       limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
       offset: paginatedQueryOptions.offset,
@@ -79,7 +67,7 @@ export async function listAndRenderChannelsOnAppAsync(
       limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
       offset: paginatedQueryOptions.offset,
       queryToPerform: (limit, offset) =>
-        queryChannelsOnAppAsync(graphqlClient, { limit, offset, appId: projectId }),
+        queryChannelsOnAppAsync({ limit, offset, appId: projectId }),
       promptOptions: {
         title: 'Load more channels?',
         renderListItems: channels => renderPageOfChannels(channels, paginatedQueryOptions),
@@ -88,23 +76,20 @@ export async function listAndRenderChannelsOnAppAsync(
   }
 }
 
-export async function listAndRenderBranchesAndUpdatesOnChannelAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId: appId,
-    channelName,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    channelName: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<void> {
-  const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, { appId, channelName });
+export async function listAndRenderBranchesAndUpdatesOnChannelAsync({
+  projectId: appId,
+  channelName,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  channelName: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
+  const channel = await ChannelQuery.viewUpdateChannelAsync({ appId, channelName });
   renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });
 
   if (paginatedQueryOptions.nonInteractive) {
-    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync(graphqlClient, {
+    const branches = await queryBranchesAndUpdateGroupsOnChannelAsync({
       appId,
       channelName,
       offset: paginatedQueryOptions.offset,
@@ -116,7 +101,7 @@ export async function listAndRenderBranchesAndUpdatesOnChannelAsync(
       limit: paginatedQueryOptions.limit ?? CHANNELS_LIMIT,
       offset: paginatedQueryOptions.offset,
       queryToPerform: (limit, offset) =>
-        queryBranchesAndUpdateGroupsOnChannelAsync(graphqlClient, {
+        queryBranchesAndUpdateGroupsOnChannelAsync({
           channelName,
           appId,
           offset,
@@ -131,11 +116,12 @@ export async function listAndRenderBranchesAndUpdatesOnChannelAsync(
   }
 }
 
-async function queryChannelsOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, offset, limit }: ViewUpdateChannelsOnAppQueryVariables
-): Promise<UpdateChannelObject[]> {
-  return await ChannelQuery.viewUpdateChannelsOnAppAsync(graphqlClient, {
+async function queryChannelsOnAppAsync({
+  appId,
+  offset,
+  limit,
+}: ViewUpdateChannelsOnAppQueryVariables): Promise<UpdateChannelObject[]> {
+  return await ChannelQuery.viewUpdateChannelsOnAppAsync({
     appId,
     offset,
     limit,
@@ -143,10 +129,9 @@ async function queryChannelsOnAppAsync(
 }
 
 async function queryBranchesAndUpdateGroupsOnChannelAsync(
-  graphqlClient: ExpoGraphqlClient,
   args: ViewBranchesOnUpdateChannelQueryVariables
 ): Promise<UpdateBranchOnChannelObject[]> {
-  return await BranchQuery.listBranchesOnChannelAsync(graphqlClient, args);
+  return await BranchQuery.listBranchesOnChannelAsync(args);
 }
 
 function renderPageOfChannels(
@@ -157,13 +142,14 @@ function renderPageOfChannels(
     printJsonOnlyOutput({ currentPage });
   } else {
     for (const channel of currentPage) {
-      renderChannelHeaderContent({ channelName: channel.name, channelId: channel.id });
       Log.addNewLineIfNone();
+      Log.log(
+        formatFields([
+          { label: 'Name', value: channel.name },
+          { label: 'ID', value: channel.id },
+        ])
+      );
       logChannelDetails(channel);
-
-      if (currentPage.indexOf(channel) < currentPage.length - 1) {
-        Log.log(`\n${chalk.dim('———')}\n`);
-      }
     }
   }
 }
@@ -177,8 +163,13 @@ function renderPageOfBranchesOnChannel(
   if (json) {
     printJsonOnlyOutput({ currentPage: channelWithNewBranches });
   } else {
-    // The channel details contain both the branch and latest update group
     Log.addNewLineIfNone();
+    Log.log(
+      formatFields([
+        { label: 'Name', value: channel.name },
+        { label: 'ID', value: channel.id },
+      ])
+    );
     logChannelDetails(channelWithNewBranches);
   }
 }
@@ -201,64 +192,3 @@ function renderChannelHeaderContent({
   Log.addNewLineIfNone();
   Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
 }
-
-export async function createChannelOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    appId,
-    branchId,
-    channelName,
-  }: {
-    appId: string;
-    branchId: string;
-    channelName: string;
-  }
-): Promise<CreateUpdateChannelOnAppMutation> {
-  // Point the new channel at a branch with its same name.
-  const branchMapping = JSON.stringify({
-    data: [{ branchId, branchMappingLogic: 'true' }],
-    version: 0,
-  });
-  return await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<CreateUpdateChannelOnAppMutation, CreateUpdateChannelOnAppMutationVariables>(
-        gql`
-          mutation CreateUpdateChannelOnApp($appId: ID!, $name: String!, $branchMapping: String!) {
-            updateChannel {
-              createUpdateChannelForApp(appId: $appId, name: $name, branchMapping: $branchMapping) {
-                id
-                name
-                branchMapping
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name: channelName,
-          branchMapping,
-        }
-      )
-      .toPromise()
-  );
-}
-
-export async function ensureChannelExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, branchId, channelName }: { appId: string; branchId: string; channelName: string }
-): Promise<void> {
-  try {
-    await createChannelOnAppAsync(graphqlClient, {
-      appId,
-      channelName,
-      branchId,
-    });
-  } catch (e: any) {
-    const isIgnorableError =
-      e.graphQLErrors?.length === 1 &&
-      e.graphQLErrors[0].extensions.errorCode === 'CHANNEL_ALREADY_EXISTS';
-    if (!isIgnorableError) {
-      throw e;
-    }
-  }
-}

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

@@ -1,13 +1,9 @@
 import assert from 'assert';
-import chalk from 'chalk';
+import CliTable from 'cli-table3';
 
 import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import Log from '../log';
-import {
-  FormattedBranchDescription,
-  formatBranch,
-  getUpdateGroupDescriptionsWithBranch,
-} from '../update/utils';
+import { UPDATE_COLUMNS, getUpdateGroupDescriptionsWithBranch } from '../update/utils';
 
 export type BranchMapping = {
   version: number;
@@ -46,7 +42,7 @@ export function getBranchMapping(branchMappingString?: string): {
   }
 
   const isRollout = branchMapping.data.length === 2;
-  const rolloutPercent = branchMapping.data[0]?.branchMappingLogic.operand;
+  const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
 
   switch (branchMapping.data.length) {
     case 0:
@@ -79,39 +75,38 @@ export function getBranchMapping(branchMappingString?: string): {
 
 export function logChannelDetails(channel: UpdateChannelObject): void {
   const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+
+  const updateChannelsTable = new CliTable({
+    head: ['branch', ...(isRollout ? ['rollout percent'] : []), ...UPDATE_COLUMNS],
+    wordWrap: true,
+  });
+
   if (branchMapping.data.length > 2) {
     throw new Error('Branch Mapping data must have length less than or equal to 2.');
   }
 
   const rolloutBranchIds = branchMapping.data.map(data => data.branchId);
-  const branchDescription = channel.updateBranches.flatMap(branch => {
-    const updateGroupWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-      branch.updateGroups
+
+  for (const currentBranch of channel.updateBranches) {
+    const updateGroupDescriptions = getUpdateGroupDescriptionsWithBranch(
+      currentBranch.updateGroups
     );
 
-    const isRolloutBranch = isRollout && rolloutBranchIds.includes(branch.id);
-    const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === branch.id;
-    let rolloutPercentNumber: number | undefined = undefined;
-    if (isRolloutBranch) {
-      rolloutPercentNumber = isBaseBranch ? rolloutPercent! * 100 : (1 - rolloutPercent!) * 100;
-    }
+    const isRolloutBranch = isRollout && rolloutBranchIds.includes(currentBranch.id);
+    const isBaseBranch = rolloutBranchIds.length > 0 && rolloutBranchIds[0] === currentBranch.id;
 
-    return updateGroupWithBranchDescriptions.map(
-      ({ branch, ...updateGroup }): FormattedBranchDescription => ({
+    updateGroupDescriptions.forEach(({ branch, message, runtimeVersion, group, platforms }) => {
+      updateChannelsTable.push([
         branch,
-        branchRolloutPercentage: rolloutPercentNumber,
-        update: updateGroup,
-      })
-    );
-  });
-
-  if (branchDescription.length === 0) {
-    Log.log(chalk.dim('No branches are pointed to this channel.'));
-  } else {
-    Log.log(
-      branchDescription
-        .map(description => formatBranch(description))
-        .join(`\n\n${chalk.dim('———')}\n\n`)
-    );
+        ...(isRolloutBranch
+          ? [isBaseBranch ? `${rolloutPercent! * 100}%` : `${(1 - rolloutPercent!) * 100}%`]
+          : []),
+        message,
+        runtimeVersion,
+        group,
+        platforms,
+      ]);
+    });
   }
+  Log.log(updateChannelsTable.toString());
 }

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

@@ -1,21 +1,85 @@
+import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
+import * as PackageManagerUtils from '@expo/package-manager';
 import { Command } from '@oclif/core';
-import nullthrows from 'nullthrows';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+import semver from 'semver';
 
 import {
-  AnalyticsWithOrchestration,
-  CommandEvent,
-  createAnalyticsAsync,
-} from '../analytics/AnalyticsManager';
-import SessionManager from '../user/SessionManager';
-import AnalyticsContextField from './context/AnalyticsContextField';
-import ContextField from './context/ContextField';
-import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
-import LoggedInContextField from './context/LoggedInContextField';
-import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
-import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
-import ProjectConfigContextField from './context/ProjectConfigContextField';
-import ProjectDirContextField from './context/ProjectDirContextField';
-import SessionManagementContextField from './context/SessionManagementContextField';
+  AnalyticsEvent,
+  flushAsync as flushAnalyticsAsync,
+  initAsync as initAnalyticsAsync,
+  logEvent,
+} from '../analytics/rudderstackClient';
+import { learnMore } from '../log';
+import { getExpoConfig } from '../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
+import { Actor, getUserAsync } from '../user/User';
+import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { setVcsClient } from '../vcs';
+import GitClient from '../vcs/clients/git';
+
+export interface CommandConfiguration {
+  /**
+   * When user data is unavailable locally, determines if the command will
+   * force the user to log in. By default, all commands require authentication.
+   */
+  allowUnauthenticated?: boolean;
+
+  /**
+   * Whether a command can be run outside of an Expo project directory.
+   * By default, all commands must be run inside an Expo project directory.
+   */
+  canRunOutsideProject?: boolean;
+}
+
+export interface ContextOptions {
+  nonInteractive: boolean;
+}
+
+export abstract class ContextField<T> {
+  abstract getValueAsync(options: ContextOptions): Promise<T>;
+}
+
+export class ProjectIdContextField extends ContextField<string> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<string> {
+    const projectDir = await findProjectRootAsync();
+    const exp = getExpoConfig(projectDir);
+    return await getProjectIdAsync(exp, { nonInteractive });
+  }
+}
+
+export class OptionalProjectIdContextField extends ContextField<string | undefined> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<string | undefined> {
+    const projectDir = await findProjectRootAsync();
+    if (!projectDir) {
+      return undefined;
+    }
+
+    const exp = getExpoConfig(projectDir);
+    return await getProjectIdAsync(exp, { nonInteractive });
+  }
+}
+
+export class ActorContextField extends ContextField<Actor> {
+  async getValueAsync({ nonInteractive }: ContextOptions): Promise<Actor> {
+    return await ensureLoggedInAsync({ nonInteractive });
+  }
+}
+
+export const EASCommandProjectIdContext = {
+  projectId: new ProjectIdContextField(),
+};
+
+export const EASCommandProjectIdIfProjectDirContext = {
+  projectId: new OptionalProjectIdContextField(),
+};
+
+export const EASCommandLoggedInContext = {
+  actor: new ActorContextField(),
+};
 
 type ContextInput<
   T extends {
@@ -34,78 +98,10 @@ type ContextOutput<
 };
 
 export default abstract class EasCommand extends Command {
-  protected static readonly ContextOptions = {
-    /**
-     * Require this command to be run when logged-in. Returns the logged-in actor and a logged-in
-     * graphql client in the context.
-     */
-    LoggedIn: {
-      loggedIn: new LoggedInContextField(),
-    },
-    /**
-     * Do not require this command to be run when logged-in, but if it is get the logged-in actor and a
-     * maybe-logged-in graphql client.
-     */
-    MaybeLoggedIn: {
-      maybeLoggedIn: new MaybeLoggedInContextField(),
-    },
-    /**
-     * Specify this context requirement if the command needs to mutate the user session.
-     */
-    SessionManagment: {
-      sessionManager: new SessionManagementContextField(),
-    },
-    /**
-     * Require the project to be identified and registered on server if this command is being
-     * run within a project directory, null otherwise.
-     */
-    OptionalProjectConfig: {
-      projectConfig: new OptionalProjectConfigContextField(),
-    },
-    /**
-     * Require this command to be run in a project directory. Return the project directory in the context.
-     */
-    ProjectDir: {
-      projectDir: new ProjectDirContextField(),
-    },
-    /**
-     * Provides functions to load the project config when dynamic config options are needed (custom Env for example).
-     */
-    DynamicProjectConfig: {
-      // eslint-disable-next-line async-protect/async-suffix
-      getDynamicProjectConfigAsync: new DynamicProjectConfigContextField(),
-    },
-    /**
-     * Require the project to be identified and registered on server. Returns the project config in the context.
-     * This also requires the user to be logged in (getProjectIdAsync requires logged in), so also expose that context.
-     * Exposing the loggedIn context here helps us guarantee user identification for logging purposes.
-     */
-    ProjectConfig: {
-      loggedIn: new LoggedInContextField(),
-      projectConfig: new ProjectConfigContextField(),
-    },
-    /**
-     * Analytics manager. Returns the analytics manager in the context for use by the command.
-     */
-    Analytics: {
-      analytics: new AnalyticsContextField(),
-    },
-  };
-
-  /**
-   * Context allows for subclasses (commands) to declare their prerequisites in a type-safe manner.
-   * These declarative definitions each output a context property that is the result of the prerequisite being
-   * satisfied. These allow a unified common interface to be shared amongst commands in order to provide a more
-   * consistent CLI experience.
-   *
-   * For example, let's say a command needs the EAS project ID to make a GraphQL mutation. It should declare that
-   * it requires the `ProjectConfig` context, and then call `getContextAsync` to get the project ID.
-   */
   static contextDefinition: ContextInput = {};
 
-  /**
-   * Execute the context in the contextDefinition to satisfy command prerequisites.
-   */
+  protected commandConfiguration: CommandConfiguration = {};
+
   protected async getContextAsync<
     C extends {
       [name: string]: any;
@@ -116,52 +112,36 @@ export default abstract class EasCommand extends Command {
   ): Promise<ContextOutput<C>> {
     const contextDefinition = commandClass.contextDefinition;
 
-    // do these serially so that they don't do things like ask for login twice in parallel
-    const contextValuePairs = [];
-    for (const [contextKey, contextField] of Object.entries(contextDefinition)) {
-      contextValuePairs.push([
-        contextKey,
-        await contextField.getValueAsync({
-          nonInteractive,
-          sessionManager: this.sessionManager,
-          analytics: this.analytics,
-        }),
-      ]);
-    }
+    const contextValuePairs = await Promise.all(
+      Object.keys(contextDefinition).map(async contextKey => {
+        return [contextKey, await contextDefinition[contextKey].getValueAsync({ nonInteractive })];
+      })
+    );
 
     return Object.fromEntries(contextValuePairs);
   }
 
-  /**
-   * The user session manager. Responsible for coordinating all user session related state.
-   * If needed in a subclass, use the SessionManager ContextOption.
-   */
-  private sessionManagerInternal?: SessionManager;
-  private get sessionManager(): SessionManager {
-    return nullthrows(this.sessionManagerInternal);
-  }
-
-  /**
-   * The analytics manager. Used for logging analytics.
-   * It is set up here to ensure a consistent set up.
-   */
-  private analyticsInternal?: AnalyticsWithOrchestration;
-  private get analytics(): AnalyticsWithOrchestration {
-    return nullthrows(this.analyticsInternal);
-  }
-
   protected abstract runAsync(): Promise<any>;
 
   // eslint-disable-next-line async-protect/async-suffix
   async run(): Promise<any> {
-    this.analyticsInternal = await createAnalyticsAsync();
-    this.sessionManagerInternal = new SessionManager(this.analytics);
+    await initAnalyticsAsync();
 
-    // this is needed for logEvent call below as it identifies the user in the analytics system
-    // if possible
-    await this.sessionManager.getUserAsync();
+    if (!this.commandConfiguration.canRunOutsideProject) {
+      const projectDir = await findProjectRootAsync();
+      await this.applyCliConfigAsync(projectDir);
+      await this.ensureEasCliIsNotInDependenciesAsync(projectDir);
+    }
 
-    this.analytics.logEvent(CommandEvent.ACTION, {
+    if (!this.commandConfiguration.allowUnauthenticated) {
+      const { flags } = await this.parse();
+      const nonInteractive = (flags as any)['non-interactive'] ?? false;
+      await ensureLoggedInAsync({ nonInteractive });
+    } else {
+      await getUserAsync();
+    }
+
+    logEvent(AnalyticsEvent.ACTION, {
       // id is assigned by oclif in constructor based on the filepath:
       // commands/submit === submit, commands/build/list === build:list
       action: `eas ${this.id}`,
@@ -172,7 +152,66 @@ export default abstract class EasCommand extends Command {
 
   // eslint-disable-next-line async-protect/async-suffix
   override async finally(err: Error): Promise<any> {
-    await this.analytics.flushAsync();
+    await flushAnalyticsAsync();
     return super.finally(err);
   }
+
+  private async applyCliConfigAsync(projectDir: string): Promise<void> {
+    const easJsonAccessor = new EasJsonAccessor(projectDir);
+    const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
+    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
+      throw new Error(
+        `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
+      );
+    }
+    if (config?.requireCommit) {
+      setVcsClient(new GitClient());
+    }
+  }
+
+  private async ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise<void> {
+    let printCliVersionWarning = false;
+
+    const consoleWarn = (msg?: string): void => {
+      if (msg) {
+        // eslint-disable-next-line no-console
+        console.warn(chalk.yellow(msg));
+      } else {
+        // eslint-disable-next-line no-console
+        console.warn();
+      }
+    };
+
+    if (await this.isEasCliInDependenciesAsync(projectDir)) {
+      printCliVersionWarning = true;
+      consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
+    }
+
+    const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
+    if (maybeRepoRoot !== projectDir && (await this.isEasCliInDependenciesAsync(maybeRepoRoot))) {
+      printCliVersionWarning = true;
+      consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);
+    }
+
+    if (printCliVersionWarning) {
+      consoleWarn(
+        `It's recommended to use the ${chalk.bold(
+          '"cli.version"'
+        )} field in eas.json to enforce the ${chalk.bold('eas-cli')} version for your project.`
+      );
+      consoleWarn(
+        learnMore('https://github.com/expo/eas-cli#enforcing-eas-cli-version-for-your-project')
+      );
+      consoleWarn();
+    }
+  }
+
+  private async isEasCliInDependenciesAsync(dir: string): Promise<boolean> {
+    const packageJsonPath = path.join(dir, 'package.json');
+    const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
+    return (
+      packageJson?.dependencies?.['eas-cli'] !== undefined ||
+      packageJson?.devDependencies?.['eas-cli'] !== undefined
+    );
+  }
 }

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

@@ -1,14 +1,18 @@
-import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
-import SessionManager from '../../user/SessionManager';
-import EasCommand from '../EasCommand';
+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, { CommandConfiguration } from '../EasCommand';
 
 jest.mock('../../user/User');
-jest.mock('../../user/SessionManager');
-jest.mock('../../analytics/AnalyticsManager', () => {
-  const { CommandEvent } = jest.requireActual('../../analytics/AnalyticsManager');
+jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
+jest.mock('../../analytics/rudderstackClient', () => {
+  const { AnalyticsEvent } = jest.requireActual('../../analytics/rudderstackClient');
   return {
-    CommandEvent,
-    createAnalyticsAsync: jest.fn(),
+    AnalyticsEvent,
+    logEvent: jest.fn(),
+    initAsync: jest.fn(),
+    flushAsync: jest.fn(),
   };
 });
 
@@ -23,20 +27,26 @@ afterAll(() => {
   process.argv = originalProcessArgv;
 });
 
-const analytics: AnalyticsWithOrchestration = {
-  logEvent: jest.fn((): void => {}),
-  setActor: jest.fn((): void => {}),
-  flushAsync: jest.fn(async (): Promise<void> => {}),
-};
-
 beforeEach(() => {
-  jest.resetAllMocks();
-
-  jest.mocked(createAnalyticsAsync).mockResolvedValue(analytics);
+  jest
+    .mocked(getUserAsync)
+    .mockReset()
+    .mockImplementation(async () => mockJester);
+  jest
+    .mocked(ensureLoggedInAsync)
+    .mockReset()
+    .mockImplementation(async () => mockJester);
+  jest.mocked(initAsync).mockReset();
+  jest.mocked(flushAsync).mockReset();
+  jest.mocked(logEvent).mockReset();
 });
 
-const createTestEasCommand = (): typeof EasCommand => {
+const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
   class TestEasCommand extends EasCommand {
+    protected override commandConfiguration: CommandConfiguration = {
+      allowUnauthenticated: !authValue,
+    };
+
     async runAsync(): Promise<void> {}
   }
 
@@ -53,33 +63,40 @@ describe(EasCommand.name, () => {
     //
     // See https://github.com/oclif/command/blob/master/src/command.ts#L80
     // and look for "Config.load"
-    it('ensures the user data is read', async () => {
-      const TestEasCommand = createTestEasCommand();
+    it('ensures the user is logged in', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
-      const sessionManagerSpy = jest.spyOn(SessionManager.prototype, 'getUserAsync');
-      expect(sessionManagerSpy).toBeCalledTimes(1);
-    }, 30_000);
+      expect(ensureLoggedInAsync).toHaveBeenCalled();
+    }, 15_000);
+
+    it('ensures the user data is read from cache', async () => {
+      const TestEasCommand = createTestEasCommand(false);
+      await TestEasCommand.run();
+
+      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
+      expect(jest.mocked(ensureLoggedInAsync)).not.toBeCalled();
+    });
 
     it('initializes analytics', async () => {
-      const TestEasCommand = createTestEasCommand();
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
-      expect(createAnalyticsAsync).toHaveBeenCalled();
+      expect(initAsync).toHaveBeenCalled();
     });
 
     it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand();
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
-      expect(analytics.flushAsync).toHaveBeenCalled();
+      expect(flushAsync).toHaveBeenCalled();
     });
 
     it('logs events', async () => {
-      const TestEasCommand = createTestEasCommand();
+      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
-      expect(analytics.logEvent).toHaveBeenCalledWith('action', {
+      expect(logEvent).toHaveBeenCalledWith('action', {
         action: `eas ${TestEasCommand.id}`,
       });
     });
@@ -87,14 +104,14 @@ describe(EasCommand.name, () => {
 
   describe('after exceptions', () => {
     it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand();
+      const TestEasCommand = createTestEasCommand(true);
       try {
         await TestEasCommand.run().then(() => {
           throw new Error('foo');
         });
       } catch {}
 
-      expect(analytics.flushAsync).toHaveBeenCalled();
+      expect(flushAsync).toHaveBeenCalled();
     });
   });
 });

packages/eas-cli/src/commandUtils/context/AnalyticsContextField.ts

@@ -1,8 +0,0 @@
-import { Analytics } from '../../analytics/AnalyticsManager';
-import ContextField, { ContextOptions } from './ContextField';
-
-export default class AnalyticsContextField extends ContextField<Analytics> {
-  async getValueAsync({ analytics }: ContextOptions): Promise<Analytics> {
-    return analytics;
-  }
-}

packages/eas-cli/src/commandUtils/context/ContextField.ts

@@ -1,12 +0,0 @@
-import { Analytics } from '../../analytics/AnalyticsManager';
-import SessionManager from '../../user/SessionManager';
-
-export interface ContextOptions {
-  sessionManager: SessionManager;
-  analytics: Analytics;
-  nonInteractive: boolean;
-}
-
-export default abstract class ContextField<T> {
-  abstract getValueAsync(options: ContextOptions): Promise<T>;
-}

packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts

@@ -1,34 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-
-import { ExpoConfigOptions, getExpoConfig } from '../../project/expoConfig';
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-
-export type DynamicConfigContextFn = (options: ExpoConfigOptions) => Promise<{
-  projectId: string;
-  exp: ExpoConfig;
-  projectDir: string;
-}>;
-
-export class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-  }: ContextOptions): Promise<DynamicConfigContextFn> {
-    return async (options?: ExpoConfigOptions) => {
-      const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-      const expBefore = getExpoConfig(projectDir, options);
-      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-        nonInteractive,
-        env: options?.env,
-      });
-      const exp = getExpoConfig(projectDir, options);
-      return {
-        exp,
-        projectDir,
-        projectId,
-      };
-    };
-  }
-}

packages/eas-cli/src/commandUtils/context/LoggedInContextField.ts

@@ -1,30 +0,0 @@
-import { Actor } from '../../user/User';
-import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
-import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
-
-export default class LoggedInContextField extends ContextField<{
-  actor: Actor;
-  featureGating: FeatureGating;
-  graphqlClient: ExpoGraphqlClient;
-}> {
-  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
-    actor: Actor;
-    featureGating: FeatureGating;
-    graphqlClient: ExpoGraphqlClient;
-  }> {
-    const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-      nonInteractive,
-    });
-    const featureGateServerValues: { [key: string]: boolean } = actor?.featureGates ?? {};
-
-    const graphqlClient = createGraphqlClient(authenticationInfo);
-
-    return {
-      actor,
-      featureGating: new FeatureGating(featureGateServerValues, new FeatureGateEnvOverrides()),
-      graphqlClient,
-    };
-  }
-}

packages/eas-cli/src/commandUtils/context/MaybeLoggedInContextField.ts

@@ -1,32 +0,0 @@
-import { Actor } from '../../user/User';
-import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
-import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
-
-export default class MaybeLoggedInContextField extends ContextField<{
-  actor: Actor | null;
-  featureGating: FeatureGating;
-  graphqlClient: ExpoGraphqlClient;
-}> {
-  async getValueAsync({ sessionManager }: ContextOptions): Promise<{
-    actor: Actor | null;
-    featureGating: FeatureGating;
-    graphqlClient: ExpoGraphqlClient;
-  }> {
-    const authenticationInfo = {
-      accessToken: sessionManager.getAccessToken(),
-      sessionSecret: sessionManager.getSessionSecret(),
-    };
-
-    const graphqlClient = createGraphqlClient(authenticationInfo);
-    const actor = await sessionManager.getUserAsync();
-    const featureGateServerValues: { [key: string]: boolean } = actor?.featureGates ?? {};
-
-    return {
-      actor: actor ?? null,
-      featureGating: new FeatureGating(featureGateServerValues, new FeatureGateEnvOverrides()),
-      graphqlClient,
-    };
-  }
-}

packages/eas-cli/src/commandUtils/context/OptionalProjectConfigContextField.ts

@@ -1,49 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
-
-import { getExpoConfig } from '../../project/expoConfig';
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-
-export class OptionalProjectConfigContextField extends ContextField<
-  | {
-      projectId: string;
-      exp: ExpoConfig;
-      projectDir: string;
-    }
-  | undefined
-> {
-  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<
-    | {
-        projectId: string;
-        exp: ExpoConfig;
-        projectDir: string;
-      }
-    | undefined
-  > {
-    let projectDir: string;
-    try {
-      projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-      if (!projectDir) {
-        return undefined;
-      }
-    } catch (e) {
-      if (e instanceof InvalidEasJsonError) {
-        throw e;
-      }
-      return undefined;
-    }
-
-    const expBefore = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-      nonInteractive,
-    });
-    const exp = getExpoConfig(projectDir);
-    return {
-      exp,
-      projectDir,
-      projectId,
-    };
-  }
-}

packages/eas-cli/src/commandUtils/context/ProjectConfigContextField.ts

@@ -1,31 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-
-import { getExpoConfig } from '../../project/expoConfig';
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-
-export default class ProjectConfigContextField extends ContextField<{
-  projectId: string;
-  exp: ExpoConfig;
-  projectDir: string;
-}> {
-  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
-    projectId: string;
-    exp: ExpoConfig;
-    projectDir: string;
-  }> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = getExpoConfig(projectDir);
-    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-      nonInteractive,
-    });
-    const exp = getExpoConfig(projectDir);
-
-    return {
-      projectId,
-      exp,
-      projectDir,
-    };
-  }
-}

packages/eas-cli/src/commandUtils/context/ProjectDirContextField.ts

@@ -1,8 +0,0 @@
-import ContextField from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-
-export default class ProjectDirContextField extends ContextField<string> {
-  async getValueAsync(): Promise<string> {
-    return await findProjectDirAndVerifyProjectSetupAsync();
-  }
-}

packages/eas-cli/src/commandUtils/context/SessionManagementContextField.ts

@@ -1,8 +0,0 @@
-import SessionManager from '../../user/SessionManager';
-import ContextField, { ContextOptions } from './ContextField';
-
-export default class SessionManagementContextField extends ContextField<SessionManager> {
-  async getValueAsync({ sessionManager }: ContextOptions): Promise<SessionManager> {
-    return sessionManager;
-  }
-}

packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/findProjectDirAndVerifyProjectSetupAsync-test.ts

@@ -1,62 +0,0 @@
-import { vol } from 'memfs';
-
-import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
-
-jest.mock('@expo/config');
-jest.mock('fs');
-
-jest.mock('../../../../prompts');
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-describe(findProjectRootAsync, () => {
-  beforeEach(() => {
-    vol.reset();
-  });
-
-  it('throws if not inside the project directory', async () => {
-    vol.fromJSON(
-      {
-        './README.md': '1',
-      },
-      '/app'
-    );
-    await expect(findProjectRootAsync({ cwd: '/app' })).rejects.toThrow(
-      'Run this command inside a project directory.'
-    );
-  });
-
-  it('defaults to process.cwd() if defaultToProcessCwd = true', async () => {
-    const spy = jest.spyOn(process, 'cwd').mockReturnValue('/this/is/fake/process/cwd');
-    try {
-      vol.fromJSON(
-        {
-          './README.md': '1',
-        },
-        '/app'
-      );
-      const projectDir = await findProjectRootAsync({
-        cwd: '/app',
-        defaultToProcessCwd: true,
-      });
-      expect(projectDir).toBe('/this/is/fake/process/cwd');
-    } finally {
-      spy.mockRestore();
-    }
-  });
-
-  it('returns the root directory of the project', async () => {
-    vol.fromJSON(
-      {
-        './README.md': '1',
-        './package.json': '2',
-        './src/index.ts': '3',
-      },
-      '/app'
-    );
-    const projectRoot = await findProjectRootAsync({ cwd: '/app/src' });
-    expect(projectRoot).toBe('/app');
-  });
-});

packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/getProjectIdAsync-test.ts

@@ -1,255 +0,0 @@
-import { getConfig, modifyConfigAsync } from '@expo/config';
-import { vol } from 'memfs';
-import { anything, instance, mock, when } from 'ts-mockito';
-
-import { Role } from '../../../../graphql/generated';
-import { AppQuery } from '../../../../graphql/queries/AppQuery';
-import { learnMore } from '../../../../log';
-import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import SessionManager from '../../../../user/SessionManager';
-import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from '../getProjectIdAsync';
-
-jest.mock('@expo/config');
-jest.mock('fs');
-
-jest.mock('../../../../graphql/queries/AppQuery');
-jest.mock('../../contextUtils/findProjectDirAndVerifyProjectSetupAsync');
-jest.mock('../../../../ora', () => ({
-  ora: () => ({
-    start: () => ({ succeed: () => {}, fail: () => {} }),
-  }),
-}));
-jest.mock('../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
-
-describe(getProjectIdAsync, () => {
-  let sessionManager: SessionManager;
-
-  beforeEach(() => {
-    const sessionManagerMock = mock<SessionManager>();
-    when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
-      actor: {
-        __typename: 'User',
-        id: 'user_id',
-        username: 'notnotbrent',
-        primaryAccount: {
-          id: 'account_id_1',
-          name: 'notnotbrent',
-          users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
-        },
-        accounts: [
-          {
-            id: 'account_id_1',
-            name: 'notnotbrent',
-            users: [{ role: Role.Owner, actor: { id: 'user_id' } }],
-          },
-          {
-            id: 'account_id_2',
-            name: 'dominik',
-            users: [{ role: Role.ViewOnly, actor: { id: 'user_id' } }],
-          },
-        ],
-        isExpoAdmin: false,
-        featureGates: {},
-      },
-      authenticationInfo: { accessToken: 'fake', sessionSecret: null },
-    });
-    sessionManager = instance(sessionManagerMock);
-
-    vol.fromJSON(
-      {
-        './README.md': '1',
-        './package.json': '2',
-        './src/index.ts': '3',
-      },
-      '/app'
-    );
-
-    jest.mocked(findProjectRootAsync).mockResolvedValue('/app');
-  });
-
-  it('gets the project ID from app config if exists', async () => {
-    jest.mocked(getConfig).mockReturnValue({
-      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
-    } as any);
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-      id: '1234',
-      fullName: '@notnotbrent/test',
-      slug: 'test',
-      ownerAccount: { name: 'notnotbrent' } as any,
-    });
-
-    await expect(
-      getProjectIdAsync(
-        sessionManager,
-        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
-        { nonInteractive: false }
-      )
-    ).resolves.toEqual('1234');
-  });
-
-  it('throws when the owner is out of sync', async () => {
-    jest.mocked(getConfig).mockReturnValue({
-      exp: { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
-    } as any);
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-      id: '1234',
-      fullName: '@notnotbrent/test',
-      slug: 'test',
-      ownerAccount: { name: 'notnotbrent' } as any,
-    });
-
-    await expect(
-      getProjectIdAsync(
-        sessionManager,
-        { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
-        { nonInteractive: false }
-      )
-    ).rejects.toThrow(
-      `Project config: Owner of project identified by "extra.eas.projectId" (notnotbrent) does not match owner specified in the "owner" field (wat). ${learnMore(
-        'https://expo.fyi/eas-project-id'
-      )}`
-    );
-  });
-
-  it('throws when the owner is not specified and is different than logged in user', async () => {
-    jest.mocked(getConfig).mockReturnValue({
-      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
-    } as any);
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-      id: '1234',
-      fullName: '@totallybrent/test',
-      slug: 'test',
-      ownerAccount: { name: 'totallybrent' } as any,
-    });
-
-    await expect(
-      getProjectIdAsync(
-        sessionManager,
-        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
-        { nonInteractive: false }
-      )
-    ).rejects.toThrow(
-      `Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) does not match the logged in user (notnotbrent) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-        'https://expo.fyi/eas-project-id'
-      )}`
-    );
-  });
-
-  it('throws when the owner is not specified and is different than logged in user which is a robot', async () => {
-    const sessionManagerMock = mock<SessionManager>();
-    when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
-      actor: {
-        __typename: 'Robot',
-        id: 'robot_id',
-        accounts: [
-          {
-            id: 'account_id_1',
-            name: 'notnotbrent',
-            users: [{ role: Role.Admin, actor: { id: 'robot_id' } }],
-          },
-          {
-            id: 'account_id_2',
-            name: 'dominik',
-            users: [{ role: Role.ViewOnly, actor: { id: 'robot_id' } }],
-          },
-        ],
-        isExpoAdmin: false,
-        featureGates: {},
-      },
-      authenticationInfo: { accessToken: 'fake', sessionSecret: null },
-    });
-    const sessionManagerRobot = instance(sessionManagerMock);
-
-    jest.mocked(getConfig).mockReturnValue({
-      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
-    } as any);
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-      id: '1234',
-      fullName: '@totallybrent/test',
-      slug: 'test',
-      ownerAccount: { name: 'totallybrent' } as any,
-    });
-
-    await expect(
-      getProjectIdAsync(
-        sessionManagerRobot,
-        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
-        { nonInteractive: false }
-      )
-    ).rejects.toThrow(
-      `Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-        'https://expo.fyi/eas-project-id'
-      )}`
-    );
-  });
-
-  it('throws when the slug is out of sync', async () => {
-    jest.mocked(getConfig).mockReturnValue({
-      exp: { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
-    } as any);
-    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-      id: '1234',
-      fullName: '@notnotbrent/test',
-      slug: 'test',
-      ownerAccount: { name: 'notnotbrent' } as any,
-    });
-
-    await expect(
-      getProjectIdAsync(
-        sessionManager,
-        { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
-        { nonInteractive: false }
-      )
-    ).rejects.toThrow(
-      `Project config: Slug for project identified by "extra.eas.projectId" (test) does not match the "slug" field (wat). ${learnMore(
-        'https://expo.fyi/eas-project-id'
-      )}`
-    );
-  });
-
-  it('fetches the project ID when not in app config, and sets it in the config', async () => {
-    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
-    jest.mocked(modifyConfigAsync).mockResolvedValue({
-      type: 'success',
-      config: { expo: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } } },
-    });
-    jest
-      .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
-      .mockImplementation(async () => '2345');
-
-    const projectId = await getProjectIdAsync(
-      sessionManager,
-      { name: 'test', slug: 'test' },
-      {
-        nonInteractive: false,
-      }
-    );
-
-    expect(projectId).toEqual('2345');
-
-    expect(modifyConfigAsync).toHaveBeenCalledTimes(1);
-    expect(modifyConfigAsync).toHaveBeenCalledWith(
-      '/app',
-      {
-        extra: { eas: { projectId: '2345' } },
-      },
-      { skipSDKVersionRequirement: true }
-    );
-  });
-
-  it('throws if writing the ID back to the config fails', async () => {
-    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
-    jest.mocked(modifyConfigAsync).mockResolvedValue({
-      type: 'fail',
-      config: null,
-    });
-    jest
-      .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
-      .mockImplementation(async () => '4567');
-
-    await expect(
-      getProjectIdAsync(sessionManager, { name: 'test', slug: 'test' }, { nonInteractive: false })
-    ).rejects.toThrow();
-  });
-});

packages/eas-cli/src/commandUtils/context/contextUtils/createGraphqlClient.ts

@@ -1,64 +0,0 @@
-import {
-  AnyVariables,
-  Client,
-  OperationContext,
-  OperationResult,
-  PromisifiedSource,
-  TypedDocumentNode,
-  cacheExchange,
-  createClient as createUrqlClient,
-  dedupExchange,
-  fetchExchange,
-} from '@urql/core';
-import { retryExchange } from '@urql/exchange-retry';
-import { DocumentNode } from 'graphql';
-import fetch from 'node-fetch';
-
-import { getExpoApiBaseUrl } from '../../../api';
-import { httpsProxyAgent } from '../../../fetch';
-
-export interface ExpoGraphqlClient extends Client {
-  query<Data = any, Variables extends AnyVariables = AnyVariables>(
-    query: DocumentNode | TypedDocumentNode<Data, Variables> | string,
-    variables: Variables,
-    context: Partial<OperationContext> & { additionalTypenames: string[] }
-  ): PromisifiedSource<OperationResult<Data, Variables>>;
-}
-
-export function createGraphqlClient(authInfo: {
-  accessToken: string | null;
-  sessionSecret: string | null;
-}): ExpoGraphqlClient {
-  return createUrqlClient({
-    url: getExpoApiBaseUrl() + '/graphql',
-    exchanges: [
-      dedupExchange,
-      cacheExchange,
-      retryExchange({
-        maxDelayMs: 4000,
-        retryIf: (err, operation) => {
-          return !!(
-            err &&
-            !operation.context.noRetry &&
-            (err.networkError || err.graphQLErrors.some(e => e?.extensions?.isTransient))
-          );
-        },
-      }),
-      fetchExchange,
-    ],
-    // @ts-expect-error Type 'typeof fetch' is not assignable to type '(input: RequestInfo, init?: RequestInit | undefined) => Promise<Response>'.
-    fetch,
-    fetchOptions: (): RequestInit => {
-      const headers: Record<string, string> = {};
-      if (authInfo.accessToken) {
-        headers.authorization = `Bearer ${authInfo.accessToken}`;
-      } else if (authInfo.sessionSecret) {
-        headers['expo-session'] = authInfo.sessionSecret;
-      }
-      return {
-        ...(httpsProxyAgent ? { agent: httpsProxyAgent } : {}),
-        headers,
-      };
-    },
-  }) as ExpoGraphqlClient;
-}

packages/eas-cli/src/commandUtils/context/contextUtils/findProjectDirAndVerifyProjectSetupAsync.ts

@@ -1,118 +0,0 @@
-import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-import * as PackageManagerUtils from '@expo/package-manager';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-import pkgDir from 'pkg-dir';
-import semver from 'semver';
-
-import { learnMore } from '../../../log';
-import { easCliVersion } from '../../../utils/easCli';
-import { getVcsClient, setVcsClient } from '../../../vcs';
-import GitClient from '../../../vcs/clients/git';
-
-async function applyCliConfigAsync(projectDir: string): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
-  const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
-  if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
-    throw new Error(
-      `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
-    );
-  }
-  if (config?.requireCommit) {
-    setVcsClient(new GitClient());
-  }
-}
-
-async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise<void> {
-  let printCliVersionWarning = false;
-
-  const consoleWarn = (msg?: string): void => {
-    if (msg) {
-      // eslint-disable-next-line no-console
-      console.warn(chalk.yellow(msg));
-    } else {
-      // eslint-disable-next-line no-console
-      console.warn();
-    }
-  };
-
-  if (await isEasCliInDependenciesAsync(projectDir)) {
-    printCliVersionWarning = true;
-    consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
-  }
-
-  const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
-  if (maybeRepoRoot !== projectDir && (await isEasCliInDependenciesAsync(maybeRepoRoot))) {
-    printCliVersionWarning = true;
-    consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);
-  }
-
-  if (printCliVersionWarning) {
-    consoleWarn(
-      `It's recommended to use the ${chalk.bold(
-        '"cli.version"'
-      )} field in eas.json to enforce the ${chalk.bold('eas-cli')} version for your project.`
-    );
-    consoleWarn(
-      learnMore('https://github.com/expo/eas-cli#enforcing-eas-cli-version-for-your-project')
-    );
-    consoleWarn();
-  }
-}
-
-async function isEasCliInDependenciesAsync(dir: string): Promise<boolean> {
-  const packageJsonPath = path.join(dir, 'package.json');
-  const packageJson = JSON.parse(await fs.readFile(packageJsonPath, 'utf8'));
-  return (
-    packageJson?.dependencies?.['eas-cli'] !== undefined ||
-    packageJson?.devDependencies?.['eas-cli'] !== undefined
-  );
-}
-
-/**
- * @returns the project root directory.
- *
- * @deprecated Should not be used outside of context functions.
- */
-export async function findProjectRootAsync({
-  cwd,
-  defaultToProcessCwd = false,
-}: {
-  cwd?: string;
-  defaultToProcessCwd?: boolean;
-} = {}): Promise<string> {
-  const projectRootDir = await pkgDir(cwd);
-  if (!projectRootDir) {
-    if (!defaultToProcessCwd) {
-      throw new Error('Run this command inside a project directory.');
-    } else {
-      return process.cwd();
-    }
-  } else {
-    let vcsRoot;
-    try {
-      vcsRoot = path.normalize(await getVcsClient().getRootPathAsync());
-    } catch {}
-    if (vcsRoot && vcsRoot.startsWith(projectRootDir) && vcsRoot !== projectRootDir) {
-      throw new Error(
-        `package.json is outside of the current git repository (project root: ${projectRootDir}, git root: ${vcsRoot}.`
-      );
-    }
-    return projectRootDir;
-  }
-}
-
-/**
- * Determine the project root directory and ensure some constraints about the project setup
- * like CLI version and dependencies.
- * @returns the project root directory
- *
- * @deprecated Should not be used outside of context functions.
- */
-export async function findProjectDirAndVerifyProjectSetupAsync(): Promise<string> {
-  const projectDir = await findProjectRootAsync();
-  await applyCliConfigAsync(projectDir);
-  await ensureEasCliIsNotInDependenciesAsync(projectDir);
-  return projectDir;
-}

packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts

@@ -1,189 +0,0 @@
-import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
-import { ExpoConfig } from '@expo/config-types';
-import { Env } from '@expo/eas-build-job';
-import chalk from 'chalk';
-
-import { AppQuery } from '../../../graphql/queries/AppQuery';
-import Log, { learnMore } from '../../../log';
-import { ora } from '../../../ora';
-import { getExpoConfig } from '../../../project/expoConfig';
-import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { toAppPrivacy } from '../../../project/projectUtils';
-import SessionManager from '../../../user/SessionManager';
-import { Actor, getActorUsername } from '../../../user/User';
-import { createGraphqlClient } from './createGraphqlClient';
-import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
-
-/**
- * Save an EAS project ID to the appropriate field in the app config.
- *
- * @deprecated Should not be used outside of context functions except in the init command.
- */
-export async function saveProjectIdToAppConfigAsync(
-  projectDir: string,
-  projectId: string,
-  options: { env?: Env } = {}
-): Promise<void> {
-  const exp = getExpoConfig(projectDir, options);
-  const result = await modifyConfigAsync(
-    projectDir,
-    {
-      extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
-    },
-    { skipSDKVersionRequirement: true }
-  );
-
-  switch (result.type) {
-    case 'success':
-      break;
-    case 'warn': {
-      Log.warn();
-      Log.warn(
-        `Warning: Your project uses dynamic app configuration, and the EAS project ID can't automatically be added to it.`
-      );
-      Log.warn(
-        chalk.dim(
-          'https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs'
-        )
-      );
-      Log.warn();
-      Log.warn(
-        `To complete the setup process, set "${chalk.bold(
-          'extra.eas.projectId'
-        )}" in your ${chalk.bold(getProjectConfigDescription(projectDir))}:`
-      );
-      Log.warn();
-      Log.warn(chalk.bold(JSON.stringify({ expo: { extra: { eas: { projectId } } } }, null, 2)));
-      Log.warn();
-      throw new Error(result.message);
-    }
-    case 'fail':
-      throw new Error(result.message);
-    default:
-      throw new Error('Unexpected result type from modifyConfigAsync');
-  }
-}
-
-/**
- * Get the EAS project ID from the app config. If the project ID is not set in the config,
- * use the owner/slug to identify an EAS project on the server (asking for confirmation first),
- * and attempt to save the EAS project ID to the appropriate field in the app config. If unable to
- * save to the app config, throw an error.
- *
- * @returns the EAS project ID
- *
- * @deprecated Should not be used outside of context functions.
- */
-export async function getProjectIdAsync(
-  sessionManager: SessionManager,
-  exp: ExpoConfig,
-  options: { env?: Env; nonInteractive: boolean }
-): Promise<string> {
-  // all codepaths in this function require a logged-in user with access to the owning account
-  // since they either query the app via graphql or create it, which includes getting info about
-  // the owner
-  const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-    nonInteractive: options.nonInteractive,
-  });
-  const graphqlClient = createGraphqlClient(authenticationInfo);
-
-  const localProjectId = exp.extra?.eas?.projectId;
-  if (localProjectId) {
-    // check that the local project ID matches account and slug
-    const appForProjectId = await AppQuery.byIdAsync(graphqlClient, localProjectId);
-    if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
-      throw new Error(
-        `Project config: Owner of project identified by "extra.eas.projectId" (${
-          appForProjectId.ownerAccount.name
-        }) does not match owner specified in the "owner" field (${exp.owner}). ${learnMore(
-          'https://expo.fyi/eas-project-id'
-        )}`
-      );
-    }
-
-    const actorUsername = getActorUsername(actor);
-    if (!exp.owner && appForProjectId.ownerAccount.name !== actorUsername) {
-      if (actorUsername) {
-        throw new Error(
-          `Project config: Owner of project identified by "extra.eas.projectId" (${
-            appForProjectId.ownerAccount.name
-          }) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${
-            appForProjectId.ownerAccount.name
-          }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-            'https://expo.fyi/eas-project-id'
-          )}`
-        );
-      } else {
-        // robot caller
-        throw new Error(
-          `Project config: Owner of project identified by "extra.eas.projectId" (${
-            appForProjectId.ownerAccount.name
-          }) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "${
-            appForProjectId.ownerAccount.name
-          }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-            'https://expo.fyi/eas-project-id'
-          )}`
-        );
-      }
-    }
-
-    if (exp.slug && exp.slug !== appForProjectId.slug) {
-      throw new Error(
-        `Project config: Slug for project identified by "extra.eas.projectId" (${
-          appForProjectId.slug
-        }) does not match the "slug" field (${exp.slug}). ${learnMore(
-          'https://expo.fyi/eas-project-id'
-        )}`
-      );
-    }
-
-    return localProjectId;
-  }
-
-  const projectDir = await findProjectRootAsync();
-  if (!projectDir) {
-    throw new Error('This command must be run inside a project directory.');
-  }
-
-  Log.warn('EAS project not configured.');
-
-  const getAccountNameForEASProjectSync = (exp: ExpoConfig, user: Actor): string => {
-    if (exp.owner) {
-      return exp.owner;
-    }
-    switch (user.__typename) {
-      case 'User':
-        return user.username;
-      case 'Robot':
-        throw new Error(
-          'The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner'
-        );
-      case 'SSOUser':
-        throw new Error('SSO users are not supported yet.');
-    }
-  };
-
-  const projectId = await fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(
-    graphqlClient,
-    {
-      accountName: getAccountNameForEASProjectSync(exp, actor),
-      projectName: exp.slug,
-      privacy: toAppPrivacy(exp.privacy),
-    },
-    {
-      nonInteractive: options.nonInteractive,
-    },
-    actor
-  );
-
-  const spinner = ora(`Linking local project to EAS project ${projectId}`).start();
-  try {
-    await saveProjectIdToAppConfigAsync(projectDir, projectId, options);
-    spinner.succeed(`Linked local project to EAS project ${projectId}`);
-  } catch (e: any) {
-    spinner.fail();
-    throw e;
-  }
-
-  return projectId;
-}

packages/eas-cli/src/commandUtils/gating/FeatureGateEnvOverrides.ts

@@ -1,40 +0,0 @@
-import nullthrows from 'nullthrows';
-
-import env from '../../env';
-import { FeatureGateKey } from './FeatureGateKey';
-
-function parseFeatureGateEnvVariableValue(value: string | undefined): string[] {
-  if (!value) {
-    return [];
-  }
-  return value.split(',').map(v => v.trim());
-}
-
-export default class FeatureGateEnvOverrides {
-  private readonly map = new Map<string, boolean>();
-
-  constructor() {
-    const overrideEnableGateKeys = new Set(parseFeatureGateEnvVariableValue(env.featureGateEnable));
-    const overrideDisableGateKeys = new Set(
-      parseFeatureGateEnvVariableValue(env.featureGateDisable)
-    );
-
-    for (const overrideEnableKey of overrideEnableGateKeys) {
-      if (overrideDisableGateKeys.has(overrideEnableKey)) {
-        continue;
-      }
-      this.map.set(overrideEnableKey, true);
-    }
-    for (const overrideDisableGateKey of overrideDisableGateKeys) {
-      this.map.set(overrideDisableGateKey, false);
-    }
-  }
-
-  public isOverridden(key: FeatureGateKey): boolean {
-    return this.map.has(key) ?? false;
-  }
-
-  public getOverride(key: FeatureGateKey): boolean {
-    return nullthrows(this.map.get(key));
-  }
-}

packages/eas-cli/src/commandUtils/gating/FeatureGateKey.ts

@@ -1,8 +0,0 @@
-export enum FeatureGateKey {
-  // for tests
-  TEST = 'test',
-}
-
-export const featureGateDefaultValueWhenNoServerValue: Record<FeatureGateKey, boolean> = {
-  [FeatureGateKey.TEST]: true,
-};

packages/eas-cli/src/commandUtils/gating/FeatureGateTestOverrides.ts

@@ -1,15 +0,0 @@
-import { FeatureGateKey } from './FeatureGateKey';
-
-export const setOverride = (_key: FeatureGateKey, _enabled: boolean): void => {
-  throw new Error('Must use mocked FeatureGateTestOverrides');
-};
-
-export const removeOverride = (_key: FeatureGateKey): void => {
-  throw new Error('Must use mocked FeatureGateTestOverrides');
-};
-
-export const isOverridden = (_key: FeatureGateKey): boolean => false;
-
-export const getOverride = (_key: FeatureGateKey): boolean => {
-  throw new Error('Must use mocked FeatureGateTestOverrides');
-};

packages/eas-cli/src/commandUtils/gating/FeatureGating.ts

@@ -1,69 +0,0 @@
-import FeatureGateEnvOverrides from './FeatureGateEnvOverrides';
-import { FeatureGateKey, featureGateDefaultValueWhenNoServerValue } from './FeatureGateKey';
-import * as FeatureGateTestOverrides from './FeatureGateTestOverrides';
-
-export default class FeatureGating {
-  constructor(
-    private readonly serverValues: { [key: string]: boolean },
-    private readonly envOverrides: FeatureGateEnvOverrides
-  ) {}
-
-  public isEnabled(experimentKey: FeatureGateKey): boolean {
-    if (process.env.NODE_ENV === 'test' && FeatureGateTestOverrides.isOverridden(experimentKey)) {
-      return FeatureGateTestOverrides.getOverride(experimentKey);
-    }
-
-    if (this.envOverrides.isOverridden(experimentKey)) {
-      return this.envOverrides.getOverride(experimentKey);
-    }
-
-    if (experimentKey in this.serverValues) {
-      return this.serverValues[experimentKey];
-    }
-
-    return featureGateDefaultValueWhenNoServerValue[experimentKey];
-  }
-
-  /**
-   * Test gate override methods
-   */
-
-  public static overrideKeyForScope(
-    key: FeatureGateKey,
-    enabled: boolean,
-    scope: () => void
-  ): void {
-    if (process.env.NODE_ENV !== 'test') {
-      throw new Error(`Cannot overrideKeyForScope outside of test environment`);
-    }
-
-    FeatureGateTestOverrides.setOverride(key, enabled);
-    try {
-      scope();
-    } finally {
-      FeatureGateTestOverrides.removeOverride(key);
-    }
-  }
-
-  public static async overrideKeyForScopeAsync(
-    key: FeatureGateKey,
-    enabled: boolean,
-    scope: () => Promise<void>
-  ): Promise<void> {
-    if (process.env.NODE_ENV !== 'test') {
-      throw new Error(`Cannot overrideKeyForScopeAsync outside of test environment`);
-    }
-
-    FeatureGateTestOverrides.setOverride(key, enabled);
-    try {
-      await scope();
-    } finally {
-      FeatureGateTestOverrides.removeOverride(key);
-    }
-  }
-
-  public static overrideKeyForEachInTest(key: FeatureGateKey, enabled: boolean): void {
-    beforeEach(() => FeatureGateTestOverrides.setOverride(key, enabled));
-    afterEach(() => FeatureGateTestOverrides.removeOverride(key));
-  }
-}

packages/eas-cli/src/commandUtils/gating/__mocks__/FeatureGateTestOverrides.ts

@@ -1,20 +0,0 @@
-import { FeatureGateKey } from '../FeatureGateKey';
-
-const map = new Map();
-
-export const setOverride = (key: FeatureGateKey, enabled: boolean): void => {
-  map.set(key, enabled);
-};
-
-export const removeOverride = (key: FeatureGateKey): void => {
-  map.delete(key);
-};
-
-export const isOverridden = (key: FeatureGateKey): boolean => map.has(key);
-
-export const getOverride = (key: FeatureGateKey): boolean => {
-  if (map.has(key)) {
-    return map.get(key);
-  }
-  throw new Error(`Key ${key} not overridden`);
-};

packages/eas-cli/src/commandUtils/gating/__tests__/FeatureGate-test.ts

@@ -1,92 +0,0 @@
-import env from '../../../env';
-import FeatureGateEnvOverrides from '../FeatureGateEnvOverrides';
-import { FeatureGateKey } from '../FeatureGateKey';
-import FeatureGating from '../FeatureGating';
-
-jest.mock('../FeatureGateTestOverrides');
-
-describe(FeatureGating, () => {
-  it('supports scoped overriding', () => {
-    const featureGating = new FeatureGating({}, new FeatureGateEnvOverrides());
-    FeatureGating.overrideKeyForScope(FeatureGateKey.TEST, false, () => {
-      expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(false);
-    });
-
-    expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(true);
-  });
-
-  it('supports async scoped overriding', async () => {
-    const featureGating = new FeatureGating({}, new FeatureGateEnvOverrides());
-    await FeatureGating.overrideKeyForScopeAsync(FeatureGateKey.TEST, false, async () => {
-      expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(false);
-    });
-
-    expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(true);
-  });
-
-  it('uses value from the server, falls back to defined value', () => {
-    const featureGating = new FeatureGating(
-      { [FeatureGateKey.TEST]: true },
-      new FeatureGateEnvOverrides()
-    );
-    expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(true);
-
-    const featureGating2 = new FeatureGating(
-      { [FeatureGateKey.TEST]: false },
-      new FeatureGateEnvOverrides()
-    );
-    expect(featureGating2.isEnabled(FeatureGateKey.TEST)).toBe(false);
-
-    const featureGating3 = new FeatureGating({}, new FeatureGateEnvOverrides());
-    expect(featureGating3.isEnabled(FeatureGateKey.TEST)).toBe(true);
-  });
-
-  describe('environment variable overriding', () => {
-    afterAll(() => {
-      env.featureGateEnable = undefined;
-      env.featureGateDisable = undefined;
-    });
-
-    it('supports env overrides affirmative', () => {
-      env.featureGateEnable = [FeatureGateKey.TEST].join(',');
-      env.featureGateDisable = [].join(',');
-      const featureGating = new FeatureGating(
-        { [FeatureGateKey.TEST]: false },
-        new FeatureGateEnvOverrides()
-      );
-      expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(true);
-    });
-
-    it('supports env overrides negative', () => {
-      env.featureGateEnable = [].join(',');
-      env.featureGateDisable = [FeatureGateKey.TEST].join(',');
-      const featureGating = new FeatureGating(
-        { [FeatureGateKey.TEST]: true },
-        new FeatureGateEnvOverrides()
-      );
-      expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(false);
-    });
-  });
-});
-
-describe('jest scoped overriding', () => {
-  FeatureGating.overrideKeyForEachInTest(FeatureGateKey.TEST, false);
-
-  it('supports jest scoped overriding', () => {
-    const featureGating = new FeatureGating(
-      { [FeatureGateKey.TEST]: true },
-      new FeatureGateEnvOverrides()
-    );
-    expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(false);
-  });
-});
-
-describe('removal of jest scoped overriding', () => {
-  it('jest scoped overriding is only for describe scope above', () => {
-    const featureGating = new FeatureGating(
-      { [FeatureGateKey.TEST]: true },
-      new FeatureGateEnvOverrides()
-    );
-    expect(featureGating.isEnabled(FeatureGateKey.TEST)).toBe(true);
-  });
-});

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

@@ -1,5 +1,4 @@
 import { Flags } from '@oclif/core';
-import { OptionFlag } from '@oclif/core/lib/interfaces';
 
 import { EasNonInteractiveAndJsonFlags } from './flags';
 
@@ -38,7 +37,7 @@ export const getLimitFlagWithCustomValues = ({
 }: {
   defaultTo: number;
   limit: number;
-}): OptionFlag<number | undefined> =>
+}): any =>
   Flags.integer({
     description: `The number of items to fetch each query. Defaults to ${defaultTo} and is capped at ${limit}.`,
     // eslint-disable-next-line async-protect/async-suffix

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

@@ -1,17 +1,18 @@
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { CommandConfiguration } from '../../commandUtils/EasCommand';
 import Log from '../../log';
+import { showLoginPromptAsync } from '../../user/actions';
 
 export default class AccountLogin extends EasCommand {
   static override description = 'log in with your Expo account';
   static override aliases = ['login'];
 
-  static override contextDefinition = {
-    ...this.ContextOptions.SessionManagment,
+  protected override commandConfiguration: CommandConfiguration = {
+    allowUnauthenticated: true,
+    canRunOutsideProject: true,
   };
 
   async runAsync(): Promise<void> {
-    const { sessionManager } = await this.getContextAsync(AccountLogin, { nonInteractive: false });
-    await sessionManager.showLoginPromptAsync();
+    await showLoginPromptAsync();
     Log.log('Logged in');
   }
 }

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

@@ -1,17 +1,18 @@
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { CommandConfiguration } from '../../commandUtils/EasCommand';
 import Log from '../../log';
+import { logoutAsync } from '../../user/User';
 
 export default class AccountLogout extends EasCommand {
   static override description = 'log out';
   static override aliases = ['logout'];
 
-  static override contextDefinition = {
-    ...this.ContextOptions.SessionManagment,
+  protected override commandConfiguration: CommandConfiguration = {
+    allowUnauthenticated: true,
+    canRunOutsideProject: true,
   };
 
   async runAsync(): Promise<void> {
-    const { sessionManager } = await this.getContextAsync(AccountLogout, { nonInteractive: false });
-    await sessionManager.logoutAsync();
+    await logoutAsync();
     Log.log('Logged out');
   }
 }

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

@@ -1,23 +1,22 @@
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { CommandConfiguration } from '../../commandUtils/EasCommand';
 import Log from '../../log';
-import { getActorDisplayName } from '../../user/User';
+import { getActorDisplayName, getUserAsync } from '../../user/User';
 
 export default class AccountView extends EasCommand {
   static override description = 'show the username you are logged in as';
   static override aliases = ['whoami'];
 
-  static override contextDefinition = {
-    ...this.ContextOptions.MaybeLoggedIn,
+  protected override commandConfiguration: CommandConfiguration = {
+    allowUnauthenticated: true,
+    canRunOutsideProject: true,
   };
 
   async runAsync(): Promise<void> {
-    const {
-      maybeLoggedIn: { actor },
-    } = await this.getContextAsync(AccountView, { nonInteractive: true });
-    if (actor) {
-      Log.log(chalk.green(getActorDisplayName(actor)));
+    const user = await getUserAsync();
+    if (user) {
+      Log.log(chalk.green(getActorDisplayName(user)));
     } else {
       Log.warn('Not logged in');
       process.exit(1);

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

@@ -1,19 +1,23 @@
-import { getAnalyticsEnabledAsync, setAnalyticsEnabledAsync } from '../analytics/AnalyticsManager';
-import EasCommand from '../commandUtils/EasCommand';
+import EasCommand, { CommandConfiguration } from '../commandUtils/EasCommand';
 import Log from '../log';
+import UserSettings from '../user/UserSettings';
 
 export default class AnalyticsView extends EasCommand {
   static override description = 'display or change analytics settings';
 
   static override args = [{ name: 'STATUS', options: ['on', 'off'] }];
 
+  protected override commandConfiguration: CommandConfiguration = {
+    allowUnauthenticated: true,
+  };
+
   async runAsync(): Promise<void> {
     const { STATUS: status } = (await this.parse(AnalyticsView)).args;
     if (status) {
-      setAnalyticsEnabledAsync(status === 'on');
+      await UserSettings.setAsync('analyticsEnabled', status === 'on');
       Log.withTick(`${status === 'on' ? 'Enabling' : 'Disabling'} analytics.`);
     } else {
-      const analyticsEnabled = await getAnalyticsEnabledAsync();
+      const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', null);
       Log.log(
         `Analytics are ${
           analyticsEnabled === false ? 'disabled' : 'enabled'

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

@@ -1,14 +1,51 @@
 import chalk from 'chalk';
+import gql from 'graphql-tag';
 
-import { createUpdateBranchOnAppAsync } from '../../branch/queries';
 import { getDefaultBranchNameAsync } from '../../branch/utils';
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import {
+  CreateUpdateBranchForAppMutation,
+  CreateUpdateBranchForAppMutationVariables,
+  UpdateBranch,
+} from '../../graphql/generated';
 import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
+export async function createUpdateBranchOnAppAsync({
+  appId,
+  name,
+}: CreateUpdateBranchForAppMutationVariables): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
+  const result = await withErrorHandlingAsync(
+    graphqlClient
+      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
+        gql`
+          mutation createUpdateBranchForApp($appId: ID!, $name: String!) {
+            updateBranch {
+              createUpdateBranchForApp(appId: $appId, name: $name) {
+                id
+                name
+              }
+            }
+          }
+        `,
+        {
+          appId,
+          name,
+        }
+      )
+      .toPromise()
+  );
+  const newBranch = result.updateBranch.createUpdateBranchForApp;
+  if (!newBranch) {
+    throw new Error(`Could not create branch ${name}.`);
+  }
+  return newBranch;
+}
+
 export default class BranchCreate extends EasCommand {
   static override description = 'create a branch';
 
@@ -25,8 +62,7 @@ export default class BranchCreate extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
@@ -34,10 +70,7 @@ export default class BranchCreate extends EasCommand {
       args: { name },
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(BranchCreate);
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BranchCreate, {
+    const { projectId } = await this.getContextAsync(BranchCreate, {
       nonInteractive,
     });
 
@@ -45,7 +78,7 @@ export default class BranchCreate extends EasCommand {
       enableJsonOutput();
     }
 
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
 
     if (!name) {
       const validationMessage = 'Branch name may not be empty.';
@@ -61,7 +94,7 @@ export default class BranchCreate extends EasCommand {
       }));
     }
 
-    const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, { appId: projectId, name });
+    const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });
 
     if (jsonFlag) {
       printJsonOnlyOutput(newBranch);

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

@@ -2,11 +2,10 @@ import chalk from 'chalk';
 import gql from 'graphql-tag';
 
 import { selectBranchOnAppAsync } from '../../branch/queries';
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
-import { withErrorHandlingAsync } from '../../graphql/client';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   DeleteUpdateBranchMutation,
   DeleteUpdateBranchMutationVariables,
@@ -19,10 +18,10 @@ import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { toggleConfirmAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-async function getBranchInfoAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, name }: GetBranchInfoQueryVariables
-): Promise<GetBranchInfoQuery> {
+async function getBranchInfoAsync({
+  appId,
+  name,
+}: GetBranchInfoQueryVariables): Promise<GetBranchInfoQuery> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .query<GetBranchInfoQuery, GetBranchInfoQueryVariables>(
@@ -50,10 +49,9 @@ async function getBranchInfoAsync(
   return data;
 }
 
-async function deleteBranchOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { branchId }: DeleteUpdateBranchMutationVariables
-): Promise<DeleteUpdateBranchResult> {
+async function deleteBranchOnAppAsync({
+  branchId,
+}: DeleteUpdateBranchMutationVariables): Promise<DeleteUpdateBranchResult> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .mutation<DeleteUpdateBranchMutation, DeleteUpdateBranchMutationVariables>(
@@ -79,8 +77,7 @@ export default class BranchDelete extends EasCommand {
   static override description = 'delete a branch';
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   static override args = [
@@ -107,26 +104,23 @@ export default class BranchDelete extends EasCommand {
       enableJsonOutput();
     }
 
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BranchDelete, { nonInteractive });
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const { projectId } = await this.getContextAsync(BranchDelete, { nonInteractive });
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
 
     if (!branchName) {
       const validationMessage = 'branch name may not be empty.';
       if (nonInteractive) {
         throw new Error(validationMessage);
       }
-      ({ name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
+      ({ name: branchName } = await selectBranchOnAppAsync({
         projectId,
-        displayTextForListItem: updateBranch => ({ title: updateBranch.name }),
+        displayTextForListItem: updateBranch => updateBranch.name,
         promptTitle: 'Which branch would you like to delete?',
         paginatedQueryOptions,
       }));
     }
 
-    const data = await getBranchInfoAsync(graphqlClient, { appId: projectId, name: branchName });
+    const data = await getBranchInfoAsync({ appId: projectId, name: branchName });
     const branchId = data.app?.byId.updateBranchByName?.id;
     if (!branchId) {
       throw new Error(`Could not find branch ${branchName} on ${projectDisplayName}`);
@@ -146,7 +140,7 @@ export default class BranchDelete extends EasCommand {
       }
     }
 
-    const deletionResult = await deleteBranchOnAppAsync(graphqlClient, {
+    const deletionResult = await deleteBranchOnAppAsync({
       branchId,
     });
 

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

@@ -1,5 +1,5 @@
 import { listAndRenderBranchesOnAppAsync } from '../../branch/queries';
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { enableJsonOutput } from '../../utils/json';
@@ -13,16 +13,12 @@ export default class BranchList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BranchList);
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BranchList, {
+    const { projectId } = await this.getContextAsync(BranchList, {
       nonInteractive: flags['non-interactive'],
     });
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
@@ -31,6 +27,6 @@ export default class BranchList extends EasCommand {
       enableJsonOutput();
     }
 
-    await listAndRenderBranchesOnAppAsync(graphqlClient, { projectId, paginatedQueryOptions });
+    await listAndRenderBranchesOnAppAsync({ projectId, paginatedQueryOptions });
   }
 }

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

@@ -2,10 +2,9 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { withErrorHandlingAsync } from '../../graphql/client';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   EditUpdateBranchInput,
   EditUpdateBranchMutation,
@@ -17,10 +16,11 @@ import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
-async function renameUpdateBranchOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, name, newName }: EditUpdateBranchInput
-): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
+async function renameUpdateBranchOnAppAsync({
+  appId,
+  name,
+  newName,
+}: EditUpdateBranchInput): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .mutation<EditUpdateBranchMutation, EditUpdateBranchMutationVariables>(
@@ -63,25 +63,21 @@ export default class BranchRename extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
     let {
       flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
     } = await this.parse(BranchRename);
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BranchRename, {
+    const { projectId } = await this.getContextAsync(BranchRename, {
       nonInteractive,
     });
     if (jsonFlag) {
       enableJsonOutput();
     }
 
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(projectId);
 
     if (!currentName) {
       const validationMessage = 'current name may not be empty.';
@@ -109,7 +105,7 @@ export default class BranchRename extends EasCommand {
       }));
     }
 
-    const editedBranch = await renameUpdateBranchOnAppAsync(graphqlClient, {
+    const editedBranch = await renameUpdateBranchOnAppAsync({
       appId: projectId,
       name: currentName!,
       newName: newName!,

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

@@ -1,5 +1,5 @@
 import { selectBranchOnAppAsync } from '../../branch/queries';
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import {
   EasPaginatedQueryFlags,
@@ -27,8 +27,7 @@ export default class BranchView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
@@ -37,10 +36,7 @@ export default class BranchView extends EasCommand {
       flags,
     } = await this.parse(BranchView);
     const { 'non-interactive': nonInteractive } = flags;
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BranchView, {
+    const { projectId } = await this.getContextAsync(BranchView, {
       nonInteractive,
     });
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
@@ -54,12 +50,10 @@ export default class BranchView extends EasCommand {
         throw new Error('Branch name may not be empty.');
       }
 
-      ({ name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
+      ({ name: branchName } = await selectBranchOnAppAsync({
         projectId,
         promptTitle: 'Which branch would you like to view?',
-        displayTextForListItem: updateBranch => ({
-          title: updateBranch.name,
-        }),
+        displayTextForListItem: updateBranch => updateBranch.name,
         // discard limit and offset because this query is not their intended target
         paginatedQueryOptions: {
           json: paginatedQueryOptions.json,
@@ -69,7 +63,7 @@ export default class BranchView extends EasCommand {
       }));
     }
 
-    await listAndRenderUpdateGroupsOnBranchAsync(graphqlClient, {
+    await listAndRenderUpdateGroupsOnBranchAsync({
       projectId,
       branchName,
       paginatedQueryOptions,

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

@@ -1,10 +1,9 @@
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { withErrorHandlingAsync } from '../../graphql/client';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   Build,
   BuildStatus,
@@ -18,10 +17,7 @@ import { appPlatformEmojis } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';
 
-async function cancelBuildAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<Pick<Build, 'id' | 'status'>> {
+async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
   const data = await withErrorHandlingAsync(
     graphqlClient
       .mutation<CancelBuildMutation, CancelBuildMutationVariables>(
@@ -60,7 +56,6 @@ function formatUnfinishedBuild(
 }
 
 export async function selectBuildToCancelAsync(
-  graphqlClient: ExpoGraphqlClient,
   projectId: string,
   projectDisplayName: string
 ): Promise<string | null> {
@@ -69,19 +64,19 @@ export async function selectBuildToCancelAsync(
   let builds;
   try {
     const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      BuildQuery.viewBuildsOnAppAsync({
         appId: projectId,
         offset: 0,
         limit: 10,
         filter: { status: BuildStatus.New },
       }),
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      BuildQuery.viewBuildsOnAppAsync({
         appId: projectId,
         offset: 0,
         limit: 10,
         filter: { status: BuildStatus.InQueue },
       }),
-      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      BuildQuery.viewBuildsOnAppAsync({
         appId: projectId,
         offset: 0,
         limit: 10,
@@ -116,12 +111,9 @@ export async function selectBuildToCancelAsync(
   }
 }
 
-async function ensureBuildExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<void> {
+async function ensureBuildExistsAsync(buildId: string): Promise<void> {
   try {
-    await BuildQuery.byIdAsync(graphqlClient, buildId);
+    await BuildQuery.byIdAsync(buildId);
   } catch {
     throw new Error(`Couldn't find a build matching the id ${buildId}`);
   }
@@ -137,8 +129,7 @@ export default class BuildCancel extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
@@ -146,17 +137,14 @@ export default class BuildCancel extends EasCommand {
       args: { BUILD_ID: buildIdFromArg },
       flags: { 'non-interactive': nonInteractive },
     } = await this.parse(BuildCancel);
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BuildCancel, {
+    const { projectId } = await this.getContextAsync(BuildCancel, {
       nonInteractive,
     });
 
-    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);
 
     if (buildIdFromArg) {
-      await ensureBuildExistsAsync(graphqlClient, buildIdFromArg);
+      await ensureBuildExistsAsync(buildIdFromArg);
     }
 
     let buildId: string | null = buildIdFromArg;
@@ -165,7 +153,7 @@ export default class BuildCancel extends EasCommand {
         throw new Error('BUILD_ID must not be empty in non-interactive mode');
       }
 
-      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName);
+      buildId = await selectBuildToCancelAsync(projectId, displayName);
       if (!buildId) {
         return;
       }
@@ -173,7 +161,7 @@ export default class BuildCancel extends EasCommand {
 
     const spinner = ora().start('Canceling the build…');
     try {
-      const { status } = await cancelBuildAsync(graphqlClient, buildId);
+      const { status } = await cancelBuildAsync(buildId);
       if (status === BuildStatus.Canceled) {
         spinner.succeed('Build canceled');
       } else {

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

@@ -4,10 +4,11 @@ import chalk from 'chalk';
 
 import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
 import { ensureProjectConfiguredAsync } from '../../build/configure';
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
@@ -26,16 +27,12 @@ export default class BuildConfigure extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BuildConfigure);
-    const {
-      projectConfig: { exp, projectId, projectDir },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BuildConfigure, {
+    const { projectId } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
     });
 
@@ -45,6 +42,7 @@ export default class BuildConfigure extends EasCommand {
 
     await getVcsClient().ensureRepoExistsAsync();
 
+    const projectDir = await findProjectRootAsync();
     const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
 
     const platform =
@@ -64,17 +62,19 @@ export default class BuildConfigure extends EasCommand {
 
     // configure expo-updates
     if (expoUpdatesIsInstalled) {
+      const exp = getExpoConfig(projectDir);
+
       if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
         const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
         if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp, projectId);
         }
       }
 
       if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
         const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
         if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+          await syncIosUpdatesConfigurationAsync(projectDir, exp, projectId);
         }
       }
     }

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

@@ -1,18 +1,21 @@
 import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
+import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 import figures from 'figures';
-import fs from 'fs-extra';
 import path from 'path';
 
-import { LocalBuildMode } from '../../build/local';
 import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import EasCommand from '../../commandUtils/EasCommand';
+import { UserInputResourceClass } from '../../build/types';
+import EasCommand, {
+  EASCommandLoggedInContext,
+  EASCommandProjectIdContext,
+} from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { StatuspageServiceName } from '../../graphql/generated';
 import Log, { link } from '../../log';
 import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
+import { findProjectRootAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import uniq from '../../utils/expodash/uniq';
 import { enableJsonOutput } from '../../utils/json';
@@ -31,7 +34,7 @@ interface RawBuildFlags {
   json: boolean;
   'auto-submit': boolean;
   'auto-submit-with-profile'?: string;
-  'resource-class'?: ResourceClass;
+  'resource-class'?: UserInputResourceClass;
   message?: string;
 }
 
@@ -85,13 +88,8 @@ export default class Build extends EasCommand {
       exclusive: ['auto-submit'],
     }),
     'resource-class': Flags.enum({
-      options: Object.values(ResourceClass),
+      options: Object.values(UserInputResourceClass),
       hidden: true,
-      deprecated: {
-        message: chalk.yellow(
-          'The --resource-class flag has been deprecated. Define the resource class in eas.json.\nLearn more: https://docs.expo.dev/build-reference/eas-json/'
-        ),
-      },
       description: 'The instance type that will be used to run this build [experimental]',
     }),
     message: Flags.string({
@@ -102,10 +100,8 @@ export default class Build extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Analytics,
+    ...EASCommandLoggedInContext,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
@@ -116,20 +112,16 @@ export default class Build extends EasCommand {
     }
     const flags = this.sanitizeFlags(rawFlags);
 
-    const {
-      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
-      projectDir,
-      analytics,
-    } = await this.getContextAsync(Build, {
+    const { actor, projectId } = await this.getContextAsync(Build, {
       nonInteractive: flags.nonInteractive,
     });
 
+    const projectDir = await findProjectRootAsync();
+
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
-    if (!flags.localBuildOptions.localBuildMode) {
+    if (!flags.localBuildOptions.enable) {
       await maybeWarnAboutEasOutagesAsync(
-        graphqlClient,
         flags.autoSubmit
           ? [StatuspageServiceName.EasBuild, StatuspageServiceName.EasSubmit]
           : [StatuspageServiceName.EasBuild]
@@ -138,14 +130,7 @@ export default class Build extends EasCommand {
 
     const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
 
-    await runBuildAndSubmitAsync(
-      graphqlClient,
-      analytics,
-      projectDir,
-      flagsWithPlatform,
-      actor,
-      getDynamicProjectConfigAsync
-    );
+    await runBuildAndSubmitAsync(projectDir, flagsWithPlatform, actor, projectId);
   }
 
   private sanitizeFlags(
@@ -195,17 +180,19 @@ export default class Build extends EasCommand {
       nonInteractive,
       localBuildOptions: flags['local']
         ? {
-            localBuildMode: LocalBuildMode.LOCAL_BUILD_PLUGIN,
+            enable: true,
             verbose: true,
             artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
           }
-        : {},
+        : {
+            enable: false,
+          },
       wait: flags['wait'],
       clearCache: flags['clear-cache'],
       json: flags['json'],
       autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
-      resourceClass: flags['resource-class'],
+      userInputResourceClass: flags['resource-class'] ?? UserInputResourceClass.DEFAULT,
       message,
     };
   }
@@ -215,7 +202,7 @@ export default class Build extends EasCommand {
   ): Promise<BuildFlags> {
     const requestedPlatform = await selectRequestedPlatformAsync(flags.requestedPlatform);
 
-    if (flags.localBuildOptions.localBuildMode) {
+    if (flags.localBuildOptions.enable) {
       if (flags.autoSubmit) {
         // TODO: implement this
         Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
@@ -227,13 +214,6 @@ export default class Build extends EasCommand {
         });
       } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
         Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
-      } else if (
-        !['linux', 'darwin'].includes(process.platform) &&
-        requestedPlatform === RequestedPlatform.Android
-      ) {
-        Errors.error('Unsupported platform, macOS or Linux is required to build apps for Android', {
-          exit: 1,
-        });
       }
     }
 
@@ -244,13 +224,10 @@ export default class Build extends EasCommand {
   }
 }
 
-export async function handleDeprecatedEasJsonAsync(
+async function handleDeprecatedEasJsonAsync(
   projectDir: string,
   nonInteractive: boolean
 ): Promise<void> {
-  if (!(await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir)))) {
-    return;
-  }
   const easJsonAccessor = new EasJsonAccessor(projectDir);
   const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
   const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [

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

@@ -4,12 +4,15 @@ import fs from 'fs-extra';
 import path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 
-import { LocalBuildMode } from '../../build/local';
 import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, {
+  EASCommandLoggedInContext,
+  EASCommandProjectIdContext,
+} 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';
 
@@ -63,20 +66,13 @@ export default class BuildInspect extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Analytics,
+    ...EASCommandLoggedInContext,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BuildInspect);
-    const {
-      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
-      projectDir,
-      analytics,
-    } = await this.getContextAsync(BuildInspect, {
+    const { actor, projectId } = await this.getContextAsync(BuildInspect, {
       nonInteractive: false,
     });
 
@@ -97,10 +93,9 @@ export default class BuildInspect extends EasCommand {
       await vcs.makeShallowCopyAsync(tmpWorkingdir);
       await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {
+      const projectDir = await findProjectRootAsync();
       try {
         await runBuildAndSubmitAsync(
-          graphqlClient,
-          analytics,
           projectDir,
           {
             nonInteractive: false,
@@ -111,7 +106,7 @@ export default class BuildInspect extends EasCommand {
             requestedPlatform: flags.platform,
             profile: flags.profile,
             localBuildOptions: {
-              localBuildMode: LocalBuildMode.LOCAL_BUILD_PLUGIN,
+              enable: true,
               ...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
               ...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
               verbose: flags.verbose,
@@ -120,7 +115,7 @@ export default class BuildInspect extends EasCommand {
             },
           },
           actor,
-          getDynamicProjectConfigAsync
+          projectId
         );
         if (!flags.verbose) {
           Log.log(chalk.green('Build successful'));

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

@@ -1,76 +0,0 @@
-import { Flags } from '@oclif/core';
-
-import { handleDeprecatedEasJsonAsync } from '.';
-import { LocalBuildMode } from '../../build/local';
-import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import EasCommand from '../../commandUtils/EasCommand';
-import { RequestedPlatform } from '../../platform';
-import { enableJsonOutput } from '../../utils/json';
-
-/**
- * This command will be run on the EAS Build workers, when building
- * directly from git. This command resolves credentials and other
- * build configuration, that normally would be included in the
- * job and metadata objects, and prints them to stdout.
- */
-export default class BuildInternal extends EasCommand {
-  static override hidden = true;
-
-  static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: ['android', 'ios'],
-      required: true,
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description:
-        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Analytics,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(BuildInternal);
-    // This command is always run with implicit --non-interactive and --json options
-    enableJsonOutput();
-
-    const {
-      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
-      projectDir,
-      analytics,
-    } = await this.getContextAsync(BuildInternal, {
-      nonInteractive: true,
-    });
-
-    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-
-    await runBuildAndSubmitAsync(
-      graphqlClient,
-      analytics,
-      projectDir,
-      {
-        requestedPlatform: flags.platform as RequestedPlatform,
-        profile: flags.profile,
-        nonInteractive: true,
-        wait: false,
-        clearCache: false,
-        json: true,
-        autoSubmit: false,
-        localBuildOptions: {
-          localBuildMode: LocalBuildMode.INTERNAL,
-        },
-      },
-      actor,
-      getDynamicProjectConfigAsync
-    );
-  }
-}

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

@@ -2,17 +2,20 @@ import { Flags } from '@oclif/core';
 
 import { BUILDS_LIMIT, listAndRenderBuildsOnAppAsync } from '../../build/queries';
 import { BuildDistributionType, BuildStatus } from '../../build/types';
-import EasCommand from '../../commandUtils/EasCommand';
+import EasCommand, { EASCommandProjectIdContext } from '../../commandUtils/EasCommand';
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import {
   EasPaginatedQueryFlags,
   getLimitFlagWithCustomValues,
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
-import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
+import {
+  AppPlatform,
+  DistributionType,
+  BuildStatus as GraphQLBuildStatus,
+} from '../../graphql/generated';
 import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { buildDistributionTypeToGraphQLDistributionType } from '../../utils/buildDistribution';
 import { enableJsonOutput } from '../../utils/json';
 
 export default class BuildList extends EasCommand {
@@ -53,8 +56,7 @@ export default class BuildList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
+    ...EASCommandProjectIdContext,
   };
 
   async runAsync(): Promise<void> {
@@ -67,10 +69,7 @@ export default class BuildList extends EasCommand {
       distribution: buildDistribution,
       'non-interactive': nonInteractive,
     } = flags;
-    const {
-      projectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BuildList, {
+    const { projectId } = await this.getContextAsync(BuildList, {
       nonInteractive,
     });
     if (jsonFlag) {
@@ -79,11 +78,10 @@ export default class BuildList extends EasCommand {
 
     const platform = toAppPlatform(requestedPlatform);
     const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
-    const graphqlBuildDistribution =
-      buildDistributionTypeToGraphQLDistributionType(buildDistribution);
-    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);
 
-    await listAndRenderBuildsOnAppAsync(graphqlClient, {
+    await listAndRenderBuildsOnAppAsync({
       projectId,
       projectDisplayName: displayName,
       filter: {
@@ -131,3 +129,17 @@ const toGraphQLBuildStatus = (buildStatus?: BuildStatus): GraphQLBuildStatus | u
     return GraphQLBuildStatus.Canceled;
   }
 };
+
+const toGraphQLBuildDistribution = (
+  buildDistribution?: BuildDistributionType
+): DistributionType | undefined => {
+  if (buildDistribution === BuildDistributionType.STORE) {
+    return DistributionType.Store;
+  } else if (buildDistribution === BuildDistributionType.INTERNAL) {
+    return DistributionType.Internal;
+  } else if (buildDistribution === BuildDistributionType.SIMULATOR) {
+    return DistributionType.Simulator;
+  } else {
+    return undefined;
+  }
+};

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

@@ -1,298 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { CredentialsSource, EasJson, EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
-import { Flags } from '@oclif/core';
-import assert from 'assert';
-import chalk from 'chalk';
-
-import { handleDeprecatedEasJsonAsync } from '.';
-import { waitForBuildEndAsync } from '../../build/build';
-import { ensureIosCredentialsForBuildResignAsync } from '../../build/ios/credentials';
-import { prepareCredentialsToResign } from '../../build/ios/prepareJob';
-import { listAndSelectBuildOnAppAsync } from '../../build/queries';
-import { printBuildResults, printLogsUrls } from '../../build/utils/printBuildInfo';
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { EasPaginatedQueryFlags } from '../../commandUtils/pagination';
-import { CredentialsContext } from '../../credentials/context';
-import {
-  BuildFragment,
-  BuildMode,
-  BuildStatus,
-  BuildWorkflow,
-  DistributionType,
-  IosJobOverridesInput,
-  ProjectArchiveSourceType,
-  StatuspageServiceName,
-} from '../../graphql/generated';
-import { BuildMutation } from '../../graphql/mutations/BuildMutation';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { toAppPlatform } from '../../graphql/types/AppPlatform';
-import Log from '../../log';
-import { requestedPlatformDisplayNames, selectPlatformAsync } from '../../platform';
-import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
-import { resolveTargetsAsync } from '../../project/ios/target';
-import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
-
-interface BuildResignFlags {
-  json: boolean;
-  nonInteractive: boolean;
-  offset?: number;
-  limit?: number;
-  platform?: Platform;
-  profile?: string;
-  maybeBuildId?: string;
-  wait: boolean;
-}
-interface RawBuildResignFlags {
-  json: boolean;
-  'non-interactive': boolean;
-  offset: number | undefined;
-  limit: number | undefined;
-  platform: 'android' | 'ios' | undefined;
-  profile: string | undefined;
-  wait: boolean;
-  id: string | undefined;
-}
-
-export default class BuildResign extends EasCommand {
-  static override description = 're-sign a build archive';
-
-  static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: ['android', 'ios'],
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description:
-        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
-      helpValue: 'PROFILE_NAME',
-    }),
-    wait: Flags.boolean({
-      default: true,
-      allowNo: true,
-      description: 'Wait for build(s) to complete.',
-    }),
-    id: Flags.string({
-      description: 'ID of the build to re-sign.',
-    }),
-    ...EasPaginatedQueryFlags,
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Analytics,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags: rawFlags } = await this.parse(BuildResign);
-    if (rawFlags.json) {
-      enableJsonOutput();
-    }
-
-    const flags = this.sanitizeFlags(rawFlags as RawBuildResignFlags);
-    const { limit, offset, nonInteractive } = flags;
-
-    const {
-      loggedIn: { actor, graphqlClient },
-      getDynamicProjectConfigAsync,
-      projectDir,
-      analytics,
-    } = await this.getContextAsync(BuildResign, {
-      nonInteractive: flags.nonInteractive,
-    });
-
-    const maybeBuild = flags.maybeBuildId
-      ? await this.maybeGetBuildAsync(graphqlClient, flags.maybeBuildId)
-      : undefined;
-    const platform =
-      (maybeBuild?.platform.toLowerCase() as Platform | undefined) ??
-      (await selectPlatformAsync(flags.platform));
-    if (platform === Platform.ANDROID) {
-      throw new Error('Re-signing archives is not supported on Android yet.');
-    }
-
-    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-
-    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasBuild]);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    const easJsonCliConfig: EasJson['cli'] =
-      (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
-
-    const buildProfile = await EasJsonUtils.getBuildProfileAsync(
-      easJsonAccessor,
-      platform,
-      flags.profile ?? 'production'
-    );
-    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
-    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-    const build = await this.ensureBuildSelectedAsync(
-      { graphqlClient, projectId, platform, nonInteractive, limit, offset },
-      maybeBuild
-    );
-    const credentialsCtx = new CredentialsContext({
-      projectInfo: { exp, projectId },
-      nonInteractive,
-      projectDir,
-      user: actor,
-      graphqlClient,
-      analytics,
-      env: buildProfile.env,
-      easJsonCliConfig,
-    });
-    if (buildProfile.credentialsSource !== CredentialsSource.LOCAL && !nonInteractive) {
-      await credentialsCtx.appStore.ensureAuthenticatedAsync();
-    }
-    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
-      {
-        projectDir,
-        nonInteractive,
-        exp,
-      },
-      buildProfile
-    );
-    const targets = await resolveTargetsAsync({
-      projectDir,
-      exp,
-      xcodeBuildContext,
-      env: buildProfile.env,
-    });
-    const credentialsResult = await ensureIosCredentialsForBuildResignAsync(
-      credentialsCtx,
-      targets,
-      buildProfile
-    );
-    assert(build.artifacts?.applicationArchiveUrl, 'Missing application archive.');
-    const jobOverrides: IosJobOverridesInput = {
-      mode: BuildMode.Resign,
-      type: BuildWorkflow.Unknown,
-      resign: {
-        applicationArchiveSource: {
-          type: ProjectArchiveSourceType.Url,
-          url: build.artifacts?.applicationArchiveUrl,
-        },
-      },
-      secrets: prepareCredentialsToResign(credentialsResult.credentials),
-      builderEnvironment: { image: 'default' },
-    };
-    const newBuild = await BuildMutation.retryIosBuildAsync(graphqlClient, {
-      buildId: build.id,
-      jobOverrides,
-    });
-
-    Log.addNewLineIfNone();
-    printLogsUrls([newBuild]);
-    Log.newLine();
-    if (!flags.wait) {
-      if (flags.json) {
-        printJsonOnlyOutput(newBuild);
-      }
-      return;
-    }
-
-    const buildResult = await waitForBuildEndAsync(graphqlClient, {
-      buildIds: [newBuild.id],
-      accountName: account.name,
-      nonInteractive,
-      projectDir,
-    });
-    if (!flags.json) {
-      printBuildResults(buildResult);
-    } else {
-      assert(buildResult[0], 'missing build results');
-      printJsonOnlyOutput(buildResult[0]);
-    }
-  }
-
-  sanitizeFlags(flags: RawBuildResignFlags): BuildResignFlags {
-    const nonInteractive = flags['non-interactive'];
-    if (nonInteractive && !flags.id) {
-      throw new Error(
-        `${chalk.bold('--id')} is required when running with ${chalk.bold(
-          '--non-interactive'
-        )} flag.`
-      );
-    }
-    return {
-      json: flags.json,
-      nonInteractive,
-      offset: flags.offset,
-      limit: flags.limit,
-      platform: flags.platform as Platform | undefined,
-      profile: flags.profile,
-      maybeBuildId: flags.id,
-      wait: flags.wait,
-    };
-  }
-
-  async ensureBuildSelectedAsync(
-    {
-      graphqlClient,
-      projectId,
-      platform,
-      nonInteractive,
-      limit,
-      offset,
-    }: {
-      graphqlClient: ExpoGraphqlClient;
-      projectId: string;
-      platform: Platform;
-      nonInteractive: boolean;
-      limit?: number;
-      offset?: number;
-    },
-    maybeBuild?: BuildFragment
-  ): Promise<BuildFragment> {
-    if (maybeBuild) {
-      return maybeBuild;
-    }
-    const build = await listAndSelectBuildOnAppAsync(graphqlClient, {
-      projectId,
-      title: 'Which build would you like to re-sign with new credentials?',
-      paginatedQueryOptions: {
-        limit,
-        offset: offset ?? 0,
-        nonInteractive,
-        json: false,
-      },
-      filter: {
-        distribution: DistributionType.Internal,
-        platform: toAppPlatform(platform),
-        status: BuildStatus.Finished,
-      },
-    });
-    if (!build) {
-      throw new Error('There are no builds that can be re-signed on this project.');
-    }
-    return build;
-  }
-
-  async maybeGetBuildAsync(
-    graphqlClient: ExpoGraphqlClient,
-    maybeBuildId?: string,
-    maybePlatform?: Platform
-  ): Promise<BuildFragment | undefined> {
-    if (maybeBuildId) {
-      const build = await BuildQuery.byIdAsync(graphqlClient, maybeBuildId);
-      if (build.distribution !== DistributionType.Internal) {
-        throw new Error('This is not an internal distribution build.');
-      }
-      if (build.status !== BuildStatus.Finished) {
-        throw new Error('Only builds that finished successfully can be re-signed.');
-      }
-      if (maybePlatform && build.platform !== toAppPlatform(maybePlatform)) {
-        throw new Error(
-          `Build with ID ${maybeBuildId} was not created for platform ${requestedPlatformDisplayNames[maybePlatform]}.`
-        );
-      }
-      return build;
-    }
-    return undefined;
-  }
-}

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

@@ -1,290 +0,0 @@
-import { Errors, Flags } from '@oclif/core';
-import assert from 'assert';
-import { pathExists } from 'fs-extra';
-import path from 'path';
-
-import { getLatestBuildAsync, listAndSelectBuildOnAppAsync } from '../../build/queries';
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import {
-  EasPaginatedQueryFlags,
-  PaginatedQueryOptions,
-  getPaginatedQueryOptions,
-} from '../../commandUtils/pagination';
-import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import Log from '../../log';
-import { appPlatformDisplayNames } from '../../platform';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { RunArchiveFlags, runAsync } from '../../run/run';
-import { isRunnableOnSimulatorOrEmulator } from '../../run/utils';
-import {
-  downloadAndMaybeExtractAppAsync,
-  extractAppFromLocalArchiveAsync,
-} from '../../utils/download';
-import { getEasBuildRunCacheDirectoryPath } from '../../utils/paths';
-
-interface RawRunFlags {
-  latest?: boolean;
-  id?: string;
-  url?: string;
-  path?: string;
-  platform?: string;
-  limit?: number;
-  offset?: number;
-}
-
-interface RunCommandFlags {
-  selectedPlatform: AppPlatform;
-  runArchiveFlags: RunArchiveFlags;
-  limit?: number;
-  offset?: number;
-}
-
-export default class Run extends EasCommand {
-  static override description = 'run simulator/emulator builds from eas-cli';
-
-  static override flags = {
-    latest: Flags.boolean({
-      description: 'Run the latest simulator/emulator build for specified platform',
-      exclusive: ['id', 'path', 'url'],
-    }),
-    url: Flags.string({
-      description: 'Simulator/Emulator build archive url',
-      exclusive: ['latest', 'id', 'path'],
-    }),
-    path: Flags.string({
-      description: 'Path to the simulator/emulator build archive or app',
-      exclusive: ['latest', 'id', 'url'],
-    }),
-    id: Flags.string({
-      description: 'ID of the simulator/emulator build to run',
-      exclusive: ['latest, path, url'],
-    }),
-    platform: Flags.enum({
-      char: 'p',
-      options: ['android', 'ios'],
-    }),
-    ...EasPaginatedQueryFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags: rawFlags } = await this.parse(Run);
-    const flags = await this.sanitizeFlagsAsync(rawFlags);
-    const queryOptions = getPaginatedQueryOptions(flags);
-    const {
-      loggedIn: { graphqlClient },
-      projectConfig: { projectId },
-    } = await this.getContextAsync(Run, {
-      nonInteractive: false,
-    });
-
-    const simulatorBuildPath = await getPathToSimulatorBuildAppAsync(
-      graphqlClient,
-      projectId,
-      flags,
-      queryOptions
-    );
-
-    await runAsync(simulatorBuildPath, flags.selectedPlatform);
-  }
-
-  private async sanitizeFlagsAsync(flags: RawRunFlags): Promise<RunCommandFlags> {
-    const { platform, limit, offset, ...runArchiveFlags } = flags;
-
-    const selectedPlatform = await resolvePlatformAsync(platform);
-
-    if (platform === 'ios' && process.platform !== 'darwin') {
-      Errors.error('You can only use an iOS simulator to run apps on macOS devices', {
-        exit: 1,
-      });
-    }
-
-    if (
-      runArchiveFlags.path &&
-      !(
-        (runArchiveFlags.path.endsWith('.tar.gz') ||
-          runArchiveFlags.path.endsWith('.app') ||
-          runArchiveFlags.path.endsWith('.apk')) &&
-        (await pathExists(runArchiveFlags.path))
-      )
-    ) {
-      Errors.error('The path must point to a .tar.gz archive, .apk file, or .app directory', {
-        exit: 1,
-      });
-    }
-
-    return {
-      selectedPlatform,
-      runArchiveFlags,
-      limit,
-      offset,
-    };
-  }
-}
-
-async function resolvePlatformAsync(platform?: string): Promise<AppPlatform> {
-  if (process.platform !== 'darwin') {
-    return AppPlatform.Android;
-  }
-
-  if (platform && Object.values(AppPlatform).includes(platform.toUpperCase() as AppPlatform)) {
-    return platform.toUpperCase() as AppPlatform;
-  }
-
-  const { selectedPlatform } = await promptAsync({
-    type: 'select',
-    message: 'Select platform',
-    name: 'selectedPlatform',
-    choices: [
-      { title: 'Android', value: AppPlatform.Android },
-      { title: 'iOS', value: AppPlatform.Ios },
-    ],
-  });
-  return selectedPlatform;
-}
-
-function validateChosenBuild(
-  maybeBuild: BuildFragment | null,
-  selectedPlatform: AppPlatform
-): BuildFragment {
-  if (!maybeBuild) {
-    throw new Error('There are no simulator/emulator builds that can be run for this project.');
-  }
-
-  if (selectedPlatform !== maybeBuild.platform) {
-    throw new Error(
-      `The selected build is for ${
-        appPlatformDisplayNames[maybeBuild.platform]
-      }, but you selected ${appPlatformDisplayNames[selectedPlatform]}`
-    );
-  }
-
-  if (maybeBuild.status !== BuildStatus.Finished) {
-    throw new Error('The selected build is not finished.');
-  }
-
-  if (!isRunnableOnSimulatorOrEmulator(maybeBuild)) {
-    throw new Error(
-      'Artifacts for the latest build have expired and are no longer available, or this is not a simulator/emulator build.'
-    );
-  }
-
-  return maybeBuild;
-}
-
-async function maybeGetBuildAsync(
-  graphqlClient: ExpoGraphqlClient,
-  flags: RunCommandFlags,
-  projectId: string,
-  paginatedQueryOptions: PaginatedQueryOptions
-): Promise<BuildFragment | null> {
-  const distributionType =
-    flags.selectedPlatform === AppPlatform.Ios ? DistributionType.Simulator : undefined;
-
-  if (flags.runArchiveFlags.id) {
-    const build = await BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
-    return validateChosenBuild(build, flags.selectedPlatform);
-  } else if (
-    !flags.runArchiveFlags.id &&
-    !flags.runArchiveFlags.path &&
-    !flags.runArchiveFlags.url &&
-    !flags.runArchiveFlags.latest
-  ) {
-    const build = await listAndSelectBuildOnAppAsync(graphqlClient, {
-      projectId,
-      title: `Select ${appPlatformDisplayNames[flags.selectedPlatform]} ${
-        flags.selectedPlatform === AppPlatform.Ios ? 'simulator' : 'emulator'
-      } build to run for ${await getDisplayNameForProjectIdAsync(graphqlClient, projectId)} app`,
-      filter: {
-        platform: flags.selectedPlatform,
-        distribution: distributionType,
-        status: BuildStatus.Finished,
-      },
-      paginatedQueryOptions,
-      selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
-      selectPromptWarningMessage:
-        'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
-    });
-    return validateChosenBuild(build, flags.selectedPlatform);
-  } else if (flags.runArchiveFlags.latest) {
-    const latestBuild = await getLatestBuildAsync(graphqlClient, {
-      projectId,
-      filter: {
-        platform: flags.selectedPlatform,
-        distribution: distributionType,
-        status: BuildStatus.Finished,
-      },
-    });
-
-    return validateChosenBuild(latestBuild, flags.selectedPlatform);
-  } else {
-    return null;
-  }
-}
-
-function getEasBuildRunCachedAppPath(
-  projectId: string,
-  buildId: string,
-  platform: AppPlatform
-): string {
-  return path.join(
-    getEasBuildRunCacheDirectoryPath(),
-    `${projectId}_${buildId}.${platform === AppPlatform.Ios ? 'app' : 'apk'}`
-  );
-}
-
-async function getPathToSimulatorBuildAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  flags: RunCommandFlags,
-  queryOptions: PaginatedQueryOptions
-): Promise<string> {
-  const maybeBuild = await maybeGetBuildAsync(graphqlClient, flags, projectId, queryOptions);
-
-  if (maybeBuild) {
-    const cachedAppPath = getEasBuildRunCachedAppPath(
-      projectId,
-      maybeBuild.id,
-      flags.selectedPlatform
-    );
-
-    if (await pathExists(cachedAppPath)) {
-      Log.newLine();
-      Log.log(`Using cached app...`);
-      return cachedAppPath;
-    }
-
-    if (!maybeBuild.artifacts?.applicationArchiveUrl) {
-      throw new Error('Build does not have an application archive url');
-    }
-
-    return await downloadAndMaybeExtractAppAsync(
-      maybeBuild.artifacts.applicationArchiveUrl,
-      flags.selectedPlatform,
-      cachedAppPath
-    );
-  }
-
-  if (flags.runArchiveFlags.url) {
-    return await downloadAndMaybeExtractAppAsync(flags.runArchiveFlags.url, flags.selectedPlatform);
-  }
-
-  if (flags.runArchiveFlags.path?.endsWith('.tar.gz')) {
-    return await extractAppFromLocalArchiveAsync(
-      flags.runArchiveFlags.path,
-      flags.selectedPlatform
-    );
-  }
-
-  // this should never fail, due to the validation in sanitizeFlagsAsync
-  assert(flags.runArchiveFlags.path);
-  return flags.runArchiveFlags.path;
-}

packages/eas-cli/src/commands/build/version/set.ts

@@ -4,7 +4,10 @@ import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import EasCommand from '../../../commandUtils/EasCommand';
+import EasCommand, {
+  EASCommandLoggedInContext,
+  EASCommandProjectIdContext,
+} from '../../../commandUtils/EasCommand';
 import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
@@ -12,8 +15,12 @@ import Log from '../../../log';
 import { selectPlatformAsync } from '../../../platform';
 import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
 import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import { getExpoConfig } from '../../../project/expoConfig';
 import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
-import { getDisplayNameForProjectIdAsync } from '../../../project/projectUtils';
+import {
+  findProjectRootAsync,
+  getDisplayNameForProjectIdAsync,
+} from '../../../project/projectUtils';
 import {
   ensureVersionSourceIsRemoteAsync,
   getBuildVersionName,
@@ -38,21 +45,18 @@ export default class BuildVersionSetView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
+    ...EASCommandLoggedInContext,
+    ...EASCommandProjectIdContext,
   };
 
   public async runAsync(): Promise<void> {
     const { flags } = await this.parse(BuildVersionSetView);
-    const {
-      loggedIn: { graphqlClient },
-      getDynamicProjectConfigAsync,
-      projectDir,
-    } = await this.getContextAsync(BuildVersionSetView, {
+    const { actor, projectId } = await this.getContextAsync(BuildVersionSetView, {
       nonInteractive: false,
     });
 
+    const projectDir = await findProjectRootAsync();
+
     const platform = await selectPlatformAsync(flags.platform);
     const easJsonAccessor = new EasJsonAccessor(projectDir);
     await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
@@ -62,21 +66,19 @@ export default class BuildVersionSetView extends EasCommand {
       flags.profile ?? undefined
     );
 
-    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: profile.env });
-    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const exp = getExpoConfig(projectDir, { env: profile.env });
+    const displayName = await getDisplayNameForProjectIdAsync(projectId);
 
     validateAppConfigForRemoteVersionSource(exp, platform);
 
-    const applicationIdentifier = await getApplicationIdentifierAsync({
-      graphqlClient,
+    const applicationIdentifier = await getApplicationIdentifierAsync(
       projectDir,
-      projectId,
       exp,
-      buildProfile: profile,
+      profile,
       platform,
-    });
+      actor
+    );
     const remoteVersions = await AppVersionQuery.latestVersionAsync(
-      graphqlClient,
       projectId,
       toAppPlatform(platform),
       applicationIdentifier
@@ -107,7 +109,7 @@ export default class BuildVersionSetView extends EasCommand {
           ? value => isValidVersionCode(value) || `Invalid value: ${VERSION_CODE_REQUIREMENTS}.`
           : value => isValidBuildNumber(value) || `Invalid value: ${BUILD_NUMBER_REQUIREMENTS}.`,
     });
-    await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+    await AppVersionMutation.createAppVersionAsync({
       appId: projectId,
       platform: toAppPlatform(platform),
       applicationIdentifier,

packages/eas-cli/src/commands/build/version/sync.ts

@@ -6,7 +6,10 @@ import chalk from 'chalk';
 
 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../../build/android/version';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
-import EasCommand from '../../../commandUtils/EasCommand';
+import EasCommand, {
+  EASCommandLoggedInContext,
+  EASCommandProjectIdContext,
+} from '../../../commandUtils/EasCommand';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { toAppPlatform } from '../../../graphql/types/AppPlatform';
 import Log from '../../../log';
@@ -18,9 +21,11 @@ import {
 import { getAppBuildGradleAsync } from '../../../project/android/gradleUtils';
 import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
 import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import { getExpoConfig } from '../../../project/expoConfig';
 import { resolveXcodeBuildContextAsync } from '../../../project/ios/scheme';
 import { resolveTargetsAsync } from '../../../project/ios/target';
 import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
+import { findProjectRootAsync } from '../../../project/projectUtils';
 import {
   ensureVersionSourceIsRemoteAsync,
   getBuildVersionName,
@@ -55,20 +60,16 @@ export default class BuildVersionSyncView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
+    ...EASCommandLoggedInContext,
+    ...EASCommandProjectIdContext,
   };
 
   public async runAsync(): Promise<void> {
     const { flags } = await this.parse(BuildVersionSyncView);
-    const {
-      loggedIn: { graphqlClient },
-      getDynamicProjectConfigAsync,
-      projectDir,
-    } = await this.getContextAsync(BuildVersionSyncView, {
+    const { actor, projectId } = await this.getContextAsync(BuildVersionSyncView, {
       nonInteractive: true,
     });
+    const projectDir = await findProjectRootAsync();
 
     const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
     const easJsonAccessor = new EasJsonAccessor(projectDir);
@@ -82,23 +83,19 @@ export default class BuildVersionSyncView extends EasCommand {
       profileName: flags.profile ?? undefined,
     });
     for (const profileInfo of buildProfiles) {
-      const { exp, projectId } = await getDynamicProjectConfigAsync({
-        env: profileInfo.profile.env,
-      });
+      const exp = getExpoConfig(projectDir, { env: profileInfo.profile.env });
 
       validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
       const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];
 
-      const applicationIdentifier = await getApplicationIdentifierAsync({
-        graphqlClient,
+      const applicationIdentifier = await getApplicationIdentifierAsync(
         projectDir,
-        projectId,
         exp,
-        buildProfile: profileInfo.profile,
-        platform: profileInfo.platform,
-      });
+        profileInfo.profile,
+        profileInfo.platform,
+        actor
+      );
       const remoteVersions = await AppVersionQuery.latestVersionAsync(
-        graphqlClient,
         projectId,
         toAppPlatform(profileInfo.platform),
         applicationIdentifier