sdf

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Expo Developers Discord
-    url: https://chat.expo.dev/
-    about: Join other developers in discussions regarding Expo and EAS.

.github/workflows/changelog-bot.yml

@@ -14,9 +14,9 @@ jobs:
           token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - name: Checkout Pull Request
-        run: gh pr checkout ${{ github.event.issue.number }}
+        run: hub pr checkout ${{ github.event.issue.number }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Install dependencies

.github/workflows/changelog.yml

@@ -8,10 +8,6 @@ on:
       - labeled
       - unlabeled
 
-concurrency:
-  group: changelog-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   pr-changelog-entry:
     name: Check CHANGELOG.md updated
@@ -20,7 +16,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Check if CHANGELOG.md was updated
         id: changelog-updated
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v35
         with:
           files: CHANGELOG.md
       - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -96,7 +96,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -138,7 +138,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: 20
+          node-version: 18
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -152,13 +152,7 @@ jobs:
           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
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-      - name: Add latest-eas-build 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
+          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:
@@ -171,7 +165,7 @@ jobs:
           token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files
@@ -181,7 +175,7 @@ jobs:
         working-directory: ./scripts
         run: yarn --silent release-changelog $EAS_CLI_VERSION > /tmp/current-changelog
       - name: Publish release
-        run: gh release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
+        run: hub release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Commit and push

.github/workflows/size.yml

@@ -2,9 +2,6 @@ name: Size
 on:
   pull_request:
     types: [synchronize, opened]
-concurrency:
-  group: size-${{ github.ref }}
-  cancel-in-progress: true
 jobs:
   compare:
     runs-on: ubuntu-latest
@@ -12,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'

.github/workflows/test-scripts.yml

@@ -13,10 +13,6 @@ on:
     paths:
       - 'scripts/**'
 
-concurrency:
-  group: test-scripts-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -25,6 +21,6 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn typecheck

.github/workflows/test.yml

@@ -6,18 +6,14 @@ on:
   pull_request:
     types: [opened, synchronize]
 
-concurrency:
-  group: test-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['16', '18', '20']
+        node: ['14', '16', '18']
         include:
-          - node: '20'
+          - node: '18'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:

.github/workflows/upgrade-eas-build-modules.yml

@@ -1,81 +0,0 @@
-name: Open a PR bumping eas-build modules
-
-on: workflow_dispatch
-
-jobs:
-  open-pr:
-    name: Open a PR bumping eas-build modules
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 20
-
-      - run: yarn install --frozen-lockfile
-
-      - name: Configure git
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Expo Bot"
-
-      - name: Upgrade eas-build modules
-        run: |
-          for DIR in packages/eas-cli packages/eas-json; do
-            pushd $DIR >/dev/null 2>&1
-              # packages are ordered according to output of `lerna list --toposort`
-              # https://github.com/expo/turtle-v2/pull/568
-              for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/steps" "@expo/turtle-spawn" "@expo/build-tools"; do
-                if grep -q $PACKAGE package.json; then
-                  echo "[$DIR] yarn --exact add $PACKAGE"
-                  yarn add --exact $PACKAGE
-                fi
-              done
-            popd >/dev/null 2>&1
-          done
-
-      - name: Set a branch name
-        id: bump-branch-name
-        run: |
-          HASH="$(echo $RANDOM | md5sum | head -c 10)"
-          BRANCH_NAME="@expo-bot/eas-build-bump-$HASH"
-
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-
-      - name: Create a branch, commit, and push
-        run: |
-          BRANCH_NAME="${{ steps.bump-branch-name.outputs.BRANCH_NAME }}"
-
-          git checkout -b $BRANCH_NAME
-          git add .
-          git commit -m "Upgrade eas-build dependencies"
-          git push origin $BRANCH_NAME
-
-      - name: Open a PR to main
-        uses: repo-sync/pull-request@v2
-        id: open-pr
-        with:
-          source_branch: '${{ steps.bump-branch-name.outputs.BRANCH_NAME }}'
-          destination_branch: 'main'
-          pr_title: 'Upgrade eas-build dependencies'
-          pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
-          pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
-          github_token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_PAT }}
-          script: |
-            github.issues.createComment({
-              issue_number: ${{ steps.open-pr.outputs.pr_number }},
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: "/changelog-entry chore Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies."
-            })

CHANGELOG.md

