v1.0.0

* remove timeout when waiting for build / submit

* update CHANGELOG.md

CHANGELOG.md

@@ -6,12 +6,18 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🛠 Breaking changes
 
+- Remove timeout when waiting for build / submission. ([#1289](https://github.com/expo/eas-cli/pull/1289) by [@dsokal](https://github.com/dsokal))
+
 ### 🎉 New features
 
+- Add metadata support for dynamic store.config.js files. ([#1270](https://github.com/expo/eas-cli/pull/1270) by [@byCedric](https://github.com/byCedric))
+- Improve reliability of update asset presigned upload requests. ([#1278](https://github.com/expo/eas-cli/pull/1278) by [@wschurman](https://github.com/wschurman))
+
 ### 🐛 Bug fixes
 
 - Rebind `console.info` correctly after `ora` instance stops. ([#1113](https://github.com/expo/eas-cli/pull/1113) by [@EvanBacon](https://github.com/EvanBacon))
 - Fix initializing git repository in monorepo. ([#1279](https://github.com/expo/eas-cli/pull/1279) by [@dsokal](https://github.com/dsokal))
+- Limit the number of SignedAssetUploadSpecifications fetched at a time. ([#1287](https://github.com/expo/eas-cli/pull/1287) by [@wschurman](https://github.com/wschurman))
 
 ### 🧹 Chores
 

CODEOWNERS

@@ -3,8 +3,8 @@
 packages/eas-cli/src/build @dsokal @wkozyra95
 packages/eas-cli/src/commands/build @dsokal @wkozyra95
 
-packages/eas-cli/src/submit @barthap @dsokal
-packages/eas-cli/src/commands/submit.ts @barthap @dsokal
+packages/eas-cli/src/submit @dsokal
+packages/eas-cli/src/commands/submit.ts @dsokal
 
 packages/eas-cli/src/update @kgc00 @wschurman
 packages/eas-cli/src/commands/update @kgc00 @wschurman

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.60.0"
+  "version": "1.0.0"
 }

packages/eas-cli/README.md

@@ -102,7 +102,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -119,7 +119,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -136,7 +136,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -150,7 +150,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -199,7 +199,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -219,7 +219,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -240,7 +240,7 @@ DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -259,7 +259,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -283,7 +283,7 @@ DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -313,7 +313,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -327,7 +327,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -344,7 +344,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -379,7 +379,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -412,7 +412,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:submit`
 
@@ -459,7 +459,7 @@ DESCRIPTION
   Update version of an app.
 ```
 
-_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/version/set.ts)_
+_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/version/set.ts)_
 
 ## `eas build:version:sync`
 
@@ -478,7 +478,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/v0.60.0/packages/eas-cli/src/commands/build/version/sync.ts)_
+_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/version/sync.ts)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -495,7 +495,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -515,7 +515,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -536,7 +536,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -553,7 +553,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -573,7 +573,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -591,7 +591,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -605,7 +605,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -619,7 +619,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -637,7 +637,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -654,7 +654,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -668,7 +668,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -682,7 +682,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -764,7 +764,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -781,7 +781,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas project:info`
 
@@ -795,7 +795,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -812,7 +812,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -832,7 +832,7 @@ DESCRIPTION
   create an environment secret on the current project or owner account
 ```
 
-_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -849,7 +849,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -863,7 +863,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas submit`
 
@@ -893,7 +893,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -923,7 +923,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -940,7 +940,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -960,7 +960,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -979,7 +979,7 @@ DESCRIPTION
   view the recent updates for a branch
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -999,7 +999,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -1019,7 +1019,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -1036,7 +1036,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1053,7 +1053,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1074,7 +1074,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1091,7 +1091,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.60.0/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v1.0.0/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "0.60.0",
+  "version": "1.0.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -14,7 +14,7 @@
     "@expo/config-plugins": "5.0.1",
     "@expo/config-types": "46.0.2",
     "@expo/eas-build-job": "0.2.85",
-    "@expo/eas-json": "0.60.0",
+    "@expo/eas-json": "1.0.0",
     "@expo/json-file": "8.2.36",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/package-manager": "0.0.56",
@@ -63,6 +63,7 @@
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
     "promise-limit": "2.7.0",
+    "promise-retry": "2.0.1",
     "prompts": "2.4.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
@@ -90,6 +91,7 @@
     "@types/mime": "2.0.3",
     "@types/node-fetch": "2.6.2",
     "@types/node-forge": "1.0.4",
+    "@types/promise-retry": "1.1.3",
     "@types/prompts": "2.0.14",
     "@types/semver": "7.3.10",
     "@types/tar": "6.1.2",

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

@@ -243,11 +243,7 @@ type MaybeBuildFragment = BuildFragment | null;
 
 export async function waitForBuildEndAsync(
   { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  {
-    // 2 hours (max build time limit) + 10 minutes (possible queue time)
-    timeoutSec = 2 * 60 * 60 + 10 * 60,
-    intervalSec = 10,
-  } = {}
+  { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
   let spinner;
   let originalSpinnerText;
@@ -259,8 +255,7 @@ export async function waitForBuildEndAsync(
     originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
     spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
   }
-  const endTime = new Date().getTime() + timeoutSec * 1000;
-  while (new Date().getTime() <= endTime) {
+  while (true) {
     const builds = await getBuildsSafelyAsync(buildIds);
     const { refetch } =
       builds.length === 1
@@ -271,10 +266,6 @@ export async function waitForBuildEndAsync(
     }
     await sleepAsync(intervalSec * 1000);
   }
-  spinner.fail('Timed out');
-  throw new Error(
-    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
-  );
 }
 
 async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {

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

@@ -51,11 +51,11 @@ export default class MetadataPull extends EasCommand {
       const relativePath = path.relative(process.cwd(), filePath);
 
       Log.addNewLineIfNone();
-      Log.log(`🎉 Your store configuration is ready.
+      Log.log(`🎉 Your store config is ready.
 
 - Update the ${chalk.bold(relativePath)} file to prepare the app information.
 - Run ${chalk.bold('eas submit')} or manually upload a new app version to the app stores.
-- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store configuration.
+- Once the app is uploaded, run ${chalk.bold('eas metadata:push')} to sync the store config.
 - ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
     } catch (error: any) {
       handleMetadataError(error);

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

@@ -18,6 +18,7 @@ export const jester2: Actor = {
 
 export const testUsername = jester.username;
 export const testSlug = 'testApp';
+export const testProjectId = '7ef93448-3bc7-4b57-be32-99326dcf24f0';
 export const testBundleIdentifier = 'test.com.app';
 export const testPackageName = 'test.com.app';
 export const testExperienceName = `@${testUsername}/${testSlug}`;
@@ -35,6 +36,11 @@ export const testAppJson = {
   sdkVersion: '38.0.0',
   ios: { bundleIdentifier: testBundleIdentifier },
   android: { package: testPackageName },
+  extra: {
+    eas: {
+      projectId: testProjectId,
+    },
+  },
 };
 
 export const testAppJsonWithDifferentOwner = {

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

@@ -0,0 +1,128 @@
+import path from 'path';
+
+import { getStaticConfigFilePath, loadConfigAsync } from '../config';
+import { MetadataValidationError } from '../errors';
+
+describe(getStaticConfigFilePath, () => {
+  const projectDir = '/app';
+
+  it(`returns same file for store.config.json`, () => {
+    const metadataPath = 'store.config.json';
+    const expectedFile = path.join(projectDir, metadataPath);
+
+    expect(getStaticConfigFilePath({ projectDir, metadataPath })).toBe(expectedFile);
+  });
+
+  it(`returns store.config.json for store.config.js`, () => {
+    const metadataPath = 'store.config.js';
+    const expectedFile = path.join(projectDir, 'store.config.json');
+
+    expect(getStaticConfigFilePath({ projectDir, metadataPath })).toBe(expectedFile);
+  });
+
+  it(`returns store.staging.json file for store.staging.js`, () => {
+    const metadataPath = 'store.staging.js';
+    const expectedFile = path.join(projectDir, 'store.staging.json');
+
+    expect(getStaticConfigFilePath({ projectDir, metadataPath })).toBe(expectedFile);
+  });
+
+  // This shouldn't be used IRL, but it tests if this function is working properly
+  it(`returns custom-name.json file for custom-name.js`, () => {
+    const metadataPath = 'custom-name.js';
+    const expectedFile = path.join(projectDir, 'custom-name.json');
+
+    expect(getStaticConfigFilePath({ projectDir, metadataPath })).toBe(expectedFile);
+  });
+});
+
+describe(loadConfigAsync, () => {
+  const projectDir = path.resolve(__dirname, 'fixtures');
+
+  it(`throws when file doesn't exist`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'doesnt-exist.json' })
+    ).rejects.toThrow('file not found');
+  });
+
+  it(`throws when validation errors are found without skipping validation`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid.config.json' })
+    ).rejects.toThrow('errors found');
+  });
+
+  it(`returns config from "store.config.json"`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'store.config.json' })
+    ).resolves.toHaveProperty('apple.copyright', 'ACME');
+  });
+
+  it(`returns config from "store.config.js"`, async () => {
+    const year = new Date().getFullYear();
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'store.config.js' })
+    ).resolves.toHaveProperty('apple.copyright', `${year} ACME`);
+  });
+
+  it(`returns config from "store.function.js"`, async () => {
+    const year = new Date().getFullYear();
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'store.function.js' })
+    ).resolves.toHaveProperty('apple.copyright', `${year} ACME`);
+  });
+
+  it(`returns config from "store.async.js"`, async () => {
+    const year = new Date().getFullYear();
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'store.async.js' })
+    ).resolves.toHaveProperty('apple.copyright', `${year} ACME`);
+  });
+
+  it(`returns invalid config from "invalid.config.json`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid.config.json', skipValidation: true })
+    ).resolves.toMatchObject({ configVersion: -1 });
+  });
+
+  it(`returns invalid config from "invalid.config.js`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid.config.js', skipValidation: true })
+    ).resolves.toMatchObject({ configVersion: -1 });
+  });
+
+  it(`returns invalid config from "invalid.function.js`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid.function.js', skipValidation: true })
+    ).resolves.toMatchObject({ configVersion: -1 });
+  });
+
+  it(`returns invalid config from "invalid.async.js`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid.async.js', skipValidation: true })
+    ).resolves.toMatchObject({ configVersion: -1 });
+  });
+
+  it(`throws invalid config type from "invalid-type.config.json"`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid-type.config.json' })
+    ).rejects.toThrow(MetadataValidationError);
+  });
+
+  it(`throws invalid config type from "invalid-type.config.js"`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid-type.config.js' })
+    ).rejects.toThrow(MetadataValidationError);
+  });
+
+  it(`throws invalid config type from "invalid-type.function.js"`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid-type.function.js' })
+    ).rejects.toThrow(MetadataValidationError);
+  });
+
+  it(`throws invalid config type from "invalid-type.async.js"`, async () => {
+    await expect(
+      loadConfigAsync({ projectDir, metadataPath: 'invalid-type.async.js' })
+    ).rejects.toThrow(MetadataValidationError);
+  });
+});

