v0.57.0

* generate graphql code

* upgrade @expo/eas-build-job

* add git commit message to build metadata

CHANGELOG.md

@@ -8,14 +8,32 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
+- Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
+- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
+
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
+
+### 🎉 New features
+
+- Display build queue type when waiting. ([#1217](https://github.com/expo/eas-cli/pull/1217) by [@dsokal](https://github.com/dsokal))
+- Add better message on how to upgrade EAS CLI. ([#1222](https://github.com/expo/eas-cli/pull/1222) by [@jeremybarbet](https://github.com/jeremybarbet), [#1231](https://github.com/expo/eas-cli/pull/1231) by [@wkozyra95](https://github.com/wkozyra95))
+- Invoke export with sourcemaps on update. ([#1228](https://github.com/expo/eas-cli/pull/1228) by [@kbrandwijk](https://github.com/kbrandwijk))
+
 ### 🐛 Bug fixes
 
 - Show spinner instead of silently timing out during asset upload. ([#1206](https://github.com/expo/eas-cli/pull/1206) by [@wschurman](https://github.com/wschurman))
 - Fix build archive S3 URLs. ([#1207](https://github.com/expo/eas-cli/pull/1207) by [@dsokal](https://github.com/dsokal))
+- `autoIncrement` option on iOS will update versions of all targets that depend on an application target. ([#1219](https://github.com/expo/eas-cli/pull/1219) by [@wkozyra95](https://github.com/wkozyra95))
 
 ### 🧹 Chores
 
 - Increase max number of chained "extends" in build profiles. ([#1208](https://github.com/expo/eas-cli/pull/1208) by [@wkozyra95](https://github.com/wkozyra95))
+- Change wording on build warning for bundle id/package name. ([#1211](https://github.com/expo/eas-cli/pull/1211) by [@kbrandwijk](https://github.com/kbrandwijk))
 
 ## [0.55.1](https://github.com/expo/eas-cli/releases/tag/v0.55.1) - 2022-07-12
 

CODEOWNERS

@@ -6,6 +6,9 @@ packages/eas-cli/src/commands/build @dsokal @wkozyra95
 packages/eas-cli/src/submit @barthap @dsokal
 packages/eas-cli/src/commands/submit.ts @barthap @dsokal
 
+packages/eas-cli/src/update @kgc00 @wschurman
+packages/eas-cli/src/commands/update @kgc00 @wschurman
+
 packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.55.1"
+  "version": "0.57.0"
 }

package.json

@@ -32,7 +32,7 @@
     "typescript": "4.7.4"
   },
   "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

packages/eas-cli/.eslintrc.js

@@ -2,6 +2,24 @@ const rootEslintrc = require('../../.eslintrc.js');
 
 module.exports = {
   rules: {
+    'no-restricted-properties': [
+      'warn',
+      {
+        object: 'it',
+        property: 'only',
+        message: 'it.only should not be committed to main.',
+      },
+      {
+        object: 'test',
+        property: 'only',
+        message: 'test.only should not be committed to main.',
+      },
+      {
+        object: 'describe',
+        property: 'only',
+        message: 'describe.only should not be committed to main.',
+      },
+    ],
     'no-restricted-imports': [
       'error',
       {

packages/eas-cli/README.md

@@ -22,69 +22,68 @@ yarn global add eas-cli
 # Usage
 
 ```sh
-# runs the command
 eas COMMAND
-# prints the version
+# runs the command
 eas (-v|--version|version)
-# outputs help for specific command
+# prints the version
 eas --help COMMAND
+# outputs help for specific command
 ```
 
 # Commands
 
 <!-- commands -->
-
-- [`eas account:login`](#eas-accountlogin)
-- [`eas account:logout`](#eas-accountlogout)
-- [`eas account:view`](#eas-accountview)
-- [`eas analytics [STATUS]`](#eas-analytics-status)
-- [`eas autocomplete [SHELL]`](#eas-autocomplete-shell)
-- [`eas branch:create [NAME]`](#eas-branchcreate-name)
-- [`eas branch:delete [NAME]`](#eas-branchdelete-name)
-- [`eas branch:list`](#eas-branchlist)
-- [`eas branch:rename`](#eas-branchrename)
-- [`eas branch:view [NAME]`](#eas-branchview-name)
-- [`eas build`](#eas-build)
-- [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
-- [`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)
-- [`eas channel:list`](#eas-channellist)
-- [`eas channel:view [NAME]`](#eas-channelview-name)
-- [`eas config`](#eas-config)
-- [`eas credentials`](#eas-credentials)
-- [`eas device:create`](#eas-devicecreate)
-- [`eas device:delete`](#eas-devicedelete)
-- [`eas device:list`](#eas-devicelist)
-- [`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 metadata:pull`](#eas-metadatapull)
-- [`eas metadata:push`](#eas-metadatapush)
-- [`eas project:info`](#eas-projectinfo)
-- [`eas project:init`](#eas-projectinit)
-- [`eas secret:create`](#eas-secretcreate)
-- [`eas secret:delete`](#eas-secretdelete)
-- [`eas secret:list`](#eas-secretlist)
-- [`eas submit`](#eas-submit)
-- [`eas update`](#eas-update)
-- [`eas update:configure`](#eas-updateconfigure)
-- [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
-- [`eas update:list`](#eas-updatelist)
-- [`eas update:view GROUPID`](#eas-updateview-groupid)
-- [`eas webhook:create`](#eas-webhookcreate)
-- [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
-- [`eas webhook:list`](#eas-webhooklist)
-- [`eas webhook:update`](#eas-webhookupdate)
-- [`eas webhook:view ID`](#eas-webhookview-id)
-- [`eas whoami`](#eas-whoami)
+* [`eas account:login`](#eas-accountlogin)
+* [`eas account:logout`](#eas-accountlogout)
+* [`eas account:view`](#eas-accountview)
+* [`eas analytics [STATUS]`](#eas-analytics-status)
+* [`eas autocomplete [SHELL]`](#eas-autocomplete-shell)
+* [`eas branch:create [NAME]`](#eas-branchcreate-name)
+* [`eas branch:delete [NAME]`](#eas-branchdelete-name)
+* [`eas branch:list`](#eas-branchlist)
+* [`eas branch:rename`](#eas-branchrename)
+* [`eas branch:view [NAME]`](#eas-branchview-name)
+* [`eas build`](#eas-build)
+* [`eas build:cancel [BUILD_ID]`](#eas-buildcancel-build_id)
+* [`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)
+* [`eas channel:list`](#eas-channellist)
+* [`eas channel:view [NAME]`](#eas-channelview-name)
+* [`eas config`](#eas-config)
+* [`eas credentials`](#eas-credentials)
+* [`eas device:create`](#eas-devicecreate)
+* [`eas device:delete`](#eas-devicedelete)
+* [`eas device:list`](#eas-devicelist)
+* [`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 metadata:pull`](#eas-metadatapull)
+* [`eas metadata:push`](#eas-metadatapush)
+* [`eas project:info`](#eas-projectinfo)
+* [`eas project:init`](#eas-projectinit)
+* [`eas secret:create`](#eas-secretcreate)
+* [`eas secret:delete`](#eas-secretdelete)
+* [`eas secret:list`](#eas-secretlist)
+* [`eas submit`](#eas-submit)
+* [`eas update`](#eas-update)
+* [`eas update:configure`](#eas-updateconfigure)
+* [`eas update:delete GROUPID`](#eas-updatedelete-groupid)
+* [`eas update:list`](#eas-updatelist)
+* [`eas update:view GROUPID`](#eas-updateview-groupid)
+* [`eas webhook:create`](#eas-webhookcreate)
+* [`eas webhook:delete [ID]`](#eas-webhookdelete-id)
+* [`eas webhook:list`](#eas-webhooklist)
+* [`eas webhook:update`](#eas-webhookupdate)
+* [`eas webhook:view ID`](#eas-webhookview-id)
+* [`eas whoami`](#eas-whoami)
 
 ## `eas account:login`
 
@@ -101,7 +100,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -118,7 +117,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -135,7 +134,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -149,7 +148,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -198,7 +197,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -218,7 +217,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -226,16 +225,20 @@ list all branches
 
 ```
 USAGE
-  $ eas branch:list [--json]
+  $ eas branch:list [--offset <value>] [--limit <value>] [--json] [--non-interactive]
 
 FLAGS
-  --json  return output as JSON
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
+                     lower value may help increase command speed.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
 
 DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -254,7 +257,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -262,19 +265,23 @@ view a branch
 
 ```
 USAGE
-  $ eas branch:view [NAME] [--json]
+  $ eas branch:view [NAME] [--offset <value>] [--limit <value>] [--json] [--non-interactive]
 
 ARGUMENTS
   NAME  Name of the branch to view
 
 FLAGS
-  --json  return a json with the branch's ID name and recent update groups.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
+                     lower value may help increase command speed.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
 
 DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -283,9 +290,10 @@ start a build
 ```
 USAGE
   $ eas build [-p android|ios|all] [--json] [--profile <value>] [--non-interactive] [--local] [--output
-    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>]
+    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>] [-m <value>]
 
 FLAGS
+  -m, --message=<value>                    A short message describing the build
   -p, --platform=(android|ios|all)
   --auto-submit                            Submit on build complete using the submit profile with the same name as the
                                            build profile
@@ -303,7 +311,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -317,7 +325,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -334,7 +342,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -369,7 +377,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.55.1/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -402,7 +410,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:submit`
 
@@ -447,7 +455,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -467,7 +475,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -488,7 +496,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -505,7 +513,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -525,7 +533,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -543,7 +551,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -557,7 +565,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -571,7 +579,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.55.1/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -589,7 +597,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -606,7 +614,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -620,7 +628,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -634,7 +642,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -716,7 +724,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -733,7 +741,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas project:info`
 
@@ -747,7 +755,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -764,7 +772,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -784,7 +792,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.55.1/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -801,7 +809,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -815,7 +823,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.55.1/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas submit`
 
@@ -845,7 +853,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -875,7 +883,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -892,7 +900,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -912,7 +920,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.55.1/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -931,7 +939,7 @@ DESCRIPTION
   view the recent updates for a branch
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -951,7 +959,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -971,7 +979,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -988,7 +996,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1005,7 +1013,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1026,7 +1034,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1043,7 +1051,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.55.1/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 
@@ -1059,5 +1067,4 @@ DESCRIPTION
 ALIASES
   $ eas whoami
 ```
-
 <!-- commandsstop -->

packages/eas-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.55.1",
+  "version": "0.57.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -13,8 +13,8 @@
     "@expo/config": "6.0.23",
     "@expo/config-plugins": "4.1.4",
     "@expo/config-types": "45.0.0",
-    "@expo/eas-build-job": "0.2.77",
-    "@expo/eas-json": "0.55.0",
+    "@expo/eas-build-job": "0.2.84",
+    "@expo/eas-json": "0.57.0",
     "@expo/json-file": "8.2.36",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/pkcs12": "0.0.8",
@@ -103,6 +103,7 @@
     "nock": "13.2.4",
     "tempy": "0.7.0",
     "ts-deepmerge": "2.0.1",
+    "ts-mockito": "2.6.1",
     "typescript": "4.7.4"
   },
   "engines": {
@@ -166,7 +167,7 @@
     },
     "warn-if-update-available": {
       "timeoutInDays": 0.5,
-      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
+      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
     },
     "update": {
       "node": {
@@ -200,5 +201,9 @@
     "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
     "clean": "rm -rf dist build tmp node_modules yarn-error.log"
+  },
+  "volta": {
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

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

@@ -0,0 +1,109 @@
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { UpdateBranchFragment } from '../graphql/generated';
+import { BranchQuery } from '../graphql/queries/BranchQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../update/utils';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+
+export const BRANCHES_LIMIT = 50;
+
+export async function selectBranchFromPaginatedQueryAsync(
+  projectId: string,
+  promptTitle: string,
+  options: PaginatedQueryOptions
+): Promise<UpdateBranchFragment> {
+  if (options.nonInteractive) {
+    throw new Error('Unable to select a branch in non-interactive mode.');
+  }
+
+  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
+    limit: options.limit ?? BRANCHES_LIMIT,
+    offset: options.offset,
+    queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
+    promptOptions: {
+      title: promptTitle,
+      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
+      createDisplayTextForSelectionPromptListItem: updateBranchFragment =>
+        updateBranchFragment.name,
+    },
+  });
+  if (!selectedBranch) {
+    throw new Error(`Could not find any branches for project "${projectId}"`);
+  }
+  return selectedBranch;
+}
+
+export async function listAndRenderPaginatedBranchesAsync(
+  projectId: string,
+  options: PaginatedQueryOptions
+): Promise<void> {
+  if (options.nonInteractive) {
+    const branches = await queryBranchesForProjectAsync(
+      options.limit ?? BRANCHES_LIMIT,
+      options.offset,
+      projectId
+    );
+    renderPageOfBranches(branches, options);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: options.limit ?? BRANCHES_LIMIT,
+      offset: options.offset,
+      queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
+      promptOptions: {
+        title: 'Load more branches?',
+        renderListItems: branches => renderPageOfBranches(branches, options),
+      },
+    });
+  }
+}
+
+async function queryBranchesForProjectAsync(
+  limit: number,
+  offset: number,
+  projectId: string
+): Promise<UpdateBranchFragment[]> {
+  return await BranchQuery.listBranchesAsync({
+    appId: projectId,
+    limit,
+    offset,
+  });
+}
+
+function renderPageOfBranches(
+  currentPage: UpdateBranchFragment[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput(currentPage);
+  } else {
+    const table = new CliTable({
+      head: ['Branch', ...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    table.push(
+      ...currentPage.map(branch => [
+        branch.name,
+        formatUpdate(branch.updates[0]),
+        branch.updates[0]?.runtimeVersion ?? 'N/A',
+        branch.updates[0]?.group ?? 'N/A',
+        getPlatformsForGroup({
+          updates: branch.updates,
+          group: branch.updates[0]?.group,
+        }),
+      ])
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branches:'));
+    Log.addNewLineIfNone();
+    Log.log(table.toString());
+  }
+}

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

@@ -0,0 +1,14 @@
+import { truncateGitCommitMessage } from '../metadata';
+
+describe(truncateGitCommitMessage, () => {
+  it('returns undefined if no message was passed', () => {
+    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
+  });
+  it('returns commit message', () => {
+    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
+  });
+
+  it('truncates long commit messages', () => {
+    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
+  });
+});

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

@@ -89,7 +89,7 @@ describe(bumpVersionAsync, () => {
     expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
   });
 
-  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.APP_VERSION', async () => {
     const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
     const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });
 

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

@@ -11,6 +11,7 @@ import {
   parseGradleCommand,
   resolveConfigValue,
 } from '../../project/android/gradleUtils';
+import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
@@ -46,9 +47,10 @@ export async function bumpVersionAsync({
 
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToBuildGradleAsync({
+  await updateNativeVersionsAsync({
     projectDir,
-    exp,
+    version: exp.version,
+    versionCode: exp.android?.versionCode,
   });
   Log.log('Synchronized versions with build gradle');
 }
@@ -74,7 +76,7 @@ export async function bumpVersionInAppJsonAsync({
     await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const versionCode = AndroidConfig.Version.getVersionCode(exp);
-    const bumpedVersionCode = versionCode + 1;
+    const bumpedVersionCode = getNextVersionCode(versionCode);
     Log.log(
       `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
         versionCode
@@ -116,21 +118,33 @@ export async function maybeResolveVersionsAsync(
   }
 }
 
-async function writeVersionsToBuildGradleAsync({
+export async function updateNativeVersionsAsync({
   projectDir,
-  exp,
+  version,
+  versionCode,
 }: {
   projectDir: string;
-  exp: ExpoConfig;
-}): Promise<string> {
+  version?: string;
+  versionCode?: number;
+}): Promise<void> {
   const buildGradle = await readBuildGradleAsync(projectDir);
   if (!buildGradle) {
     throw new Error('This project is missing a build.gradle file.');
   }
-  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
-  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
+  let updatedBuildGradle = buildGradle;
+  if (version !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionName ".*"`),
+      `versionName "${version}"`
+    );
+  }
+  if (versionCode !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionCode.*`),
+      `versionCode ${versionCode}`
+    );
+  }
   await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
-  return updatedBuildGradle;
 }
 
 async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {

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

@@ -25,7 +25,7 @@ import {
   appPlatformEmojis,
   requestedPlatformDisplayNames,
 } from '../platform';
-import { uploadAsync } from '../uploads';
+import { uploadFileAtPathToS3Async } from '../uploads';
 import { formatBytes } from '../utils/files';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
@@ -179,7 +179,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         const projectTarball = await makeProjectTarballAsync();
         projectTarballPath = projectTarball.path;
 
-        const { bucketKey } = await uploadAsync(
+        const { bucketKey } = await uploadFileAtPathToS3Async(
           UploadSessionType.EasBuildProjectSources,
           projectTarball.path,
           createProgressTracker({
@@ -352,7 +352,7 @@ async function handleSingleBuildProgressAsync(
           );
         }
         Log.newLine();
-        Log.log('Waiting in queue');
+        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
         queueProgressBar.start(
           build.initialQueuePosition + 1,
           build.initialQueuePosition - build.queuePosition + 1,
@@ -385,6 +385,12 @@ async function handleSingleBuildProgressAsync(
   return { refetch: true };
 }
 
+const priorityToQueueDisplayName: Record<BuildPriority, string> = {
+  [BuildPriority.Normal]: 'queue',
+  [BuildPriority.NormalPlus]: 'queue',
+  [BuildPriority.High]: 'priority queue',
+};
+
 const statusToDisplayName: Record<BuildStatus, string> = {
   [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
   [BuildStatus.InQueue]: 'in queue',

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

@@ -1,7 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 
 import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
@@ -21,7 +20,6 @@ export interface AndroidBuildContext {
 
 export interface IosBuildContext {
   bundleIdentifier: string;
-  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
   applicationTarget: Target;
   targets: Target[];
   xcodeBuildContext: XcodeBuildContext;
@@ -29,6 +27,7 @@ export interface IosBuildContext {
 
 export interface BuildContext<T extends Platform> {
   accountName: string;
+  easJsonCliConfig: EasJson['cli'];
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
   resourceClass: BuildResourceClass;
@@ -41,6 +40,7 @@ export interface BuildContext<T extends Platform> {
   projectDir: string;
   projectId: string;
   projectName: string;
+  message?: string;
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;

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

@@ -1,5 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 import JsonFile from '@expo/json-file';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
@@ -21,21 +21,25 @@ import { LocalBuildOptions } from './local';
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,
   buildProfile,
+  easJsonCliConfig,
   clearCache = false,
   localBuildOptions,
   nonInteractive = false,
   platform,
   projectDir,
   resourceClass,
+  message,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
+  easJsonCliConfig: EasJson['cli'];
   clearCache: boolean;
   localBuildOptions: LocalBuildOptions;
   nonInteractive: boolean;
   platform: T;
   projectDir: string;
   resourceClass: BuildResourceClass;
+  message?: string;
 }): Promise<BuildContext<T>> {
   const exp = getExpoConfig(projectDir, { env: buildProfile.env });
 
@@ -74,6 +78,7 @@ export async function createBuildContextAsync<T extends Platform>({
     buildProfile,
     buildProfileName,
     resourceClass,
+    easJsonCliConfig,
     clearCache,
     credentialsCtx,
     exp,
@@ -86,6 +91,7 @@ export async function createBuildContextAsync<T extends Platform>({
     trackingCtx,
     user,
     workflow,
+    message,
   };
   if (platform === Platform.ANDROID) {
     const common = commonContext as CommonContext<Platform.ANDROID>;

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

@@ -3,6 +3,7 @@ import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import type { XCBuildConfiguration } from 'xcode';
 
 import { readPlistAsync } from '../../../utils/plist';
 import {
@@ -17,6 +18,12 @@ import {
 
 jest.mock('fs');
 
+const getXCBuildConfigurationFromPbxproj = jest.spyOn(
+  IOSConfig.Target,
+  'getXCBuildConfigurationFromPbxproj'
+);
+const getPbxproj = jest.spyOn(IOSConfig.XcodeUtils, 'getPbxproj');
+
 afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
@@ -51,14 +58,34 @@ describe(evaluateTemplateString, () => {
 
 // bare workflow
 describe(bumpVersionAsync, () => {
+  beforeEach(() => {
+    getPbxproj.mockImplementation(() => ({} as any));
+  });
+  afterEach(() => {
+    getXCBuildConfigurationFromPbxproj.mockReset();
+    getPbxproj.mockReset();
+  });
   it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
     const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -76,13 +103,25 @@ describe(bumpVersionAsync, () => {
   it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
     const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });
 
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {
-        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
-      },
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -97,14 +136,27 @@ describe(bumpVersionAsync, () => {
     expect(infoPlist['CFBundleVersion']).toBe('2');
   });
 
-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.APP_VERSION', async () => {
     const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -121,12 +173,25 @@ describe(bumpVersionAsync, () => {
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
     const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
@@ -288,9 +353,9 @@ describe(getInfoPlistPath, () => {
 
 function initBareWorkflowProject({
   appVersion = '1.0.0',
-  version = '1',
+  buildNumber = '1',
   infoPlistName = 'Info.plist',
-}: { appVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -311,7 +376,7 @@ function initBareWorkflowProject({
   <key>CFBundleShortVersionString</key>
   <string>${appVersion}</string>
   <key>CFBundleVersion</key>
-  <string>${version}</string>
+  <string>${buildNumber}</string>
 </dict>
 </plist>`,
     },

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

@@ -1,8 +1,6 @@
-import { IOSConfig } from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import type { XCBuildConfiguration } from 'xcode';
 
-import { IosCredentials, Target } from '../../credentials/ios/types';
+import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
@@ -44,12 +42,10 @@ export async function createIosContextAsync(
     env: buildProfile.env,
   });
   const applicationTarget = findApplicationTarget(targets);
-  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
 
   return {
     bundleIdentifier: applicationTarget.bundleIdentifier,
     applicationTarget,
-    applicationTargetBuildSettings,
     targets,
     xcodeBuildContext,
   };
@@ -68,7 +64,7 @@ export async function prepareIosBuildAsync(
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile: ctx.buildProfile,
-        buildSettings: ctx.ios.applicationTargetBuildSettings,
+        targets: ctx.ios.targets,
       });
     },
     prepareJobAsync: async (
@@ -97,18 +93,3 @@ export async function prepareIosBuildAsync(
     },
   });
 }
-
-function resolveBuildSettings(
-  ctx: CommonContext<Platform.IOS>,
-  applicationTarget: Target
-): XCBuildConfiguration['buildSettings'] {
-  if (ctx.workflow === Workflow.MANAGED) {
-    return {};
-  }
-  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
-  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
-    targetName: applicationTarget.targetName,
-    buildConfiguration: applicationTarget.buildConfiguration,
-  });
-  return xcBuildConfiguration?.buildSettings ?? {};
-}

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

@@ -1,8 +1,8 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
 
+import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
@@ -12,12 +12,12 @@ export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
-  buildSettings,
+  targets,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   buildProfile: BuildProfile<Platform.IOS>;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  targets: Target[];
 }): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const { autoIncrement } = buildProfile;
@@ -27,7 +27,7 @@ export async function syncProjectConfigurationAsync({
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {
     await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }

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

@@ -1,16 +1,20 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';
 
+import { Target } from '../../credentials/ios/types';
 import Log from '../../log';
+import { findApplicationTarget } from '../../project/ios/target';
+import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
+import uniqBy from '../../utils/expodash/uniqBy';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { bumpAppVersionAsync } from '../utils/version';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -22,21 +26,25 @@ export async function bumpVersionAsync({
   bumpStrategy,
   projectDir,
   exp,
-  buildSettings,
+  targets,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   bumpStrategy: BumpStrategy;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  targets: Target[];
 }): Promise<void> {
   if (bumpStrategy === BumpStrategy.NOOP) {
     return;
   }
   ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
+  await updateNativeVersionsAsync({
+    projectDir,
+    version: exp.version,
+    buildNumber: exp.ios?.buildNumber,
+    targets,
+  });
   Log.log('Synchronized versions with Info.plist');
 }
 
@@ -59,10 +67,8 @@ export async function bumpVersionInAppJsonAsync({
     await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const buildNumber = IOSConfig.Version.getBuildNumber(exp);
-    if (buildNumber.match(/^\d+(\.\d+)*$/)) {
-      const comps = buildNumber.split('.');
-      comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
-      const bumpedBuildNumber = comps.join('.');
+    if (isValidBuildNumber(buildNumber)) {
+      const bumpedBuildNumber = getNextBuildNumber(buildNumber);
       Log.log(
         `Bumping ${chalk.bold('expo.ios.buildNumber')} from ${chalk.bold(
           buildNumber
@@ -121,12 +127,21 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings']
+  targets: Target[]
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  const applicationTarget = findApplicationTarget(targets);
   try {
     return {
-      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
-      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+      appBuildVersion: await readBuildNumberAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
+      appVersion: await readShortVersionAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
     };
   } catch (err: any) {
     Log.warn('Failed to read app versions.');
@@ -137,23 +152,6 @@ export async function maybeResolveVersionsAsync(
   }
 }
 
-async function writeVersionsToInfoPlistAsync({
-  projectDir,
-  exp,
-  infoPlist,
-  buildSettings,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  infoPlist: IOSConfig.InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
-}): Promise<IOSConfig.InfoPlist> {
-  let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
-  updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
-  return updatedInfoPlist;
-}
-
 export function getInfoPlistPath(
   projectDir: string,
   buildSettings: XCBuildConfiguration['buildSettings']
@@ -181,24 +179,55 @@ async function readInfoPlistAsync(
   return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
 }
 
-async function writeInfoPlistAsync({
+export async function updateNativeVersionsAsync({
   projectDir,
-  infoPlist,
-  buildSettings,
+  version,
+  buildNumber,
+  targets,
 }: {
   projectDir: string;
-  infoPlist: IOSConfig.InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  version?: string;
+  buildNumber?: string;
+  targets: Target[];
 }): Promise<void> {
-  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  await writePlistAsync(infoPlistPath, infoPlist);
+  const project = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+  const iosDir = path.join(projectDir, 'ios');
+
+  const infoPlistFiles: string[] = [];
+  for (const target of targets) {
+    const { targetName, buildConfiguration } = target;
+    const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+      targetName,
+      buildConfiguration,
+    });
+    const infoPlist = xcBuildConfiguration?.buildSettings?.INFOPLIST_FILE;
+    if (infoPlist) {
+      const evaluatedInfoPlistPath = trimQuotes(
+        evaluateTemplateString(infoPlist, {
+          SRCROOT: iosDir,
+        })
+      );
+      const absolutePath = path.isAbsolute(evaluatedInfoPlistPath)
+        ? evaluatedInfoPlistPath
+        : path.join(iosDir, evaluatedInfoPlistPath);
+      infoPlistFiles.push(path.normalize(absolutePath));
+    }
+  }
+  const uniqueInfoPlistPaths = uniqBy(infoPlistFiles, i => i);
+  for (const infoPlistPath of uniqueInfoPlistPaths) {
+    const infoPlist = (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+    if (buildNumber) {
+      infoPlist.CFBundleVersion = buildNumber;
+    }
+    if (version) {
+      infoPlist.CFBundleShortVersionString = version;
+    }
+    await writePlistAsync(infoPlistPath, infoPlist);
+  }
 }
 
-function ensureStaticConfigExists(projectDir: string): void {
-  const paths = getConfigFilePaths(projectDir);
-  if (!paths.staticConfigPath) {
-    throw new Error('autoIncrement option is not supported when using app.config.js');
-  }
+function trimQuotes(s: string): string {
+  return s?.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s;
 }
 
 export function evaluateTemplateString(

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

@@ -24,12 +24,13 @@ import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<Metadata> {
+  const vcsClient = getVcsClient();
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   const distribution =
     ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
       ? 'simulator'
       : ctx.buildProfile.distribution) ?? 'store';
-  const metadata = {
+  const metadata: Metadata = {
     trackingContext: ctx.trackingCtx,
     ...(await maybeResolveVersionsAsync(ctx)),
     cliVersion: easCliVersion,
@@ -43,9 +44,13 @@ export async function collectMetadataAsync<T extends Platform>(
     appName: ctx.exp.name,
     appIdentifier: resolveAppIdentifier(ctx),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await getVcsClient().getCommitHashAsync(),
-    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
+    gitCommitMessage: truncateGitCommitMessage(
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
+    ),
+    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
     username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    message: ctx.message,
     ...(ctx.platform === Platform.IOS && {
       iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
         ctx as BuildContext<Platform.IOS>
@@ -60,11 +65,7 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
     const iosContext = ctx as BuildContext<Platform.IOS>;
-    return await maybeResolveIosVersionsAsync(
-      ctx.projectDir,
-      ctx.exp,
-      iosContext.ios.applicationTargetBuildSettings
-    );
+    return await maybeResolveIosVersionsAsync(ctx.projectDir, ctx.exp, iosContext.ios.targets);
   } else if (ctx.platform === Platform.ANDROID) {
     const androidCtx = ctx as BuildContext<Platform.ANDROID>;
     return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
@@ -149,3 +150,13 @@ function resolveIosEnterpriseProvisioning(
 ): IosEnterpriseProvisioning | undefined {
   return ctx.buildProfile.enterpriseProvisioning;
 }
+
+export function truncateGitCommitMessage(
+  msg: string | undefined,
+  maxLength: number = 4096
+): string | undefined {
+  if (msg === undefined) {
+    return undefined;
+  }
+  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
+}

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

@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
+import { BuildProfile, EasJson, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
@@ -55,6 +55,7 @@ export interface BuildFlags {
   submitProfile?: string;
   localBuildOptions: LocalBuildOptions;
   userInputResourceClass?: UserInputResourceClass;
+  message?: string;
 }
 
 const platformToGraphQLResourceClassMapping: Record<
@@ -80,6 +81,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
     nonInteractive: flags.nonInteractive,
   });
   const easJsonReader = new EasJsonReader(projectDir);
+  const easJsonCliConfig: EasJson['cli'] = (await easJsonReader.getCliConfigAsync()) ?? {};
 
   const platforms = toPlatforms(flags.requestedPlatform);
   const buildProfiles = await getProfilesAsync({
@@ -111,6 +113,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
         platformToGraphQLResourceClassMapping[buildProfile.platform][
           flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
         ],
+      easJsonCliConfig,
     });
     if (maybeBuild) {
       startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -188,12 +191,14 @@ async function prepareAndStartBuildAsync({
   moreBuilds,
   buildProfile,
   resourceClass,
+  easJsonCliConfig,
 }: {
   projectDir: string;
   flags: BuildFlags;
   moreBuilds: boolean;
   buildProfile: ProfileData<'build'>;
   resourceClass: BuildResourceClass;
+  easJsonCliConfig: EasJson['cli'];
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
     buildProfileName: buildProfile.profileName,
@@ -204,6 +209,8 @@ async function prepareAndStartBuildAsync({
     platform: buildProfile.platform,
     projectDir,
     localBuildOptions: flags.localBuildOptions,
+    easJsonCliConfig,
+    message: flags.message,
   });
 
   if (moreBuilds) {

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

@@ -0,0 +1,58 @@
+import { Flags } from '@oclif/core';
+
+export const getPaginatedQueryOptions = (
+  flags: Record<keyof typeof EasPaginatedQueryFlags, any>
+): PaginatedQueryOptions => {
+  return {
+    json: flags.json ?? false,
+    offset: flags.offset ?? 0,
+    nonInteractive: flags['non-interactive'] ?? false,
+    ...('limit' in flags && { limit: flags.limit }),
+  };
+};
+
+const parseFlagInputStringAsInteger = (
+  input: string,
+  flagName: string,
+  lowerLimit: number,
+  upperLimit: number
+): number => {
+  const inputAsNumber = Number(input);
+  if (isNaN(inputAsNumber)) {
+    throw new Error(`Unable to parse ${input} as a number`);
+  }
+  if (inputAsNumber < lowerLimit || inputAsNumber > upperLimit) {
+    throw new Error(`--${flagName} must be between ${lowerLimit} and ${upperLimit}`);
+  }
+  return inputAsNumber;
+};
+
+export const EasPaginatedQueryFlags = {
+  offset: Flags.integer({
+    description: 'Start queries from specified index. Use for paginating results. Defaults to 0.',
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input =>
+      parseFlagInputStringAsInteger(input, 'offset', 0, Number.MAX_SAFE_INTEGER),
+  }),
+  limit: Flags.integer({
+    description:
+      'The number of query items to list at once. The default value is 50 (the maximum is 100). Using a lower value may help increase command speed.',
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input => parseFlagInputStringAsInteger(input, 'limit', 1, 100),
+  }),
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+  }),
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+// options required to control a paginated query
+// from user input
+export type PaginatedQueryOptions = {
+  nonInteractive: boolean;
+  json: boolean;
+  limit?: number;
+  offset: number;
+};

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

@@ -1,106 +1,28 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import CliTable from 'cli-table3';
-import { print } from 'graphql';
-import gql from 'graphql-tag';
-
+import { listAndRenderPaginatedBranchesAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
-import {
-  BranchesByAppQuery,
-  BranchesByAppQueryVariables,
-  UpdateBranchFragment,
-} from '../../graphql/generated';
-import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch';
-import Log from '../../log';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-const BRANCHES_LIMIT = 10_000;
-
-export async function listBranchesAsync({
-  projectId,
-}: {
-  projectId: string;
-}): Promise<UpdateBranchFragment[]> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
-        gql`
-          query BranchesByAppQuery($appId: String!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateBranches(offset: 0, limit: $limit) {
-                  id
-                  ...UpdateBranchFragment
-                }
-              }
-            }
-          }
-          ${print(UpdateBranchFragmentNode)}
-        `,
-        {
-          appId: projectId,
-          limit: BRANCHES_LIMIT,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
-      )
-      .toPromise()
-  );
-
-  return data?.app?.byId.updateBranches ?? [];
-}
+import { enableJsonOutput } from '../../utils/json';
 
 export default class BranchList extends EasCommand {
   static description = 'list all branches';
 
   static flags = {
-    json: Flags.boolean({
-      description: 'return output as JSON',
-      default: false,
-    }),
+    ...EasPaginatedQueryFlags,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BranchList);
-    if (flags.json) {
+    const options = getPaginatedQueryOptions(flags);
+
+    if (options.json) {
       enableJsonOutput();
     }
 
     const projectDir = await findProjectRootAsync();
     const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
-    const branches = await listBranchesAsync({ projectId });
-    if (flags.json) {
-      printJsonOnlyOutput(branches);
-    } else {
-      const table = new CliTable({
-        head: ['Branch', ...UPDATE_COLUMNS],
-        wordWrap: true,
-      });
-
-      table.push(
-        ...branches.map(branch => [
-          branch.name,
-          formatUpdate(branch.updates[0]),
-          branch.updates[0]?.runtimeVersion ?? 'N/A',
-          branch.updates[0]?.group ?? 'N/A',
-          getPlatformsForGroup({
-            updates: branch.updates,
-            group: branch.updates[0]?.group,
-          }),
-        ])
-      );
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branches with their most recent update group:'));
-      Log.log(table.toString());
-      if (branches.length >= BRANCHES_LIMIT) {
-        Log.warn(`Showing first ${BRANCHES_LIMIT} branches, some results might be omitted.`);
-      }
-    }
+    await listAndRenderPaginatedBranchesAsync(projectId, options);
   }
 }

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

@@ -1,17 +1,10 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import Table from 'cli-table3';
-
+import { selectBranchFromPaginatedQueryAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log from '../../log';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync } from '../../prompts';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils';
-import groupBy from '../../utils/expodash/groupBy';
-import formatFields from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { listAndRenderUpdatesOnBranchByNameAsync } from '../../update/queries';
+import { enableJsonOutput } from '../../utils/json';
 
 export default class BranchView extends EasCommand {
   static description = 'view a branch';
@@ -25,18 +18,17 @@ export default class BranchView extends EasCommand {
   ];
 
   static flags = {
-    json: Flags.boolean({
-      description: `return a json with the branch's ID name and recent update groups.`,
-      default: false,
-    }),
+    ...EasPaginatedQueryFlags,
   };
 
   async runAsync(): Promise<void> {
     let {
-      args: { name },
-      flags: { json: jsonFlag },
+      args: { name: branchName },
+      flags,
     } = await this.parse(BranchView);
-    if (jsonFlag) {
+    const options = getPaginatedQueryOptions(flags);
+
+    if (options.json) {
       enableJsonOutput();
     }
 
@@ -44,63 +36,20 @@ export default class BranchView extends EasCommand {
     const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
-    if (!name) {
-      const validationMessage = 'Branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ name } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Please enter the name of the branch to view:',
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
-
-    const { app } = await UpdateQuery.viewBranchAsync({
-      appId: projectId,
-      name,
-    });
-    const UpdateBranch = app?.byId.updateBranchByName;
-    if (!UpdateBranch) {
-      throw new Error(`Could not find branch "${name}"`);
-    }
-
-    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
-      group => group[0]
-    );
-
-    if (jsonFlag) {
-      printJsonOnlyOutput({ ...UpdateBranch, updates });
-    } else {
-      const groupTable = new Table({
-        head: UPDATE_COLUMNS,
-        wordWrap: true,
-      });
-
-      for (const update of updates) {
-        groupTable.push([
-          formatUpdate(update),
-          update.runtimeVersion,
-          update.group,
-          getPlatformsForGroup({
-            updates: UpdateBranch.updates,
-            group: update.group,
-          }),
-        ]);
+    // provide help to a user if they ran the command with missing args
+    if (!branchName) {
+      if (options.nonInteractive) {
+        throw new Error('Branch name may not be empty.');
       }
 
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branch:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: UpdateBranch.name },
-          { label: 'ID', value: UpdateBranch.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Recently published update groups:'));
-      Log.log(groupTable.toString());
+      ({ name: branchName } = await selectBranchFromPaginatedQueryAsync(
+        projectId,
+        'Which branch would you like to view?',
+        // discard limit and offset because this query is not those flag's intended target
+        { json: options.json, nonInteractive: options.nonInteractive, offset: 0 }
+      ));
     }
+
+    await listAndRenderUpdatesOnBranchByNameAsync(projectId, branchName, options);
   }
 }

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

@@ -23,6 +23,7 @@ interface RawBuildFlags {
   'auto-submit': boolean;
   'auto-submit-with-profile'?: string;
   'resource-class'?: UserInputResourceClass;
+  message?: string;
 }
 
 export default class Build extends EasCommand {
@@ -86,6 +87,10 @@ export default class Build extends EasCommand {
       hidden: true,
       description: 'The instance type that will be used to run this build [experimental]',
     }),
+    message: Flags.string({
+      char: 'm',
+      description: 'A short message describing the build',
+    }),
   };
 
   async runAsync(): Promise<void> {
@@ -143,6 +148,11 @@ export default class Build extends EasCommand {
       Log.newLine();
     }
 
+    const message = flags['message'];
+    if (message && message.length > 1024) {
+      Errors.error('Message cannot be longer than 1024 characters.', { exit: 1 });
+    }
+
     const profile = flags['profile'];
     return {
       requestedPlatform,
@@ -163,6 +173,7 @@ export default class Build extends EasCommand {
       autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
       userInputResourceClass: flags['resource-class'] ?? UserInputResourceClass.DEFAULT,
+      message,
     };
   }
 }

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

@@ -0,0 +1,114 @@
+import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../../commandUtils/EasCommand';
+import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
+import { toAppPlatform } from '../../../graphql/types/AppPlatform';
+import Log from '../../../log';
+import { selectPlatformAsync } from '../../../platform';
+import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
+import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import { getExpoConfig } from '../../../project/expoConfig';
+import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../../project/projectUtils';
+import {
+  ensureRemoteVersionPolicyAsync,
+  getBuildVersionName,
+  validateAppConfigForRemoteVersionPolicyAsync,
+} from '../../../project/remoteVersionSource';
+import { promptAsync } from '../../../prompts';
+
+export default class BuildVersionSetView extends EasCommand {
+  static description = 'Update version of an app.';
+  static hidden = true;
+
+  static flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios'],
+    }),
+    profile: Flags.string({
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+      helpValue: 'PROFILE_NAME',
+    }),
+  };
+
+  public async runAsync(): Promise<void> {
+    const { flags } = await this.parse(BuildVersionSetView);
+
+    const projectDir = await findProjectRootAsync();
+
+    const platform = await selectPlatformAsync(flags.platform);
+    const easJsonReader = new EasJsonReader(projectDir);
+    await ensureRemoteVersionPolicyAsync(projectDir, easJsonReader);
+    const profile = await easJsonReader.getBuildProfileAsync(platform, flags.profile ?? undefined);
+
+    const exp = getExpoConfig(projectDir, { env: profile.env });
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
+    await validateAppConfigForRemoteVersionPolicyAsync(exp);
+
+    const applicationIdentifier = await getApplicationIdentifierAsync(
+      projectDir,
+      exp,
+      profile,
+      platform
+    );
+    const remoteVersions = await AppVersionQuery.latestVersionAsync(
+      projectId,
+      toAppPlatform(platform),
+      applicationIdentifier
+    );
+    const currentStateMessage = remoteVersions?.buildVersion
+      ? `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
+          platform
+        )} "${applicationIdentifier}" is configured with ${getBuildVersionName(platform)} ${
+          remoteVersions.buildVersion
+        }.`
+      : `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
+          platform
+        )} "${applicationIdentifier}" does not have any ${getBuildVersionName(
+          platform
+        )} configured.`;
+
+    const versionPromptMessage = remoteVersions?.buildVersion
+      ? `What version would you like to set?`
+      : `What version would you like to initialize it with?`;
+    Log.log(currentStateMessage);
+
+    const { version } = await promptAsync({
+      type: platform === Platform.ANDROID ? 'number' : 'text',
+      name: 'version',
+      message: versionPromptMessage,
+      validate:
+        platform === Platform.ANDROID
+          ? value => isValidVersionCode(value) || `Invalid value: ${VERSION_CODE_REQUIREMENTS}.`
+          : value => isValidBuildNumber(value) || `Invalid value: ${BUILD_NUMBER_REQUIREMENTS}.`,
+    });
+    await AppVersionMutation.createAppVersionAsync({
+      appId: projectId,
+      platform: toAppPlatform(platform),
+      applicationIdentifier,
+      storeVersion: exp.version ?? '1.0.0',
+      buildVersion: String(version),
+      runtimeVersion: getRuntimeVersionNullable(exp, platform) ?? undefined,
+    });
+  }
+}
+
+function getApplicationIdentifierName(platform: Platform): string {
+  if (platform === Platform.ANDROID) {
+    return 'application ID';
+  } else {
+    return 'bundle identifier';
+  }
+}

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

@@ -0,0 +1,184 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile, EasJsonReader } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../../build/android/version';
+import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
+import EasCommand from '../../../commandUtils/EasCommand';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
+import { toAppPlatform } from '../../../graphql/types/AppPlatform';
+import Log from '../../../log';
+import {
+  appPlatformDisplayNames,
+  selectRequestedPlatformAsync,
+  toPlatforms,
+} from '../../../platform';
+import { getAppBuildGradleAsync } from '../../../project/android/gradleUtils';
+import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
+import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import { getExpoConfig } from '../../../project/expoConfig';
+import { resolveXcodeBuildContextAsync } from '../../../project/ios/scheme';
+import { resolveTargetsAsync } from '../../../project/ios/target';
+import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
+import { findProjectRootAsync, getProjectIdAsync } from '../../../project/projectUtils';
+import {
+  ensureRemoteVersionPolicyAsync,
+  getBuildVersionName,
+  validateAppConfigForRemoteVersionPolicyAsync,
+} from '../../../project/remoteVersionSource';
+import { resolveWorkflowAsync } from '../../../project/workflow';
+import { getProfilesAsync } from '../../../utils/profiles';
+
+interface SyncContext<T extends Platform> {
+  projectDir: string;
+  exp: ExpoConfig;
+  workflow: Workflow;
+  profile: BuildProfile<T>;
+  buildVersion: string;
+}
+
+export default class BuildVersionSyncView extends EasCommand {
+  public static description = 'Update a version in native code with a value stored on EAS servers';
+  static hidden = true;
+
+  public static flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+    }),
+    profile: Flags.string({
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+      helpValue: 'PROFILE_NAME',
+    }),
+  };
+
+  public async runAsync(): Promise<void> {
+    const { flags } = await this.parse(BuildVersionSyncView);
+    const projectDir = await findProjectRootAsync();
+
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    const easJsonReader = new EasJsonReader(projectDir);
+    await ensureRemoteVersionPolicyAsync(projectDir, easJsonReader);
+
+    const platforms = toPlatforms(requestedPlatform);
+    const buildProfiles = await getProfilesAsync({
+      type: 'build',
+      easJsonReader,
+      platforms,
+      profileName: flags.profile ?? undefined,
+    });
+    for (const profileInfo of buildProfiles) {
+      const exp = getExpoConfig(projectDir, { env: profileInfo.profile.env });
+      const projectId = await getProjectIdAsync(exp);
+      await validateAppConfigForRemoteVersionPolicyAsync(exp);
+      const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];
+
+      const applicationIdentifier = await getApplicationIdentifierAsync(
+        projectDir,
+        exp,
+        profileInfo.profile,
+        profileInfo.platform
+      );
+      const remoteVersions = await AppVersionQuery.latestVersionAsync(
+        projectId,
+        toAppPlatform(profileInfo.platform),
+        applicationIdentifier
+      );
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform);
+      if (!remoteVersions?.buildVersion) {
+        Log.warn(
+          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
+        );
+        continue;
+      }
+      if (workflow === Workflow.MANAGED) {
+        Log.warn(
+          `The remote value for the ${platformDisplayName} ${getBuildVersionName(
+            profileInfo.platform
+          )} is ${chalk.bold(
+            remoteVersions?.buildVersion
+          )}, but it was not synced to the local project. This command has no effect on projects using managed workflow.`
+        );
+        continue;
+      }
+      if (profileInfo.platform === Platform.ANDROID) {
+        this.syncAndroidAsync({
+          projectDir,
+          exp,
+          profile: profileInfo.profile as BuildProfile<Platform.ANDROID>,
+          workflow,
+          buildVersion: remoteVersions.buildVersion,
+        });
+      } else {
+        this.syncIosAsync({
+          projectDir,
+          exp,
+          profile: profileInfo.profile as BuildProfile<Platform.IOS>,
+          workflow,
+          buildVersion: remoteVersions.buildVersion,
+        });
+      }
+      Log.withTick(
+        `Successfully updated the ${platformDisplayName} ${getBuildVersionName(
+          profileInfo.platform
+        )} in native code to ${chalk.bold(remoteVersions?.buildVersion)}.`
+      );
+    }
+  }
+
+  private async syncIosAsync({
+    workflow,
+    projectDir,
+    exp,
+    profile,
+    buildVersion,
+  }: SyncContext<Platform.IOS>): Promise<void> {
+    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
+      { exp, projectDir, nonInteractive: false },
+      profile
+    );
+    const targets = await resolveTargetsAsync({
+      projectDir,
+      exp,
+      xcodeBuildContext,
+      env: profile.env,
+    });
+
+    if (!isValidBuildNumber(buildVersion)) {
+      throw new Error(`Invalid buildNumber (${buildVersion}), ${BUILD_NUMBER_REQUIREMENTS}.`);
+    }
+
+    if (workflow === Workflow.GENERIC) {
+      await updateIosNativeVersionsAsync({
+        projectDir,
+        buildNumber: buildVersion,
+        targets,
+      });
+    }
+  }
+
+  private async syncAndroidAsync({
+    projectDir,
+    workflow,
+    buildVersion,
+  }: SyncContext<Platform.ANDROID>): Promise<void> {
+    if (!isValidVersionCode(buildVersion)) {
+      throw new Error(`Invalid versionCode (${buildVersion}), ${VERSION_CODE_REQUIREMENTS}.`);
+    }
+
+    if (workflow === Workflow.GENERIC) {
+      const buildGradle = await getAppBuildGradleAsync(projectDir);
+      const isMultiFlavor =
+        buildGradle.android?.productFlavors || buildGradle.android?.flavorDimensions;
+      if (isMultiFlavor) {
+        throw new Error(
+          "Versions in native code can't be automatically synced in multi-flavor Android projects. If you are using EAS Build with app version source set to remote, the correct values will be injected at the build time."
+        );
+      }
+      await updateAndroidNativeVersionsAsync({ projectDir, versionCode: Number(buildVersion) });
+    }
+  }
+}

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

@@ -9,6 +9,7 @@ import gql from 'graphql-tag';
 import nullthrows from 'nullthrows';
 
 import { getEASUpdateURL } from '../../api';
+import { BRANCHES_LIMIT } from '../../branch/queries';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import EasCommand from '../../commandUtils/EasCommand';
 import fetch from '../../fetch';
@@ -25,6 +26,7 @@ import {
   ViewBranchUpdatesQuery,
 } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
@@ -58,7 +60,6 @@ import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { getVcsClient } from '../../vcs';
 import { createUpdateBranchOnAppAsync } from '../branch/create';
-import { listBranchesAsync } from '../branch/list';
 import { createUpdateChannelOnAppAsync } from '../channel/create';
 
 export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
@@ -128,8 +129,8 @@ export async function ensureBranchExistsAsync({
 }: {
   appId: string;
   name: string;
-  limit?: number;
-  offset?: number;
+  limit: number;
+  offset: number;
 }): Promise<{
   id: string;
   updates: Exclude<
@@ -291,7 +292,11 @@ export default class UpdatePublish extends EasCommand {
         throw new Error(validationMessage);
       }
 
-      const branches = await listBranchesAsync({ projectId });
+      const branches = await BranchQuery.listBranchesAsync({
+        appId: projectId,
+        limit: BRANCHES_LIMIT,
+        offset: 0,
+      });
       if (branches.length === 0) {
         ({ name: branchName } = await promptAsync({
           type: 'text',
@@ -474,6 +479,7 @@ export default class UpdatePublish extends EasCommand {
       appId: projectId,
       name: branchName,
       limit: 0,
+      offset: 0,
     });
 
     // Sort the updates into different groups based on their platform specific runtime versions
@@ -568,7 +574,7 @@ export default class UpdatePublish extends EasCommand {
         const newUpdatesForRuntimeVersion = newUpdates.filter(
           update => update.runtimeVersion === runtime
         );
-        if (!newUpdatesForRuntimeVersion.length) {
+        if (newUpdatesForRuntimeVersion.length === 0) {
           throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
         }
         const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
@@ -643,7 +649,7 @@ export async function getUpdatesToRepublishInteractiveAsync(
     title: formatUpdateTitle(update),
     value: update.group,
   }));
-  if (!updateGroups.length) {
+  if (updateGroups.length === 0) {
     throw new Error(
       `There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
     );

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

@@ -4,24 +4,21 @@ import chalk from 'chalk';
 import CliTable from 'cli-table3';
 
 import EasCommand from '../../commandUtils/EasCommand';
-import { ViewAllUpdatesQuery } from '../../graphql/generated';
 import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { FormatUpdateParameter, UPDATE_COLUMNS, formatUpdate } from '../../update/utils';
-import groupBy from '../../utils/expodash/groupBy';
+import { UPDATES_LIMIT } from '../../update/queries';
+import {
+  UPDATE_COLUMNS,
+  UpdateGroupDescription,
+  formatUpdate,
+  getUpdateGroupsWithPlatforms,
+} from '../../update/utils';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { getVcsClient } from '../../vcs';
 
-type UpdateGroupDescription = FormatUpdateParameter & {
-  branch: string;
-  group: string;
-  platforms: string;
-  runtimeVersion: string;
-};
-
 export default class BranchView extends EasCommand {
   static description = 'view the recent updates for a branch';
 
@@ -55,10 +52,17 @@ export default class BranchView extends EasCommand {
 
     let updateGroupDescriptions: UpdateGroupDescription[];
     if (all) {
-      const branchesAndUpdates = await UpdateQuery.viewAllAsync({ appId: projectId });
-      updateGroupDescriptions = getUpdateGroupDescriptions(
-        branchesAndUpdates.app.byId.updateBranches
-      );
+      const branchesAndUpdates = await UpdateQuery.viewAllAsync({
+        appId: projectId,
+        limit: UPDATES_LIMIT,
+        offset: 0,
+      });
+      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
+        branchesAndUpdates.app.byId.updates.map(update => ({
+          ...update,
+          branch: update.branch.name,
+        }))
+      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
     } else {
       let branchInteractive: string | undefined;
       if (!branchFlag) {
@@ -80,12 +84,16 @@ export default class BranchView extends EasCommand {
       const branchesAndUpdates = await UpdateQuery.viewBranchAsync({
         appId: projectId,
         name: branch,
+        limit: UPDATES_LIMIT,
+        offset: 0,
       });
       const UpdateBranch = branchesAndUpdates.app?.byId.updateBranchByName;
       if (!UpdateBranch) {
         throw new Error(`Could not find branch "${branch}"`);
       }
-      updateGroupDescriptions = getUpdateGroupDescriptions([UpdateBranch]);
+      updateGroupDescriptions = getUpdateGroupsWithPlatforms(
+        UpdateBranch.updates.map(update => ({ ...update, branch }))
+      ).sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
     }
 
     if (jsonFlag) {
@@ -96,29 +104,6 @@ export default class BranchView extends EasCommand {
   }
 }
 
-function getUpdateGroupDescriptions(
-  branchesAndUpdates: ViewAllUpdatesQuery['app']['byId']['updateBranches']
-): UpdateGroupDescription[] {
-  const flattenedBranchesAndUpdates = branchesAndUpdates.flatMap(branch =>
-    branch.updates.map(update => {
-      return { branch: branch.name, ...update };
-    })
-  );
-  const updateGroupDescriptions = Object.values(
-    groupBy(flattenedBranchesAndUpdates, update => update.group)
-  ).map(updateGroup => {
-    const platforms = updateGroup
-      .map(update => update.platform)
-      .sort()
-      .join(', ');
-    return { ...updateGroup[0], platforms };
-  });
-  updateGroupDescriptions.sort(
-    (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime()
-  );
-  return updateGroupDescriptions;
-}
-
 function logAsTable(updateGroupDescriptions: UpdateGroupDescription[]): void {
   const table = new CliTable({
     head: ['Branch', ...UPDATE_COLUMNS],

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

@@ -254,11 +254,11 @@ export class SetUpAdhocProvisioningProfile {
     ctx: CredentialsContext,
     appleTeam: AppleTeamFragment
   ): Promise<AppleDeviceFragment[]> {
-    const action = new DeviceCreateAction(this.app.account, appleTeam);
+    const action = new DeviceCreateAction(ctx.appStore, this.app.account, appleTeam);
     const method = await action.runAsync();
 
     while (true) {
-      if (method !== RegistrationMethod.INPUT) {
+      if (method === RegistrationMethod.WEBSITE) {
         Log.newLine();
         Log.log(chalk.bold("Press any key if you've already finished device registration."));
         await pressAnyKeyToContinueAsync();

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

@@ -1,4 +1,5 @@
 import { JSONObject } from '@expo/json-file';
+import type { XCBuildConfiguration } from 'xcode';
 
 import {
   CommonIosAppCredentialsFragment,
@@ -17,6 +18,7 @@ export interface Target {
   bundleIdentifier: string;
   parentBundleIdentifier?: string;
   entitlements: JSONObject;
+  buildSettings?: XCBuildConfiguration['buildSettings'];
 }
 
 export interface TargetCredentials {

packages/eas-cli/src/devices/actions/create/__mocks__/developerPortalMethod.ts

@@ -0,0 +1 @@
+export const runDeveloperPortalMethodAsync = jest.fn();

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

@@ -1,13 +1,17 @@
 import prompts from 'prompts';
+import { instance, mock } from 'ts-mockito';
 
+import AppStoreApi from '../../../../credentials/ios/appstore/AppStoreApi';
 import { Account } from '../../../../user/Account';
 import DeviceCreateAction, { RegistrationMethod } from '../action';
+import { runDeveloperPortalMethodAsync } from '../developerPortalMethod';
 import { runInputMethodAsync } from '../inputMethod';
 import { runRegistrationUrlMethodAsync } from '../registrationUrlMethod';
 
 jest.mock('prompts');
-jest.mock('../registrationUrlMethod');
+jest.mock('../developerPortalMethod');
 jest.mock('../inputMethod');
+jest.mock('../registrationUrlMethod');
 
 beforeEach(() => {
   const promptsMock = jest.mocked(prompts);
@@ -25,6 +29,8 @@ describe(DeviceCreateAction, () => {
       jest.mocked(prompts).mockImplementationOnce(async () => ({
         method: RegistrationMethod.WEBSITE,
       }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);
 
       const account: Account = {
         id: 'account_id',
@@ -35,7 +41,7 @@ describe(DeviceCreateAction, () => {
         appleTeamIdentifier: 'ABC123Y',
         appleTeamName: 'John Doe (Individual)',
       };
-      const action = new DeviceCreateAction(account, appleTeam);
+      const action = new DeviceCreateAction(appStoreApi, account, appleTeam);
       await action.runAsync();
 
       expect(runRegistrationUrlMethodAsync).toBeCalled();
@@ -45,6 +51,8 @@ describe(DeviceCreateAction, () => {
       jest.mocked(prompts).mockImplementationOnce(async () => ({
         method: RegistrationMethod.INPUT,
       }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);
 
       const account: Account = {
         id: 'account_id',
@@ -55,10 +63,32 @@ describe(DeviceCreateAction, () => {
         appleTeamIdentifier: 'ABC123Y',
         appleTeamName: 'John Doe (Individual)',
       };
-      const action = new DeviceCreateAction(account, appleTeam);
+      const action = new DeviceCreateAction(appStoreApi, account, appleTeam);
       await action.runAsync();
 
       expect(runInputMethodAsync).toBeCalled();
     });
+
+    it('calls runDeveloperPortalMethodAsync if user chooses the developer portal method', async () => {
+      jest.mocked(prompts).mockImplementationOnce(async () => ({
+        method: RegistrationMethod.DEVELOPER_PORTAL,
+      }));
+      const appStoreApiMock = mock<AppStoreApi>();
+      const appStoreApi = instance(appStoreApiMock);
+
+      const account: Account = {
+        id: 'account_id',
+        name: 'foobar',
+      };
+      const appleTeam = {
+        id: 'apple-team-id',
+        appleTeamIdentifier: 'ABC123Y',
+        appleTeamName: 'John Doe (Individual)',
+      };
+      const action = new DeviceCreateAction(appStoreApi, account, appleTeam);
+      await action.runAsync();
+
+      expect(runDeveloperPortalMethodAsync).toBeCalled();
+    });
   });
 });

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

@@ -1,20 +1,24 @@
 import chalk from 'chalk';
 
+import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
 import { AppleTeam } from '../../../graphql/generated';
 import Log from '../../../log';
 import { promptAsync } from '../../../prompts';
 import { Account } from '../../../user/Account';
+import { runDeveloperPortalMethodAsync } from './developerPortalMethod';
 import { runInputMethodAsync } from './inputMethod';
 import { runRegistrationUrlMethodAsync } from './registrationUrlMethod';
 
 export enum RegistrationMethod {
   WEBSITE,
   INPUT,
+  DEVELOPER_PORTAL,
   EXIT,
 }
 
 export default class DeviceCreateAction {
   constructor(
+    private appStoreApi: AppStoreApi,
     private account: Account,
     private appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
   ) {}
@@ -23,6 +27,8 @@ export default class DeviceCreateAction {
     const method = await this.askForRegistrationMethodAsync();
     if (method === RegistrationMethod.WEBSITE) {
       await runRegistrationUrlMethodAsync(this.account.id, this.appleTeam);
+    } else if (method === RegistrationMethod.DEVELOPER_PORTAL) {
+      await runDeveloperPortalMethodAsync(this.appStoreApi, this.account.id, this.appleTeam);
     } else if (method === RegistrationMethod.INPUT) {
       await runInputMethodAsync(this.account.id, this.appleTeam);
     } else if (method === RegistrationMethod.EXIT) {
@@ -44,6 +50,12 @@ export default class DeviceCreateAction {
           )} - generates a registration URL to be opened on your devices`,
           value: RegistrationMethod.WEBSITE,
         },
+        {
+          title: `${chalk.bold(
+            'Developer Portal'
+          )} - import devices already registered on Apple Developer Portal`,
+          value: RegistrationMethod.DEVELOPER_PORTAL,
+        },
         {
           title: `${chalk.bold('Input')} - allows you to type in UDIDs (advanced option)`,
           value: RegistrationMethod.INPUT,

packages/eas-cli/src/devices/actions/create/developerPortalMethod.ts

@@ -0,0 +1,131 @@
+import { Device, DeviceClass } from '@expo/apple-utils';
+
+import { AppleDeviceMutation } from '../../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
+import {
+  AppleDeviceFragmentWithAppleTeam,
+  AppleDeviceQuery,
+} from '../../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
+import { getRequestContext } from '../../../credentials/ios/appstore/authenticate';
+import { AuthCtx } from '../../../credentials/ios/appstore/authenticateTypes';
+import { AppleDeviceClass, AppleTeam } from '../../../graphql/generated';
+import Log from '../../../log';
+import { ora } from '../../../ora';
+import { promptAsync } from '../../../prompts';
+import chunk from '../../../utils/expodash/chunk';
+
+const DEVICE_IMPORT_CHUNK_SIZE = 10;
+const DEVICE_CLASS_TO_GRAPHQL_TYPE: Partial<Record<DeviceClass, AppleDeviceClass>> = {
+  [DeviceClass.IPAD]: AppleDeviceClass.Ipad,
+  [DeviceClass.IPHONE]: AppleDeviceClass.Iphone,
+};
+
+export async function runDeveloperPortalMethodAsync(
+  appStoreApi: AppStoreApi,
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
+): Promise<void> {
+  const appleAuthCtx = await appStoreApi.ensureAuthenticatedAsync();
+  const unregisteredPortalDevices = await findUnregisteredPortalDevicesAsync(
+    appleAuthCtx,
+    accountId,
+    appleTeam
+  );
+  if (unregisteredPortalDevices.length === 0) {
+    Log.log('All your devices registered on Apple Developer Portal are already imported to EAS.');
+    return;
+  }
+  const devicesToImport = await chooseDevicesToImportAsync(unregisteredPortalDevices);
+  await importDevicesAsync(accountId, appleTeam, devicesToImport);
+}
+
+async function importDevicesAsync(
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>,
+  devices: Device[]
+): Promise<void> {
+  const spinner = ora(
+    `Importing ${devices.length} Apple device${devices.length === 1 ? '' : 's'} to EAS`
+  ).start();
+  const deviceChunks = chunk(devices, DEVICE_IMPORT_CHUNK_SIZE);
+  try {
+    for (const deviceChunk of deviceChunks) {
+      await importDeviceChunkAsync(accountId, appleTeam, deviceChunk);
+    }
+  } catch (err) {
+    spinner.fail();
+    throw err;
+  }
+  spinner.succeed();
+}
+
+async function importDeviceChunkAsync(
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>,
+  devices: Device[]
+): Promise<void> {
+  const promises = devices.map(device => {
+    return AppleDeviceMutation.createAppleDeviceAsync(
+      {
+        appleTeamId: appleTeam.id,
+        identifier: device.attributes.udid,
+        name: device.attributes.name,
+        deviceClass: DEVICE_CLASS_TO_GRAPHQL_TYPE[device.attributes.deviceClass] ?? undefined,
+      },
+      accountId
+    );
+  });
+  await Promise.all(promises);
+}
+
+async function findUnregisteredPortalDevicesAsync(
+  appleAuthCtx: AuthCtx,
+  accountId: string,
+  appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
+): Promise<Device[]> {
+  const expoRegisteredDevices = await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(
+    accountId,
+    appleTeam.appleTeamIdentifier,
+    { useCache: false }
+  );
+  const expoRegisteredDevicesByUdid = expoRegisteredDevices.reduce((acc, device) => {
+    acc[device.identifier] = device;
+    return acc;
+  }, {} as Record<string, AppleDeviceFragmentWithAppleTeam>);
+
+  const portalDevices = await Device.getAllIOSProfileDevicesAsync(getRequestContext(appleAuthCtx));
+  return portalDevices.filter(
+    portalDevice =>
+      !(portalDevice.attributes.udid in expoRegisteredDevicesByUdid) &&
+      [DeviceClass.IPAD, DeviceClass.IPHONE].includes(portalDevice.attributes.deviceClass)
+  );
+}
+
+async function chooseDevicesToImportAsync(devices: Device[]): Promise<Device[]> {
+  const { chosenDevices } = await promptAsync({
+    type: 'multiselect',
+    name: 'chosenDevices',
+    message: 'Which devices do you want to import to EAS?',
+    choices: devices.map(device => ({
+      value: device,
+      title: formatDeviceLabel(device),
+      selected: true,
+    })),
+  });
+  return chosenDevices;
+}
+
+export function formatDeviceLabel(device: Device): string {
+  const deviceDetails = formatDeviceDetails(device);
+  return `${device.attributes.name} - ${device.attributes.udid})${
+    deviceDetails !== '' ? ` - ${deviceDetails}` : ''
+  }`;
+}
+
+function formatDeviceDetails(device: Device): string {
+  let details: string = device.attributes.deviceClass;
+  if (device.attributes.model) {
+    details = device.attributes.model;
+  }
+  return details === '' ? details : `(${details})`;
+}

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

@@ -29,12 +29,12 @@ export default class DeviceManager {
     Log.addNewLineIfNone();
 
     const account = await this.resolveAccountAsync();
-    const { team } = await this.ctx.appStore.ensureAuthenticatedAsync();
+    const appleAuthCtx = await this.ctx.appStore.ensureAuthenticatedAsync();
     const appleTeam = await ensureAppleTeamExistsAsync(account.id, {
-      appleTeamIdentifier: team.id,
-      appleTeamName: team.name,
+      appleTeamIdentifier: appleAuthCtx.team.id,
+      appleTeamName: appleAuthCtx.team.name,
     });
-    const action = new DeviceCreateAction(account, appleTeam);
+    const action = new DeviceCreateAction(this.ctx.appStore, account, appleTeam);
     await action.runAsync();
   }
 

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

@@ -123,6 +123,8 @@ export type Account = {
   requiresAccessTokenForPushSecurity: Scalars['Boolean'];
   /** Snacks associated with this account */
   snacks: Array<Snack>;
+  /** SSO configuration for this account */
+  ssoConfiguration?: Maybe<AccountSsoConfiguration>;
   /** Subscription info visible to members that have VIEWER role */
   subscription?: Maybe<SubscriptionDetails>;
   /** @deprecated No longer needed */
@@ -393,6 +395,90 @@ export type AccountQueryByNameArgs = {
   accountName: Scalars['String'];
 };
 
+/** Auth configuration data for an SSO account. */
+export type AccountSsoConfiguration = {
+  __typename?: 'AccountSSOConfiguration';
+  authEndpoint?: Maybe<Scalars['String']>;
+  authProtocol: AuthProtocolType;
+  authProviderIdentifier: Scalars['String'];
+  clientIdentifier: Scalars['String'];
+  clientSecret: Scalars['String'];
+  createdAt: Scalars['DateTime'];
+  id: Scalars['ID'];
+  issuer?: Maybe<Scalars['String']>;
+  jwksEndpoint?: Maybe<Scalars['String']>;
+  redirectUri: Scalars['String'];
+  tokenEndpoint?: Maybe<Scalars['String']>;
+  updatedAt: Scalars['DateTime'];
+  userInfoEndpoint?: Maybe<Scalars['String']>;
+};
+
+export type AccountSsoConfigurationData = {
+  authEndpoint?: InputMaybe<Scalars['String']>;
+  authProtocol: AuthProtocolType;
+  authProviderIdentifier: Scalars['String'];
+  clientIdentifier: Scalars['String'];
+  clientSecret: Scalars['String'];
+  issuer?: InputMaybe<Scalars['String']>;
+  jwksEndpoint?: InputMaybe<Scalars['String']>;
+  redirectUri: Scalars['String'];
+  tokenEndpoint?: InputMaybe<Scalars['String']>;
+  userInfoEndpoint?: InputMaybe<Scalars['String']>;
+};
+
+export type AccountSsoConfigurationMutation = {
+  __typename?: 'AccountSSOConfigurationMutation';
+  /** Create an AccountSSOConfiguration for an Account */
+  createAccountSSOConfiguration: AccountSsoConfiguration;
+  /** Delete an AccountSSOConfiguration */
+  deleteAccountSSOConfiguration: DeleteAccountSsoConfigurationResult;
+  /** Update an AccountSSOConfiguration */
+  updateAccountSSOConfiguration: AccountSsoConfiguration;
+};
+
+
+export type AccountSsoConfigurationMutationCreateAccountSsoConfigurationArgs = {
+  accountId: Scalars['ID'];
+  accountSSOConfigurationData: AccountSsoConfigurationData;
+};
+
+
+export type AccountSsoConfigurationMutationDeleteAccountSsoConfigurationArgs = {
+  id: Scalars['ID'];
+};
+
+
+export type AccountSsoConfigurationMutationUpdateAccountSsoConfigurationArgs = {
+  accountSSOConfigurationData: AccountSsoConfigurationData;
+  id: Scalars['ID'];
+};
+
+/** Public auth configuration data for an SSO account. */
+export type AccountSsoConfigurationPublicData = {
+  __typename?: 'AccountSSOConfigurationPublicData';
+  authEndpoint?: Maybe<Scalars['String']>;
+  authProtocol: AuthProtocolType;
+  authProviderIdentifier: Scalars['String'];
+  clientIdentifier: Scalars['String'];
+  id: Scalars['ID'];
+  issuer?: Maybe<Scalars['String']>;
+  jwksEndpoint?: Maybe<Scalars['String']>;
+  redirectUri: Scalars['String'];
+  tokenEndpoint?: Maybe<Scalars['String']>;
+  userInfoEndpoint?: Maybe<Scalars['String']>;
+};
+
+export type AccountSsoConfigurationPublicDataQuery = {
+  __typename?: 'AccountSSOConfigurationPublicDataQuery';
+  /** Get AccountSSOConfiguration public data by account name */
+  publicDataByAccountName: AccountSsoConfigurationPublicData;
+};
+
+
+export type AccountSsoConfigurationPublicDataQueryPublicDataByAccountNameArgs = {
+  accountName: Scalars['String'];
+};
+
 export type AccountUsageMetric = {
   __typename?: 'AccountUsageMetric';
   id: Scalars['ID'];
@@ -427,6 +513,7 @@ export type AccountUsageMetricsByBillingPeriodArgs = {
 
 
 export type AccountUsageMetricsMetricsForServiceMetricArgs = {
+  filterParams?: InputMaybe<Scalars['JSONObject']>;
   granularity: UsageMetricsGranularity;
   serviceMetric: EasServiceMetric;
   timespan: UsageMetricsTimespan;
@@ -708,6 +795,7 @@ export type AndroidJobInput = {
   type: BuildWorkflow;
   updates?: InputMaybe<BuildUpdatesInput>;
   username?: InputMaybe<Scalars['String']>;
+  version?: InputMaybe<AndroidJobVersionInput>;
 };
 
 export type AndroidJobKeystoreInput = {
@@ -722,6 +810,10 @@ export type AndroidJobSecretsInput = {
   environmentSecrets?: InputMaybe<Scalars['JSONObject']>;
 };
 
+export type AndroidJobVersionInput = {
+  versionCode: Scalars['String'];
+};
+
 export type AndroidKeystore = {
   __typename?: 'AndroidKeystore';
   account: Account;
@@ -834,6 +926,7 @@ export type App = Project & {
   isLikedByMe: Scalars['Boolean'];
   /** @deprecated No longer supported */
   lastPublishedTime: Scalars['DateTime'];
+  latestAppVersionByPlatformAndApplicationIdentifier?: Maybe<AppVersion>;
   latestReleaseForReleaseChannel?: Maybe<AppRelease>;
   /** ID of latest classic update release */
   latestReleaseId: Scalars['ID'];
@@ -956,6 +1049,13 @@ export type AppIosAppCredentialsArgs = {
 };
 
 
+/** Represents an Exponent App (or Experience in legacy terms) */
+export type AppLatestAppVersionByPlatformAndApplicationIdentifierArgs = {
+  applicationIdentifier: Scalars['String'];
+  platform: AppPlatform;
+};
+
+
 /** Represents an Exponent App (or Experience in legacy terms) */
 export type AppLatestReleaseForReleaseChannelArgs = {
   platform: AppPlatform;
@@ -1198,6 +1298,52 @@ export enum AppStoreConnectUserRole {
   Unknown = 'UNKNOWN'
 }
 
+/** Represents Play Store/App Store version of an application */
+export type AppVersion = {
+  __typename?: 'AppVersion';
+  /**
+   * Store identifier for an application
+   *  - Android - applicationId
+   *  - iOS - bundle identifier
+   */
+  applicationIdentifier: Scalars['String'];
+  /**
+   * Value that identifies build in a store (it's visible to developers, but not to end users)
+   * - Android - versionCode in build.gradle ("android.versionCode" field in app.json)
+   * - iOS - CFBundleVersion in Info.plist ("ios.buildNumber" field in app.json)
+   */
+  buildVersion: Scalars['String'];
+  id: Scalars['ID'];
+  platform: AppPlatform;
+  runtimeVersion?: Maybe<Scalars['String']>;
+  /**
+   * User-facing version in a store
+   * - Android - versionName in build.gradle ("version" field in app.json)
+   * - iOS - CFBundleShortVersionString in Info.plist ("version" field in app.json)
+   */
+  storeVersion: Scalars['String'];
+};
+
+export type AppVersionInput = {
+  appId: Scalars['ID'];
+  applicationIdentifier: Scalars['String'];
+  buildVersion: Scalars['String'];
+  platform: AppPlatform;
+  runtimeVersion?: InputMaybe<Scalars['String']>;
+  storeVersion: Scalars['String'];
+};
+
+export type AppVersionMutation = {
+  __typename?: 'AppVersionMutation';
+  /** Create an app version */
+  createAppVersion: AppVersion;
+};
+
+
+export type AppVersionMutationCreateAppVersionArgs = {
+  appVersionInput: AppVersionInput;
+};
+
 export type AppleAppIdentifier = {
   __typename?: 'AppleAppIdentifier';
   account: Account;
@@ -1414,7 +1560,7 @@ export type ApplePushKey = {
 };
 
 export type ApplePushKeyInput = {
-  appleTeamId?: InputMaybe<Scalars['ID']>;
+  appleTeamId: Scalars['ID'];
   keyIdentifier: Scalars['String'];
   keyP8: Scalars['String'];
 };
@@ -1539,6 +1685,10 @@ export type AssetQueryMetadataArgs = {
   storageKeys: Array<Scalars['String']>;
 };
 
+export enum AuthProtocolType {
+  Oidc = 'OIDC'
+}
+
 export type Billing = {
   __typename?: 'Billing';
   /** History of invoices */
@@ -1567,6 +1717,7 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   canRetry: Scalars['Boolean'];
   cancelingActor?: Maybe<Actor>;
   channel?: Maybe<Scalars['String']>;
+  childBuild?: Maybe<Build>;
   completedAt?: Maybe<Scalars['DateTime']>;
   createdAt: Scalars['DateTime'];
   distribution?: Maybe<DistributionType>;
@@ -1575,6 +1726,7 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   estimatedWaitTimeLeftSeconds?: Maybe<Scalars['Int']>;
   expirationDate?: Maybe<Scalars['DateTime']>;
   gitCommitHash?: Maybe<Scalars['String']>;
+  gitCommitMessage?: Maybe<Scalars['String']>;
   id: Scalars['ID'];
   /** Queue position is 1-indexed */
   initialQueuePosition?: Maybe<Scalars['Int']>;
@@ -1584,6 +1736,10 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   iosEnterpriseProvisioning?: Maybe<BuildIosEnterpriseProvisioning>;
   isGitWorkingTreeDirty?: Maybe<Scalars['Boolean']>;
   logFiles: Array<Scalars['String']>;
+  maxBuildTimeSeconds: Scalars['Int'];
+  /** Retry time starts after completedAt */
+  maxRetryTimeMinutes: Scalars['Int'];
+  message?: Maybe<Scalars['String']>;
   metrics?: Maybe<BuildMetrics>;
   parentBuild?: Maybe<Build>;
   platform: AppPlatform;
@@ -1739,8 +1895,10 @@ export type BuildMetadataInput = {
   credentialsSource?: InputMaybe<BuildCredentialsSource>;
   distribution?: InputMaybe<DistributionType>;
   gitCommitHash?: InputMaybe<Scalars['String']>;
+  gitCommitMessage?: InputMaybe<Scalars['String']>;
   iosEnterpriseProvisioning?: InputMaybe<BuildIosEnterpriseProvisioning>;
   isGitWorkingTreeDirty?: InputMaybe<Scalars['Boolean']>;
+  message?: InputMaybe<Scalars['String']>;
   reactNativeVersion?: InputMaybe<Scalars['String']>;
   releaseChannel?: InputMaybe<Scalars['String']>;
   runtimeVersion?: InputMaybe<Scalars['String']>;
@@ -1817,7 +1975,8 @@ export type BuildParamsInput = {
 
 export enum BuildPriority {
   High = 'HIGH',
-  Normal = 'NORMAL'
+  Normal = 'NORMAL',
+  NormalPlus = 'NORMAL_PLUS'
 }
 
 /** Publicly visible data for a Build. */
@@ -2028,6 +2187,11 @@ export type DeleteAccountResult = {
   id: Scalars['ID'];
 };
 
+export type DeleteAccountSsoConfigurationResult = {
+  __typename?: 'DeleteAccountSSOConfigurationResult';
+  id: Scalars['ID'];
+};
+
 export type DeleteAndroidKeystoreResult = {
   __typename?: 'DeleteAndroidKeystoreResult';
   id: Scalars['ID'];
@@ -2123,6 +2287,7 @@ export enum EasBuildDeprecationInfoType {
 export enum EasServiceMetric {
   AssetsRequests = 'ASSETS_REQUESTS',
   BandwidthUsage = 'BANDWIDTH_USAGE',
+  Builds = 'BUILDS',
   ManifestRequests = 'MANIFEST_REQUESTS',
   UniqueUsers = 'UNIQUE_USERS'
 }
@@ -2216,6 +2381,15 @@ export enum Feature {
   Teams = 'TEAMS'
 }
 
+export type FutureSubscription = {
+  __typename?: 'FutureSubscription';
+  createdAt: Scalars['DateTime'];
+  id: Scalars['ID'];
+  meteredBillingStatus: MeteredBillingStatus;
+  planId: Scalars['String'];
+  startDate: Scalars['DateTime'];
+};
+
 export type GetSignedAssetUploadSpecificationsResult = {
   __typename?: 'GetSignedAssetUploadSpecificationsResult';
   specifications: Array<Scalars['String']>;
@@ -2488,6 +2662,7 @@ export type IosJobInput = {
   type: BuildWorkflow;
   updates?: InputMaybe<BuildUpdatesInput>;
   username?: InputMaybe<Scalars['String']>;
+  version?: InputMaybe<IosJobVersionInput>;
 };
 
 export type IosJobSecretsInput = {
@@ -2501,6 +2676,10 @@ export type IosJobTargetCredentialsInput = {
   targetName: Scalars['String'];
 };
 
+export type IosJobVersionInput = {
+  buildNumber: Scalars['String'];
+};
+
 /** @deprecated Use developmentClient option instead. */
 export enum IosManagedBuildType {
   DevelopmentClient = 'DEVELOPMENT_CLIENT',
@@ -2682,6 +2861,11 @@ export type MeMutationUpdateProfileArgs = {
   userData: UserDataInput;
 };
 
+export type MeteredBillingStatus = {
+  __typename?: 'MeteredBillingStatus';
+  EAS_UPDATE: Scalars['Boolean'];
+};
+
 export type Offer = {
   __typename?: 'Offer';
   features?: Maybe<Array<Maybe<Feature>>>;
@@ -2898,6 +3082,8 @@ export type RootMutation = {
   accessToken: AccessTokenMutation;
   /** Mutations that modify an Account */
   account: AccountMutation;
+  /** Mutations that create, update, and delete an AccountSSOConfiguration */
+  accountSSOConfiguration: AccountSsoConfigurationMutation;
   /** Mutations that modify the build credentials for an Android app */
   androidAppBuildCredentials: AndroidAppBuildCredentialsMutation;
   /** Mutations that modify the credentials for an Android app */
@@ -2910,6 +3096,8 @@ export type RootMutation = {
   app?: Maybe<AppMutation>;
   /** Mutations that modify an App Store Connect Api Key */
   appStoreConnectApiKey: AppStoreConnectApiKeyMutation;
+  /** Mutations that modify an AppVersion */
+  appVersion: AppVersionMutation;
   /** Mutations that modify an Identifier for an iOS App */
   appleAppIdentifier: AppleAppIdentifierMutation;
   /** Mutations that modify an Apple Device */
@@ -2985,6 +3173,8 @@ export type RootQuery = {
   _doNotUse?: Maybe<Scalars['String']>;
   /** Top-level query object for querying Accounts. */
   account: AccountQuery;
+  /** Top-level query object for querying AccountSSOConfigurationPublicData */
+  accountSSOConfigurationPublicData: AccountSsoConfigurationPublicDataQuery;
   /** Top-level query object for querying Actors. */
   actor: ActorQuery;
   /**
@@ -3178,12 +3368,16 @@ export type Submission = ActivityTimelineProjectActivity & {
   archiveUrl?: Maybe<Scalars['String']>;
   canRetry: Scalars['Boolean'];
   cancelingActor?: Maybe<Actor>;
+  childSubmission?: Maybe<Submission>;
+  completedAt?: Maybe<Scalars['DateTime']>;
   createdAt: Scalars['DateTime'];
   error?: Maybe<SubmissionError>;
   id: Scalars['ID'];
   initiatingActor?: Maybe<Actor>;
   iosConfig?: Maybe<IosSubmissionConfig>;
   logsUrl?: Maybe<Scalars['String']>;
+  /** Retry time starts after completedAt */
+  maxRetryTimeMinutes: Scalars['Int'];
   parentSubmission?: Maybe<Submission>;
   platform: AppPlatform;
   status: SubmissionStatus;
@@ -3279,8 +3473,10 @@ export type SubscriptionDetails = {
   cancelledAt?: Maybe<Scalars['DateTime']>;
   concurrencies?: Maybe<Concurrencies>;
   endedAt?: Maybe<Scalars['DateTime']>;
+  futureSubscription?: Maybe<FutureSubscription>;
   id: Scalars['ID'];
   isDowngrading?: Maybe<Scalars['Boolean']>;
+  meteredBillingStatus: MeteredBillingStatus;
   name?: Maybe<Scalars['String']>;
   nextInvoice?: Maybe<Scalars['DateTime']>;
   planId?: Maybe<Scalars['String']>;
@@ -3475,6 +3671,7 @@ export type UsageMetricTotal = {
 
 export enum UsageMetricType {
   Bandwidth = 'BANDWIDTH',
+  Build = 'BUILD',
   Request = 'REQUEST',
   User = 'USER'
 }
@@ -3846,14 +4043,6 @@ export type DeleteUpdateBranchMutationVariables = Exact<{
 
 export type DeleteUpdateBranchMutation = { __typename?: 'RootMutation', updateBranch: { __typename?: 'UpdateBranchMutation', deleteUpdateBranch: { __typename?: 'DeleteUpdateBranchResult', id: string } } };
 
-export type BranchesByAppQueryVariables = Exact<{
-  appId: Scalars['String'];
-  limit: Scalars['Int'];
-}>;
-
-
-export type BranchesByAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, createdAt: any, message?: string | null, runtimeVersion: string, group: string, platform: string, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'User', username: string, id: string } | null }> }> } } };
-
 export type EditUpdateBranchMutationVariables = Exact<{
   input: EditUpdateBranchInput;
 }>;
@@ -4330,6 +4519,13 @@ export type CreateAppMutationVariables = Exact<{
 
 export type CreateAppMutation = { __typename?: 'RootMutation', app?: { __typename?: 'AppMutation', createApp: { __typename?: 'App', id: string } } | null };
 
+export type CreateAppVersionMutationVariables = Exact<{
+  appVersionInput: AppVersionInput;
+}>;
+
+
+export type CreateAppVersionMutation = { __typename?: 'RootMutation', appVersion: { __typename?: 'AppVersionMutation', createAppVersion: { __typename?: 'AppVersion', id: string } } };
+
 export type CreateAndroidBuildMutationVariables = Exact<{
   appId: Scalars['ID'];
   job: AndroidJobInput;
@@ -4448,6 +4644,15 @@ export type DeleteWebhookMutationVariables = Exact<{
 
 export type DeleteWebhookMutation = { __typename?: 'RootMutation', webhook: { __typename?: 'WebhookMutation', deleteWebhook: { __typename?: 'DeleteWebhookResult', id: string } } };
 
+export type LatestAppVersionQueryVariables = Exact<{
+  appId: Scalars['String'];
+  platform: AppPlatform;
+  applicationIdentifier: Scalars['String'];
+}>;
+
+
+export type LatestAppVersionQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, latestAppVersionByPlatformAndApplicationIdentifier?: { __typename?: 'AppVersion', id: string, storeVersion: string, buildVersion: string } | null } } };
+
 export type ViewBranchQueryVariables = Exact<{
   appId: Scalars['String'];
   name: Scalars['String'];
@@ -4456,6 +4661,15 @@ export type ViewBranchQueryVariables = Exact<{
 
 export type ViewBranchQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranchByName?: { __typename?: 'UpdateBranch', id: string, name: string } | null } } };
 
+export type BranchesByAppQueryVariables = Exact<{
+  appId: Scalars['String'];
+  limit: Scalars['Int'];
+  offset: Scalars['Int'];
+}>;
+
+
+export type BranchesByAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, createdAt: any, message?: string | null, runtimeVersion: string, group: string, platform: string, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'User', username: string, id: string } | null }> }> } } };
+
 export type BuildsByIdQueryVariables = Exact<{
   buildId: Scalars['ID'];
 }>;
@@ -4531,10 +4745,11 @@ export type GetAllSubmissionsForAppQuery = { __typename?: 'RootQuery', app: { __
 export type ViewAllUpdatesQueryVariables = Exact<{
   appId: Scalars['String'];
   limit: Scalars['Int'];
+  offset: Scalars['Int'];
 }>;
 
 
-export type ViewAllUpdatesQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, actor?: { __typename?: 'Robot', firstName?: string | null, id: string } | { __typename?: 'User', username: string, id: string } | null }> }> } } };
+export type ViewAllUpdatesQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, actor?: { __typename?: 'Robot', firstName?: string | null, id: string } | { __typename?: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string } }> } } };
 
 export type ViewBranchUpdatesQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -4544,7 +4759,7 @@ export type ViewBranchUpdatesQueryVariables = Exact<{
 }>;
 
 
-export type ViewBranchUpdatesQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranchByName?: { __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, actor?: { __typename?: 'Robot', firstName?: string | null, id: string } | { __typename?: 'User', username: string, id: string } | null }> } | null } } };
+export type ViewBranchUpdatesQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranchByName?: { __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, actor?: { __typename?: 'Robot', firstName?: string | null, id: string } | { __typename?: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string } }> } | null } } };
 
 export type CurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 

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

@@ -0,0 +1,42 @@
+import assert from 'assert';
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../client';
+import {
+  AppPlatform,
+  CreateAppVersionMutation,
+  CreateAppVersionMutationVariables,
+} from '../generated';
+
+export const AppVersionMutation = {
+  async createAppVersionAsync(appVersionInput: {
+    appId: string;
+    platform: AppPlatform;
+    applicationIdentifier: string;
+    storeVersion: string;
+    buildVersion: string;
+    runtimeVersion?: string;
+  }): Promise<string> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<CreateAppVersionMutation, CreateAppVersionMutationVariables>(
+          gql`
+            mutation CreateAppVersionMutation($appVersionInput: AppVersionInput!) {
+              appVersion {
+                createAppVersion(appVersionInput: $appVersionInput) {
+                  id
+                }
+              }
+            }
+          `,
+          {
+            appVersionInput,
+          }
+        )
+        .toPromise()
+    );
+    const appVersionId = data.appVersion?.createAppVersion.id;
+    assert(appVersionId, 'AppVersion ID must be defined');
+    return appVersionId;
+  },
+};

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

@@ -0,0 +1,51 @@
+import gql from 'graphql-tag';
+
+import { graphqlClient, withErrorHandlingAsync } from '../client';
+import {
+  AppPlatform,
+  AppVersion,
+  LatestAppVersionQuery,
+  LatestAppVersionQueryVariables,
+} from '../generated';
+
+export const AppVersionQuery = {
+  async latestVersionAsync(
+    appId: string,
+    platform: AppPlatform,
+    applicationIdentifier: string
+  ): Promise<Pick<AppVersion, 'storeVersion' | 'buildVersion'> | null> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<LatestAppVersionQuery, LatestAppVersionQueryVariables>(
+          gql`
+            query LatestAppVersion(
+              $appId: String!
+              $platform: AppPlatform!
+              $applicationIdentifier: String!
+            ) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  latestAppVersionByPlatformAndApplicationIdentifier(
+                    platform: $platform
+                    applicationIdentifier: $applicationIdentifier
+                  ) {
+                    id
+                    storeVersion
+                    buildVersion
+                  }
+                }
+              }
+            }
+          `,
+          { appId, applicationIdentifier, platform },
+          {
+            additionalTypenames: ['App', 'AppVersion'],
+          }
+        )
+        .toPromise()
+    );
+
+    return data.app.byId.latestAppVersionByPlatformAndApplicationIdentifier ?? null;
+  },
+};

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

@@ -1,7 +1,15 @@
+import { print } from 'graphql';
 import gql from 'graphql-tag';
 
 import { graphqlClient, withErrorHandlingAsync } from '../client';
-import { ViewBranchQuery, ViewBranchQueryVariables } from '../generated';
+import {
+  BranchesByAppQuery,
+  BranchesByAppQueryVariables,
+  UpdateBranchFragment,
+  ViewBranchQuery,
+  ViewBranchQueryVariables,
+} from '../generated';
+import { UpdateBranchFragmentNode } from '../types/UpdateBranch';
 
 export const BranchQuery = {
   async getBranchByNameAsync({
@@ -41,4 +49,38 @@ export const BranchQuery = {
     );
     return branch;
   },
+  async listBranchesAsync({
+    appId,
+    limit,
+    offset,
+  }: BranchesByAppQueryVariables): Promise<UpdateBranchFragment[]> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
+          gql`
+            query BranchesByAppQuery($appId: String!, $limit: Int!, $offset: Int!) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  updateBranches(limit: $limit, offset: $offset) {
+                    id
+                    ...UpdateBranchFragment
+                  }
+                }
+              }
+            }
+            ${print(UpdateBranchFragmentNode)}
+          `,
+          {
+            appId,
+            limit,
+            offset,
+          },
+          { additionalTypenames: ['UpdateBranch'] }
+        )
+        .toPromise()
+    );
+
+    return data?.app?.byId.updateBranches ?? [];
+  },
 };

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

@@ -8,41 +8,44 @@ import {
   ViewBranchUpdatesQueryVariables,
 } from '../generated';
 
-export const viewBranchUpdatesQueryUpdateLimit = 300;
+export type BranchUpdateObject = Exclude<
+  ViewBranchUpdatesQuery['app']['byId']['updateBranchByName'],
+  null | undefined
+>['updates'][number];
 
-type ViewBranchUpdatesQueryVariablesWithOptionalLimitAndOffset =
-  Partial<ViewBranchUpdatesQueryVariables> &
-    Pick<ViewBranchUpdatesQueryVariables, 'appId' | 'name'>;
+export type AppUpdateObject = ViewAllUpdatesQuery['app']['byId']['updates'][number];
+
+export type UpdateObject = BranchUpdateObject | AppUpdateObject;
 
 export const UpdateQuery = {
-  async viewAllAsync({ appId }: { appId: string }): Promise<ViewAllUpdatesQuery> {
+  async viewAllAsync({ appId, limit, offset }: ViewAllUpdatesQueryVariables) {
     return withErrorHandlingAsync(
       graphqlClient
         .query<ViewAllUpdatesQuery, ViewAllUpdatesQueryVariables>(
           gql`
-            query ViewAllUpdates($appId: String!, $limit: Int!) {
+            query ViewAllUpdates($appId: String!, $limit: Int!, $offset: Int!) {
               app {
                 byId(appId: $appId) {
                   id
-                  updateBranches(offset: 0, limit: $limit) {
+                  updates(limit: $limit, offset: $offset) {
                     id
-                    name
-                    updates(offset: 0, limit: $limit) {
+                    group
+                    message
+                    createdAt
+                    runtimeVersion
+                    platform
+                    actor {
                       id
-                      group
-                      message
-                      createdAt
-                      runtimeVersion
-                      platform
-                      actor {
-                        id
-                        ... on User {
-                          username
-                        }
-                        ... on Robot {
-                          firstName
-                        }
+                      ... on User {
+                        username
                       }
+                      ... on Robot {
+                        firstName
+                      }
+                    }
+                    branch {
+                      id
+                      name
                     }
                   }
                 }
@@ -51,20 +54,16 @@ export const UpdateQuery = {
           `,
           {
             appId,
-            limit: viewBranchUpdatesQueryUpdateLimit,
+            limit,
+            offset,
           },
           { additionalTypenames: ['UpdateBranch', 'Update'] }
         )
         .toPromise()
     );
   },
-  async viewBranchAsync({
-    appId,
-    name,
-    limit = viewBranchUpdatesQueryUpdateLimit,
-    offset = 0,
-  }: ViewBranchUpdatesQueryVariablesWithOptionalLimitAndOffset) {
-    return withErrorHandlingAsync<ViewBranchUpdatesQuery>(
+  async viewBranchAsync({ appId, name, limit, offset }: ViewBranchUpdatesQueryVariables) {
+    return withErrorHandlingAsync(
       graphqlClient
         .query<ViewBranchUpdatesQuery, ViewBranchUpdatesQueryVariables>(
           gql`
@@ -75,7 +74,7 @@ export const UpdateQuery = {
                   updateBranchByName(name: $name) {
                     id
                     name
-                    updates(offset: $offset, limit: $limit) {
+                    updates(limit: $limit, offset: $offset) {
                       id
                       group
                       message
@@ -92,6 +91,10 @@ export const UpdateQuery = {
                           firstName
                         }
                       }
+                      branch {
+                        id
+                        name
+                      }
                     }
                   }
                 }

packages/eas-cli/src/platform.ts

@@ -47,6 +47,23 @@ export async function selectRequestedPlatformAsync(platform?: string): Promise<R
   return requestedPlatform;
 }
 
+export async function selectPlatformAsync(platform?: string): Promise<Platform> {
+  if (platform && Object.values(Platform).includes(platform.toLowerCase() as Platform)) {
+    return platform.toLowerCase() as Platform;
+  }
+
+  const { resolvedPlatform } = await promptAsync({
+    type: 'select',
+    message: 'Select platform',
+    name: 'resolvedPlatform',
+    choices: [
+      { title: 'Android', value: Platform.ANDROID },
+      { title: 'iOS', value: Platform.IOS },
+    ],
+  });
+  return resolvedPlatform;
+}
+
 export function toPlatforms(requestedPlatform: RequestedPlatform): Platform[] {
   if (requestedPlatform === RequestedPlatform.All) {
     return [Platform.ANDROID, Platform.IOS];

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

@@ -0,0 +1,27 @@
+import { getNextVersionCode, isValidVersionCode } from '../versions';
+
+describe(isValidVersionCode, () => {
+  test('isValidVersionCode()', () => {
+    expect(isValidVersionCode(123)).toBe(true);
+    expect(isValidVersionCode(12.3)).toBe(false);
+    expect(isValidVersionCode(-123)).toBe(false);
+    expect(isValidVersionCode(2000000000)).toBe(true);
+    expect(isValidVersionCode(2000000001)).toBe(false);
+    expect(isValidVersionCode('123')).toBe(true);
+    expect(isValidVersionCode('12.3')).toBe(false);
+    expect(isValidVersionCode('-123')).toBe(false);
+    expect(isValidVersionCode('2000000000')).toBe(true);
+    expect(isValidVersionCode('2000000001')).toBe(false);
+  });
+});
+
+describe(getNextVersionCode, () => {
+  test('getNextVersionCode()', () => {
+    expect(getNextVersionCode(123)).toBe(124);
+    expect(() => getNextVersionCode(12.3)).toThrowError();
+    expect(getNextVersionCode(1999999999)).toBe(2000000000);
+    expect(() => getNextVersionCode(2000000000)).toThrowError();
+    expect(getNextVersionCode('123')).toBe(124);
+    expect(() => getNextVersionCode('12.3')).toThrowError();
+  });
+});

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

@@ -159,10 +159,10 @@ export function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(
 ): void {
   if (AndroidConfig.Package.getPackage(exp) && !warnPrinted) {
     Log.warn(
-      `Specifying "android.package" in ${getProjectConfigDescription(
+      `Specified value for "android.package" in ${getProjectConfigDescription(
         projectDir
-      )} is deprecated for bare workflow projects.\n` +
-        'EAS Build depends only on the value in the native code. Please remove the deprecated configuration.'
+      )} is ignored because an ${chalk.bold('android')} directory was detected in the project.\n` +
+        'EAS Build will use the value found in the native code.'
     );
     warnPrinted = true;
   }

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

@@ -0,0 +1,22 @@
+import assert from 'assert';
+
+const MAX_VERSION_CODE = 2000000000;
+export const VERSION_CODE_REQUIREMENTS = `versionCode needs to be a positive integer smaller or equal to ${MAX_VERSION_CODE}`;
+
+export function isValidVersionCode(versionCode: string | number): boolean {
+  const numericVersionCode = typeof versionCode === 'string' ? Number(versionCode) : versionCode;
+  return (
+    Number.isInteger(numericVersionCode) &&
+    numericVersionCode <= MAX_VERSION_CODE &&
+    numericVersionCode > 0
+  );
+}
+
+export function getNextVersionCode(versionCode: string | number): number {
+  assert(isValidVersionCode(versionCode), `Invalid versionCode ${versionCode}`);
+  const numericVersionCode = typeof versionCode === 'string' ? Number(versionCode) : versionCode;
+  if (numericVersionCode >= MAX_VERSION_CODE) {
+    throw new Error(`Invalid value: ${VERSION_CODE_REQUIREMENTS}.`);
+  }
+  return numericVersionCode + 1;
+}

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

@@ -0,0 +1,49 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  getApplicationIdAsync,
+} from './android/applicationId';
+import { resolveGradleBuildContextAsync } from './android/gradle';
+import { getBundleIdentifierAsync } from './ios/bundleIdentifier';
+import { resolveXcodeBuildContextAsync } from './ios/scheme';
+import { findApplicationTarget, resolveTargetsAsync } from './ios/target';
+import { resolveWorkflowAsync } from './workflow';
+
+export async function getApplicationIdentifierAsync(
+  projectDir: string,
+  exp: ExpoConfig,
+  buildProfile: BuildProfile,
+  platform: Platform
+): Promise<string> {
+  if (platform === Platform.ANDROID) {
+    const profile = buildProfile as BuildProfile<Platform.ANDROID>;
+    const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+    const gradleContext = await resolveGradleBuildContextAsync(projectDir, profile);
+
+    if (workflow === Workflow.MANAGED) {
+      await ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, exp);
+    }
+
+    return await getApplicationIdAsync(projectDir, exp, gradleContext);
+  } else {
+    const profile = buildProfile as BuildProfile<Platform.IOS>;
+    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
+      { exp, projectDir, nonInteractive: false },
+      profile
+    );
+    const targets = await resolveTargetsAsync({
+      projectDir,
+      exp,
+      xcodeBuildContext,
+      env: profile.env,
+    });
+    const applicationTarget = findApplicationTarget(targets);
+    return await getBundleIdentifierAsync(projectDir, exp, {
+      targetName: applicationTarget.targetName,
+      buildConfiguration: applicationTarget.buildConfiguration,
+    });
+  }
+}

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

@@ -41,8 +41,8 @@ export async function ensureProjectExistsAsync(projectInfo: ProjectInfo): Promis
   });
 
   const spinner = ora(`Linking to project ${chalk.bold(projectFullName)}`).start();
-
   const maybeId = await findProjectIdByAccountNameAndSlugNullableAsync(accountName, projectName);
+
   if (maybeId) {
     spinner.succeed(`Linked to project ${chalk.bold(projectLink)}`);
     projectCache[projectFullName] = maybeId;

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

@@ -0,0 +1,21 @@
+import { getNextBuildNumber, isValidBuildNumber } from '../versions';
+
+describe(isValidBuildNumber, () => {
+  test('isValidBuildNumber()', () => {
+    expect(isValidBuildNumber('1.2.3')).toBe(true);
+    expect(isValidBuildNumber('1.2')).toBe(true);
+    expect(isValidBuildNumber('1')).toBe(true);
+    expect(isValidBuildNumber('1.2.3.4')).toBe(false);
+    expect(isValidBuildNumber('1.2.-3')).toBe(false);
+    expect(isValidBuildNumber('1.a.3')).toBe(false);
+  });
+});
+
+describe(getNextBuildNumber, () => {
+  test('getNextBuildNumber', () => {
+    expect(getNextBuildNumber('1.2.3')).toBe('1.2.4');
+    expect(getNextBuildNumber('1.2')).toBe('1.3');
+    expect(getNextBuildNumber('1')).toBe('2');
+    expect(() => getNextBuildNumber('1.2.3.4')).toThrowError();
+  });
+});

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

@@ -152,10 +152,10 @@ export function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(
 ): void {
   if (IOSConfig.BundleIdentifier.getBundleIdentifier(exp) && !warnPrinted) {
     Log.warn(
-      `Specifying "ios.bundleIdentifier" in ${getProjectConfigDescription(
+      `Specified value for "ios.bundleIdentifier" in ${getProjectConfigDescription(
         projectDir
-      )} is deprecated for bare workflow projects.\n` +
-        'EAS Build depends only on the value in the native code. Please remove the deprecated configuration.'
+      )} is ignored because an ${chalk.bold('ios')} directory was detected in the project.\n` +
+        'EAS Build will use the value found in the native code.'
     );
     warnPrinted = true;
   }

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

@@ -1,8 +1,9 @@
 import { ExpoConfig } from '@expo/config';
-import { IOSConfig } from '@expo/config-plugins';
+import { IOSConfig, XcodeProject } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
 import Joi from 'joi';
+import type { XCBuildConfiguration } from 'xcode';
 
 import { Target } from '../../credentials/ios/types';
 import { resolveWorkflowAsync } from '../workflow';
@@ -91,6 +92,7 @@ export async function resolveBareProjectTargetsAsync({
   const { buildScheme, buildConfiguration } = xcodeBuildContext;
   const result: Target[] = [];
 
+  const pbxProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
   const applicationTarget = await IOSConfig.Target.findApplicationTargetWithDependenciesAsync(
     projectDir,
     buildScheme
@@ -108,6 +110,11 @@ export async function resolveBareProjectTargetsAsync({
     bundleIdentifier,
     buildConfiguration,
     entitlements: entitlements ?? {},
+    buildSettings: resolveBareProjectBuildSettings(
+      pbxProject,
+      applicationTarget.name,
+      buildConfiguration
+    ),
   });
 
   const dependencies = await resolveBareProjectDependenciesAsync({
@@ -116,6 +123,7 @@ export async function resolveBareProjectTargetsAsync({
     buildConfiguration,
     target: applicationTarget,
     bundleIdentifier,
+    pbxProject,
   });
   if (dependencies.length > 0) {
     result.push(...dependencies);
@@ -141,12 +149,14 @@ async function resolveBareProjectDependenciesAsync({
   buildConfiguration,
   target,
   bundleIdentifier,
+  pbxProject,
 }: {
   exp: ExpoConfig;
   projectDir: string;
   buildConfiguration?: string;
   target: IOSConfig.Target.Target;
   bundleIdentifier: string;
+  pbxProject: XcodeProject;
 }): Promise<Target[]> {
   const result: Target[] = [];
 
@@ -166,6 +176,11 @@ async function resolveBareProjectDependenciesAsync({
         bundleIdentifier: dependencyBundleIdentifier,
         parentBundleIdentifier: bundleIdentifier,
         entitlements: entitlements ?? {},
+        buildSettings: resolveBareProjectBuildSettings(
+          pbxProject,
+          dependency.name,
+          buildConfiguration
+        ),
       });
       const dependencyDependencies = await resolveBareProjectDependenciesAsync({
         exp,
@@ -173,6 +188,7 @@ async function resolveBareProjectDependenciesAsync({
         buildConfiguration,
         target: dependency,
         bundleIdentifier: dependencyBundleIdentifier,
+        pbxProject,
       });
       if (dependencyDependencies.length > 0) {
         result.push(...dependencyDependencies);
@@ -198,3 +214,15 @@ export function findTargetByName(targets: Target[], name: string): Target {
   }
   return target;
 }
+
+function resolveBareProjectBuildSettings(
+  project: XcodeProject,
+  targetName: string,
+  buildConfiguration?: string
+): XCBuildConfiguration['buildSettings'] {
+  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+    targetName,
+    buildConfiguration,
+  });
+  return xcBuildConfiguration?.buildSettings ?? {};
+}

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

@@ -0,0 +1,14 @@
+import assert from 'assert';
+
+export const BUILD_NUMBER_REQUIREMENTS = `buildNumber needs to consist only of up to 3 dot-separated positive integers`;
+
+export function isValidBuildNumber(buildNumber: string): boolean {
+  return !!buildNumber.match(/^\d+(\.\d+)?(\.\d+)?$/);
+}
+
+export function getNextBuildNumber(buildNumber: string): string {
+  assert(isValidBuildNumber(buildNumber), `Invalid buildNumber ${buildNumber}`);
+  const comps = buildNumber.split('.');
+  comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
+  return comps.join('.');
+}

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

@@ -161,6 +161,7 @@ export async function buildBundlesAsync({
     inputDir,
     '--experimental-bundle',
     '--non-interactive',
+    '--dump-sourcemap',
   ]);
 }
 

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

@@ -0,0 +1,71 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+import { AppVersionSource, EasJsonReader } from '@expo/eas-json';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+
+import Log from '../log';
+import { confirmAsync } from '../prompts';
+
+export async function ensureRemoteVersionPolicyAsync(
+  projectDir: string,
+  easJsonReader: EasJsonReader
+): Promise<void> {
+  const easJsonCliConfig = await easJsonReader.getCliConfigAsync();
+  if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
+    return;
+  }
+
+  Log.log(
+    `The app version source defines whether the app version is stored locally in your project source (e.g. in app.json, Info.plist, or build.gradle) or remotely on EAS servers and only applied to the project at build time. To use this command, you will need to enable the remote version policy by adding  ${chalk.bold(
+      '{"cli": { "appVersionSource": "remote" }}'
+    )} in eas.json.`
+  );
+  // TODO: add link to docs
+  const confirm = await confirmAsync({
+    message: 'Do you want to set app version source to remote now?',
+  });
+  if (!confirm) {
+    throw new Error('Aborting...');
+  }
+
+  const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
+  const easJson = await fs.readJSON(easJsonPath);
+  easJson.cli = { ...easJson?.cli, appVersionSource: AppVersionSource.REMOTE };
+  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+  Log.withTick('Updated eas.json');
+}
+
+export async function validateAppConfigForRemoteVersionPolicyAsync(exp: ExpoConfig): Promise<void> {
+  if (typeof exp.runtimeVersion === 'object' && exp.runtimeVersion?.policy === 'nativeVersion') {
+    throw new Error(
+      `${chalk.bold('nativeVersion')} policy for ${chalk.bold(
+        'runtimeVersion'
+      )} is currently not supported when version source is set to remote. Switch policy e.g. to ${chalk.bold(
+        'appVersion'
+      )} or define version explicitly.`
+    );
+  }
+  if (exp.ios?.buildNumber !== undefined) {
+    throw new Error(
+      `${chalk.bold(
+        'ios.buildNumber'
+      )} field in app config is not supported when version source is set to remote, remove it and re-run the command.`
+    );
+  }
+  if (exp.android?.versionCode !== undefined) {
+    throw new Error(
+      `${chalk.bold(
+        'android.versionCode'
+      )} field in app config is not supported when version source is set to remote, remove it and re-run the command.`
+    );
+  }
+}
+
+export function getBuildVersionName(platform: Platform): string {
+  if (platform === Platform.ANDROID) {
+    return 'versionCode';
+  } else {
+    return 'buildNumber';
+  }
+}

packages/eas-cli/src/submit/__tests__/ArchiveSource-test.ts

@@ -7,7 +7,7 @@ import { AppPlatform, BuildFragment, UploadSessionType } from '../../graphql/gen
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import { confirmAsync, promptAsync } from '../../prompts';
-import { uploadAsync } from '../../uploads';
+import { uploadFileAtPathToS3Async } from '../../uploads';
 import {
   Archive,
   ArchiveSourceType,
@@ -243,7 +243,9 @@ describe(getArchiveAsync, () => {
     const path = '/archive.apk';
     await fs.writeFile(path, 'some content');
 
-    jest.mocked(uploadAsync).mockResolvedValueOnce({ url: ARCHIVE_URL, bucketKey: 'wat' });
+    jest
+      .mocked(uploadFileAtPathToS3Async)
+      .mockResolvedValueOnce({ url: ARCHIVE_URL, bucketKey: 'wat' });
 
     const archive = await getArchiveAsync({
       ...SOURCE_STUB_INPUT,
@@ -251,7 +253,7 @@ describe(getArchiveAsync, () => {
       path,
     });
 
-    expect(uploadAsync).toBeCalledWith(
+    expect(uploadFileAtPathToS3Async).toBeCalledWith(
       UploadSessionType.EasSubmitAppArchive,
       path,
       expect.anything()

packages/eas-cli/src/submit/utils/files.ts

@@ -1,7 +1,7 @@
 import fs from 'fs-extra';
 
 import { UploadSessionType } from '../../graphql/generated';
-import { uploadAsync } from '../../uploads';
+import { uploadFileAtPathToS3Async } from '../../uploads';
 import { createProgressTracker } from '../../utils/progress';
 
 export async function isExistingFileAsync(filePath: string): Promise<boolean> {
@@ -15,7 +15,7 @@ export async function isExistingFileAsync(filePath: string): Promise<boolean> {
 
 export async function uploadAppArchiveAsync(path: string): Promise<string> {
   const fileSize = (await fs.stat(path)).size;
-  const { url } = await uploadAsync(
+  const { url } = await uploadFileAtPathToS3Async(
     UploadSessionType.EasSubmitAppArchive,
     path,
     createProgressTracker({

packages/eas-cli/src/update/__tests__/fixtures/updates.ts

@@ -0,0 +1,62 @@
+import { v4 as uuidv4 } from 'uuid';
+
+import { PublishPlatformFlag } from '../../../commands/update';
+import { UpdateObject } from '../../../graphql/queries/UpdateQuery';
+
+export function createMockUpdates(
+  {
+    updateCount = 1,
+    platformFlag = 'all',
+    groupId,
+  }: Partial<{
+    updateCount: number;
+    platformFlag: PublishPlatformFlag;
+    groupId: string;
+  }> = {
+    updateCount: 1,
+    platformFlag: 'all',
+  }
+): UpdateObject[] {
+  let updates: UpdateObject[] = [];
+  if (platformFlag === 'all') {
+    updateCount = Math.ceil(updateCount / 2);
+  }
+  for (let i = 0; i < updateCount; i++) {
+    const androidUpdate = {
+      id: uuidv4(),
+      group: uuidv4(),
+      message: 'default test message',
+      createdAt: new Date(),
+      runtimeVersion: 'exposdk:44.0.0',
+      platform: 'android',
+      manifestFragment: '',
+    };
+    const iosUpdate = {
+      ...androidUpdate,
+      id: uuidv4(),
+      platform: 'ios',
+    };
+    if (!i && groupId) {
+      androidUpdate.group = groupId;
+      iosUpdate.group = groupId;
+    }
+    const isOddNumberedUpdateCount = !(updateCount % 2);
+    const isFinalLoop = i === updateCount - 1;
+    switch (platformFlag) {
+      case 'all':
+        updates = [
+          ...updates,
+          androidUpdate as UpdateObject,
+          ...(isFinalLoop && isOddNumberedUpdateCount ? [] : [iosUpdate as UpdateObject]),
+        ];
+        break;
+      case 'android':
+        updates = [...updates, androidUpdate as UpdateObject];
+        break;
+      case 'ios':
+        updates = [...updates, iosUpdate as UpdateObject];
+        break;
+    }
+  }
+  return updates;
+}

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

@@ -1,16 +1,15 @@
 import { v4 as uuidv4 } from 'uuid';
 
 import {
-  PublishPlatformFlag,
   ensureBranchExistsAsync,
   getUpdatesToRepublishInteractiveAsync,
   truncatePublishUpdateMessage,
 } from '../../commands/update';
 import { graphqlClient } from '../../graphql/client';
-import { ViewBranchUpdatesQuery } from '../../graphql/generated';
-import { viewBranchUpdatesQueryUpdateLimit } from '../../graphql/queries/UpdateQuery';
+import { UpdateObject } from '../../graphql/queries/UpdateQuery';
 import Log from '../../log';
 import { selectAsync } from '../../prompts';
+import { createMockUpdates } from './fixtures/updates';
 
 const appId = '6c94sxe6-37d2-4700-52fa-1b813204dad2';
 const branchId = '5e84e3cb-563e-4022-a65e-6e7a42fe4ed3';
@@ -36,12 +35,7 @@ jest.mock('../../commands/update', () => {
     getUpdatesToRepublishInteractiveAsync: jest.fn(actual.getUpdatesToRepublishInteractiveAsync),
   };
 });
-const updatesToResolve = jest.fn(
-  (): Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'] => []
-);
+const updatesToResolve = jest.fn((): UpdateObject[] => []);
 jest.mock('../../graphql/client', () => ({
   ...jest.requireActual('../../graphql/client'),
   graphqlClient: {
@@ -84,70 +78,6 @@ jest.mock('../../graphql/client', () => ({
   },
 }));
 
-function createMockUpdates(
-  {
-    updateCount = 1,
-    platformFlag = 'all',
-    groupId,
-  }: Partial<{
-    updateCount: number;
-    platformFlag: PublishPlatformFlag;
-    groupId: string;
-  }> = {
-    updateCount: 1,
-    platformFlag: 'all',
-  }
-): Exclude<
-  Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-  null | undefined
->['updates'] {
-  let updates: Exclude<
-    Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
-    null | undefined
-  >['updates'] = [];
-  if (platformFlag === 'all') {
-    updateCount = Math.ceil(updateCount / 2);
-  }
-  for (let i = 0; i < updateCount; i++) {
-    const androidUpdate = {
-      id: uuidv4(),
-      group: uuidv4(),
-      message: 'default test message',
-      createdAt: new Date(),
-      runtimeVersion: 'exposdk:44.0.0',
-      platform: 'android',
-      manifestFragment: '',
-    };
-    const iosUpdate = {
-      ...androidUpdate,
-      id: uuidv4(),
-      platform: 'ios',
-    };
-    if (!i && groupId) {
-      androidUpdate.group = groupId;
-      iosUpdate.group = groupId;
-    }
-    const isOddNumberedUpdateCount = !(updateCount % 2);
-    const isFinalLoop = i === updateCount - 1;
-    switch (platformFlag) {
-      case 'all':
-        updates = [
-          ...updates,
-          androidUpdate,
-          ...(isFinalLoop && isOddNumberedUpdateCount ? [] : [iosUpdate]),
-        ];
-        break;
-      case 'android':
-        updates = [...updates, androidUpdate];
-        break;
-      case 'ios':
-        updates = [...updates, iosUpdate];
-        break;
-    }
-  }
-  return updates;
-}
-
 describe('UpdatePublish', () => {
   describe('ensureBranchExistsAsync', () => {
     beforeEach(() => {
@@ -155,18 +85,6 @@ describe('UpdatePublish', () => {
       jest.mocked(graphqlClient.mutation).mockClear();
     });
 
-    it('defaults limit to viewBranchUpdatesQueryUpdateLimit and offset to 0 when none are provided', async () => {
-      await ensureBranchExistsAsync({ appId, name: appName });
-      const [[, bindings]] = jest.mocked(graphqlClient.query).mock.calls;
-
-      expect(bindings).toEqual({
-        appId,
-        name: appName,
-        limit: viewBranchUpdatesQueryUpdateLimit,
-        offset: 0,
-      });
-    });
-
     it.each([
       [0, 0],
       [10, 50],

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

@@ -0,0 +1,95 @@
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { BranchUpdateObject, UpdateQuery } from '../graphql/queries/UpdateQuery';
+import Log from '../log';
+import formatFields from '../utils/formatFields';
+import { printJsonOnlyOutput } from '../utils/json';
+import { paginatedQueryWithConfirmPromptAsync } from '../utils/queries';
+import { UPDATE_COLUMNS, formatUpdate, getUpdateGroupsWithPlatforms } from './utils';
+
+export const UPDATES_LIMIT = 50;
+
+export async function listAndRenderUpdatesOnBranchByNameAsync(
+  projectId: string,
+  branchName: string,
+  options: PaginatedQueryOptions
+): Promise<void> {
+  if (options.nonInteractive) {
+    const updates = await queryUpdateGroupsForBranchAsync(
+      options.limit ?? UPDATES_LIMIT,
+      options.offset,
+      projectId,
+      branchName
+    );
+    renderUpdateGroups(updates, options, branchName);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: options.limit ?? UPDATES_LIMIT,
+      offset: options.offset,
+      queryToPerform: (limit, offset) =>
+        queryUpdateGroupsForBranchAsync(limit, offset, projectId, branchName),
+      promptOptions: {
+        title: 'Load more branches?',
+        renderListItems: updates => renderUpdateGroups(updates, options, branchName),
+      },
+    });
+  }
+}
+
+async function queryUpdateGroupsForBranchAsync(
+  limit: number,
+  offset: number,
+  projectId: string,
+  branchName: string
+): Promise<BranchUpdateObject[]> {
+  const { app } = await UpdateQuery.viewBranchAsync({
+    appId: projectId,
+    name: branchName,
+    limit,
+    offset,
+  });
+
+  const updateBranch = app?.byId.updateBranchByName;
+  if (!updateBranch) {
+    throw new Error(`Could not find branch "${branchName}"`);
+  }
+
+  return updateBranch.updates;
+}
+
+function renderUpdateGroups(
+  updates: BranchUpdateObject[],
+  { json }: PaginatedQueryOptions,
+  branchName: string
+): void {
+  const branch = { name: branchName, id: updates[0]?.branch.id ?? 'N/A' };
+  if (json) {
+    printJsonOnlyOutput({ ...branch, currentPage: updates });
+  } else {
+    const updateGroupsTable = new CliTable({
+      head: UPDATE_COLUMNS,
+      wordWrap: true,
+    });
+    updateGroupsTable.push(
+      ...getUpdateGroupsWithPlatforms(updates).map(update => [
+        formatUpdate(update),
+        update.runtimeVersion,
+        update.group,
+        update.platforms,
+      ])
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branch:'));
+    Log.log(
+      formatFields([
+        { label: 'Name', value: branch.name },
+        { label: 'ID', value: branch.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.log(updateGroupsTable.toString());
+  }
+}

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

@@ -12,6 +12,13 @@ export type FormatUpdateParameter = Pick<Update, 'id' | 'createdAt' | 'message'>
   actor?: Maybe<Pick<User, 'username' | 'id'> | Pick<Robot, 'firstName' | 'id'>>;
 };
 
+export type UpdateGroupDescription = FormatUpdateParameter & {
+  branch: string;
+  group: string;
+  platforms: string;
+  runtimeVersion: string;
+};
+
 export const UPDATE_COLUMNS = [
   'Update message',
   'Update runtime version',
@@ -19,6 +26,15 @@ export const UPDATE_COLUMNS = [
   'Update platforms',
 ];
 
+export function getUpdateGroupsWithPlatforms<
+  UpdateFragment extends Pick<Update, 'platform' | 'group'>
+>(updates: UpdateFragment[]): (UpdateFragment & { platforms: string })[] {
+  return Object.values(groupBy(updates, updates => updates.group)).map(updateGroup => ({
+    ...updateGroup[0],
+    platforms: formatPlatformForUpdateGroup(updateGroup),
+  }));
+}
+
 export function getPlatformsForGroup({
   group,
   updates,
@@ -27,20 +43,35 @@ export function getPlatformsForGroup({
   updates: { group: string; platform: string }[];
 }): string {
   const groupedUpdates = groupBy(updates, update => update.group);
-  if (Object.keys(groupedUpdates).length === 0) {
-    return 'N/A';
+  return formatPlatformForUpdateGroup(groupedUpdates[group]);
+}
+
+export function formatPlatformForUpdateGroup(
+  updateGroup: {
+    group: string;
+    platform: string;
+  }[]
+): string {
+  return updateGroup.length === 0
+    ? 'N/A'
+    : updateGroup
+        .map(update => update.platform)
+        .sort()
+        .join(', ');
+}
+
+export function truncateString(originalMessage: string, length: number = 512): string {
+  if (originalMessage.length > length) {
+    return originalMessage.substring(0, length - 3) + '...';
   }
-  return groupedUpdates[group]
-    .map(update => update.platform)
-    .sort()
-    .join(', ');
+  return originalMessage;
 }
 
 export function formatUpdate(update: FormatUpdateParameter): string {
   if (!update) {
     return 'N/A';
   }
-  const message = update.message ? `"${update.message}" ` : '';
+  const message = update.message ? `"${truncateString(update.message)}" ` : '';
   return `${message}(${format(update.createdAt, 'en_US')} by ${getActorDisplayName(
     update.actor as any
   )})`;

packages/eas-cli/src/uploads.ts

@@ -10,7 +10,7 @@ import { UploadSessionType } from './graphql/generated';
 import { PresignedPost, UploadSessionMutation } from './graphql/mutations/UploadSessionMutation';
 import { ProgressHandler } from './utils/progress';
 
-export async function uploadAsync(
+export async function uploadFileAtPathToS3Async(
   type: UploadSessionType,
   path: string,
   handleProgressEvent: ProgressHandler

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

@@ -0,0 +1,190 @@
+import { confirmAsync, selectAsync } from '../../prompts';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../queries';
+
+jest.mock('../../prompts', () => ({
+  selectAsync: jest.fn(),
+  confirmAsync: jest.fn(),
+}));
+
+type MockDataType = {
+  id: string;
+  value: string;
+};
+
+const mockQuery = jest.fn<Promise<MockDataType[]>, any>();
+const mockRenderMethod = jest.fn();
+
+const selectMoreObject = {
+  title: 'Next page...',
+  value: '_fetchMore',
+};
+
+function createPaginatedQueryResponse(
+  responseLength: number,
+  uniqueIdentifier?: string,
+  firstItem?: MockDataType
+): MockDataType[] {
+  return Array.from({ length: responseLength }).map((_, index) => {
+    return !index && firstItem
+      ? firstItem
+      : {
+          id: `${uniqueIdentifier ?? 'x'}-${index}`,
+          value: `${uniqueIdentifier ?? 'x'}-${index}`,
+        };
+  });
+}
+
+describe(paginatedQueryWithConfirmPromptAsync.name, () => {
+  beforeEach(() => {
+    mockQuery.mockClear();
+    mockRenderMethod.mockClear();
+    jest.mocked(confirmAsync).mockClear();
+  });
+
+  it.each([
+    [10, 50],
+    [77, 30],
+  ])(
+    'sets the limit to %s + 1 and offset to %s and queries until no results are left',
+    async (limit, offset) => {
+      mockQuery
+        .mockResolvedValueOnce(createPaginatedQueryResponse(limit + 1))
+        .mockResolvedValueOnce(createPaginatedQueryResponse(limit + 1))
+        .mockResolvedValueOnce(createPaginatedQueryResponse(Math.floor(limit / 2)));
+      jest.mocked(confirmAsync).mockResolvedValue(true);
+
+      await paginatedQueryWithConfirmPromptAsync({
+        limit,
+        offset,
+        queryToPerform: mockQuery,
+        promptOptions: {
+          title: '',
+          renderListItems: mockRenderMethod,
+        },
+      });
+
+      const { calls } = mockQuery.mock;
+      const finalResults = await mockQuery.mock.results.pop()?.value;
+      expect(mockQuery.mock.calls.length).toEqual(3);
+      calls.forEach(([limitArg, offsetArg], i) => {
+        expect(limitArg).toEqual(limit + 1);
+        expect(offsetArg).toEqual(offset + limit * i);
+      });
+      expect(finalResults.length).toEqual(Math.floor(limit / 2));
+      expect(mockRenderMethod).toBeCalledTimes(3);
+    }
+  );
+});
+
+describe(paginatedQueryWithSelectPromptAsync.name, () => {
+  const mockHandleEmptySelectList = jest.fn();
+
+  beforeEach(() => {
+    mockQuery.mockClear();
+    mockRenderMethod.mockClear();
+    mockHandleEmptySelectList.mockClear();
+    jest.mocked(selectAsync).mockClear();
+  });
+
+  it.each([
+    [10, 50],
+    [77, 30],
+  ])(
+    'queries multiple pages of %s + 1 items with an offset of %s and returns the selected list item',
+    async (limit, offset) => {
+      const selectedItem = {
+        title: 'second-3',
+        value: 'second-3',
+      };
+      mockQuery
+        .mockResolvedValueOnce(createPaginatedQueryResponse(limit + 1, 'first'))
+        // we need to insert a the last item from the previous query
+        // as the first item in the following query.
+        // the id is used for grouping items, so it must match an id in the previous query
+        .mockResolvedValueOnce(
+          createPaginatedQueryResponse(limit + 1, 'second', {
+            id: `first-${limit}`,
+            value: `first-${limit}`,
+          })
+        )
+        .mockResolvedValueOnce(
+          createPaginatedQueryResponse(Math.floor(limit / 2), 'third', {
+            id: `second-${limit}`,
+            value: `second-${limit}`,
+          })
+        );
+      jest
+        .mocked(selectAsync)
+        .mockResolvedValueOnce(selectMoreObject.value)
+        .mockResolvedValueOnce(selectMoreObject.value)
+        .mockResolvedValueOnce(selectedItem.value);
+
+      const selectedQueryItem = await paginatedQueryWithSelectPromptAsync({
+        limit,
+        offset,
+        queryToPerform: mockQuery,
+        promptOptions: {
+          title: '',
+          getIdentifierForQueryItem: item => item.id,
+          createDisplayTextForSelectionPromptListItem: item => 'item: ' + item.value,
+        },
+      });
+
+      // return value
+      expect(selectedQueryItem).toEqual({ id: selectedItem.value, value: selectedItem.value });
+
+      // query
+      const { calls: queryCalls } = mockQuery.mock;
+      const finalQueryResults = await mockQuery.mock.results.pop()?.value;
+      expect(mockQuery.mock.calls.length).toEqual(3);
+      queryCalls.forEach(([limitArg, offsetArg], i) => {
+        expect(limitArg).toEqual(limit + 1);
+        expect(offsetArg).toEqual(offset + limit * i);
+      });
+      expect(finalQueryResults.length).toEqual(Math.floor(limit / 2));
+
+      // select prompt
+      const selectCalls = jest.mocked(selectAsync).mock.calls;
+      selectCalls.forEach(([, listItems], i) => {
+        const oneBasedIndex = i + 1;
+        const isLastCall = i === 2;
+        if (isLastCall) {
+          expect(listItems[listItems.length - 1]).not.toEqual(selectMoreObject);
+          expect(listItems.length).toEqual(
+            limit * oneBasedIndex -
+              // ceiling gives us the extra query item
+              // used for pagination in odd limit queries
+              Math.ceil(limit / 2)
+          );
+        } else {
+          expect(listItems[listItems.length - 1]).toEqual(selectMoreObject);
+          expect(listItems.length).toEqual(
+            limit * oneBasedIndex +
+              // pagination item
+              1
+          );
+        }
+      });
+    }
+  );
+
+  it('returns nothing when there are no items to select', async () => {
+    mockQuery.mockResolvedValueOnce([]);
+
+    const result = await paginatedQueryWithSelectPromptAsync({
+      limit: 50,
+      offset: 0,
+      queryToPerform: mockQuery,
+      promptOptions: {
+        title: '',
+        getIdentifierForQueryItem: item => item.id,
+        createDisplayTextForSelectionPromptListItem: item => item.value,
+      },
+    });
+
+    expect(result).toBeFalsy();
+  });
+});

packages/eas-cli/src/utils/expodash/__tests__/chunk-test.ts

@@ -0,0 +1,19 @@
+import chunk from '../chunk';
+
+describe(chunk, () => {
+  it('works with an empty list', () => {
+    expect(chunk([])).toEqual([]);
+  });
+
+  it('works with list length undividable by chunk size', () => {
+    expect(chunk([1, 2, 3, 4, 5], 2)).toEqual([[1, 2], [3, 4], [5]]);
+  });
+
+  it('works with list length dividable by chunk size', () => {
+    expect(chunk([1, 2, 3, 4, 5, 6], 2)).toEqual([
+      [1, 2],
+      [3, 4],
+      [5, 6],
+    ]);
+  });
+});

packages/eas-cli/src/utils/expodash/chunk.ts

@@ -0,0 +1,12 @@
+export default function chunk<T>(list: T[], size = 1): T[][] {
+  const result: T[][] = [];
+  for (let i = 0; i < list.length; i++) {
+    const isFirstElementInChunk = i % size === 0;
+    if (isFirstElementInChunk) {
+      result.push([list[i]]);
+    } else {
+      result[result.length - 1].push(list[i]);
+    }
+  }
+  return result;
+}

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

@@ -0,0 +1,133 @@
+import { confirmAsync, selectAsync } from '../prompts';
+import uniqBy from './expodash/uniqBy';
+
+const fetchMoreValue = '_fetchMore';
+
+type BasePaginatedQueryArgs<QueryReturnType extends Record<string, any>> = {
+  limit: number;
+  offset: number;
+  queryToPerform: (limit: number, offset: number) => Promise<QueryReturnType[]>;
+};
+
+type PaginatedQueryWithConfirmPromptArgs<QueryReturnType extends Record<string, any>> =
+  BasePaginatedQueryArgs<QueryReturnType> & {
+    promptOptions: {
+      readonly title: string;
+      renderListItems: (currentPage: QueryReturnType[]) => void;
+    };
+  };
+
+type PaginatedQueryWithSelectPromptArgs<QueryReturnType extends Record<string, any>> =
+  BasePaginatedQueryArgs<QueryReturnType> & {
+    promptOptions: {
+      readonly title: string;
+      createDisplayTextForSelectionPromptListItem: (queryItem: QueryReturnType) => string;
+      getIdentifierForQueryItem: (queryItem: QueryReturnType) => string;
+    };
+  };
+
+export async function paginatedQueryWithConfirmPromptAsync<
+  QueryReturnType extends Record<string, any>
+>(queryArgs: PaginatedQueryWithConfirmPromptArgs<QueryReturnType>): Promise<void> {
+  return await paginatedQueryWithConfirmPromptInternalAsync(queryArgs, []);
+}
+
+async function paginatedQueryWithConfirmPromptInternalAsync<
+  QueryReturnType extends Record<string, any>
+>(
+  {
+    limit,
+    offset,
+    queryToPerform,
+    promptOptions,
+  }: PaginatedQueryWithConfirmPromptArgs<QueryReturnType>,
+  accumulator: QueryReturnType[]
+): Promise<void> {
+  // query an extra item to determine if there are more pages left
+  const paginatedItems = await queryToPerform(limit + 1, offset);
+  const areMorePagesAvailable = paginatedItems.length > limit;
+  // drop that extra item used for pagination from our render logic
+  const currentPage = paginatedItems.slice(0, limit);
+  const newAccumulator = [...accumulator, ...currentPage];
+
+  promptOptions.renderListItems(currentPage);
+
+  if (!areMorePagesAvailable) {
+    return;
+  }
+
+  if (await confirmAsync({ message: promptOptions.title })) {
+    return await paginatedQueryWithConfirmPromptInternalAsync(
+      {
+        limit,
+        offset: offset + limit,
+        queryToPerform,
+        promptOptions,
+      },
+      newAccumulator
+    );
+  }
+}
+
+/**
+ * Returns an array of item(s) where the id is equal to the id of the user's selected item
+ * If no items are available for a user to select, this will return an empty array.
+ */
+export async function paginatedQueryWithSelectPromptAsync<
+  QueryReturnType extends Record<string, any>
+>(queryArgs: PaginatedQueryWithSelectPromptArgs<QueryReturnType>): Promise<QueryReturnType | void> {
+  return await paginatedQueryWithSelectPromptInternalAsync(queryArgs, []);
+}
+
+async function paginatedQueryWithSelectPromptInternalAsync<
+  QueryReturnType extends Record<string, any>
+>(
+  {
+    limit,
+    offset,
+    queryToPerform,
+    promptOptions,
+  }: PaginatedQueryWithSelectPromptArgs<QueryReturnType>,
+  accumulator: QueryReturnType[]
+): Promise<QueryReturnType | void> {
+  // query an extra item to determine if there are more pages left
+  const paginatedItems = await queryToPerform(limit + 1, offset);
+  const areMorePagesAvailable = paginatedItems.length > limit;
+  // drop that extra item used for pagination from our render logic
+  const currentPage = paginatedItems.slice(0, limit);
+  const newAccumulator = [...accumulator, ...currentPage];
+
+  const selectionPromptListItems = uniqBy(newAccumulator, queryItem =>
+    promptOptions.getIdentifierForQueryItem(queryItem)
+  ).map(queryItem => ({
+    title: promptOptions.createDisplayTextForSelectionPromptListItem(queryItem),
+    value: promptOptions.getIdentifierForQueryItem(queryItem),
+  }));
+  if (areMorePagesAvailable) {
+    selectionPromptListItems.push({ title: 'Next page...', value: fetchMoreValue });
+  }
+  if (selectionPromptListItems.length === 0) {
+    return;
+  }
+
+  const valueOfUserSelectedListItem = await selectAsync<string>(
+    promptOptions.title,
+    selectionPromptListItems
+  );
+
+  if (valueOfUserSelectedListItem === fetchMoreValue) {
+    return await paginatedQueryWithSelectPromptInternalAsync(
+      {
+        limit,
+        offset: offset + limit,
+        queryToPerform,
+        promptOptions,
+      },
+      newAccumulator
+    );
+  }
+
+  return newAccumulator.find(
+    items => promptOptions.getIdentifierForQueryItem(items) === valueOfUserSelectedListItem
+  );
+}

packages/eas-json/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "0.55.0",
+  "version": "0.57.0",
   "author": "Expo <[email protected]>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/eas-build-job": "0.2.77",
+    "@expo/eas-build-job": "0.2.84",
     "@expo/json-file": "8.2.36",
     "chalk": "4.1.2",
     "env-string": "1.0.1",
@@ -38,5 +38,9 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "volta": {
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

packages/eas-json/src/index.ts

@@ -1,6 +1,6 @@
 export { AndroidReleaseStatus, AndroidReleaseTrack, SubmitProfile } from './submit/types';
 export { getDefaultProfile as getDefaultSubmitProfile } from './submit/resolver';
-export { EasJson, ProfileType } from './types';
+export { EasJson, ProfileType, AppVersionSource } from './types';
 export {
   AndroidVersionAutoIncrement,
   BuildProfile,

packages/eas-json/src/schema.ts

@@ -2,11 +2,13 @@ import Joi from 'joi';
 
 import { BuildProfileSchema } from './build/schema';
 import { SubmitProfileSchema } from './submit/schema';
+import { AppVersionSource } from './types';
 
 export const EasJsonSchema = Joi.object({
   cli: Joi.object({
     version: Joi.string(),
     requireCommit: Joi.boolean(),
+    appVersionSource: Joi.string().valid(...Object.values(AppVersionSource)),
   }),
   build: Joi.object().pattern(Joi.string(), BuildProfileSchema),
   submit: Joi.object().pattern(Joi.string(), SubmitProfileSchema),

packages/eas-json/src/types.ts

@@ -11,10 +11,16 @@ export enum CredentialsSource {
   REMOTE = 'remote',
 }
 
+export enum AppVersionSource {
+  LOCAL = 'local',
+  REMOTE = 'remote',
+}
+
 export interface EasJson {
   cli?: {
     version?: string;
     requireCommit?: boolean;
+    appVersionSource?: AppVersionSource;
   };
   build?: { [profileName: string]: EasJsonBuildProfile };
   submit?: { [profileName: string]: EasJsonSubmitProfile };

scripts/package.json

@@ -26,9 +26,13 @@
     "@types/dateformat": "3.0.1",
     "@types/fs-extra": "9.0.13",
     "@types/lodash-es": "4.17.6",
-    "@types/node": "17.0.32",
-    "@types/semver": "7.3.9",
-    "ts-node": "10.7.0",
+    "@types/node": "18.0.4",
+    "@types/semver": "7.3.10",
+    "ts-node": "10.9.1",
     "typescript": "4.7.4"
+  },
+  "volta": {
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

scripts/yarn.lock

@@ -2,17 +2,30 @@
 # yarn lockfile v1
 
 
-"@cspotcode/source-map-consumer@0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
-  integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
-
-"@cspotcode/[email protected]":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
-  integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
+"@cspotcode/source-map-support@^0.8.0":
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz#00629c35a688e05a88b1cda684fb9d5e73f000a1"
+  integrity sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==
   dependencies:
-    "@cspotcode/source-map-consumer" "0.8.0"
+    "@jridgewell/trace-mapping" "0.3.9"
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/[email protected]":
+  version "0.3.9"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz#6534fd5933a53ba7cbf3a17615e273a0d1273ff9"
+  integrity sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
 
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
@@ -63,15 +76,15 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-16.10.3.tgz#7a8f2838603ea314d1d22bb3171d899e15c57bd5"
   integrity sha512-ho3Ruq+fFnBrZhUYI46n/bV2GjwzSkwuT4dTf0GkuNFmnb8nq4ny2z9JEVemFi6bdEJanHLlYfy9c6FN9B9McQ==
 
-"@types/node@17.0.32":
-  version "17.0.32"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.32.tgz#51d59d7a90ef2d0ae961791e0900cad2393a0149"
-  integrity sha512-eAIcfAvhf/BkHcf4pkLJ7ECpBAhh9kcxRBpip9cTiO+hf+aJrsxYxBeS6OXvOd9WqNAJmavXVpZvY1rBjNsXmw==
+"@types/node@18.0.4":
+  version "18.0.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-18.0.4.tgz#48aedbf35efb3af1248e4cd4d792c730290cd5d6"
+  integrity sha512-M0+G6V0Y4YV8cqzHssZpaNCqvYwlCiulmm0PwpNLF55r/+cT8Ol42CHRU1SEaYFH2rTwiiE1aYg/2g2rrtGdPA==
 
-"@types/[email protected].9":
-  version "7.3.9"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc"
-  integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ==
+"@types/[email protected].10":
+  version "7.3.10"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73"
+  integrity sha512-zsv3fsC7S84NN6nPK06u79oWgrPVd0NvOyqgghV1haPaFcVxIrP4DLomRwGAXk0ui4HZA7mOcSFL98sMVW9viw==
 
 acorn-walk@^8.1.1:
   version "8.2.0"
@@ -155,12 +168,12 @@ [email protected]:
   dependencies:
     lru-cache "^6.0.0"
 
-ts-node@10.7.0:
-  version "10.7.0"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
-  integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
+ts-node@10.9.1:
+  version "10.9.1"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.9.1.tgz#e73de9102958af9e1f0b168a6ff320e25adcff4b"
+  integrity sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==
   dependencies:
-    "@cspotcode/source-map-support" "0.7.0"
+    "@cspotcode/source-map-support" "^0.8.0"
     "@tsconfig/node10" "^1.0.7"
     "@tsconfig/node12" "^1.0.7"
     "@tsconfig/node14" "^1.0.0"
@@ -171,7 +184,7 @@ [email protected]:
     create-require "^1.1.0"
     diff "^4.0.1"
     make-error "^1.1.1"
-    v8-compile-cache-lib "^3.0.0"
+    v8-compile-cache-lib "^3.0.1"
     yn "3.1.1"
 
 [email protected]:
@@ -189,7 +202,7 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-v8-compile-cache-lib@^3.0.0:
+v8-compile-cache-lib@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
   integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==

yarn.lock

@@ -1269,10 +1269,10 @@
     slugify "^1.3.4"
     sucrase "^3.20.0"
 
-"@expo/[email protected].77":
-  version "0.2.77"
-  resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.77.tgz#2ebdb3e6706c4020812e2e8e3d2e7da26e3c7eb1"
-  integrity sha512-CFS/Uixa3XqV39vdoDnQP93kgd2EGf3gaOqLYl+9gnMCP9h2+Q9fIbfPw5DnFu2LEIyU+Xw5DtpkyTQEBjTLyA==
+"@expo/[email protected].84":
+  version "0.2.84"
+  resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.84.tgz#d5b423ee1ee828b21c9b6bee611dfd97728da5d4"
+  integrity sha512-e4OHxRUz2DeZWOsQkNWyAbJUGfOE6O2dH1/hEyzWeXew9kPrDr/u/aKAYicwOiZACiikBl+x7bOAIdoZuOz7uA==
   dependencies:
     joi "^17.4.2"
     semver "^7.3.5"
@@ -8930,7 +8930,7 @@ lodash.without@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.without/-/lodash.without-4.4.0.tgz#3cd4574a00b67bae373a94b748772640507b7aac"
   integrity sha1-PNRXSgC2e643OpS3SHcmQFB7eqw=
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.21, lodash@^4.7.0, lodash@~4.17.0:
+lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0, lodash@~4.17.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -12132,6 +12132,13 @@ ts-log@^2.2.3:
   resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb"
   integrity sha512-XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w==
 
+[email protected]:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/ts-mockito/-/ts-mockito-2.6.1.tgz#bc9ee2619033934e6fad1c4455aca5b5ace34e73"
+  integrity sha512-qU9m/oEBQrKq5hwfbJ7MgmVN5Gu6lFnIGWvpxSjrqq6YYEVv+RwVFWySbZMBgazsWqv6ctAyVBpo9TmAxnOEKw==
+  dependencies:
+    lodash "^4.17.5"
+
 ts-node@^9:
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.0.0.tgz#e7699d2a110cc8c0d3b831715e417688683460b3"