@@ -8,390 +8,14 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Support configuring a Google Service Account Key via eas credentials, for sending Android Notifications via FCM V1. ([#2197](https://github.com/expo/eas-cli/pull/2197) by [@christopherwalter](https://github.com/christopherwalter))
-
-### 🐛 Bug fixes
-
-- Revert expose expo export dev flag as an option in eas update. ([#2214](https://github.com/expo/eas-cli/pull/2214) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2223](https://github.com/expo/eas-cli/pull/2223) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.1.3](https://github.com/expo/eas-cli/releases/tag/v7.1.3) - 2024-02-07
-
-### 🧹 Chores
-
-- Remove duplicated log message when creating ASC API key. ([#2208](https://github.com/expo/eas-cli/pull/2208) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Add simulator flag to metadata. ([#2073](https://github.com/expo/eas-cli/pull/2073) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies. ([#2220](https://github.com/expo/eas-cli/pull/2220) by [@expo-bot](https://github.com/expo-bot))
-
-## [7.1.2](https://github.com/expo/eas-cli/releases/tag/v7.1.2) - 2024-01-30
-
-### 🧹 Chores
-
-- Add better validation for EAS Submit inputs. ([#2202](https://github.com/expo/eas-cli/pull/2202) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.1.1](https://github.com/expo/eas-cli/releases/tag/v7.1.1) - 2024-01-26
-
-### 🐛 Bug fixes
-
-- Revert incorrect EAS Submit input validation changes. ([#2200](https://github.com/expo/eas-cli/pull/2200) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.1.0](https://github.com/expo/eas-cli/releases/tag/v7.1.0) - 2024-01-26
-
-### 🎉 New features
-
-- Support requireCommit for EAS Update. ([#2196](https://github.com/expo/eas-cli/pull/2196) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Remove support for classic updates release channel in 50+. ([#2189](https://github.com/expo/eas-cli/pull/2189) by [@wschurman](https://github.com/wschurman))
-- Validate EAS Submit inputs better. ([#2198](https://github.com/expo/eas-cli/pull/2198) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [7.0.0](https://github.com/expo/eas-cli/releases/tag/v7.0.0) - 2024-01-19
-
-### 🛠 Breaking changes
-
-- Stop generating eas-update-metadata.json on publish. ([#2187](https://github.com/expo/eas-cli/pull/2187) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Use branch mapping utility fn. ([#2186](https://github.com/expo/eas-cli/pull/2186) by [@quinlanj](https://github.com/quinlanj))
-
-## [6.1.0](https://github.com/expo/eas-cli/releases/tag/v6.1.0) - 2024-01-18
-
-### 🎉 New features
-
-- Add `build:delete` command. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Add filter flags for `platform` and `profile` to `build:cancel` and `build:delete` commands. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🧹 Chores
-
-- Remove "bare"-specific **eas.json** template. ([#2179](https://github.com/expo/eas-cli/pull/2179) by [@sjchmiela](https://github.com/sjchmiela))
-- Prompt users if they want to continue if EAS CLI fails to provision the devices. ([#2181](https://github.com/expo/eas-cli/pull/2181) by [@szdziedzic](https://github.com/szdziedzic))
-- Update `eas-cli` and `@expo/eas-json` dependencies. ([#2176](https://github.com/expo/eas-cli/pull/2176) by [@szdziedzic](https://github.com/szdziedzic))
-- Update `eas.schema.json` to after adding Xcode 15.2 image. ([#2184](https://github.com/expo/eas-cli/pull/2184) by [@szdziedzic](https://github.com/szdziedzic))
-- Upgrade packages from the expo/expo repo. ([#2145](https://github.com/expo/eas-cli/pull/2145) by [@wschurman](https://github.com/wschurman))
-
-## [6.0.0](https://github.com/expo/eas-cli/releases/tag/v6.0.0) - 2024-01-12
-
-### 🛠 Breaking changes
-
-- Drop support for Node 14. ([#2175](https://github.com/expo/eas-cli/pull/2175) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🎉 New features
-
-- Allow undefined update message for EAS Update publishing when no VCS. ([#2148](https://github.com/expo/eas-cli/pull/2148) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Upgrade `@expo/eas-build-job` to `1.0.56`, thus removing unused (since [#1524](https://github.com/expo/eas-cli/pull/1524)) support for S3 project archives. ([#2165](https://github.com/expo/eas-cli/pull/2165) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [5.9.3](https://github.com/expo/eas-cli/releases/tag/v5.9.3) - 2023-12-19
-
-### 🧹 Chores
-
-- Rename getUpdateGroupJsonInfo. ([#2157](https://github.com/expo/eas-cli/pull/2157) by [@quinlanj](https://github.com/quinlanj))
-- Add new Xcode 15.1 image to `eas.schema.json`. ([#2155](https://github.com/expo/eas-cli/pull/2155) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.9.2](https://github.com/expo/eas-cli/releases/tag/v5.9.2) - 2023-12-15
-
-### 🧹 Chores
-
-- Throw error if custom build config is gitignored. ([#2123](https://github.com/expo/eas-cli/pull/2123) by [@szdziedzic](https://github.com/szdziedzic))
-- Update `@expo/steps` library to `1.0.51`. ([#2130](https://github.com/expo/eas-cli/pull/2130) by [@szdziedzic](https://github.com/szdziedzic))
-- Update `eas.schema.json` to include changes after some of our images were migrated from Ubuntu 18.04 to Ubuntu 20.04. ([#2137](https://github.com/expo/eas-cli/pull/2137) by [@szdziedzic](https://github.com/szdziedzic))
-- Update oclif dependencies. ([#2008](https://github.com/expo/eas-cli/pull/2008) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Upgrade `eas-build-job` and unify how we're handling `buildMode`. ([#2138](https://github.com/expo/eas-cli/pull/2138) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [5.9.1](https://github.com/expo/eas-cli/releases/tag/v5.9.1) - 2023-11-20
-
-### 🐛 Bug fixes
-
-- Don't ask a user to install the dev client if running in non-interactive mode. ([#2124](https://github.com/expo/eas-cli/pull/2124) by [@szdziedzic](https://github.com/szdziedzic))
-- Always refresh existing provisioning profile before use. ([#2125](https://github.com/expo/eas-cli/pull/2125) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [5.9.0](https://github.com/expo/eas-cli/releases/tag/v5.9.0) - 2023-11-15
-
-### 🎉 New features
-
-- Add `--profile` flag to `eas build:run` command. ([#2035](https://github.com/expo/eas-cli/pull/2035) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.8.0](https://github.com/expo/eas-cli/releases/tag/v5.8.0) - 2023-11-13
-
-### 🎉 New features
-
-- Move channel:rollout out of developer preview. ([#2114](https://github.com/expo/eas-cli/pull/2114) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
-- Fixed provisioning of new devices into an existing profile. ([#2119](https://github.com/expo/eas-cli/pull/2119) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🧹 Chores
-
-- Update `@expo/package-manager` to `1.1.2` to change package manager resolution order. ([#2118](https://github.com/expo/eas-cli/pull/2118) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.7.0](https://github.com/expo/eas-cli/releases/tag/v5.7.0) - 2023-11-08
-
-### 🎉 New features
-
-- Add `EXPO_APPLE_TEAM_ID` and `EXPO_APPLE_PROVIDER_ID` support. ([#2091](https://github.com/expo/eas-cli/pull/2091) by [@EvanBacon](https://github.com/EvanBacon))
-
-### 🧹 Chores
-
-- Add link to SDK upgrade page for SDK-gated command error. ([#2106](https://github.com/expo/eas-cli/pull/2106) by [@wschurman](https://github.com/wschurman))
-- Add `selectedImage` and `customNodeVersion` information to build metadata. ([#2113](https://github.com/expo/eas-cli/pull/2113) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.6.0](https://github.com/expo/eas-cli/releases/tag/v5.6.0) - 2023-10-27
-
-### 🎉 New features
-
-- Use corresponding submit profile when selecting build from EAS. ([#2101](https://github.com/expo/eas-cli/pull/2101) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🐛 Bug fixes
-
-- Added `buildArtifactsUrl` to `eas-cli build:view --json` output. ([#2102](https://github.com/expo/eas-cli/pull/2102) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [5.5.0](https://github.com/expo/eas-cli/releases/tag/v5.5.0) - 2023-10-25
-
-### 🎉 New features
-
-- Add account type to the items in the prompt to select project owner. ([#2083](https://github.com/expo/eas-cli/pull/2083) by [@alanjhughes](https://github.com/alanjhughes))
-- Gate roll back to embedded to expo-updates >= 0.19.0. ([#2094](https://github.com/expo/eas-cli/pull/2094) by [@wschurman](https://github.com/wschurman))
-
-### 🐛 Bug fixes
-
-- EAS Update: Increase asset upload timeout to 90s and reset on upload retry for slow connections. ([#2085](https://github.com/expo/eas-cli/pull/2085) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Add `requiredPackageManager` to metadata. ([#2067](https://github.com/expo/eas-cli/pull/2067) by [@kadikraman](https://github.com/kadikraman))
-- Move `getVcsClient` into command context. ([#2086](https://github.com/expo/eas-cli/pull/2086) by [@Josh-McFarlin](https://github.com/Josh-McFarlin))
-- Display Apple device creation date when listing devices. ([#2092](https://github.com/expo/eas-cli/pull/2092) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Clean up Intel resource classes code after their deletion. ([#2093](https://github.com/expo/eas-cli/pull/2093) by [@szdziedzic](https://github.com/szdziedzic))
-- Update images descriptions in `eas.schema.json` and add info about the new JDK 17 image. ([#2099](https://github.com/expo/eas-cli/pull/2099) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.4.0](https://github.com/expo/eas-cli/releases/tag/v5.4.0) - 2023-09-28
-
-### 🎉 New features
-
-- Add support for the Tap to Pay on iPhone iOS entitlement. ([#2069](https://github.com/expo/eas-cli/pull/2069) by [@fobos531](https://github.com/fobos531))
-
-## [5.3.1](https://github.com/expo/eas-cli/releases/tag/v5.3.1) - 2023-09-28
-
-### 🧹 Chores
-
-- Update EAS Build images description in our VSCode plugin. Add new `macos-ventura-13.6-xcode-15.0` image. ([#2068](https://github.com/expo/eas-cli/pull/2068) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.3.0](https://github.com/expo/eas-cli/releases/tag/v5.3.0) - 2023-09-25
-
-### 🎉 New features
-
-- Update: expose expo cli `--dev` flag as an argument. ([#2050](https://github.com/expo/eas-cli/pull/2050) by [@nderscore](https://github.com/nderscore))
-- Support `bun` option in eas.json. ([#2055](https://github.com/expo/eas-cli/pull/2055) by [@kadikraman](https://github.com/kadikraman))
-
-### 🐛 Bug fixes
-
-- Support node aliases in .nvmrc. ([#2052](https://github.com/expo/eas-cli/pull/2052) by [@khamilowicz](https://github.com/khamilowicz))
-
-### 🧹 Chores
-
-- Rollouts: more robust printing function. ([#2047](https://github.com/expo/eas-cli/pull/2047) by [@quinlanj](https://github.com/quinlanj))
-
-## [5.2.0](https://github.com/expo/eas-cli/releases/tag/v5.2.0) - 2023-09-05
-
-### 🎉 New features
-
-- Rollouts: json output for ci. ([#2037](https://github.com/expo/eas-cli/pull/2037) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
-- Update: only print channel-branch pairing if we created a channel. ([#2036](https://github.com/expo/eas-cli/pull/2036) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Added rollout tests. ([#2042](https://github.com/expo/eas-cli/pull/2042) by [@quinlanj](https://github.com/quinlanj))
-- Remove unreachable codesigning option. ([#2041](https://github.com/expo/eas-cli/pull/2041) by [@quinlanj](https://github.com/quinlanj))
-- Fix generated graphql tsc errors. ([#2039](https://github.com/expo/eas-cli/pull/2039) by [@quinlanj](https://github.com/quinlanj))
-- Rollouts: view action for CI. ([#2040](https://github.com/expo/eas-cli/pull/2040) by [@quinlanj](https://github.com/quinlanj))
-
-## [5.1.0](https://github.com/expo/eas-cli/releases/tag/v5.1.0) - 2023-09-01
-
-### 🎉 New features
-
-- Support `pnpm` option in eas.json. ([#1988](https://github.com/expo/eas-cli/pull/1988) by [@khamilowicz](https://github.com/khamilowicz))
-
-### 🐛 Bug fixes
-
-- Make app config error not repeat indefinitely. ([#2020](https://github.com/expo/eas-cli/pull/2020) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [5.0.2](https://github.com/expo/eas-cli/releases/tag/v5.0.2) - 2023-08-29
-
-### 🐛 Bug fixes
-
-- Add proper expo cli `--platform` flag handling when exporting updates. ([#1939](https://github.com/expo/eas-cli/pull/1939) by [@byCedric](https://github.com/byCedric))
-
-## [5.0.1](https://github.com/expo/eas-cli/releases/tag/v5.0.1) - 2023-08-28
-
-### 🐛 Bug fixes
-
-- Pass `platform` argument to expo-cli correctly when using the `eas update` command. ([#2028](https://github.com/expo/eas-cli/pull/2028) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [5.0.0](https://github.com/expo/eas-cli/releases/tag/v5.0.0) - 2023-08-28
-
-### 🛠 Breaking changes
-
-- Only export at most ios and android dist for EAS updates. ([#2002](https://github.com/expo/eas-cli/pull/2002) by [@wschurman](https://github.com/wschurman))
-
-### 🎉 New features
-
-- Add rollback disambiguation command. ([#2004](https://github.com/expo/eas-cli/pull/2004) by [@wschurman](https://github.com/wschurman))
-- Detect devices that fail to be provisioned, list them to the user and show the explanation message with the link to the devices page to check actual status. ([#2011](https://github.com/expo/eas-cli/pull/2011) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Add info to EAS Update asset upload process about asset counts and limits. ([#2013](https://github.com/expo/eas-cli/pull/2013) by [@wschurman](https://github.com/wschurman))
-- .nvmrc support for setting node version. ([#1954](https://github.com/expo/eas-cli/pull/1954) by [@khamilowicz](https://github.com/khamilowicz))
-
-### 🐛 Bug fixes
-
-- Support republishing roll back to embedded updates. ([#2006](https://github.com/expo/eas-cli/pull/2006) by [@wschurman](https://github.com/wschurman))
-- Configure updates as well when somebody tries to run a build with channel set. ([#2016](https://github.com/expo/eas-cli/pull/2016) by [@wschurman](https://github.com/wschurman))
-- Fix printing bug: branch with no update. ([#2023](https://github.com/expo/eas-cli/pull/2023) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- More branch map utility functions. ([#2001](https://github.com/expo/eas-cli/pull/2001) by [@quinlanj](https://github.com/quinlanj))
-- More branch mapping utils. ([#2003](https://github.com/expo/eas-cli/pull/2003) by [@quinlanj](https://github.com/quinlanj))
-- Create a linked channel on build if not exists. ([#2017](https://github.com/expo/eas-cli/pull/2017) by [@quinlanj](https://github.com/quinlanj))
-- Add `developmentClient` to metadata. ([#2015](https://github.com/expo/eas-cli/pull/2015) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [4.1.2](https://github.com/expo/eas-cli/releases/tag/v4.1.2) - 2023-08-10
-
-### 🧹 Chores
-
-- Make branch mapping utility files have no dependencies. ([#1993](https://github.com/expo/eas-cli/pull/1993) by [@quinlanj](https://github.com/quinlanj))
-
-## [4.1.1](https://github.com/expo/eas-cli/releases/tag/v4.1.1) - 2023-08-08
-
-### 🧹 Chores
-
-- Logger to say website support is coming soon for rollouts. ([#1997](https://github.com/expo/eas-cli/pull/1997) by [@quinlanj](https://github.com/quinlanj))
-
-## [4.1.0](https://github.com/expo/eas-cli/releases/tag/v4.1.0) - 2023-08-08
-
-### 🎉 New features
-
-- Pass credentials to custom iOS builds. ([#1989](https://github.com/expo/eas-cli/pull/1989) by [@szdziedzic](https://github.com/szdziedzic))
-- Add the `withoutCredentials` option as a common build profile field in `eas.json`. ([#1994](https://github.com/expo/eas-cli/pull/1994) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [4.0.1](https://github.com/expo/eas-cli/releases/tag/v4.0.1) - 2023-08-08
-
-### 🐛 Bug fixes
-
-- Fix `eas channel:*` to work with empty branch mappings. ([#1992](https://github.com/expo/eas-cli/pull/1992) by [@quinlanj](https://github.com/quinlanj))
-
-## [4.0.0](https://github.com/expo/eas-cli/releases/tag/v4.0.0) - 2023-08-07
-
-### 🛠 Breaking changes
-
-- Release redesigned `eas channel:rollout` into developer preview. The set of flag arguments are different, in addition to the workflow. ([#1986](https://github.com/expo/eas-cli/pull/1986) by [@quinlanj](https://github.com/quinlanj))
-
-### 🎉 New features
-
-- Option to add current Apple Silicon device without the need to manually provide the provisioning UDID. ([#1943](https://github.com/expo/eas-cli/pull/1943) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🐛 Bug fixes
-
-- Fix rollout-preview ending with republish with code signing. ([#1978](https://github.com/expo/eas-cli/pull/1978) by [@wschurman](https://github.com/wschurman))
-- Rollouts: fix fp precision. ([#1985](https://github.com/expo/eas-cli/pull/1985) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Fixing more grammar errors. ([#1980](https://github.com/expo/eas-cli/pull/1980) by [@quinlanj](https://github.com/quinlanj))
-- Handle rollout edit edge case. ([#1981](https://github.com/expo/eas-cli/pull/1981) by [@quinlanj](https://github.com/quinlanj))
-- Linked expo.fyi rollout article. ([#1991](https://github.com/expo/eas-cli/pull/1991) by [@quinlanj](https://github.com/quinlanj))
-- Rollout ux improvements. ([#1984](https://github.com/expo/eas-cli/pull/1984) by [@quinlanj](https://github.com/quinlanj))
-
-## [3.18.3](https://github.com/expo/eas-cli/releases/tag/v3.18.3) - 2023-08-03
-
-### 🐛 Bug fixes
-
-- Fix republishing with code signing. ([#1973](https://github.com/expo/eas-cli/pull/1973) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Add relationships flag to rollouts-preview. ([#1972](https://github.com/expo/eas-cli/pull/1972) by [@quinlanj](https://github.com/quinlanj))
-- Get channel:{view,list,edit} to play nice with rollouts. ([#1974](https://github.com/expo/eas-cli/pull/1974) by [@quinlanj](https://github.com/quinlanj))
-- Use 'roll out' instead of rollout for verbs. ([#1979](https://github.com/expo/eas-cli/pull/1979) by [@quinlanj](https://github.com/quinlanj))
-
-## [3.18.2](https://github.com/expo/eas-cli/releases/tag/v3.18.2) - 2023-08-03
-
-### 🐛 Bug fixes
-
-- Revert adding `.nvmrc` support for setting node version. ([#1976](https://github.com/expo/eas-cli/pull/1976) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Use just a comma instead of `, ` when concatenating `keywords` in `eas metadata`. ([#1967](https://github.com/expo/eas-cli/pull/1967) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.18.1](https://github.com/expo/eas-cli/releases/tag/v3.18.1) - 2023-08-03
-
-### 🐛 Bug fixes
-
-- Pass correct group into `update:republish`. ([#1971](https://github.com/expo/eas-cli/pull/1971) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Make new rollouts version available for internal dogfooding. ([#1966](https://github.com/expo/eas-cli/pull/1966) by [@quinlanj](https://github.com/quinlanj))
-- Change default runtime version policy for EAS Update to appVersion. ([#1968](https://github.com/expo/eas-cli/pull/1968) by [@quinlanj](https://github.com/quinlanj))
-
-## [3.18.0](https://github.com/expo/eas-cli/releases/tag/v3.18.0) - 2023-08-02
-
-### 🎉 New features
-
-- .nvmrc support for setting node version. ([#1954](https://github.com/expo/eas-cli/pull/1954) by [@khamilowicz](https://github.com/khamilowicz))
-- Provide credentials for custom Android builds. ([#1969](https://github.com/expo/eas-cli/pull/1969) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- More branch mapping utility. ([#1957](https://github.com/expo/eas-cli/pull/1957) by [@quinlanj](https://github.com/quinlanj))
-- Utility classes to select existing rollouts and channels. ([#1958](https://github.com/expo/eas-cli/pull/1958) by [@quinlanj](https://github.com/quinlanj))
-
-## [3.17.1](https://github.com/expo/eas-cli/releases/tag/v3.17.1) - 2023-07-27
-
-### 🧹 Chores
-
-- Unify channel graphql query types. ([#1949](https://github.com/expo/eas-cli/pull/1949) by [@quinlanj](https://github.com/quinlanj))
-- Revert UpdateBranchWithCurrentGroupFragment. ([#1952](https://github.com/expo/eas-cli/pull/1952) by [@quinlanj](https://github.com/quinlanj))
-- Fetch entire relay compliant dataset. ([#1953](https://github.com/expo/eas-cli/pull/1953) by [@quinlanj](https://github.com/quinlanj))
-
-## [3.17.0](https://github.com/expo/eas-cli/releases/tag/v3.17.0) - 2023-07-24
-
-### 🎉 New features
-
-- Add `rollout` option for configuring Android submissions. ([#1938](https://github.com/expo/eas-cli/pull/1938) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Added branch mapping utility functions. ([#1944](https://github.com/expo/eas-cli/pull/1944) by [@quinlanj](https://github.com/quinlanj))
-- Amend branch mapping utility functions. ([#1945](https://github.com/expo/eas-cli/pull/1945) by [@quinlanj](https://github.com/quinlanj))
-- Handle error thrown when `intel-medium` resource class is not available as server-side defined error. ([#1947](https://github.com/expo/eas-cli/pull/1947) by [@szdziedzic](https://github.com/szdziedzic))
-- Remove `intel-medium` from `eas.schema.json`, so it's not suggested as a valid value by our VSCode plugin. ([#1947](https://github.com/expo/eas-cli/pull/1947) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.16.0](https://github.com/expo/eas-cli/releases/tag/v3.16.0) - 2023-07-18
-
-### 🎉 New features
-
 - Add styling to SSO auth redirect completion page. ([#1929](https://github.com/expo/eas-cli/pull/1929) by [@wschurman](https://github.com/wschurman))
 - Ignore entitlements from native template when `/ios` is gitignored. ([#1906](https://github.com/expo/eas-cli/pull/1906) by [@byCedric](https://github.com/byCedric))
 - Use node server default port selection for SSO login server. ([#1930](https://github.com/expo/eas-cli/pull/1930) by [@wschurman](https://github.com/wschurman))
 
 ### 🐛 Bug fixes
 
-- Fix incorrect handling of valid `inProgress` Android submission release status. ([#1934](https://github.com/expo/eas-cli/pull/1934) by [@szdziedzic](https://github.com/szdziedzic))
-
 ### 🧹 Chores
 
-- Print friendly error msg in case account doesn't have required permission. ([#1867](https://github.com/expo/eas-cli/pull/1867) by [@firasrg](https://github.com/firasrg))
 - Limit project file upload size to 2GB. ([#1928](https://github.com/expo/eas-cli/pull/1928) by [@khamilowicz](https://github.com/khamilowicz))
 - Bump urql graphql client major version. ([#1936](https://github.com/expo/eas-cli/pull/1936) by [@quinlanj](https://github.com/quinlanj))
 

CODEOWNERS

@@ -1,10 +1,10 @@
-* @szdziedzic @khamilowicz @sjchmiela
+* @szdziedzic @khamilowicz
 
-packages/eas-cli/src/build @szdziedzic @khamilowicz @sjchmiela
-packages/eas-cli/src/commands/build @szdziedzic @khamilowicz @sjchmiela
+packages/eas-cli/src/build @szdziedzic @khamilowicz
+packages/eas-cli/src/commands/build @szdziedzic @khamilowicz
 
-packages/eas-cli/src/submit @szdziedzic @khamilowicz @sjchmiela
-packages/eas-cli/src/commands/submit.ts @szdziedzic @khamilowicz @sjchmiela
+packages/eas-cli/src/submit @szdziedzic @khamilowicz
+packages/eas-cli/src/commands/submit.ts @szdziedzic @khamilowicz
 
 packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
 packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
@@ -13,4 +13,4 @@ packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric
 
-packages/eas-json @szdziedzic @khamilowicz @sjchmiela
+packages/eas-json @szdziedzic @khamilowicz

CONTRIBUTING.md

@@ -18,25 +18,6 @@ If you're making changes to `packages/eas-json` or prefer/need to work with prod
 yarn start
 ```
 
-If it is easier for you to work with the code locally with compiler options set to:
-
-```json
-...
-"compilerOptions": {
-    ...
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    ...
-}
-...
-```
-
-you can consider using:
-
-```
-yarn start-allow-unused
-```
-
 ## 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.

RELEASING.md

@@ -12,3 +12,7 @@ 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`.

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Instead of opening a GitHub issue for security vulnerabilities, send an email to our secure inbox: secure@expo.io.

jest.config.js

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

jest.config.ts

@@ -1,15 +0,0 @@
-import type { Config } from 'jest';
-
-// eslint-disable-next-line import/no-relative-packages
-import easCliConfig from './packages/eas-cli/jest.config';
-// eslint-disable-next-line import/no-relative-packages
-import easJsonConfig from './packages/eas-json/jest.config';
-
-const config: Config = {
-  projects: [easCliConfig, easJsonConfig],
-  testPathIgnorePatterns: ['.*'],
-  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
-  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
-};
-
-export default config;

jest/jest.config.js

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

jest/jest.config.ts

@@ -1,9 +0,0 @@
-import type { Config } from 'jest';
-
-const config: Config = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
-};
-
-export default config;

lerna.json

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

package.json

@@ -10,7 +10,6 @@
     "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-allow-unused": "lerna run watch-allow-unused --stream --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint .",
@@ -20,22 +19,22 @@
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@types/jest": "29.5.11",
-    "@types/node": "20.11.0",
-    "eslint": "8.56.0",
-    "eslint-config-universe": "12.0.0",
-    "eslint-plugin-async-protect": "3.1.0",
+    "@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",
     "eslint-plugin-node": "11.1.0",
-    "jest": "29.7.0",
-    "jest-watch-typeahead": "2.2.2",
-    "lerna": "7.4.2",
-    "oclif": "^3.9.0",
-    "prettier": "3.1.1",
-    "ts-jest": "29.1.1",
-    "typescript": "5.3.3"
+    "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"
   },
   "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

packages/eas-cli/README.md

@@ -68,7 +68,6 @@ eas --help COMMAND
 * [`eas build`](#eas-build)
 * [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
 * [`eas build:configure`](#eas-buildconfigure)
-* [`eas build:delete [BUILD_ID]`](#eas-builddelete-build_id)
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:resign`](#eas-buildresign)
@@ -111,8 +110,6 @@ eas --help COMMAND
 * [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
 * [`eas update:list`](#eas-updatelist)
 * [`eas update:republish`](#eas-updaterepublish)
-* [`eas update:roll-back-to-embedded`](#eas-updateroll-back-to-embedded)
-* [`eas update:rollback`](#eas-updaterollback)
 * [`eas update:view GROUPID`](#eas-updateview-groupid)
 * [`eas webhook:create`](#eas-webhookcreate)
 * [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
@@ -136,7 +133,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -153,7 +150,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -170,7 +167,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -184,7 +181,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -195,7 +192,7 @@ USAGE
   $ eas autocomplete [SHELL] [-r]
 
 ARGUMENTS
-  SHELL  (zsh|bash|powershell) Shell type
+  SHELL  shell type
 
 FLAGS
   -r, --refresh-cache  Refresh cache (ignores displaying instructions)
@@ -210,12 +207,10 @@ EXAMPLES
 
   $ eas autocomplete zsh
 
-  $ eas autocomplete powershell
-
   $ eas autocomplete --refresh-cache
 ```
 
-_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v2.3.10/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.10/src/commands/autocomplete/index.ts)_
 
 ## `eas branch:create [NAME]`
 
@@ -236,7 +231,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -257,7 +252,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -277,7 +272,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -297,7 +292,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -320,7 +315,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -350,7 +345,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -358,18 +353,16 @@ cancel a build
 
 ```
 USAGE
-  $ eas build:cancel [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
+  $ eas build:cancel [BUILD_ID] [--non-interactive]
 
 FLAGS
-  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
-  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
-  --non-interactive                 Run the command in non-interactive mode.
+  --non-interactive  Run the command in non-interactive mode.
 
 DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -386,26 +379,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/configure.ts)_
-
-## `eas build:delete [BUILD_ID]`
-
-delete a build
-
-```
-USAGE
-  $ eas build:delete [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
-
-FLAGS
-  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
-  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
-  --non-interactive                 Run the command in non-interactive mode.
-
-DESCRIPTION
-  delete a build
-```
-
-_See code: [src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/delete.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -440,7 +414,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -452,7 +426,7 @@ USAGE
     new|in-queue|in-progress|pending-cancel|errored|finished|canceled] [--distribution store|internal|simulator]
     [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>] [--sdkVersion <value>] [--runtimeVersion
     <value>] [--appIdentifier <value>] [--buildProfile <value>] [--gitCommitHash <value>] [--offset <value>] [--limit
-    <value>] [--json --non-interactive] [--simulator]
+    <value>] [--json --non-interactive]
 
 FLAGS
   --appBuildVersion=<value>
@@ -472,16 +446,13 @@ FLAGS
   --platform=(all|android|ios)
   --runtimeVersion=<value>
   --sdkVersion=<value>
-  --simulator                                                                   Filter only iOS simulator builds. Can
-                                                                                only be used with --platform flag set to
-                                                                                "ios"
   --status=(new|in-queue|in-progress|pending-cancel|errored|finished|canceled)
 
 DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -507,7 +478,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -515,12 +486,10 @@ run simulator/emulator builds from eas-cli
 
 ```
 USAGE
-  $ eas build:run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios] [-e <value>]
-    [--offset <value>] [--limit <value>]
+  $ eas build:run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios] [--offset
+    <value>] [--limit <value>]
 
 FLAGS
-  -e, --profile=PROFILE_NAME    Name of the build profile used to create the build to run. When specified, only builds
-                                created with the specified build profile will be queried.
   -p, --platform=(android|ios)
   --id=<value>                  ID of the simulator/emulator build to run
   --latest                      Run the latest simulator/emulator build for specified platform
@@ -533,7 +502,7 @@ DESCRIPTION
   run simulator/emulator builds from eas-cli
 ```
 
-_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -582,7 +551,7 @@ DESCRIPTION
   get the latest version from EAS servers
 ```
 
-_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -601,7 +570,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -620,7 +589,7 @@ DESCRIPTION
   update a version in native code with a value stored on EAS servers
 ```
 
-_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -637,7 +606,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -658,7 +627,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -680,7 +649,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -700,7 +669,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -708,31 +677,23 @@ Roll a new branch out on a channel incrementally.
 
 ```
 USAGE
-  $ eas channel:rollout [CHANNEL] [--action create|edit|end|view] [--percent <value>] [--outcome
-    republish-and-revert|revert] [--branch <value>] [--runtime-version <value>] [--private-key-path <value>] [--json
-    --non-interactive]
+  $ eas channel:rollout [CHANNEL] [--branch <value>] [--percent <value>] [--end] [--json --non-interactive]
 
 ARGUMENTS
   CHANNEL  channel on which the rollout should be done
 
 FLAGS
-  --action=(create|edit|end|view)          Rollout action to perform
-  --branch=<value>                         Branch to roll out. Use with --action=create
-  --json                                   Enable JSON output, non-JSON messages will be printed to stderr.
-  --non-interactive                        Run the command in non-interactive mode.
-  --outcome=(republish-and-revert|revert)  End outcome of rollout. Use with --action=end
-  --percent=<value>                        Percent of users to send to the new branch. Use with --action=edit or
-                                           --action=create
-  --private-key-path=<value>               File containing the PEM-encoded private key corresponding to the certificate
-                                           in expo-updates' configuration. Defaults to a file named "private-key.pem" in
-                                           the certificate's directory.
-  --runtime-version=<value>                Runtime version to target. Use with --action=create
+  --branch=<value>   branch to rollout
+  --end              end the rollout
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --non-interactive  Run the command in non-interactive mode.
+  --percent=<value>  percent of users to send to the new branch
 
 DESCRIPTION
   Roll a new branch out on a channel incrementally.
 ```
 
-_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -755,7 +716,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -776,7 +737,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -793,7 +754,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -807,7 +768,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -827,7 +788,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -848,7 +809,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -869,7 +830,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -883,7 +844,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -897,11 +858,11 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
-Display help for eas.
+display help for eas-cli
 
 ```
 USAGE
@@ -914,10 +875,10 @@ FLAGS
   -n, --nested-commands  Include all nested commands in the output.
 
 DESCRIPTION
-  Display help for eas.
+  display help for eas-cli
 ```
 
-_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.23/src/commands/help.ts)_
+_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.22/src/commands/help.ts)_
 
 ## `eas init`
 
@@ -985,7 +946,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -1002,7 +963,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -1019,7 +980,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas open`
 
@@ -1033,7 +994,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1047,7 +1008,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1069,7 +1030,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -1092,7 +1053,7 @@ DESCRIPTION
   create an environment secret on the current project or owner account
 ```
 
-_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -1110,7 +1071,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -1124,7 +1085,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas secret:push`
 
@@ -1144,7 +1105,7 @@ DESCRIPTION
   read environment secrets from env file and store on the server
 ```
 
-_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/push.ts)_
 
 ## `eas submit`
 
@@ -1174,7 +1135,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -1207,7 +1168,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -1225,7 +1186,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -1233,7 +1194,7 @@ delete all the updates in an update group
 
 ```
 USAGE
-  $ eas update:delete GROUPID [--json --non-interactive]
+  $ eas update:delete [GROUPID] [--json --non-interactive]
 
 ARGUMENTS
   GROUPID  The ID of an update group to delete.
@@ -1246,7 +1207,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -1268,7 +1229,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -1277,71 +1238,22 @@ roll back to an existing update
 ```
 USAGE
   $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [-m <value>] [-p android|ios|all]
-    [--private-key-path <value>] [--json --non-interactive]
+    [--json --non-interactive]
 
 FLAGS
-  -m, --message=<value>             Short message describing the republished update group
+  -m, --message=<value>             Short message describing the republished update
   -p, --platform=(android|ios|all)  [default: all]
-  --branch=<value>                  Branch name to select an update group to republish from
-  --channel=<value>                 Channel name to select an update group to republish from
+  --branch=<value>                  Branch name to select an update to republish from
+  --channel=<value>                 Channel name to select an update to republish from
   --group=<value>                   Update group ID to republish
   --json                            Enable JSON output, non-JSON messages will be printed to stderr.
   --non-interactive                 Run the command in non-interactive mode.
-  --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
-                                    expo-updates' configuration. Defaults to a file named "private-key.pem" in the
-                                    certificate's directory.
 
 DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/republish.ts)_
-
-## `eas update:roll-back-to-embedded`
-
-roll back to the embedded update
-
-```
-USAGE
-  $ eas update:roll-back-to-embedded [--branch <value>] [--channel <value>] [--message <value>] [-p android|ios|all] [--auto]
-    [--private-key-path <value>] [--json --non-interactive]
-
-FLAGS
-  -p, --platform=(android|ios|all)  [default: all]
-  --auto                            Use the current git branch and commit message for the EAS branch and update message
-  --branch=<value>                  Branch to publish the rollback to embedded update group on
-  --channel=<value>                 Channel that the published rollback to embedded update should affect
-  --json                            Enable JSON output, non-JSON messages will be printed to stderr.
-  --message=<value>                 A short message describing the rollback to embedded update
-  --non-interactive                 Run the command in non-interactive mode.
-  --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
-                                    expo-updates' configuration. Defaults to a file named "private-key.pem" in the
-                                    certificate's directory.
-
-DESCRIPTION
-  roll back to the embedded update
-```
-
-_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/roll-back-to-embedded.ts)_
-
-## `eas update:rollback`
-
-roll back to an embedded update or an existing update
-
-```
-USAGE
-  $ eas update:rollback [--private-key-path <value>]
-
-FLAGS
-  --private-key-path=<value>  File containing the PEM-encoded private key corresponding to the certificate in
-                              expo-updates' configuration. Defaults to a file named "private-key.pem" in the
-                              certificate's directory.
-
-DESCRIPTION
-  roll back to an embedded update or an existing update
-```
-
-_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/rollback.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/republish.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -1349,7 +1261,7 @@ update group details
 
 ```
 USAGE
-  $ eas update:view GROUPID [--json]
+  $ eas update:view [GROUPID] [--json]
 
 ARGUMENTS
   GROUPID  The ID of an update group.
@@ -1361,7 +1273,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1382,7 +1294,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1402,7 +1314,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1420,7 +1332,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1442,7 +1354,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1450,7 +1362,7 @@ view a webhook
 
 ```
 USAGE
-  $ eas webhook:view ID
+  $ eas webhook:view [ID]
 
 ARGUMENTS
   ID  ID of the webhook to view
@@ -1459,7 +1371,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.2.0/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/jest.config.js

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

packages/eas-cli/jest.config.ts

@@ -1,14 +0,0 @@
-import type { Config } from 'jest';
-
-// eslint-disable-next-line import/no-relative-packages
-import baseConfig from '../../jest/jest.config';
-
-const config: Config = {
-  ...baseConfig,
-  rootDir: __dirname,
-  roots: ['src', '__mocks__'],
-  globalSetup: './jest/global-setup.ts',
-  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
-};
-
-export default config;

packages/eas-cli/package.json

@@ -1,64 +1,64 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "7.2.0",
+  "version": "3.15.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.4.0",
+    "@expo/apple-utils": "1.3.1",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.5.4",
-    "@expo/config-plugins": "7.8.4",
-    "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.61",
-    "@expo/eas-json": "7.1.3",
+    "@expo/config": "8.1.2",
+    "@expo/config-plugins": "7.2.4",
+    "@expo/config-types": "49.0.0",
+    "@expo/eas-build-job": "1.0.13",
+    "@expo/eas-json": "3.15.1",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "1.1.2",
+    "@expo/package-manager": "0.0.57",
     "@expo/pkcs12": "0.0.8",
     "@expo/plist": "0.0.20",
-    "@expo/plugin-help": "5.1.23",
-    "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "6.7.3",
+    "@expo/plugin-help": "5.1.22",
+    "@expo/plugin-warn-if-update-available": "2.5.0",
+    "@expo/prebuild-config": "6.2.5",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.67",
+    "@expo/steps": "1.0.25",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "^1.26.2",
-    "@oclif/plugin-autocomplete": "^2.3.10",
+    "@oclif/core": "1.23.2",
+    "@oclif/plugin-autocomplete": "1.3.10",
     "@segment/ajv-human-errors": "^2.1.2",
     "@urql/core": "4.0.11",
+    "@urql/exchange-graphcache": "6.1.4",
     "@urql/exchange-retry": "1.2.0",
     "ajv": "8.11.0",
     "ajv-formats": "2.1.1",
     "better-opn": "3.0.2",
     "chalk": "4.1.2",
-    "cli-progress": "3.12.0",
+    "cli-progress": "3.11.2",
     "dateformat": "4.6.3",
-    "dotenv": "16.3.1",
+    "dotenv": "16.0.3",
     "env-paths": "2.2.0",
-    "envinfo": "7.11.0",
+    "envinfo": "7.8.1",
     "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.3.2",
+    "fast-glob": "3.2.12",
     "figures": "3.2.0",
     "form-data": "4.0.0",
-    "fs-extra": "11.2.0",
+    "fs-extra": "10.1.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
-    "graphql": "16.8.1",
+    "graphql": "16.6.0",
     "graphql-tag": "2.12.6",
     "https-proxy-agent": "5.0.1",
-    "ignore": "5.3.0",
+    "ignore": "5.2.4",
     "indent-string": "4.0.0",
     "jks-js": "1.1.0",
-    "joi": "17.11.0",
-    "jsonwebtoken": "9.0.0",
-    "keychain": "1.5.0",
+    "joi": "17.7.0",
+    "keychain": "1.3.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
     "minimatch": "5.1.2",
@@ -68,59 +68,58 @@
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "pngjs": "7.0.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.5.4",
+    "semver": "7.3.8",
     "slash": "3.0.0",
-    "tar": "6.2.0",
+    "tar": "6.1.13",
     "terminal-link": "2.1.1",
-    "tslib": "2.6.2",
-    "turndown": "7.1.2",
+    "tslib": "2.4.1",
+    "turndown": "7.1.1",
     "untildify": "4.0.0",
-    "uuid": "9.0.1",
+    "uuid": "9.0.0",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.0",
-    "@graphql-codegen/introspection": "4.0.0",
-    "@graphql-codegen/typescript": "4.0.1",
-    "@graphql-codegen/typescript-operations": "4.0.1",
-    "@types/cli-progress": "3.11.5",
+    "@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",
+    "@types/cli-progress": "3.11.0",
     "@types/dateformat": "3.0.1",
-    "@types/envinfo": "7.8.3",
+    "@types/envinfo": "7.8.1",
     "@types/express": "4.17.15",
-    "@types/fs-extra": "11.0.4",
+    "@types/fs-extra": "9.0.13",
     "@types/getenv": "^1.0.0",
-    "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
     "@types/node-fetch": "2.6.2",
     "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.4",
+    "@types/pngjs": "6.0.1",
     "@types/promise-retry": "1.1.3",
     "@types/prompts": "2.4.2",
-    "@types/semver": "7.5.6",
-    "@types/tar": "6.1.10",
+    "@types/semver": "7.3.13",
+    "@types/tar": "6.1.3",
     "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.7",
+    "@types/uuid": "9.0.0",
     "@types/wrap-ansi": "3.0.0",
     "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
     "express": "4.18.2",
     "memfs": "3.4.13",
     "mockdate": "3.0.5",
-    "nock": "13.4.0",
+    "nock": "13.2.9",
     "rimraf": "3.0.2",
-    "ts-deepmerge": "6.2.0",
+    "ts-deepmerge": "4.0.0",
     "ts-mockito": "2.6.1",
-    "ts-node": "10.9.2",
-    "typescript": "5.3.3"
+    "ts-node": "10.9.1",
+    "typescript": "4.9.4"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
@@ -209,9 +208,7 @@
     "rebuild": "rimraf build && yarn build",
     "pretarball-ci": "./scripts/pretarball-ci.sh",
     "build": "tsc --project tsconfig.build.json",
-    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
     "watch": "yarn build --watch --preserveWatchOutput",
-    "watch-allow-unused": "yarn build-allow-unused --watch --preserveWatchOutput",
     "typecheck": "tsc",
     "test": "jest",
     "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
@@ -219,7 +216,7 @@
     "clean": "rimraf dist build tmp node_modules yarn-error.log"
   },
   "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

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

@@ -1,11 +1,11 @@
 import { AppVersionSource, EasJson } from '@expo/eas-json';
 import chalk from 'chalk';
 
-import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
 import BuildVersionGetView from '../../commands/build/version/get';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { getMockEasJson, mockCommandContext, mockProjectId, mockTestCommand } from './utils';
 
 jest.mock('../../project/applicationIdentifier');
 jest.mock('fs');

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

@@ -2,6 +2,12 @@ import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';
 
+import BuildVersionSetView from '../../commands/build/version/set';
+import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
+import { AppQuery } from '../../graphql/queries/AppQuery';
+import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
+import Log from '../../log';
+import * as prompts from '../../prompts';
 import {
   getMockAppFragment,
   getMockEasJson,
@@ -9,12 +15,6 @@ import {
   mockProjectId,
   mockTestCommand,
 } from './utils';
-import BuildVersionSetView from '../../commands/build/version/set';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import * as prompts from '../../prompts';
 
 jest.mock('../../project/applicationIdentifier');
 jest.mock('../../graphql/queries/AppVersionQuery');

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

@@ -3,13 +3,6 @@ import { AppVersionSource, EasJson } from '@expo/eas-json';
 import fs from 'fs-extra';
 import path from 'path';
 
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
 import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
 import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
 import BuildVersionSyncView from '../../commands/build/version/sync';
@@ -21,6 +14,13 @@ import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
 import { resolveTargetsAsync } from '../../project/ios/target';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import * as prompts from '../../prompts';
+import {
+  getMockAppFragment,
+  getMockEasJson,
+  mockCommandContext,
+  mockProjectId,
+  mockTestCommand,
+} from './utils';
 
 jest.mock('../../build/android/version');
 jest.mock('../../build/ios/version');

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

@@ -59,7 +59,7 @@ export interface LocalProjectContext {
 export function mockCommandContext<
   C extends {
     [name: string]: any;
-  } = object,
+  } = object
 >(
   commandClass: { contextDefinition: ContextInput<C> },
   overrides: {

packages/eas-cli/src/branch/__tests__/fixtures.ts

@@ -1,12 +0,0 @@
-import { UpdateBranchBasicInfoFragment } from '../../graphql/generated';
-
-export const testBasicBranchInfo: UpdateBranchBasicInfoFragment = {
-  id: 'c4fec95d-7ab1-4d35-bfe6-fe7ff05beda9',
-  name: 'development',
-  __typename: 'UpdateBranch',
-};
-export const testBasicBranchInfo2: UpdateBranchBasicInfoFragment = {
-  id: '43ccb8a4-8aaa-47f0-9790-dcc80933441b',
-  name: 'preview',
-  __typename: 'UpdateBranch',
-};

packages/eas-cli/src/branch/actions/SelectBranch.ts

@@ -1,107 +0,0 @@
-import { EASUpdateAction, EASUpdateContext, NonInteractiveError } from '../../eas-update/utils';
-import { UpdateBranchBasicInfoFragment } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import {
-  Connection,
-  Edge,
-  FilterPagination,
-  QueryParams,
-  selectPaginatedAsync,
-} from '../../utils/relay';
-
-/**
- * Select a branch for the project.
- *
- * @constructor
- * @param {function} options.filterPredicate - A predicate to filter the branches that are shown to the user. It takes a branchInfo object as a parameter and returns a boolean.
- * @param {string} options.printedType - The type of branch printed to the user. Defaults to 'branch'.
- * @param {number} options.pageSize - The number of branches to show per page. Defaults to 100.
- * @param {function} options.beforeEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called before each query.
- * @args externalQueryParams The query params for the pagination.
- * @args totalNodesFetched The total number of nodes fetched so far.
- * @args dataset The dataset so far.
- * @param {function} options.afterEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called after each query.
- * @args externalQueryParams The query params for the pagination.
- * @args totalNodesFetched The total number of nodes fetched so far.
- * @args dataset The dataset so far.
- * @args willFetchAgain If the query will fetch again to get a complete page.
- */
-export class SelectBranch implements EASUpdateAction<UpdateBranchBasicInfoFragment | null> {
-  constructor(
-    private options: {
-      filterPredicate?: (branchInfo: UpdateBranchBasicInfoFragment) => boolean;
-      printedType?: string;
-      pageSize?: number;
-      beforeEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateBranchBasicInfoFragment>[]
-      ) => void;
-      afterEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateBranchBasicInfoFragment>[],
-        willFetchAgain: boolean
-      ) => void;
-    } = {}
-  ) {}
-
-  async queryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams
-  ): Promise<Connection<UpdateBranchBasicInfoFragment>> {
-    const { graphqlClient, app } = ctx;
-    const { projectId } = app;
-    return await BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync(graphqlClient, {
-      appId: projectId,
-      ...queryParams,
-    });
-  }
-
-  async filterQueryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams,
-    filterPredicate: (branchInfo: UpdateBranchBasicInfoFragment) => boolean
-  ): Promise<Connection<UpdateBranchBasicInfoFragment>> {
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateBranchBasicInfoFragment>> =>
-      await this.queryAsync(ctx, queryParams);
-    return await FilterPagination.getPageAsync({
-      queryParams,
-      queryAsync,
-      filterPredicate,
-      beforeEachQuery: this.options.beforeEachFilterQuery,
-      afterEachQuery: this.options.afterEachFilterQuery,
-    });
-  }
-
-  public async runAsync(ctx: EASUpdateContext): Promise<UpdateBranchBasicInfoFragment | null> {
-    const { nonInteractive } = ctx;
-    const { filterPredicate } = this.options;
-    const printedType = this.options.printedType ?? 'branch';
-    const pageSize = this.options.pageSize ?? 100;
-    if (nonInteractive) {
-      throw new NonInteractiveError(
-        `${printedType} selection cannot be run in non-interactive mode.`
-      );
-    }
-
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateBranchBasicInfoFragment>> =>
-      filterPredicate
-        ? this.filterQueryAsync(ctx, queryParams, filterPredicate)
-        : this.queryAsync(ctx, queryParams);
-
-    const getTitleAsync = async (branchInfo: UpdateBranchBasicInfoFragment): Promise<string> =>
-      branchInfo.name;
-
-    return await selectPaginatedAsync({
-      queryAsync,
-      getTitleAsync,
-      printedType,
-      pageSize,
-    });
-  }
-}

packages/eas-cli/src/branch/actions/__tests__/SelectBranch-test.ts

@@ -1,92 +0,0 @@
-import { createCtxMock } from '../../../eas-update/__tests__/fixtures';
-import { NonInteractiveError } from '../../../eas-update/utils';
-import { UpdateBranchBasicInfoFragment } from '../../../graphql/generated';
-import { BranchQuery } from '../../../graphql/queries/BranchQuery';
-import { promptAsync } from '../../../prompts';
-import { testBasicBranchInfo, testBasicBranchInfo2 } from '../../__tests__/fixtures';
-import { SelectBranch } from '../SelectBranch';
-
-jest.mock('../../../prompts');
-jest.mock('../../../graphql/queries/BranchQuery');
-describe(SelectBranch, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  it('returns null if project has no branchs', async () => {
-    const ctx = createCtxMock();
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    const selectBranch = new SelectBranch();
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBeNull();
-  });
-  it('still prompts if project has only one branch', async () => {
-    const ctx = createCtxMock();
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [{ node: testBasicBranchInfo, cursor: 'cursor' }],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
-      item: testBasicBranchInfo,
-    }));
-    const selectBranch = new SelectBranch();
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBe(testBasicBranchInfo);
-    expect(promptAsync).toHaveBeenCalledTimes(1);
-  });
-  it('returns the selected branch', async () => {
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [
-        { node: testBasicBranchInfo, cursor: 'cursor' },
-        { node: testBasicBranchInfo2, cursor: 'cursor' },
-      ],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
-      item: testBasicBranchInfo,
-    }));
-    const ctx = createCtxMock();
-    const selectBranch = new SelectBranch();
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBe(testBasicBranchInfo);
-  });
-  it('returns the only available branch with a filter', async () => {
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [
-        { node: testBasicBranchInfo, cursor: 'cursor' },
-        { node: testBasicBranchInfo2, cursor: 'cursor' },
-      ],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    const ctx = createCtxMock();
-    const selectBranch = new SelectBranch({
-      filterPredicate: (branchInfo: UpdateBranchBasicInfoFragment) =>
-        branchInfo === testBasicBranchInfo,
-    });
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBe(testBasicBranchInfo);
-  });
-  it('throws an error in Non-Interactive Mode', async () => {
-    const ctx = createCtxMock({
-      nonInteractive: true,
-    });
-    const selectBranch = new SelectBranch();
-
-    // dont fail if users are running in non-interactive mode
-    await expect(selectBranch.runAsync(ctx)).rejects.toThrowError(NonInteractiveError);
-  });
-});

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

@@ -1,7 +1,6 @@
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
-import { BranchNotFoundError } from './utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { withErrorHandlingAsync } from '../graphql/client';
@@ -20,6 +19,7 @@ import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
+import { BranchNotFoundError } from './utils';
 
 export const BRANCHES_LIMIT = 50;
 

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

@@ -1,8 +1,9 @@
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
 
-export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string> {
+export async function getDefaultBranchNameAsync(): Promise<string> {
   return (
-    (await vcsClient.getBranchNameAsync()) || `branch-${Math.random().toString(36).substring(2, 4)}`
+    (await getVcsClient().getBranchNameAsync()) ||
+    `branch-${Math.random().toString(36).substring(2, 4)}`
   );
 }
 

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

@@ -92,6 +92,5 @@ function createMockBuildFragment({
     },
     status: BuildStatus.InQueue,
     resourceClass: BuildResourceClass.AndroidMedium,
-    isForIosSimulator: false,
   };
 }

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

@@ -1,97 +0,0 @@
-import { instance, mock } from 'ts-mockito';
-import { v4 as uuid } from 'uuid';
-
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { selectBuildToDeleteAsync } from '../../commands/build/delete';
-import {
-  AppPlatform,
-  BuildFragment,
-  BuildPriority,
-  BuildResourceClass,
-  BuildStatus,
-} from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { confirmAsync, selectAsync } from '../../prompts';
-
-jest.mock('../../ora', () => ({
-  ora: jest.fn().mockImplementation(() => ({
-    start: jest.fn().mockImplementation(() => ({
-      stop: jest.fn(),
-      fail: jest.fn(),
-    })),
-  })),
-}));
-jest.mock('../../prompts', () => {
-  return {
-    selectAsync: jest.fn(),
-    confirmAsync: jest.fn(),
-  };
-});
-
-jest.mock('../../graphql/queries/BuildQuery', () => {
-  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
-  return {
-    BuildQuery: {
-      ...actual.BuildQuery,
-      viewBuildsOnAppAsync: jest.fn(),
-    },
-  };
-});
-
-describe(selectBuildToDeleteAsync.name, () => {
-  const selectedBuildId = uuid();
-  const projectId = uuid();
-
-  beforeEach(() => {
-    jest
-      .mocked(BuildQuery.viewBuildsOnAppAsync)
-      .mockImplementation(async () => [
-        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
-      ]);
-  });
-
-  it('does not return build id when confirmation is rejected', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
-    expect(selectBuildToDeleteAsync(graphqlClient, 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(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
-      selectedBuildId
-    );
-  });
-});
-
-function createMockBuildFragment({
-  projectId,
-  buildId,
-}: {
-  projectId: string;
-  buildId?: string;
-}): BuildFragment {
-  return {
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    platform: AppPlatform.Android,
-    id: buildId ?? uuid(),
-    priority: BuildPriority.Normal,
-    project: {
-      __typename: 'App',
-      slug: 'test-project',
-      id: projectId,
-      name: 'test-project',
-      ownerAccount: {
-        __typename: 'Account',
-        id: uuid(),
-        name: 'test-account',
-      },
-    },
-    status: BuildStatus.InQueue,
-    resourceClass: BuildResourceClass.AndroidMedium,
-    isForIosSimulator: false,
-  };
-}

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

@@ -8,7 +8,6 @@ import os from 'os';
 import path from 'path';
 
 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
-import { getVcsClient } from '../../../vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -19,8 +18,6 @@ import {
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
 
-const vcsClient = getVcsClient();
-
 afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
@@ -194,8 +191,7 @@ describe(maybeResolveVersionsAsync, () => {
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/app',
         exp,
-        {} as BuildProfile<Platform.ANDROID>,
-        vcsClient
+        {} as BuildProfile<Platform.ANDROID>
       );
       expect(appVersion).toBe('3.0.0');
       expect(appBuildVersion).toBe('123');
@@ -207,8 +203,7 @@ describe(maybeResolveVersionsAsync, () => {
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/app',
         exp,
-        {} as BuildProfile<Platform.ANDROID>,
-        vcsClient
+        {} as BuildProfile<Platform.ANDROID>
       );
       expect(appVersion).toBe('5.0.0');
       expect(appBuildVersion).toBe('126');

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

@@ -3,10 +3,6 @@ import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
@@ -33,6 +29,10 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } from '../validate';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteVersionCodeAsync } from './version';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>
@@ -59,22 +59,13 @@ This means that it will most likely produce an AAB and you will not be able to i
   await checkGoogleServicesFileAsync(ctx);
   await validatePNGsForManagedProjectAsync(ctx);
 
-  const gradleContext = await resolveGradleBuildContextAsync(
-    ctx.projectDir,
-    buildProfile,
-    ctx.vcsClient
-  );
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
 
   if (ctx.workflow === Workflow.MANAGED) {
     await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
   }
 
-  const applicationId = await getApplicationIdAsync(
-    ctx.projectDir,
-    ctx.exp,
-    ctx.vcsClient,
-    gradleContext
-  );
+  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
   const versionCodeOverride =
     ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
       ? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
@@ -83,7 +74,6 @@ This means that it will most likely produce an AAB and you will not be able to i
           exp: ctx.exp,
           applicationId,
           buildProfile,
-          vcsClient: ctx.vcsClient,
         })
       : undefined;
 
@@ -99,14 +89,14 @@ export async function prepareAndroidBuildAsync(
       return await ensureAndroidCredentialsAsync(ctx);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+      await syncProjectConfigurationAsync(ctx.graphqlClient, {
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         localAutoIncrement:
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        vcsClient: ctx.vcsClient,
+        projectId: ctx.projectId,
       });
     },
     prepareJobAsync: async (
@@ -134,7 +124,8 @@ export async function prepareAndroidBuildAsync(
 }
 
 function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
-  return !ctx.buildProfile.withoutCredentials;
+  const isCustomBuild = ctx.buildProfile.config !== undefined;
+  return !ctx.buildProfile.withoutCredentials && !isCustomBuild;
 }
 
 async function ensureAndroidCredentialsAsync(
@@ -146,7 +137,6 @@ async function ensureAndroidCredentialsAsync(
   const androidApplicationIdentifier = await getApplicationIdAsync(
     ctx.projectDir,
     ctx.exp,
-    ctx.vcsClient,
     ctx.android.gradleContext
   );
   const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {

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

@@ -14,6 +14,7 @@ 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';
 
 interface JobData {
@@ -33,7 +34,7 @@ export async function prepareJobAsync(
   const username = getUsername(ctx.exp, ctx.user);
   const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
   const projectRootDirectory =
-    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
   const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
@@ -65,8 +66,6 @@ export async function prepareJobAsync(
     builderEnvironment: {
       image: buildProfile.image,
       node: buildProfile.node,
-      pnpm: buildProfile.pnpm,
-      bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
       expoCli: buildProfile.expoCli,

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

@@ -6,31 +6,34 @@ import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+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 { Client } from '../../vcs/vcs';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  localAutoIncrement,
-  vcsClient,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  localAutoIncrement?: AndroidVersionAutoIncrement;
-  vcsClient: Client;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+export async function syncProjectConfigurationAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    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(projectDir, exp);
+      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   } else {

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

@@ -18,7 +18,6 @@ import {
 } from '../../project/android/gradleUtils';
 import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
@@ -97,10 +96,9 @@ export async function bumpVersionInAppJsonAsync({
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildProfile: BuildProfile<Platform.ANDROID>,
-  vcsClient: Client
+  buildProfile: BuildProfile<Platform.ANDROID>
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
     const buildGradle = await getAppBuildGradleAsync(projectDir);
     try {
@@ -185,14 +183,12 @@ export async function resolveRemoteVersionCodeAsync(
     exp,
     applicationId,
     buildProfile,
-    vcsClient,
   }: {
     projectDir: string;
     projectId: string;
     exp: ExpoConfig;
     applicationId: string;
     buildProfile: BuildProfile<Platform.ANDROID>;
-    vcsClient: Client;
   }
 ): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
@@ -202,7 +198,7 @@ export async function resolveRemoteVersionCodeAsync(
     applicationId
   );
 
-  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
+  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
   let currentBuildVersion: string;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
@@ -232,9 +228,7 @@ export async function resolveRemoteVersionCodeAsync(
         applicationIdentifier: applicationId,
         storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
-          undefined,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
       });
       spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -256,9 +250,7 @@ export async function resolveRemoteVersionCodeAsync(
         applicationIdentifier: applicationId,
         storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
         buildVersion: String(nextBuildVersion),
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
-          undefined,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
       });
       spinner.succeed(
         `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -1,5 +1,5 @@
 import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
-import { CredentialsSource } from '@expo/eas-json';
+import { CredentialsSource, EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
 import assert from 'assert';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
@@ -7,26 +7,6 @@ import fs from 'fs-extra';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
-import { BuildContext } from './context';
-import {
-  EasBuildDownForMaintenanceError,
-  EasBuildFreeTierDisabledAndroidError,
-  EasBuildFreeTierDisabledError,
-  EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildLegacyResourceClassNotAvailableError,
-  EasBuildProjectArchiveUploadError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
-  EasBuildTooManyPendingBuildsError,
-  RequestValidationError,
-  TurtleDeprecatedJobFormatError,
-} from './errors';
-import { transformMetadata } from './graphql';
-import { LocalBuildMode, runLocalBuildAsync } from './local';
-import { collectMetadataAsync } from './metadata';
-import { printDeprecationWarnings } from './utils/printBuildInfo';
-import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
@@ -37,6 +17,7 @@ import {
   BuildFragment,
   BuildParamsInput,
   BuildPriority,
+  BuildResourceClass,
   BuildStatus,
   UploadSessionType,
 } from '../graphql/generated';
@@ -49,11 +30,32 @@ import {
   appPlatformEmojis,
   requestedPlatformDisplayNames,
 } from '../platform';
+import { confirmAsync } from '../prompts';
 import { uploadFileAtPathToGCSAsync } 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 {
+  EasBuildDownForMaintenanceError,
+  EasBuildFreeTierDisabledAndroidError,
+  EasBuildFreeTierDisabledError,
+  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
+  EasBuildProjectArchiveUploadError,
+  EasBuildResourceClassNotAvailableInFreeTierError,
+  EasBuildTooManyPendingBuildsError,
+  RequestValidationError,
+  TurtleDeprecatedJobFormatError,
+} from './errors';
+import { transformMetadata } from './graphql';
+import { LocalBuildMode, runLocalBuildAsync } from './local';
+import { collectMetadataAsync } from './metadata';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -97,7 +99,7 @@ function resolveBuildParamsInput<T extends Platform>(
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
-  TJob extends Job,
+  TJob extends Job
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
   const { ctx } = builder;
   const credentialsResult = await withAnalyticsAsync(
@@ -122,10 +124,9 @@ export async function prepareBuildRequestForPlatformAsync<
     }
   );
 
-  if (await ctx.vcsClient.isCommitRequiredAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
     Log.addNewLineIfNone();
     await reviewAndCommitChangesAsync(
-      ctx.vcsClient,
       `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
       { nonInteractive: ctx.nonInteractive }
     );
@@ -135,7 +136,7 @@ export async function prepareBuildRequestForPlatformAsync<
   if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
     projectArchive = {
       type: ArchiveSourceType.PATH,
-      path: (await makeProjectTarballAsync(ctx.vcsClient)).path,
+      path: (await makeProjectTarballAsync()).path,
     };
   } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
     projectArchive = {
@@ -189,7 +190,6 @@ const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
   EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED: EasBuildFreeTierIosLimitExceededError,
   EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER:
     EasBuildResourceClassNotAvailableInFreeTierError,
-  EAS_BUILD_LEGACY_RESOURCE_CLASS_NOT_AVAILABLE: EasBuildLegacyResourceClassNotAvailableError,
   VALIDATION_ERROR: RequestValidationError,
 };
 
@@ -243,7 +243,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
             'https://expo.fyi/eas-build-archive'
           )}`
         );
-        const projectTarball = await makeProjectTarballAsync(ctx.vcsClient);
+        const projectTarball = await makeProjectTarballAsync();
 
         if (projectTarball.size > 1024 * 1024 * 100) {
           Log.warn(
@@ -333,7 +333,12 @@ export type MaybeBuildFragment = BuildFragment | null;
 
 export async function waitForBuildEndAsync(
   graphqlClient: ExpoGraphqlClient,
-  { buildIds, accountName }: { buildIds: string[]; accountName: string },
+  {
+    buildIds,
+    accountName,
+    projectDir,
+    nonInteractive,
+  }: { buildIds: string[]; accountName: string; projectDir: string; nonInteractive: boolean },
   { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
   let spinner;
@@ -350,7 +355,10 @@ export async function waitForBuildEndAsync(
     const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
     const { refetch } =
       builds.length === 1
-        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
+        ? await handleSingleBuildProgressAsync(
+            { build: builds[0], accountName, projectDir, nonInteractive },
+            { spinner }
+          )
         : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
     if (!refetch) {
       return builds;
@@ -388,9 +396,13 @@ async function handleSingleBuildProgressAsync(
   {
     build,
     accountName,
+    projectDir,
+    nonInteractive,
   }: {
     build: MaybeBuildFragment;
     accountName: string;
+    projectDir: string;
+    nonInteractive: boolean;
   },
   { spinner }: { spinner: Ora }
 ): Promise<BuildProgressResult> {
@@ -444,6 +456,54 @@ async function handleSingleBuildProgressAsync(
           );
         }
 
+        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(
@@ -592,3 +652,21 @@ function formatAccountSubscriptionsUrl(accountName: string): string {
     getExpoWebsiteBaseUrl()
   ).toString();
 }
+
+async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir: string): Promise<void> {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(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.M_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,16 +1,17 @@
+import { Platform, Workflow } from '@expo/eas-build-job';
 import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import Log, { learnMore } from '../log';
+import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
+import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 interface ConfigureParams {
   projectDir: string;
   nonInteractive: boolean;
-  vcsClient: Client;
 }
 
 export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
@@ -35,24 +36,20 @@ export async function ensureProjectConfiguredAsync(
   return true;
 }
 
-async function configureAsync({
-  projectDir,
-  nonInteractive,
-  vcsClient,
-}: ConfigureParams): Promise<void> {
-  await maybeBailOnRepoStatusAsync(vcsClient);
+async function configureAsync({ projectDir, nonInteractive }: ConfigureParams): Promise<void> {
+  await maybeBailOnRepoStatusAsync();
 
-  await createEasJsonAsync(projectDir, vcsClient);
+  await createEasJsonAsync(projectDir);
 
-  if (await vcsClient.isCommitRequiredAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
     Log.newLine();
-    await reviewAndCommitChangesAsync(vcsClient, 'Configure EAS Build', {
+    await reviewAndCommitChangesAsync('Configure EAS Build', {
       nonInteractive,
     });
   }
 }
 
-const EAS_JSON_DEFAULT: EasJson = {
+const EAS_JSON_MANAGED_DEFAULT: EasJson = {
   cli: {
     version: `>= ${easCliVersion}`,
   },
@@ -71,11 +68,44 @@ const EAS_JSON_DEFAULT: EasJson = {
   },
 };
 
-async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
+const EAS_JSON_BARE_DEFAULT: EasJson = {
+  cli: {
+    version: `>= ${easCliVersion}`,
+  },
+  build: {
+    development: {
+      distribution: 'internal',
+      android: {
+        gradleCommand: ':app:assembleDebug',
+      },
+      ios: {
+        buildConfiguration: 'Debug',
+      },
+    },
+    preview: {
+      distribution: 'internal',
+    },
+    production: {},
+  },
+  submit: {
+    production: {},
+  },
+};
+
+async function createEasJsonAsync(projectDir: string): Promise<void> {
   const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
 
-  await fs.writeFile(easJsonPath, `${JSON.stringify(EAS_JSON_DEFAULT, null, 2)}\n`);
-  await vcsClient.trackFileAsync(easJsonPath);
+  const hasAndroidNativeProject =
+    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
+  const hasIosNativeProject =
+    (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
+  const easJson =
+    hasAndroidNativeProject || hasIosNativeProject
+      ? EAS_JSON_BARE_DEFAULT
+      : EAS_JSON_MANAGED_DEFAULT;
+
+  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+  await getVcsClient().trackFileAsync(easJsonPath);
   Log.withTick(
     `Generated ${chalk.bold('eas.json')}. ${learnMore(
       'https://docs.expo.dev/build-reference/eas-json/'

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

@@ -1,9 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
-import { NodePackageManager } from '@expo/package-manager';
 
-import { LocalBuildOptions } from './local';
 import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
@@ -13,7 +11,7 @@ import { GradleBuildContext } from '../project/android/gradle';
 import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
+import { LocalBuildOptions } from './local';
 
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 
@@ -57,7 +55,4 @@ export interface BuildContext<T extends Platform> {
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
   android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
   ios: T extends Platform.IOS ? IosBuildContext : undefined;
-  developmentClient: boolean;
-  requiredPackageManager: NodePackageManager['name'] | null;
-  vcsClient: Client;
 }

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

@@ -1,16 +1,10 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
-import { resolvePackageManager } from '@expo/package-manager';
 import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -19,7 +13,11 @@ import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
+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,
@@ -36,7 +34,6 @@ export async function createBuildContextAsync<T extends Platform>({
   actor,
   graphqlClient,
   analytics,
-  vcsClient,
   getDynamicPrivateProjectConfigAsync,
   customBuildConfigMetadata,
 }: {
@@ -54,24 +51,15 @@ export async function createBuildContextAsync<T extends Platform>({
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  vcsClient: Client;
   getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<BuildContext<T>> {
   const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
   const projectName = exp.slug;
   const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
   const accountId = account.id;
   const runFromCI = getenv.boolish('CI', false);
-  const developmentClient =
-    buildProfile.developmentClient ??
-    (platform === Platform.ANDROID
-      ? (buildProfile as BuildProfile<Platform.ANDROID>)?.gradleCommand === ':app:assembleDebug'
-      : (buildProfile as BuildProfile<Platform.IOS>)?.buildConfiguration === 'Debug') ??
-    false;
-
-  const requiredPackageManager = resolvePackageManager(projectDir);
 
   const credentialsCtx = new CredentialsContext({
     projectInfo: { exp, projectId },
@@ -82,7 +70,6 @@ export async function createBuildContextAsync<T extends Platform>({
     analytics,
     env: buildProfile.env,
     easJsonCliConfig,
-    vcsClient,
   });
 
   const devClientProperties = getDevClientEventProperties({
@@ -129,13 +116,10 @@ export async function createBuildContextAsync<T extends Platform>({
     user: actor,
     graphqlClient,
     analytics,
-    vcsClient,
     workflow,
     message,
     runFromCI,
     customBuildConfigMetadata,
-    developmentClient,
-    requiredPackageManager,
   };
   if (platform === Platform.ANDROID) {
     const common = commonContext as CommonContext<Platform.ANDROID>;

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

@@ -14,8 +14,6 @@ export class EasBuildFreeTierIosLimitExceededError extends EasCommandError {}
 
 export class EasBuildResourceClassNotAvailableInFreeTierError extends EasCommandError {}
 
-export class EasBuildLegacyResourceClassNotAvailableError extends EasCommandError {}
-
 export class RequestValidationError extends EasCommandError {}
 
 export class EasBuildDownForMaintenanceError extends EasCommandError {}

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

@@ -1,27 +1,30 @@
 import {
   ArchiveSource,
   ArchiveSourceType,
-  BuildMode,
   BuildTrigger,
   Metadata,
   Workflow,
 } from '@expo/eas-build-job';
-import assert from 'assert';
 
 import {
   BuildCredentialsSource,
   BuildIosEnterpriseProvisioning,
   BuildMetadataInput,
+  BuildMode,
   BuildWorkflow,
   DistributionType,
-  BuildMode as GraphQLBuildMode,
   BuildTrigger as GraphQLBuildTrigger,
   ProjectArchiveSourceInput,
   ProjectArchiveSourceType,
 } from '../graphql/generated';
 
 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
-  if (archiveSource.type === ArchiveSourceType.GCS) {
+  if (archiveSource.type === ArchiveSourceType.S3) {
+    return {
+      type: ProjectArchiveSourceType.S3,
+      bucketKey: archiveSource.bucketKey,
+    };
+  } else if (archiveSource.type === ArchiveSourceType.GCS) {
     return {
       type: ProjectArchiveSourceType.Gcs,
       bucketKey: archiveSource.bucketKey,
@@ -39,6 +42,7 @@ 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),
@@ -87,16 +91,17 @@ export function transformIosEnterpriseProvisioning(
   }
 }
 
-const buildModeToGraphQLBuildMode: Record<BuildMode, GraphQLBuildMode> = {
-  [BuildMode.BUILD]: GraphQLBuildMode.Build,
-  [BuildMode.CUSTOM]: GraphQLBuildMode.Custom,
-  [BuildMode.RESIGN]: GraphQLBuildMode.Resign,
-};
-
-export function transformBuildMode(buildMode: BuildMode): GraphQLBuildMode {
-  const graphQLBuildMode = buildModeToGraphQLBuildMode[buildMode];
-  assert(graphQLBuildMode, `Unsupported build mode: ${buildMode}`);
-  return graphQLBuildMode;
+// 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 {

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

@@ -6,7 +6,6 @@ import os from 'os';
 import type { XCBuildConfiguration } from 'xcode';
 
 import { readPlistAsync } from '../../../utils/plist';
-import { getVcsClient } from '../../../vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -19,8 +18,6 @@ import {
 
 jest.mock('fs');
 
-const vcsClient = getVcsClient();
-
 const getXCBuildConfigurationFromPbxproj = jest.spyOn(
   IOSConfig.Target,
   'getXCBuildConfigurationFromPbxproj'
@@ -62,7 +59,7 @@ describe(evaluateTemplateString, () => {
 // bare workflow
 describe(bumpVersionAsync, () => {
   beforeEach(() => {
-    getPbxproj.mockImplementation((): any => {});
+    getPbxproj.mockImplementation(() => ({} as any));
   });
   afterEach(() => {
     getXCBuildConfigurationFromPbxproj.mockReset();
@@ -76,7 +73,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -112,7 +109,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -147,7 +144,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
@@ -182,7 +179,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
@@ -265,7 +262,7 @@ describe(readBuildNumberAsync, () => {
   describe('bare project', () => {
     it('reads the build number from native code', async () => {
       const exp = initBareWorkflowProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {}, vcsClient);
+      const buildNumber = await readBuildNumberAsync('/app', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -273,7 +270,7 @@ describe(readBuildNumberAsync, () => {
   describe('managed project', () => {
     it('reads the build number from expo config', async () => {
       const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {}, vcsClient);
+      const buildNumber = await readBuildNumberAsync('/app', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -283,21 +280,16 @@ describe(readShortVersionAsync, () => {
   describe('bare project', () => {
     it('reads the short version from native code', async () => {
       const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {}, vcsClient);
+      const appVersion = await readShortVersionAsync('/app', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
       const exp = initBareWorkflowProject({
         appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
-      const buildNumber = await readShortVersionAsync(
-        '/app',
-        exp,
-        {
-          CURRENT_PROJECT_VERSION: '1.0.0',
-        },
-        vcsClient
-      );
+      const buildNumber = await readShortVersionAsync('/app', exp, {
+        CURRENT_PROJECT_VERSION: '1.0.0',
+      });
       expect(buildNumber).toBe('1.0.0');
     });
 
@@ -307,14 +299,9 @@ describe(readShortVersionAsync, () => {
       });
 
       await expect(
-        readShortVersionAsync(
-          '/app',
-          exp,
-          {
-            CURRENT_PROJECT_VERSION: '0.0.7.1.028',
-          },
-          vcsClient
-        )
+        readShortVersionAsync('/app', exp, {
+          CURRENT_PROJECT_VERSION: '0.0.7.1.028',
+        })
       ).rejects.toThrowError(
         'CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: 0.0.7.1.028'
       );
@@ -324,7 +311,7 @@ describe(readShortVersionAsync, () => {
   describe('managed project', () => {
     it('reads the version from app config', async () => {
       const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {}, vcsClient);
+      const appVersion = await readShortVersionAsync('/app', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
   });

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

@@ -1,11 +1,6 @@
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 
-import { ensureIosCredentialsAsync } from './credentials';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteBuildNumberAsync } from './version';
 import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
@@ -20,6 +15,11 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } from '../validate';
+import { ensureIosCredentialsAsync } from './credentials';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteBuildNumberAsync } from './version';
 
 export async function createIosContextAsync(
   ctx: CommonContext<Platform.IOS>
@@ -39,7 +39,6 @@ export async function createIosContextAsync(
       projectDir: ctx.projectDir,
       nonInteractive: ctx.nonInteractive,
       exp: ctx.exp,
-      vcsClient: ctx.vcsClient,
     },
     buildProfile
   );
@@ -48,7 +47,6 @@ export async function createIosContextAsync(
     exp: ctx.exp,
     xcodeBuildContext,
     env: buildProfile.env,
-    vcsClient: ctx.vcsClient,
   });
   const applicationTarget = findApplicationTarget(targets);
   const buildNumberOverride =
@@ -59,7 +57,6 @@ export async function createIosContextAsync(
           exp: ctx.exp,
           applicationTarget,
           buildProfile,
-          vcsClient: ctx.vcsClient,
         })
       : undefined;
   return {
@@ -80,7 +77,7 @@ export async function prepareIosBuildAsync(
       return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+      await syncProjectConfigurationAsync(ctx.graphqlClient, {
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         targets: ctx.ios.targets,
@@ -88,7 +85,7 @@ export async function prepareIosBuildAsync(
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        vcsClient: ctx.vcsClient,
+        projectId: ctx.projectId,
       });
     },
     prepareJobAsync: async (

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

@@ -55,5 +55,6 @@ export async function ensureIosCredentialsForBuildResignAsync(
 }
 
 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  return !buildCtx.buildProfile.simulator && !buildCtx.buildProfile.withoutCredentials;
+  const isCustomBuild = buildCtx.buildProfile.config !== undefined;
+  return !buildCtx.buildProfile.simulator && !isCustomBuild;
 }

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

@@ -16,6 +16,7 @@ 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';
 
 interface JobData {
@@ -36,7 +37,7 @@ export async function prepareJobAsync(
   const username = getUsername(ctx.exp, ctx.user);
   const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
   const projectRootDirectory =
-    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
   const buildCredentials: Ios.BuildSecrets['buildCredentials'] = {};
   if (jobData.credentials) {
     const targetNames = Object.keys(jobData.credentials);
@@ -57,8 +58,6 @@ export async function prepareJobAsync(
     builderEnvironment: {
       image: buildProfile.image,
       node: buildProfile.node,
-      pnpm: buildProfile.pnpm,
-      bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       bundler: buildProfile.bundler,
       cocoapods: buildProfile.cocoapods,

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

@@ -2,32 +2,35 @@ import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';
 
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+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 { Client } from '../../vcs/vcs';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
-export async function syncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  targets,
-  localAutoIncrement,
-  vcsClient,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  targets: Target[];
-  localAutoIncrement?: IosVersionAutoIncrement;
-  vcsClient: Client;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+export async function syncProjectConfigurationAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    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(vcsClient, projectDir, exp);
+      await syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {

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

@@ -19,7 +19,6 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import uniqBy from '../../utils/expodash/uniqBy';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
-import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
@@ -111,10 +110,9 @@ function validateShortVersion(shortVersion: string | undefined): void {
 export async function readShortVersionAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings'],
-  vcsClient: Client
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
 
@@ -133,10 +131,9 @@ export async function readShortVersionAsync(
 export async function readBuildNumberAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings'],
-  vcsClient: Client
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
@@ -150,8 +147,7 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  targets: Target[],
-  vcsClient: Client
+  targets: Target[]
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
   const applicationTarget = findApplicationTarget(targets);
   try {
@@ -159,14 +155,12 @@ export async function maybeResolveVersionsAsync(
       appBuildVersion: await readBuildNumberAsync(
         projectDir,
         exp,
-        applicationTarget.buildSettings ?? {},
-        vcsClient
+        applicationTarget.buildSettings ?? {}
       ),
       appVersion: await readShortVersionAsync(
         projectDir,
         exp,
-        applicationTarget.buildSettings ?? {},
-        vcsClient
+        applicationTarget.buildSettings ?? {}
       ),
     };
   } catch (err: any) {
@@ -284,14 +278,12 @@ export async function resolveRemoteBuildNumberAsync(
     exp,
     applicationTarget,
     buildProfile,
-    vcsClient,
   }: {
     projectDir: string;
     projectId: string;
     exp: ExpoConfig;
     applicationTarget: Target;
     buildProfile: BuildProfile<Platform.IOS>;
-    vcsClient: Client;
   }
 ): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
@@ -304,14 +296,12 @@ export async function resolveRemoteBuildNumberAsync(
   const localBuildNumber = await readBuildNumberAsync(
     projectDir,
     exp,
-    applicationTarget.buildSettings ?? {},
-    vcsClient
+    applicationTarget.buildSettings ?? {}
   );
   const localShortVersion = await readShortVersionAsync(
     projectDir,
     exp,
-    applicationTarget.buildSettings ?? {},
-    vcsClient
+    applicationTarget.buildSettings ?? {}
   );
   let currentBuildVersion: string;
   if (remoteVersions?.buildVersion) {
@@ -342,9 +332,7 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
-          undefined,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
       });
       spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -366,9 +354,7 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: nextBuildVersion,
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
-          undefined,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
       });
       spinner.succeed(
         `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.60';
+const PLUGIN_PACKAGE_VERSION = '1.0.27';
 
 export enum LocalBuildMode {
   /**

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

@@ -1,20 +1,11 @@
 import { Updates } from '@expo/config-plugins';
-import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { BuildMode, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
-import { BuildContext } from './context';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { LocalBuildMode } from './local';
-import { BuildDistributionType } from './types';
 import Log from '../log';
-import {
-  getUsername,
-  isClassicUpdatesSupportedAsync,
-  isExpoUpdatesInstalled,
-} from '../project/projectUtils';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -24,12 +15,21 @@ import {
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from '../update/ios/UpdatesModule';
 import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { LocalBuildMode } from './local';
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<Metadata> {
+  const vcsClient = getVcsClient();
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
-  const distribution = ctx.buildProfile.distribution ?? BuildDistributionType.STORE;
+  const distribution =
+    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
+      ? 'simulator'
+      : ctx.buildProfile.distribution) ?? 'store';
   const metadata: Metadata = {
     trackingContext: ctx.analyticsEventProperties,
     ...(await maybeResolveVersionsAsync(ctx)),
@@ -37,23 +37,21 @@ export async function collectMetadataAsync<T extends Platform>(
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion:
-      (await Updates.getRuntimeVersionNullableAsync(ctx.projectDir, ctx.exp, ctx.platform)) ??
-      undefined,
+    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
     reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
     ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
     appIdentifier: resolveAppIdentifier(ctx),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await ctx.vcsClient.getCommitHashAsync(),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
     gitCommitMessage: truncateGitCommitMessage(
-      (await ctx.vcsClient.getLastCommitMessageAsync()) ?? undefined
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
     ),
     isGitWorkingTreeDirty:
       ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL
         ? false
-        : await ctx.vcsClient.hasUncommittedChangesAsync(),
+        : await vcsClient.hasUncommittedChangesAsync(),
     username: getUsername(ctx.exp, ctx.user),
     message: ctx.message,
     ...(ctx.platform === Platform.IOS && {
@@ -63,12 +61,8 @@ export async function collectMetadataAsync<T extends Platform>(
     }),
     runWithNoWaitFlag: ctx.noWait,
     runFromCI: ctx.runFromCI,
+    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
     customWorkflowName: ctx.customBuildConfigMetadata?.workflowName,
-    developmentClient: ctx.developmentClient,
-    requiredPackageManager: ctx.requiredPackageManager ?? undefined,
-    selectedImage: ctx.buildProfile.image,
-    customNodeVersion: ctx.buildProfile.node,
-    simulator: 'simulator' in ctx.buildProfile && ctx.buildProfile.simulator,
   };
   return sanitizeMetadata(metadata);
 }
@@ -81,8 +75,7 @@ async function maybeResolveVersionsAsync<T extends Platform>(
     const resolvedVersion = await maybeResolveIosVersionsAsync(
       ctx.projectDir,
       ctx.exp,
-      iosContext.ios.targets,
-      ctx.vcsClient
+      iosContext.ios.targets
     );
     if (iosContext.ios.buildNumberOverride) {
       return {
@@ -96,8 +89,7 @@ async function maybeResolveVersionsAsync<T extends Platform>(
     const resolvedVersion = await maybeResolveAndroidVersionsAsync(
       ctx.projectDir,
       ctx.exp,
-      androidCtx.buildProfile,
-      ctx.vcsClient
+      androidCtx.buildProfile
     );
     if (androidCtx.android.versionCodeOverride) {
       return {
@@ -128,19 +120,13 @@ async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
   if (ctx.buildProfile.channel) {
     return { channel: ctx.buildProfile.channel };
   }
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
   const channel = await getNativeChannelAsync(ctx);
   if (channel) {
     return { channel };
   }
-
-  if (!(await isClassicUpdatesSupportedAsync(ctx.projectDir))) {
-    return null;
-  }
-
-  if (ctx.buildProfile.releaseChannel) {
-    return { releaseChannel: ctx.buildProfile.releaseChannel };
-  }
-
   const releaseChannel = await getNativeReleaseChannelAsync(ctx);
   return { releaseChannel };
 }

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 
-import { formatGraphQLBuild } from './utils/formatBuild';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { AppPlatform, BuildFilter, BuildFragment } from '../graphql/generated';
@@ -12,6 +11,7 @@ import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
+import { formatGraphQLBuild } from './utils/formatBuild';
 
 export const BUILDS_LIMIT = 50;
 

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

@@ -1,4 +1,3 @@
-import { ExpoConfig } from '@expo/config-types';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import {
   AppVersionSource,
@@ -13,18 +12,7 @@ import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
 import { Analytics } from '../analytics/AnalyticsManager';
-import { createAndLinkChannelAsync, doesChannelExistAsync } from '../channel/queries';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
@@ -50,9 +38,9 @@ import {
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
 import {
+  installExpoUpdatesAsync,
   isExpoUpdatesInstalledAsDevDependency,
   isExpoUpdatesInstalledOrAvailable,
-  isUsingEASUpdate,
   validateAppVersionRuntimePolicySupportAsync,
 } from '../project/projectUtils';
 import {
@@ -69,14 +57,23 @@ import {
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { ensureEASUpdateIsConfiguredAsync } from '../update/configure';
 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 { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -98,19 +95,17 @@ export interface BuildFlags {
 export async function runBuildAndSubmitAsync(
   graphqlClient: ExpoGraphqlClient,
   analytics: Analytics,
-  vcsClient: Client,
   projectDir: string,
   flags: BuildFlags,
   actor: Actor,
   getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
 ): Promise<void> {
-  await vcsClient.ensureRepoExistsAsync();
-  await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
+  await getVcsClient().ensureRepoExistsAsync();
+  await ensureRepoIsCleanAsync(flags.nonInteractive);
 
   await ensureProjectConfiguredAsync({
     projectDir,
     nonInteractive: flags.nonInteractive,
-    vcsClient,
   });
   const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   const easJsonCliConfig: EasJson['cli'] =
@@ -122,7 +117,6 @@ export async function runBuildAndSubmitAsync(
     easJsonAccessor,
     platforms,
     profileName: flags.profile ?? undefined,
-    projectDir,
   });
   Log.log(
     `Loaded "env" configuration for the "${buildProfiles[0].profileName}" profile: ${
@@ -136,18 +130,13 @@ export async function runBuildAndSubmitAsync(
     projectDir,
     nonInteractive: flags.nonInteractive,
     buildProfiles,
-    vcsClient,
   });
 
   const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
     {};
   for (const buildProfile of buildProfiles) {
     validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
-    const maybeMetadata = await validateCustomBuildConfigAsync({
-      projectDir,
-      profile: buildProfile.profile,
-      vcsClient,
-    });
+    const maybeMetadata = await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
     if (maybeMetadata) {
       customBuildConfigMetadataByPlatform[toAppPlatform(buildProfile.platform)] = maybeMetadata;
     }
@@ -170,7 +159,6 @@ export async function runBuildAndSubmitAsync(
       actor,
       graphqlClient,
       analytics,
-      vcsClient,
       getDynamicPrivateProjectConfigAsync,
       customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
     });
@@ -195,7 +183,6 @@ export async function runBuildAndSubmitAsync(
       platforms,
       profileName: flags.submitProfile,
       type: 'submit',
-      projectDir,
     });
     for (const startedBuild of startedBuilds) {
       const submitProfile = nullthrows(
@@ -235,6 +222,8 @@ export async function runBuildAndSubmitAsync(
   const builds = await waitForBuildEndAsync(graphqlClient, {
     buildIds: startedBuilds.map(({ build }) => build.id),
     accountName,
+    projectDir,
+    nonInteractive: flags.nonInteractive,
   });
   if (!flags.json) {
     printBuildResults(builds);
@@ -280,7 +269,6 @@ async function prepareAndStartBuildAsync({
   actor,
   graphqlClient,
   analytics,
-  vcsClient,
   getDynamicPrivateProjectConfigAsync,
   customBuildConfigMetadata,
 }: {
@@ -292,7 +280,6 @@ async function prepareAndStartBuildAsync({
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  vcsClient: Client;
   getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
@@ -311,7 +298,6 @@ async function prepareAndStartBuildAsync({
     actor,
     graphqlClient,
     analytics,
-    vcsClient,
     getDynamicPrivateProjectConfigAsync,
     customBuildConfigMetadata,
   });
@@ -334,26 +320,11 @@ async function prepareAndStartBuildAsync({
   );
   if (buildProfile.profile.channel) {
     await validateExpoUpdatesInstalledAsProjectDependencyAsync({
-      exp: buildCtx.exp,
-      projectId: buildCtx.projectId,
       projectDir,
-      vcsClient: buildCtx.vcsClient,
       sdkVersion: buildCtx.exp.sdkVersion,
       nonInteractive: flags.nonInteractive,
       buildProfile,
     });
-    if (isUsingEASUpdate(buildCtx.exp, buildCtx.projectId)) {
-      const doesChannelExist = await doesChannelExistAsync(graphqlClient, {
-        appId: buildCtx.projectId,
-        channelName: buildProfile.profile.channel,
-      });
-      if (!doesChannelExist) {
-        await createAndLinkChannelAsync(graphqlClient, {
-          appId: buildCtx.projectId,
-          channelName: buildProfile.profile.channel,
-        });
-      }
-    }
   }
 
   await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
@@ -420,7 +391,6 @@ async function prepareAndStartSubmissionAsync({
     analytics: buildCtx.analytics,
     projectId: buildCtx.projectId,
     exp: buildCtx.exp,
-    vcsClient: buildCtx.vcsClient,
   });
 
   if (moreBuilds) {
@@ -477,18 +447,12 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
 }
 
 async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
-  exp,
-  projectId,
   projectDir,
-  vcsClient,
   buildProfile,
   nonInteractive,
   sdkVersion,
 }: {
-  exp: ExpoConfig;
-  projectId: string;
   projectDir: string;
-  vcsClient: Client;
   buildProfile: ProfileData<'build'>;
   nonInteractive: boolean;
   sdkVersion?: string;
@@ -503,25 +467,18 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
     );
   } else if (nonInteractive) {
     Log.warn(
-      `The build profile "${buildProfile.profileName}" has specified the channel "${buildProfile.profile.channel}", but the "expo-updates" package hasn't been installed. To use channels for your builds, install the "expo-updates" package by running "npx expo install expo-updates" followed by "eas update:configure".`
+      `The build profile "${buildProfile.profileName}" has specified the channel "${buildProfile.profile.channel}", but the "expo-updates" package hasn't been installed. To use channels for your builds, install the "expo-updates" package by running "npx expo install expo-updates".`
     );
   } else {
     Log.warn(
-      `The build profile "${buildProfile.profileName}" specifies the channel "${buildProfile.profile.channel}", but the "expo-updates" package is missing. To use channels in your builds, install the "expo-updates" package and run "eas update:configure".`
+      `The build profile "${buildProfile.profileName}" specifies the channel "${buildProfile.profile.channel}", but the "expo-updates" package is missing. To use channels in your builds, install the "expo-updates" package.`
     );
     const installExpoUpdates = await confirmAsync({
-      message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
+      message: `Would you like to install the "expo-updates" package?`,
     });
     if (installExpoUpdates) {
-      await ensureEASUpdateIsConfiguredAsync({
-        exp,
-        projectId,
-        projectDir,
-        platform: RequestedPlatform.All,
-        vcsClient,
-      });
-      Log.withTick('Installed expo-updates and configured EAS Update.');
-      throw new Error('Command must be re-run to pick up new updates configuration.');
+      await installExpoUpdatesAsync(projectDir, { silent: false });
+      Log.withTick('Installed expo-updates');
     }
   }
 }

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

@@ -11,6 +11,5 @@ export enum BuildStatus {
 export enum BuildDistributionType {
   STORE = 'store',
   INTERNAL = 'internal',
-  /** @deprecated Use simulator flag instead */
   SIMULATOR = 'simulator',
 }

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

@@ -3,7 +3,6 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
-import { reviewAndCommitChangesAsync } from './repository';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -11,16 +10,15 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync } from '../../prompts';
 import { expoCommandAsync } from '../../utils/expoCli';
 import { ProfileData } from '../../utils/profiles';
-import { Client } from '../../vcs/vcs';
+import { getVcsClient } from '../../vcs';
+import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,
-  vcsClient,
   nonInteractive = false,
   buildProfiles = [],
 }: {
   projectDir: string;
-  vcsClient: Client;
   nonInteractive?: boolean;
   buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
@@ -43,7 +41,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   );
 
   const workflowPerPlatformList = await Promise.all(
-    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform, vcsClient))
+    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
   );
 
   Log.newLine();
@@ -57,19 +55,6 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
       'expo-dev-client'
     )} installed for your project.`
   );
-  if (nonInteractive) {
-    Log.error(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
-    Log.error(
-      learnMore('https://docs.expo.dev/clients/installation/', {
-        learnMoreMessage: 'See installation instructions on how to do it.',
-        dim: false,
-      })
-    );
-    Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and try again later.`, {
-      exit: 1,
-    });
-  }
-
   const areAllManaged = workflowPerPlatformList.every(i => i === Workflow.MANAGED);
   if (areAllManaged) {
     const install = await confirmAsync({
@@ -77,7 +62,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
       instructions: 'The command will abort unless you agree.',
     });
     if (install) {
-      await installExpoDevClientAsync(projectDir, vcsClient, { nonInteractive });
+      await installExpoDevClientAsync(projectDir, { nonInteractive });
     } else {
       Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
         exit: 1,
@@ -115,7 +100,6 @@ async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolea
 
 async function installExpoDevClientAsync(
   projectDir: string,
-  vcsClient: Client,
   { nonInteractive }: { nonInteractive: boolean }
 ): Promise<void> {
   Log.newLine();
@@ -123,8 +107,8 @@ async function installExpoDevClientAsync(
   Log.newLine();
   await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
   Log.newLine();
-  if (await vcsClient.isCommitRequiredAsync()) {
-    await reviewAndCommitChangesAsync(vcsClient, 'Install expo-dev-client', {
+  if (await getVcsClient().isCommitRequiredAsync()) {
+    await reviewAndCommitChangesAsync('Install expo-dev-client', {
       nonInteractive,
     });
   }

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 
-import { getBuildLogsUrl } from './url';
 import {
   AppPlatform,
   BuildFragment,
@@ -8,6 +7,7 @@ import {
 } from '../../graphql/generated';
 import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
+import { getBuildLogsUrl } from './url';
 
 export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);

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

@@ -2,7 +2,6 @@ import assert from 'assert';
 import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';
 
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 import {
   AppPlatform,
   BuildError,
@@ -14,6 +13,7 @@ import {
 } from '../../graphql/generated';
 import Log, { learnMore, link } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
 function terminalLinkFallback(url: string, text: string): string {
   return `${text} (${url})`;

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

@@ -10,10 +10,10 @@ import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import { Client } from '../../vcs/vcs';
+import { getVcsClient } from '../../vcs';
 
-export async function maybeBailOnRepoStatusAsync(vcsClient: Client): Promise<void> {
-  if (!(await vcsClient.isCommitRequiredAsync())) {
+export async function maybeBailOnRepoStatusAsync(): Promise<void> {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -32,11 +32,8 @@ export async function maybeBailOnRepoStatusAsync(vcsClient: Client): Promise<voi
   }
 }
 
-export async function ensureRepoIsCleanAsync(
-  vcsClient: Client,
-  nonInteractive = false
-): Promise<void> {
-  if (!(await vcsClient.isCommitRequiredAsync())) {
+export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -53,22 +50,19 @@ export async function ensureRepoIsCleanAsync(
     message: `Commit changes to git?`,
   });
   if (answer) {
-    await commitPromptAsync(vcsClient, { commitAllFiles: true });
+    await commitPromptAsync({ commitAllFiles: true });
   } else {
     throw new Error('Commit all changes. Aborting...');
   }
 }
 
-export async function commitPromptAsync(
-  vcsClient: Client,
-  {
-    initialCommitMessage,
-    commitAllFiles,
-  }: {
-    initialCommitMessage?: string;
-    commitAllFiles?: boolean;
-  } = {}
-): Promise<void> {
+export async function commitPromptAsync({
+  initialCommitMessage,
+  commitAllFiles,
+}: {
+  initialCommitMessage?: string;
+  commitAllFiles?: boolean;
+} = {}): Promise<void> {
   const { message } = await promptAsync({
     type: 'text',
     name: 'message',
@@ -76,16 +70,14 @@ export async function commitPromptAsync(
     initial: initialCommitMessage,
     validate: (input: string) => input !== '',
   });
-  await vcsClient.commitAsync({
+  await getVcsClient().commitAsync({
     commitAllFiles,
     commitMessage: message,
     nonInteractive: false,
   });
 }
 
-export async function makeProjectTarballAsync(
-  vcsClient: Client
-): Promise<{ path: string; size: number }> {
+export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
   const spinner = ora('Compressing project files');
 
   await fs.mkdirp(getTmpDirectory());
@@ -107,7 +99,7 @@ export async function makeProjectTarballAsync(
   startTimer(compressTimerLabel);
 
   try {
-    await vcsClient.makeShallowCopyAsync(shallowClonePath);
+    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
@@ -141,12 +133,11 @@ enum ShouldCommitChanges {
 }
 
 export async function reviewAndCommitChangesAsync(
-  vcsClient: Client,
   initialCommitMessage: string,
   { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
   if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await vcsClient.commitAsync({
+    await getVcsClient().commitAsync({
       commitMessage: initialCommitMessage,
       commitAllFiles: false,
       nonInteractive,
@@ -180,11 +171,11 @@ export async function reviewAndCommitChangesAsync(
       "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
     );
   } else if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync(vcsClient, { initialCommitMessage });
+    await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes.');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcsClient.showDiffAsync();
-    await reviewAndCommitChangesAsync(vcsClient, initialCommitMessage, {
+    await getVcsClient().showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, {
       nonInteractive,
       askedFirstTime: false,
     });

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

@@ -7,13 +7,21 @@ import Log, { link } from '../../log';
 
 type AndroidResourceClass = Exclude<
   ResourceClass,
-  ResourceClass.M1_MEDIUM | ResourceClass.M_MEDIUM | ResourceClass.M_LARGE
+  | ResourceClass.M1_EXPERIMENTAL
+  | ResourceClass.M1_MEDIUM
+  | ResourceClass.M1_LARGE
+  | ResourceClass.INTEL_MEDIUM
+  | ResourceClass.M_MEDIUM
+  | ResourceClass.M_LARGE
 >;
 
 const iosResourceClassToBuildResourceClassMapping: Record<ResourceClass, BuildResourceClass> = {
   [ResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
   [ResourceClass.LARGE]: BuildResourceClass.IosLarge,
+  [ResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosMMedium,
   [ResourceClass.M1_MEDIUM]: BuildResourceClass.IosMMedium,
+  [ResourceClass.M1_LARGE]: BuildResourceClass.IosMLarge,
+  [ResourceClass.INTEL_MEDIUM]: BuildResourceClass.IosIntelMedium,
   [ResourceClass.MEDIUM]: BuildResourceClass.IosMedium,
   [ResourceClass.M_MEDIUM]: BuildResourceClass.IosMMedium,
   [ResourceClass.M_LARGE]: BuildResourceClass.IosMLarge,
@@ -49,7 +57,15 @@ export async function resolveBuildResourceClassAsync<T extends Platform>(
 }
 
 function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): BuildResourceClass {
-  if (selectedResourceClass && ResourceClass.M1_MEDIUM === selectedResourceClass) {
+  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`);
   }
 
@@ -72,7 +88,7 @@ function resolveIosResourceClass(
     );
   }
 
-  if (ResourceClass.M1_MEDIUM === resourceClass) {
+  if ([ResourceClass.M1_EXPERIMENTAL, ResourceClass.M1_MEDIUM].includes(resourceClass)) {
     Log.warn(
       `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
         'm-medium'
@@ -80,7 +96,7 @@ function resolveIosResourceClass(
     );
   }
 
-  if (ResourceClass.M_LARGE === resourceClass) {
+  if ([ResourceClass.M_LARGE, ResourceClass.M1_LARGE].includes(resourceClass)) {
     Log.warn(
       `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
         'large'

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

@@ -3,9 +3,9 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
 
-import { updateAppJsonConfigAsync } from './appJson';
 import Log from '../../log';
 import { promptAsync } from '../../prompts';
+import { updateAppJsonConfigAsync } from './appJson';
 
 export function ensureStaticConfigExists(projectDir: string): void {
   const paths = getConfigFilePaths(projectDir);

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

@@ -4,9 +4,10 @@ import fs from 'fs-extra';
 import path from 'path';
 import semver from 'semver';
 
-import { CommonContext } from './context';
 import Log, { learnMore } from '../log';
 import { isPNGAsync } from '../utils/image';
+import { getVcsClient } from '../vcs';
+import { CommonContext } from './context';
 
 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {
@@ -27,12 +28,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const rootDir = path.normalize(await ctx.vcsClient.getRootPathAsync());
+  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&
     (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await getVcsClient().isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
   ) {
     Log.warn(
       `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`

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

@@ -0,0 +1,8 @@
+export class ListChannels {
+  constructor() {}
+
+  async runAsync(): Promise<void> {}
+
+  // TODO return channels fragment
+  async listChannelsAsync(): Promise<void> {}
+}

packages/eas-cli/src/channel/__tests__/branch-mapping-fixtures.ts

@@ -1,22 +0,0 @@
-import { BranchBasicInfo, ChannelBasicInfo, UpdateChannelInfoWithBranches } from '../utils';
-
-export const testChannelBasicInfo: ChannelBasicInfo = {
-  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
-  name: 'production',
-  branchMapping:
-    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
-};
-
-export const testBasicBranchInfo1: BranchBasicInfo = {
-  id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-  name: 'wrong-channel',
-};
-
-export const testBasicBranchInfo2: BranchBasicInfo = {
-  id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-  name: 'production',
-};
-export const channelInfoWithBranches: UpdateChannelInfoWithBranches<BranchBasicInfo> = {
-  ...testChannelBasicInfo,
-  updateBranches: [testBasicBranchInfo1, testBasicBranchInfo2],
-};

packages/eas-cli/src/channel/__tests__/branch-mapping-test.ts

@@ -1,70 +0,0 @@
-import { testChannelBasicInfo } from './branch-mapping-fixtures';
-import {
-  emptyBranchMapping,
-  rolloutBranchMapping,
-  standardBranchMapping,
-} from '../../rollout/__tests__/fixtures';
-import {
-  BranchMappingValidationError,
-  assertVersion,
-  getAlwaysTrueBranchMapping,
-  getBranchMapping,
-  getEmptyBranchMapping,
-  getStandardBranchId,
-  isAlwaysTrueBranchMapping,
-  isEmptyBranchMapping,
-} from '../branch-mapping';
-
-describe(assertVersion, () => {
-  it('throws if the branch mapping is not the correct version', () => {
-    expect(() => assertVersion(testChannelBasicInfo, 5)).toThrowError(BranchMappingValidationError);
-  });
-  it('asserts the correct version', () => {
-    assertVersion(testChannelBasicInfo, 0);
-    expect(getBranchMapping(testChannelBasicInfo.branchMapping).version).toBe(0);
-  });
-});
-
-describe(getEmptyBranchMapping, () => {
-  it('gets an empty branch mapping', () => {
-    expect(isEmptyBranchMapping(getEmptyBranchMapping())).toBe(true);
-  });
-});
-
-describe(isEmptyBranchMapping, () => {
-  it('detects empty branch mappings', () => {
-    expect(isEmptyBranchMapping(emptyBranchMapping)).toBe(true);
-    expect(isEmptyBranchMapping(standardBranchMapping)).toBe(false);
-    expect(isEmptyBranchMapping(rolloutBranchMapping)).toBe(false);
-  });
-});
-
-describe(isAlwaysTrueBranchMapping, () => {
-  it('detects always true branch mappings', () => {
-    expect(isAlwaysTrueBranchMapping(standardBranchMapping)).toBe(true);
-    expect(isAlwaysTrueBranchMapping(rolloutBranchMapping)).toBe(false);
-    expect(isAlwaysTrueBranchMapping(emptyBranchMapping)).toBe(false);
-  });
-});
-
-describe(getAlwaysTrueBranchMapping, () => {
-  it('gets an always true branch mapping', () => {
-    const alwaysTrueBranchMapping = getAlwaysTrueBranchMapping('test-id');
-    expect(isAlwaysTrueBranchMapping(alwaysTrueBranchMapping)).toBe(true);
-  });
-});
-
-describe(getStandardBranchId, () => {
-  it('throws if the branch mapping is not a standard mapping', () => {
-    expect(() => getStandardBranchId(testChannelBasicInfo)).toThrowError(
-      BranchMappingValidationError
-    );
-  });
-  it('gets a standard branch id', () => {
-    const channelObjectWithStandardMapping = { ...testChannelBasicInfo };
-    channelObjectWithStandardMapping.branchMapping = JSON.stringify(standardBranchMapping);
-    expect(getStandardBranchId(channelObjectWithStandardMapping)).toBe(
-      standardBranchMapping.data[0].branchId
-    );
-  });
-});

packages/eas-cli/src/channel/__tests__/fixtures.ts

@@ -1,148 +0,0 @@
-import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
-import { UpdateBranchObject, UpdateChannelObject } from '../../graphql/queries/ChannelQuery';
-
-export const testUpdateBranch1: UpdateBranchObject = {
-  id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-  name: 'wrong-channel',
-  updateGroups: [
-    [
-      {
-        id: 'bbe3e63a-f620-4603-8c4d-258f3e51590d',
-        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
-        message: 'fix bug',
-        createdAt: '2023-07-17T22:48:59.278Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'ios',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"7d40544b395c5949f4646f5e150fe020","fileSHA256":"LN_rjlzN55dvcBL7jM5zryIpAp7iHU8VCf7RFIccbNg","storageKey":"Pi65ns2w9xLI5G_m9aGrJ5wK5FpWcGcInSSFwnA_0aA","contentType":"image/png","fileExtension":".png"},{"bundleKey":"cdd04e13d4ec83ff0cd13ec8dabdc341","fileSHA256":"irHji01LPI9giDYxtJo9bTPHaEHzuUcCMTlb4xn90Ks","storageKey":"oJZ9JX1m8IKNDgnIqcKOo5KUFOoa_NCaxruigZu65E0","contentType":"image/png","fileExtension":".png"},{"bundleKey":"a132ecc4ba5c1517ff83c0fb321bc7fc","fileSHA256":"K3RDqaWOksoRpXW9wRWYYVpX3eMFzYznDWAmBrMCzZg","storageKey":"X3OAkUu5P_LqyKFx1bNkA_qDQFLlSjCYNAlVEaOamHE","contentType":"image/png","fileExtension":".png"},{"bundleKey":"0ea69b5077e7c4696db85dbcba75b0e1","fileSHA256":"Pd0Hc-0n4j0leJ8wFzGzrEVa2L5aonoKG4OPicbSciU","storageKey":"FwJkAbrRNahBGX1KXnTAgiiwyzENu3D7DeEzCwmInyo","contentType":"image/png","fileExtension":".png"},{"bundleKey":"f5b790e2ac193b3d41015edb3551f9b8","fileSHA256":"vCfIss7SLYKt1AAi0hxjsgOMEDceLJB6ZWjQf6gTU4k","storageKey":"GQtYm7r0G9N3WJyrymjZ26p8eNMIb7rzqwSVgGco5EU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"3d0ac172fe41ab941a8c68cd7e3a17ee","fileSHA256":"jjnar-ZPrb_g0Bx5tcFfjJrP3v8HdeAlXMk__xN7I1U","storageKey":"bimf-UXq5IFH5nNHCIHdcQ2MyJwTnwDVBb-P8hr2CZw","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/bbe3e63a-f620-4603-8c4d-258f3e51590d',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-          name: 'wrong-channel',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-      {
-        id: 'db22401b-d321-4629-a068-21d6d1f19c02',
-        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
-        message: 'fix bug',
-        createdAt: '2023-07-17T22:48:59.278Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'android',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"778ffc9fe8773a878e9c30a6304784de","fileSHA256":"i2Gkx-9w3JJ1PwSUl2SC9m_UFQ7CPfx3KrZeEDc6-lU","storageKey":"idnX8z03q4vGLzhYMPaQGBADjhqvWe67_afPqJ1vGzM","contentType":"image/png","fileExtension":".png"},{"bundleKey":"376d6a4c7f622917c39feb23671ef71d","fileSHA256":"QJsG0VpGM-5viirUgoKq0M4zQ_TYyPfLhAhN5mrM54I","storageKey":"46DQ95-UdSKiRkQgt5FyXkE1FrKOT9tBZP3nS7auKlg","contentType":"image/png","fileExtension":".png"},{"bundleKey":"c79c3606a1cf168006ad3979763c7e0c","fileSHA256":"kGZm3WiTRq2iMs42ia3vkHtCV_obWT8DY40rlJf2SIQ","storageKey":"k-3xHp3vP8mR36WdccUZVPTRJKpP-zlyboWdkXCIQpQ","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02bc1fa7c0313217bde2d65ccbff40c9","fileSHA256":"_6fuRbdkBbpzkhSVAI99aMneY5X0tpQdsGNGX244IyA","storageKey":"lfqeUjiWFXwowhxVDBEzxsbTOEzYxMLebljy5Bh1mpU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"35ba0eaec5a4f5ed12ca16fabeae451d","fileSHA256":"hM9es7ICUPaeDkczvrTaX0F_BoKJKlrRteYlcHU8IbE","storageKey":"fMoMrsUeB5xWw_Ugn8FqGJf-M2pld2hkXKR704z0MM8","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"4cc2ee49988e438ac066827b809721de","fileSHA256":"ctfK72f8EdS1IQmDvJLya38RMSma16beJcMoQToZIe0","storageKey":"QdEoKuCQPvVPA71gY52wqJ9vmtV4ObnCcPE2FP4SIdo","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/db22401b-d321-4629-a068-21d6d1f19c02',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-          name: 'wrong-channel',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-    ],
-  ],
-  __typename: 'UpdateBranch',
-};
-
-export const testUpdateBranch2: UpdateBranchObject = {
-  id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-  name: 'production',
-  updateGroups: [
-    [
-      {
-        id: 'f04aafc1-0bf5-4548-8c35-726b467e7c40',
-        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
-        message: 'fix bug',
-        createdAt: '2023-06-23T23:37:10.004Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'ios',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"7d40544b395c5949f4646f5e150fe020","fileSHA256":"LN_rjlzN55dvcBL7jM5zryIpAp7iHU8VCf7RFIccbNg","storageKey":"Pi65ns2w9xLI5G_m9aGrJ5wK5FpWcGcInSSFwnA_0aA","contentType":"image/png","fileExtension":".png"},{"bundleKey":"cdd04e13d4ec83ff0cd13ec8dabdc341","fileSHA256":"irHji01LPI9giDYxtJo9bTPHaEHzuUcCMTlb4xn90Ks","storageKey":"oJZ9JX1m8IKNDgnIqcKOo5KUFOoa_NCaxruigZu65E0","contentType":"image/png","fileExtension":".png"},{"bundleKey":"a132ecc4ba5c1517ff83c0fb321bc7fc","fileSHA256":"K3RDqaWOksoRpXW9wRWYYVpX3eMFzYznDWAmBrMCzZg","storageKey":"X3OAkUu5P_LqyKFx1bNkA_qDQFLlSjCYNAlVEaOamHE","contentType":"image/png","fileExtension":".png"},{"bundleKey":"0ea69b5077e7c4696db85dbcba75b0e1","fileSHA256":"Pd0Hc-0n4j0leJ8wFzGzrEVa2L5aonoKG4OPicbSciU","storageKey":"FwJkAbrRNahBGX1KXnTAgiiwyzENu3D7DeEzCwmInyo","contentType":"image/png","fileExtension":".png"},{"bundleKey":"f5b790e2ac193b3d41015edb3551f9b8","fileSHA256":"vCfIss7SLYKt1AAi0hxjsgOMEDceLJB6ZWjQf6gTU4k","storageKey":"GQtYm7r0G9N3WJyrymjZ26p8eNMIb7rzqwSVgGco5EU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"76ec49faddaef30ba78fe50edc5ab3d6","fileSHA256":"OLUdgP-fZI2shwGS5qlIk7nWnybL_13RJl5xR85CDBU","storageKey":"OCvI0-34zApbdo3eSGfIaQUbWdZeLeKH-nJSeedKTFs","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/f04aafc1-0bf5-4548-8c35-726b467e7c40',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-          name: 'production',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-      {
-        id: 'd8d15786-2727-407f-bf3e-f4bda7e397d9',
-        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
-        message: 'fix bug',
-        createdAt: '2023-06-23T23:37:10.004Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'android',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"778ffc9fe8773a878e9c30a6304784de","fileSHA256":"i2Gkx-9w3JJ1PwSUl2SC9m_UFQ7CPfx3KrZeEDc6-lU","storageKey":"idnX8z03q4vGLzhYMPaQGBADjhqvWe67_afPqJ1vGzM","contentType":"image/png","fileExtension":".png"},{"bundleKey":"376d6a4c7f622917c39feb23671ef71d","fileSHA256":"QJsG0VpGM-5viirUgoKq0M4zQ_TYyPfLhAhN5mrM54I","storageKey":"46DQ95-UdSKiRkQgt5FyXkE1FrKOT9tBZP3nS7auKlg","contentType":"image/png","fileExtension":".png"},{"bundleKey":"c79c3606a1cf168006ad3979763c7e0c","fileSHA256":"kGZm3WiTRq2iMs42ia3vkHtCV_obWT8DY40rlJf2SIQ","storageKey":"k-3xHp3vP8mR36WdccUZVPTRJKpP-zlyboWdkXCIQpQ","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02bc1fa7c0313217bde2d65ccbff40c9","fileSHA256":"_6fuRbdkBbpzkhSVAI99aMneY5X0tpQdsGNGX244IyA","storageKey":"lfqeUjiWFXwowhxVDBEzxsbTOEzYxMLebljy5Bh1mpU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"35ba0eaec5a4f5ed12ca16fabeae451d","fileSHA256":"hM9es7ICUPaeDkczvrTaX0F_BoKJKlrRteYlcHU8IbE","storageKey":"fMoMrsUeB5xWw_Ugn8FqGJf-M2pld2hkXKR704z0MM8","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"f4c6981626dbabcf51078d07a1611f4e","fileSHA256":"q-k1hSWl49aXpSg4jOSaVVnYFSFL6xf7HVl_TQE-ObM","storageKey":"FwK1PaZqtpL0QZIgaHsxU1AV93JhMdu9K1wZizXROAc","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/d8d15786-2727-407f-bf3e-f4bda7e397d9',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-          name: 'production',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-    ],
-  ],
-  __typename: 'UpdateBranch',
-};
-export const testChannelObject: UpdateChannelObject = {
-  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
-  name: 'production',
-  createdAt: '2023-05-16T21:26:16.946Z',
-  updatedAt: '2023-05-16T21:26:16.946Z',
-  branchMapping:
-    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
-  updateBranches: [testUpdateBranch1, testUpdateBranch2],
-  __typename: 'UpdateChannel',
-};
-
-export const testBasicChannelInfo: UpdateChannelBasicInfoFragment = {
-  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
-  name: 'production',
-  branchMapping:
-    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.1,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
-  __typename: 'UpdateChannel',
-};
-
-export const testBasicChannelInfo2: UpdateChannelBasicInfoFragment = {
-  id: '9d5c7bf0-d52d-474c-9140-c1bad7f0de9d',
-  name: 'staging',
-  branchMapping:
-    '{"data":[{"branchId":"d7d68e32-d9c9-4a8d-8d1b-21e53100a5e8","branchMappingLogic":{"operand":0.1,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"f9f708c2-0c91-4360-b2a4-0b61834aef4a","branchMappingLogic":"true"}],"version":0}',
-  __typename: 'UpdateChannel',
-};

packages/eas-cli/src/channel/__tests__/print-utils-test.ts

@@ -1,57 +0,0 @@
-import { format } from '@expo/timeago.js';
-
-import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
-import { getAlwaysTrueBranchMapping, getEmptyBranchMapping } from '../branch-mapping';
-import { getDescriptionByBranchId } from '../print-utils';
-
-describe(getDescriptionByBranchId, () => {
-  it('should get descriptions for multiple branches with multiple update groups', () => {
-    const descriptionByBranchId = getDescriptionByBranchId(testChannelObject);
-    expect(Object.values(descriptionByBranchId)).toHaveLength(2);
-    expect(descriptionByBranchId[testUpdateBranch1.id]).toEqual({
-      branch: 'wrong-channel',
-      branchRolloutPercentage: 15,
-      update: {
-        codeSigningKey: undefined,
-        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
-        isRollBackToEmbedded: false,
-        message: `"fix bug" (${format('2023-07-17T22:48:59.278Z', 'en_US')} by quintest113)`,
-        platforms: 'android, ios',
-        runtimeVersion: 'exposdk:48.0.0',
-      },
-    });
-
-    expect(descriptionByBranchId[testUpdateBranch2.id]).toEqual({
-      branch: 'production',
-      branchRolloutPercentage: 85,
-      update: {
-        codeSigningKey: undefined,
-        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
-        isRollBackToEmbedded: false,
-        message: `"fix bug" (${format('2023-06-23T23:37:10.004Z', 'en_US')} by quintest113)`,
-        platforms: 'android, ios',
-        runtimeVersion: 'exposdk:48.0.0',
-      },
-    });
-  });
-  it('should get descriptions for branches with no updates', () => {
-    const noUpdatesBranch = { ...testUpdateBranch1, updateGroups: [] };
-    const oneBranchChannel = {
-      ...testChannelObject,
-      updateBranches: [noUpdatesBranch],
-      branchMapping: JSON.stringify(getAlwaysTrueBranchMapping(noUpdatesBranch.id)),
-    };
-    const descriptionByBranchId = getDescriptionByBranchId(oneBranchChannel);
-    expect(Object.values(descriptionByBranchId)).toHaveLength(1);
-    expect(descriptionByBranchId[testUpdateBranch1.id]).toEqual({ branch: 'wrong-channel' });
-  });
-  it('should get descriptions for no branches', () => {
-    const noBranchChannel = {
-      ...testChannelObject,
-      updateBranches: [],
-      branchMapping: JSON.stringify(getEmptyBranchMapping()),
-    };
-    const descriptionByBranchId = getDescriptionByBranchId(noBranchChannel);
-    expect(Object.values(descriptionByBranchId)).toHaveLength(0);
-  });
-});

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

@@ -1,11 +0,0 @@
-import { channelInfoWithBranches, testBasicBranchInfo1 } from './branch-mapping-fixtures';
-import { getUpdateBranch } from '../utils';
-
-describe(getUpdateBranch, () => {
-  it('gets the update branch', () => {
-    expect(getUpdateBranch(channelInfoWithBranches, '754bf17f-efc0-46ab-8a59-a03f20e53e9b')).toBe(
-      testBasicBranchInfo1
-    );
-    expect(() => getUpdateBranch(channelInfoWithBranches, 'not-a-branch-ID')).toThrow();
-  });
-});

packages/eas-cli/src/channel/actions/SelectChannel.ts

@@ -1,107 +0,0 @@
-import { EASUpdateAction, EASUpdateContext, NonInteractiveError } from '../../eas-update/utils';
-import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
-import {
-  Connection,
-  Edge,
-  FilterPagination,
-  QueryParams,
-  selectPaginatedAsync,
-} from '../../utils/relay';
-
-/**
- * Select a channel for the project.
- *
- * @constructor
- * @param {function} options.filterPredicate - A predicate to filter the channels that are shown to the user. It takes a channelInfo object as a parameter and returns a boolean.
- * @param {string} options.printedType - The type of channel printed to the user. Defaults to 'channel'.
- * @param {number} options.pageSize - The number of channels to show per page. Defaults to 100.
- * @param {function} options.beforeEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called before each query.
- * @args externalQueryParams The query params for the pagination.
- * @args totalNodesFetched The total number of nodes fetched so far.
- * @args dataset The dataset so far.
- * @param {function} options.afterEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called after each query.
- * @args externalQueryParams The query params for the pagination.
- * @args totalNodesFetched The total number of nodes fetched so far.
- * @args dataset The dataset so far.
- * @args willFetchAgain If the query will fetch again to get a complete page.
- */
-export class SelectChannel implements EASUpdateAction<UpdateChannelBasicInfoFragment | null> {
-  constructor(
-    private options: {
-      filterPredicate?: (channelInfo: UpdateChannelBasicInfoFragment) => boolean;
-      printedType?: string;
-      pageSize?: number;
-      beforeEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateChannelBasicInfoFragment>[]
-      ) => void;
-      afterEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateChannelBasicInfoFragment>[],
-        willFetchAgain: boolean
-      ) => void;
-    } = {}
-  ) {}
-
-  async queryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams
-  ): Promise<Connection<UpdateChannelBasicInfoFragment>> {
-    const { graphqlClient, app } = ctx;
-    const { projectId } = app;
-    return await ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync(graphqlClient, {
-      appId: projectId,
-      ...queryParams,
-    });
-  }
-
-  async filterQueryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams,
-    filterPredicate: (channelInfo: UpdateChannelBasicInfoFragment) => boolean
-  ): Promise<Connection<UpdateChannelBasicInfoFragment>> {
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateChannelBasicInfoFragment>> =>
-      await this.queryAsync(ctx, queryParams);
-    return await FilterPagination.getPageAsync({
-      queryParams,
-      queryAsync,
-      filterPredicate,
-      beforeEachQuery: this.options.beforeEachFilterQuery,
-      afterEachQuery: this.options.afterEachFilterQuery,
-    });
-  }
-
-  public async runAsync(ctx: EASUpdateContext): Promise<UpdateChannelBasicInfoFragment | null> {
-    const { nonInteractive } = ctx;
-    const { filterPredicate } = this.options;
-    const printedType = this.options.printedType ?? 'channel';
-    const pageSize = this.options.pageSize ?? 100;
-    if (nonInteractive) {
-      throw new NonInteractiveError(
-        `${printedType} selection cannot be run in non-interactive mode.`
-      );
-    }
-
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateChannelBasicInfoFragment>> =>
-      filterPredicate
-        ? this.filterQueryAsync(ctx, queryParams, filterPredicate)
-        : this.queryAsync(ctx, queryParams);
-
-    const getTitleAsync = async (channelInfo: UpdateChannelBasicInfoFragment): Promise<string> =>
-      channelInfo.name;
-
-    return await selectPaginatedAsync({
-      queryAsync,
-      getTitleAsync,
-      printedType,
-      pageSize,
-    });
-  }
-}

packages/eas-cli/src/channel/actions/__tests__/SelectChannel-test.ts

@@ -1,92 +0,0 @@
-import { createCtxMock } from '../../../eas-update/__tests__/fixtures';
-import { NonInteractiveError } from '../../../eas-update/utils';
-import { UpdateChannelBasicInfoFragment } from '../../../graphql/generated';
-import { ChannelQuery } from '../../../graphql/queries/ChannelQuery';
-import { promptAsync } from '../../../prompts';
-import { testBasicChannelInfo, testBasicChannelInfo2 } from '../../__tests__/fixtures';
-import { SelectChannel } from '../SelectChannel';
-
-jest.mock('../../../prompts');
-jest.mock('../../../graphql/queries/ChannelQuery');
-describe(SelectChannel, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  it('returns null if project has no channels', async () => {
-    const ctx = createCtxMock();
-    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    const selectChannel = new SelectChannel();
-    const channel = await selectChannel.runAsync(ctx);
-    expect(channel).toBeNull();
-  });
-  it('still prompts if project has only one channel', async () => {
-    const ctx = createCtxMock();
-    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [{ node: testBasicChannelInfo, cursor: 'cursor' }],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
-      item: testBasicChannelInfo,
-    }));
-    const selectChannel = new SelectChannel();
-    const channel = await selectChannel.runAsync(ctx);
-    expect(channel).toBe(testBasicChannelInfo);
-    expect(promptAsync).toHaveBeenCalledTimes(1);
-  });
-  it('returns the selected channel', async () => {
-    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [
-        { node: testBasicChannelInfo, cursor: 'cursor' },
-        { node: testBasicChannelInfo2, cursor: 'cursor' },
-      ],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
-      item: testBasicChannelInfo,
-    }));
-    const ctx = createCtxMock();
-    const selectChannel = new SelectChannel();
-    const channel = await selectChannel.runAsync(ctx);
-    expect(channel).toBe(testBasicChannelInfo);
-  });
-  it('returns the only available channel with a filter', async () => {
-    jest.mocked(ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [
-        { node: testBasicChannelInfo, cursor: 'cursor' },
-        { node: testBasicChannelInfo2, cursor: 'cursor' },
-      ],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    const ctx = createCtxMock();
-    const selectChannel = new SelectChannel({
-      filterPredicate: (channelInfo: UpdateChannelBasicInfoFragment) =>
-        channelInfo === testBasicChannelInfo,
-    });
-    const channel = await selectChannel.runAsync(ctx);
-    expect(channel).toBe(testBasicChannelInfo);
-  });
-  it('throws an error in Non-Interactive Mode', async () => {
-    const ctx = createCtxMock({
-      nonInteractive: true,
-    });
-    const selectChannel = new SelectChannel();
-
-    // dont fail if users are running in non-interactive mode
-    await expect(selectChannel.runAsync(ctx)).rejects.toThrowError(NonInteractiveError);
-  });
-});

packages/eas-cli/src/channel/branch-mapping.ts

@@ -1,214 +0,0 @@
-import { ChannelBasicInfo } from './utils';
-
-// TODO(quin): move this into a common package with www
-export type BranchMappingOperator =
-  | '=='
-  | '!='
-  | '<'
-  | '>'
-  | '<='
-  | '>='
-  | 'in'
-  | 'regex'
-  | 'hash_lt'
-  | 'hash_lte'
-  | 'hash_gt'
-  | 'hash_gte';
-export type BranchMappingObject = {
-  clientKey: string;
-  branchMappingOperator: BranchMappingOperator;
-  operand: number | string | string[];
-};
-export type BranchMappingAlwaysTrue = 'true';
-export type BranchMappingStatement =
-  | ['and' | 'or', ...BranchMappingNode[]]
-  | ['not', BranchMappingNode];
-export type BranchMappingNode =
-  | BranchMappingAlwaysTrue
-  | BranchMappingObject
-  | BranchMappingStatement;
-export type BranchMapping = {
-  version: number;
-  data: {
-    branchId: string;
-    branchMappingLogic: BranchMappingNode;
-  }[];
-};
-
-export type AlwaysTrueBranchMapping = {
-  version: number;
-  data: [
-    {
-      branchId: string;
-      branchMappingLogic: BranchMappingAlwaysTrue;
-    },
-  ];
-};
-
-export type EmptyBranchMapping = {
-  version: number;
-  data: [];
-};
-
-export function getEmptyBranchMapping(): EmptyBranchMapping {
-  return {
-    version: 0,
-    data: [],
-  };
-}
-
-export function getAlwaysTrueBranchMapping(branchId: string): AlwaysTrueBranchMapping {
-  return {
-    version: 0,
-    data: [
-      {
-        branchId,
-        branchMappingLogic: 'true',
-      },
-    ],
-  };
-}
-
-export function hasEmptyBranchMap(channelInfo: ChannelBasicInfo): boolean {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  return isEmptyBranchMapping(branchMapping);
-}
-
-export function hasStandardBranchMap(channelInfo: ChannelBasicInfo): boolean {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  return isAlwaysTrueBranchMapping(branchMapping);
-}
-
-export function getStandardBranchId(channelInfo: ChannelBasicInfo): string {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  assertAlwaysTrueBranchMapping(branchMapping);
-  return getBranchIdFromStandardMapping(branchMapping);
-}
-
-export function isEmptyBranchMapping(
-  branchMapping: BranchMapping
-): branchMapping is EmptyBranchMapping {
-  return branchMapping.data.length === 0;
-}
-
-export function isAlwaysTrueBranchMapping(
-  branchMapping: BranchMapping
-): branchMapping is AlwaysTrueBranchMapping {
-  const numBranches = branchMapping.data.length;
-  if (numBranches !== 1) {
-    return false;
-  }
-  const branchMappingLogic = branchMapping.data[0].branchMappingLogic;
-  return isAlwaysTrue(branchMappingLogic);
-}
-
-function getBranchIdFromStandardMapping(branchMapping: AlwaysTrueBranchMapping): string {
-  return branchMapping.data[0].branchId;
-}
-
-export function getBranchIds(branchMapping: BranchMapping): string[] {
-  return branchMapping.data.map(data => data.branchId);
-}
-
-export function getBranchMapping(branchMappingString: string): BranchMapping {
-  try {
-    return JSON.parse(branchMappingString);
-  } catch {
-    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
-  }
-}
-
-export function getNodesFromStatement(statement: BranchMappingStatement): BranchMappingNode[] {
-  return statement.slice(1) as BranchMappingNode[];
-}
-
-export function isAndStatement(
-  statement: BranchMappingStatement
-): statement is BranchMappingStatement {
-  return statement[0] === 'and';
-}
-
-export function isStatement(node: BranchMappingNode): node is BranchMappingStatement {
-  return Array.isArray(node);
-}
-
-export function isNodeObject(node: BranchMappingNode): node is BranchMappingObject {
-  return typeof node === 'object' && !isStatement(node);
-}
-
-export function andStatement(nodes: BranchMappingNode[]): ['and', ...BranchMappingNode[]] {
-  return ['and', ...nodes];
-}
-
-export function isAlwaysTrue(node: BranchMappingNode): boolean {
-  return node === 'true';
-}
-
-export function alwaysTrue(): BranchMappingAlwaysTrue {
-  return 'true';
-}
-
-export function equalsOperator(): BranchMappingOperator {
-  return '==';
-}
-
-export function hashLtOperator(): BranchMappingOperator {
-  return 'hash_lt';
-}
-
-function isVersion(branchMapping: BranchMapping, version: number): boolean {
-  return branchMapping.version === version;
-}
-
-export function assertVersion(channelInfo: ChannelBasicInfo, version: number): void {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  if (!isVersion(branchMapping, version)) {
-    throw new BranchMappingValidationError(
-      `Expected branch mapping version ${version}. Received: ${JSON.stringify(branchMapping)}`
-    );
-  }
-}
-
-export function assertStatement(node: BranchMappingNode): asserts node is BranchMappingStatement {
-  if (!isStatement(node)) {
-    throw new BranchMappingValidationError(
-      'Branch mapping node must be a statement. Received: ' + JSON.stringify(node)
-    );
-  }
-}
-
-export function assertNodeObject(node: BranchMappingNode): asserts node is BranchMappingObject {
-  if (!isNodeObject(node)) {
-    throw new BranchMappingValidationError(
-      'Branch mapping node must be an object. Received: ' + JSON.stringify(node)
-    );
-  }
-}
-
-export function assertNumber(operand: string | number | string[]): asserts operand is number {
-  if (typeof operand !== 'number') {
-    throw new BranchMappingValidationError(
-      'Expected a number. Received: ' + JSON.stringify(operand)
-    );
-  }
-}
-
-export function assertString(operand: string | number | string[]): asserts operand is string {
-  if (typeof operand !== 'string') {
-    throw new BranchMappingValidationError(
-      'Expected a string. Received: ' + JSON.stringify(operand)
-    );
-  }
-}
-
-function assertAlwaysTrueBranchMapping(
-  branchMapping: BranchMapping
-): asserts branchMapping is AlwaysTrueBranchMapping {
-  if (!isAlwaysTrueBranchMapping(branchMapping)) {
-    throw new BranchMappingValidationError(
-      'Expected standard branch mapping. Received: ' + JSON.stringify(branchMapping)
-    );
-  }
-}
-
-export class BranchMappingValidationError extends Error {}

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

@@ -1,71 +0,0 @@
-import chalk from 'chalk';
-
-import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
-import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
-import Log from '../log';
-import { getRollout, isRollout } from '../rollout/branch-mapping';
-import {
-  FormattedBranchDescription,
-  formatBranch,
-  getUpdateGroupDescriptionsWithBranch,
-} from '../update/utils';
-
-/**
- * Log all the branches associated with the channel and their most recent update group
- */
-export function logChannelDetails(channel: UpdateChannelObject): void {
-  assertVersion(channel, 0);
-  const doesSupportMapping =
-    hasEmptyBranchMap(channel) || hasStandardBranchMap(channel) || isRollout(channel);
-  if (!doesSupportMapping) {
-    Log.log(chalk.dim('Custom branch mapping detected.'));
-    return;
-  }
-
-  const branchDescriptionByBranchId = getDescriptionByBranchId(channel);
-  const entries = Object.entries(branchDescriptionByBranchId);
-  if (entries.length === 0) {
-    Log.log(chalk.dim('No branches are pointed to this channel.'));
-  } else {
-    Log.log(
-      entries
-        .map(([_branchId, description]) => formatBranch(description))
-        .join(`\n\n${chalk.dim('———')}\n\n`)
-    );
-  }
-}
-
-export function getDescriptionByBranchId(
-  channel: UpdateChannelObject
-): Record<string, FormattedBranchDescription> {
-  return channel.updateBranches.reduce(
-    (acc, branch) => {
-      const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
-      let maybePercentOnBranch: number | undefined = undefined;
-      if (maybeRollout) {
-        maybePercentOnBranch =
-          maybeRollout.rolledOutBranchId === branch.id
-            ? maybeRollout.percentRolledOut
-            : 100 - maybeRollout.percentRolledOut;
-      }
-
-      if (branch.updateGroups.length === 0) {
-        acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
-        return acc;
-      }
-      const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-        branch.updateGroups
-      );
-      // display the most recent update group
-      const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
-      const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
-      acc[branch.id] = {
-        branch: branchName,
-        branchRolloutPercentage: maybePercentOnBranch,
-        update: updateGroup,
-      };
-      return acc;
-    },
-    {} as Record<string, FormattedBranchDescription>
-  );
-}

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

@@ -1,12 +1,6 @@
 import chalk from 'chalk';
-import { print } from 'graphql';
 import gql from 'graphql-tag';
 
-import { ChannelNotFoundError } from './errors';
-import { logChannelDetails } from './print-utils';
-import { ChannelBasicInfo } from './utils';
-import { createUpdateBranchOnAppAsync } from '../branch/queries';
-import { BranchNotFoundError } from '../branch/utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { withErrorHandlingAsync } from '../graphql/client';
@@ -18,15 +12,14 @@ import {
 } from '../graphql/generated';
 import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
 import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
-import { UpdateChannelBasicInfoFragmentNode } from '../graphql/types/UpdateChannelBasicInfo';
 import Log from '../log';
-import { getDisplayNameForProjectIdAsync } from '../project/projectUtils';
 import formatFields from '../utils/formatFields';
 import { printJsonOnlyOutput } from '../utils/json';
 import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
+import { logChannelDetails } from './utils';
 
 export const CHANNELS_LIMIT = 25;
 
@@ -234,11 +227,11 @@ export async function createChannelOnAppAsync(
             updateChannel {
               createUpdateChannelForApp(appId: $appId, name: $name, branchMapping: $branchMapping) {
                 id
-                ...UpdateChannelBasicInfoFragment
+                name
+                branchMapping
               }
             }
           }
-          ${print(UpdateChannelBasicInfoFragmentNode)}
         `,
         {
           appId,
@@ -269,101 +262,3 @@ export async function ensureChannelExistsAsync(
     }
   }
 }
-
-export async function doesChannelExistAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, channelName }: { appId: string; channelName: string }
-): Promise<boolean> {
-  try {
-    await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
-      appId,
-      channelName,
-    });
-  } catch (err) {
-    if (err instanceof ChannelNotFoundError) {
-      return false;
-    }
-    throw err;
-  }
-  return true;
-}
-
-/**
- *
- * Creates a channel and links it to a branch with the same name.
- *
- * @param appId the app ID, also known as the project ID
- * @param channelName the name of the channel to create
- * @param shouldPrintJson print only the JSON output
- */
-export async function createAndLinkChannelAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    appId,
-    channelName,
-    shouldPrintJson,
-  }: { appId: string; channelName: string; shouldPrintJson?: boolean }
-): Promise<ChannelBasicInfo> {
-  let branchId: string;
-  let branchMessage: string;
-
-  try {
-    const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
-      appId,
-      name: channelName,
-    });
-    branchId = branch.id;
-    branchMessage = `We found a branch with the same name`;
-  } catch (error) {
-    if (error instanceof BranchNotFoundError) {
-      const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
-        appId,
-        name: channelName,
-      });
-      branchId = newBranch.id;
-      branchMessage = `We also went ahead and made a branch with the same name`;
-    } else {
-      throw error;
-    }
-  }
-
-  const {
-    updateChannel: { createUpdateChannelForApp: newChannel },
-  } = await createChannelOnAppAsync(graphqlClient, {
-    appId,
-    channelName,
-    branchId,
-  });
-
-  if (!newChannel) {
-    throw new Error(
-      `Could not create channel with name ${channelName} on project with id ${appId}`
-    );
-  }
-
-  if (shouldPrintJson) {
-    printJsonOnlyOutput(newChannel);
-  } else {
-    Log.addNewLineIfNone();
-    Log.withTick(
-      `Created a new channel on project ${chalk.bold(
-        await getDisplayNameForProjectIdAsync(graphqlClient, appId)
-      )}`
-    );
-    Log.log(
-      formatFields([
-        { label: 'Name', value: newChannel.name },
-        { label: 'ID', value: newChannel.id },
-      ])
-    );
-    Log.addNewLineIfNone();
-    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
-    Log.log(
-      formatFields([
-        { label: 'Name', value: newChannel.name },
-        { label: 'ID', value: branchId },
-      ])
-    );
-  }
-  return newChannel;
-}

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

@@ -1,35 +1,117 @@
-export type ChannelBasicInfo = {
-  id: string;
-  name: string;
-  branchMapping: string;
-};
-export type BranchBasicInfo = {
-  id: string;
-  name: string;
+import assert from 'assert';
+import chalk from 'chalk';
+
+import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import Log from '../log';
+import {
+  FormattedBranchDescription,
+  formatBranch,
+  getUpdateGroupDescriptionsWithBranch,
+} from '../update/utils';
+
+export type BranchMapping = {
+  version: number;
+  data: {
+    branchId: string;
+    branchMappingLogic: {
+      operand: number;
+      clientKey: string;
+      branchMappingOperator: string;
+    } & string;
+  }[];
 };
 
-export type UpdateChannelInfoWithBranches<Branch extends BranchBasicInfo> = ChannelBasicInfo & {
-  updateBranches: Branch[];
-};
+/**
+ * Get the branch mapping and determine whether it is a rollout.
+ * Ensure that the branch mapping is properly formatted.
+ */
+export function getBranchMapping(branchMappingString?: string): {
+  branchMapping: BranchMapping;
+  isRollout: boolean;
+  rolloutPercent?: number;
+} {
+  if (!branchMappingString) {
+    throw new Error('Missing branch mapping.');
+  }
+  let branchMapping: BranchMapping;
+  try {
+    branchMapping = JSON.parse(branchMappingString);
+  } catch {
+    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
+  }
+  assert(branchMapping, 'Branch Mapping must be defined.');
 
-function getUpdateBranchNullable<Branch extends BranchBasicInfo>(
-  channel: UpdateChannelInfoWithBranches<Branch>,
-  branchId: string
-): Branch | null {
-  const updateBranches = channel.updateBranches;
-  const updateBranch = updateBranches.find(branch => branch.id === branchId);
-  return updateBranch ?? null;
+  if (branchMapping.version !== 0) {
+    throw new Error('Branch mapping must be version 0.');
+  }
+
+  const isRollout = branchMapping.data.length === 2;
+  const rolloutPercent = branchMapping.data[0]?.branchMappingLogic.operand;
+
+  switch (branchMapping.data.length) {
+    case 0:
+      break;
+    case 1:
+      if (branchMapping.data[0].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a single branch must be "true"');
+      }
+      break;
+    case 2:
+      if (branchMapping.data[0].branchMappingLogic.clientKey !== 'rolloutToken') {
+        throw new Error('Client key of initial branch mapping must be "rolloutToken"');
+      }
+      if (branchMapping.data[0].branchMappingLogic.branchMappingOperator !== 'hash_lt') {
+        throw new Error('Branch mapping operator of initial branch mapping must be "hash_lt"');
+      }
+      if (rolloutPercent == null) {
+        throw new Error('Branch mapping is missing a "rolloutPercent"');
+      }
+      if (branchMapping.data[1].branchMappingLogic !== 'true') {
+        throw new Error('Branch mapping logic for a the second branch of a rollout must be "true"');
+      }
+      break;
+    default:
+      throw new Error('Branch mapping data must have length less than or equal to 2.');
+  }
+
+  return { branchMapping, isRollout, rolloutPercent };
 }
 
-export function getUpdateBranch<Branch extends BranchBasicInfo>(
-  channel: UpdateChannelInfoWithBranches<Branch>,
-  branchId: string
-): Branch {
-  const updateBranch = getUpdateBranchNullable(channel, branchId);
-  if (!updateBranch) {
-    throw new Error(
-      `Could not find branch with id "${branchId}" in branch-mapping of channel "${channel.name}"`
+export function logChannelDetails(channel: UpdateChannelObject): void {
+  const { branchMapping, isRollout, rolloutPercent } = getBranchMapping(channel.branchMapping);
+  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
+    );
+
+    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;
+    }
+
+    return updateGroupWithBranchDescriptions.map(
+      ({ branch, ...updateGroup }): FormattedBranchDescription => ({
+        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`)
     );
   }
-  return updateBranch;
 }

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

@@ -3,6 +3,13 @@ import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
+import {
+  AnalyticsWithOrchestration,
+  CommandEvent,
+  createAnalyticsAsync,
+} from '../analytics/AnalyticsManager';
+import Log from '../log';
+import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
 import {
@@ -15,20 +22,12 @@ import { OptionalPrivateProjectConfigContextField } from './context/OptionalPriv
 import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
-import VcsClientContextField from './context/VcsClientContextField';
 import { EasCommandError } from './errors';
-import {
-  AnalyticsWithOrchestration,
-  CommandEvent,
-  createAnalyticsAsync,
-} from '../analytics/AnalyticsManager';
-import Log from '../log';
-import SessionManager from '../user/SessionManager';
 
 export type ContextInput<
   T extends {
     [name: string]: any;
-  } = object,
+  } = object
 > = {
   [P in keyof T]: ContextField<T[P]>;
 };
@@ -36,7 +35,7 @@ export type ContextInput<
 export type ContextOutput<
   T extends {
     [name: string]: any;
-  } = object,
+  } = object
 > = {
   [P in keyof T]: T[P];
 };
@@ -102,9 +101,6 @@ export default abstract class EasCommand extends Command {
     Analytics: {
       analytics: new AnalyticsContextField(),
     },
-    Vcs: {
-      vcsClient: new VcsClientContextField(),
-    },
   };
 
   /**
@@ -136,7 +132,7 @@ export default abstract class EasCommand extends Command {
   protected async getContextAsync<
     C extends {
       [name: string]: any;
-    } = object,
+    } = object
   >(
     commandClass: { contextDefinition: ContextInput<C> },
     { nonInteractive }: { nonInteractive: boolean }
@@ -204,14 +200,7 @@ export default abstract class EasCommand extends Command {
           const requestIdLine = graphQLError.extensions?.requestId
             ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
             : '';
-
-          const defaultMsg = `${messageLine}${requestIdLine}`;
-
-          if (graphQLError.extensions?.errorCode === 'UNAUTHORIZED_ERROR') {
-            return `You don't have the required permissions to perform this operation.\n\n${defaultMsg}`;
-          }
-
-          return defaultMsg;
+          return `${messageLine}${requestIdLine}`;
         })
         .join('\n');
       Log.error(cleanMessage);

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

@@ -1,99 +0,0 @@
-import chalk from 'chalk';
-
-import { ExpoGraphqlClient } from './context/contextUtils/createGraphqlClient';
-import {
-  AppPlatform,
-  Build,
-  BuildFilter,
-  BuildFragment,
-  BuildStatus,
-  InputMaybe,
-} from '../graphql/generated';
-import { BuildQuery } from '../graphql/queries/BuildQuery';
-import { RequestedPlatform, appPlatformEmojis } from '../platform';
-
-const platformToAppPlatform: Record<
-  Exclude<RequestedPlatform, RequestedPlatform.All>,
-  AppPlatform
-> = {
-  android: AppPlatform.Android,
-  ios: AppPlatform.Ios,
-};
-
-export async function ensureBuildExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<void> {
-  try {
-    await BuildQuery.byIdAsync(graphqlClient, buildId);
-  } catch {
-    throw new Error(`Couldn't find a build matching the id ${buildId}`);
-  }
-}
-
-export async function fetchBuildsAsync({
-  graphqlClient,
-  projectId,
-  filters,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  projectId: string;
-  filters?: { statuses?: BuildStatus[]; platform?: RequestedPlatform; profile?: string };
-}): Promise<BuildFragment[]> {
-  let builds: BuildFragment[];
-  const queryFilters: InputMaybe<BuildFilter> = {};
-  if (filters?.platform && filters.platform !== 'all') {
-    queryFilters['platform'] = platformToAppPlatform[filters.platform];
-  }
-  if (filters?.profile) {
-    queryFilters['buildProfile'] = filters.profile;
-  }
-  if (!filters?.statuses) {
-    builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-      appId: projectId,
-      offset: 0,
-      limit: 10,
-      filter: queryFilters ? queryFilters : undefined,
-    });
-  } else {
-    builds = (
-      await Promise.all(
-        filters.statuses.map(status =>
-          BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-            appId: projectId,
-            offset: 0,
-            limit: 10,
-            filter: queryFilters ? { ...queryFilters, status } : { status },
-          })
-        )
-      )
-    ).flat();
-  }
-  builds.sort((buildA, buildB) => (buildA.createdAt > buildB.createdAt ? -1 : 1));
-  return builds;
-}
-
-export function formatBuild(
-  build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
-): string {
-  const platform = appPlatformEmojis[build.platform];
-  const startTime = new Date(build.createdAt).toLocaleString();
-  let statusText: string;
-  if (build.status === BuildStatus.New) {
-    statusText = 'new';
-  } else if (build.status === BuildStatus.InQueue) {
-    statusText = 'in queue';
-  } else if (build.status === BuildStatus.InProgress) {
-    statusText = 'in progress';
-  } else if (build.status === BuildStatus.Finished) {
-    statusText = 'finished';
-  } else if (build.status === BuildStatus.Errored) {
-    statusText = 'errored';
-  } else if ([BuildStatus.PendingCancel, BuildStatus.Canceled].includes(build.status)) {
-    statusText = 'canceled';
-  } else {
-    statusText = 'unknown';
-  }
-  const status = chalk.blue(statusText);
-  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
-}

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

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

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

@@ -1,13 +1,13 @@
 import { ExpoConfig } from '@expo/config-types';
 
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import {
   ExpoConfigOptions,
   getPrivateExpoConfig,
   getPublicExpoConfig,
 } 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;

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

@@ -1,8 +1,8 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 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;

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

@@ -1,8 +1,8 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 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;

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

@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
 
+import { getPrivateExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class OptionalPrivateProjectConfigContextField extends ContextField<
   | {

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

@@ -1,9 +1,9 @@
 import { ExpoConfig } from '@expo/config-types';
 
+import { getPrivateExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class PrivateProjectConfigContextField extends ContextField<{
   projectId: string;

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

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

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

@@ -1,9 +0,0 @@
-import ContextField from './ContextField';
-import { getVcsClient } from '../../vcs';
-import { Client } from '../../vcs/vcs';
-
-export default class VcsClientContextField extends ContextField<Client> {
-  async getValueAsync(): Promise<Client> {
-    return getVcsClient();
-  }
-}

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

@@ -5,10 +5,12 @@ import {
   OperationResult,
   OperationResultSource,
   TypedDocumentNode,
-  cacheExchange,
   createClient as createUrqlClient,
+  cacheExchange as defaultCacheExchange,
   fetchExchange,
 } from '@urql/core';
+import { cacheExchange as graphqlCacheExchange } from '@urql/exchange-graphcache';
+import { relayPagination } from '@urql/exchange-graphcache/extras';
 import { retryExchange } from '@urql/exchange-retry';
 import { DocumentNode } from 'graphql';
 import fetch from 'node-fetch';
@@ -24,14 +26,25 @@ export interface ExpoGraphqlClient extends Client {
   ): OperationResultSource<OperationResult<Data, Variables>>;
 }
 
-export function createGraphqlClient(authInfo: {
-  accessToken: string | null;
-  sessionSecret: string | null;
-}): ExpoGraphqlClient {
+// TODO: plumb this down, maybe use a feature gate for this?
+export function createGraphqlClient(
+  authInfo: {
+    accessToken: string | null;
+    sessionSecret: string | null;
+  },
+  _options: { useGraphqlCachePolicy?: boolean } = {}
+): ExpoGraphqlClient {
   return createUrqlClient({
     url: getExpoApiBaseUrl() + '/graphql',
     exchanges: [
-      cacheExchange,
+      //options.useGraphqlCachePolicy ? graphqlCacheExchange() : defaultCacheExchange,
+      graphqlCacheExchange({
+        resolvers: {
+          App: {
+            updateChannels: relayPagination(),
+          },
+        },
+      }),
       retryExchange({
         maxDelayMs: 4000,
         retryIf: (err, operation) => {

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

@@ -3,8 +3,6 @@ import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
 
-import { createGraphqlClient } from './createGraphqlClient';
-import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
@@ -13,6 +11,8 @@ import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../
 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.

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

@@ -1,7 +1,7 @@
 import nullthrows from 'nullthrows';
 
-import { FeatureGateKey } from './FeatureGateKey';
 import env from '../../env';
+import { FeatureGateKey } from './FeatureGateKey';
 
 function parseFeatureGateEnvVariableValue(value: string | undefined): string[] {
   if (!value) {

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

@@ -27,7 +27,6 @@ export default class BranchCreate extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -38,7 +37,6 @@ export default class BranchCreate extends EasCommand {
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-      vcsClient,
     } = await this.getContextAsync(BranchCreate, {
       nonInteractive,
     });
@@ -58,7 +56,7 @@ export default class BranchCreate extends EasCommand {
         type: 'text',
         name: 'name',
         message: 'Provide a branch name:',
-        initial: await getDefaultBranchNameAsync(vcsClient),
+        initial: await getDefaultBranchNameAsync(),
         validate: value => (value ? true : validationMessage),
       }));
     }

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

@@ -1,8 +1,7 @@
-import { Flags } from '@oclif/core';
+import chalk from 'chalk';
 import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { ensureBuildExistsAsync, fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { withErrorHandlingAsync } from '../../graphql/client';
@@ -12,9 +11,10 @@ import {
   CancelBuildMutation,
   CancelBuildMutationVariables,
 } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { RequestedPlatform } from '../../platform';
+import { appPlatformEmojis } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { confirmAsync, selectAsync } from '../../prompts';
 
@@ -42,28 +42,54 @@ async function cancelBuildAsync(
   return data.build!.cancel;
 }
 
+function formatUnfinishedBuild(
+  build: Pick<Build, 'id' | 'platform' | 'status' | 'createdAt'>
+): string {
+  const platform = appPlatformEmojis[build.platform];
+  const startTime = new Date(build.createdAt).toLocaleString();
+  let statusText: string;
+  if (build.status === BuildStatus.New) {
+    statusText = 'new';
+  } else if (build.status === BuildStatus.InQueue) {
+    statusText = 'in queue';
+  } else {
+    statusText = 'in progress';
+  }
+  const status = chalk.blue(statusText);
+  return `${platform} Started at: ${startTime}, Status: ${status}, Id: ${build.id}`;
+}
+
 export async function selectBuildToCancelAsync(
   graphqlClient: ExpoGraphqlClient,
   projectId: string,
-  projectDisplayName: string,
-  filters?: {
-    platform?: RequestedPlatform;
-    profile?: string;
-  }
+  projectDisplayName: string
 ): Promise<string | null> {
   const spinner = ora().start('Fetching the uncompleted builds…');
 
   let builds;
   try {
-    builds = await fetchBuildsAsync({
-      graphqlClient,
-      projectId,
-      filters: {
-        ...filters,
-        statuses: [BuildStatus.New, BuildStatus.InQueue, BuildStatus.InProgress],
-      },
-    });
+    const [newBuilds, inQueueBuilds, inProgressBuilds] = await Promise.all([
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.New },
+      }),
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.InQueue },
+      }),
+      BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+        appId: projectId,
+        offset: 0,
+        limit: 10,
+        filter: { status: BuildStatus.InProgress },
+      }),
+    ]);
     spinner.stop();
+    builds = [...newBuilds, ...inQueueBuilds, ...inProgressBuilds];
   } catch (error) {
     spinner.fail(
       `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
@@ -71,13 +97,13 @@ export async function selectBuildToCancelAsync(
     throw error;
   }
   if (builds.length === 0) {
-    Log.warn(`We couldn't find any uncompleted builds for the project ${projectDisplayName}.`);
+    Log.warn(`There aren't any uncompleted builds for the project ${projectDisplayName}.`);
     return null;
   } else {
     const buildId = await selectAsync<string>(
       'Which build do you want to cancel?',
       builds.map(build => ({
-        title: formatBuild(build),
+        title: formatUnfinishedBuild(build),
         value: build.id,
       }))
     );
@@ -90,6 +116,17 @@ export async function selectBuildToCancelAsync(
   }
 }
 
+async function ensureBuildExistsAsync(
+  graphqlClient: ExpoGraphqlClient,
+  buildId: string
+): Promise<void> {
+  try {
+    await BuildQuery.byIdAsync(graphqlClient, buildId);
+  } catch {
+    throw new Error(`Couldn't find a build matching the id ${buildId}`);
+  }
+}
+
 export default class BuildCancel extends EasCommand {
   static override description = 'cancel a build';
 
@@ -97,36 +134,18 @@ export default class BuildCancel extends EasCommand {
 
   static override flags = {
     ...EASNonInteractiveFlag,
-    platform: Flags.enum({
-      char: 'p',
-      description: 'Filter builds by the platform if build ID is not provided',
-      options: Object.values(RequestedPlatform),
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description: 'Filter builds by build profile if build ID is not provided',
-      helpValue: 'PROFILE_NAME',
-    }),
   };
 
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
     const {
       args: { BUILD_ID: buildIdFromArg },
-      flags: { 'non-interactive': nonInteractive, platform, profile },
+      flags: { 'non-interactive': nonInteractive },
     } = await this.parse(BuildCancel);
-
-    if (buildIdFromArg && (platform || profile)) {
-      throw new Error(
-        'Build ID cannot be used together with platform and profile flags. They are used to filter the list of builds when not providing the build ID'
-      );
-    }
-
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -143,13 +162,10 @@ export default class BuildCancel extends EasCommand {
     let buildId: string | null = buildIdFromArg;
     if (!buildId) {
       if (nonInteractive) {
-        throw new Error('Build ID must be provided in non-interactive mode');
+        throw new Error('BUILD_ID must not be empty in non-interactive mode');
       }
 
-      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName, {
-        platform,
-        profile,
-      });
+      buildId = await selectBuildToCancelAsync(graphqlClient, projectId, displayName);
       if (!buildId) {
         return;
       }

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

@@ -11,8 +11,12 @@ import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectU
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { ensureEASUpdateIsConfiguredInEasJsonAsync } from '../../update/configure';
+import {
+  ensureEASUpdateIsConfiguredInEasJsonAsync,
+  ensureUseClassicUpdatesIsRemovedAsync,
+} from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { getVcsClient } from '../../vcs';
 
 export default class BuildConfigure extends EasCommand {
   static override description = 'configure the project to support EAS Build';
@@ -28,14 +32,13 @@ export default class BuildConfigure extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BuildConfigure);
     const {
       privateProjectConfig: { exp, projectId, projectDir },
-      vcsClient,
+      loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
     });
@@ -44,9 +47,7 @@ export default class BuildConfigure extends EasCommand {
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    // BuildConfigure.ContextOptions.Vcs.client.getValueAsync()
-
-    await vcsClient.ensureRepoExistsAsync();
+    await getVcsClient().ensureRepoExistsAsync();
 
     const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
 
@@ -63,25 +64,30 @@ export default class BuildConfigure extends EasCommand {
     const didCreateEasJson = await ensureProjectConfiguredAsync({
       projectDir,
       nonInteractive: false,
-      vcsClient,
     });
     if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
+      if (exp.updates?.useClassicUpdates) {
+        // NOTE: this method modifies the Expo config; be sure to use this function's return value
+        // if the config object is used later in the future
+        await ensureUseClassicUpdatesIsRemovedAsync({ exp, projectDir });
+      }
+
       await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
     }
 
     // configure expo-updates
     if (expoUpdatesIsInstalled) {
       if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
         if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
+          await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
         }
       }
 
       if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
-        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+        const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
         if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(vcsClient, projectDir, exp);
+          await syncIosUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
         }
       }
     }

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

@@ -1,148 +0,0 @@
-import { Flags } from '@oclif/core';
-import gql from 'graphql-tag';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { ensureBuildExistsAsync, fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { withErrorHandlingAsync } from '../../graphql/client';
-import { Build, DeleteBuildMutation, DeleteBuildMutationVariables } from '../../graphql/generated';
-import Log from '../../log';
-import { ora } from '../../ora';
-import { RequestedPlatform } from '../../platform';
-import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { confirmAsync, selectAsync } from '../../prompts';
-
-async function deleteBuildAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<Pick<Build, 'id'>> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<DeleteBuildMutation, DeleteBuildMutationVariables>(
-        gql`
-          mutation DeleteBuildMutation($buildId: ID!) {
-            build(buildId: $buildId) {
-              deleteBuild(buildId: $buildId) {
-                id
-              }
-            }
-          }
-        `,
-        { buildId }
-      )
-      .toPromise()
-  );
-  return data.build!.deleteBuild;
-}
-
-export async function selectBuildToDeleteAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  projectDisplayName: string,
-  filters?: {
-    platform?: RequestedPlatform;
-    profile?: string;
-  }
-): Promise<string | null> {
-  const spinner = ora().start('Fetching builds…');
-
-  let builds;
-  try {
-    builds = await fetchBuildsAsync({ graphqlClient, projectId, filters });
-    spinner.stop();
-  } catch (error) {
-    spinner.fail(
-      `Something went wrong and we couldn't fetch the builds for the project ${projectDisplayName}.`
-    );
-    throw error;
-  }
-  if (builds.length === 0) {
-    Log.warn(`We couldn't find any builds for the project ${projectDisplayName}.`);
-    return null;
-  } else {
-    const buildId = await selectAsync<string>(
-      'Which build do you want to delete?',
-      builds.map(build => ({
-        title: formatBuild(build),
-        value: build.id,
-      }))
-    );
-
-    return (await confirmAsync({
-      message: 'Are you sure you want to delete it?',
-    }))
-      ? buildId
-      : null;
-  }
-}
-
-export default class BuildDelete extends EasCommand {
-  static override description = 'delete a build';
-  static override args = [{ name: 'BUILD_ID' }];
-  static override flags = {
-    ...EASNonInteractiveFlag,
-    platform: Flags.enum({
-      char: 'p',
-      description: 'Filter builds by the platform if build ID is not provided',
-      options: Object.values(RequestedPlatform),
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description: 'Filter builds by build profile if build ID is not provided',
-      helpValue: 'PROFILE_NAME',
-    }),
-  };
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      args: { BUILD_ID: buildIdFromArg },
-      flags: { 'non-interactive': nonInteractive, platform, profile },
-    } = await this.parse(BuildDelete);
-
-    if (buildIdFromArg && (platform || profile)) {
-      throw new Error(
-        'Build ID cannot be used together with platform and profile flags. They are used to filter the list of builds when not providing the build ID'
-      );
-    }
-
-    const {
-      privateProjectConfig: { projectId },
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(BuildDelete, { nonInteractive });
-    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-
-    if (buildIdFromArg) {
-      await ensureBuildExistsAsync(graphqlClient, buildIdFromArg);
-    }
-
-    let buildId: string | null = buildIdFromArg;
-    if (!buildId) {
-      if (nonInteractive) {
-        throw new Error('Build ID must be provided in non-interactive mode');
-      }
-
-      buildId = await selectBuildToDeleteAsync(graphqlClient, projectId, displayName, {
-        platform,
-        profile,
-      });
-      if (!buildId) {
-        return;
-      }
-    }
-
-    const spinner = ora().start('Deleting the build...');
-    try {
-      await deleteBuildAsync(graphqlClient, buildId);
-      spinner.succeed('Build deleted');
-    } catch (error) {
-      spinner.fail(`Something went wrong and we couldn't delete your build ${buildId}`);
-      throw error;
-    }
-  }
-}

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

@@ -106,7 +106,6 @@ export default class Build extends EasCommand {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -122,7 +121,6 @@ export default class Build extends EasCommand {
       getDynamicPrivateProjectConfigAsync,
       projectDir,
       analytics,
-      vcsClient,
     } = await this.getContextAsync(Build, {
       nonInteractive: flags.nonInteractive,
     });
@@ -143,7 +141,6 @@ export default class Build extends EasCommand {
     await runBuildAndSubmitAsync(
       graphqlClient,
       analytics,
-      vcsClient,
       projectDir,
       flagsWithPlatform,
       actor,

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

@@ -11,6 +11,7 @@ import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
 import { getTmpDirectory } from '../../utils/paths';
+import { getVcsClient } from '../../vcs';
 
 enum InspectStage {
   ARCHIVE = 'archive',
@@ -66,7 +67,6 @@ export default class BuildInspect extends EasCommand {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -76,7 +76,6 @@ export default class BuildInspect extends EasCommand {
       getDynamicPrivateProjectConfigAsync,
       projectDir,
       analytics,
-      vcsClient,
     } = await this.getContextAsync(BuildInspect, {
       nonInteractive: false,
     });
@@ -93,15 +92,15 @@ export default class BuildInspect extends EasCommand {
     await this.prepareOutputDirAsync(outputDirectory, flags.force);
 
     if (flags.stage === InspectStage.ARCHIVE) {
-      await vcsClient.ensureRepoExistsAsync();
-      await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
+      const vcs = getVcsClient();
+      await vcs.ensureRepoExistsAsync();
+      await vcs.makeShallowCopyAsync(tmpWorkingdir);
       await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {
       try {
         await runBuildAndSubmitAsync(
           graphqlClient,
           analytics,
-          vcsClient,
           projectDir,
           {
             nonInteractive: false,

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

@@ -37,7 +37,6 @@ export default class BuildInternal extends EasCommand {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -50,7 +49,6 @@ export default class BuildInternal extends EasCommand {
       getDynamicPrivateProjectConfigAsync,
       projectDir,
       analytics,
-      vcsClient,
     } = await this.getContextAsync(BuildInternal, {
       nonInteractive: true,
     });
@@ -62,7 +60,6 @@ export default class BuildInternal extends EasCommand {
     await runBuildAndSubmitAsync(
       graphqlClient,
       analytics,
-      vcsClient,
       projectDir,
       {
         requestedPlatform: flags.platform as RequestedPlatform,

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

@@ -10,7 +10,6 @@ import {
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
 import { AppPlatform, BuildStatus as GraphQLBuildStatus } from '../../graphql/generated';
-import Log from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { buildDistributionTypeToGraphQLDistributionType } from '../../utils/buildDistribution';
@@ -52,16 +51,11 @@ export default class BuildList extends EasCommand {
     ...EasPaginatedQueryFlags,
     limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
     ...EasNonInteractiveAndJsonFlags,
-    simulator: Flags.boolean({
-      description:
-        'Filter only iOS simulator builds. Can only be used with --platform flag set to "ios"',
-    }),
   };
 
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -74,17 +68,6 @@ export default class BuildList extends EasCommand {
       distribution: buildDistribution,
       'non-interactive': nonInteractive,
     } = flags;
-    if (buildDistribution === BuildDistributionType.SIMULATOR) {
-      Log.warn(
-        `Using --distribution flag with "simulator" value is deprecated - use --simulator flag instead`
-      );
-    }
-    if (flags.simulator && requestedPlatform !== RequestedPlatform.Ios) {
-      Log.error(
-        `The --simulator flag is only usable with --platform flag set to "ios", as it is used to filter specifically iOS simulator builds`
-      );
-      process.exit(1);
-    }
     const {
       privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
@@ -116,7 +99,6 @@ export default class BuildList extends EasCommand {
         appIdentifier: flags.appIdentifier,
         buildProfile: flags.buildProfile,
         gitCommitHash: flags.gitCommitHash,
-        simulator: flags.simulator,
       },
       paginatedQueryOptions,
     });

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

@@ -88,7 +88,6 @@ export default class BuildResign extends EasCommand {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -105,7 +104,6 @@ export default class BuildResign extends EasCommand {
       getDynamicPrivateProjectConfigAsync,
       projectDir,
       analytics,
-      vcsClient,
     } = await this.getContextAsync(BuildResign, {
       nonInteractive: flags.nonInteractive,
     });
@@ -147,7 +145,6 @@ export default class BuildResign extends EasCommand {
       analytics,
       env: buildProfile.env,
       easJsonCliConfig,
-      vcsClient,
     });
     if (buildProfile.credentialsSource !== CredentialsSource.LOCAL && !nonInteractive) {
       await credentialsCtx.appStore.ensureAuthenticatedAsync();
@@ -157,7 +154,6 @@ export default class BuildResign extends EasCommand {
         projectDir,
         nonInteractive,
         exp,
-        vcsClient,
       },
       buildProfile
     );
@@ -166,7 +162,6 @@ export default class BuildResign extends EasCommand {
       exp,
       xcodeBuildContext,
       env: buildProfile.env,
-      vcsClient,
     });
     const credentialsResult = await ensureIosCredentialsForBuildResignAsync(
       credentialsCtx,
@@ -204,6 +199,8 @@ export default class BuildResign extends EasCommand {
     const buildResult = await waitForBuildEndAsync(graphqlClient, {
       buildIds: [newBuild.id],
       accountName: account.name,
+      nonInteractive,
+      projectDir,
     });
     if (!flags.json) {
       printBuildResults(buildResult);

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

@@ -11,7 +11,7 @@ import {
   PaginatedQueryOptions,
   getPaginatedQueryOptions,
 } from '../../commandUtils/pagination';
-import { AppPlatform, BuildFragment, BuildStatus } from '../../graphql/generated';
+import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -33,7 +33,6 @@ interface RawRunFlags {
   platform?: string;
   limit?: number;
   offset?: number;
-  profile?: string;
 }
 
 interface RunCommandFlags {
@@ -41,7 +40,6 @@ interface RunCommandFlags {
   runArchiveFlags: RunArchiveFlags;
   limit?: number;
   offset?: number;
-  profile?: string;
 }
 
 export default class Run extends EasCommand {
@@ -68,12 +66,6 @@ export default class Run extends EasCommand {
       char: 'p',
       options: ['android', 'ios'],
     }),
-    profile: Flags.string({
-      char: 'e',
-      description:
-        'Name of the build profile used to create the build to run. When specified, only builds created with the specified build profile will be queried.',
-      helpValue: 'PROFILE_NAME',
-    }),
     ...EasPaginatedQueryFlags,
   };
 
@@ -81,7 +73,6 @@ export default class Run extends EasCommand {
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -106,7 +97,7 @@ export default class Run extends EasCommand {
   }
 
   private async sanitizeFlagsAsync(flags: RawRunFlags): Promise<RunCommandFlags> {
-    const { platform, limit, offset, profile, ...runArchiveFlags } = flags;
+    const { platform, limit, offset, ...runArchiveFlags } = flags;
 
     const selectedPlatform = await resolvePlatformAsync(platform);
 
@@ -130,16 +121,11 @@ export default class Run extends EasCommand {
       });
     }
 
-    if (profile && (runArchiveFlags.id || runArchiveFlags.path || runArchiveFlags.url)) {
-      Log.warn('The --profile flag is ignored when using --id, --path, or --url flags.');
-    }
-
     return {
       selectedPlatform,
       runArchiveFlags,
       limit,
       offset,
-      profile,
     };
   }
 }
@@ -200,7 +186,8 @@ async function maybeGetBuildAsync(
   projectId: string,
   paginatedQueryOptions: PaginatedQueryOptions
 ): Promise<BuildFragment | null> {
-  const simulator = flags.selectedPlatform === AppPlatform.Ios ? true : undefined;
+  const distributionType =
+    flags.selectedPlatform === AppPlatform.Ios ? DistributionType.Simulator : undefined;
 
   if (flags.runArchiveFlags.id) {
     const build = await BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
@@ -218,9 +205,8 @@ async function maybeGetBuildAsync(
       } build to run for ${await getDisplayNameForProjectIdAsync(graphqlClient, projectId)} app`,
       filter: {
         platform: flags.selectedPlatform,
+        distribution: distributionType,
         status: BuildStatus.Finished,
-        buildProfile: flags.profile,
-        simulator,
       },
       paginatedQueryOptions,
       selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
@@ -234,9 +220,8 @@ async function maybeGetBuildAsync(
       projectId,
       filter: {
         platform: flags.selectedPlatform,
+        distribution: distributionType,
         status: BuildStatus.Finished,
-        buildProfile: flags.profile,
-        simulator,
       },
     });
 

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

@@ -38,7 +38,6 @@ export default class BuildVersionGetView extends EasCommand {
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Vcs,
   };
 
   public async runAsync(): Promise<void> {
@@ -50,7 +49,6 @@ export default class BuildVersionGetView extends EasCommand {
       loggedIn: { graphqlClient },
       getDynamicPrivateProjectConfigAsync,
       projectDir,
-      vcsClient,
     } = await this.getContextAsync(BuildVersionGetView, {
       nonInteractive: true,
     });
@@ -70,7 +68,6 @@ export default class BuildVersionGetView extends EasCommand {
       easJsonAccessor,
       platforms,
       profileName: flags.profile ?? undefined,
-      projectDir,
     });
     const results: { [key in Platform]?: string } = {};
     for (const { profile, platform } of buildProfiles) {
@@ -87,7 +84,6 @@ export default class BuildVersionGetView extends EasCommand {
         exp,
         buildProfile: profile,
         platform,
-        vcsClient,
       });
       const remoteVersions = await AppVersionQuery.latestVersionAsync(
         graphqlClient,