packages/eas-cli/src/metadata/__tests__/fixtures/invalid-type.async.js

@@ -0,0 +1,3 @@
+module.exports = async function () {
+  return await Promise.resolve(null);
+};

packages/eas-cli/src/metadata/__tests__/fixtures/invalid-type.config.js

@@ -0,0 +1 @@
+module.exports = 1337;

packages/eas-cli/src/metadata/__tests__/fixtures/invalid-type.config.json

@@ -0,0 +1,5 @@
+[
+  {
+    "configVersion": -1
+  }
+]

packages/eas-cli/src/metadata/__tests__/fixtures/invalid-type.function.js

@@ -0,0 +1,3 @@
+module.exports = function () {
+  return true;
+};

packages/eas-cli/src/metadata/__tests__/fixtures/invalid.async.js

@@ -0,0 +1,3 @@
+module.exports = async function () {
+  return await Promise.resolve({ configVersion: -1 });
+};

packages/eas-cli/src/metadata/__tests__/fixtures/invalid.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  configVersion: -1,
+};

packages/eas-cli/src/metadata/__tests__/fixtures/invalid.config.json

@@ -0,0 +1,3 @@
+{
+  "configVersion": -1
+}

packages/eas-cli/src/metadata/__tests__/fixtures/invalid.function.js

