chore: initial setup for ESM

.github/workflows/changelog.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: '16'
       - name: Checkout Pull Request
         run: hub pr checkout ${{ github.event.issue.number }}
         env:

.github/workflows/release.yml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
@@ -96,7 +96,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -138,7 +138,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: 18
+          node-version: '16'
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -155,7 +155,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: '16'
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files

.github/workflows/size.yml

@@ -9,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 18
+          node-version: 16
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'

.github/workflows/test.yml

@@ -10,9 +10,9 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['14', '16', '18']
+        node: ['12', '14', '16']
         include:
-          - node: '18'
+          - node: '16'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:

CHANGELOG.md

@@ -10,20 +10,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🐛 Bug fixes
 
-- Match bundle identifier capabilities more accurately. ([#1112](https://github.com/expo/eas-cli/pull/1112) by [@EvanBacon](https://github.com/EvanBacon))
-
 ### 🧹 Chores
 
-- Update dependencies. ([#1095](https://github.com/expo/eas-cli/pull/1095), [#1115](https://github.com/expo/eas-cli/pull/1115) by [@dsokal](https://github.com/dsokal))
-- Better spinner placement for multiple builds. ([#1105](https://github.com/expo/eas-cli/pull/1105) by [@dsokal](https://github.com/dsokal))
-- Use getExpoConfig to access config. ([#1122](https://github.com/expo/eas-cli/pull/1122) by [@wkozyra95](https://github.com/wkozyra95))
-
-## [0.52.0](https://github.com/expo/eas-cli/releases/tag/v0.52.0) - 2022-04-26
-
-### 🎉 New features
-
-- Support target specific entitlements. ([#1078](https://github.com/expo/eas-cli/pull/1078) by [@wkozyra95](https://github.com/wkozyra95))
-
 ## [0.51.0](https://github.com/expo/eas-cli/releases/tag/v0.51.0) - 2022-04-19
 
 ### 🎉 New features

jest.config.js

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

jest/jest.config.js

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

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.53.0"
+  "version": "0.51.0"
 }

package.json

@@ -1,5 +1,6 @@
 {
   "private": true,
+  "type":"module",
   "workspaces": [
     "packages/*"
   ],
@@ -17,22 +18,22 @@
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
-    "@types/jest": "27.5.0",
-    "@types/node": "17.0.32",
-    "eslint": "8.15.0",
-    "eslint-config-universe": "11.0.0",
+    "@types/jest": "27.4.1",
+    "@types/node": "16.7.8",
+    "eslint": "8.12.0",
+    "eslint-config-universe": "10.0.0",
     "eslint-plugin-async-protect": "1.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "28.1.0",
-    "jest-watch-typeahead": "1.1.0",
+    "jest": "27.5.1",
+    "jest-watch-typeahead": "1.0.0",
     "lerna": "4.0.0",
     "oclif": "3.0.1",
-    "prettier": "2.6.2",
-    "ts-jest": "28.0.2",
-    "typescript": "4.6.4"
+    "prettier": "2.6.1",
+    "ts-jest": "27.1.4",
+    "typescript": "4.6.3"
   },
   "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "16.10.0",
+    "yarn": "1.22.15"
   }
 }

packages/eas-cli/README.md

@@ -98,7 +98,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -115,7 +115,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -132,7 +132,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -146,7 +146,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -175,7 +175,7 @@ EXAMPLES
   $ eas autocomplete --refresh-cache
 ```
 
-_See code: [@expo/plugin-autocomplete](https://github.com/expo/plugin-autocomplete/blob/v1.4.0/src/commands/autocomplete/index.ts)_
+_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.2.0/src/commands/autocomplete/index.ts)_
 
 ## `eas branch:create [NAME]`
 
@@ -195,7 +195,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -215,7 +215,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -232,7 +232,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -251,7 +251,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -271,7 +271,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -300,7 +300,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -314,7 +314,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -331,7 +331,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -366,7 +366,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -399,7 +399,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:submit`
 
@@ -444,7 +444,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -464,7 +464,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -485,7 +485,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -502,7 +502,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -522,7 +522,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -540,7 +540,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -554,7 +554,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -568,7 +568,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -586,7 +586,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -603,7 +603,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -617,7 +617,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -631,7 +631,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -651,7 +651,7 @@ DESCRIPTION
   Display help for eas.
 ```
 
-_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.2.0/src/commands/help.ts)_
+_See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.12/src/commands/help.ts)_
 
 ## `eas init`
 
@@ -710,7 +710,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -727,7 +727,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -747,7 +747,7 @@ DESCRIPTION
   create an environment secret on the current project or owner account
 ```
 
-_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -764,7 +764,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -778,7 +778,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas submit`
 
@@ -808,7 +808,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -838,7 +838,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -855,7 +855,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -875,7 +875,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -894,7 +894,7 @@ DESCRIPTION
   view the recent updates for a branch
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -914,7 +914,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -934,7 +934,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -951,7 +951,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -968,7 +968,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -989,7 +989,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1006,7 +1006,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.53.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.51.0/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/bin/run

@@ -1,6 +0,0 @@
-#!/usr/bin/env node
-
-require('@oclif/core')
-  .run()
-  .then(require('@oclif/core/flush'))
-  .catch(require('@oclif/core/handle'));

packages/eas-cli/bin/run.js

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { Errors, flush, run } from '@oclif/core';
+
+run(undefined, import.meta.url)
+  .then(flush)
+  .catch(Errors.handle);

packages/eas-cli/graphql.schema.json

@@ -701,7 +701,7 @@
           },
           {
             "name": "billing",
-            "description": "Billing information. Only visible to members with the ADMIN or OWNER role.",
+            "description": "Billing information",
             "args": [],
             "type": {
               "kind": "OBJECT",
@@ -1702,7 +1702,7 @@
                 "deprecationReason": null
               },
               {
-                "name": "chargeID",
+                "name": "chargeIdentifier",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
@@ -1716,30 +1716,6 @@
                 "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
-              },
-              {
-                "name": "description",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "reason",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "String",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
               }
             ],
             "type": {
@@ -2112,15 +2088,15 @@
         "description": null,
         "fields": [
           {
-            "name": "id",
+            "name": "metric",
             "description": null,
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
+                "kind": "ENUM",
+                "name": "EASServiceMetric",
                 "ofType": null
               }
             },
@@ -2143,22 +2119,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "serviceMetric",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "EASServiceMetric",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "timestamp",
             "description": null,
@@ -2197,151 +2157,11 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "AccountUsageMetricAndCost",
-        "description": null,
-        "fields": [
-          {
-            "name": "id",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "limit",
-            "description": "The limit, in units, allowed by this plan",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "metricType",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "UsageMetricType",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "serviceMetric",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "EASServiceMetric",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "totalCost",
-            "description": "Total cost of this particular metric, in cents",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "value",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
         "name": "AccountUsageMetrics",
         "description": null,
         "fields": [
-          {
-            "name": "byBillingPeriod",
-            "description": null,
-            "args": [
-              {
-                "name": "date",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "DateTime",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "UsageMetricTotal",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "metricsForServiceMetric",
             "description": null,
@@ -2363,7 +2183,7 @@
                 "deprecationReason": null
               },
               {
-                "name": "serviceMetric",
+                "name": "metric",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
@@ -6665,15 +6485,15 @@
         "fields": [
           {
             "name": "colorPalette",
-            "description": null,
+            "description": "Nullable color palette of the app icon. If null, color palette couldn't be retrieved from external service (imgix)",
             "args": [],
             "type": {
               "kind": "SCALAR",
               "name": "JSON",
               "ofType": null
             },
-            "isDeprecated": true,
-            "deprecationReason": "No longer supported"
+            "isDeprecated": false,
+            "deprecationReason": null
           },
           {
             "name": "originalUrl",
@@ -6725,29 +6545,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "AppInfoInput",
-        "description": null,
-        "fields": null,
-        "inputFields": [
-          {
-            "name": "displayName",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "INPUT_OBJECT",
         "name": "AppInput",
@@ -6770,18 +6567,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "appInfo",
-            "description": null,
-            "type": {
-              "kind": "INPUT_OBJECT",
-              "name": "AppInfoInput",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "privacy",
             "description": null,
@@ -6898,55 +6683,6 @@
             "isDeprecated": true,
             "deprecationReason": "No longer supported"
           },
-          {
-            "name": "setAppInfo",
-            "description": "Set display info for app",
-            "args": [
-              {
-                "name": "appId",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "appInfo",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "AppInfoInput",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "App",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "setPushSecurityEnabled",
             "description": "Require api token to send push notifs for experience",
@@ -13286,65 +13022,6 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "Concurrencies",
-        "description": null,
-        "fields": [
-          {
-            "name": "android",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "ios",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "total",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "INPUT_OBJECT",
         "name": "CreateAccessTokenInput",
@@ -13449,18 +13126,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "archiveUrl",
-            "description": null,
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "defaultValue": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "config",
             "description": null,
@@ -13599,16 +13264,59 @@
             "deprecationReason": null
           },
           {
-            "name": "archiveUrl",
+            "name": "config",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "INPUT_OBJECT",
+                "name": "IosSubmissionConfigInput",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "submittedBuildId",
             "description": null,
             "type": {
               "kind": "SCALAR",
-              "name": "String",
+              "name": "ID",
               "ofType": null
             },
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateSubmissionInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "appId",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           },
           {
             "name": "config",
@@ -13617,8 +13325,24 @@
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "INPUT_OBJECT",
-                "name": "IosSubmissionConfigInput",
+                "kind": "SCALAR",
+                "name": "JSONObject",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "platform",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "AppPlatform",
                 "ofType": null
               }
             },
@@ -14268,29 +13992,11 @@
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
-          {
-            "name": "ASSETS_REQUESTS",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "BANDWIDTH_USAGE",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "MANIFEST_REQUESTS",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
-          {
-            "name": "UNIQUE_USERS",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
           }
         ],
         "possibleTypes": null
@@ -21383,34 +21089,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "archiveUrl",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "canRetry",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "cancelingActor",
             "description": null,
@@ -21503,18 +21181,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "parentSubmission",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "Submission",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "platform",
             "description": null,
@@ -21763,13 +21429,9 @@
                 "name": "submissionId",
                 "description": null,
                 "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
+                  "kind": "SCALAR",
+                  "name": "ID",
+                  "ofType": null
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
@@ -21855,18 +21517,18 @@
             "deprecationReason": null
           },
           {
-            "name": "retrySubmission",
-            "description": "Retry an EAS Submit submission",
+            "name": "createSubmission",
+            "description": "Create an EAS Submit submission",
             "args": [
               {
-                "name": "parentSubmissionId",
+                "name": "input",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateSubmissionInput",
                     "ofType": null
                   }
                 },
@@ -21884,8 +21546,8 @@
                 "ofType": null
               }
             },
-            "isDeprecated": false,
-            "deprecationReason": null
+            "isDeprecated": true,
+            "deprecationReason": "Use createIosSubmission / createAndroidSubmission instead"
           }
         ],
         "inputFields": null,
@@ -22025,18 +21687,6 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
-          {
-            "name": "concurrencies",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "Concurrencies",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "endedAt",
             "description": null,
@@ -23329,113 +22979,6 @@
         ],
         "possibleTypes": null
       },
-      {
-        "kind": "OBJECT",
-        "name": "UsageMetricTotal",
-        "description": null,
-        "fields": [
-          {
-            "name": "billingPeriod",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "BillingPeriod",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "id",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "overageMetrics",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "AccountUsageMetricAndCost",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "planMetrics",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "OBJECT",
-                    "name": "AccountUsageMetricAndCost",
-                    "ofType": null
-                  }
-                }
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "totalCost",
-            "description": "Total cost of overages, in cents",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Float",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
       {
         "kind": "ENUM",
         "name": "UsageMetricType",
@@ -23444,23 +22987,11 @@
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
-          {
-            "name": "BANDWIDTH",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
           {
             "name": "REQUEST",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
-          {
-            "name": "USER",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
           }
         ],
         "possibleTypes": null

packages/eas-cli/jest.config.js

@@ -1,5 +1,14 @@
-module.exports = {
-  ...require('../../jest/jest.config.js'),
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+
+import baseConfig from '../../jest/jest.config.js';
+
+const filename = fileURLToPath(import.meta.url);
+// eslint-disable-next-line no-underscore-dangle
+const __dirname = dirname(filename);
+
+export default {
+  ...baseConfig,
   rootDir: __dirname,
   roots: ['src', '__mocks__'],
   globalSetup: './jest/global-setup.ts',

packages/eas-cli/package.json

@@ -1,38 +1,39 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.53.0",
+  "version": "0.51.0",
   "author": "Expo <[email protected]>",
   "bin": {
-    "eas": "./bin/run"
+    "eas": "./bin/run.js"
   },
+  "type": "module",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.33",
+    "@expo/apple-utils": "0.0.0-alpha.31",
     "@expo/code-signing-certificates": "0.0.2",
-    "@expo/config": "6.0.23",
-    "@expo/config-plugins": "4.1.4",
-    "@expo/config-types": "45.0.0",
-    "@expo/eas-build-job": "0.2.72",
-    "@expo/eas-json": "0.53.0",
-    "@expo/json-file": "8.2.36",
+    "@expo/config": "6.0.19",
+    "@expo/config-plugins": "4.1.0",
+    "@expo/config-types": "44.0.0",
+    "@expo/eas-build-job": "0.2.68",
+    "@expo/eas-json": "0.51.0",
+    "@expo/json-file": "8.2.34",
     "@expo/multipart-body-parser": "1.1.0",
-    "@expo/pkcs12": "0.0.8",
-    "@expo/plist": "0.0.18",
-    "@expo/plugin-autocomplete": "1.4.0",
-    "@expo/plugin-help": "5.2.0",
-    "@expo/plugin-warn-if-update-available": "2.3.0",
-    "@expo/prebuild-config": "3.1.6",
+    "@expo/pkcs12": "0.0.7",
+    "@expo/plist": "0.0.17",
+    "@expo/plugin-warn-if-update-available": "2.1.0",
+    "@expo/prebuild-config": "3.1.0",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.6.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.9.0",
-    "@urql/core": "2.4.4",
-    "@urql/exchange-retry": "0.3.3",
+    "@oclif/core": "1.6.4",
+    "@oclif/plugin-autocomplete": "1.2.0",
+    "@oclif/plugin-help": "5.1.12",
+    "@urql/core": "2.4.3",
+    "@urql/exchange-retry": "0.3.2",
     "chalk": "4.1.2",
-    "cli-progress": "3.11.0",
-    "cli-table3": "0.6.2",
+    "cli-progress": "3.10.0",
+    "cli-table3": "0.6.1",
     "dateformat": "4.6.3",
     "env-paths": "2.2.0",
     "envinfo": "7.8.1",
@@ -40,12 +41,12 @@
     "fast-glob": "3.2.11",
     "figures": "3.2.0",
     "form-data": "4.0.0",
-    "fs-extra": "10.1.0",
+    "fs-extra": "10.0.1",
     "getenv": "1.0.0",
-    "gradle-to-js": "2.0.1",
-    "graphql": "16.5.0",
+    "gradle-to-js": "2.0.0",
+    "graphql": "16.3.0",
     "graphql-tag": "2.12.6",
-    "https-proxy-agent": "5.0.1",
+    "https-proxy-agent": "5.0.0",
     "ignore": "5.2.0",
     "indent-string": "4.0.0",
     "jks-js": "1.0.2",
@@ -53,8 +54,8 @@
     "keychain": "1.3.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
-    "minimatch": "5.0.1",
-    "nanoid": "3.3.4",
+    "minimatch": "3.0.5",
+    "nanoid": "3.3.2",
     "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
     "nullthrows": "1.1.1",
@@ -63,12 +64,12 @@
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.3.7",
+    "semver": "7.3.5",
     "slash": "3.0.0",
     "strip-ansi": "6.0.0",
     "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "tslib": "2.4.0",
+    "tslib": "2.3.1",
     "turndown": "7.1.1",
     "untildify": "4.0.0",
     "uuid": "8.3.2",
@@ -77,8 +78,8 @@
   "devDependencies": {
     "@graphql-codegen/cli": "2.6.2",
     "@graphql-codegen/introspection": "2.1.1",
-    "@graphql-codegen/typescript": "2.4.11",
-    "@graphql-codegen/typescript-operations": "2.4.0",
+    "@graphql-codegen/typescript": "2.4.8",
+    "@graphql-codegen/typescript-operations": "2.3.5",
     "@types/cli-progress": "3.9.2",
     "@types/dateformat": "3.0.1",
     "@types/envinfo": "7.8.1",
@@ -86,25 +87,25 @@
     "@types/getenv": "^1.0.0",
     "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
-    "@types/node-forge": "1.0.2",
+    "@types/node-forge": "1.0.1",
     "@types/prompts": "2.0.14",
     "@types/semver": "7.3.9",
     "@types/tar": "6.1.1",
-    "@types/tough-cookie": "4.0.2",
+    "@types/tough-cookie": "4.0.1",
     "@types/uuid": "8.3.4",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "0.27.2",
+    "axios": "0.26.1",
     "eslint-plugin-graphql": "4.0.0",
     "form-data": "4.0.0",
-    "memfs": "3.4.3",
+    "memfs": "3.4.1",
     "mockdate": "3.0.5",
     "nock": "13.2.4",
     "tempy": "0.7.0",
     "ts-deepmerge": "2.0.1",
-    "typescript": "4.6.4"
+    "typescript": "4.6.3"
   },
   "engines": {
-    "node": ">=14.0.0"
+    "node": ">=14.16"
   },
   "files": [
     "/bin",
@@ -122,8 +123,8 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@expo/plugin-autocomplete",
-      "@expo/plugin-help",
+      "@oclif/plugin-autocomplete",
+      "@oclif/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
     "topics": {

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

@@ -0,0 +1,3 @@
+export function asMock(fn: any): jest.Mock {
+  return fn as jest.Mock;
+}

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

@@ -105,7 +105,7 @@ export async function maybeResolveVersionsAsync(
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
       };
-    } catch {
+    } catch (err: any) {
       return {};
     }
   } else {

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

@@ -231,23 +231,16 @@ export async function waitForBuildEndAsync(
     intervalSec = 10,
   } = {}
 ): Promise<MaybeBuildFragment[]> {
-  let spinner;
-  let originalSpinnerText;
-  if (buildIds.length === 1) {
-    Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
-    originalSpinnerText = 'Waiting for build to complete.';
-    spinner = ora(originalSpinnerText).start();
-  } else {
-    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
-    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
-  }
+  const b = `build${buildIds.length > 1 ? 's' : ''}`;
+  Log.log(`Waiting for ${b} to complete. You can press Ctrl+C to exit.`);
+  const spinner = ora(`Waiting for ${b} to complete.`).start();
   const endTime = new Date().getTime() + timeoutSec * 1000;
   while (new Date().getTime() <= endTime) {
     const builds = await getBuildsSafelyAsync(buildIds);
     const { refetch } =
       builds.length === 1
         ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
-        : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
+        : await handleMultipleBuildsProgressAsync({ builds }, { spinner });
     if (!refetch) {
       return builds;
     }
@@ -380,7 +373,7 @@ const platforms = [AppPlatform.Android, AppPlatform.Ios];
 
 async function handleMultipleBuildsProgressAsync(
   { builds: maybeBuilds }: { builds: MaybeBuildFragment[] },
-  { spinner, originalSpinnerText }: { spinner: Ora; originalSpinnerText: string }
+  { spinner }: { spinner: Ora }
 ): Promise<BuildProgressResult> {
   const buildCount = maybeBuilds.length;
   const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);
@@ -400,7 +393,7 @@ async function handleMultipleBuildsProgressAsync(
     }
     return { refetch: false };
   } else {
-    spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
+    spinner.text = formatPendingBuildsText(builds);
     return { refetch: true };
   }
 }
@@ -419,10 +412,9 @@ function formatSettledBuildsText(builds: BuildFragment[]): string {
     .join('\n  ');
 }
 
-function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragment[]): string {
-  return [
-    originalSpinnerText,
-    ...platforms.map(platform => {
+function formatPendingBuildsText(builds: BuildFragment[]): string {
+  return platforms
+    .map(platform => {
       const build = builds.find(build => build.platform === platform);
       const status = build ? statusToDisplayName[build.status] : 'unknown';
       let extraInfo = '';
@@ -445,8 +437,8 @@ function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragm
       return `${appPlatformEmojis[platform]} ${
         appPlatformDisplayNames[platform]
       } build - status: ${chalk.bold(status)}${extraInfo}`;
-    }),
-  ].join('\n  ');
+    })
+    .join('\n  ');
 }
 
 function isBuildFragment(maybeBuild: MaybeBuildFragment): maybeBuild is BuildFragment {

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

@@ -36,12 +36,13 @@ export async function createIosContextAsync(
     },
     buildProfile
   );
-  const targets = await resolveTargetsAsync({
-    projectDir: ctx.projectDir,
-    exp: ctx.exp,
-    xcodeBuildContext,
-    env: buildProfile.env,
-  });
+  const targets = await resolveTargetsAsync(
+    {
+      projectDir: ctx.projectDir,
+      exp: ctx.exp,
+    },
+    xcodeBuildContext
+  );
   const applicationTarget = findApplicationTarget(targets);
   const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
 

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

@@ -2,6 +2,7 @@ import { Platform } from '@expo/eas-build-job';
 
 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
 import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { resolveEntitlementsJsonAsync } from '../../credentials/ios/appstore/entitlements';
 import { IosCredentials, Target } from '../../credentials/ios/types';
 import { CredentialsResult } from '../build';
 import { BuildContext } from '../context';
@@ -18,6 +19,13 @@ export async function ensureIosCredentialsAsync(
   const provider = new IosCredentialsProvider(buildCtx.credentialsCtx, {
     app: getAppFromContext(buildCtx.credentialsCtx),
     targets,
+    iosCapabilitiesOptions: {
+      entitlements: await resolveEntitlementsJsonAsync(
+        buildCtx.projectDir,
+        buildCtx.workflow,
+        buildCtx.buildProfile.env ?? {}
+      ),
+    },
     distribution: buildCtx.buildProfile.distribution ?? 'store',
     enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
   });

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

@@ -6,7 +6,7 @@ import semver from 'semver';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.82';
+const PLUGIN_PACKAGE_VERSION = '0.0.74';
 
 export interface LocalBuildOptions {
   enable: boolean;

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

@@ -1,8 +1,12 @@
+import { asMock } from '../../__tests__/utils';
 import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
 import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
 import { getUserAsync } from '../../user/User';
 import { ensureLoggedInAsync } from '../../user/actions';
 import EasCommand from '../EasCommand';
+import TestEasCommand from './TestEasCommand';
+
+TestEasCommand.prototype.authValue = jest.fn().mockImplementation(() => true);
 
 jest.mock('../../user/User');
 jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));
@@ -28,30 +32,17 @@ afterAll(() => {
 });
 
 beforeEach(() => {
-  jest
-    .mocked(getUserAsync)
+  asMock(getUserAsync)
     .mockReset()
-    .mockImplementation(async () => mockJester);
-  jest
-    .mocked(ensureLoggedInAsync)
+    .mockImplementation(() => mockJester);
+  asMock(ensureLoggedInAsync)
     .mockReset()
-    .mockImplementation(async () => mockJester);
-  jest.mocked(initAsync).mockReset();
-  jest.mocked(flushAsync).mockReset();
-  jest.mocked(logEvent).mockReset();
+    .mockImplementation(() => mockJester);
+  asMock(initAsync).mockReset();
+  asMock(flushAsync).mockReset();
+  asMock(logEvent).mockReset();
 });
 
-const createTestEasCommand = (authValue: boolean): typeof EasCommand => {
-  class TestEasCommand extends EasCommand {
-    requiresAuthentication = authValue;
-
-    async runAsync(): Promise<void> {}
-  }
-
-  TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
-  return TestEasCommand;
-};
-
 describe(EasCommand.name, () => {
   describe('without exceptions', () => {
     // The first test in this suite should have an increased timeout
@@ -62,36 +53,32 @@ describe(EasCommand.name, () => {
     // See https://github.com/oclif/command/blob/master/src/command.ts#L80
     // and look for "Config.load"
     it('ensures the user is logged in', async () => {
-      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(ensureLoggedInAsync).toHaveBeenCalled();
     }, 15_000);
 
     it('ensures the user data is read from cache', async () => {
-      const TestEasCommand = createTestEasCommand(false);
+      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
+
       await TestEasCommand.run();
 
-      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
-      expect(jest.mocked(ensureLoggedInAsync)).not.toBeCalled();
+      expect(getUserAsync).toHaveReturnedWith(mockJester);
     });
 
     it('initializes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(initAsync).toHaveBeenCalled();
     });
 
     it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(flushAsync).toHaveBeenCalled();
     });
 
     it('logs events', async () => {
-      const TestEasCommand = createTestEasCommand(true);
       await TestEasCommand.run();
 
       expect(logEvent).toHaveBeenCalledWith('action', {
@@ -102,12 +89,11 @@ describe(EasCommand.name, () => {
 
   describe('after exceptions', () => {
     it('flushes analytics', async () => {
-      const TestEasCommand = createTestEasCommand(true);
       try {
         await TestEasCommand.run().then(() => {
           throw new Error('foo');
         });
-      } catch {}
+      } catch (error) {}
 
       expect(flushAsync).toHaveBeenCalled();
     });

packages/eas-cli/src/commandUtils/__tests__/TestEasCommand.ts

@@ -0,0 +1,13 @@
+import EasCommand from '../EasCommand';
+
+export default class TestEasCommand extends EasCommand {
+  requiresAuthentication = this.authValue();
+
+  authValue(): boolean {
+    return false;
+  }
+
+  async runAsync(): Promise<void> {}
+}
+
+TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -10,7 +11,6 @@ import {
   UpdateBranch,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -79,7 +79,7 @@ export default class BranchCreate extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -12,7 +13,6 @@ import {
   GetBranchInfoQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -103,7 +103,7 @@ export default class BranchDelete extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import CliTable from 'cli-table3';
@@ -13,7 +14,6 @@ import {
 } from '../../graphql/generated';
 import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -71,7 +71,7 @@ export default class BranchList extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const branches = await listBranchesAsync({ projectId });
     if (flags.json) {

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -11,7 +12,6 @@ import {
   UpdateBranch,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -78,7 +78,7 @@ export default class BranchRename extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import Table from 'cli-table3';
@@ -5,7 +6,6 @@ import Table from 'cli-table3';
 import EasCommand from '../../commandUtils/EasCommand';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
@@ -41,7 +41,7 @@ export default class BranchView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     if (!name) {

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
 
@@ -13,7 +14,6 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { appPlatformEmojis } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -104,7 +104,7 @@ async function selectBuildToCancelAsync(
 async function ensureBuildExistsAsync(buildId: string): Promise<void> {
   try {
     await BuildQuery.byIdAsync(buildId);
-  } catch {
+  } catch (err) {
     throw new Error(`Couldn't find a build matching the id ${buildId}`);
   }
 }
@@ -118,7 +118,7 @@ export default class BuildCancel extends EasCommand {
     const { BUILD_ID: buildIdFromArg } = (await this.parse(BuildCancel)).args;
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -7,7 +8,6 @@ import { ensureProjectConfiguredAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
@@ -55,7 +55,7 @@ export default class BuildConfigure extends EasCommand {
 
     // configure expo-updates
     if (expoUpdatesIsInstalled) {
-      const exp = getExpoConfig(projectDir);
+      const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
 
       if ([RequestedPlatform.Android, RequestedPlatform.All].includes(platform)) {
         const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);

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

@@ -102,7 +102,7 @@ export default class BuildInspect extends EasCommand {
         if (!flags.verbose) {
           Log.log(chalk.green('Build successful'));
         }
-      } catch {
+      } catch (err) {
         if (!flags.verbose) {
           Log.error('Build failed');
           Log.error(`Re-run this command with ${chalk.bold('--verbose')} flag to see the logs`);

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -13,7 +14,6 @@ import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -77,7 +77,7 @@ export default class BuildList extends EasCommand {
     const graphqlBuildDistribution = toGraphQLBuildDistribution(buildDistribution);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 
 import { formatGraphQLBuild } from '../../build/utils/formatBuild';
@@ -6,7 +7,6 @@ import { BuildFragment } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -35,7 +35,7 @@ export default class BuildView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectName = await getProjectFullNameAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -10,7 +11,6 @@ import {
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -88,7 +88,7 @@ export default class ChannelCreate extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';
 
@@ -11,7 +12,6 @@ import {
   GetChannelInfoQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -55,7 +55,7 @@ export default class ChannelDelete extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import gql from 'graphql-tag';
@@ -14,7 +15,6 @@ import {
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -120,7 +120,7 @@ export default class ChannelEdit extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     const channelName = args.name ?? (await promptForChannelAsync());

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import gql from 'graphql-tag';
 
@@ -8,7 +9,6 @@ import {
   GetAllChannelsForAppQueryVariables,
 } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -85,7 +85,7 @@ export default class ChannelList extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     const getAllUpdateChannelForAppResult = await getAllUpdateChannelForAppAsync({

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -6,7 +7,6 @@ import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generat
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -344,7 +344,7 @@ export default class ChannelRollout extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const fullName = await getProjectFullNameAsync(exp);
     const projectId = await getProjectIdAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -6,7 +7,6 @@ import Table from 'cli-table3';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import {
@@ -45,7 +45,7 @@ export function getBranchMapping(branchMappingString?: string): {
   let branchMapping: BranchMapping;
   try {
     branchMapping = JSON.parse(branchMappingString);
-  } catch {
+  } catch (e) {
     throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
   }
   assert(branchMapping, 'Branch Mapping must be defined.');
@@ -165,7 +165,7 @@ export default class ChannelView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     if (!channelName) {

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

@@ -1,4 +1,5 @@
 import { Device, DeviceStatus } from '@expo/apple-utils';
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 
@@ -16,7 +17,6 @@ import formatDevice from '../../devices/utils/formatDevice';
 import { AppleDevice, Maybe } from '../../graphql/generated';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
 
@@ -34,7 +34,7 @@ export default class DeviceDelete extends EasCommand {
     } = await this.parse(DeviceDelete);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 
     if (!appleTeamIdentifier) {

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -8,7 +9,6 @@ import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleT
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { Ora, ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 
@@ -23,7 +23,7 @@ export default class BuildList extends EasCommand {
     let appleTeamIdentifier = (await this.parse(BuildList)).flags['apple-team-id'];
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 
     let spinner: Ora;

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

@@ -1,9 +1,10 @@
+import { getConfig } from '@expo/config';
+
 import EasCommand from '../../commandUtils/EasCommand';
 import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
 import formatDevice from '../../devices/utils/formatDevice';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 
 export default class DeviceView extends EasCommand {
@@ -29,7 +30,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 
     const spinner = ora().start(`Fetching device details for ${UDID}…`);

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

@@ -1,10 +1,10 @@
+import { getConfig } from '@expo/config';
 import gql from 'graphql-tag';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import formatFields from '../../utils/formatFields';
 
@@ -36,7 +36,7 @@ export default class ProjectInfo extends EasCommand {
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const { app } = await projectInfoByIdAsync(projectId);
     if (!app) {

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

@@ -1,8 +1,8 @@
+import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';
 
 export default class ProjectInit extends EasCommand {
@@ -11,7 +11,7 @@ export default class ProjectInit extends EasCommand {
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
 
     if (exp.extra?.eas?.projectId) {
       Log.error(

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -8,7 +9,6 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -47,7 +47,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
     } = await this.parse(EnvironmentSecretCreate);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const accountName = await getProjectAccountNameAsync(exp);
 
     const { slug } = exp;

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 
 import EasCommand from '../../commandUtils/EasCommand';
@@ -8,7 +9,6 @@ import {
   EnvironmentSecretsQuery,
 } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -27,7 +27,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 import dateFormat from 'dateformat';
@@ -5,7 +6,6 @@ import dateFormat from 'dateformat';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
@@ -17,7 +17,7 @@ export default class EnvironmentSecretList extends EasCommand {
 
   async runAsync(): Promise<void> {
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectAccountName = await getProjectAccountNameAsync(exp);
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -12,7 +13,6 @@ import {
   selectRequestedPlatformAsync,
   toPlatforms,
 } from '../platform';
-import { getExpoConfig } from '../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
 import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
 import { submitAsync, waitToCompleteAsync } from '../submit/submit';
@@ -89,7 +89,7 @@ export default class Submit extends EasCommand {
     const flags = await this.sanitizeFlagsAsync(rawFlags);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     const platforms = toPlatforms(flags.requestedPlatform);

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

@@ -1,4 +1,4 @@
-import { ExpoConfig, modifyConfigAsync } from '@expo/config';
+import { ExpoConfig, getConfig, modifyConfigAsync } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
@@ -9,7 +9,6 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { AppPlatform } from '../../graphql/generated';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform, appPlatformDisplayNames } from '../../platform';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectIdAsync,
@@ -42,7 +41,9 @@ export default class UpdateConfigure extends EasCommand {
     const { flags } = await this.parse(UpdateConfigure);
     const platform = flags.platform as RequestedPlatform;
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+    });
 
     if (!isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion)) {
       await installExpoUpdatesAsync(projectDir);

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

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config';
+import { ExpoConfig, getConfig } from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { Errors, Flags } from '@oclif/core';
@@ -27,7 +27,6 @@ import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectIdAsync,
@@ -226,11 +225,13 @@ export default class UpdatePublish extends EasCommand {
     republish = group ? true : republish;
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir, {
+    const { exp } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
       isPublicConfig: true,
     });
 
-    const expPrivate = getExpoConfig(projectDir, {
+    const { exp: expPrivate } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
       isPublicConfig: false,
     });
 

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
@@ -7,7 +8,6 @@ import EasCommand from '../../commandUtils/EasCommand';
 import { ViewAllUpdatesQuery } from '../../graphql/generated';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
 import { FormatUpdateParameter, UPDATE_COLUMNS, formatUpdate } from '../../update/utils';
@@ -50,7 +50,7 @@ export default class BranchView extends EasCommand {
     }
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     let updateGroupDescriptions: UpdateGroupDescription[];

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

@@ -1,10 +1,10 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { WebhookType } from '../../graphql/generated';
 import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { prepareInputParamsAsync } from '../../webhooks/input';
 
@@ -30,7 +30,7 @@ export default class WebhookCreate extends EasCommand {
     const webhookInputParams = await prepareInputParamsAsync(flags);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     const spinner = ora('Creating a webhook').start();

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
@@ -8,7 +9,6 @@ import { WebhookMutation } from '../../graphql/mutations/WebhookMutation';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
 import { formatWebhook } from '../../webhooks/formatWebhook';
@@ -30,7 +30,7 @@ export default class WebhookDelete extends EasCommand {
     } = await this.parse(WebhookDelete);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
 
     let webhook: WebhookFragment | undefined =

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

@@ -1,3 +1,4 @@
+import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -6,7 +7,6 @@ import { WebhookType } from '../../graphql/generated';
 import { WebhookQuery } from '../../graphql/queries/WebhookQuery';
 import Log from '../../log';
 import { ora } from '../../ora';
-import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
@@ -30,7 +30,7 @@ export default class WebhookList extends EasCommand {
     } = await this.parse(WebhookList);
 
     const projectDir = await findProjectRootAsync();
-    const exp = getExpoConfig(projectDir);
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
     const projectFullName = await getProjectFullNameAsync(exp);
 

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

@@ -76,9 +76,7 @@ export const testPushKey: ApplePushKeyFragment = {
   iosAppCredentialsList: [],
 };
 
-export const testTargets: Target[] = [
-  { targetName: 'testapp', bundleIdentifier: 'foo.bar.com', entitlements: {} },
-];
+export const testTargets: Target[] = [{ targetName: 'testapp', bundleIdentifier: 'foo.bar.com' }];
 
 export const testProvisioningProfileFragment: AppleProvisioningProfileFragment = {
   id: 'test-prov-prof-id-1',

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -16,7 +17,7 @@ import {
 
 jest.mock('../../../../ora');
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe('BuildCredentialsUtils', () => {
   describe(canCopyLegacyCredentialsAsync, () => {
@@ -83,9 +84,7 @@ describe('BuildCredentialsUtils', () => {
   });
   describe(promptUserAndCopyLegacyCredentialsAsync, () => {
     it('copies all legacy credentials to EAS if the user is eligible', async () => {
-      jest
-        .mocked(promptAsync)
-        .mockImplementation(async () => ({ providedName: 'test-provided-name' }));
+      asMock(promptAsync).mockImplementation(() => ({ providedName: 'test-provided-name' }));
       const ctx = createCtxMock({
         nonInteractive: false,
         android: {

packages/eas-cli/src/credentials/android/actions/__tests__/CreateFcm-test.ts

@@ -1,10 +1,11 @@
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { CreateFcm } from '../CreateFcm';
 
 jest.mock('../../../../prompts');
-jest.mocked(promptAsync).mockImplementation(async () => ({ fcmApiKey: 'blah' }));
+asMock(promptAsync).mockImplementation(() => ({ fcmApiKey: 'blah' }));
 
 describe(CreateFcm, () => {
   it('creates an fcm api key in Interactive Mode', async () => {

packages/eas-cli/src/credentials/android/actions/__tests__/CreateGoogleServiceAccountKey-test.ts

@@ -1,5 +1,6 @@
 import { vol } from 'memfs';
 
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
@@ -7,7 +8,7 @@ import { CreateGoogleServiceAccountKey } from '../CreateGoogleServiceAccountKey'
 
 jest.mock('../../../../prompts');
 jest.mock('fs');
-jest.mocked(promptAsync).mockImplementation(async () => ({
+asMock(promptAsync).mockImplementation(() => ({
   filePath: '/google-service-account-key.json',
 }));
 

packages/eas-cli/src/credentials/android/actions/__tests__/CreateKeystore-test.ts

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { jester as mockJester } from '../../../../credentials/__tests__/fixtures-constants';
 import { testKeystore } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -14,7 +15,7 @@ jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn(
 
 describe('CreateKeystore', () => {
   beforeEach(() => {
-    jest.mocked(generateRandomKeystoreAsync).mockReset();
+    asMock(generateRandomKeystoreAsync).mockReset();
   });
   it('creates a keystore in Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: false });
@@ -27,7 +28,7 @@ describe('CreateKeystore', () => {
     expect(generateRandomKeystoreAsync).toHaveBeenCalled();
   });
   it('creates a keystore by uploading', async () => {
-    jest.mocked(askForUserProvidedAsync).mockImplementationOnce(async () => testKeystore);
+    asMock(askForUserProvidedAsync).mockImplementationOnce(() => testKeystore);
     const ctx = createCtxMock({ nonInteractive: false });
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx);
     const createKeystoreAction = new CreateKeystore(appLookupParams.account);

packages/eas-cli/src/credentials/android/actions/__tests__/RemoveFcm-test.ts

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -8,7 +9,7 @@ import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveFcm } from '../RemoveFcm';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemoveFcm, () => {
   it('removes an FCM API Key', async () => {

packages/eas-cli/src/credentials/android/actions/__tests__/RemoveGoogleServiceAccountKey-test.ts

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -7,7 +8,7 @@ import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { RemoveGoogleServiceAccountKey } from '../RemoveGoogleServiceAccountKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemoveGoogleServiceAccountKey, () => {
   it('removes an Google Service Account Key', async () => {

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import { testAndroidBuildCredentialsFragment } from '../../../__tests__/fixtures-android';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -6,7 +7,7 @@ import { RemoveKeystore } from '../RemoveKeystore';
 
 jest.mock('fs-extra');
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemoveKeystore, () => {
   it('removes a keystore', async () => {

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import {
   getNewAndroidApiMock,
   testAndroidBuildCredentialsFragment,
@@ -18,7 +19,7 @@ jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn(
 
 describe('SetUpBuildCredentials', () => {
   beforeEach(() => {
-    jest.mocked(generateRandomKeystoreAsync).mockReset();
+    asMock(generateRandomKeystoreAsync).mockReset();
   });
 
   it('skips setup when there are prior credentials', async () => {

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

@@ -1,5 +1,6 @@
 import { vol } from 'memfs';
 
+import { asMock } from '../../../../__tests__/utils';
 import { AndroidKeystoreType } from '../../../../graphql/generated';
 import { confirmAsync } from '../../../../prompts';
 import {
@@ -12,14 +13,13 @@ import {
   SelectAndroidBuildCredentials,
   SelectAndroidBuildCredentialsResultType,
 } from '../../../manager/SelectAndroidBuildCredentials';
-import { AppLookupParams } from '../../api/GraphqlClient';
 import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { SetUpBuildCredentialsFromCredentialsJson } from '../SetUpBuildCredentialsFromCredentialsJson';
 
 jest.mock('fs');
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 jest.mock('../../../manager/SelectAndroidBuildCredentials');
 
 beforeEach(() => {
@@ -28,7 +28,7 @@ beforeEach(() => {
 
 describe(SetUpBuildCredentialsFromCredentialsJson, () => {
   it('sets up a new build configuration from credentials.json upon user request', async () => {
-    jest.mocked(SelectAndroidBuildCredentials).mockImplementation((() => {
+    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
       return {
         runAsync: () => {
           return {
@@ -37,7 +37,7 @@ describe(SetUpBuildCredentialsFromCredentialsJson, () => {
           };
         },
       };
-    }) as any as (app: AppLookupParams) => SelectAndroidBuildCredentials);
+    });
     const ctx = createCtxMock({
       nonInteractive: false,
       android: {
@@ -78,7 +78,7 @@ describe(SetUpBuildCredentialsFromCredentialsJson, () => {
     expect(ctx.android.createAndroidAppBuildCredentialsAsync).toHaveBeenCalledTimes(1);
   });
   it('uses an existing build configuration upon user request', async () => {
-    jest.mocked(SelectAndroidBuildCredentials).mockImplementation((() => {
+    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
       return {
         runAsync: () => {
           return {
@@ -87,7 +87,7 @@ describe(SetUpBuildCredentialsFromCredentialsJson, () => {
           };
         },
       };
-    }) as any as (app: AppLookupParams) => SelectAndroidBuildCredentials);
+    });
     const ctx = createCtxMock({
       nonInteractive: false,
       android: {

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

@@ -1,5 +1,6 @@
 import { vol } from 'memfs';
 
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -13,7 +14,7 @@ import { SetUpGoogleServiceAccountKey } from '../SetUpGoogleServiceAccountKey';
 
 jest.mock('../../../../prompts');
 jest.mock('fs');
-jest.mocked(promptAsync).mockImplementation(async () => ({
+asMock(promptAsync).mockImplementation(() => ({
   filePath: '/google-service-account-key.json',
 }));
 

packages/eas-cli/src/credentials/android/actions/__tests__/UseExistingGoogleServiceAccountKey-test.ts

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -8,9 +9,7 @@ import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { UseExistingGoogleServiceAccountKey } from '../UseExistingGoogleServiceAccountKey';
 
 jest.mock('../../../../prompts');
-jest
-  .mocked(promptAsync)
-  .mockImplementation(async () => ({ chosenKey: testGoogleServiceAccountKeyFragment }));
+asMock(promptAsync).mockImplementation(() => ({ chosenKey: testGoogleServiceAccountKeyFragment }));
 
 describe(UseExistingGoogleServiceAccountKey, () => {
   it('uses an existing Google Service Account Key in Interactive Mode', async () => {

packages/eas-cli/src/credentials/android/utils/__tests__/googleServiceAccountKey-test.ts

@@ -1,5 +1,6 @@
 import { vol } from 'memfs';
 
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import { detectGoogleServiceAccountKeyPathAsync } from '../googleServiceAccountKey';
 
@@ -24,13 +25,13 @@ afterAll(() => {
 });
 
 afterEach(() => {
-  jest.mocked(promptAsync).mockClear();
-  jest.mocked(confirmAsync).mockClear();
+  asMock(promptAsync).mockClear();
+  asMock(confirmAsync).mockClear();
 });
 
 describe('Google Service Account Key path detection', () => {
   it('detects a single google-services file and prompts for confirmation', async () => {
-    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
+    asMock(confirmAsync).mockResolvedValueOnce(true);
     const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir/subdir');
     expect(confirmAsync).toHaveBeenCalledWith(
       expect.objectContaining({ message: 'Would you like to use this file?' })
@@ -45,7 +46,7 @@ describe('Google Service Account Key path detection', () => {
   });
 
   it('returns null, when user rejects to use detected file', async () => {
-    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
+    asMock(confirmAsync).mockResolvedValueOnce(false);
     const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir/subdir');
     expect(confirmAsync).toHaveBeenCalledTimes(1);
     expect(confirmAsync).toHaveBeenCalledWith(
@@ -55,7 +56,7 @@ describe('Google Service Account Key path detection', () => {
   });
 
   it('displays a chooser, when multiple files are found', async () => {
-    jest.mocked(promptAsync).mockResolvedValueOnce({
+    asMock(promptAsync).mockResolvedValueOnce({
       selectedPath: '/project_dir/another-service-account.json',
     });
     const serviceAccountPath = await detectGoogleServiceAccountKeyPathAsync('/project_dir'); // should find 2 files here
@@ -75,7 +76,7 @@ describe('Google Service Account Key path detection', () => {
   });
 
   it('returns null, when user selects the "None of above"', async () => {
-    jest.mocked(promptAsync).mockResolvedValueOnce({
+    asMock(promptAsync).mockResolvedValueOnce({
       selectedPath: false,
     });
 

packages/eas-cli/src/credentials/android/utils/__tests__/printCredentials-test.ts

@@ -1,5 +1,6 @@
 import mockdate from 'mockdate';
 
+import { asMock } from '../../../../__tests__/utils';
 import Log from '../../../../log';
 import {
   testAndroidAppCredentialsFragment,
@@ -24,9 +25,7 @@ describe('print credentials', () => {
       appLookupParams,
       appCredentials: testAndroidAppCredentialsFragment,
     });
-    const loggedSoFar = jest
-      .mocked(Log.log)
-      .mock.calls.reduce((acc, mockValue) => acc + mockValue.toString(), '');
+    const loggedSoFar = asMock(Log.log).mock.calls.reduce((acc, mockValue) => acc + mockValue);
     expect(loggedSoFar).toMatchSnapshot();
   });
 });

packages/eas-cli/src/credentials/android/utils/googleServiceAccountKey.ts

@@ -20,7 +20,7 @@ function fileIsServiceAccountKey(keyJsonPath: string): boolean {
   try {
     readAndValidateServiceAccountKey(keyJsonPath);
     return true;
-  } catch {
+  } catch (err: any) {
     return false;
   }
 }

packages/eas-cli/src/credentials/android/utils/keystore.ts

@@ -24,7 +24,7 @@ export async function keytoolCommandExistsAsync(): Promise<boolean> {
   try {
     await spawnAsync('keytool');
     return true;
-  } catch {
+  } catch (error) {
     return false;
   }
 }

packages/eas-cli/src/credentials/android/utils/keystoreNew.ts

@@ -24,7 +24,7 @@ function isPKCSKeystore(keystore: Keystore): boolean {
   try {
     parsePKCS12(keystore.keystore, keystore.keystorePassword);
     return true;
-  } catch {
+  } catch (e) {
     return false;
   }
 }
@@ -33,7 +33,7 @@ function isJKSKeystore(keystore: Keystore): boolean {
   try {
     jks.parseJks(Buffer.from(keystore.keystore, 'base64'), keystore.keystorePassword);
     return true;
-  } catch {
+  } catch (e) {
     return false;
   }
 }

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

@@ -1,4 +1,4 @@
-import { ExpoConfig } from '@expo/config';
+import { ExpoConfig, getConfig } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
 
@@ -50,7 +50,7 @@ export class CredentialsContext {
   ): ExpoConfig | null {
     try {
       return getExpoConfig(projectDir, { env });
-    } catch {
+    } catch (error) {
       // ignore error, context might be created outside of expo project
       return null;
     }
@@ -70,7 +70,7 @@ export class CredentialsContext {
       return;
     }
     // trigger getConfig error
-    getExpoConfig(this.options.projectDir);
+    getConfig(this.options.projectDir, { skipSDKVersionRequirement: true });
   }
 
   public logOwnerAndProject(): void {

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

@@ -2,6 +2,7 @@ import fs from 'fs-extra';
 import { vol } from 'memfs';
 import prompts from 'prompts';
 
+import { asMock } from '../../../__tests__/utils';
 import { IosDistributionType } from '../../../graphql/generated';
 import {
   testKeystore,
@@ -24,8 +25,8 @@ jest.mock('prompts');
 describe('update credentials.json', () => {
   beforeEach(() => {
     vol.reset();
-    jest.mocked(prompts).mockReset();
-    jest.mocked(prompts).mockImplementation(() => {
+    asMock(prompts).mockReset();
+    asMock(prompts).mockImplementation(() => {
       throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
     });
   });
@@ -175,7 +176,6 @@ describe('update credentials.json', () => {
       {
         targetName: 'testapp',
         bundleIdentifier: 'com.bundle.id',
-        entitlements: {},
       },
     ];
 

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

@@ -114,7 +114,7 @@ export async function readRawAsync(
   try {
     const credentialsJSONContents = await fs.readFile(credentialsJsonFilePath, 'utf8');
     return JSON.parse(credentialsJSONContents);
-  } catch {
+  } catch (err) {
     throw new Error(
       `credentials.json must exist in the project root directory and contain a valid JSON`
     );

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

@@ -11,6 +11,7 @@ import { ensureAllTargetsAreConfigured } from '../credentialsJson/utils';
 import { getAppFromContext } from './actions/BuildCredentialsUtils';
 import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
 import { SetUpPushKey } from './actions/SetUpPushKey';
+import { IosCapabilitiesOptions } from './appstore/ensureAppExists';
 import { App, IosCredentials, Target } from './types';
 import { isAdHocProfile } from './utils/provisioningProfile';
 
@@ -19,6 +20,7 @@ interface Options {
   targets: Target[];
   distribution: DistributionType;
   enterpriseProvisioning?: IosEnterpriseProvisioning;
+  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
 
 export default class IosCredentialsProvider {
@@ -61,6 +63,7 @@ export default class IosCredentialsProvider {
       targets: this.options.targets,
       distribution: this.options.distribution,
       enterpriseProvisioning: this.options.enterpriseProvisioning,
+      iosCapabilitiesOptions: this.options.iosCapabilitiesOptions,
     }).runAsync(this.ctx);
   }
 

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

@@ -58,13 +58,7 @@ describe(IosCredentialsProvider, () => {
             },
             projectName: appLookupParams.projectName,
           },
-          targets: [
-            {
-              targetName: 'testapp',
-              bundleIdentifier: appLookupParams.bundleIdentifier,
-              entitlements: {},
-            },
-          ],
+          targets: [{ targetName: 'testapp', bundleIdentifier: appLookupParams.bundleIdentifier }],
           distribution: 'store',
         });
         await expect(provider.getCredentialsAsync(CredentialsSource.REMOTE)).rejects.toThrowError(
@@ -101,13 +95,7 @@ describe(IosCredentialsProvider, () => {
             },
             projectName: appLookupParams.projectName,
           },
-          targets: [
-            {
-              targetName: 'testapp',
-              bundleIdentifier: appLookupParams.bundleIdentifier,
-              entitlements: {},
-            },
-          ],
+          targets: [{ targetName: 'testapp', bundleIdentifier: appLookupParams.bundleIdentifier }],
           distribution: 'store',
         });
 

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

@@ -4,6 +4,7 @@ import nullthrows from 'nullthrows';
 
 import Log from '../../../log';
 import { CredentialsContext } from '../../context';
+import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
 import { App, IosAppBuildCredentialsMap, IosCredentials, Target } from '../types';
 import { displayProjectCredentials } from '../utils/printCredentials';
 import { SetUpTargetBuildCredentials } from './SetUpTargetBuildCredentials';
@@ -13,6 +14,7 @@ interface Options {
   targets: Target[];
   distribution: DistributionType;
   enterpriseProvisioning?: IosEnterpriseProvisioning;
+  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
 
 export class SetUpBuildCredentials {
@@ -48,9 +50,7 @@ export class SetUpBuildCredentials {
         Log.newLine();
       }
       const action = new SetUpTargetBuildCredentials({
-        enterpriseProvisioning: this.options.enterpriseProvisioning,
-        distribution: this.options.distribution,
-        entitlements: target.entitlements,
+        ...this.options,
         app: {
           ...this.options.app,
           bundleIdentifier: target.bundleIdentifier,

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

@@ -1,5 +1,4 @@
 import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
-import { JSONObject } from '@expo/json-file';
 
 import {
   IosDistributionType as GraphQLIosDistributionType,
@@ -8,6 +7,7 @@ import {
 import Log from '../../../log';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams as GraphQLAppLookupParams } from '../api/GraphqlClient';
+import { IosCapabilitiesOptions } from '../appstore/ensureAppExists';
 import { SetUpAdhocProvisioningProfile } from './SetUpAdhocProvisioningProfile';
 import { SetUpInternalProvisioningProfile } from './SetUpInternalProvisioningProfile';
 import { SetUpProvisioningProfile } from './SetUpProvisioningProfile';
@@ -16,13 +16,13 @@ interface Options {
   app: GraphQLAppLookupParams;
   distribution: DistributionType;
   enterpriseProvisioning?: IosEnterpriseProvisioning;
-  entitlements: JSONObject;
+  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
 export class SetUpTargetBuildCredentials {
   constructor(private options: Options) {}
 
   async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
-    const { app, entitlements } = this.options;
+    const { app, iosCapabilitiesOptions } = this.options;
 
     await ctx.bestEffortAppStoreAuthenticateAsync();
 
@@ -33,7 +33,7 @@ export class SetUpTargetBuildCredentials {
           bundleIdentifier: app.bundleIdentifier,
           projectName: app.projectName,
         },
-        { entitlements }
+        iosCapabilitiesOptions
       );
     }
     try {

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -17,8 +18,8 @@ function enumKeys<O extends object, K extends keyof O = keyof O>(obj: O): K[] {
 }
 
 afterEach(() => {
-  jest.mocked(promptAsync).mockClear();
-  jest.mocked(getCredentialsFromUserAsync).mockClear();
+  asMock(promptAsync).mockClear();
+  asMock(getCredentialsFromUserAsync).mockClear();
 });
 
 describe(getAscApiKeyName, () => {
@@ -34,10 +35,10 @@ describe(getAscApiKeyName, () => {
 
 describe(promptForAscApiKeyPathAsync, () => {
   it('prompts for keyId, keyP8Path and issuerId when user is not authenticated to Apple', async () => {
-    jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+    asMock(promptAsync).mockImplementationOnce(() => ({
       keyP8Path: '/asc-api-key.p8',
     }));
-    jest.mocked(getCredentialsFromUserAsync).mockImplementation(async () => ({
+    asMock(getCredentialsFromUserAsync).mockImplementation(() => ({
       keyId: 'test-key-id',
       issuerId: 'test-issuer-id',
     }));
@@ -61,10 +62,10 @@ describe(promptForAscApiKeyPathAsync, () => {
     expect(getCredentialsFromUserAsync).toHaveBeenCalledTimes(2); // keyId, issuerId
   });
   it('prompts for keyId, keyP8Path and detects issuerId when user is authenticated to Apple', async () => {
-    jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+    asMock(promptAsync).mockImplementationOnce(() => ({
       keyP8Path: '/asc-api-key.p8',
     }));
-    jest.mocked(getCredentialsFromUserAsync).mockImplementation(async () => ({
+    asMock(getCredentialsFromUserAsync).mockImplementation(() => ({
       keyId: 'test-key-id',
     }));
     const ctx = createCtxMock({
@@ -84,6 +85,6 @@ describe(promptForAscApiKeyPathAsync, () => {
     });
     expect(promptAsync).toHaveBeenCalledTimes(1); // keyP8Path
     expect(getCredentialsFromUserAsync).toHaveBeenCalledTimes(1); // keyId
-    expect(jest.mocked(ctx.appStore.getAscApiKeyAsync).mock.calls.length).toBe(1); // issuerId
+    expect(asMock(ctx.appStore.getAscApiKeyAsync).mock.calls.length).toBe(1); // issuerId
   });
 });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -14,7 +15,7 @@ import { ConfigureProvisioningProfile } from '../ConfigureProvisioningProfile';
 
 jest.mock('../../../../ora');
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe('ConfigureProvisioningProfile', () => {
   it('configures a Provisioning Profile in Interactive Mode', async () => {
@@ -42,9 +43,9 @@ describe('ConfigureProvisioningProfile', () => {
     await provProfConfigurator.runAsync(ctx);
 
     // expect provisioning profile not to be updated on expo servers
-    expect(jest.mocked(ctx.ios.updateProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.updateProvisioningProfileAsync).mock.calls.length).toBe(1);
     // expect provisioning profile not to be updated on apple portal
-    expect(jest.mocked(ctx.appStore.useExistingProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.useExistingProvisioningProfileAsync).mock.calls.length).toBe(1);
   });
   it('errors in Non Interactive Mode', async () => {
     const ctx = createCtxMock({
@@ -61,8 +62,8 @@ describe('ConfigureProvisioningProfile', () => {
     );
 
     // expect provisioning profile not to be updated on expo servers
-    expect(jest.mocked(ctx.ios.updateProvisioningProfileAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.updateProvisioningProfileAsync).mock.calls.length).toBe(0);
     // expect provisioning profile not to be updated on apple portal
-    expect(jest.mocked(ctx.appStore.useExistingProvisioningProfileAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.appStore.useExistingProvisioningProfileAsync).mock.calls.length).toBe(0);
   });
 });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -8,7 +9,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { CreateAscApiKey } from '../CreateAscApiKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(CreateAscApiKey, () => {
   it('creates a App Store API Key in Interactive Mode', async () => {
@@ -26,9 +27,9 @@ describe(CreateAscApiKey, () => {
     await createAscApiKeyAction.runAsync(ctx, AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
 
     // expect api key to be created on expo servers
-    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(1);
     // expect api key to be created on apple portal
-    expect(jest.mocked(ctx.appStore.createAscApiKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.createAscApiKeyAsync).mock.calls.length).toBe(1);
   });
   it('errors in Non Interactive Mode', async () => {
     const ctx = createCtxMock({

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -12,7 +13,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { CreateProvisioningProfile } from '../CreateProvisioningProfile';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe('CreateProvisioningProfile', () => {
   it('creates a Provisioning Profile in Interactive Mode', async () => {
@@ -33,9 +34,9 @@ describe('CreateProvisioningProfile', () => {
     await createProvProfAction.runAsync(ctx);
 
     // expect provisioning profile to be created on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be created on apple portal
-    expect(jest.mocked(ctx.appStore.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.createProvisioningProfileAsync).mock.calls.length).toBe(1);
   });
   it('errors in Non Interactive Mode', async () => {
     const ctx = createCtxMock({
@@ -51,8 +52,8 @@ describe('CreateProvisioningProfile', () => {
     );
 
     // expect provisioning profile not to be created on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
     // expect provisioning profile not to be created on apple portal
-    expect(jest.mocked(ctx.appStore.createProvisioningProfileAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.appStore.createProvisioningProfileAsync).mock.calls.length).toBe(0);
   });
 });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -7,7 +8,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { CreatePushKey } from '../CreatePushKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(CreatePushKey, () => {
   it('creates a Push Key in Interactive Mode', async () => {
@@ -24,9 +25,9 @@ describe(CreatePushKey, () => {
     await createPushKeyAction.runAsync(ctx);
 
     // expect push key to be created on expo servers
-    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(1);
     // expect push key to be created on apple portal
-    expect(jest.mocked(ctx.appStore.createPushKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.createPushKeyAsync).mock.calls.length).toBe(1);
   });
   it('errors in Non Interactive Mode', async () => {
     const ctx = createCtxMock({

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

@@ -1,10 +1,11 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testAscApiKeyFragment } from '../../../__tests__/fixtures-ios';
 import { RemoveAscApiKey } from '../RemoveAscApiKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemoveAscApiKey, () => {
   it('removes an Asc API Key', async () => {

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -10,7 +11,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { RemoveDistributionCertificate } from '../RemoveDistributionCertificate';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe('RemoveDistributionCertificate', () => {
   it('deletes the distribution certificate on Expo and Apple servers when there are no App Dependencies in Interactive Mode', async () => {
@@ -23,11 +24,11 @@ describe('RemoveDistributionCertificate', () => {
     await removeDistCertAction.runAsync(ctx);
 
     // expect dist cert to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect dist cert to be deleted on apple portal
-    expect(jest.mocked(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile deletion to be skipped because there arent any associated with the dist cert
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
   });
   it('deletes the distribution certificate on Expo servers when there are no App Dependencies in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });
@@ -39,11 +40,11 @@ describe('RemoveDistributionCertificate', () => {
     await removeDistCertAction.runAsync(ctx);
 
     // expect dist cert to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
     // not supported in non-interactive mode
-    expect(jest.mocked(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(0);
     // expect provisioning profile deletion to be skipped because there arent any associated with the dist cert
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
   });
   it('deletes the distribution certificate and its provisioning profile on Expo and Apple servers when there are App Dependencies in Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: false });
@@ -55,11 +56,11 @@ describe('RemoveDistributionCertificate', () => {
     await removeDistCertAction.runAsync(ctx);
 
     // expect dist cert to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect dist cert to be deleted on apple portal
-    expect(jest.mocked(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile deletion to be invoked on expo servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
   });
   it('errors when the distribution certificate has App Dependencies in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testTargets } from '../../../__tests__/fixtures-ios';
@@ -19,6 +20,6 @@ describe('RemoveProvisioningProfile', () => {
     await removeProfilesAction.runAsync(ctx);
 
     // expect provisioning profile to be deleted from servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
   });
 });

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

@@ -1,10 +1,11 @@
+import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testPushKey } from '../../../__tests__/fixtures-ios';
 import { RemovePushKey } from '../RemovePushKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(RemovePushKey, () => {
   it('deletes the push key on Expo and Apple servers in Interactive Mode', async () => {
@@ -13,9 +14,9 @@ describe(RemovePushKey, () => {
     await removePushKeyAction.runAsync(ctx);
 
     // expect push key to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deletePushKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deletePushKeyAsync).mock.calls.length).toBe(1);
     // expect push key to be revoked on apple portal
-    expect(jest.mocked(ctx.appStore.revokePushKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.appStore.revokePushKeyAsync).mock.calls.length).toBe(1);
   });
   it('errors in Non-Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: true });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -14,7 +15,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { SetUpAscApiKey, SetupAscApiKeyChoice } from '../SetUpAscApiKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(SetUpAscApiKey, () => {
   it('skips setting up a ASC API Key if it is already configured', async () => {
@@ -35,9 +36,9 @@ describe(SetUpAscApiKey, () => {
     await setupAscApiKeyAction.runAsync(ctx);
 
     // expect not to create a new ASC API Key on expo servers
-    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
     // expect configuration not to be updated with a new ASC API Key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(0);
   });
   it('sets up a ASC API Key, creating a new one if there are no existing ASC API Keys', async () => {
     const ctx = createCtxMock({
@@ -60,9 +61,9 @@ describe(SetUpAscApiKey, () => {
     await setupAscApiKeyAction.runAsync(ctx);
 
     // expect to create a new ASC API Key on expo servers
-    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(1);
     // expect configuration to be updated with a new ASC API Key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
   });
   it('sets up a ASC API Key, use autoselected ASC API Key when there are existing keys', async () => {
     const ctx = createCtxMock({
@@ -86,9 +87,9 @@ describe(SetUpAscApiKey, () => {
     await setupAscApiKeyAction.runAsync(ctx);
 
     // expect not to create a new ASC API Key on expo servers, we are using the existing one
-    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
     // expect configuration to be updated with a new ASC API Key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
   });
   it('sets up a ASC API Key, allowing user to choose existing keys', async () => {
     const ctx = createCtxMock({
@@ -98,7 +99,7 @@ describe(SetUpAscApiKey, () => {
         getAscApiKeysForAccountAsync: jest.fn(() => [testAscApiKeyFragment]),
       },
     });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
+    asMock(promptAsync).mockImplementation(() => ({
       choice: SetupAscApiKeyChoice.USE_EXISTING,
       chosenAscApiKey: testAscApiKeyFragment,
     }));
@@ -110,9 +111,9 @@ describe(SetUpAscApiKey, () => {
     await setupAscApiKeyAction.runAsync(ctx);
 
     // expect not to create a new ASC API Key on expo servers, we are using the existing one
-    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
     // expect configuration to be updated with a new ASC API Key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
   });
   it('works in Non Interactive Mode if ASC Key is configured', async () => {
     const ctx = createCtxMock({

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { IosAppBuildCredentialsFragment, IosDistributionType } from '../../../../graphql/generated';
 import { promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -13,10 +14,10 @@ jest.mock('../SetUpProvisioningProfile');
 jest.mock('../BuildCredentialsUtils', () => ({ getAllBuildCredentialsAsync: jest.fn() }));
 
 beforeEach(() => {
-  jest.mocked(promptAsync).mockReset();
+  asMock(promptAsync).mockReset();
 
-  jest.mocked(getAllBuildCredentialsAsync).mockReset();
-  jest.mocked(getAllBuildCredentialsAsync).mockImplementation(() => {
+  asMock(getAllBuildCredentialsAsync).mockReset();
+  asMock(getAllBuildCredentialsAsync).mockImplementation(() => {
     throw new Error(
       `unhandled getAllBuildCredentialsAsync call - this shouldn't happen - fix tests!`
     );
@@ -36,7 +37,7 @@ describe(SetUpInternalProvisioningProfile, () => {
   describe('interactive mode', () => {
     describe('when authenticated with apple', () => {
       it('runs the SetUpAdhocProvisioningProfile action for non-enterprise team', async () => {
-        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [];
           return buildCredentials;
         });
@@ -63,10 +64,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('asks the user for an action to run when they have access to an enterprise team', async () => {
-        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+        asMock(promptAsync).mockImplementationOnce(() => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [];
           return buildCredentials;
         });
@@ -98,10 +99,10 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
     describe('when not authenticated with apple', () => {
       it('asks the user for an action to run when both adhoc and universal distribution credentials exist', async () => {
-        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+        asMock(promptAsync).mockImplementationOnce(() => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [
             testAdhocBuildCredentials,
             testEnterpriseBuildCredentials,
@@ -132,10 +133,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('runs the SetUpAdhocProvisioningProfile action when adhoc credentials exist', async () => {
-        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+        asMock(promptAsync).mockImplementationOnce(() => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [testAdhocBuildCredentials];
           return buildCredentials;
         });
@@ -163,10 +164,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('runs the SetUpProvisioningProfile action when enterprise credentials exist', async () => {
-        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+        asMock(promptAsync).mockImplementationOnce(() => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [
             testEnterpriseBuildCredentials,
           ];
@@ -196,10 +197,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('forces the apple authentication when neither adhoc nor enterprise credentials exist', async () => {
-        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
+        asMock(promptAsync).mockImplementationOnce(() => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [];
           return buildCredentials;
         });
@@ -227,7 +228,7 @@ describe(SetUpInternalProvisioningProfile, () => {
 
   describe('non-interactive mode', () => {
     it('throws an error when both adhoc and enterprise credentials are set up', async () => {
-      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [
           testAdhocBuildCredentials,
           testEnterpriseBuildCredentials,
@@ -248,7 +249,7 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
 
     it('throws an error when neither adhoc nor enterprise credentials are set up', async () => {
-      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [];
         return buildCredentials;
       });
@@ -264,7 +265,7 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
 
     it('runs the SetUpAdhocProvisioningProfile action when adhoc credentials exist', async () => {
-      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [testAdhocBuildCredentials];
         return buildCredentials;
       });
@@ -286,7 +287,7 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
 
     it('runs the SetUpProvisioningProfile action when enterprise credentials exist', async () => {
-      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
+      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [testEnterpriseBuildCredentials];
         return buildCredentials;
       });

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

@@ -1,5 +1,6 @@
 import nullthrows from 'nullthrows';
 
+import { asMock } from '../../../../__tests__/utils';
 import { IosDistributionType } from '../../../../graphql/generated';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
@@ -18,7 +19,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { SetUpProvisioningProfile } from '../SetUpProvisioningProfile';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 jest.mock('../SetUpDistributionCertificate');
 jest.mock('../ConfigureProvisioningProfile');
 jest.mock('../CreateProvisioningProfile');
@@ -26,7 +27,7 @@ jest.mock('../../validators/validateProvisioningProfile');
 
 describe('SetUpProvisioningProfile', () => {
   it('repairs existing Provisioning Profile with bad build credentials in Interactive Mode', async () => {
-    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
+    asMock(validateProvisioningProfileAsync).mockImplementation(() => false);
     const ctx = createCtxMock({
       nonInteractive: false,
       appStore: {
@@ -60,14 +61,12 @@ describe('SetUpProvisioningProfile', () => {
     await setupProvisioningProfileAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      1
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
     // expect provisioning profile not to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
   });
   it('sets up a new Provisioning Profile with bad build credentials in Interactive Mode', async () => {
-    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
+    asMock(validateProvisioningProfileAsync).mockImplementation(() => false);
     const ctx = createCtxMock({
       nonInteractive: false,
       appStore: {
@@ -92,14 +91,12 @@ describe('SetUpProvisioningProfile', () => {
     await setupProvisioningProfileAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      1
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
   });
   it('skips setting up a Provisioning Profile with prior build credentials configured properly in Interactive Mode', async () => {
-    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => true);
+    asMock(validateProvisioningProfileAsync).mockImplementation(() => true);
     const ctx = createCtxMock({
       nonInteractive: false,
       appStore: {
@@ -124,14 +121,12 @@ describe('SetUpProvisioningProfile', () => {
     await setupProvisioningProfileAction.runAsync(ctx);
 
     // expect build credentials not to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      0
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(0);
     // expect provisioning profile not to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
   });
   it('sets up a Provisioning Profile with no prior build credentials configured in Interactive Mode', async () => {
-    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
+    asMock(validateProvisioningProfileAsync).mockImplementation(() => false);
     const ctx = createCtxMock({
       nonInteractive: false,
       appStore: {
@@ -152,14 +147,12 @@ describe('SetUpProvisioningProfile', () => {
     await setupProvisioningProfileAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      1
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
     // expect provisioning profile not to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
   });
   it('errors in Non Interactive Mode', async () => {
-    jest.mocked(validateProvisioningProfileAsync).mockImplementation(async () => false);
+    asMock(validateProvisioningProfileAsync).mockImplementation(() => false);
     const ctx = createCtxMock({
       nonInteractive: true,
     });
@@ -173,10 +166,8 @@ describe('SetUpProvisioningProfile', () => {
     );
 
     // expect build credentials not to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      0
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(0);
     // expect provisioning profile not to be deleted on expo servers
-    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
   });
 });

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -7,7 +8,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { SetUpPushKey } from '../SetUpPushKey';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(SetUpPushKey, () => {
   it('skips setting up a Push Key if it is already configured', async () => {
@@ -23,9 +24,9 @@ describe(SetUpPushKey, () => {
     await setupPushKeyAction.runAsync(ctx);
 
     // expect not to create a new push key on expo servers
-    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
     // expect configuration not to be updated with a new push key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(0);
   });
   it('sets up a Push Key, creating a new one if there are no existing push keys', async () => {
     const ctx = createCtxMock({
@@ -41,9 +42,9 @@ describe(SetUpPushKey, () => {
     await setupPushKeyAction.runAsync(ctx);
 
     // expect to create a new push key on expo servers
-    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(1);
     // expect configuration to be updated with a new push key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
   });
   it('sets up a Push Key, use autoselected push key when there are existing keys', async () => {
     const ctx = createCtxMock({
@@ -65,9 +66,9 @@ describe(SetUpPushKey, () => {
     await setupPushKeyAction.runAsync(ctx);
 
     // expect not to create a new push key on expo servers, we are using the existing one
-    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
     // expect configuration not to be updated with a new push key
-    expect(jest.mocked(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
   });
   it('errors in Non Interactive Mode', async () => {
     const ctx = createCtxMock({

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -14,16 +15,15 @@ import {
 } from '../SetUpSubmissionCredentials';
 
 jest.mock('../../../../prompts');
-jest.mocked(confirmAsync).mockImplementation(async () => true);
+asMock(confirmAsync).mockImplementation(() => true);
 
 describe(SetUpSubmissionCredentials, () => {
   it('allows user to enter an App Specific Password', async () => {
-    jest
-      .mocked(promptAsync)
-      .mockImplementationOnce(async () => ({
+    asMock(promptAsync)
+      .mockImplementationOnce(() => ({
         choice: PROMPT_FOR_APP_SPECIFIC_PASSWORD,
       }))
-      .mockImplementationOnce(async () => ({
+      .mockImplementationOnce(() => ({
         appSpecificPassword: 'super secret',
       }));
     const ctx = createCtxMock({
@@ -37,7 +37,7 @@ describe(SetUpSubmissionCredentials, () => {
     const asp = await setupAscApiKeyAction.runAsync(ctx);
 
     // prompt to choose ASP, then prompt to input ASP
-    expect(jest.mocked(promptAsync).mock.calls.length).toBe(2);
+    expect(asMock(promptAsync).mock.calls.length).toBe(2);
     expect(asp).toBe('super secret');
   });
   it('returns an ASC API key', async () => {

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

@@ -1,3 +1,4 @@
+import { asMock } from '../../../../__tests__/utils';
 import { IosDistributionType } from '../../../../graphql/generated';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
@@ -20,8 +21,8 @@ jest.mock('../../../../prompts');
 jest.mock('../../../credentialsJson/read');
 
 beforeEach(() => {
-  jest.mocked(confirmAsync).mockReset();
-  jest.mocked(confirmAsync).mockImplementation(async () => true);
+  asMock(confirmAsync).mockReset();
+  asMock(confirmAsync).mockImplementation(() => true);
 });
 
 describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
@@ -60,13 +61,11 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect build credentials not to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      0
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(0);
     // expect distribution certificate not to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(0);
     // expect provisioning profile not to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
+    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
   });
   it('sets up build credentials with no prior configuration in Interactive Mode', async () => {
     const ctx = createCtxMock({
@@ -91,13 +90,11 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      1
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
     // expect distribution certificate to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
   });
   it('sets up build credentials with different prior configuration in Interactive Mode', async () => {
     // create deep clone the quick and dirty way
@@ -126,13 +123,11 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      1
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
     // expect distribution certificate to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
   });
   it('works in Non Interactive Mode - sets up build credentials with different prior configuration', async () => {
     // create deep clone the quick and dirty way
@@ -162,14 +157,12 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect no prompts to be called
-    expect(jest.mocked(confirmAsync).mock.calls.length).toBe(0);
+    expect(asMock(confirmAsync).mock.calls.length).toBe(0);
     // expect build credentials to be created or updated on expo servers
-    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
-      1
-    );
+    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
     // expect distribution certificate to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be uploaded on expo servers
-    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
   });
 });

packages/eas-cli/src/credentials/ios/appstore/__tests__/ascApiKey-test.ts

@@ -1,5 +1,6 @@
 import { ApiKey, ApiKeyType, UserRole } from '@expo/apple-utils';
 
+import { asMock } from '../../../../__tests__/utils';
 import {
   createAscApiKeyAsync,
   getAscApiKeyAsync,
@@ -56,7 +57,7 @@ beforeEach(() => {
 test(`listAscApiKeysAsync`, async () => {
   const mockRequestContext = {};
   jest.spyOn(ApiKey, 'getAsync').mockImplementation(async () => []);
-  jest.mocked(getRequestContext).mockImplementation(() => mockRequestContext);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
   const result = await listAscApiKeysAsync(mockAuthCtx);
   expect(ApiKey.getAsync).toHaveBeenLastCalledWith(mockRequestContext);
   expect(result).toEqual([]);
@@ -65,7 +66,7 @@ test(`listAscApiKeysAsync`, async () => {
 test(`getAscApiKeyAsync`, async () => {
   const mockRequestContext = {};
   jest.spyOn(ApiKey, 'infoAsync').mockImplementation(async () => mockApiKey);
-  jest.mocked(getRequestContext).mockImplementation(() => mockRequestContext);
+  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);
@@ -74,7 +75,7 @@ test(`getAscApiKeyAsync`, async () => {
 test(`createAscApiKeyAsync`, async () => {
   const mockRequestContext = {};
   jest.spyOn(ApiKey, 'createAsync').mockImplementation(async () => mockApiKey);
-  jest.mocked(getRequestContext).mockImplementation(() => mockRequestContext);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
   const result = await createAscApiKeyAsync(mockAuthCtx, { nickname: 'test-name' });
   expect(ApiKey.createAsync).toHaveBeenLastCalledWith(mockRequestContext, {
     nickname: 'test-name',
@@ -88,7 +89,7 @@ test(`createAscApiKeyAsync`, async () => {
 test(`revokeAscApiKeyAsync`, async () => {
   const mockRequestContext = {};
   jest.spyOn(ApiKey, 'infoAsync').mockImplementation(async () => mockApiKey);
-  jest.mocked(getRequestContext).mockImplementation(() => mockRequestContext);
+  asMock(getRequestContext).mockImplementation(() => mockRequestContext);
   const result = await revokeAscApiKeyAsync(mockAuthCtx, 'test-key-id');
   expect(ApiKey.infoAsync).toHaveBeenLastCalledWith(mockRequestContext, {
     id: 'test-key-id',

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

@@ -18,43 +18,6 @@ describe(assertValidOptions, () => {
 });
 
 describe(syncCapabilitiesForEntitlementsAsync, () => {
-  it(`does not disable associated domains when MDM managed domains is active`, async () => {
-    const ctx = { providerId: 123195, teamId: 'MyteamId' };
-    // https://forums.expo.dev/t/eas-build-failed-on-ios-associated-domains-capability/61662/5
-    const capabilities = [
-      {
-        id: 'U78L9459DG_MDM_MANAGED_ASSOCIATED_DOMAINS',
-        attributes: {
-          ownerType: 'BUNDLE',
-          settings: null,
-          editable: true,
-          inputs: null,
-          enabled: true,
-          responseId: '77eb74ad-7c24-48de-9d35-1fabb4c5afd9',
-        },
-      },
-    ].map(({ id, attributes }) => new BundleIdCapability(ctx, id, attributes as any));
-
-    const entitlements = {
-      'com.apple.developer.associated-domains': ['applinks:packagename.fr'],
-    };
-
-    const bundleId = {
-      getBundleIdCapabilitiesAsync: jest.fn(() => capabilities),
-      updateBundleIdCapabilityAsync: jest.fn(),
-      id: 'XXX',
-    } as any;
-
-    await syncCapabilitiesForEntitlementsAsync(bundleId, entitlements);
-
-    expect(bundleId.updateBundleIdCapabilityAsync).toBeCalledWith([
-      {
-        capabilityType: 'ASSOCIATED_DOMAINS',
-        option: 'ON',
-      },
-    ]);
-  });
-
   it('enables all capabilities', async () => {
     const bundleId = {
       getBundleIdCapabilitiesAsync: jest.fn(() => []),

packages/eas-cli/src/credentials/ios/appstore/__tests__/resolveCredentials-test.ts

@@ -1,5 +1,6 @@
 import { vol } from 'memfs';
 
+import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import { AppleTeamType } from '../authenticateTypes';
 import { resolveAppleTeamAsync, resolveAscApiKeyAsync } from '../resolveCredentials';
@@ -16,7 +17,7 @@ const testAscApiKey = {
 beforeEach(() => {
   vol.reset();
   process.env = {};
-  jest.mocked(promptAsync).mockReset();
+  asMock(promptAsync).mockReset();
 });
 
 describe(resolveAscApiKeyAsync, () => {
@@ -43,7 +44,7 @@ describe(resolveAscApiKeyAsync, () => {
     vol.fromJSON({
       '/test-asc-key.p8': testAscApiKey.keyP8,
     });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
+    asMock(promptAsync).mockImplementation(() => ({
       ascApiKeyPath: '/test-asc-key.p8',
       ascIssuerId: testAscApiKey.issuerId,
       ascApiKeyId: testAscApiKey.keyId,
@@ -77,7 +78,7 @@ describe(resolveAppleTeamAsync, () => {
     });
   });
   it(`prompts the user if it can't find anything else`, async () => {
-    jest.mocked(promptAsync).mockImplementation(async () => ({
+    asMock(promptAsync).mockImplementation(() => ({
       appleTeamId: testTeam.teamId,
       appleTeamType: testTeam.teamType,
     }));

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

@@ -1,14 +1,11 @@
 import { IOSConfig, compileModsAsync } from '@expo/config-plugins';
+import { Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
 import { getPrebuildConfigAsync } from '@expo/prebuild-config';
 
-import { readPlistAsync } from '../../utils/plist';
+import { readPlistAsync } from '../../../utils/plist';
 
-interface Target {
-  buildConfiguration?: string;
-  targetName: string;
-}
-export async function getManagedApplicationTargetEntitlementsAsync(
+export async function getManagedEntitlementsJsonAsync(
   projectDir: string,
   env: Record<string, string>
 ): Promise<JSONObject> {
@@ -31,11 +28,22 @@ export async function getManagedApplicationTargetEntitlementsAsync(
   }
 }
 
-export async function getNativeTargetEntitlementsAsync(
+export async function resolveEntitlementsJsonAsync(
   projectDir: string,
-  target: Target
-): Promise<JSONObject | null> {
-  const entitlementsPath = IOSConfig.Entitlements.getEntitlementsPath(projectDir, target);
+  workflow: Workflow,
+  env: Record<string, string>
+): Promise<JSONObject> {
+  if (workflow === Workflow.GENERIC) {
+    return (await getEntitlementsJsonAsync(projectDir)) || {};
+  } else if (workflow === Workflow.MANAGED) {
+    return await getManagedEntitlementsJsonAsync(projectDir, env);
+  } else {
+    throw new Error(`Unknown workflow: ${workflow}`);
+  }
+}
+
+async function getEntitlementsJsonAsync(projectDir: string): Promise<JSONObject | null> {
+  const entitlementsPath = IOSConfig.Paths.getEntitlementsPath(projectDir);
   if (entitlementsPath) {
     const plist = await readPlistAsync(entitlementsPath);
     return plist ? (plist as unknown as JSONObject) : null;

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

@@ -1,5 +1,3 @@
-import { JSONObject } from '@expo/json-file';
-
 import {
   CommonIosAppCredentialsFragment,
   IosAppBuildCredentialsFragment,
@@ -16,7 +14,6 @@ export interface Target {
   buildConfiguration?: string;
   bundleIdentifier: string;
   parentBundleIdentifier?: string;
-  entitlements: JSONObject;
 }
 
 export interface TargetCredentials {

packages/eas-cli/src/credentials/ios/utils/__tests__/__snapshots__/printCredentials-test.ts.snap

@@ -1,7 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`print credentials prints the IosAppCredentials map 1`] = `
-"iOS Credentials            
+Array [
+  "iOS Credentials            
 Project                    @quinlanj/test52
 Bundle Identifier          com.quinlanj.test52
 Apple Team                 test-apple-identifier 
@@ -50,5 +51,6 @@ Status                     active
 Expiration                 Wed, 13 Oct 2021 18:28:44 UTC
 Apple Team                 test-apple-identifier 
 Updated                    5 months ago
-                           "
+                           ",
+]
 `;