update CHANGELOG.md

CHANGELOG.md

@@ -8,93 +8,19 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-- Add styling to SSO auth redirect completion page. ([#1929](https://github.com/expo/eas-cli/pull/1929) by [@wschurman](https://github.com/wschurman))
-- Ignore entitlements from native template when `/ios` is gitignored. ([#1906](https://github.com/expo/eas-cli/pull/1906) by [@byCedric](https://github.com/byCedric))
-- Use node server default port selection for SSO login server. ([#1930](https://github.com/expo/eas-cli/pull/1930) by [@wschurman](https://github.com/wschurman))
-
 ### 🐛 Bug fixes
 
-### 🧹 Chores
-
-- Limit project file upload size to 2GB. ([#1928](https://github.com/expo/eas-cli/pull/1928) by [@khamilowicz](https://github.com/khamilowicz))
-- Bump urql graphql client major version. ([#1936](https://github.com/expo/eas-cli/pull/1936) by [@quinlanj](https://github.com/quinlanj))
-
-## [3.15.1](https://github.com/expo/eas-cli/releases/tag/v3.15.1) - 2023-07-11
-
-### 🐛 Bug fixes
-
-- Ensure useClassicUpdates is not set when using EAS Update commands. ([#1915](https://github.com/expo/eas-cli/pull/1915) by [@ide](https://github.com/ide))
-- Handle multiple GraphQLErrors when receiving a CombinedError. ([#1924](https://github.com/expo/eas-cli/pull/1924) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🧹 Chores
-
-- Bump Expo package dependencies. ([#1911](https://github.com/expo/eas-cli/pull/1911) by [@brentvatne](https://github.com/brentvatne))
-- Better bare workflow runtimeVersion error. ([#1910](https://github.com/expo/eas-cli/pull/1910) by [@quinlanj](https://github.com/quinlanj))
-- Fix runtime version print logs. ([#1925](https://github.com/expo/eas-cli/pull/1925) by [@quinlanj](https://github.com/quinlanj))
-- Add info about new `macos-ventura-13.4-xcode-14.3.1` image to `eas.schema.json`. ([#1920](https://github.com/expo/eas-cli/pull/1920) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.15.0](https://github.com/expo/eas-cli/releases/tag/v3.15.0) - 2023-06-30
-
-### 🎉 New features
-
-- Show build profile when selecting a build for eas build:run. ([#1901](https://github.com/expo/eas-cli/pull/1901) by [@keith-kurak](https://github.com/keith-kurak))
-- Adds -m alias to --message in update/republish and removed README comment. ([#1905](https://github.com/expo/eas-cli/pull/1905) by [@pusongqi](https://github.com/pusongqi))
-
-### 🧹 Chores
-
-- Better runtimeVersion output. ([#1894](https://github.com/expo/eas-cli/pull/1894) by [@quinlanj](https://github.com/quinlanj))
-- Print better error message when uploading project archive tarball fails. ([#1897](https://github.com/expo/eas-cli/pull/1897) by [@szdziedzic](https://github.com/szdziedzic))
-- Adds support for 2 new server-side errors related to build limits. ([#1921](https://github.com/expo/eas-cli/pull/1921) by [@sundeeppeswani](https://github.com/sundeeppeswani))
-
-## [3.14.0](https://github.com/expo/eas-cli/releases/tag/v3.14.0) - 2023-06-20
-
-### 🎉 New features
-
-- Added support for SSO users. ([#1875](https://github.com/expo/eas-cli/pull/1875) by [@lzkb](https://github.com/lzkb))
-- Added new bundle identifier capabilities and entitlements from WWDC23. ([#1870](https://github.com/expo/eas-cli/pull/1870) by [@EvanBacon](https://github.com/EvanBacon))
-- Selecting default keystore via CLI. ([#1889](https://github.com/expo/eas-cli/pull/1889) by [@khamilowicz](https://github.com/khamilowicz))
-
-### 🧹 Chores
-
-- Change sso flag display. ([#1890](https://github.com/expo/eas-cli/pull/1890) by [@lzkb](https://github.com/lzkb))
-- Build:configure -- add channels to eas.json if using eas updates. ([#1887](https://github.com/expo/eas-cli/pull/1887) by [@quinlanj](https://github.com/quinlanj))
-- Eas update: Error gracefully if no git repo. ([#1884](https://github.com/expo/eas-cli/pull/1884) by [@quinlanj](https://github.com/quinlanj))
-- Error gracefully if expo pkg not installed. ([#1883](https://github.com/expo/eas-cli/pull/1883) by [@quinlanj](https://github.com/quinlanj))
-- Update `eas build:configure` command to show the link of `eas.json` when generated. ([#1878](https://github.com/expo/eas-cli/pull/1878) by [@amandeepmittal](https://github.com/amandeepmittal))
-- Create app.json or add the "expo" key if either are missing, before modifying or reading the file. ([#1881](https://github.com/expo/eas-cli/pull/1881) by [@brentvatne](https://github.com/brentvatne))
-- Include the original stack in re-thrown errors thrown from EAS CLI commands. ([#1882](https://github.com/expo/eas-cli/pull/1882) by [@brentvatne](https://github.com/brentvatne))
-- Make `update:configure` less verbose. ([#1888](https://github.com/expo/eas-cli/pull/1888) by [@quinlanj](https://github.com/quinlanj))
-- Improve validation for values from app config. ([#1893](https://github.com/expo/eas-cli/pull/1893) by [@wkozyra95](https://github.com/wkozyra95))
-- Improve `expo-updates` validation for builds with `channel` property set. ([#1885](https://github.com/expo/eas-cli/pull/1885) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [3.13.3](https://github.com/expo/eas-cli/releases/tag/v3.13.3) - 2023-06-05
-
-### 🐛 Bug fixes
-
-- Show original GraphQL error message in case of an unexpected error. ([#1862](https://github.com/expo/eas-cli/pull/1862) by [@dsokal](https://github.com/dsokal))
-- Fix updates synchronization of native files to include strings.xml for bare projects. ([#1865](https://github.com/expo/eas-cli/pull/1865) by [@wschurman](https://github.com/wschurman))
-
-## [3.13.2](https://github.com/expo/eas-cli/releases/tag/v3.13.2) - 2023-05-26
-
-### 🧹 Chores
-
-- Refactor getExpoConfig to remove dangerous default. ([#1857](https://github.com/expo/eas-cli/pull/1857) by [@wschurman](https://github.com/wschurman))
-- Add support for pending-cancel build status. ([#1855](https://github.com/expo/eas-cli/pull/1855) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [3.13.1](https://github.com/expo/eas-cli/releases/tag/v3.13.1) - 2023-05-24
+- Load iOS entitlements from prebuild config when `./ios` is gitignored. ([#1852](https://github.com/expo/eas-cli/pull/1852) by [@byCedric](https://github.com/byCedric))
 
 ### 🧹 Chores
 
 - Short format for selecting devices prompt. ([#1840](https://github.com/expo/eas-cli/pull/1840) by [@khamilowicz](https://github.com/khamilowicz))
-- Improve typescript types for user display. ([#1851](https://github.com/expo/eas-cli/pull/1851) by [@wschurman](https://github.com/wschurman))
-- Add error for `large` resource class not available on the free plan to server-side defined errors. ([#1848](https://github.com/expo/eas-cli/pull/1848) by [@szdziedzic](https://github.com/szdziedzic))
 
 ## [3.13.0](https://github.com/expo/eas-cli/releases/tag/v3.13.0) - 2023-05-17
 
 ### 🎉 New features
 
 - Add clear cache flag to eas update. ([#1839](https://github.com/expo/eas-cli/pull/1839) by [@quinlanj](https://github.com/quinlanj))
-- Print EAS Update assets that timed out during upload or processing. ([#1849](https://github.com/expo/eas-cli/pull/1849) by [@wschurman](https://github.com/wschurman))
 
 ### 🐛 Bug fixes
 

CODEOWNERS

@@ -1,10 +1,10 @@
-* @szdziedzic @khamilowicz
+* @dsokal @wkozyra95
 
-packages/eas-cli/src/build @szdziedzic @khamilowicz
-packages/eas-cli/src/commands/build @szdziedzic @khamilowicz
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95
 
-packages/eas-cli/src/submit @szdziedzic @khamilowicz
-packages/eas-cli/src/commands/submit.ts @szdziedzic @khamilowicz
+packages/eas-cli/src/submit @dsokal
+packages/eas-cli/src/commands/submit.ts @dsokal
 
 packages/eas-cli/src/update @EvanBacon @byCedric @wschurman
 packages/eas-cli/src/commands/update @EvanBacon @byCedric @wschurman
@@ -13,4 +13,4 @@ packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric
 
-packages/eas-json @szdziedzic @khamilowicz
+packages/eas-json @dsokal @wkozyra95

lerna.json

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

packages/eas-cli/README.md

@@ -133,7 +133,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -150,7 +150,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -167,7 +167,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -181,7 +181,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -231,7 +231,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -252,7 +252,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -272,7 +272,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -292,7 +292,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -315,7 +315,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -345,7 +345,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -362,7 +362,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -379,7 +379,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -414,7 +414,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/v3.15.1/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -422,11 +422,10 @@ list all builds for your project
 
 ```
 USAGE
-  $ eas build:list [--platform all|android|ios] [--status
-    new|in-queue|in-progress|pending-cancel|errored|finished|canceled] [--distribution store|internal|simulator]
-    [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>] [--sdkVersion <value>] [--runtimeVersion
-    <value>] [--appIdentifier <value>] [--buildProfile <value>] [--gitCommitHash <value>] [--offset <value>] [--limit
-    <value>] [--json --non-interactive]
+  $ eas build:list [--platform all|android|ios] [--status new|in-queue|in-progress|errored|finished|canceled]
+    [--distribution store|internal|simulator] [--channel <value>] [--appVersion <value>] [--appBuildVersion <value>]
+    [--sdkVersion <value>] [--runtimeVersion <value>] [--appIdentifier <value>] [--buildProfile <value>]
+    [--gitCommitHash <value>] [--offset <value>] [--limit <value>] [--json --non-interactive]
 
 FLAGS
   --appBuildVersion=<value>
@@ -436,23 +435,23 @@ FLAGS
   --channel=<value>
   --distribution=(store|internal|simulator)
   --gitCommitHash=<value>
-  --json                                                                        Enable JSON output, non-JSON messages
-                                                                                will be printed to stderr.
-  --limit=<value>                                                               The number of items to fetch each query.
-                                                                                Defaults to 10 and is capped at 50.
-  --non-interactive                                                             Run the command in non-interactive mode.
-  --offset=<value>                                                              Start queries from specified index. Use
-                                                                                for paginating results. Defaults to 0.
+  --json                                                         Enable JSON output, non-JSON messages will be printed
+                                                                 to stderr.
+  --limit=<value>                                                The number of items to fetch each query. Defaults to 10
+                                                                 and is capped at 50.
+  --non-interactive                                              Run the command in non-interactive mode.
+  --offset=<value>                                               Start queries from specified index. Use for paginating
+                                                                 results. Defaults to 0.
   --platform=(all|android|ios)
   --runtimeVersion=<value>
   --sdkVersion=<value>
-  --status=(new|in-queue|in-progress|pending-cancel|errored|finished|canceled)
+  --status=(new|in-queue|in-progress|errored|finished|canceled)
 
 DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:resign`
 
@@ -478,7 +477,7 @@ DESCRIPTION
   re-sign a build archive
 ```
 
-_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/resign.ts)_
+_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/resign.ts)_
 
 ## `eas build:run`
 
@@ -502,7 +501,7 @@ DESCRIPTION
   run simulator/emulator builds from eas-cli
 ```
 
-_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/run.ts)_
+_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/run.ts)_
 
 ## `eas build:submit`
 
@@ -551,7 +550,7 @@ DESCRIPTION
   get the latest version from EAS servers
 ```
 
-_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/version/get.ts)_
+_See code: [src/commands/build/version/get.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/version/get.ts)_
 
 ## `eas build:version:set`
 
@@ -570,7 +569,7 @@ DESCRIPTION
   update version of an app
 ```
 
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -589,7 +588,7 @@ DESCRIPTION
   update a version in native code with a value stored on EAS servers
 ```
 
-_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -606,7 +605,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -627,7 +626,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -649,7 +648,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -669,7 +668,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:rollout [CHANNEL]`
 
@@ -693,7 +692,7 @@ DESCRIPTION
   Roll a new branch out on a channel incrementally.
 ```
 
-_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/rollout.ts)_
+_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/channel/rollout.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -716,7 +715,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -737,7 +736,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -754,7 +753,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -768,7 +767,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/v3.15.1/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -788,7 +787,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -809,7 +808,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:rename`
 
@@ -830,7 +829,7 @@ DESCRIPTION
   rename a registered device
 ```
 
-_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/rename.ts)_
+_See code: [src/commands/device/rename.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/device/rename.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -844,7 +843,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -858,7 +857,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -946,7 +945,7 @@ DESCRIPTION
   validate the local store configuration
 ```
 
-_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/metadata/lint.ts)_
+_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/metadata/lint.ts)_
 
 ## `eas metadata:pull`
 
@@ -963,7 +962,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/v3.15.1/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -980,7 +979,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/v3.15.1/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas open`
 
@@ -994,7 +993,7 @@ DESCRIPTION
   open the project page in a web browser
 ```
 
-_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/open.ts)_
+_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/open.ts)_
 
 ## `eas project:info`
 
@@ -1008,7 +1007,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -1030,7 +1029,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -1053,7 +1052,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/v3.15.1/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -1071,7 +1070,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -1085,7 +1084,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas secret:push`
 
@@ -1105,7 +1104,7 @@ DESCRIPTION
   read environment secrets from env file and store on the server
 ```
 
-_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/secret/push.ts)_
+_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/secret/push.ts)_
 
 ## `eas submit`
 
@@ -1135,7 +1134,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -1143,12 +1142,11 @@ publish an update group
 
 ```
 USAGE
-  $ eas update [--branch <value>] [--channel <value>] [-m <value>] [--republish | --input-dir <value> |
-    --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
+  $ eas update [--branch <value>] [--channel <value>] [--message <value>] [--republish | --input-dir <value>
+    | --skip-bundler] [--group <value> |  | ] [--clear-cache] [-p android|ios|all] [--auto] [--private-key-path <value>]
     [--json --non-interactive]
 
 FLAGS
-  -m, --message=<value>             A short message describing the update
   -p, --platform=(android|ios|all)  [default: all]
   --auto                            Use the current git branch and commit message for the EAS branch and update message
   --branch=<value>                  Branch to publish the update group on
@@ -1157,6 +1155,7 @@ FLAGS
   --group=<value>                   Update group to republish (deprecated, see republish command)
   --input-dir=<value>               [default: dist] Location of the bundle
   --json                            Enable JSON output, non-JSON messages will be printed to stderr.
+  --message=<value>                 A short message describing the update
   --non-interactive                 Run the command in non-interactive mode.
   --private-key-path=<value>        File containing the PEM-encoded private key corresponding to the certificate in
                                     expo-updates' configuration. Defaults to a file named "private-key.pem" in the
@@ -1168,7 +1167,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -1186,7 +1185,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -1207,7 +1206,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -1229,7 +1228,7 @@ DESCRIPTION
   view the recent updates
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:republish`
 
@@ -1237,23 +1236,23 @@ roll back to an existing update
 
 ```
 USAGE
-  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [-m <value>] [-p android|ios|all]
-    [--json --non-interactive]
+  $ eas update:republish [--channel <value> | --branch <value> | --group <value>] [--message <value>] [-p
+    android|ios|all] [--json --non-interactive]
 
 FLAGS
-  -m, --message=<value>             Short message describing the republished update
   -p, --platform=(android|ios|all)  [default: all]
   --branch=<value>                  Branch name to select an update to republish from
   --channel=<value>                 Channel name to select an update to republish from
   --group=<value>                   Update group ID to republish
   --json                            Enable JSON output, non-JSON messages will be printed to stderr.
+  --message=<value>                 Short message describing the republished update
   --non-interactive                 Run the command in non-interactive mode.
 
 DESCRIPTION
   roll back to an existing update
 ```
 
-_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/republish.ts)_
+_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/update/republish.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -1273,7 +1272,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1294,7 +1293,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1314,7 +1313,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1332,7 +1331,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1354,7 +1353,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1371,7 +1370,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.15.1/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.13.0/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/package.json

@@ -1,20 +1,20 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "3.15.1",
+  "version": "3.13.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.3.1",
+    "@expo/apple-utils": "1.2.0",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.1.2",
-    "@expo/config-plugins": "7.2.4",
-    "@expo/config-types": "49.0.0",
+    "@expo/config": "7.0.3",
+    "@expo/config-plugins": "6.0.2",
+    "@expo/config-types": "47.0.0",
     "@expo/eas-build-job": "1.0.13",
-    "@expo/eas-json": "3.15.1",
+    "@expo/eas-json": "3.13.0",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
@@ -23,18 +23,17 @@
     "@expo/plist": "0.0.20",
     "@expo/plugin-help": "5.1.22",
     "@expo/plugin-warn-if-update-available": "2.5.0",
-    "@expo/prebuild-config": "6.2.5",
+    "@expo/prebuild-config": "5.0.7",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.25",
+    "@expo/steps": "1.0.13",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "1.23.2",
     "@oclif/plugin-autocomplete": "1.3.10",
     "@segment/ajv-human-errors": "^2.1.2",
-    "@urql/core": "4.0.11",
-    "@urql/exchange-graphcache": "6.1.4",
-    "@urql/exchange-retry": "1.2.0",
+    "@urql/core": "3.1.1",
+    "@urql/exchange-retry": "1.0.0",
     "ajv": "8.11.0",
     "ajv-formats": "2.1.1",
     "better-opn": "3.0.2",

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

@@ -66,8 +66,7 @@ export function mockCommandContext<
     easJson?: EasJson;
     exp?: ExpoConfig;
     projectId?: string;
-    getDynamicPrivateProjectConfigAsync?: DynamicConfigContextFn;
-    getDynamicPublicProjectConfigAsync?: DynamicConfigContextFn;
+    getDynamicProjectConfigAsync?: DynamicConfigContextFn;
   }
 ): ContextOutput<C> {
   const projectDir = path.join('/test', uuidv4());
@@ -97,16 +96,8 @@ export function mockCommandContext<
         projectDir,
       };
     }
-    if (contextKey === 'getDynamicPrivateProjectConfigAsync') {
-      result.getDynamicPrivateProjectConfigAsync = () => ({
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      });
-    }
-
-    if (contextKey === 'getDynamicPublicProjectConfigAsync') {
-      result.getDynamicPublicProjectConfigAsync = () => ({
+    if (contextKey === 'getDynamicProjectConfigAsync') {
+      result.getDynamicProjectConfigAsync = () => ({
         exp: overrides.exp ?? getMockExpoConfig(),
         projectId: overrides.projectId ?? mockProjectId,
         projectDir,
@@ -125,25 +116,3 @@ export function mockTestCommand<T extends Command>(
   (cmd as any).getContextAsync = jest.fn(() => ctx);
   return cmd;
 }
-
-export class NoErrorThrownError extends Error {}
-
-export const getErrorAsync = async <TError = any>(
-  call: () => unknown
-): Promise<TError | NoErrorThrownError> => {
-  try {
-    await call();
-    throw new NoErrorThrownError();
-  } catch (error: unknown) {
-    return error as TError;
-  }
-};
-
-export const getError = <TError = any>(call: () => unknown): TError | NoErrorThrownError => {
-  try {
-    call();
-    throw new NoErrorThrownError();
-  } catch (error: unknown) {
-    return error as TError;
-  }
-};

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

@@ -3,7 +3,6 @@ import { CombinedError } from '@urql/core';
 import { GraphQLError } from 'graphql/error';
 import { v4 as uuidv4 } from 'uuid';
 
-import { getError } from '../../__tests__/commands/utils';
 import { EasCommandError } from '../../commandUtils/errors';
 import Build from '../../commands/build';
 import Log, { link } from '../../log';
@@ -13,9 +12,6 @@ import {
   EasBuildFreeTierDisabledAndroidError,
   EasBuildFreeTierDisabledError,
   EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
   EasBuildTooManyPendingBuildsError,
   RequestValidationError,
   TurtleDeprecatedJobFormatError,
@@ -27,18 +23,12 @@ beforeEach(() => {
 
 const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `[
   {
-    "name": "GraphQLError",
-    "extensions": {},
     "message": "Error 1"
   },
   {
-    "name": "GraphQLError",
-    "extensions": {},
     "message": "Error 2"
   },
   {
-    "name": "GraphQLError",
-    "extensions": {},
     "message": "Error 3"
   }
 ]`;
@@ -135,38 +125,11 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              TurtleDeprecatedJobFormatError,
-              'Error 1'
-            );
-          });
-
-          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError(
-              'Error 1',
-              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
-            );
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError =
-              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
-                handleBuildRequestError(error, platform);
-              });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildResourceClassNotAvailableInFreeTierError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError, 'Error 1');
+            }
           });
         });
         describe('with iOS', () => {
@@ -176,38 +139,11 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              TurtleDeprecatedJobFormatError,
-              'Error 1'
-            );
-          });
-
-          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError(
-              'Error 1',
-              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
-            );
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError =
-              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
-                handleBuildRequestError(error, platform);
-              });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildResourceClassNotAvailableInFreeTierError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError, 'Error 1');
+            }
           });
         });
       });
@@ -220,17 +156,11 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildFreeTierDisabledError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError, 'Error 1');
+            }
           });
         });
         describe('with iOS', () => {
@@ -240,17 +170,11 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildFreeTierDisabledError,
-              'Error 1'
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError, 'Error 1');
+            }
           });
         });
       });
@@ -275,56 +199,15 @@ describe(Build.name, () => {
           const graphQLErrors = [graphQLError];
           const error = new CombinedError({ graphQLErrors });
 
-          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledAndroidError>(
-            () => {
-              handleBuildRequestError(error, platform);
-            }
-          );
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierDisabledAndroidError,
-            'Error 1'
-          );
-        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED', () => {
-        it('throws correct EasCommandError subclass', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-
-          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierLimitExceededError>(
-            () => {
-              handleBuildRequestError(error, platform);
-            }
-          );
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierLimitExceededError,
-            'Error 1'
-          );
-        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED', () => {
-        it('throws correct EasCommandError subclass', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-
-          const handleBuildRequestErrorThrownError =
-            getError<EasBuildFreeTierIosLimitExceededError>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierIosLimitExceededError,
-            'Error 1'
-          );
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            assertReThrownError(
+              caughtError as Error,
+              EasBuildFreeTierDisabledAndroidError,
+              'Error 1'
+            );
+          }
         });
       });
 
@@ -336,15 +219,11 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
+            try {
               handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              RequestValidationError,
-              'Error 1'
-            );
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, RequestValidationError, 'Error 1');
+            }
           });
         });
         describe('with iOS', () => {
@@ -354,15 +233,11 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
+            try {
               handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              RequestValidationError,
-              'Error 1'
-            );
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, RequestValidationError, 'Error 1');
+            }
           });
         });
       });
@@ -377,17 +252,15 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildDownForMaintenanceError,
-              EXPECTED_EAS_BUILD_DOWN_MESSAGE
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildDownForMaintenanceError,
+                EXPECTED_EAS_BUILD_DOWN_MESSAGE
+              );
+            }
           });
         });
         describe('with iOS', () => {
@@ -397,17 +270,15 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildDownForMaintenanceError,
-              EXPECTED_EAS_BUILD_DOWN_MESSAGE
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildDownForMaintenanceError,
+                EXPECTED_EAS_BUILD_DOWN_MESSAGE
+              );
+            }
           });
         });
       });
@@ -420,17 +291,15 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildTooManyPendingBuildsError,
-              EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildTooManyPendingBuildsError,
+                EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
+              );
+            }
           });
         });
         describe('with iOS', () => {
@@ -440,17 +309,15 @@ describe(Build.name, () => {
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
 
-            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildTooManyPendingBuildsError,
-              EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
-            );
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildTooManyPendingBuildsError,
+                EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
+              );
+            }
           });
         });
       });
@@ -463,36 +330,13 @@ describe(Build.name, () => {
           const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
           const graphQLErrors = [graphQLError];
           const error = new CombinedError({ graphQLErrors });
-          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;
+          const expectedMessage = EXPECTED_GENERIC_MESSAGE + `\nRequest ID: ${mockRequestId}`;
 
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
             handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        it('throws base Error class with message including all error messages if combined error has multiple GraphQL errors', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLErrors = [
-            getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR'),
-            getGraphQLError('Error 2', 'OTHER_GRAPHQL_ERROR'),
-            getGraphQLError('Error 3', 'YET_ANOTHER_GRAPHQL_ERROR'),
-          ];
-          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage =
-            `${EXPECTED_GENERIC_MESSAGE}\n` +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 1\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 2\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 3';
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, Error, expectedMessage);
+          }
         });
         describe('without request ID', () => {
           it('throws base Error class with custom message without request ID line', async () => {
@@ -501,13 +345,12 @@ describe(Build.name, () => {
             delete graphQLError.extensions.requestId;
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
-            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
 
-            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+            try {
               handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
+            }
           });
         });
       });
@@ -517,36 +360,13 @@ describe(Build.name, () => {
           const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
           const graphQLErrors = [graphQLError];
           const error = new CombinedError({ graphQLErrors });
-          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;
+          const expectedMessage = EXPECTED_GENERIC_MESSAGE + `\nRequest ID: ${mockRequestId}`;
 
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
             handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        it('throws base Error class with message including all error messages if combined error has multiple GraphQL errors', async () => {
-          const platform = Platform.IOS;
-          const graphQLErrors = [
-            getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR'),
-            getGraphQLError('Error 2', 'OTHER_GRAPHQL_ERROR'),
-            getGraphQLError('Error 3', 'YET_ANOTHER_GRAPHQL_ERROR'),
-          ];
-          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage =
-            `${EXPECTED_GENERIC_MESSAGE}\n` +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 1\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 2\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 3';
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, Error, expectedMessage);
+          }
         });
         describe('without request ID', () => {
           it('throws base Error class with custom message without request ID line', async () => {
@@ -555,13 +375,12 @@ describe(Build.name, () => {
             delete graphQLError.extensions.requestId;
             const graphQLErrors = [graphQLError];
             const error = new CombinedError({ graphQLErrors });
-            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
 
-            const handleBuildRequestErrorThrownError = getError<Error>(() => {
+            try {
               handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
+            }
           });
         });
       });
@@ -573,11 +392,11 @@ describe(Build.name, () => {
           const platform = Platform.ANDROID;
           const error = new Error('Non-graphQL-related error');
 
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
             handleBuildRequestError(error, platform);
-          });
-
-          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
+          } catch (caughtError) {
+            expect(caughtError).toStrictEqual(error);
+          }
         });
       });
       describe('with iOS', () => {
@@ -585,11 +404,11 @@ describe(Build.name, () => {
           const platform = Platform.IOS;
           const error = new Error('Non-graphQL-related error');
 
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
+          try {
             handleBuildRequestError(error, platform);
-          });
-
-          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
+          } catch (caughtError) {
+            expect(caughtError).toStrictEqual(error);
+          }
         });
       });
     });

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