@@ -0,0 +1,3 @@
+module.exports = function () {
+  return { configVersion: -1 };
+};

packages/eas-cli/src/metadata/__tests__/fixtures/store.async.js

@@ -0,0 +1,5 @@
+module.exports = async function () {
+  const config = require('./store.config.json');
+  config.apple.copyright = `${new Date().getFullYear()} ACME`;
+  return await Promise.resolve(config);
+};

packages/eas-cli/src/metadata/__tests__/fixtures/store.config.js

@@ -0,0 +1,5 @@
+const config = require('./store.config.json');
+
+config.apple.copyright = `${new Date().getFullYear()} ACME`;
+
+module.exports = config;

packages/eas-cli/src/metadata/__tests__/fixtures/store.config.json

@@ -0,0 +1,22 @@
+{
+  "configVersion": 0,
+  "apple": {
+    "copyright": "ACME",
+    "info": {
+      "en-US": {
+        "title": "App title",
+        "subtitle": "Subtitle for your app",
+        "description": "A longer description of what your app does",
+        "keywords": [
+          "keyword"
+        ],
+        "releaseNotes": "Bug fixes and improved stability",
+        "promoText": "Short tagline for your app",
+        "marketingUrl": "https://example.com/en/marketing",
+        "supportUrl": "https://example.com/en/support",
+        "privacyPolicyUrl": "https://example.com/en/privacy",
+        "privacyChoicesUrl": "https://example.com/en/choices"
+      }
+    }
+  }
+}

