functions start

* [eas-cli] Support target specific entitlements

* reiview feedback

* fix tests

* review feedback

* update CHANGELOG.md

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: "\U0001F41B Bug Report in EAS CLI"
-labels: 'bug'
+labels: 'needs review'
 description: 'You want to report a reproducible bug or regression in EAS CLI.'
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,5 +1,5 @@
 name: "\U0001F64B Enhancement"
-labels: 'enhancement'
+labels: 'enhancement,needs review'
 description: 'Want us to add something to EAS CLI?'
 body:
   - type: markdown

.github/workflows/stale-issues.yml

@@ -0,0 +1,24 @@
+name: Close inactive issues
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v4
+        with:
+          ascending: false
+          operations-per-run: 300
+          days-before-issue-stale: 30
+          days-before-issue-close: 7
+          stale-issue-label: "stale"
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity. If there is no activity in the next 7 days, the issue will be closed."
+          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale. Please open a new issue if you believe you are encountering a related problem."
+          days-before-pr-stale: -1
+          days-before-pr-close: -1
+          enable-statistics: true
+          exempt-issue-labels: "needs review"
+          exempt-all-assignees: true

CHANGELOG.md

@@ -8,14 +8,71 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+## [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
+
+- Add non-interactive flag to eas update command. ([#1066](https://github.com/expo/eas-cli/pull/1066) by [@wschurman](https://github.com/wschurman))
+- Handle new EAS Submit common error - expired Apple's certificates. ([#1068](https://github.com/expo/eas-cli/pull/1068) by [@dsokal](https://github.com/dsokal))
+
+### 🐛 Bug fixes
+
+- Enable full bundling logging for eas update when debugging. ([#1070](https://github.com/expo/eas-cli/pull/1070) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Upgrade `@expo/[email protected]` (now with license). ([#1064](https://github.com/expo/eas-cli/pull/1064) by [@EvanBacon](https://github.com/EvanBacon))
+- Unify Google Service Account key prompts. ([#1063](https://github.com/expo/eas-cli/pull/1063) by [@dsokal](https://github.com/dsokal))
+
+## [0.50.0](https://github.com/expo/eas-cli/releases/tag/v0.50.0) - 2022-04-11
+
+### 🎉 New features
+
+- Provide queue position progress and estimated wait time. ([#1049](https://github.com/expo/eas-cli/pull/1049), [#1058](https://github.com/expo/eas-cli/pull/1058) by [@dsokal](https://github.com/dsokal))
+- Enable App Store authentication for ASC Api Keys with environment variables. ([#1051](https://github.com/expo/eas-cli/pull/1051) by [@quinlanj](https://github.com/quinlanj))
+
+### 🐛 Bug fixes
+
+- Prompt for user/password authentication where required. ([#1055](https://github.com/expo/eas-cli/pull/1055) by [@quinlanj](https://github.com/quinlanj))
+- Require private-key-path to be specified for updating when code signing configured. ([#1059](https://github.com/expo/eas-cli/pull/1059) by [@wschurman](https://github.com/wschurman))
+
+## [0.49.0](https://github.com/expo/eas-cli/releases/tag/v0.49.0) - 2022-04-05
+
+### 🎉 New features
+
+- Added experimental App Store Connect API provisioning profile regeneration. ([#1038](https://github.com/expo/eas-cli/pull/1038) by [@EvanBacon](https://github.com/EvanBacon))
+- Experimental support for iOS App Extensions in managed projects. ([#1039](https://github.com/expo/eas-cli/pull/1039) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+- Fix proxy support. ([#1032](https://github.com/expo/eas-cli/pull/1032) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Add annotations regarding App Store Connect Token session support. ([#1029](https://github.com/expo/eas-cli/pull/1029) by [@EvanBacon](https://github.com/EvanBacon))
+- Upgrade dependencies. ([#1043](https://github.com/expo/eas-cli/pull/1043) by [@dsokal](https://github.com/dsokal))
+- Make default deprecation message more generic. ([#1047](https://github.com/expo/eas-cli/pull/1047) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [0.48.2](https://github.com/expo/eas-cli/releases/tag/v0.48.2) - 2022-03-21
+
+### 🎉 New features
+
 - Add proxy support. ([#1005](https://github.com/expo/eas-cli/pull/1005) by [@wkozyra95](https://github.com/wkozyra95))
 
 ### 🐛 Bug fixes
 
 - Do not retry build requests. ([#1024](https://github.com/expo/eas-cli/pull/1024) by [@wkozyra95](https://github.com/wkozyra95))
 
-### 🧹 Chores
-
 ## [0.48.1](https://github.com/expo/eas-cli/releases/tag/v0.48.1) - 2022-03-15
 
 ### 🐛 Bug fixes

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.48.2"
+  "version": "0.52.0"
 }

package.json

@@ -19,17 +19,17 @@
   "devDependencies": {
     "@types/jest": "27.4.1",
     "@types/node": "16.7.8",
-    "eslint": "8.11.0",
+    "eslint": "8.12.0",
     "eslint-config-universe": "10.0.0",
     "eslint-plugin-async-protect": "1.1.0",
     "eslint-plugin-node": "11.1.0",
     "jest": "27.5.1",
     "jest-watch-typeahead": "1.0.0",
     "lerna": "4.0.0",
-    "oclif": "2.5.0",
-    "prettier": "2.5.1",
-    "ts-jest": "27.1.3",
-    "typescript": "4.6.2"
+    "oclif": "2.6.3",
+    "prettier": "2.6.1",
+    "ts-jest": "27.1.4",
+    "typescript": "4.6.3"
   },
   "volta": {
     "node": "16.10.0",

packages/eas-cli/README.md

@@ -48,6 +48,7 @@ eas --help COMMAND
 * [`eas build:configure`](#eas-buildconfigure)
 * [`eas build:inspect`](#eas-buildinspect)
 * [`eas build:list`](#eas-buildlist)
+* [`eas build:submit`](#eas-buildsubmit)
 * [`eas build:view [BUILD_ID]`](#eas-buildview-build_id)
 * [`eas channel:create [NAME]`](#eas-channelcreate-name)
 * [`eas channel:edit [NAME]`](#eas-channeledit-name)
@@ -61,6 +62,9 @@ eas --help COMMAND
 * [`eas device:view [UDID]`](#eas-deviceview-udid)
 * [`eas diagnostics`](#eas-diagnostics)
 * [`eas help [COMMAND]`](#eas-help-command)
+* [`eas init`](#eas-init)
+* [`eas login`](#eas-login)
+* [`eas logout`](#eas-logout)
 * [`eas project:info`](#eas-projectinfo)
 * [`eas project:init`](#eas-projectinit)
 * [`eas secret:create`](#eas-secretcreate)
@@ -77,6 +81,7 @@ eas --help COMMAND
 * [`eas webhook:list`](#eas-webhooklist)
 * [`eas webhook:update`](#eas-webhookupdate)
 * [`eas webhook:view ID`](#eas-webhookview-id)
+* [`eas whoami`](#eas-whoami)
 
 ## `eas account:login`
 
@@ -93,7 +98,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -110,7 +115,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -127,7 +132,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -141,7 +146,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -190,7 +195,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -210,7 +215,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -227,7 +232,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -246,7 +251,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -266,7 +271,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -295,7 +300,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -309,7 +314,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -326,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.48.2/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -361,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.48.2/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -394,7 +399,35 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/build/list.ts)_
+
+## `eas build:submit`
+
+submit app binary to App Store and/or Play Store
+
+```
+USAGE
+  $ eas build:submit [-p android|ios|all] [--profile <value>] [--latest | --id <value> | --path <value> | --url
+    <value>] [--verbose] [--wait] [--non-interactive]
+
+FLAGS
+  -p, --platform=(android|ios|all)
+  --id=<value>                      ID of the build to submit
+  --latest                          Submit the latest build for specified platform
+  --non-interactive                 Run command in non-interactive mode
+  --path=<value>                    Path to the .apk/.aab/.ipa file
+  --profile=<value>                 Name of the submit profile from eas.json. Defaults to "production" if defined in
+                                    eas.json.
+  --url=<value>                     App archive url
+  --verbose                         Always print logs from Submission Service
+  --[no-]wait                       Wait for submission to complete
+
+DESCRIPTION
+  submit app binary to App Store and/or Play Store
+
+ALIASES
+  $ eas build:submit
+```
 
 ## `eas build:view [BUILD_ID]`
 
@@ -411,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.48.2/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -431,7 +464,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -452,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.48.2/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -469,7 +502,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -489,7 +522,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -507,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.48.2/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -521,7 +554,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -535,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.48.2/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -553,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.48.2/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -570,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.48.2/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -584,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.48.2/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -598,7 +631,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -620,6 +653,51 @@ DESCRIPTION
 
 _See code: [@oclif/plugin-help](https://github.com/oclif/plugin-help/blob/v5.1.12/src/commands/help.ts)_
 
+## `eas init`
+
+create or link an EAS project
+
+```
+USAGE
+  $ eas init
+
+DESCRIPTION
+  create or link an EAS project
+
+ALIASES
+  $ eas init
+```
+
+## `eas login`
+
+log in with your Expo account
+
+```
+USAGE
+  $ eas login
+
+DESCRIPTION
+  log in with your Expo account
+
+ALIASES
+  $ eas login
+```
+
+## `eas logout`
+
+log out
+
+```
+USAGE
+  $ eas logout
+
+DESCRIPTION
+  log out
+
+ALIASES
+  $ eas logout
+```
+
 ## `eas project:info`
 
 information about the current project
@@ -632,7 +710,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -649,7 +727,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -669,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.48.2/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -686,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.48.2/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -700,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.48.2/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas submit`
 
@@ -730,7 +808,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -739,7 +817,7 @@ publish an update group
 ```
 USAGE
   $ eas update [--branch <value>] [--message <value>] [--republish | --input-dir <value> | --skip-bundler]
-    [--group <value> |  | ] [-p android|ios|all] [--json] [--auto] [--private-key-path <value>]
+    [--group <value> |  | ] [-p android|ios|all] [--json] [--auto] [--private-key-path <value>] [--non-interactive]
 
 FLAGS
   -p, --platform=(android|ios|all)  [default: all]
@@ -749,6 +827,7 @@ FLAGS
   --input-dir=<value>               [default: dist] Location of the bundle
   --json                            Enable JSON output, non-JSON messages will be printed to stderr
   --message=<value>                 A short message describing the update
+  --non-interactive                 Run command in non-interactive mode
   --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
                                     expo-updates' configuration. Defaults to a file named "private-key.pem" in the
                                     certificate's directory.
@@ -759,7 +838,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -776,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.48.2/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -796,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.48.2/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -815,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.48.2/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -835,7 +914,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -855,7 +934,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -872,7 +951,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -889,7 +968,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -910,7 +989,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -927,5 +1006,20 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.48.2/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.52.0/packages/eas-cli/src/commands/webhook/view.ts)_
+
+## `eas whoami`
+
+show the username you are logged in as
+
+```
+USAGE
+  $ eas whoami
+
+DESCRIPTION
+  show the username you are logged in as
+
+ALIASES
+  $ eas whoami
+```
 <!-- commandsstop -->

packages/eas-cli/functions.tsconfig.webpack.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@tsconfig/node16/tsconfig.json",
+  "compilerOptions": {
+    "jsx": "react-jsx",
+    "strict": true
+  }
+}

packages/eas-cli/graphql-codegen.yml

@@ -1,5 +1,5 @@
 overwrite: true
-schema: 'https://staging-api.expo.dev/graphql'
+schema: 'http://localhost:3000/graphql'
 documents:
   - 'src/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'

packages/eas-cli/graphql.schema.json

@@ -711,6 +711,39 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "billingPeriod",
+            "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": "BillingPeriod",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "buildJobs",
             "description": "Build Jobs associated with this account",
@@ -1224,6 +1257,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "usageMetrics",
+            "description": "Account query object for querying EAS usage metrics",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "AccountUsageMetrics",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "userInvitations",
             "description": "Pending user invitations for this account",
@@ -2033,6 +2082,198 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "AccountUsageMetric",
+        "description": null,
+        "fields": [
+          {
+            "name": "metric",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "EASServiceMetric",
+                "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": "timestamp",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "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,
+            "args": [
+              {
+                "name": "granularity",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "ENUM",
+                    "name": "UsageMetricsGranularity",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "metric",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "ENUM",
+                    "name": "EASServiceMetric",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "timespan",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "UsageMetricsTimespan",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "AccountUsageMetric",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "INTERFACE",
         "name": "ActivityTimelineProjectActivity",
@@ -9901,6 +10142,65 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "BillingPeriod",
+        "description": null,
+        "fields": [
+          {
+            "name": "anchor",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "end",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "start",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "SCALAR",
         "name": "Boolean",
@@ -10052,6 +10352,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "estimatedWaitTimeLeftSeconds",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "Int",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "expirationDate",
             "description": null,
@@ -10092,6 +10404,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "initialQueuePosition",
+            "description": "Queue position is 1-indexed",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "Int",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "initiatingActor",
             "description": null,
@@ -13464,6 +13788,33 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "DeployFunctionResult",
+        "description": null,
+        "fields": [
+          {
+            "name": "success",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "Deployment",
@@ -13693,6 +14044,23 @@
         ],
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "EASServiceMetric",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "MANIFEST_REQUESTS",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "EditUpdateBranchInput",
@@ -14256,6 +14624,210 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "FunctionMutation",
+        "description": null,
+        "fields": [
+          {
+            "name": "createFunction",
+            "description": null,
+            "args": [
+              {
+                "name": "appId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "bucketKey",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "DeployFunctionResult",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "getFunctionStatus",
+            "description": null,
+            "args": [
+              {
+                "name": "appId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "FunctionStatusResult",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "getSignedFunctionUploadSpecification",
+            "description": null,
+            "args": [
+              {
+                "name": "appId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "GetFunctionUploadUrlResult",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "FunctionStatusResult",
+        "description": null,
+        "fields": [
+          {
+            "name": "logUrls",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "status",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "GetFunctionUploadUrlResult",
+        "description": null,
+        "fields": [
+          {
+            "name": "specification",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "GetSignedAssetUploadSpecificationsResult",
@@ -19349,6 +19921,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "function",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "FunctionMutation",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "googleServiceAccountKey",
             "description": "Mutations that modify a Google Service Account Key",
@@ -22671,6 +23259,168 @@
         ],
         "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": "metrics",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "AccountUsageMetric",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "total",
+            "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": "ENUM",
+        "name": "UsageMetricType",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "REQUEST",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "UsageMetricsGranularity",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "DAY",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "HOUR",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "MINUTE",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "TOTAL",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "UsageMetricsTimespan",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "end",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "start",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "User",
@@ -23685,6 +24435,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "expires",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "id",
             "description": null,
@@ -24045,6 +24811,22 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "expires",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "id",
             "description": "Email to which this invitation was sent",

packages/eas-cli/package.json

@@ -1,38 +1,41 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.48.2",
+  "version": "0.52.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.28",
+    "@expo/apple-utils": "0.0.0-alpha.31",
     "@expo/code-signing-certificates": "0.0.2",
-    "@expo/config": "6.0.19",
-    "@expo/config-plugins": "4.1.0",
+    "@expo/config": "6.0.21",
+    "@expo/config-plugins": "4.1.2",
     "@expo/config-types": "44.0.0",
-    "@expo/eas-build-job": "0.2.66",
-    "@expo/eas-json": "0.48.0",
+    "@expo/eas-build-job": "0.2.71",
+    "@expo/eas-json": "0.52.0",
     "@expo/json-file": "8.2.34",
+    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/package-manager": "0.0.50",
     "@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/prebuild-config": "3.1.2",
     "@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.5.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",
+    "adm-zip": "0.5.9",
     "chalk": "4.1.2",
+    "cli-progress": "3.10.0",
     "cli-table3": "0.6.1",
     "dateformat": "4.6.3",
-    "dicer": "0.3.1",
     "env-paths": "2.2.0",
     "envinfo": "7.8.1",
     "fast-deep-equal": "3.1.3",
@@ -41,6 +44,7 @@
     "form-data": "4.0.0",
     "fs-extra": "10.0.1",
     "getenv": "1.0.0",
+    "got": "^11.1.4",
     "gradle-to-js": "2.0.0",
     "graphql": "16.3.0",
     "graphql-tag": "2.12.6",
@@ -48,42 +52,48 @@
     "ignore": "5.2.0",
     "indent-string": "4.0.0",
     "jks-js": "1.0.2",
+    "js-yaml": "^3.13.1",
     "joi": "17.6.0",
     "keychain": "1.3.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
     "minimatch": "3.0.5",
-    "nanoid": "3.3.1",
+    "nanoid": "3.3.2",
     "node-fetch": "2.6.7",
-    "node-forge": "1.2.1",
+    "node-forge": "1.3.1",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
+    "pnp-webpack-plugin": "1.7.0",
+    "react-dev-utils": "12.0.0",
     "resolve-from": "5.0.0",
     "semver": "7.3.5",
     "slash": "3.0.0",
     "strip-ansi": "6.0.0",
-    "structured-headers": "0.4.1",
     "tar": "6.1.11",
     "terminal-link": "2.1.1",
+    "ts-loader": "^9.2.8",
     "tslib": "2.3.1",
     "turndown": "7.1.1",
     "untildify": "4.0.0",
     "uuid": "8.3.2",
+    "webpack": "5.72.0",
     "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "2.6.2",
     "@graphql-codegen/introspection": "2.1.1",
-    "@graphql-codegen/typescript": "2.4.7",
-    "@graphql-codegen/typescript-operations": "2.3.4",
+    "@graphql-codegen/typescript": "2.4.8",
+    "@graphql-codegen/typescript-operations": "2.3.5",
+    "@types/cli-progress": "3.9.2",
+    "@types/adm-zip": "0.4.34",
     "@types/dateformat": "3.0.1",
-    "@types/dicer": "0.2.2",
     "@types/envinfo": "7.8.1",
     "@types/fs-extra": "9.0.13",
     "@types/getenv": "^1.0.0",
+    "@types/js-yaml": "^3.12.2",
     "@types/mime": "2.0.3",
     "@types/node-fetch": "^2.5.7",
     "@types/node-forge": "1.0.1",
@@ -92,6 +102,7 @@
     "@types/tar": "6.1.1",
     "@types/tough-cookie": "4.0.1",
     "@types/uuid": "8.3.4",
+    "@types/webpack": "5.28.0",
     "@types/wrap-ansi": "3.0.0",
     "axios": "0.26.1",
     "eslint-plugin-graphql": "4.0.0",
@@ -101,7 +112,7 @@
     "nock": "13.2.4",
     "tempy": "0.7.0",
     "ts-deepmerge": "2.0.1",
-    "typescript": "4.6.2"
+    "typescript": "4.6.3"
   },
   "engines": {
     "node": ">=12.0.0"

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

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

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

@@ -1,16 +1,29 @@
 import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
+import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
 
 import { withAnalyticsAsync } from '../analytics/common';
 import { BuildEvent } from '../analytics/events';
-import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
+import { getExpoWebsiteBaseUrl } from '../api';
+import {
+  AppPlatform,
+  BuildFragment,
+  BuildPriority,
+  BuildStatus,
+  UploadSessionType,
+} from '../graphql/generated';
 import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log, { learnMore } from '../log';
-import { ora } from '../ora';
-import { requestedPlatformDisplayNames } from '../platform';
+import { Ora, ora } from '../ora';
+import {
+  appPlatformDisplayNames,
+  appPlatformEmojis,
+  requestedPlatformDisplayNames,
+} from '../platform';
 import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
@@ -100,43 +113,43 @@ export async function prepareBuildRequestForPlatformAsync<
       try {
         return await sendBuildRequestAsync(builder, job, metadata);
       } catch (error: any) {
-        if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-          Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
-        ) {
-          Log.error(
-            'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
-          );
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED'
-        ) {
-          Log.error(
-            'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
-          );
-          throw new Error('Build request failed.');
-        } else if (
-          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
-        ) {
-          Log.error(
-            `You have already reached the maximum number of pending ${
-              requestedPlatformDisplayNames[job.platform]
-            } builds for your account. Try again later.`
-          );
-          throw new Error('Build request failed.');
-        } else if (error?.graphQLErrors) {
-          Log.error(
-            'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
-          );
-        }
-        throw error;
+        handleBuildRequestError(error, job.platform);
       }
     }
   };
 }
 
+function handleBuildRequestError(error: any, platform: Platform): never {
+  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+    Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
+  ) {
+    Log.error(
+      'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
+    );
+    throw new Error('Build request failed.');
+  } else if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED') {
+    Log.error(
+      'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
+    );
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
+  ) {
+    Log.error(
+      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
+    );
+    throw new Error('Build request failed.');
+  } else if (error?.graphQLErrors) {
+    Log.error(
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
+    );
+  }
+  throw error;
+}
+
 async function uploadProjectAsync<TPlatform extends Platform>(
   ctx: BuildContext<TPlatform>
 ): Promise<string> {
@@ -208,105 +221,242 @@ async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJ
   );
 }
 
+type MaybeBuildFragment = BuildFragment | null;
+
 export async function waitForBuildEndAsync(
-  buildIds: string[],
-  { timeoutSec = 3600, intervalSec = 30 } = {}
-): Promise<(BuildFragment | null)[]> {
-  Log.log(
-    `Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`
-  );
-  const spinner = ora().start();
-  let time = new Date().getTime();
-  const endTime = time + timeoutSec * 1000;
-  while (time <= endTime) {
-    const builds: (BuildFragment | null)[] = await Promise.all(
-      buildIds.map(async buildId => {
-        try {
-          return await BuildQuery.byIdAsync(buildId, { useCache: false });
-        } catch (err) {
-          Log.debug('Failed to fetch the build status', err);
-          return null;
-        }
-      })
-    );
-    if (builds.length === 1) {
-      const [build] = builds;
-      if (build !== null) {
-        switch (build.status) {
-          case BuildStatus.Finished:
-            spinner.succeed('Build finished');
-            return builds;
-          case BuildStatus.New:
-            spinner.text = 'Build created';
-            break;
-          case BuildStatus.InQueue:
-            spinner.text = 'Build queued...';
-            break;
-          case BuildStatus.Canceled:
-            spinner.text = 'Build canceled';
-            spinner.stopAndPersist();
-            return builds;
-          case BuildStatus.InProgress:
-            spinner.text = 'Build in progress...';
-            break;
-          case BuildStatus.Errored:
-            spinner.fail('Build failed');
-            if (build.error) {
-              return builds;
-            } else {
-              throw new Error(`Standalone build failed!`);
-            }
-          default:
-            spinner.warn('Unknown status');
-            throw new Error(`Unknown build status: ${build.status} - aborting!`);
-        }
-      } else {
-        if (!spinner.text) {
-          spinner.text = 'Could not fetch the build status. Check your network connection.';
-        }
-      }
-    } else {
-      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
-        spinner.succeed('All builds have finished');
-        return builds;
-      } else if (
-        builds.filter(build =>
-          build?.status
-            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
-                build.status
-              )
-            : false
-        ).length === builds.length
-      ) {
-        spinner.fail('Some of the builds were canceled or failed.');
-        return builds;
-      } else {
-        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
-        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
-        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
-        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
-        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
-        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
-        const unknown =
-          builds.length - newBuilds - inQueue - inProgress - errored - finished - canceled;
-        spinner.text = [
-          newBuilds && `Builds created: ${newBuilds}`,
-          inQueue && `Builds in queue: ${inQueue}`,
-          inProgress && `Builds in progress: ${inProgress}`,
-          canceled && `Builds canceled: ${canceled}`,
-          errored && chalk.red(`Builds failed: ${errored}`),
-          finished && chalk.green(`Builds finished: ${finished}`),
-          unknown && chalk.red(`Builds with unknown status: ${unknown}`),
-        ]
-          .filter(i => i)
-          .join('\t');
-      }
+  { buildIds, accountName }: { buildIds: string[]; accountName: string },
+  {
+    // 2 hours (max build time limit) + 10 minutes (possible queue time)
+    timeoutSec = 2 * 60 * 60 + 10 * 60,
+    intervalSec = 10,
+  } = {}
+): Promise<MaybeBuildFragment[]> {
+  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 });
+    if (!refetch) {
+      return builds;
     }
-    time = new Date().getTime();
     await sleepAsync(intervalSec * 1000);
   }
-  spinner.warn('Timed out');
+  spinner.fail('Timed out');
   throw new Error(
     'Timeout reached! It is taking longer than expected to finish the build, aborting...'
   );
 }
+
+async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
+  const promises = buildIds.map(async buildId => {
+    try {
+      return await BuildQuery.byIdAsync(buildId, { useCache: false });
+    } catch (err) {
+      Log.debug('Failed to fetch the build status', err);
+      return null;
+    }
+  });
+  return await Promise.all(promises);
+}
+
+interface BuildProgressResult {
+  refetch: boolean;
+}
+
+let queueProgressBarStarted = false;
+const queueProgressBar = new cliProgress.SingleBar(
+  { format: '|{bar}| {estimatedWaitTime}' },
+  cliProgress.Presets.rect
+);
+
+async function handleSingleBuildProgressAsync(
+  { build, accountName }: { build: MaybeBuildFragment; accountName: string },
+  { spinner }: { spinner: Ora }
+): Promise<BuildProgressResult> {
+  if (build === null) {
+    spinner.text = 'Could not fetch the build status. Check your network connection.';
+    return { refetch: true };
+  }
+
+  if (queueProgressBarStarted && build?.status && build.status !== BuildStatus.InQueue) {
+    if (build.status === BuildStatus.InProgress) {
+      queueProgressBar.update(queueProgressBar.getTotal(), {
+        estimatedWaitTime: '',
+      });
+    }
+    queueProgressBar.stop();
+    Log.newLine();
+    queueProgressBarStarted = false;
+    spinner.start('Build is about to start');
+  }
+
+  switch (build.status) {
+    case BuildStatus.Finished:
+      spinner.succeed('Build finished');
+      return { refetch: false };
+    case BuildStatus.New:
+      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${chalk.underline(
+        formatAccountSubscriptionsUrl(accountName)
+      )}.`;
+      break;
+    case BuildStatus.InQueue: {
+      spinner.text = 'Build queued...';
+      const progressBarPayload =
+        typeof build.estimatedWaitTimeLeftSeconds === 'number'
+          ? { estimatedWaitTime: formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds) }
+          : { estimatedWaitTime: '' };
+
+      if (
+        !queueProgressBarStarted &&
+        typeof build.initialQueuePosition === 'number' &&
+        typeof build.queuePosition === 'number'
+      ) {
+        spinner.stopAndPersist();
+        if (build.priority !== BuildPriority.High) {
+          Log.newLine();
+          Log.log('Start builds sooner in the priority queue.');
+          Log.log(
+            `Sign up for EAS Production or Enterprise at ${chalk.underline(
+              formatAccountSubscriptionsUrl(accountName)
+            )}`
+          );
+        }
+        Log.newLine();
+        Log.log('Waiting in queue');
+        queueProgressBar.start(
+          build.initialQueuePosition + 1,
+          build.initialQueuePosition - build.queuePosition + 1,
+          progressBarPayload
+        );
+        queueProgressBarStarted = true;
+      }
+      if (typeof build.queuePosition === 'number') {
+        queueProgressBar.update(build.queuePosition, progressBarPayload);
+      }
+      break;
+    }
+    case BuildStatus.Canceled:
+      spinner.fail('Build canceled');
+      return { refetch: false };
+    case BuildStatus.InProgress:
+      spinner.text = 'Build in progress...';
+      break;
+    case BuildStatus.Errored:
+      spinner.fail('Build failed');
+      if (build.error) {
+        return { refetch: false };
+      } else {
+        throw new Error('Standalone build failed!');
+      }
+    default:
+      spinner.warn('Unknown status');
+      throw new Error(`Unknown build status: ${build.status} - aborting!`);
+  }
+  return { refetch: true };
+}
+
+const statusToDisplayName: Record<BuildStatus, string> = {
+  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
+  [BuildStatus.InQueue]: 'in queue',
+  [BuildStatus.InProgress]: 'in progress',
+  [BuildStatus.Canceled]: 'canceled',
+  [BuildStatus.Finished]: 'finished',
+  [BuildStatus.Errored]: 'failed',
+};
+
+const platforms = [AppPlatform.Android, AppPlatform.Ios];
+
+async function handleMultipleBuildsProgressAsync(
+  { builds: maybeBuilds }: { builds: MaybeBuildFragment[] },
+  { spinner }: { spinner: Ora }
+): Promise<BuildProgressResult> {
+  const buildCount = maybeBuilds.length;
+  const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);
+
+  const allFinished =
+    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
+  const allSettled =
+    builds.filter(build =>
+      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
+    ).length === buildCount;
+
+  if (allSettled) {
+    if (allFinished) {
+      spinner.succeed(formatSettledBuildsText(builds));
+    } else {
+      spinner.fail(formatSettledBuildsText(builds));
+    }
+    return { refetch: false };
+  } else {
+    spinner.text = formatPendingBuildsText(builds);
+    return { refetch: true };
+  }
+}
+
+function formatSettledBuildsText(builds: BuildFragment[]): string {
+  return platforms
+    .map(platform => {
+      const build = nullthrows(
+        builds.find(build => build.platform === platform),
+        `Build for platform ${platform} must be defined in this context`
+      );
+      return `${appPlatformEmojis[platform]} ${
+        appPlatformDisplayNames[platform]
+      } build - status: ${chalk.bold(statusToDisplayName[build.status])}`;
+    })
+    .join('\n  ');
+}
+
+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 = '';
+      if (
+        build?.status === BuildStatus.InQueue &&
+        typeof build.initialQueuePosition === 'number' &&
+        typeof build.queuePosition === 'number'
+      ) {
+        const percent = Math.floor(
+          ((build.initialQueuePosition - build.queuePosition + 1) /
+            (build.initialQueuePosition + 1)) *
+            100
+        );
+        const estimatedWaitTime =
+          typeof build.estimatedWaitTimeLeftSeconds === 'number'
+            ? ` - ${formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds)}`
+            : '';
+        extraInfo = ` - queue progress: ${chalk.bold(`${percent}%`)}${estimatedWaitTime}`;
+      }
+      return `${appPlatformEmojis[platform]} ${
+        appPlatformDisplayNames[platform]
+      } build - status: ${chalk.bold(status)}${extraInfo}`;
+    })
+    .join('\n  ');
+}
+
+function isBuildFragment(maybeBuild: MaybeBuildFragment): maybeBuild is BuildFragment {
+  return maybeBuild !== null;
+}
+
+function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
+  if (estimatedWaitTimeLeftSeconds < 5 * 60) {
+    return 'starting soon...';
+  } else {
+    const n = Math.floor(estimatedWaitTimeLeftSeconds / (10 * 60)) + 1;
+    return `starting in about ${n}0 minutes...`;
+  }
+}
+
+function formatAccountSubscriptionsUrl(accountName: string): string {
+  return new URL(
+    `/accounts/${accountName}/settings/subscriptions`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
+}

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

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

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

@@ -2,7 +2,6 @@ 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';
@@ -19,13 +18,6 @@ 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.67';
+const PLUGIN_PACKAGE_VERSION = '0.0.78';
 
 export interface LocalBuildOptions {
   enable: boolean;

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

@@ -137,7 +137,11 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
     return;
   }
 
-  const builds = await waitForBuildEndAsync(startedBuilds.map(({ build }) => build.id));
+  const { accountName } = Object.values(buildCtxByPlatform)[0];
+  const builds = await waitForBuildEndAsync({
+    buildIds: startedBuilds.map(({ build }) => build.id),
+    accountName,
+  });
   printBuildResults(builds, flags.json);
 
   const haveAllBuildsFailedOrCanceled = builds.every(

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

@@ -103,10 +103,7 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
     Log.warn("Changes won't affect your project config.");
     Log.warn(deprecationInfo.message);
   } else if (deprecationInfo.type === EasBuildDeprecationInfoType.UserFacing) {
-    Log.warn('This command is using API that soon will be deprecated, please update eas-cli.');
-    Log.warn(
-      'There might be some changes necessary to your project config, latest eas-cli will provide more specific error messages.'
-    );
+    Log.warn('This command is using API that soon will be deprecated.');
     Log.warn(deprecationInfo.message);
   } else {
     Log.warn('An unexpected warning was encountered. Please report it as a bug:');

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

@@ -1,3 +1,4 @@
+import admzip from 'adm-zip';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
@@ -122,6 +123,63 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
   return { size, path: tarPath };
 }
 
+export async function makeZipAsync(pathToZip: string): Promise<{ path: string; size: number }> {
+  const spinner = ora('Compressing project files');
+
+  await fs.mkdirp(getTmpDirectory());
+  const shallowClonePath = path.join(getTmpDirectory(), `${uuidv4()}-shallow-clone`);
+
+  try {
+    process.chdir(pathToZip);
+    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
+    process.chdir('..');
+
+    const zipPath = path.join(getTmpDirectory(), `${uuidv4()}.zip`);
+
+    // If the compression takes longer then a second, show the spinner.
+    // This can happen when the user has a lot of resources or doesn't ignore their CocoaPods.
+    // A basic project on a Mac can compress in roughly ~40ms.
+    // A fairly complex project without CocoaPods ignored can take up to 30s.
+    const timer = setTimeout(
+      () => {
+        spinner.start();
+      },
+      Log.isDebug ? 1 : 1000
+    );
+    // TODO: Possibly warn after more time about unoptimized assets.
+    const compressTimerLabel = 'makeProjectZipAsync';
+    startTimer(compressTimerLabel);
+
+    const zip = new admzip();
+    zip.addLocalFolder(shallowClonePath);
+    await zipAsync(zip, zipPath);
+    clearTimeout(timer);
+
+    const { size } = await fs.stat(zipPath);
+    const duration = endTimer(compressTimerLabel);
+    if (spinner.isSpinning) {
+      const prettyTime = formatMilliseconds(duration);
+      spinner.succeed(
+        `Compressed project files ${chalk.dim(`${prettyTime} (${formatBytes(size)})`)}`
+      );
+    }
+
+    return { size, path: zipPath };
+  } catch (err) {
+    if (spinner.isSpinning) {
+      spinner.fail();
+    }
+    throw err;
+  } finally {
+    await fs.remove(shallowClonePath);
+  }
+}
+
+async function zipAsync(zip: admzip, targetFileName?: string): Promise<void> {
+  return new Promise((resolve, reject) => {
+    zip.writeZip(targetFileName, (error: Error | null) => (error ? reject(error) : resolve()));
+  });
+}
 enum ShouldCommitChanges {
   Yes,
   ShowDiffFirst,

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

@@ -1,12 +1,8 @@
-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() }));
@@ -32,17 +28,30 @@ afterAll(() => {
 });
 
 beforeEach(() => {
-  asMock(getUserAsync)
+  jest
+    .mocked(getUserAsync)
     .mockReset()
-    .mockImplementation(() => mockJester);
-  asMock(ensureLoggedInAsync)
+    .mockImplementation(async () => mockJester);
+  jest
+    .mocked(ensureLoggedInAsync)
     .mockReset()
-    .mockImplementation(() => mockJester);
-  asMock(initAsync).mockReset();
-  asMock(flushAsync).mockReset();
-  asMock(logEvent).mockReset();
+    .mockImplementation(async () => mockJester);
+  jest.mocked(initAsync).mockReset();
+  jest.mocked(flushAsync).mockReset();
+  jest.mocked(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
@@ -53,32 +62,36 @@ 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 () => {
-      asMock(TestEasCommand.prototype.authValue).mockImplementationOnce(() => false);
-
+      const TestEasCommand = createTestEasCommand(false);
       await TestEasCommand.run();
 
-      expect(getUserAsync).toHaveReturnedWith(mockJester);
+      expect(jest.mocked(getUserAsync)).toBeCalledTimes(1);
+      expect(jest.mocked(ensureLoggedInAsync)).not.toBeCalled();
     });
 
     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', {
@@ -89,6 +102,7 @@ describe(EasCommand.name, () => {
 
   describe('after exceptions', () => {
     it('flushes analytics', async () => {
+      const TestEasCommand = createTestEasCommand(true);
       try {
         await TestEasCommand.run().then(() => {
           throw new Error('foo');

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

@@ -1,13 +0,0 @@
-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/functions/create.ts

@@ -0,0 +1,151 @@
+import { getConfig } from '@expo/config';
+import spawnAsync, { SpawnOptions, SpawnResult } from '@expo/spawn-async';
+import admzip from 'adm-zip';
+import fs from 'fs';
+import fsPromise from 'fs/promises';
+import got from 'got';
+import fetch from 'node-fetch';
+import path from 'path';
+import { pipeline } from 'stream/promises';
+
+import { makeZipAsync } from '../../build/utils/repository';
+import EasCommand from '../../commandUtils/EasCommand';
+import { bundleFunctionsAsync, prepareFunctionEntriesAsync } from '../../functions/webpack';
+import { FunctionMutation } from '../../graphql/mutations/FunctionMutation';
+import { PresignedPost } from '../../graphql/mutations/UploadSessionMutation';
+import Log from '../../log';
+import { ora } from '../../ora';
+import {
+  findProjectRootAsync,
+  getProjectAccountName,
+  getProjectIdAsync,
+} from '../../project/projectUtils';
+import { uploadWithPresignedPostAsync } from '../../uploads';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { expoCommandAsync } from '../../utils/expoCli';
+import { sleepAsync } from '../../utils/promise';
+
+export default class FunctionsCreate extends EasCommand {
+  static description = 'create a function';
+
+  async runAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
+    const projectId = await getProjectIdAsync(exp);
+
+    const downloadSpinner = ora('Downloading functions template...').start();
+    const functionsTemplateUrl =
+      'https://github.com/quinlanj/functions-entry-point/archive/refs/heads/main.zip';
+    const functionsBuild = 'functions-build';
+    const functionsBuildZip = `${functionsBuild}.zip`;
+    const originalUnzippedDirectory = 'functions-entry-point-main';
+    // ensure empty build directory
+    await fsPromise.rm(path.join(projectDir, functionsBuild), { force: true, recursive: true });
+    // download and unzip the functions template
+    const downloadStream = got.stream(functionsTemplateUrl);
+    await pipeline(downloadStream, fs.createWriteStream(path.join(projectDir, functionsBuildZip)));
+    const zip = new admzip(functionsBuildZip);
+    zip.extractAllTo(/*target path*/ path.join(projectDir), /*overwrite*/ true);
+    // rename to desired dir, remove zip
+    await Promise.all([
+      fsPromise.rename(
+        path.join(projectDir, originalUnzippedDirectory),
+        path.join(projectDir, functionsBuild)
+      ),
+      fsPromise.rm(path.join(projectDir, functionsBuildZip)),
+    ]);
+    downloadSpinner.succeed('Downloaded functions template');
+
+    const permissionSpinner = ora('Modifying permissions...').start();
+    const promises = [];
+    for (const file of await fsPromise.readdir(path.join(projectDir, functionsBuild, 'scripts'))) {
+      promises.push(fsPromise.chmod(path.join(projectDir, functionsBuild, 'scripts', file), 0o777));
+    }
+    await Promise.all(promises);
+    permissionSpinner.succeed('Modified permissions');
+
+    const gitSpinner = ora('Initializing inner git...').start();
+    process.chdir(path.join(projectDir, functionsBuild));
+    const { status, stderr } = await spawnAsync('git', ['init']);
+    if (status !== 0) {
+      throw new Error('Failed to initialize git: ' + stderr);
+    }
+    process.chdir('..');
+    gitSpinner.succeed('Initialized inner git');
+
+    Log.log('Bundling functions...');
+    const functionDirectory = path.join(projectDir, 'functions');
+    const functionEntries = await prepareFunctionEntriesAsync(functionDirectory);
+    const outputDirectory = path.join(projectDir, functionsBuild, 'functions');
+    await bundleFunctionsAsync(projectDir, functionEntries, outputDirectory);
+    Log.log('Successfully bundled functions...');
+
+    Log.log('Doing web build...');
+    const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+    const functionName = `${accountName}-${exp.slug}`; // TODO: set up a Cloudflare enterprise domain so we don't have to do this
+    const region = 'us-east1';
+    const cloudFunctionProject = 'eas-functions';
+    const publicUrl = `https://${region}-${cloudFunctionProject}.cloudfunctions.net/${functionName}`;
+    const webOutputDirectory = path.join(projectDir, functionsBuild, 'web-build');
+    await expoCommandAsync(projectDir, ['build:web'], {
+      env: { WEBPACK_BUILD_OUTPUT_PATH: webOutputDirectory, WEB_PUBLIC_URL: publicUrl },
+    });
+    Log.log('Finished web build...');
+
+    const { path: compressedProjectPath } = await makeZipAsync(
+      path.join(projectDir, functionsBuild)
+    );
+    const uploadSpinner = ora('Uploading project...').start();
+    let bucketKey;
+    try {
+      const specification = await FunctionMutation.uploadAsync(projectId);
+      const presignedPost: PresignedPost = JSON.parse(specification);
+      await uploadWithPresignedPostAsync(compressedProjectPath, presignedPost);
+      bucketKey = presignedPost.fields.key;
+      uploadSpinner.succeed(`Successfully uploaded project to bucket: ${bucketKey}`);
+    } catch (err) {
+      uploadSpinner.fail('Failed to upload project');
+      throw err;
+    }
+
+    const spinner = ora('Creating a function...').start();
+    try {
+      const success = await FunctionMutation.createAsync(bucketKey, projectId);
+      spinner.succeed(`Successfully created function: ${success}`);
+    } catch (err) {
+      spinner.fail('Failed to create a function');
+      throw err;
+    }
+
+    Log.log('Streaming build logs....');
+    const logsPrinted = new Set<string>();
+    let sawLastLog = false;
+    while (true) {
+      const { status, logUrls } = await FunctionMutation.getStatusAsync(projectId);
+      Log.log(`Function status: ${status}`);
+
+      const logsUrlsToPrint = logUrls.filter(url => !logsPrinted.has(url)).sort();
+      const logResponses = await Promise.all(logsUrlsToPrint.map(url => fetch(url)));
+      const logBodies = await Promise.all(logResponses.map(body => body.text()));
+      const logPayloads = logBodies.map(body => JSON.parse(body)).map(body => body.textPayload);
+      logPayloads.forEach(response => Log.log(response));
+      logsUrlsToPrint.forEach(logUrl => logsPrinted.add(logUrl));
+      if (!sawLastLog) {
+        sawLastLog = logPayloads.some(log => log === 'DONE');
+      }
+
+      if (sawLastLog && status === 'ACTIVE') {
+        Log.log(`🎉🎉🎉 Hooray! Your function is complete!`);
+        Log.log(`🎉🎉🎉 Your web-app is available at: ${publicUrl}`);
+        for (const submodule of Object.keys(functionEntries)) {
+          Log.log(`🎉🎉🎉 ${submodule} is available at: ${publicUrl}/functions/${submodule}`);
+        }
+        break;
+      } else if (status !== 'ACTIVE' && status !== 'DEPLOY_IN_PROGRESS') {
+        Log.log(`🤔 Uh oh...your function is  ${status}`);
+        break;
+      }
+      await sleepAsync(6000);
+    }
+  }
+}

packages/eas-cli/src/commands/functions/start.ts

@@ -0,0 +1,25 @@
+import path from 'path';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { installNodeDependenciesAsync } from '../../functions/CreateApp';
+import { YarnPackageManager } from '../../functions/PackageManager';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { findProjectRootAsync } from '../../project/projectUtils';
+
+export default class FunctionsCreate extends EasCommand {
+  static description = 'start a function';
+
+  async runAsync(): Promise<void> {
+    const projectDir = await findProjectRootAsync();
+    const functionsBuild = 'functions-build';
+
+    const installSpinner = ora('Installing dependencies...').start();
+    await installNodeDependenciesAsync(path.join(projectDir, functionsBuild), 'yarn');
+    installSpinner.succeed('Modified permissions');
+
+    Log.log('serving up the function...');
+    const yarn = new YarnPackageManager({ cwd: path.join(projectDir, functionsBuild) });
+    await yarn.runAsync('dev');
+  }
+}

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

@@ -194,6 +194,10 @@ export default class UpdatePublish extends EasCommand {
       description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
       required: false,
     }),
+    'non-interactive': Flags.boolean({
+      default: false,
+      description: 'Run command in non-interactive mode',
+    }),
   };
 
   async runAsync(): Promise<void> {
@@ -209,6 +213,7 @@ export default class UpdatePublish extends EasCommand {
         'skip-bundler': skipBundler,
         platform,
         'private-key-path': privateKeyPath,
+        'non-interactive': nonInteractive,
       },
     } = await this.parse(UpdatePublish);
     if (jsonFlag) {
@@ -225,9 +230,24 @@ export default class UpdatePublish extends EasCommand {
       isPublicConfig: true,
     });
 
-    const codeSigningInfo = await getCodeSigningInfoAsync(exp, privateKeyPath);
+    const { exp: expPrivate } = getConfig(projectDir, {
+      skipSDKVersionRequirement: true,
+      isPublicConfig: false,
+    });
 
-    if (!isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion)) {
+    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
+
+    const hasExpoUpdates = isExpoUpdatesInstalledOrAvailable(projectDir, exp.sdkVersion);
+    if (!hasExpoUpdates && nonInteractive) {
+      Errors.error(
+        `${chalk.bold(
+          'expo-updates'
+        )} must already be installed when executing in non-interactive mode`,
+        { exit: 1 }
+      );
+    }
+
+    if (!hasExpoUpdates) {
       const install = await confirmAsync({
         message: `You are creating an update which requires ${chalk.bold(
           'expo-updates'
@@ -254,6 +274,10 @@ export default class UpdatePublish extends EasCommand {
     }
 
     if (!branchName) {
+      if (nonInteractive) {
+        throw new Error('Must supply --branch or use --auto when in non-interactive mode');
+      }
+
       const validationMessage = 'Branch name may not be empty.';
       if (jsonFlag) {
         throw new Error(validationMessage);
@@ -303,6 +327,10 @@ export default class UpdatePublish extends EasCommand {
       if (group) {
         updatesToRepublish = await getUpdateGroupAsync({ group });
       } else {
+        if (nonInteractive) {
+          throw new Error('Must supply --group when in non-interactive mode');
+        }
+
         // Drop into interactive mode if the user has not specified an update group to republish.
         if (jsonFlag) {
           throw new Error('You must specify the update group to republish.');
@@ -367,6 +395,10 @@ export default class UpdatePublish extends EasCommand {
       oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
 
       if (!message) {
+        if (nonInteractive) {
+          throw new Error('Must supply --message when in non-interactive mode');
+        }
+
         const validationMessage = 'publish message may not be empty.';
         if (jsonFlag) {
           throw new Error(validationMessage);
@@ -385,6 +417,10 @@ export default class UpdatePublish extends EasCommand {
       }
 
       if (!message) {
+        if (nonInteractive) {
+          throw new Error('Must supply --message or use --auto when in non-interactive mode');
+        }
+
         const validationMessage = 'publish message may not be empty.';
         if (jsonFlag) {
           throw new Error(validationMessage);

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

@@ -1,5 +1,5 @@
 import AppStoreApi from '../ios/appstore/AppStoreApi';
-import { AuthCtx } from '../ios/appstore/authenticate';
+import { AuthCtx } from '../ios/appstore/authenticateTypes';
 
 export const testAuthCtx: AuthCtx = {
   appleId: 'test-apple-id',

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

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

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

@@ -1,5 +1,8 @@
+import chalk from 'chalk';
+import fs from 'fs-extra';
+
 import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
-import Log from '../../../log';
+import Log, { learnMore } from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { Account } from '../../../user/Account';
 import { CredentialsContext } from '../../context';
@@ -41,14 +44,33 @@ export class CreateGoogleServiceAccountKey {
       return detectedPath;
     }
 
-    const { keyJsonPath } = await promptAsync([
-      {
-        type: 'text',
-        name: 'keyJsonPath',
-        message: 'Path to Google Service Account Key JSON file:',
-        validate: (value: string) => value.length > 0 || "Path can't be empty",
+    Log.log(
+      `${chalk.bold(
+        'A Google Service Account JSON key is required to upload your app to Google Play Store'
+      )}.\n` +
+        `If you're not sure what this is or how to create one, ${learnMore(
+          'https://expo.fyi/creating-google-service-account',
+          { learnMoreMessage: 'learn more' }
+        )}`
+    );
+    const { filePath } = await promptAsync({
+      name: 'filePath',
+      message: 'Path to Google Service Account file:',
+      initial: 'api-0000000000000000000-111111-aaaaaabbbbbb.json',
+      type: 'text',
+      // eslint-disable-next-line async-protect/async-suffix
+      validate: async (filePath: string) => {
+        try {
+          const stats = await fs.stat(filePath);
+          if (stats.isFile()) {
+            return true;
+          }
+          return 'Input is not a file.';
+        } catch {
+          return 'File does not exist.';
+        }
       },
-    ]);
-    return keyJsonPath;
+    });
+    return filePath;
   }
 }

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

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

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

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

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

@@ -1,4 +1,3 @@
-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';
@@ -15,7 +14,7 @@ jest.mock('../../utils/keystore', () => ({ generateRandomKeystoreAsync: jest.fn(
 
 describe('CreateKeystore', () => {
   beforeEach(() => {
-    asMock(generateRandomKeystoreAsync).mockReset();
+    jest.mocked(generateRandomKeystoreAsync).mockReset();
   });
   it('creates a keystore in Interactive Mode', async () => {
     const ctx = createCtxMock({ nonInteractive: false });
@@ -28,7 +27,7 @@ describe('CreateKeystore', () => {
     expect(generateRandomKeystoreAsync).toHaveBeenCalled();
   });
   it('creates a keystore by uploading', async () => {
-    asMock(askForUserProvidedAsync).mockImplementationOnce(() => testKeystore);
+    jest.mocked(askForUserProvidedAsync).mockImplementationOnce(async () => 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,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { confirmAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -9,7 +8,7 @@ import { getAppLookupParamsFromContextAsync } from '../BuildCredentialsUtils';
 import { RemoveFcm } from '../RemoveFcm';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(RemoveFcm, () => {
   it('removes an FCM API Key', async () => {

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

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

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

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

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

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

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

@@ -1,6 +1,5 @@
 import { vol } from 'memfs';
 
-import { asMock } from '../../../../__tests__/utils';
 import { AndroidKeystoreType } from '../../../../graphql/generated';
 import { confirmAsync } from '../../../../prompts';
 import {
@@ -13,13 +12,14 @@ 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');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => 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 () => {
-    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
+    jest.mocked(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 () => {
-    asMock(SelectAndroidBuildCredentials).mockImplementation(() => {
+    jest.mocked(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,6 +1,5 @@
 import { vol } from 'memfs';
 
-import { asMock } from '../../../../__tests__/utils';
 import { promptAsync } from '../../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -14,8 +13,8 @@ import { SetUpGoogleServiceAccountKey } from '../SetUpGoogleServiceAccountKey';
 
 jest.mock('../../../../prompts');
 jest.mock('fs');
-asMock(promptAsync).mockImplementation(() => ({
-  keyJsonPath: '/google-service-account-key.json',
+jest.mocked(promptAsync).mockImplementation(async () => ({
+  filePath: '/google-service-account-key.json',
 }));
 
 beforeEach(() => {

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

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

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

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

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

@@ -10,6 +10,7 @@ import { Actor, getActorDisplayName } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
+import { AuthenticationMode } from './ios/appstore/authenticateTypes';
 
 export class CredentialsContext {
   public readonly android = AndroidGraphqlClient;
@@ -99,6 +100,11 @@ export class CredentialsContext {
       return;
     }
 
+    if (this.appStore.defaultAuthenticationMode === AuthenticationMode.API_KEY) {
+      await this.appStore.ensureAuthenticatedAsync();
+      return;
+    }
+
     Log.log(
       chalk.green(
         'If you provide your Apple account credentials we will be able to generate all necessary build credentials and fully validate them.'

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

@@ -2,7 +2,6 @@ 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,
@@ -25,8 +24,8 @@ jest.mock('prompts');
 describe('update credentials.json', () => {
   beforeEach(() => {
     vol.reset();
-    asMock(prompts).mockReset();
-    asMock(prompts).mockImplementation(() => {
+    jest.mocked(prompts).mockReset();
+    jest.mocked(prompts).mockImplementation(() => {
       throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
     });
   });
@@ -176,6 +175,7 @@ describe('update credentials.json', () => {
       {
         targetName: 'testapp',
         bundleIdentifier: 'com.bundle.id',
+        entitlements: {},
       },
     ];
 

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

@@ -11,7 +11,6 @@ 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';
 
@@ -20,7 +19,6 @@ interface Options {
   targets: Target[];
   distribution: DistributionType;
   enterpriseProvisioning?: IosEnterpriseProvisioning;
-  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
 
 export default class IosCredentialsProvider {
@@ -63,7 +61,6 @@ 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,7 +58,13 @@ describe(IosCredentialsProvider, () => {
             },
             projectName: appLookupParams.projectName,
           },
-          targets: [{ targetName: 'testapp', bundleIdentifier: appLookupParams.bundleIdentifier }],
+          targets: [
+            {
+              targetName: 'testapp',
+              bundleIdentifier: appLookupParams.bundleIdentifier,
+              entitlements: {},
+            },
+          ],
           distribution: 'store',
         });
         await expect(provider.getCredentialsAsync(CredentialsSource.REMOTE)).rejects.toThrowError(
@@ -95,7 +101,13 @@ describe(IosCredentialsProvider, () => {
             },
             projectName: appLookupParams.projectName,
           },
-          targets: [{ targetName: 'testapp', bundleIdentifier: appLookupParams.bundleIdentifier }],
+          targets: [
+            {
+              targetName: 'testapp',
+              bundleIdentifier: appLookupParams.bundleIdentifier,
+              entitlements: {},
+            },
+          ],
           distribution: 'store',
         });
 

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

@@ -94,7 +94,6 @@ async function generateAscApiKeyAsync(
   ctx: CredentialsContext,
   purpose: AppStoreApiKeyPurpose
 ): Promise<MinimalAscApiKey> {
-  //console.log('debug');
   await ctx.appStore.ensureAuthenticatedAsync();
   const ascApiKey = await ctx.appStore.createAscApiKeyAsync({
     nickname: getAscApiKeyName(purpose),

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

@@ -12,7 +12,7 @@ import { MissingCredentialsNonInteractiveError } from '../../errors';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
 import { ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
-import { AuthCtx } from '../appstore/authenticate';
+import { AuthCtx } from '../appstore/authenticateTypes';
 
 export class ConfigureProvisioningProfile {
   constructor(
@@ -84,7 +84,7 @@ export class ConfigureProvisioningProfile {
         certP12: certificateP12,
         certPassword: certificatePassword,
         distCertSerialNumber: serialNumber,
-        teamId: authCtx.appleId,
+        teamId: authCtx.team.id,
       }
     );
 

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

@@ -9,7 +9,7 @@ import { askForUserProvidedAsync } from '../../utils/promptForCredentials';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
 import { ProvisioningProfile } from '../appstore/Credentials.types';
-import { AuthCtx } from '../appstore/authenticate';
+import { AuthCtx } from '../appstore/authenticateTypes';
 import { provisioningProfileSchema } from '../credentials';
 import { resolveAppleTeamIfAuthenticatedAsync } from './AppleTeamUtils';
 import { generateProvisioningProfileAsync } from './ProvisioningProfileUtils';
@@ -68,7 +68,7 @@ export class CreateProvisioningProfile {
       certP12: this.distributionCertificate.certificateP12,
       certPassword: this.distributionCertificate.certificatePassword,
       distCertSerialNumber: this.distributionCertificate.serialNumber,
-      teamId: this.distributionCertificate.appleTeam?.appleTeamIdentifier ?? appleAuthCtx.appleId,
+      teamId: this.distributionCertificate.appleTeam?.appleTeamIdentifier ?? appleAuthCtx.team.id,
     });
   }
 }

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

@@ -4,7 +4,6 @@ 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';
@@ -14,7 +13,6 @@ interface Options {
   targets: Target[];
   distribution: DistributionType;
   enterpriseProvisioning?: IosEnterpriseProvisioning;
-  iosCapabilitiesOptions?: IosCapabilitiesOptions;
 }
 
 export class SetUpBuildCredentials {
@@ -50,7 +48,9 @@ export class SetUpBuildCredentials {
         Log.newLine();
       }
       const action = new SetUpTargetBuildCredentials({
-        ...this.options,
+        enterpriseProvisioning: this.options.enterpriseProvisioning,
+        distribution: this.options.distribution,
+        entitlements: target.entitlements,
         app: {
           ...this.options.app,
           bundleIdentifier: target.bundleIdentifier,

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

@@ -1,4 +1,5 @@
 import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
+import { JSONObject } from '@expo/json-file';
 
 import {
   IosDistributionType as GraphQLIosDistributionType,
@@ -7,7 +8,6 @@ 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;
-  iosCapabilitiesOptions?: IosCapabilitiesOptions;
+  entitlements: JSONObject;
 }
 export class SetUpTargetBuildCredentials {
   constructor(private options: Options) {}
 
   async runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment> {
-    const { app, iosCapabilitiesOptions } = this.options;
+    const { app, entitlements } = this.options;
 
     await ctx.bestEffortAppStoreAuthenticateAsync();
 
@@ -33,7 +33,7 @@ export class SetUpTargetBuildCredentials {
           bundleIdentifier: app.bundleIdentifier,
           projectName: app.projectName,
         },
-        iosCapabilitiesOptions
+        { entitlements }
       );
     }
     try {

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -11,7 +10,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { RemoveDistributionCertificate } from '../RemoveDistributionCertificate';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe('RemoveDistributionCertificate', () => {
   it('deletes the distribution certificate on Expo and Apple servers when there are no App Dependencies in Interactive Mode', async () => {
@@ -24,11 +23,11 @@ describe('RemoveDistributionCertificate', () => {
     await removeDistCertAction.runAsync(ctx);
 
     // expect dist cert to be deleted on expo servers
-    expect(asMock(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect dist cert to be deleted on apple portal
-    expect(asMock(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(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 });
@@ -40,11 +39,11 @@ describe('RemoveDistributionCertificate', () => {
     await removeDistCertAction.runAsync(ctx);
 
     // expect dist cert to be deleted on expo servers
-    expect(asMock(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
     // not supported in non-interactive mode
-    expect(asMock(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(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(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(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 });
@@ -56,11 +55,11 @@ describe('RemoveDistributionCertificate', () => {
     await removeDistCertAction.runAsync(ctx);
 
     // expect dist cert to be deleted on expo servers
-    expect(asMock(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.deleteDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect dist cert to be deleted on apple portal
-    expect(asMock(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.appStore.revokeDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile deletion to be invoked on expo servers
-    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
 import { testTargets } from '../../../__tests__/fixtures-ios';
@@ -20,6 +19,6 @@ describe('RemoveProvisioningProfile', () => {
     await removeProfilesAction.runAsync(ctx);
 
     // expect provisioning profile to be deleted from servers
-    expect(asMock(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.deleteProvisioningProfilesAsync).mock.calls.length).toBe(1);
   });
 });

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

@@ -1,11 +1,10 @@
-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');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(RemovePushKey, () => {
   it('deletes the push key on Expo and Apple servers in Interactive Mode', async () => {
@@ -14,9 +13,9 @@ describe(RemovePushKey, () => {
     await removePushKeyAction.runAsync(ctx);
 
     // expect push key to be deleted on expo servers
-    expect(asMock(ctx.ios.deletePushKeyAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.deletePushKeyAsync).mock.calls.length).toBe(1);
     // expect push key to be revoked on apple portal
-    expect(asMock(ctx.appStore.revokePushKeyAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -15,7 +14,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { SetUpAscApiKey, SetupAscApiKeyChoice } from '../SetUpAscApiKey';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(SetUpAscApiKey, () => {
   it('skips setting up a ASC API Key if it is already configured', async () => {
@@ -36,9 +35,9 @@ describe(SetUpAscApiKey, () => {
     await setupAscApiKeyAction.runAsync(ctx);
 
     // expect not to create a new ASC API Key on expo servers
-    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
     // expect configuration not to be updated with a new ASC API Key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(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({
@@ -61,9 +60,9 @@ describe(SetUpAscApiKey, () => {
     await setupAscApiKeyAction.runAsync(ctx);
 
     // expect to create a new ASC API Key on expo servers
-    expect(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(1);
     // expect configuration to be updated with a new ASC API Key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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({
@@ -87,9 +86,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(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
     // expect configuration to be updated with a new ASC API Key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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({
@@ -99,7 +98,7 @@ describe(SetUpAscApiKey, () => {
         getAscApiKeysForAccountAsync: jest.fn(() => [testAscApiKeyFragment]),
       },
     });
-    asMock(promptAsync).mockImplementation(() => ({
+    jest.mocked(promptAsync).mockImplementation(async () => ({
       choice: SetupAscApiKeyChoice.USE_EXISTING,
       chosenAscApiKey: testAscApiKeyFragment,
     }));
@@ -111,9 +110,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(asMock(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createAscApiKeyAsync).mock.calls.length).toBe(0);
     // expect configuration to be updated with a new ASC API Key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { IosAppBuildCredentialsFragment, IosDistributionType } from '../../../../graphql/generated';
 import { promptAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -14,10 +13,10 @@ jest.mock('../SetUpProvisioningProfile');
 jest.mock('../BuildCredentialsUtils', () => ({ getAllBuildCredentialsAsync: jest.fn() }));
 
 beforeEach(() => {
-  asMock(promptAsync).mockReset();
+  jest.mocked(promptAsync).mockReset();
 
-  asMock(getAllBuildCredentialsAsync).mockReset();
-  asMock(getAllBuildCredentialsAsync).mockImplementation(() => {
+  jest.mocked(getAllBuildCredentialsAsync).mockReset();
+  jest.mocked(getAllBuildCredentialsAsync).mockImplementation(() => {
     throw new Error(
       `unhandled getAllBuildCredentialsAsync call - this shouldn't happen - fix tests!`
     );
@@ -37,7 +36,7 @@ describe(SetUpInternalProvisioningProfile, () => {
   describe('interactive mode', () => {
     describe('when authenticated with apple', () => {
       it('runs the SetUpAdhocProvisioningProfile action for non-enterprise team', async () => {
-        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [];
           return buildCredentials;
         });
@@ -64,10 +63,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('asks the user for an action to run when they have access to an enterprise team', async () => {
-        asMock(promptAsync).mockImplementationOnce(() => ({
+        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [];
           return buildCredentials;
         });
@@ -99,10 +98,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 () => {
-        asMock(promptAsync).mockImplementationOnce(() => ({
+        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [
             testAdhocBuildCredentials,
             testEnterpriseBuildCredentials,
@@ -133,10 +132,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('runs the SetUpAdhocProvisioningProfile action when adhoc credentials exist', async () => {
-        asMock(promptAsync).mockImplementationOnce(() => ({
+        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [testAdhocBuildCredentials];
           return buildCredentials;
         });
@@ -164,10 +163,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('runs the SetUpProvisioningProfile action when enterprise credentials exist', async () => {
-        asMock(promptAsync).mockImplementationOnce(() => ({
+        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [
             testEnterpriseBuildCredentials,
           ];
@@ -197,10 +196,10 @@ describe(SetUpInternalProvisioningProfile, () => {
       });
 
       it('forces the apple authentication when neither adhoc nor enterprise credentials exist', async () => {
-        asMock(promptAsync).mockImplementationOnce(() => ({
+        jest.mocked(promptAsync).mockImplementationOnce(async () => ({
           distributionType: IosDistributionType.Enterprise,
         }));
-        asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+        jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
           const buildCredentials: IosAppBuildCredentialsFragment[] = [];
           return buildCredentials;
         });
@@ -228,7 +227,7 @@ describe(SetUpInternalProvisioningProfile, () => {
 
   describe('non-interactive mode', () => {
     it('throws an error when both adhoc and enterprise credentials are set up', async () => {
-      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [
           testAdhocBuildCredentials,
           testEnterpriseBuildCredentials,
@@ -249,7 +248,7 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
 
     it('throws an error when neither adhoc nor enterprise credentials are set up', async () => {
-      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [];
         return buildCredentials;
       });
@@ -265,7 +264,7 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
 
     it('runs the SetUpAdhocProvisioningProfile action when adhoc credentials exist', async () => {
-      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [testAdhocBuildCredentials];
         return buildCredentials;
       });
@@ -287,7 +286,7 @@ describe(SetUpInternalProvisioningProfile, () => {
     });
 
     it('runs the SetUpProvisioningProfile action when enterprise credentials exist', async () => {
-      asMock(getAllBuildCredentialsAsync).mockImplementationOnce(() => {
+      jest.mocked(getAllBuildCredentialsAsync).mockImplementationOnce(async () => {
         const buildCredentials: IosAppBuildCredentialsFragment[] = [testEnterpriseBuildCredentials];
         return buildCredentials;
       });

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

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

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

@@ -1,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
 import { getAppstoreMock, testAuthCtx } from '../../../__tests__/fixtures-appstore';
@@ -8,7 +7,7 @@ import { getAppLookupParamsFromContext } from '../BuildCredentialsUtils';
 import { SetUpPushKey } from '../SetUpPushKey';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(SetUpPushKey, () => {
   it('skips setting up a Push Key if it is already configured', async () => {
@@ -24,9 +23,9 @@ describe(SetUpPushKey, () => {
     await setupPushKeyAction.runAsync(ctx);
 
     // expect not to create a new push key on expo servers
-    expect(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
     // expect configuration not to be updated with a new push key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(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({
@@ -42,9 +41,9 @@ describe(SetUpPushKey, () => {
     await setupPushKeyAction.runAsync(ctx);
 
     // expect to create a new push key on expo servers
-    expect(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(1);
     // expect configuration to be updated with a new push key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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({
@@ -66,9 +65,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(asMock(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createPushKeyAsync).mock.calls.length).toBe(0);
     // expect configuration not to be updated with a new push key
-    expect(asMock(ctx.ios.updateIosAppCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync, promptAsync } from '../../../../prompts';
 import { createCtxMock } from '../../../__tests__/fixtures-context';
@@ -15,15 +14,16 @@ import {
 } from '../SetUpSubmissionCredentials';
 
 jest.mock('../../../../prompts');
-asMock(confirmAsync).mockImplementation(() => true);
+jest.mocked(confirmAsync).mockImplementation(async () => true);
 
 describe(SetUpSubmissionCredentials, () => {
   it('allows user to enter an App Specific Password', async () => {
-    asMock(promptAsync)
-      .mockImplementationOnce(() => ({
+    jest
+      .mocked(promptAsync)
+      .mockImplementationOnce(async () => ({
         choice: PROMPT_FOR_APP_SPECIFIC_PASSWORD,
       }))
-      .mockImplementationOnce(() => ({
+      .mockImplementationOnce(async () => ({
         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(asMock(promptAsync).mock.calls.length).toBe(2);
+    expect(jest.mocked(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,4 +1,3 @@
-import { asMock } from '../../../../__tests__/utils';
 import { IosDistributionType } from '../../../../graphql/generated';
 import { findApplicationTarget } from '../../../../project/ios/target';
 import { confirmAsync } from '../../../../prompts';
@@ -21,8 +20,8 @@ jest.mock('../../../../prompts');
 jest.mock('../../../credentialsJson/read');
 
 beforeEach(() => {
-  asMock(confirmAsync).mockReset();
-  asMock(confirmAsync).mockImplementation(() => true);
+  jest.mocked(confirmAsync).mockReset();
+  jest.mocked(confirmAsync).mockImplementation(async () => true);
 });
 
 describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
@@ -61,11 +60,13 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect build credentials not to be created or updated on expo servers
-    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      0
+    );
     // expect distribution certificate not to be uploaded on expo servers
-    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(0);
     // expect provisioning profile not to be uploaded on expo servers
-    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(0);
   });
   it('sets up build credentials with no prior configuration in Interactive Mode', async () => {
     const ctx = createCtxMock({
@@ -90,11 +91,13 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      1
+    );
     // expect distribution certificate to be uploaded on expo servers
-    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be uploaded on expo servers
-    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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
@@ -123,11 +126,13 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect build credentials to be created or updated on expo servers
-    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      1
+    );
     // expect distribution certificate to be uploaded on expo servers
-    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be uploaded on expo servers
-    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(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
@@ -157,12 +162,14 @@ describe('SetUpTargetBuildCredentialsFromCredentialsJson', () => {
     await setupBuildCredentialsFromCredentialsJsonAction.runAsync(ctx);
 
     // expect no prompts to be called
-    expect(asMock(confirmAsync).mock.calls.length).toBe(0);
+    expect(jest.mocked(confirmAsync).mock.calls.length).toBe(0);
     // expect build credentials to be created or updated on expo servers
-    expect(asMock(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createOrUpdateIosAppBuildCredentialsAsync).mock.calls.length).toBe(
+      1
+    );
     // expect distribution certificate to be uploaded on expo servers
-    expect(asMock(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createDistributionCertificateAsync).mock.calls.length).toBe(1);
     // expect provisioning profile to be uploaded on expo servers
-    expect(asMock(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
+    expect(jest.mocked(ctx.ios.createProvisioningProfileAsync).mock.calls.length).toBe(1);
   });
 });

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

@@ -1,3 +1,4 @@
+import Log from '../../../log';
 import {
   AscApiKey,
   AscApiKeyInfo,
@@ -14,7 +15,13 @@ import {
   listAscApiKeysAsync,
   revokeAscApiKeyAsync,
 } from './ascApiKey';
-import { AuthCtx, Options as AuthenticateOptions, authenticateAsync } from './authenticate';
+import {
+  Options as AuthenticateOptions,
+  assertUserAuthCtx,
+  authenticateAsync,
+  isUserAuthCtx,
+} from './authenticate';
+import { AuthCtx, AuthenticationMode, UserAuthCtx } from './authenticateTypes';
 import {
   createDistributionCertificateAsync,
   listDistributionCertificatesAsync,
@@ -34,13 +41,36 @@ import {
 } from './provisioningProfile';
 import { createOrReuseAdhocProvisioningProfileAsync } from './provisioningProfileAdhoc';
 import { createPushKeyAsync, listPushKeysAsync, revokePushKeyAsync } from './pushKey';
+import { hasAscEnvVars } from './resolveCredentials';
 
 export default class AppStoreApi {
   public authCtx?: AuthCtx;
+  public defaultAuthenticationMode: AuthenticationMode;
+
+  constructor() {
+    this.defaultAuthenticationMode = hasAscEnvVars()
+      ? AuthenticationMode.API_KEY
+      : AuthenticationMode.USER;
+  }
+
+  public async ensureUserAuthenticatedAsync(options?: AuthenticateOptions): Promise<UserAuthCtx> {
+    if (this.authCtx && !isUserAuthCtx(this.authCtx)) {
+      // already authenticated, but with the wrong type
+      Log.log(`Only user authentication is supported. Reauthenticating as user...`);
+      this.authCtx = undefined;
+    }
+
+    const updatedAuthCtx = await this.ensureAuthenticatedAsync({
+      ...options,
+      mode: AuthenticationMode.USER,
+    });
+    return assertUserAuthCtx(updatedAuthCtx);
+  }
 
   public async ensureAuthenticatedAsync(options?: AuthenticateOptions): Promise<AuthCtx> {
     if (!this.authCtx) {
-      this.authCtx = await authenticateAsync(options);
+      const mode = options?.mode ?? this.defaultAuthenticationMode;
+      this.authCtx = await authenticateAsync({ mode, ...options });
     }
     return this.authCtx;
   }
@@ -69,18 +99,18 @@ export default class AppStoreApi {
   }
 
   public async listPushKeysAsync(): Promise<PushKeyStoreInfo[]> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await listPushKeysAsync(ctx);
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await listPushKeysAsync(userCtx);
   }
 
   public async createPushKeyAsync(name?: string): Promise<PushKey> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await createPushKeyAsync(ctx, name);
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await createPushKeyAsync(userCtx, name);
   }
 
   public async revokePushKeyAsync(ids: string[]): Promise<void> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await revokePushKeyAsync(ctx, ids);
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await revokePushKeyAsync(userCtx, ids);
   }
 
   public async useExistingProvisioningProfileAsync(
@@ -144,22 +174,22 @@ export default class AppStoreApi {
   }
 
   public async listAscApiKeysAsync(): Promise<AscApiKeyInfo[]> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await listAscApiKeysAsync(ctx);
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await listAscApiKeysAsync(userCtx);
   }
 
   public async getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo | null> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await getAscApiKeyAsync(ctx, keyId);
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await getAscApiKeyAsync(userCtx, keyId);
   }
 
   public async createAscApiKeyAsync({ nickname }: { nickname: string }): Promise<AscApiKey> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await createAscApiKeyAsync(ctx, { nickname });
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await createAscApiKeyAsync(userCtx, { nickname });
   }
 
   public async revokeAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo> {
-    const ctx = await this.ensureAuthenticatedAsync();
-    return await revokeAscApiKeyAsync(ctx, keyId);
+    const userCtx = await this.ensureUserAuthenticatedAsync();
+    return await revokeAscApiKeyAsync(userCtx, keyId);
   }
 }

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

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

@@ -0,0 +1,91 @@
+import { vol } from 'memfs';
+
+import { promptAsync } from '../../../../prompts';
+import { AppleTeamType } from '../authenticateTypes';
+import { resolveAppleTeamAsync, resolveAscApiKeyAsync } from '../resolveCredentials';
+
+jest.mock('../../../../prompts');
+jest.mock('fs');
+
+const testAscApiKey = {
+  keyP8: 'test-key-p8',
+  keyId: 'test-key-id',
+  issuerId: 'test-issuer-id',
+};
+
+beforeEach(() => {
+  vol.reset();
+  process.env = {};
+  jest.mocked(promptAsync).mockReset();
+});
+
+describe(resolveAscApiKeyAsync, () => {
+  it(`uses option overrides over environment variables`, async () => {
+    process.env.EXPO_ASC_API_KEY_PATH = 'not supposed to be here';
+    process.env.EXPO_ASC_KEY_ID = 'not supposed to be here';
+    process.env.EXPO_ASC_ISSUER_ID = 'not supposed to be here';
+    const ascApiKey = await resolveAscApiKeyAsync(testAscApiKey);
+    expect(ascApiKey).toMatchObject(testAscApiKey);
+  });
+  it(`uses environment variables if no option overrides are provided`, async () => {
+    vol.fromJSON({
+      '/test-asc-key.p8': testAscApiKey.keyP8,
+    });
+
+    process.env.EXPO_ASC_API_KEY_PATH = '/test-asc-key.p8';
+    process.env.EXPO_ASC_KEY_ID = testAscApiKey.keyId;
+    process.env.EXPO_ASC_ISSUER_ID = testAscApiKey.issuerId;
+
+    const ascApiKey = await resolveAscApiKeyAsync();
+    expect(ascApiKey).toMatchObject(testAscApiKey);
+  });
+  it(`prompts the user if it can't find anything else`, async () => {
+    vol.fromJSON({
+      '/test-asc-key.p8': testAscApiKey.keyP8,
+    });
+    jest.mocked(promptAsync).mockImplementation(async () => ({
+      ascApiKeyPath: '/test-asc-key.p8',
+      ascIssuerId: testAscApiKey.issuerId,
+      ascApiKeyId: testAscApiKey.keyId,
+    }));
+    const ascApiKey = await resolveAscApiKeyAsync();
+    expect(ascApiKey).toMatchObject(testAscApiKey);
+  });
+});
+
+const testTeam = {
+  teamId: 'test-id',
+  teamName: 'test-name',
+  teamType: AppleTeamType.IN_HOUSE,
+};
+describe(resolveAppleTeamAsync, () => {
+  it(`uses option overrides over environment variables`, async () => {
+    process.env.EXPO_APPLE_TEAM_ID = 'not supposed to be here';
+    process.env.EXPO_APPLE_TEAM_TYPE = 'not supposed to be here';
+    const team = await resolveAppleTeamAsync(testTeam);
+    expect(team).toMatchObject({ id: testTeam.teamId, name: testTeam.teamName, inHouse: true });
+  });
+  it(`uses environment variables if no option overrides are provided`, async () => {
+    process.env.EXPO_APPLE_TEAM_ID = testTeam.teamId;
+    process.env.EXPO_APPLE_TEAM_TYPE = testTeam.teamType;
+
+    const team = await resolveAppleTeamAsync();
+    expect(team).toMatchObject({
+      id: testTeam.teamId,
+      name: undefined,
+      inHouse: true,
+    });
+  });
+  it(`prompts the user if it can't find anything else`, async () => {
+    jest.mocked(promptAsync).mockImplementation(async () => ({
+      appleTeamId: testTeam.teamId,
+      appleTeamType: testTeam.teamType,
+    }));
+    const team = await resolveAppleTeamAsync();
+    expect(team).toMatchObject({
+      id: testTeam.teamId,
+      name: undefined,
+      inHouse: true,
+    });
+  });
+});

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

@@ -3,31 +3,40 @@ import { ApiKey, ApiKeyProps, ApiKeyType, UserRole } from '@expo/apple-utils';
 import Log from '../../../log';
 import { ora } from '../../../ora';
 import { AscApiKey, AscApiKeyInfo } from './Credentials.types';
-import { AuthCtx, getRequestContext } from './authenticate';
+import { getRequestContext } from './authenticate';
+import { AuthCtx, UserAuthCtx } from './authenticateTypes';
 
-export async function listAscApiKeysAsync(authCtx: AuthCtx): Promise<AscApiKeyInfo[]> {
+/**
+ * List App Store Connect API Keys.
+ * **Does not support App Store Connect API (CI).**
+ */
+export async function listAscApiKeysAsync(userAuthCtx: UserAuthCtx): Promise<AscApiKeyInfo[]> {
   const spinner = ora(`Fetching App Store Connect API Keys.`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     const keys = await ApiKey.getAsync(context);
     spinner.succeed(`Fetched App Store Connect API Keys.`);
-    return keys.map(key => getAscApiKeyInfo(key, authCtx));
+    return keys.map(key => getAscApiKeyInfo(key, userAuthCtx));
   } catch (error) {
     spinner.fail(`Failed to fetch App Store Connect API Keys.`);
     throw error;
   }
 }
 
+/**
+ * Get an App Store Connect API Key.
+ * **Does not support App Store Connect API (CI).**
+ */
 export async function getAscApiKeyAsync(
-  authCtx: AuthCtx,
+  userAuthCtx: UserAuthCtx,
   keyId: string
 ): Promise<AscApiKeyInfo | null> {
   const spinner = ora(`Fetching App Store Connect API Key.`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     const apiKey = await ApiKey.infoAsync(context, { id: keyId });
     spinner.succeed(`Fetched App Store Connect API Key (ID: ${keyId}).`);
-    return getAscApiKeyInfo(apiKey, authCtx);
+    return getAscApiKeyInfo(apiKey, userAuthCtx);
   } catch (error: any) {
     const message = error?.message ?? '';
     if (message.includes("There is no resource of type 'apiKeys' with id")) {
@@ -40,8 +49,12 @@ export async function getAscApiKeyAsync(
   }
 }
 
+/**
+ * Create an App Store Connect API Key.
+ * **Does not support App Store Connect API (CI).**
+ */
 export async function createAscApiKeyAsync(
-  authCtx: AuthCtx,
+  userAuthCtx: UserAuthCtx,
   {
     nickname,
     allAppsVisible,
@@ -51,7 +64,7 @@ export async function createAscApiKeyAsync(
 ): Promise<AscApiKey> {
   const spinner = ora(`Creating App Store Connect API Key.`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     const key = await ApiKey.createAsync(context, {
       nickname: nickname ?? `[expo] ${new Date().getTime()}`,
       allAppsVisible: allAppsVisible ?? true,
@@ -76,7 +89,7 @@ export async function createAscApiKeyAsync(
     const fullKey = await ApiKey.infoAsync(context, { id: key.id });
     spinner.succeed(`Created App Store Connect API Key.`);
     return {
-      ...getAscApiKeyInfo(fullKey, authCtx),
+      ...getAscApiKeyInfo(fullKey, userAuthCtx),
       keyP8,
     };
   } catch (err: any) {
@@ -85,17 +98,21 @@ export async function createAscApiKeyAsync(
   }
 }
 
+/**
+ * Revoke an App Store Connect API Key.
+ * **Does not support App Store Connect API (CI).**
+ */
 export async function revokeAscApiKeyAsync(
-  authCtx: AuthCtx,
+  userAuthCtx: UserAuthCtx,
   keyId: string
 ): Promise<AscApiKeyInfo> {
   const spinner = ora(`Revoking App Store Connect API Key.`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     const apiKey = await ApiKey.infoAsync(context, { id: keyId });
     const revokedKey = await apiKey.revokeAsync();
     spinner.succeed(`Revoked App Store Connect API Key.`);
-    return getAscApiKeyInfo(revokedKey, authCtx);
+    return getAscApiKeyInfo(revokedKey, userAuthCtx);
   } catch (error) {
     Log.error(error);
     spinner.fail(`Failed to revoke App Store Connect API Key.`);

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

@@ -4,16 +4,28 @@ import {
   RequestContext,
   Session,
   Teams,
+  Token,
 } from '@expo/apple-utils';
 import assert from 'assert';
 import chalk from 'chalk';
 
 import Log from '../../../log';
 import { toggleConfirmAsync } from '../../../prompts';
+import { MinimalAscApiKey } from '../credentials';
+import {
+  ApiKeyAuthCtx,
+  AppleTeamType,
+  AuthCtx,
+  AuthenticationMode,
+  Team,
+  UserAuthCtx,
+} from './authenticateTypes';
 import {
   deletePasswordAsync,
   promptPasswordAsync,
-  resolveCredentialsAsync,
+  resolveAppleTeamAsync,
+  resolveAscApiKeyAsync,
+  resolveUserCredentialsAsync,
 } from './resolveCredentials';
 
 const APPLE_IN_HOUSE_TEAM_TYPE = 'in-house';
@@ -21,31 +33,27 @@ const APPLE_IN_HOUSE_TEAM_TYPE = 'in-house';
 export type Options = {
   appleId?: string;
   teamId?: string;
+  teamName?: string;
+  teamType?: AppleTeamType;
+  ascApiKey?: MinimalAscApiKey;
   /**
    * Can be used to restore the Apple auth state via apple-utils.
    */
   cookies?: Session.AuthState['cookies'];
+  /** Indicates how Apple network requests will be made. */
+  mode?: AuthenticationMode;
 };
 
-export type Team = {
-  id: string;
-  name: string;
-  inHouse?: boolean;
-};
+export function isUserAuthCtx(authCtx: AuthCtx | undefined): authCtx is UserAuthCtx {
+  return !!authCtx && typeof (authCtx as UserAuthCtx).appleId === 'string';
+}
 
-export type AuthCtx = {
-  appleId: string;
-  appleIdPassword?: string;
-  team: Team;
-  /**
-   * Defined when using Fastlane
-   */
-  fastlaneSession?: string;
-  /**
-   * Can be used to restore the Apple auth state via apple-utils.
-   */
-  authState?: Session.AuthState;
-};
+export function assertUserAuthCtx(authCtx: AuthCtx | undefined): UserAuthCtx {
+  if (isUserAuthCtx(authCtx)) {
+    return authCtx;
+  }
+  throw new Error('Expected user authentication context (login/password).');
+}
 
 export function getRequestContext(authCtx: AuthCtx): RequestContext {
   assert(authCtx.authState?.context, 'Apple request context must be defined');
@@ -67,7 +75,7 @@ async function loginAsync(
   }
 
   // Resolve the user credentials, optimizing for password-less login.
-  const { username, password } = await resolveCredentialsAsync(userCredentials);
+  const { username, password } = await resolveUserCredentialsAsync(userCredentials);
   assert(username);
 
   // Clear data
@@ -144,6 +152,35 @@ async function loginWithUserCredentialsAsync({
 }
 
 export async function authenticateAsync(options: Options = {}): Promise<AuthCtx> {
+  if (options.mode === AuthenticationMode.API_KEY) {
+    return await authenticateWithApiKeyAsync(options);
+  } else {
+    return await authenticateAsUserAsync(options);
+  }
+}
+
+async function authenticateWithApiKeyAsync(options: Options = {}): Promise<ApiKeyAuthCtx> {
+  // Resolve the user credentials, optimizing for password-less login.
+  const ascApiKey = await resolveAscApiKeyAsync(options.ascApiKey);
+  const team = await resolveAppleTeamAsync(options);
+  const jwtDurationSeconds = 1200; // 20 minutes
+  return {
+    team,
+    authState: {
+      context: {
+        token: new Token({
+          key: ascApiKey.keyP8,
+          issuerId: ascApiKey.issuerId,
+          keyId: ascApiKey.keyId,
+          duration: jwtDurationSeconds,
+        }),
+      },
+    },
+    ascApiKey,
+  };
+}
+
+async function authenticateAsUserAsync(options: Options = {}): Promise<AuthCtx> {
   // help keep apple login visually apart from the other operations.
   Log.addNewLineIfNone();
 

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

@@ -0,0 +1,48 @@
+import { Session } from '@expo/apple-utils';
+
+import { MinimalAscApiKey } from '../credentials';
+
+export enum AuthenticationMode {
+  /** App Store API requests will be made using the official API via an API key, used for CI environments where 2FA cannot be performed. */
+  API_KEY,
+  /** Uses cookies based authentication and the unofficial App Store web API, this provides more functionality than the official API but cannot be reliably used in CI because it requires 2FA. */
+  USER,
+}
+
+export enum AppleTeamType {
+  IN_HOUSE = 'IN_HOUSE',
+  COMPANY_OR_ORGANIZATION = 'COMPANY_OR_ORGANIZATION',
+  INDIVIDUAL = 'INDIVIDUAL',
+}
+
+export type Team = {
+  id: string;
+  /** Name of the development team, this is undefined when ASC API keys are used instead of cookies for authentication. */
+  name?: string;
+  inHouse?: boolean;
+};
+
+export type UserAuthCtx = {
+  appleId: string;
+  appleIdPassword?: string;
+  team: Team;
+  /**
+   * Defined when using Fastlane
+   */
+  fastlaneSession?: string;
+  /**
+   * Can be used to restore the Apple auth state via apple-utils.
+   */
+  authState?: Session.AuthState;
+};
+
+export type ApiKeyAuthCtx = {
+  ascApiKey: MinimalAscApiKey;
+  team: Team;
+  /**
+   * Can be used to restore the Apple auth state via apple-utils.
+   */
+  authState?: Partial<Session.AuthState>;
+};
+
+export type AuthCtx = UserAuthCtx | ApiKeyAuthCtx;

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

@@ -2,6 +2,7 @@ import { BundleId, CapabilityTypeOption } from '@expo/apple-utils';
 import { JSONObject } from '@expo/json-file';
 
 import Log from '../../../log';
+import { isAppStoreConnectTokenOnlyContext } from '../utils/authType';
 import {
   CapabilityMapping,
   EXPO_NO_CAPABILITY_SYNC,
@@ -15,6 +16,8 @@ type UpdateCapabilityRequest = Parameters<BundleId['updateBundleIdCapabilityAsyn
  * If a capability identifier is missing, then attempt to create it.
  * Link all of the capability identifiers at the same time after parsing the entitlements file.
  *
+ * **Does not support App Store Connect API (CI).**
+ *
  * @param bundleId Bundle identifier object.
  * @param entitlements JSON representation of the iOS entitlements plist
  *
@@ -28,6 +31,15 @@ export async function syncCapabilityIdentifiersForEntitlementsAsync(
     return { created: [], linked: [] };
   }
 
+  // App Store Connect token authentication is not currently supported,
+  // the team ID is required to create capability identifiers.
+  if (isAppStoreConnectTokenOnlyContext(bundleId.context)) {
+    Log.warn(
+      `Skipping capability identifier syncing because the current Apple authentication session is not using Cookies (username/password).`
+    );
+    return { created: [], linked: [] };
+  }
+
   const createdIds: string[] = [];
   const linkedIds: string[] = [];
   const CapabilityIdMapping = CapabilityMapping.filter(capability => capability.capabilityIdModel);

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

@@ -5,6 +5,9 @@ import Log from '../../../log';
 import type { Ora } from '../../../ora';
 import { convertHTMLToASCII } from '../utils/convertHTMLToASCII';
 
+/**
+ * **Does not support App Store Connect API (CI).**
+ */
 async function getContractStatusAsync(
   context: RequestContext
 ): Promise<ITCAgreements.ITCContractStatus | null> {
@@ -17,6 +20,9 @@ async function getContractStatusAsync(
   }
 }
 
+/**
+ * **Does not support App Store Connect API (CI).**
+ */
 async function getContractMessagesAsync(
   context: RequestContext
 ): Promise<ITCAgreements.ITCContractMessage[] | null> {
@@ -28,6 +34,9 @@ async function getContractMessagesAsync(
   }
 }
 
+/**
+ * **Does not support App Store Connect API (CI).**
+ */
 async function getRequiredContractMessagesAsync(
   context: RequestContext
 ): Promise<{ messages: ITCAgreements.ITCContractMessage[]; isFatal: boolean }> {
@@ -77,6 +86,9 @@ export function formatContractMessage(message: ITCAgreements.ITCContractMessage)
   });
 }
 
+/**
+ * **Does not support App Store Connect API (CI).**
+ */
 export async function assertContractMessagesAsync(
   context: RequestContext,
   spinner?: Ora

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

@@ -7,7 +7,8 @@ import {
 
 import { ora } from '../../../ora';
 import { DistributionCertificate, DistributionCertificateStoreInfo } from './Credentials.types';
-import { AuthCtx, getRequestContext } from './authenticate';
+import { getRequestContext } from './authenticate';
+import { AuthCtx } from './authenticateTypes';
 
 export class AppleTooManyCertsError extends Error {}
 

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

@@ -4,7 +4,8 @@ import chalk from 'chalk';
 
 import Log from '../../../log';
 import { ora } from '../../../ora';
-import { AuthCtx, getRequestContext } from './authenticate';
+import { getRequestContext, isUserAuthCtx } from './authenticate';
+import { AuthCtx, UserAuthCtx } from './authenticateTypes';
 import { syncCapabilitiesForEntitlementsAsync } from './bundleIdCapabilities';
 import { syncCapabilityIdentifiersForEntitlementsAsync } from './capabilityIdentifiers';
 import { assertContractMessagesAsync } from './contractMessages';
@@ -72,7 +73,13 @@ export async function ensureBundleIdExistsWithNameAsync(
         // Unable to process request - PLA Update available - You currently don't have access to this membership resource. To resolve this issue, agree to the latest Program License Agreement in your developer account.
         err.message.match(/agree/)
       ) {
-        await assertContractMessagesAsync(context);
+        if (isUserAuthCtx(authCtx)) {
+          await assertContractMessagesAsync(context);
+        } else {
+          Log.warn(
+            `You currently don't have access to this membership resource. To resolve this issue, agree to the latest Program License Agreement in your developer account.`
+          );
+        }
       }
     }
 
@@ -150,7 +157,7 @@ export async function syncCapabilityIdentifiersAsync(
 }
 
 export async function ensureAppExistsAsync(
-  authCtx: AuthCtx,
+  userAuthCtx: UserAuthCtx,
   {
     name,
     language,
@@ -165,7 +172,7 @@ export async function ensureAppExistsAsync(
     sku?: string;
   }
 ): Promise<App> {
-  const context = getRequestContext(authCtx);
+  const context = getRequestContext(userAuthCtx);
   const spinner = ora(`Linking to App Store Connect ${chalk.dim(bundleIdentifier)}`).start();
 
   let app = await App.findAsync(context, { bundleId: bundleIdentifier });
@@ -176,7 +183,9 @@ export async function ensureAppExistsAsync(
     try {
       // Assert contract errors when the user needs to create an app.
       await assertContractMessagesAsync(context, spinner);
-
+      /**
+       * **Does not support App Store Connect API (CI).**
+       */
       app = await App.createAsync(context, {
         bundleId: bundleIdentifier,
         name,
@@ -186,9 +195,8 @@ export async function ensureAppExistsAsync(
       });
     } catch (error: any) {
       if (error.message.match(/An App ID with Identifier '(.*)' is not available/)) {
-        const providerName = authCtx.authState?.session.provider.name;
         throw new Error(
-          `\nThe bundle identifier "${bundleIdentifier}" is not available to provider "${providerName}". Please change it in your app config and try again.\n`
+          `\nThe bundle identifier "${bundleIdentifier}" is not available to provider "${userAuthCtx.authState?.session.provider.name}. Please change it in your app config and try again.\n`
         );
       }
 

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

@@ -1,13 +1,15 @@
 import { Profile, ProfileType, RequestContext } from '@expo/apple-utils';
 
 import { ora } from '../../../ora';
+import { isAppStoreConnectTokenOnlyContext } from '../utils/authType';
 import { findP12CertSerialNumber } from '../utils/p12Certificate';
 import {
   DistributionCertificate,
   ProvisioningProfile,
   ProvisioningProfileStoreInfo,
 } from './Credentials.types';
-import { AuthCtx, getRequestContext } from './authenticate';
+import { getRequestContext } from './authenticate';
+import { AuthCtx } from './authenticateTypes';
 import { getBundleIdForIdentifierAsync, getProfilesForBundleIdAsync } from './bundleId';
 import { getCertificateBySerialNumberAsync, transformCertificate } from './distributionCertificate';
 
@@ -70,6 +72,12 @@ async function addCertificateToProfileAsync(
 
   // Assign the new certificate
   profile.attributes.certificates = [cert];
+
+  // Experimentally regenerate the provisioning profile using App Store Connect API.
+  if (isAppStoreConnectTokenOnlyContext(profile.context)) {
+    return await profile.regenerateManuallyAsync();
+  }
+  // This method does not support App Store Connect API.
   return await profile.regenerateAsync();
 }
 

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

@@ -1,8 +1,10 @@
 import { Device, Profile, ProfileState, ProfileType, RequestContext } from '@expo/apple-utils';
 
 import { ora } from '../../../ora';
+import { isAppStoreConnectTokenOnlyContext } from '../utils/authType';
 import { ProvisioningProfile } from './Credentials.types';
-import { AuthCtx, getRequestContext } from './authenticate';
+import { getRequestContext } from './authenticate';
+import { AuthCtx } from './authenticateTypes';
 import { getBundleIdForIdentifierAsync, getProfilesForBundleIdAsync } from './bundleId';
 import { getDistributionCertificateAsync } from './distributionCertificate';
 
@@ -89,7 +91,15 @@ async function findProfileByBundleIdAsync(
     }
     const profile = expoProfiles.sort(sortByExpiration)[expoProfiles.length - 1];
     profile.attributes.certificates = [distributionCertificate];
-    return { profile: await profile.regenerateAsync(), didUpdate: true };
+
+    return {
+      profile: isAppStoreConnectTokenOnlyContext(profile.context)
+        ? // Experimentally regenerate the provisioning profile using App Store Connect API.
+          await profile.regenerateManuallyAsync()
+        : // This method does not support App Store Connect API.
+          await profile.regenerateAsync(),
+      didUpdate: true,
+    };
   }
 
   // there is no valid provisioning profile available
@@ -173,7 +183,14 @@ async function manageAdHocProfilesAsync(
     }
     // We need to add new devices to the list and create a new provisioning profile.
     existingProfile.attributes.devices = devices;
-    await existingProfile.regenerateAsync();
+
+    if (isAppStoreConnectTokenOnlyContext(existingProfile.context)) {
+      // Experimentally regenerate the provisioning profile using App Store Connect API.
+      await existingProfile.regenerateManuallyAsync();
+    } else {
+      // This method does not support App Store Connect API.
+      await existingProfile.regenerateAsync();
+    }
 
     const updatedProfile = (await findProfileByBundleIdAsync(context, bundleId, certSerialNumber))
       .profile;

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

@@ -5,7 +5,8 @@ import dateformat from 'dateformat';
 import Log from '../../../log';
 import { ora } from '../../../ora';
 import { PushKey, PushKeyStoreInfo } from './Credentials.types';
-import { AuthCtx, getRequestContext } from './authenticate';
+import { getRequestContext } from './authenticate';
+import { UserAuthCtx } from './authenticateTypes';
 
 const { MaxKeysCreatedError } = Keys;
 
@@ -15,10 +16,14 @@ Please revoke the old ones or reuse existing from your other apps.
 Please remember that Apple Keys are not application specific!
 `;
 
-export async function listPushKeysAsync(authCtx: AuthCtx): Promise<PushKeyStoreInfo[]> {
+/**
+ * List all existing push keys on Apple servers.
+ * **Does not support App Store Connect API (CI).**
+ */
+export async function listPushKeysAsync(userAuthCtx: UserAuthCtx): Promise<PushKeyStoreInfo[]> {
   const spinner = ora(`Fetching Apple push keys`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     const keys = await Keys.getKeysAsync(context);
     spinner.succeed(`Fetched Apple push keys`);
     return keys;
@@ -28,21 +33,25 @@ export async function listPushKeysAsync(authCtx: AuthCtx): Promise<PushKeyStoreI
   }
 }
 
+/**
+ * Create a new push key on Apple servers.
+ * **Does not support App Store Connect API (CI).**
+ */
 export async function createPushKeyAsync(
-  authCtx: AuthCtx,
+  userAuthCtx: UserAuthCtx,
   name: string = `Expo Push Notifications Key ${dateformat('yyyymmddHHMMss')}`
 ): Promise<PushKey> {
   const spinner = ora(`Creating Apple push key`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     const key = await Keys.createKeyAsync(context, { name, isApns: true });
     const apnsKeyP8 = await Keys.downloadKeyAsync(context, { id: key.id });
     spinner.succeed(`Created Apple push key`);
     return {
       apnsKeyId: key.id,
       apnsKeyP8,
-      teamId: authCtx.team.id,
-      teamName: authCtx.team.name,
+      teamId: userAuthCtx.team.id,
+      teamName: userAuthCtx.team.name,
     };
   } catch (err: any) {
     spinner.fail('Failed to create Apple push key');
@@ -57,12 +66,16 @@ export async function createPushKeyAsync(
   }
 }
 
-export async function revokePushKeyAsync(authCtx: AuthCtx, ids: string[]): Promise<void> {
+/**
+ * Revoke an existing push key on Apple servers.
+ * **Does not support App Store Connect API (CI).**
+ */
+export async function revokePushKeyAsync(userAuthCtx: UserAuthCtx, ids: string[]): Promise<void> {
   const name = `Apple push key${ids?.length === 1 ? '' : 's'}`;
 
   const spinner = ora(`Revoking ${name}`).start();
   try {
-    const context = getRequestContext(authCtx);
+    const context = getRequestContext(userAuthCtx);
     await Promise.all(ids.map(id => Keys.revokeKeyAsync(context, { id })));
 
     spinner.succeed(`Revoked ${name}`);

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

@@ -5,6 +5,8 @@ import wrapAnsi from 'wrap-ansi';
 
 import Log, { learnMore } from '../../../log';
 import { promptAsync } from '../../../prompts';
+import { MinimalAscApiKey } from '../credentials';
+import { AppleTeamType, Team } from './authenticateTypes';
 import * as Keychain from './keychain';
 
 /**
@@ -13,7 +15,7 @@ import * as Keychain from './keychain';
  *
  * @param options
  */
-export async function resolveCredentialsAsync(
+export async function resolveUserCredentialsAsync(
   options: Partial<Auth.UserCredentials>
 ): Promise<Partial<Auth.UserCredentials>> {
   const credentials = getAppleIdFromEnvironmentOrOptions(options);
@@ -25,6 +27,162 @@ export async function resolveCredentialsAsync(
   return credentials;
 }
 
+export function hasAscEnvVars(): boolean {
+  return (
+    !!process.env.EXPO_ASC_API_KEY_PATH ||
+    !!process.env.EXPO_ASC_KEY_ID ||
+    !!process.env.EXPO_ASC_ISSUER_ID
+  );
+}
+
+export async function resolveAscApiKeyAsync(
+  ascApiKey?: MinimalAscApiKey
+): Promise<MinimalAscApiKey> {
+  const passedKeyP8 = await getAscKeyP8FromEnvironmentOrOptionsAsync(ascApiKey);
+  const passedKeyId = await getAscKeyIdFromEnvironmentOrOptionsAsync(ascApiKey);
+  const passedIssuerId = await getAscIssuerIdFromEnvironmentOrOptionsAsync(ascApiKey);
+
+  return {
+    keyP8: passedKeyP8,
+    keyId: passedKeyId,
+    issuerId: passedIssuerId,
+  };
+}
+
+async function getAscKeyP8FromEnvironmentOrOptionsAsync(
+  ascApiKey?: MinimalAscApiKey
+): Promise<string> {
+  if (ascApiKey?.keyP8) {
+    return ascApiKey?.keyP8;
+  } else if (process.env.EXPO_ASC_API_KEY_PATH) {
+    return await fs.readFile(process.env.EXPO_ASC_API_KEY_PATH, 'utf-8');
+  }
+
+  const { ascApiKeyPath } = await promptAsync({
+    type: 'text',
+    name: 'ascApiKeyPath',
+    message: `Path to ASC Api Key Path (.p8):`,
+    validate: (val: string) => val !== '',
+  });
+  return await fs.readFile(ascApiKeyPath, 'utf-8');
+}
+
+async function getAscKeyIdFromEnvironmentOrOptionsAsync(
+  ascApiKey?: MinimalAscApiKey
+): Promise<string> {
+  if (ascApiKey?.keyId) {
+    return ascApiKey?.keyId;
+  } else if (process.env.EXPO_ASC_KEY_ID) {
+    return process.env.EXPO_ASC_KEY_ID;
+  }
+
+  const { ascApiKeyId } = await promptAsync({
+    type: 'text',
+    name: 'ascApiKeyId',
+    message: `ASC Api Key ID:`,
+    validate: (val: string) => val !== '',
+  });
+  return ascApiKeyId;
+}
+
+async function getAscIssuerIdFromEnvironmentOrOptionsAsync(
+  ascApiKey?: MinimalAscApiKey
+): Promise<string> {
+  if (ascApiKey?.issuerId) {
+    return ascApiKey?.issuerId;
+  } else if (process.env.EXPO_ASC_ISSUER_ID) {
+    return process.env.EXPO_ASC_ISSUER_ID;
+  }
+
+  const { ascIssuerId } = await promptAsync({
+    type: 'text',
+    name: 'ascIssuerId',
+    message: `ASC Issuer ID:`,
+    validate: (val: string) => val !== '',
+  });
+  return ascIssuerId;
+}
+
+function isAppleTeamType(maybeTeamType: any): maybeTeamType is AppleTeamType {
+  return maybeTeamType in AppleTeamType;
+}
+
+function assertAppleTeamType(maybeTeamType: any): AppleTeamType {
+  if (!isAppleTeamType(maybeTeamType)) {
+    throw new Error(
+      `Invalid Apple Team Type: ${maybeTeamType}. Must be one of ${Object.keys(AppleTeamType).join(
+        ', '
+      )}`
+    );
+  }
+  return maybeTeamType;
+}
+
+function resolveAppleTeamTypeFromEnvironment(): AppleTeamType | undefined {
+  if (!process.env.EXPO_APPLE_TEAM_TYPE) {
+    return undefined;
+  }
+  return assertAppleTeamType(process.env.EXPO_APPLE_TEAM_TYPE);
+}
+
+async function getAppleTeamIdFromEnvironmentOrOptionsAsync(options: {
+  teamId?: string;
+}): Promise<string> {
+  if (options.teamId) {
+    return options.teamId;
+  } else if (process.env.EXPO_APPLE_TEAM_ID) {
+    return process.env.EXPO_APPLE_TEAM_ID;
+  }
+
+  const { appleTeamId } = await promptAsync({
+    type: 'text',
+    name: 'appleTeamId',
+    message: `Apple Team ID:`,
+    validate: (val: string) => val !== '',
+  });
+  return appleTeamId;
+}
+
+async function getAppleTeamTypeFromEnvironmentOrOptionsAsync(options: {
+  teamType?: AppleTeamType;
+}): Promise<string> {
+  if (options.teamType) {
+    return options.teamType;
+  }
+
+  const appleTeamTypeFromEnvironment = resolveAppleTeamTypeFromEnvironment();
+  if (appleTeamTypeFromEnvironment) {
+    return appleTeamTypeFromEnvironment;
+  }
+
+  const { appleTeamType } = await promptAsync({
+    type: 'select',
+    message: 'Select your Apple Team Type:',
+    name: 'appleTeamType',
+    choices: [
+      { title: 'Enterprise', value: AppleTeamType.IN_HOUSE },
+      { title: 'Company/Organization', value: AppleTeamType.COMPANY_OR_ORGANIZATION },
+      { title: 'Individual', value: AppleTeamType.INDIVIDUAL },
+    ],
+  });
+  return appleTeamType;
+}
+
+export async function resolveAppleTeamAsync(
+  options: {
+    teamId?: string;
+    teamName?: string;
+    teamType?: AppleTeamType;
+  } = {}
+): Promise<Team> {
+  const passedTeamType = await getAppleTeamTypeFromEnvironmentOrOptionsAsync(options);
+  return {
+    id: await getAppleTeamIdFromEnvironmentOrOptionsAsync(options),
+    name: options.teamName,
+    inHouse: passedTeamType === AppleTeamType.IN_HOUSE,
+  };
+}
+
 function getAppleIdFromEnvironmentOrOptions({
   username,
   password,

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

@@ -1,3 +1,5 @@
+import { JSONObject } from '@expo/json-file';
+
 import {
   CommonIosAppCredentialsFragment,
   IosAppBuildCredentialsFragment,
@@ -14,6 +16,7 @@ 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,8 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`print credentials prints the IosAppCredentials map 1`] = `
-Array [
-  "iOS Credentials            
+"iOS Credentials            
 Project                    @quinlanj/test52
 Bundle Identifier          com.quinlanj.test52
 Apple Team                 test-apple-identifier 
@@ -51,6 +50,5 @@ Status                     active
 Expiration                 Wed, 13 Oct 2021 18:28:44 UTC
 Apple Team                 test-apple-identifier 
 Updated                    5 months ago
-                           ",
-]
+                           "
 `;

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

@@ -1,7 +1,6 @@
 import mockdate from 'mockdate';
 import nullthrows from 'nullthrows';
 
-import { asMock } from '../../../../__tests__/utils';
 import Log from '../../../../log';
 import { IosAppCredentialsQuery } from '../../api/graphql/queries/IosAppCredentialsQuery';
 import { App, Target } from '../../types';
@@ -29,9 +28,13 @@ describe('print credentials', () => {
     const appCredentials = {
       test52: nullthrows(testIosAppCredentialsData),
     };
-    const targets: Target[] = [{ targetName: 'test52', bundleIdentifier: 'com.quinlanj.test52' }];
+    const targets: Target[] = [
+      { targetName: 'test52', bundleIdentifier: 'com.quinlanj.test52', entitlements: {} },
+    ];
     displayIosCredentials(app, appCredentials, targets);
-    const loggedSoFar = asMock(Log.log).mock.calls.reduce((acc, mockValue) => acc + mockValue);
+    const loggedSoFar = jest
+      .mocked(Log.log)
+      .mock.calls.reduce((acc, mockValue) => acc + mockValue, '');
     expect(loggedSoFar).toMatchSnapshot();
   });
 });

packages/eas-cli/src/credentials/ios/utils/authType.ts

@@ -0,0 +1,6 @@
+import { RequestContext } from '@expo/apple-utils';
+
+/** Is the request context App Store Connect only with no access to cookies authentication. */
+export function isAppStoreConnectTokenOnlyContext(authContext: RequestContext): boolean {
+  return !authContext.teamId && !!authContext.token;
+}

packages/eas-cli/src/credentials/ios/utils/printCredentials.ts

@@ -123,7 +123,7 @@ export function displayIosCredentials(
 export function displayProjectCredentials(
   app: App,
   appBuildCredentials: IosAppBuildCredentialsMap,
-  targets: Target[]
+  targets: Omit<Target, 'entitlements'>[]
 ): void {
   const projectFullName = `@${app.account.name}/${app.projectName}`;
   const targetToBundleId = targets.reduce<Record<string, string>>((acc, target) => {

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

@@ -43,7 +43,6 @@ import { SetUpProvisioningProfile } from '../ios/actions/SetUpProvisioningProfil
 import { SetUpPushKey } from '../ios/actions/SetUpPushKey';
 import { UpdateCredentialsJson } from '../ios/actions/UpdateCredentialsJson';
 import { AppLookupParams } from '../ios/api/GraphqlClient';
-import { getManagedEntitlementsJsonAsync } from '../ios/appstore/entitlements';
 import { App, IosAppCredentialsMap, Target } from '../ios/types';
 import { displayIosCredentials } from '../ios/utils/printCredentials';
 import { ActionInfo, IosActionType, Scope } from './Actions';
@@ -192,10 +191,12 @@ export class ManageIos {
       },
       buildProfile
     );
-    const targets = await resolveTargetsAsync(
-      { exp: ctx.exp, projectDir: ctx.projectDir },
-      xcodeBuildContext
-    );
+    const targets = await resolveTargetsAsync({
+      exp: ctx.exp,
+      projectDir: ctx.projectDir,
+      xcodeBuildContext,
+      env: buildProfile.env,
+    });
     return {
       app,
       targets,
@@ -235,12 +236,6 @@ export class ManageIos {
         targets,
         distribution: buildProfile.distribution,
         enterpriseProvisioning: buildProfile.enterpriseProvisioning,
-        iosCapabilitiesOptions: {
-          entitlements: await getManagedEntitlementsJsonAsync(
-            ctx.projectDir,
-            buildProfile.env ?? {}
-          ),
-        },
       }).runAsync(ctx);
       return;
     }

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

@@ -1,4 +1,3 @@
-import { asMock } from '../../../__tests__/utils';
 import { promptAsync } from '../../../prompts';
 import {
   getNewAndroidApiMock,
@@ -15,12 +14,12 @@ const TEST_STRING = 'TEST_STRING';
 jest.mock('../../../prompts');
 
 beforeEach(() => {
-  asMock(promptAsync).mockReset();
+  jest.mocked(promptAsync).mockReset();
 });
 
 describe(SelectAndroidBuildCredentials, () => {
   it('returns a request to make default build credentials when there are no credentials', async () => {
-    asMock(promptAsync).mockImplementation(() => ({
+    jest.mocked(promptAsync).mockImplementation(async () => ({
       providedName: TEST_STRING,
     }));
     const ctx = createCtxMock({
@@ -38,7 +37,7 @@ describe(SelectAndroidBuildCredentials, () => {
     });
   });
   it('returns a request to make build credentials when the user chooses to make a new one', async () => {
-    asMock(promptAsync).mockImplementation(() => ({
+    jest.mocked(promptAsync).mockImplementation(async () => ({
       buildCredentialsResultOrRequestToCreateNew:
         SelectAndroidBuildCredentialsResultType.CREATE_REQUEST,
       providedName: TEST_STRING,
@@ -60,7 +59,7 @@ describe(SelectAndroidBuildCredentials, () => {
     });
   });
   it('returns a request to make default build credentials when the user chooses to make a new one, and if they have no existing credentials', async () => {
-    asMock(promptAsync).mockImplementation(() => ({
+    jest.mocked(promptAsync).mockImplementation(async () => ({
       buildCredentialsResultOrRequestToCreateNew:
         SelectAndroidBuildCredentialsResultType.CREATE_REQUEST,
       providedName: TEST_STRING,
@@ -80,7 +79,7 @@ describe(SelectAndroidBuildCredentials, () => {
     });
   });
   it('returns buildCredentials of the users choice', async () => {
-    asMock(promptAsync).mockImplementation(() => ({
+    jest.mocked(promptAsync).mockImplementation(async () => ({
       buildCredentialsResultOrRequestToCreateNew: testAndroidBuildCredentialsFragment,
     }));
     const ctx = createCtxMock({

packages/eas-cli/src/devices/__tests__/manager-test.ts

@@ -1,6 +1,5 @@
 import prompts from 'prompts';
 
-import { asMock } from '../../__tests__/utils';
 import Log from '../../log';
 import { Actor } from '../../user/User';
 import { AccountResolver } from '../manager';
@@ -15,8 +14,8 @@ jest.mock('../../project/projectUtils', () => {
 jest.mock('../../credentials/ios/api/graphql/queries/AppleTeamQuery');
 
 beforeEach(() => {
-  asMock(prompts).mockReset();
-  asMock(prompts).mockImplementation(() => {
+  jest.mocked(prompts).mockReset();
+  jest.mocked(prompts).mockImplementation(() => {
     throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
   });
 });
@@ -38,7 +37,7 @@ describe(AccountResolver, () => {
       const exp = {} as any;
 
       it('returns the account defined in app.json/app.config.js if user confirms', async () => {
-        asMock(prompts).mockImplementationOnce(() => ({
+        jest.mocked(prompts).mockImplementationOnce(async () => ({
           value: true,
         }));
 
@@ -48,10 +47,10 @@ describe(AccountResolver, () => {
       });
 
       it('asks the user to choose the account from his account list if he rejects to use the one defined in app.json / app.config.js', async () => {
-        asMock(prompts).mockImplementationOnce(() => ({
+        jest.mocked(prompts).mockImplementationOnce(async () => ({
           useProjectAccount: false,
         }));
-        asMock(prompts).mockImplementationOnce(() => ({
+        jest.mocked(prompts).mockImplementationOnce(async () => ({
           account: user.accounts[0],
         }));
 
@@ -61,7 +60,7 @@ describe(AccountResolver, () => {
       });
 
       it(`asks the user to choose the account from his account list if he doesn't have access to the account defined in app.json / app.config.js`, async () => {
-        asMock(prompts).mockImplementationOnce(() => ({
+        jest.mocked(prompts).mockImplementationOnce(async () => ({
           account: user.accounts[0],
         }));
 
@@ -80,7 +79,7 @@ describe(AccountResolver, () => {
 
     describe('when outside project dir', () => {
       it('asks the user to choose the account from his account list', async () => {
-        asMock(prompts).mockImplementationOnce(() => ({
+        jest.mocked(prompts).mockImplementationOnce(async () => ({
           account: user.accounts[0],
         }));
 

packages/eas-cli/src/devices/actions/create/__tests__/action-test.ts

@@ -1,6 +1,5 @@
 import prompts from 'prompts';
 
-import { asMock } from '../../../../__tests__/utils';
 import { Account } from '../../../../user/Account';
 import DeviceCreateAction, { RegistrationMethod } from '../action';
 import { runInputMethodAsync } from '../inputMethod';
@@ -11,19 +10,19 @@ jest.mock('../registrationUrlMethod');
 jest.mock('../inputMethod');
 
 beforeEach(() => {
-  const promptsMock = asMock(prompts);
+  const promptsMock = jest.mocked(prompts);
   promptsMock.mockReset();
   promptsMock.mockImplementation(() => {
     throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
   });
-  asMock(runRegistrationUrlMethodAsync).mockClear();
-  asMock(runInputMethodAsync).mockClear();
+  jest.mocked(runRegistrationUrlMethodAsync).mockClear();
+  jest.mocked(runInputMethodAsync).mockClear();
 });
 
 describe(DeviceCreateAction, () => {
   describe('#runAsync', () => {
     it('calls runRegistrationUrlMethodAsync if user chooses the website method', async () => {
-      asMock(prompts).mockImplementationOnce(() => ({
+      jest.mocked(prompts).mockImplementationOnce(async () => ({
         method: RegistrationMethod.WEBSITE,
       }));
 
@@ -43,7 +42,7 @@ describe(DeviceCreateAction, () => {
     });
 
     it('calls runInputMethodAsync if user chooses the input method', async () => {
-      asMock(prompts).mockImplementationOnce(() => ({
+      jest.mocked(prompts).mockImplementationOnce(async () => ({
         method: RegistrationMethod.INPUT,
       }));
 

packages/eas-cli/src/devices/actions/create/__tests__/inputMethod-test.ts

@@ -1,6 +1,5 @@
 import prompts from 'prompts';
 
-import { asMock } from '../../../../__tests__/utils';
 import { AppleDeviceMutation } from '../../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
 import { AppleDeviceClass, AppleTeam } from '../../../../graphql/generated';
 import { runInputMethodAsync } from '../inputMethod';
@@ -9,19 +8,19 @@ jest.mock('../../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation
 jest.mock('../../../../ora');
 
 beforeEach(() => {
-  asMock(prompts).mockReset();
-  asMock(prompts).mockImplementation(() => {
+  jest.mocked(prompts).mockReset();
+  jest.mocked(prompts).mockImplementation(() => {
     throw new Error(`unhandled prompts call - this shouldn't happen - fix tests!`);
   });
-  asMock(AppleDeviceMutation.createAppleDeviceAsync).mockClear();
+  jest.mocked(AppleDeviceMutation.createAppleDeviceAsync).mockClear();
 });
 
 describe(runInputMethodAsync, () => {
   it('should allow for multiple device registration', async () => {
     mockDeviceData('00001111-001122334455662E', 'my iPhone', AppleDeviceClass.Iphone);
-    asMock(prompts).mockImplementationOnce(() => ({ value: true }));
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
     mockDeviceData('b12cba9856d89c932ab7a4b813c4d932534e1679', 'my iPad', AppleDeviceClass.Ipad);
-    asMock(prompts).mockImplementationOnce(() => ({ value: false }));
+    jest.mocked(prompts).mockImplementationOnce(async () => ({ value: false }));
 
     const accountId = 'account-id';
     // @ts-expect-error appleTeam is missing properties of AppleTeam GraphQL type
@@ -38,8 +37,8 @@ describe(runInputMethodAsync, () => {
 });
 
 function mockDeviceData(udid: string, name: string, deviceClass: AppleDeviceClass): void {
-  asMock(prompts).mockImplementationOnce(() => ({ udid }));
-  asMock(prompts).mockImplementationOnce(() => ({ name }));
-  asMock(prompts).mockImplementationOnce(() => ({ deviceClass }));
-  asMock(prompts).mockImplementationOnce(() => ({ value: true }));
+  jest.mocked(prompts).mockImplementationOnce(async () => ({ udid }));
+  jest.mocked(prompts).mockImplementationOnce(async () => ({ name }));
+  jest.mocked(prompts).mockImplementationOnce(async () => ({ deviceClass }));
+  jest.mocked(prompts).mockImplementationOnce(async () => ({ value: true }));
 }

packages/eas-cli/src/devices/manager.ts

@@ -97,7 +97,7 @@ export class AccountResolver {
 
 async function ensureAppleTeamExistsAsync(
   accountId: string,
-  { appleTeamIdentifier, appleTeamName }: { appleTeamIdentifier: string; appleTeamName: string }
+  { appleTeamIdentifier, appleTeamName }: { appleTeamIdentifier: string; appleTeamName?: string }
 ): Promise<AppleTeamFragment> {
   const appleTeam = await AppleTeamQuery.getByAppleTeamIdentifierAsync(
     accountId,

packages/eas-cli/src/fetch.ts

@@ -10,18 +10,21 @@ export class RequestError extends Error {
   }
 }
 
-function createHttpAgent(): Agent | null {
-  const httpProxyUrl = process.env.http_proxy;
-  if (!httpProxyUrl) {
+function createHttpsAgent(): Agent | null {
+  const httpsProxyUrl = process.env.https_proxy;
+  if (!httpsProxyUrl) {
     return null;
   }
-  return createHttpsProxyAgent(httpProxyUrl);
+  return createHttpsProxyAgent(httpsProxyUrl);
 }
 
-export const httpProxyAgent: Agent | null = createHttpAgent();
+export const httpsProxyAgent: Agent | null = createHttpsAgent();
 
 export default async function (url: RequestInfo, init?: RequestInit): Promise<Response> {
-  const response = await fetch(url, init);
+  const response = await fetch(url, {
+    ...init,
+    ...(httpsProxyAgent ? { agent: httpsProxyAgent } : {}),
+  });
   if (response.status >= 400) {
     throw new RequestError(`Request failed: ${response.status} (${response.statusText})`, response);
   }

packages/eas-cli/src/functions/CreateApp.ts

@@ -0,0 +1,41 @@
+import * as PackageManager from '@expo/package-manager';
+import fs from 'fs/promises';
+import yaml from 'js-yaml';
+import * as path from 'path';
+import semver from 'semver';
+
+import Log from '../log';
+
+export async function installNodeDependenciesAsync(
+  projectRoot: string,
+  packageManager: 'yarn' | 'npm'
+): Promise<void> {
+  const options = { cwd: projectRoot };
+  if (packageManager === 'yarn') {
+    const yarn = new PackageManager.YarnPackageManager(options);
+    const version = await yarn.versionAsync();
+    const nodeLinker = await yarn.getConfigAsync('nodeLinker');
+    if (semver.satisfies(version, '>=2.0.0-rc.24') && nodeLinker !== 'node-modules') {
+      const yarnRc = path.join(projectRoot, '.yarnrc.yml');
+      let yamlString = '';
+      try {
+        yamlString = await fs.readFile(yarnRc, 'utf8');
+      } catch (error: any) {
+        if (error.code !== 'ENOENT') {
+          throw error;
+        }
+      }
+      const config: any = yamlString ? yaml.safeLoad(yamlString) : {};
+      config.nodeLinker = 'node-modules';
+
+      Log.warn(
+        `Yarn v${version} detected, enabling experimental Yarn v2 support using the node-modules plugin.`
+      );
+      Log.log(`Writing ${yarnRc}...`);
+      await fs.writeFile(yarnRc, yaml.safeDump(config));
+    }
+    await yarn.installAsync();
+  } else {
+    await new PackageManager.NpmPackageManager(options).installAsync();
+  }
+}

packages/eas-cli/src/functions/PackageManager.ts

@@ -0,0 +1,66 @@
+import spawnAsync, { SpawnOptions, SpawnResult } from '@expo/spawn-async';
+import { Transform } from 'stream';
+
+import Log from '../log';
+
+function ansiRegex({ onlyFirst = false } = {}): RegExp {
+  const pattern = [
+    '[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]+)*|[a-zA-Z\\d]+(?:;[-a-zA-Z\\d\\/#&.:=?%@~_]*)*)?\\u0007)',
+    '(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PR-TZcf-ntqry=><~]))',
+  ].join('|');
+
+  return new RegExp(pattern, onlyFirst ? undefined : 'g');
+}
+
+const ansi = `(?:${ansiRegex().source})*`;
+const yarnPeerDependencyWarningPattern = new RegExp(
+  `${ansi}warning${ansi} "[^"]+" has (?:unmet|incorrect) peer dependency "[^"]+"\\.\n`,
+  'g'
+);
+
+class YarnStderrTransform extends Transform {
+  _transform(
+    chunk: Buffer,
+    _encoding: string,
+    callback: (error?: Error | null, data?: any) => void
+  ): void {
+    this.push(chunk.toString().replace(yarnPeerDependencyWarningPattern, ''));
+    callback();
+  }
+}
+
+export class YarnPackageManager {
+  options: SpawnOptions;
+
+  constructor({ cwd, silent }: { cwd: string; silent?: boolean }) {
+    this.options = {
+      env: {
+        ...process.env,
+      },
+      cwd,
+      ...(silent
+        ? { ignoreStdio: true }
+        : {
+            stdio: ['inherit', 'inherit', 'pipe'],
+          }),
+    };
+  }
+
+  async runAsync(command: string): Promise<void> {
+    await this.runPrivateAsync([command]);
+  }
+
+  // Private
+  private async runPrivateAsync(args: string[]): Promise<SpawnResult> {
+    if (!this.options.ignoreStdio) {
+      Log.log(`> yarn ${args.join(' ')}`);
+    }
+
+    // Have spawnAsync consume stdio but we don't actually do anything with it if it's ignored
+    const promise = spawnAsync('yarnpkg', args, { ...this.options, ignoreStdio: false });
+    if (promise.child.stderr && !this.options.ignoreStdio) {
+      promise.child.stderr.pipe(new YarnStderrTransform()).pipe(process.stderr);
+    }
+    return promise;
+  }
+}

packages/eas-cli/src/functions/formatWebpackMessages.ts

@@ -0,0 +1,123 @@
+/**
+ * Copyright (c) 2015-present, Facebook, Inc.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const friendlySyntaxErrorLabel = 'Syntax error:';
+
+function isLikelyASyntaxError(message: string | string[]): boolean {
+  return message.indexOf(friendlySyntaxErrorLabel) !== -1;
+}
+
+// Cleans up webpack error messages.
+function formatMessage(message: any): any {
+  let lines = [];
+
+  if (typeof message === 'string') {
+    lines = message.split('\n');
+  } else if ('message' in message) {
+    lines = message['message'].split('\n');
+  } else if (Array.isArray(message)) {
+    message.forEach(message => {
+      if ('message' in message) {
+        lines = message['message'].split('\n');
+      }
+    });
+  }
+
+  // Strip webpack-added headers off errors/warnings
+  // https://github.com/webpack/webpack/blob/master/lib/ModuleError.js
+  lines = lines.filter((line: string) => !/Module [A-z ]+\(from/.test(line));
+
+  // Transform parsing error into syntax error
+  // TODO: move this to our ESLint formatter?
+  lines = lines.map((line: string) => {
+    const parsingError = /Line (\d+):(?:(\d+):)?\s*Parsing error: (.+)$/.exec(line);
+    if (!parsingError) {
+      return line;
+    }
+    const [, errorLine, errorColumn, errorMessage] = parsingError;
+    return `${friendlySyntaxErrorLabel} ${errorMessage} (${errorLine}:${errorColumn})`;
+  });
+
+  message = lines.join('\n');
+  // Smoosh syntax errors (commonly found in CSS)
+  message = message.replace(
+    /SyntaxError\s+\((\d+):(\d+)\)\s*(.+?)\n/g,
+    `${friendlySyntaxErrorLabel} $3 ($1:$2)\n`
+  );
+  // Clean up export errors
+  message = message.replace(
+    /^.*export '(.+?)' was not found in '(.+?)'.*$/gm,
+    `Attempted import error: '$1' is not exported from '$2'.`
+  );
+  message = message.replace(
+    /^.*export 'default' \(imported as '(.+?)'\) was not found in '(.+?)'.*$/gm,
+    `Attempted import error: '$2' does not contain a default export (imported as '$1').`
+  );
+  message = message.replace(
+    /^.*export '(.+?)' \(imported as '(.+?)'\) was not found in '(.+?)'.*$/gm,
+    `Attempted import error: '$1' is not exported from '$3' (imported as '$2').`
+  );
+  lines = message.split('\n');
+
+  // Remove leading newline
+  if (lines.length > 2 && lines[1].trim() === '') {
+    lines.splice(1, 1);
+  }
+  // Clean up file name
+  lines[0] = lines[0].replace(/^(.*) \d+:\d+-\d+$/, '$1');
+
+  // Cleans up verbose "module not found" messages for files and packages.
+  if (lines[1] && lines[1].indexOf('Module not found: ') === 0) {
+    lines = [
+      lines[0],
+      lines[1]
+        .replace('Error: ', '')
+        .replace('Module not found: Cannot find file:', 'Cannot find file:'),
+    ];
+  }
+
+  // Add helpful message for users trying to use Sass for the first time
+  if (lines[1] && lines[1].match(/Cannot find module.+sass/)) {
+    lines[1] = 'To import Sass files, you first need to install sass.\n';
+    lines[1] += 'Run `npm install sass` or `yarn add sass` inside your workspace.';
+  }
+
+  message = lines.join('\n');
+  // Internal stacks are generally useless so we strip them... with the
+  // exception of stacks containing `webpack:` because they're normally
+  // from user code generated by webpack. For more information see
+  // https://github.com/facebook/create-react-app/pull/1050
+  message = message.replace(/^\s*at\s((?!webpack:).)*:\d+:\d+[\s)]*(\n|$)/gm, ''); // at ... ...:x:y
+  message = message.replace(/^\s*at\s<anonymous>(\n|$)/gm, ''); // at <anonymous>
+  lines = message.split('\n');
+
+  // Remove duplicated newlines
+  lines = lines.filter(
+    (line: string, index: number, arr: string[]) =>
+      index === 0 || line.trim() !== '' || line.trim() !== arr[index - 1].trim()
+  );
+
+  // Reassemble the message
+  message = lines.join('\n');
+  return message.trim();
+}
+
+export function formatWebpackMessages(json: any): {
+  errors: any[];
+  warnings: any[];
+} {
+  const formattedErrors = json.errors.map(formatMessage);
+  const formattedWarnings = json.warnings.map(formatMessage);
+  const result = { errors: formattedErrors, warnings: formattedWarnings };
+  if (result.errors.some(isLikelyASyntaxError)) {
+    // If there are any syntax errors, show just them.
+    result.errors = result.errors.filter(isLikelyASyntaxError);
+  }
+  return result;
+}

packages/eas-cli/src/functions/webpack.ts

@@ -0,0 +1,132 @@
+import chalk from 'chalk';
+import fs from 'fs/promises';
+import path from 'path';
+import PnpWebpackPlugin from 'pnp-webpack-plugin';
+import { Compiler, Configuration, EntryObject, webpack } from 'webpack';
+
+import Log from '../log';
+import { formatWebpackMessages } from './formatWebpackMessages';
+
+async function getWebpackFunctionConfigurationAsync(
+  projectDir: string,
+  entry: EntryObject,
+  outputPath: string
+): Promise<Configuration> {
+  const webpackConfig = {
+    entry,
+    target: 'node',
+    mode: 'development' as 'development',
+    // Disable file info logs.
+    //stats: 'none',
+
+    // https://webpack.js.org/configuration/other-options/#bail
+    // Fail out on the first error instead of tolerating it.
+    bail: true,
+
+    module: {
+      rules: [
+        {
+          test: /\.tsx?$/,
+          use: {
+            loader: require.resolve('ts-loader'),
+            options: {
+              configFile: require.resolve('../../functions.tsconfig.webpack.json'),
+              context: projectDir,
+            },
+          },
+          exclude: /node_modules/,
+        },
+      ],
+    },
+    resolve: {
+      plugins: [PnpWebpackPlugin],
+      extensions: ['.tsx', '.ts', '.js'],
+    },
+    resolveLoader: {
+      plugins: [PnpWebpackPlugin.moduleLoader(module)],
+    },
+    output: {
+      filename: '[name].js',
+      path: outputPath,
+      library: {
+        type: 'commonjs',
+      },
+    },
+  };
+
+  return webpackConfig;
+}
+
+async function compileWebAppAsync(compiler: Compiler): Promise<any> {
+  // We generate the stats.json file in the webpack-config
+  const { warnings } = await new Promise((resolve, reject) =>
+    compiler.run((error, stats) => {
+      let messages;
+      if (error) {
+        if (!error.message) {
+          return reject(error);
+        }
+        messages = formatWebpackMessages({
+          errors: [error.message],
+          warnings: [],
+          _showErrors: true,
+          _showWarnings: true,
+        });
+      } else {
+        messages = formatWebpackMessages(
+          stats?.toJson({ all: false, warnings: true, errors: true })
+        );
+      }
+
+      if (messages.errors.length) {
+        // Only keep the first error. Others are often indicative
+        // of the same problem, but confuse the reader with noise.
+        if (messages.errors.length > 1) {
+          messages.errors.length = 1;
+        }
+        return reject(messages.errors.join('\n\n'));
+      }
+      resolve({
+        warnings: messages.warnings,
+      });
+    })
+  );
+  return { warnings };
+}
+
+export async function bundleFunctionsAsync(
+  projectDir: string,
+  entry: EntryObject,
+  outputPath: string
+): Promise<void> {
+  const config = await getWebpackFunctionConfigurationAsync(projectDir, entry, outputPath);
+  const compiler = webpack(config);
+  try {
+    const { warnings } = await compileWebAppAsync(compiler);
+    if (warnings.length) {
+      Log.warn(chalk.yellow('Compiled with warnings.\n'));
+      Log.warn(warnings.join('\n\n'));
+    } else {
+      Log.log(chalk.green('Compiled successfully.\n'));
+    }
+  } catch (error) {
+    Log.error(chalk.red('Failed to compile.\n'));
+    Log.error(error);
+    throw error;
+  }
+}
+
+export async function prepareFunctionEntriesAsync(functionsPath: string): Promise<EntryObject> {
+  const files = await fs.readdir(functionsPath);
+  if (files.length === 0) {
+    throw new Error(`No functions found in ${functionsPath}`);
+  }
+
+  const entries = {} as EntryObject;
+  for (const file of files) {
+    const filenameNoExtension = path.parse(file).name;
+    entries[filenameNoExtension] = path.join(functionsPath, file);
+  }
+
+  return entries;
+}

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

@@ -15,7 +15,7 @@ import { DocumentNode } from 'graphql';
 import fetch from 'node-fetch';
 
 import { getExpoApiBaseUrl } from '../api';
-import { httpProxyAgent } from '../fetch';
+import { httpsProxyAgent } from '../fetch';
 import Log from '../log';
 import { getAccessToken, getSessionSecret } from '../user/sessionStorage';
 
@@ -49,7 +49,7 @@ export const graphqlClient = createUrqlClient({
       headers['expo-session'] = sessionSecret;
     }
     return {
-      ...(httpProxyAgent ? { agent: httpProxyAgent } : {}),
+      ...(httpsProxyAgent ? { agent: httpsProxyAgent } : {}),
       headers,
     };
   },

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

@@ -96,6 +96,7 @@ export type Account = {
   availableBuilds?: Maybe<Scalars['Int']>;
   /** Billing information */
   billing?: Maybe<Billing>;
+  billingPeriod: BillingPeriod;
   /** Build Jobs associated with this account */
   buildJobs: Array<BuildJob>;
   /**
@@ -129,6 +130,8 @@ export type Account = {
   /** @deprecated See isCurrent */
   unlimitedBuilds: Scalars['Boolean'];
   updatedAt: Scalars['DateTime'];
+  /** Account query object for querying EAS usage metrics */
+  usageMetrics: AccountUsageMetrics;
   /** Pending user invitations for this account */
   userInvitations: Array<UserInvitation>;
   /** Actors associated with this account and permissions they hold */
@@ -196,6 +199,15 @@ export type AccountAppsArgs = {
 };
 
 
+/**
+ * An account is a container owning projects, credentials, billing and other organization
+ * data and settings. Actors may own and be members of accounts.
+ */
+export type AccountBillingPeriodArgs = {
+  date: Scalars['DateTime'];
+};
+
+
 /**
  * An account is a container owning projects, credentials, billing and other organization
  * data and settings. Actors may own and be members of accounts.
@@ -379,6 +391,32 @@ export type AccountQueryByNameArgs = {
   accountName: Scalars['String'];
 };
 
+export type AccountUsageMetric = {
+  __typename?: 'AccountUsageMetric';
+  metric: EasServiceMetric;
+  metricType: UsageMetricType;
+  timestamp: Scalars['DateTime'];
+  value: Scalars['Float'];
+};
+
+export type AccountUsageMetrics = {
+  __typename?: 'AccountUsageMetrics';
+  byBillingPeriod: UsageMetricTotal;
+  metricsForServiceMetric: Array<AccountUsageMetric>;
+};
+
+
+export type AccountUsageMetricsByBillingPeriodArgs = {
+  date: Scalars['DateTime'];
+};
+
+
+export type AccountUsageMetricsMetricsForServiceMetricArgs = {
+  granularity: UsageMetricsGranularity;
+  metric: EasServiceMetric;
+  timespan: UsageMetricsTimespan;
+};
+
 export type ActivityTimelineProjectActivity = {
   activityTimestamp: Scalars['DateTime'];
   actor?: Maybe<Actor>;
@@ -1482,6 +1520,13 @@ export type Billing = {
   subscription?: Maybe<SubscriptionDetails>;
 };
 
+export type BillingPeriod = {
+  __typename?: 'BillingPeriod';
+  anchor: Scalars['DateTime'];
+  end: Scalars['DateTime'];
+  start: Scalars['DateTime'];
+};
+
 /** Represents an EAS Build */
 export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   __typename?: 'Build';
@@ -1496,9 +1541,12 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   createdAt?: Maybe<Scalars['DateTime']>;
   distribution?: Maybe<DistributionType>;
   error?: Maybe<BuildError>;
+  estimatedWaitTimeLeftSeconds?: Maybe<Scalars['Int']>;
   expirationDate?: Maybe<Scalars['DateTime']>;
   gitCommitHash?: Maybe<Scalars['String']>;
   id: Scalars['ID'];
+  /** Queue position is 1-indexed */
+  initialQueuePosition?: Maybe<Scalars['Int']>;
   initiatingActor?: Maybe<Actor>;
   /** @deprecated User type is deprecated */
   initiatingUser?: Maybe<User>;
@@ -1977,6 +2025,11 @@ export type DeleteWebhookResult = {
   id: Scalars['ID'];
 };
 
+export type DeployFunctionResult = {
+  __typename?: 'DeployFunctionResult';
+  success: Scalars['Boolean'];
+};
+
 /** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
 export type Deployment = {
   __typename?: 'Deployment';
@@ -2014,6 +2067,10 @@ export enum EasBuildDeprecationInfoType {
   UserFacing = 'USER_FACING'
 }
 
+export enum EasServiceMetric {
+  ManifestRequests = 'MANIFEST_REQUESTS'
+}
+
 export type EditUpdateBranchInput = {
   appId?: InputMaybe<Scalars['ID']>;
   id?: InputMaybe<Scalars['ID']>;
@@ -2103,6 +2160,40 @@ export enum Feature {
   Teams = 'TEAMS'
 }
 
+export type FunctionMutation = {
+  __typename?: 'FunctionMutation';
+  createFunction: DeployFunctionResult;
+  getFunctionStatus: FunctionStatusResult;
+  getSignedFunctionUploadSpecification: GetFunctionUploadUrlResult;
+};
+
+
+export type FunctionMutationCreateFunctionArgs = {
+  appId: Scalars['String'];
+  bucketKey: Scalars['String'];
+};
+
+
+export type FunctionMutationGetFunctionStatusArgs = {
+  appId: Scalars['String'];
+};
+
+
+export type FunctionMutationGetSignedFunctionUploadSpecificationArgs = {
+  appId: Scalars['String'];
+};
+
+export type FunctionStatusResult = {
+  __typename?: 'FunctionStatusResult';
+  logUrls: Array<Scalars['String']>;
+  status: Scalars['String'];
+};
+
+export type GetFunctionUploadUrlResult = {
+  __typename?: 'GetFunctionUploadUrlResult';
+  specification: Scalars['String'];
+};
+
 export type GetSignedAssetUploadSpecificationsResult = {
   __typename?: 'GetSignedAssetUploadSpecificationsResult';
   specifications: Array<Scalars['String']>;
@@ -2820,6 +2911,7 @@ export type RootMutation = {
   emailSubscription: EmailSubscriptionMutation;
   /** Mutations that create and delete EnvironmentSecrets */
   environmentSecret: EnvironmentSecretMutation;
+  function: FunctionMutation;
   /** Mutations that modify a Google Service Account Key */
   googleServiceAccountKey: GoogleServiceAccountKeyMutation;
   /** Mutations that modify the build credentials for an iOS app */
@@ -3349,6 +3441,29 @@ export enum UploadSessionType {
   EasSubmitAppArchive = 'EAS_SUBMIT_APP_ARCHIVE'
 }
 
+export type UsageMetricTotal = {
+  __typename?: 'UsageMetricTotal';
+  billingPeriod: BillingPeriod;
+  metrics: Array<AccountUsageMetric>;
+  total: Scalars['Float'];
+};
+
+export enum UsageMetricType {
+  Request = 'REQUEST'
+}
+
+export enum UsageMetricsGranularity {
+  Day = 'DAY',
+  Hour = 'HOUR',
+  Minute = 'MINUTE',
+  Total = 'TOTAL'
+}
+
+export type UsageMetricsTimespan = {
+  end: Scalars['DateTime'];
+  start: Scalars['DateTime'];
+};
+
 /** Represents a human (not robot) actor. */
 export type User = Actor & {
   __typename?: 'User';
@@ -3470,6 +3585,7 @@ export type UserInvitation = {
   created: Scalars['DateTime'];
   /** Email to which this invitation was sent */
   email: Scalars['String'];
+  expires: Scalars['DateTime'];
   id: Scalars['ID'];
   /** Account permissions to be granted upon acceptance of this invitation */
   permissions: Array<Permission>;
@@ -3541,6 +3657,7 @@ export type UserInvitationPublicData = {
   accountName: Scalars['String'];
   created: Scalars['DateTime'];
   email: Scalars['String'];
+  expires: Scalars['DateTime'];
   /** Email to which this invitation was sent */
   id: Scalars['ID'];
 };
@@ -4193,7 +4310,7 @@ export type CreateAndroidBuildMutationVariables = Exact<{
 }>;
 
 
-export type CreateAndroidBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createAndroidBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
+export type CreateAndroidBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createAndroidBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
 
 export type CreateIosBuildMutationVariables = Exact<{
   appId: Scalars['ID'];
@@ -4202,7 +4319,7 @@ export type CreateIosBuildMutationVariables = Exact<{
 }>;
 
 
-export type CreateIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createIosBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
+export type CreateIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createIosBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
 
 export type CreateEnvironmentSecretForAccountMutationVariables = Exact<{
   input: CreateEnvironmentSecretInput;
@@ -4227,6 +4344,28 @@ export type DeleteEnvironmentSecretMutationVariables = Exact<{
 
 export type DeleteEnvironmentSecretMutation = { __typename?: 'RootMutation', environmentSecret: { __typename?: 'EnvironmentSecretMutation', deleteEnvironmentSecret: { __typename?: 'DeleteEnvironmentSecretResult', id: string } } };
 
+export type GetSignedUploadFunctionMutationVariables = Exact<{
+  appId: Scalars['String'];
+}>;
+
+
+export type GetSignedUploadFunctionMutation = { __typename?: 'RootMutation', function: { __typename?: 'FunctionMutation', getSignedFunctionUploadSpecification: { __typename?: 'GetFunctionUploadUrlResult', specification: string } } };
+
+export type CreateFunctionMutationVariables = Exact<{
+  bucketKey: Scalars['String'];
+  appId: Scalars['String'];
+}>;
+
+
+export type CreateFunctionMutation = { __typename?: 'RootMutation', function: { __typename?: 'FunctionMutation', createFunction: { __typename?: 'DeployFunctionResult', success: boolean } } };
+
+export type GetFunctionStatusMutationVariables = Exact<{
+  appId: Scalars['String'];
+}>;
+
+
+export type GetFunctionStatusMutation = { __typename?: 'RootMutation', function: { __typename?: 'FunctionMutation', getFunctionStatus: { __typename?: 'FunctionStatusResult', status: string, logUrls: Array<string> } } };
+
 export type CreateKeystoreGenerationUrlMutationVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -4315,7 +4454,7 @@ export type BuildsByIdQueryVariables = Exact<{
 }>;
 
 
-export type BuildsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
+export type BuildsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
 
 export type GetAllBuildsForAppQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -4325,7 +4464,7 @@ export type GetAllBuildsForAppQueryVariables = Exact<{
 }>;
 
 
-export type GetAllBuildsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, builds: Array<{ __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }> } } };
+export type GetAllBuildsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, builds: Array<{ __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }> } } };
 
 export type GetChannelByNameForAppQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -4421,7 +4560,7 @@ export type WebhookByIdQuery = { __typename?: 'RootQuery', webhook: { __typename
 
 export type AppFragment = { __typename?: 'App', id: string, fullName: string, slug: string };
 
-export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
+export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
 
 export type EnvironmentSecretFragment = { __typename?: 'EnvironmentSecret', id: string, name: string, createdAt: any };
 

packages/eas-cli/src/graphql/mutations/FunctionMutation.ts

@@ -0,0 +1,79 @@
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../client';
+import {
+  CreateFunctionMutation,
+  CreateFunctionMutationVariables,
+  GetFunctionStatusMutation,
+  GetFunctionStatusMutationVariables,
+  GetSignedUploadFunctionMutation,
+  GetSignedUploadFunctionMutationVariables,
+} from '../generated';
+
+export const FunctionMutation = {
+  async uploadAsync(appId: string): Promise<string> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<GetSignedUploadFunctionMutation, GetSignedUploadFunctionMutationVariables>(
+          gql`
+            mutation GetSignedUploadFunctionMutation($appId: String!) {
+              function {
+                getSignedFunctionUploadSpecification(appId: $appId) {
+                  specification
+                }
+              }
+            }
+          `,
+          {
+            appId,
+          }
+        )
+        .toPromise()
+    );
+    return data.function.getSignedFunctionUploadSpecification.specification;
+  },
+  async createAsync(bucketKey: string, appId: string): Promise<boolean> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<CreateFunctionMutation, CreateFunctionMutationVariables>(
+          gql`
+            mutation CreateFunctionMutation($bucketKey: String!, $appId: String!) {
+              function {
+                createFunction(bucketKey: $bucketKey, appId: $appId) {
+                  success
+                }
+              }
+            }
+          `,
+          {
+            bucketKey,
+            appId,
+          }
+        )
+        .toPromise()
+    );
+    return data.function.createFunction.success;
+  },
+  async getStatusAsync(appId: string): Promise<{ status: string; logUrls: string[] }> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<GetFunctionStatusMutation, GetFunctionStatusMutationVariables>(
+          gql`
+            mutation GetFunctionStatusMutation($appId: String!) {
+              function {
+                getFunctionStatus(appId: $appId) {
+                  status
+                  logUrls
+                }
+              }
+            }
+          `,
+          {
+            appId,
+          }
+        )
+        .toPromise()
+    );
+    return data.function.getFunctionStatus;
+  },
+};

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

@@ -41,6 +41,10 @@ export const BuildFragmentNode = gql`
     appBuildVersion
     runtimeVersion
     gitCommitHash
+    initialQueuePosition
+    queuePosition
+    estimatedWaitTimeLeftSeconds
+    priority
     createdAt
     updatedAt
   }

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

@@ -1,6 +1,5 @@
 import { vol } from 'memfs';
 
-import { asMock } from '../../__tests__/utils';
 import { confirmAsync } from '../../prompts';
 import { Actor, getUserAsync } from '../../user/User';
 import {
@@ -123,52 +122,58 @@ describe(getProjectAccountNameAsync, () => {
   const expWithoutOwner: any = {};
 
   beforeEach(() => {
-    asMock(getUserAsync).mockReset();
+    jest.mocked(getUserAsync).mockReset();
   });
 
   it(`returns the owner field's value from app.json / app.config.js`, async () => {
-    asMock(getUserAsync).mockImplementation((): Actor | undefined => ({
-      __typename: 'User',
-      id: 'user_id',
-      username: 'notnotbrent',
-      accounts: [
-        { id: 'account_id_1', name: 'notnotbrent' },
-        { id: 'account_id_2', name: 'dominik' },
-      ],
-      isExpoAdmin: false,
-    }));
+    jest.mocked(getUserAsync).mockImplementation(
+      async (): Promise<Actor> => ({
+        __typename: 'User',
+        id: 'user_id',
+        username: 'notnotbrent',
+        accounts: [
+          { id: 'account_id_1', name: 'notnotbrent' },
+          { id: 'account_id_2', name: 'dominik' },
+        ],
+        isExpoAdmin: false,
+      })
+    );
 
     const projectAccountName = await getProjectAccountNameAsync(expWithOwner);
     expect(projectAccountName).toBe('dominik');
   });
 
   it(`returns the username if owner field is not set in app.json / app.config.js`, async () => {
-    asMock(getUserAsync).mockImplementation((): Actor | undefined => ({
-      __typename: 'User',
-      id: 'user_id',
-      username: 'notnotbrent',
-      accounts: [
-        { id: 'account_id_1', name: 'notnotbrent' },
-        { id: 'account_id_2', name: 'dominik' },
-      ],
-      isExpoAdmin: false,
-    }));
+    jest.mocked(getUserAsync).mockImplementation(
+      async (): Promise<Actor> => ({
+        __typename: 'User',
+        id: 'user_id',
+        username: 'notnotbrent',
+        accounts: [
+          { id: 'account_id_1', name: 'notnotbrent' },
+          { id: 'account_id_2', name: 'dominik' },
+        ],
+        isExpoAdmin: false,
+      })
+    );
 
     const projectAccountName = await getProjectAccountNameAsync(expWithoutOwner);
     expect(projectAccountName).toBe('notnotbrent');
   });
 
   it(`throws when project owner is undefined for robot actors`, async () => {
-    asMock(getUserAsync).mockImplementation((): Actor | undefined => ({
-      __typename: 'Robot',
-      id: 'user_id',
-      firstName: 'GLaDOS',
-      accounts: [
-        { id: 'account_id_1', name: 'notnotbrent' },
-        { id: 'account_id_2', name: 'dominik' },
-      ],
-      isExpoAdmin: false,
-    }));
+    jest.mocked(getUserAsync).mockImplementation(
+      async (): Promise<Actor> => ({
+        __typename: 'Robot',
+        id: 'user_id',
+        firstName: 'GLaDOS',
+        accounts: [
+          { id: 'account_id_1', name: 'notnotbrent' },
+          { id: 'account_id_2', name: 'dominik' },
+        ],
+        isExpoAdmin: false,
+      })
+    );
     await expect(getProjectAccountNameAsync(expWithoutOwner)).rejects.toThrow(
       'manifest property is required'
     );
@@ -177,57 +182,67 @@ describe(getProjectAccountNameAsync, () => {
 
 describe(promptToCreateProjectIfNotExistsAsync, () => {
   beforeEach(() => {
-    asMock(getUserAsync).mockReset();
-    asMock(findProjectIdByAccountNameAndSlugNullableAsync).mockReset();
+    jest.mocked(getUserAsync).mockReset();
+    jest.mocked(findProjectIdByAccountNameAndSlugNullableAsync).mockReset();
   });
 
   it('returns the existing project', async () => {
-    asMock(getUserAsync).mockImplementation((): Actor | undefined => ({
-      __typename: 'User',
-      id: 'user_id',
-      username: 'quin',
-      accounts: [{ id: 'account_id_1', name: 'quin' }],
-      isExpoAdmin: false,
-    }));
-    asMock(findProjectIdByAccountNameAndSlugNullableAsync).mockImplementation(
-      () => 'already-existing-project-id'
+    jest.mocked(getUserAsync).mockImplementation(
+      async (): Promise<Actor> => ({
+        __typename: 'User',
+        id: 'user_id',
+        username: 'quin',
+        accounts: [{ id: 'account_id_1', name: 'quin' }],
+        isExpoAdmin: false,
+      })
     );
+    jest
+      .mocked(findProjectIdByAccountNameAndSlugNullableAsync)
+      .mockImplementation(async () => 'already-existing-project-id');
     const exp: any = {};
     const projectId = await promptToCreateProjectIfNotExistsAsync(exp);
     expect(projectId).toBe('already-existing-project-id');
   });
   it('makes a new project if none exists', async () => {
     jest.mock('../../prompts');
-    asMock(getUserAsync).mockImplementation((): Actor | undefined => ({
-      __typename: 'User',
-      id: 'user_id',
-      username: 'quin',
-      accounts: [{ id: 'account_id_1', name: 'quin' }],
-      isExpoAdmin: false,
-    }));
-    asMock(findProjectIdByAccountNameAndSlugNullableAsync).mockImplementation(() => null);
-    asMock(ensureProjectExistsAsync).mockImplementation(() => 'new-project-id');
+    jest.mocked(getUserAsync).mockImplementation(
+      async (): Promise<Actor> => ({
+        __typename: 'User',
+        id: 'user_id',
+        username: 'quin',
+        accounts: [{ id: 'account_id_1', name: 'quin' }],
+        isExpoAdmin: false,
+      })
+    );
+    jest
+      .mocked(findProjectIdByAccountNameAndSlugNullableAsync)
+      .mockImplementation(async () => null);
+    jest.mocked(ensureProjectExistsAsync).mockImplementation(async () => 'new-project-id');
 
     // user agrees to make new project
-    asMock(confirmAsync).mockImplementation(() => true);
+    jest.mocked(confirmAsync).mockImplementation(async () => true);
     const exp: any = {};
     const projectId = await promptToCreateProjectIfNotExistsAsync(exp);
     expect(projectId).toBe('new-project-id');
   });
   it('aborts making a new project if the user declines', async () => {
     jest.mock('../../prompts');
-    asMock(getUserAsync).mockImplementation((): Actor | undefined => ({
-      __typename: 'User',
-      id: 'user_id',
-      username: 'quin',
-      accounts: [{ id: 'account_id_1', name: 'quin' }],
-      isExpoAdmin: false,
-    }));
-    asMock(findProjectIdByAccountNameAndSlugNullableAsync).mockImplementation(() => null);
-    asMock(ensureProjectExistsAsync).mockImplementation(() => 'new-project-id');
+    jest.mocked(getUserAsync).mockImplementation(
+      async (): Promise<Actor> => ({
+        __typename: 'User',
+        id: 'user_id',
+        username: 'quin',
+        accounts: [{ id: 'account_id_1', name: 'quin' }],
+        isExpoAdmin: false,
+      })
+    );
+    jest
+      .mocked(findProjectIdByAccountNameAndSlugNullableAsync)
+      .mockImplementation(async () => null);
+    jest.mocked(ensureProjectExistsAsync).mockImplementation(async () => 'new-project-id');
 
     // user doesnt agree to make new project
-    asMock(confirmAsync).mockImplementation(() => false);
+    jest.mocked(confirmAsync).mockImplementation(async () => false);
     const exp: any = {};
     const projectId = await promptToCreateProjectIfNotExistsAsync(exp);
     expect(projectId).toBe(null);

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

@@ -2,7 +2,6 @@ import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 
-import { asMock } from '../../../__tests__/utils';
 import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
 import { promptAsync } from '../../../prompts';
 import {
@@ -21,7 +20,7 @@ beforeEach(async () => {
   // this fixes a weird error with tempy in @expo/image-utils
   await fs.mkdirp(os.tmpdir());
 
-  asMock(promptAsync).mockReset();
+  jest.mocked(promptAsync).mockReset();
 });
 
 describe(getApplicationIdAsync, () => {
@@ -122,7 +121,7 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
         '/app'
       );
 
-      asMock(promptAsync).mockImplementationOnce(() => ({
+      jest.mocked(promptAsync).mockImplementationOnce(async () => ({
         packageName: 'com.expo.notdominik',
       }));
 
@@ -139,7 +138,7 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
         '/app'
       );
 
-      asMock(promptAsync).mockImplementationOnce(() => ({
+      jest.mocked(promptAsync).mockImplementationOnce(async () => ({
         packageName: 'com.expo.notdominik',
       }));