v7.1.2

* Revert "Revert "[eas-json] validate EAS Submit inputs better""

* make validation constraints more loose where necessary

* update CHANGELOG.md

* fix message

* Apply suggestions from code review

Co-authored-by: Stanisław Chmiela <[email protected]>

* apply suggested changes

---------

Co-authored-by: Stanisław Chmiela <[email protected]>

.github/workflows/changelog-bot.yml

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

.github/workflows/changelog.yml

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

.github/workflows/release.yml

@@ -27,9 +27,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn install --frozen-lockfile --check-files
-      - run: yarn build-ci
+      - run: yarn build
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
         run: |
@@ -68,9 +68,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn install --frozen-lockfile --check-files
-      - run: yarn build-ci
+      - run: yarn build
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
         run: |
@@ -96,10 +96,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 20
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
-      - run: yarn build-ci
+      - run: yarn build
       - run: |
           yarn pretarball-ci
           yarn oclif pack:win
@@ -138,11 +138,11 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: 18
+          node-version: 20
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
-        run: yarn build-ci
+        run: yarn build
       - name: Publish packages to npm
         run: yarn lerna publish from-package --yes --no-verify-access
         env:
@@ -165,7 +165,7 @@ jobs:
           token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 20
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files

.github/workflows/size.yml

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

.github/workflows/test-scripts.yml

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

.github/workflows/test.yml

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

CHANGELOG.md