packages/eas-cli/src/metadata/__tests__/fixtures/store.function.js

@@ -0,0 +1,5 @@
+module.exports = function () {
+  const config = require('./store.config.json');
+  config.apple.copyright = `${new Date().getFullYear()} ACME`;
+  return config;
+};

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

@@ -1,9 +1,12 @@
 import Ajv from 'ajv';
 import assert from 'assert';
+import fs from 'fs-extra';
+import path from 'path';
 
 import { AppleConfigReader } from './apple/config/reader';
 import { AppleConfigWriter } from './apple/config/writer';
 import { AppleMetadata } from './apple/types';
+import { MetadataValidationError } from './errors';
 
 export interface MetadataConfig {
   /** The store configuration version */
@@ -12,6 +15,68 @@ export interface MetadataConfig {
   apple?: AppleMetadata;
 }
 
+/**
+ * Resolve the dynamic config from the user.
+ * It supports methods, async methods, or objects (json).
+ */
+async function resolveDynamicConfigAsync(configFile: string): Promise<unknown> {
+  const userConfigOrFunction = await import(configFile).then(file => file.default ?? file);
+
+  return typeof userConfigOrFunction === 'function'
+    ? await userConfigOrFunction()
+    : userConfigOrFunction;
+}
+
+/**
+ * Get the static configuration file path, based on the metadata context.
+ * This uses any custom name provided, but swaps out the extension for `.json`.
+ */
+export function getStaticConfigFilePath({
+  projectDir,
+  metadataPath,
+}: {
+  projectDir: string;
+  metadataPath: string;
+}): string {
+  const configFile = path.join(projectDir, metadataPath);
+  const configExtension = path.extname(configFile);
+
+  return path.join(projectDir, `${path.basename(configFile, configExtension)}.json`);
+}
+
+/**
+ * Load the store configuration from a metadata context.
+ * This can load `.json` and `.js` config files, using `require`.
+ * It throws MetadataValidationErrors when the file doesn't exist, or contains errors.
+ * The user is prompted to try anyway when errors are found.
+ */
+export async function loadConfigAsync({
+  projectDir,
+  metadataPath,
+  skipValidation = false,
+}: {
+  projectDir: string;
+  metadataPath: string;
+  skipValidation?: boolean;
+}): Promise<MetadataConfig> {
+  const configFile = path.join(projectDir, metadataPath);
+  if (!(await fs.pathExists(configFile))) {
+    throw new MetadataValidationError(`Metadata store config file not found: "${configFile}"`);
+  }
+
+  const configData = await resolveDynamicConfigAsync(configFile);
+
+  if (!skipValidation) {
+    const { valid, errors: validationErrors } = validateConfig(configData);
+
+    if (!valid) {
+      throw new MetadataValidationError(`Metadata store config errors found`, validationErrors);
+    }
+  }
+
+  return configData as MetadataConfig;
+}
+
 /**
  * Run the JSON Schema validation to normalize defaults and flag early config errors.
  * This includes validating the known store limitations for every configurable property.

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

@@ -6,7 +6,7 @@ import Log from '../log';
 import { confirmAsync } from '../prompts';
 import { AppleData } from './apple/data';
 import { createAppleTasks } from './apple/tasks';
-import { createAppleWriter } from './config';
+import { createAppleWriter, getStaticConfigFilePath } from './config';
 import { MetadataContext, ensureMetadataAppStoreAuthenticatedAsync } from './context';
 import { MetadataDownloadError, MetadataValidationError } from './errors';
 import { subscribeTelemetry } from './utils/telemetry';
@@ -16,15 +16,16 @@ import { subscribeTelemetry } from './utils/telemetry';
  * Note, only App Store is supported at this time.
  */
 export async function downloadMetadataAsync(metadataCtx: MetadataContext): Promise<string> {
-  const filePath = path.resolve(metadataCtx.projectDir, metadataCtx.metadataPath);
+  const filePath = getStaticConfigFilePath(metadataCtx);
   const fileExists = await fs.pathExists(filePath);
 
   if (fileExists) {
+    const filePathRelative = path.relative(metadataCtx.projectDir, filePath);
     const overwrite = await confirmAsync({
-      message: `Do you want to overwrite the existing store configuration "${metadataCtx.metadataPath}"?`,
+      message: `Do you want to overwrite the existing "${filePathRelative}"?`,
     });
     if (!overwrite) {
-      throw new MetadataValidationError(`Store configuration already exists at "${filePath}"`);
+      throw new MetadataValidationError(`Store config already exists at "${filePath}"`);
     }
   }
 
@@ -35,7 +36,7 @@ export async function downloadMetadataAsync(metadataCtx: MetadataContext): Promi
   );
 
   Log.addNewLineIfNone();
-  Log.log('Downloading App Store configuration...');
+  Log.log('Downloading App Store config...');
 
   const errors: Error[] = [];
   const config = createAppleWriter();
@@ -59,7 +60,7 @@ export async function downloadMetadataAsync(metadataCtx: MetadataContext): Promi
   }
 
   try {
-    await fs.writeJson(filePath, config.toSchema(), { spaces: 2 });
+    await fs.writeJSON(filePath, config.toSchema(), { spaces: 2 });
   } finally {
     unsubscribeTelemetry();
   }

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