@@ -4,7 +4,6 @@ import assert from 'assert';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
-import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
 import { BuildEvent } from '../analytics/AnalyticsManager';
@@ -43,10 +42,6 @@ import {
   EasBuildFreeTierDisabledAndroidError,
   EasBuildFreeTierDisabledError,
   EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildProjectArchiveUploadError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
   EasBuildTooManyPendingBuildsError,
   RequestValidationError,
   TurtleDeprecatedJobFormatError,
@@ -186,10 +181,6 @@ const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
   EAS_BUILD_FREE_TIER_DISABLED: EasBuildFreeTierDisabledError,
   EAS_BUILD_FREE_TIER_DISABLED_IOS: EasBuildFreeTierDisabledIOSError,
   EAS_BUILD_FREE_TIER_DISABLED_ANDROID: EasBuildFreeTierDisabledAndroidError,
-  EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED: EasBuildFreeTierLimitExceededError,
-  EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED: EasBuildFreeTierIosLimitExceededError,
-  EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER:
-    EasBuildResourceClassNotAvailableInFreeTierError,
   VALIDATION_ERROR: RequestValidationError,
 };
 
@@ -211,19 +202,12 @@ export function handleBuildRequestError(error: any, platform: Platform): never {
       `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
     );
   } else if (error?.graphQLErrors) {
-    const errorMessage = error.graphQLErrors
-      .map((graphQLError: GraphQLError) => {
-        const requestIdLine = graphQLError?.extensions?.requestId
-          ? `\nRequest ID: ${graphQLError.extensions.requestId}`
-          : '';
-        const errorMessageLine = graphQLError?.message
-          ? `\nError message: ${graphQLError.message}`
-          : '';
-        return `${requestIdLine}${errorMessageLine}`;
-      })
-      .join('');
+    const requestIdLine = error?.graphQLErrors?.[0]?.extensions?.requestId
+      ? `\nRequest ID: ${error.graphQLErrors[0].extensions.requestId}`
+      : '';
     throw new Error(
-      `Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.${errorMessage}`
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.' +
+        requestIdLine
     );
   }
   throw error;
@@ -255,10 +239,6 @@ async function uploadProjectAsync<TPlatform extends Platform>(
           );
         }
 
-        if (projectTarball.size > 2 * 1024 * 1024 * 1024) {
-          throw new Error('Project archive is too big. Maximum allowed size is 2GB.');
-        }
-
         projectTarballPath = projectTarball.path;
 
         const bucketKey = await uploadFileAtPathToGCSAsync(
@@ -283,12 +263,6 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         properties: ctx.analyticsEventProperties,
       }
     );
-  } catch (err: any) {
-    let errMessage = 'Failed to upload the project tarball to EAS Build';
-    if (err.message) {
-      errMessage += `\n\nReason: ${err.message}`;
-    }
-    throw new EasBuildProjectArchiveUploadError(errMessage);
   } finally {
     if (projectTarballPath) {
       await fs.remove(projectTarballPath);
@@ -518,7 +492,6 @@ async function handleSingleBuildProgressAsync(
       }
       break;
     }
-    case BuildStatus.PendingCancel:
     case BuildStatus.Canceled:
       spinner.fail('Build canceled');
       return { refetch: false };
@@ -549,7 +522,6 @@ const statusToDisplayName: Record<BuildStatus, string> = {
   [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
   [BuildStatus.InQueue]: 'in queue',
   [BuildStatus.InProgress]: 'in progress',
-  [BuildStatus.PendingCancel]: 'canceled',
   [BuildStatus.Canceled]: 'canceled',
   [BuildStatus.Finished]: 'finished',
   [BuildStatus.Errored]: 'failed',
@@ -568,12 +540,7 @@ async function handleMultipleBuildsProgressAsync(
     builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
   const allSettled =
     builds.filter(build =>
-      [
-        BuildStatus.Finished,
-        BuildStatus.Errored,
-        BuildStatus.Canceled,
-        BuildStatus.PendingCancel,
-      ].includes(build.status)
+      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
     ).length === buildCount;
 
   if (allSettled) {

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

@@ -3,7 +3,7 @@ import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import Log, { learnMore } from '../log';
+import Log from '../log';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
 import { getVcsClient } from '../vcs';
@@ -14,10 +14,6 @@ interface ConfigureParams {
   nonInteractive: boolean;
 }
 
-export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
-  return await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir));
-}
-
 /**
  * Creates eas.json if it does not exist.
  *
@@ -28,7 +24,7 @@ export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
 export async function ensureProjectConfiguredAsync(
   configureParams: ConfigureParams
 ): Promise<boolean> {
-  if (await easJsonExistsAsync(configureParams.projectDir)) {
+  if (await fs.pathExists(EasJsonAccessor.formatEasJsonPath(configureParams.projectDir))) {
     return false;
   }
 
@@ -106,9 +102,5 @@ async function createEasJsonAsync(projectDir: string): Promise<void> {
 
   await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
   await getVcsClient().trackFileAsync(easJsonPath);
-  Log.withTick(
-    `Generated ${chalk.bold('eas.json')}. ${learnMore(
-      'https://docs.expo.dev/build-reference/eas-json/'
-    )}`
-  );
+  Log.withTick(`Generated ${chalk.bold('eas.json')}`);
 }

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

@@ -34,7 +34,7 @@ export async function createBuildContextAsync<T extends Platform>({
   actor,
   graphqlClient,
   analytics,
-  getDynamicPrivateProjectConfigAsync,
+  getDynamicProjectConfigAsync,
   customBuildConfigMetadata,
 }: {
   buildProfileName: string;
@@ -51,10 +51,10 @@ export async function createBuildContextAsync<T extends Platform>({
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
+  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
   const projectName = exp.slug;
   const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
   const workflow = await resolveWorkflowAsync(projectDir, platform);

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

@@ -8,16 +8,8 @@ export class EasBuildFreeTierDisabledIOSError extends EasCommandError {}
 
 export class EasBuildFreeTierDisabledAndroidError extends EasCommandError {}
 
-export class EasBuildFreeTierLimitExceededError extends EasCommandError {}
-
-export class EasBuildFreeTierIosLimitExceededError extends EasCommandError {}
-
-export class EasBuildResourceClassNotAvailableInFreeTierError extends EasCommandError {}
-
 export class RequestValidationError extends EasCommandError {}
 
 export class EasBuildDownForMaintenanceError extends EasCommandError {}
 
 export class EasBuildTooManyPendingBuildsError extends EasCommandError {}
-
-export class EasBuildProjectArchiveUploadError extends EasCommandError {}

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

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

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

@@ -132,7 +132,6 @@ function createBuildToPartialChoiceMaker(
         name: build.platform === AppPlatform.Ios ? 'Build number' : 'Version code',
         value: build.appBuildVersion ? chalk.bold(build.appBuildVersion) : null,
       },
-      { name: 'Profile', value: build.buildProfile ? chalk.bold(build.buildProfile) : null },
     ];
 
     const filteredDescriptionArray: string[] = descriptionItems

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

@@ -24,7 +24,7 @@ import {
 } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
-import Log, { learnMore } from '../log';
+import Log from '../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
@@ -37,12 +37,7 @@ import {
 } from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
-import {
-  installExpoUpdatesAsync,
-  isExpoUpdatesInstalledAsDevDependency,
-  isExpoUpdatesInstalledOrAvailable,
-  validateAppVersionRuntimePolicySupportAsync,
-} from '../project/projectUtils';
+import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
 import {
   validateAppConfigForRemoteVersionSource,
   validateBuildProfileVersionSettings,
@@ -98,7 +93,7 @@ export async function runBuildAndSubmitAsync(
   projectDir: string,
   flags: BuildFlags,
   actor: Actor,
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
+  getDynamicProjectConfigAsync: DynamicConfigContextFn
 ): Promise<void> {
   await getVcsClient().ensureRepoExistsAsync();
   await ensureRepoIsCleanAsync(flags.nonInteractive);
@@ -118,13 +113,6 @@ export async function runBuildAndSubmitAsync(
     platforms,
     profileName: flags.profile ?? undefined,
   });
-  Log.log(
-    `Loaded "env" configuration for the "${buildProfiles[0].profileName}" profile: ${
-      buildProfiles[0].profile.env
-        ? Object.keys(buildProfiles[0].profile.env).join(', ')
-        : 'no environment variables specified'
-    }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
-  );
 
   await ensureExpoDevClientInstalledForDevClientBuildsAsync({
     projectDir,
@@ -159,7 +147,7 @@ export async function runBuildAndSubmitAsync(
       actor,
       graphqlClient,
       analytics,
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
     });
     if (maybeBuild) {
@@ -230,9 +218,7 @@ export async function runBuildAndSubmitAsync(
   }
 
   const haveAllBuildsFailedOrCanceled = builds.every(
-    build =>
-      build?.status &&
-      [BuildStatus.Errored, BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build?.status)
+    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
   );
 
   await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags);
@@ -269,7 +255,7 @@ async function prepareAndStartBuildAsync({
   actor,
   graphqlClient,
   analytics,
-  getDynamicPrivateProjectConfigAsync,
+  getDynamicProjectConfigAsync,
   customBuildConfigMetadata,
 }: {
   projectDir: string;
@@ -280,7 +266,7 @@ async function prepareAndStartBuildAsync({
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
@@ -298,7 +284,7 @@ async function prepareAndStartBuildAsync({
     actor,
     graphqlClient,
     analytics,
-    getDynamicPrivateProjectConfigAsync,
+    getDynamicProjectConfigAsync,
     customBuildConfigMetadata,
   });
 
@@ -318,14 +304,6 @@ async function prepareAndStartBuildAsync({
     buildCtx.projectId,
     flags.nonInteractive
   );
-  if (buildProfile.profile.channel) {
-    await validateExpoUpdatesInstalledAsProjectDependencyAsync({
-      projectDir,
-      sdkVersion: buildCtx.exp.sdkVersion,
-      nonInteractive: flags.nonInteractive,
-      buildProfile,
-    });
-  }
 
   await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
   if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
@@ -445,40 +423,3 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
     }
   }
 }
-
-async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
-  projectDir,
-  buildProfile,
-  nonInteractive,
-  sdkVersion,
-}: {
-  projectDir: string;
-  buildProfile: ProfileData<'build'>;
-  nonInteractive: boolean;
-  sdkVersion?: string;
-}): Promise<void> {
-  if (isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion)) {
-    return;
-  }
-
-  if (isExpoUpdatesInstalledAsDevDependency(projectDir)) {
-    Log.warn(
-      `The build profile "${buildProfile.profileName}" uses the channel "${buildProfile.profile.channel}", but you've added "expo-updates" as a dev dependency. To make channels work for your builds, move "expo-updates" from dev dependencies to the main dependencies in your project.`
-    );
-  } else if (nonInteractive) {
-    Log.warn(
-      `The build profile "${buildProfile.profileName}" has specified the channel "${buildProfile.profile.channel}", but the "expo-updates" package hasn't been installed. To use channels for your builds, install the "expo-updates" package by running "npx expo install expo-updates".`
-    );
-  } else {
-    Log.warn(
-      `The build profile "${buildProfile.profileName}" specifies the channel "${buildProfile.profile.channel}", but the "expo-updates" package is missing. To use channels in your builds, install the "expo-updates" package.`
-    );
-    const installExpoUpdates = await confirmAsync({
-      message: `Would you like to install the "expo-updates" package?`,
-    });
-    if (installExpoUpdates) {
-      await installExpoUpdatesAsync(projectDir, { silent: false });
-      Log.withTick('Installed expo-updates');
-    }
-  }
-}

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

