v0.34.0

rename useDevelopmentClient to developmentClient (#711 )
* generate graphql code * rename useDevelopmentClient to developmentClient * update CHANGELOG.md * upgrade @expo/eas-build-job
2026-11-15 03:38:08 -10:00 · 2021-11-01 11:23:56 -07:00 · 2021-10-31 18:51:26 +01:00 · 2021-10-29 10:47:14 +02:00 · 2021-10-28 11:51:40 -07:00 · 2021-10-28 11:50:08 -07:00
169 changed files with 4774 additions and 3994 deletions
@@ -34,6 +34,7 @@ module.exports = {
        ],
      },
    ],
+    'no-underscore-dangle': ['error', { allow: ['__typename'] }],
    '@typescript-eslint/explicit-function-return-type': [
      'warn',
      {
@@ -2,7 +2,7 @@

 # Checklist

- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary.
+- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary. You can comment this pull request with `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]` and CHANGELOG.md will be updated automatically.
 - [ ] I've tagged the changelog entry with `[EAS BUILD API]` if it's a part of a breaking change to EAS Build API (only possible when updating `@expo/eas-build-job` package).

 # Why
@@ -0,0 +1,46 @@
+on:
+  issue_comment:
+    types: [created]
+
+name: Changelog
+
+jobs:
+  pr-commented:
+    runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: '16'
+      - name: Checkout Pull Request
+        run: hub pr checkout ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Add changelog entry
+        working-directory: ./scripts
+        run: |
+          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
+          if [[ ! "$PARAMS" =~ " " ]]; then
+            echo "Invalid /changelog-entry command"
+            exit 1
+          fi
+          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          yarn changelog-entry "$CATEGORY" "$MESSAGE"
+        env:
+          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
+          PR_COMMENT_BODY: ${{ github.event.comment.body }}
+      - name: Commit and push
+        run: |
+          # use the last commit author name and email
+          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push
@@ -142,6 +142,7 @@ jobs:
        with:
          node-version: '16'
      - name: Install dependencies
+        working-directory: ./scripts
        run: yarn install --frozen-lockfile --check-files
      - name: Resolve version
        run: echo "EAS_CLI_VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
@@ -159,7 +160,7 @@ jobs:
          git config --global user.email "[email protected]"
          git config --global user.name "Expo CI"
          git add CHANGELOG.md
-          git commit -m "[skip ci] update CHANGELOG.md"
+          git commit -m "update CHANGELOG.md"
          git push
      - name: Prepare changelog for Slack
        run: |
@@ -6,12 +6,107 @@ This is the log of notable changes to EAS CLI and related packages.

 ### 🛠 Breaking changes

- Enable auto-incrementing on Android. ([#645](https://github.com/expo/eas-cli/pull/645) by [@jkhales](https://github.com/jkhales))
+- `[EAS BUILD API]` Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
+- Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
+- Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
+- Add required `cli` field in root of `eas.json` ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))

 ### 🎉 New features

 ### 🐛 Bug fixes

+- Better error message when eas.json is invalid. ([#707](https://github.com/expo/eas-cli/pull/707) by [@dsokal](https://github.com/dsokal))
+- Fix credentials workflow for new users: add additionalTypenames for credentials. ([#703](https://github.com/expo/eas-cli/pull/703) by [@quinlanj](https://github.com/quinlanj))
+
+### 🧹 Chores
+
+- Add additionalTypenames for other queries. ([#704](https://github.com/expo/eas-cli/pull/704) by [@quinlanj](https://github.com/quinlanj))
+- Fix errors after pulling down most recent graphql schema changes. ([#713](https://github.com/expo/eas-cli/pull/713) by [@quinlanj](https://github.com/quinlanj))
+- Refactor credentials manager. ([#712](https://github.com/expo/eas-cli/pull/712) by [@quinlanj](https://github.com/quinlanj))
+- Remove unneeded parameters. ([#710](https://github.com/expo/eas-cli/pull/710) by [@quinlanj](https://github.com/quinlanj))
+- Enforce additionalTypenames for graphql queries. ([#709](https://github.com/expo/eas-cli/pull/709) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.33.1](https://github.com/expo/eas-cli/releases/tag/0.33.1) - 2021-10-22
+
+### 🎉 New features
+
+- Compute runtime version using config-plugins. ([#697](https://github.com/expo/eas-cli/pull/697) by [@jkhales](https://github.com/jkhales))
+
+### 🐛 Bug fixes
+
+- [eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ ([#706](https://github.com/expo/eas-cli/pull/706) by [@brentvatne](https://github.com/brentvatne))
+
+## [0.33.0](https://github.com/expo/eas-cli/releases/tag/0.33.0) - 2021-10-20
+
+### 🎉 New features
+
+- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
+  - Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
+  - To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
+    ```json
+      {
+        "build": {
+          "production": { ... }
+        },
+        "submit": {
+          "production": { ... }
+        }
+      }
+    ```
+
+### 🐛 Bug fixes
+
+- Skip the second prompt for Apple ID if the user is already signed in with Apple. ([#691](https://github.com/expo/eas-cli/pull/691) by [@dsokal](https://github.com/dsokal))
+- Unify reading `app.json`. ([#692](https://github.com/expo/eas-cli/pull/692) by [@dsokal](https://github.com/dsokal))
+
+## [0.32.0](https://github.com/expo/eas-cli/releases/tag/0.32.0) - 2021-10-15
+
+### 🎉 New features
+
+- Add App Store Connect Api Key support to iOS submissions. ([#678](https://github.com/expo/eas-cli/pull/678) by [@quinlanj](https://github.com/quinlanj))
+- Create/list/revoke App Store Connect Api keys via Apple apis. ([#687](https://github.com/expo/eas-cli/pull/687) by [@quinlanj](https://github.com/quinlanj))
+- Add ability to select a build from a list in `eas submit` interactive mode. ([#688](https://github.com/expo/eas-cli/pull/688) by [@barthap](https://github.com/barthap))
+
+### 🐛 Bug fixes
+
+- Fix printing App Store Connect URL after submission. ([#683](https://github.com/expo/eas-cli/pull/683) by [@brentvatne](https://github.com/brentvatne))
+
+### 🧹 Chores
+
+- Add App Store Connect Api Key fields to `eas.json`. ([#684](https://github.com/expo/eas-cli/pull/684) by [@quinlanj](https://github.com/quinlanj))
+- Enable no-underscore-dangle eslint rule. ([#686](https://github.com/expo/eas-cli/pull/686) by [@dsokal](https://github.com/dsokal))
+
+## [0.31.1](https://github.com/expo/eas-cli/releases/tag/0.31.1) - 2021-10-08
+
+### 🐛 Bug fixes
+
+- Google Service Account Keys: Fix non-interactive bug in credentials service workflow ([#682](https://github.com/expo/eas-cli/pull/682) by [@quinlanj](https://github.com/quinlanj))
+
+## [0.31.0](https://github.com/expo/eas-cli/releases/tag/0.31.0) - 2021-10-08
+
+### 🛠 Breaking changes
+
+- Don't resolve the iOS builder image on the client side. EAS Build will use the appropriate iOS image for a given Expo SDK version unless the `image` is defined. This only applies to managed projects. ([#675](https://github.com/expo/eas-cli/pull/675) by [@wkozyra95](https://github.com/wkozyra95) + [@dsokal](https://github.com/dsokal))
+
+### 🎉 New features
+
+- Integrate credentials service with Android submissions. ([#664](https://github.com/expo/eas-cli/pull/664) by [@quinlanj](https://github.com/quinlanj))
+- Add option to review ad-hoc devices when reusing provisioning profile. ([#673](https://github.com/expo/eas-cli/pull/673) by [@dsokal](https://github.com/dsokal))
+
+## [0.30.1](https://github.com/expo/eas-cli/releases/tag/0.30.1) - 2021-10-06
+
+### 🐛 Bug fixes
+
+- Fix `--json` flag when running EAS CLI on GitHub actions. ([#669](https://github.com/expo/eas-cli/pull/669) by [@dsokal](https://github.com/dsokal))
+- Fix `"ios: mods.ios.infoPlist: Failed to find Info.plist linked to Xcode project."` warning when running `eas build` in a managed project.([#670](https://github.com/expo/eas-cli/pull/670) by [@brentvatne](https://github.com/brentvatne))
+- Fix building monorepo projects on Windows. ([#671](https://github.com/expo/eas-cli/pull/671) by [@dsokal](https://github.com/dsokal))
+
+## [0.30.0](https://github.com/expo/eas-cli/releases/tag/v0.30.0) - 2021-10-05
+
+### 🛠 Breaking changes
+
+- Enable auto-incrementing on Android. ([#645](https://github.com/expo/eas-cli/pull/645) by [@jkhales](https://github.com/jkhales))
+
 ### 🧹 Chores

 - Ports detection for Google Service Account Keys into the credentials service. ([#660](https://github.com/expo/eas-cli/pull/660) by [@quinlanj](https://github.com/quinlanj))
@@ -1,5 +1,5 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "version": "0.30.0"
+  "version": "0.34.0"
 }
@@ -1,9 +1,6 @@
 {
  "private": true,
-  "workspaces": [
-    "packages/*",
-    "scripts"
-  ],
+  "workspaces": ["packages/*"],
  "scripts": {
    "build": "lerna run build",
    "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
@@ -31,7 +28,7 @@
    "typescript": "4.4.2"
  },
  "volta": {
-    "node": "16.8.0",
-    "yarn": "1.22.11"
+    "node": "16.10.0",
+    "yarn": "1.22.15"
  }
 }
@@ -33,264 +33,7 @@ eas --help COMMAND
 # Commands

 <!-- commands -->
-* [`eas account:login`](#eas-accountlogin)
-* [`eas account:logout`](#eas-accountlogout)
-* [`eas account:view`](#eas-accountview)
-* [`eas analytics [STATUS]`](#eas-analytics-status)
-* [`eas build`](#eas-build)
-* [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
-* [`eas build:configure`](#eas-buildconfigure)
-* [`eas build:list`](#eas-buildlist)
-* [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
-* [`eas config`](#eas-config)
-* [`eas credentials`](#eas-credentials)
-* [`eas device:create`](#eas-devicecreate)
-* [`eas device:list`](#eas-devicelist)
-* [`eas device:view [UDID]`](#eas-deviceview-udid)
-* [`eas diagnostics`](#eas-diagnostics)
 * [`eas help [COMMAND]`](#eas-help-command)
-* [`eas project:info`](#eas-projectinfo)
-* [`eas project:init`](#eas-projectinit)
-* [`eas secret:create`](#eas-secretcreate)
-* [`eas secret:delete`](#eas-secretdelete)
-* [`eas secret:list`](#eas-secretlist)
-* [`eas submit`](#eas-submit)
-* [`eas webhook:create`](#eas-webhookcreate)
-* [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
-* [`eas webhook:list`](#eas-webhooklist)
-* [`eas webhook:update`](#eas-webhookupdate)
-* [`eas webhook:view ID`](#eas-webhookview-id)
-
-## `eas account:login`
-
-log in with your Expo account
-
-```
-USAGE
-  $ eas account:login
-
-ALIASES
-  $ eas login
-```
-
-_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/account/login.js)_
-
-## `eas account:logout`
-
-log out
-
-```
-USAGE
-  $ eas account:logout
-
-ALIASES
-  $ eas logout
-```
-
-_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/account/logout.js)_
-
-## `eas account:view`
-
-show the username you are logged in as
-
-```
-USAGE
-  $ eas account:view
-
-ALIASES
-  $ eas whoami
-```
-
-_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/account/view.js)_
-
-## `eas analytics [STATUS]`
-
-view or change analytics settings
-
-```
-USAGE
-  $ eas analytics [STATUS]
-```
-
-_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/analytics.js)_
-
-## `eas build`
-
-start a build
-
-```
-USAGE
-  $ eas build
-
-OPTIONS
-  -p, --platform=(android|ios|all)
-
-  --auto-submit                            Submit on build complete using the submit profile with the same name as the
-                                           build profile
-
-  --auto-submit-with-profile=PROFILE_NAME  Submit on build complete using the submit profile with provided name
-
-  --clear-cache                            Clear cache before the build
-
-  --json                                   Enable JSON output, non-JSON messages will be printed to stderr
-
-  --local                                  Run build locally [experimental]
-
-  --non-interactive                        Run command in non-interactive mode
-
-  --profile=PROFILE_NAME                   [default: release] Name of the build profile from eas.json
-
-  --skip-project-configuration             Skip project configuration
-
-  --[no-]wait                              Wait for build(s) to complete
-```
-
-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/build/index.js)_
-
-## `eas build:cancel [BUILD_ID]`
-
-Cancel a build.
-
-```
-USAGE
-  $ eas build:cancel [BUILD_ID]
-```
-
-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/build/cancel.js)_
-
-## `eas build:configure`
-
-Configure the project to support EAS Build.
-
-```
-USAGE
-  $ eas build:configure
-
-OPTIONS
-  -p, --platform=(android|ios|all)  Platform to configure
-```
-
-_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/build/configure.js)_
-
-## `eas build:list`
-
-list all builds for your project
-
-```
-USAGE
-  $ eas build:list
-
-OPTIONS
-  --appBuildVersion=appBuildVersion
-  --appIdentifier=appIdentifier
-  --appVersion=appVersion
-  --buildProfile=buildProfile
-  --channel=channel
-  --distribution=(store|internal|simulator)
-  --gitCommitHash=gitCommitHash
-
-  --json                                                         Enable JSON output, non-JSON messages will be printed
-                                                                 to stderr
-
-  --limit=limit
-
-  --platform=(all|android|ios)
-
-  --runtimeVersion=runtimeVersion
-
-  --sdkVersion=sdkVersion
-
-  --status=(new|in-queue|in-progress|errored|finished|canceled)
-```
-
-_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/build/list.js)_
-
-## `eas build:view [BUILD_ID]`
-
-view a build for your project
-
-```
-USAGE
-  $ eas build:view [BUILD_ID]
-
-OPTIONS
-  --json  Enable JSON output, non-JSON messages will be printed to stderr
-```
-
-_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/build/view.js)_
-
-## `eas config`
-
-show the eas.json config
-
-```
-USAGE
-  $ eas config
-
-OPTIONS
-  -p, --platform=(android|ios)
-  --profile=profile
-```
-
-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/config.js)_
-
-## `eas credentials`
-
-manage your credentials
-
-```
-USAGE
-  $ eas credentials
-```
-
-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/credentials.js)_
-
-## `eas device:create`
-
-register new Apple Devices to use for internal distribution
-
-```
-USAGE
-  $ eas device:create
-```
-
-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/device/create.js)_
-
-## `eas device:list`
-
-list all registered devices for your account
-
-```
-USAGE
-  $ eas device:list
-
-OPTIONS
-  --apple-team-id=apple-team-id
-```
-
-_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/device/list.js)_
-
-## `eas device:view [UDID]`
-
-view a device for your project
-
-```
-USAGE
-  $ eas device:view [UDID]
-```
-
-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/device/view.js)_
-
-## `eas diagnostics`
-
-log environment info to the console
-
-```
-USAGE
-  $ eas diagnostics
-```
-
-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/diagnostics.js)_

 ## `eas help [COMMAND]`

@@ -308,188 +51,4 @@ OPTIONS
 ```

 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v3.2.3/src/commands/help.ts)_
-
-## `eas project:info`
-
-information about the current project
-
-```
-USAGE
-  $ eas project:info
-```
-
-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/project/info.js)_
-
-## `eas project:init`
-
-create or link an EAS project
-
-```
-USAGE
-  $ eas project:init
-
-ALIASES
-  $ eas init
-```
-
-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/project/init.js)_
-
-## `eas secret:create`
-
-Create an environment secret on the current project or owner account.
-
-```
-USAGE
-  $ eas secret:create
-
-OPTIONS
-  --force                    Delete and recreate existing secrets
-  --name=name                Name of the secret
-  --scope=(account|project)  [default: project] Scope for the secret
-  --value=value              Value of the secret
-```
-
-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/secret/create.js)_
-
-## `eas secret:delete`
-
-Delete an environment secret by ID.
-
-```
-USAGE
-  $ eas secret:delete
-
-OPTIONS
-  --id=id  ID of the secret to delete
-
-DESCRIPTION
-  Unsure where to find the secret's ID? Run eas secrets:list
-```
-
-_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/secret/delete.js)_
-
-## `eas secret:list`
-
-Lists environment secrets available for your current app
-
-```
-USAGE
-  $ eas secret:list
-```
-
-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/secret/list.js)_
-
-## `eas submit`
-
-submit build archive to app store
-
-```
-USAGE
-  $ eas submit
-
-OPTIONS
-  -p, --platform=(android|ios|all)
-  --id=id                           ID of the build to submit
-  --latest                          Submit the latest build for specified platform
-  --non-interactive                 Run command in non-interactive mode
-  --path=path                       Path to the .apk/.aab/.ipa file
-
-  --profile=profile                 Name of the submit profile from eas.json. Defaults to "release" if defined in
-                                    eas.json.
-
-  --url=url                         App archive url
-
-  --verbose                         Always print logs from Submission Service
-
-  --[no-]wait                       Wait for submission to complete
-
-DESCRIPTION
-  See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
-
-ALIASES
-  $ eas build:submit
-```
-
-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/submit.js)_
-
-## `eas webhook:create`
-
-Create a webhook on the current project.
-
-```
-USAGE
-  $ eas webhook:create
-
-OPTIONS
-  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
-
-  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
-                   header.
-
-  --url=url        Webhook URL
-```
-
-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/webhook/create.js)_
-
-## `eas webhook:delete [ID]`
-
-Delete a webhook on the current project.
-
-```
-USAGE
-  $ eas webhook:delete [ID]
-
-ARGUMENTS
-  ID  ID of the webhook to delete
-```
-
-_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/webhook/delete.js)_
-
-## `eas webhook:list`
-
-List webhooks on the current project.
-
-```
-USAGE
-  $ eas webhook:list
-
-OPTIONS
-  --event=(BUILD)  Event type that triggers the webhook
-```
-
-_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/webhook/list.js)_
-
-## `eas webhook:update`
-
-Create a webhook on the current project.
-
-```
-USAGE
-  $ eas webhook:update
-
-OPTIONS
-  --event=(BUILD)  [default: BUILD] Event type that triggers the webhook
-  --id=id          (required) Webhook ID
-
-  --secret=secret  Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature'
-                   header.
-
-  --url=url        Webhook URL
-```
-
-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/webhook/update.js)_
-
-## `eas webhook:view ID`
-
-View a webhook on the current project.
-
-```
-USAGE
-  $ eas webhook:view ID
-
-ARGUMENTS
-  ID  ID of the webhook to view
-```
-
-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.30.0/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->
@@ -1,7 +1,7 @@
 {
  "name": "eas-cli",
  "description": "EAS command line tool",
-  "version": "0.30.0",
+  "version": "0.34.0",
  "author": "Expo <[email protected]>",
  "bin": {
    "eas": "./bin/run"
@@ -9,15 +9,15 @@
  "bugs": "https://github.com/expo/eas-cli/issues",
  "dependencies": {
    "@expo/apple-utils": "0.0.0-alpha.25",
-    "@expo/config": "5.0.9",
-    "@expo/config-plugins": "3.1.0",
-    "@expo/eas-build-job": "0.2.48",
-    "@expo/eas-json": "^0.30.0",
+    "@expo/config": "6.0.3",
+    "@expo/config-plugins": "4.0.3",
+    "@expo/eas-build-job": "0.2.57",
+    "@expo/eas-json": "^0.34.0",
    "@expo/json-file": "8.2.33",
    "@expo/pkcs12": "0.0.4",
    "@expo/plist": "0.0.14",
    "@expo/plugin-warn-if-update-available": "1.7.0",
-    "@expo/prebuild-config": "2.1.0",
+    "@expo/prebuild-config": "3.0.3",
    "@expo/results": "1.0.0",
    "@expo/rudder-sdk-node": "1.1.0",
    "@expo/sdk-runtime-versions": "1.0.0",
@@ -61,6 +61,7 @@
    "qrcode-terminal": "0.12.0",
    "resolve-from": "5.0.0",
    "semver": "7.3.5",
+    "slash": "3.0.0",
    "strip-ansi": "6.0.0",
    "tar": "6.1.11",
    "terminal-link": "2.1.1",
@@ -4,13 +4,7 @@ import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';

 import UserSettings from './user/UserSettings';
-
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../package.json');
+import { easCliVersion } from './utils/easCli';

 const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
  darwin: 'Mac',
@@ -97,7 +91,7 @@ export function logEvent(name: string, properties: Record<string, any> = {}): vo
  ensureUserIdentified();

  const { userId, deviceId } = identifyData ?? {};
-  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
+  const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };

  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
  rudderstackClient.track({
@@ -126,7 +120,7 @@ function getRudderStackContext(): Record<string, any> {
  return {
    os: { name: platform, version: os.release() },
    device: { type: platform, model: platform },
-    app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
+    app: { name: 'eas cli', version: easCliVersion ?? undefined },
  };
 }

@@ -1,6 +1,5 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
-import fs from 'fs-extra';

 import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
@@ -10,17 +9,6 @@ import { ensureValidVersions } from '../utils/updates';
 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
  ensureValidVersions(exp);
  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
-
-  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
-    const updatedBuildGradleContents =
-      AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
-        projectDir,
-        buildGradleContents
-      );
-    await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
-  }

  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
  const androidManifest = await getAndroidManifestAsync(projectDir);
@@ -39,7 +27,7 @@ export async function syncUpdatesConfigurationAsync(
  ensureValidVersions(exp);
  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
  try {
-    await ensureUpdatesConfiguredAsync(projectDir, exp);
+    await ensureUpdatesConfiguredAsync(projectDir);
  } catch (error) {
    Log.error(
      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
@@ -62,15 +50,9 @@ export async function syncUpdatesConfigurationAsync(
  }
 }

-async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
-
-  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
-    const gradleScriptApply = AndroidConfig.Updates.formatApplyLineForBuildGradle(projectDir);
-    throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
-  }
-
+// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
+// all that is needed on Expo SDK 43+ to configure expo-updates configuration in AndroidManifest.xml
+async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
  const androidManifest = await getAndroidManifestAsync(projectDir);

  if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
@@ -31,7 +31,7 @@ beforeEach(async () => {
  await fs.mkdirp(os.tmpdir());
 });

-// generic workflow
+// bare workflow
 describe(bumpVersionAsync, () => {
  it('throws an informative error when multiple flavors are detected in the android project', async () => {
    await initProjectWithGradleFileAsync(
@@ -69,7 +69,7 @@ describe(bumpVersionAsync, () => {
  });
  it('bumps expo.android.versionCode and buildGradle versionCode when strategy = BumpStrategy.VERSION_CODE', async () => {
    const nativeVersionCode = 100; // this should be overwritten by bumpVersionAsync
-    const fakeExp = initGenericProject({ versionCode: nativeVersionCode });
+    const fakeExp = initBareWorkflowProject({ versionCode: nativeVersionCode });

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.VERSION_CODE,
@@ -91,7 +91,7 @@ describe(bumpVersionAsync, () => {

  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
    const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
-    const fakeExp = initGenericProject({ versionName: nativeVersionName });
+    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
@@ -112,7 +112,7 @@ describe(bumpVersionAsync, () => {
  });

  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initGenericProject();
+    const fakeExp = initBareWorkflowProject();

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
@@ -185,9 +185,9 @@ describe(bumpVersionInAppJsonAsync, () => {
 });

 describe(maybeResolveVersionsAsync, () => {
-  describe('generic project', () => {
+  describe('bare project', () => {
    it('reads the versions from native code', async () => {
-      const exp = initGenericProject();
+      const exp = initBareWorkflowProject();
      const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
        '/repo',
        exp,
@@ -211,7 +211,7 @@ describe(maybeResolveVersionsAsync, () => {
  });
 });

-function initGenericProject({
+function initBareWorkflowProject({
  versionCode = 123,
  versionName = '3.0.0',
 }: {
@@ -6,10 +6,10 @@ import { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json
 import Log from '../../log';
 import {
  ensureApplicationIdIsDefinedForManagedProjectAsync,
-  warnIfAndroidPackageDefinedInAppConfigForGenericProject,
+  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject,
 } from '../../project/android/applicationId';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { ConfigureContext } from '../context';
 import { isExpoUpdatesInstalled } from '../utils/updates';
 import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
@@ -21,12 +21,12 @@ export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void
    return;
  }

-  warnIfAndroidPackageDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+  warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);

  await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);

  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-  await vcs.trackFileAsync(easGradlePath);
+  await getVcsClient().trackFileAsync(easGradlePath);

  if (isExpoUpdatesInstalled(ctx.projectDir)) {
    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -17,15 +17,14 @@ export function transformJob(job: Android.Job): AndroidJobInput {
    artifactPath: job.artifactPath,
    username: job.username,
    buildType: job.buildType && transformBuildType(job.buildType),
+    developmentClient: job.developmentClient,
  };
 }

 function transformBuildType(buildType: Android.BuildType): AndroidBuildType {
  if (buildType === Android.BuildType.APK) {
    return AndroidBuildType.Apk;
-  } else if (buildType === Android.BuildType.APP_BUNDLE) {
-    return AndroidBuildType.AppBundle;
  } else {
-    return AndroidBuildType.DevelopmentClient;
+    return AndroidBuildType.AppBundle;
  }
 }
@@ -1,11 +1,12 @@
 import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import { AndroidBuildProfile } from '@expo/eas-json';
 import path from 'path';
+import slash from 'slash';

 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';

 interface JobData {
@@ -25,7 +26,8 @@ export async function prepareJobAsync(
 ): Promise<Job> {
  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const projectRootDirectory =
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
  const { credentials } = jobData;
  const buildCredentials = credentials
    ? {
@@ -51,7 +53,7 @@ export async function prepareJobAsync(
    projectRootDirectory,
    projectArchive: jobData.projectArchive,
    builderEnvironment: {
-      image: buildProfile.image ?? 'default',
+      image: buildProfile.image,
      node: buildProfile.node,
      yarn: buildProfile.yarn,
      ndk: buildProfile.ndk,
@@ -68,12 +70,11 @@ export async function prepareJobAsync(
    },
    releaseChannel: ctx.buildProfile.releaseChannel,
    updates: { channel: ctx.buildProfile.channel },
-
+    developmentClient: buildProfile.developmentClient,
    gradleCommand: buildProfile.gradleCommand,
    artifactPath: buildProfile.artifactPath,
-
+    buildType,
    username,
-    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
  };

  return sanitizeJob(job);
@@ -13,7 +13,7 @@ import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
-import vcs from '../vcs';
+import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
 import { runLocalBuildAsync } from './local';
 import { MetadataContext, collectMetadataAsync } from './metadata';
@@ -68,7 +68,7 @@ export async function prepareBuildRequestForPlatformAsync<
    });
  }

-  if (await vcs.hasUncommittedChangesAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
    Log.addNewLineIfNone();
    await reviewAndCommitChangesAsync(
      `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
@@ -10,7 +10,8 @@ import { RequestedPlatform } from '../platform';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { confirmAsync, promptAsync } from '../prompts';
 import { ensureLoggedInAsync } from '../user/actions';
-import vcs from '../vcs';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
 import { configureAndroidAsync } from './android/configure';
 import { ConfigureContext } from './context';
 import { configureIosAsync } from './ios/configure';
@@ -37,7 +38,7 @@ export async function ensureProjectConfiguredAsync(
      projectDir,
      platform: requestedPlatform,
    });
-    if (await vcs.hasUncommittedChangesAsync()) {
+    if (await getVcsClient().isCommitRequiredAsync()) {
      error(
        'Build process requires clean working tree, please commit all your changes and run `eas build` again',
        { exit: 1 }
@@ -57,7 +58,7 @@ export async function configureAsync(options: {
  platform: RequestedPlatform;
  projectDir: string;
 }): Promise<void> {
-  await vcs.ensureRepoExistsAsync();
+  await getVcsClient().ensureRepoExistsAsync();
  await maybeBailOnRepoStatusAsync();

  const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
@@ -86,31 +87,39 @@ export async function configureAsync(options: {
    await configureIosAsync(ctx);
  }

-  if (await vcs.hasUncommittedChangesAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
    Log.newLine();
    await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
-  } else {
+  } else if (!(await getVcsClient().hasUncommittedChangesAsync())) {
    Log.newLine();
    Log.withTick('No changes were necessary, the project is already configured correctly.');
  }
 }

 const EAS_JSON_MANAGED_DEFAULT: EasJson = {
+  cli: {
+    version: `>= ${easCliVersion}`,
+  },
  build: {
-    release: {},
    development: {
      developmentClient: true,
      distribution: 'internal',
    },
+    preview: {
+      distribution: 'internal',
+    },
+    production: {},
  },
  submit: {
-    release: {},
+    production: {},
  },
 };

-const EAS_JSON_GENERIC_DEFAULT: EasJson = {
+const EAS_JSON_BARE_DEFAULT: EasJson = {
+  cli: {
+    version: `>= ${easCliVersion}`,
+  },
  build: {
-    release: {},
    development: {
      distribution: 'internal',
      android: {
@@ -120,9 +129,13 @@ const EAS_JSON_GENERIC_DEFAULT: EasJson = {
        buildConfiguration: 'Debug',
      },
    },
+    preview: {
+      distribution: 'internal',
+    },
+    production: {},
  },
  submit: {
-    release: {},
+    production: {},
  },
 };

@@ -139,11 +152,11 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v

  const easJson =
    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
-      ? EAS_JSON_GENERIC_DEFAULT
+      ? EAS_JSON_BARE_DEFAULT
      : EAS_JSON_MANAGED_DEFAULT;

  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-  await vcs.trackFileAsync(easJsonPath);
+  await getVcsClient().trackFileAsync(easJsonPath);
  Log.withTick('Generated eas.json');
 }

@@ -177,7 +190,7 @@ async function reviewAndCommitChangesAsync(
    await commitPromptAsync({ initialCommitMessage });
    Log.withTick('Committed changes');
  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcs.showDiffAsync();
+    await getVcsClient().showDiffAsync();
    await reviewAndCommitChangesAsync(initialCommitMessage, false);
  }
 }
@@ -1,30 +1,16 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
-import fs from 'fs-extra';

 import Log from '../../log';
 import { getProjectAccountName } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { ensureValidVersions } from '../utils/updates';
 import { readPlistAsync, writePlistAsync } from './plist';

 export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
  ensureValidVersions(exp);
  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
-  let xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-
-  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
-    xcodeProject = IOSConfig.Updates.ensureBundleReactNativePhaseContainsConfigurationScript(
-      projectDir,
-      xcodeProject
-    );
-    await fs.writeFile(
-      IOSConfig.Paths.getPBXProjectPath(projectDir),
-      // eslint-disable-next-line node/no-sync
-      xcodeProject.writeSync()
-    );
-  }

  let expoPlist = await readExpoPlistAsync(projectDir);
  if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
@@ -41,7 +27,7 @@ export async function syncUpdatesConfigurationAsync(
  ensureValidVersions(exp);
  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
  try {
-    await ensureUpdatesConfiguredAsync(projectDir, exp);
+    await ensureUpdatesConfiguredAsync(projectDir);
  } catch (error) {
    Log.error(
      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
@@ -62,15 +48,9 @@ export async function syncUpdatesConfigurationAsync(
  }
 }

-async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
-  const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
-
-  if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
-    const script = 'expo-updates/scripts/create-manifest-ios.sh';
-    const buildPhase = '"Bundle React Native code and images"';
-    throw new Error(`Path to ${script} is missing in a ${buildPhase} build phase.`);
-  }
-
+// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
+// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
+async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
  const expoPlist = await readExpoPlistAsync(projectDir);
  if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
    throw new Error('Missing values in Expo.plist');
@@ -88,7 +68,7 @@ async function writeExpoPlistAsync(
 ): Promise<void> {
  const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
  await writePlistAsync(expoPlistPath, expoPlist);
-  await vcs.trackFileAsync(expoPlistPath);
+  await getVcsClient().trackFileAsync(expoPlistPath);
 }

 export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
@@ -49,10 +49,10 @@ describe(evaluateTemplateString, () => {
  });
 });

-// generic workflow
+// bare workflow
 describe(bumpVersionAsync, () => {
  it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
-    const fakeExp = initGenericProject();
+    const fakeExp = initBareWorkflowProject();

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -74,7 +74,7 @@ describe(bumpVersionAsync, () => {
  });

  it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
-    const fakeExp = initGenericProject({ infoPlistName: 'Info2.plist' });
+    const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.BUILD_NUMBER,
@@ -98,7 +98,7 @@ describe(bumpVersionAsync, () => {
  });

  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
-    const fakeExp = initGenericProject();
+    const fakeExp = initBareWorkflowProject();

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.APP_VERSION,
@@ -120,7 +120,7 @@ describe(bumpVersionAsync, () => {
  });

  it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initGenericProject();
+    const fakeExp = initBareWorkflowProject();

    await bumpVersionAsync({
      bumpStrategy: BumpStrategy.NOOP,
@@ -194,9 +194,9 @@ describe(bumpVersionInAppJsonAsync, () => {
 });

 describe(readBuildNumberAsync, () => {
-  describe('generic project', () => {
+  describe('bare project', () => {
    it('reads the build number from native code', async () => {
-      const exp = initGenericProject();
+      const exp = initBareWorkflowProject();
      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
      expect(buildNumber).toBe('1');
    });
@@ -212,14 +212,14 @@ describe(readBuildNumberAsync, () => {
 });

 describe(readShortVersionAsync, () => {
-  describe('generic project', () => {
+  describe('bare project', () => {
    it('reads the short version from native code', async () => {
-      const exp = initGenericProject();
+      const exp = initBareWorkflowProject();
      const appVersion = await readShortVersionAsync('/repo', exp, {});
      expect(appVersion).toBe('1.0.0');
    });
    it('evaluates interpolated build number', async () => {
-      const exp = initGenericProject({
+      const exp = initBareWorkflowProject({
        appVersion: '$(CURRENT_PROJECT_VERSION)',
      });
      const buildNumber = await readShortVersionAsync('/repo', exp, {
@@ -231,7 +231,7 @@ describe(readShortVersionAsync, () => {

  describe('managed project', () => {
    it('reads the version from app config', async () => {
-      const exp = initGenericProject();
+      const exp = initBareWorkflowProject();
      const appVersion = await readShortVersionAsync('/repo', exp, {});
      expect(appVersion).toBe('1.0.0');
    });
@@ -286,7 +286,7 @@ describe(getInfoPlistPath, () => {
  });
 });

-function initGenericProject({
+function initBareWorkflowProject({
  appVersion = '1.0.0',
  version = '1',
  infoPlistName = 'Info.plist',
@@ -6,7 +6,7 @@ import type { XCBuildConfiguration } from 'xcode';
 import Log from '../../log';
 import {
  ensureBundleIdentifierIsDefinedForManagedProjectAsync,
-  warnIfBundleIdentifierDefinedInAppConfigForGenericProject,
+  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject,
 } from '../../project/ios/bundleIdentifier';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { ConfigureContext } from '../context';
@@ -20,7 +20,7 @@ export async function configureIosAsync(ctx: ConfigureContext): Promise<void> {
    return;
  }

-  warnIfBundleIdentifierDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+  warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(ctx.projectDir, ctx.exp);

  if (isExpoUpdatesInstalled(ctx.projectDir)) {
    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -1,12 +1,7 @@
 import { Env, Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';

-import {
-  DistributionType,
-  IosBuildType,
-  IosJobInput,
-  IosJobSecretsInput,
-} from '../../graphql/generated';
+import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
 import { transformProjectArchive, transformWorkflow } from '../graphql';

 export function transformJob(job: Ios.Job): IosJobInput {
@@ -16,30 +11,18 @@ export function transformJob(job: Ios.Job): IosJobInput {
    projectRootDirectory: job.projectRootDirectory,
    releaseChannel: job.releaseChannel,
    updates: job.updates,
-    distribution: job.distribution && transformDistributionType(job.distribution),
    secrets: transformIosSecrets(job.secrets),
    builderEnvironment: job.builderEnvironment,
    cache: job.cache,
-
    scheme: job.scheme,
    buildConfiguration: job.buildConfiguration,
    artifactPath: job.artifactPath,
-
-    buildType: job.buildType && transformBuildType(job.buildType),
    username: job.username,
+    developmentClient: job.developmentClient,
+    simulator: job.simulator,
  };
 }

-function transformDistributionType(distributionType: Ios.DistributionType): DistributionType {
-  if (distributionType === 'store') {
-    return DistributionType.Store;
-  } else if (distributionType === 'internal') {
-    return DistributionType.Internal;
-  } else {
-    return DistributionType.Simulator;
-  }
-}
-
 function transformIosSecrets(secrets: {
  buildCredentials?: Ios.BuildCredentials;
  env?: Env;
@@ -61,11 +44,3 @@ function transformIosSecrets(secrets: {
    environmentSecrets: secrets.env,
  };
 }
-
-function transformBuildType(buildType: Ios.BuildType): IosBuildType {
-  if (buildType === Ios.BuildType.DEVELOPMENT_CLIENT) {
-    return IosBuildType.DevelopmentClient;
-  } else {
-    return IosBuildType.Release;
-  }
-}
@@ -1,11 +1,11 @@
 import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
-import semver from 'semver';
+import slash from 'slash';

 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { getUsername } from '../../project/projectUtils';
 import { ensureLoggedInAsync } from '../../user/actions';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';

 interface JobData {
@@ -24,7 +24,8 @@ export async function prepareJobAsync(
  ctx: BuildContext<Platform.IOS>,
  jobData: JobData
 ): Promise<Job> {
-  const projectRootDirectory = path.relative(await vcs.getRootPathAsync(), ctx.projectDir) || '.';
+  const projectRootDirectory =
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
  if (jobData.credentials) {
@@ -39,9 +40,8 @@ export async function prepareJobAsync(
    platform: Platform.IOS,
    projectArchive: jobData.projectArchive,
    projectRootDirectory,
-    distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
    builderEnvironment: {
-      image: resolveImage(ctx),
+      image: ctx.buildProfile.image,
      node: ctx.buildProfile.node,
      yarn: ctx.buildProfile.yarn,
      bundler: ctx.buildProfile.bundler,
@@ -60,30 +60,16 @@ export async function prepareJobAsync(
    },
    releaseChannel: ctx.buildProfile.releaseChannel,
    updates: { channel: ctx.buildProfile.channel },
-
+    developmentClient: ctx.buildProfile.developmentClient,
+    simulator: ctx.buildProfile.simulator,
    scheme: jobData.buildScheme,
    buildConfiguration: ctx.buildProfile.buildConfiguration,
    artifactPath: ctx.buildProfile.artifactPath,
-
-    buildType: ctx.buildProfile.developmentClient
-      ? Ios.BuildType.DEVELOPMENT_CLIENT
-      : Ios.BuildType.RELEASE,
    username,
  };
  return sanitizeJob(job);
 }

-function resolveImage(ctx: BuildContext<Platform.IOS>): Ios.BuilderEnvironment['image'] {
-  // see https://linear.app/expo/issue/ENG-1396/make-default-image-dependent-on-sdk-version
-  if (!ctx.buildProfile.image && ctx.exp.sdkVersion) {
-    const majorSdkVersion = semver.major(ctx.exp.sdkVersion);
-    if (majorSdkVersion <= 41) {
-      return 'macos-catalina-10.15-xcode-12.4';
-    }
-  }
-  return ctx.buildProfile.image ?? 'default';
-}
-
 function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {
  return {
    provisioningProfileBase64: targetCredentials.provisioningProfile,
@@ -7,7 +7,8 @@ import { GradleBuildContext } from '../project/android/gradle';
 import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
 import { getUsername } from '../project/projectUtils';
 import { ensureLoggedInAsync } from '../user/actions';
-import vcs from '../vcs';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
 import {
  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -21,13 +22,6 @@ import {
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 import { isExpoUpdatesInstalled } from './utils/updates';

-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../../package.json');
-
 export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
  ? AndroidMetadataContext
  : IosMetadataContext;
@@ -53,7 +47,7 @@ export async function collectMetadataAsync<T extends Platform>(
  const metadata = {
    trackingContext: ctx.trackingCtx,
    ...(await maybeResolveVersionsAsync(ctx, platformContext)),
-    cliVersion: packageJSON.version,
+    cliVersion: easCliVersion,
    workflow: ctx.workflow,
    credentialsSource: ctx.buildProfile.credentialsSource,
    sdkVersion: ctx.exp.sdkVersion,
@@ -63,7 +57,8 @@ export async function collectMetadataAsync<T extends Platform>(
    appName: ctx.exp.name,
    appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
    buildProfile: ctx.buildProfileName,
-    gitCommitHash: await vcs.getCommitHashAsync(),
+    gitCommitHash: await getVcsClient().getCommitHashAsync(),
+    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
    username: getUsername(ctx.exp, await ensureLoggedInAsync()),
    ...(ctx.platform === Platform.IOS && {
      iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
@@ -1,6 +1,6 @@
 import * as ExpoConfig from '@expo/config';
+import JsonFile from '@expo/json-file';
 import assert from 'assert';
-import fs from 'fs-extra';

 export async function updateAppJsonConfigAsync(
  {
@@ -15,10 +15,19 @@ export async function updateAppJsonConfigAsync(
  const paths = ExpoConfig.getConfigFilePaths(projectDir);
  assert(paths.staticConfigPath, "can't update dynamic config");

-  const rawStaticConfig = await fs.readJSON(paths.staticConfigPath);
+  const rawStaticConfig = readAppJson(paths.staticConfigPath);
  rawStaticConfig.expo = rawStaticConfig.expo ?? {};
  modifyConfig(rawStaticConfig.expo);
-  await fs.writeJson(paths.staticConfigPath, rawStaticConfig, { spaces: 2 });
+  await JsonFile.writeAsync(paths.staticConfigPath, rawStaticConfig, { json5: false });

  modifyConfig(exp);
 }
+
+// TODO: remove this once @expo/config exports getStaticConfig
+export function readAppJson(appJsonPath: string): any {
+  const config = JsonFile.read(appJsonPath, { json5: true });
+  if (config) {
+    return config as any;
+  }
+  throw new Error(`Failed to read app.json`);
+}
@@ -1,5 +1,5 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJsonReader } from '@expo/eas-json';
+import { Workflow } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
@@ -9,40 +9,37 @@ import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync } from '../../prompts';
-import { expoCommandAsync } from '../../utils/expoCommand';
-import zipObject from '../../utils/expodash/zipObject';
+import { expoCommandAsync } from '../../utils/expoCli';
+import { ProfileData } from '../../utils/profiles';
 import { reviewAndCommitChangesAsync } from './repository';

 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
  projectDir,
-  platforms,
-  profile,
  nonInteractive = false,
+  buildProfiles = [],
 }: {
  projectDir: string;
-  platforms: Platform[];
-  profile: string;
  nonInteractive?: boolean;
+  buildProfiles?: ProfileData<BuildProfile>[];
 }): Promise<void> {
  if (await isExpoDevClientInstalledAsync(projectDir)) {
    return;
  }

-  const easJsonReader = new EasJsonReader(projectDir);
-  const devClientPerPlatformList = await Promise.all(
-    platforms.map(async platform => {
-      const buildProfile = await easJsonReader.readBuildProfileAsync(platform, profile);
-      return buildProfile.developmentClient ?? false;
-    })
+  const buildProfilesWithDevelopmentClientRequired = buildProfiles.filter(
+    buildProfile => buildProfile.profile.developmentClient
  );

-  const isDevClientRequired = devClientPerPlatformList.some(i => i);
-  if (!isDevClientRequired) {
+  const isDevelopmentClientRequired = buildProfilesWithDevelopmentClientRequired.some(Boolean);
+
+  if (!isDevelopmentClientRequired) {
    return;
  }

-  const devClientPerPlatform = zipObject(platforms, devClientPerPlatformList);
-  const platformsToCheck = platforms.filter(platform => devClientPerPlatform[platform]);
+  const platformsToCheck = buildProfilesWithDevelopmentClientRequired.map(
+    ({ platform }) => platform
+  );
+
  const workflowPerPlatformList = await Promise.all(
    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
  );
@@ -67,15 +64,15 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
    if (install) {
      await installExpoDevClientAsync(projectDir, { nonInteractive });
    } else {
-      error(`Install ${chalk.bold('expo-dev-client')} on your own and come back later.`, {
+      error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
        exit: 1,
      });
    }
  } else {
-    Log.warn(`Unfortunately, you need to install ${chalk.bold('expo-dev-client')} on your own.`);
+    Log.warn(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
    Log.warn(
      learnMore('https://docs.expo.dev/clients/installation/', {
-        learnMoreMessage: 'See installation instructions on how to do it',
+        learnMoreMessage: 'See installation instructions on how to do it.',
        dim: false,
      })
    );
@@ -24,7 +24,9 @@ export function printLogsUrls(builds: BuildFragment[]): void {
    builds.forEach(build => {
      const logsUrl = getBuildLogsUrl(build);
      Log.log(
-        `${appPlatformDisplayNames[build.platform]} build details: ${chalk.underline(logsUrl)}`
+        `${appPlatformEmojis[build.platform]} ${
+          appPlatformDisplayNames[build.platform]
+        } build details: ${chalk.underline(logsUrl)}`
      );
    });
  }
@@ -10,10 +10,10 @@ import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';

 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
-  if (!(await vcs.hasUncommittedChangesAsync())) {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
    return;
  }
  Log.addNewLineIfNone();
@@ -33,7 +33,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
 }

 export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
-  if (!(await vcs.hasUncommittedChangesAsync())) {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
    return;
  }
  Log.addNewLineIfNone();
@@ -70,7 +70,7 @@ export async function commitPromptAsync({
    initial: initialCommitMessage,
    validate: (input: string) => input !== '',
  });
-  await vcs.commitAsync({ commitAllFiles, commitMessage: message });
+  await getVcsClient().commitAsync({ commitAllFiles, commitMessage: message });
 }

 export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -95,7 +95,7 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
  startTimer(compressTimerLabel);

  try {
-    await vcs.makeShallowCopyAsync(shallowClonePath);
+    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
    await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
      '.',
    ]);
@@ -133,7 +133,10 @@ export async function reviewAndCommitChangesAsync(
  { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
  if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+    await getVcsClient().commitAsync({
+      commitMessage: initialCommitMessage,
+      commitAllFiles: false,
+    });
    Log.withTick('Committed changes.');
    return;
  }
@@ -166,7 +169,7 @@ export async function reviewAndCommitChangesAsync(
    await commitPromptAsync({ initialCommitMessage });
    Log.withTick('Committed changes.');
  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcs.showDiffAsync();
+    await getVcsClient().showDiffAsync();
    await reviewAndCommitChangesAsync(initialCommitMessage, {
      nonInteractive,
      askedFirstTime: false,
@@ -2,7 +2,7 @@ import { ExpoConfig, getPackageJson } from '@expo/config';

 export function isExpoUpdatesInstalled(projectDir: string): boolean {
  const packageJson = getPackageJson(projectDir);
-  return packageJson.dependencies && 'expo-updates' in packageJson.dependencies;
+  return !!(packageJson.dependencies && 'expo-updates' in packageJson.dependencies);
 }

 export function ensureValidVersions(exp: ExpoConfig): void {
@@ -3,7 +3,7 @@ import fs from 'fs-extra';
 import path from 'path';

 import Log, { learnMore } from '../log';
-import vcs from '../vcs';
+import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';

 export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
@@ -25,12 +25,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
  if (!googleServicesFilePath) {
    return;
  }
-  const rootDir = path.normalize(await vcs.getRootPathAsync());
+  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
  const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
  if (
    (await fs.pathExists(absGoogleServicesFilePath)) &&
    (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await vcs.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
+      (await getVcsClient().isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
  ) {
    Log.warn(
      `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
@@ -41,7 +41,7 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
      )}`
    );
    Log.warn(
-      'If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.'
+      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
    );
    Log.newLine();
  }
@@ -1,4 +1,6 @@
+import { EasJsonReader } from '@expo/eas-json';
 import { Command } from '@oclif/command';
+import semver from 'semver';

 import {
  AnalyticsEvent,
@@ -6,8 +8,13 @@ import {
  initAsync as initAnalyticsAsync,
  logEvent,
 } from '../analytics';
+import Log from '../log';
+import { findProjectRootAsync } from '../project/projectUtils';
 import { getUserAsync } from '../user/User';
 import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { setVcsClient } from '../vcs';
+import GitClient from '../vcs/clients/git';

 export default abstract class EasCommand extends Command {
  /**
@@ -20,7 +27,10 @@ export default abstract class EasCommand extends Command {

  // eslint-disable-next-line async-protect/async-suffix
  async run(): Promise<any> {
+    EasJsonReader.setLog(Log);
+
    await initAnalyticsAsync();
+    await this.applyCliConfigAsync();

    if (this.requiresAuthentication) {
      const { flags } = this.parse();
@@ -42,4 +52,18 @@ export default abstract class EasCommand extends Command {
    await flushAnalyticsAsync();
    return super.finally(err);
  }
+
+  private async applyCliConfigAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const easJsonReader = new EasJsonReader(projectDir);
+    const config = await easJsonReader.getCliConfigAsync();
+    if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
+      throw new Error(
+        `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
+      );
+    }
+    if (config?.requireCommit) {
+      setVcsClient(new GitClient());
+    }
+  }
 }
@@ -17,7 +17,7 @@ import {
  getProjectIdAsync,
 } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';

 export async function createUpdateBranchOnAppAsync({
  appId,
@@ -75,11 +75,7 @@ export default class BranchCreate extends EasCommand {
      flags,
    } = this.parse(BranchCreate);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);
@@ -94,7 +90,8 @@ export default class BranchCreate extends EasCommand {
        name: 'name',
        message: 'Please name the branch:',
        initial:
-          (await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
+          (await getVcsClient().getBranchNameAsync()) ||
+          `branch-${Math.random().toString(36).substr(2, 4)}`,
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -43,7 +43,8 @@ async function getBranchInfoAsync({
        {
          appId,
          name,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch'] }
      )
      .toPromise()
  );
@@ -98,10 +99,7 @@ export default class BranchDelete extends EasCommand {
      flags: { json: jsonFlag },
    } = this.parse(BranchDelete);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);
@@ -44,7 +44,8 @@ export async function listBranchesAsync({
        {
          appId: projectId,
          limit: BRANCHES_LIMIT,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch'] }
      )
      .toPromise()
  );
@@ -67,10 +68,7 @@ export default class BranchList extends EasCommand {
  async runAsync(): Promise<void> {
    const { flags } = this.parse(BranchList);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const branches = await listBranchesAsync({ projectId });
@@ -1,5 +1,6 @@
-import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
-import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
+import { ExpoConfig, getConfig } from '@expo/config';
+import { Updates } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import { flags } from '@oclif/command';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -28,11 +29,12 @@ import {
  collectAssetsAsync,
  uploadAssetsAsync,
 } from '../../project/publish';
+import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync, selectAsync } from '../../prompts';
 import { formatUpdate } from '../../update/utils';
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
-import vcs from '../../vcs';
+import { getVcsClient } from '../../vcs';
 import { createUpdateBranchOnAppAsync } from './create';
 import { listBranchesAsync } from './list';
 import { viewUpdateBranchAsync } from './view';
@@ -60,7 +62,8 @@ async function getUpdateGroupAsync({
        `,
        {
          group,
-        }
+        },
+        { additionalTypenames: ['Update'] }
      )
      .toPromise()
  );
@@ -162,23 +165,20 @@ export default class BranchPublish extends EasCommand {
    // If a group was specified, that means we are republishing it.
    republish = group ? true : republish;

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, {
      skipSDKVersionRequirement: true,
      isPublicConfig: true,
    });

-    const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);
+    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);

    const projectId = await getProjectIdAsync(exp);

    if (!branchName && autoFlag) {
      branchName =
-        (await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`;
+        (await getVcsClient().getBranchNameAsync()) ||
+        `branch-${Math.random().toString(36).substr(2, 4)}`;
    }

    if (!branchName) {
@@ -301,7 +301,7 @@ export default class BranchPublish extends EasCommand {
    }

    if (!message && autoFlag) {
-      message = (await vcs.getLastCommitMessageAsync())?.trim();
+      message = (await getVcsClient().getLastCommitMessageAsync())?.trim();
    }

    if (!message) {
@@ -315,7 +315,7 @@ export default class BranchPublish extends EasCommand {
        message: `Please enter a publication message.`,
        initial: republish
          ? `Republish "${oldMessage!}" - group: ${group}`
-          : (await vcs.getLastCommitMessageAsync())?.trim(),
+          : (await getVcsClient().getLastCommitMessageAsync())?.trim(),
        validate: value => (value ? true : validationMessage),
      }));
    }
@@ -392,59 +392,26 @@ export default class BranchPublish extends EasCommand {
  }
 }

-function getRuntimeVersionObject(
+async function getRuntimeVersionObjectAsync(
  exp: ExpoConfig,
-  platformFlag: string,
+  platformFlag: PlatformFlag,
  projectDir: string
-): Record<string, string> {
-  let { runtimeVersion: defaultRuntimeVersion, sdkVersion } = exp;
+): Promise<Record<string, string>> {
+  const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];

-  // When a SDK version is supplied instead of a runtime version and we're in the managed workflow
-  // construct the runtimeVersion with special meaning indicating that the runtime is an
-  // Expo SDK preset runtime that can be launched in Expo Go.
-  const isManagedProject = getDefaultTarget(projectDir) === 'managed';
-  if (!defaultRuntimeVersion && sdkVersion && isManagedProject) {
-    Log.withTick('Generating runtime version from sdk version');
-    defaultRuntimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
-  }
-  const iOSRuntimeVersion = (exp as any).ios?.runtimeVersion; // TODO-JJ remove cast to any
-  const androidRuntimeVersion = (exp as any).android?.runtimeVersion; // TODO-JJ remove cast to any
-  let runtimeVersions: Record<string, string>;
-  switch (platformFlag) {
-    case 'ios': {
-      runtimeVersions = {
-        ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
-      };
-      break;
+  for (const platform of platforms) {
+    const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
+    if (isPolicy) {
+      const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
+      if (!isManaged) {
+        throw new Error('Runtime version policies are only supported in the managed workflow.');
+      }
    }
-    case 'android': {
-      runtimeVersions = {
-        android: androidRuntimeVersion ?? defaultRuntimeVersion,
-      };
-      break;
-    }
-    case 'all': {
-      runtimeVersions = {
-        ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
-        android: androidRuntimeVersion ?? defaultRuntimeVersion,
-      };
-      break;
-    }
-    default:
-      throw new Error('Platform flag must be "ios", "android", or "all"');
-  }
-  if (Object.values(runtimeVersions).some(runtime => !runtime)) {
-    throw new Error(
-      "Couldn't find a 'runtimeVersion' for every platform. Please specify it under the 'expo' key in 'app.json'"
-    );
-  }
-  if (Object.values(runtimeVersions).some(runtime => typeof runtime !== 'string')) {
-    throw new Error(
-      `Please ensure that all of the runtime versions defined in the app.json are strings.`
-    );
  }

-  return runtimeVersions;
+  return Object.fromEntries(
+    platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
+  );
 }

 function formatUpdateTitle(
@@ -74,10 +74,7 @@ export default class BranchRename extends EasCommand {
      flags: { json: jsonFlag, from: currentName, to: newName },
    } = this.parse(BranchRename);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);
@@ -58,7 +58,8 @@ export async function viewUpdateBranchAsync({
          appId,
          name,
          limit: PAGE_LIMIT,
-        }
+        },
+        { additionalTypenames: ['UpdateBranch', 'Update'] }
      )
      .toPromise()
  );
@@ -90,11 +91,7 @@ export default class BranchView extends EasCommand {
      flags: { json: jsonFlag },
    } = this.parse(BranchView);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
-
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -117,7 +117,7 @@ export default class BuildCancel extends EasCommand {
  async runAsync(): Promise<void> {
    const { BUILD_ID: buildIdFromArg } = this.parse(BuildCancel).args;

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectFullName = await getProjectFullNameAsync(exp);
@@ -31,7 +31,7 @@ export default class BuildConfigure extends EasCommand {

    await configureAsync({
      platform,
-      projectDir: (await findProjectRootAsync()) ?? process.cwd(),
+      projectDir: await findProjectRootAsync(),
    });

    Log.newLine();
@@ -1,13 +1,10 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import {
-  EasJsonReader,
-  hasMismatchedExtendsAsync,
-  isUsingDeprecatedFormatAsync,
-  migrateAsync,
-} from '@expo/eas-json';
+import { BuildProfile, EasJsonReader } from '@expo/eas-json';
 import { flags } from '@oclif/command';
 import { error } from '@oclif/errors';
 import chalk from 'chalk';
+import figures from 'figures';
+import fs from 'fs-extra';
 import nullthrows from 'nullthrows';

 import { prepareAndroidBuildAsync } from '../../build/android/build';
@@ -27,7 +24,7 @@ import {
  SubmissionFragment,
 } from '../../graphql/generated';
 import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
-import Log from '../../log';
+import Log, { learnMore, link } from '../../log';
 import {
  RequestedPlatform,
  appPlatformDisplayNames,
@@ -41,21 +38,24 @@ import {
 } from '../../project/isEasEnabledForProject';
 import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
 import { findProjectRootAsync } from '../../project/projectUtils';
-import { confirmAsync } from '../../prompts';
+import { selectAsync } from '../../prompts';
 import { createSubmissionContextAsync } from '../../submit/context';
 import {
  submitAsync,
  waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../../submit/submit';
 import { printSubmissionDetailsUrls } from '../../submit/utils/urls';
+import { easCliVersion } from '../../utils/easCli';
 import { enableJsonOutput } from '../../utils/json';
-import vcs from '../../vcs';
+import { ProfileData, getProfilesAsync } from '../../utils/profiles';
+import { getVcsClient, setVcsClient } from '../../vcs';
+import GitClient from '../../vcs/clients/git';

 interface RawBuildFlags {
  platform?: string;
  'skip-credentials-check': boolean;
  'skip-project-configuration': boolean;
-  profile: string;
+  profile?: string;
  'non-interactive': boolean;
  local: boolean;
  wait: boolean;
@@ -68,7 +68,7 @@ interface RawBuildFlags {
 interface BuildFlags {
  requestedPlatform: RequestedPlatform;
  skipProjectConfiguration: boolean;
-  profile: string;
+  profile: string | null;
  nonInteractive: boolean;
  local: boolean;
  wait: boolean;
@@ -99,8 +99,8 @@ export default class Build extends EasCommand {
      description: 'Skip project configuration',
    }),
    profile: flags.string({
-      default: 'release',
-      description: 'Name of the build profile from eas.json',
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
      helpValue: 'PROFILE_NAME',
    }),
    'non-interactive': flags.boolean({
@@ -143,53 +143,69 @@ export default class Build extends EasCommand {
    const flags = await this.sanitizeFlagsAsync(rawFlags);
    const { requestedPlatform } = flags;

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);

-    await vcs.ensureRepoExistsAsync();
+    await getVcsClient().ensureRepoExistsAsync();
    await ensureRepoIsCleanAsync(flags.nonInteractive);

    await ensureProjectConfiguredAsync(projectDir, requestedPlatform);

    const platforms = toPlatforms(requestedPlatform);
-    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+    const easJsonReader = new EasJsonReader(projectDir);
+    const buildProfiles = await getProfilesAsync({
      platforms,
-      projectDir,
-      profile: flags.profile,
-      nonInteractive: flags.nonInteractive,
+      profileName: flags.profile,
+      async readProfileAsync(platform, profileName) {
+        return await easJsonReader.readBuildProfileAsync(platform, profileName);
+      },
    });

-    const startedBuilds: BuildFragment[] = [];
+    await ensureExpoDevClientInstalledForDevClientBuildsAsync({
+      projectDir,
+      nonInteractive: flags.nonInteractive,
+      buildProfiles,
+    });
+
+    const startedBuilds: {
+      build: BuildFragment;
+      buildProfile: ProfileData<BuildProfile>;
+    }[] = [];
    const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
-    for (const platform of platforms) {
+
+    for (const buildProfile of buildProfiles) {
      const { build: maybeBuild, buildCtx } = await this.prepareAndStartBuildAsync({
        projectDir,
-        platform,
        flags,
        moreBuilds: platforms.length > 1,
+        buildProfile,
      });
      if (maybeBuild) {
-        startedBuilds.push(maybeBuild);
+        startedBuilds.push({ build: maybeBuild, buildProfile });
      }
-      buildCtxByPlatform[toAppPlatform(platform)] = buildCtx;
+      buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
    }
+
    if (flags.local) {
      return;
    }

    Log.newLine();
-    printLogsUrls(startedBuilds);
+    printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
    Log.newLine();

    const submissions: SubmissionFragment[] = [];
    if (flags.autoSubmit) {
-      for (const build of startedBuilds) {
+      for (const startedBuild of startedBuilds) {
        const submission = await this.prepareAndStartSubmissionAsync({
-          build,
-          credentialsCtx: nullthrows(buildCtxByPlatform[build.platform]?.credentialsCtx),
+          build: startedBuild.build,
+          credentialsCtx: nullthrows(
+            buildCtxByPlatform[startedBuild.build.platform]?.credentialsCtx
+          ),
          flags,
          moreBuilds: startedBuilds.length > 1,
          projectDir,
+          buildProfile: startedBuild.buildProfile,
        });
        submissions.push(submission);
      }
@@ -203,7 +219,7 @@ export default class Build extends EasCommand {
      return;
    }

-    const builds = await waitForBuildEndAsync(startedBuilds.map(build => build.id));
+    const builds = await waitForBuildEndAsync(startedBuilds.map(({ build }) => build.id));
    printBuildResults(builds, flags.json);

    const haveAllBuildsFailedOrCanceled = builds.every(
@@ -252,7 +268,7 @@ export default class Build extends EasCommand {
    return {
      requestedPlatform,
      skipProjectConfiguration: flags['skip-project-configuration'],
-      profile,
+      profile: profile ?? null,
      nonInteractive,
      local: flags['local'],
      wait: flags['wait'],
@@ -263,34 +279,31 @@ export default class Build extends EasCommand {
    };
  }

-  private async prepareAndStartBuildAsync<T extends Platform>({
+  private async prepareAndStartBuildAsync({
    projectDir,
-    platform,
    flags,
    moreBuilds,
+    buildProfile,
  }: {
    projectDir: string;
-    platform: T;
    flags: BuildFlags;
    moreBuilds: boolean;
-  }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<T> }> {
-    const easJsonReader = new EasJsonReader(projectDir);
-    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
-
+    buildProfile: ProfileData<BuildProfile>;
+  }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
    const buildCtx = await createBuildContextAsync({
-      buildProfileName: flags.profile,
+      buildProfileName: buildProfile.profileName,
      clearCache: flags.clearCache,
-      buildProfile,
+      buildProfile: buildProfile.profile,
      local: flags.local,
      nonInteractive: flags.nonInteractive,
-      platform,
+      platform: buildProfile.platform,
      projectDir,
      skipProjectConfiguration: flags.skipProjectConfiguration,
    });

    if (moreBuilds) {
      Log.newLine();
-      const appPlatform = toAppPlatform(platform);
+      const appPlatform = toAppPlatform(buildProfile.platform);
      Log.log(
        `${appPlatformEmojis[appPlatform]} ${chalk.bold(
          `${appPlatformDisplayNames[appPlatform]} build`
@@ -330,16 +343,17 @@ export default class Build extends EasCommand {
    flags,
    moreBuilds,
    projectDir,
+    buildProfile,
  }: {
    build: BuildFragment;
    credentialsCtx: CredentialsContext;
    flags: BuildFlags;
    moreBuilds: boolean;
    projectDir: string;
+    buildProfile: ProfileData<BuildProfile>;
  }): Promise<SubmissionFragment> {
    const easJsonReader = new EasJsonReader(projectDir);
    const platform = toPlatform(build.platform);
-    const buildProfile = await easJsonReader.readBuildProfileAsync(platform, flags.profile);
    const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
    const submissionCtx = await createSubmissionContextAsync({
      platform,
@@ -348,7 +362,7 @@ export default class Build extends EasCommand {
      profile: submitProfile,
      archiveFlags: { id: build.id },
      nonInteractive: flags.nonInteractive,
-      env: buildProfile.env,
+      env: buildProfile.profile.env,
      credentialsCtx,
    });

@@ -378,36 +392,52 @@ export async function handleDeprecatedEasJsonAsync(
  projectDir: string,
  nonInteractive: boolean
 ): Promise<void> {
-  if (await isUsingDeprecatedFormatAsync(projectDir)) {
-    const hasMismatchedExtendsKeys = await hasMismatchedExtendsAsync(projectDir);
-    if (nonInteractive) {
-      Log.error('We detected that your eas.json is using a deprecated format.');
-      Log.error(
-        'We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json'
-      );
-      error('Unsupported eas.json format', { exit: 1 });
-    }
+  if (!(await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir)))) {
+    return;
+  }
+  const easJsonReader = new EasJsonReader(projectDir);
+  const rawEasJson = await easJsonReader.readRawAsync();
+  if (rawEasJson?.cli) {
+    return;
+  }

-    const confirm = await confirmAsync({
-      message:
-        'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
-    });
-    if (confirm) {
-      await migrateAsync(projectDir);
-      if (hasMismatchedExtendsKeys) {
-        Log.warn(
-          '"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms'
-        );
-        Log.warn(
-          'Migration was successful, but you need to manually adjust the extend rules for your profiles'
-        );
-        error('Fix eas.json manually', { exit: 1 });
-      }
-    } else {
-      Log.error(
-        "Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again"
-      );
-      error('Unsupported eas.json format', { exit: 1 });
-    }
+  if (nonInteractive) {
+    Log.warn(
+      `${
+        figures.warning
+      } Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
+        'https://expo.fyi/eas-vcs-workflow'
+      )} for more information.`
+    );
+    Log.warn(
+      'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
+    );
+    setVcsClient(new GitClient());
+    return;
+  }
+  Log.log(
+    `${chalk.bold(
+      'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
+    )} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
+  );
+  Log.log(
+    `If you want to continue using the Git integration, you can opt in with ${chalk.bold(
+      'cli.requireCommit'
+    )} in ${chalk.bold('eas.json')} or with the following prompt`
+  );
+  Log.newLine();
+
+  const mode = await selectAsync('Select your preferred Git integration', [
+    { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+    { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
+  ]);
+
+  rawEasJson.cli =
+    mode === 'requireCommit'
+      ? { version: `>= ${easCliVersion}`, requireCommit: true }
+      : { version: `>= ${easCliVersion}` };
+  await fs.writeJSON(EasJsonReader.formatEasJsonPath(projectDir), rawEasJson, { spaces: 2 });
+  if (mode === 'requireCommit') {
+    setVcsClient(new GitClient());
  }
 }
@@ -76,7 +76,7 @@ export default class BuildList extends EasCommand {
    const graphqlBuildStatus = toGraphQLBuildStatus(buildStatus);
    const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectName = await getProjectFullNameAsync(exp);
@@ -34,7 +34,7 @@ export default class BuildView extends EasCommand {
      enableJsonOutput();
    }

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectName = await getProjectFullNameAsync(exp);
@@ -84,10 +84,7 @@ export default class ChannelCreate extends EasCommand {
      flags: { json: jsonFlag },
    } = this.parse(ChannelCreate);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -49,7 +49,8 @@ async function getChannelByNameForAppAsync({
            }
          }
        `,
-        { appId, channelName }
+        { appId, channelName },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] }
      )
      .toPromise()
  );
@@ -121,10 +122,7 @@ export default class ChannelEdit extends EasCommand {
      flags: { branch: branchName, json: jsonFlag },
    } = this.parse(ChannelEdit);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -58,7 +58,8 @@ async function getAllUpdateChannelForAppAsync({
            }
          }
        `,
-        { appId, offset: 0, limit: CHANNEL_LIMIT }
+        { appId, offset: 0, limit: CHANNEL_LIMIT },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
      )
      .toPromise()
  );
@@ -80,10 +81,7 @@ export default class ChannelList extends EasCommand {
      flags: { json: jsonFlag },
    } = this.parse(ChannelList);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -346,10 +346,7 @@ export default class ChannelRollout extends EasCommand {
      flags: { branch: branchName, percent },
    } = this.parse(ChannelRollout);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const fullName = await getProjectFullNameAsync(exp);
    const projectId = await getProjectIdAsync(exp);
@@ -133,7 +133,8 @@ export async function getUpdateChannelByNameForAppAsync({
            }
          }
        `,
-        { appId, channelName }
+        { appId, channelName },
+        { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
      )
      .toPromise()
  );
@@ -215,10 +216,7 @@ export default class ChannelView extends EasCommand {
      flags: { json: jsonFlag },
    } = this.parse(ChannelView);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -27,7 +27,7 @@ export default class Config extends EasCommand {
      profile?: string;
    };

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    await handleDeprecatedEasJsonAsync(projectDir, false);

    const reader = new EasJsonReader(projectDir);
@@ -22,7 +22,7 @@ export default class BuildList extends EasCommand {
  async runAsync(): Promise<void> {
    let appleTeamIdentifier = this.parse(BuildList).flags['apple-team-id'];

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const accountName = await getProjectAccountNameAsync(exp);

@@ -29,7 +29,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
      throw new Error('Device UDID is missing');
    }

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const accountName = await getProjectAccountNameAsync(exp);

@@ -2,8 +2,7 @@ import envinfo from 'envinfo';

 import EasCommand from '../commandUtils/EasCommand';
 import Log from '../log';
-
-const packageJSON = require('../../package.json');
+import { easCliVersion } from '../utils/easCli';

 export default class Diagnostics extends EasCommand {
  static description = 'log environment info to the console';
@@ -30,7 +29,7 @@ export default class Diagnostics extends EasCommand {
        npmGlobalPackages: ['eas-cli', 'expo-cli'],
      },
      {
-        title: `EAS CLI ${packageJSON.version} environment info`,
+        title: `EAS CLI ${easCliVersion} environment info`,
      }
    );
    Log.log(info);
@@ -22,7 +22,8 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
            }
          }
        `,
-        { appId }
+        { appId },
+        { additionalTypenames: ['App'] }
      )
      .toPromise()
  );
@@ -34,10 +35,7 @@ export default class ProjectInfo extends EasCommand {
  static description = 'information about the current project';

  async runAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const { app } = await projectInfoByIdAsync(projectId);
@@ -10,10 +10,7 @@ export default class ProjectInit extends EasCommand {
  static aliases = ['init'];

  async runAsync(): Promise<void> {
-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });

    if (exp.extra?.eas?.projectId) {
@@ -50,7 +50,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
      flags: { name, value: secretValue, scope, force },
    } = this.parse(EnvironmentSecretCreate);

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const accountName = await getProjectAccountNameAsync(exp);

@@ -32,7 +32,7 @@ Unsure where to find the secret's ID? Run ${chalk.bold('eas secrets:list')}`;
  };

  async runAsync(): Promise<void> {
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectAccountName = await getProjectAccountNameAsync(exp);
@@ -20,7 +20,7 @@ export default class EnvironmentSecretList extends EasCommand {
  static description = 'Lists environment secrets available for your current app';

  async runAsync(): Promise<void> {
-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectAccountName = await getProjectAccountNameAsync(exp);
@@ -7,7 +7,7 @@ import chalk from 'chalk';
 import EasCommand from '../commandUtils/EasCommand';
 import { SubmissionFragment } from '../graphql/generated';
 import { toAppPlatform } from '../graphql/types/AppPlatform';
-import Log, { learnMore } from '../log';
+import Log, { link } from '../log';
 import {
  RequestedPlatform,
  appPlatformDisplayNames,
@@ -20,6 +20,7 @@ import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils
 import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
 import { submitAsync, waitToCompleteAsync } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { getProfilesAsync } from '../utils/profiles';

 interface RawFlags {
  platform?: string;
@@ -44,9 +45,7 @@ interface Flags {

 export default class Submit extends EasCommand {
  static description = `submit build archive to app store
-See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/submit/eas-json/', {
-    learnMoreMessage: '',
-  })}`;
+See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit/eas-json/')}`;
  static aliases = ['build:submit'];

  static flags = {
@@ -56,7 +55,7 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
    }),
    profile: flags.string({
      description:
-        'Name of the submit profile from eas.json. Defaults to "release" if defined in eas.json.',
+        'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
    }),
    latest: flags.boolean({
      description: 'Submit the latest build for specified platform',
@@ -93,7 +92,7 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
    const { flags: rawFlags } = this.parse(Submit);
    const flags = await this.sanitizeFlagsAsync(rawFlags);

-    const projectDir = (await findProjectRootAsync()) ?? process.cwd();
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -103,23 +102,30 @@ See how to configure submits with eas.json: ${learnMore('https://docs.expo.dev/s
      return;
    }

-    const easJsonReader = new EasJsonReader(projectDir);
    const platforms = toPlatforms(flags.requestedPlatform);
+    const easJsonReader = new EasJsonReader(projectDir);
+    const submissionProfiles = await getProfilesAsync({
+      platforms,
+      profileName: flags.profile,
+      async readProfileAsync(platform, profileName) {
+        return await easJsonReader.readSubmitProfileAsync(platform, profileName);
+      },
+    });
+
    const submissions: SubmissionFragment[] = [];
-    for (const platform of platforms) {
-      const profile = await easJsonReader.readSubmitProfileAsync(platform, flags.profile);
+    for (const submissionProfile of submissionProfiles) {
      const ctx = await createSubmissionContextAsync({
-        platform,
+        platform: submissionProfile.platform,
        projectDir,
        projectId,
-        profile,
+        profile: submissionProfile.profile,
        archiveFlags: flags.archiveFlags,
        nonInteractive: flags.nonInteractive,
      });

-      if (platforms.length > 1) {
+      if (submissionProfiles.length > 1) {
        Log.newLine();
-        const appPlatform = toAppPlatform(platform);
+        const appPlatform = toAppPlatform(submissionProfile.platform);
        Log.log(
          `${appPlatformEmojis[appPlatform]} ${chalk.bold(
            `${appPlatformDisplayNames[appPlatform]} submission`
@@ -39,7 +39,8 @@ export async function viewUpdateAsync({
        `,
        {
          groupId,
-        }
+        },
+        { additionalTypenames: ['Update'] }
      )
      .toPromise()
  );
@@ -30,10 +30,7 @@ export default class WebhookCreate extends EasCommand {
    const { flags } = this.parse(WebhookCreate);
    const webhookInputParams = await prepareInputParamsAsync(flags);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -29,10 +29,7 @@ export default class WebhookDelete extends EasCommand {
      args: { ID: webhookId },
    } = this.parse(WebhookDelete);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);

@@ -29,10 +29,7 @@ export default class WebhookList extends EasCommand {
      flags: { event },
    } = this.parse(WebhookList);

-    const projectDir = await findProjectRootAsync(process.cwd());
-    if (!projectDir) {
-      throw new Error('Please run this command inside a project directory.');
-    }
+    const projectDir = await findProjectRootAsync();
    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
    const projectId = await getProjectIdAsync(exp);
    const projectFullName = await getProjectFullNameAsync(exp);
@@ -17,12 +17,6 @@ export class SetupGoogleServiceAccountKey {
  constructor(private app: AppLookupParams) {}

  public async runAsync(ctx: CredentialsContext): Promise<CommonAndroidAppCredentialsFragment> {
-    if (ctx.nonInteractive) {
-      throw new MissingCredentialsNonInteractiveError(
-        'Google Service Account Keys cannot be set up in --non-interactive mode.'
-      );
-    }
-
    const isKeySetup = await this.isGoogleServiceAccountKeySetupAsync(ctx);
    if (isKeySetup) {
      Log.succeed('Google Service Account Key already set up.');
@@ -31,6 +25,11 @@ export class SetupGoogleServiceAccountKey {
        'androidAppCredentials cannot be null if google service account key is already set up'
      );
    }
+    if (ctx.nonInteractive) {
+      throw new MissingCredentialsNonInteractiveError(
+        'Google Service Account Keys cannot be set up in --non-interactive mode.'
+      );
+    }

    const keysForAccount = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(
      this.app.account
@@ -22,6 +22,7 @@ describe(CreateGoogleServiceAccountKey, () => {
      '/google-service-account-key.json': JSON.stringify({
        type: 'service_account',
        private_key: 'super secret',
+        client_email: '[email protected]',
      }),
    });

@@ -45,6 +45,7 @@ describe(SetupGoogleServiceAccountKey, () => {
      '/google-service-account-key.json': JSON.stringify({
        type: 'service_account',
        private_key: 'super secret',
+        client_email: '[email protected]',
      }),
    });
    const ctx = createCtxMock({
@@ -29,6 +29,9 @@ export const GoogleServiceAccountKeyQuery = {
          `,
          {
            accountName,
+          },
+          {
+            additionalTypenames: ['GoogleServiceAccountKey'],
          }
        )
        .toPromise()
@@ -19,6 +19,8 @@ export type KeystoreWithType = Keystore & {
 export type GoogleServiceAccountKey = {
  [key: string]: any;
  private_key: string;
+  type: string;
+  client_email: string;
 };

 export type AndroidCredentials = {
@@ -11,6 +11,7 @@ beforeAll(() => {
  const mockDetectableServiceAccountJson = JSON.stringify({
    type: 'service_account',
    private_key: 'super secret',
+    client_email: '[email protected]',
  });

  vol.fromJSON({
@@ -13,6 +13,7 @@ import { GoogleServiceAccountKey } from '../credentials';
 export const MinimalGoogleServiceAccountKeySchema = Joi.object({
  type: Joi.string().required(),
  private_key: Joi.string().required(),
+  client_email: Joi.string().required(),
 });

 function fileIsServiceAccountKey(keyJsonPath: string): boolean {
@@ -19,7 +19,7 @@ export class CredentialsContext {
  public readonly user: Actor;

  private shouldAskAuthenticateAppStore: boolean = true;
-  private _exp?: ExpoConfig;
+  private resolvedExp?: ExpoConfig;

  constructor(
    private options: {
@@ -33,10 +33,10 @@ export class CredentialsContext {
    this.user = options.user;
    this.nonInteractive = options.nonInteractive ?? false;

-    this._exp = options.exp;
-    if (!this._exp) {
+    this.resolvedExp = options.exp;
+    if (!this.resolvedExp) {
      try {
-        this._exp = getExpoConfig(options.projectDir);
+        this.resolvedExp = getExpoConfig(options.projectDir);
      } catch (error) {
        // ignore error, context might be created outside of expo project
      }
@@ -44,12 +44,12 @@ export class CredentialsContext {
  }

  get hasProjectContext(): boolean {
-    return !!this._exp;
+    return !!this.resolvedExp;
  }

  get exp(): ExpoConfig {
    this.ensureProjectContext();
-    return this._exp!;
+    return this.resolvedExp!;
  }

  public ensureProjectContext(): void {
@@ -6,8 +6,8 @@ import { AndroidAppBuildCredentialsFragment, IosDistributionType } from '../../g
 import Log from '../../log';
 import { findApplicationTarget, findTargetByName } from '../../project/ios/target';
 import zipObject from '../../utils/expodash/zipObject';
-import vcs from '../../vcs';
-import GitClient from '../../vcs/git';
+import { getVcsClient } from '../../vcs';
+import GitClient from '../../vcs/clients/git';
 import { CredentialsContext } from '../context';
 import { App, Target, TargetCredentials } from '../ios/types';
 import { readRawAsync } from './read';
@@ -294,8 +294,9 @@ async function updateFileAsync(
 }

 async function isFileUntrackedAsync(path: string): Promise<boolean> {
-  if (vcs instanceof GitClient) {
-    return await vcs.isFileUntrackedAsync(path);
+  const vcsClient = getVcsClient();
+  if (vcsClient instanceof GitClient) {
+    return await vcsClient.isFileUntrackedAsync(path);
  }
  return false;
 }
@@ -5,3 +5,9 @@ export class MissingCredentialsNonInteractiveError extends Error {
    );
  }
 }
+
+export class MissingCredentialsError extends Error {
+  constructor(message?: string) {
+    super(message ?? 'Credentials are not set up.');
+  }
+}
@@ -93,7 +93,7 @@ export default class IosCredentialsProvider {
    }

    const confirmSetup = await confirmAsync({
-      message: `Would you like to setup Push Notifications for your project?`,
+      message: `Would you like to set up Push Notifications for your project?`,
    });
    if (!confirmSetup) {
      return null;
@@ -0,0 +1,71 @@
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+import * as uuid from 'uuid';
+
+import Log, { learnMore } from '../../../log';
+import { promptAsync } from '../../../prompts';
+import { getCredentialsFromUserAsync } from '../../utils/promptForCredentials';
+import { AscApiKey } from '../appstore/Credentials.types';
+import { AscApiKeyPath, MinimalAscApiKey, ascApiKeyMetadataSchema } from '../credentials';
+
+export async function promptForAscApiKeyAsync(): Promise<AscApiKeyPath> {
+  Log.log(
+    chalk.bold('An App Store Connect Api key is required to upload your app to the Apple App Store')
+  );
+  Log.log(
+    `If you're not sure what this is or how to create one, ${learnMore(
+      'https://expo.fyi/creating-asc-api-key'
+    )}`
+  );
+
+  const { keyP8Path } = await promptAsync({
+    type: 'text',
+    name: 'keyP8Path',
+    message: 'Path to App Store Connect Api Key:',
+    initial: 'AuthKey_ABCD.p8',
+    // eslint-disable-next-line async-protect/async-suffix
+    validate: async (filePath: string) => {
+      try {
+        const stats = await fs.stat(filePath);
+        if (stats.isFile()) {
+          return true;
+        }
+        return 'Input is not a file.';
+      } catch {
+        return 'File does not exist.';
+      }
+    },
+  });
+  const regex = /^AuthKey_(?<keyId>\w+)\.p8$/; // Common ASC Api file name downloaded from Apple
+  const bestEffortKeyId = path.basename(keyP8Path).match(regex)?.groups?.keyId;
+  const ascApiKeyMetadata = await getCredentialsFromUserAsync(ascApiKeyMetadataSchema, {
+    keyId: bestEffortKeyId,
+  });
+  return { ...ascApiKeyMetadata, keyP8Path };
+}
+
+export async function promptForIssuerIdAsync(): Promise<string> {
+  Log.log(chalk.bold('An App Store Connect Issuer ID is required'));
+  Log.log(
+    `If you're not sure what this is or how to find yours, ${learnMore(
+      'https://expo.fyi/asc-issuer-id'
+    )}`
+  );
+
+  const { issuerId } = await promptAsync({
+    type: 'text',
+    name: 'issuerId',
+    message: 'App Store Connect Issuer ID:',
+    validate: (input: string) => uuid.validate(input),
+  });
+
+  return issuerId;
+}
+
+export async function getMinimalAscApiKeyAsync(ascApiKey: AscApiKey): Promise<MinimalAscApiKey> {
+  return {
+    ...ascApiKey,
+    issuerId: ascApiKey.issuerId ?? (await promptForIssuerIdAsync()),
+  };
+}
@@ -10,7 +10,7 @@ export class CreateDistributionCertificate {
  public async runAsync(
    ctx: CredentialsContext
  ): Promise<AppleDistributionCertificateMutationResult> {
-    const distCert = await provideOrGenerateDistributionCertificateAsync(ctx, this.account.name);
+    const distCert = await provideOrGenerateDistributionCertificateAsync(ctx);
    const result = await ctx.ios.createDistributionCertificateAsync(this.account, distCert);
    Log.succeed('Created distribution certificate');
    return result;
@@ -12,7 +12,7 @@ export class CreatePushKey {
      throw new Error(`A new push key cannot be created in non-interactive mode.`);
    }

-    const pushKey = await provideOrGeneratePushKeyAsync(ctx, this.account.name);
+    const pushKey = await provideOrGeneratePushKeyAsync(ctx);
    const result = await ctx.ios.createPushKeyAsync(this.account, pushKey);
    Log.succeed('Created push key');
    return result;
@@ -61,7 +61,7 @@ export function formatDistributionCertificate(
  return line;
 }

-async function _selectDistributionCertificateAsync(
+async function selectDistributionCertificateAsync(
  distCerts: AppleDistributionCertificateFragment[],
  validDistributionCertificates?: AppleDistributionCertificateFragment[]
 ): Promise<AppleDistributionCertificateFragment | null> {
@@ -93,7 +93,7 @@ export async function selectDistributionCertificateWithDependenciesAsync(
    return null;
  }
  if (!ctx.appStore.authCtx) {
-    return _selectDistributionCertificateAsync(distCertsForAccount);
+    return selectDistributionCertificateAsync(distCertsForAccount);
  }

  // get valid certs on the developer portal
@@ -103,7 +103,7 @@ export async function selectDistributionCertificateWithDependenciesAsync(
    certInfoFromApple
  );

-  return _selectDistributionCertificateAsync(distCertsForAccount, validDistCerts);
+  return selectDistributionCertificateAsync(distCertsForAccount, validDistCerts);
 }

 /**
@@ -121,7 +121,7 @@ export async function selectValidDistributionCertificateAsync(
    return null;
  }
  if (!ctx.appStore.authCtx) {
-    return _selectDistributionCertificateAsync(distCertsForAccount);
+    return selectDistributionCertificateAsync(distCertsForAccount);
  }

  // filter by apple team
@@ -140,7 +140,7 @@ export async function selectValidDistributionCertificateAsync(
  Log.log(
    `${validDistCerts.length}/${distCertsForAccount.length} Distribution Certificates are currently valid for Apple Team ${ctx.appStore.authCtx?.team.id}.`
  );
-  return _selectDistributionCertificateAsync(validDistCerts);
+  return selectDistributionCertificateAsync(validDistCerts);
 }

 const APPLE_DIST_CERTS_TOO_MANY_GENERATED_ERROR = `
@@ -152,8 +152,7 @@ Please remember that Apple Distribution Certificates are not application specifi
 `;

 export async function provideOrGenerateDistributionCertificateAsync(
-  ctx: CredentialsContext,
-  accountName: string
+  ctx: CredentialsContext
 ): Promise<DistributionCertificate> {
  if (!ctx.nonInteractive) {
    const userProvided = await promptForDistCertAsync(ctx);
@@ -168,13 +167,11 @@ export async function provideOrGenerateDistributionCertificateAsync(
        if (!isValid) {
          Log.warn("Provided Distribution Certificate is no longer valid on Apple's server");
        }
-        return isValid
-          ? userProvided
-          : await provideOrGenerateDistributionCertificateAsync(ctx, accountName);
+        return isValid ? userProvided : await provideOrGenerateDistributionCertificateAsync(ctx);
      }
    }
  }
-  return await generateDistributionCertificateAsync(ctx, accountName);
+  return await generateDistributionCertificateAsync(ctx);
 }

 async function promptForDistCertAsync(
@@ -200,8 +197,7 @@ async function promptForDistCertAsync(
 }

 async function generateDistributionCertificateAsync(
-  ctx: CredentialsContext,
-  accountName: string
+  ctx: CredentialsContext
 ): Promise<DistributionCertificate> {
  await ctx.appStore.ensureAuthenticatedAsync();
  try {
@@ -246,7 +242,7 @@ async function generateDistributionCertificateAsync(
      throw e;
    }
  }
-  return await generateDistributionCertificateAsync(ctx, accountName);
+  return await generateDistributionCertificateAsync(ctx);
 }

 function formatDistributionCertificateFromApple(
@@ -14,10 +14,7 @@ import { pushKeySchema } from '../credentials';
 import { isPushKeyValidAndTrackedAsync } from '../validators/validatePushKey';
 import { formatAppleTeam } from './AppleTeamUtils';

-export async function provideOrGeneratePushKeyAsync(
-  ctx: CredentialsContext,
-  accountName: string
-): Promise<PushKey> {
+export async function provideOrGeneratePushKeyAsync(ctx: CredentialsContext): Promise<PushKey> {
  if (!ctx.nonInteractive) {
    const userProvided = await promptForPushKeyAsync(ctx);
    if (userProvided) {
@@ -36,11 +33,11 @@ export async function provideOrGeneratePushKeyAsync(
        if (useUserProvided) {
          return userProvided;
        }
-        return await provideOrGeneratePushKeyAsync(ctx, accountName);
+        return await provideOrGeneratePushKeyAsync(ctx);
      }
    }
  }
-  return await generatePushKeyAsync(ctx, accountName);
+  return await generatePushKeyAsync(ctx);
 }

 async function promptForPushKeyAsync(ctx: CredentialsContext): Promise<PushKey | null> {
@@ -63,10 +60,7 @@ async function promptForPushKeyAsync(ctx: CredentialsContext): Promise<PushKey |
  return userProvided;
 }

-async function generatePushKeyAsync(
-  ctx: CredentialsContext,
-  accountName: string
-): Promise<PushKey> {
+async function generatePushKeyAsync(ctx: CredentialsContext): Promise<PushKey> {
  await ctx.appStore.ensureAuthenticatedAsync();
  try {
    return await ctx.appStore.createPushKeyAsync();
@@ -106,7 +100,7 @@ async function generatePushKeyAsync(
      throw e;
    }
  }
-  return await generatePushKeyAsync(ctx, accountName);
+  return await generatePushKeyAsync(ctx);
 }

 function formatPushKeyFromApple(pushKey: PushKeyStoreInfo): string {
@@ -12,7 +12,7 @@ import {
  IosDistributionType,
 } from '../../../graphql/generated';
 import Log from '../../../log';
-import { confirmAsync, pressAnyKeyToContinueAsync } from '../../../prompts';
+import { confirmAsync, pressAnyKeyToContinueAsync, promptAsync } from '../../../prompts';
 import differenceBy from '../../../utils/expodash/differenceBy';
 import { CredentialsContext } from '../../context';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
@@ -23,6 +23,12 @@ import { assignBuildCredentialsAsync, getBuildCredentialsAsync } from './BuildCr
 import { chooseDevicesAsync, formatDeviceLabel } from './DeviceUtils';
 import { SetupDistributionCertificate } from './SetupDistributionCertificate';

+enum ReuseAction {
+  Yes,
+  ShowDevices,
+  No,
+}
+
 export class SetupAdhocProvisioningProfile {
  constructor(private app: AppLookupParams) {}

@@ -184,10 +190,23 @@ export class SetupAdhocProvisioningProfile {
    );

    if (allRegisteredDevicesAreProvisioned) {
-      return await confirmAsync({
-        message: `All your registered devices are present in the Provisioning Profile. Would you like to reuse it?`,
-        initial: true,
-      });
+      const reuseAction = await this.promptForReuseActionAsync();
+      if (reuseAction === ReuseAction.Yes) {
+        return true;
+      } else if (reuseAction === ReuseAction.No) {
+        return false;
+      } else {
+        Log.newLine();
+        Log.log('Devices registered in the Provisioning Profile:');
+        for (const device of provisionedDevices) {
+          Log.log(`- ${formatDeviceLabel(device)}`);
+        }
+        Log.newLine();
+        return (
+          (await this.promptForReuseActionAsync({ showShowDevicesOption: false })) ===
+          ReuseAction.Yes
+        );
+      }
    } else {
      const missingDevices = differenceBy(registeredAppleDevices, provisionedDevices, 'identifier');
      Log.warn(`The provisioning profile is missing the following devices:`);
@@ -201,6 +220,36 @@ export class SetupAdhocProvisioningProfile {
    }
  }

+  private async promptForReuseActionAsync({
+    showShowDevicesOption = true,
+  } = {}): Promise<ReuseAction> {
+    const { selected } = await promptAsync({
+      type: 'select',
+      name: 'selected',
+      message: `${
+        showShowDevicesOption
+          ? 'All your registered devices are present in the Provisioning Profile. '
+          : ''
+      }Would you like to reuse the profile?`,
+      choices: [
+        { title: 'Yes', value: ReuseAction.Yes },
+        ...(showShowDevicesOption
+          ? [
+              {
+                title: 'Show devices and ask me again',
+                value: ReuseAction.ShowDevices,
+              },
+            ]
+          : []),
+        {
+          title: 'No, let me choose devices again',
+          value: ReuseAction.No,
+        },
+      ],
+    });
+    return selected;
+  }
+
  private async registerDevicesAsync(
    ctx: CredentialsContext,
    appleTeam: AppleTeamFragment
@@ -39,7 +39,7 @@ export class SetupTargetBuildCredentials {
    try {
      return await this.setupBuildCredentialsAsync(ctx);
    } catch (error) {
-      Log.error('Failed to setup credentials.');
+      Log.error('Failed to set up credentials.');
      throw error;
    }
  }
@@ -22,7 +22,10 @@ export const AppQuery = {
            }
            ${print(AppFragmentNode)}
          `,
-          { fullName }
+          { fullName },
+          {
+            additionalTypenames: ['App'],
+          }
        )
        .toPromise()
    );
@@ -111,7 +111,10 @@ export const AppleDeviceQuery = {
              }
            }
          `,
-          { accountName, appleTeamIdentifier }
+          { accountName, appleTeamIdentifier },
+          {
+            additionalTypenames: ['AppleDevice', 'AppleTeam'],
+          }
        )
        .toPromise()
    );
@@ -147,7 +150,10 @@ export const AppleDeviceQuery = {
              }
            }
          `,
-          { accountName, identifier }
+          { accountName, identifier },
+          {
+            additionalTypenames: ['AppleDevice', 'AppleTeam'],
+          }
        )
        .toPromise()
    );
@@ -60,7 +60,11 @@ export const AppleDistributionCertificateQuery = {
            iosDistributionType,
          },
          {
-            additionalTypenames: ['IosAppCredentials', 'IosAppBuildCredentials'],
+            additionalTypenames: [
+              'AppleDistributionCertificate',
+              'IosAppCredentials',
+              'IosAppBuildCredentials',
+            ],
          }
        )
        .toPromise()
@@ -93,6 +97,9 @@ export const AppleDistributionCertificateQuery = {
          `,
          {
            accountName,
+          },
+          {
+            additionalTypenames: ['AppleDistributionCertificate'],
          }
        )
        .toPromise()
@@ -77,7 +77,11 @@ export const AppleProvisioningProfileQuery = {
            iosDistributionType,
          },
          {
-            additionalTypenames: ['IosAppCredentials', 'IosAppBuildCredentials'],
+            additionalTypenames: [
+              'AppleProvisioningProfile',
+              'IosAppCredentials',
+              'IosAppBuildCredentials',
+            ],
          }
        )
        .toPromise()
@@ -26,6 +26,9 @@ export const ApplePushKeyQuery = {
          `,
          {
            accountName,
+          },
+          {
+            additionalTypenames: ['ApplePushKey'],
          }
        )
        .toPromise()
@@ -28,7 +28,10 @@ export const AppleTeamQuery = {
              }
            }
          `,
-          { accountName }
+          { accountName },
+          {
+            additionalTypenames: ['AppleTeam'],
+          }
        )
        .toPromise()
    );
@@ -57,6 +60,9 @@ export const AppleTeamQuery = {
          {
            accountId,
            appleTeamIdentifier,
+          },
+          {
+            additionalTypenames: ['AppleTeam'],
          }
        )
        .toPromise()
@@ -1,4 +1,6 @@
 import {
+  AscApiKey,
+  AscApiKeyInfo,
  DistributionCertificate,
  DistributionCertificateStoreInfo,
  ProvisioningProfile,
@@ -6,6 +8,12 @@ import {
  PushKey,
  PushKeyStoreInfo,
 } from './Credentials.types';
+import {
+  createAscApiKeyAsync,
+  getAscApiKeyAsync,
+  listAscApiKeysAsync,
+  revokeAscApiKeyAsync,
+} from './ascApiKey';
 import { AuthCtx, Options as AuthenticateOptions, authenticateAsync } from './authenticate';
 import {
  createDistributionCertificateAsync,
@@ -136,4 +144,24 @@ export default class AppStoreApi {
      distCertSerialNumber
    );
  }
+
+  public async listAscApiKeysAsync(): Promise<AscApiKeyInfo[]> {
+    const ctx = await this.ensureAuthenticatedAsync();
+    return await listAscApiKeysAsync(ctx);
+  }
+
+  public async getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo> {
+    const ctx = await this.ensureAuthenticatedAsync();
+    return await getAscApiKeyAsync(ctx, keyId);
+  }
+
+  public async createAscApiKeyAsync({ nickname }: { nickname: string }): Promise<AscApiKey> {
+    const ctx = await this.ensureAuthenticatedAsync();
+    return await createAscApiKeyAsync(ctx, { nickname });
+  }
+
+  public async revokeAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo> {
+    const ctx = await this.ensureAuthenticatedAsync();
+    return await revokeAscApiKeyAsync(ctx, keyId);
+  }
 }
@@ -15,8 +15,8 @@ export function formatDistributionCertificate({
  created,
  ownerName,
 }: DistributionCertificateStoreInfo): string {
-  const expiresDate = _formatTimestamp(expires);
-  const createdDate = _formatTimestamp(created);
+  const expiresDate = formatTimestamp(expires);
+  const createdDate = formatTimestamp(created);
  return `${name} (${status}) - ID: ${id} - expires: ${expiresDate} (created: ${createdDate}) - owner: ${ownerName}`;
 }

@@ -48,6 +48,6 @@ export function isPushKey(obj: { [key: string]: any }): obj is PushKey {
  );
 }

-function _formatTimestamp(timestamp: number): string {
+function formatTimestamp(timestamp: number): string {
  return dateformat(new Date(timestamp * 1000));
 }
@@ -1,3 +1,5 @@
+import { UserRole } from '@expo/apple-utils';
+
 export interface Device {
  id: string;
  teamId: string;
@@ -66,3 +68,16 @@ export interface PushKey {
  teamId: string;
  teamName?: string;
 }
+
+export type AscApiKeyInfo = {
+  keyId: string;
+  issuerId?: string;
+  teamId: string;
+  name: string;
+  teamName?: string;
+  roles: UserRole[];
+};
+
+export type AscApiKey = AscApiKeyInfo & {
+  keyP8: string;
+};
@@ -0,0 +1,98 @@
+import { ApiKey, ApiKeyType, UserRole } from '@expo/apple-utils';
+
+import { asMock } from '../../../../__tests__/utils';
+import {
+  createAscApiKeyAsync,
+  getAscApiKeyAsync,
+  listAscApiKeysAsync,
+  revokeAscApiKeyAsync,
+} from '../ascApiKey';
+import { getRequestContext } from '../authenticate';
+
+jest.mock('@expo/apple-utils');
+jest.mock('../authenticate');
+jest.mock('../../../../ora');
+
+const mockTeam = {
+  id: 'test-id',
+  name: 'test-name',
+};
+const mockAuthCtx = {
+  appleId: 'test-appleId',
+  team: mockTeam,
+};
+
+const mockApiKey = {
+  type: 'apiKeys',
+  id: 'NL67AN9Q6Q',
+  attributes: {
+    nickname: 'ejb-apple-utils-admin',
+    lastUsed: '2021-06-28T12:30:41-07:00',
+    revokingDate: null,
+    isActive: true,
+    canDownload: false,
+    privateKey: null,
+    roles: ['ADMIN'],
+    allAppsVisible: true,
+    keyType: 'PUBLIC_API',
+  },
+  downloadAsync: jest.fn(() => 'super secret'),
+  revokeAsync: jest.fn(() => mockApiKey),
+} as unknown as ApiKey;
+
+const mockAscApiKeyInfo = {
+  issuerId: undefined,
+  keyId: 'NL67AN9Q6Q',
+  name: 'ejb-apple-utils-admin',
+  roles: ['ADMIN'],
+  teamId: 'test-id',
+  teamName: 'test-name',
+};
+
+beforeEach(() => {
+  jest.clearAllMocks();
+});
+
+test(`listAscApiKeysAsync`, async () => {
+  const mockRequestContext = {};
+  jest.spyOn(ApiKey, 'getAsync').mockImplementation(async () => []);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
+  const result = await listAscApiKeysAsync(mockAuthCtx);
+  expect(ApiKey.getAsync).toHaveBeenLastCalledWith(mockRequestContext);
+  expect(result).toEqual([]);
+});
+
+test(`getAscApiKeyAsync`, async () => {
+  const mockRequestContext = {};
+  jest.spyOn(ApiKey, 'infoAsync').mockImplementation(async () => mockApiKey);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
+  const result = await getAscApiKeyAsync(mockAuthCtx, 'test-key-id');
+  expect(ApiKey.infoAsync).toHaveBeenLastCalledWith(mockRequestContext, { id: 'test-key-id' });
+  expect(result).toEqual(mockAscApiKeyInfo);
+});
+
+test(`createAscApiKeyAsync`, async () => {
+  const mockRequestContext = {};
+  jest.spyOn(ApiKey, 'createAsync').mockImplementation(async () => mockApiKey);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
+  const result = await createAscApiKeyAsync(mockAuthCtx, { nickname: 'test-name' });
+  expect(ApiKey.createAsync).toHaveBeenLastCalledWith(mockRequestContext, {
+    nickname: 'test-name',
+    allAppsVisible: true,
+    roles: [UserRole.ADMIN],
+    keyType: ApiKeyType.PUBLIC_API,
+  });
+  expect(result).toEqual({ ...mockAscApiKeyInfo, keyP8: 'super secret' });
+});
+
+test(`revokeAscApiKeyAsync`, async () => {
+  const mockRequestContext = {};
+  jest.spyOn(ApiKey, 'infoAsync').mockImplementation(async () => mockApiKey);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
+  const result = await revokeAscApiKeyAsync(mockAuthCtx, 'test-key-id');
+  expect(ApiKey.infoAsync).toHaveBeenLastCalledWith(mockRequestContext, {
+    id: 'test-key-id',
+  });
+  expect(mockApiKey.revokeAsync).toBeCalled();
+  expect(result).toEqual(mockAscApiKeyInfo);
+});
@@ -0,0 +1,104 @@
+import { ApiKey, ApiKeyProps, ApiKeyType, UserRole } from '@expo/apple-utils';
+
+import Log from '../../../log';
+import { ora } from '../../../ora';
+import { AscApiKey, AscApiKeyInfo } from './Credentials.types';
+import { AuthCtx, getRequestContext } from './authenticate';
+
+export async function listAscApiKeysAsync(authCtx: AuthCtx): Promise<AscApiKeyInfo[]> {
+  const spinner = ora(`Fetching App Store Connect API Keys.`).start();
+  try {
+    const context = getRequestContext(authCtx);
+    const keys = await ApiKey.getAsync(context);
+    spinner.succeed(`Fetched App Store Connect API Keys.`);
+    return keys.map(key => getAscApiKeyInfo(key, authCtx));
+  } catch (error) {
+    spinner.fail(`Failed to fetch App Store Connect API Keys.`);
+    throw error;
+  }
+}
+
+export async function getAscApiKeyAsync(authCtx: AuthCtx, keyId: string): Promise<AscApiKeyInfo> {
+  const spinner = ora(`Fetching App Store Connect API Key.`).start();
+  try {
+    const context = getRequestContext(authCtx);
+    const apiKey = await ApiKey.infoAsync(context, { id: keyId });
+    spinner.succeed(`Fetched App Store Connect API Key (ID: ${keyId}).`);
+    return getAscApiKeyInfo(apiKey, authCtx);
+  } catch (error) {
+    Log.error(error);
+    spinner.fail(`Failed to fetch App Store Connect API Key.`);
+    throw error;
+  }
+}
+
+export async function createAscApiKeyAsync(
+  authCtx: AuthCtx,
+  {
+    nickname,
+    allAppsVisible,
+    roles,
+    keyType,
+  }: Partial<Pick<ApiKeyProps, 'nickname' | 'roles' | 'allAppsVisible' | 'keyType'>>
+): Promise<AscApiKey> {
+  const spinner = ora(`Creating App Store Connect API Key.`).start();
+  try {
+    const context = getRequestContext(authCtx);
+    const key = await ApiKey.createAsync(context, {
+      nickname: nickname ?? `[expo] ${new Date().getTime()}`,
+      allAppsVisible: allAppsVisible ?? true,
+      roles: roles ?? [UserRole.ADMIN],
+      keyType: keyType ?? ApiKeyType.PUBLIC_API,
+    });
+    const keyP8 = await key.downloadAsync();
+    if (!keyP8) {
+      const { nickname, roles } = key.attributes;
+      const humanReadableKey = `App Store Connect Key '${nickname}' (${
+        key.id
+      }) with roles {${roles.join(',')}}`;
+      if (!key.attributes.canDownload) {
+        // this case would be unexpected because we just created the key
+        throw new Error(`${humanReadableKey} is not available for download from Apple.`);
+      } else if (!key.attributes.isActive) {
+        throw new Error(`${humanReadableKey} is inactive and could not be downloaded.`);
+      }
+      throw new Error(`Failed to download .p8 file of ${humanReadableKey}.`);
+    }
+    return {
+      ...getAscApiKeyInfo(key, authCtx),
+      keyP8,
+    };
+  } catch (err: any) {
+    spinner.fail('Failed to create App Store Connect API Key.');
+    throw err;
+  }
+}
+
+export async function revokeAscApiKeyAsync(
+  authCtx: AuthCtx,
+  keyId: string
+): Promise<AscApiKeyInfo> {
+  const spinner = ora(`Revoking App Store Connect API Key.`).start();
+  try {
+    const context = getRequestContext(authCtx);
+    const apiKey = await ApiKey.infoAsync(context, { id: keyId });
+    const revokedKey = await apiKey.revokeAsync();
+    spinner.succeed(`Revoked App Store Connect API Key.`);
+    return getAscApiKeyInfo(revokedKey, authCtx);
+  } catch (error) {
+    Log.error(error);
+    spinner.fail(`Failed to revoke App Store Connect API Key.`);
+    throw error;
+  }
+}
+
+export function getAscApiKeyInfo(apiKey: ApiKey, authCtx: AuthCtx): AscApiKeyInfo {
+  return {
+    name: apiKey.attributes.nickname,
+    keyId: apiKey.id,
+    issuerId: apiKey.attributes.provider?.id,
+    teamId: authCtx.team.id,
+    teamName: authCtx.team.name,
+    roles: apiKey.attributes.roles,
+  };
+}
@@ -1,3 +1,5 @@
+import { UserRole } from '@expo/apple-utils';
+
 import { AppleDevice } from '../../graphql/generated';
 import Log from '../../log';
 import { CredentialSchema } from '../utils/promptForCredentials';
@@ -100,6 +102,38 @@ export const distributionCertificateSchema: CredentialSchema<DistributionCertifi
  },
 };

+export type MinimalAscApiKey = {
+  keyP8: string;
+  keyId: string;
+  issuerId: string;
+  teamId?: string;
+  teamName?: string;
+  roles?: UserRole[];
+  name?: string;
+};
+
+export interface AscApiKeyPath {
+  keyP8Path: string;
+  keyId: string;
+  issuerId: string;
+}
+
+export const ascApiKeyMetadataSchema: CredentialSchema<Omit<MinimalAscApiKey, 'keyP8'>> = {
+  name: 'App Store Connect API Key',
+  questions: [
+    {
+      field: 'keyId',
+      type: 'string',
+      question: 'Key ID:',
+    },
+    {
+      field: 'issuerId',
+      type: 'string',
+      question: 'Issuer ID:',
+    },
+  ],
+};
+
 export const pushKeySchema: CredentialSchema<PushKey> = {
  name: 'Apple Push Notifications service key',
  questions: [
@@ -12,7 +12,9 @@ Developer Portal ID       9839M6AY8W
 Apple Team                77KQ969CHE 
 Updated                   6 months ago
                          
+                          
 App Store Configuration   
+                          
 Distribution Certificate  
 Serial Number             test-serial
 Expiration Date           Wed, 13 Oct 2021 18:28:44 UTC
@@ -26,7 +28,9 @@ Expiration                Wed, 13 Oct 2021 18:28:44 UTC
 Apple Team                test-apple-identifier 
 Updated                   5 months ago
                          
+                          
 Ad Hoc Configuration      
+                          
 Distribution Certificate  
 Serial Number             test-serial
 Expiration Date           Wed, 13 Oct 2021 18:28:44 UTC
@@ -128,11 +128,9 @@ export function displayProjectCredentials(
  const isMultitarget = targets.length > 1;

  Log.addNewLineIfNone();
-  const fields = [
-    { label: 'Project Credentials Configuration', value: '' },
-    { label: 'Project', value: projectFullName },
-  ];
-
+  Log.log(chalk.cyan.bold('Project Credentials Configuration'));
+  Log.newLine();
+  const fields = [{ label: 'Project', value: projectFullName }];
  for (const [targetName, buildCredentials] of Object.entries(appBuildCredentials)) {
    if (isMultitarget) {
      fields.push({ label: '', value: '' });
@@ -148,10 +146,12 @@ function displayIosAppBuildCredentials(
  buildCredentials: IosAppBuildCredentialsFragment,
  fields: { label: string; value: string }[]
 ): void {
+  fields.push({ label: '', value: '' });
  fields.push({
    label: `${prettyIosDistributionType(buildCredentials.iosDistributionType)} Configuration`,
    value: '',
  });
+  fields.push({ label: '', value: '' });
  const maybeDistCert = buildCredentials.distributionCertificate;
  fields.push({ label: 'Distribution Certificate', value: '' });
  if (maybeDistCert) {
@@ -192,9 +192,13 @@ function displayIosAppBuildCredentials(
      });
    }
    if (appleDevices && appleDevices.length > 0) {
-      fields.push({ label: 'Provisioned devices', value: '' });
-      for (const appleDevice of appleDevices) {
-        fields.push({ label: '    -', value: formatAppleDevice(appleDevice) });
+      const [firstAppleDevice, ...rest] = appleDevices;
+      fields.push({
+        label: 'Provisioned devices',
+        value: `- ${formatAppleDevice(firstAppleDevice)}`,
+      });
+      for (const appleDevice of rest) {
+        fields.push({ label: '', value: `- ${formatAppleDevice(appleDevice)}` });
      }
    }
    fields.push({ label: 'Updated', value: `${fromNow(new Date(updatedAt))} ago` });
@@ -0,0 +1,50 @@
+export type ActionInfo = {
+  value: AndroidActionType | IosActionType;
+  title: string;
+  scope: Scope;
+};
+
+export enum Scope {
+  Project,
+  Manager,
+  Account,
+}
+
+export enum AndroidActionType {
+  ManageBuildCredentials,
+  ManageFcm,
+  ManageGoogleServiceAccountKey,
+  ManageCredentialsJson,
+  GoBackToCaller,
+  GoBackToHighLevelActions,
+  CreateKeystore,
+  DownloadKeystore,
+  RemoveKeystore,
+  CreateFcm,
+  RemoveFcm,
+  CreateGsaKey,
+  UseExistingGsaKey,
+  RemoveGsaKey,
+  SetupGsaKey,
+  UpdateCredentialsJson,
+  SetupBuildCredentialsFromCredentialsJson,
+}
+
+export enum IosActionType {
+  ManageCredentialsJson,
+  ManageBuildCredentials,
+  ManagePushKey,
+  GoBackToCaller,
+  GoBackToHighLevelActions,
+  SetupBuildCredentials,
+  SetupBuildCredentialsFromCredentialsJson,
+  UpdateCredentialsJson,
+  UseExistingDistributionCertificate,
+  RemoveProvisioningProfile,
+  CreateDistributionCertificate,
+  RemoveDistributionCertificate,
+  SetupPushKey,
+  CreatePushKey,
+  UseExistingPushKey,
+  RemovePushKey,
+}
@@ -0,0 +1,116 @@
+import { ActionInfo, AndroidActionType, Scope } from './Actions';
+
+export const highLevelActions: ActionInfo[] = [
+  {
+    value: AndroidActionType.ManageBuildCredentials,
+    title: 'Keystore: Manage everything needed to build your project',
+    scope: Scope.Manager,
+  },
+  {
+    value: AndroidActionType.ManageFcm,
+    title: 'Push Notifications: Manage your FCM Api Key',
+    scope: Scope.Manager,
+  },
+  {
+    value: AndroidActionType.ManageGoogleServiceAccountKey,
+    title: 'Google Service Account: Manage your Service Account Key',
+    scope: Scope.Manager,
+  },
+  {
+    value: AndroidActionType.ManageCredentialsJson,
+    title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
+    scope: Scope.Manager,
+  },
+  {
+    value: AndroidActionType.GoBackToCaller,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
+
+export const credentialsJsonActions: ActionInfo[] = [
+  {
+    value: AndroidActionType.UpdateCredentialsJson,
+    title: 'Download credentials from EAS to credentials.json',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.SetupBuildCredentialsFromCredentialsJson,
+    title: 'Upload credentials from credentials.json to EAS',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.GoBackToHighLevelActions,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
+
+export const buildCredentialsActions: ActionInfo[] = [
+  {
+    value: AndroidActionType.CreateKeystore,
+    title: 'Set up a new keystore',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.DownloadKeystore,
+    title: 'Download existing keystore',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.RemoveKeystore,
+    title: 'Delete your keystore',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.GoBackToHighLevelActions,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
+
+export const fcmActions: ActionInfo[] = [
+  {
+    value: AndroidActionType.CreateFcm,
+    title: 'Upload an FCM Api Key',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.RemoveFcm,
+    title: 'Delete your FCM Api Key',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.GoBackToHighLevelActions,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
+
+export const gsaKeyActions: ActionInfo[] = [
+  {
+    value: AndroidActionType.SetupGsaKey,
+    title: 'Setup a Google Service Account Key',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.CreateGsaKey,
+    title: 'Upload a Google Service Account Key',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.UseExistingGsaKey,
+    title: 'Use an existing Google Service Account Key',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.RemoveGsaKey,
+    title: 'Delete a Google Service Account Key',
+    scope: Scope.Project,
+  },
+  {
+    value: AndroidActionType.GoBackToHighLevelActions,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
@@ -0,0 +1,110 @@
+import { CredentialsContext } from '../context';
+import { ActionInfo, IosActionType, Scope } from './Actions';
+
+export const highLevelActions: ActionInfo[] = [
+  {
+    value: IosActionType.ManageBuildCredentials,
+    title: 'Build Credentials: Manage everything needed to build your project',
+    scope: Scope.Manager,
+  },
+  {
+    value: IosActionType.ManagePushKey,
+    title: 'Push Notifications: Manage your Apple Push Notifications Key',
+    scope: Scope.Manager,
+  },
+  {
+    value: IosActionType.ManageCredentialsJson,
+    title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
+    scope: Scope.Manager,
+  },
+  {
+    value: IosActionType.GoBackToCaller,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
+
+export const credentialsJsonActions: ActionInfo[] = [
+  {
+    value: IosActionType.UpdateCredentialsJson,
+    title: 'Download credentials from EAS to credentials.json',
+    scope: Scope.Project,
+  },
+  {
+    value: IosActionType.SetupBuildCredentialsFromCredentialsJson,
+    title: 'Upload credentials from credentials.json to EAS',
+    scope: Scope.Project,
+  },
+  {
+    value: IosActionType.GoBackToHighLevelActions,
+    title: 'Go back',
+    scope: Scope.Manager,
+  },
+];
+
+export function getPushKeyActions(ctx: CredentialsContext): ActionInfo[] {
+  return [
+    {
+      value: IosActionType.SetupPushKey,
+      title: 'Setup your project to use Push Notifications',
+      scope: Scope.Project,
+    },
+    {
+      value: IosActionType.CreatePushKey,
+      title: 'Add a new push key',
+      scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
+    },
+    {
+      value: IosActionType.UseExistingPushKey,
+      title: 'Use an existing push key',
+      scope: Scope.Project,
+    },
+    {
+      value: IosActionType.RemovePushKey,
+      title: 'Remove a push key from your account',
+      scope: Scope.Account,
+    },
+    {
+      value: IosActionType.GoBackToHighLevelActions,
+      title: 'Go back',
+      scope: Scope.Manager,
+    },
+  ];
+}
+
+export function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[] {
+  return [
+    {
+      // This command will be triggered during build to ensure all credentials are ready
+      // I'm leaving it here for now to simplify testing
+      value: IosActionType.SetupBuildCredentials,
+      title: 'All: Set up all the required credentials to build your project',
+      scope: Scope.Project,
+    },
+    {
+      value: IosActionType.UseExistingDistributionCertificate,
+      title: 'Distribution Certificate: Use an existing one for your project',
+      scope: Scope.Project,
+    },
+    {
+      value: IosActionType.CreateDistributionCertificate,
+      title: `Distribution Certificate: Add a new one to your account`,
+      scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
+    },
+    {
+      value: IosActionType.RemoveDistributionCertificate,
+      title: 'Distribution Certificate: Delete one from your account',
+      scope: Scope.Account,
+    },
+    {
+      value: IosActionType.RemoveProvisioningProfile,
+      title: 'Provisioning Profile: Delete one from your project',
+      scope: Scope.Project,
+    },
+    {
+      value: IosActionType.GoBackToHighLevelActions,
+      title: 'Go back',
+      scope: Scope.Manager,
+    },
+  ];
+}
@@ -34,6 +34,14 @@ import {
  displayEmptyAndroidCredentials,
 } from '../android/utils/printCredentials';
 import { CredentialsContext } from '../context';
+import { ActionInfo, AndroidActionType, Scope } from './Actions';
+import {
+  buildCredentialsActions,
+  credentialsJsonActions,
+  fcmActions,
+  gsaKeyActions,
+  highLevelActions,
+} from './AndroidActions';
 import { Action, PressAnyKeyToContinue } from './HelperActions';
 import {
  SelectAndroidBuildCredentials,
@@ -42,148 +50,6 @@ import {
 } from './SelectAndroidBuildCredentials';
 import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';

-enum ActionType {
-  ManageBuildCredentials,
-  ManageFcm,
-  ManageGoogleServiceAccountKey,
-  ManageCredentialsJson,
-  GoBackToCaller,
-  GoBackToHighLevelActions,
-  CreateKeystore,
-  DownloadKeystore,
-  RemoveKeystore,
-  CreateFcm,
-  RemoveFcm,
-  CreateGsaKey,
-  UseExistingGsaKey,
-  RemoveGsaKey,
-  SetupGsaKey,
-  UpdateCredentialsJson,
-  SetupBuildCredentialsFromCredentialsJson,
-}
-
-enum Scope {
-  Project,
-  Manager,
-}
-
-type ActionInfo = { value: ActionType; title: string; scope: Scope };
-
-const highLevelActions: ActionInfo[] = [
-  {
-    value: ActionType.ManageBuildCredentials,
-    title: 'Keystore: Manage everything needed to build your project',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.ManageFcm,
-    title: 'Push Notifications: Manage your FCM Api Key',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.ManageGoogleServiceAccountKey,
-    title: 'Google Service Account: Manage your Service Account Key',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.ManageCredentialsJson,
-    title: 'Credentials.json: Upload/Download credentials between EAS servers and your local json ',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.GoBackToCaller,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
-const credentialsJsonActions: ActionInfo[] = [
-  {
-    value: ActionType.UpdateCredentialsJson,
-    title: 'Download credentials from EAS to credentials.json',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.SetupBuildCredentialsFromCredentialsJson,
-    title: 'Upload credentials from credentials.json to EAS',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.GoBackToHighLevelActions,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
-const buildCredentialsActions: ActionInfo[] = [
-  {
-    value: ActionType.CreateKeystore,
-    title: 'Set up a new keystore',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.DownloadKeystore,
-    title: 'Download existing keystore',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.RemoveKeystore,
-    title: 'Delete your keystore',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.GoBackToHighLevelActions,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
-const fcmActions: ActionInfo[] = [
-  {
-    value: ActionType.CreateFcm,
-    title: 'Upload an FCM Api Key',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.RemoveFcm,
-    title: 'Delete your FCM Api Key',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.GoBackToHighLevelActions,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
-const gsaKeyActions: ActionInfo[] = [
-  {
-    value: ActionType.SetupGsaKey,
-    title: 'Setup a Google Service Account Key',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.CreateGsaKey,
-    title: 'Upload a Google Service Account Key',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.UseExistingGsaKey,
-    title: 'Use an existing Google Service Account Key',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.RemoveGsaKey,
-    title: 'Delete a Google Service Account Key',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.GoBackToHighLevelActions,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
 export class ManageAndroid {
  constructor(private callingAction: Action) {}

@@ -242,22 +108,22 @@ export class ManageAndroid {
          throw new Error('Action not supported yet');
        }
        if (actionInfo.scope === Scope.Manager) {
-          if (chosenAction === ActionType.ManageBuildCredentials) {
+          if (chosenAction === AndroidActionType.ManageBuildCredentials) {
            currentActions = buildCredentialsActions;
            continue;
-          } else if (chosenAction === ActionType.ManageFcm) {
+          } else if (chosenAction === AndroidActionType.ManageFcm) {
            currentActions = fcmActions;
            continue;
-          } else if (chosenAction === ActionType.ManageGoogleServiceAccountKey) {
+          } else if (chosenAction === AndroidActionType.ManageGoogleServiceAccountKey) {
            currentActions = gsaKeyActions;
            continue;
-          } else if (chosenAction === ActionType.ManageCredentialsJson) {
+          } else if (chosenAction === AndroidActionType.ManageCredentialsJson) {
            currentActions = credentialsJsonActions;
            continue;
-          } else if (chosenAction === ActionType.GoBackToHighLevelActions) {
+          } else if (chosenAction === AndroidActionType.GoBackToHighLevelActions) {
            currentActions = highLevelActions;
            continue;
-          } else if (chosenAction === ActionType.GoBackToCaller) {
+          } else if (chosenAction === AndroidActionType.GoBackToCaller) {
            return await this.callingAction.runAsync(ctx);
          }
        }
@@ -302,7 +168,7 @@ export class ManageAndroid {

  private async runProjectSpecificActionAsync(
    ctx: CredentialsContext,
-    action: ActionType,
+    action: AndroidActionType,
    gradleContext?: GradleBuildContext
  ): Promise<void> {
    assert(
@@ -310,7 +176,7 @@ export class ManageAndroid {
      'You must be in your project directory in order to perform this action'
    );
    const appLookupParams = await getAppLookupParamsFromContextAsync(ctx, gradleContext);
-    if (action === ActionType.CreateKeystore) {
+    if (action === AndroidActionType.CreateKeystore) {
      const selectBuildCredentialsResult = await new SelectAndroidBuildCredentials(
        appLookupParams
      ).runAsync(ctx);
@@ -331,47 +197,47 @@ export class ManageAndroid {
          }
        );
      }
-    } else if (action === ActionType.DownloadKeystore) {
+    } else if (action === AndroidActionType.DownloadKeystore) {
      const buildCredentials = await new SelectExistingAndroidBuildCredentials(
        appLookupParams
      ).runAsync(ctx);
      if (buildCredentials) {
        await new DownloadKeystore({ app: appLookupParams }).runAsync(ctx, buildCredentials);
      }
-    } else if (action === ActionType.RemoveKeystore) {
+    } else if (action === AndroidActionType.RemoveKeystore) {
      const buildCredentials = await new SelectExistingAndroidBuildCredentials(
        appLookupParams
      ).runAsync(ctx);
      if (buildCredentials) {
        await new RemoveKeystore(appLookupParams).runAsync(ctx, buildCredentials);
      }
-    } else if (action === ActionType.CreateFcm) {
+    } else if (action === AndroidActionType.CreateFcm) {
      const fcm = await new CreateFcm(appLookupParams.account).runAsync(ctx);
      await new AssignFcm(appLookupParams).runAsync(ctx, fcm);
-    } else if (action === ActionType.RemoveFcm) {
+    } else if (action === AndroidActionType.RemoveFcm) {
      await new RemoveFcm(appLookupParams).runAsync(ctx);
-    } else if (action === ActionType.CreateGsaKey) {
+    } else if (action === AndroidActionType.CreateGsaKey) {
      const gsaKey = await new CreateGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
      await new AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
-    } else if (action === ActionType.UseExistingGsaKey) {
+    } else if (action === AndroidActionType.UseExistingGsaKey) {
      const gsaKey = await new UseExistingGoogleServiceAccountKey(appLookupParams.account).runAsync(
        ctx
      );
      if (gsaKey) {
        await new AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
      }
-    } else if (action === ActionType.RemoveGsaKey) {
+    } else if (action === AndroidActionType.RemoveGsaKey) {
      await new SelectAndRemoveGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
-    } else if (action === ActionType.SetupGsaKey) {
+    } else if (action === AndroidActionType.SetupGsaKey) {
      await new SetupGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
-    } else if (action === ActionType.UpdateCredentialsJson) {
+    } else if (action === AndroidActionType.UpdateCredentialsJson) {
      const buildCredentials = await new SelectExistingAndroidBuildCredentials(
        appLookupParams
      ).runAsync(ctx);
      if (buildCredentials) {
        await new UpdateCredentialsJson().runAsync(ctx, buildCredentials);
      }
-    } else if (action === ActionType.SetupBuildCredentialsFromCredentialsJson) {
+    } else if (action === AndroidActionType.SetupBuildCredentialsFromCredentialsJson) {
      await new SetupBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
    }
  }
@@ -38,145 +38,17 @@ import { AppLookupParams } from '../ios/api/GraphqlClient';
 import { getManagedEntitlementsJsonAsync } from '../ios/appstore/entitlements';
 import { App, IosAppCredentialsMap, Target } from '../ios/types';
 import { displayIosCredentials } from '../ios/utils/printCredentials';
+import { ActionInfo, IosActionType, Scope } from './Actions';
 import { Action, PressAnyKeyToContinue } from './HelperActions';
+import {
+  credentialsJsonActions,
+  getBuildCredentialsActions,
+  getPushKeyActions,
+  highLevelActions,
+} from './IosActions';
 import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
 import { SelectIosDistributionTypeGraphqlFromBuildProfile } from './SelectIosDistributionTypeGraphqlFromBuildProfile';

-enum ActionType {
-  ManageCredentialsJson,
-  ManageBuildCredentials,
-  ManagePushKey,
-  GoBackToCaller,
-  GoBackToHighLevelActions,
-  SetupBuildCredentials,
-  SetupBuildCredentialsFromCredentialsJson,
-  UpdateCredentialsJson,
-  UseExistingDistributionCertificate,
-  RemoveProvisioningProfile,
-  CreateDistributionCertificate,
-  RemoveDistributionCertificate,
-  SetupPushKey,
-  CreatePushKey,
-  UseExistingPushKey,
-  RemovePushKey,
-}
-
-enum Scope {
-  Project,
-  Account,
-  Manager,
-}
-
-type ActionInfo = { value: ActionType; title: string; scope: Scope };
-
-const highLevelActions: ActionInfo[] = [
-  {
-    value: ActionType.ManageBuildCredentials,
-    title: 'Build Credentials: Manage everything needed to build your project',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.ManagePushKey,
-    title: 'Push Notifications: Manage your Apple Push Notifications Key',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.ManageCredentialsJson,
-    title: 'Credentials.json: Upload/Download credentials between EAS servers and your local json ',
-    scope: Scope.Manager,
-  },
-  {
-    value: ActionType.GoBackToCaller,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
-const credentialsJsonActions: ActionInfo[] = [
-  {
-    value: ActionType.UpdateCredentialsJson,
-    title: 'Download credentials from EAS to credentials.json',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.SetupBuildCredentialsFromCredentialsJson,
-    title: 'Upload credentials from credentials.json to EAS',
-    scope: Scope.Project,
-  },
-  {
-    value: ActionType.GoBackToHighLevelActions,
-    title: 'Go back',
-    scope: Scope.Manager,
-  },
-];
-
-function getPushKeyActions(ctx: CredentialsContext): ActionInfo[] {
-  return [
-    {
-      value: ActionType.SetupPushKey,
-      title: 'Setup your project to use Push Notifications',
-      scope: Scope.Project,
-    },
-    {
-      value: ActionType.CreatePushKey,
-      title: 'Add a new push key',
-      scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
-    },
-    {
-      value: ActionType.UseExistingPushKey,
-      title: 'Use an existing push key',
-      scope: Scope.Project,
-    },
-    {
-      value: ActionType.RemovePushKey,
-      title: 'Remove a push key from your account',
-      scope: Scope.Account,
-    },
-    {
-      value: ActionType.GoBackToHighLevelActions,
-      title: 'Go back',
-      scope: Scope.Manager,
-    },
-  ];
-}
-
-function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[] {
-  return [
-    {
-      // This command will be triggered during build to ensure all credentials are ready
-      // I'm leaving it here for now to simplify testing
-      value: ActionType.SetupBuildCredentials,
-      title: 'All: Set up all the required credentials to build your project',
-      scope: Scope.Project,
-    },
-    {
-      value: ActionType.UseExistingDistributionCertificate,
-      title: 'Distribution Certificate: Use an existing one for your project',
-      scope: Scope.Project,
-    },
-    {
-      value: ActionType.CreateDistributionCertificate,
-      title: `Distribution Certificate: Add a new one to your account`,
-      scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
-    },
-    {
-      value: ActionType.RemoveDistributionCertificate,
-      title: 'Distribution Certificate: Delete one from your account',
-      scope: Scope.Account,
-    },
-    {
-      value: ActionType.RemoveProvisioningProfile,
-      title: 'Provisioning Profile: Delete one from your project',
-      scope: Scope.Project,
-    },
-    {
-      value: ActionType.GoBackToHighLevelActions,
-      title: 'Go back',
-      scope: Scope.Manager,
-    },
-  ];
-}
-
 export class ManageIos {
  constructor(private callingAction: Action) {}

@@ -226,19 +98,19 @@ export class ManageIos {
          throw new Error('Action not supported yet');
        }
        if (actionInfo.scope === Scope.Manager) {
-          if (chosenAction === ActionType.ManageBuildCredentials) {
+          if (chosenAction === IosActionType.ManageBuildCredentials) {
            currentActions = buildCredentialsActions;
            continue;
-          } else if (chosenAction === ActionType.ManageCredentialsJson) {
+          } else if (chosenAction === IosActionType.ManageCredentialsJson) {
            currentActions = credentialsJsonActions;
            continue;
-          } else if (chosenAction === ActionType.ManagePushKey) {
+          } else if (chosenAction === IosActionType.ManagePushKey) {
            currentActions = pushKeyActions;
            continue;
-          } else if (chosenAction === ActionType.GoBackToHighLevelActions) {
+          } else if (chosenAction === IosActionType.GoBackToHighLevelActions) {
            currentActions = highLevelActions;
            continue;
-          } else if (chosenAction === ActionType.GoBackToCaller) {
+          } else if (chosenAction === IosActionType.GoBackToCaller) {
            return await this.callingAction.runAsync(ctx);
          }
        } else if (actionInfo.scope === Scope.Project) {
@@ -315,15 +187,15 @@ export class ManageIos {
  private async runAccountSpecificActionAsync(
    ctx: CredentialsContext,
    account: Account,
-    action: ActionType
+    action: IosActionType
  ): Promise<void> {
-    if (action === ActionType.RemoveDistributionCertificate) {
+    if (action === IosActionType.RemoveDistributionCertificate) {
      await new SelectAndRemoveDistributionCertificate(account).runAsync(ctx);
-    } else if (action === ActionType.CreateDistributionCertificate) {
+    } else if (action === IosActionType.CreateDistributionCertificate) {
      await new CreateDistributionCertificate(account).runAsync(ctx);
-    } else if (action === ActionType.CreatePushKey) {
+    } else if (action === IosActionType.CreatePushKey) {
      await new CreatePushKey(account).runAsync(ctx);
-    } else if (action === ActionType.RemovePushKey) {
+    } else if (action === IosActionType.RemovePushKey) {
      await new SelectAndRemovePushKey(account).runAsync(ctx);
    }
  }
@@ -333,9 +205,9 @@ export class ManageIos {
    app: App,
    targets: Target[],
    buildProfile: IosBuildProfile,
-    action: ActionType
+    action: IosActionType
  ): Promise<void> {
-    if (action === ActionType.SetupBuildCredentials) {
+    if (action === IosActionType.SetupBuildCredentials) {
      await new SetupBuildCredentials({
        app,
        targets,
@@ -352,12 +224,12 @@ export class ManageIos {
      buildProfile
    ).runAsync(ctx);

-    if (action === ActionType.SetupBuildCredentialsFromCredentialsJson) {
+    if (action === IosActionType.SetupBuildCredentialsFromCredentialsJson) {
      await new SetupBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(
        ctx
      );
      return;
-    } else if (action === ActionType.UpdateCredentialsJson) {
+    } else if (action === IosActionType.UpdateCredentialsJson) {
      await new UpdateCredentialsJson(app, targets, distributionType).runAsync(ctx);
      return;
    }
@@ -365,7 +237,7 @@ export class ManageIos {
    const target = await this.selectTargetAsync(targets);
    const appLookupParams = getAppLookupParamsFromContext(ctx, target);
    switch (action) {
-      case ActionType.UseExistingDistributionCertificate: {
+      case IosActionType.UseExistingDistributionCertificate: {
        const distCert = await selectValidDistributionCertificateAsync(ctx, appLookupParams);
        if (!distCert) {
          return;
@@ -378,7 +250,7 @@ export class ManageIos {
        );
        return;
      }
-      case ActionType.CreateDistributionCertificate: {
+      case IosActionType.CreateDistributionCertificate: {
        const distCert = await new CreateDistributionCertificate(appLookupParams.account).runAsync(
          ctx
        );
@@ -395,7 +267,7 @@ export class ManageIos {
        }
        return;
      }
-      case ActionType.RemoveProvisioningProfile: {
+      case IosActionType.RemoveProvisioningProfile: {
        const iosAppCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(
          appLookupParams
        );
@@ -418,7 +290,7 @@ export class ManageIos {
        }
        return;
      }
-      case ActionType.SetupPushKey: {
+      case IosActionType.SetupPushKey: {
        const setupPushKeyAction = await new SetupPushKey(appLookupParams);
        const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
        if (isPushKeySetup) {
@@ -430,7 +302,7 @@ export class ManageIos {
        }
        return;
      }
-      case ActionType.CreatePushKey: {
+      case IosActionType.CreatePushKey: {
        const pushKey = await new CreatePushKey(appLookupParams.account).runAsync(ctx);
        const confirm = await confirmAsync({
          message: `Do you want ${appLookupParams.projectName} to use the new Push Key?`,
@@ -440,7 +312,7 @@ export class ManageIos {
        }
        return;
      }
-      case ActionType.UseExistingPushKey: {
+      case IosActionType.UseExistingPushKey: {
        const selectedPushKey = await selectPushKeyAsync(ctx, appLookupParams.account);
        if (selectedPushKey) {
          await new AssignPushKey(appLookupParams).runAsync(ctx, selectedPushKey);
@@ -20,7 +20,7 @@ export async function createContextAsync({
  cwd?: string;
  user: Actor;
 }): Promise<DeviceManagerContext> {
-  const projectDir = await findProjectRootAsync(cwd);
+  const projectDir = await findProjectRootAsync({ cwd });
  let exp: ExpoConfig | null = null;
  if (projectDir) {
    const config = getConfig(projectDir, { skipSDKVersionRequirement: true });
@@ -1,12 +1,17 @@
 import {
+  Client,
  CombinedError as GraphqlError,
+  OperationContext,
  OperationResult,
+  PromisifiedSource,
+  TypedDocumentNode,
  cacheExchange,
  createClient as createUrqlClient,
  dedupExchange,
  fetchExchange,
 } from '@urql/core';
 import { retryExchange } from '@urql/exchange-retry';
+import { DocumentNode } from 'graphql';
 // node-fetch is used here because @urql/core uses the fetch API under the hood
 // don't use node-fetch elsewhere
 // eslint-disable-next-line
@@ -57,7 +62,17 @@ export const graphqlClient = createUrqlClient({
    }
    return {};
  },
-});
+}) as StricterClient;
+
+/* Please specify additionalTypenames in your Graphql queries */
+export interface StricterClient extends Client {
+  // eslint-disable-next-line @typescript-eslint/ban-types
+  query<Data = any, Variables extends object = {}>(
+    query: DocumentNode | TypedDocumentNode<Data, Variables> | string,
+    variables: Variables | undefined,
+    context: Partial<OperationContext> & { additionalTypenames: string[] }
+  ): PromisifiedSource<OperationResult<Data, Variables>>;
+}

 export async function withErrorHandlingAsync<T>(promise: Promise<OperationResult<T>>): Promise<T> {
  const { data, error } = await promise;
Author	SHA1	Message	Date
Brent Vatne	36118b700f	v0.34.0	2021-11-01 11:23:56 -07:00
Dominik Sokal	2fb947b47a	rename `useDevelopmentClient` to `developmentClient` (#711 ) * generate graphql code * rename useDevelopmentClient to developmentClient * update CHANGELOG.md * upgrade @expo/eas-build-job	2021-10-31 18:51:26 +01:00
gregfentonandWojciech Kozyra	0f1156e951	[eas-cli] correct warning message text (#715 ) (#716 ) * [eas-cli] correct warning message text (#715) * (minor) Incorrect instructions in warning message Fixes #715 * Update packages/eas-cli/src/build/validate.ts Co-authored-by: Wojciech Kozyra <[email protected]>	2021-10-29 10:47:14 +02:00
Quinlan Jung	e9f8be92b7	[eas-cli] fix graphql (#713 ) * [eas-cli] fix graphql * update CHANGELOG.md	2021-10-28 11:51:40 -07:00
Quinlan Jung	6360ea9f8e	[eas-cli] refactor credentials manager (#712 ) * [eas-cli] refactor android manager * refactor ios * update CHANGELOG.md	2021-10-28 11:50:08 -07:00
Wojciech Kozyra	ad2d8e80f0	add no commit workflow (#695 )	2021-10-28 11:40:11 +02:00
Quinlan Jung	bc0a5fdaa6	[eas-cli] remove unneeded parameters (#710 ) * [eas-cli] remove unneeded parameters * update CHANGELOG.md	2021-10-27 12:49:56 -07:00
Quinlan Jung	d6cfc887c3	[eas-cli] enforce additionalTypenames on graphql queries (#709 ) * [eas-cli] enforce additional typenames * fix stuff * update CHANGELOG.md	2021-10-26 11:07:26 -07:00
Quinlan Jung	ce41c436aa	[eas-cli] add additionalTypenames for other queries (#704 ) * [eas-cli] add additionalTypenames for other queries * update CHANGELOG.md	2021-10-25 16:50:32 -07:00
Quinlan Jung	ec096eaaa2	[ENG-2143][eas-cli] add additionalTypenames for credentials (#703 ) * [eas-cli] add additionalTypenames for credentials * update CHANGELOG.md	2021-10-25 16:50:10 -07:00
Dominik Sokal	9c32dd5308	don't print logs to stderr (#708 ) * don't print logs to stderr * update CHANGELOG.md	2021-10-25 14:15:54 +02:00
Dominik Sokal	69d7ee9547	fix changelog workflow - use sed for trimming string	2021-10-25 14:03:04 +02:00
Dominik Sokal	e2e4cb67ca	better error message when eas.json is invalid (#707 ) * better error message when eas.json is invalid * add unit test * update CHANGELOG.md	2021-10-25 13:19:27 +02:00
Dominik Sokal	4a08ad4997	unify eas.json and build job format (#701 ) * unify eas.json and build job format * update CHANGELOG.md	2021-10-25 09:56:30 +02:00
Expo CI	107a1c12bd	update CHANGELOG.md	2021-10-22 18:16:12 +00:00
Brent Vatne	8fe5268a73	v0.33.1	2021-10-22 11:10:45 -07:00
Brent Vatne	faba1ad8e3	[eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ (#706 )	2021-10-22 11:09:50 -07:00
Dominik Sokal	ea4885c710	fix typo	2021-10-21 10:10:47 +02:00
Brent Vatne	4d85002d2b	[eas-cli] Update the submission prompt options	2021-10-20 11:43:55 -07:00
jkh	535b17f592	[eas-cli] use config-plugin to compute runtime version (#697 )	2021-10-20 10:58:59 -07:00
Expo CI	e556b45d4d	update CHANGELOG.md	2021-10-20 15:49:25 +00:00
jonsamp	48130dcbdc	v0.33.0	2021-10-20 11:43:29 -04:00
Jon Samp Wojciech Kozyra Dominik Sokal	1419ca6325	[eas-cli] Make "production" the default profile name (#677 ) * build defaults to production, falls back to release * allow submit to use production profile * fix typo * lint * use a common type * lint * adds changelog * adds test for getDefaultProfilesAsync * updates default config * self feedback * adds channel names * removes channel from default eas json config * de-nest getDefaultProfilesAsync * remove "_" variable name * fix changelog * incorporate feedback * restore readme to main * lint * Update CHANGELOG.md Co-authored-by: Wojciech Kozyra <[email protected]> * Update CHANGELOG.md Co-authored-by: Dominik Sokal <[email protected]> * Update packages/eas-cli/src/build/utils/devClient.ts Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Wojciech Kozyra <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-10-18 12:26:08 -04:00
Dominik Sokal	8513dc0645	update CHANGELOG.md	2021-10-18 14:59:13 +02:00
Dominik Sokal	70e8f8370b	unify reading app.json (#692 )	2021-10-18 14:58:08 +02:00
Dominik Sokal	135c90a8b8	eas submit - skip second prompt for apple id when already signed in with apple (#691 ) * eas submit - skip second prompt for apple id when already signed in with apple * update CHANGELOG.md	2021-10-18 14:37:47 +02:00
Dominik Sokal	fa588c2d24	don't capitalize credentials.json	2021-10-18 12:33:35 +02:00
Dominik Sokal	b4ce7a91c2	rename generic workflow -> bare workflow (#690 )	2021-10-18 10:24:24 +02:00
Dominik Sokal	8ca9d66c32	fix typos	2021-10-15 16:04:54 +02:00
Dominik Sokal	a86fabde59	re-generate graphql code	2021-10-15 11:44:44 +02:00
Expo CI	40a896675f	update CHANGELOG.md	2021-10-15 09:05:59 +00:00
Dominik Sokal	cf7848e3c5	v0.32.0	2021-10-15 11:00:07 +02:00
Bartłomiej Klocek	3d4394a9bc	[eas-cli][submit] Ability to select a build from the list (#688 ) * [eas-cli][submit] Ability to select a build from the list * Add tests * update CHANGELOG.md	2021-10-15 10:42:42 +02:00
Quinlan Jung	05f4c08d09	[eas-cli] create/list/revoke asc api keys via baconlane (#687 ) * [eas-cli] manage ascApiKeys via baconlane * expose methods * update CHANGELOG.md * pr feedback * fix tests * grammar	2021-10-14 13:22:19 -07:00
Quinlan JungandDominik Sokal	a4107a86f9	[eas-cli] support ascApiKeys in ios submission (#678 ) * [eas-cli] support ascApiKeys in ios submission * format feedback * get values from eas.json * more pr feedback * changelog stuff * fyi * tests * fix lint * Update CHANGELOG.md Co-authored-by: Dominik Sokal <[email protected]> * Update packages/eas-cli/src/submit/ios/IosSubmitCommand.ts Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-10-11 14:49:26 -07:00
Quinlan JungandDominik Sokal	a5c695dd88	[eas-json] add asc api key parameters to eas json (#684 ) * [eas-json] add asc api key parameters to eas json * changelog stuff * Update CHANGELOG.md Co-authored-by: Dominik Sokal <[email protected]> Co-authored-by: Dominik Sokal <[email protected]>	2021-10-11 14:41:13 -07:00
Dominik Sokal	7576d9195d	eslint - enable no-underscore-dangle (#686 ) * eslint - enable no-underscore-dangle * update CHANGELOG.md	2021-10-11 11:10:03 +02:00
Brent VatneandDominik Sokal	838c1508be	[eas-cli] Fix printing App Store Connect URL after submission (#683 ) * [eas-cli] Fix printing App Store Connect URL after submission * Update CHANGELOG * Fix comment * Remove unnecessary import * Update other place where we pass in empty string to learnMore * Apply suggestions from code review Co-authored-by: Dominik Sokal <[email protected]>	2021-10-11 10:12:03 +02:00
Expo CI	7941683435	update CHANGELOG.md	2021-10-08 23:07:10 +00:00
Quinlan Jung	91f2311a50	v0.31.1	2021-10-08 16:01:17 -07:00
Quinlan Jung	45d10d9b83	[eas-cli] fix non interactive bug for service accounts (#682 ) * [eas-cli] fix non interactive bug * changelog stuff	2021-10-08 15:49:52 -07:00
Dominik Sokal	f5d5093922	changelog bot: commit as last commit author (#680 )	2021-10-08 16:39:47 +02:00
Dominik Sokal	fa4687b0f8	implement simple changelog bot (#676 ) * implement simple changelog bot * update PR template	2021-10-08 15:08:02 +02:00
Expo CI	e78c475118	update CHANGELOG.md	2021-10-08 12:37:00 +00:00
Dominik Sokal	def91af01f	v0.31.0	2021-10-08 14:26:59 +02:00
Dominik Sokal	5eb0fb75ac	print platform emoji next to build details url when building for multiple platforms	2021-10-08 14:23:11 +02:00
Dominik Sokal	de8c69f766	update CHANGELOG.md	2021-10-08 13:58:55 +02:00
Wojciech KozyraandDominik Sokal	5879ac424d	[eas-cli] do not set default image (#675 ) * [eas-cli] do not set default image * upgrade @expo/eas-build-job * remove redundant import * update CHANGELOG Co-authored-by: Dominik Sokal <[email protected]>	2021-10-08 13:56:57 +02:00
Dominik Sokal	e30f62ec12	add option to review adhoc devices when reusing profile (#673 ) * add option to review adhoc devices when reusing profile * update CHANGELOG * update snapshot * address PR feedback	2021-10-08 10:46:37 +02:00
Bartłomiej Klocek	dc4e36e8a8	[eas-cli] Improved service account display in submission summary (#674 )	2021-10-08 09:17:46 +02:00
Quinlan Jung	12ded8c9a9	[eas-cli] integrated credentials service with android submissions (#664 ) * [eas-cli] integrated credentials service with android submissions * pr feedback * tests * changelog * pr feedback * dont print path in summary if it doesnt exist * fix tests	2021-10-06 13:16:02 -07:00
Dominik Sokal	7378c6fd0e	change CHANGELOG commit message	2021-10-06 16:23:02 +02:00
Expo CI	77a8b08834	[skip ci] update CHANGELOG.md	2021-10-06 14:15:53 +00:00
Dominik Sokal	79db9eb482	v0.30.1	2021-10-06 16:09:23 +02:00
Dominik Sokal	59f6d36114	don't use PAT for release	2021-10-06 16:07:24 +02:00
Dominik Sokal	c36c26f5a9	fix building monorepo projects on Windows (#671 ) * fix building monorepo projects on Windows * update CHANGELOG * address PR feedback	2021-10-06 15:34:42 +02:00
Dominik Sokal	d6692f20b5	volta pin [email protected] and [email protected]	2021-10-06 09:50:33 +02:00
Brent Vatne	6e37f596df	[eas-cli] Bump @expo/config @expo/prebuild-config @expo/config-plugins to fix iOS Info.plist warning (#670 ) * [eas-cli] Bump @expo/config @expo/prebuild-config @expo/config-plugins * Update CHANGELOG	2021-10-06 09:39:57 +02:00
Dominik Sokal	d326891ef8	fix committing changelog changes from CI	2021-10-05 18:36:52 +02:00
Dominik Sokal	46a34327d9	fix --json flag when running on GitHub Actions (#669 ) * fix --json flag when running on GitHub Actions * update CHANGELOG	2021-10-05 15:38:34 +02:00
Dominik Sokal	97242af30f	update CHANGELOG	2021-10-05 13:23:34 +02:00