Revert "[eas-cli][update] Only export at most ios and android dist (#2002)"

This reverts commit 6bdee0f395.

.github/workflows/changelog-bot.yml

@@ -16,7 +16,7 @@ jobs:
         with:
           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/release.yml

@@ -175,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

CHANGELOG.md

@@ -8,104 +8,10 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 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))
-
 ### 🐛 Bug fixes
 
 ### 🧹 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
@@ -129,7 +35,6 @@ This is the log of notable changes to EAS CLI and related packages.
 
 - 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
 

lerna.json

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

packages/eas-cli/README.md

@@ -110,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)
@@ -135,7 +133,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -152,7 +150,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -169,7 +167,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -183,7 +181,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -233,7 +231,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -254,7 +252,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -274,7 +272,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -294,7 +292,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -317,7 +315,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -347,7 +345,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -364,7 +362,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -381,7 +379,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -416,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/v5.7.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -454,7 +452,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -480,7 +478,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -504,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/v5.7.0/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -553,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/v5.7.0/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -572,7 +570,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -591,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/v5.7.0/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -608,7 +606,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -629,7 +627,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -651,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/v5.7.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -671,7 +669,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -679,7 +677,7 @@ Roll a new branch out on a channel incrementally.
 
 ```
 USAGE
-  $ eas channel:rollout [CHANNEL] [--action create|edit|end|view] [--percent <value>] [--outcome
+  $ eas channel:rollout [CHANNEL] [--action create|edit|end] [--percent <value>] [--outcome
     republish-and-revert|revert] [--branch <value>] [--runtime-version <value>] [--private-key-path <value>] [--json
     --non-interactive]
 
@@ -687,7 +685,7 @@ ARGUMENTS
   CHANNEL  channel on which the rollout should be done
 
 FLAGS
-  --action=(create|edit|end|view)          Rollout action to perform
+  --action=(create|edit|end)               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.
@@ -703,7 +701,7 @@ DESCRIPTION
   Roll a new branch out on a channel incrementally.
 ```
 
-_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -726,7 +724,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -747,7 +745,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -764,7 +762,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -778,7 +776,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/v5.7.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -798,7 +796,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -819,7 +817,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -840,7 +838,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -854,7 +852,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -868,7 +866,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -956,7 +954,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -973,7 +971,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/v5.7.0/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -990,7 +988,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/v5.7.0/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas open`
 
@@ -1004,7 +1002,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1018,7 +1016,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1040,7 +1038,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -1063,7 +1061,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/v5.7.0/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -1081,7 +1079,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -1095,7 +1093,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas secret:push`
 
@@ -1115,7 +1113,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/v5.7.0/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/secret/push.ts)_
 
 ## `eas submit`
 
@@ -1145,7 +1143,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -1154,8 +1152,8 @@ publish an update group
 ```
 USAGE
   $ eas update [--branch <value>] [--channel <value>] [-m <value>] [--republish | --input-dir <value> |
-    --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--dev] [--auto] [--private-key-path
-    <value>] [--json --non-interactive]
+    --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
+    [--json --non-interactive]
 
 FLAGS
   -m, --message=<value>             A short message describing the update
@@ -1164,7 +1162,6 @@ FLAGS
   --branch=<value>                  Branch to publish the update group on
   --channel=<value>                 Channel that the published update should affect
   --clear-cache                     Clear the bundler cache before publishing
-  --dev                             Publish a development bundle
   --group=<value>                   Update group to republish (deprecated, see republish command)
   --input-dir=<value>               [default: dist] Location of the bundle
   --json                            Enable JSON output, non-JSON messages will be printed to stderr.
@@ -1179,7 +1176,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -1197,7 +1194,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -1218,7 +1215,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -1240,7 +1237,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -1267,53 +1264,7 @@ DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/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/v5.7.0/packages/eas-cli/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/v5.7.0/packages/eas-cli/src/commands/update/rollback.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/update/republish.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -1333,7 +1284,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1354,7 +1305,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1374,7 +1325,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1392,7 +1343,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1414,7 +1365,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1431,7 +1382,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v5.7.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v5.0.1/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/package.json

@@ -1,24 +1,24 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "5.7.0",
+  "version": "5.0.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.3.2",
+    "@expo/apple-utils": "1.3.1",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "8.1.2",
     "@expo/config-plugins": "7.2.4",
     "@expo/config-types": "49.0.0",
-    "@expo/eas-build-job": "1.0.48",
-    "@expo/eas-json": "5.7.0",
+    "@expo/eas-build-job": "1.0.39",
+    "@expo/eas-json": "5.0.0",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "1.1.1",
+    "@expo/package-manager": "0.0.57",
     "@expo/pkcs12": "0.0.8",
     "@expo/plist": "0.0.20",
     "@expo/plugin-help": "5.1.22",
@@ -50,7 +50,7 @@
     "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.2.4",
@@ -73,7 +73,7 @@
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.5.2",
+    "semver": "7.3.8",
     "slash": "3.0.0",
     "tar": "6.1.13",
     "terminal-link": "2.1.1",

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/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

@@ -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;
 
@@ -107,7 +97,6 @@ export async function prepareAndroidBuildAsync(
             ? false
             : ctx.buildProfile.autoIncrement,
         projectId: ctx.projectId,
-        vcsClient: ctx.vcsClient,
       });
     },
     prepareJobAsync: async (
@@ -147,7 +136,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

@@ -11,7 +11,6 @@ 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(
@@ -21,16 +20,14 @@ export async function syncProjectConfigurationAsync(
     exp,
     localAutoIncrement,
     projectId,
-    vcsClient,
   }: {
     projectDir: string;
     exp: ExpoConfig;
     localAutoIncrement?: AndroidVersionAutoIncrement;
     projectId: string;
-    vcsClient: Client;
   }
 ): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {

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;

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';
@@ -17,6 +17,7 @@ import {
   BuildFragment,
   BuildParamsInput,
   BuildPriority,
+  BuildResourceClass,
   BuildStatus,
   UploadSessionType,
 } from '../graphql/generated';
@@ -29,11 +30,13 @@ 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,
@@ -122,10 +125,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 +137,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 = {
@@ -243,7 +245,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 +335,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 +357,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 +398,13 @@ async function handleSingleBuildProgressAsync(
   {
     build,
     accountName,
+    projectDir,
+    nonInteractive,
   }: {
     build: MaybeBuildFragment;
     accountName: string;
+    projectDir: string;
+    nonInteractive: boolean;
   },
   { spinner }: { spinner: Ora }
 ): Promise<BuildProgressResult> {
@@ -444,6 +458,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 +654,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

@@ -6,13 +6,12 @@ import fs from 'fs-extra';
 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> {
@@ -37,18 +36,14 @@ 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,
     });
   }
@@ -97,20 +92,20 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
   },
 };
 
-async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
+async function createEasJsonAsync(projectDir: string): Promise<void> {
   const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
 
   const hasAndroidNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)) === Workflow.GENERIC;
+    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
   const hasIosNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)) === Workflow.GENERIC;
+    (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 vcsClient.trackFileAsync(easJsonPath);
+  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,7 +1,6 @@
 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 { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -12,7 +11,6 @@ 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'>;
@@ -58,6 +56,4 @@ export interface BuildContext<T extends Platform> {
   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,7 +1,6 @@
 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';
@@ -14,7 +13,6 @@ 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';
@@ -36,7 +34,6 @@ export async function createBuildContextAsync<T extends Platform>({
   actor,
   graphqlClient,
   analytics,
-  vcsClient,
   getDynamicPrivateProjectConfigAsync,
   customBuildConfigMetadata,
 }: {
@@ -54,14 +51,13 @@ 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 =
@@ -71,8 +67,6 @@ export async function createBuildContextAsync<T extends Platform>({
       : (buildProfile as BuildProfile<Platform.IOS>)?.buildConfiguration === 'Debug') ??
     false;
 
-  const requiredPackageManager = resolvePackageManager(projectDir);
-
   const credentialsCtx = new CredentialsContext({
     projectInfo: { exp, projectId },
     nonInteractive,
@@ -82,7 +76,6 @@ export async function createBuildContextAsync<T extends Platform>({
     analytics,
     env: buildProfile.env,
     easJsonCliConfig,
-    vcsClient,
   });
 
   const devClientProperties = getDevClientEventProperties({
@@ -129,13 +122,11 @@ 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/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'
@@ -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

@@ -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 {
@@ -89,7 +86,6 @@ export async function prepareIosBuildAsync(
             ? false
             : ctx.buildProfile.autoIncrement,
         projectId: ctx.projectId,
-        vcsClient: ctx.vcsClient,
       });
     },
     prepareJobAsync: async (

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

@@ -7,7 +7,6 @@ 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(
@@ -18,22 +17,20 @@ export async function syncProjectConfigurationAsync(
     targets,
     localAutoIncrement,
     projectId,
-    vcsClient,
   }: {
     projectDir: string;
     exp: ExpoConfig;
     targets: Target[];
     localAutoIncrement?: IosVersionAutoIncrement;
     projectId: string;
-    vcsClient: Client;
   }
 ): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync(graphqlClient, vcsClient, projectDir, exp, projectId);
+      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) {

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.48';
+const PLUGIN_PACKAGE_VERSION = '1.0.39';
 
 export enum LocalBuildMode {
   /**

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

@@ -15,6 +15,7 @@ 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';
@@ -23,6 +24,7 @@ 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 =
     ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
@@ -42,14 +44,14 @@ export async function collectMetadataAsync<T extends Platform>(
     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 && {
@@ -62,9 +64,6 @@ export async function collectMetadataAsync<T extends Platform>(
     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,
   };
   return sanitizeMetadata(metadata);
 }
@@ -77,8 +76,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 {
@@ -92,8 +90,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 {

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

@@ -66,7 +66,7 @@ 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';
@@ -98,19 +98,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'] =
@@ -136,7 +134,6 @@ export async function runBuildAndSubmitAsync(
     projectDir,
     nonInteractive: flags.nonInteractive,
     buildProfiles,
-    vcsClient,
   });
 
   const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
@@ -166,7 +163,6 @@ export async function runBuildAndSubmitAsync(
       actor,
       graphqlClient,
       analytics,
-      vcsClient,
       getDynamicPrivateProjectConfigAsync,
       customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
     });
@@ -231,6 +227,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);
@@ -276,7 +274,6 @@ async function prepareAndStartBuildAsync({
   actor,
   graphqlClient,
   analytics,
-  vcsClient,
   getDynamicPrivateProjectConfigAsync,
   customBuildConfigMetadata,
 }: {
@@ -288,7 +285,6 @@ async function prepareAndStartBuildAsync({
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  vcsClient: Client;
   getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
@@ -307,7 +303,6 @@ async function prepareAndStartBuildAsync({
     actor,
     graphqlClient,
     analytics,
-    vcsClient,
     getDynamicPrivateProjectConfigAsync,
     customBuildConfigMetadata,
   });
@@ -334,7 +329,6 @@ async function prepareAndStartBuildAsync({
       exp: buildCtx.exp,
       projectId: buildCtx.projectId,
       projectDir,
-      vcsClient: buildCtx.vcsClient,
       sdkVersion: buildCtx.exp.sdkVersion,
       nonInteractive: flags.nonInteractive,
       buildProfile,
@@ -417,7 +411,6 @@ async function prepareAndStartSubmissionAsync({
     analytics: buildCtx.analytics,
     projectId: buildCtx.projectId,
     exp: buildCtx.exp,
-    vcsClient: buildCtx.vcsClient,
   });
 
   if (moreBuilds) {
@@ -478,7 +471,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   graphqlClient,
   projectId,
   projectDir,
-  vcsClient,
   buildProfile,
   nonInteractive,
   sdkVersion,
@@ -487,7 +479,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   exp: ExpoConfig;
   projectId: string;
   projectDir: string;
-  vcsClient: Client;
   buildProfile: ProfileData<'build'>;
   nonInteractive: boolean;
   sdkVersion?: string;
@@ -517,7 +508,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
         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.');

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

@@ -10,17 +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();
@@ -64,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,
@@ -102,7 +100,6 @@ async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolea
 
 async function installExpoDevClientAsync(
   projectDir: string,
-  vcsClient: Client,
   { nonInteractive }: { nonInteractive: boolean }
 ): Promise<void> {
   Log.newLine();
@@ -110,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/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/validate.ts

@@ -6,6 +6,7 @@ import semver from 'semver';
 
 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 {
@@ -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/__tests__/fixtures.ts

@@ -124,7 +124,6 @@ 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],

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

@@ -1,57 +0,0 @@
-import { format } from '@expo/timeago.js';
-
-import { getAlwaysTrueBranchMapping, getEmptyBranchMapping } from '../branch-mapping';
-import { getDescriptionByBranchId } from '../print-utils';
-import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
-
-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/print-utils.ts

@@ -1,3 +1,4 @@
+import assert from 'assert';
 import chalk from 'chalk';
 
 import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
@@ -10,35 +11,17 @@ import {
 } from '../update/utils';
 import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
 
-/**
- * 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;
-  }
+  assert(
+    hasEmptyBranchMap(channel) || hasStandardBranchMap(channel) || isRollout(channel),
+    'Only standard branch mappings and rollouts are supported.'
+  );
 
-  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`)
+  const branchDescription = channel.updateBranches.flatMap(branch => {
+    const updateGroupWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
+      branch.updateGroups
     );
-  }
-}
-
-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) {
@@ -48,21 +31,22 @@ export function getDescriptionByBranchId(
           : 100 - maybeRollout.percentRolledOut;
     }
 
-    if (branch.updateGroups.length === 0) {
-      acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
-      return acc;
-    }
-    const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-      branch.updateGroups
+    return updateGroupWithBranchDescriptions.map(
+      ({ branch, ...updateGroup }): FormattedBranchDescription => ({
+        branch,
+        branchRolloutPercentage: maybePercentOnBranch,
+        update: updateGroup,
+      })
     );
-    // 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>);
+  });
+
+  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`)
+    );
+  }
 }

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

@@ -22,7 +22,6 @@ 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';
 
 export type ContextInput<
@@ -102,9 +101,6 @@ export default abstract class EasCommand extends Command {
     Analytics: {
       analytics: new AnalyticsContextField(),
     },
-    Vcs: {
-      vcsClient: new VcsClientContextField(),
-    },
   };
 
   /**

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

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

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

@@ -139,7 +139,6 @@ export default class BuildCancel extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {

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

@@ -16,6 +16,7 @@ import {
   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';
@@ -31,7 +32,6 @@ export default class BuildConfigure extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -39,7 +39,6 @@ export default class BuildConfigure extends EasCommand {
     const {
       privateProjectConfig: { exp, projectId, projectDir },
       loggedIn: { graphqlClient },
-      vcsClient,
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
     });
@@ -48,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);
 
@@ -67,7 +64,6 @@ export default class BuildConfigure extends EasCommand {
     const didCreateEasJson = await ensureProjectConfiguredAsync({
       projectDir,
       nonInteractive: false,
-      vcsClient,
     });
     if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
       if (exp.updates?.useClassicUpdates) {
@@ -82,22 +78,16 @@ export default class BuildConfigure extends EasCommand {
     // 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(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(
-            graphqlClient,
-            vcsClient,
-            projectDir,
-            exp,
-            projectId
-          );
+          await syncIosUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
         }
       }
     }

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

@@ -56,7 +56,6 @@ export default class BuildList extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {

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

@@ -73,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> {

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,
     });
@@ -87,7 +85,6 @@ export default class BuildVersionGetView extends EasCommand {
         exp,
         buildProfile: profile,
         platform,
-        vcsClient,
       });
       const remoteVersions = await AppVersionQuery.latestVersionAsync(
         graphqlClient,

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

@@ -41,7 +41,6 @@ export default class BuildVersionSetView 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 BuildVersionSetView extends EasCommand {
       loggedIn: { graphqlClient },
       getDynamicPrivateProjectConfigAsync,
       projectDir,
-      vcsClient,
     } = await this.getContextAsync(BuildVersionSetView, {
       nonInteractive: false,
     });
@@ -76,7 +74,6 @@ export default class BuildVersionSetView extends EasCommand {
       exp,
       buildProfile: profile,
       platform,
-      vcsClient,
     });
     const remoteVersions = await AppVersionQuery.latestVersionAsync(
       graphqlClient,

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

@@ -28,7 +28,6 @@ import {
 } from '../../../project/remoteVersionSource';
 import { resolveWorkflowAsync } from '../../../project/workflow';
 import { getProfilesAsync } from '../../../utils/profiles';
-import { Client } from '../../../vcs/vcs';
 
 interface SyncContext<T extends Platform> {
   projectDir: string;
@@ -36,7 +35,6 @@ interface SyncContext<T extends Platform> {
   workflow: Workflow;
   profile: BuildProfile<T>;
   buildVersion: string;
-  vcsClient: Client;
 }
 
 export default class BuildVersionSyncView extends EasCommand {
@@ -60,7 +58,6 @@ export default class BuildVersionSyncView extends EasCommand {
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Vcs,
   };
 
   public async runAsync(): Promise<void> {
@@ -69,7 +66,6 @@ export default class BuildVersionSyncView extends EasCommand {
       loggedIn: { graphqlClient },
       getDynamicPrivateProjectConfigAsync,
       projectDir,
-      vcsClient,
     } = await this.getContextAsync(BuildVersionSyncView, {
       nonInteractive: true,
     });
@@ -101,7 +97,6 @@ export default class BuildVersionSyncView extends EasCommand {
         exp,
         buildProfile: profileInfo.profile,
         platform: profileInfo.platform,
-        vcsClient,
       });
       const remoteVersions = await AppVersionQuery.latestVersionAsync(
         graphqlClient,
@@ -109,7 +104,7 @@ export default class BuildVersionSyncView extends EasCommand {
         toAppPlatform(profileInfo.platform),
         applicationIdentifier
       );
-      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform);
       if (!remoteVersions?.buildVersion) {
         Log.warn(
           `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