@@ -2,7 +2,6 @@ export enum BuildStatus {
   NEW = 'new',
   IN_QUEUE = 'in-queue',
   IN_PROGRESS = 'in-progress',
-  PENDING_CANCEL = 'pending-cancel',
   ERRORED = 'errored',
   FINISHED = 'finished',
   CANCELED = 'canceled',

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

@@ -27,7 +27,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
             return chalk.blue('in queue');
           case GraphQLBuildStatus.InProgress:
             return chalk.blue('in progress');
-          case GraphQLBuildStatus.PendingCancel:
           case GraphQLBuildStatus.Canceled:
             return chalk.gray('canceled');
           case GraphQLBuildStatus.Finished:
@@ -91,7 +90,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
           case GraphQLBuildStatus.InQueue:
           case GraphQLBuildStatus.InProgress:
             return '<in progress>';
-          case GraphQLBuildStatus.PendingCancel:
           case GraphQLBuildStatus.Canceled:
           case GraphQLBuildStatus.Errored:
             return null;

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

@@ -80,7 +80,7 @@ function printBuildResult(build: BuildFragment): void {
     }
     return;
   }
-  if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build.status)) {
+  if (build.status === BuildStatus.Canceled) {
     Log.addNewLineIfNone();
     Log.error(
       `${appPlatformEmojis[build.platform]} ${

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

@@ -1,8 +0,0 @@
-export class ListChannels {
-  constructor() {}
-
-  async runAsync(): Promise<void> {}
-
-  // TODO return channels fragment
-  async listChannelsAsync(): Promise<void> {}
-}

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

@@ -1,6 +1,5 @@
 import { Command } from '@oclif/core';
 import { CombinedError } from '@urql/core';
-import { GraphQLError } from 'graphql/error';
 import nullthrows from 'nullthrows';
 
 import {
@@ -12,14 +11,11 @@ import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
-import {
-  DynamicPrivateProjectConfigContextField,
-  DynamicPublicProjectConfigContextField,
-} from './context/DynamicProjectConfigContextField';
+import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
 import LoggedInContextField from './context/LoggedInContextField';
 import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
-import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
-import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
+import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
+import ProjectConfigContextField from './context/ProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import { EasCommandError } from './errors';
@@ -69,7 +65,7 @@ export default abstract class EasCommand extends Command {
      * run within a project directory, null otherwise.
      */
     OptionalProjectConfig: {
-      privateProjectConfig: new OptionalPrivateProjectConfigContextField(),
+      projectConfig: new OptionalProjectConfigContextField(),
     },
     /**
      * Require this command to be run in a project directory. Return the project directory in the context.
@@ -82,9 +78,7 @@ export default abstract class EasCommand extends Command {
      */
     DynamicProjectConfig: {
       // eslint-disable-next-line async-protect/async-suffix
-      getDynamicPublicProjectConfigAsync: new DynamicPublicProjectConfigContextField(),
-      // eslint-disable-next-line async-protect/async-suffix
-      getDynamicPrivateProjectConfigAsync: new DynamicPrivateProjectConfigContextField(),
+      getDynamicProjectConfigAsync: new DynamicProjectConfigContextField(),
     },
     /**
      * Require the project to be identified and registered on server. Returns the project config in the context.
@@ -93,7 +87,7 @@ export default abstract class EasCommand extends Command {
      */
     ProjectConfig: {
       loggedIn: new LoggedInContextField(),
-      privateProjectConfig: new PrivateProjectConfigContextField(),
+      projectConfig: new ProjectConfigContextField(),
     },
     /**
      * Analytics manager. Returns the analytics manager in the context for use by the command.
@@ -194,23 +188,16 @@ export default abstract class EasCommand extends Command {
     if (err instanceof EasCommandError) {
       Log.error(err.message);
     } else if (err instanceof CombinedError && err?.graphQLErrors) {
-      const cleanMessage = err?.graphQLErrors
-        .map((graphQLError: GraphQLError) => {
-          const messageLine = graphQLError.message.replace('[GraphQL] ', '');
-          const requestIdLine = graphQLError.extensions?.requestId
-            ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
-            : '';
-          return `${messageLine}${requestIdLine}`;
-        })
-        .join('\n');
+      let cleanMessage = err.message.replace('[GraphQL] ', '');
+      cleanMessage += err?.graphQLErrors?.[0]?.extensions?.requestId
+        ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
+        : '';
       Log.error(cleanMessage);
       baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
     } else {
       Log.error(err.message);
     }
     Log.debug(err);
-    const sanitizedError = new Error(baseMessage);
-    sanitizedError.stack = err.stack;
-    throw sanitizedError;
+    throw new Error(baseMessage);
   }
 }

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

@@ -172,44 +172,6 @@ describe(EasCommand.name, () => {
         expect(logDebugSpy).toBeCalledWith(error);
       });
 
-      it('logs the cleaned messages with request IDs if multiple GraphQL errors present', async () => {
-        const TestEasCommand = createTestEasCommand();
-        const logErrorSpy = jest.spyOn(Log, 'error');
-        const logDebugSpy = jest.spyOn(Log, 'debug');
-        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
-        const graphQLErrors = [
-          new GraphQLError('Unexpected GraphQL error message', null, null, null, null, null, {
-            errorCode: 'UNKNOWN_GRAPHQL_ERROR',
-            requestId: mockRequestId,
-          }),
-          new GraphQLError('Other GraphQL error message', null, null, null, null, null, {
-            errorCode: 'OTHER_GRAPHQL_ERROR',
-            requestId: mockRequestId,
-          }),
-          new GraphQLError('Yet another GraphQL error message', null, null, null, null, null, {
-            errorCode: 'YET_ANOTHER_GRAPHQL_ERROR',
-            requestId: mockRequestId,
-          }),
-        ];
-        const error = new CombinedError({ graphQLErrors });
-        runAsyncMock.mockImplementation(() => {
-          throw error;
-        });
-        try {
-          await TestEasCommand.run();
-        } catch {}
-
-        expect(logErrorSpy).toBeCalledWith(
-          'Unexpected GraphQL error message\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Other GraphQL error message\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Yet another GraphQL error message\n' +
-            `Request ID: ${mockRequestId}`
-        );
-        expect(logDebugSpy).toBeCalledWith(error);
-      });
-
       it('re-throws the error with default base message', async () => {
         const TestEasCommand = createTestEasCommand();
         const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
@@ -224,7 +186,7 @@ describe(EasCommand.name, () => {
         }
       });
 
-      it('re-throws the error with a different default base message in case of CombinedError', async () => {
+      it('re-throws the error with a different default base message in case of graphQLError', async () => {
         const TestEasCommand = createTestEasCommand();
         const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
         runAsyncMock.mockImplementation(() => {
@@ -238,34 +200,6 @@ describe(EasCommand.name, () => {
           expect((caughtError as Error).message).toEqual('GraphQL request failed.');
         }
       });
-
-      it('re-throws the error with a different default base message in case of CombinedError with multiple GraphQLErrors', async () => {
-        const TestEasCommand = createTestEasCommand();
-        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
-        runAsyncMock.mockImplementation(() => {
-          const graphQLErrors = [
-            new GraphQLError('Unexpected GraphQL error message', null, null, null, null, null, {
-              errorCode: 'UNEXPECTED_GRAPHQL_ERROR',
-              requestId: mockRequestId,
-            }),
-            new GraphQLError('Other GraphQL error message', null, null, null, null, null, {
-              errorCode: 'OTHER_GRAPHQL_ERROR',
-              requestId: mockRequestId,
-            }),
-            new GraphQLError('Yet another GraphQL error message', null, null, null, null, null, {
-              errorCode: 'YET_ANOTHER_GRAPHQL_ERROR',
-              requestId: mockRequestId,
-            }),
-          ];
-          throw new CombinedError({ graphQLErrors });
-        });
-        try {
-          await TestEasCommand.run();
-        } catch (caughtError) {
-          expect(caughtError).toBeInstanceOf(Error);
-          expect((caughtError as Error).message).toEqual('GraphQL request failed.');
-        }
-      });
     });
   });
 });

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

@@ -1,55 +1,29 @@
 import { ExpoConfig } from '@expo/config-types';
 
-import {
-  ExpoConfigOptions,
-  getPrivateExpoConfig,
-  getPublicExpoConfig,
-} from '../../project/expoConfig';
+import { ExpoConfigOptions, getExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 
-export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
+export type DynamicConfigContextFn = (options: ExpoConfigOptions) => Promise<{
   projectId: string;
   exp: ExpoConfig;
   projectDir: string;
 }>;
 
-export class DynamicPublicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
+export class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
   async getValueAsync({
     nonInteractive,
     sessionManager,
   }: ContextOptions): Promise<DynamicConfigContextFn> {
     const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
     return async (options?: ExpoConfigOptions) => {
-      const expBefore = getPublicExpoConfig(projectDir, options);
+      const expBefore = getExpoConfig(projectDir, options);
       const projectId = await getProjectIdAsync(sessionManager, expBefore, {
         nonInteractive,
         env: options?.env,
       });
-      const exp = getPublicExpoConfig(projectDir, options);
-      return {
-        exp,
-        projectDir,
-        projectId,
-      };
-    };
-  }
-}
-
-export class DynamicPrivateProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-  }: ContextOptions): Promise<DynamicConfigContextFn> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    return async (options?: ExpoConfigOptions) => {
-      const expBefore = getPrivateExpoConfig(projectDir, options);
-      const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-        nonInteractive,
-        env: options?.env,
-      });
-      const exp = getPrivateExpoConfig(projectDir, options);
+      const exp = getExpoConfig(projectDir, options);
       return {
         exp,
         projectDir,

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

@@ -1,12 +1,12 @@
 import { ExpoConfig } from '@expo/config-types';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
 
-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 
-export class OptionalPrivateProjectConfigContextField extends ContextField<
+export class OptionalProjectConfigContextField extends ContextField<
   | {
       projectId: string;
       exp: ExpoConfig;
@@ -35,11 +35,11 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
       return undefined;
     }
 
-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(sessionManager, expBefore, {
       nonInteractive,
     });
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
     return {
       exp,
       projectDir,

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

@@ -1,11 +1,11 @@
 import { ExpoConfig } from '@expo/config-types';
 
-import { getPrivateExpoConfig } from '../../project/expoConfig';
+import { getExpoConfig } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 
-export class PrivateProjectConfigContextField extends ContextField<{
+export default class ProjectConfigContextField extends ContextField<{
   projectId: string;
   exp: ExpoConfig;
   projectDir: string;
@@ -16,11 +16,11 @@ export class PrivateProjectConfigContextField extends ContextField<{
     projectDir: string;
   }> {
     const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = getPrivateExpoConfig(projectDir);
+    const expBefore = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(sessionManager, expBefore, {
       nonInteractive,
     });
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
 
     return {
       projectId,

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

@@ -1,4 +1,4 @@
-import { getConfig, getConfigFilePaths, modifyConfigAsync } from '@expo/config';
+import { getConfig, modifyConfigAsync } from '@expo/config';
 import { vol } from 'memfs';
 import { anything, instance, mock, when } from 'ts-mockito';
 
@@ -26,10 +26,6 @@ describe(getProjectIdAsync, () => {
   let sessionManager: SessionManager;
 
   beforeEach(() => {
-    jest
-      .mocked(getConfigFilePaths)
-      .mockReturnValue({ staticConfigPath: null, dynamicConfigPath: null });
-
     const sessionManagerMock = mock<SessionManager>();
     when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
       actor: {

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

@@ -3,14 +3,13 @@ import {
   Client,
   OperationContext,
   OperationResult,
-  OperationResultSource,
+  PromisifiedSource,
   TypedDocumentNode,
+  cacheExchange,
   createClient as createUrqlClient,
-  cacheExchange as defaultCacheExchange,
+  dedupExchange,
   fetchExchange,
 } from '@urql/core';
-import { cacheExchange as graphqlCacheExchange } from '@urql/exchange-graphcache';
-import { relayPagination } from '@urql/exchange-graphcache/extras';
 import { retryExchange } from '@urql/exchange-retry';
 import { DocumentNode } from 'graphql';
 import fetch from 'node-fetch';
@@ -23,28 +22,18 @@ export interface ExpoGraphqlClient extends Client {
     query: DocumentNode | TypedDocumentNode<Data, Variables> | string,
     variables: Variables,
     context: Partial<OperationContext> & { additionalTypenames: string[] }
-  ): OperationResultSource<OperationResult<Data, Variables>>;
+  ): PromisifiedSource<OperationResult<Data, Variables>>;
 }
 
-// TODO: plumb this down, maybe use a feature gate for this?
-export function createGraphqlClient(
-  authInfo: {
-    accessToken: string | null;
-    sessionSecret: string | null;
-  },
-  _options: { useGraphqlCachePolicy?: boolean } = {}
-): ExpoGraphqlClient {
+export function createGraphqlClient(authInfo: {
+  accessToken: string | null;
+  sessionSecret: string | null;
+}): ExpoGraphqlClient {
   return createUrqlClient({
     url: getExpoApiBaseUrl() + '/graphql',
     exchanges: [
-      //options.useGraphqlCachePolicy ? graphqlCacheExchange() : defaultCacheExchange,
-      graphqlCacheExchange({
-        resolvers: {
-          App: {
-            updateChannels: relayPagination(),
-          },
-        },
-      }),
+      dedupExchange,
+      cacheExchange,
       retryExchange({
         maxDelayMs: 4000,
         retryIf: (err, operation) => {

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

@@ -1,4 +1,4 @@
-import { getProjectConfigDescription } from '@expo/config';
+import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
 import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
@@ -6,7 +6,7 @@ import chalk from 'chalk';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
-import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../../project/expoConfig';
+import { getExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
@@ -24,8 +24,8 @@ export async function saveProjectIdToAppConfigAsync(
   projectId: string,
   options: { env?: Env } = {}
 ): Promise<void> {
-  const exp = getPrivateExpoConfig(projectDir, options);
-  const result = await createOrModifyExpoConfigAsync(
+  const exp = getExpoConfig(projectDir, options);
+  const result = await modifyConfigAsync(
     projectDir,
     {
       extra: { ...exp.extra, eas: { ...exp.extra?.eas, projectId } },
@@ -160,12 +160,12 @@ export async function getProjectIdAsync(
     switch (user.__typename) {
       case 'User':
         return user.username;
-      case 'SSOUser':
-        return user.username;
       case 'Robot':
         throw new Error(
           'The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner'
         );
+      case 'SSOUser':
+        throw new Error('SSO users are not supported yet.');
     }
   };
 

packages/eas-cli/src/commands/account/login.ts

@@ -1,5 +1,3 @@
-import { Flags } from '@oclif/core';
-
 import EasCommand from '../../commandUtils/EasCommand';
 import Log from '../../log';
 
@@ -7,27 +5,13 @@ export default class AccountLogin extends EasCommand {
   static override description = 'log in with your Expo account';
   static override aliases = ['login'];
 
-  static override flags = {
-    // can pass either --sso or -s
-    sso: Flags.boolean({
-      description: 'Login with SSO',
-      char: 's',
-      default: false,
-      hidden: true,
-    }),
-  };
-
   static override contextDefinition = {
     ...this.ContextOptions.SessionManagment,
   };
 
   async runAsync(): Promise<void> {
-    const {
-      flags: { sso },
-    } = await this.parse(AccountLogin);
-
     const { sessionManager } = await this.getContextAsync(AccountLogin, { nonInteractive: false });
-    await sessionManager.showLoginPromptAsync({ sso });
+    await sessionManager.showLoginPromptAsync();
     Log.log('Logged in');
   }
 }

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

@@ -35,7 +35,7 @@ export default class BranchCreate extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(BranchCreate);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchCreate, {
       nonInteractive,

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

@@ -108,7 +108,7 @@ export default class BranchDelete extends EasCommand {
     }
 
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchDelete, { nonInteractive });
     const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

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

@@ -20,7 +20,7 @@ export default class BranchList extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BranchList);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchList, {
       nonInteractive: flags['non-interactive'],

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

@@ -72,7 +72,7 @@ export default class BranchRename extends EasCommand {
       flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
     } = await this.parse(BranchRename);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchRename, {
       nonInteractive,

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

@@ -38,7 +38,7 @@ export default class BranchView extends EasCommand {
     } = await this.parse(BranchView);
     const { 'non-interactive': nonInteractive } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchView, {
       nonInteractive,

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

@@ -147,7 +147,7 @@ export default class BuildCancel extends EasCommand {
       flags: { 'non-interactive': nonInteractive },
     } = await this.parse(BuildCancel);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildCancel, {
       nonInteractive,
@@ -174,7 +174,7 @@ export default class BuildCancel extends EasCommand {
     const spinner = ora().start('Canceling the build…');
     try {
       const { status } = await cancelBuildAsync(graphqlClient, buildId);
-      if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(status)) {
+      if (status === BuildStatus.Canceled) {
         spinner.succeed('Build canceled');
       } else {
         spinner.text = 'Build is already completed';

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

@@ -7,14 +7,10 @@ import { ensureProjectConfiguredAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import Log, { learnMore } from '../../log';
 import { RequestedPlatform } from '../../platform';
-import { isExpoUpdatesInstalled, isUsingEASUpdate } from '../../project/projectUtils';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import {
-  ensureEASUpdateIsConfiguredInEasJsonAsync,
-  ensureUseClassicUpdatesIsRemovedAsync,
-} from '../../update/configure';
 import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
 import { getVcsClient } from '../../vcs';
 
@@ -37,7 +33,7 @@ export default class BuildConfigure extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BuildConfigure);
     const {
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
@@ -61,19 +57,10 @@ export default class BuildConfigure extends EasCommand {
 
     // ensure eas.json exists
     Log.newLine();
-    const didCreateEasJson = await ensureProjectConfiguredAsync({
+    await ensureProjectConfiguredAsync({
       projectDir,
       nonInteractive: false,
     });
-    if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
-      if (exp.updates?.useClassicUpdates) {
-        // NOTE: this method modifies the Expo config; be sure to use this function's return value
-        // if the config object is used later in the future
-        await ensureUseClassicUpdatesIsRemovedAsync({ exp, projectDir });
-      }
-
-      await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
-    }
 
     // configure expo-updates
     if (expoUpdatesIsInstalled) {

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

@@ -118,7 +118,7 @@ export default class Build extends EasCommand {
 
     const {
       loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
       analytics,
     } = await this.getContextAsync(Build, {
@@ -144,7 +144,7 @@ export default class Build extends EasCommand {
       projectDir,
       flagsWithPlatform,
       actor,
-      getDynamicPrivateProjectConfigAsync
+      getDynamicProjectConfigAsync
     );
   }
 

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

@@ -73,7 +73,7 @@ export default class BuildInspect extends EasCommand {
     const { flags } = await this.parse(BuildInspect);
     const {
       loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
       analytics,
     } = await this.getContextAsync(BuildInspect, {
@@ -120,7 +120,7 @@ export default class BuildInspect extends EasCommand {
             },
           },
           actor,
-          getDynamicPrivateProjectConfigAsync
+          getDynamicProjectConfigAsync
         );
         if (!flags.verbose) {
           Log.log(chalk.green('Build successful'));

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

@@ -46,7 +46,7 @@ export default class BuildInternal extends EasCommand {
 
     const {
       loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
       analytics,
     } = await this.getContextAsync(BuildInternal, {
@@ -74,7 +74,7 @@ export default class BuildInternal extends EasCommand {
         },
       },
       actor,
-      getDynamicPrivateProjectConfigAsync
+      getDynamicProjectConfigAsync
     );
   }
 }

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

@@ -27,7 +27,6 @@ export default class BuildList extends EasCommand {
         BuildStatus.NEW,
         BuildStatus.IN_QUEUE,
         BuildStatus.IN_PROGRESS,
-        BuildStatus.PENDING_CANCEL,
         BuildStatus.ERRORED,
         BuildStatus.FINISHED,
         BuildStatus.CANCELED,
@@ -69,7 +68,7 @@ export default class BuildList extends EasCommand {
       'non-interactive': nonInteractive,
     } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildList, {
       nonInteractive,
@@ -124,8 +123,6 @@ const toGraphQLBuildStatus = (buildStatus?: BuildStatus): GraphQLBuildStatus | u
     return GraphQLBuildStatus.InQueue;
   } else if (buildStatus === BuildStatus.IN_PROGRESS) {
     return GraphQLBuildStatus.InProgress;
-  } else if (buildStatus === BuildStatus.PENDING_CANCEL) {
-    return GraphQLBuildStatus.PendingCancel;
   } else if (buildStatus === BuildStatus.ERRORED) {
     return GraphQLBuildStatus.Errored;
   } else if (buildStatus === BuildStatus.FINISHED) {

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

@@ -101,7 +101,7 @@ export default class BuildResign extends EasCommand {
 
     const {
       loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
       analytics,
     } = await this.getContextAsync(BuildResign, {
@@ -130,7 +130,7 @@ export default class BuildResign extends EasCommand {
       platform,
       flags.profile ?? 'production'
     );
-    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
+    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
     const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
     const build = await this.ensureBuildSelectedAsync(
       { graphqlClient, projectId, platform, nonInteractive, limit, offset },

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

@@ -81,7 +81,7 @@ export default class Run extends EasCommand {
     const queryOptions = getPaginatedQueryOptions(flags);
     const {
       loggedIn: { graphqlClient },
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
     } = await this.getContextAsync(Run, {
       nonInteractive: false,
     });
@@ -210,9 +210,8 @@ async function maybeGetBuildAsync(
       },
       paginatedQueryOptions,
       selectPromptDisabledFunction: build => !isRunnableOnSimulatorOrEmulator(build),
-      selectPromptWarningMessage: `Artifacts for this build have expired and are no longer available, or this is not ${
-        flags.selectedPlatform === AppPlatform.Ios ? 'a simulator' : 'an emulator'
-      } build.`,
+      selectPromptWarningMessage:
+        'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
     });
     return validateChosenBuild(build, flags.selectedPlatform);
   } else if (flags.runArchiveFlags.latest) {

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

@@ -47,7 +47,7 @@ export default class BuildVersionGetView extends EasCommand {
     }
     const {
       loggedIn: { graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
     } = await this.getContextAsync(BuildVersionGetView, {
       nonInteractive: true,
@@ -71,7 +71,7 @@ export default class BuildVersionGetView extends EasCommand {
     });
     const results: { [key in Platform]?: string } = {};
     for (const { profile, platform } of buildProfiles) {
-      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
+      const { exp, projectId } = await getDynamicProjectConfigAsync({
         env: profile.env,
       });
 

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

@@ -47,7 +47,7 @@ export default class BuildVersionSetView extends EasCommand {
     const { flags } = await this.parse(BuildVersionSetView);
     const {
       loggedIn: { graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
     } = await this.getContextAsync(BuildVersionSetView, {
       nonInteractive: false,
@@ -62,7 +62,7 @@ export default class BuildVersionSetView extends EasCommand {
       flags.profile ?? undefined
     );
 
-    const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: profile.env });
+    const { exp, projectId } = await getDynamicProjectConfigAsync({ env: profile.env });
     const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
 
     validateAppConfigForRemoteVersionSource(exp, platform);

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

@@ -64,7 +64,7 @@ export default class BuildVersionSyncView extends EasCommand {
     const { flags } = await this.parse(BuildVersionSyncView);
     const {
       loggedIn: { graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       projectDir,
     } = await this.getContextAsync(BuildVersionSyncView, {
       nonInteractive: true,
@@ -82,7 +82,7 @@ export default class BuildVersionSyncView extends EasCommand {
       profileName: flags.profile ?? undefined,
     });
     for (const profileInfo of buildProfiles) {
-      const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
+      const { exp, projectId } = await getDynamicProjectConfigAsync({
         env: profileInfo.profile.env,
       });
 

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

@@ -28,7 +28,7 @@ export default class BuildView extends EasCommand {
       flags,
     } = await this.parse(BuildView);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildView, {
       nonInteractive: true,

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

@@ -38,7 +38,7 @@ export default class ChannelCreate extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelCreate);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelCreate, {
       nonInteractive,

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

@@ -41,7 +41,7 @@ export default class ChannelDelete extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelDelete);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelDelete, {
       nonInteractive,

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

@@ -75,7 +75,7 @@ export default class ChannelEdit extends EasCommand {
       flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelEdit);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelEdit, {
       nonInteractive,

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

@@ -27,7 +27,7 @@ export default class ChannelList extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelList, {
       nonInteractive,

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

@@ -336,7 +336,7 @@ export default class ChannelRollout extends EasCommand {
       },
     } = await this.parse(ChannelRollout);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelRollout, {
       nonInteractive,

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

@@ -38,7 +38,7 @@ export default class ChannelView extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelView, {
       nonInteractive,

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

@@ -41,7 +41,7 @@ export default class Config extends EasCommand {
       enableJsonOutput();
     }
     const { platform: maybePlatform, profile: maybeProfile } = flags;
-    const { getDynamicPublicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
+    const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
       nonInteractive: false,
     });
 
@@ -82,8 +82,9 @@ export default class Config extends EasCommand {
         Log.log(JSON.stringify(profile, null, 2));
       }
     } else {
-      const { exp: appConfig } = await getDynamicPublicProjectConfigAsync({
+      const { exp: appConfig } = await getDynamicProjectConfigAsync({
         env: profile.env,
+        isPublicConfig: true,
       });
 
       if (flags.json) {

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

@@ -21,8 +21,8 @@ export default class Credentials extends EasCommand {
     const { flags } = await this.parse(Credentials);
     const {
       loggedIn: { actor, graphqlClient },
-      privateProjectConfig,
-      getDynamicPrivateProjectConfigAsync,
+      projectConfig,
+      getDynamicProjectConfigAsync,
       analytics,
     } = await this.getContextAsync(Credentials, {
       nonInteractive: false,
@@ -32,8 +32,8 @@ export default class Credentials extends EasCommand {
       actor,
       graphqlClient,
       analytics,
-      privateProjectConfig ?? null,
-      getDynamicPrivateProjectConfigAsync,
+      projectConfig ?? null,
+      getDynamicProjectConfigAsync,
       flags.platform
     ).runAsync();
   }

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

@@ -15,7 +15,7 @@ export default class DeviceCreate extends EasCommand {
     // this command is interactive by design
     const {
       loggedIn: { actor, graphqlClient },
-      privateProjectConfig,
+      projectConfig,
     } = await this.getContextAsync(DeviceCreate, {
       nonInteractive: false,
     });
@@ -24,7 +24,7 @@ export default class DeviceCreate extends EasCommand {
       appStore: new AppStoreApi(),
       user: actor,
       graphqlClient,
-      projectId: privateProjectConfig?.projectId,
+      projectId: projectConfig?.projectId,
     });
     const manager = new DeviceManager(ctx);
     await manager.createAsync();

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

@@ -43,7 +43,7 @@ export default class DeviceDelete extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(DeviceDelete, {
       nonInteractive: paginatedQueryOptions.nonInteractive,

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

@@ -29,7 +29,7 @@ export default class BuildList extends EasCommand {
     const { flags } = await this.parse(BuildList);
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildList, {
       nonInteractive: paginatedQueryOptions.nonInteractive,

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

@@ -44,7 +44,7 @@ export default class DeviceRename extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     let { 'apple-team-id': appleTeamIdentifier, udid, name } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(DeviceRename, {
       nonInteractive: paginatedQueryOptions.nonInteractive,

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

@@ -32,7 +32,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
       throw new Error('Device UDID is missing');
     }
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(DeviceView, {
       nonInteractive: true,

packages/eas-cli/src/commands/metadata/pull.ts

@@ -35,7 +35,7 @@ export default class MetadataPull extends EasCommand {
     const { flags } = await this.parse(MetadataPull);
     const {
       loggedIn: { actor, graphqlClient },
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
       analytics,
     } = await this.getContextAsync(MetadataPull, {
       nonInteractive: false,

packages/eas-cli/src/commands/metadata/push.ts

@@ -33,7 +33,7 @@ export default class MetadataPush extends EasCommand {
     const { flags } = await this.parse(MetadataPush);
     const {
       loggedIn: { actor, graphqlClient },
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
       analytics,
     } = await this.getContextAsync(MetadataPush, {
       nonInteractive: false,

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

@@ -16,7 +16,7 @@ export default class Open extends EasCommand {
   async runAsync(): Promise<void> {
     // this command is interactive by nature (only really run by humans in a terminal)
     const {
-      privateProjectConfig: { projectId, exp },
+      projectConfig: { projectId, exp },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(Open, {
       nonInteractive: false,

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

@@ -1,4 +1,4 @@
-import { AppJSONConfig, PackageJSONConfig, getConfig } from '@expo/config';
+import { AppJSONConfig, PackageJSONConfig, getConfig, modifyConfigAsync } from '@expo/config';
 import chalk from 'chalk';
 import { vol } from 'memfs';
 import { instance, mock } from 'ts-mockito';
@@ -12,17 +12,12 @@ import FeatureGating from '../../../commandUtils/gating/FeatureGating';
 import { jester, jester2 } from '../../../credentials/__tests__/fixtures-constants';
 import { AppMutation } from '../../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
-import { createOrModifyExpoConfigAsync } from '../../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { confirmAsync, promptAsync } from '../../../prompts';
 import ProjectInit from '../init';
 
 jest.mock('fs');
 jest.mock('@expo/config');
-jest.mock('../../../project/expoConfig', () => ({
-  ...jest.requireActual('../../../project/expoConfig'),
-  createOrModifyExpoConfigAsync: jest.fn(),
-}));
 jest.mock('../../../prompts');
 jest.mock('../../../user/actions');
 jest.mock('../../../graphql/mutations/AppMutation');
@@ -148,16 +143,13 @@ describe(ProjectInit.name, () => {
       });
 
       describe('force', () => {
-        beforeEach(() => {
+        it('does not prompt to overwrite when different', async () => {
           jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
             id: '1234',
             slug: 'testing-123',
             fullName: '@jester/testing-123',
             ownerAccount: jester.accounts[0],
           });
-        });
-
-        it('does not prompt to overwrite when different', async () => {
           await new ProjectInit(['--id', '12345', '--force'], {
             root: '/test-project',
           } as any).run();
@@ -191,7 +183,7 @@ describe(ProjectInit.name, () => {
           });
 
           await new ProjectInit(['--id', '1234'], commandOptions).run();
-          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
         });
 
         it('prompts to configure if not consistent', async () => {
@@ -203,20 +195,14 @@ describe(ProjectInit.name, () => {
           });
 
           jest.mocked(confirmAsync).mockResolvedValue(true);
-          jest
-            .mocked(createOrModifyExpoConfigAsync)
-            .mockResolvedValue({ type: 'success', config: {} as any });
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
           await new ProjectInit(['--id', '1234'], commandOptions).run();
 
           expect(confirmAsync).toHaveBeenCalled();
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            owner: 'jester2',
-          });
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            slug: 'testing-124',
-          });
+          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
         });
 
         it('overrides if force flag is present and it is not consistent', async () => {
@@ -227,20 +213,14 @@ describe(ProjectInit.name, () => {
             ownerAccount: jester2.accounts[0],
           });
 
-          jest
-            .mocked(createOrModifyExpoConfigAsync)
-            .mockResolvedValue({ type: 'success', config: {} as any });
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
           await new ProjectInit(['--id', '1234', '--force'], commandOptions).run();
 
           expect(confirmAsync).not.toHaveBeenCalled();
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            owner: 'jester2',
-          });
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            slug: 'testing-124',
-          });
+          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
         });
 
         it('throws if non-interactive is present and it is not consistent', async () => {
@@ -251,9 +231,7 @@ describe(ProjectInit.name, () => {
             ownerAccount: jester2.accounts[0],
           });
 
-          jest
-            .mocked(createOrModifyExpoConfigAsync)
-            .mockResolvedValue({ type: 'success', config: {} as any });
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
           await expect(
             new ProjectInit(['--id', '1234', '--non-interactive'], commandOptions).run()
@@ -262,7 +240,7 @@ describe(ProjectInit.name, () => {
           );
 
           expect(confirmAsync).not.toHaveBeenCalled();
-          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
         });
       });
     });
@@ -293,7 +271,7 @@ describe(ProjectInit.name, () => {
           });
 
           await new ProjectInit(['--id', '1234'], commandOptions).run();
-          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
         });
 
         it('prompts to configure if not consistent', async () => {
@@ -307,20 +285,14 @@ describe(ProjectInit.name, () => {
           });
 
           jest.mocked(confirmAsync).mockResolvedValue(true);
-          jest
-            .mocked(createOrModifyExpoConfigAsync)
-            .mockResolvedValue({ type: 'success', config: {} as any });
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
           await new ProjectInit(['--id', '1234'], commandOptions).run();
 
           expect(confirmAsync).toHaveBeenCalled();
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            owner: 'jester2',
-          });
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            slug: 'testing-124',
-          });
+          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
         });
 
         it('overrides if force flag is present and it is not consistent', async () => {
@@ -333,20 +305,14 @@ describe(ProjectInit.name, () => {
             ownerAccount: jester2.accounts[0],
           });
 
-          jest
-            .mocked(createOrModifyExpoConfigAsync)
-            .mockResolvedValue({ type: 'success', config: {} as any });
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
           await new ProjectInit(['--id', '1234', '--force'], commandOptions).run();
 
           expect(confirmAsync).not.toHaveBeenCalled();
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            owner: 'jester2',
-          });
-          expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-            slug: 'testing-124',
-          });
+          expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
+          expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
         });
 
         it('throws if non-interactive is present and it is not consistent', async () => {
@@ -359,9 +325,7 @@ describe(ProjectInit.name, () => {
             ownerAccount: jester2.accounts[0],
           });
 
-          jest
-            .mocked(createOrModifyExpoConfigAsync)
-            .mockResolvedValue({ type: 'success', config: {} as any });
+          jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
           await expect(
             new ProjectInit(['--id', '1234', '--non-interactive'], commandOptions).run()
@@ -370,7 +334,7 @@ describe(ProjectInit.name, () => {
           );
 
           expect(confirmAsync).not.toHaveBeenCalled();
-          expect(createOrModifyExpoConfigAsync).not.toHaveBeenCalled();
+          expect(modifyConfigAsync).not.toHaveBeenCalled();
         });
       });
     });
@@ -403,20 +367,14 @@ describe(ProjectInit.name, () => {
         });
 
         jest.mocked(confirmAsync).mockResolvedValue(true);
-        jest
-          .mocked(createOrModifyExpoConfigAsync)
-          .mockResolvedValue({ type: 'success', config: {} as any });
+        jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
 
         await new ProjectInit([], commandOptions).run();
 
         expect(confirmAsync).toHaveBeenCalled();
-        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledTimes(2);
-        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-          owner: 'jester2',
-        });
-        expect(createOrModifyExpoConfigAsync).toHaveBeenCalledWith('/test-project', {
-          slug: 'testing-124',
-        });
+        expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
+        expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
+        expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
       });
     });
 

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

@@ -43,7 +43,7 @@ export default class ProjectInfo extends EasCommand {
 
   async runAsync(): Promise<void> {
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ProjectInfo, {
       nonInteractive: true,

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

@@ -1,4 +1,4 @@
-import { getProjectConfigDescription } from '@expo/config';
+import { getProjectConfigDescription, modifyConfigAsync } from '@expo/config';
 import { ExpoConfig } from '@expo/config-types';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -13,7 +13,7 @@ import { AppMutation } from '../../graphql/mutations/AppMutation';
 import { AppQuery } from '../../graphql/queries/AppQuery';
 import Log, { link } from '../../log';
 import { ora } from '../../ora';
-import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../project/expoConfig';
+import { getExpoConfig } from '../../project/expoConfig';
 import { findProjectIdByAccountNameAndSlugNullableAsync } from '../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
 import { toAppPrivacy } from '../../project/projectUtils';
 import { confirmAsync, promptAsync } from '../../prompts';
@@ -60,7 +60,7 @@ export default class ProjectInit extends EasCommand {
     projectDir: string,
     modifications: Partial<ExpoConfig>
   ): Promise<void> {
-    const result = await createOrModifyExpoConfigAsync(projectDir, modifications);
+    const result = await modifyConfigAsync(projectDir, modifications);
     switch (result.type) {
       case 'success':
         break;
@@ -98,7 +98,7 @@ export default class ProjectInit extends EasCommand {
     projectDir: string,
     { force, nonInteractive }: InitializeMethodOptions
   ): Promise<void> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
     const appForProjectId = await AppQuery.byIdAsync(graphqlClient, projectId);
     const correctOwner = appForProjectId.ownerAccount.name;
     const correctSlug = appForProjectId.slug;
@@ -153,7 +153,7 @@ export default class ProjectInit extends EasCommand {
     projectDir: string,
     { force, nonInteractive }: InitializeMethodOptions
   ): Promise<void> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
     const existingProjectId = exp.extra?.eas?.projectId;
 
     if (projectId === existingProjectId) {
@@ -209,7 +209,7 @@ export default class ProjectInit extends EasCommand {
     actor: Actor,
     projectDir: string
   ): Promise<string> {
-    const exp = getPrivateExpoConfig(projectDir);
+    const exp = getExpoConfig(projectDir);
     const existingProjectId = exp.extra?.eas?.projectId;
 
     if (existingProjectId) {

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

@@ -66,7 +66,7 @@ export default class EnvironmentSecretCreate extends EasCommand {
       },
     } = await this.parse(EnvironmentSecretCreate);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(EnvironmentSecretCreate, {
       nonInteractive,

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

@@ -31,7 +31,7 @@ export default class EnvironmentSecretDelete extends EasCommand {
       flags: { id, 'non-interactive': nonInteractive },
     } = await this.parse(EnvironmentSecretDelete);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(EnvironmentSecretDelete, {
       nonInteractive,

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

@@ -19,7 +19,7 @@ export default class EnvironmentSecretList extends EasCommand {
 
   async runAsync(): Promise<void> {
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(EnvironmentSecretList, {
       nonInteractive: true,

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

@@ -51,7 +51,7 @@ export default class EnvironmentSecretPush extends EasCommand {
       flags: { scope, force, 'env-file': maybeEnvFilePath, 'non-interactive': nonInteractive },
     } = await this.parse(EnvironmentSecretPush);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(EnvironmentSecretPush, {
       nonInteractive,

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

@@ -100,7 +100,7 @@ export default class Submit extends EasCommand {
     const { flags: rawFlags } = await this.parse(Submit);
     const {
       loggedIn: { actor, graphqlClient },
-      privateProjectConfig: { exp, projectId, projectDir },
+      projectConfig: { exp, projectId, projectDir },
       analytics,
     } = await this.getContextAsync(Submit, {
       nonInteractive: false,

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

@@ -1,27 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { instance, mock } from 'ts-mockito';
-
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { ensureEASUpdateIsConfiguredAsync } from '../../../update/configure';
-
-describe(ensureEASUpdateIsConfiguredAsync, () => {
-  it('errors with "useClassicUpdates" set and no app.json', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
-    const exp: ExpoConfig = {
-      name: 'test',
-      slug: 'test',
-      updates: { useClassicUpdates: true },
-    };
-
-    await expect(async () => {
-      await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
-        exp,
-        projectId: 'test',
-        projectDir: '/tmp/test',
-        platform: null,
-      });
-    }).rejects.toThrow(
-      `Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "useClassicUpdates" from your app config and run this command again.`
-    );
-  });
-});

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

@@ -1,4 +1,11 @@
-import { AppJSONConfig, ExpoConfig, PackageJSONConfig, Platform, getConfig } from '@expo/config';
+import {
+  AppJSONConfig,
+  ExpoConfig,
+  GetConfigOptions,
+  PackageJSONConfig,
+  Platform,
+  getConfig,
+} from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
@@ -7,10 +14,7 @@ import { instance, mock } from 'ts-mockito';
 
 import UpdatePublish from '..';
 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import {
-  DynamicPrivateProjectConfigContextField,
-  DynamicPublicProjectConfigContextField,
-} from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
@@ -233,26 +237,22 @@ function mockTestProject({
 
   jest.mocked(getConfig).mockReturnValue(mockManifest as any);
   jest
-    .spyOn(DynamicPrivateProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = { ...mockManifest.exp };
-      return {
-        exp,
-        projectDir: projectRoot,
-        projectId: configuredProjectId,
-      };
-    });
-  jest
-    .spyOn(DynamicPublicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = {
-        name: mockManifest.exp.name,
-        version: mockManifest.exp.version,
-        slug: mockManifest.exp.slug,
-        sdkVersion: mockManifest.exp.sdkVersion,
-        owner: mockManifest.exp.owner,
-        extra: mockManifest.exp.extra,
-      };
+    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async (options?: GetConfigOptions) => {
+      let exp = { ...mockManifest.exp };
+
+      // Fake a limited public config
+      if (options?.isPublicConfig) {
+        exp = {
+          name: mockManifest.exp.name,
+          version: mockManifest.exp.version,
+          slug: mockManifest.exp.slug,
+          sdkVersion: mockManifest.exp.sdkVersion,
+          owner: mockManifest.exp.owner,
+          extra: mockManifest.exp.extra,
+        };
+      }
+
       return {
         exp,
         projectDir: projectRoot,

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

@@ -3,7 +3,7 @@ import { vol } from 'memfs';
 import { instance, mock } from 'ts-mockito';
 
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
-import { PrivateProjectConfigContextField } from '../../../commandUtils/context/PrivateProjectConfigContextField';
+import ProjectConfigContextField from '../../../commandUtils/context/ProjectConfigContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
 import FeatureGating from '../../../commandUtils/gating/FeatureGating';
@@ -324,7 +324,7 @@ function mockTestProject({
   const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
 
   jest.mocked(getConfig).mockReturnValue(mockManifest as any);
-  jest.spyOn(PrivateProjectConfigContextField.prototype, 'getValueAsync').mockResolvedValue({
+  jest.spyOn(ProjectConfigContextField.prototype, 'getValueAsync').mockResolvedValue({
     exp: mockManifest.exp,
     projectDir: projectRoot,
     projectId: configuredProjectId,

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

@@ -1,4 +1,10 @@
-import { AppJSONConfig, ExpoConfig, PackageJSONConfig, getConfig } from '@expo/config';
+import {
+  AppJSONConfig,
+  ExpoConfig,
+  GetConfigOptions,
+  PackageJSONConfig,
+  getConfig,
+} from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
 import nullthrows from 'nullthrows';
@@ -6,10 +12,7 @@ import path from 'path';
 import { instance, mock } from 'ts-mockito';
 
 import { ensureBranchExistsAsync } from '../../../branch/queries';
-import {
-  DynamicPrivateProjectConfigContextField,
-  DynamicPublicProjectConfigContextField,
-} from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
 import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
 import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
 import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
@@ -214,26 +217,22 @@ function mockTestProject({
 
   jest.mocked(getConfig).mockReturnValue(mockManifest as any);
   jest
-    .spyOn(DynamicPrivateProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = { ...mockManifest.exp };
-      return {
-        exp,
-        projectDir: projectRoot,
-        projectId: configuredProjectId,
-      };
-    });
-  jest
-    .spyOn(DynamicPublicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => {
-      const exp = {
-        name: mockManifest.exp.name,
-        version: mockManifest.exp.version,
-        slug: mockManifest.exp.slug,
-        sdkVersion: mockManifest.exp.sdkVersion,
-        owner: mockManifest.exp.owner,
-        extra: mockManifest.exp.extra,
-      };
+    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async (options?: GetConfigOptions) => {
+      let exp = { ...mockManifest.exp };
+
+      // Fake a limited public config
+      if (options?.isPublicConfig) {
+        exp = {
+          name: mockManifest.exp.name,
+          version: mockManifest.exp.version,
+          slug: mockManifest.exp.slug,
+          sdkVersion: mockManifest.exp.sdkVersion,
+          owner: mockManifest.exp.owner,
+          extra: mockManifest.exp.extra,
+        };
+      }
+
       return {
         exp,
         projectDir: projectRoot,

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

@@ -1,16 +1,14 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { easJsonExistsAsync } from '../../build/configure';
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASNonInteractiveFlag } from '../../commandUtils/flags';
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import { RequestedPlatform } from '../../platform';
 import {
   ensureEASUpdateIsConfiguredAsync,
   ensureEASUpdateIsConfiguredInEasJsonAsync,
 } from '../../update/configure';
-import { getVcsClient } from '../../vcs';
 
 export default class UpdateConfigure extends EasCommand {
   static override description = 'configure the project to support EAS Update';
@@ -34,18 +32,16 @@ export default class UpdateConfigure extends EasCommand {
     const { flags } = await this.parse(UpdateConfigure);
     const platform = flags.platform as RequestedPlatform;
     const {
-      privateProjectConfig: { projectId, exp, projectDir },
+      projectConfig: { projectId, exp, projectDir },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(UpdateConfigure, {
       nonInteractive: flags['non-interactive'],
     });
 
     Log.log(
-      '💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
+      '💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    await getVcsClient().ensureRepoExistsAsync();
-
     await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
       exp,
       projectId,
@@ -56,16 +52,23 @@ export default class UpdateConfigure extends EasCommand {
     await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
 
     Log.addNewLineIfNone();
-    Log.log(`🎉 Your app is configured to use EAS Update!`);
+    Log.log(`🎉 Your app is configured with EAS Update!`);
     Log.newLine();
-    const easJsonExists = await easJsonExistsAsync(projectDir);
-    if (!easJsonExists) {
-      Log.log(`- Run ${chalk.bold('eas build:configure')} to complete your installation`);
-    }
+    Log.log(`${chalk.bold('Next steps')}:`);
+    Log.newLine();
+    Log.log('Update a production build:');
+    Log.log(`1. Create a new build. Example: ${chalk.bold('eas build --profile production')}.`);
+    Log.log('2. Make changes in your project.');
+    Log.log(`3. Publish an update. Example: ${chalk.bold('eas update --channel production')}.`);
+    Log.log('4. Force close and reopen the app at least twice to view the update.');
+
+    Log.newLine();
+    Log.log('Preview an update:');
     Log.log(
-      `- ${learnMore('https://docs.expo.dev/eas-update/introduction/', {
-        learnMoreMessage: 'Learn more about other capabilities of EAS Update',
-      })}`
+      `1. Publish an update to a branch. Example: ${chalk.bold('eas update --branch new-feature')}.`
+    );
+    Log.log(
+      '2. In Expo Go or a development build, navigate to Projects > [project name] > Branch > Open.'
     );
   }
 }

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

@@ -23,7 +23,6 @@ import { RequestedPlatform } from '../../platform';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import {
   ExpoCLIExportPlatformFlag,
-  RawAsset,
   buildBundlesAsync,
   buildUnsortedUpdateInfoGroupAsync,
   collectAssetsAsync,
@@ -46,7 +45,6 @@ import {
   getManifestBodyAsync,
   signBody,
 } from '../../utils/code-signing';
-import areSetsEqual from '../../utils/expodash/areSetsEqual';
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
@@ -98,7 +96,6 @@ export default class UpdatePublish extends EasCommand {
       required: false,
     }),
     message: Flags.string({
-      char: 'm',
       description: 'A short message describing the update',
       required: false,
     }),
@@ -168,8 +165,7 @@ export default class UpdatePublish extends EasCommand {
     } = this.sanitizeFlags(rawFlags);
 
     const {
-      getDynamicPublicProjectConfigAsync,
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(UpdatePublish, {
       nonInteractive,
@@ -183,7 +179,9 @@ export default class UpdatePublish extends EasCommand {
       exp: expPossiblyWithoutEasUpdateConfigured,
       projectId,
       projectDir,
-    } = await getDynamicPublicProjectConfigAsync();
+    } = await getDynamicProjectConfigAsync({
+      isPublicConfig: true,
+    });
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
@@ -194,8 +192,10 @@ export default class UpdatePublish extends EasCommand {
       projectId,
     });
 
-    const { exp } = await getDynamicPublicProjectConfigAsync();
-    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
+    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
+    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
+      isPublicConfig: false,
+    });
     const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
 
     const branchName = await getBranchNameForCommandAsync({
@@ -241,58 +241,14 @@ export default class UpdatePublish extends EasCommand {
       const assets = filterExportedPlatformsByFlag(collectedAssets, platformFlag);
       realizedPlatforms = Object.keys(assets) as PublishPlatform[];
 
-      // Timeout mechanism:
-      // - Start with 60 second timeout. 60 seconds is chosen because the cloud function that processes
-      //   uploaded assets has a timeout of 60 seconds.
-      // - Each time one or more assets reports as ready, reset the timeout to 60 seconds.
-      // - Start upload. Internally, uploadAssetsAsync uploads them all and then checks for successful
-      //   processing every (5 + n) seconds with a linear backoff of n + 1 second.
-      // - At the same time as upload is started, start timeout checker which checks every 1 second to see
-      //   if timeout has been reached. When timeout expires, send a cancellation signal to currently running
-      //   upload function call to instruct it to stop uploading or checking for successful processing.
-      let lastUploadedStorageKeys = new Set<string>();
-      let lastAssetUploadResults: {
-        asset: RawAsset & { storageKey: string };
-        finished: boolean;
-      }[] = [];
-      let timeAtWhichToTimeout = Date.now() + 60 * 1000; // sixty seconds from now
-      const cancelationToken = { isCanceledOrFinished: false };
-
-      const uploadResults = await Promise.race([
-        uploadAssetsAsync(
-          graphqlClient,
-          assets,
-          projectId,
-          cancelationToken,
-          assetUploadResults => {
-            const currentUploadedStorageKeys = new Set(
-              assetUploadResults.filter(r => r.finished).map(r => r.asset.storageKey)
-            );
-            if (!areSetsEqual(currentUploadedStorageKeys, lastUploadedStorageKeys)) {
-              timeAtWhichToTimeout = Date.now() + 60 * 1000; // reset timeout to sixty seconds from now
-              lastUploadedStorageKeys = currentUploadedStorageKeys;
-              lastAssetUploadResults = assetUploadResults;
-            }
-
-            const totalAssets = assetUploadResults.length;
-            const missingAssetCount = assetUploadResults.filter(a => !a.finished).length;
-            assetSpinner.text = `Uploading (${totalAssets - missingAssetCount}/${totalAssets})`;
-          }
-        ),
-        (async () => {
-          while (Date.now() < timeAtWhichToTimeout) {
-            if (cancelationToken.isCanceledOrFinished) {
-              break;
-            }
-            await new Promise(res => setTimeout(res, 1000)); // wait 1 second
-          }
-          cancelationToken.isCanceledOrFinished = true;
-          const timedOutAssets = lastAssetUploadResults
-            .filter(r => !r.finished)
-            .map(r => `\n- ${r.asset.originalPath ?? r.asset.path}`);
-          throw new Error(`Asset processing timed out for assets: ${timedOutAssets}`);
-        })(),
-      ]);
+      const uploadResults = await uploadAssetsAsync(
+        graphqlClient,
+        assets,
+        projectId,
+        (totalAssets, missingAssets) => {
+          assetSpinner.text = `Uploading (${totalAssets - missingAssets}/${totalAssets})`;
+        }
+      );
 
       uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
       assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;

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

@@ -41,7 +41,7 @@ export default class UpdateList extends EasCommand {
     const { flags } = await this.parse(UpdateList);
     const { branch: branchFlag, all, json: jsonFlag, 'non-interactive': nonInteractive } = flags;
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(UpdateList, {
       nonInteractive,

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

@@ -72,7 +72,6 @@ export default class UpdateRepublish extends EasCommand {
       exclusive: ['branch', 'channel'],
     }),
     message: Flags.string({
-      char: 'm',
       description: 'Short message describing the republished update',
       required: false,
     }),
@@ -95,7 +94,7 @@ export default class UpdateRepublish extends EasCommand {
     const flags = this.sanitizeFlags(rawFlags);
 
     const {
-      privateProjectConfig: { exp, projectId },
+      projectConfig: { exp, projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(UpdateRepublish, {
       nonInteractive: flags.nonInteractive,

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

@@ -122,8 +122,7 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
     } = this.sanitizeFlags(rawFlags);
 
     const {
-      getDynamicPublicProjectConfigAsync,
-      getDynamicPrivateProjectConfigAsync,
+      getDynamicProjectConfigAsync,
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(UpdateRollBackToEmbedded, {
       nonInteractive,
@@ -137,7 +136,9 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
       exp: expPossiblyWithoutEasUpdateConfigured,
       projectId,
       projectDir,
-    } = await getDynamicPublicProjectConfigAsync();
+    } = await getDynamicProjectConfigAsync({
+      isPublicConfig: true,
+    });
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
@@ -148,8 +149,10 @@ export default class UpdateRollBackToEmbedded extends EasCommand {
       projectId,
     });
 
-    const { exp } = await getDynamicPublicProjectConfigAsync();
-    const { exp: expPrivate } = await getDynamicPrivateProjectConfigAsync();
+    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
+    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
+      isPublicConfig: false,
+    });
     const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
 
     const branchName = await getBranchNameForCommandAsync({

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

@@ -33,7 +33,7 @@ export default class WebhookCreate extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(WebhookCreate);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(WebhookCreate, {
       nonInteractive: flags['non-interactive'],

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

@@ -39,7 +39,7 @@ export default class WebhookDelete extends EasCommand {
       flags: { 'non-interactive': nonInteractive },
     } = await this.parse(WebhookDelete);
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(WebhookDelete, {
       nonInteractive,

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

@@ -36,7 +36,7 @@ export default class WebhookList extends EasCommand {
     }
 
     const {
-      privateProjectConfig: { projectId },
+      projectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(WebhookList, {
       nonInteractive: true,

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

@@ -151,7 +151,6 @@ export function getNewAndroidApiMock(): { [key in keyof typeof AndroidGraphqlCli
     updateAndroidAppCredentialsAsync: jest.fn(),
     updateAndroidAppBuildCredentialsAsync: jest.fn(),
     createAndroidAppBuildCredentialsAsync: jest.fn(),
-    setDefaultAndroidAppBuildCredentialsAsync: jest.fn(),
     getDefaultAndroidAppBuildCredentialsAsync: jest.fn(),
     getAndroidAppBuildCredentialsByNameAsync: jest.fn(),
     createOrUpdateAndroidAppBuildCredentialsByNameAsync: jest.fn(),

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

@@ -146,16 +146,6 @@ export async function updateAndroidAppBuildCredentialsAsync(
   );
 }
 
-export async function setDefaultAndroidAppBuildCredentialsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildCredentials: AndroidAppBuildCredentialsFragment
-): Promise<AndroidAppBuildCredentialsFragment> {
-  return await AndroidAppBuildCredentialsMutation.setDefaultAndroidAppBuildCredentialsAsync(
-    graphqlClient,
-    buildCredentials.id
-  );
-}
-
 export async function createAndroidAppBuildCredentialsAsync(
   graphqlClient: ExpoGraphqlClient,
   appLookupParams: AppLookupParams,
@@ -174,6 +164,14 @@ export async function createAndroidAppBuildCredentialsAsync(
       graphqlClient,
       appLookupParams
     );
+  const buildCredentialsList = androidAppCredentials.androidAppBuildCredentialsList;
+  const existingDefaultBuildCredentials =
+    buildCredentialsList.find(buildCredentials => buildCredentials.isDefault) ?? null;
+  if (existingDefaultBuildCredentials && isDefault) {
+    throw new Error(
+      'Cannot create new default Android Build Credentials. A set of default credentials exists already.'
+    );
+  }
 
   return await AndroidAppBuildCredentialsMutation.createAndroidAppBuildCredentialsAsync(
     graphqlClient,

packages/eas-cli/src/credentials/android/api/graphql/mutations/AndroidAppBuildCredentialsMutation.ts

@@ -5,7 +5,6 @@ import gql from 'graphql-tag';
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
-  AndroidAppBuildCredentials,
   AndroidAppBuildCredentialsFragment,
   AndroidAppBuildCredentialsInput,
   CreateAndroidAppBuildCredentialsMutation,
@@ -56,37 +55,6 @@ export const AndroidAppBuildCredentialsMutation = {
     );
     return data.androidAppBuildCredentials.createAndroidAppBuildCredentials;
   },
-  async setDefaultAndroidAppBuildCredentialsAsync(
-    graphqlClient: ExpoGraphqlClient,
-    androidAppBuildCredentialsId: string
-  ): Promise<AndroidAppBuildCredentialsFragment> {
-    const data = await withErrorHandlingAsync(
-      graphqlClient
-        .mutation<AndroidAppBuildCredentials>(
-          gql`
-            mutation AndroidAppBuildCredentialsMutation(
-              $androidAppBuildCredentialsId: ID!
-              $isDefault: Boolean!
-            ) {
-              androidAppBuildCredentials {
-                setDefault(id: $androidAppBuildCredentialsId, isDefault: $isDefault) {
-                  id
-                  ...AndroidAppBuildCredentialsFragment
-                }
-              }
-            }
-            ${print(AndroidAppBuildCredentialsFragmentNode)}
-          `,
-          {
-            androidAppBuildCredentialsId,
-            isDefault: true,
-          }
-        )
-        .toPromise()
-    );
-    assert(data, `GraphQL: 'setDefault' not defined in server response ${JSON.stringify(data)}}`);
-    return data;
-  },
   async setKeystoreAsync(
     graphqlClient: ExpoGraphqlClient,
     androidAppBuildCredentialsId: string,

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

@@ -6,7 +6,7 @@ import chalk from 'chalk';
 import { Analytics } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import Log from '../log';
-import { getPrivateExpoConfig } from '../project/expoConfig';
+import { getExpoConfig } from '../project/expoConfig';
 import { confirmAsync } from '../prompts';
 import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
@@ -56,6 +56,18 @@ export class CredentialsContext {
     this.projectInfo = options.projectInfo;
   }
 
+  static getExpoConfigInProject(
+    projectDir: string,
+    { env }: { env?: Env } = {}
+  ): ExpoConfig | null {
+    try {
+      return getExpoConfig(projectDir, { env });
+    } catch {
+      // ignore error, context might be created outside of expo project
+      return null;
+    }
+  }
+
   get hasProjectContext(): boolean {
     return !!this.projectInfo;
   }
@@ -75,7 +87,7 @@ export class CredentialsContext {
       return;
     }
     // trigger getConfig error
-    getPrivateExpoConfig(this.options.projectDir);
+    getExpoConfig(this.options.projectDir);
   }
 
   async bestEffortAppStoreAuthenticateAsync(): Promise<void> {

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

@@ -169,4 +169,8 @@ describe(syncCapabilityIdentifiersForEntitlementsAsync, () => {
       })
     ).rejects.toThrow(/is not available. Enter a different string/);
   });
+
+  it(`ignores capabilities from "/ios" folder when gitignored`, async () => {
+    //
+  });
 });

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

@@ -513,20 +513,6 @@ export const CapabilityMapping: CapabilityClassifier[] = [
     validateOptions: createValidateStringArrayOptions(['app-usage', 'system-installation']),
     getOptions: getDefinedOptions,
   },
-  {
-    name: 'Apple Pay Later Merchandising',
-    entitlement: 'com.apple.developer.pay-later-merchandising',
-    capability: CapabilityType.APPLE_PAY_LATER_MERCHANDISING,
-    validateOptions: createValidateStringArrayOptions(['payinfour-merchandising']),
-    getOptions: getDefinedOptions,
-  },
-  {
-    name: 'Sensitive Content Analysis',
-    entitlement: 'com.apple.developer.sensitivecontentanalysis.client',
-    capability: CapabilityType.SENSITIVE_CONTENT_ANALYSIS,
-    validateOptions: createValidateStringArrayOptions(['analysis']),
-    getOptions: getDefinedOptions,
-  },
   {
     // Not in Xcode
     // https://developer-mdn.apple.com/documentation/devicecheck/preparing_to_use_the_app_attest_service
@@ -712,36 +698,6 @@ export const CapabilityMapping: CapabilityClassifier[] = [
     validateOptions: validateBooleanOptions,
     getOptions: getBooleanOptions,
   },
-  {
-    entitlement: 'com.apple.developer.shared-with-you.collaboration',
-    name: 'Messages Collaboration',
-    capability: CapabilityType.MESSAGES_COLLABORATION,
-    validateOptions: validateBooleanOptions,
-    getOptions: getBooleanOptions,
-  },
-  {
-    entitlement: 'com.apple.developer.submerged-shallow-depth-and-pressure',
-    name: 'Shallow Depth and Pressure',
-    capability: CapabilityType.SHALLOW_DEPTH_PRESSURE,
-    validateOptions: validateBooleanOptions,
-    getOptions: getBooleanOptions,
-  },
-  {
-    entitlement: 'com.apple.developer.proximity-reader.identity.display',
-    name: 'Tap to Present ID on iPhone (Display Only)',
-    capability: CapabilityType.TAP_TO_DISPLAY_ID,
-    validateOptions: validateBooleanOptions,
-    getOptions: getBooleanOptions,
-  },
-  {
-    entitlement: 'com.apple.developer.matter.allow-setup-payload',
-    name: 'Matter Allow Setup Payload',
-    capability: CapabilityType.MATTER_ALLOW_SETUP_PAYLOAD,
-    validateOptions: validateBooleanOptions,
-    getOptions: getBooleanOptions,
-  },
-
-  // VMNET
 
   // These don't appear to have entitlements, so it's unclear how we can automatically enable / disable them at this time.
   // TODO: Maybe add a warning about manually enabling features?

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

@@ -18,7 +18,6 @@ export enum AndroidActionType {
   GoBackToCaller,
   GoBackToHighLevelActions,
   CreateKeystore,
-  SetDefaultKeystore,
   DownloadKeystore,
   RemoveKeystore,
   CreateFcm,

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

@@ -52,11 +52,6 @@ export const buildCredentialsActions: ActionInfo[] = [
     title: 'Set up a new keystore',
     scope: Scope.Project,
   },
-  {
-    value: AndroidActionType.SetDefaultKeystore,
-    title: 'Change default keystore',
-    scope: Scope.Project,
-  },
   {
     value: AndroidActionType.DownloadKeystore,
     title: 'Download existing keystore',

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

@@ -1,42 +0,0 @@
-import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
-import Log from '../../log';
-import { confirmAsync } from '../../prompts';
-import { promptForNameAsync } from '../android/actions/BuildCredentialsUtils';
-import { CreateKeystore } from '../android/actions/CreateKeystore';
-import { AppLookupParams } from '../android/api/GraphqlClient';
-import { CredentialsContext } from '../context';
-
-export class CreateAndroidBuildCredentials {
-  constructor(private app: AppLookupParams) {}
-
-  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment> {
-    const name = await promptForNameAsync();
-
-    const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(
-      ctx.graphqlClient,
-      this.app
-    );
-
-    let isDefault = true;
-    if (buildCredentialsList.length > 0) {
-      isDefault = await confirmAsync({
-        message: 'Do you want to set this as your default build credentials?',
-        initial: false,
-      });
-    }
-
-    const keystore = await new CreateKeystore(this.app.account).runAsync(ctx);
-    const createAndroidCredentials = await ctx.android.createAndroidAppBuildCredentialsAsync(
-      ctx.graphqlClient,
-      this.app,
-      {
-        name,
-        isDefault,
-        androidKeystoreId: keystore.id,
-      }
-    );
-
-    Log.succeed(`Created Android build credentials ${createAndroidCredentials.name}`);
-    return createAndroidCredentials;
-  }
-}

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

@@ -11,7 +11,7 @@ export interface Action<T = void> {
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
   projectInfo: CredentialsContextProjectInfo | null;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
   runAsync(ctx: CredentialsContext): Promise<T>;
 }
 

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

@@ -14,6 +14,7 @@ import {
 } from '../android/actions/BuildCredentialsUtils';
 import { CreateFcm } from '../android/actions/CreateFcm';
 import { CreateGoogleServiceAccountKey } from '../android/actions/CreateGoogleServiceAccountKey';
+import { CreateKeystore } from '../android/actions/CreateKeystore';
 import { DownloadKeystore } from '../android/actions/DownloadKeystore';
 import { RemoveFcm } from '../android/actions/RemoveFcm';
 import { SelectAndRemoveGoogleServiceAccountKey } from '../android/actions/RemoveGoogleServiceAccountKey';
@@ -35,11 +36,13 @@ import {
   gsaKeyActions,
   highLevelActions,
 } from './AndroidActions';
-import { CreateAndroidBuildCredentials } from './CreateAndroidBuildCredentials';
 import { Action, PressAnyKeyToContinue } from './HelperActions';
-import { SelectExistingAndroidBuildCredentials } from './SelectAndroidBuildCredentials';
+import {
+  SelectAndroidBuildCredentials,
+  SelectAndroidBuildCredentialsResultType,
+  SelectExistingAndroidBuildCredentials,
+} from './SelectAndroidBuildCredentials';
 import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
-import { SetDefaultAndroidKeystore } from './SetDefaultAndroidKeystore';
 
 export class ManageAndroid {
   constructor(private callingAction: Action, private projectDir: string) {}
@@ -51,7 +54,7 @@ export class ManageAndroid {
       : null;
     let projectInfo: CredentialsContextProjectInfo | null = null;
     if (hasProjectContext) {
-      const { exp, projectId } = await this.callingAction.getDynamicPrivateProjectConfigAsync({
+      const { exp, projectId } = await this.callingAction.getDynamicProjectConfigAsync({
         env: buildProfile?.env,
       });
       projectInfo = { exp, projectId };
@@ -160,9 +163,31 @@ export class ManageAndroid {
     );
     const appLookupParams = await getAppLookupParamsFromContextAsync(ctx, gradleContext);
     if (action === AndroidActionType.CreateKeystore) {
-      await new CreateAndroidBuildCredentials(appLookupParams).runAsync(ctx);
-    } else if (action === AndroidActionType.SetDefaultKeystore) {
-      await new SetDefaultAndroidKeystore(appLookupParams).runAsync(ctx);
+      const selectBuildCredentialsResult = await new SelectAndroidBuildCredentials(
+        appLookupParams
+      ).runAsync(ctx);
+      const keystore = await new CreateKeystore(appLookupParams.account).runAsync(ctx);
+      if (
+        selectBuildCredentialsResult.resultType ===
+        SelectAndroidBuildCredentialsResultType.CREATE_REQUEST
+      ) {
+        await ctx.android.createAndroidAppBuildCredentialsAsync(
+          ctx.graphqlClient,
+          appLookupParams,
+          {
+            ...selectBuildCredentialsResult.result,
+            androidKeystoreId: keystore.id,
+          }
+        );
+      } else {
+        await ctx.android.updateAndroidAppBuildCredentialsAsync(
+          ctx.graphqlClient,
+          selectBuildCredentialsResult.result,
+          {
+            androidKeystoreId: keystore.id,
+          }
+        );
+      }
     } else if (action === AndroidActionType.DownloadKeystore) {
       const buildCredentials = await new SelectExistingAndroidBuildCredentials(
         appLookupParams

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

@@ -64,7 +64,7 @@ export class ManageIos {
 
     let projectInfo: CredentialsContextProjectInfo | null = null;
     if (this.callingAction.projectInfo) {
-      const { exp, projectId } = await this.callingAction.getDynamicPrivateProjectConfigAsync({
+      const { exp, projectId } = await this.callingAction.getDynamicProjectConfigAsync({
         env: buildProfile?.env,
       });
       projectInfo = { exp, projectId };

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

@@ -13,7 +13,7 @@ export class SelectPlatform {
     public readonly graphqlClient: ExpoGraphqlClient,
     public readonly analytics: Analytics,
     public readonly projectInfo: CredentialsContextProjectInfo | null,
-    public readonly getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn,
+    public readonly getDynamicProjectConfigAsync: DynamicConfigContextFn,
     private readonly flagPlatform?: string
   ) {}
 

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

@@ -1,45 +0,0 @@
-import { AndroidAppBuildCredentialsFragment } from '../../graphql/generated';
-import Log from '../../log';
-import { promptAsync } from '../../prompts';
-import { sortBuildCredentials } from '../android/actions/BuildCredentialsUtils';
-import { AppLookupParams } from '../android/api/GraphqlClient';
-import { CredentialsContext } from '../context';
-
-export class SetDefaultAndroidKeystore {
-  constructor(private app: AppLookupParams) {}
-
-  async runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | undefined> {
-    const buildCredentialsList = await ctx.android.getAndroidAppBuildCredentialsListAsync(
-      ctx.graphqlClient,
-      this.app
-    );
-    if (buildCredentialsList.length === 0) {
-      Log.log(`You don't have any Android build credentials`);
-      return;
-    }
-    const sortedBuildCredentialsList = sortBuildCredentials(buildCredentialsList);
-    const sortedBuildCredentialsChoices = sortedBuildCredentialsList.map(buildCredentials => ({
-      title: buildCredentials.isDefault
-        ? `${buildCredentials.name} (Default)`
-        : buildCredentials.name,
-      value: buildCredentials,
-    }));
-
-    const { buildCredentialsResult } = await promptAsync({
-      type: 'select',
-      name: 'buildCredentialsResult',
-      message: 'Select build credentials',
-      choices: [...sortedBuildCredentialsChoices, { title: 'Cancel', value: null }],
-    });
-
-    if (!buildCredentialsResult?.androidKeystore) {
-      return;
-    }
-
-    Log.log('Updating the default build credentials for this project...');
-    return await ctx.android.setDefaultAndroidAppBuildCredentialsAsync(ctx.graphqlClient, {
-      ...buildCredentialsResult,
-      isDefault: true,
-    });
-  }
-}

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