@@ -1,12 +1,9 @@
-import fs from 'fs-extra';
-import path from 'path';
-
 import { MetadataEvent } from '../analytics/events';
 import Log from '../log';
 import { confirmAsync } from '../prompts';
 import { AppleData } from './apple/data';
 import { createAppleTasks } from './apple/tasks';
-import { createAppleReader, validateConfig } from './config';
+import { MetadataConfig, createAppleReader, loadConfigAsync } from './config';
 import { MetadataContext, ensureMetadataAppStoreAuthenticatedAsync } from './context';
 import { MetadataUploadError, MetadataValidationError, logMetadataValidationError } from './errors';
 import { subscribeTelemetry } from './utils/telemetry';
@@ -18,28 +15,7 @@ import { subscribeTelemetry } from './utils/telemetry';
 export async function uploadMetadataAsync(
   metadataCtx: MetadataContext
 ): Promise<{ appleLink: string }> {
-  const filePath = path.resolve(metadataCtx.projectDir, metadataCtx.metadataPath);
-  if (!(await fs.pathExists(filePath))) {
-    throw new MetadataValidationError(`Store configuration file not found "${filePath}"`);
-  }
-
-  const fileData = await fs.readJson(filePath);
-  const { valid, errors: validationErrors } = validateConfig(fileData);
-  if (!valid) {
-    const error = new MetadataValidationError(`Store configuration errors found`, validationErrors);
-    logMetadataValidationError(error);
-    Log.newLine();
-    Log.warn(
-      'Without further updates, the current store configuration may fail to be synchronized with the App Store or pass App Store review.'
-    );
-    const attempt = await confirmAsync({
-      message: 'Do you still want to push the store configuration?',
-    });
-    if (!attempt) {
-      throw error;
-    }
-  }
-
+  const storeConfig = await loadConfigWithValidationPromptAsync(metadataCtx);
   const { app, auth } = await ensureMetadataAppStoreAuthenticatedAsync(metadataCtx);
   const { unsubscribeTelemetry, executionId } = subscribeTelemetry(
     MetadataEvent.APPLE_METADATA_UPLOAD,
@@ -50,7 +26,7 @@ export async function uploadMetadataAsync(
   Log.log('Uploading App Store configuration...');
 
   const errors: Error[] = [];
-  const config = createAppleReader(fileData);
+  const config = createAppleReader(storeConfig);
   const tasks = createAppleTasks(metadataCtx, {
     // We need to resolve a different version as soon as possible.
     // This version is the parent model of all changes we are going to push.
@@ -83,3 +59,25 @@ export async function uploadMetadataAsync(
 
   return { appleLink: `https://appstoreconnect.apple.com/apps/${app.id}/appstore` };
 }
+
+async function loadConfigWithValidationPromptAsync(
+  metadataCtx: MetadataContext
+): Promise<MetadataConfig> {
+  try {
+    return await loadConfigAsync(metadataCtx);
+  } catch (error) {
+    if (error instanceof MetadataValidationError) {
+      logMetadataValidationError(error);
+      Log.newLine();
+      Log.warn(
+        'Without further updates, the current store configuration can fail to be synchronized with the App Store or pass App Store review.'
+      );
+
+      if (await confirmAsync({ message: 'Do you still want to push the store configuration?' })) {
+        return await loadConfigAsync({ ...metadataCtx, skipValidation: true });
+      }
+    }
+
+    throw error;
+  }
+}

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

@@ -1,3 +1,4 @@
+import { getConfig, modifyConfigAsync } from '@expo/config';
 import { vol } from 'memfs';
 
 import { confirmAsync } from '../../prompts';
@@ -10,6 +11,7 @@ import {
   findProjectRootAsync,
   getProjectAccountName,
   getProjectAccountNameAsync,
+  getProjectIdAsync,
   promptToCreateProjectIfNotExistsAsync,
 } from '../projectUtils';
 
@@ -248,3 +250,28 @@ describe(promptToCreateProjectIfNotExistsAsync, () => {
     expect(projectId).toBe(null);
   });
 });
+
+describe(getProjectIdAsync, () => {
+  it('gets the project ID from app config if exists', async () => {
+    await expect(
+      getProjectIdAsync({ name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } })
+    ).resolves.toEqual('1234');
+  });
+
+  it('fetches the project ID when not in app config, and sets it in the config', async () => {
+    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
+    jest.mocked(modifyConfigAsync).mockResolvedValue({
+      type: 'success',
+      config: { expo: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } } },
+    });
+    jest.mocked(ensureProjectExistsAsync).mockImplementation(async () => '2345');
+
+    const projectId = await getProjectIdAsync({ name: 'test', slug: 'test' }, {}, { cwd: '/app' });
+    expect(projectId).toBe('2345');
+
+    expect(modifyConfigAsync).toHaveBeenCalledTimes(1);
+    expect(modifyConfigAsync).toHaveBeenCalledWith('/app', {
+      extra: { eas: { projectId: '2345' } },
+    });
+  });
+});

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