@@ -133,7 +128,6 @@ export default class BuildVersionSyncView extends EasCommand {
           profile: profileInfo.profile as BuildProfile<Platform.ANDROID>,
           workflow,
           buildVersion: remoteVersions.buildVersion,
-          vcsClient,
         });
       } else {
         this.syncIosAsync({
@@ -142,7 +136,6 @@ export default class BuildVersionSyncView extends EasCommand {
           profile: profileInfo.profile as BuildProfile<Platform.IOS>,
           workflow,
           buildVersion: remoteVersions.buildVersion,
-          vcsClient,
         });
       }
       Log.withTick(
@@ -159,10 +152,9 @@ export default class BuildVersionSyncView extends EasCommand {
     exp,
     profile,
     buildVersion,
-    vcsClient,
   }: SyncContext<Platform.IOS>): Promise<void> {
     const xcodeBuildContext = await resolveXcodeBuildContextAsync(
-      { exp, projectDir, nonInteractive: false, vcsClient },
+      { exp, projectDir, nonInteractive: false },
       profile
     );
     const targets = await resolveTargetsAsync({
@@ -170,7 +162,6 @@ export default class BuildVersionSyncView extends EasCommand {
       exp,
       xcodeBuildContext,
       env: profile.env,
-      vcsClient,
     });
 
     if (!isValidBuildNumber(buildVersion)) {

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

@@ -20,7 +20,6 @@ export default class BuildView extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {

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

@@ -17,13 +17,11 @@ import {
   RolloutActions,
   RolloutMainMenu,
 } from '../../rollout/actions/RolloutMainMenu';
-import { enableJsonOutput } from '../../utils/json';
 
 enum ActionRawFlagValue {
   CREATE = 'create',
   EDIT = 'edit',
   END = 'end',
-  VIEW = 'view',
 }
 type ChannelRolloutRawArgsAndFlags = {
   channel?: string;
@@ -139,7 +137,8 @@ export default class ChannelRollout extends EasCommand {
       nonInteractive: argsAndFlags.nonInteractive,
     });
     if (argsAndFlags.json) {
-      enableJsonOutput();
+      // TODO(quin): implement json output
+      throw new Error('Developer Preview doesnt support JSON output yet');
     }
 
     const app = { projectId, exp };
@@ -169,8 +168,6 @@ export default class ChannelRollout extends EasCommand {
         return ManageRolloutActions.EDIT;
       case ActionRawFlagValue.END:
         return ManageRolloutActions.END;
-      case ActionRawFlagValue.VIEW:
-        return ManageRolloutActions.VIEW;
     }
   }
 

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

@@ -15,7 +15,6 @@ export default class Credentials extends EasCommand {
     ...this.ContextOptions.OptionalProjectConfig,
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -25,7 +24,6 @@ export default class Credentials extends EasCommand {
       privateProjectConfig,
       getDynamicPrivateProjectConfigAsync,
       analytics,
-      vcsClient,
     } = await this.getContextAsync(Credentials, {
       nonInteractive: false,
     });
@@ -33,7 +31,6 @@ export default class Credentials extends EasCommand {
     await new SelectPlatform(
       actor,
       graphqlClient,
-      vcsClient,
       analytics,
       privateProjectConfig ?? null,
       getDynamicPrivateProjectConfigAsync,

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

@@ -5,18 +5,16 @@ import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
-import { Client } from '../vcs/vcs';
 
 export default class Diagnostics extends EasCommand {
   static override description = 'display environment info';
 
   static override contextDefinition = {
     ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
-    const { projectDir, vcsClient } = await this.getContextAsync(Diagnostics, {
+    const { projectDir } = await this.getContextAsync(Diagnostics, {
       nonInteractive: true,
     });
 
@@ -45,13 +43,13 @@ export default class Diagnostics extends EasCommand {
     );
 
     Log.log(info.trimEnd());
-    await this.printWorkflowAsync(projectDir, vcsClient);
+    await this.printWorkflowAsync(projectDir);
     Log.newLine();
   }
 
-  private async printWorkflowAsync(projectDir: string, vcsClient: Client): Promise<void> {
-    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
-    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  private async printWorkflowAsync(projectDir: string): Promise<void> {
+    const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+    const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
 
     if (androidWorkflow === iosWorkflow) {
       Log.log(`    Project workflow: ${androidWorkflow}`);

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

@@ -27,7 +27,6 @@ export default class MetadataPull extends EasCommand {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -38,13 +37,12 @@ export default class MetadataPull extends EasCommand {
       loggedIn: { actor, graphqlClient },
       privateProjectConfig: { exp, projectId, projectDir },
       analytics,
-      vcsClient,
     } = await this.getContextAsync(MetadataPull, {
       nonInteractive: false,
     });
 
     // this command is interactive (all nonInteractive flags passed to utility functions are false)
-    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false, vcsClient });
+    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
 
     const submitProfiles = await getProfilesAsync({
       type: 'submit',
@@ -66,7 +64,6 @@ export default class MetadataPull extends EasCommand {
       graphqlClient,
       analytics,
       nonInteractive: false,
-      vcsClient,
     });
 
     try {

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

@@ -25,7 +25,6 @@ export default class MetadataPush extends EasCommand {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -36,13 +35,12 @@ export default class MetadataPush extends EasCommand {
       loggedIn: { actor, graphqlClient },
       privateProjectConfig: { exp, projectId, projectDir },
       analytics,
-      vcsClient,
     } = await this.getContextAsync(MetadataPush, {
       nonInteractive: false,
     });
 
     // this command is interactive (all nonInteractive flags passed to utility functions are false)
-    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false, vcsClient });
+    await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
 
     const submitProfiles = await getProfilesAsync({
       type: 'submit',
@@ -64,7 +62,6 @@ export default class MetadataPush extends EasCommand {
       graphqlClient,
       analytics,
       nonInteractive: false,
-      vcsClient,
     });
 
     try {

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

@@ -16,7 +16,7 @@ import { ora } from '../../ora';
 import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../project/projectUtils';
-import { Choice, confirmAsync, promptAsync } from '../../prompts';
+import { confirmAsync, promptAsync } from '../../prompts';
 import { Actor } from '../../user/User';
 
 type InitializeMethodOptions = {
@@ -234,11 +234,21 @@ export default class ProjectInit extends EasCommand {
       if (allAccounts.length === 1) {
         accountName = allAccounts[0].name;
       } else {
-        const choices = ProjectInit.getAccountChoices(
-          actor,
-          accountNamesWhereUserHasSufficientPermissionsToCreateApp
-        );
+        // if regular user, put primary account first
+        const sortedAccounts =
+          actor.__typename === 'Robot'
+            ? allAccounts
+            : [...allAccounts].sort((a, _b) =>
+                actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
+              );
 
+        const choices = sortedAccounts.map(account => ({
+          title: account.name,
+          value: account,
+          description: !accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(account.name)
+            ? '(Viewer Role)'
+            : undefined,
+        }));
         accountName = (
           await promptAsync({
             type: 'select',
@@ -311,71 +321,6 @@ export default class ProjectInit extends EasCommand {
     return createdProjectId;
   }
 
-  private static getAccountChoices(
-    actor: Actor,
-    namesWithSufficientPermissions: Set<string>
-  ): Choice[] {
-    const allAccounts = actor.accounts;
-
-    const sortedAccounts =
-      actor.__typename === 'Robot'
-        ? allAccounts
-        : [...allAccounts].sort((a, _b) =>
-            actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
-          );
-
-    if (actor.__typename !== 'Robot') {
-      const personalAccount = allAccounts?.find(
-        account => account?.ownerUserActor?.id === actor.id
-      );
-
-      const personalAccountChoice = personalAccount
-        ? {
-            title: personalAccount.name,
-            value: personalAccount,
-            description: !namesWithSufficientPermissions.has(personalAccount.name)
-              ? '(Personal) (Viewer Role)'
-              : '(Personal)',
-          }
-        : undefined;
-
-      const userAccounts = allAccounts
-        ?.filter(account => account.ownerUserActor && account.name !== actor.username)
-        .map(account => ({
-          title: account.name,
-          value: account,
-          description: !namesWithSufficientPermissions.has(account.name)
-            ? '(Team) (Viewer Role)'
-            : '(Team)',
-        }));
-
-      const organizationAccounts = allAccounts
-        ?.filter(account => account.name !== actor.username && !account.ownerUserActor)
-        .map(account => ({
-          title: account.name,
-          value: account,
-          description: !namesWithSufficientPermissions.has(account.name)
-            ? '(Organization) (Viewer Role)'
-            : '(Organization)',
-        }));
-
-      let choices: Choice[] = [];
-      if (personalAccountChoice) {
-        choices = [personalAccountChoice];
-      }
-
-      return [...choices, ...userAccounts, ...organizationAccounts].sort((a, _b) =>
-        actor.__typename === 'User' ? (a.value.name === actor.username ? -1 : 1) : 0
-      );
-    }
-
-    return sortedAccounts.map(account => ({
-      title: account.name,
-      value: account,
-      description: !namesWithSufficientPermissions.has(account.name) ? '(Viewer Role)' : undefined,
-    }));
-  }
-
   async runAsync(): Promise<void> {
     const {
       flags: { id: idArgument, force, 'non-interactive': nonInteractive },

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

@@ -94,7 +94,6 @@ export default class Submit extends EasCommand {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.ProjectDir,
     ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -103,7 +102,6 @@ export default class Submit extends EasCommand {
       loggedIn: { actor, graphqlClient },
       privateProjectConfig: { exp, projectId, projectDir },
       analytics,
-      vcsClient,
     } = await this.getContextAsync(Submit, {
       nonInteractive: false,
     });
@@ -137,8 +135,6 @@ export default class Submit extends EasCommand {
         analytics,
         exp,
         projectId,
-        vcsClient,
-        specifiedProfile: flagsWithPlatform.profile,
       });
 
       if (submissionProfiles.length > 1) {

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

@@ -3,12 +3,10 @@ import { instance, mock } from 'ts-mockito';
 
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { ensureEASUpdateIsConfiguredAsync } from '../../../update/configure';
-import { Client } from '../../../vcs/vcs';
 
 describe(ensureEASUpdateIsConfiguredAsync, () => {
   it('errors with "useClassicUpdates" set and no app.json', async () => {
     const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
-    const vcsClient = instance(mock<Client>({}));
     const exp: ExpoConfig = {
       name: 'test',
       slug: 'test',
@@ -21,7 +19,6 @@ describe(ensureEASUpdateIsConfiguredAsync, () => {
         projectId: 'test',
         projectDir: '/tmp/test',
         platform: null,
-        vcsClient,
       });
     }).rejects.toThrow(
       `Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "useClassicUpdates" from your app config and run this command again.`

packages/eas-cli/src/commands/update/__tests__/roll-back-to-embedded.test.ts

@@ -43,10 +43,6 @@ jest.mock('@expo/config');
 jest.mock('@expo/config-plugins');
 jest.mock('../../../branch/queries');
 jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
-jest.mock('../../../project/projectUtils', () => ({
-  ...jest.requireActual('../../../project/projectUtils'),
-  enforceRollBackToEmbeddedUpdateSupportAsync: jest.fn(),
-}));
 jest.mock('../../../update/configure');
 jest.mock('../../../update/getBranchNameFromChannelNameAsync');
 jest.mock('../../../graphql/mutations/PublishMutation');

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

@@ -10,6 +10,7 @@ import {
   ensureEASUpdateIsConfiguredAsync,
   ensureEASUpdateIsConfiguredInEasJsonAsync,
 } from '../../update/configure';
+import { getVcsClient } from '../../vcs';
 
 export default class UpdateConfigure extends EasCommand {
   static override description = 'configure the project to support EAS Update';
@@ -27,7 +28,6 @@ export default class UpdateConfigure extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -36,7 +36,6 @@ export default class UpdateConfigure extends EasCommand {
     const {
       privateProjectConfig: { projectId, exp, projectDir },
       loggedIn: { graphqlClient },
-      vcsClient,
     } = await this.getContextAsync(UpdateConfigure, {
       nonInteractive: flags['non-interactive'],
     });
@@ -45,14 +44,13 @@ export default class UpdateConfigure extends EasCommand {
       '💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    await vcsClient.ensureRepoExistsAsync();
+    await getVcsClient().ensureRepoExistsAsync();
 
     await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
       exp,
       projectId,
       projectDir,
       platform,
-      vcsClient,
     });
 
     await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);

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

@@ -52,10 +52,10 @@ import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
+import { getVcsClient } from '../../vcs';
 
 type RawUpdateFlags = {
   auto: boolean;
-  dev: boolean;
   branch?: string;
   channel?: string;
   message?: string;
@@ -74,7 +74,6 @@ type RawUpdateFlags = {
 
 type UpdateFlags = {
   auto: boolean;
-  dev: boolean;
   platform: ExpoCLIExportPlatformFlag;
   branchName?: string;
   channelName?: string;
@@ -135,10 +134,6 @@ export default class UpdatePublish extends EasCommand {
       default: 'all',
       required: false,
     }),
-    dev: Flags.boolean({
-      description: 'Publish a development bundle',
-      default: false,
-    }),
     auto: Flags.boolean({
       description:
         'Use the current git branch and commit message for the EAS branch and update message',
@@ -154,7 +149,6 @@ export default class UpdatePublish extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -164,7 +158,6 @@ export default class UpdatePublish extends EasCommand {
       auto: autoFlag,
       platform: platformFlag,
       channelName: channelNameArg,
-      dev,
       updateMessage: updateMessageArg,
       inputDir,
       skipBundler,
@@ -179,7 +172,6 @@ export default class UpdatePublish extends EasCommand {
       getDynamicPublicProjectConfigAsync,
       getDynamicPrivateProjectConfigAsync,
       loggedIn: { graphqlClient },
-      vcsClient,
     } = await this.getContextAsync(UpdatePublish, {
       nonInteractive,
     });
@@ -201,7 +193,6 @@ export default class UpdatePublish extends EasCommand {
       platform: getRequestedPlatform(platformFlag),
       projectDir,
       projectId,
-      vcsClient,
     });
 
     const { exp } = await getDynamicPublicProjectConfigAsync();
@@ -210,7 +201,6 @@ export default class UpdatePublish extends EasCommand {
 
     const branchName = await getBranchNameForCommandAsync({
       graphqlClient,
-      vcsClient,
       projectId,
       channelNameArg,
       branchNameArg,
@@ -219,7 +209,7 @@ export default class UpdatePublish extends EasCommand {
       paginatedQueryOptions,
     });
 
-    const updateMessage = await getUpdateMessageForCommandAsync(vcsClient, {
+    const updateMessage = await getUpdateMessageForCommandAsync({
       updateMessageArg,
       autoFlag,
       nonInteractive,
@@ -230,7 +220,7 @@ export default class UpdatePublish extends EasCommand {
     if (!skipBundler) {
       const bundleSpinner = ora().start('Exporting...');
       try {
-        await buildBundlesAsync({ projectDir, inputDir, dev, exp, platformFlag, clearCache });
+        await buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache });
         bundleSpinner.succeed('Exported bundle(s)');
       } catch (e) {
         bundleSpinner.fail('Export failed');
@@ -253,22 +243,20 @@ export default class UpdatePublish extends EasCommand {
       realizedPlatforms = Object.keys(assets) as PublishPlatform[];
 
       // Timeout mechanism:
-      // - Start with NO_ACTIVITY_TIMEOUT. 90 seconds is chosen because the cloud function that processes
-      //   uploaded assets has a timeout of 60 seconds and uploading can take some time on a slow connection.
-      // - Each time one or more assets reports as ready, reset the timeout.
-      // - Each time an asset upload begins, reset the timeout. This includes retries.
-      // - Start upload. Internally, uploadAssetsAsync uploads them all first and then checks for successful
+      // - Start with 60 second timeout. 60 seconds is chosen because the cloud function that processes
+      //   uploaded assets has a timeout of 60 seconds.
+      // - Each time one or more assets reports as ready, reset the timeout to 60 seconds.
+      // - Start upload. Internally, uploadAssetsAsync uploads them all and then checks for successful
       //   processing every (5 + n) seconds with a linear backoff of n + 1 second.
       // - At the same time as upload is started, start timeout checker which checks every 1 second to see
       //   if timeout has been reached. When timeout expires, send a cancellation signal to currently running
       //   upload function call to instruct it to stop uploading or checking for successful processing.
-      const NO_ACTIVITY_TIMEOUT = 90 * 1000; // 90 seconds
       let lastUploadedStorageKeys = new Set<string>();
       let lastAssetUploadResults: {
         asset: RawAsset & { storageKey: string };
         finished: boolean;
       }[] = [];
-      let timeAtWhichToTimeout = Date.now() + NO_ACTIVITY_TIMEOUT;
+      let timeAtWhichToTimeout = Date.now() + 60 * 1000; // sixty seconds from now
       const cancelationToken = { isCanceledOrFinished: false };
 
       const uploadResults = await Promise.race([
@@ -282,7 +270,7 @@ export default class UpdatePublish extends EasCommand {
               assetUploadResults.filter(r => r.finished).map(r => r.asset.storageKey)
             );
             if (!areSetsEqual(currentUploadedStorageKeys, lastUploadedStorageKeys)) {
-              timeAtWhichToTimeout = Date.now() + NO_ACTIVITY_TIMEOUT; // reset timeout to NO_ACTIVITY_TIMEOUT
+              timeAtWhichToTimeout = Date.now() + 60 * 1000; // reset timeout to sixty seconds from now
               lastUploadedStorageKeys = currentUploadedStorageKeys;
               lastAssetUploadResults = assetUploadResults;
             }
@@ -290,10 +278,6 @@ export default class UpdatePublish extends EasCommand {
             const totalAssets = assetUploadResults.length;
             const missingAssetCount = assetUploadResults.filter(a => !a.finished).length;
             assetSpinner.text = `Uploading (${totalAssets - missingAssetCount}/${totalAssets})`;
-          },
-          () => {
-            // when an upload is retried, reset the timeout as we know this will now need more time
-            timeAtWhichToTimeout = Date.now() + NO_ACTIVITY_TIMEOUT; // reset timeout to NO_ACTIVITY_TIMEOUT
           }
         ),
         (async () => {
@@ -362,12 +346,7 @@ export default class UpdatePublish extends EasCommand {
       throw e;
     }
 
-    const runtimeVersions = await getRuntimeVersionObjectAsync(
-      exp,
-      realizedPlatforms,
-      projectDir,
-      vcsClient
-    );
+    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
     const runtimeToPlatformMapping =
       getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
 
@@ -381,11 +360,12 @@ export default class UpdatePublish extends EasCommand {
         branchId,
         channelName: branchName,
       });
-      Log.withTick(
-        `Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`
-      );
     }
 
+    Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);
+
+    const vcsClient = getVcsClient();
+
     const gitCommitHash = await vcsClient.getCommitHashAsync();
     const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
 
@@ -543,7 +523,7 @@ export default class UpdatePublish extends EasCommand {
   private sanitizeFlags(flags: RawUpdateFlags): UpdateFlags {
     const nonInteractive = flags['non-interactive'] ?? false;
 
-    const { auto, branch: branchName, channel: channelName, dev, message: updateMessage } = flags;
+    const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
     if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
       Errors.error(
         '--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified',
@@ -572,7 +552,6 @@ export default class UpdatePublish extends EasCommand {
       auto,
       branchName,
       channelName,
-      dev,
       updateMessage,
       inputDir: flags['input-dir'],
       skipBundler: flags['skip-bundler'],

packages/eas-cli/src/commands/update/roll-back-to-embedded.ts

@@ -20,10 +20,7 @@ import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
-import {
-  enforceRollBackToEmbeddedUpdateSupportAsync,
-  getOwnerAccountForProjectIdAsync,
-} from '../../project/projectUtils';
+import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import {
   ExpoCLIExportPlatformFlag,
   defaultPublishPlatforms,
@@ -46,6 +43,7 @@ import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
+import { getVcsClient } from '../../vcs';
 
 type RawUpdateFlags = {
   auto: boolean;
@@ -70,6 +68,7 @@ type UpdateFlags = {
 };
 
 export default class UpdateRollBackToEmbedded extends EasCommand {
+  static override hidden = true; // until we launch
   static override description = 'roll back to the embedded update';
 
   static override flags = {
@@ -87,11 +86,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
     }),
     platform: Flags.enum({
       char: 'p',
-      options: [
-        // TODO: Add web when it's fully supported
-        ...defaultPublishPlatforms,
-        'all',
-      ],
+      options: [...defaultPublishPlatforms, 'all'],
       default: 'all',
       required: false,
     }),
@@ -110,7 +105,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
   static override contextDefinition = {
     ...this.ContextOptions.DynamicProjectConfig,
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
   };
 
   async runAsync(): Promise<void> {
@@ -131,7 +125,6 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
       getDynamicPublicProjectConfigAsync,
       getDynamicPrivateProjectConfigAsync,
       loggedIn: { graphqlClient },
-      vcsClient,
     } = await this.getContextAsync(UpdateRollBackToEmbedded, {
       nonInteractive,
     });
@@ -153,19 +146,14 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
       platform: getRequestedPlatform(platformFlag),
       projectDir,
       projectId,
-      vcsClient,
     });
 
-    // check that the expo-updates package version supports roll back to embedded
-    await enforceRollBackToEmbeddedUpdateSupportAsync(projectDir);
-
     const { exp } = await getDynamicPublicProjectConfigAsync();
     const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
     const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
 
     const branchName = await getBranchNameForCommandAsync({
       graphqlClient,
-      vcsClient,
       projectId,
       channelNameArg,
       branchNameArg,
@@ -174,7 +162,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
       paginatedQueryOptions,
     });
 
-    const updateMessage = await getUpdateMessageForCommandAsync(vcsClient, {
+    const updateMessage = await getUpdateMessageForCommandAsync({
       updateMessageArg,
       autoFlag,
       nonInteractive,
@@ -198,15 +186,12 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
 
     Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);
 
+    const vcsClient = getVcsClient();
+
     const gitCommitHash = await vcsClient.getCommitHashAsync();
     const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
 
-    const runtimeVersions = await getRuntimeVersionObjectAsync(
-      exp,
-      realizedPlatforms,
-      projectDir,
-      vcsClient
-    );
+    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
 
     let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
     const publishSpinner = ora('Publishing...').start();

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

@@ -8,6 +8,8 @@ import UpdateRollBackToEmbedded from './roll-back-to-embedded';
 export default class UpdateRollback extends EasCommand {
   static override description = 'roll back to an embedded update or an existing update';
 
+  static override hidden = true;
+
   static override flags = {
     'private-key-path': Flags.string({
       description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,

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

@@ -11,7 +11,6 @@ import {
 } from '../../../project/projectUtils';
 import { promptAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
-import { AndroidPackageNotDefinedError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
 
 /**
@@ -109,11 +108,10 @@ export async function getAppLookupParamsFromContextAsync(
   const androidApplicationIdentifier = await getApplicationIdAsync(
     ctx.projectDir,
     ctx.exp,
-    ctx.vcsClient,
     gradleContext
   );
   if (!androidApplicationIdentifier) {
-    throw new AndroidPackageNotDefinedError(
+    throw new Error(
       `android.package needs to be defined in your ${getProjectConfigDescription(
         ctx.projectDir
       )} file`

packages/eas-cli/src/credentials/android/api/GraphqlClient.ts

@@ -260,6 +260,7 @@ export async function createKeystoreAsync(
       keystorePassword: keystore.keystorePassword,
       keyAlias: keystore.keyAlias,
       keyPassword: keystore.keyPassword,
+      type: keystore.type,
     },
     account.id
   );

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

@@ -9,7 +9,6 @@ import Log from '../log';
 import { getPrivateExpoConfig } from '../project/expoConfig';
 import { confirmAsync } from '../prompts';
 import { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
@@ -29,7 +28,6 @@ export class CredentialsContext {
   public readonly user: Actor;
   public readonly graphqlClient: ExpoGraphqlClient;
   public readonly analytics: Analytics;
-  public readonly vcsClient: Client;
   public readonly easJsonCliConfig?: EasJson['cli'];
 
   private shouldAskAuthenticateAppStore: boolean = true;
@@ -46,7 +44,6 @@ export class CredentialsContext {
       user: Actor;
       graphqlClient: ExpoGraphqlClient;
       analytics: Analytics;
-      vcsClient: Client;
       env?: Env;
     }
   ) {
@@ -55,7 +52,6 @@ export class CredentialsContext {
     this.user = options.user;
     this.graphqlClient = options.graphqlClient;
     this.analytics = options.analytics;
-    this.vcsClient = options.vcsClient;
     this.nonInteractive = options.nonInteractive ?? false;
     this.projectInfo = options.projectInfo;
   }

packages/eas-cli/src/credentials/credentialsJson/update.ts

@@ -6,8 +6,8 @@ import { AndroidAppBuildCredentialsFragment, IosDistributionType } from '../../g
 import Log from '../../log';
 import { findApplicationTarget, findTargetByName } from '../../project/ios/target';
 import zipObject from '../../utils/expodash/zipObject';
+import { getVcsClient } from '../../vcs';
 import GitClient from '../../vcs/clients/git';
-import { Client } from '../../vcs/vcs';
 import { CredentialsContext } from '../context';
 import { App, Target, TargetCredentials } from '../ios/types';
 import { readRawAsync } from './read';
@@ -38,7 +38,7 @@ export async function updateAndroidCredentialsAsync(
     rawCredentialsJson?.android?.keystore?.keystorePath ?? 'credentials/android/keystore.jks';
   Log.log(`Writing Keystore to ${keystorePath}`);
   await updateFileAsync(ctx.projectDir, keystorePath, keystore.keystore);
-  const shouldWarnKeystore = await isFileUntrackedAsync(keystorePath, ctx.vcsClient);
+  const shouldWarnKeystore = await isFileUntrackedAsync(keystorePath);
 
   const androidCredentials: Partial<CredentialsJson['android']> = {
     keystore: {
@@ -52,7 +52,7 @@ export async function updateAndroidCredentialsAsync(
   await fs.writeJson(getCredentialsJsonPath(ctx.projectDir), rawCredentialsJson, {
     spaces: 2,
   });
-  const shouldWarnCredentialsJson = await isFileUntrackedAsync('credentials.json', ctx.vcsClient);
+  const shouldWarnCredentialsJson = await isFileUntrackedAsync('credentials.json');
 
   const newFilePaths = [];
   if (shouldWarnKeystore) {
@@ -137,14 +137,14 @@ export async function updateIosCredentialsAsync(
 
   const newFilePaths = [];
   for (const [, targetCredentials] of Object.entries(iosCredentials)) {
-    if (await isFileUntrackedAsync(targetCredentials.distributionCertificate.path, ctx.vcsClient)) {
+    if (await isFileUntrackedAsync(targetCredentials.distributionCertificate.path)) {
       newFilePaths.push(targetCredentials.distributionCertificate.path);
     }
-    if (await isFileUntrackedAsync(targetCredentials.provisioningProfilePath, ctx.vcsClient)) {
+    if (await isFileUntrackedAsync(targetCredentials.provisioningProfilePath)) {
       newFilePaths.push(targetCredentials.provisioningProfilePath);
     }
   }
-  if (await isFileUntrackedAsync('credentials.json', ctx.vcsClient)) {
+  if (await isFileUntrackedAsync('credentials.json')) {
     newFilePaths.push('credentials.json');
   }
   displayUntrackedFilesWarning(newFilePaths);
@@ -296,7 +296,8 @@ async function updateFileAsync(
   }
 }
 
-async function isFileUntrackedAsync(path: string, vcsClient: Client): Promise<boolean> {
+async function isFileUntrackedAsync(path: string): Promise<boolean> {
+  const vcsClient = getVcsClient();
   if (vcsClient instanceof GitClient) {
     return await vcsClient.isFileUntrackedAsync(path);
   }

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

@@ -15,9 +15,3 @@ export class UnsupportedCredentialsChoiceError extends Error {
     super(message);
   }
 }
-
-export class AndroidPackageNotDefinedError extends Error {
-  constructor(message?: string) {
-    super(message ?? 'android.package needs to be defined in your app.json/app.config.js file');
-  }
-}

packages/eas-cli/src/credentials/ios/actions/DeviceUtils.ts

@@ -31,7 +31,7 @@ export function formatDeviceLabel(device: AppleDeviceFragment): string {
   const deviceDetails = formatDeviceDetails(device);
   return `${device.identifier}${deviceDetails !== '' ? ` ${deviceDetails}` : ''}${
     device.name ? ` (${device.name})` : ''
-  }${device.createdAt ? ` (created at: ${device.createdAt})` : ''}`;
+  }`;
 }
 
 function formatDeviceDetails(device: AppleDeviceFragment): string {

packages/eas-cli/src/credentials/ios/actions/__tests__/DeviceUtils-test.ts

@@ -1,25 +0,0 @@
-import { v4 as uuidv4 } from 'uuid';
-
-import { AppleDeviceClass, AppleDeviceFragment } from '../../../../graphql/generated';
-import { formatDeviceLabel } from '../DeviceUtils';
-
-describe(formatDeviceLabel, () => {
-  it('returns createdAt clause', async () => {
-    const currentDate = new Date();
-    const appleDevice = {
-      __typename: 'AppleDevice',
-      id: uuidv4(),
-      identifier: 'test-apple-device-id',
-      name: 'test-apple-device-name',
-      model: '15',
-      deviceClass: AppleDeviceClass.Iphone,
-      createdAt: currentDate.toISOString(),
-    } as AppleDeviceFragment;
-
-    const result = formatDeviceLabel(appleDevice);
-
-    expect(result).toEqual(
-      `test-apple-device-id (iPhone 15) (test-apple-device-name) (created at: ${currentDate.toISOString()})`
-    );
-  });
-});

packages/eas-cli/src/credentials/ios/actions/__tests__/SetUpAdhocProvisioningProfile-test.ts

@@ -15,7 +15,6 @@ import {
 import Log from '../../../../log';
 import { getApplePlatformFromTarget } from '../../../../project/ios/target';
 import { Actor } from '../../../../user/User';
-import { Client } from '../../../../vcs/vcs';
 import { CredentialsContext, CredentialsContextProjectInfo } from '../../../context';
 import { ProvisioningProfile } from '../../appstore/Credentials.types';
 import { ApplePlatform } from '../../appstore/constants';
@@ -119,7 +118,6 @@ function setUpTest(): { ctx: CredentialsContext; distCert: AppleDistributionCert
         graphqlClient: ExpoGraphqlClient;
         analytics: Analytics;
         env?: Env;
-        vcsClient: Client;
       }
     )
   );

packages/eas-cli/src/credentials/ios/appstore/authenticate.ts

@@ -8,7 +8,6 @@ import {
 } from '@expo/apple-utils';
 import assert from 'assert';
 import chalk from 'chalk';
-import { int } from 'getenv';
 
 import Log from '../../../log';
 import { toggleConfirmAsync } from '../../../prompts';
@@ -189,10 +188,7 @@ async function authenticateAsUserAsync(options: Options = {}): Promise<AuthCtx>
     const authState = await loginAsync(
       {
         cookies: options.cookies,
-        teamId: options.teamId ?? process.env.EXPO_APPLE_TEAM_ID,
-        providerId: process.env.EXPO_APPLE_PROVIDER_ID
-          ? int(process.env.EXPO_APPLE_PROVIDER_ID)
-          : undefined,
+        teamId: options.teamId,
       },
       {
         // TODO: Provide a way to disable this for users who want to mix and match teams / providers.

packages/eas-cli/src/credentials/ios/appstore/bundleIdCapabilities.ts

@@ -733,13 +733,6 @@ export const CapabilityMapping: CapabilityClassifier[] = [
     validateOptions: validateBooleanOptions,
     getOptions: getBooleanOptions,
   },
-  {
-    entitlement: 'com.apple.developer.proximity-reader.payment.acceptance',
-    name: 'Tap to Pay on iPhone',
-    capability: CapabilityType.TAP_TO_PAY_ON_IPHONE,
-    validateOptions: validateBooleanOptions,
-    getOptions: getBooleanOptions,
-  },
   {
     entitlement: 'com.apple.developer.matter.allow-setup-payload',
     name: 'Matter Allow Setup Payload',

packages/eas-cli/src/credentials/manager/HelperActions.ts

@@ -4,14 +4,12 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import Log from '../../log';
 import { pressAnyKeyToContinueAsync } from '../../prompts';
 import { Actor } from '../../user/User';
-import { Client } from '../../vcs/vcs';
 import { CredentialsContext, CredentialsContextProjectInfo } from '../context';
 
 export interface Action<T = void> {
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  vcsClient: Client;
   projectInfo: CredentialsContextProjectInfo | null;
   getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
   runAsync(ctx: CredentialsContext): Promise<T>;

packages/eas-cli/src/credentials/manager/ManageAndroid.ts

@@ -27,7 +27,6 @@ import {
   displayEmptyAndroidCredentials,
 } from '../android/utils/printCredentials';
 import { CredentialsContext, CredentialsContextProjectInfo } from '../context';
-import { AndroidPackageNotDefinedError } from '../errors';
 import { ActionInfo, AndroidActionType, Scope } from './Actions';
 import {
   buildCredentialsActions,
@@ -65,7 +64,6 @@ export class ManageAndroid {
       analytics: this.callingAction.analytics,
       env: buildProfile?.env,
       nonInteractive: false,
-      vcsClient: this.callingAction.vcsClient,
     });
 
     let gradleContext;
@@ -133,12 +131,6 @@ export class ManageAndroid {
 
         await this.runProjectSpecificActionAsync(ctx, chosenAction, gradleContext);
       } catch (err) {
-        if (err instanceof AndroidPackageNotDefinedError) {
-          err.message += `\n${learnMore(
-            'https://docs.expo.dev/workflow/configuration/'
-          )} about configuration with app.json/app.config.js`;
-          throw err; // breaks out of the loop to avoid failing again after continuation
-        }
         Log.error(err);
         if (process.env.DEBUG) {
           throw err; // breaks out of the loop so we can get stack trace
@@ -154,7 +146,7 @@ export class ManageAndroid {
     buildProfile: BuildProfile<Platform.ANDROID>
   ): Promise<GradleBuildContext | undefined> {
     assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
-    return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile, ctx.vcsClient);
+    return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
   }
 
   private async runProjectSpecificActionAsync(

packages/eas-cli/src/credentials/manager/ManageIos.ts

@@ -78,7 +78,6 @@ export class ManageIos {
       analytics: this.callingAction.analytics,
       env: buildProfile?.env,
       nonInteractive: false,
-      vcsClient: this.callingAction.vcsClient,
     });
     const buildCredentialsActions = getBuildCredentialsActions(ctx);
     const pushKeyActions = getPushKeyActions(ctx);
@@ -195,7 +194,6 @@ export class ManageIos {
         projectDir: ctx.projectDir,
         nonInteractive: ctx.nonInteractive,
         exp: ctx.exp,
-        vcsClient: ctx.vcsClient,
       },
       buildProfile
     );
@@ -204,7 +202,6 @@ export class ManageIos {
       projectDir: ctx.projectDir,
       xcodeBuildContext,
       env: buildProfile.env,
-      vcsClient: ctx.vcsClient,
     });
     return {
       app,

packages/eas-cli/src/credentials/manager/SelectPlatform.ts

@@ -3,7 +3,6 @@ import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjec
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { selectPlatformAsync } from '../../platform';
 import { Actor } from '../../user/User';
-import { Client } from '../../vcs/vcs';
 import { CredentialsContextProjectInfo } from '../context';
 import { ManageAndroid } from './ManageAndroid';
 import { ManageIos } from './ManageIos';
@@ -12,7 +11,6 @@ export class SelectPlatform {
   constructor(
     public readonly actor: Actor,
     public readonly graphqlClient: ExpoGraphqlClient,
-    public readonly vcsClient: Client,
     public readonly analytics: Analytics,
     public readonly projectInfo: CredentialsContextProjectInfo | null,
     public readonly getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn,

packages/eas-cli/src/credentials/manager/__tests__/ManageAndroid-test.ts

@@ -1,71 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonUtils } from '@expo/eas-json';
-
-import { Analytics } from '../../../analytics/AnalyticsManager';
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { learnMore } from '../../../log';
-import { getProjectConfigDescription } from '../../../project/projectUtils';
-import { pressAnyKeyToContinueAsync } from '../../../prompts';
-import { Actor } from '../../../user/User';
-import { Client } from '../../../vcs/vcs';
-import { getAppLookupParamsFromContextAsync } from '../../android/actions/BuildCredentialsUtils';
-import { CredentialsContextProjectInfo } from '../../context';
-import { AndroidPackageNotDefinedError } from '../../errors';
-import { Action } from '../HelperActions';
-import { ManageAndroid } from '../ManageAndroid';
-
-jest.mock('../../android/actions/BuildCredentialsUtils');
-jest.mock('../../../prompts', () => {
-  return {
-    ...jest.requireActual('../../../prompts'),
-    pressAnyKeyToContinueAsync: jest.fn(),
-  };
-});
-jest.mock('../../../project/projectUtils');
-
-describe('runAsync', () => {
-  describe('"android.package" missing in app.json', () => {
-    const manageAndroid = new ManageAndroid(
-      {
-        projectInfo: {} as CredentialsContextProjectInfo,
-        actor: {} as Actor,
-        graphqlClient: {} as ExpoGraphqlClient,
-        analytics: {} as Analytics,
-        vcsClient: {} as Client,
-        getDynamicPrivateProjectConfigAsync: jest
-          .fn()
-          .mockResolvedValue({ exp: {}, projectId: '' }),
-        runAsync: jest.fn(),
-      } as Action,
-      ''
-    );
-    it('does not repeat the error indefinitely and prints useful error', async () => {
-      jest.spyOn(EasJsonUtils, 'getBuildProfileNamesAsync').mockResolvedValue(['testProfile']);
-      jest
-        .spyOn(EasJsonUtils, 'getBuildProfileAsync')
-        .mockResolvedValue({} as BuildProfile<Platform.ANDROID>);
-      jest.mocked(getProjectConfigDescription).mockReturnValue('app.json');
-      jest.mocked(getAppLookupParamsFromContextAsync).mockImplementation(() => {
-        throw new AndroidPackageNotDefinedError(
-          'Specify "android.package" in app.json and run this command again.'
-        );
-      });
-      const pressAnyKeyToContinueAsyncMock = jest.mocked(pressAnyKeyToContinueAsync);
-      Array.from(Array(100)).map((_, i) => {
-        // continue 101 times if error is rethrown indefinitely
-        pressAnyKeyToContinueAsyncMock.mockResolvedValueOnce();
-      });
-      pressAnyKeyToContinueAsyncMock.mockImplementationOnce(async () => {
-        // fail after 102nd time
-        fail('test should not reach this place - if it does, the error repeats indefinitely');
-      });
-      const reThrownError = new AndroidPackageNotDefinedError(
-        'Specify "android.package" in app.json and run this command again.\n' +
-          `${learnMore(
-            'https://docs.expo.dev/workflow/configuration/'
-          )} about configuration with app.json/app.config.js`
-      );
-      await expect(manageAndroid.runAsync()).rejects.toThrow(reThrownError);
-    });
-  });
-});

packages/eas-cli/src/graphql/queries/ChannelQuery.ts

@@ -60,7 +60,6 @@ export const ChannelQuery = {
                   updateChannelByName(name: $channelName) {
                     id
                     name
-                    updatedAt
                     createdAt
                     branchMapping
                     updateBranches(offset: 0, limit: 5) {
@@ -105,7 +104,6 @@ export const ChannelQuery = {
                   updateChannels(offset: $offset, limit: $limit) {
                     id
                     name
-                    updatedAt
                     createdAt
                     branchMapping
                     updateBranches(offset: 0, limit: 5) {

packages/eas-cli/src/graphql/types/Account.ts

@@ -4,10 +4,6 @@ export const AccountFragmentNode = gql`
   fragment AccountFragment on Account {
     id
     name
-    ownerUserActor {
-      id
-      username
-    }
     users {
       actor {
         id

packages/eas-cli/src/graphql/types/Build.ts

@@ -17,7 +17,6 @@ export const BuildFragmentNode = gql`
       buildUrl
       xcodeBuildLogsUrl
       applicationArchiveUrl
-      buildArtifactsUrl
     }
     initiatingActor {
       __typename

packages/eas-cli/src/graphql/types/credentials/AppleDevice.ts

@@ -15,6 +15,5 @@ export const AppleDeviceFragmentNode = gql`
     name
     model
     deviceClass
-    createdAt
   }
 `;

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

@@ -6,7 +6,6 @@ import assert from 'assert';
 import { CredentialsContext } from '../credentials/context';
 import { getRequestContext } from '../credentials/ios/appstore/authenticate';
 import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
-import { Client } from '../vcs/vcs';
 
 export type MetadataAppStoreAuthentication = {
   /** The root entity of the App store */
@@ -22,14 +21,13 @@ export type MetadataAppStoreAuthentication = {
 async function resolveAppStoreBundleIdentifierAsync(
   projectDir: string,
   profile: SubmitProfile,
-  exp: ExpoConfig,
-  vcsClient: Client
+  exp: ExpoConfig
 ): Promise<string> {
   if ('bundleIdentifier' in profile) {
-    return profile.bundleIdentifier ?? (await getBundleIdentifierAsync(projectDir, exp, vcsClient));
+    return profile.bundleIdentifier ?? (await getBundleIdentifierAsync(projectDir, exp));
   }
 
-  return await getBundleIdentifierAsync(projectDir, exp, vcsClient);
+  return await getBundleIdentifierAsync(projectDir, exp);
 }
 
 /**
@@ -47,12 +45,7 @@ export async function getAppStoreAuthAsync({
   exp: ExpoConfig;
   credentialsCtx: CredentialsContext;
 }): Promise<MetadataAppStoreAuthentication> {
-  const bundleId = await resolveAppStoreBundleIdentifierAsync(
-    projectDir,
-    profile,
-    exp,
-    credentialsCtx.vcsClient
-  );
+  const bundleId = await resolveAppStoreBundleIdentifierAsync(projectDir, profile, exp);
 
   const authCtx = await credentialsCtx.appStore.ensureAuthenticatedAsync();
   assert(authCtx.authState, 'Failed to authenticate with App Store Connect');

packages/eas-cli/src/project/__tests__/projectUtils.test.ts

@@ -1,68 +0,0 @@
-import { AppJSONConfig, PackageJSONConfig } from '@expo/config';
-import { vol } from 'memfs';
-import path from 'path';
-import resolveFrom from 'resolve-from';
-
-import { enforceRollBackToEmbeddedUpdateSupportAsync } from '../projectUtils';
-
-jest.mock('fs');
-jest.mock('resolve-from');
-
-const projectRoot = '/test-project';
-
-describe(enforceRollBackToEmbeddedUpdateSupportAsync, () => {
-  it('does not throw when an appropriate version is installed', async () => {
-    mockTestProject('0.19.1');
-
-    await enforceRollBackToEmbeddedUpdateSupportAsync(projectRoot);
-  });
-
-  it('throws when an unappropriate version is installed', async () => {
-    mockTestProject('0.18.0');
-
-    await expect(enforceRollBackToEmbeddedUpdateSupportAsync(projectRoot)).rejects.toThrowError(
-      'The expo-updates package must have a version >= 0.19.0 to use roll back to embedded, which corresponds to Expo SDK 50 or greater.'
-    );
-  });
-});
-
-function mockTestProject(expoUpdatesPackageVersion: string): { appJson: AppJSONConfig } {
-  const packageJSON: PackageJSONConfig = {
-    name: 'testing123',
-    version: '0.1.0',
-    description: 'fake description',
-    main: 'index.js',
-    dependencies: {
-      'expo-updates': expoUpdatesPackageVersion,
-    },
-  };
-
-  const expoUpdatesPackageJSON: PackageJSONConfig = {
-    name: 'expo-updates',
-    version: expoUpdatesPackageVersion,
-  };
-
-  const appJSON: AppJSONConfig = {
-    expo: {
-      name: 'testing 123',
-      version: '0.1.0',
-      slug: 'testing-123',
-      sdkVersion: '33.0.0',
-    },
-  };
-
-  jest
-    .mocked(resolveFrom.silent)
-    .mockReturnValue(path.join(projectRoot, 'node_modules/expo-updates/package.json'));
-
-  vol.fromJSON(
-    {
-      'package.json': JSON.stringify(packageJSON),
-      'app.json': JSON.stringify(appJSON),
-      'node_modules/expo-updates/package.json': JSON.stringify(expoUpdatesPackageJSON),
-    },
-    projectRoot
-  );
-
-  return { appJson: appJSON };
-}

packages/eas-cli/src/project/__tests__/publish-test.ts

@@ -576,7 +576,6 @@ describe(uploadAssetsAsync, () => {
         assetsForUpdateInfoGroup,
         testProjectId,
         { isCanceledOrFinished: false },
-        () => {},
         () => {}
       )
     ).resolves.toEqual({
@@ -623,7 +622,6 @@ describe(uploadAssetsAsync, () => {
         {
           isCanceledOrFinished: false,
         },
-        () => {},
         () => {}
       )
     ).resolves.toEqual({
@@ -669,8 +667,7 @@ describe(uploadAssetsAsync, () => {
       assetsForUpdateInfoGroup,
       testProjectId,
       { isCanceledOrFinished: false },
-      onAssetUploadResultsChangedFn,
-      () => {}
+      onAssetUploadResultsChangedFn
     );
     expect(onAssetUploadResultsChangedFn).toHaveBeenCalledTimes(3);
   });

packages/eas-cli/src/project/__tests__/workflow-test.ts

@@ -1,13 +1,11 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { vol } from 'memfs';
 
-import { getVcsClient } from '../../vcs';
 import { resolveWorkflowAsync, resolveWorkflowPerPlatformAsync } from '../workflow';
 
 jest.mock('fs');
 
 const projectDir = '/app';
-const vcsClient = getVcsClient();
 
 describe(resolveWorkflowAsync, () => {
   beforeEach(() => {
@@ -23,12 +21,10 @@ describe(resolveWorkflowAsync, () => {
       projectDir
     );
 
-    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)).resolves.toBe(
-      Workflow.GENERIC
-    );
-    await expect(resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)).resolves.toBe(
+    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID)).resolves.toBe(
       Workflow.GENERIC
     );
+    await expect(resolveWorkflowAsync(projectDir, Platform.IOS)).resolves.toBe(Workflow.GENERIC);
   });
 
   test('bare workflow for single platform', async () => {
@@ -39,12 +35,10 @@ describe(resolveWorkflowAsync, () => {
       projectDir
     );
 
-    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)).resolves.toBe(
+    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID)).resolves.toBe(
       Workflow.MANAGED
     );
-    await expect(resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)).resolves.toBe(
-      Workflow.GENERIC
-    );
+    await expect(resolveWorkflowAsync(projectDir, Platform.IOS)).resolves.toBe(Workflow.GENERIC);
   });
 
   test('android/ios directories are ignored', async () => {
@@ -57,12 +51,10 @@ describe(resolveWorkflowAsync, () => {
       projectDir
     );
 
-    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)).resolves.toBe(
-      Workflow.MANAGED
-    );
-    await expect(resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)).resolves.toBe(
+    await expect(resolveWorkflowAsync(projectDir, Platform.ANDROID)).resolves.toBe(
       Workflow.MANAGED
     );
+    await expect(resolveWorkflowAsync(projectDir, Platform.IOS)).resolves.toBe(Workflow.MANAGED);
   });
 });
 
@@ -80,7 +72,7 @@ describe(resolveWorkflowPerPlatformAsync, () => {
       projectDir
     );
 
-    await expect(resolveWorkflowPerPlatformAsync(projectDir, vcsClient)).resolves.toEqual({
+    await expect(resolveWorkflowPerPlatformAsync(projectDir)).resolves.toEqual({
       android: Workflow.GENERIC,
       ios: Workflow.GENERIC,
     });

packages/eas-cli/src/project/android/__tests__/applicationId-test.ts

@@ -7,7 +7,6 @@ import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/cr
 import { jester, jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../prompts';
-import { getVcsClient } from '../../../vcs';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
@@ -18,8 +17,6 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
 
-const vcsClient = getVcsClient();
-
 beforeEach(async () => {
   vol.reset();
 
@@ -47,9 +44,7 @@ describe(getApplicationIdAsync, () => {
         '/app'
       );
 
-      const applicationId = await getApplicationIdAsync('/app', {} as any, vcsClient, {
-        moduleName: 'app',
-      });
+      const applicationId = await getApplicationIdAsync('/app', {} as any, { moduleName: 'app' });
       expect(applicationId).toBe('com.expo.notdominik');
     });
 
@@ -61,9 +56,9 @@ describe(getApplicationIdAsync, () => {
         },
         '/app'
       );
-      await expect(
-        getApplicationIdAsync('/app', {} as any, vcsClient, undefined)
-      ).rejects.toThrowError(/Failed to find 'build.gradle' /);
+      await expect(getApplicationIdAsync('/app', {} as any, undefined)).rejects.toThrowError(
+        /Failed to find 'build.gradle' /
+      );
     });
 
     it('throws an error if the project does not have applicationId defined in build.gradle', async () => {
@@ -76,7 +71,7 @@ describe(getApplicationIdAsync, () => {
       );
 
       await expect(
-        getApplicationIdAsync('/app', {} as any, vcsClient, { moduleName: 'app' })
+        getApplicationIdAsync('/app', {} as any, { moduleName: 'app' })
       ).rejects.toThrowError(/Could not read applicationId/);
     });
   });
@@ -88,7 +83,6 @@ describe(getApplicationIdAsync, () => {
         {
           android: { package: 'com.expo.notdominik' },
         } as any,
-        vcsClient,
         { moduleName: 'app' }
       );
       expect(applicationId).toBe('com.expo.notdominik');
@@ -96,20 +90,15 @@ describe(getApplicationIdAsync, () => {
 
     it('throws an error if Android package is not defined in app config', async () => {
       await expect(
-        getApplicationIdAsync('/app', {} as any, vcsClient, { moduleName: 'app' })
+        getApplicationIdAsync('/app', {} as any, { moduleName: 'app' })
       ).rejects.toThrowError(/Specify "android.package"/);
     });
 
     it('throws an error if Android package in app config is invalid', async () => {
       await expect(
-        getApplicationIdAsync(
-          '/app',
-          { android: { package: '1com.expo.notdominik' } } as any,
-          vcsClient,
-          {
-            moduleName: 'app',
-          }
-        )
+        getApplicationIdAsync('/app', { android: { package: '1com.expo.notdominik' } } as any, {
+          moduleName: 'app',
+        })
       ).rejects.toThrowError(/Specify "android.package"/);
     });
   });
@@ -132,7 +121,6 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
           projectDir: '/app',
           projectId: '',
           exp: {} as any,
-          vcsClient,
         })
       ).rejects.toThrowError(/we can't update this file programmatically/);
     });
@@ -162,7 +150,6 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
           projectDir: '/app',
           projectId: '',
           exp: {} as any,
-          vcsClient,
         })
       ).resolves.toBe('com.expo.notdominik');
       expect(promptAsync).toHaveBeenCalled();
@@ -195,7 +182,6 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
           projectDir: '/app',
           projectId: '',
           exp: {} as any,
-          vcsClient,
         })
       ).resolves.toBe('com.expo.notdominik');
       const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));

packages/eas-cli/src/project/android/__tests__/gradle-test.ts

@@ -4,15 +4,12 @@ import os from 'os';
 
 import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { promptAsync } from '../../../prompts';
-import { getVcsClient } from '../../../vcs';
 import { resolveGradleBuildContextAsync } from '../gradle';
 
 jest.mock('fs');
 jest.mock('../../../prompts');
 jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
 
-const vcsClient = getVcsClient();
-
 beforeEach(async () => {
   vol.reset();
   // do not remove the following line
@@ -39,7 +36,7 @@ describe(resolveGradleBuildContextAsync, () => {
         '/app'
       );
 
-      const gradleContext = await resolveGradleBuildContextAsync('/app', {} as any, vcsClient);
+      const gradleContext = await resolveGradleBuildContextAsync('/app', {} as any);
       expect(gradleContext).toEqual({ moduleName: 'app' });
     });
     it('resolves to flavor', async () => {
@@ -62,13 +59,9 @@ describe(resolveGradleBuildContextAsync, () => {
         '/app'
       );
 
-      const gradleContext = await resolveGradleBuildContextAsync(
-        '/app',
-        {
-          gradleCommand: ':app:buildAbcRelease',
-        } as any,
-        vcsClient
-      );
+      const gradleContext = await resolveGradleBuildContextAsync('/app', {
+        gradleCommand: ':app:buildAbcRelease',
+      } as any);
       expect(gradleContext).toEqual({ moduleName: 'app', flavor: 'abc' });
     });
 
@@ -80,13 +73,9 @@ describe(resolveGradleBuildContextAsync, () => {
         },
         '/app'
       );
-      const gradleContext = await resolveGradleBuildContextAsync(
-        '/app',
-        {
-          gradleCommand: ':app:buildAbcRelease',
-        } as any,
-        vcsClient
-      );
+      const gradleContext = await resolveGradleBuildContextAsync('/app', {
+        gradleCommand: ':app:buildAbcRelease',
+      } as any);
       expect(gradleContext).toEqual(undefined);
     });
     it('returns undefined if flavor does not exist', async () => {
@@ -104,20 +93,16 @@ describe(resolveGradleBuildContextAsync, () => {
         '/app'
       );
 
-      const gradleContext = await resolveGradleBuildContextAsync(
-        '/app',
-        {
-          gradleCommand: ':app:buildAbcRelease',
-        } as any,
-        vcsClient
-      );
+      const gradleContext = await resolveGradleBuildContextAsync('/app', {
+        gradleCommand: ':app:buildAbcRelease',
+      } as any);
       expect(gradleContext).toEqual(undefined);
     });
   });
 
   describe('managed projects', () => {
     it('resolves to { moduleName: app } for managed projects', async () => {
-      const gradleContext = await resolveGradleBuildContextAsync('/app', {} as any, {} as any);
+      const gradleContext = await resolveGradleBuildContextAsync('/app', {} as any);
       expect(gradleContext).toEqual({ moduleName: 'app' });
     });
   });

packages/eas-cli/src/project/android/applicationId.ts

@@ -15,7 +15,6 @@ import {
   getProjectConfigDescription,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { Client } from '../../vcs/vcs';
 import { resolveWorkflowAsync } from '../workflow';
 import { GradleBuildContext } from './gradle';
 import * as gradleUtils from './gradleUtils';
@@ -27,19 +26,17 @@ export async function ensureApplicationIdIsDefinedForManagedProjectAsync({
   projectDir,
   projectId,
   exp,
-  vcsClient,
 }: {
   graphqlClient: ExpoGraphqlClient;
   projectDir: string;
   projectId: string;
   exp: ExpoConfig;
-  vcsClient: Client;
 }): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
 
   try {
-    return await getApplicationIdAsync(projectDir, exp, vcsClient, {
+    return await getApplicationIdAsync(projectDir, exp, {
       moduleName: gradleUtils.DEFAULT_MODULE_NAME,
     });
   } catch {
@@ -98,10 +95,9 @@ export async function getApplicationIdFromBareAsync(
 export async function getApplicationIdAsync(
   projectDir: string,
   exp: ExpoConfig,
-  vcsClient: Client,
   gradleContext?: GradleBuildContext
 ): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
     warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
 

packages/eas-cli/src/project/android/gradle.ts

@@ -3,7 +3,6 @@ import { BuildProfile } from '@expo/eas-json';
 
 import Log from '../../log';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { Client } from '../../vcs/vcs';
 import * as gradleUtils from './gradleUtils';
 
 export interface GradleBuildContext {
@@ -13,10 +12,9 @@ export interface GradleBuildContext {
 
 export async function resolveGradleBuildContextAsync(
   projectDir: string,
-  buildProfile: BuildProfile<Platform.ANDROID>,
-  vcsClient: Client
+  buildProfile: BuildProfile<Platform.ANDROID>
 ): Promise<GradleBuildContext | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
     try {
       if (buildProfile.gradleCommand) {

packages/eas-cli/src/project/applicationIdentifier.ts

@@ -3,7 +3,6 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { Client } from '../vcs/vcs';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
@@ -24,7 +23,6 @@ export async function getApplicationIdentifierAsync({
   exp,
   buildProfile,
   platform,
-  vcsClient,
 }: {
   graphqlClient: ExpoGraphqlClient;
   projectDir: string;
@@ -32,11 +30,10 @@ export async function getApplicationIdentifierAsync({
   exp: ExpoConfig;
   buildProfile: BuildProfile;
   platform: Platform;
-  vcsClient: Client;
 }): Promise<string> {
   if (platform === Platform.ANDROID) {
     const profile = buildProfile as BuildProfile<Platform.ANDROID>;
-    const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+    const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
 
     if (workflow === Workflow.MANAGED) {
       return await ensureApplicationIdIsDefinedForManagedProjectAsync({
@@ -44,14 +41,13 @@ export async function getApplicationIdentifierAsync({
         projectDir,
         projectId,
         exp,
-        vcsClient,
       });
     }
 
-    const gradleContext = await resolveGradleBuildContextAsync(projectDir, profile, vcsClient);
-    return await getApplicationIdAsync(projectDir, exp, vcsClient, gradleContext);
+    const gradleContext = await resolveGradleBuildContextAsync(projectDir, profile);
+    return await getApplicationIdAsync(projectDir, exp, gradleContext);
   } else {
-    const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+    const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
     const profile = buildProfile as BuildProfile<Platform.IOS>;
     if (workflow === Workflow.MANAGED) {
       return await ensureBundleIdentifierIsDefinedForManagedProjectAsync({
@@ -59,12 +55,11 @@ export async function getApplicationIdentifierAsync({
         projectDir,
         projectId,
         exp,
-        vcsClient,
       });
     }
 
     const xcodeBuildContext = await resolveXcodeBuildContextAsync(
-      { exp, projectDir, nonInteractive: false, vcsClient },
+      { exp, projectDir, nonInteractive: false },
       profile
     );
     const targets = await resolveTargetsAsync({
@@ -72,10 +67,9 @@ export async function getApplicationIdentifierAsync({
       exp,
       xcodeBuildContext,
       env: profile.env,
-      vcsClient,
     });
     const applicationTarget = findApplicationTarget(targets);
-    return await getBundleIdentifierAsync(projectDir, exp, vcsClient, {
+    return await getBundleIdentifierAsync(projectDir, exp, {
       targetName: applicationTarget.targetName,
       buildConfiguration: applicationTarget.buildConfiguration,
     });

packages/eas-cli/src/project/ios/__tests__/bundleIdentifier-test.ts

@@ -8,7 +8,6 @@ import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/cr
 import { jester, jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { promptAsync } from '../../../prompts';
-import { getVcsClient } from '../../../vcs';
 import {
   ensureBundleIdentifierIsDefinedForManagedProjectAsync,
   getBundleIdentifierAsync,
@@ -20,8 +19,6 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
 
-const vcsClient = getVcsClient();
-
 beforeEach(async () => {
   vol.reset();
 
@@ -47,7 +44,7 @@ describe(getBundleIdentifierAsync, () => {
         '/app'
       );
 
-      const bundleIdentifier = await getBundleIdentifierAsync('/app', {} as any, vcsClient);
+      const bundleIdentifier = await getBundleIdentifierAsync('/app', {} as any);
       expect(bundleIdentifier).toBe('org.name.testproject');
     });
 
@@ -62,7 +59,7 @@ describe(getBundleIdentifierAsync, () => {
         '/app'
       );
 
-      await expect(getBundleIdentifierAsync('/app', {} as any, vcsClient)).rejects.toThrowError(
+      await expect(getBundleIdentifierAsync('/app', {} as any)).rejects.toThrowError(
         /Could not read bundle identifier/
       );
     });
@@ -70,25 +67,21 @@ describe(getBundleIdentifierAsync, () => {
 
   describe('managed projects', () => {
     it('reads bundleIdentifier from app config', async () => {
-      const applicationId = await getBundleIdentifierAsync(
-        '/app',
-        {
-          ios: { bundleIdentifier: 'com.expo.notdominik' },
-        } as any,
-        vcsClient
-      );
+      const applicationId = await getBundleIdentifierAsync('/app', {
+        ios: { bundleIdentifier: 'com.expo.notdominik' },
+      } as any);
       expect(applicationId).toBe('com.expo.notdominik');
     });
 
     it('throws an error if bundleIdentifier is not defined in app config', async () => {
-      await expect(getBundleIdentifierAsync('/app', {} as any, vcsClient)).rejects.toThrowError(
+      await expect(getBundleIdentifierAsync('/app', {} as any)).rejects.toThrowError(
         /Specify "ios.bundleIdentifier"/
       );
     });
 
     it('throws an error if bundleIdentifier in app config is invalid', async () => {
       await expect(
-        getBundleIdentifierAsync('/app', { ios: { bundleIdentifier: '' } } as any, vcsClient)
+        getBundleIdentifierAsync('/app', { ios: { bundleIdentifier: '' } } as any)
       ).rejects.toThrowError(/Specify "ios.bundleIdentifier"/);
     });
   });
@@ -110,7 +103,6 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
           projectDir: '/app',
           projectId: '1234',
           exp: {} as any,
-          vcsClient,
         })
       ).rejects.toThrowError(/we can't update this file programmatically/);
     });
@@ -140,7 +132,6 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
           projectDir: '/app',
           projectId: '1234',
           exp: {} as any,
-          vcsClient,
         })
       ).resolves.toBe('com.expo.notdominik');
       expect(promptAsync).toHaveBeenCalled();
@@ -171,7 +162,6 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
           projectDir: '/app',
           projectId: '1234',
           exp: {} as any,
-          vcsClient,
         })
       ).resolves.toBe('com.expo.notdominik');
       const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));

packages/eas-cli/src/project/ios/bundleIdentifier.ts

@@ -9,7 +9,6 @@ import { readAppJson } from '../../build/utils/appJson';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import Log, { learnMore } from '../../log';
 import { promptAsync } from '../../prompts';
-import { Client } from '../../vcs/vcs';
 import { getOwnerAccountForProjectIdAsync, getProjectConfigDescription } from '../projectUtils';
 import { resolveWorkflowAsync } from '../workflow';
 
@@ -20,19 +19,17 @@ export async function ensureBundleIdentifierIsDefinedForManagedProjectAsync({
   projectDir,
   projectId,
   exp,
-  vcsClient,
 }: {
   graphqlClient: ExpoGraphqlClient;
   projectDir: string;
   projectId: string;
   exp: ExpoConfig;
-  vcsClient: Client;
 }): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
 
   try {
-    return await getBundleIdentifierAsync(projectDir, exp, vcsClient);
+    return await getBundleIdentifierAsync(projectDir, exp);
   } catch {
     return await configureBundleIdentifierAsync({
       graphqlClient,
@@ -52,10 +49,9 @@ export class AmbiguousBundleIdentifierError extends Error {
 export async function getBundleIdentifierAsync(
   projectDir: string,
   exp: ExpoConfig,
-  vcsClient: Client,
   xcodeContext?: { targetName?: string; buildConfiguration?: string }
 ): Promise<string> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
 
@@ -205,14 +201,8 @@ async function getSuggestedBundleIdentifierAsync(
   } else {
     // the only callsite is heavily interactive
     const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-    let possibleId: string;
     // It's common to use dashes in your node project name, strip them from the suggested package name.
-    if (account.name) {
-      possibleId = `com.${account.name}.${exp.slug}`.split('-').join('');
-    } else {
-      possibleId = `com.${exp.slug}`.split('-').join('');
-    }
-
+    const possibleId = `com.${account.name}.${exp.slug}`.split('-').join('');
     if (isBundleIdentifierValid(possibleId)) {
       return possibleId;
     }

packages/eas-cli/src/project/ios/entitlements.ts

@@ -3,7 +3,6 @@ import { JSONObject } from '@expo/json-file';
 import { getPrebuildConfigAsync } from '@expo/prebuild-config';
 
 import { readPlistAsync } from '../../utils/plist';
-import { Client } from '../../vcs/vcs';
 import { hasIgnoredIosProjectAsync } from '../workflow';
 
 interface Target {
@@ -12,8 +11,7 @@ interface Target {
 }
 export async function getManagedApplicationTargetEntitlementsAsync(
   projectDir: string,
-  env: Record<string, string>,
-  vcsClient: Client
+  env: Record<string, string>
 ): Promise<JSONObject> {
   const originalProcessEnv: NodeJS.ProcessEnv = process.env;
 
@@ -28,7 +26,7 @@ export async function getManagedApplicationTargetEntitlementsAsync(
       projectRoot: projectDir,
       platforms: ['ios'],
       introspect: true,
-      ignoreExistingNativeFiles: await hasIgnoredIosProjectAsync(projectDir, vcsClient),
+      ignoreExistingNativeFiles: await hasIgnoredIosProjectAsync(projectDir),
     });
     return expWithMods.ios?.entitlements || {};
   } finally {

packages/eas-cli/src/project/ios/scheme.ts

@@ -7,7 +7,6 @@ import chalk from 'chalk';
 import Log from '../../log';
 import { promptAsync } from '../../prompts';
 import sortBy from '../../utils/expodash/sortBy';
-import { Client } from '../../vcs/vcs';
 import { resolveWorkflowAsync } from '../workflow';
 
 export interface XcodeBuildContext {
@@ -20,11 +19,10 @@ export async function resolveXcodeBuildContextAsync(
     exp,
     projectDir,
     nonInteractive,
-    vcsClient,
-  }: { exp: ExpoConfig; projectDir: string; nonInteractive: boolean; vcsClient: Client },
+  }: { exp: ExpoConfig; projectDir: string; nonInteractive: boolean },
   buildProfile: BuildProfile<Platform.IOS>
 ): Promise<XcodeBuildContext> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     const buildScheme =
       buildProfile.scheme ??

packages/eas-cli/src/project/ios/target.ts

@@ -7,7 +7,6 @@ import type { XCBuildConfiguration } from 'xcode';
 
 import { ApplePlatform } from '../../credentials/ios/appstore/constants';
 import { Target } from '../../credentials/ios/types';
-import { Client } from '../../vcs/vcs';
 import { resolveWorkflowAsync } from '../workflow';
 import { getBundleIdentifierAsync } from './bundleIdentifier';
 import {
@@ -28,7 +27,6 @@ interface ResolveTargetOptions {
   exp: ExpoConfig;
   env?: Record<string, string>;
   xcodeBuildContext: XcodeBuildContext;
-  vcsClient: Client;
 }
 
 const AppExtensionsConfigSchema = Joi.array().items(
@@ -45,23 +43,16 @@ export async function resolveManagedProjectTargetsAsync({
   projectDir,
   xcodeBuildContext,
   env,
-  vcsClient,
 }: ResolveTargetOptions): Promise<Target[]> {
   const { buildScheme, buildConfiguration } = xcodeBuildContext;
   const applicationTargetName = buildScheme;
-  const applicationTargetBundleIdentifier = await getBundleIdentifierAsync(
-    projectDir,
-    exp,
-    vcsClient,
-    {
-      targetName: applicationTargetName,
-      buildConfiguration,
-    }
-  );
+  const applicationTargetBundleIdentifier = await getBundleIdentifierAsync(projectDir, exp, {
+    targetName: applicationTargetName,
+    buildConfiguration,
+  });
   const applicationTargetEntitlements = await getManagedApplicationTargetEntitlementsAsync(
     projectDir,
-    env ?? {},
-    vcsClient
+    env ?? {}
   );
   const appExtensions: UserDefinedTarget[] =
     exp.extra?.eas?.build?.experimental?.ios?.appExtensions ?? [];
@@ -98,7 +89,6 @@ export async function resolveBareProjectTargetsAsync({
   exp,
   projectDir,
   xcodeBuildContext,
-  vcsClient,
 }: ResolveTargetOptions): Promise<Target[]> {
   const { buildScheme, buildConfiguration } = xcodeBuildContext;
   const result: Target[] = [];
@@ -108,7 +98,7 @@ export async function resolveBareProjectTargetsAsync({
     projectDir,
     buildScheme
   );
-  const bundleIdentifier = await getBundleIdentifierAsync(projectDir, exp, vcsClient, {
+  const bundleIdentifier = await getBundleIdentifierAsync(projectDir, exp, {
     targetName: applicationTarget.name,
     buildConfiguration,
   });
@@ -135,7 +125,6 @@ export async function resolveBareProjectTargetsAsync({
     target: applicationTarget,
     bundleIdentifier,
     pbxProject,
-    vcsClient,
   });
   if (dependencies.length > 0) {
     result.push(...dependencies);
@@ -145,7 +134,7 @@ export async function resolveBareProjectTargetsAsync({
 }
 
 export async function resolveTargetsAsync(opts: ResolveTargetOptions): Promise<Target[]> {
-  const workflow = await resolveWorkflowAsync(opts.projectDir, Platform.IOS, opts.vcsClient);
+  const workflow = await resolveWorkflowAsync(opts.projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     return await resolveBareProjectTargetsAsync(opts);
   } else if (workflow === Workflow.MANAGED) {
@@ -162,7 +151,6 @@ async function resolveBareProjectDependenciesAsync({
   target,
   bundleIdentifier,
   pbxProject,
-  vcsClient,
 }: {
   exp: ExpoConfig;
   projectDir: string;
@@ -170,7 +158,6 @@ async function resolveBareProjectDependenciesAsync({
   target: IOSConfig.Target.Target;
   bundleIdentifier: string;
   pbxProject: XcodeProject;
-  vcsClient: Client;
 }): Promise<Target[]> {
   const result: Target[] = [];
 
@@ -179,15 +166,10 @@ async function resolveBareProjectDependenciesAsync({
       if (!dependency.signable) {
         continue;
       }
-      const dependencyBundleIdentifier = await getBundleIdentifierAsync(
-        projectDir,
-        exp,
-        vcsClient,
-        {
-          targetName: dependency.name,
-          buildConfiguration,
-        }
-      );
+      const dependencyBundleIdentifier = await getBundleIdentifierAsync(projectDir, exp, {
+        targetName: dependency.name,
+        buildConfiguration,
+      });
       const entitlements = await getNativeTargetEntitlementsAsync(projectDir, {
         targetName: target.name,
         buildConfiguration,
@@ -211,7 +193,6 @@ async function resolveBareProjectDependenciesAsync({
         target: dependency,
         bundleIdentifier: dependencyBundleIdentifier,
         pbxProject,
-        vcsClient,
       });
       if (dependencyDependencies.length > 0) {
         result.push(...dependencyDependencies);

packages/eas-cli/src/project/projectUtils.ts

@@ -9,7 +9,7 @@ import { getEASUpdateURL } from '../api';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { AccountFragment, AppPrivacy } from '../graphql/generated';
 import { AppQuery } from '../graphql/queries/AppQuery';
-import Log, { learnMore } from '../log';
+import Log from '../log';
 import { Actor } from '../user/User';
 import { expoCommandAsync } from '../utils/expoCli';
 
@@ -109,25 +109,6 @@ export async function validateAppVersionRuntimePolicySupportAsync(
   );
 }
 
-export async function enforceRollBackToEmbeddedUpdateSupportAsync(
-  projectDir: string
-): Promise<void> {
-  const maybePackageJson = resolveFrom.silent(projectDir, 'expo-updates/package.json');
-
-  if (maybePackageJson) {
-    const { version } = await fs.readJson(maybePackageJson);
-    if (semver.gte(version, '0.19.0')) {
-      return;
-    }
-  }
-
-  throw new Error(
-    `The expo-updates package must have a version >= 0.19.0 to use roll back to embedded, which corresponds to Expo SDK 50 or greater. ${learnMore(
-      'https://docs.expo.dev/workflow/upgrading-expo-sdk-walkthrough/'
-    )}`
-  );
-}
-
 export async function installExpoUpdatesAsync(
   projectDir: string,
   options?: { silent: boolean }

packages/eas-cli/src/project/publish.ts

@@ -25,15 +25,11 @@ import { promptAsync } from '../prompts';
 import { getBranchNameFromChannelNameAsync } from '../update/getBranchNameFromChannelNameAsync';
 import { formatUpdateMessage, truncateString as truncateUpdateMessage } from '../update/utils';
 import { PresignedPost, uploadWithPresignedPostWithRetryAsync } from '../uploads';
-import {
-  expoCommandAsync,
-  shouldUseVersionedExpoCLI,
-  shouldUseVersionedExpoCLIWithExplicitPlatforms,
-} from '../utils/expoCli';
+import { expoCommandAsync, shouldUseVersionedExpoCLI } from '../utils/expoCli';
 import chunk from '../utils/expodash/chunk';
 import { truthy } from '../utils/expodash/filter';
 import uniqBy from '../utils/expodash/uniqBy';
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
 import { resolveWorkflowAsync } from './workflow';
 
 export type ExpoCLIExportPlatformFlag = Platform | 'all';
@@ -185,23 +181,32 @@ export async function buildBundlesAsync({
   exp,
   platformFlag,
   clearCache,
-  dev = false,
 }: {
   projectDir: string;
   inputDir: string;
-  exp: Pick<ExpoConfig, 'sdkVersion' | 'web'>;
+  exp: Pick<ExpoConfig, 'sdkVersion'>;
   platformFlag: ExpoCLIExportPlatformFlag;
   clearCache?: boolean;
-  dev?: boolean;
 }): Promise<void> {
   const packageJSON = JsonFile.read(path.resolve(projectDir, 'package.json'));
   if (!packageJSON) {
     throw new Error('Could not locate package.json');
   }
 
-  // Legacy global Expo CLI
-  if (!shouldUseVersionedExpoCLI(projectDir, exp)) {
-    return await expoCommandAsync(projectDir, [
+  if (shouldUseVersionedExpoCLI(projectDir, exp)) {
+    await expoCommandAsync(projectDir, [
+      'export',
+      '--output-dir',
+      inputDir,
+      '--dump-sourcemap',
+      '--dump-assetmap',
+      '--platform',
+      platformFlag,
+      ...(clearCache ? ['--clear'] : []),
+    ]);
+  } else {
+    // Legacy global Expo CLI
+    await expoCommandAsync(projectDir, [
       'export',
       '--output-dir',
       inputDir,
@@ -209,52 +214,11 @@ export async function buildBundlesAsync({
       '--non-interactive',
       '--dump-sourcemap',
       '--dump-assetmap',
-      `--platform=${platformFlag}`,
-      ...(dev ? ['--dev'] : []),
+      '--platform',
+      platformFlag,
       ...(clearCache ? ['--clear'] : []),
     ]);
   }
-
-  // Versioned Expo CLI, with multiple platform flag support
-  if (shouldUseVersionedExpoCLIWithExplicitPlatforms(projectDir)) {
-    // When creating EAS updates, we don't want to build a web bundle
-    const platformArgs =
-      platformFlag === 'all'
-        ? ['--platform', 'ios', '--platform', 'android']
-        : ['--platform', platformFlag];
-
-    return await expoCommandAsync(projectDir, [
-      'export',
-      '--output-dir',
-      inputDir,
-      '--dump-sourcemap',
-      '--dump-assetmap',
-      ...platformArgs,
-      ...(dev ? ['--dev'] : []),
-      ...(clearCache ? ['--clear'] : []),
-    ]);
-  }
-
-  // Versioned Expo CLI, without multiple platform flag support
-  // Warn users about potential export issues when using Metro web
-  // See: https://github.com/expo/expo/pull/23621
-  if (exp.web?.bundler === 'metro') {
-    Log.warn('Exporting bundle for all platforms, including Metro web.');
-    Log.warn(
-      'If your app is incompatible with web, remove the "expo.web.bundler" property from your app manifest, or upgrade to the latest Expo SDK.'
-    );
-  }
-
-  return await expoCommandAsync(projectDir, [
-    'export',
-    '--output-dir',
-    inputDir,
-    '--dump-sourcemap',
-    '--dump-assetmap',
-    `--platform=${platformFlag}`,
-    ...(dev ? ['--dev'] : []),
-    ...(clearCache ? ['--clear'] : []),
-  ]);
 }
 
 export async function resolveInputDirectoryAsync(
@@ -424,8 +388,7 @@ export async function uploadAssetsAsync(
   cancelationToken: { isCanceledOrFinished: boolean },
   onAssetUploadResultsChanged: (
     assetUploadResults: { asset: RawAsset & { storageKey: string }; finished: boolean }[]
-  ) => void,
-  onAssetUploadBegin: () => void
+  ) => void
 ): Promise<AssetUploadResult> {
   let assets: RawAsset[] = [];
   let platform: keyof CollectedAssets;
@@ -487,11 +450,7 @@ export async function uploadAssetsAsync(
           throw Error('Canceled upload');
         }
         const presignedPost: PresignedPost = JSON.parse(specifications[i]);
-        await uploadWithPresignedPostWithRetryAsync(
-          missingAsset.path,
-          presignedPost,
-          onAssetUploadBegin
-        );
+        await uploadWithPresignedPostWithRetryAsync(missingAsset.path, presignedPost);
       });
     }),
   ]);
@@ -545,7 +504,6 @@ export async function getBranchNameForCommandAsync({
   autoFlag,
   nonInteractive,
   paginatedQueryOptions,
-  vcsClient,
 }: {
   graphqlClient: ExpoGraphqlClient;
   projectId: string;
@@ -554,7 +512,6 @@ export async function getBranchNameForCommandAsync({
   autoFlag: boolean;
   nonInteractive: boolean;
   paginatedQueryOptions: PaginatedQueryOptions;
-  vcsClient: Client;
 }): Promise<string> {
   if (channelNameArg && branchNameArg) {
     throw new Error(
@@ -571,7 +528,7 @@ export async function getBranchNameForCommandAsync({
   }
 
   if (autoFlag) {
-    return await getDefaultBranchNameAsync(vcsClient);
+    return await getDefaultBranchNameAsync();
   } else if (nonInteractive) {
     throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode.');
   } else {
@@ -595,7 +552,7 @@ export async function getBranchNameForCommandAsync({
         type: 'text',
         name: 'name',
         message: 'No branches found. Provide a branch name:',
-        initial: await getDefaultBranchNameAsync(vcsClient),
+        initial: await getDefaultBranchNameAsync(),
         validate: value => (value ? true : 'Branch name may not be empty.'),
       });
       branchName = name;
@@ -606,23 +563,20 @@ export async function getBranchNameForCommandAsync({
   }
 }
 
-export async function getUpdateMessageForCommandAsync(
-  vcsClient: Client,
-  {
-    updateMessageArg,
-    autoFlag,
-    nonInteractive,
-    jsonFlag,
-  }: {
-    updateMessageArg: string | undefined;
-    autoFlag: boolean;
-    nonInteractive: boolean;
-    jsonFlag: boolean;
-  }
-): Promise<string> {
+export async function getUpdateMessageForCommandAsync({
+  updateMessageArg,
+  autoFlag,
+  nonInteractive,
+  jsonFlag,
+}: {
+  updateMessageArg: string | undefined;
+  autoFlag: boolean;
+  nonInteractive: boolean;
+  jsonFlag: boolean;
+}): Promise<string> {
   let updateMessage = updateMessageArg;
   if (!updateMessageArg && autoFlag) {
-    updateMessage = (await vcsClient.getLastCommitMessageAsync())?.trim();
+    updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
   }
 
   if (!updateMessage) {
@@ -638,7 +592,7 @@ export async function getUpdateMessageForCommandAsync(
       type: 'text',
       name: 'updateMessageLocal',
       message: `Provide an update message:`,
-      initial: (await vcsClient.getLastCommitMessageAsync())?.trim(),
+      initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
       validate: (value: any) => (value ? true : validationMessage),
     });
     updateMessage = updateMessageLocal;
@@ -677,8 +631,7 @@ export function getRequestedPlatform(
 export async function getRuntimeVersionObjectAsync(
   exp: ExpoConfig,
   platforms: Platform[],
-  projectDir: string,
-  vcsClient: Client
+  projectDir: string
 ): Promise<{ platform: string; runtimeVersion: string }[]> {
   for (const platform of platforms) {
     if (platform === 'web') {
@@ -687,7 +640,7 @@ export async function getRuntimeVersionObjectAsync(
     const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
     if (isPolicy) {
       const isManaged =
-        (await resolveWorkflowAsync(projectDir, platform as EASBuildJobPlatform, vcsClient)) ===
+        (await resolveWorkflowAsync(projectDir, platform as EASBuildJobPlatform)) ===
         Workflow.MANAGED;
       if (!isManaged) {
         throw new Error(

packages/eas-cli/src/project/workflow.ts

@@ -3,12 +3,11 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import fs from 'fs-extra';
 import path from 'path';
 
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
 
 export async function resolveWorkflowAsync(
   projectDir: string,
-  platform: Platform,
-  vcsClient: Client
+  platform: Platform
 ): Promise<Workflow> {
   let platformWorkflowMarkers: string[];
   try {
@@ -23,6 +22,7 @@ export async function resolveWorkflowAsync(
     return Workflow.MANAGED;
   }
 
+  const vcsClient = getVcsClient();
   const vcsRootPath = path.normalize(await vcsClient.getRootPathAsync());
   for (const marker of platformWorkflowMarkers) {
     if (
@@ -36,20 +36,17 @@ export async function resolveWorkflowAsync(
 }
 
 export async function resolveWorkflowPerPlatformAsync(
-  projectDir: string,
-  vcsClient: Client
+  projectDir: string
 ): Promise<Record<Platform, Workflow>> {
   const [android, ios] = await Promise.all([
-    resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient),
-    resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient),
+    resolveWorkflowAsync(projectDir, Platform.ANDROID),
+    resolveWorkflowAsync(projectDir, Platform.IOS),
   ]);
   return { android, ios };
 }
 
-export async function hasIgnoredIosProjectAsync(
-  projectDir: string,
-  vcsClient: Client
-): Promise<boolean> {
+export async function hasIgnoredIosProjectAsync(projectDir: string): Promise<boolean> {
+  const vcsClient = getVcsClient();
   const vcsRootPath = path.normalize(await vcsClient.getRootPathAsync());
 
   try {

packages/eas-cli/src/rollout/actions/ManageRollout.ts

@@ -20,7 +20,6 @@ import {
 export enum ManageRolloutActions {
   EDIT = 'Edit',
   END = 'End',
-  VIEW = 'View',
   GO_BACK = 'Go back',
 }
 
@@ -32,7 +31,7 @@ export class ManageRollout implements EASUpdateAction<EASUpdateAction> {
     private channelInfo: UpdateChannelBasicInfoFragment,
     private options: {
       callingAction?: EASUpdateAction;
-      action?: ManageRolloutActions.EDIT | ManageRolloutActions.END | ManageRolloutActions.VIEW;
+      action?: ManageRolloutActions.EDIT | ManageRolloutActions.END;
     } & Partial<EditRolloutNonInteractiveOptions> &
       Partial<EndRolloutNonInteractiveOptions> &
       EndRolloutGeneralOptions
@@ -52,9 +51,6 @@ export class ManageRollout implements EASUpdateAction<EASUpdateAction> {
         return new EditRollout(this.channelInfo, this.options);
       case ManageRolloutActions.END:
         return new EndRollout(this.channelInfo, this.options);
-      case ManageRolloutActions.VIEW:
-        // Rollout is automatically printed in interactive mode
-        return new Noop();
       case ManageRolloutActions.GO_BACK:
         assert(this.options.callingAction, 'calling action must be defined');
         return this.options.callingAction;
@@ -98,7 +94,3 @@ export class ManageRollout implements EASUpdateAction<EASUpdateAction> {
     });
   }
 }
-
-class Noop {
-  public async runAsync(): Promise<void> {}
-}

packages/eas-cli/src/rollout/actions/NonInteractiveRollout.ts

@@ -1,14 +1,7 @@
 import { EASUpdateAction, EASUpdateContext } from '../../eas-update/utils';
 import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
-import {
-  ChannelQuery,
-  UpdateBranchObject,
-  UpdateChannelObject,
-} from '../../graphql/queries/ChannelQuery';
-import Log from '../../log';
-import { printJsonOnlyOutput } from '../../utils/json';
-import { getRollout, getRolloutInfo, isConstrainedRolloutInfo, isRollout } from '../branch-mapping';
-import { printRollout } from '../utils';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import { CodeSigningInfo } from '../../utils/code-signing';
 import {
   CreateRollout,
   NonInteractiveOptions as CreateRolloutNonInteractiveOptions,
@@ -25,19 +18,6 @@ import {
 import { ManageRolloutActions } from './ManageRollout';
 import { MainMenuActions, RolloutActions } from './RolloutMainMenu';
 
-type JSONRolloutOutput = {
-  defaultBranch: UpdateBranchObject;
-  rolledOutBranch: UpdateBranchObject;
-  percentRolledOut: number;
-  runtimeVersion?: string;
-  updatedAt: Date;
-};
-
-type JSONOutput = {
-  hasRollout: boolean;
-  originalRolloutInfo?: JSONRolloutOutput;
-  currentRolloutInfo?: JSONRolloutOutput;
-};
 /**
  * Control a rollout in non interactive mode.
  */
@@ -45,7 +25,7 @@ export class NonInteractiveRollout implements EASUpdateAction<void> {
   constructor(
     private options: {
       channelName?: string;
-      json?: boolean;
+      codeSigningInfo?: CodeSigningInfo;
       action?: RolloutActions;
     } & Partial<EditRolloutNonInteractiveOptions> &
       Partial<EndRolloutNonInteractiveOptions> &
@@ -69,102 +49,29 @@ export class NonInteractiveRollout implements EASUpdateAction<void> {
       appId: app.projectId,
       channelName,
     });
-    const channelObject = await this.getChannelObjectAsync(ctx, {
-      channelName,
-      runtimeVersion: this.getRuntimeVersion(channelInfo),
-    });
 
     if (!action) {
       throw new Error(`--action is required in non-interactive mode.`);
     }
-    const updatedChannelInfo = await this.runActionAsync(ctx, action, channelObject);
-    const updatedChannelObject = await this.getChannelObjectAsync(ctx, {
-      channelName,
-      runtimeVersion: this.getRuntimeVersion(updatedChannelInfo),
-    });
-    if (this.options.json) {
-      const json = await this.getJsonAsync({
-        originalChannelObject: channelObject,
-        updatedChannelObject,
-      });
-      printJsonOnlyOutput(json);
-    }
+    await this.runActionAsync(ctx, action, channelInfo, this.options);
   }
 
   async runActionAsync(
     ctx: EASUpdateContext,
     action: RolloutActions,
-    channelObject: UpdateChannelObject
+    channelInfo: UpdateChannelBasicInfoFragment,
+    options: Partial<EditRolloutNonInteractiveOptions> &
+      Partial<EndRolloutNonInteractiveOptions> &
+      EndRolloutGeneralOptions &
+      Partial<CreateRolloutNonInteractiveOptions>
   ): Promise<UpdateChannelBasicInfoFragment> {
     switch (action) {
       case MainMenuActions.CREATE_NEW:
-        return await new CreateRollout(channelObject, this.options).runAsync(ctx);
+        return await new CreateRollout(channelInfo, options).runAsync(ctx);
       case ManageRolloutActions.EDIT:
-        return await new EditRollout(channelObject, this.options).runAsync(ctx);
+        return await new EditRollout(channelInfo, options).runAsync(ctx);
       case ManageRolloutActions.END:
-        return await new EndRollout(channelObject, this.options).runAsync(ctx);
-      case ManageRolloutActions.VIEW:
-        return this.viewRollout(channelObject);
+        return await new EndRollout(channelInfo, options).runAsync(ctx);
     }
   }
-
-  viewRollout(channelObject: UpdateChannelObject): UpdateChannelObject {
-    if (!this.options.json) {
-      printRollout(channelObject);
-      Log.warn('For formatted output, add the --json flag to your command.');
-    }
-    return channelObject;
-  }
-
-  async getJsonAsync({
-    originalChannelObject,
-    updatedChannelObject,
-  }: {
-    originalChannelObject: UpdateChannelObject;
-    updatedChannelObject: UpdateChannelObject;
-  }): Promise<JSONOutput> {
-    return {
-      hasRollout: isRollout(updatedChannelObject),
-      ...(isRollout(originalChannelObject)
-        ? { originalRolloutInfo: await this.getRolloutJsonAsync(originalChannelObject) }
-        : {}),
-      ...(isRollout(updatedChannelObject)
-        ? { currentRolloutInfo: await this.getRolloutJsonAsync(updatedChannelObject) }
-        : {}),
-    };
-  }
-
-  async getRolloutJsonAsync(channelObject: UpdateChannelObject): Promise<JSONRolloutOutput> {
-    const rollout = getRollout(channelObject);
-    return {
-      defaultBranch: rollout.defaultBranch,
-      rolledOutBranch: rollout.rolledOutBranch,
-      percentRolledOut: rollout.percentRolledOut,
-      runtimeVersion: this.getRuntimeVersion(channelObject) ?? undefined,
-      updatedAt: channelObject.updatedAt,
-    };
-  }
-
-  getRuntimeVersion(channelInfo: UpdateChannelBasicInfoFragment): string | undefined {
-    if (isRollout(channelInfo)) {
-      const updatedRolloutInfo = getRolloutInfo(channelInfo);
-      if (isConstrainedRolloutInfo(updatedRolloutInfo)) {
-        return updatedRolloutInfo.runtimeVersion;
-      }
-    }
-    return undefined;
-  }
-
-  async getChannelObjectAsync(
-    ctx: EASUpdateContext,
-    { channelName, runtimeVersion }: { channelName: string; runtimeVersion?: string }
-  ): Promise<UpdateChannelObject> {
-    const { graphqlClient, app } = ctx;
-    const { projectId } = app;
-    return await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
-      appId: projectId,
-      channelName,
-      ...(runtimeVersion ? { filter: { runtimeVersions: [runtimeVersion] } } : {}),
-    });
-  }
 }

packages/eas-cli/src/rollout/actions/RolloutMainMenu.ts

@@ -27,8 +27,7 @@ export enum MainMenuActions {
 export type RolloutActions =
   | MainMenuActions.CREATE_NEW
   | ManageRolloutActions.EDIT
-  | ManageRolloutActions.END
-  | ManageRolloutActions.VIEW;
+  | ManageRolloutActions.END;
 
 /**
  * Manage a rollout for the project.
@@ -127,11 +126,7 @@ export class RolloutMainMenu implements EASUpdateAction<void> {
   toMainMenuAction(action: RolloutActions): MainMenuActions {
     if (action === MainMenuActions.CREATE_NEW) {
       return MainMenuActions.CREATE_NEW;
-    } else if (
-      action === ManageRolloutActions.EDIT ||
-      action === ManageRolloutActions.END ||
-      action === ManageRolloutActions.VIEW
-    ) {
+    } else if (action === ManageRolloutActions.EDIT || action === ManageRolloutActions.END) {
       return MainMenuActions.MANAGE_EXISTING;
     } else {
       throw new Error(`Action not supported yet: ` + action);