@@ -6,16 +6,7 @@ export async function withErrorHandlingAsync<T>(promise: Promise<OperationResult
   const { data, error } = await promise;
 
   if (error) {
-    if (
-      error.graphQLErrors.some(
-        e =>
-          e?.extensions?.isTransient &&
-          ![
-            'EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED',
-            'EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED',
-          ].includes(e?.extensions?.errorCode as string)
-      )
-    ) {
+    if (error.graphQLErrors.some(e => e?.extensions?.isTransient)) {
       Log.error(`We've encountered a transient error. Try again shortly.`);
     }
     throw error;

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

@@ -759,8 +759,6 @@ export type AndroidAppCredentialsMutation = {
   __typename?: 'AndroidAppCredentialsMutation';
   /** Create a set of credentials for an Android app */
   createAndroidAppCredentials: AndroidAppCredentials;
-  /** Delete a set of credentials for an Android app */
-  deleteAndroidAppCredentials: DeleteAndroidAppCredentialsResult;
   /** Set the FCM push key to be used in an Android app */
   setFcm: AndroidAppCredentials;
   /** Set the Google Service Account Key to be used for submitting an Android app */
@@ -775,11 +773,6 @@ export type AndroidAppCredentialsMutationCreateAndroidAppCredentialsArgs = {
 };
 
 
-export type AndroidAppCredentialsMutationDeleteAndroidAppCredentialsArgs = {
-  id: Scalars['ID'];
-};
-
-
 export type AndroidAppCredentialsMutationSetFcmArgs = {
   fcmId: Scalars['ID'];
   id: Scalars['ID'];
@@ -1026,8 +1019,6 @@ export type App = Project & {
   /** @deprecated No longer supported */
   iconUrl?: Maybe<Scalars['String']>;
   id: Scalars['ID'];
-  /** App query field for querying EAS Insights about this app */
-  insights: AppInsights;
   /** iOS app credentials for the project */
   iosAppCredentials: Array<IosAppCredentials>;
   /** Whether the latest classic update publish is using a deprecated SDK version */
@@ -1164,7 +1155,6 @@ export type AppBuildsPaginatedArgs = {
 export type AppChannelsPaginatedArgs = {
   after?: InputMaybe<Scalars['String']>;
   before?: InputMaybe<Scalars['String']>;
-  filter?: InputMaybe<ChannelFilterInput>;
   first?: InputMaybe<Scalars['Int']>;
   last?: InputMaybe<Scalars['Int']>;
 };
@@ -1362,29 +1352,6 @@ export type AppInput = {
   projectName: Scalars['String'];
 };
 
-export type AppInsights = {
-  __typename?: 'AppInsights';
-  hasEventsFromExpoInsightsClientModule: Scalars['Boolean'];
-  totalUniqueUsers?: Maybe<Scalars['Int']>;
-  uniqueUsersByAppVersionOverTime: UniqueUsersOverTimeData;
-  uniqueUsersByPlatformOverTime: UniqueUsersOverTimeData;
-};
-
-
-export type AppInsightsTotalUniqueUsersArgs = {
-  timespan: InsightsTimespan;
-};
-
-
-export type AppInsightsUniqueUsersByAppVersionOverTimeArgs = {
-  timespan: InsightsTimespan;
-};
-
-
-export type AppInsightsUniqueUsersByPlatformOverTimeArgs = {
-  timespan: InsightsTimespan;
-};
-
 export type AppMutation = {
   __typename?: 'AppMutation';
   /** Create an unpublished app */
@@ -1982,43 +1949,6 @@ export enum AuthProtocolType {
   Oidc = 'OIDC'
 }
 
-export type BackgroundJobReceipt = {
-  __typename?: 'BackgroundJobReceipt';
-  account: Account;
-  createdAt: Scalars['DateTime'];
-  errorCode?: Maybe<Scalars['String']>;
-  errorMessage?: Maybe<Scalars['String']>;
-  id: Scalars['ID'];
-  resultId?: Maybe<Scalars['ID']>;
-  resultType: BackgroundJobResultType;
-  state: BackgroundJobState;
-  tries: Scalars['Int'];
-  updatedAt: Scalars['DateTime'];
-  willRetry: Scalars['Boolean'];
-};
-
-export type BackgroundJobReceiptQuery = {
-  __typename?: 'BackgroundJobReceiptQuery';
-  /** Look up background job receipt by ID */
-  byId: BackgroundJobReceipt;
-};
-
-
-export type BackgroundJobReceiptQueryByIdArgs = {
-  id: Scalars['ID'];
-};
-
-export enum BackgroundJobResultType {
-  GithubBuild = 'GITHUB_BUILD'
-}
-
-export enum BackgroundJobState {
-  Failure = 'FAILURE',
-  InProgress = 'IN_PROGRESS',
-  Queued = 'QUEUED',
-  Success = 'SUCCESS'
-}
-
 export type Billing = {
   __typename?: 'Billing';
   /** History of invoices */
@@ -2042,7 +1972,6 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
   __typename?: 'Build';
   activityTimestamp: Scalars['DateTime'];
   actor?: Maybe<Actor>;
-  app: App;
   appBuildVersion?: Maybe<Scalars['String']>;
   appVersion?: Maybe<Scalars['String']>;
   artifacts?: Maybe<BuildArtifacts>;
@@ -2491,8 +2420,7 @@ export enum BuildStatus {
   Finished = 'FINISHED',
   InProgress = 'IN_PROGRESS',
   InQueue = 'IN_QUEUE',
-  New = 'NEW',
-  PendingCancel = 'PENDING_CANCEL'
+  New = 'NEW'
 }
 
 export enum BuildTrigger {
@@ -2519,10 +2447,6 @@ export type Card = {
   last4?: Maybe<Scalars['String']>;
 };
 
-export type ChannelFilterInput = {
-  searchTerm?: InputMaybe<Scalars['String']>;
-};
-
 export type Charge = {
   __typename?: 'Charge';
   amount: Scalars['Int'];
@@ -2644,11 +2568,6 @@ export type DeleteAccountSsoConfigurationResult = {
   id: Scalars['ID'];
 };
 
-export type DeleteAndroidAppCredentialsResult = {
-  __typename?: 'DeleteAndroidAppCredentialsResult';
-  id: Scalars['ID'];
-};
-
 export type DeleteAndroidKeystoreResult = {
   __typename?: 'DeleteAndroidKeystoreResult';
   id: Scalars['ID'];
@@ -3054,8 +2973,8 @@ export enum GitHubAppInstallationStatus {
 
 export type GitHubAppMutation = {
   __typename?: 'GitHubAppMutation';
-  /** Create a GitHub build for an app. Returns the ID of the background job receipt. Use BackgroundJobReceiptQuery to get the status of the job. */
-  createGitHubBuild: BackgroundJobReceipt;
+  /** Create a GitHub build for an app */
+  createGitHubBuild: Scalars['Boolean'];
 };
 
 
@@ -3243,11 +3162,6 @@ export type GoogleServiceAccountKeyMutationDeleteGoogleServiceAccountKeyArgs = {
   id: Scalars['ID'];
 };
 
-export type InsightsTimespan = {
-  end: Scalars['DateTime'];
-  start: Scalars['DateTime'];
-};
-
 export type Invoice = {
   __typename?: 'Invoice';
   /** The total amount due for the invoice, in cents */
@@ -3445,6 +3359,16 @@ export type IosAppCredentialsMutationSetPushKeyArgs = {
   pushKeyId: Scalars['ID'];
 };
 
+export type IosAppCredentialsQuery = {
+  __typename?: 'IosAppCredentialsQuery';
+  byId: IosAppCredentials;
+};
+
+
+export type IosAppCredentialsQueryByIdArgs = {
+  iosAppCredentialsId: Scalars['ID'];
+};
+
 /** @deprecated Use developmentClient option instead. */
 export enum IosBuildType {
   DevelopmentClient = 'DEVELOPMENT_CLIENT',
@@ -3590,19 +3514,6 @@ export type LeaveAccountResult = {
   success: Scalars['Boolean'];
 };
 
-export type LineChartData = {
-  __typename?: 'LineChartData';
-  datasets: Array<LineDataset>;
-  labels: Array<Scalars['String']>;
-};
-
-export type LineDataset = {
-  __typename?: 'LineDataset';
-  data: Array<Maybe<Scalars['Int']>>;
-  id: Scalars['ID'];
-  label: Scalars['String'];
-};
-
 export enum MailchimpAudience {
   ExpoDevelopers = 'EXPO_DEVELOPERS'
 }
@@ -3755,7 +3666,6 @@ export type MeteredBillingStatus = {
 
 export enum NotificationEvent {
   BuildComplete = 'BUILD_COMPLETE',
-  BuildPlanCreditThresholdExceeded = 'BUILD_PLAN_CREDIT_THRESHOLD_EXCEEDED',
   SubmissionComplete = 'SUBMISSION_COMPLETE'
 }
 
@@ -4165,7 +4075,6 @@ export type RootQuery = {
   /** Top-level query object for querying Apple Teams. */
   appleTeam: AppleTeamQuery;
   asset: AssetQuery;
-  backgroundJobReceipt: BackgroundJobReceiptQuery;
   buildJobs: BuildJobQuery;
   buildOrBuildJob: BuildOrBuildJobQuery;
   /** Top-level query object for querying BuildPublicData publicly. */
@@ -4177,6 +4086,8 @@ export type RootQuery = {
   githubApp: GitHubAppQuery;
   /** Top-level query object for querying Stripe Invoices. */
   invoice: InvoiceQuery;
+  /** Top-level query object for querying IosAppCredentials. */
+  iosAppCredentials: IosAppCredentialsQuery;
   /**
    * If authenticated as a typical end user, this is the appropriate top-level
    * query object
@@ -4265,7 +4176,6 @@ export type SsoUser = Actor & UserActor & {
   /** Coalesced project activity for all apps belonging to all accounts this user belongs to. Only resolves for the viewer. */
   activityTimelineProjectActivities: Array<ActivityTimelineProjectActivity>;
   appCount: Scalars['Int'];
-  /** @deprecated No longer supported */
   appetizeCode?: Maybe<Scalars['String']>;
   /** Apps this user has published. If this user is the viewer, this field returns the apps the user has access to. */
   apps: Array<App>;
@@ -4283,14 +4193,11 @@ export type SsoUser = Actor & UserActor & {
   fullName?: Maybe<Scalars['String']>;
   /** GitHub account linked to a user */
   githubUser?: Maybe<GitHubUser>;
-  /** @deprecated No longer supported */
   githubUsername?: Maybe<Scalars['String']>;
   id: Scalars['ID'];
-  /** @deprecated No longer supported */
   industry?: Maybe<Scalars['String']>;
   isExpoAdmin: Scalars['Boolean'];
   lastName?: Maybe<Scalars['String']>;
-  /** @deprecated No longer supported */
   location?: Maybe<Scalars['String']>;
   notificationSubscriptions: Array<NotificationSubscription>;
   /** Associated accounts */
@@ -4298,7 +4205,6 @@ export type SsoUser = Actor & UserActor & {
   profilePhoto: Scalars['String'];
   /** Snacks associated with this account */
   snacks: Array<Snack>;
-  /** @deprecated No longer supported */
   twitterUsername?: Maybe<Scalars['String']>;
   username: Scalars['String'];
 };
@@ -4340,7 +4246,11 @@ export type SsoUserSnacksArgs = {
 
 export type SsoUserDataInput = {
   firstName?: InputMaybe<Scalars['String']>;
+  githubUsername?: InputMaybe<Scalars['String']>;
+  industry?: InputMaybe<Scalars['String']>;
   lastName?: InputMaybe<Scalars['String']>;
+  location?: InputMaybe<Scalars['String']>;
+  twitterUsername?: InputMaybe<Scalars['String']>;
 };
 
 export type SsoUserQuery = {
@@ -4756,11 +4666,6 @@ export type TimelineActivityFilterInput = {
   types?: InputMaybe<Array<ActivityTimelineProjectActivityType>>;
 };
 
-export type UniqueUsersOverTimeData = {
-  __typename?: 'UniqueUsersOverTimeData';
-  data: LineChartData;
-};
-
 export type UnsubscribeFromNotificationResult = {
   __typename?: 'UnsubscribeFromNotificationResult';
   notificationSubscription: NotificationSubscription;
@@ -4770,7 +4675,6 @@ export type Update = ActivityTimelineProjectActivity & {
   __typename?: 'Update';
   activityTimestamp: Scalars['DateTime'];
   actor?: Maybe<Actor>;
-  app: App;
   awaitingCodeSigningInfo: Scalars['Boolean'];
   branch: UpdateBranch;
   branchId: Scalars['ID'];
@@ -4793,7 +4697,6 @@ export type Update = ActivityTimelineProjectActivity & {
 
 export type UpdateBranch = {
   __typename?: 'UpdateBranch';
-  app: App;
   appId: Scalars['ID'];
   createdAt: Scalars['DateTime'];
   id: Scalars['ID'];
@@ -4855,7 +4758,6 @@ export type UpdateBranchMutationPublishUpdateGroupsArgs = {
 
 export type UpdateChannel = {
   __typename?: 'UpdateChannel';
-  app: App;
   appId: Scalars['ID'];
   branchMapping: Scalars['String'];
   createdAt: Scalars['DateTime'];
@@ -4947,7 +4849,6 @@ export type UpdateRollBackToEmbeddedGroup = {
 export type UpdatesFilter = {
   platform?: InputMaybe<AppPlatform>;
   runtimeVersions?: InputMaybe<Array<Scalars['String']>>;
-  sdkVersions?: InputMaybe<Array<Scalars['String']>>;
 };
 
 export type UploadSession = {
@@ -5007,7 +4908,6 @@ export type User = Actor & UserActor & {
   /** Coalesced project activity for all apps belonging to all accounts this user belongs to. Only resolves for the viewer. */
   activityTimelineProjectActivities: Array<ActivityTimelineProjectActivity>;
   appCount: Scalars['Int'];
-  /** @deprecated No longer supported */
   appetizeCode?: Maybe<Scalars['String']>;
   /** Apps this user has published */
   apps: Array<App>;
@@ -5027,19 +4927,16 @@ export type User = Actor & UserActor & {
   fullName?: Maybe<Scalars['String']>;
   /** GitHub account linked to a user */
   githubUser?: Maybe<GitHubUser>;
-  /** @deprecated No longer supported */
   githubUsername?: Maybe<Scalars['String']>;
   /** Whether this user has any pending user invitations. Only resolves for the viewer. */
   hasPendingUserInvitations: Scalars['Boolean'];
   id: Scalars['ID'];
-  /** @deprecated No longer supported */
   industry?: Maybe<Scalars['String']>;
   isExpoAdmin: Scalars['Boolean'];
-  /** @deprecated No longer supported */
+  /** @deprecated This field no longer exists */
   isLegacy: Scalars['Boolean'];
   isSecondFactorAuthenticationEnabled: Scalars['Boolean'];
   lastName?: Maybe<Scalars['String']>;
-  /** @deprecated No longer supported */
   location?: Maybe<Scalars['String']>;
   notificationSubscriptions: Array<NotificationSubscription>;
   /** Pending UserInvitations for this user. Only resolves for the viewer. */
@@ -5051,7 +4948,6 @@ export type User = Actor & UserActor & {
   secondFactorDevices: Array<UserSecondFactorDevice>;
   /** Snacks associated with this account */
   snacks: Array<Snack>;
-  /** @deprecated No longer supported */
   twitterUsername?: Maybe<Scalars['String']>;
   username: Scalars['String'];
 };
@@ -5102,7 +4998,6 @@ export type UserActor = {
    */
   activityTimelineProjectActivities: Array<ActivityTimelineProjectActivity>;
   appCount: Scalars['Int'];
-  /** @deprecated No longer supported */
   appetizeCode?: Maybe<Scalars['String']>;
   /** Apps this user has published */
   apps: Array<App>;
@@ -5124,14 +5019,11 @@ export type UserActor = {
   fullName?: Maybe<Scalars['String']>;
   /** GitHub account linked to a user */
   githubUser?: Maybe<GitHubUser>;
-  /** @deprecated No longer supported */
   githubUsername?: Maybe<Scalars['String']>;
   id: Scalars['ID'];
-  /** @deprecated No longer supported */
   industry?: Maybe<Scalars['String']>;
   isExpoAdmin: Scalars['Boolean'];
   lastName?: Maybe<Scalars['String']>;
-  /** @deprecated No longer supported */
   location?: Maybe<Scalars['String']>;
   notificationSubscriptions: Array<NotificationSubscription>;
   /** Associated accounts */
@@ -5139,7 +5031,6 @@ export type UserActor = {
   profilePhoto: Scalars['String'];
   /** Snacks associated with this user's personal account */
   snacks: Array<Snack>;
-  /** @deprecated No longer supported */
   twitterUsername?: Maybe<Scalars['String']>;
   username: Scalars['String'];
 };
@@ -5198,12 +5089,17 @@ export type UserActorQueryByUsernameArgs = {
 };
 
 export type UserDataInput = {
+  appetizeCode?: InputMaybe<Scalars['String']>;
   email?: InputMaybe<Scalars['String']>;
   firstName?: InputMaybe<Scalars['String']>;
   fullName?: InputMaybe<Scalars['String']>;
+  githubUsername?: InputMaybe<Scalars['String']>;
   id?: InputMaybe<Scalars['ID']>;
+  industry?: InputMaybe<Scalars['String']>;
   lastName?: InputMaybe<Scalars['String']>;
+  location?: InputMaybe<Scalars['String']>;
   profilePhoto?: InputMaybe<Scalars['String']>;
+  twitterUsername?: InputMaybe<Scalars['String']>;
   username?: InputMaybe<Scalars['String']>;
 };
 
@@ -5980,7 +5876,7 @@ export type UpdatePublishMutationVariables = Exact<{
 }>;
 
 
-export type UpdatePublishMutation = { __typename?: 'RootMutation', updateBranch: { __typename?: 'UpdateBranchMutation', publishUpdateGroups: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> } };
+export type UpdatePublishMutation = { __typename?: 'RootMutation', updateBranch: { __typename?: 'UpdateBranchMutation', publishUpdateGroups: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> } };
 
 export type SetCodeSigningInfoMutationVariables = Exact<{
   updateId: Scalars['ID'];
@@ -6078,7 +5974,7 @@ export type BranchesByAppQueryVariables = Exact<{
 }>;
 
 
-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, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> }> } } };
+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, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> }> } } };
 
 export type ViewBranchesOnUpdateChannelQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -6088,7 +5984,7 @@ export type ViewBranchesOnUpdateChannelQueryVariables = Exact<{
 }>;
 
 
-export type ViewBranchesOnUpdateChannelQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannelByName?: { __typename?: 'UpdateChannel', id: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> } | null } } };
+export type ViewBranchesOnUpdateChannelQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannelByName?: { __typename?: 'UpdateChannel', id: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> } | null } } };
 
 export type BuildsByIdQueryVariables = Exact<{
   buildId: Scalars['ID'];
@@ -6120,7 +6016,7 @@ export type ViewUpdateChannelOnAppQueryVariables = Exact<{
 }>;
 
 
-export type ViewUpdateChannelOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannelByName?: { __typename?: 'UpdateChannel', id: string, name: string, createdAt: any, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> } | null } } };
+export type ViewUpdateChannelOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannelByName?: { __typename?: 'UpdateChannel', id: string, name: string, createdAt: any, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> } | null } } };
 
 export type ViewUpdateChannelsOnAppQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -6129,7 +6025,7 @@ export type ViewUpdateChannelsOnAppQueryVariables = Exact<{
 }>;
 
 
-export type ViewUpdateChannelsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannels: Array<{ __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> }> } } };
+export type ViewUpdateChannelsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannels: Array<{ __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> }> } } };
 
 export type EnvironmentSecretsByAppIdQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -6182,7 +6078,7 @@ export type ViewUpdatesByGroupQueryVariables = Exact<{
 }>;
 
 
-export type ViewUpdatesByGroupQuery = { __typename?: 'RootQuery', updatesByGroup: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> };
+export type ViewUpdatesByGroupQuery = { __typename?: 'RootQuery', updatesByGroup: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> };
 
 export type ViewUpdateGroupsOnBranchQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -6193,7 +6089,7 @@ export type ViewUpdateGroupsOnBranchQueryVariables = Exact<{
 }>;
 
 
-export type ViewUpdateGroupsOnBranchQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranchByName?: { __typename?: 'UpdateBranch', id: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> } | null } } };
+export type ViewUpdateGroupsOnBranchQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateBranchByName?: { __typename?: 'UpdateBranch', id: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> } | null } } };
 
 export type ViewUpdateGroupsOnAppQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -6203,12 +6099,12 @@ export type ViewUpdateGroupsOnAppQueryVariables = Exact<{
 }>;
 
 
-export type ViewUpdateGroupsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> } } };
+export type ViewUpdateGroupsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> } } };
 
 export type CurrentUserQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type CurrentUserQuery = { __typename?: 'RootQuery', meActor?: { __typename: 'Robot', firstName?: string | null, id: string, featureGates: any, isExpoAdmin: boolean, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'SSOUser', username: string, id: string, featureGates: any, isExpoAdmin: boolean, primaryAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'User', username: string, id: string, featureGates: any, isExpoAdmin: boolean, primaryAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | null };
+export type CurrentUserQuery = { __typename?: 'RootQuery', meActor?: { __typename: 'Robot', firstName?: string | null, id: string, featureGates: any, isExpoAdmin: boolean, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'SSOUser', username: string, id: string, featureGates: any, isExpoAdmin: boolean, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | { __typename: 'User', username: string, id: string, featureGates: any, isExpoAdmin: boolean, primaryAccount: { __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }, accounts: Array<{ __typename?: 'Account', id: string, name: string, users: Array<{ __typename?: 'UserPermission', role: Role, actor: { __typename?: 'Robot', id: string } | { __typename?: 'SSOUser', id: string } | { __typename?: 'User', id: string } }> }> } | null };
 
 export type WebhooksByAppIdQueryVariables = Exact<{
   appId: Scalars['String'];
@@ -6239,9 +6135,9 @@ export type StatuspageServiceFragment = { __typename?: 'StatuspageService', id:
 
 export type SubmissionFragment = { __typename?: 'Submission', id: string, status: SubmissionStatus, platform: AppPlatform, logsUrl?: string | null, app: { __typename?: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } }, androidConfig?: { __typename?: 'AndroidSubmissionConfig', applicationIdentifier?: string | null, track: SubmissionAndroidTrack, releaseStatus?: SubmissionAndroidReleaseStatus | null } | null, iosConfig?: { __typename?: 'IosSubmissionConfig', ascAppIdentifier: string, appleIdUsername?: string | null } | null, error?: { __typename?: 'SubmissionError', errorCode?: string | null, message?: string | null } | null };
 
-export type UpdateFragment = { __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null };
+export type UpdateFragment = { __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null };
 
-export type UpdateBranchFragment = { __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, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> };
+export type UpdateBranchFragment = { __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, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> };
 
 export type WebhookFragment = { __typename?: 'Webhook', id: string, event: WebhookType, url: string, createdAt: any, updatedAt: any };
 

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

@@ -106,41 +106,6 @@ export const ChannelQuery = {
       throw new Error(`Could not find channels on project with id ${appId}`);
     }
 
-    return updateChannels;
-  },
-  async viewUpdateChannelsPaginatedOnAppAsync(
-    graphqlClient: ExpoGraphqlClient,
-    { appId, limit, offset }: ViewUpdateChannelsOnAppQueryVariables
-  ): Promise<UpdateChannelObject[]> {
-    const response = await withErrorHandlingAsync(
-      graphqlClient
-        .query<ViewUpdateChannelsOnAppQuery, ViewUpdateChannelsOnAppQueryVariables>(
-          gql`
-            query ViewUpdateChannelsOnApp($appId: String!, $offset: Int!, $limit: Int!) {
-              app {
-                byId(appId: $appId) {
-                  id
-                  updateChannels(offset: $offset, limit: $limit) {
-                    id
-                    name
-                    branchMapping
-                  }
-                }
-              }
-            }
-            ${print(UpdateFragmentNode)}
-          `,
-          { appId, offset, limit },
-          { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
-        )
-        .toPromise()
-    );
-    const { updateChannels } = response.app.byId;
-
-    if (!updateChannels) {
-      throw new Error(`Could not find channels on project with id ${appId}`);
-    }
-
     return updateChannels;
   },
 };

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

@@ -16,7 +16,7 @@ export const UserQuery = {
               meActor {
                 __typename
                 id
-                ... on UserActor {
+                ... on User {
                   username
                   primaryAccount {
                     id
@@ -26,6 +26,9 @@ export const UserQuery = {
                 ... on Robot {
                   firstName
                 }
+                ... on SSOUser {
+                  username
+                }
                 accounts {
                   id
                   ...AccountFragment
@@ -38,7 +41,7 @@ export const UserQuery = {
           `,
           {},
           {
-            additionalTypenames: ['User', 'SSOUser'],
+            additionalTypenames: ['User'],
           }
         )
         .toPromise()

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

@@ -15,7 +15,7 @@ export const UpdateFragmentNode = gql`
     actor {
       __typename
       id
-      ... on UserActor {
+      ... on User {
         username
       }
       ... on Robot {