@@ -12,6 +12,71 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Add better validation for EAS Submit inputs. ([#2202](https://github.com/expo/eas-cli/pull/2202) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.1.1](https://github.com/expo/eas-cli/releases/tag/v7.1.1) - 2024-01-26
+
+### 🐛 Bug fixes
+
+- Revert incorrect EAS Submit input validation changes. ([#2200](https://github.com/expo/eas-cli/pull/2200) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.1.0](https://github.com/expo/eas-cli/releases/tag/v7.1.0) - 2024-01-26
+
+### 🎉 New features
+
+- Support requireCommit for EAS Update. ([#2196](https://github.com/expo/eas-cli/pull/2196) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Remove support for classic updates release channel in 50+. ([#2189](https://github.com/expo/eas-cli/pull/2189) by [@wschurman](https://github.com/wschurman))
+- Validate EAS Submit inputs better. ([#2198](https://github.com/expo/eas-cli/pull/2198) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [7.0.0](https://github.com/expo/eas-cli/releases/tag/v7.0.0) - 2024-01-19
+
+### 🛠 Breaking changes
+
+- Stop generating eas-update-metadata.json on publish. ([#2187](https://github.com/expo/eas-cli/pull/2187) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Use branch mapping utility fn. ([#2186](https://github.com/expo/eas-cli/pull/2186) by [@quinlanj](https://github.com/quinlanj))
+
+## [6.1.0](https://github.com/expo/eas-cli/releases/tag/v6.1.0) - 2024-01-18
+
+### 🎉 New features
+
+- Add `build:delete` command. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Add filter flags for `platform` and `profile` to `build:cancel` and `build:delete` commands. ([#2178](https://github.com/expo/eas-cli/pull/2178) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+### 🧹 Chores
+
+- Remove "bare"-specific **eas.json** template. ([#2179](https://github.com/expo/eas-cli/pull/2179) by [@sjchmiela](https://github.com/sjchmiela))
+- Prompt users if they want to continue if EAS CLI fails to provision the devices. ([#2181](https://github.com/expo/eas-cli/pull/2181) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas-cli` and `@expo/eas-json` dependencies. ([#2176](https://github.com/expo/eas-cli/pull/2176) by [@szdziedzic](https://github.com/szdziedzic))
+- Update `eas.schema.json` to after adding Xcode 15.2 image. ([#2184](https://github.com/expo/eas-cli/pull/2184) by [@szdziedzic](https://github.com/szdziedzic))
+- Upgrade packages from the expo/expo repo. ([#2145](https://github.com/expo/eas-cli/pull/2145) by [@wschurman](https://github.com/wschurman))
+
+## [6.0.0](https://github.com/expo/eas-cli/releases/tag/v6.0.0) - 2024-01-12
+
+### 🛠 Breaking changes
+
+- Drop support for Node 14. ([#2175](https://github.com/expo/eas-cli/pull/2175) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🎉 New features
+
+- Allow undefined update message for EAS Update publishing when no VCS. ([#2148](https://github.com/expo/eas-cli/pull/2148) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Upgrade `@expo/eas-build-job` to `1.0.56`, thus removing unused (since [#1524](https://github.com/expo/eas-cli/pull/1524)) support for S3 project archives. ([#2165](https://github.com/expo/eas-cli/pull/2165) by [@sjchmiela](https://github.com/sjchmiela))
+
+## [5.9.3](https://github.com/expo/eas-cli/releases/tag/v5.9.3) - 2023-12-19
+
+### 🧹 Chores
+
+- Rename getUpdateGroupJsonInfo. ([#2157](https://github.com/expo/eas-cli/pull/2157) by [@quinlanj](https://github.com/quinlanj))
+- Add new Xcode 15.1 image to `eas.schema.json`. ([#2155](https://github.com/expo/eas-cli/pull/2155) by [@szdziedzic](https://github.com/szdziedzic))
+
 ## [5.9.2](https://github.com/expo/eas-cli/releases/tag/v5.9.2) - 2023-12-15
 
 ### 🧹 Chores

CONTRIBUTING.md

@@ -18,6 +18,25 @@ If you're making changes to `packages/eas-json` or prefer/need to work with prod
 yarn start
 ```
 
+If it is easier for you to work with the code locally with compiler options set to:
+
+```json
+...
+"compilerOptions": {
+    ...
+    "noUnusedLocals": false,
+    "noUnusedParameters": false,
+    ...
+}
+...
+```
+
+you can consider using:
+
+```
+yarn start-allow-unused
+```
+
 ## Format
 
 - Be sure to update the [`CHANGELOG.md`](./CHANGELOG.md) with changes for every PR. There is a changelog bot that can generate the proper entry for you. The instructions on how to use it are in the PR description placeholder.

jest.config.js

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

jest.config.ts

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

jest/jest.config.js

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

jest/jest.config.ts

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

lerna.json

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

package.json

@@ -6,11 +6,11 @@
   ],
   "scripts": {
     "build": "lerna run build",
-    "build-ci": "lerna run build-ci",
     "build:tarballs:linux": "yarn build-for-size-check",
     "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
     "typecheck": "lerna run typecheck",
     "start": "lerna run watch --stream --parallel",
+    "start-allow-unused": "lerna run watch-allow-unused --stream --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint .",
@@ -20,22 +20,22 @@
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@types/jest": "29.2.5",
-    "@types/node": "18.11.18",
-    "eslint": "8.31.0",
-    "eslint-config-universe": "11.1.1",
-    "eslint-plugin-async-protect": "3.0.0",
+    "@types/jest": "29.5.11",
+    "@types/node": "20.11.0",
+    "eslint": "8.56.0",
+    "eslint-config-universe": "12.0.0",
+    "eslint-plugin-async-protect": "3.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "29.3.1",
-    "jest-watch-typeahead": "2.2.1",
-    "lerna": "6.4.1",
+    "jest": "29.7.0",
+    "jest-watch-typeahead": "2.2.2",
+    "lerna": "7.4.2",
     "oclif": "^3.9.0",
-    "prettier": "2.8.2",
-    "ts-jest": "29.0.3",
-    "typescript": "4.9.4"
+    "prettier": "3.1.1",
+    "ts-jest": "29.1.1",
+    "typescript": "5.3.3"
   },
   "volta": {
-    "node": "18.19.0",
-    "yarn": "1.22.19"
+    "node": "20.11.0",
+    "yarn": "1.22.21"
   }
 }

packages/eas-cli/README.md

@@ -68,6 +68,7 @@ eas --help COMMAND
 * [`eas build`](#eas-build)
 * [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
 * [`eas build:configure`](#eas-buildconfigure)
+* [`eas build:delete [BUILD_ID]`](#eas-builddelete-build_id)
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
 * [`eas build:resign`](#eas-buildresign)
@@ -135,7 +136,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -152,7 +153,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -169,7 +170,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -183,7 +184,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -235,7 +236,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -256,7 +257,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -276,7 +277,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -296,7 +297,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -319,7 +320,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -349,7 +350,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -357,16 +358,18 @@ cancel a build
 
 ```
 USAGE
-  $ eas build:cancel [BUILD_ID] [--non-interactive]
+  $ eas build:cancel [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
 
 FLAGS
-  --non-interactive  Run the command in non-interactive mode.
+  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
+  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
+  --non-interactive                 Run the command in non-interactive mode.
 
 DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -383,7 +386,26 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/configure.ts)_
+
+## `eas build:delete [BUILD_ID]`
+
+delete a build
+
+```
+USAGE
+  $ eas build:delete [BUILD_ID] [--non-interactive] [-p android|ios|all] [-e <value>]
+
+FLAGS
+  -e, --profile=PROFILE_NAME        Filter builds by build profile if build ID is not provided
+  -p, --platform=(android|ios|all)  Filter builds by the platform if build ID is not provided
+  --non-interactive                 Run the command in non-interactive mode.
+
+DESCRIPTION
+  delete a build
+```
+
+_See code: [src/commands/build/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/delete.ts)_
 
 ## `eas build:inspect`
 
@@ -418,7 +440,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.9.2/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -456,7 +478,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -482,7 +504,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -508,7 +530,7 @@ DESCRIPTION
   run simulator/emulator builds from eas-cli
 ```
 
-_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -557,7 +579,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.9.2/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -576,7 +598,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -595,7 +617,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.9.2/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -612,7 +634,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -633,7 +655,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -655,7 +677,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -675,7 +697,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/channel/list.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -707,7 +729,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.9.2/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -730,7 +752,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -751,7 +773,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -768,7 +790,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -782,7 +804,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.9.2/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -802,7 +824,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -823,7 +845,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -844,7 +866,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -858,7 +880,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -872,7 +894,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -960,7 +982,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -977,7 +999,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.9.2/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -994,7 +1016,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.9.2/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/metadata/push.ts)_
 
 ## `eas open`
 
@@ -1008,7 +1030,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1022,7 +1044,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1044,7 +1066,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -1067,7 +1089,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.9.2/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -1085,7 +1107,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -1099,7 +1121,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.9.2/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/secret/list.ts)_
 
 ## `eas secret:push`
 
@@ -1119,7 +1141,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.9.2/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/secret/push.ts)_
 
 ## `eas submit`
 
@@ -1149,7 +1171,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -1183,7 +1205,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -1201,7 +1223,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -1222,7 +1244,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.9.2/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -1244,7 +1266,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -1271,7 +1293,7 @@ DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/republish.ts)_
 
 ## `eas update:roll-back-to-embedded`
 
@@ -1298,7 +1320,7 @@ 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.9.2/src/commands/update/roll-back-to-embedded.ts)_
+_See code: [src/commands/update/roll-back-to-embedded.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/roll-back-to-embedded.ts)_
 
 ## `eas update:rollback`
 
@@ -1317,7 +1339,7 @@ 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.9.2/src/commands/update/rollback.ts)_
+_See code: [src/commands/update/rollback.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/rollback.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -1337,7 +1359,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1358,7 +1380,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1378,7 +1400,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1396,7 +1418,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1418,7 +1440,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1435,7 +1457,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v5.9.2/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v7.1.2/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/graphql.schema.json

@@ -1213,6 +1213,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "isDisabled",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "isSSOEnabled",
             "description": "Whether this account has SSO enabled. Can be queried by all members.",
@@ -1717,6 +1733,18 @@
         "description": null,
         "fields": null,
         "inputFields": [
+          {
+            "name": "searchTerm",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "sortByField",
             "description": null,
@@ -3117,6 +3145,33 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "AccountUsageEASJobsMetadata",
+        "description": null,
+        "fields": [
+          {
+            "name": "resourceClassDisplayName",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "UNION",
         "name": "AccountUsageMetadata",
@@ -3130,6 +3185,11 @@
             "kind": "OBJECT",
             "name": "AccountUsageEASBuildMetadata",
             "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "AccountUsageEASJobsMetadata",
+            "ofType": null
           }
         ]
       },
@@ -14944,6 +15004,18 @@
         "name": "BuildAnnotation",
         "description": null,
         "fields": [
+          {
+            "name": "authorUsername",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "buildPhase",
             "description": null,
@@ -15016,6 +15088,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "regexFlags",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "regexString",
             "description": null,
@@ -15116,6 +15200,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "regexFlags",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "regexString",
             "description": null,
@@ -16546,18 +16642,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "buildMode",
-            "description": null,
-            "type": {
-              "kind": "ENUM",
-              "name": "BuildMode",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "buildProfile",
             "description": null,
@@ -21091,6 +21175,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "JOBS",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "UPDATES",
             "description": null,
@@ -21132,6 +21222,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "RUN_TIME",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "UNIQUE_UPDATERS",
             "description": null,
@@ -37385,14 +37481,14 @@
           {
             "name": "EAS_BUILD_PROJECT_SOURCES",
             "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
+            "isDeprecated": true,
+            "deprecationReason": "Use EAS_BUILD_GCS_PROJECT_SOURCES instead."
           },
           {
             "name": "EAS_SUBMIT_APP_ARCHIVE",
             "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
+            "isDeprecated": true,
+            "deprecationReason": "Use EAS_SUBMIT_GCS_APP_ARCHIVE instead."
           },
           {
             "name": "EAS_SUBMIT_GCS_APP_ARCHIVE",
@@ -37530,6 +37626,12 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "MINUTE",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "REQUEST",
             "description": null,

packages/eas-cli/jest.config.js

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

packages/eas-cli/jest.config.ts

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

packages/eas-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "5.9.2",
+  "version": "7.1.2",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -10,11 +10,11 @@
   "dependencies": {
     "@expo/apple-utils": "1.3.2",
     "@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.50",
-    "@expo/eas-json": "5.9.2",
+    "@expo/config": "8.5.4",
+    "@expo/config-plugins": "7.8.4",
+    "@expo/config-types": "50.0.0",
+    "@expo/eas-build-job": "1.0.59",
+    "@expo/eas-json": "7.1.2",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
@@ -23,7 +23,7 @@
     "@expo/plist": "0.0.20",
     "@expo/plugin-help": "5.1.23",
     "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "6.2.5",
+    "@expo/prebuild-config": "6.7.3",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
@@ -38,26 +38,27 @@
     "ajv-formats": "2.1.1",
     "better-opn": "3.0.2",
     "chalk": "4.1.2",
-    "cli-progress": "3.11.2",
+    "cli-progress": "3.12.0",
     "dateformat": "4.6.3",
-    "dotenv": "16.0.3",
+    "dotenv": "16.3.1",
     "env-paths": "2.2.0",
-    "envinfo": "7.8.1",
+    "envinfo": "7.11.0",
     "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.2.12",
+    "fast-glob": "3.3.2",
     "figures": "3.2.0",
     "form-data": "4.0.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "11.2.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
     "graphql": "16.8.1",
     "graphql-tag": "2.12.6",
     "https-proxy-agent": "5.0.1",
-    "ignore": "5.2.4",
+    "ignore": "5.3.0",
     "indent-string": "4.0.0",
     "jks-js": "1.1.0",
-    "joi": "17.7.0",
-    "keychain": "1.3.0",
+    "joi": "17.11.0",
+    "jsonwebtoken": "9.0.0",
+    "keychain": "1.5.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
     "minimatch": "5.1.2",
@@ -67,58 +68,59 @@
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "pngjs": "6.0.0",
+    "pngjs": "7.0.0",
     "promise-limit": "2.7.0",
     "promise-retry": "2.0.1",
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.5.2",
+    "semver": "7.5.4",
     "slash": "3.0.0",
-    "tar": "6.1.13",
+    "tar": "6.2.0",
     "terminal-link": "2.1.1",
-    "tslib": "2.4.1",
-    "turndown": "7.1.1",
+    "tslib": "2.6.2",
+    "turndown": "7.1.2",
     "untildify": "4.0.0",
-    "uuid": "9.0.0",
+    "uuid": "9.0.1",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "2.16.3",
-    "@graphql-codegen/introspection": "2.2.3",
-    "@graphql-codegen/typescript": "2.8.7",
-    "@graphql-codegen/typescript-operations": "2.5.12",
-    "@types/cli-progress": "3.11.0",
+    "@graphql-codegen/cli": "5.0.0",
+    "@graphql-codegen/introspection": "4.0.0",
+    "@graphql-codegen/typescript": "4.0.1",
+    "@graphql-codegen/typescript-operations": "4.0.1",
+    "@types/cli-progress": "3.11.5",
     "@types/dateformat": "3.0.1",
-    "@types/envinfo": "7.8.1",
+    "@types/envinfo": "7.8.3",
     "@types/express": "4.17.15",
-    "@types/fs-extra": "9.0.13",
+    "@types/fs-extra": "11.0.4",
     "@types/getenv": "^1.0.0",
+    "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
     "@types/node-fetch": "2.6.2",
     "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.1",
+    "@types/pngjs": "6.0.4",
     "@types/promise-retry": "1.1.3",
     "@types/prompts": "2.4.2",
-    "@types/semver": "7.3.13",
-    "@types/tar": "6.1.3",
+    "@types/semver": "7.5.6",
+    "@types/tar": "6.1.10",
     "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.0",
+    "@types/uuid": "9.0.7",
     "@types/wrap-ansi": "3.0.0",
     "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
     "express": "4.18.2",
     "memfs": "3.4.13",
     "mockdate": "3.0.5",
-    "nock": "13.2.9",
+    "nock": "13.4.0",
     "rimraf": "3.0.2",
-    "ts-deepmerge": "4.0.0",
+    "ts-deepmerge": "6.2.0",
     "ts-mockito": "2.6.1",
-    "ts-node": "10.9.1",
-    "typescript": "4.9.4"
+    "ts-node": "10.9.2",
+    "typescript": "5.3.3"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=16.0.0"
   },
   "files": [
     "/bin",
@@ -204,19 +206,20 @@
   "scripts": {
     "postpack": "rimraf oclif.manifest.json",
     "prepack": "yarn rebuild && node ./scripts/prepack.js",
-    "rebuild": "rimraf build && yarn build-ci",
+    "rebuild": "rimraf build && yarn build",
     "pretarball-ci": "./scripts/pretarball-ci.sh",
     "build": "tsc --project tsconfig.build.json",
-    "build-ci": "tsc --project tsconfig.build-ci.json",
+    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
     "watch": "yarn build --watch --preserveWatchOutput",
-    "typecheck": "tsc --project tsconfig.build-ci.json",
+    "watch-allow-unused": "yarn build-allow-unused --watch --preserveWatchOutput",
+    "typecheck": "tsc",
     "test": "jest",
     "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
     "clean": "rimraf dist build tmp node_modules yarn-error.log"
   },
   "volta": {
-    "node": "18.19.0",
-    "yarn": "1.22.19"
+    "node": "20.11.0",
+    "yarn": "1.22.21"
   }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,6 +3,10 @@ import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteVersionCodeAsync } from './version';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
@@ -29,10 +33,6 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } from '../validate';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>
@@ -99,14 +99,13 @@ export async function prepareAndroidBuildAsync(
       return await ensureAndroidCredentialsAsync(ctx);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync(ctx.graphqlClient, {
+      await syncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         localAutoIncrement:
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        projectId: ctx.projectId,
         vcsClient: ctx.vcsClient,
       });
     },

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

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

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

@@ -232,7 +232,9 @@ export async function resolveRemoteVersionCodeAsync(
         applicationIdentifier: applicationId,
         storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
+          undefined,
       });
       spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -254,7 +256,9 @@ export async function resolveRemoteVersionCodeAsync(
         applicationIdentifier: applicationId,
         storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
         buildVersion: String(nextBuildVersion),
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
+          undefined,
       });
       spinner.succeed(
         `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -7,6 +7,26 @@ import fs from 'fs-extra';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
+import { BuildContext } from './context';
+import {
+  EasBuildDownForMaintenanceError,
+  EasBuildFreeTierDisabledAndroidError,
+  EasBuildFreeTierDisabledError,
+  EasBuildFreeTierDisabledIOSError,
+  EasBuildFreeTierIosLimitExceededError,
+  EasBuildFreeTierLimitExceededError,
+  EasBuildLegacyResourceClassNotAvailableError,
+  EasBuildProjectArchiveUploadError,
+  EasBuildResourceClassNotAvailableInFreeTierError,
+  EasBuildTooManyPendingBuildsError,
+  RequestValidationError,
+  TurtleDeprecatedJobFormatError,
+} from './errors';
+import { transformMetadata } from './graphql';
+import { LocalBuildMode, runLocalBuildAsync } from './local';
+import { collectMetadataAsync } from './metadata';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
@@ -34,26 +54,6 @@ import { formatBytes } from '../utils/files';
 import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
-import { BuildContext } from './context';
-import {
-  EasBuildDownForMaintenanceError,
-  EasBuildFreeTierDisabledAndroidError,
-  EasBuildFreeTierDisabledError,
-  EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildLegacyResourceClassNotAvailableError,
-  EasBuildProjectArchiveUploadError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
-  EasBuildTooManyPendingBuildsError,
-  RequestValidationError,
-  TurtleDeprecatedJobFormatError,
-} from './errors';
-import { transformMetadata } from './graphql';
-import { LocalBuildMode, runLocalBuildAsync } from './local';
-import { collectMetadataAsync } from './metadata';
-import { printDeprecationWarnings } from './utils/printBuildInfo';
-import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -97,7 +97,7 @@ function resolveBuildParamsInput<T extends Platform>(
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
-  TJob extends Job
+  TJob extends Job,
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
   const { ctx } = builder;
   const credentialsResult = await withAnalyticsAsync(

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

@@ -1,13 +1,11 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
 import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
+import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import Log, { learnMore } from '../log';
-import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
 import { Client } from '../vcs/vcs';
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 interface ConfigureParams {
   projectDir: string;
@@ -54,7 +52,7 @@ async function configureAsync({
   }
 }
 
-const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+const EAS_JSON_DEFAULT: EasJson = {
   cli: {
     version: `>= ${easCliVersion}`,
   },
@@ -73,43 +71,10 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
   },
 };
 
-const EAS_JSON_BARE_DEFAULT: EasJson = {
-  cli: {
-    version: `>= ${easCliVersion}`,
-  },
-  build: {
-    development: {
-      distribution: 'internal',
-      android: {
-        gradleCommand: ':app:assembleDebug',
-      },
-      ios: {
-        buildConfiguration: 'Debug',
-      },
-    },
-    preview: {
-      distribution: 'internal',
-    },
-    production: {},
-  },
-  submit: {
-    production: {},
-  },
-};
-
 async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
   const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
 
-  const hasAndroidNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient)) === Workflow.GENERIC;
-  const hasIosNativeProject =
-    (await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient)) === 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 fs.writeFile(easJsonPath, `${JSON.stringify(EAS_JSON_DEFAULT, null, 2)}\n`);
   await vcsClient.trackFileAsync(easJsonPath);
   Log.withTick(
     `Generated ${chalk.bold('eas.json')}. ${learnMore(

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

@@ -3,6 +3,7 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
 import { NodePackageManager } from '@expo/package-manager';
 
+import { LocalBuildOptions } from './local';
 import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
@@ -13,7 +14,6 @@ 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'>;
 

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

@@ -6,6 +6,11 @@ import getenv from 'getenv';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -15,11 +20,6 @@ import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
 import { Client } from '../vcs/vcs';
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { resolveBuildResourceClassAsync } from './utils/resourceClass';
 
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,

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

@@ -21,12 +21,7 @@ import {
 } from '../graphql/generated';
 
 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
-  if (archiveSource.type === ArchiveSourceType.S3) {
-    return {
-      type: ProjectArchiveSourceType.S3,
-      bucketKey: archiveSource.bucketKey,
-    };
-  } else if (archiveSource.type === ArchiveSourceType.GCS) {
+  if (archiveSource.type === ArchiveSourceType.GCS) {
     return {
       type: ProjectArchiveSourceType.Gcs,
       bucketKey: archiveSource.bucketKey,

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

@@ -62,7 +62,7 @@ describe(evaluateTemplateString, () => {
 // bare workflow
 describe(bumpVersionAsync, () => {
   beforeEach(() => {
-    getPbxproj.mockImplementation(() => ({} as any));
+    getPbxproj.mockImplementation((): any => {});
   });
   afterEach(() => {
     getXCBuildConfigurationFromPbxproj.mockReset();
@@ -76,7 +76,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -112,7 +112,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -147,7 +147,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
@@ -182,7 +182,7 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        } as XCBuildConfiguration)
+        }) as XCBuildConfiguration
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,

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

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

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

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

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

@@ -342,7 +342,9 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
+          undefined,
       });
       spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -364,7 +366,9 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: nextBuildVersion,
-        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
+        runtimeVersion:
+          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
+          undefined,
       });
       spinner.succeed(
         `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

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

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

@@ -4,8 +4,16 @@ import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
+import { LocalBuildMode } from './local';
 import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import {
+  getUsername,
+  isClassicUpdatesSupportedAsync,
+  isExpoUpdatesInstalled,
+} from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -15,10 +23,6 @@ import {
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
 } from '../update/ios/UpdatesModule';
 import { easCliVersion } from '../utils/easCli';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
-import { BuildContext } from './context';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { LocalBuildMode } from './local';
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
@@ -35,7 +39,9 @@ export async function collectMetadataAsync<T extends Platform>(
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    runtimeVersion:
+      (await Updates.getRuntimeVersionNullableAsync(ctx.projectDir, ctx.exp, ctx.platform)) ??
+      undefined,
     reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
     ...channelOrReleaseChannel,
     distribution,
@@ -123,13 +129,19 @@ async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
   if (ctx.buildProfile.channel) {
     return { channel: ctx.buildProfile.channel };
   }
-  if (ctx.buildProfile.releaseChannel) {
-    return { releaseChannel: ctx.buildProfile.releaseChannel };
-  }
   const channel = await getNativeChannelAsync(ctx);
   if (channel) {
     return { channel };
   }
+
+  if (!(await isClassicUpdatesSupportedAsync(ctx.projectDir))) {
+    return null;
+  }
+
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
+
   const releaseChannel = await getNativeReleaseChannelAsync(ctx);
   return { releaseChannel };
 }

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

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

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

@@ -13,6 +13,16 @@ import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { createAndLinkChannelAsync, doesChannelExistAsync } from '../channel/queries';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
@@ -67,16 +77,6 @@ import { truthy } from '../utils/expodash/filter';
 import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
 import { Client } from '../vcs/vcs';
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
 
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -334,7 +334,6 @@ async function prepareAndStartBuildAsync({
   );
   if (buildProfile.profile.channel) {
     await validateExpoUpdatesInstalledAsProjectDependencyAsync({
-      graphqlClient,
       exp: buildCtx.exp,
       projectId: buildCtx.projectId,
       projectDir,
@@ -479,7 +478,6 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
 
 async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   exp,
-  graphqlClient,
   projectId,
   projectDir,
   vcsClient,
@@ -487,7 +485,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   nonInteractive,
   sdkVersion,
 }: {
-  graphqlClient: ExpoGraphqlClient;
   exp: ExpoConfig;
   projectId: string;
   projectDir: string;
@@ -516,7 +513,7 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
       message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
     });
     if (installExpoUpdates) {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+      await ensureEASUpdateIsConfiguredAsync({
         exp,
         projectId,
         projectDir,

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

@@ -3,6 +3,7 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
+import { reviewAndCommitChangesAsync } from './repository';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -11,7 +12,6 @@ import { confirmAsync } from '../../prompts';
 import { expoCommandAsync } from '../../utils/expoCli';
 import { ProfileData } from '../../utils/profiles';
 import { Client } from '../../vcs/vcs';
-import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,

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

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

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

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

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

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

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

@@ -4,9 +4,9 @@ import fs from 'fs-extra';
 import path from 'path';
 import semver from 'semver';
 
+import { CommonContext } from './context';
 import Log, { learnMore } from '../log';
 import { isPNGAsync } from '../utils/image';
-import { CommonContext } from './context';
 
 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {

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

@@ -1,3 +1,4 @@
+import { testChannelBasicInfo } from './branch-mapping-fixtures';
 import {
   emptyBranchMapping,
   rolloutBranchMapping,
@@ -13,7 +14,6 @@ import {
   isAlwaysTrueBranchMapping,
   isEmptyBranchMapping,
 } from '../branch-mapping';
-import { testChannelBasicInfo } from './branch-mapping-fixtures';
 
 describe(assertVersion, () => {
   it('throws if the branch mapping is not the correct version', () => {

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

@@ -1,8 +1,8 @@
 import { format } from '@expo/timeago.js';
 
+import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
 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', () => {

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

@@ -1,5 +1,5 @@
-import { getUpdateBranch } from '../utils';
 import { channelInfoWithBranches, testBasicBranchInfo1 } from './branch-mapping-fixtures';
+import { getUpdateBranch } from '../utils';
 
 describe(getUpdateBranch, () => {
   it('gets the update branch', () => {

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

@@ -41,7 +41,7 @@ export type AlwaysTrueBranchMapping = {
     {
       branchId: string;
       branchMappingLogic: BranchMappingAlwaysTrue;
-    }
+    },
   ];
 };
 

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

@@ -1,5 +1,6 @@
 import chalk from 'chalk';
 
+import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
 import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import Log from '../log';
 import { getRollout, isRollout } from '../rollout/branch-mapping';
@@ -8,7 +9,6 @@ import {
   formatBranch,
   getUpdateGroupDescriptionsWithBranch,
 } from '../update/utils';
-import { assertVersion, hasEmptyBranchMap, hasStandardBranchMap } from './branch-mapping';
 
 /**
  * Log all the branches associated with the channel and their most recent update group
@@ -38,31 +38,34 @@ export function logChannelDetails(channel: UpdateChannelObject): void {
 export function getDescriptionByBranchId(
   channel: UpdateChannelObject
 ): Record<string, FormattedBranchDescription> {
-  return channel.updateBranches.reduce((acc, branch) => {
-    const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
-    let maybePercentOnBranch: number | undefined = undefined;
-    if (maybeRollout) {
-      maybePercentOnBranch =
-        maybeRollout.rolledOutBranchId === branch.id
-          ? maybeRollout.percentRolledOut
-          : 100 - maybeRollout.percentRolledOut;
-    }
+  return channel.updateBranches.reduce(
+    (acc, branch) => {
+      const maybeRollout = isRollout(channel) ? getRollout(channel) : null;
+      let maybePercentOnBranch: number | undefined = undefined;
+      if (maybeRollout) {
+        maybePercentOnBranch =
+          maybeRollout.rolledOutBranchId === branch.id
+            ? maybeRollout.percentRolledOut
+            : 100 - maybeRollout.percentRolledOut;
+      }
 
-    if (branch.updateGroups.length === 0) {
-      acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
+      if (branch.updateGroups.length === 0) {
+        acc[branch.id] = { branch: branch.name, branchRolloutPercentage: maybePercentOnBranch };
+        return acc;
+      }
+      const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
+        branch.updateGroups
+      );
+      // display the most recent update group
+      const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
+      const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
+      acc[branch.id] = {
+        branch: branchName,
+        branchRolloutPercentage: maybePercentOnBranch,
+        update: updateGroup,
+      };
       return acc;
-    }
-    const updateGroupsWithBranchDescriptions = getUpdateGroupDescriptionsWithBranch(
-      branch.updateGroups
-    );
-    // display the most recent update group
-    const updateGroupWithBranchDescription = updateGroupsWithBranchDescriptions[0];
-    const { branch: branchName, ...updateGroup } = updateGroupWithBranchDescription;
-    acc[branch.id] = {
-      branch: branchName,
-      branchRolloutPercentage: maybePercentOnBranch,
-      update: updateGroup,
-    };
-    return acc;
-  }, {} as Record<string, FormattedBranchDescription>);
+    },
+    {} as Record<string, FormattedBranchDescription>
+  );
 }

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

@@ -2,6 +2,9 @@ import chalk from 'chalk';
 import { print } from 'graphql';
 import gql from 'graphql-tag';
 
+import { ChannelNotFoundError } from './errors';
+import { logChannelDetails } from './print-utils';
+import { ChannelBasicInfo } from './utils';
 import { createUpdateBranchOnAppAsync } from '../branch/queries';
 import { BranchNotFoundError } from '../branch/utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -24,9 +27,6 @@ import {
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
-import { ChannelNotFoundError } from './errors';
-import { logChannelDetails } from './print-utils';
-import { ChannelBasicInfo } from './utils';
 
 export const CHANNELS_LIMIT = 25;
 

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

@@ -3,13 +3,6 @@ import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
-import {
-  AnalyticsWithOrchestration,
-  CommandEvent,
-  createAnalyticsAsync,
-} from '../analytics/AnalyticsManager';
-import Log from '../log';
-import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
 import {
@@ -24,11 +17,18 @@ import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import VcsClientContextField from './context/VcsClientContextField';
 import { EasCommandError } from './errors';
+import {
+  AnalyticsWithOrchestration,
+  CommandEvent,
+  createAnalyticsAsync,
+} from '../analytics/AnalyticsManager';
+import Log from '../log';
+import SessionManager from '../user/SessionManager';
 
 export type ContextInput<
   T extends {
     [name: string]: any;
-  } = object
+  } = object,
 > = {
   [P in keyof T]: ContextField<T[P]>;
 };
@@ -36,7 +36,7 @@ export type ContextInput<
 export type ContextOutput<
   T extends {
     [name: string]: any;
-  } = object
+  } = object,
 > = {
   [P in keyof T]: T[P];
 };
@@ -136,7 +136,7 @@ export default abstract class EasCommand extends Command {
   protected async getContextAsync<
     C extends {
       [name: string]: any;
-    } = object
+    } = object,
   >(
     commandClass: { contextDefinition: ContextInput<C> },
     { nonInteractive }: { nonInteractive: boolean }

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

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

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

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

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

@@ -1,13 +1,13 @@
 import { ExpoConfig } from '@expo/config-types';
 
+import ContextField, { ContextOptions } from './ContextField';
+import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
+import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import {
   ExpoConfigOptions,
   getPrivateExpoConfig,
   getPublicExpoConfig,
 } from '../../project/expoConfig';
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 
 export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
   projectId: string;

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

@@ -1,8 +1,8 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 
 export default class LoggedInContextField extends ContextField<{
   actor: Actor;

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

@@ -1,8 +1,8 @@
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { Actor } from '../../user/User';
 import FeatureGateEnvOverrides from '../gating/FeatureGateEnvOverrides';
 import FeatureGating from '../gating/FeatureGating';
-import ContextField, { ContextOptions } from './ContextField';
-import { ExpoGraphqlClient, createGraphqlClient } from './contextUtils/createGraphqlClient';
 
 export default class MaybeLoggedInContextField extends ContextField<{
   actor: Actor | null;

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

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

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

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

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

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

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

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

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

@@ -3,6 +3,8 @@ import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
 
+import { createGraphqlClient } from './createGraphqlClient';
+import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
@@ -11,8 +13,6 @@ import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
 import { Actor, getActorUsername } from '../../../user/User';
-import { createGraphqlClient } from './createGraphqlClient';
-import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
 
 /**
  * Save an EAS project ID to the appropriate field in the app config.

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

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

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

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

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

@@ -11,10 +11,7 @@ import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectU
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import {
-  ensureEASUpdateIsConfiguredInEasJsonAsync,
-  ensureUseClassicUpdatesIsRemovedAsync,
-} from '../../update/configure';
+import { ensureEASUpdateIsConfiguredInEasJsonAsync } from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 
 export default class BuildConfigure extends EasCommand {
@@ -38,7 +35,6 @@ export default class BuildConfigure extends EasCommand {
     const { flags } = await this.parse(BuildConfigure);
     const {
       privateProjectConfig: { exp, projectId, projectDir },
-      loggedIn: { graphqlClient },
       vcsClient,
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
@@ -70,12 +66,6 @@ export default class BuildConfigure extends EasCommand {
       vcsClient,
     });
     if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
-      if (exp.updates?.useClassicUpdates) {
-        // NOTE: this method modifies the Expo config; be sure to use this function's return value
-        // if the config object is used later in the future
-        await ensureUseClassicUpdatesIsRemovedAsync({ exp, projectDir });
-      }
-
       await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
     }
 
@@ -84,20 +74,14 @@ export default class BuildConfigure extends EasCommand {
       if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
         const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
         if (workflow === Workflow.GENERIC) {
-          await syncAndroidUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId);
+          await syncAndroidUpdatesConfigurationAsync(projectDir, exp);
         }
       }
 
       if ([RequestedPlatform.Ios, RequestedPlatform.All].includes(platform)) {
         const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
         if (workflow === Workflow.GENERIC) {
-          await syncIosUpdatesConfigurationAsync(
-            graphqlClient,
-            vcsClient,
-            projectDir,
-            exp,
-            projectId
-          );
+          await syncIosUpdatesConfigurationAsync(vcsClient, projectDir, exp);
         }
       }
     }

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

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

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

@@ -1,4 +1,4 @@
-import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
+import { getRuntimeVersionNullableAsync } from '@expo/config-plugins/build/utils/Updates';
 import { Platform } from '@expo/eas-build-job';
 import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
@@ -116,7 +116,8 @@ export default class BuildVersionSetView extends EasCommand {
       applicationIdentifier,
       storeVersion: exp.version ?? '1.0.0',
       buildVersion: String(version),
-      runtimeVersion: getRuntimeVersionNullable(exp, platform) ?? undefined,
+      runtimeVersion:
+        (await getRuntimeVersionNullableAsync(projectDir, exp, platform)) ?? undefined,
     });
   }
 }

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

@@ -4,7 +4,11 @@ import { print } from 'graphql';
 import gql from 'graphql-tag';
 
 import { selectBranchOnAppAsync } from '../../branch/queries';
-import { hasEmptyBranchMap, hasStandardBranchMap } from '../../channel/branch-mapping';
+import {
+  getAlwaysTrueBranchMapping,
+  hasEmptyBranchMap,
+  hasStandardBranchMap,
+} from '../../channel/branch-mapping';
 import { selectChannelOnAppAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
@@ -124,11 +128,7 @@ export default class ChannelEdit extends EasCommand {
 
     const channel = await updateChannelBranchMappingAsync(graphqlClient, {
       channelId: existingChannel.id,
-      // todo: move branch mapping logic to utility
-      branchMapping: JSON.stringify({
-        data: [{ branchId: branch.id, branchMappingLogic: 'true' }],
-        version: 0,
-      }),
+      branchMapping: JSON.stringify(getAlwaysTrueBranchMapping(branch.id)),
     });
 
     if (json) {

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

@@ -132,7 +132,7 @@ export default class ChannelRollout extends EasCommand {
     const { args, flags } = await this.parse(ChannelRollout);
     const argsAndFlags = this.sanitizeArgsAndFlags({ ...flags, ...args });
     const {
-      privateProjectConfig: { exp, projectId },
+      privateProjectConfig: { exp, projectId, projectDir },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelRollout, {
       nonInteractive: argsAndFlags.nonInteractive,
@@ -141,9 +141,8 @@ export default class ChannelRollout extends EasCommand {
       enableJsonOutput();
     }
 
-    const app = { projectId, exp };
+    const app = { projectId, exp, projectDir };
     const ctx = {
-      projectId,
       nonInteractive: argsAndFlags.nonInteractive,
       graphqlClient,
       app,

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

@@ -50,9 +50,7 @@ export default class Config extends EasCommand {
       maybeProfile ??
       (await selectAsync(
         'Select build profile',
-        (
-          await EasJsonUtils.getBuildProfileNamesAsync(accessor)
-        ).map(profileName => ({
+        (await EasJsonUtils.getBuildProfileNamesAsync(accessor)).map(profileName => ({
           title: profileName,
           value: profileName,
         }))

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

@@ -37,7 +37,6 @@ export default class Open extends EasCommand {
       } else {
         spinner.fail(failedMessage);
       }
-      return;
     } catch (error) {
       spinner.fail(failedMessage);
       throw error;

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

@@ -1,30 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-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',
-      updates: { useClassicUpdates: true },
-    };
-
-    await expect(async () => {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
-        exp,
-        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__/index.test.ts

@@ -324,7 +324,7 @@ function mockTestExport({
     uniqueUploadedAssetPaths: [],
   });
 
-  jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+  jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
   return { inputDir: exportDir, platforms, runtimeVersion };
 }

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

@@ -84,7 +84,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
     mockTestProject();
     const platforms = ['android', 'ios'];
     const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
       branchId: 'branch123',
@@ -106,7 +106,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
     const { projectId } = mockTestProject();
     const platforms = ['android', 'ios'];
     const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
     jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
@@ -154,7 +154,7 @@ describe(UpdateRollBackToEmbedded.name, () => {
 
     const platforms = ['ios'];
     const runtimeVersion = 'exposdk:47.0.0';
-    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+    jest.mocked(Updates.getRuntimeVersionAsync).mockResolvedValue(runtimeVersion);
 
     // Mock an existing branch, so we don't create a new one
     jest.mocked(ensureBranchExistsAsync).mockResolvedValue({

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

@@ -35,7 +35,6 @@ export default class UpdateConfigure extends EasCommand {
     const platform = flags.platform as RequestedPlatform;
     const {
       privateProjectConfig: { projectId, exp, projectDir },
-      loggedIn: { graphqlClient },
       vcsClient,
     } = await this.getContextAsync(UpdateConfigure, {
       nonInteractive: flags['non-interactive'],
@@ -47,7 +46,7 @@ export default class UpdateConfigure extends EasCommand {
 
     await vcsClient.ensureRepoExistsAsync();
 
-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
       exp,
       projectId,
       projectDir,

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

@@ -4,6 +4,7 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
 import { ensureBranchExistsAsync } from '../../branch/queries';
+import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import { ensureChannelExistsAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -40,7 +41,7 @@ import {
   uploadAssetsAsync,
 } from '../../project/publish';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
-import { getUpdateGroupJsonInfo } from '../../update/utils';
+import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
   checkManifestBodyAgainstUpdateInfoGroup,
   getCodeSigningInfoAsync,
@@ -188,6 +189,9 @@ export default class UpdatePublish extends EasCommand {
       enableJsonOutput();
     }
 
+    await vcsClient.ensureRepoExistsAsync();
+    await ensureRepoIsCleanAsync(vcsClient, nonInteractive);
+
     const {
       exp: expPossiblyWithoutEasUpdateConfigured,
       projectId,
@@ -196,7 +200,7 @@ export default class UpdatePublish extends EasCommand {
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
       exp: expPossiblyWithoutEasUpdateConfigured,
       platform: getRequestedPlatform(platformFlag),
       projectDir,
@@ -469,7 +473,7 @@ export default class UpdatePublish extends EasCommand {
     }
 
     if (jsonFlag) {
-      printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
+      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
     } else {
       if (new Set(newUpdates.map(update => update.group)).size > 1) {
         Log.addNewLineIfNone();
@@ -511,7 +515,7 @@ export default class UpdatePublish extends EasCommand {
               ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
               : []),
             ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: updateMessage },
+            { label: 'Message', value: updateMessage ?? '' },
             ...(gitCommitHash
               ? [
                   {

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

@@ -34,7 +34,7 @@ import {
   getUpdateMessageForCommandAsync,
 } from '../../project/publish';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
-import { getUpdateGroupJsonInfo } from '../../update/utils';
+import { getUpdateJsonInfosForUpdates } from '../../update/utils';
 import {
   CodeSigningInfo,
   checkDirectiveBodyAgainstUpdateInfoGroup,
@@ -148,7 +148,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
-    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+    await ensureEASUpdateIsConfiguredAsync({
       exp: expPossiblyWithoutEasUpdateConfigured,
       platform: getRequestedPlatform(platformFlag),
       projectDir,
@@ -228,7 +228,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
     }
 
     if (jsonFlag) {
-      printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
+      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(newUpdates));
     } else {
       if (new Set(newUpdates.map(update => update.group)).size > 1) {
         Log.addNewLineIfNone();
@@ -270,7 +270,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
               ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
               : []),
             ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: updateMessage },
+            { label: 'Message', value: updateMessage ?? '' },
             ...(gitCommitHash
               ? [
                   {
@@ -300,7 +300,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
     graphqlClient: ExpoGraphqlClient;
     isGitWorkingTreeDirty: boolean | undefined;
     gitCommitHash: string | undefined;
-    updateMessage: string;
+    updateMessage: string | undefined;
     branchId: string;
     codeSigningInfo: CodeSigningInfo | undefined;
     runtimeVersions: { platform: string; runtimeVersion: string }[];

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

@@ -1,9 +1,9 @@
 import { Flags } from '@oclif/core';
 
-import EasCommand from '../../commandUtils/EasCommand';
-import { promptAsync } from '../../prompts';
 import UpdateRepublish from './republish';
 import UpdateRollBackToEmbedded from './roll-back-to-embedded';
+import EasCommand from '../../commandUtils/EasCommand';
+import { promptAsync } from '../../prompts';
 
 export default class UpdateRollback extends EasCommand {
   static override description = 'roll back to an embedded update or an existing update';

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

@@ -7,7 +7,7 @@ import Log from '../../log';
 import {
   formatUpdateGroup,
   getUpdateGroupDescriptions,
-  getUpdateGroupJsonInfo,
+  getUpdateJsonInfosForUpdates,
 } from '../../update/utils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
@@ -47,7 +47,7 @@ export default class UpdateView extends EasCommand {
     const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId });
 
     if (jsonFlag) {
-      printJsonOnlyOutput(getUpdateGroupJsonInfo(updatesByGroup));
+      printJsonOnlyOutput(getUpdateJsonInfosForUpdates(updatesByGroup));
     } else {
       const [updateGroupDescription] = getUpdateGroupDescriptions([updatesByGroup]);
 

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

@@ -1,3 +1,9 @@
+import {
+  testKeystore2Base64,
+  testKeystoreBase64,
+  testPKCS12KeystoreBase64,
+  testPKCS12KeystoreEmptyPasswordBase64,
+} from './fixtures-base64-data';
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidFcmFragment,
@@ -11,12 +17,6 @@ import {
 } from '../../graphql/generated';
 import * as AndroidGraphqlClient from '../android/api/GraphqlClient';
 import { Keystore } from '../android/credentials';
-import {
-  testKeystore2Base64,
-  testKeystoreBase64,
-  testPKCS12KeystoreBase64,
-  testPKCS12KeystoreEmptyPasswordBase64,
-} from './fixtures-base64-data';
 
 const now = new Date();
 

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

@@ -1,10 +1,10 @@
 import merge from 'ts-deepmerge';
 
-import { CredentialsContext } from '../context';
 import { getNewAndroidApiMock } from './fixtures-android';
 import { getAppstoreMock } from './fixtures-appstore';
 import { testAppJson, testUsername } from './fixtures-constants';
 import { getNewIosApiMock } from './fixtures-ios';
+import { CredentialsContext } from '../context';
 
 export function createCtxMock(mockOverride: Record<string, any> = {}): CredentialsContext {
   const defaultMock = {

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

@@ -1,5 +1,6 @@
 import { UserRole } from '@expo/apple-utils';
 
+import { testProvisioningProfileBase64 } from './fixtures-base64-data';
 import {
   AppFragment,
   AppStoreConnectApiKeyFragment,
@@ -21,7 +22,6 @@ import {
   ProvisioningProfile,
 } from '../ios/appstore/Credentials.types';
 import { Target } from '../ios/types';
-import { testProvisioningProfileBase64 } from './fixtures-base64-data';
 
 const now = new Date();
 

packages/eas-cli/src/credentials/android/AndroidCredentialsProvider.ts

@@ -2,12 +2,12 @@ import { Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import nullthrows from 'nullthrows';
 
-import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
-import { CredentialsContext } from '../context';
-import * as credentialsJsonReader from '../credentialsJson/read';
 import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
 import { AppLookupParams } from './api/GraphqlClient';
 import { Keystore } from './credentials';
+import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
+import { CredentialsContext } from '../context';
+import * as credentialsJsonReader from '../credentialsJson/read';
 
 export interface AndroidCredentials {
   keystore: Keystore;
@@ -20,7 +20,10 @@ interface Options {
 export default class AndroidCredentialsProvider {
   public readonly platform = Platform.ANDROID;
 
-  constructor(private ctx: CredentialsContext, private options: Options) {}
+  constructor(
+    private ctx: CredentialsContext,
+    private options: Options
+  ) {}
 
   public async getCredentialsAsync(
     src: CredentialsSource.LOCAL | CredentialsSource.REMOTE

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

@@ -1,11 +1,11 @@
 import chalk from 'chalk';
 
+import { BackupKeystore } from './DownloadKeystore';
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { confirmAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-import { BackupKeystore } from './DownloadKeystore';
 
 export class RemoveKeystore {
   constructor(private app: AppLookupParams) {}

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

@@ -1,5 +1,11 @@
 import nullthrows from 'nullthrows';
 
+import {
+  canCopyLegacyCredentialsAsync,
+  createOrUpdateDefaultAndroidAppBuildCredentialsAsync,
+  promptUserAndCopyLegacyCredentialsAsync,
+} from './BuildCredentialsUtils';
+import { CreateKeystore } from './CreateKeystore';
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidKeystoreFragment,
@@ -9,12 +15,6 @@ import { ora } from '../../../ora';
 import { CredentialsContext } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
-import {
-  canCopyLegacyCredentialsAsync,
-  createOrUpdateDefaultAndroidAppBuildCredentialsAsync,
-  promptUserAndCopyLegacyCredentialsAsync,
-} from './BuildCredentialsUtils';
-import { CreateKeystore } from './CreateKeystore';
 
 interface Options {
   app: AppLookupParams;

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

@@ -1,3 +1,4 @@
+import { BackupKeystore } from './DownloadKeystore';
 import {
   AndroidAppBuildCredentialsFragment,
   AndroidKeystoreType,
@@ -12,7 +13,6 @@ import {
 } from '../../manager/SelectAndroidBuildCredentials';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { getKeystoreWithType } from '../utils/keystoreNew';
-import { BackupKeystore } from './DownloadKeystore';
 
 export class SetUpBuildCredentialsFromCredentialsJson {
   constructor(private app: AppLookupParams) {}

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

@@ -1,5 +1,8 @@
 import nullthrows from 'nullthrows';
 
+import { AssignGoogleServiceAccountKey } from './AssignGoogleServiceAccountKey';
+import { CreateGoogleServiceAccountKey } from './CreateGoogleServiceAccountKey';
+import { UseExistingGoogleServiceAccountKey } from './UseExistingGoogleServiceAccountKey';
 import {
   CommonAndroidAppCredentialsFragment,
   GoogleServiceAccountKeyFragment,
@@ -9,9 +12,6 @@ import { promptAsync } from '../../../prompts';
 import { CredentialsContext } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
-import { AssignGoogleServiceAccountKey } from './AssignGoogleServiceAccountKey';
-import { CreateGoogleServiceAccountKey } from './CreateGoogleServiceAccountKey';
-import { UseExistingGoogleServiceAccountKey } from './UseExistingGoogleServiceAccountKey';
 
 export class SetUpGoogleServiceAccountKey {
   constructor(private app: AppLookupParams) {}

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

@@ -1,3 +1,10 @@
+import { AndroidAppBuildCredentialsMutation } from './graphql/mutations/AndroidAppBuildCredentialsMutation';
+import { AndroidAppCredentialsMutation } from './graphql/mutations/AndroidAppCredentialsMutation';
+import { AndroidFcmMutation } from './graphql/mutations/AndroidFcmMutation';
+import { AndroidKeystoreMutation } from './graphql/mutations/AndroidKeystoreMutation';
+import { GoogleServiceAccountKeyMutation } from './graphql/mutations/GoogleServiceAccountKeyMutation';
+import { AndroidAppCredentialsQuery } from './graphql/queries/AndroidAppCredentialsQuery';
+import { GoogleServiceAccountKeyQuery } from './graphql/queries/GoogleServiceAccountKeyQuery';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   AccountFragment,
@@ -11,13 +18,6 @@ import {
 } from '../../../graphql/generated';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { GoogleServiceAccountKey, KeystoreWithType } from '../credentials';
-import { AndroidAppBuildCredentialsMutation } from './graphql/mutations/AndroidAppBuildCredentialsMutation';
-import { AndroidAppCredentialsMutation } from './graphql/mutations/AndroidAppCredentialsMutation';
-import { AndroidFcmMutation } from './graphql/mutations/AndroidFcmMutation';
-import { AndroidKeystoreMutation } from './graphql/mutations/AndroidKeystoreMutation';
-import { GoogleServiceAccountKeyMutation } from './graphql/mutations/GoogleServiceAccountKeyMutation';
-import { AndroidAppCredentialsQuery } from './graphql/queries/AndroidAppCredentialsQuery';
-import { GoogleServiceAccountKeyQuery } from './graphql/queries/GoogleServiceAccountKeyQuery';
 
 export interface AppLookupParams {
   account: AccountFragment;

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

@@ -3,6 +3,10 @@ import { Env } from '@expo/eas-build-job';
 import { EasJson } from '@expo/eas-json';
 import chalk from 'chalk';
 
+import * as AndroidGraphqlClient from './android/api/GraphqlClient';
+import * as IosGraphqlClient from './ios/api/GraphqlClient';
+import AppStoreApi from './ios/appstore/AppStoreApi';
+import { AuthenticationMode } from './ios/appstore/authenticateTypes';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import Log from '../log';
@@ -10,10 +14,6 @@ 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';
-import { AuthenticationMode } from './ios/appstore/authenticateTypes';
 
 export type CredentialsContextProjectInfo = {
   exp: ExpoConfig;

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

@@ -1,7 +1,6 @@
 import fs from 'fs-extra';
 import path from 'path';
 
-import { Target } from '../ios/types';
 import {
   AndroidCredentials,
   CredentialsJson,
@@ -12,6 +11,7 @@ import {
   IosTargetCredentials,
 } from './types';
 import { getCredentialsJsonPath } from './utils';
+import { Target } from '../ios/types';
 
 export async function readAndroidCredentialsAsync(projectDir: string): Promise<AndroidCredentials> {
   const credentialsJson = await readAsync(projectDir);

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

@@ -2,6 +2,13 @@ import fs from 'fs-extra';
 import nullthrows from 'nullthrows';
 import path from 'path';
 
+import { readRawAsync } from './read';
+import {
+  CredentialsJson,
+  CredentialsJsonIosCredentials,
+  CredentialsJsonIosTargetCredentials,
+} from './types';
+import { getCredentialsJsonPath } from './utils';
 import { AndroidAppBuildCredentialsFragment, IosDistributionType } from '../../graphql/generated';
 import Log from '../../log';
 import { findApplicationTarget, findTargetByName } from '../../project/ios/target';
@@ -10,13 +17,6 @@ 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';
-import {
-  CredentialsJson,
-  CredentialsJsonIosCredentials,
-  CredentialsJsonIosTargetCredentials,
-} from './types';
-import { getCredentialsJsonPath } from './utils';
 
 /**
  * Update Android credentials.json with values from www, content of credentials.json

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

@@ -1,7 +1,7 @@
 import path from 'path';
 
-import { Target } from '../ios/types';
 import { IosCredentials } from './types';
+import { Target } from '../ios/types';
 
 export function getCredentialsJsonPath(projectDir: string): string {
   return path.join(projectDir, 'credentials.json');

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

@@ -11,7 +11,10 @@ export class MissingCredentialsError extends Error {
 }
 
 export class UnsupportedCredentialsChoiceError extends Error {
-  constructor(message: string, public choice: string) {
+  constructor(
+    message: string,
+    public choice: string
+  ) {
     super(message);
   }
 }

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

@@ -6,6 +6,11 @@ import {
   IosEnterpriseProvisioning,
 } from '@expo/eas-json';
 
+import { getAppFromContextAsync } from './actions/BuildCredentialsUtils';
+import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
+import { SetUpPushKey } from './actions/SetUpPushKey';
+import { App, IosCredentials, Target } from './types';
+import { isAdHocProfile, isEnterpriseUniversalProfile } from './utils/provisioningProfile';
 import { CommonIosAppCredentialsFragment } from '../../graphql/generated';
 import Log from '../../log';
 import { findApplicationTarget } from '../../project/ios/target';
@@ -13,11 +18,6 @@ import { selectAsync } from '../../prompts';
 import { CredentialsContext } from '../context';
 import * as credentialsJsonReader from '../credentialsJson/read';
 import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
-import { getAppFromContextAsync } from './actions/BuildCredentialsUtils';
-import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
-import { SetUpPushKey } from './actions/SetUpPushKey';
-import { App, IosCredentials, Target } from './types';
-import { isAdHocProfile, isEnterpriseUniversalProfile } from './utils/provisioningProfile';
 
 interface Options {
   app: App;
@@ -35,7 +35,10 @@ enum PushNotificationSetupOption {
 export default class IosCredentialsProvider {
   public readonly platform = Platform.IOS;
 
-  constructor(private ctx: CredentialsContext, private options: Options) {}
+  constructor(
+    private ctx: CredentialsContext,
+    private options: Options
+  ) {}
 
   public async getCredentialsAsync(
     src: CredentialsSource.LOCAL | CredentialsSource.REMOTE

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

@@ -3,6 +3,7 @@ import fs from 'fs-extra';
 import { nanoid } from 'nanoid';
 import path from 'path';
 
+import { formatAppleTeam } from './AppleTeamFormatting';
 import { AccountFragment, AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
 import Log, { learnMore } from '../../../log';
 import { confirmAsync, promptAsync } from '../../../prompts';
@@ -20,7 +21,6 @@ import {
   ascApiKeyIssuerIdSchema,
 } from '../credentials';
 import { isAscApiKeyValidAndTrackedAsync } from '../validators/validateAscApiKey';
-import { formatAppleTeam } from './AppleTeamFormatting';
 
 export enum AppStoreApiKeyPurpose {
   SUBMISSION_SERVICE = 'EAS Submit',

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

@@ -1,3 +1,5 @@
+import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
+import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
 import {
   AppStoreConnectApiKeyFragment,
   CommonIosAppCredentialsFragment,
@@ -5,8 +7,6 @@ import {
 import Log from '../../../log';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
-import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
-import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
 
 export class AssignAscApiKey {
   constructor(private app: AppLookupParams) {}

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

@@ -1,8 +1,8 @@
+import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import { ApplePushKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
-import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 
 export class AssignPushKey {
   constructor(private app: AppLookupParams) {}

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

@@ -1,5 +1,6 @@
 import nullthrows from 'nullthrows';
 
+import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import {
   AppleDistributionCertificateFragment,
   AppleProvisioningProfileFragment,
@@ -11,7 +12,6 @@ import { getOwnerAccountForProjectIdAsync } from '../../../project/projectUtils'
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { App, Target } from '../types';
-import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 
 export async function getAllBuildCredentialsAsync(
   ctx: CredentialsContext,

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

@@ -1,7 +1,7 @@
+import { AppStoreApiKeyPurpose, provideOrGenerateAscApiKeyAsync } from './AscApiKeyUtils';
 import { AccountFragment, AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
 import Log from '../../../log';
 import { CredentialsContext } from '../../context';
-import { AppStoreApiKeyPurpose, provideOrGenerateAscApiKeyAsync } from './AscApiKeyUtils';
 
 export class CreateAscApiKey {
   constructor(private account: AccountFragment) {}