mirror of
https://github.com/expo/eas-cli.git
synced 2026-11-14 17:50:32 -10:00
Compare commits
28
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
97c361f25b | ||
|
|
9cb17fa731 | ||
|
|
530649fe8b | ||
|
|
50f38a0cb2 | ||
|
|
6aa3a78963 | ||
|
|
3e224f9583 | ||
|
|
db338b2b78 | ||
|
|
971c8e4010 | ||
|
|
df64a59354 | ||
|
|
e5d80fcb6d | ||
|
|
4088ea3e43 | ||
|
|
edd42186d9 | ||
|
|
e6ba63cfd0 | ||
|
|
7b60901bb1 | ||
|
|
a551e9010a | ||
|
|
95441798ed | ||
|
|
814f863a63 | ||
|
|
283f086b25 | ||
|
|
7da01333c6 | ||
|
|
c057eaa098 | ||
|
|
968fdd221c | ||
|
|
6d28e0eecc | ||
|
|
a2b4d2dbd2 | ||
|
|
660c996602 | ||
|
|
35ede265ed | ||
|
|
cf02f075d7 | ||
|
|
a2027eabd2 | ||
|
|
4ef239c59c |
No files matched your search
@@ -37,7 +37,7 @@ body:
|
||||
required: true
|
||||
attributes:
|
||||
label: Environment
|
||||
description: Run `npx expo-env-info` and paste the output here.
|
||||
description: Run `npx expo-env-info` and `expo doctor`, and paste the output here.
|
||||
- type: textarea
|
||||
validations:
|
||||
required: false
|
||||
|
||||
@@ -6,6 +6,7 @@ packages/eas-cli/tmp
|
||||
# Code editors
|
||||
.idea
|
||||
.history
|
||||
.vscode
|
||||
|
||||
# macOS
|
||||
.DS_Store
|
||||
|
||||
+42
-1
@@ -12,6 +12,47 @@ This is the log of notable changes to EAS CLI and related packages.
|
||||
|
||||
### 🧹 Chores
|
||||
|
||||
- Refactor metadata telemetry to handle errors better. ([#1169](https://github.com/expo/eas-cli/pull/1169) by [@byCedric](https://github.com/byCedric))
|
||||
|
||||
## [0.54.1](https://github.com/expo/eas-cli/releases/tag/v0.54.1) - 2022-06-15
|
||||
|
||||
### 🎉 New features
|
||||
|
||||
- Add App Store Connect link after `eas metadata:push`. ([#1168](https://github.com/expo/eas-cli/pull/1168) by [@byCedric](https://github.com/byCedric))
|
||||
|
||||
### 🐛 Bug fixes
|
||||
|
||||
- Surface ASC errors in metadata for normal API rejections. ([#1167](https://github.com/expo/eas-cli/pull/1167) by [@byCedric](https://github.com/byCedric))
|
||||
|
||||
## [0.54.0](https://github.com/expo/eas-cli/releases/tag/v0.54.0) - 2022-06-15
|
||||
|
||||
### 🛠 Breaking changes
|
||||
|
||||
- Remove fallback for legacy format in `eas.json`. ([#1158](https://github.com/expo/eas-cli/pull/1158), [#1163](https://github.com/expo/eas-cli/pull/1163) by [@wkozyra95](https://github.com/wkozyra95))
|
||||
|
||||
### 🎉 New features
|
||||
|
||||
- `eas update` now provides more information about the publish process including real-time feedback on asset uploads, update ids, and website links. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
|
||||
- Added first beta of `eas metadata` to sync store information using store configuration files ([#1136](https://github.com/expo/eas-cli/pull/1136) by [@bycedric](https://github.com/bycedric))
|
||||
|
||||
### 🐛 Bug fixes
|
||||
|
||||
- Improved support for working on branches with many updates. ([#1144](https://github.com/expo/eas-cli/pull/1144), [#1148](https://github.com/expo/eas-cli/pull/1148) by [@kgc00](https://github.com/kgc00/))
|
||||
- `eas update` project links no longer contain a `)` on unsupported terminals. ([#1152](https://github.com/expo/eas-cli/pull/1152) by [@kgc00](https://github.com/kgc00/))
|
||||
- Add metadata schema to bundled eas-cli package. ([#1166](https://github.com/expo/eas-cli/pull/1166) by [@byCedric](https://github.com/byCedric))
|
||||
|
||||
### 🧹 Chores
|
||||
|
||||
- Update `eas-build-job`. ([#1162](https://github.com/expo/eas-cli/pull/1162) by [@wkozyra95](https://github.com/wkozyra95))
|
||||
|
||||
## [0.53.1](https://github.com/expo/eas-cli/releases/tag/v0.53.1) - 2022-06-07
|
||||
|
||||
### 🐛 Bug fixes
|
||||
|
||||
- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119) by [@kgc00](https://github.com/kgc00/))
|
||||
|
||||
### 🧹 Chores
|
||||
|
||||
- Display project archive docs before compressing/uploading to EAS Build. ([#1127](https://github.com/expo/eas-cli/pull/1127) by [@dsokal](https://github.com/dsokal))
|
||||
- Add new common error code for submits. ([#1129](https://github.com/expo/eas-cli/pull/1129) by [@dsokal](https://github.com/dsokal))
|
||||
|
||||
@@ -24,7 +65,7 @@ This is the log of notable changes to EAS CLI and related packages.
|
||||
### 🐛 Bug fixes
|
||||
|
||||
- Match bundle identifier capabilities more accurately. ([#1112](https://github.com/expo/eas-cli/pull/1112) by [@EvanBacon](https://github.com/EvanBacon))
|
||||
- No longer timeout on publishing updates for branches with many updates. ([#1119](https://github.com/expo/eas-cli/pull/1119)) by [@kgc00](https://github.com/kgc00/)
|
||||
- Limit concurrent asset uploads. ([#1153](https://github.com/expo/eas-cli/pull/1153) by [@wschurman](https://github.com/wschurman))
|
||||
|
||||
### 🧹 Chores
|
||||
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
* @dsokal @wkozyra95
|
||||
|
||||
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/metadata @bycedric
|
||||
packages/eas-cli/src/commands/metadata @bycedric
|
||||
|
||||
packages/eas-json @dsokal @wkozyra95
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"npmClient": "yarn",
|
||||
"useWorkspaces": true,
|
||||
"version": "0.53.1"
|
||||
"version": "0.54.1"
|
||||
}
|
||||
+78
-42
@@ -65,6 +65,8 @@ eas --help COMMAND
|
||||
* [`eas init`](#eas-init)
|
||||
* [`eas login`](#eas-login)
|
||||
* [`eas logout`](#eas-logout)
|
||||
* [`eas metadata:pull`](#eas-metadatapull)
|
||||
* [`eas metadata:push`](#eas-metadatapush)
|
||||
* [`eas project:info`](#eas-projectinfo)
|
||||
* [`eas project:init`](#eas-projectinit)
|
||||
* [`eas secret:create`](#eas-secretcreate)
|
||||
@@ -98,7 +100,7 @@ ALIASES
|
||||
$ eas login
|
||||
```
|
||||
|
||||
_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/account/login.ts)_
|
||||
_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/login.ts)_
|
||||
|
||||
## `eas account:logout`
|
||||
|
||||
@@ -115,7 +117,7 @@ ALIASES
|
||||
$ eas logout
|
||||
```
|
||||
|
||||
_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/account/logout.ts)_
|
||||
_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/logout.ts)_
|
||||
|
||||
## `eas account:view`
|
||||
|
||||
@@ -132,7 +134,7 @@ ALIASES
|
||||
$ eas whoami
|
||||
```
|
||||
|
||||
_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/account/view.ts)_
|
||||
_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/view.ts)_
|
||||
|
||||
## `eas analytics [STATUS]`
|
||||
|
||||
@@ -146,7 +148,7 @@ DESCRIPTION
|
||||
display or change analytics settings
|
||||
```
|
||||
|
||||
_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/analytics.ts)_
|
||||
_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/analytics.ts)_
|
||||
|
||||
## `eas autocomplete [SHELL]`
|
||||
|
||||
@@ -195,7 +197,7 @@ DESCRIPTION
|
||||
create a branch
|
||||
```
|
||||
|
||||
_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/branch/create.ts)_
|
||||
_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/create.ts)_
|
||||
|
||||
## `eas branch:delete [NAME]`
|
||||
|
||||
@@ -215,7 +217,7 @@ DESCRIPTION
|
||||
delete a branch
|
||||
```
|
||||
|
||||
_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/branch/delete.ts)_
|
||||
_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/delete.ts)_
|
||||
|
||||
## `eas branch:list`
|
||||
|
||||
@@ -232,7 +234,7 @@ DESCRIPTION
|
||||
list all branches
|
||||
```
|
||||
|
||||
_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/branch/list.ts)_
|
||||
_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/list.ts)_
|
||||
|
||||
## `eas branch:rename`
|
||||
|
||||
@@ -251,7 +253,7 @@ DESCRIPTION
|
||||
rename a branch
|
||||
```
|
||||
|
||||
_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/branch/rename.ts)_
|
||||
_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/rename.ts)_
|
||||
|
||||
## `eas branch:view [NAME]`
|
||||
|
||||
@@ -271,7 +273,7 @@ DESCRIPTION
|
||||
view a branch
|
||||
```
|
||||
|
||||
_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/branch/view.ts)_
|
||||
_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/view.ts)_
|
||||
|
||||
## `eas build`
|
||||
|
||||
@@ -300,7 +302,7 @@ DESCRIPTION
|
||||
start a build
|
||||
```
|
||||
|
||||
_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/build/index.ts)_
|
||||
_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/index.ts)_
|
||||
|
||||
## `eas build:cancel [BUILD_ID]`
|
||||
|
||||
@@ -314,7 +316,7 @@ DESCRIPTION
|
||||
cancel a build
|
||||
```
|
||||
|
||||
_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/build/cancel.ts)_
|
||||
_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/cancel.ts)_
|
||||
|
||||
## `eas build:configure`
|
||||
|
||||
@@ -331,7 +333,7 @@ DESCRIPTION
|
||||
configure the project to support EAS Build
|
||||
```
|
||||
|
||||
_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/build/configure.ts)_
|
||||
_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/configure.ts)_
|
||||
|
||||
## `eas build:inspect`
|
||||
|
||||
@@ -366,7 +368,7 @@ DESCRIPTION
|
||||
inspect the state of the project at specific build stages, useful for troubleshooting
|
||||
```
|
||||
|
||||
_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/build/inspect.ts)_
|
||||
_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/inspect.ts)_
|
||||
|
||||
## `eas build:list`
|
||||
|
||||
@@ -399,7 +401,7 @@ DESCRIPTION
|
||||
list all builds for your project
|
||||
```
|
||||
|
||||
_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/build/list.ts)_
|
||||
_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/list.ts)_
|
||||
|
||||
## `eas build:submit`
|
||||
|
||||
@@ -444,7 +446,7 @@ DESCRIPTION
|
||||
view a build for your project
|
||||
```
|
||||
|
||||
_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/build/view.ts)_
|
||||
_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/view.ts)_
|
||||
|
||||
## `eas channel:create [NAME]`
|
||||
|
||||
@@ -464,7 +466,7 @@ DESCRIPTION
|
||||
create a channel
|
||||
```
|
||||
|
||||
_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/channel/create.ts)_
|
||||
_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/create.ts)_
|
||||
|
||||
## `eas channel:edit [NAME]`
|
||||
|
||||
@@ -485,7 +487,7 @@ DESCRIPTION
|
||||
point a channel at a new branch
|
||||
```
|
||||
|
||||
_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/channel/edit.ts)_
|
||||
_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/edit.ts)_
|
||||
|
||||
## `eas channel:list`
|
||||
|
||||
@@ -502,7 +504,7 @@ DESCRIPTION
|
||||
list all channels
|
||||
```
|
||||
|
||||
_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/channel/list.ts)_
|
||||
_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/list.ts)_
|
||||
|
||||
## `eas channel:view [NAME]`
|
||||
|
||||
@@ -522,7 +524,7 @@ DESCRIPTION
|
||||
view a channel
|
||||
```
|
||||
|
||||
_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/channel/view.ts)_
|
||||
_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/view.ts)_
|
||||
|
||||
## `eas config`
|
||||
|
||||
@@ -540,7 +542,7 @@ DESCRIPTION
|
||||
display project configuration (app.json + eas.json)
|
||||
```
|
||||
|
||||
_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/config.ts)_
|
||||
_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/config.ts)_
|
||||
|
||||
## `eas credentials`
|
||||
|
||||
@@ -554,7 +556,7 @@ DESCRIPTION
|
||||
manage credentials
|
||||
```
|
||||
|
||||
_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/credentials.ts)_
|
||||
_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/credentials.ts)_
|
||||
|
||||
## `eas device:create`
|
||||
|
||||
@@ -568,7 +570,7 @@ DESCRIPTION
|
||||
register new Apple Devices to use for internal distribution
|
||||
```
|
||||
|
||||
_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/device/create.ts)_
|
||||
_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/create.ts)_
|
||||
|
||||
## `eas device:delete`
|
||||
|
||||
@@ -586,7 +588,7 @@ DESCRIPTION
|
||||
remove a registered device from your account
|
||||
```
|
||||
|
||||
_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/device/delete.ts)_
|
||||
_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/delete.ts)_
|
||||
|
||||
## `eas device:list`
|
||||
|
||||
@@ -603,7 +605,7 @@ DESCRIPTION
|
||||
list all registered devices for your account
|
||||
```
|
||||
|
||||
_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/device/list.ts)_
|
||||
_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/list.ts)_
|
||||
|
||||
## `eas device:view [UDID]`
|
||||
|
||||
@@ -617,7 +619,7 @@ DESCRIPTION
|
||||
view a device for your project
|
||||
```
|
||||
|
||||
_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/device/view.ts)_
|
||||
_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/view.ts)_
|
||||
|
||||
## `eas diagnostics`
|
||||
|
||||
@@ -631,7 +633,7 @@ DESCRIPTION
|
||||
display environment info
|
||||
```
|
||||
|
||||
_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/diagnostics.ts)_
|
||||
_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/diagnostics.ts)_
|
||||
|
||||
## `eas help [COMMAND]`
|
||||
|
||||
@@ -698,6 +700,40 @@ ALIASES
|
||||
$ eas logout
|
||||
```
|
||||
|
||||
## `eas metadata:pull`
|
||||
|
||||
generate the local store configuration from the app stores
|
||||
|
||||
```
|
||||
USAGE
|
||||
$ eas metadata:pull [--profile <value>]
|
||||
|
||||
FLAGS
|
||||
--profile=<value> Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.
|
||||
|
||||
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.54.1/packages/eas-cli/src/commands/metadata/pull.ts)_
|
||||
|
||||
## `eas metadata:push`
|
||||
|
||||
sync the local store configuration to the app stores
|
||||
|
||||
```
|
||||
USAGE
|
||||
$ eas metadata:push [--profile <value>]
|
||||
|
||||
FLAGS
|
||||
--profile=<value> Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.
|
||||
|
||||
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.54.1/packages/eas-cli/src/commands/metadata/push.ts)_
|
||||
|
||||
## `eas project:info`
|
||||
|
||||
information about the current project
|
||||
@@ -710,7 +746,7 @@ DESCRIPTION
|
||||
information about the current project
|
||||
```
|
||||
|
||||
_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/project/info.ts)_
|
||||
_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/info.ts)_
|
||||
|
||||
## `eas project:init`
|
||||
|
||||
@@ -727,7 +763,7 @@ ALIASES
|
||||
$ eas init
|
||||
```
|
||||
|
||||
_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/project/init.ts)_
|
||||
_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/init.ts)_
|
||||
|
||||
## `eas secret:create`
|
||||
|
||||
@@ -747,7 +783,7 @@ DESCRIPTION
|
||||
create an environment secret on the current project or owner account
|
||||
```
|
||||
|
||||
_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/secret/create.ts)_
|
||||
_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/create.ts)_
|
||||
|
||||
## `eas secret:delete`
|
||||
|
||||
@@ -764,7 +800,7 @@ DESCRIPTION
|
||||
delete an environment secret by ID
|
||||
```
|
||||
|
||||
_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/secret/delete.ts)_
|
||||
_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/delete.ts)_
|
||||
|
||||
## `eas secret:list`
|
||||
|
||||
@@ -778,7 +814,7 @@ DESCRIPTION
|
||||
list environment secrets available for your current app
|
||||
```
|
||||
|
||||
_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/secret/list.ts)_
|
||||
_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/list.ts)_
|
||||
|
||||
## `eas submit`
|
||||
|
||||
@@ -808,7 +844,7 @@ ALIASES
|
||||
$ eas build:submit
|
||||
```
|
||||
|
||||
_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/submit.ts)_
|
||||
_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/submit.ts)_
|
||||
|
||||
## `eas update`
|
||||
|
||||
@@ -838,7 +874,7 @@ DESCRIPTION
|
||||
publish an update group
|
||||
```
|
||||
|
||||
_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/update/index.ts)_
|
||||
_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/index.ts)_
|
||||
|
||||
## `eas update:configure`
|
||||
|
||||
@@ -855,7 +891,7 @@ DESCRIPTION
|
||||
configure the project to support EAS Update
|
||||
```
|
||||
|
||||
_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/update/configure.ts)_
|
||||
_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/configure.ts)_
|
||||
|
||||
## `eas update:delete GROUPID`
|
||||
|
||||
@@ -875,7 +911,7 @@ DESCRIPTION
|
||||
delete all the updates in an update group
|
||||
```
|
||||
|
||||
_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/update/delete.ts)_
|
||||
_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/delete.ts)_
|
||||
|
||||
## `eas update:list`
|
||||
|
||||
@@ -894,7 +930,7 @@ DESCRIPTION
|
||||
view the recent updates for a branch
|
||||
```
|
||||
|
||||
_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/update/list.ts)_
|
||||
_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/list.ts)_
|
||||
|
||||
## `eas update:view GROUPID`
|
||||
|
||||
@@ -914,7 +950,7 @@ DESCRIPTION
|
||||
update group details
|
||||
```
|
||||
|
||||
_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/update/view.ts)_
|
||||
_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/view.ts)_
|
||||
|
||||
## `eas webhook:create`
|
||||
|
||||
@@ -934,7 +970,7 @@ DESCRIPTION
|
||||
create a webhook
|
||||
```
|
||||
|
||||
_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/webhook/create.ts)_
|
||||
_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/create.ts)_
|
||||
|
||||
## `eas webhook:delete [ID]`
|
||||
|
||||
@@ -951,7 +987,7 @@ DESCRIPTION
|
||||
delete a webhook
|
||||
```
|
||||
|
||||
_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/webhook/delete.ts)_
|
||||
_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/delete.ts)_
|
||||
|
||||
## `eas webhook:list`
|
||||
|
||||
@@ -968,7 +1004,7 @@ DESCRIPTION
|
||||
list webhooks
|
||||
```
|
||||
|
||||
_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/webhook/list.ts)_
|
||||
_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/list.ts)_
|
||||
|
||||
## `eas webhook:update`
|
||||
|
||||
@@ -989,7 +1025,7 @@ DESCRIPTION
|
||||
update a webhook
|
||||
```
|
||||
|
||||
_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/webhook/update.ts)_
|
||||
_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/update.ts)_
|
||||
|
||||
## `eas webhook:view ID`
|
||||
|
||||
@@ -1006,7 +1042,7 @@ DESCRIPTION
|
||||
view a webhook
|
||||
```
|
||||
|
||||
_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.53.1/packages/eas-cli/src/commands/webhook/view.ts)_
|
||||
_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/view.ts)_
|
||||
|
||||
## `eas whoami`
|
||||
|
||||
|
||||
Generated
+118
-1
@@ -10523,6 +10523,22 @@
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "canRetry",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "NON_NULL",
|
||||
"name": null,
|
||||
"ofType": {
|
||||
"kind": "SCALAR",
|
||||
"name": "Boolean",
|
||||
"ofType": null
|
||||
}
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "cancelingActor",
|
||||
"description": null,
|
||||
@@ -10548,7 +10564,7 @@
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "createdAt",
|
||||
"name": "completedAt",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
@@ -10559,6 +10575,22 @@
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "createdAt",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "NON_NULL",
|
||||
"name": null,
|
||||
"ofType": {
|
||||
"kind": "SCALAR",
|
||||
"name": "DateTime",
|
||||
"ofType": null
|
||||
}
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "distribution",
|
||||
"description": null,
|
||||
@@ -10571,6 +10603,18 @@
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "enqueuedAt",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "SCALAR",
|
||||
"name": "DateTime",
|
||||
"ofType": null
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "error",
|
||||
"description": null,
|
||||
@@ -10731,6 +10775,18 @@
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "parentBuild",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "OBJECT",
|
||||
"name": "Build",
|
||||
"ofType": null
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "platform",
|
||||
"description": null,
|
||||
@@ -10779,6 +10835,18 @@
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "provisioningStartedAt",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "SCALAR",
|
||||
"name": "DateTime",
|
||||
"ofType": null
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "queuePosition",
|
||||
"description": "Queue position is 1-indexed",
|
||||
@@ -10883,6 +10951,22 @@
|
||||
"name": "updatedAt",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "NON_NULL",
|
||||
"name": null,
|
||||
"ofType": {
|
||||
"kind": "SCALAR",
|
||||
"name": "DateTime",
|
||||
"ofType": null
|
||||
}
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "workerStartedAt",
|
||||
"description": null,
|
||||
"args": [],
|
||||
"type": {
|
||||
"kind": "SCALAR",
|
||||
"name": "DateTime",
|
||||
@@ -12330,6 +12414,39 @@
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
},
|
||||
{
|
||||
"name": "retryBuild",
|
||||
"description": "Retry an EAS Build build",
|
||||
"args": [
|
||||
{
|
||||
"name": "buildId",
|
||||
"description": null,
|
||||
"type": {
|
||||
"kind": "NON_NULL",
|
||||
"name": null,
|
||||
"ofType": {
|
||||
"kind": "SCALAR",
|
||||
"name": "ID",
|
||||
"ofType": null
|
||||
}
|
||||
},
|
||||
"defaultValue": null,
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
}
|
||||
],
|
||||
"type": {
|
||||
"kind": "NON_NULL",
|
||||
"name": null,
|
||||
"ofType": {
|
||||
"kind": "OBJECT",
|
||||
"name": "Build",
|
||||
"ofType": null
|
||||
}
|
||||
},
|
||||
"isDeprecated": false,
|
||||
"deprecationReason": null
|
||||
}
|
||||
],
|
||||
"inputFields": null,
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "eas-cli",
|
||||
"description": "EAS command line tool",
|
||||
"version": "0.53.1",
|
||||
"version": "0.54.1",
|
||||
"author": "Expo <[email protected]>",
|
||||
"bin": {
|
||||
"eas": "./bin/run"
|
||||
@@ -13,8 +13,8 @@
|
||||
"@expo/config": "6.0.23",
|
||||
"@expo/config-plugins": "4.1.4",
|
||||
"@expo/config-types": "45.0.0",
|
||||
"@expo/eas-build-job": "0.2.72",
|
||||
"@expo/eas-json": "0.53.1",
|
||||
"@expo/eas-build-job": "0.2.77",
|
||||
"@expo/eas-json": "0.54.0",
|
||||
"@expo/json-file": "8.2.36",
|
||||
"@expo/multipart-body-parser": "1.1.0",
|
||||
"@expo/pkcs12": "0.0.8",
|
||||
@@ -61,6 +61,7 @@
|
||||
"nullthrows": "1.1.1",
|
||||
"ora": "5.1.0",
|
||||
"pkg-dir": "4.2.0",
|
||||
"promise-limit": "2.7.0",
|
||||
"prompts": "2.4.2",
|
||||
"qrcode-terminal": "0.12.0",
|
||||
"resolve-from": "5.0.0",
|
||||
@@ -110,7 +111,8 @@
|
||||
"files": [
|
||||
"/bin",
|
||||
"/build",
|
||||
"/oclif.manifest.json"
|
||||
"/oclif.manifest.json",
|
||||
"/schema"
|
||||
],
|
||||
"homepage": "https://github.com/expo/eas-cli",
|
||||
"keywords": [
|
||||
@@ -143,6 +145,9 @@
|
||||
"device": {
|
||||
"description": "manage Apple devices for Internal Distribution"
|
||||
},
|
||||
"metadata": {
|
||||
"description": "manage store configuration"
|
||||
},
|
||||
"project": {
|
||||
"description": "manage project"
|
||||
},
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Platform, Workflow } from '@expo/eas-build-job';
|
||||
import { BuildProfile, SubmitProfile } from '@expo/eas-json';
|
||||
import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
|
||||
import chalk from 'chalk';
|
||||
import nullthrows from 'nullthrows';
|
||||
|
||||
@@ -57,11 +57,12 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
|
||||
projectDir,
|
||||
nonInteractive: flags.nonInteractive,
|
||||
});
|
||||
const easJsonReader = new EasJsonReader(projectDir);
|
||||
|
||||
const platforms = toPlatforms(flags.requestedPlatform);
|
||||
const buildProfiles = await getProfilesAsync({
|
||||
type: 'build',
|
||||
projectDir,
|
||||
easJsonReader,
|
||||
platforms,
|
||||
profileName: flags.profile ?? undefined,
|
||||
});
|
||||
@@ -102,7 +103,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
|
||||
const submissions: SubmissionFragment[] = [];
|
||||
if (flags.autoSubmit) {
|
||||
const submitProfiles = await getProfilesAsync({
|
||||
projectDir,
|
||||
easJsonReader,
|
||||
platforms,
|
||||
profileName: flags.submitProfile,
|
||||
type: 'submit',
|
||||
|
||||
@@ -35,3 +35,16 @@ export function getInternalDistributionInstallUrl(build: BuildFragment): string
|
||||
|
||||
return build.artifacts.buildUrl;
|
||||
}
|
||||
|
||||
export function getUpdateGroupUrl(
|
||||
accountName: string,
|
||||
projectName: string,
|
||||
updateGroupId: string
|
||||
): string {
|
||||
return new URL(
|
||||
`/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
|
||||
projectName
|
||||
)}/updates/${encodeURIComponent(updateGroupId)}`,
|
||||
getExpoWebsiteBaseUrl()
|
||||
).toString();
|
||||
}
|
||||
@@ -1,21 +1,12 @@
|
||||
import { EasJsonReader } from '@expo/eas-json';
|
||||
import { Errors, Flags } from '@oclif/core';
|
||||
import chalk from 'chalk';
|
||||
import figures from 'figures';
|
||||
import fs from 'fs-extra';
|
||||
import path from 'path';
|
||||
|
||||
import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
|
||||
import { ensureRepoIsCleanAsync, reviewAndCommitChangesAsync } from '../../build/utils/repository';
|
||||
import EasCommand from '../../commandUtils/EasCommand';
|
||||
import Log, { learnMore, link } from '../../log';
|
||||
import Log from '../../log';
|
||||
import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
|
||||
import { findProjectRootAsync } from '../../project/projectUtils';
|
||||
import { selectAsync } from '../../prompts';
|
||||
import { easCliVersion } from '../../utils/easCli';
|
||||
import { enableJsonOutput } from '../../utils/json';
|
||||
import { getVcsClient, setVcsClient } from '../../vcs';
|
||||
import GitClient from '../../vcs/clients/git';
|
||||
|
||||
interface RawBuildFlags {
|
||||
platform?: string;
|
||||
@@ -98,7 +89,6 @@ export default class Build extends EasCommand {
|
||||
const flags = await this.sanitizeFlagsAsync(rawFlags);
|
||||
|
||||
const projectDir = await findProjectRootAsync();
|
||||
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
|
||||
|
||||
await runBuildAndSubmitAsync(projectDir, flags);
|
||||
}
|
||||
@@ -168,67 +158,3 @@ export default class Build extends EasCommand {
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
export async function handleDeprecatedEasJsonAsync(
|
||||
projectDir: string,
|
||||
nonInteractive: boolean
|
||||
): Promise<void> {
|
||||
const easJsonPath = EasJsonReader.formatEasJsonPath(projectDir);
|
||||
if (!(await fs.pathExists(easJsonPath))) {
|
||||
return;
|
||||
}
|
||||
const easJsonReader = new EasJsonReader(projectDir);
|
||||
const rawEasJson = await easJsonReader.readAsync();
|
||||
if (rawEasJson?.cli) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (nonInteractive) {
|
||||
Log.warn(
|
||||
`${
|
||||
figures.warning
|
||||
} Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
|
||||
'https://expo.fyi/eas-vcs-workflow'
|
||||
)} for more information.`
|
||||
);
|
||||
Log.warn(
|
||||
'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
|
||||
);
|
||||
setVcsClient(new GitClient());
|
||||
return;
|
||||
}
|
||||
Log.log(
|
||||
`${chalk.bold(
|
||||
'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
|
||||
)} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
|
||||
);
|
||||
Log.log(
|
||||
`If you want to continue using the Git integration, you can opt in with ${chalk.bold(
|
||||
'cli.requireCommit'
|
||||
)} in ${chalk.bold('eas.json')} or with the following prompt.`
|
||||
);
|
||||
Log.newLine();
|
||||
|
||||
const mode = await selectAsync('Select your preferred Git integration', [
|
||||
{ title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
|
||||
{ title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
|
||||
]);
|
||||
|
||||
if (mode === 'requireCommit') {
|
||||
setVcsClient(new GitClient());
|
||||
await ensureRepoIsCleanAsync(nonInteractive);
|
||||
}
|
||||
|
||||
rawEasJson.cli =
|
||||
mode === 'requireCommit'
|
||||
? { version: `>= ${easCliVersion}`, requireCommit: true }
|
||||
: { version: `>= ${easCliVersion}` };
|
||||
await fs.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
|
||||
Log.withTick('Updated eas.json');
|
||||
if (mode === 'requireCommit') {
|
||||
await getVcsClient().trackFileAsync(easJsonPath);
|
||||
await reviewAndCommitChangesAsync('Set cli.requireCommit to true in eas.json', {
|
||||
nonInteractive,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,6 @@ import { appPlatformEmojis } from '../platform';
|
||||
import { getExpoConfig } from '../project/expoConfig';
|
||||
import { findProjectRootAsync } from '../project/projectUtils';
|
||||
import { selectAsync } from '../prompts';
|
||||
import { handleDeprecatedEasJsonAsync } from './build';
|
||||
|
||||
export default class Config extends EasCommand {
|
||||
static description = 'display project configuration (app.json + eas.json)';
|
||||
@@ -31,7 +30,6 @@ export default class Config extends EasCommand {
|
||||
};
|
||||
|
||||
const projectDir = await findProjectRootAsync();
|
||||
await handleDeprecatedEasJsonAsync(projectDir, false);
|
||||
|
||||
const reader = new EasJsonReader(projectDir);
|
||||
const profileName =
|
||||
|
||||
@@ -0,0 +1,64 @@
|
||||
import { getConfig } from '@expo/config';
|
||||
import { Flags } from '@oclif/core';
|
||||
import chalk from 'chalk';
|
||||
import path from 'path';
|
||||
|
||||
import { ensureProjectConfiguredAsync } from '../../build/configure';
|
||||
import EasCommand from '../../commandUtils/EasCommand';
|
||||
import { CredentialsContext } from '../../credentials/context';
|
||||
import Log, { learnMore } from '../../log';
|
||||
import { createMetadataContextAsync } from '../../metadata/context';
|
||||
import { downloadMetadataAsync } from '../../metadata/download';
|
||||
import { handleMetadataError } from '../../metadata/errors';
|
||||
import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
|
||||
import { ensureLoggedInAsync } from '../../user/actions';
|
||||
|
||||
export default class MetadataPull extends EasCommand {
|
||||
static description = 'generate the local store configuration from the app stores';
|
||||
|
||||
static flags = {
|
||||
profile: Flags.string({
|
||||
description:
|
||||
'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
|
||||
}),
|
||||
};
|
||||
|
||||
async runAsync(): Promise<void> {
|
||||
Log.warn('EAS Metadata is in beta and subject to breaking changes.');
|
||||
|
||||
const { flags } = await this.parse(MetadataPull);
|
||||
const projectDir = await findProjectRootAsync();
|
||||
const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
|
||||
await getProjectIdAsync(exp);
|
||||
await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
|
||||
|
||||
const credentialsCtx = new CredentialsContext({
|
||||
exp,
|
||||
projectDir,
|
||||
user: await ensureLoggedInAsync(),
|
||||
nonInteractive: false,
|
||||
});
|
||||
|
||||
const metadataCtx = await createMetadataContextAsync({
|
||||
credentialsCtx,
|
||||
projectDir,
|
||||
exp,
|
||||
profileName: flags.profile,
|
||||
});
|
||||
|
||||
try {
|
||||
const filePath = await downloadMetadataAsync(metadataCtx);
|
||||
const relativePath = path.relative(process.cwd(), filePath);
|
||||
|
||||
Log.addNewLineIfNone();
|
||||
Log.log(`🎉 Your store configuration 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.
|
||||
- ${learnMore('https://docs.expo.dev/eas-metadata/introduction/')}`);
|
||||
} catch (error: any) {
|
||||
handleMetadataError(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
import { getConfig } from '@expo/config';
|
||||
import { Flags } from '@oclif/core';
|
||||
|
||||
import { ensureProjectConfiguredAsync } from '../../build/configure';
|
||||
import EasCommand from '../../commandUtils/EasCommand';
|
||||
import { CredentialsContext } from '../../credentials/context';
|
||||
import Log, { learnMore } from '../../log';
|
||||
import { createMetadataContextAsync } from '../../metadata/context';
|
||||
import { handleMetadataError } from '../../metadata/errors';
|
||||
import { uploadMetadataAsync } from '../../metadata/upload';
|
||||
import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
|
||||
import { ensureLoggedInAsync } from '../../user/actions';
|
||||
|
||||
export default class MetadataPush extends EasCommand {
|
||||
static description = 'sync the local store configuration to the app stores';
|
||||
|
||||
static flags = {
|
||||
profile: Flags.string({
|
||||
description:
|
||||
'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
|
||||
}),
|
||||
};
|
||||
|
||||
async runAsync(): Promise<void> {
|
||||
Log.warn('EAS Metadata is in beta and subject to breaking changes.');
|
||||
|
||||
const { flags } = await this.parse(MetadataPush);
|
||||
const projectDir = await findProjectRootAsync();
|
||||
const { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
|
||||
await getProjectIdAsync(exp);
|
||||
await ensureProjectConfiguredAsync({ projectDir, nonInteractive: false });
|
||||
|
||||
const credentialsCtx = new CredentialsContext({
|
||||
exp,
|
||||
projectDir,
|
||||
user: await ensureLoggedInAsync(),
|
||||
nonInteractive: false,
|
||||
});
|
||||
|
||||
const metadataCtx = await createMetadataContextAsync({
|
||||
credentialsCtx,
|
||||
projectDir,
|
||||
exp,
|
||||
profileName: flags.profile,
|
||||
});
|
||||
|
||||
try {
|
||||
const { appleLink } = await uploadMetadataAsync(metadataCtx);
|
||||
Log.addNewLineIfNone();
|
||||
Log.log(`🎉 Store configuration is synced with the app stores.
|
||||
|
||||
${learnMore(appleLink, { learnMoreMessage: 'See the changes in App Store Connect' })}`);
|
||||
} catch (error: any) {
|
||||
handleMetadataError(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { EasJsonReader } from '@expo/eas-json';
|
||||
import { Errors, Flags } from '@oclif/core';
|
||||
import chalk from 'chalk';
|
||||
|
||||
@@ -95,7 +96,7 @@ export default class Submit extends EasCommand {
|
||||
const platforms = toPlatforms(flags.requestedPlatform);
|
||||
const submissionProfiles = await getProfilesAsync({
|
||||
type: 'submit',
|
||||
projectDir,
|
||||
easJsonReader: new EasJsonReader(projectDir),
|
||||
platforms,
|
||||
profileName: flags.profile,
|
||||
});
|
||||
|
||||
@@ -9,6 +9,7 @@ import gql from 'graphql-tag';
|
||||
import nullthrows from 'nullthrows';
|
||||
|
||||
import { getEASUpdateURL } from '../../api';
|
||||
import { getUpdateGroupUrl } from '../../build/utils/url';
|
||||
import EasCommand from '../../commandUtils/EasCommand';
|
||||
import fetch from '../../fetch';
|
||||
import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
|
||||
@@ -25,11 +26,12 @@ import {
|
||||
} from '../../graphql/generated';
|
||||
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
|
||||
import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
|
||||
import Log from '../../log';
|
||||
import Log, { link } from '../../log';
|
||||
import { ora } from '../../ora';
|
||||
import { getExpoConfig } from '../../project/expoConfig';
|
||||
import {
|
||||
findProjectRootAsync,
|
||||
getProjectAccountName,
|
||||
getProjectIdAsync,
|
||||
installExpoUpdatesAsync,
|
||||
isExpoUpdatesInstalledOrAvailable,
|
||||
@@ -44,6 +46,7 @@ import {
|
||||
import { resolveWorkflowAsync } from '../../project/workflow';
|
||||
import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
|
||||
import { formatUpdate } from '../../update/utils';
|
||||
import { ensureLoggedInAsync } from '../../user/actions';
|
||||
import {
|
||||
checkManifestBodyAgainstUpdateInfoGroup,
|
||||
getCodeSigningInfoAsync,
|
||||
@@ -59,7 +62,7 @@ import { listBranchesAsync } from '../branch/list';
|
||||
import { createUpdateChannelOnAppAsync } from '../channel/create';
|
||||
|
||||
export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
|
||||
type PlatformFlag = PublishPlatform | 'all';
|
||||
export type PublishPlatformFlag = PublishPlatform | 'all';
|
||||
|
||||
async function getUpdateGroupAsync({
|
||||
group,
|
||||
@@ -117,12 +120,16 @@ async function ensureChannelExistsAsync({
|
||||
}
|
||||
}
|
||||
|
||||
async function ensureBranchExistsAsync({
|
||||
export async function ensureBranchExistsAsync({
|
||||
appId,
|
||||
name: branchName,
|
||||
limit,
|
||||
offset,
|
||||
}: {
|
||||
appId: string;
|
||||
name: string;
|
||||
limit?: number;
|
||||
offset?: number;
|
||||
}): Promise<{
|
||||
id: string;
|
||||
updates: Exclude<
|
||||
@@ -133,6 +140,8 @@ async function ensureBranchExistsAsync({
|
||||
const { app } = await UpdateQuery.viewBranchAsync({
|
||||
appId,
|
||||
name: branchName,
|
||||
limit,
|
||||
offset,
|
||||
});
|
||||
const updateBranch = app?.byId.updateBranchByName;
|
||||
if (updateBranch) {
|
||||
@@ -221,7 +230,7 @@ export default class UpdatePublish extends EasCommand {
|
||||
enableJsonOutput();
|
||||
}
|
||||
|
||||
const platformFlag = platform as PlatformFlag;
|
||||
const platformFlag = platform as PublishPlatformFlag;
|
||||
// If a group was specified, that means we are republishing it.
|
||||
republish = group ? true : republish;
|
||||
|
||||
@@ -309,13 +318,10 @@ export default class UpdatePublish extends EasCommand {
|
||||
assert(branchName, 'Branch name must be specified.');
|
||||
}
|
||||
|
||||
const { id: branchId, updates } = await ensureBranchExistsAsync({
|
||||
appId: projectId,
|
||||
name: branchName,
|
||||
});
|
||||
|
||||
let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
|
||||
let oldMessage: string, oldRuntimeVersion: string;
|
||||
let uploadedAssetCount = 0;
|
||||
|
||||
if (republish) {
|
||||
// If we are republishing, we don't need to worry about building the bundle or uploading the assets.
|
||||
// Instead we get the `updateInfoGroup` from the update we wish to republish.
|
||||
@@ -335,26 +341,12 @@ export default class UpdatePublish extends EasCommand {
|
||||
throw new Error('You must specify the update group to republish.');
|
||||
}
|
||||
|
||||
const updateGroups = uniqBy(updates, u => u.group)
|
||||
.filter(update => {
|
||||
// Only show groups that have updates on the specified platform(s).
|
||||
return platformFlag === 'all' || update.platform === platformFlag;
|
||||
})
|
||||
.map(update => ({
|
||||
title: formatUpdateTitle(update),
|
||||
value: update.group,
|
||||
}));
|
||||
if (updateGroups.length === 0) {
|
||||
throw new Error(
|
||||
`There are no updates on branch "${branchName}" published on the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
|
||||
);
|
||||
}
|
||||
|
||||
const selectedUpdateGroup = await selectAsync<string>(
|
||||
'which update would you like to republish?',
|
||||
updateGroups
|
||||
updatesToRepublish = await getUpdatesToRepublishInteractiveAsync(
|
||||
projectId,
|
||||
branchName,
|
||||
platformFlag,
|
||||
50
|
||||
);
|
||||
updatesToRepublish = updates.filter(update => update.group === selectedUpdateGroup);
|
||||
}
|
||||
const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
|
||||
// Only republish to the specified platforms
|
||||
@@ -362,7 +354,7 @@ export default class UpdatePublish extends EasCommand {
|
||||
);
|
||||
if (updatesToRepublishFilteredByPlatform.length === 0) {
|
||||
throw new Error(
|
||||
`There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
|
||||
`There are no updates on branch "${branchName}" published for the platform(s) "${platformFlag}" with group ID "${
|
||||
group ? group : updatesToRepublish[0].group
|
||||
}". Did you mean to publish a new update instead?`
|
||||
);
|
||||
@@ -449,9 +441,16 @@ export default class UpdatePublish extends EasCommand {
|
||||
try {
|
||||
const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
|
||||
const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
|
||||
await uploadAssetsAsync(assets);
|
||||
const { uniqueUploadedAssetCount } = await uploadAssetsAsync(
|
||||
assets,
|
||||
spinnerText => (assetSpinner.text = `Uploading assets... ${spinnerText}`)
|
||||
);
|
||||
uploadedAssetCount = uniqueUploadedAssetCount;
|
||||
unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
|
||||
assetSpinner.succeed('Uploaded assets!');
|
||||
const uploadAssetSuccessMessage = uploadedAssetCount
|
||||
? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'asset' : 'assets'}!`
|
||||
: `Uploading assets skipped -- no new assets found!`;
|
||||
assetSpinner.succeed(uploadAssetSuccessMessage);
|
||||
} catch (e) {
|
||||
assetSpinner.fail('Failed to upload assets');
|
||||
throw e;
|
||||
@@ -465,6 +464,12 @@ export default class UpdatePublish extends EasCommand {
|
||||
.map(pair => pair[0]);
|
||||
}
|
||||
|
||||
const { id: branchId } = await ensureBranchExistsAsync({
|
||||
appId: projectId,
|
||||
name: branchName,
|
||||
limit: 0,
|
||||
});
|
||||
|
||||
// Sort the updates into different groups based on their platform specific runtime versions
|
||||
const updateGroups: PublishUpdateGroupInput[] = Object.entries(runtimeToPlatformMapping).map(
|
||||
([runtime, platforms]) => {
|
||||
@@ -554,20 +559,36 @@ export default class UpdatePublish extends EasCommand {
|
||||
|
||||
Log.addNewLineIfNone();
|
||||
for (const runtime of new Set(Object.values(runtimeVersions))) {
|
||||
const platforms = newUpdates
|
||||
.filter(update => update.runtimeVersion === runtime)
|
||||
.map(update => update.platform);
|
||||
const newUpdate = newUpdates.find(update => update.runtimeVersion === runtime);
|
||||
if (!newUpdate) {
|
||||
const newUpdatesForRuntimeVersion = newUpdates.filter(
|
||||
update => update.runtimeVersion === runtime
|
||||
);
|
||||
if (!newUpdatesForRuntimeVersion.length) {
|
||||
throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
|
||||
}
|
||||
const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
|
||||
const newAndroidUpdate = newUpdatesForRuntimeVersion.find(
|
||||
update => update.platform === 'android'
|
||||
);
|
||||
const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
|
||||
const updateGroupId = newUpdatesForRuntimeVersion[0].group;
|
||||
|
||||
const projectName = exp.slug;
|
||||
const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
|
||||
const updateGroupUrl = getUpdateGroupUrl(accountName, projectName, updateGroupId);
|
||||
const updateGroupLink = link(updateGroupUrl, { dim: false });
|
||||
|
||||
Log.log(
|
||||
formatFields([
|
||||
{ label: 'branch', value: branchName },
|
||||
{ label: 'runtime version', value: runtime },
|
||||
{ label: 'platform', value: platforms.join(', ') },
|
||||
{ label: 'update group ID', value: newUpdate.group },
|
||||
{ label: 'message', value: message! },
|
||||
{ label: 'Branch', value: branchName },
|
||||
{ label: 'Runtime version', value: runtime },
|
||||
{ label: 'Platform', value: platforms.join(', ') },
|
||||
{ label: 'Update group ID', value: updateGroupId },
|
||||
...(newAndroidUpdate
|
||||
? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
|
||||
: []),
|
||||
...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
|
||||
{ label: 'Message', value: message! },
|
||||
{ label: 'Website link', value: updateGroupLink },
|
||||
])
|
||||
);
|
||||
Log.addNewLineIfNone();
|
||||
@@ -576,9 +597,76 @@ export default class UpdatePublish extends EasCommand {
|
||||
}
|
||||
}
|
||||
|
||||
export async function getUpdatesToRepublishInteractiveAsync(
|
||||
projectId: string,
|
||||
branchName: string,
|
||||
platformFlag: string,
|
||||
pageSize: number,
|
||||
offset: number = 0,
|
||||
cumulativeUpdates: Exclude<
|
||||
Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
|
||||
null | undefined
|
||||
>['updates'] = []
|
||||
): Promise<
|
||||
Exclude<
|
||||
Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
|
||||
null | undefined
|
||||
>['updates']
|
||||
> {
|
||||
const fetchMoreValue = '_fetchMore';
|
||||
|
||||
const { updates } = await ensureBranchExistsAsync({
|
||||
appId: projectId,
|
||||
name: branchName,
|
||||
limit: pageSize + 1, // fetch an extra item so we know if there are additional pages
|
||||
offset,
|
||||
});
|
||||
cumulativeUpdates = [
|
||||
...cumulativeUpdates,
|
||||
// drop that extra item used for pagination from our render logic
|
||||
...updates.slice(0, updates.length - 1),
|
||||
];
|
||||
const cumulativeUpdatesForTargetPlatforms =
|
||||
platformFlag === 'all'
|
||||
? cumulativeUpdates
|
||||
: cumulativeUpdates.filter(update => {
|
||||
// Only show groups that have updates on the specified platform(s).
|
||||
return update.platform === platformFlag;
|
||||
});
|
||||
const updateGroups = uniqBy(cumulativeUpdatesForTargetPlatforms, u => u.group).map(update => ({
|
||||
title: formatUpdateTitle(update),
|
||||
value: update.group,
|
||||
}));
|
||||
if (!updateGroups.length) {
|
||||
throw new Error(
|
||||
`There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
|
||||
);
|
||||
}
|
||||
|
||||
if (updates.length > pageSize) {
|
||||
updateGroups.push({ title: 'Next page...', value: fetchMoreValue });
|
||||
}
|
||||
|
||||
const selectedUpdateGroup = await selectAsync<string>(
|
||||
'Which update would you like to republish?',
|
||||
updateGroups
|
||||
);
|
||||
if (selectedUpdateGroup === fetchMoreValue) {
|
||||
return await getUpdatesToRepublishInteractiveAsync(
|
||||
projectId,
|
||||
branchName,
|
||||
platformFlag,
|
||||
pageSize,
|
||||
offset + pageSize,
|
||||
cumulativeUpdates
|
||||
);
|
||||
}
|
||||
return cumulativeUpdates.filter(update => update.group === selectedUpdateGroup);
|
||||
}
|
||||
|
||||
async function getRuntimeVersionObjectAsync(
|
||||
exp: ExpoConfig,
|
||||
platformFlag: PlatformFlag,
|
||||
platformFlag: PublishPlatformFlag,
|
||||
projectDir: string
|
||||
): Promise<Record<string, string>> {
|
||||
const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
|
||||
|
||||
+21
-7
@@ -1564,10 +1564,13 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
|
||||
appVersion?: Maybe<Scalars['String']>;
|
||||
artifacts?: Maybe<BuildArtifacts>;
|
||||
buildProfile?: Maybe<Scalars['String']>;
|
||||
canRetry: Scalars['Boolean'];
|
||||
cancelingActor?: Maybe<Actor>;
|
||||
channel?: Maybe<Scalars['String']>;
|
||||
createdAt?: Maybe<Scalars['DateTime']>;
|
||||
completedAt?: Maybe<Scalars['DateTime']>;
|
||||
createdAt: Scalars['DateTime'];
|
||||
distribution?: Maybe<DistributionType>;
|
||||
enqueuedAt?: Maybe<Scalars['DateTime']>;
|
||||
error?: Maybe<BuildError>;
|
||||
estimatedWaitTimeLeftSeconds?: Maybe<Scalars['Int']>;
|
||||
expirationDate?: Maybe<Scalars['DateTime']>;
|
||||
@@ -1582,9 +1585,11 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
|
||||
isGitWorkingTreeDirty?: Maybe<Scalars['Boolean']>;
|
||||
logFiles: Array<Scalars['String']>;
|
||||
metrics?: Maybe<BuildMetrics>;
|
||||
parentBuild?: Maybe<Build>;
|
||||
platform: AppPlatform;
|
||||
priority: BuildPriority;
|
||||
project: Project;
|
||||
provisioningStartedAt?: Maybe<Scalars['DateTime']>;
|
||||
/** Queue position is 1-indexed */
|
||||
queuePosition?: Maybe<Scalars['Int']>;
|
||||
reactNativeVersion?: Maybe<Scalars['String']>;
|
||||
@@ -1593,7 +1598,8 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
|
||||
sdkVersion?: Maybe<Scalars['String']>;
|
||||
status: BuildStatus;
|
||||
submissions: Array<Submission>;
|
||||
updatedAt?: Maybe<Scalars['DateTime']>;
|
||||
updatedAt: Scalars['DateTime'];
|
||||
workerStartedAt?: Maybe<Scalars['DateTime']>;
|
||||
};
|
||||
|
||||
export type BuildArtifact = {
|
||||
@@ -1765,6 +1771,8 @@ export type BuildMutation = {
|
||||
createIosBuild: CreateBuildResult;
|
||||
/** Delete an EAS Build build */
|
||||
deleteBuild: Build;
|
||||
/** Retry an EAS Build build */
|
||||
retryBuild: Build;
|
||||
};
|
||||
|
||||
|
||||
@@ -1791,6 +1799,11 @@ export type BuildMutationDeleteBuildArgs = {
|
||||
buildId: Scalars['ID'];
|
||||
};
|
||||
|
||||
|
||||
export type BuildMutationRetryBuildArgs = {
|
||||
buildId: Scalars['ID'];
|
||||
};
|
||||
|
||||
export type BuildOrBuildJob = {
|
||||
id: Scalars['ID'];
|
||||
};
|
||||
@@ -4309,7 +4322,7 @@ export type CreateAndroidBuildMutationVariables = Exact<{
|
||||
}>;
|
||||
|
||||
|
||||
export type CreateAndroidBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createAndroidBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
|
||||
export type CreateAndroidBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createAndroidBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
|
||||
|
||||
export type CreateIosBuildMutationVariables = Exact<{
|
||||
appId: Scalars['ID'];
|
||||
@@ -4318,7 +4331,7 @@ export type CreateIosBuildMutationVariables = Exact<{
|
||||
}>;
|
||||
|
||||
|
||||
export type CreateIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createIosBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
|
||||
export type CreateIosBuildMutation = { __typename?: 'RootMutation', build: { __typename?: 'BuildMutation', createIosBuild: { __typename?: 'CreateBuildResult', build: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }, deprecationInfo?: { __typename?: 'EASBuildDeprecationInfo', type: EasBuildDeprecationInfoType, message: string } | null } } };
|
||||
|
||||
export type CreateEnvironmentSecretForAccountMutationVariables = Exact<{
|
||||
input: CreateEnvironmentSecretInput;
|
||||
@@ -4431,7 +4444,7 @@ export type BuildsByIdQueryVariables = Exact<{
|
||||
}>;
|
||||
|
||||
|
||||
export type BuildsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
|
||||
export type BuildsByIdQuery = { __typename?: 'RootQuery', builds: { __typename?: 'BuildQuery', byId: { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } } } };
|
||||
|
||||
export type GetAllBuildsForAppQueryVariables = Exact<{
|
||||
appId: Scalars['String'];
|
||||
@@ -4441,7 +4454,7 @@ export type GetAllBuildsForAppQueryVariables = Exact<{
|
||||
}>;
|
||||
|
||||
|
||||
export type GetAllBuildsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, builds: Array<{ __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }> } } };
|
||||
export type GetAllBuildsForAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, builds: Array<{ __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } }> } } };
|
||||
|
||||
export type GetChannelByNameForAppQueryVariables = Exact<{
|
||||
appId: Scalars['String'];
|
||||
@@ -4510,6 +4523,7 @@ export type ViewBranchUpdatesQueryVariables = Exact<{
|
||||
appId: Scalars['String'];
|
||||
name: Scalars['String'];
|
||||
limit: Scalars['Int'];
|
||||
offset: Scalars['Int'];
|
||||
}>;
|
||||
|
||||
|
||||
@@ -4537,7 +4551,7 @@ export type WebhookByIdQuery = { __typename?: 'RootQuery', webhook: { __typename
|
||||
|
||||
export type AppFragment = { __typename?: 'App', id: string, fullName: string, slug: string };
|
||||
|
||||
export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt?: any | null, updatedAt?: any | null, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
|
||||
export type BuildFragment = { __typename?: 'Build', id: string, status: BuildStatus, platform: AppPlatform, channel?: string | null, releaseChannel?: string | null, distribution?: DistributionType | null, iosEnterpriseProvisioning?: BuildIosEnterpriseProvisioning | null, buildProfile?: string | null, sdkVersion?: string | null, appVersion?: string | null, appBuildVersion?: string | null, runtimeVersion?: string | null, gitCommitHash?: string | null, initialQueuePosition?: number | null, queuePosition?: number | null, estimatedWaitTimeLeftSeconds?: number | null, priority: BuildPriority, createdAt: any, updatedAt: any, error?: { __typename?: 'BuildError', errorCode: string, message: string, docsUrl?: string | null } | null, artifacts?: { __typename?: 'BuildArtifacts', buildUrl?: string | null, xcodeBuildLogsUrl?: string | null } | null, initiatingActor?: { __typename: 'Robot', id: string, displayName: string } | { __typename: 'User', id: string, displayName: string } | null, project: { __typename: 'App', id: string, name: string, slug: string, ownerAccount: { __typename?: 'Account', id: string, name: string } } | { __typename: 'Snack', id: string, name: string, slug: string } };
|
||||
|
||||
export type EnvironmentSecretFragment = { __typename?: 'EnvironmentSecret', id: string, name: string, createdAt: any };
|
||||
|
||||
|
||||
@@ -8,7 +8,11 @@ import {
|
||||
ViewBranchUpdatesQueryVariables,
|
||||
} from '../generated';
|
||||
|
||||
const PAGE_LIMIT = 300;
|
||||
export const viewBranchUpdatesQueryUpdateLimit = 300;
|
||||
|
||||
type ViewBranchUpdatesQueryVariablesWithOptionalLimitAndOffset =
|
||||
Partial<ViewBranchUpdatesQueryVariables> &
|
||||
Pick<ViewBranchUpdatesQueryVariables, 'appId' | 'name'>;
|
||||
|
||||
export const UpdateQuery = {
|
||||
async viewAllAsync({ appId }: { appId: string }): Promise<ViewAllUpdatesQuery> {
|
||||
@@ -47,26 +51,31 @@ export const UpdateQuery = {
|
||||
`,
|
||||
{
|
||||
appId,
|
||||
limit: PAGE_LIMIT,
|
||||
limit: viewBranchUpdatesQueryUpdateLimit,
|
||||
},
|
||||
{ additionalTypenames: ['UpdateBranch', 'Update'] }
|
||||
)
|
||||
.toPromise()
|
||||
);
|
||||
},
|
||||
async viewBranchAsync({ appId, name }: Pick<ViewBranchUpdatesQueryVariables, 'appId' | 'name'>) {
|
||||
async viewBranchAsync({
|
||||
appId,
|
||||
name,
|
||||
limit = viewBranchUpdatesQueryUpdateLimit,
|
||||
offset = 0,
|
||||
}: ViewBranchUpdatesQueryVariablesWithOptionalLimitAndOffset) {
|
||||
return withErrorHandlingAsync<ViewBranchUpdatesQuery>(
|
||||
graphqlClient
|
||||
.query<ViewBranchUpdatesQuery, ViewBranchUpdatesQueryVariables>(
|
||||
gql`
|
||||
query ViewBranchUpdates($appId: String!, $name: String!, $limit: Int!) {
|
||||
query ViewBranchUpdates($appId: String!, $name: String!, $limit: Int!, $offset: Int!) {
|
||||
app {
|
||||
byId(appId: $appId) {
|
||||
id
|
||||
updateBranchByName(name: $name) {
|
||||
id
|
||||
name
|
||||
updates(offset: 0, limit: $limit) {
|
||||
updates(offset: $offset, limit: $limit) {
|
||||
id
|
||||
group
|
||||
message
|
||||
@@ -92,7 +101,8 @@ export const UpdateQuery = {
|
||||
{
|
||||
appId,
|
||||
name,
|
||||
limit: PAGE_LIMIT,
|
||||
limit,
|
||||
offset,
|
||||
},
|
||||
{ additionalTypenames: ['UpdateBranch', 'Update'] }
|
||||
)
|
||||
|
||||
@@ -7,7 +7,7 @@ import {
|
||||
ReleaseType,
|
||||
} from '@expo/apple-utils';
|
||||
|
||||
import { unique } from '../../utils/array';
|
||||
import uniq from '../../../utils/expodash/uniq';
|
||||
import { AttributesOf } from '../../utils/asc';
|
||||
import { removeDatePrecision } from '../../utils/date';
|
||||
import { AppleMetadata } from '../types';
|
||||
@@ -22,18 +22,18 @@ export const DEFAULT_WHATSNEW = 'Bug fixes and improved stability';
|
||||
* This uses version 0 of the config schema.
|
||||
*/
|
||||
export class AppleConfigReader {
|
||||
constructor(public readonly schema: AppleMetadata) {}
|
||||
public constructor(public readonly schema: AppleMetadata) {}
|
||||
|
||||
getAgeRating(): Partial<AttributesOf<AgeRatingDeclaration>> | null {
|
||||
public getAgeRating(): Partial<AttributesOf<AgeRatingDeclaration>> | null {
|
||||
return this.schema.advisory || null;
|
||||
}
|
||||
|
||||
getLocales(): string[] {
|
||||
public getLocales(): string[] {
|
||||
// TODO: filter "default" locales, add option to add non-localized info to the config
|
||||
return unique(Object.keys(this.schema.info || {}));
|
||||
return uniq(Object.keys(this.schema.info || {}));
|
||||
}
|
||||
|
||||
getInfoLocale(
|
||||
public getInfoLocale(
|
||||
locale: string
|
||||
): PartialExcept<AttributesOf<AppInfoLocalization>, 'locale' | 'name'> | null {
|
||||
const info = this.schema.info?.[locale];
|
||||
@@ -43,7 +43,7 @@ export class AppleConfigReader {
|
||||
|
||||
return {
|
||||
locale,
|
||||
name: info.title || 'no name provided',
|
||||
name: info.title ?? 'no name provided',
|
||||
subtitle: info.subtitle,
|
||||
privacyChoicesUrl: info.privacyChoicesUrl,
|
||||
privacyPolicyText: info.privacyPolicyText,
|
||||
@@ -51,7 +51,7 @@ export class AppleConfigReader {
|
||||
};
|
||||
}
|
||||
|
||||
getCategories(): CategoryIds | null {
|
||||
public getCategories(): CategoryIds | null {
|
||||
if (Array.isArray(this.schema.categories) && this.schema.categories.length > 0) {
|
||||
return {
|
||||
primaryCategory: this.schema.categories[0],
|
||||
@@ -63,13 +63,13 @@ export class AppleConfigReader {
|
||||
}
|
||||
|
||||
/** Get the `AppStoreVersion` object. */
|
||||
getVersion(): Partial<
|
||||
public getVersion(): Partial<
|
||||
Omit<AttributesOf<AppStoreVersion>, 'releaseType' | 'earliestReleaseDate'>
|
||||
> | null {
|
||||
return this.schema.copyright ? { copyright: this.schema.copyright } : null;
|
||||
}
|
||||
|
||||
getVersionRelease(): Partial<
|
||||
public getVersionRelease(): Partial<
|
||||
Pick<AttributesOf<AppStoreVersion>, 'releaseType' | 'earliestReleaseDate'>
|
||||
> | null {
|
||||
const { release } = this.schema;
|
||||
@@ -99,7 +99,7 @@ export class AppleConfigReader {
|
||||
return null;
|
||||
}
|
||||
|
||||
getVersionLocale(
|
||||
public getVersionLocale(
|
||||
locale: string,
|
||||
context: { versionIsFirst: boolean }
|
||||
): Partial<AttributesOf<AppStoreVersionLocalization>> | null {
|
||||
|
||||
@@ -18,18 +18,18 @@ export class AppleConfigWriter {
|
||||
constructor(public readonly schema: Partial<AppleMetadata> = {}) {}
|
||||
|
||||
/** Get the schema result to write it to the config file */
|
||||
toSchema(): { configVersion: number; apple: Partial<AppleMetadata> } {
|
||||
public toSchema(): { configVersion: number; apple: Partial<AppleMetadata> } {
|
||||
return {
|
||||
configVersion: 0,
|
||||
apple: this.schema,
|
||||
};
|
||||
}
|
||||
|
||||
setAgeRating(attributes: AttributesOf<AgeRatingDeclaration>): void {
|
||||
public setAgeRating(attributes: AttributesOf<AgeRatingDeclaration>): void {
|
||||
this.schema.advisory = attributes;
|
||||
}
|
||||
|
||||
setInfoLocale(attributes: AttributesOf<AppInfoLocalization>): void {
|
||||
public setInfoLocale(attributes: AttributesOf<AppInfoLocalization>): void {
|
||||
this.schema.info = this.schema.info ?? {};
|
||||
const existing = this.schema.info[attributes.locale] ?? {};
|
||||
|
||||
@@ -43,7 +43,7 @@ export class AppleConfigWriter {
|
||||
};
|
||||
}
|
||||
|
||||
setCategories({ primaryCategory, secondaryCategory }: AttributesOf<AppInfo>): void {
|
||||
public setCategories({ primaryCategory, secondaryCategory }: AttributesOf<AppInfo>): void {
|
||||
this.schema.categories = [];
|
||||
|
||||
// TODO: see why these types are conflicting
|
||||
@@ -55,13 +55,13 @@ export class AppleConfigWriter {
|
||||
}
|
||||
}
|
||||
|
||||
setVersion(
|
||||
public setVersion(
|
||||
attributes: Omit<AttributesOf<AppStoreVersion>, 'releaseType' | 'earliestReleaseDate'>
|
||||
): void {
|
||||
this.schema.copyright = optional(attributes.copyright);
|
||||
}
|
||||
|
||||
setVersionRelease(
|
||||
public setVersionRelease(
|
||||
attributes: Pick<AttributesOf<AppStoreVersion>, 'releaseType' | 'earliestReleaseDate'>
|
||||
): void {
|
||||
if (attributes.releaseType === ReleaseType.SCHEDULED) {
|
||||
@@ -83,7 +83,7 @@ export class AppleConfigWriter {
|
||||
}
|
||||
}
|
||||
|
||||
setVersionLocale(attributes: AttributesOf<AppStoreVersionLocalization>): void {
|
||||
public setVersionLocale(attributes: AttributesOf<AppStoreVersionLocalization>): void {
|
||||
this.schema.info = this.schema.info ?? {};
|
||||
const existing = this.schema.info[attributes.locale] ?? {};
|
||||
|
||||
|
||||
@@ -4,16 +4,16 @@ import { AppleData, PartialAppleData } from './data';
|
||||
|
||||
export abstract class AppleTask {
|
||||
/** Get a description from the task to use as section headings in the log */
|
||||
abstract name(): string;
|
||||
public abstract name(): string;
|
||||
|
||||
/** Prepare the data from the App Store to start syncing with the store configuration */
|
||||
abstract prepareAsync(options: TaskPrepareOptions): Promise<void>;
|
||||
public abstract prepareAsync(options: TaskPrepareOptions): Promise<void>;
|
||||
|
||||
/** Download all information from the App Store to generate the store configuration */
|
||||
abstract downloadAsync(options: TaskDownloadOptions): Promise<void>;
|
||||
public abstract downloadAsync(options: TaskDownloadOptions): Promise<void>;
|
||||
|
||||
/** Upload all information from the store configuration to the App Store */
|
||||
abstract uploadAsync(options: TaskUploadOptions): Promise<void>;
|
||||
public abstract uploadAsync(options: TaskUploadOptions): Promise<void>;
|
||||
}
|
||||
|
||||
export type TaskPrepareOptions = {
|
||||
|
||||
@@ -12,20 +12,20 @@ export type AgeRatingData = {
|
||||
};
|
||||
|
||||
export class AgeRatingTask extends AppleTask {
|
||||
name = (): string => 'age rating declarations';
|
||||
public name = (): string => 'age rating declarations';
|
||||
|
||||
async prepareAsync({ context }: TaskPrepareOptions): Promise<void> {
|
||||
public async prepareAsync({ context }: TaskPrepareOptions): Promise<void> {
|
||||
assert(context.version, `App version information is not prepared, can't update age rating`);
|
||||
context.ageRating = (await context.version.getAgeRatingDeclarationAsync()) || undefined;
|
||||
}
|
||||
|
||||
async downloadAsync({ config, context }: TaskDownloadOptions): Promise<void> {
|
||||
public async downloadAsync({ config, context }: TaskDownloadOptions): Promise<void> {
|
||||
if (context.ageRating) {
|
||||
config.setAgeRating(context.ageRating.attributes);
|
||||
}
|
||||
}
|
||||
|
||||
async uploadAsync({ config, context }: TaskUploadOptions): Promise<void> {
|
||||
public async uploadAsync({ config, context }: TaskUploadOptions): Promise<void> {
|
||||
assert(context.ageRating, `Age rating not initialized, can't update age rating`);
|
||||
|
||||
const ageRating = config.getAgeRating();
|
||||
|
||||
@@ -15,9 +15,9 @@ export type AppInfoData = {
|
||||
};
|
||||
|
||||
export class AppInfoTask extends AppleTask {
|
||||
name = (): string => 'app information';
|
||||
public name = (): string => 'app information';
|
||||
|
||||
async prepareAsync({ context }: TaskPrepareOptions): Promise<void> {
|
||||
public async prepareAsync({ context }: TaskPrepareOptions): Promise<void> {
|
||||
const info = await retryIfNullAsync(() => context.app.getEditAppInfoAsync());
|
||||
assert(info, 'Could not resolve the editable app info to update');
|
||||
|
||||
@@ -25,7 +25,7 @@ export class AppInfoTask extends AppleTask {
|
||||
context.infoLocales = await info.getLocalizationsAsync();
|
||||
}
|
||||
|
||||
async downloadAsync({ config, context }: TaskDownloadOptions): Promise<void> {
|
||||
public async downloadAsync({ config, context }: TaskDownloadOptions): Promise<void> {
|
||||
assert(context.info, `App info not initialized, can't download info`);
|
||||
|
||||
config.setCategories(context.info.attributes);
|
||||
@@ -35,7 +35,7 @@ export class AppInfoTask extends AppleTask {
|
||||
}
|
||||
}
|
||||
|
||||
async uploadAsync({ config, context }: TaskUploadOptions): Promise<void> {
|
||||
public async uploadAsync({ config, context }: TaskUploadOptions): Promise<void> {
|
||||
assert(context.info, `App info not initialized, can't update info`);
|
||||
|
||||
const categories = config.getCategories();
|
||||
@@ -68,14 +68,19 @@ export class AppInfoTask extends AppleTask {
|
||||
|
||||
const model = context.infoLocales.find(model => model.attributes.locale === locale);
|
||||
await logAsync(
|
||||
() =>
|
||||
model
|
||||
? model.updateAsync(attributes)
|
||||
: context.info.createLocalizationAsync({ ...attributes, locale }),
|
||||
async () => {
|
||||
return model
|
||||
? await model.updateAsync(attributes)
|
||||
: await context.info.createLocalizationAsync({ ...attributes, locale });
|
||||
},
|
||||
{
|
||||
pending: `${model ? 'Updating' : 'Creating'} localized info for ${locale}...`,
|
||||
success: `${model ? 'Updated' : 'Created'} localized info for ${locale}`,
|
||||
failure: `Failed ${model ? 'updating' : 'creating'} localized info for ${locale}`,
|
||||
pending: `${model ? 'Updating' : 'Creating'} localized info for ${chalk.bold(
|
||||
locale
|
||||
)}...`,
|
||||
success: `${model ? 'Updated' : 'Created'} localized info for ${chalk.bold(locale)}`,
|
||||
failure: `Failed ${model ? 'updating' : 'creating'} localized info for ${chalk.bold(
|
||||
locale
|
||||
)}`,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -28,17 +28,17 @@ export type AppVersionData = {
|
||||
export class AppVersionTask extends AppleTask {
|
||||
private options: AppVersionOptions;
|
||||
|
||||
constructor(options: Partial<AppVersionOptions> = {}) {
|
||||
public constructor(options: Partial<AppVersionOptions> = {}) {
|
||||
super();
|
||||
this.options = {
|
||||
platform: options.platform || Platform.IOS,
|
||||
editLive: options.editLive || false,
|
||||
platform: options.platform ?? Platform.IOS,
|
||||
editLive: options.editLive ?? false,
|
||||
};
|
||||
}
|
||||
|
||||
name = (): string => (this.options.editLive ? 'live app version' : 'editable app version');
|
||||
public name = (): string => (this.options.editLive ? 'live app version' : 'editable app version');
|
||||
|
||||
async prepareAsync({ context }: TaskPrepareOptions): Promise<void> {
|
||||
public async prepareAsync({ context }: TaskPrepareOptions): Promise<void> {
|
||||
const { version, versionIsFirst, versionIsLive } = await resolveVersionAsync(
|
||||
context.app,
|
||||
this.options
|
||||
@@ -52,7 +52,7 @@ export class AppVersionTask extends AppleTask {
|
||||
context.versionLocales = await version.getLocalizationsAsync();
|
||||
}
|
||||
|
||||
async downloadAsync({ config, context }: TaskDownloadOptions): Promise<void> {
|
||||
public async downloadAsync({ config, context }: TaskDownloadOptions): Promise<void> {
|
||||
assert(context.version, `App version not initialized, can't download version`);
|
||||
|
||||
config.setVersion(context.version.attributes);
|
||||
@@ -63,7 +63,7 @@ export class AppVersionTask extends AppleTask {
|
||||
}
|
||||
}
|
||||
|
||||
async uploadAsync({ config, context }: TaskUploadOptions): Promise<void> {
|
||||
public async uploadAsync({ config, context }: TaskUploadOptions): Promise<void> {
|
||||
assert(context.version, `App version not initialized, can't update version`);
|
||||
|
||||
const version = config.getVersion();
|
||||
@@ -71,16 +71,17 @@ export class AppVersionTask extends AppleTask {
|
||||
if (!version && !release) {
|
||||
Log.log(chalk`{dim - Skipped version and release update, not configured}`);
|
||||
} else {
|
||||
const description = [version && 'version info', release && 'release info']
|
||||
const { versionString } = context.version.attributes;
|
||||
const description = [version && 'version', release && 'release']
|
||||
.filter(Boolean)
|
||||
.join(' and ');
|
||||
|
||||
context.version = await logAsync(
|
||||
() => context.version.updateAsync({ ...version, ...release }),
|
||||
{
|
||||
pending: `Updating ${description}...`,
|
||||
success: `Updated ${description}`,
|
||||
failure: `Failed updating ${description}`,
|
||||
pending: `Updating ${description} info for ${chalk.bold(versionString)}...`,
|
||||
success: `Updated ${description} info for ${chalk.bold(versionString)}...`,
|
||||
failure: `Failed updating ${description} info for ${chalk.bold(versionString)}...`,
|
||||
}
|
||||
);
|
||||
}
|
||||
@@ -97,14 +98,21 @@ export class AppVersionTask extends AppleTask {
|
||||
|
||||
const oldModel = context.versionLocales.find(model => model.attributes.locale === locale);
|
||||
await logAsync(
|
||||
() =>
|
||||
oldModel
|
||||
? oldModel.updateAsync(attributes)
|
||||
: context.version.createLocalizationAsync({ ...attributes, locale }),
|
||||
async () => {
|
||||
return oldModel
|
||||
? await oldModel.updateAsync(attributes)
|
||||
: await context.version.createLocalizationAsync({ ...attributes, locale });
|
||||
},
|
||||
{
|
||||
pending: `${oldModel ? 'Updating' : 'Creating'} localized version for ${locale}...`,
|
||||
success: `${oldModel ? 'Updated' : 'Created'} localized version for ${locale}`,
|
||||
failure: `Failed ${oldModel ? 'updating' : 'creating'} localized version for ${locale}`,
|
||||
pending: `${oldModel ? 'Updating' : 'Creating'} localized version for ${chalk.bold(
|
||||
locale
|
||||
)}...`,
|
||||
success: `${oldModel ? 'Updated' : 'Created'} localized version for ${chalk.bold(
|
||||
locale
|
||||
)}`,
|
||||
failure: `Failed ${
|
||||
oldModel ? 'updating' : 'creating'
|
||||
} localized version for ${chalk.bold(locale)}`,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { App, Session } from '@expo/apple-utils';
|
||||
import { ExpoConfig } from '@expo/config';
|
||||
import { Platform } from '@expo/eas-build-job';
|
||||
import { SubmitProfile } from '@expo/eas-json';
|
||||
import { EasJsonReader, SubmitProfile } from '@expo/eas-json';
|
||||
import assert from 'assert';
|
||||
|
||||
import { CredentialsContext } from '../credentials/context';
|
||||
@@ -10,7 +10,6 @@ import { getExpoConfig } from '../project/expoConfig';
|
||||
import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
|
||||
import { Actor } from '../user/User';
|
||||
import { ensureLoggedInAsync } from '../user/actions';
|
||||
import { getProfilesAsync } from '../utils/profiles';
|
||||
|
||||
export type MetadataContext = {
|
||||
/** Submission profile platform to use */
|
||||
@@ -48,28 +47,18 @@ export async function createMetadataContextAsync(params: {
|
||||
exp?: ExpoConfig;
|
||||
profileName?: string;
|
||||
}): Promise<MetadataContext> {
|
||||
const submissionProfiles = await getProfilesAsync({
|
||||
type: 'submit',
|
||||
platforms: [Platform.IOS],
|
||||
projectDir: params.projectDir,
|
||||
profileName: params.profileName,
|
||||
});
|
||||
|
||||
const submissionProfile = submissionProfiles.find(profile => profile.platform === Platform.IOS);
|
||||
assert(
|
||||
submissionProfile,
|
||||
'Could not resolve the iOS submission profile, only iOS is supported for metadata'
|
||||
);
|
||||
const iosSubmissionProfile = submissionProfile.profile as SubmitProfile<Platform.IOS>;
|
||||
const easJsonReader = new EasJsonReader(params.projectDir);
|
||||
const submitProfile = await easJsonReader.getSubmitProfileAsync(Platform.IOS, params.profileName);
|
||||
|
||||
const exp = params.exp ?? getExpoConfig(params.projectDir);
|
||||
const user = await ensureLoggedInAsync();
|
||||
const bundleIdentifier = await getBundleIdentifierAsync(params.projectDir, exp);
|
||||
const bundleIdentifier =
|
||||
submitProfile.bundleIdentifier ?? (await getBundleIdentifierAsync(params.projectDir, exp));
|
||||
|
||||
return {
|
||||
platform: Platform.IOS,
|
||||
profile: iosSubmissionProfile,
|
||||
metadataPath: iosSubmissionProfile.metadataPath ?? 'store.config.json',
|
||||
profile: submitProfile,
|
||||
metadataPath: submitProfile.metadataPath ?? 'store.config.json',
|
||||
user,
|
||||
credentialsCtx: params.credentialsCtx,
|
||||
bundleIdentifier,
|
||||
|
||||
@@ -2,13 +2,14 @@ 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 { AppleData, PartialAppleData } from './apple/data';
|
||||
import { createAppleTasks } from './apple/tasks';
|
||||
import { createAppleWriter } from './config';
|
||||
import { MetadataContext, ensureMetadataAppStoreAuthenticatedAsync } from './context';
|
||||
import { MetadataDownloadError, MetadataValidationError } from './errors';
|
||||
import { subscribeTelemetry } from './utils/telemetry';
|
||||
import { withTelemetryAsync } from './utils/telemetry';
|
||||
|
||||
/**
|
||||
* Generate a local store configuration from the stores.
|
||||
@@ -28,38 +29,38 @@ export async function downloadMetadataAsync(metadataCtx: MetadataContext): Promi
|
||||
}
|
||||
|
||||
const { app, auth } = await ensureMetadataAppStoreAuthenticatedAsync(metadataCtx);
|
||||
const { unsubscribeTelemetry, executionId } = subscribeTelemetry(
|
||||
MetadataEvent.APPLE_METADATA_DOWNLOAD,
|
||||
{ app, auth }
|
||||
);
|
||||
|
||||
const errors: Error[] = [];
|
||||
const config = createAppleWriter();
|
||||
const tasks = createAppleTasks(metadataCtx);
|
||||
const taskCtx = { app };
|
||||
Log.addNewLineIfNone();
|
||||
Log.log('Downloading App Store configuration...');
|
||||
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.prepareAsync({ context: taskCtx });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
await withTelemetryAsync(MetadataEvent.APPLE_METADATA_DOWNLOAD, { app, auth }, async () => {
|
||||
const errors: Error[] = [];
|
||||
const config = createAppleWriter();
|
||||
const tasks = createAppleTasks(metadataCtx);
|
||||
const taskCtx: PartialAppleData = { app };
|
||||
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.prepareAsync({ context: taskCtx });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.downloadAsync({ config, context: taskCtx as AppleData });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.downloadAsync({ config, context: taskCtx as AppleData });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
await fs.writeJson(filePath, config.toSchema(), { spaces: 2 });
|
||||
unsubscribeTelemetry();
|
||||
await fs.writeJson(filePath, config.toSchema(), { spaces: 2 });
|
||||
|
||||
if (errors.length > 0) {
|
||||
throw new MetadataDownloadError(errors, executionId);
|
||||
}
|
||||
if (errors.length > 0) {
|
||||
throw new MetadataDownloadError(errors);
|
||||
}
|
||||
});
|
||||
|
||||
return filePath;
|
||||
}
|
||||
@@ -1,4 +1,5 @@
|
||||
import type { ErrorObject } from 'ajv';
|
||||
import chalk from 'chalk';
|
||||
|
||||
import Log, { link } from '../log';
|
||||
|
||||
@@ -8,11 +9,22 @@ import Log, { link } from '../log';
|
||||
* and should contain useful information for the user to solve before trying again.
|
||||
*/
|
||||
export class MetadataValidationError extends Error {
|
||||
constructor(message?: string, public readonly errors?: ErrorObject[]) {
|
||||
public constructor(message?: string, public readonly errors: ErrorObject[] = []) {
|
||||
super(message ?? 'Store configuration validation failed');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* During telemetry actions, a random exection ID is generated.
|
||||
* This ID should be communicated to users and reported to us.
|
||||
* With that ID, we can look up the failed requests and help solve the issue.
|
||||
*/
|
||||
export class MetadataTelemetryError extends Error {
|
||||
public constructor(public readonly originalError: Error, public readonly executionId: string) {
|
||||
super(originalError.message);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* If a single entity failed to update, we don't block the other entities from uploading.
|
||||
* We still attempt to update the data in the stores as much as possible.
|
||||
@@ -20,7 +32,7 @@ export class MetadataValidationError extends Error {
|
||||
* It contains that list of encountered errors to present to the user.
|
||||
*/
|
||||
export class MetadataUploadError extends Error {
|
||||
constructor(public readonly errors: Error[], public readonly executionId: string) {
|
||||
public constructor(public readonly errors: Error[]) {
|
||||
super(
|
||||
`Store configuration upload encountered ${
|
||||
errors.length === 1 ? 'an error' : `${errors.length} errors`
|
||||
@@ -31,12 +43,12 @@ export class MetadataUploadError extends Error {
|
||||
|
||||
/**
|
||||
* If a single entity failed to download, we don't block the other entities from downloading.
|
||||
* We sill attempt to pull in the data from the stores as much as possible.
|
||||
* Because of that, we keep track of any errors envountered and throw this generic error.
|
||||
* We still attempt to pull in the data from the stores as much as possible.
|
||||
* Because of that, we keep track of any errors encountered and throw this generic error.
|
||||
* It contains that list of encountered errors to present to the user.
|
||||
*/
|
||||
export class MetadataDownloadError extends Error {
|
||||
constructor(public readonly errors: Error[], public readonly executionId: string) {
|
||||
public constructor(public readonly errors: Error[]) {
|
||||
super(
|
||||
`Store configuration download encountered ${
|
||||
errors.length === 1 ? 'an error' : `${errors.length} errors`
|
||||
@@ -49,15 +61,27 @@ export class MetadataDownloadError extends Error {
|
||||
* Handle a thrown metadata error by informing the user what went wrong.
|
||||
* If a normal error is thrown, this method will re-throw that error to avoid consuming it.
|
||||
*/
|
||||
export function handleMetadataError(error: Error): void {
|
||||
export function handleMetadataError(thrownError: Error): void {
|
||||
const error =
|
||||
thrownError instanceof MetadataTelemetryError ? thrownError.originalError : thrownError;
|
||||
|
||||
if (error instanceof MetadataValidationError) {
|
||||
Log.error(error.message);
|
||||
Log.log(error.errors?.map(err => ` - ${err.dataPath} ${err.message}`).join('\n'));
|
||||
Log.newLine();
|
||||
Log.error(chalk.bold(error.message));
|
||||
if (error.errors?.length > 0) {
|
||||
Log.log(error.errors.map(err => ` - ${err.dataPath} ${err.message}`).join('\n'));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (error instanceof MetadataDownloadError || error instanceof MetadataUploadError) {
|
||||
Log.error(error.message);
|
||||
Log.newLine();
|
||||
Log.error(chalk.bold(error.message));
|
||||
if (error.errors?.length > 0) {
|
||||
Log.newLine();
|
||||
Log.error(error.errors.map(err => err.message).join('\n\n'));
|
||||
}
|
||||
Log.newLine();
|
||||
Log.log('Please check the logs for any configuration issues.');
|
||||
Log.log('If this issue persists, please open a new issue at:');
|
||||
// TODO: add execution ID to the issue template link
|
||||
|
||||
@@ -2,59 +2,62 @@ import fs from 'fs-extra';
|
||||
import path from 'path';
|
||||
|
||||
import { MetadataEvent } from '../analytics/events';
|
||||
import { AppleData } from './apple/data';
|
||||
import Log from '../log';
|
||||
import { AppleData, PartialAppleData } from './apple/data';
|
||||
import { createAppleTasks } from './apple/tasks';
|
||||
import { createAppleReader, validateConfig } from './config';
|
||||
import { MetadataContext, ensureMetadataAppStoreAuthenticatedAsync } from './context';
|
||||
import { MetadataUploadError, MetadataValidationError } from './errors';
|
||||
import { subscribeTelemetry } from './utils/telemetry';
|
||||
import { withTelemetryAsync } from './utils/telemetry';
|
||||
|
||||
/**
|
||||
* Sync a local store configuration with the stores.
|
||||
* Note, only App Store is supported at this time.
|
||||
*/
|
||||
export async function uploadMetadataAsync(metadataCtx: MetadataContext): Promise<void> {
|
||||
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 { app, auth } = await ensureMetadataAppStoreAuthenticatedAsync(metadataCtx);
|
||||
const { unsubscribeTelemetry, executionId } = subscribeTelemetry(
|
||||
MetadataEvent.APPLE_METADATA_UPLOAD,
|
||||
{ app, auth }
|
||||
);
|
||||
|
||||
const fileData = await fs.readJson(filePath);
|
||||
const { valid, errors: validationErrors } = validateConfig(fileData);
|
||||
if (!valid) {
|
||||
throw new MetadataValidationError(`Store configuration errors found`, validationErrors);
|
||||
}
|
||||
|
||||
const errors: Error[] = [];
|
||||
const config = createAppleReader(fileData);
|
||||
const tasks = createAppleTasks(metadataCtx);
|
||||
const taskCtx = { app };
|
||||
Log.addNewLineIfNone();
|
||||
Log.log('Uploading App Store configuration...');
|
||||
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.prepareAsync({ context: taskCtx });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
await withTelemetryAsync(MetadataEvent.APPLE_METADATA_UPLOAD, { app, auth }, async () => {
|
||||
const errors: Error[] = [];
|
||||
const config = createAppleReader(fileData);
|
||||
const tasks = createAppleTasks(metadataCtx);
|
||||
const taskCtx: PartialAppleData = { app };
|
||||
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.prepareAsync({ context: taskCtx });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.uploadAsync({ config, context: taskCtx as AppleData });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
for (const task of tasks) {
|
||||
try {
|
||||
await task.uploadAsync({ config, context: taskCtx as AppleData });
|
||||
} catch (error: any) {
|
||||
errors.push(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
unsubscribeTelemetry();
|
||||
if (errors.length > 0) {
|
||||
throw new MetadataUploadError(errors);
|
||||
}
|
||||
});
|
||||
|
||||
if (errors.length > 0) {
|
||||
throw new MetadataUploadError(errors, executionId);
|
||||
}
|
||||
return { appleLink: `https://appstoreconnect.apple.com/apps/${app.id}/appstore` };
|
||||
}
|
||||
@@ -4,7 +4,6 @@ describe(removeDatePrecision, () => {
|
||||
it('returns null for falsy values', () => {
|
||||
expect(removeDatePrecision(null)).toBeNull();
|
||||
expect(removeDatePrecision(undefined)).toBeNull();
|
||||
expect(removeDatePrecision(false)).toBeNull();
|
||||
});
|
||||
|
||||
it('returns null for invalid dates', () => {
|
||||
|
||||
@@ -1,23 +1,73 @@
|
||||
import { App } from '@expo/apple-utils';
|
||||
import { App, getRequestClient } from '@expo/apple-utils';
|
||||
|
||||
import { TelemetryContext, makeDataScrubber } from '../telemetry';
|
||||
import { MetadataEvent } from '../../../analytics/events';
|
||||
import { MetadataTelemetryError } from '../../errors';
|
||||
import { TelemetryContext, makeDataScrubber, withTelemetryAsync } from '../telemetry';
|
||||
|
||||
const stub: TelemetryContext = {
|
||||
// Only the App ID is considered to be sensitive
|
||||
app: new App({} as any, 'SECRET_APP_ID', {} as any),
|
||||
// Only the token properties and user credentials are considered to be sensitive
|
||||
auth: {
|
||||
username: 'SECRET_USERNAME',
|
||||
password: 'SECRET_PASSWORD',
|
||||
context: {
|
||||
token: 'SECRET_TOKEN',
|
||||
teamId: 'SECRET_TEAM_ID',
|
||||
providerId: 1337,
|
||||
},
|
||||
} as any,
|
||||
};
|
||||
|
||||
describe(withTelemetryAsync, () => {
|
||||
afterEach(() => {
|
||||
jest.clearAllMocks();
|
||||
});
|
||||
|
||||
it('detaches interceptors after action resolved', async () => {
|
||||
const { interceptors } = getRequestClient();
|
||||
const ejectInterceptor = jest.spyOn(interceptors.response, 'eject');
|
||||
|
||||
await withTelemetryAsync(MetadataEvent.APPLE_METADATA_DOWNLOAD, stub, async () => {
|
||||
return 'testing resolved telemetry action';
|
||||
});
|
||||
|
||||
expect(ejectInterceptor).toBeCalledWith(expect.any(Number));
|
||||
});
|
||||
|
||||
it('detaches interceptors after action rejected', async () => {
|
||||
const { interceptors } = getRequestClient();
|
||||
const ejectInterceptor = jest.spyOn(interceptors.response, 'eject');
|
||||
|
||||
try {
|
||||
await withTelemetryAsync(MetadataEvent.APPLE_METADATA_DOWNLOAD, stub, async () => {
|
||||
throw new Error('testing rejected telemetry action');
|
||||
});
|
||||
} catch {
|
||||
// intentional failure
|
||||
}
|
||||
|
||||
expect(ejectInterceptor).toBeCalledWith(expect.any(Number));
|
||||
});
|
||||
|
||||
it('adds executionId to thrown errors', async () => {
|
||||
let caughtError: null | Error = null;
|
||||
|
||||
try {
|
||||
await withTelemetryAsync(MetadataEvent.APPLE_METADATA_DOWNLOAD, stub, async () => {
|
||||
throw new Error('testing exectution ID');
|
||||
});
|
||||
} catch (error: any) {
|
||||
caughtError = error;
|
||||
}
|
||||
|
||||
expect(caughtError).toBeInstanceOf(MetadataTelemetryError);
|
||||
expect(caughtError).toHaveProperty('executionId', expect.any(String));
|
||||
expect(caughtError).toHaveProperty('originalError', expect.any(Error));
|
||||
});
|
||||
});
|
||||
|
||||
describe(makeDataScrubber, () => {
|
||||
const stub: TelemetryContext = {
|
||||
// Only the App ID is considered to be sensitive
|
||||
app: new App({} as any, 'SECRET_APP_ID', {} as any),
|
||||
// Only the token properties and user credentials are considered to be sensitive
|
||||
auth: {
|
||||
username: 'SECRET_USERNAME',
|
||||
password: 'SECRET_PASSWORD',
|
||||
context: {
|
||||
token: 'SECRET_TOKEN',
|
||||
teamId: 'SECRET_TEAM_ID',
|
||||
providerId: 1337,
|
||||
},
|
||||
} as any,
|
||||
};
|
||||
|
||||
it('scrubs the app.id', () => {
|
||||
expect(makeDataScrubber(stub)('some text SECRET_APP_ID')).toBe('some text {APPLE_APP_ID}');
|
||||
});
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
export function unique<T = any>(items: T[]): T[] {
|
||||
const set = new Set(items);
|
||||
return [...set];
|
||||
}
|
||||
@@ -9,7 +9,7 @@
|
||||
* "pointer": "/data/attributes/earliestReleaseDate"
|
||||
* }
|
||||
*/
|
||||
export function removeDatePrecision(date: any): null | Date {
|
||||
export function removeDatePrecision(date: null | undefined | string | number | Date): null | Date {
|
||||
if (date) {
|
||||
try {
|
||||
const result = new Date(date);
|
||||
|
||||
@@ -3,26 +3,18 @@ import type { AxiosError } from 'axios';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
|
||||
import { Analytics, MetadataEvent } from '../../analytics/events';
|
||||
import { MetadataTelemetryError } from '../errors';
|
||||
|
||||
export type TelemetryContext = {
|
||||
app: App;
|
||||
auth: Partial<Session.AuthState>;
|
||||
};
|
||||
|
||||
/**
|
||||
* Subscribe the telemetry to the ongoing metadata requests and responses.
|
||||
* When providing the app and auth info, we can scrub that data from the telemetry.
|
||||
* Returns an execution ID to group all events of a single run together, and a unsubscribe function.
|
||||
*/
|
||||
export function subscribeTelemetry(
|
||||
export async function withTelemetryAsync<T>(
|
||||
event: MetadataEvent,
|
||||
options: TelemetryContext
|
||||
): {
|
||||
/** Unsubscribe the telemetry from all apple-utils events */
|
||||
unsubscribeTelemetry: () => void;
|
||||
/** The unique id added to all telemetry events from a single execution */
|
||||
executionId: string;
|
||||
} {
|
||||
options: TelemetryContext,
|
||||
action: () => Promise<T>
|
||||
): Promise<T> {
|
||||
const executionId = uuidv4();
|
||||
const scrubber = makeDataScrubber(options);
|
||||
const { interceptors } = getRequestClient();
|
||||
@@ -59,11 +51,13 @@ export function subscribeTelemetry(
|
||||
}
|
||||
);
|
||||
|
||||
function unsubscribeTelemetry(): void {
|
||||
try {
|
||||
return await action();
|
||||
} catch (error: any) {
|
||||
throw new MetadataTelemetryError(error, executionId);
|
||||
} finally {
|
||||
interceptors.response.eject(responseInterceptorId);
|
||||
}
|
||||
|
||||
return { unsubscribeTelemetry, executionId };
|
||||
}
|
||||
|
||||
/** Exposed for testing */
|
||||
|
||||
@@ -468,7 +468,11 @@ describe(uploadAssetsAsync, () => {
|
||||
});
|
||||
|
||||
mockdate.set(0);
|
||||
await expect(uploadAssetsAsync(assetsForUpdateInfoGroup)).resolves.toBe(undefined);
|
||||
await expect(uploadAssetsAsync(assetsForUpdateInfoGroup)).resolves.toEqual({
|
||||
assetCount: 6,
|
||||
uniqueAssetCount: 3,
|
||||
uniqueUploadedAssetCount: 0,
|
||||
});
|
||||
});
|
||||
it('resolves if the assets are eventually uploaded', async () => {
|
||||
jest.spyOn(PublishQuery, 'getAssetMetadataAsync').mockImplementation(async () => {
|
||||
@@ -496,6 +500,45 @@ describe(uploadAssetsAsync, () => {
|
||||
});
|
||||
|
||||
mockdate.set(0);
|
||||
await expect(uploadAssetsAsync(assetsForUpdateInfoGroup)).resolves.toBe(undefined);
|
||||
await expect(uploadAssetsAsync(assetsForUpdateInfoGroup)).resolves.toEqual({
|
||||
assetCount: 6,
|
||||
uniqueAssetCount: 3,
|
||||
uniqueUploadedAssetCount: 2,
|
||||
});
|
||||
});
|
||||
it('updates spinner text throughout execution', async () => {
|
||||
jest.spyOn(PublishQuery, 'getAssetMetadataAsync').mockImplementation(async () => {
|
||||
const status =
|
||||
Date.now() === 0 ? AssetMetadataStatus.DoesNotExist : AssetMetadataStatus.Exists;
|
||||
mockdate.set(Date.now() + 1);
|
||||
jest.runAllTimers();
|
||||
return [
|
||||
{
|
||||
storageKey: 'qbgckgkgfdjnNuf9dQd7FDTWUmlEEzg7l1m1sKzQaq0',
|
||||
status,
|
||||
__typename: 'AssetMetadataResult',
|
||||
}, // userDefinedAsset
|
||||
{
|
||||
storageKey: 'bbjgXFSIXtjviGwkaPFY0HG4dVVIGiXHAboRFQEqVa4',
|
||||
status,
|
||||
__typename: 'AssetMetadataResult',
|
||||
}, // android.code
|
||||
{
|
||||
storageKey: 'dP-nC8EJXKz42XKh_Rc9tYxiGAT-ilpkRltEi6HIKeQ',
|
||||
status,
|
||||
__typename: 'AssetMetadataResult',
|
||||
}, // ios.code
|
||||
];
|
||||
});
|
||||
const updateSpinnerFn = jest.fn(_text => {});
|
||||
|
||||
mockdate.set(0);
|
||||
await uploadAssetsAsync(assetsForUpdateInfoGroup, updateSpinnerFn);
|
||||
const calls = updateSpinnerFn.mock.calls;
|
||||
expect(calls).toEqual([
|
||||
['6 assets present'],
|
||||
['3 unique assets found'],
|
||||
['2 new assets uploading'],
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -35,7 +35,10 @@ export async function ensureProjectExistsAsync(projectInfo: ProjectInfo): Promis
|
||||
assert(account, `You must have access to the ${accountName} account to run this command`);
|
||||
|
||||
const projectDashboardUrl = getProjectDashboardUrl(accountName, projectName);
|
||||
const projectLink = terminalLink(projectFullName, projectDashboardUrl);
|
||||
const projectLink = terminalLink(projectFullName, projectDashboardUrl, {
|
||||
// https://github.com/sindresorhus/terminal-link/issues/18#issuecomment-1068020361
|
||||
fallback: () => `${projectFullName} (${projectDashboardUrl})`,
|
||||
});
|
||||
|
||||
const spinner = ora(`Linking to project ${chalk.bold(projectFullName)}`).start();
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@ import fs from 'fs-extra';
|
||||
import Joi from 'joi';
|
||||
import mime from 'mime';
|
||||
import path from 'path';
|
||||
import promiseLimit from 'promise-limit';
|
||||
|
||||
import { AssetMetadataStatus, PartialManifestAsset } from '../graphql/generated';
|
||||
import { PublishMutation } from '../graphql/mutations/PublishMutation';
|
||||
@@ -245,7 +246,16 @@ export async function filterOutAssetsThatAlreadyExistAsync(
|
||||
return missingAssets;
|
||||
}
|
||||
|
||||
export async function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAssets): Promise<void> {
|
||||
type AssetUploadResult = {
|
||||
assetCount: number;
|
||||
uniqueAssetCount: number;
|
||||
uniqueUploadedAssetCount: number;
|
||||
};
|
||||
|
||||
export async function uploadAssetsAsync(
|
||||
assetsForUpdateInfoGroup: CollectedAssets,
|
||||
updateSpinnerText?: (updatedText: string) => void
|
||||
): Promise<AssetUploadResult> {
|
||||
let assets: RawAsset[] = [];
|
||||
let platform: keyof CollectedAssets;
|
||||
for (platform in assetsForUpdateInfoGroup) {
|
||||
@@ -255,6 +265,7 @@ export async function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAsset
|
||||
...assetsForUpdateInfoGroup[platform]!.assets,
|
||||
];
|
||||
}
|
||||
updateSpinnerText?.(`${assets.length} ${assets.length === 1 ? 'asset' : 'assets'} present`);
|
||||
|
||||
const assetsWithStorageKey = await Promise.all(
|
||||
assets.map(async asset => {
|
||||
@@ -269,19 +280,30 @@ export async function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAsset
|
||||
storageKey: string;
|
||||
}
|
||||
>(assetsWithStorageKey, asset => asset.storageKey);
|
||||
updateSpinnerText?.(
|
||||
`${uniqueAssets.length} unique ${uniqueAssets.length === 1 ? 'asset' : 'assets'} found`
|
||||
);
|
||||
|
||||
let missingAssets = await filterOutAssetsThatAlreadyExistAsync(uniqueAssets);
|
||||
const uniqueUploadedAssetCount = missingAssets.length;
|
||||
const { specifications } = await PublishMutation.getUploadURLsAsync(
|
||||
missingAssets.map(ma => ma.contentType)
|
||||
);
|
||||
|
||||
const assetUploadPromiseLimit = promiseLimit(15);
|
||||
|
||||
await Promise.all(
|
||||
missingAssets.map((missingAsset, i) => {
|
||||
const presignedPost: PresignedPost = JSON.parse(specifications[i]);
|
||||
return uploadWithPresignedPostAsync(missingAsset.path, presignedPost);
|
||||
assetUploadPromiseLimit(async () => {
|
||||
const presignedPost: PresignedPost = JSON.parse(specifications[i]);
|
||||
return uploadWithPresignedPostAsync(missingAsset.path, presignedPost);
|
||||
});
|
||||
})
|
||||
);
|
||||
|
||||
updateSpinnerText?.(
|
||||
`${missingAssets.length} new ${missingAssets.length === 1 ? 'asset' : 'assets'} uploading`
|
||||
);
|
||||
// Wait up to TIMEOUT_LIMIT for assets to be uploaded and processed
|
||||
const start = Date.now();
|
||||
let timeout = 1;
|
||||
@@ -295,4 +317,9 @@ export async function uploadAssetsAsync(assetsForUpdateInfoGroup: CollectedAsset
|
||||
throw new Error('Asset upload timed out. Please try again.');
|
||||
}
|
||||
}
|
||||
return {
|
||||
assetCount: assets.length,
|
||||
uniqueAssetCount: uniqueAssets.length,
|
||||
uniqueUploadedAssetCount,
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,303 @@
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
|
||||
import {
|
||||
PublishPlatformFlag,
|
||||
ensureBranchExistsAsync,
|
||||
getUpdatesToRepublishInteractiveAsync,
|
||||
} from '../../commands/update';
|
||||
import { graphqlClient } from '../../graphql/client';
|
||||
import { ViewBranchUpdatesQuery } from '../../graphql/generated';
|
||||
import { viewBranchUpdatesQueryUpdateLimit } from '../../graphql/queries/UpdateQuery';
|
||||
import { selectAsync } from '../../prompts';
|
||||
|
||||
const appId = '6c94sxe6-37d2-4700-52fa-1b813204dad2';
|
||||
const branchId = '5e84e3cb-563e-4022-a65e-6e7a42fe4ed3';
|
||||
const appName = '@tester/test';
|
||||
const branchName = 'test-branch';
|
||||
const projectName = 'test-project';
|
||||
|
||||
jest.mock('../../graphql/queries/UpdateQuery', () => {
|
||||
const actual = jest.requireActual('../../graphql/queries/UpdateQuery');
|
||||
return {
|
||||
...actual,
|
||||
getViewBranchUpdatesQueryUpdateLimit: jest.fn(actual.getViewBranchUpdatesQueryUpdateLimit),
|
||||
};
|
||||
});
|
||||
jest.mock('../../prompts', () => ({
|
||||
selectAsync: jest.fn(),
|
||||
}));
|
||||
jest.mock('../../commands/update', () => {
|
||||
const actual = jest.requireActual('../../commands/update');
|
||||
return {
|
||||
...actual,
|
||||
ensureBranchExistsAsync: jest.fn(actual.ensureBranchExistsAsync),
|
||||
getUpdatesToRepublishInteractiveAsync: jest.fn(actual.getUpdatesToRepublishInteractiveAsync),
|
||||
};
|
||||
});
|
||||
const updatesToResolve = jest.fn(
|
||||
(): Exclude<
|
||||
Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
|
||||
null | undefined
|
||||
>['updates'] => []
|
||||
);
|
||||
jest.mock('../../graphql/client', () => ({
|
||||
...jest.requireActual('../../graphql/client'),
|
||||
graphqlClient: {
|
||||
query: jest.fn(() => ({
|
||||
toPromise: () =>
|
||||
Promise.resolve({
|
||||
data: {
|
||||
__typename: 'RootQuery',
|
||||
app: {
|
||||
__typename: 'AppQuery',
|
||||
byId: {
|
||||
__typename: 'App',
|
||||
id: appId,
|
||||
updateBranchByName: {
|
||||
__typename: 'UpdateBranch',
|
||||
id: branchId,
|
||||
name: branchName,
|
||||
updates: updatesToResolve(),
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
}),
|
||||
})),
|
||||
mutation: jest.fn(() => ({
|
||||
toPromise: () => ({
|
||||
error: {
|
||||
graphQLErrors: [
|
||||
{
|
||||
GraphQLError: `A channel already exists with (app_id, name) = (${appId}, ${appName})`,
|
||||
extensions: {
|
||||
code: 'INTERNAL_SERVER_ERROR',
|
||||
errorCode: 'CHANNEL_ALREADY_EXISTS',
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
}),
|
||||
})),
|
||||
},
|
||||
}));
|
||||
|
||||
function createMockUpdates(
|
||||
{
|
||||
updateCount = 1,
|
||||
platformFlag = 'all',
|
||||
groupId,
|
||||
}: Partial<{
|
||||
updateCount: number;
|
||||
platformFlag: PublishPlatformFlag;
|
||||
groupId: string;
|
||||
}> = {
|
||||
updateCount: 1,
|
||||
platformFlag: 'all',
|
||||
}
|
||||
): Exclude<
|
||||
Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
|
||||
null | undefined
|
||||
>['updates'] {
|
||||
let updates: Exclude<
|
||||
Exclude<ViewBranchUpdatesQuery['app'], null | undefined>['byId']['updateBranchByName'],
|
||||
null | undefined
|
||||
>['updates'] = [];
|
||||
if (platformFlag === 'all') {
|
||||
updateCount = Math.ceil(updateCount / 2);
|
||||
}
|
||||
for (let i = 0; i < updateCount; i++) {
|
||||
const androidUpdate = {
|
||||
id: uuidv4(),
|
||||
group: uuidv4(),
|
||||
message: 'default test message',
|
||||
createdAt: new Date(),
|
||||
runtimeVersion: 'exposdk:44.0.0',
|
||||
platform: 'android',
|
||||
manifestFragment: '',
|
||||
};
|
||||
const iosUpdate = {
|
||||
...androidUpdate,
|
||||
id: uuidv4(),
|
||||
platform: 'ios',
|
||||
};
|
||||
if (!i && groupId) {
|
||||
androidUpdate.group = groupId;
|
||||
iosUpdate.group = groupId;
|
||||
}
|
||||
const isOddNumberedUpdateCount = !(updateCount % 2);
|
||||
const isFinalLoop = i === updateCount - 1;
|
||||
switch (platformFlag) {
|
||||
case 'all':
|
||||
updates = [
|
||||
...updates,
|
||||
androidUpdate,
|
||||
...(isFinalLoop && isOddNumberedUpdateCount ? [] : [iosUpdate]),
|
||||
];
|
||||
break;
|
||||
case 'android':
|
||||
updates = [...updates, androidUpdate];
|
||||
break;
|
||||
case 'ios':
|
||||
updates = [...updates, iosUpdate];
|
||||
break;
|
||||
}
|
||||
}
|
||||
return updates;
|
||||
}
|
||||
|
||||
describe('UpdatePublish', () => {
|
||||
describe('ensureBranchExistsAsync', () => {
|
||||
beforeEach(() => {
|
||||
jest.mocked(graphqlClient.query).mockClear();
|
||||
jest.mocked(graphqlClient.mutation).mockClear();
|
||||
});
|
||||
|
||||
it('defaults limit to viewBranchUpdatesQueryUpdateLimit and offset to 0 when none are provided', async () => {
|
||||
await ensureBranchExistsAsync({ appId, name: appName });
|
||||
const [[, bindings]] = jest.mocked(graphqlClient.query).mock.calls;
|
||||
|
||||
expect(bindings).toEqual({
|
||||
appId,
|
||||
name: appName,
|
||||
limit: viewBranchUpdatesQueryUpdateLimit,
|
||||
offset: 0,
|
||||
});
|
||||
});
|
||||
|
||||
it.each([
|
||||
[0, 0],
|
||||
[10, 50],
|
||||
[100, 3],
|
||||
[1000, 77],
|
||||
])('sets the limit to %s and offset to %s when provided', async (limit, offset) => {
|
||||
await ensureBranchExistsAsync({ appId, name: appName, limit, offset });
|
||||
const [[, bindings]] = jest.mocked(graphqlClient.query).mock.calls;
|
||||
|
||||
expect(bindings).toEqual({
|
||||
appId,
|
||||
name: appName,
|
||||
limit,
|
||||
offset,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('getUpdatesToRepublishInteractiveAsync', () => {
|
||||
beforeEach(() => {
|
||||
jest.mocked(graphqlClient.query).mockClear();
|
||||
jest.mocked(graphqlClient.mutation).mockClear();
|
||||
jest.mocked(getUpdatesToRepublishInteractiveAsync).mockClear();
|
||||
jest.mocked(selectAsync).mockClear();
|
||||
});
|
||||
|
||||
it('throws when there are no updates', async () => {
|
||||
const platformFlag = 'all';
|
||||
await expect(
|
||||
async () =>
|
||||
await getUpdatesToRepublishInteractiveAsync(projectName, branchName, platformFlag, 50)
|
||||
).rejects.toThrow(
|
||||
`There are no updates on branch "${branchName}" published for the platform(s) ${platformFlag}. Did you mean to publish a new update instead?`
|
||||
);
|
||||
});
|
||||
|
||||
it('fetches multiple pages of updates and can select an update from the most recent page', async () => {
|
||||
const mockSelectedGroupId = uuidv4();
|
||||
const pageSize = 2;
|
||||
updatesToResolve
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize + 1 }))
|
||||
.mockReturnValueOnce(
|
||||
createMockUpdates({ updateCount: pageSize + 1, groupId: mockSelectedGroupId })
|
||||
);
|
||||
jest
|
||||
.mocked(selectAsync)
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce(mockSelectedGroupId);
|
||||
|
||||
const selectedUpdates = await getUpdatesToRepublishInteractiveAsync(
|
||||
projectName,
|
||||
branchName,
|
||||
'all',
|
||||
pageSize
|
||||
);
|
||||
expect(selectedUpdates.every(update => update.group === mockSelectedGroupId)).toBeTruthy();
|
||||
});
|
||||
|
||||
it('fetches multiple pages of updates and can return an update from a previous page', async () => {
|
||||
const mockSelectedGroupId = uuidv4();
|
||||
const pageSize = 5;
|
||||
updatesToResolve
|
||||
.mockReturnValueOnce(
|
||||
createMockUpdates({ updateCount: pageSize + 1, groupId: mockSelectedGroupId })
|
||||
)
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize + 1 }));
|
||||
jest
|
||||
.mocked(selectAsync)
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce(mockSelectedGroupId);
|
||||
|
||||
const selectedUpdates = await getUpdatesToRepublishInteractiveAsync(
|
||||
projectName,
|
||||
branchName,
|
||||
'all',
|
||||
pageSize
|
||||
);
|
||||
expect(selectedUpdates.every(update => update.group === mockSelectedGroupId)).toBeTruthy();
|
||||
});
|
||||
|
||||
it('displays the option to fetch more pages as long as there are unfetched updates left', async () => {
|
||||
const mockSelectedGroupId = uuidv4();
|
||||
const pageSize = 10;
|
||||
updatesToResolve
|
||||
.mockReturnValueOnce(
|
||||
createMockUpdates({ updateCount: pageSize + 1, groupId: mockSelectedGroupId })
|
||||
)
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize + 1 }))
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize }));
|
||||
jest
|
||||
.mocked(selectAsync)
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce(mockSelectedGroupId);
|
||||
|
||||
await getUpdatesToRepublishInteractiveAsync(projectName, branchName, 'all', pageSize);
|
||||
const { calls } = jest.mocked(selectAsync).mock;
|
||||
expect(calls.length).toEqual(3);
|
||||
const [[, firstOptions], [, secondOptions], [, thirdOptions]] = calls;
|
||||
const fetchMoreValue = '_fetchMore';
|
||||
expect(firstOptions[firstOptions.length - 1].value).toEqual(fetchMoreValue);
|
||||
expect(firstOptions.length).toEqual(pageSize / 2 + 1); // + 1 === fetch more object
|
||||
expect(secondOptions[secondOptions.length - 1].value).toEqual(fetchMoreValue);
|
||||
expect(secondOptions.length).toEqual((pageSize / 2) * 2 + 1);
|
||||
expect(thirdOptions.every(update => update.value !== fetchMoreValue)).toBeTruthy();
|
||||
expect(thirdOptions.length).toEqual((pageSize / 2) * 3);
|
||||
});
|
||||
|
||||
it('paginates update requests as expected', async () => {
|
||||
const mockSelectedGroupId = uuidv4();
|
||||
const pageSize = 50;
|
||||
updatesToResolve
|
||||
.mockReturnValueOnce(
|
||||
createMockUpdates({ updateCount: pageSize + 1, groupId: mockSelectedGroupId })
|
||||
)
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize + 1 }))
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize + 1 }))
|
||||
.mockReturnValueOnce(createMockUpdates({ updateCount: pageSize }));
|
||||
jest
|
||||
.mocked(selectAsync)
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce('_fetchMore')
|
||||
.mockResolvedValueOnce(mockSelectedGroupId);
|
||||
|
||||
await getUpdatesToRepublishInteractiveAsync(projectName, branchName, 'all', pageSize);
|
||||
const gqlBindings = jest.mocked(graphqlClient.query).mock.calls.map(call => call[1]);
|
||||
expect(gqlBindings).toEqual([
|
||||
expect.objectContaining({ limit: pageSize + 1, offset: pageSize * 0 }),
|
||||
expect.objectContaining({ limit: pageSize + 1, offset: pageSize * 1 }),
|
||||
expect.objectContaining({ limit: pageSize + 1, offset: pageSize * 2 }),
|
||||
expect.objectContaining({ limit: pageSize + 1, offset: pageSize * 3 }),
|
||||
]);
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,5 +1,5 @@
|
||||
import { Platform } from '@expo/eas-build-job';
|
||||
import { BuildProfile, EasJsonReader, errors } from '@expo/eas-json';
|
||||
import { EasJsonReader, errors } from '@expo/eas-json';
|
||||
|
||||
import { selectAsync } from '../../prompts';
|
||||
import { getProfilesAsync } from '../profiles';
|
||||
@@ -31,7 +31,7 @@ describe(getProfilesAsync, () => {
|
||||
|
||||
it('defaults to production profile', async () => {
|
||||
const result = await getProfilesAsync({
|
||||
projectDir: '/fake',
|
||||
easJsonReader: new EasJsonReader('/fake'),
|
||||
platforms: [Platform.ANDROID, Platform.IOS],
|
||||
profileName: undefined,
|
||||
type: 'build',
|
||||
@@ -39,53 +39,8 @@ describe(getProfilesAsync, () => {
|
||||
|
||||
expect(result[0].profileName).toBe('production');
|
||||
expect(result[1].profileName).toBe('production');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
|
||||
});
|
||||
|
||||
it('defaults to release profile when production profile is non-existent', async () => {
|
||||
getBuildProfileAsync
|
||||
.mockImplementationOnce(() => {
|
||||
throw new errors.MissingProfileError();
|
||||
})
|
||||
.mockImplementationOnce(() => {
|
||||
throw new errors.MissingProfileError();
|
||||
});
|
||||
|
||||
const result = await getProfilesAsync({
|
||||
projectDir: '/fake',
|
||||
platforms: [Platform.ANDROID, Platform.IOS],
|
||||
profileName: undefined,
|
||||
type: 'build',
|
||||
});
|
||||
|
||||
expect(result[0].profileName).toBe('release');
|
||||
expect(result[1].profileName).toBe('release');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'release');
|
||||
});
|
||||
|
||||
it('asks the user to pick profile if "release" does not exist', async () => {
|
||||
getBuildProfileAsync.mockImplementation(async (_, profileName) => {
|
||||
if (profileName === 'foo') {
|
||||
return {} as unknown as BuildProfile<Platform>;
|
||||
}
|
||||
throw new errors.MissingProfileError();
|
||||
});
|
||||
getBuildProfileNamesAsync.mockImplementation(() => Promise.resolve(['foo', 'bar']));
|
||||
jest.mocked(selectAsync).mockImplementation(async () => 'foo');
|
||||
|
||||
const result = await getProfilesAsync({
|
||||
projectDir: '/fake',
|
||||
platforms: [Platform.ANDROID],
|
||||
profileName: undefined,
|
||||
type: 'build',
|
||||
});
|
||||
expect(selectAsync).toHaveBeenCalled();
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'foo');
|
||||
expect(result[0].profileName).toBe('foo');
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, undefined);
|
||||
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, undefined);
|
||||
});
|
||||
|
||||
it('throws an error if there are no profiles in eas.json', async () => {
|
||||
@@ -96,7 +51,7 @@ describe(getProfilesAsync, () => {
|
||||
|
||||
await expect(
|
||||
getProfilesAsync({
|
||||
projectDir: '/fake',
|
||||
easJsonReader: new EasJsonReader('/fake'),
|
||||
platforms: [Platform.ANDROID],
|
||||
profileName: undefined,
|
||||
type: 'build',
|
||||
@@ -106,7 +61,7 @@ describe(getProfilesAsync, () => {
|
||||
|
||||
it('gets a specific profile', async () => {
|
||||
const result = await getProfilesAsync({
|
||||
projectDir: '/fake',
|
||||
easJsonReader: new EasJsonReader('/fake'),
|
||||
platforms: [Platform.ANDROID, Platform.IOS],
|
||||
profileName: 'custom-profile',
|
||||
type: 'build',
|
||||
@@ -125,7 +80,7 @@ describe(getProfilesAsync, () => {
|
||||
|
||||
await expect(
|
||||
getProfilesAsync({
|
||||
projectDir: '/fake',
|
||||
easJsonReader: new EasJsonReader('/fake'),
|
||||
platforms: [Platform.ANDROID, Platform.IOS],
|
||||
profileName: undefined,
|
||||
type: 'build',
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
import uniq from '../uniq';
|
||||
|
||||
describe(uniq, () => {
|
||||
it('returns unique numbers from a list', () => {
|
||||
expect(uniq([1, 2, 2, 3, 4, 2, 3])).toEqual([1, 2, 3, 4]);
|
||||
});
|
||||
|
||||
it('returns unique strings from a list', () => {
|
||||
expect(uniq(['hi', 'hello', 'hello', 'ola'])).toEqual(['hi', 'hello', 'ola']);
|
||||
});
|
||||
|
||||
it('returns unique mixed types from a list', () => {
|
||||
expect(uniq([1, 2, 2, 'hi', 'hi', 'hello', 3])).toEqual([1, 2, 'hi', 'hello', 3]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,4 @@
|
||||
export default function uniq<T = any>(items: T[]): T[] {
|
||||
const set = new Set(items);
|
||||
return [...set];
|
||||
}
|
||||
@@ -1,16 +1,5 @@
|
||||
import { Platform } from '@expo/eas-build-job';
|
||||
import {
|
||||
BuildProfile,
|
||||
EasJsonReader,
|
||||
ProfileType,
|
||||
SubmitProfile,
|
||||
errors,
|
||||
getDefaultSubmitProfile,
|
||||
} from '@expo/eas-json';
|
||||
import chalk from 'chalk';
|
||||
|
||||
import Log from '../log';
|
||||
import { ExpoChoice, selectAsync } from '../prompts';
|
||||
import { BuildProfile, EasJsonReader, ProfileType, SubmitProfile } from '@expo/eas-json';
|
||||
|
||||
type EasProfile<T extends ProfileType> = T extends 'build'
|
||||
? BuildProfile<Platform>
|
||||
@@ -23,109 +12,26 @@ export type ProfileData<T extends ProfileType> = {
|
||||
};
|
||||
|
||||
export async function getProfilesAsync<T extends ProfileType>({
|
||||
projectDir,
|
||||
easJsonReader,
|
||||
platforms,
|
||||
profileName,
|
||||
type,
|
||||
}: {
|
||||
projectDir: string;
|
||||
easJsonReader: EasJsonReader;
|
||||
platforms: Platform[];
|
||||
profileName?: string;
|
||||
type: T;
|
||||
}): Promise<ProfileData<T>[]> {
|
||||
const results = platforms.map(async function (platform) {
|
||||
if (profileName) {
|
||||
const profile = await readProfileAsync({ projectDir, platform, type, profileName });
|
||||
return {
|
||||
profile,
|
||||
profileName,
|
||||
platform,
|
||||
};
|
||||
}
|
||||
|
||||
try {
|
||||
const profile = await readProfileAsync({
|
||||
projectDir,
|
||||
platform,
|
||||
type,
|
||||
profileName: 'production',
|
||||
});
|
||||
return {
|
||||
profile,
|
||||
profileName: 'production',
|
||||
platform,
|
||||
};
|
||||
} catch (error) {
|
||||
if (!(error instanceof errors.MissingProfileError)) {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
const profile = await readProfileAsync({
|
||||
projectDir,
|
||||
platform,
|
||||
type,
|
||||
profileName: 'release',
|
||||
});
|
||||
Log.warn(
|
||||
`The default profile changed from ${chalk.bold('release')} to ${chalk.bold(
|
||||
'production'
|
||||
)}. We detected that you still have a ${chalk.bold(
|
||||
'release'
|
||||
)} build profile, so we are using it. Update eas.json to have a profile named ${chalk.bold(
|
||||
'production'
|
||||
)} under the ${chalk.bold(
|
||||
'build'
|
||||
)} key, or specify which profile you'd like to use with the ${chalk.bold(
|
||||
'--profile'
|
||||
)} flag. This fallback behavior will be removed in the next major version of EAS CLI.`
|
||||
);
|
||||
return {
|
||||
profile,
|
||||
profileName: 'release',
|
||||
platform,
|
||||
};
|
||||
} catch (error) {
|
||||
if (!(error instanceof errors.MissingProfileError)) {
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
const defaultProfile = getDefaultProfile({ platform, type });
|
||||
if (defaultProfile) {
|
||||
return {
|
||||
profile: defaultProfile,
|
||||
profileName: '__default__',
|
||||
platform,
|
||||
};
|
||||
}
|
||||
|
||||
const profileNames = await readProfileNamesAsync({
|
||||
projectDir,
|
||||
type,
|
||||
});
|
||||
if (profileNames.length === 0) {
|
||||
throw new errors.MissingProfileError(
|
||||
`Missing profile in eas.json: ${profileName ?? 'production'}`
|
||||
);
|
||||
}
|
||||
const choices: ExpoChoice<string>[] = profileNames.map(profileName => ({
|
||||
title: profileName,
|
||||
value: profileName,
|
||||
}));
|
||||
const chosenProfileName = await selectAsync(
|
||||
'The "production" profile is missing in eas.json. Pick another profile:',
|
||||
choices
|
||||
);
|
||||
const profile = await readProfileAsync({
|
||||
projectDir,
|
||||
easJsonReader,
|
||||
platform,
|
||||
type,
|
||||
profileName: chosenProfileName,
|
||||
profileName,
|
||||
});
|
||||
return {
|
||||
profile,
|
||||
profileName: chosenProfileName,
|
||||
profileName: profileName ?? 'production',
|
||||
platform,
|
||||
};
|
||||
});
|
||||
@@ -134,49 +40,19 @@ export async function getProfilesAsync<T extends ProfileType>({
|
||||
}
|
||||
|
||||
async function readProfileAsync<T extends ProfileType>({
|
||||
projectDir,
|
||||
easJsonReader,
|
||||
platform,
|
||||
type,
|
||||
profileName,
|
||||
}: {
|
||||
projectDir: string;
|
||||
easJsonReader: EasJsonReader;
|
||||
platform: Platform;
|
||||
type: T;
|
||||
profileName: string;
|
||||
profileName?: string;
|
||||
}): Promise<EasProfile<T>> {
|
||||
const easJsonReader = new EasJsonReader(projectDir);
|
||||
if (type === 'build') {
|
||||
return (await easJsonReader.getBuildProfileAsync(platform, profileName)) as EasProfile<T>;
|
||||
} else {
|
||||
return (await easJsonReader.getSubmitProfileAsync(platform, profileName)) as EasProfile<T>;
|
||||
}
|
||||
}
|
||||
|
||||
function getDefaultProfile<T extends ProfileType>({
|
||||
platform,
|
||||
type,
|
||||
}: {
|
||||
platform: Platform;
|
||||
type: T;
|
||||
}): EasProfile<T> | null {
|
||||
if (type === 'build') {
|
||||
return null;
|
||||
} else {
|
||||
return getDefaultSubmitProfile(platform) as EasProfile<T>;
|
||||
}
|
||||
}
|
||||
|
||||
async function readProfileNamesAsync({
|
||||
projectDir,
|
||||
type,
|
||||
}: {
|
||||
projectDir: string;
|
||||
type: ProfileType;
|
||||
}): Promise<string[]> {
|
||||
const easJsonReader = new EasJsonReader(projectDir);
|
||||
if (type === 'build') {
|
||||
return await easJsonReader.getBuildProfileNamesAsync();
|
||||
} else {
|
||||
return await easJsonReader.getSubmitProfileNamesAsync();
|
||||
}
|
||||
}
|
||||
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "@expo/eas-json",
|
||||
"description": "A library for interacting with eas.json",
|
||||
"version": "0.53.1",
|
||||
"version": "0.54.0",
|
||||
"author": "Expo <[email protected]>",
|
||||
"bugs": "https://github.com/expo/eas-cli/issues",
|
||||
"dependencies": {
|
||||
"@expo/eas-build-job": "0.2.72",
|
||||
"@expo/eas-build-job": "0.2.77",
|
||||
"@expo/json-file": "8.2.36",
|
||||
"chalk": "4.1.2",
|
||||
"env-string": "1.0.1",
|
||||
|
||||
@@ -14,11 +14,11 @@ export function resolveBuildProfile<T extends Platform>({
|
||||
}: {
|
||||
easJson: EasJson;
|
||||
platform: T;
|
||||
profileName: string;
|
||||
profileName?: string;
|
||||
}): BuildProfile<T> {
|
||||
const easJsonProfile = resolveProfile({
|
||||
easJson,
|
||||
profileName,
|
||||
profileName: profileName ?? 'production',
|
||||
});
|
||||
const { android, ios, ...base } = easJsonProfile;
|
||||
const withoutDefaults = mergeProfiles(base, easJsonProfile[platform] ?? {});
|
||||
|
||||
@@ -59,7 +59,7 @@ export class EasJsonReader {
|
||||
|
||||
public async getBuildProfileAsync<T extends Platform>(
|
||||
platform: T,
|
||||
profileName: string
|
||||
profileName?: string
|
||||
): Promise<BuildProfile<T>> {
|
||||
const easJson = await this.readAsync();
|
||||
return resolveBuildProfile({ easJson, platform, profileName });
|
||||
@@ -84,7 +84,7 @@ export class EasJsonReader {
|
||||
|
||||
public async getSubmitProfileAsync<T extends Platform>(
|
||||
platform: T,
|
||||
profileName: string
|
||||
profileName?: string
|
||||
): Promise<SubmitProfile<T>> {
|
||||
const easJson = await this.readAsync();
|
||||
return resolveSubmitProfile({ easJson, platform, profileName });
|
||||
|
||||
@@ -17,15 +17,23 @@ export function resolveSubmitProfile<T extends Platform>({
|
||||
}: {
|
||||
easJson: EasJson;
|
||||
platform: T;
|
||||
profileName: string;
|
||||
profileName?: string;
|
||||
}): SubmitProfile<T> {
|
||||
const submitProfile = resolveProfile({
|
||||
easJson,
|
||||
platform,
|
||||
profileName,
|
||||
});
|
||||
const unevaluatedProfile = mergeProfiles(getDefaultProfile(platform), submitProfile);
|
||||
return evaluateFields(platform, unevaluatedProfile);
|
||||
try {
|
||||
const submitProfile = resolveProfile({
|
||||
easJson,
|
||||
platform,
|
||||
profileName: profileName ?? 'production',
|
||||
});
|
||||
const unevaluatedProfile = mergeProfiles(getDefaultProfile(platform), submitProfile);
|
||||
return evaluateFields(platform, unevaluatedProfile);
|
||||
} catch (err: any) {
|
||||
if (err instanceof MissingProfileError && !profileName) {
|
||||
return getDefaultProfile(platform);
|
||||
} else {
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function resolveProfile<T extends Platform>({
|
||||
|
||||
@@ -1269,10 +1269,10 @@
|
||||
slugify "^1.3.4"
|
||||
sucrase "^3.20.0"
|
||||
|
||||
"@expo/[email protected]2":
|
||||
version "0.2.72"
|
||||
resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.72.tgz#cc1716cb722a400a20de48731e81c10a876b12be"
|
||||
integrity sha512-PDWY/C/ypKzbLLW/V45yIuRRR4KWlUNTmyhiIMdx7qaJgpQs4ax8u8BkYBR/e3FSCKfd3s8fqkxuyWEUcdZG5w==
|
||||
"@expo/[email protected]7":
|
||||
version "0.2.77"
|
||||
resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.77.tgz#2ebdb3e6706c4020812e2e8e3d2e7da26e3c7eb1"
|
||||
integrity sha512-CFS/Uixa3XqV39vdoDnQP93kgd2EGf3gaOqLYl+9gnMCP9h2+Q9fIbfPw5DnFu2LEIyU+Xw5DtpkyTQEBjTLyA==
|
||||
dependencies:
|
||||
joi "^17.4.2"
|
||||
semver "^7.3.5"
|
||||
@@ -10564,6 +10564,11 @@ promise-inflight@^1.0.1:
|
||||
resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
|
||||
integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
|
||||
|
||||
[email protected]:
|
||||
version "2.7.0"
|
||||
resolved "https://registry.yarnpkg.com/promise-limit/-/promise-limit-2.7.0.tgz#eb5737c33342a030eaeaecea9b3d3a93cb592b26"
|
||||
integrity sha512-7nJ6v5lnJsXwGprnGXga4wx6d1POjvi5Qmf1ivTRxTjH4Z/9Czja/UCMLVmB9N93GeWOU93XaFaEt6jbuoagNw==
|
||||
|
||||
promise-retry@^2.0.1:
|
||||
version "2.0.1"
|
||||
resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
|
||||
|
||||
Reference in new issue
Block a user