@@ -129,24 +129,19 @@ export async function setProjectIdAsync(
 
 export async function getProjectIdAsync(
   exp: ExpoConfig,
-  options: { env?: Env } = {}
+  options: { env?: Env } = {},
+  findProjectRootOptions: {
+    cwd?: string;
+    defaultToProcessCwd?: boolean;
+  } = {}
 ): Promise<string> {
-  if (!process.env.EAS_ENABLE_PROJECT_ID) {
-    const privacy = toAppPrivacy(exp.privacy);
-    return await ensureProjectExistsAsync({
-      accountName: getProjectAccountName(exp, await ensureLoggedInAsync()),
-      projectName: exp.slug,
-      privacy,
-    });
-  }
-
   const localProjectId = exp.extra?.eas?.projectId;
   if (localProjectId) {
     return localProjectId;
   }
 
   // Set the project ID if it is missing.
-  const projectDir = await findProjectRootAsync();
+  const projectDir = await findProjectRootAsync(findProjectRootOptions);
   if (!projectDir) {
     throw new Error('Please run this command inside a project directory.');
   }

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

@@ -11,8 +11,9 @@ import { AssetMetadataStatus, PartialManifestAsset } from '../graphql/generated'
 import { PublishMutation } from '../graphql/mutations/PublishMutation';
 import { PresignedPost } from '../graphql/mutations/UploadSessionMutation';
 import { PublishQuery } from '../graphql/queries/PublishQuery';
-import { uploadWithPresignedPostAsync } from '../uploads';
+import { uploadWithPresignedPostWithRetryAsync } from '../uploads';
 import { expoCommandAsync } from '../utils/expoCli';
+import chunk from '../utils/expodash/chunk';
 import uniqBy from '../utils/expodash/uniqBy';
 
 export type PublishPlatform = Extract<'android' | 'ios', Platform>;
@@ -285,12 +286,18 @@ export async function uploadAssetsAsync(
   const totalAssets = uniqueAssets.length;
 
   updateSpinnerText?.(totalAssets, totalAssets);
-
   let missingAssets = await filterOutAssetsThatAlreadyExistAsync(uniqueAssets);
   const uniqueUploadedAssetCount = missingAssets.length;
-  const { specifications } = await PublishMutation.getUploadURLsAsync(
-    missingAssets.map(ma => ma.contentType)
-  );
+
+  const missingAssetChunks = chunk(missingAssets, 100);
+  const specifications: string[] = [];
+  for (const missingAssets of missingAssetChunks) {
+    const { specifications: chunkSpecifications } = await PublishMutation.getUploadURLsAsync(
+      missingAssets.map(ma => ma.contentType)
+    );
+    specifications.push(...chunkSpecifications);
+  }
+
   updateSpinnerText?.(totalAssets, missingAssets.length);
 
   const assetUploadPromiseLimit = promiseLimit(15);
@@ -300,7 +307,7 @@ export async function uploadAssetsAsync(
     missingAssets.map((missingAsset, i) => {
       assetUploadPromiseLimit(async () => {
         const presignedPost: PresignedPost = JSON.parse(specifications[i]);
-        await uploadWithPresignedPostAsync(missingAsset.path, presignedPost);
+        await uploadWithPresignedPostWithRetryAsync(missingAsset.path, presignedPost);
       });
     }),
   ]);

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

@@ -11,7 +11,6 @@ const APP_STORE_NAMES: Record<AppPlatform, string> = {
   [AppPlatform.Ios]: 'Apple App Store Connect',
 };
 
-const CHECK_TIMEOUT_MS = 3600_000;
 const CHECK_INTERVAL_MS = 5_000;
 
 export async function waitForSubmissionsEndAsync(
@@ -25,9 +24,7 @@ export async function waitForSubmissionsEndAsync(
 
   const spinner = ora(`Submitting`).start();
 
-  let time = new Date().getTime();
-  const timeoutTime = time + CHECK_TIMEOUT_MS;
-  while (time <= timeoutTime) {
+  while (true) {
     const submissions = await Promise.all(
       initialSubmissions.map(({ id }) => {
         try {
@@ -76,11 +73,8 @@ export async function waitForSubmissionsEndAsync(
       }
     }
 
-    time = new Date().getTime();
     await sleepAsync(CHECK_INTERVAL_MS);
   }
-  spinner.warn('Timed out');
-  throw new Error('Timeout reached! It is taking longer than expected to complete, aborting...');
 }
 
 function getSingleSpinnerText(submission: SubmissionFragment): string {

packages/eas-cli/src/uploads.ts

@@ -3,6 +3,7 @@ import FormData from 'form-data';
 import fs from 'fs-extra';
 import { Response } from 'node-fetch';
 import nullthrows from 'nullthrows';
+import promiseRetry from 'promise-retry';
 import { URL } from 'url';
 
 import fetch from './fetch';
@@ -18,7 +19,11 @@ export async function uploadFileAtPathToS3Async(
   const presignedPost = await UploadSessionMutation.createUploadSessionAsync(type);
   assert(presignedPost.fields.key, 'key is not specified in in presigned post');
 
-  const response = await uploadWithPresignedPostAsync(path, presignedPost, handleProgressEvent);
+  const response = await uploadWithPresignedPostWithProgressAsync(
+    path,
+    presignedPost,
+    handleProgressEvent
+  );
   const location = nullthrows(
     response.headers.get('location'),
     `location does not exist in response headers (make sure you're uploading to AWS S3)`
@@ -27,11 +32,48 @@ export async function uploadFileAtPathToS3Async(
   return { url, bucketKey: presignedPost.fields.key };
 }
 
-export async function uploadWithPresignedPostAsync(
+export async function uploadWithPresignedPostWithRetryAsync(
   file: string,
-  presignedPost: PresignedPost,
-  handleProgressEvent?: ProgressHandler
+  presignedPost: PresignedPost
 ): Promise<Response> {
+  return await promiseRetry(
+    async retry => {
+      // retry fetch errors (usually connection or DNS errors)
+      let response: Response;
+      try {
+        response = await uploadWithPresignedPostAsync(file, presignedPost);
+      } catch (e: any) {
+        return retry(e);
+      }
+
+      // retry 408, 429, 5xx as suggested by google
+      if (
+        response.status === 408 ||
+        response.status === 429 ||
+        (response.status >= 500 && response.status <= 599)
+      ) {
+        return retry(new Error(`Presigned upload responded with a ${response.status} status`));
+      }
+
+      // don't retry other errors
+      if (!response.ok) {
+        throw new Error(`Presigned upload responded with a ${response.status} status`);
+      }
+
+      return response;
+    },
+    // retry parameters match google suggested defaults: https://cloud.google.com/storage/docs/retry-strategy#node.js
+    {
+      retries: 3,
+      factor: 2,
+    }
+  );
+}
+
+async function createPresignedPostFormDataAsync(
+  file: string,
+  presignedPost: PresignedPost
+): Promise<{ form: FormData; fileSize: number }> {
   const fileStat = await fs.stat(file);
   const fileSize = fileStat.size;
   const form = new FormData();
@@ -39,6 +81,30 @@ export async function uploadWithPresignedPostAsync(
     form.append(fieldKey, fieldValue);
   }
   form.append('file', fs.createReadStream(file), { knownLength: fileSize });
+  return { form, fileSize };
+}
+
+async function uploadWithPresignedPostAsync(
+  file: string,
+  presignedPost: PresignedPost
+): Promise<Response> {
+  const { form } = await createPresignedPostFormDataAsync(file, presignedPost);
+  const formHeaders = form.getHeaders();
+  return await fetch(presignedPost.url, {
+    method: 'POST',
+    body: form,
+    headers: {
+      ...formHeaders,
+    },
+  });
+}
+
+async function uploadWithPresignedPostWithProgressAsync(
+  file: string,
+  presignedPost: PresignedPost,
+  handleProgressEvent: ProgressHandler
+): Promise<Response> {
+  const { form, fileSize } = await createPresignedPostFormDataAsync(file, presignedPost);
   const formHeaders = form.getHeaders();
   const uploadPromise = fetch(presignedPost.url, {
     method: 'POST',
@@ -49,27 +115,23 @@ export async function uploadWithPresignedPostAsync(
   });
 
   let currentSize = 0;
-  if (handleProgressEvent) {
-    form.addListener('data', (chunk: Buffer) => {
-      currentSize += Buffer.byteLength(chunk);
-      handleProgressEvent({
-        progress: {
-          total: fileSize,
-          percent: currentSize / fileSize,
-          transferred: currentSize,
-        },
-      });
+  form.addListener('data', (chunk: Buffer) => {
+    currentSize += Buffer.byteLength(chunk);
+    handleProgressEvent({
+      progress: {
+        total: fileSize,
+        percent: currentSize / fileSize,
+        transferred: currentSize,
+      },
     });
-    try {
-      const response = await uploadPromise;
-      handleProgressEvent({ isComplete: true });
-      return response;
-    } catch (error: any) {
-      handleProgressEvent({ isComplete: true, error });
-      throw error;
-    }
-  } else {
-    return await uploadPromise;
+  });
+  try {
+    const response = await uploadPromise;
+    handleProgressEvent({ isComplete: true });
+    return response;
+  } catch (error: any) {
+    handleProgressEvent({ isComplete: true, error });
+    throw error;
   }
 }
 

packages/eas-json/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "0.60.0",
+  "version": "1.0.0",
   "author": "Expo <[email protected]>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {

yarn.lock

@@ -3897,6 +3897,13 @@
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3"
   integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==
 
+"@types/[email protected]":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@types/promise-retry/-/promise-retry-1.1.3.tgz#baab427419da9088a1d2f21bf56249c21b3dd43c"
+  integrity sha512-LxIlEpEX6frE3co3vCO2EUJfHIta1IOmhDlcAsR4GMMv9hev1iTI9VwberVGkePJAuLZs5rMucrV8CziCfuJMw==
+  dependencies:
+    "@types/retry" "*"
+
 "@types/[email protected]":
   version "2.0.14"
   resolved "https://registry.yarnpkg.com/@types/prompts/-/prompts-2.0.14.tgz#10cb8899844bb0771cabe57c1becaaaca9a3b521"
@@ -3904,6 +3911,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/retry@*":
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.2.tgz#ed279a64fa438bb69f2480eda44937912bb7480a"
+  integrity sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==
+
 "@types/[email protected]":
   version "7.3.10"
   resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.10.tgz#5f19ee40cbeff87d916eedc8c2bfe2305d957f73"
@@ -10671,7 +10683,7 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/promise-limit/-/promise-limit-2.7.0.tgz#eb5737c33342a030eaeaecea9b3d3a93cb592b26"
   integrity sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==
 
-promise-retry@^2.0.1:
+[email protected], promise-retry@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
   integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
@@ -11151,6 +11163,13 @@ rfdc@^1.3.0:
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
   integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
+[email protected], rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
 rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
@@ -11158,13 +11177,6 @@ rimraf@^2.6.3:
   dependencies:
     glob "^7.1.3"
 
-rimraf@^3.0.0, rimraf@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
-  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
-  dependencies:
-    glob "^7.1.3"
-
 rimraf@~2.4.0:
   version "2.4.5"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.4.5.tgz#ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"