Compare commits

...
41 Commits
Author SHA1 Message Date
jonsamp ddfe60a7b0 v0.40.0 2021-12-08 15:43:11 -05:00
jkh 7dedeb904b [eas-cli] change eas update:publish to eas update (#830)
* [eas-cli] change eas update:publish to eas update

* update CHANGELOG.md

* grammar
2021-12-08 15:15:25 -05:00
Quinlan Jung 4c02e0102b [eas-cli] pass build profile env to credentials ctx (#828)
* [eas-cli] pass build profile env to credentials ctx

* update CHANGELOG.md

* pr feedback

* oops
2021-12-08 11:15:04 -08:00
kgc00 e91516fcc7 [eas-cli] removes account name from tracking context (#827) 2021-12-08 10:15:46 -08:00
jkh d01f6c0d8e [eas-cli] ask for publish message before staring bundling (#826) 2021-12-08 11:13:26 -05:00
jkh 1ce69cd7c9 [eas-cli] rename branch:publish to update:publish (#818) 2021-12-06 11:38:20 -05:00
Expo CI 83c10793ac update CHANGELOG.md 2021-12-06 11:47:10 +00:00
Wojciech Kozyra a344c11ba1 v0.39.0 2021-12-06 12:41:24 +01:00
Wojciech Kozyra c7d5a9a819 upgrade eas-cli-local-build-plugin to 0.0.54 2021-12-06 12:41:08 +01:00
Wojciech KozyraandDominik Sokal 2f43ed94ab detect react-native version + update eas-build-job (#823)
* detect react-native version + update eas-build-job

* update CHANGELOG.md

* Apply suggestions from code review

Co-authored-by: Dominik Sokal <[email protected]>

* update packages

Co-authored-by: Dominik Sokal <[email protected]>
2021-12-06 12:38:29 +01:00
Dominik Sokal 4a4ebf3cd6 print project workflow in eas diagnostics + update bug report template - add manged/bare input (#822)
* update bug report template - add manged/bare input

* print project workflow in eas diagnostics

* update CHANGELOG.md
2021-12-06 12:05:20 +01:00
Dominik Sokal 18b832dbda fix setting up credentials for projects with Apple Watch companion apps (#812)
* fix setting up credentials for projects with Apple Watch companion apps

* update CHANGELOG.md
2021-12-06 11:37:39 +01:00
Dominik Sokal 1200e7fecd upgrade @expo/* deps (#821)
* upgrade @expo/* deps

* update CHANGELOG.md
2021-12-06 10:50:44 +01:00
Dominik Sokal 3cc6b73d3a make iOS submission message less scary: App Store -> App Store Connect (#815) 2021-12-06 09:41:46 +01:00
jkh 4831ff186a [eas-cli] bump config-plugins to 4.0.11 (#817) 2021-12-03 16:26:00 -05:00
Wojciech Kozyra a2d60a4a76 [eas-cli] improve error message for missing ascAppId (#813)
* [eas-cli] improve error message for missing ascAppId

* update CHANGELOG.md

* Update packages/eas-cli/src/submit/ios/IosSubmitCommand.ts
2021-12-03 09:03:11 +01:00
jkh 9f604777b9 [eas-cli] set runtime version in eas update:configure (#811) 2021-12-02 09:15:26 -05:00
Dominik Sokal fce9bda9bb [changelog-bot] revert checkout action back to v2 2021-12-02 11:27:00 +01:00
Dominik Sokal 4cc6745a0d [changelog-bot] revert setup-node action back to v2; use checkout@v1 2021-12-02 11:22:17 +01:00
Dominik Sokal 67f0b806f4 [changelog-bot] revert setup-node action to v1 2021-12-02 11:11:42 +01:00
Dominik Sokal 9280dfb3ad [changelog-bot] always capitalize message 2021-12-02 09:36:12 +01:00
jkh 2befbb0eba [eas-cli] fix typos in eas channel:view logging (#810) 2021-12-01 12:53:55 -05:00
Wojciech Kozyra 41359b7194 [eas-cli] pass bundle identifier when resolving asc app id (#809)
* [eas-cli] pass bundle identifier when resolving asc app id

* update CHANGELOG.md
2021-12-01 16:32:55 +01:00
jkh c57861a67d [eas-cli] add missing @expo/sdk-runtime-versions dependency (#808) 2021-11-30 13:19:55 -05:00
Expo CI d31ece8793 update CHANGELOG.md 2021-11-29 23:11:26 +00:00
Brent Vatne 4f7148b756 v0.38.3 2021-11-29 15:04:37 -08:00
Brent Vatne bc8a781d86 [eas-cli] upgrade @expo/* deps (#806) 2021-11-29 14:49:44 -08:00
jkh 153a70fb85 [eas-cli] add eas update:configure (#800) 2021-11-29 07:58:02 -05:00
Wojciech Kozyra 2f93492fc3 [eas-cli] print warning about outdated version to stderr (#805)
* print warning about outdated version to stderr

* update CHANGELOG.md
2021-11-29 11:23:31 +01:00
Dominik Sokal 0b39ff1457 update README.md 2021-11-29 10:15:39 +01:00
Kim BrandwijkandDominik Sokal f6817037ae docs: fix broken links to all command source files in readme (#791)
* docs: fix broken links to all command source files in readme

They pointed to .js, but they're all .ts

* docs: fix command paths by adding typescript devdependency

* fix: add typescript devDependency to eas-json for consistency

Co-authored-by: Dominik Sokal <[email protected]>
2021-11-29 10:13:53 +01:00
Expo CI 216f97ea8a update CHANGELOG.md 2021-11-26 22:01:36 +00:00
Brent Vatne 11c194a168 v0.38.2 2021-11-26 13:50:29 -08:00
Brent Vatne 3c74c111a7 Update yarn.lock 2021-11-26 13:41:40 -08:00
Brent Vatne b69b8b87a7 [eas-cli] upgrade @expo/* deps (#801) 2021-11-26 13:40:58 -08:00
jkh 825baa9f68 [eas-cli] check EAS Update URL is correctly configured before publish (#789) 2021-11-26 16:23:14 -05:00
Dominik Sokal 9f5736cfaa fix lint error 2021-11-26 14:39:10 +01:00
Dominik Sokal ae24ffbe86 fix getProfilesAsync tests 2021-11-26 14:23:08 +01:00
Dominik Sokal 487316370b refactor @expo/eas-json (#794)
* refactor @expo/eas-json

* update CHANGELOG.md
2021-11-26 12:35:49 +01:00
Dominik Sokal 8bc3565270 fix evaluating template strings from info.plist (#798)
* fix evaluating template strings from info.plist

* update CHANGELOG.md
2021-11-26 11:41:57 +01:00
Expo CI 07450f6bf7 update CHANGELOG.md 2021-11-25 09:34:42 +00:00
62 changed files with 1535 additions and 1154 deletions

No files matched your search

+7
View File
@@ -21,6 +21,13 @@ body:
label: Summary
description: Describe the issue in 1 or 2 sentences
placeholder: Clearly describe what the expected behavior is vs. what is actually happening. This should be as short as possible, while still communicating all the necessary information. If your summary is just 'X library/method isn't working', then you need to continue debugging yourself and provide more information.
- type: textarea
validations:
required: true
attributes:
label: Managed or bare?
description: See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
placeholder: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project.
- type: textarea
validations:
required: true
+45 -1
View File
@@ -6,14 +6,58 @@ This is the log of notable changes to EAS CLI and related packages.
### 🛠 Breaking changes
- [eas-cli] change eas update:publish to eas update. ([#830](https://github.com/expo/eas-cli/pull/830) by [@jkhales](https://github.com/jkhales))
### 🎉 New features
### 🐛 Bug fixes
- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
- Pass build profile environment to credentials command. ([#828](https://github.com/expo/eas-cli/pull/828) by [@quinlanj](https://github.com/quinlanj))
### 🧹 Chores
## [0.39.0](https://github.com/expo/eas-cli/releases/tag/v0.39.0) - 2021-12-06
### 🎉 New features
- Set runtime version in `eas update:configure`. ([#811](https://github.com/expo/eas-cli/pull/811) by [@jkhales](https://github.com/jkhales))
- Print project workflow in `eas diagnostics`. ([#822](https://github.com/expo/eas-cli/pull/822) by [@dsokal](https://github.com/dsokal))
### 🐛 Bug fixes
- Fix submit for multi-target projects where ascAppId is not specified. ([#809](https://github.com/expo/eas-cli/pull/809) by [@wkozyra95](https://github.com/wkozyra95))
- Fix building iOS projects with Apple Watch companion app. ([#812](https://github.com/expo/eas-cli/pull/812), [#817](https://github.com/expo/eas-cli/pull/817), [#821](https://github.com/expo/eas-cli/pull/821) by [@jkhales](https://github.com/jkhales) + [@dsokal](https://github.com/dsokal))
### 🧹 Chores
- Improve error message for missing ascAppId. ([#813](https://github.com/expo/eas-cli/pull/813) by [@wkozyra95](https://github.com/wkozyra95))
- Add `react-native` version to metadata. ([#823](https://github.com/expo/eas-cli/pull/823) by [@wkozyra95](https://github.com/wkozyra95))
## [0.38.3](https://github.com/expo/eas-cli/releases/tag/v0.38.3) - 2021-11-29
### 🐛 Bug fixes
- Print warning about outdated version to stderr. ([#805](https://github.com/expo/eas-cli/pull/805) by [@wkozyra95](https://github.com/wkozyra95))
- Fix Apple sign in capabilities. ([#806](https://github.com/expo/eas-cli/pull/806) by [@brentvatne](https://github.com/brentvatne))
## [0.38.2](https://github.com/expo/eas-cli/releases/tag/v0.38.2) - 2021-11-26
### 🎉 New features
- Add support for extending submit profiles. ([#794](https://github.com/expo/eas-cli/pull/794) by [@dsokal](https://github.com/dsokal))
- Add command: `eas update:configure`. ([#800](https://github.com/expo/eas-cli/pull/800) by [@jkhales](https://github.com/jkhales))
### 🐛 Bug fixes
- Fix reading app version and app build version of iOS projects. ([#798](https://github.com/expo/eas-cli/pull/798) by [@dsokal](https://github.com/dsokal))
- Fix push notifications entitlements. ([#801](https://github.com/expo/eas-cli/pull/801) by [@brentvatne](https://github.com/brentvatne))
## [0.38.1](https://github.com/expo/eas-cli/releases/tag/v0.38.1) - 2021-11-25
### 🐛 Bug fixes
- Fix building iOS projects with whitespace in the project name. ([#792](https://github.com/expo/eas-cli/pull/792) by [@dsokal](https://github.com/dsokal))
## [0.38.0](https://github.com/expo/eas-cli/releases/tag/v0.38.0) - 2021-11-24
### 🎉 New features
+1 -1
View File
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.38.1"
"version": "0.40.0"
}
+33 -32
View File
@@ -7,9 +7,9 @@ EAS command line tool
[![Downloads/week](https://img.shields.io/npm/dw/eas-cli.svg)](https://npmjs.org/package/eas-cli)
[![License](https://img.shields.io/npm/l/eas-cli.svg)](https://github.com/expo/eas-cli/blob/main/package.json)
* [Installation](#installation)
* [Usage](#usage)
* [Commands](#commands)
- [Installation](#installation)
- [Usage](#usage)
- [Commands](#commands)
# Installation
@@ -73,7 +73,7 @@ ALIASES
$ eas login
```
_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/account/login.js)_
_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/account/login.ts)_
## `eas account:logout`
@@ -87,7 +87,7 @@ ALIASES
$ eas logout
```
_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/account/logout.js)_
_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/account/logout.ts)_
## `eas account:view`
@@ -101,7 +101,7 @@ ALIASES
$ eas whoami
```
_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/account/view.js)_
_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/account/view.ts)_
## `eas analytics [STATUS]`
@@ -112,11 +112,11 @@ USAGE
$ eas analytics [STATUS]
```
_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/analytics.js)_
_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/analytics.ts)_
## `eas build`
start a build
Start a build
```
USAGE
@@ -146,7 +146,7 @@ OPTIONS
--[no-]wait Wait for build(s) to complete
```
_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/build/index.js)_
_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/index.ts)_
## `eas build:cancel [BUILD_ID]`
@@ -157,7 +157,7 @@ USAGE
$ eas build:cancel [BUILD_ID]
```
_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/build/cancel.js)_
_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/cancel.ts)_
## `eas build:configure`
@@ -171,7 +171,7 @@ OPTIONS
-p, --platform=(android|ios|all) Platform to configure
```
_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/build/configure.js)_
_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/configure.ts)_
## `eas build:list`
@@ -204,7 +204,7 @@ OPTIONS
--status=(new|in-queue|in-progress|errored|finished|canceled)
```
_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/build/list.js)_
_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/list.ts)_
## `eas build:view [BUILD_ID]`
@@ -218,7 +218,7 @@ OPTIONS
--json Enable JSON output, non-JSON messages will be printed to stderr
```
_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/build/view.js)_
_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/build/view.ts)_
## `eas config`
@@ -233,7 +233,7 @@ OPTIONS
--profile=profile
```
_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/config.js)_
_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/config.ts)_
## `eas credentials`
@@ -244,7 +244,7 @@ USAGE
$ eas credentials
```
_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/credentials.js)_
_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/credentials.ts)_
## `eas device:create`
@@ -255,7 +255,7 @@ USAGE
$ eas device:create
```
_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/device/create.js)_
_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/create.ts)_
## `eas device:list`
@@ -269,7 +269,7 @@ OPTIONS
--apple-team-id=apple-team-id
```
_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/device/list.js)_
_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/list.ts)_
## `eas device:view [UDID]`
@@ -280,7 +280,7 @@ USAGE
$ eas device:view [UDID]
```
_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/device/view.js)_
_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/device/view.ts)_
## `eas diagnostics`
@@ -291,7 +291,7 @@ USAGE
$ eas diagnostics
```
_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/diagnostics.js)_
_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/diagnostics.ts)_
## `eas help [COMMAND]`
@@ -319,7 +319,7 @@ USAGE
$ eas project:info
```
_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/project/info.js)_
_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/project/info.ts)_
## `eas project:init`
@@ -333,7 +333,7 @@ ALIASES
$ eas init
```
_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/project/init.js)_
_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/project/init.ts)_
## `eas secret:create`
@@ -350,7 +350,7 @@ OPTIONS
--value=value Value of the secret
```
_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/secret/create.js)_
_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/create.ts)_
## `eas secret:delete`
@@ -367,7 +367,7 @@ DESCRIPTION
Unsure where to find the secret's ID? Run eas secret:list
```
_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/secret/delete.js)_
_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/delete.ts)_
## `eas secret:list`
@@ -378,11 +378,11 @@ USAGE
$ eas secret:list
```
_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/secret/list.js)_
_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/secret/list.ts)_
## `eas submit`
submit build archive to app store
Submit build archive to App Store Connect
```
USAGE
@@ -405,13 +405,14 @@ OPTIONS
--[no-]wait Wait for submission to complete
DESCRIPTION
See how to configure submits with eas.json: https://docs.expo.dev/submit/eas-json/
See how to configure submits with eas.json:
https://docs.expo.dev/submit/eas-json/
ALIASES
$ eas build:submit
```
_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/submit.js)_
_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/submit.ts)_
## `eas webhook:create`
@@ -430,7 +431,7 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/webhook/create.js)_
_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/create.ts)_
## `eas webhook:delete [ID]`
@@ -444,7 +445,7 @@ ARGUMENTS
ID ID of the webhook to delete
```
_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/webhook/delete.js)_
_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/delete.ts)_
## `eas webhook:list`
@@ -458,7 +459,7 @@ OPTIONS
--event=(BUILD|SUBMIT) Event type that triggers the webhook
```
_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/webhook/list.js)_
_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/list.ts)_
## `eas webhook:update`
@@ -478,7 +479,7 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/webhook/update.js)_
_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/update.ts)_
## `eas webhook:view ID`
@@ -492,5 +493,5 @@ ARGUMENTS
ID ID of the webhook to view
```
_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.38.1/packages/eas-cli/src/commands/webhook/view.js)_
_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.40.0/packages/eas-cli/src/commands/webhook/view.ts)_
<!-- commandsstop -->
+9 -8
View File
@@ -1,7 +1,7 @@
{
"name": "eas-cli",
"description": "EAS command line tool",
"version": "0.38.1",
"version": "0.40.0",
"author": "Expo <[email protected]>",
"bin": {
"eas": "./bin/run"
@@ -9,15 +9,15 @@
"bugs": "https://github.com/expo/eas-cli/issues",
"dependencies": {
"@expo/apple-utils": "0.0.0-alpha.26",
"@expo/config": "6.0.8",
"@expo/config-plugins": "4.0.8",
"@expo/eas-build-job": "0.2.57",
"@expo/eas-json": "^0.38.0",
"@expo/config": "6.0.11",
"@expo/config-plugins": "4.0.11",
"@expo/eas-build-job": "0.2.61",
"@expo/eas-json": "^0.40.0",
"@expo/json-file": "8.2.34",
"@expo/pkcs12": "0.0.6",
"@expo/plist": "0.0.16",
"@expo/plugin-warn-if-update-available": "1.7.0",
"@expo/prebuild-config": "3.0.8",
"@expo/plugin-warn-if-update-available": "1.7.1",
"@expo/prebuild-config": "3.0.11",
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.1",
"@expo/spawn-async": "1.5.0",
@@ -95,7 +95,8 @@
"mockdate": "^3.0.2",
"nock": "^13.0.5",
"tempy": "0.7.0",
"ts-deepmerge": "1.0.8"
"ts-deepmerge": "1.0.8",
"typescript": "4.5.2"
},
"engines": {
"node": ">=12.0.0"
@@ -1,7 +1,7 @@
import { ExpoConfig } from '@expo/config';
import { AndroidConfig } from '@expo/config-plugins';
import { Platform, Workflow } from '@expo/eas-build-job';
import { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json';
import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
import Log from '../../log';
import {
@@ -41,7 +41,7 @@ export async function validateAndSyncProjectConfigurationAsync({
}: {
projectDir: string;
exp: ExpoConfig;
buildProfile: AndroidBuildProfile;
buildProfile: BuildProfile<Platform.ANDROID>;
}): Promise<void> {
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
const { autoIncrement } = buildProfile;
@@ -1,5 +1,5 @@
import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
import { AndroidBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import path from 'path';
import slash from 'slash';
@@ -25,7 +25,7 @@ export async function prepareJobAsync(
jobData: JobData
): Promise<Job> {
const username = getUsername(ctx.exp, await ensureLoggedInAsync());
const buildProfile: AndroidBuildProfile = ctx.buildProfile;
const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
const projectRootDirectory =
slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
const { credentials } = jobData;
+1 -1
View File
@@ -143,7 +143,7 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v
if (await fs.pathExists(easJsonPath)) {
const reader = new EasJsonReader(ctx.projectDir);
await reader.readAndValidateAsync();
await reader.readAsync();
Log.withTick('Validated eas.json');
return;
+3 -3
View File
@@ -1,5 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { AndroidBuildProfile, BuildProfile, IosBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import JsonFile from '@expo/json-file';
import resolveFrom from 'resolve-from';
import { v4 as uuidv4 } from 'uuid';
@@ -49,6 +49,7 @@ export async function createBuildContextAsync<T extends Platform>({
nonInteractive,
projectDir,
user,
env: buildProfile.env,
});
const devClientProperties = getDevClientEventProperties({
@@ -60,7 +61,6 @@ export async function createBuildContextAsync<T extends Platform>({
tracking_id: uuidv4(),
platform,
...(accountId && { account_id: accountId }),
account_name: accountName,
project_id: projectId,
project_type: workflow,
...devClientProperties,
@@ -107,7 +107,7 @@ function getDevClientEventProperties({
}: {
platform: Platform;
projectDir: string;
buildProfile: AndroidBuildProfile | IosBuildProfile;
buildProfile: BuildProfile;
}): Partial<TrackingContext> {
let includesDevClient;
const version = tryGetDevClientVersion(projectDir);
+2 -2
View File
@@ -1,6 +1,6 @@
import { ExpoConfig } from '@expo/config';
import { Platform, Workflow } from '@expo/eas-build-job';
import { IosBuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
import type { XCBuildConfiguration } from 'xcode';
import Log from '../../log';
@@ -36,7 +36,7 @@ export async function validateAndSyncProjectConfigurationAsync({
}: {
projectDir: string;
exp: ExpoConfig;
buildProfile: IosBuildProfile;
buildProfile: BuildProfile<Platform.IOS>;
buildSettings: XCBuildConfiguration['buildSettings'];
}): Promise<void> {
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
+7 -1
View File
@@ -130,6 +130,7 @@ export async function maybeResolveVersionsAsync(
};
} catch (err: any) {
Log.warn('Failed to read app versions.');
Log.debug(err);
Log.warn(err.message);
Log.warn('Proceeding anyway...');
return {};
@@ -200,7 +201,12 @@ function ensureStaticConfigExists(projectDir: string): void {
}
}
export function evaluateTemplateString(s: string, vars: Record<string, any>): string {
export function evaluateTemplateString(
s: string,
buildSettings: XCBuildConfiguration['buildSettings']
): string {
// necessary because XCBuildConfiguration['buildSettings'] is not a plain object
const vars = { ...buildSettings };
return s.replace(/\$\((\w+)\)/g, (match, key) => {
if (vars.hasOwnProperty(key)) {
const value = String(vars[key]);
+1 -1
View File
@@ -3,7 +3,7 @@ import spawnAsync from '@expo/spawn-async';
import semver from 'semver';
const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
const PLUGIN_PACKAGE_VERSION = '0.0.50';
const PLUGIN_PACKAGE_VERSION = '0.0.54';
export async function runLocalBuildAsync(job: Job): Promise<void> {
const { command, args } = await getCommandAndArgsAsync(job);
+16
View File
@@ -1,6 +1,8 @@
import { Updates } from '@expo/config-plugins';
import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
import { IosEnterpriseProvisioning } from '@expo/eas-json';
import fs from 'fs-extra';
import resolveFrom from 'resolve-from';
import Log from '../log';
import { getUsername } from '../project/projectUtils';
@@ -48,6 +50,7 @@ export async function collectMetadataAsync<T extends Platform>(
credentialsSource: ctx.buildProfile.credentialsSource,
sdkVersion: ctx.exp.sdkVersion,
runtimeVersion: getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
reactNativeVersion: await getReactNativeVersionAsync(ctx),
...channelOrReleaseChannel,
distribution,
appName: ctx.exp.name,
@@ -141,6 +144,19 @@ async function getNativeChannelAsync<T extends Platform>(
return undefined;
}
async function getReactNativeVersionAsync(
ctx: BuildContext<Platform>
): Promise<string | undefined> {
try {
const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
return (await fs.readJson(reactNativePackageJsonPath)).version;
} catch (err) {
Log.debug('Failed to resolve react-native version:');
Log.debug(err);
return undefined;
}
}
function resolveIosEnterpriseProvisioning(
ctx: BuildContext<Platform.IOS>
): IosEnterpriseProvisioning | undefined {
@@ -8,7 +8,6 @@ import {
initAsync as initAnalyticsAsync,
logEvent,
} from '../analytics/rudderstackClient';
import Log from '../log';
import { findProjectRootAsync } from '../project/projectUtils';
import { getUserAsync } from '../user/User';
import { ensureLoggedInAsync } from '../user/actions';
@@ -27,8 +26,6 @@ export default abstract class EasCommand extends Command {
// eslint-disable-next-line async-protect/async-suffix
async run(): Promise<any> {
EasJsonReader.setLog(Log);
await initAnalyticsAsync();
await this.applyCliConfigAsync();
+2 -467
View File
@@ -1,475 +1,10 @@
import { ExpoConfig, getConfig } from '@expo/config';
import { Updates } from '@expo/config-plugins';
import { Platform, Workflow } from '@expo/eas-build-job';
import { flags } from '@oclif/command';
import assert from 'assert';
import chalk from 'chalk';
import dateFormat from 'dateformat';
import gql from 'graphql-tag';
import EasCommand from '../../commandUtils/EasCommand';
import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
import {
GetUpdateGroupAsyncQuery,
Robot,
RootQueryUpdatesByGroupArgs,
Update,
UpdateInfoGroup,
User,
ViewBranchQuery,
} from '../../graphql/generated';
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
import Log from '../../log';
import { ora } from '../../ora';
import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
import {
PublishPlatform,
buildBundlesAsync,
buildUnsortedUpdateInfoGroupAsync,
collectAssetsAsync,
uploadAssetsAsync,
} from '../../project/publish';
import { resolveWorkflowAsync } from '../../project/workflow';
import { promptAsync, selectAsync } from '../../prompts';
import { formatUpdate } from '../../update/utils';
import uniqBy from '../../utils/expodash/uniqBy';
import formatFields from '../../utils/formatFields';
import { getVcsClient } from '../../vcs';
import { createUpdateChannelOnAppAsync } from '../channel/create';
import { createUpdateBranchOnAppAsync } from './create';
import { listBranchesAsync } from './list';
import { viewUpdateBranchAsync } from './view';
export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
type PlatformFlag = PublishPlatform | 'all';
async function getUpdateGroupAsync({
group,
}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
const { updatesByGroup } = await withErrorHandlingAsync(
graphqlClient
.query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
gql`
query getUpdateGroupAsync($group: ID!) {
updatesByGroup(group: $group) {
id
group
runtimeVersion
manifestFragment
platform
message
}
}
`,
{
group,
},
{ additionalTypenames: ['Update'] }
)
.toPromise()
);
return updatesByGroup;
}
async function ensureChannelExistsAsync({
appId,
branchId,
channelName,
}: {
appId: string;
branchId: string;
channelName: string;
}): Promise<void> {
try {
await createUpdateChannelOnAppAsync({
appId,
channelName,
branchId,
});
Log.withTick(
`Created a channel: ${chalk.bold(channelName)} pointed at branch: ${chalk.bold(channelName)}.`
);
} catch (e: any) {
const isIgnorableError =
e.graphQLErrors?.length === 1 &&
e.graphQLErrors[0].extensions.errorCode === 'CHANNEL_ALREADY_EXISTS';
if (!isIgnorableError) {
throw e;
}
}
}
async function ensureBranchExistsAsync({
appId,
name: branchName,
}: {
appId: string;
name: string;
}): Promise<{
id: string;
updates: Exclude<
Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
null | undefined
>['updates'];
}> {
const { app } = await viewUpdateBranchAsync({
appId,
name: branchName,
});
const updateBranch = app?.byId.updateBranchByName;
if (updateBranch) {
const { id, updates } = updateBranch;
await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
return { id, updates };
}
const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
Log.withTick(`Created branch: ${chalk.bold(branchName)}`);
await ensureChannelExistsAsync({ appId, branchId: newUpdateBranch.id, channelName: branchName });
return { id: newUpdateBranch.id, updates: [] };
}
export default class BranchPublish extends EasCommand {
static description = 'deprecated, use "eas update"';
static hidden = true;
static description = 'Publish an update group to a branch.';
static args = [
{
name: 'name',
description: 'Name of the branch to publish on',
},
];
static flags = {
message: flags.string({
description: 'short message describing the updates.',
required: false,
}),
republish: flags.boolean({
description: 'republish an update group',
exclusive: ['input-dir', 'skip-bundler'],
}),
group: flags.string({
description: 'update group to republish',
exclusive: ['input-dir', 'skip-bundler'],
}),
'input-dir': flags.string({
description: 'location of the bundle',
default: 'dist',
required: false,
}),
'skip-bundler': flags.boolean({
description: `skip running Expo CLI to bundle the app before publishing`,
default: false,
}),
platform: flags.enum({
char: 'p',
description: `only publish to a single platform`,
options: [...defaultPublishPlatforms, 'all'],
default: 'all',
required: false,
}),
json: flags.boolean({
description: `return a json with the new update group.`,
default: false,
}),
auto: flags.boolean({
description:
'use the current git branch and commit message for the EAS branch and update message',
default: false,
}),
};
async runAsync(): Promise<void> {
let {
args: { name: branchName },
flags: {
json: jsonFlag,
auto: autoFlag,
message,
republish,
group,
'input-dir': inputDir,
'skip-bundler': skipBundler,
},
} = this.parse(BranchPublish);
const platformFlag = this.parse(BranchPublish).flags.platform as PlatformFlag;
// If a group was specified, that means we are republishing it.
republish = group ? true : republish;
const projectDir = await findProjectRootAsync();
const { exp } = getConfig(projectDir, {
skipSDKVersionRequirement: true,
isPublicConfig: true,
});
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
const projectId = await getProjectIdAsync(exp);
if (!branchName && autoFlag) {
branchName =
(await getVcsClient().getBranchNameAsync()) ||
`branch-${Math.random().toString(36).substr(2, 4)}`;
}
if (!branchName) {
const validationMessage = 'branch name may not be empty.';
if (jsonFlag) {
throw new Error(validationMessage);
}
const branches = await listBranchesAsync({ projectId });
branchName = await selectAsync<string>(
'which branch would you like to publish on?',
branches.map(branch => {
return {
title: `${branch.name} ${chalk.grey(
`- current update: ${formatUpdate(branch.updates[0])}`
)}`,
value: branch.name,
};
})
);
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;
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.
let updatesToRepublish: Pick<
Update,
'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
>[];
if (group) {
updatesToRepublish = await getUpdateGroupAsync({ group });
} else {
// Drop into interactive mode if the user has not specified an update group to republish.
if (jsonFlag) {
throw new Error('You must specify the update group to republish.');
}
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 = updates.filter(update => update.group === selectedUpdateGroup);
}
const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
// Only republish to the specified platforms
update => platformFlag === 'all' || update.platform === platformFlag
);
if (updatesToRepublishFilteredByPlatform.length === 0) {
throw new Error(
`There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
group ? group : updatesToRepublish[0].group
}". Did you mean to publish a new update instead?`
);
}
let publicationPlatformMessage: string;
if (platformFlag === 'all') {
if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
Log.warn(`You are republishing an update that wasn't published for all platforms.`);
}
publicationPlatformMessage = `The republished update will appear on the same plaforms it was originally published on: ${updatesToRepublishFilteredByPlatform
.map(update => update.platform)
.join(',')}`;
} else {
publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
}
Log.withTick(publicationPlatformMessage);
for (const update of updatesToRepublishFilteredByPlatform) {
const { manifestFragment } = update;
const platform = update.platform as PublishPlatform;
unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
}
// These are the same for each member of an update group
group = updatesToRepublishFilteredByPlatform[0].group;
oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
} else {
// build bundle and upload assets for a new publish
if (!skipBundler) {
await buildBundlesAsync({ projectDir, inputDir });
}
const assetSpinner = ora('Uploading assets...').start();
try {
const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
await uploadAssetsAsync(assets);
unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
assetSpinner.succeed('Uploaded assets!');
} catch (e) {
assetSpinner.fail('Failed to upload assets');
throw e;
}
}
if (!message && autoFlag) {
message = (await getVcsClient().getLastCommitMessageAsync())?.trim();
}
if (!message) {
const validationMessage = 'publish message may not be empty.';
if (jsonFlag) {
throw new Error(validationMessage);
}
({ publishMessage: message } = await promptAsync({
type: 'text',
name: 'publishMessage',
message: `Please enter a publication message.`,
initial: republish
? `Republish "${oldMessage!}" - group: ${group}`
: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
validate: value => (value ? true : validationMessage),
}));
}
const runtimeToPlatformMapping: Record<string, string[]> = {};
for (const runtime of new Set(Object.values(runtimeVersions))) {
runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
.filter(pair => pair[1] === runtime)
.map(pair => pair[0]);
}
// Sort the updates into different groups based on their platform specific runtime versions
const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
const localUpdateInfoGroup = Object.fromEntries(
platforms.map(platform => [
platform,
unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
])
);
if (republish && !oldRuntimeVersion) {
throw new Error(
'Can not find the runtime version of the update group that is being republished.'
);
}
return {
branchId,
updateInfoGroup: localUpdateInfoGroup,
runtimeVersion: republish ? oldRuntimeVersion : runtime,
message,
};
});
let newUpdates;
const publishSpinner = ora('Publishing...').start();
try {
newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
publishSpinner.succeed('Published!');
} catch (e) {
publishSpinner.fail('Failed to published updates');
throw e;
}
if (jsonFlag) {
Log.log(JSON.stringify(newUpdates));
} else {
if (new Set(newUpdates.map(update => update.group)).size > 1) {
Log.addNewLineIfNone();
Log.log(
'👉 Since multiple runtime versions are defined, multiple update groups have been published.'
);
}
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) {
throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
}
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 },
])
);
Log.addNewLineIfNone();
}
}
throw new Error(BranchPublish.description);
}
}
async function getRuntimeVersionObjectAsync(
exp: ExpoConfig,
platformFlag: PlatformFlag,
projectDir: string
): Promise<Record<string, string>> {
const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
for (const platform of platforms) {
const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
if (isPolicy) {
const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
if (!isManaged) {
throw new Error('Runtime version policies are only supported in the managed workflow.');
}
}
}
return Object.fromEntries(
platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
);
}
function formatUpdateTitle(
update: Exclude<
Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
null | undefined
>['updates'][number]
): string {
const { message, createdAt, actor, runtimeVersion } = update;
let actorName: string;
switch (actor?.__typename) {
case 'User': {
actorName = (actor as Pick<User, 'username' | 'id'>).username;
break;
}
case 'Robot': {
const { firstName, id } = actor as Pick<Robot, 'firstName' | 'id'>;
actorName = firstName ?? `robot: ${id.slice(0, 4)}...`;
break;
}
default:
actorName = 'unknown';
}
return `[${dateFormat(
createdAt,
'mmm dd HH:MM'
)} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
}
@@ -52,7 +52,7 @@ function logSuccess(platform: RequestedPlatform): void {
storesText = 'the Google Play Store';
} else if (platform === 'ios') {
platformsText = 'iOS project is';
storesText = 'the Apple App Store';
storesText = 'the Apple App Store Connect';
}
Log.log(`🎉 Your ${platformsText} ready to build.
+27 -15
View File
@@ -1,5 +1,5 @@
import { Platform, Workflow } from '@expo/eas-build-job';
import { EasJsonReader } from '@expo/eas-json';
import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
import { flags } from '@oclif/command';
import { error } from '@oclif/errors';
import chalk from 'chalk';
@@ -64,7 +64,7 @@ interface RawBuildFlags {
interface BuildFlags {
requestedPlatform: RequestedPlatform;
skipProjectConfiguration: boolean;
profile: string | null;
profile?: string;
nonInteractive: boolean;
local: boolean;
wait: boolean;
@@ -75,7 +75,7 @@ interface BuildFlags {
}
export default class Build extends EasCommand {
static description = 'start a build';
static description = 'Start a build';
static flags = {
platform: flags.enum({
@@ -152,7 +152,7 @@ export default class Build extends EasCommand {
type: 'build',
projectDir,
platforms,
profileName: flags.profile,
profileName: flags.profile ?? undefined,
});
await ensureExpoDevClientInstalledForDevClientBuildsAsync({
@@ -190,14 +190,26 @@ export default class Build extends EasCommand {
const submissions: SubmissionFragment[] = [];
if (flags.autoSubmit) {
const submitProfiles = await getProfilesAsync({
projectDir,
platforms,
profileName: flags.submitProfile,
type: 'submit',
});
for (const startedBuild of startedBuilds) {
const submitProfile = nullthrows(
submitProfiles.find(
({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
)
).profile;
const submission = await this.prepareAndStartSubmissionAsync({
build: startedBuild.build,
buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
flags,
moreBuilds: startedBuilds.length > 1,
projectDir,
buildProfile: startedBuild.buildProfile,
buildProfile: startedBuild.buildProfile.profile,
submitProfile,
nonInteractive: flags.nonInteractive,
});
submissions.push(submission);
}
@@ -260,7 +272,7 @@ export default class Build extends EasCommand {
return {
requestedPlatform,
skipProjectConfiguration: flags['skip-project-configuration'],
profile: profile ?? null,
profile,
nonInteractive,
local: flags['local'],
wait: flags['wait'],
@@ -328,29 +340,29 @@ export default class Build extends EasCommand {
private async prepareAndStartSubmissionAsync({
build,
buildCtx,
flags,
moreBuilds,
projectDir,
buildProfile,
submitProfile,
nonInteractive,
}: {
build: BuildFragment;
buildCtx: BuildContext<Platform>;
flags: BuildFlags;
moreBuilds: boolean;
projectDir: string;
buildProfile: ProfileData<'build'>;
buildProfile: BuildProfile;
submitProfile: SubmitProfile;
nonInteractive: boolean;
}): Promise<SubmissionFragment> {
const easJsonReader = new EasJsonReader(projectDir);
const platform = toPlatform(build.platform);
const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
const submissionCtx = await createSubmissionContextAsync({
platform,
projectDir,
projectId: build.project.id,
profile: submitProfile,
archiveFlags: { id: build.id },
nonInteractive: flags.nonInteractive,
env: buildProfile.profile.env,
nonInteractive,
env: buildProfile.env,
credentialsCtx: buildCtx.credentialsCtx,
applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
});
@@ -386,7 +398,7 @@ export async function handleDeprecatedEasJsonAsync(
return;
}
const easJsonReader = new EasJsonReader(projectDir);
const rawEasJson = await easJsonReader.readRawAsync();
const rawEasJson = await easJsonReader.readAsync();
if (rawEasJson?.cli) {
return;
}
@@ -89,7 +89,7 @@ export async function updateChannelBranchMappingAsync({
);
const channel = data.updateChannel.editUpdateChannel;
if (!channel) {
throw new Error(`Could not fine channel with id ${channelId}`);
throw new Error(`Could not find a channel with id: ${channelId}`);
}
return data.updateChannel.editUpdateChannel!;
}
@@ -181,7 +181,7 @@ export function logChannelDetails(channel: {
: []),
formatUpdate(update),
update?.runtimeVersion ?? 'N/A',
update?.group ?? 'N/A,',
update?.group ?? 'N/A',
getPlatformsForGroup({
updates: branch.updates,
group: branch.updates[0]?.group,
@@ -239,7 +239,7 @@ export default class ChannelView extends EasCommand {
});
const channel = getUpdateChannelByNameForAppresult.app?.byId.updateChannelByName;
if (!channel) {
throw new Error(`Could not fine channel with name ${channelName}`);
throw new Error(`Could not find a channel with name: ${channelName}`);
}
if (jsonFlag) {
@@ -256,9 +256,7 @@ export default class ChannelView extends EasCommand {
])
);
Log.addNewLineIfNone();
Log.log(
chalk`{bold Branches, pointed at by this channel, and their most recent update group:}`
);
Log.log(chalk`{bold Branches pointed at this channel and their most recent update group:}`);
logChannelDetails(channel);
}
}
+1 -1
View File
@@ -55,7 +55,7 @@ export default class Config extends EasCommand {
},
]));
const profile = await reader.readBuildProfileAsync(platform, profileName);
const profile = await reader.getBuildProfileAsync(platform, profileName);
const config = getExpoConfig(projectDir, { env: profile.env, isPublicConfig: true });
Log.log(getProjectConfigDescription(projectDir));
+1 -7
View File
@@ -1,16 +1,10 @@
import EasCommand from '../commandUtils/EasCommand';
import { CredentialsContext } from '../credentials/context';
import { SelectPlatform } from '../credentials/manager/SelectPlatform';
import { ensureLoggedInAsync } from '../user/actions';
export default class Credentials extends EasCommand {
static description = 'manage your credentials';
async runAsync(): Promise<void> {
const ctx = new CredentialsContext({
projectDir: process.cwd(),
user: await ensureLoggedInAsync(),
});
await new SelectPlatform().runAsync(ctx);
await new SelectPlatform().runAsync();
}
}
+21 -1
View File
@@ -1,7 +1,10 @@
import { Platform } from '@expo/eas-build-job';
import envinfo from 'envinfo';
import EasCommand from '../commandUtils/EasCommand';
import Log from '../log';
import { findProjectRootAsync } from '../project/projectUtils';
import { resolveWorkflowAsync } from '../project/workflow';
import { easCliVersion } from '../utils/easCli';
export default class Diagnostics extends EasCommand {
@@ -32,6 +35,23 @@ export default class Diagnostics extends EasCommand {
title: `EAS CLI ${easCliVersion} environment info`,
}
);
Log.log(info);
Log.log(info.trimEnd());
await this.printWorkflowAsync();
Log.newLine();
}
private async printWorkflowAsync(): Promise<void> {
const projectDir = await findProjectRootAsync();
const androidWorkflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
const iosWorkflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
if (androidWorkflow === iosWorkflow) {
Log.log(` Project workflow: ${androidWorkflow}`);
} else {
Log.log(` Project Workflow:`);
Log.log(` Android: ${androidWorkflow}`);
Log.log(` iOS: ${iosWorkflow}`);
}
}
}
+1 -1
View File
@@ -42,7 +42,7 @@ interface Flags {
}
export default class Submit extends EasCommand {
static description = `submit build archive to app store
static description = `Submit build archive to App Store Connect
See how to configure submits with eas.json: ${link('https://docs.expo.dev/submit/eas-json/')}`;
static aliases = ['build:submit'];
@@ -0,0 +1,108 @@
import { ExpoConfig, getConfig, modifyConfigAsync } from '@expo/config';
import { Platform, Workflow } from '@expo/eas-build-job';
import chalk from 'chalk';
import EasCommand from '../../commandUtils/EasCommand';
import Log, { learnMore } from '../../log';
import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
import { resolveWorkflowAsync } from '../../project/workflow';
const EAS_UPDATE_URL = 'https://u.expo.dev';
const DEFAULT_RUNTIME_VERSION = { policy: 'sdkVersion' } as const;
export async function getEASUpdateURLAsync(exp: ExpoConfig): Promise<string> {
const projectId = await getProjectIdAsync(exp);
return new URL(projectId, EAS_UPDATE_URL).href;
}
async function configureProjectForEASUpdateAsync(
projectDir: string,
exp: ExpoConfig
): Promise<void> {
const easUpdateURL = await getEASUpdateURLAsync(exp);
const preexistingRuntimeVersion = exp.runtimeVersion;
const result = await modifyConfigAsync(projectDir, {
runtimeVersion: preexistingRuntimeVersion ?? DEFAULT_RUNTIME_VERSION,
updates: { ...exp.updates, url: easUpdateURL },
});
switch (result.type) {
case 'success':
if (exp.updates?.url) {
if (exp.updates.url !== easUpdateURL) {
Log.withTick(
`Overwrote "${exp.updates?.url}" with "${easUpdateURL}" for the updates.url value in app.json`
);
}
} else {
Log.withTick(`Set updates.url value, to "${easUpdateURL}" in app.json`);
}
if (!preexistingRuntimeVersion) {
Log.withTick(
`Set runtimeVersion to "${JSON.stringify(DEFAULT_RUNTIME_VERSION)}" in app.json`
);
}
break;
case 'warn': {
Log.addNewLineIfNone();
Log.warn(
`It looks like you are using a dynamic configuration! ${learnMore(
'https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs)'
)}`
);
Log.warn(
`In order to finish configuring your project for EAS Update, you are going to need manually add the following to your app.config.js:\n${learnMore(
'https://expo.fyi/eas-update-config.md'
)}\n`
);
Log.log(
chalk.bold(
`{\n updates": {\n "url": "${easUpdateURL}"\n },\n "runtimeVersion": {\n "policy": "sdkVersion"\n }\n}`
)
);
Log.addNewLineIfNone();
throw new Error(result.message);
}
case 'fail':
throw new Error(result.message);
default:
throw new Error('Unexpected result type from modifyConfigAsync');
}
}
export default class UpdateConfigure extends EasCommand {
static hidden = true;
static description = 'Configure the project to support EAS Update.';
async runAsync(): Promise<void> {
Log.log(
'💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
);
const projectDir = await findProjectRootAsync();
const { exp } = getConfig(projectDir, {
skipSDKVersionRequirement: true,
});
await configureProjectForEASUpdateAsync(projectDir, exp);
const hasAndroidNativeProject =
(await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
const hasIosNativeProject =
(await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
Log.addNewLineIfNone();
if (hasAndroidNativeProject || hasIosNativeProject) {
Log.log(
`🧐 It seems you are on the bare workflow! Please also update your native files. You can do this by either running ${chalk.bold(
'eas build:configure'
)} or manually editing Expo.plist/AndroidManifest.xml. ${learnMore(
'https://expo.fyi/eas-update-config.md#native-configuration'
)}`
);
} else {
Log.log(`🎉 Your app is configured to run EAS Update!`);
}
}
}
@@ -0,0 +1,483 @@
import { ExpoConfig, getConfig } from '@expo/config';
import { Updates } from '@expo/config-plugins';
import { Platform, Workflow } from '@expo/eas-build-job';
import { flags } from '@oclif/command';
import assert from 'assert';
import chalk from 'chalk';
import dateFormat from 'dateformat';
import gql from 'graphql-tag';
import EasCommand from '../../commandUtils/EasCommand';
import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
import {
GetUpdateGroupAsyncQuery,
Robot,
RootQueryUpdatesByGroupArgs,
Update,
UpdateInfoGroup,
User,
ViewBranchQuery,
} from '../../graphql/generated';
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
import Log from '../../log';
import { ora } from '../../ora';
import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
import {
PublishPlatform,
buildBundlesAsync,
buildUnsortedUpdateInfoGroupAsync,
collectAssetsAsync,
uploadAssetsAsync,
} from '../../project/publish';
import { resolveWorkflowAsync } from '../../project/workflow';
import { promptAsync, selectAsync } from '../../prompts';
import { formatUpdate } from '../../update/utils';
import uniqBy from '../../utils/expodash/uniqBy';
import formatFields from '../../utils/formatFields';
import { getVcsClient } from '../../vcs';
import { createUpdateBranchOnAppAsync } from '../branch/create';
import { listBranchesAsync } from '../branch/list';
import { viewUpdateBranchAsync } from '../branch/view';
import { createUpdateChannelOnAppAsync } from '../channel/create';
import { getEASUpdateURLAsync } from './configure';
export const defaultPublishPlatforms: PublishPlatform[] = ['android', 'ios'];
type PlatformFlag = PublishPlatform | 'all';
async function getUpdateGroupAsync({
group,
}: RootQueryUpdatesByGroupArgs): Promise<GetUpdateGroupAsyncQuery['updatesByGroup']> {
const { updatesByGroup } = await withErrorHandlingAsync(
graphqlClient
.query<GetUpdateGroupAsyncQuery, RootQueryUpdatesByGroupArgs>(
gql`
query getUpdateGroupAsync($group: ID!) {
updatesByGroup(group: $group) {
id
group
runtimeVersion
manifestFragment
platform
message
}
}
`,
{
group,
},
{ additionalTypenames: ['Update'] }
)
.toPromise()
);
return updatesByGroup;
}
async function ensureChannelExistsAsync({
appId,
branchId,
channelName,
}: {
appId: string;
branchId: string;
channelName: string;
}): Promise<void> {
try {
await createUpdateChannelOnAppAsync({
appId,
channelName,
branchId,
});
Log.withTick(
`Created a channel: ${chalk.bold(channelName)} pointed at branch: ${chalk.bold(channelName)}.`
);
} catch (e: any) {
const isIgnorableError =
e.graphQLErrors?.length === 1 &&
e.graphQLErrors[0].extensions.errorCode === 'CHANNEL_ALREADY_EXISTS';
if (!isIgnorableError) {
throw e;
}
}
}
async function ensureBranchExistsAsync({
appId,
name: branchName,
}: {
appId: string;
name: string;
}): Promise<{
id: string;
updates: Exclude<
Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
null | undefined
>['updates'];
}> {
const { app } = await viewUpdateBranchAsync({
appId,
name: branchName,
});
const updateBranch = app?.byId.updateBranchByName;
if (updateBranch) {
const { id, updates } = updateBranch;
await ensureChannelExistsAsync({ appId, branchId: id, channelName: branchName });
return { id, updates };
}
const newUpdateBranch = await createUpdateBranchOnAppAsync({ appId, name: branchName });
Log.withTick(`Created branch: ${chalk.bold(branchName)}`);
await ensureChannelExistsAsync({ appId, branchId: newUpdateBranch.id, channelName: branchName });
return { id: newUpdateBranch.id, updates: [] };
}
export default class UpdatePublish extends EasCommand {
static hidden = true;
static description = 'Publish an update group.';
static flags = {
branch: flags.string({
description: 'Branch to publish the update group on',
required: false,
}),
message: flags.string({
description: 'A short message describing the update',
required: false,
}),
republish: flags.boolean({
description: 'Republish an update group',
exclusive: ['input-dir', 'skip-bundler'],
}),
group: flags.string({
description: 'Update group to republish',
exclusive: ['input-dir', 'skip-bundler'],
}),
'input-dir': flags.string({
description: 'Location of the bundle',
default: 'dist',
required: false,
}),
'skip-bundler': flags.boolean({
description: `Skip running Expo CLI to bundle the app before publishing`,
default: false,
}),
platform: flags.enum({
char: 'p',
options: [...defaultPublishPlatforms, 'all'],
default: 'all',
required: false,
}),
json: flags.boolean({
description: 'Enable JSON output, non-JSON messages will be printed to stderr',
default: false,
}),
auto: flags.boolean({
description:
'Use the current git branch and commit message for the EAS branch and update message',
default: false,
}),
};
async runAsync(): Promise<void> {
let {
flags: {
branch: branchName,
json: jsonFlag,
auto: autoFlag,
message,
republish,
group,
'input-dir': inputDir,
'skip-bundler': skipBundler,
},
} = this.parse(UpdatePublish);
const platformFlag = this.parse(UpdatePublish).flags.platform as PlatformFlag;
// If a group was specified, that means we are republishing it.
republish = group ? true : republish;
const projectDir = await findProjectRootAsync();
const { exp } = getConfig(projectDir, {
skipSDKVersionRequirement: true,
isPublicConfig: true,
});
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
const projectId = await getProjectIdAsync(exp);
await checkEASUpdateURLIsSetAsync(exp);
if (!branchName && autoFlag) {
branchName =
(await getVcsClient().getBranchNameAsync()) ||
`branch-${Math.random().toString(36).substr(2, 4)}`;
}
if (!branchName) {
const validationMessage = 'branch name may not be empty.';
if (jsonFlag) {
throw new Error(validationMessage);
}
const branches = await listBranchesAsync({ projectId });
branchName = await selectAsync<string>(
'which branch would you like to publish on?',
branches.map(branch => {
return {
title: `${branch.name} ${chalk.grey(
`- current update: ${formatUpdate(branch.updates[0])}`
)}`,
value: branch.name,
};
})
);
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;
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.
let updatesToRepublish: Pick<
Update,
'group' | 'message' | 'runtimeVersion' | 'manifestFragment' | 'platform'
>[];
if (group) {
updatesToRepublish = await getUpdateGroupAsync({ group });
} else {
// Drop into interactive mode if the user has not specified an update group to republish.
if (jsonFlag) {
throw new Error('You must specify the update group to republish.');
}
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 = updates.filter(update => update.group === selectedUpdateGroup);
}
const updatesToRepublishFilteredByPlatform = updatesToRepublish.filter(
// Only republish to the specified platforms
update => platformFlag === 'all' || update.platform === platformFlag
);
if (updatesToRepublishFilteredByPlatform.length === 0) {
throw new Error(
`There are no updates on branch "${branchName}" published on the platform(s) "${platformFlag}" with group ID "${
group ? group : updatesToRepublish[0].group
}". Did you mean to publish a new update instead?`
);
}
let publicationPlatformMessage: string;
if (platformFlag === 'all') {
if (updatesToRepublishFilteredByPlatform.length !== defaultPublishPlatforms.length) {
Log.warn(`You are republishing an update that wasn't published for all platforms.`);
}
publicationPlatformMessage = `The republished update will appear on the same plaforms it was originally published on: ${updatesToRepublishFilteredByPlatform
.map(update => update.platform)
.join(',')}`;
} else {
publicationPlatformMessage = `The republished update will appear only on: ${platformFlag}`;
}
Log.withTick(publicationPlatformMessage);
for (const update of updatesToRepublishFilteredByPlatform) {
const { manifestFragment } = update;
const platform = update.platform as PublishPlatform;
unsortedUpdateInfoGroups[platform] = JSON.parse(manifestFragment);
}
// These are the same for each member of an update group
group = updatesToRepublishFilteredByPlatform[0].group;
oldMessage = updatesToRepublishFilteredByPlatform[0].message ?? '';
oldRuntimeVersion = updatesToRepublishFilteredByPlatform[0].runtimeVersion;
} else {
if (!message && autoFlag) {
message = (await getVcsClient().getLastCommitMessageAsync())?.trim();
}
if (!message) {
const validationMessage = 'publish message may not be empty.';
if (jsonFlag) {
throw new Error(validationMessage);
}
({ publishMessage: message } = await promptAsync({
type: 'text',
name: 'publishMessage',
message: `Please enter an update message.`,
initial: republish
? `Republish "${oldMessage!}" - group: ${group}`
: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
validate: (value: any) => (value ? true : validationMessage),
}));
}
// build bundle and upload assets for a new publish
if (!skipBundler) {
await buildBundlesAsync({ projectDir, inputDir });
}
const assetSpinner = ora('Uploading assets...').start();
try {
const platforms = platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
const assets = await collectAssetsAsync({ inputDir: inputDir!, platforms });
await uploadAssetsAsync(assets);
unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
assetSpinner.succeed('Uploaded assets!');
} catch (e) {
assetSpinner.fail('Failed to upload assets');
throw e;
}
}
const runtimeToPlatformMapping: Record<string, string[]> = {};
for (const runtime of new Set(Object.values(runtimeVersions))) {
runtimeToPlatformMapping[runtime] = Object.entries(runtimeVersions)
.filter(pair => pair[1] === runtime)
.map(pair => pair[0]);
}
// Sort the updates into different groups based on their platform specific runtime versions
const updateGroups = Object.entries(runtimeToPlatformMapping).map(([runtime, platforms]) => {
const localUpdateInfoGroup = Object.fromEntries(
platforms.map(platform => [
platform,
unsortedUpdateInfoGroups[platform as keyof UpdateInfoGroup],
])
);
if (republish && !oldRuntimeVersion) {
throw new Error(
'Can not find the runtime version of the update group that is being republished.'
);
}
return {
branchId,
updateInfoGroup: localUpdateInfoGroup,
runtimeVersion: republish ? oldRuntimeVersion : runtime,
message,
};
});
let newUpdates;
const publishSpinner = ora('Publishing...').start();
try {
newUpdates = await PublishMutation.publishUpdateGroupAsync(updateGroups);
publishSpinner.succeed('Published!');
} catch (e) {
publishSpinner.fail('Failed to published updates');
throw e;
}
if (jsonFlag) {
Log.log(JSON.stringify(newUpdates));
} else {
if (new Set(newUpdates.map(update => update.group)).size > 1) {
Log.addNewLineIfNone();
Log.log(
'👉 Since multiple runtime versions are defined, multiple update groups have been published.'
);
}
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) {
throw new Error(`Publish response is missing updates with runtime ${runtime}.`);
}
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! },
])
);
Log.addNewLineIfNone();
}
}
}
}
async function getRuntimeVersionObjectAsync(
exp: ExpoConfig,
platformFlag: PlatformFlag,
projectDir: string
): Promise<Record<string, string>> {
const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
for (const platform of platforms) {
const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
if (isPolicy) {
const isManaged = (await resolveWorkflowAsync(projectDir, platform)) === Workflow.MANAGED;
if (!isManaged) {
throw new Error('Runtime version policies are only supported in the managed workflow.');
}
}
}
return Object.fromEntries(
platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
);
}
function formatUpdateTitle(
update: Exclude<
Exclude<ViewBranchQuery['app'], null | undefined>['byId']['updateBranchByName'],
null | undefined
>['updates'][number]
): string {
const { message, createdAt, actor, runtimeVersion } = update;
let actorName: string;
switch (actor?.__typename) {
case 'User': {
actorName = (actor as Pick<User, 'username' | 'id'>).username;
break;
}
case 'Robot': {
const { firstName, id } = actor as Pick<Robot, 'firstName' | 'id'>;
actorName = firstName ?? `robot: ${id.slice(0, 4)}...`;
break;
}
default:
actorName = 'unknown';
}
return `[${dateFormat(
createdAt,
'mmm dd HH:MM'
)} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
}
async function checkEASUpdateURLIsSetAsync(exp: ExpoConfig): Promise<void> {
const configuredURL = exp.updates?.url;
const expectedURL = await getEASUpdateURLAsync(exp);
if (configuredURL !== expectedURL) {
throw new Error(
`The update URL is incorrectly configured for EAS Update. Please set updates.url to ${expectedURL} in your app.json.`
);
}
}
+17 -5
View File
@@ -1,4 +1,5 @@
import { ExpoConfig, getConfig } from '@expo/config';
import { Env } from '@expo/eas-build-job';
import chalk from 'chalk';
import Log from '../log';
@@ -27,6 +28,7 @@ export class CredentialsContext {
nonInteractive?: boolean;
projectDir: string;
user: Actor;
env?: Env;
}
) {
this.projectDir = options.projectDir;
@@ -35,11 +37,21 @@ export class CredentialsContext {
this.resolvedExp = options.exp;
if (!this.resolvedExp) {
try {
this.resolvedExp = getExpoConfig(options.projectDir);
} catch (error) {
// ignore error, context might be created outside of expo project
}
this.resolvedExp =
CredentialsContext.getExpoConfigInProject(this.projectDir, { env: options.env }) ??
undefined;
}
}
static getExpoConfigInProject(
projectDir: string,
{ env }: { env?: Env } = {}
): ExpoConfig | null {
try {
return getExpoConfig(projectDir, { env });
} catch (error) {
// ignore error, context might be created outside of expo project
return null;
}
}
@@ -119,7 +119,9 @@ async function promptForAscApiKeyAsync(ctx: CredentialsContext): Promise<Minimal
async function promptForKeyP8AndIdAsync(): Promise<Pick<AscApiKeyPath, 'keyP8Path' | 'keyId'>> {
Log.log(
chalk.bold('An App Store Connect Api key is required to upload your app to the Apple App Store')
chalk.bold(
'An App Store Connect Api key is required to upload your app to the Apple App Store Connect'
)
);
Log.log(
`If you're not sure what this is or how to create one, ${learnMore(
@@ -162,11 +162,13 @@ export async function ensureAppExistsAsync(
}
): Promise<App> {
const context = getRequestContext(authCtx);
const spinner = ora(`Linking to App Store ${chalk.dim(bundleIdentifier)}`).start();
const spinner = ora(`Linking to App Store Connect ${chalk.dim(bundleIdentifier)}`).start();
let app = await App.findAsync(context, { bundleId: bundleIdentifier });
if (!app) {
spinner.text = `Creating App Store app ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`;
spinner.text = `Creating App Store Connect app ${chalk.bold(name)} ${chalk.dim(
bundleIdentifier
)}`;
try {
// Assert contract errors when the user needs to create an app.
await assertContractMessagesAsync(context, spinner);
@@ -194,6 +196,8 @@ export async function ensureAppExistsAsync(
} else {
// TODO: Update app name when API gives us that possibility
}
spinner.succeed(`Prepared App Store for ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`);
spinner.succeed(
`Prepared App Store Connect for ${chalk.bold(name)} ${chalk.dim(bundleIdentifier)}`
);
return app;
}
@@ -1,5 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { AndroidBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import assert from 'assert';
import Log, { learnMore } from '../../log';
@@ -10,7 +10,7 @@ import {
} from '../../project/projectUtils';
import { promptAsync } from '../../prompts';
import { findAccountByName } from '../../user/Account';
import { ensureActorHasUsername } from '../../user/actions';
import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
import { AssignFcm } from '../android/actions/AssignFcm';
import { AssignGoogleServiceAccountKey } from '../android/actions/AssignGoogleServiceAccountKey';
import {
@@ -51,12 +51,18 @@ import {
import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
export class ManageAndroid {
constructor(private callingAction: Action) {}
constructor(private callingAction: Action, private projectDir: string) {}
async runAsync(
ctx: CredentialsContext,
currentActions: ActionInfo[] = highLevelActions
): Promise<void> {
async runAsync(currentActions: ActionInfo[] = highLevelActions): Promise<void> {
const hasProjectContext = !!CredentialsContext.getExpoConfigInProject(this.projectDir);
const buildProfile = hasProjectContext
? await new SelectBuildProfileFromEasJson(this.projectDir, Platform.ANDROID).runAsync()
: null;
const ctx = new CredentialsContext({
projectDir: process.cwd(),
user: await ensureLoggedInAsync(),
env: buildProfile?.env,
});
const accountName = ctx.hasProjectContext
? getProjectAccountName(ctx.exp, ctx.user)
: ensureActorHasUsername(ctx.user);
@@ -64,7 +70,12 @@ export class ManageAndroid {
if (!account) {
throw new Error(`You do not have access to account: ${accountName}`);
}
const { gradleContext } = await this.createProjectContextAsync(ctx);
let gradleContext;
if (ctx.hasProjectContext) {
assert(buildProfile, 'buildProfile must be defined in a project context');
gradleContext = await this.createProjectContextAsync(ctx, buildProfile);
}
while (true) {
try {
@@ -140,30 +151,18 @@ export class ManageAndroid {
}
}
private async createProjectContextAsync(ctx: CredentialsContext): Promise<{
gradleContext?: GradleBuildContext;
buildProfile?: AndroidBuildProfile;
}> {
if (!ctx.hasProjectContext) {
return {};
}
private async createProjectContextAsync(
ctx: CredentialsContext,
buildProfile: BuildProfile<Platform.ANDROID>
): Promise<GradleBuildContext | undefined> {
assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
if (!maybeProjectId) {
throw new Error(
'Your project must be registered with EAS in order to use the credentials manager.'
);
}
const buildProfile = await new SelectBuildProfileFromEasJson(
ctx.projectDir,
Platform.ANDROID
).runAsync(ctx);
const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
return {
gradleContext,
buildProfile,
};
return await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
}
private async runProjectSpecificActionAsync(
@@ -1,5 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { IosBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import assert from 'assert';
import nullthrows from 'nullthrows';
@@ -17,7 +17,7 @@ import {
} from '../../project/projectUtils';
import { confirmAsync, promptAsync, selectAsync } from '../../prompts';
import { Account, findAccountByName } from '../../user/Account';
import { ensureActorHasUsername } from '../../user/actions';
import { ensureActorHasUsername, ensureLoggedInAsync } from '../../user/actions';
import { CredentialsContext } from '../context';
import {
AppStoreApiKeyPurpose,
@@ -59,12 +59,18 @@ import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
import { SelectIosDistributionTypeGraphqlFromBuildProfile } from './SelectIosDistributionTypeGraphqlFromBuildProfile';
export class ManageIos {
constructor(private callingAction: Action) {}
constructor(private callingAction: Action, private projectDir: string) {}
async runAsync(
ctx: CredentialsContext,
currentActions: ActionInfo[] = highLevelActions
): Promise<void> {
async runAsync(currentActions: ActionInfo[] = highLevelActions): Promise<void> {
const hasProjectContext = !!CredentialsContext.getExpoConfigInProject(this.projectDir);
const buildProfile = hasProjectContext
? await new SelectBuildProfileFromEasJson(this.projectDir, Platform.IOS).runAsync()
: null;
const ctx = new CredentialsContext({
projectDir: process.cwd(),
user: await ensureLoggedInAsync(),
env: buildProfile?.env,
});
const buildCredentialsActions = getBuildCredentialsActions(ctx);
const pushKeyActions = getPushKeyActions(ctx);
const ascApiKeyActions = getAscApiKeyActions(ctx);
@@ -78,7 +84,16 @@ export class ManageIos {
if (!account) {
throw new Error(`You do not have access to account: ${accountName}`);
}
const { app, targets, buildProfile } = await this.createProjectContextAsync(ctx, account);
let app = null;
let targets = null;
if (ctx.hasProjectContext) {
assert(buildProfile, 'buildProfile must be defined in project context');
const projectContext = await this.createProjectContextAsync(ctx, account, buildProfile);
app = projectContext.app;
targets = projectContext.targets;
}
while (true) {
try {
if (ctx.hasProjectContext) {
@@ -154,16 +169,13 @@ export class ManageIos {
private async createProjectContextAsync(
ctx: CredentialsContext,
account: Account
): Promise<{ app: App | null; targets: Target[] | null; buildProfile: IosBuildProfile | null }> {
if (!ctx.hasProjectContext) {
return {
app: null,
targets: null,
buildProfile: null,
};
}
account: Account,
buildProfile: BuildProfile<Platform.IOS>
): Promise<{
app: App;
targets: Target[];
}> {
assert(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
const maybeProjectId = await promptToCreateProjectIfNotExistsAsync(ctx.exp);
if (!maybeProjectId) {
throw new Error(
@@ -172,10 +184,6 @@ export class ManageIos {
}
const app = { account, projectName: ctx.exp.slug };
const buildProfile = await new SelectBuildProfileFromEasJson(
ctx.projectDir,
Platform.IOS
).runAsync(ctx);
const xcodeBuildContext = await resolveXcodeBuildContextAsync(
{
projectDir: ctx.projectDir,
@@ -191,7 +199,6 @@ export class ManageIos {
return {
app,
targets,
buildProfile,
};
}
@@ -219,7 +226,7 @@ export class ManageIos {
ctx: CredentialsContext,
app: App,
targets: Target[],
buildProfile: IosBuildProfile,
buildProfile: BuildProfile<Platform.IOS>,
action: IosActionType
): Promise<void> {
if (action === IosActionType.SetUpBuildCredentials) {
@@ -3,7 +3,6 @@ import { BuildProfile, EasJsonReader } from '@expo/eas-json';
import Log from '../../log';
import { promptAsync } from '../../prompts';
import { CredentialsContext } from '../context';
export class SelectBuildProfileFromEasJson<T extends Platform> {
private easJsonReader: EasJsonReader;
@@ -12,14 +11,14 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
this.easJsonReader = new EasJsonReader(projectDir);
}
async runAsync(ctx: CredentialsContext): Promise<BuildProfile<T>> {
const profileName = await this.getProfileNameFromEasConfigAsync(ctx);
const easConfig = await this.easJsonReader.readBuildProfileAsync<T>(this.platform, profileName);
async runAsync(): Promise<BuildProfile<T>> {
const profileName = await this.getProfileNameFromEasConfigAsync();
const easConfig = await this.easJsonReader.getBuildProfileAsync<T>(this.platform, profileName);
Log.succeed(`Using build profile: ${profileName}`);
return easConfig;
}
async getProfileNameFromEasConfigAsync(ctx: CredentialsContext): Promise<string> {
async getProfileNameFromEasConfigAsync(): Promise<string> {
const buildProfileNames = await this.easJsonReader.getBuildProfileNamesAsync();
if (buildProfileNames.length === 0) {
throw new Error(
@@ -28,11 +27,6 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
} else if (buildProfileNames.length === 1) {
return buildProfileNames[0];
}
if (ctx.nonInteractive) {
throw new Error(
'You have multiple build profiles. Please run this command in interactive mode.'
);
}
const { profileName } = await promptAsync({
type: 'select',
name: 'profileName',
@@ -1,11 +1,12 @@
import { IosBuildProfile } from '@expo/eas-json';
import { Platform } from '@expo/eas-build-job';
import { BuildProfile } from '@expo/eas-json';
import { IosDistributionType as IosDistributionTypeGraphql } from '../../graphql/generated';
import { promptAsync } from '../../prompts';
import { CredentialsContext } from '../context';
export class SelectIosDistributionTypeGraphqlFromBuildProfile {
constructor(private buildProfile: IosBuildProfile) {}
constructor(private buildProfile: BuildProfile<Platform.IOS>) {}
async runAsync(ctx: CredentialsContext): Promise<IosDistributionTypeGraphql> {
const { distribution, simulator } = this.buildProfile;
@@ -1,10 +1,9 @@
import { promptAsync } from '../../prompts';
import { CredentialsContext } from '../context';
import { ManageAndroid } from './ManageAndroid';
import { ManageIos } from './ManageIos';
export class SelectPlatform {
async runAsync(ctx: CredentialsContext): Promise<void> {
async runAsync(): Promise<void> {
const { platform } = await promptAsync({
type: 'select',
name: 'platform',
@@ -16,8 +15,8 @@ export class SelectPlatform {
});
if (platform === 'ios') {
return await new ManageIos(new SelectPlatform()).runAsync(ctx);
return await new ManageIos(new SelectPlatform(), process.cwd()).runAsync();
}
return await new ManageAndroid(new SelectPlatform()).runAsync(ctx);
return await new ManageAndroid(new SelectPlatform(), process.cwd()).runAsync();
}
}
@@ -1,4 +1,5 @@
import { IosBuildProfile } from '@expo/eas-json';
import { Platform } from '@expo/eas-build-job';
import { BuildProfile } from '@expo/eas-json';
import { IosDistributionType as IosDistributionTypeGraphql } from '../../../graphql/generated';
import { createCtxMock } from '../../__tests__/fixtures-context';
@@ -8,7 +9,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
it('errors with a simulator distribution', async () => {
const buildProfile = {
simulator: true,
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -22,7 +23,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
it('returns APP_STORE type with a store distribution', async () => {
const buildProfile = {
distribution: 'store',
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -37,7 +38,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
const buildProfile = {
distribution: 'internal',
enterpriseProvisioning: 'universal',
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -52,7 +53,7 @@ describe('SelectIosDistributionTypeGraphqlFromBuildProfile', () => {
const buildProfile = {
distribution: 'internal',
enterpriseProvisioning: 'adhoc',
} as IosBuildProfile;
} as BuildProfile<Platform.IOS>;
const ctx = createCtxMock({
nonInteractive: false,
@@ -3,7 +3,7 @@ import mockdate from 'mockdate';
import path from 'path';
import { v4 as uuidv4 } from 'uuid';
import { defaultPublishPlatforms } from '../../commands/branch/publish';
import { defaultPublishPlatforms } from '../../commands/update';
import { AssetMetadataStatus } from '../../graphql/generated';
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
import { PublishQuery } from '../../graphql/queries/PublishQuery';
+2 -2
View File
@@ -1,7 +1,7 @@
import { ExpoConfig } from '@expo/config';
import { IOSConfig } from '@expo/config-plugins';
import { Platform, Workflow } from '@expo/eas-build-job';
import { IosBuildProfile } from '@expo/eas-json';
import { BuildProfile } from '@expo/eas-json';
import chalk from 'chalk';
import Log from '../../log';
@@ -20,7 +20,7 @@ export async function resolveXcodeBuildContextAsync(
projectDir,
nonInteractive,
}: { exp: ExpoConfig; projectDir: string; nonInteractive: boolean },
buildProfile: IosBuildProfile
buildProfile: BuildProfile<Platform.IOS>
): Promise<XcodeBuildContext> {
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
if (workflow === Workflow.GENERIC) {
+46 -6
View File
@@ -24,17 +24,57 @@ export async function resolveTargetsAsync(
buildConfiguration,
});
if (applicationTarget.dependencies && applicationTarget.dependencies.length > 0) {
for (const dependency of applicationTarget.dependencies) {
const dependencies = await resolveDependenciesAsync({
exp,
projectDir,
buildConfiguration,
target: applicationTarget,
bundleIdentifier,
});
if (dependencies.length > 0) {
result.push(...dependencies);
}
return result;
}
async function resolveDependenciesAsync({
exp,
projectDir,
buildConfiguration,
target,
bundleIdentifier,
}: {
exp: ExpoConfig;
projectDir: string;
buildConfiguration?: string;
target: IOSConfig.Target.Target;
bundleIdentifier: string;
}): Promise<Target[]> {
const result: Target[] = [];
if (target.dependencies && target.dependencies.length > 0) {
for (const dependency of target.dependencies) {
const dependencyBundleIdentifier = await getBundleIdentifierAsync(projectDir, exp, {
targetName: dependency.name,
buildConfiguration,
});
result.push({
targetName: dependency.name,
buildConfiguration,
bundleIdentifier: await getBundleIdentifierAsync(projectDir, exp, {
targetName: dependency.name,
buildConfiguration,
}),
bundleIdentifier: dependencyBundleIdentifier,
parentBundleIdentifier: bundleIdentifier,
});
const dependencyDependencies = await resolveDependenciesAsync({
exp,
projectDir,
buildConfiguration,
target: dependency,
bundleIdentifier: dependencyBundleIdentifier,
});
if (dependencyDependencies.length > 0) {
result.push(...dependencyDependencies);
}
}
}
-1
View File
@@ -62,7 +62,6 @@ export async function createSubmissionContextAsync<T extends Platform>(params: {
tracking_id: uuidv4(),
platform: params.platform,
...(accountId && { account_id: accountId }),
account_name: accountName,
project_id: params.projectId,
};
@@ -35,7 +35,10 @@ export async function ensureAppStoreConnectAppExistsAsync(
const { appName, language } = ctx.profile;
const options = {
...ctx.profile,
bundleIdentifier: await getBundleIdentifierAsync(ctx.projectDir, exp),
bundleIdentifier:
ctx.applicationIdentifierOverride ??
ctx.profile.bundleIdentifier ??
(await getBundleIdentifierAsync(ctx.projectDir, exp)),
appName: appName ?? exp.name ?? (await promptForAppNameAsync()),
language: sanitizeLanguage(language),
};
@@ -200,7 +200,11 @@ export default class IosSubmitCommand {
if (ascAppId) {
return result(ascAppId);
} else if (this.ctx.nonInteractive) {
return result(new Error('Set ascAppId in the submit profile (eas.json).'));
return result(
new Error(
'Set ascAppId in the submit profile (eas.json) or re-run this command in interactive mode.'
)
);
} else {
Log.log(
wrapAnsi(
+1 -1
View File
@@ -8,7 +8,7 @@ import { sleepAsync } from '../../utils/promise';
const APP_STORE_NAMES: Record<AppPlatform, string> = {
[AppPlatform.Android]: 'Google Play Store',
[AppPlatform.Ios]: 'Apple App Store',
[AppPlatform.Ios]: 'Apple App Store Connect',
};
const CHECK_TIMEOUT_MS = 3600_000;
+1 -1
View File
@@ -29,7 +29,7 @@ export function getPlatformsForGroup({
return groupedUpdates[group]
.map(update => update.platform)
.sort()
.join(',');
.join(', ');
}
export function formatUpdate(update: FormatUpdateParameter): string {
@@ -8,8 +8,8 @@ jest.mock('@expo/eas-json', () => {
const EasJsonReaderMock = jest.fn();
EasJsonReaderMock.prototype = {
readBuildProfileAsync: jest.fn(),
readSubmitProfileAsync: jest.fn(),
getBuildProfileAsync: jest.fn(),
getSubmitProfileAsync: jest.fn(),
};
return {
...actual,
@@ -17,11 +17,11 @@ jest.mock('@expo/eas-json', () => {
};
});
const readBuildProfileAsync = jest.spyOn(EasJsonReader.prototype, 'readBuildProfileAsync');
const getBuildProfileAsync = jest.spyOn(EasJsonReader.prototype, 'getBuildProfileAsync');
describe(getProfilesAsync, () => {
afterEach(() => {
readBuildProfileAsync.mockReset();
getBuildProfileAsync.mockReset();
});
it('defaults to production profile', async () => {
@@ -34,17 +34,17 @@ describe(getProfilesAsync, () => {
expect(result[0].profileName).toBe('production');
expect(result[1].profileName).toBe('production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, '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 () => {
readBuildProfileAsync
.mockRejectedValueOnce(() => {
throw new Error();
getBuildProfileAsync
.mockImplementationOnce(() => {
throw new errors.MissingProfileError();
})
.mockRejectedValueOnce(() => {
throw new Error();
.mockImplementationOnce(() => {
throw new errors.MissingProfileError();
});
const result = await getProfilesAsync({
@@ -56,20 +56,16 @@ describe(getProfilesAsync, () => {
expect(result[0].profileName).toBe('release');
expect(result[1].profileName).toBe('release');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, 'production');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, '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('fails when neither production or release profiles are present', async () => {
readBuildProfileAsync
.mockRejectedValueOnce(() => {
throw new Error();
})
.mockRejectedValueOnce(() => {
throw new Error();
});
getBuildProfileAsync.mockImplementation(() => {
throw new errors.MissingProfileError();
});
await expect(
getProfilesAsync({
@@ -78,7 +74,7 @@ describe(getProfilesAsync, () => {
profileName: undefined,
type: 'build',
})
).rejects.toThrowError(/There is no build profile named "production" in eas.json/);
).rejects.toThrowError(errors.MissingProfileError);
});
it('gets a specific profile', async () => {
@@ -91,12 +87,12 @@ describe(getProfilesAsync, () => {
expect(result[0].profileName).toBe('custom-profile');
expect(result[1].profileName).toBe('custom-profile');
expect(readBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
expect(readBuildProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
expect(getBuildProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
expect(getBuildProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
});
it('throws validation error if eas.json is invalid', async () => {
readBuildProfileAsync.mockImplementation(() => {
getBuildProfileAsync.mockImplementation(() => {
throw new errors.InvalidEasJsonError('eas.json is not valid');
});
+36 -12
View File
@@ -1,10 +1,15 @@
import { Platform } from '@expo/eas-build-job';
import { BuildProfile, EasJsonReader, SubmitProfile, errors } from '@expo/eas-json';
import {
BuildProfile,
EasJsonReader,
ProfileType,
SubmitProfile,
errors,
getDefaultSubmitProfile,
} from '@expo/eas-json';
import Log from '../log';
type ProfileType = 'build' | 'submit';
type EasProfile<T extends ProfileType> = T extends 'build'
? BuildProfile<Platform>
: SubmitProfile<Platform>;
@@ -23,7 +28,7 @@ export async function getProfilesAsync<T extends ProfileType>({
}: {
projectDir: string;
platforms: Platform[];
profileName?: string | null;
profileName?: string;
type: T;
}): Promise<ProfileData<T>[]> {
const results = platforms.map(async function (platform) {
@@ -32,23 +37,28 @@ export async function getProfilesAsync<T extends ProfileType>({
if (!profileName) {
try {
profile = await readProfileAsync({ projectDir, platform, type, profileName: 'production' });
profileName = 'production';
profile = await readProfileAsync({ projectDir, platform, type, profileName });
} catch (errorOuter) {
if (errorOuter instanceof errors.InvalidEasJsonError) {
if (!(errorOuter instanceof errors.MissingProfileError)) {
throw errorOuter;
}
try {
profile = await readProfileAsync({ projectDir, platform, type, profileName: 'release' });
profileName = 'release';
profile = await readProfileAsync({ projectDir, platform, type, profileName });
Log.warn(
'The default profile changed from "release" to "production". We detected that you still have a "release" build profile, so we are using it. Update eas.json to have a profile named "production" under the `build` key, or specify which profile you\'d like to use with the --profile flag. This fallback behavior will be removed in the next major version of EAS CLI.'
);
} catch (errorInner) {
if (errorInner instanceof errors.InvalidEasJsonError) {
if (!(errorInner instanceof errors.MissingProfileError)) {
throw errorInner;
}
throw new Error(`There is no ${type} profile named "production" in eas.json`);
const defaultProfile = getDefaultProfile({ platform, type });
if (!defaultProfile) {
throw errorInner;
}
profileName = '__default__';
profile = defaultProfile;
}
}
} else {
@@ -73,13 +83,27 @@ async function readProfileAsync<T extends ProfileType>({
}: {
projectDir: string;
platform: Platform;
type: ProfileType;
type: T;
profileName: string;
}): Promise<EasProfile<T>> {
const easJsonReader = new EasJsonReader(projectDir);
if (type === 'build') {
return (await easJsonReader.readBuildProfileAsync(platform, profileName)) as EasProfile<T>;
return (await easJsonReader.getBuildProfileAsync(platform, profileName)) as EasProfile<T>;
} else {
return (await easJsonReader.readSubmitProfileAsync(platform, profileName)) as EasProfile<T>;
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>;
}
}
+4 -3
View File
@@ -1,11 +1,11 @@
{
"name": "@expo/eas-json",
"description": "A library for interacting with eas.json",
"version": "0.38.0",
"version": "0.40.0",
"author": "Expo <[email protected]>",
"bugs": "https://github.com/expo/eas-cli/issues",
"dependencies": {
"@expo/eas-build-job": "0.2.57",
"@expo/eas-build-job": "0.2.61",
"@expo/json-file": "8.2.33",
"chalk": "4.1.2",
"env-string": "1.0.1",
@@ -16,7 +16,8 @@
},
"devDependencies": {
"@types/fs-extra": "9.0.12",
"memfs": "3.2.2"
"memfs": "3.2.2",
"typescript": "4.5.2"
},
"engines": {
"node": ">=12.0.0"
-31
View File
@@ -1,31 +0,0 @@
import { Platform } from '@expo/eas-build-job';
import { AndroidBuildProfile, CommonBuildProfile, IosBuildProfile } from './EasBuild.types';
import { AndroidSubmitProfile, IosSubmitProfile } from './EasSubmit.types';
export enum CredentialsSource {
LOCAL = 'local',
REMOTE = 'remote',
}
export interface RawBuildProfile extends Partial<CommonBuildProfile> {
extends?: string;
[Platform.ANDROID]?: Partial<AndroidBuildProfile>;
[Platform.IOS]?: Partial<IosBuildProfile>;
}
export interface EasSubmitConfiguration {
[Platform.ANDROID]?: AndroidSubmitProfile;
[Platform.IOS]?: IosSubmitProfile;
}
export interface CliConfig {
version?: string;
requireCommit?: boolean;
}
export interface EasJson {
cli?: CliConfig;
build: { [profile: string]: RawBuildProfile };
submit?: { [profile: string]: EasSubmitConfiguration };
}
-265
View File
@@ -1,265 +0,0 @@
import { Platform } from '@expo/eas-build-job';
import JsonFile from '@expo/json-file';
import envString from 'env-string';
import fs from 'fs-extra';
import path from 'path';
import { BuildProfile } from './EasBuild.types';
import { CliConfig, CredentialsSource, EasJson, RawBuildProfile } from './EasJson.types';
import {
AndroidSubmitProfileSchema,
CliConfigSchema,
EasJsonSchema,
IosSubmitProfileSchema,
MinimalEasJsonSchema,
} from './EasJsonSchema';
import {
AndroidSubmitProfileFieldsToEvaluate,
IosSubmitProfileFieldsToEvaluate,
SubmitProfile,
} from './EasSubmit.types';
import { InvalidEasJsonError, MissingEasJsonError } from './errors';
interface EasJsonPreValidation {
cli?: object;
build: { [profile: string]: object };
submit?: { [profile: string]: object };
}
const defaults = {
distribution: 'store',
credentialsSource: CredentialsSource.REMOTE,
} as const;
type LoggerFn = (...args: any[]) => void;
interface Logger {
log: LoggerFn;
warn: LoggerFn;
}
export class EasJsonReader {
private static log?: Logger;
public static formatEasJsonPath(projectDir: string): string {
return path.join(projectDir, 'eas.json');
}
public static setLog(log: Logger): void {
this.log = log;
}
constructor(private projectDir: string) {}
public async getBuildProfileNamesAsync(): Promise<string[]> {
const easJson = await this.readRawAsync();
return Object.keys(easJson?.build ?? {});
}
public async getCliConfigAsync(): Promise<CliConfig | null> {
try {
const easJson = await this.readRawAsync();
if (!easJson.cli) {
return null;
}
const { value, error } = CliConfigSchema.validate(easJson.cli, {
allowUnknown: false,
convert: true,
abortEarly: false,
});
if (error) {
throw new Error(`"cli" field in eas.json is not valid [${error.toString()}]`);
}
return value as CliConfig;
} catch (err: any) {
if (err instanceof MissingEasJsonError) {
return null;
}
throw err;
}
}
public async getSubmitProfileNamesAsync({ throwIfEasJsonDoesNotExist = true } = {}): Promise<
string[]
> {
try {
const easJson = await this.readRawAsync();
return Object.keys(easJson?.submit ?? {});
} catch (err: any) {
if (!throwIfEasJsonDoesNotExist && err.code === 'ENOENT') {
return [];
} else {
throw err;
}
}
}
public async readBuildProfileAsync<T extends Platform>(
platform: T,
profileName: string
): Promise<BuildProfile<T>> {
const easJson = await this.readAndValidateAsync();
this.ensureBuildProfileExists(easJson, profileName);
const {
android: resolvedAndroidSpecificValues,
ios: resolvedIosSpecificValues,
...resolvedProfile
} = this.resolveBuildProfile(easJson, profileName);
if (platform === Platform.ANDROID) {
const profileWithoutDefaults = profileMerge(
resolvedProfile,
resolvedAndroidSpecificValues ?? {}
);
return profileMerge(defaults, profileWithoutDefaults) as BuildProfile<T>;
} else if (platform === Platform.IOS) {
const profileWithoutDefaults = profileMerge(resolvedProfile, resolvedIosSpecificValues ?? {});
return profileMerge(defaults, profileWithoutDefaults) as BuildProfile<T>;
} else {
throw new Error(`Unknown platform ${platform}`);
}
}
public async readSubmitProfileAsync<T extends Platform>(
platform: T,
profileNameArg?: string
): Promise<SubmitProfile<T>> {
let profileName = profileNameArg;
if (!profileName) {
const profileNames = await this.getSubmitProfileNamesAsync({
throwIfEasJsonDoesNotExist: false,
});
if (profileNames.includes('production')) {
profileName = 'production';
} else if (profileNames.includes('release')) {
profileName = 'release';
} else {
return getDefaultSubmitProfile(platform);
}
}
const easJson = await this.readAndValidateAsync();
const profile = easJson?.submit?.[profileName];
if (!profile) {
throw new Error(`There is no submit profile named ${profileName} in eas.json`);
}
const platformProfile = profile[platform];
if (platformProfile) {
return this.evaluateFields(platform, platformProfile as SubmitProfile<T>);
} else {
return getDefaultSubmitProfile(platform);
}
}
public async readAndValidateAsync(): Promise<EasJson> {
const easJson = await this.readRawAsync();
const { value, error } = EasJsonSchema.validate(easJson, {
allowUnknown: false,
convert: true,
abortEarly: false,
});
if (error) {
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
return value as EasJson;
}
public async readRawAsync(): Promise<EasJsonPreValidation> {
try {
const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
if (!(await fs.pathExists(easJsonPath))) {
throw new MissingEasJsonError(
`An eas.json file could not be found at ${easJsonPath}. You must make one in order to proceed. Learn more at https://expo.fyi/eas-json`
);
}
const rawEasJson = JsonFile.read(easJsonPath);
const { value, error } = MinimalEasJsonSchema.validate(rawEasJson, { abortEarly: false });
if (error) {
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
return value;
} catch (err: any) {
if (err.code === 'EJSONPARSE') {
err.message = `Found invalid JSON in eas.json. ${err.message}`;
}
throw err;
}
}
private resolveBuildProfile(
easJson: EasJson,
profileName: string,
depth: number = 0
): RawBuildProfile {
if (depth >= 2) {
throw new Error(
'Too long chain of build profile extensions, make sure "extends" keys do not make a cycle'
);
}
const buildProfile = easJson.build[profileName];
if (!buildProfile) {
throw new Error(`There is no build profile named ${profileName} in eas.json`);
}
const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
if (baseProfileName) {
return profileMerge(
this.resolveBuildProfile(easJson, baseProfileName, depth + 1),
buildProfileRest
);
} else {
return buildProfileRest;
}
}
private ensureBuildProfileExists(easJson: EasJson, profileName: string): void {
if (!easJson.build || !easJson.build[profileName]) {
throw new Error(`There is no build profile named ${profileName} in eas.json`);
}
}
private evaluateFields<T extends Platform>(
platform: T,
profile: SubmitProfile<T>
): SubmitProfile<T> {
const fields =
platform === Platform.ANDROID
? AndroidSubmitProfileFieldsToEvaluate
: IosSubmitProfileFieldsToEvaluate;
const evaluatedProfile = { ...profile };
for (const field of fields) {
if (field in evaluatedProfile) {
// @ts-ignore
evaluatedProfile[field] = envString(evaluatedProfile[field], process.env);
}
}
return evaluatedProfile;
}
}
export function profileMerge(base: RawBuildProfile, update: RawBuildProfile): RawBuildProfile {
const result = {
...base,
...update,
};
if (base.env && update.env) {
result.env = {
...base.env,
...update.env,
};
}
if (base.android && update.android) {
result.android = profileMerge(base.android, update.android);
}
if (base.ios && update.ios) {
result.ios = profileMerge(base.ios, update.ios);
}
return result;
}
function getDefaultSubmitProfile<T extends Platform>(platform: T): SubmitProfile<T> {
const Schema =
platform === Platform.ANDROID ? AndroidSubmitProfileSchema : IosSubmitProfileSchema;
return Schema.validate({}, { convert: true }).value;
}
@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
import fs from 'fs-extra';
import { vol } from 'memfs';
import { EasJsonReader } from '../EasJsonReader';
import { EasJsonReader } from '../reader';
jest.mock('fs');
@@ -19,18 +19,18 @@ test('minimal valid eas.json for both platforms', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const iosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'production');
expect({
expect(androidProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
}).toEqual(androidProfile);
});
expect({
expect(iosProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
}).toEqual(iosProfile);
});
});
test('valid eas.json for development client builds', async () => {
@@ -47,20 +47,20 @@ test('valid eas.json for development client builds', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'debug');
const androidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
expect({
const iosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'debug');
const androidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'debug');
expect(androidProfile).toEqual({
credentialsSource: 'remote',
distribution: 'store',
developmentClient: true,
withoutCredentials: true,
}).toEqual(androidProfile);
});
expect({
expect(iosProfile).toEqual({
credentialsSource: 'remote',
distribution: 'store',
developmentClient: true,
}).toEqual(iosProfile);
});
});
test('valid profile for internal distribution on Android', async () => {
@@ -73,11 +73,11 @@ test('valid profile for internal distribution on Android', async () => {
});
const reader = new EasJsonReader('/project');
const profile = await reader.readBuildProfileAsync(Platform.ANDROID, 'internal');
expect({
const profile = await reader.getBuildProfileAsync(Platform.ANDROID, 'internal');
expect(profile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
}).toEqual(profile);
});
});
test('valid profile extending other profile', async () => {
@@ -95,18 +95,18 @@ test('valid profile extending other profile', async () => {
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
const extendedProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
expect({
const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
const extendedProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
expect(baseProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
node: '12.0.0',
}).toEqual(baseProfile);
expect({
});
expect(extendedProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
node: '13.0.0',
}).toEqual(extendedProfile);
});
});
test('valid profile extending other profile with platform specific envs', async () => {
@@ -134,33 +134,33 @@ test('valid profile extending other profile with platform specific envs', async
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'extension');
expect({
const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'extension');
expect(baseProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
env: {
BASE_ENV: '1',
PROFILE: 'base',
},
}).toEqual(baseProfile);
expect({
});
expect(extendedAndroidProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
env: {
BASE_ENV: '1',
PROFILE: 'extension:android',
},
}).toEqual(extendedAndroidProfile);
expect({
});
expect(extendedIosProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
env: {
BASE_ENV: '1',
PROFILE: 'extension',
},
}).toEqual(extendedIosProfile);
});
});
test('valid profile extending other profile with platform specific caching', async () => {
@@ -188,32 +188,32 @@ test('valid profile extending other profile with platform specific caching', asy
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.readBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.readBuildProfileAsync(Platform.IOS, 'extension');
expect({
const baseProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'base');
const extendedAndroidProfile = await reader.getBuildProfileAsync(Platform.ANDROID, 'extension');
const extendedIosProfile = await reader.getBuildProfileAsync(Platform.IOS, 'extension');
expect(baseProfile).toEqual({
distribution: 'store',
credentialsSource: 'remote',
cache: {
disabled: true,
},
}).toEqual(baseProfile);
expect({
});
expect(extendedAndroidProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
cache: {
cacheDefaultPaths: false,
customPaths: ['somefakepath'],
},
}).toEqual(extendedAndroidProfile);
expect({
});
expect(extendedIosProfile).toEqual({
distribution: 'internal',
credentialsSource: 'remote',
cache: {
key: 'extend-key',
},
}).toEqual(extendedIosProfile);
});
});
test('valid eas.json with missing profile', async () => {
@@ -224,8 +224,8 @@ test('valid eas.json with missing profile', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'debug');
await expect(promise).rejects.toThrowError('There is no build profile named debug in eas.json');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'debug');
await expect(promise).rejects.toThrowError('Missing build profile in eas.json: debug');
});
test('invalid eas.json when using wrong buildType', async () => {
@@ -236,7 +236,7 @@ test('invalid eas.json when using wrong buildType', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(
'eas.json is not valid [ValidationError: "build.production.android.buildType" must be one of [apk, app-bundle]]'
);
@@ -246,10 +246,8 @@ test('empty json', async () => {
await fs.writeJson('/project/eas.json', {});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(
'There is no build profile named production in eas.json'
);
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError('Missing build profile in eas.json: production');
});
test('invalid semver value', async () => {
@@ -260,7 +258,7 @@ test('invalid semver value', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(
'eas.json is not valid [ValidationError: "build.production.node" failed custom validation because 12.0.0-alpha is not a valid version]'
);
@@ -274,15 +272,15 @@ test('invalid release channel', async () => {
});
const reader = new EasJsonReader('/project');
const promise = reader.readBuildProfileAsync(Platform.ANDROID, 'production');
const promise = reader.getBuildProfileAsync(Platform.ANDROID, 'production');
await expect(promise).rejects.toThrowError(/fails to match the required pattern/);
});
test('get profile names', async () => {
await fs.writeJson('/project/eas.json', {
build: {
production: { node: '12.0.0-alpha' },
blah: { node: '12.0.0-alpha' },
production: { node: '12.0.0' },
blah: { node: '12.0.0' },
},
});
@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
import fs from 'fs-extra';
import { vol } from 'memfs';
import { EasJsonReader } from '../EasJsonReader';
import { EasJsonReader } from '../reader';
jest.mock('fs');
@@ -19,8 +19,8 @@ test('minimal allowed eas.json for both platforms', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'production');
const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');
expect(androidProfile).toEqual({
changesNotSentForReview: false,
@@ -46,7 +46,7 @@ test('android config with all required values', async () => {
});
const reader = new EasJsonReader('/project');
const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');
expect(androidProfile).toEqual({
serviceAccountKeyPath: './path.json',
@@ -72,7 +72,7 @@ test('android config with serviceAccountKeyPath set to env var', async () => {
try {
process.env.GOOGLE_SERVICE_ACCOUNT = './path.json';
const reader = new EasJsonReader('/project');
const androidProfile = await reader.readSubmitProfileAsync(Platform.ANDROID, 'production');
const androidProfile = await reader.getSubmitProfileAsync(Platform.ANDROID, 'production');
expect(androidProfile).toEqual({
serviceAccountKeyPath: './path.json',
@@ -102,7 +102,7 @@ test('ios config with all required values', async () => {
});
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'production');
const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'production');
expect(iosProfile).toEqual({
appleId: '[email protected]',
@@ -136,7 +136,7 @@ test('ios config with ascApiKey fields set to env var', async () => {
process.env.ASC_API_KEY_ISSUER_ID = 'abc-123-def-456';
process.env.ASC_API_KEY_ID = 'ABCD';
const reader = new EasJsonReader('/project');
const iosProfile = await reader.readSubmitProfileAsync(Platform.IOS, 'release');
const iosProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'release');
expect(iosProfile).toEqual({
appleId: '[email protected]',
@@ -153,3 +153,45 @@ test('ios config with ascApiKey fields set to env var', async () => {
process.env.ASC_API_KEY_ID = undefined;
}
});
test('valid profile extending other profile', async () => {
await fs.writeJson('/project/eas.json', {
submit: {
base: {
ios: {
appleId: '[email protected]',
ascAppId: '1223423523',
appleTeamId: 'QWERTY',
},
},
extension: {
extends: 'base',
ios: {
appleTeamId: 'ABCDEF',
ascApiKeyPath: './path-ABCD.p8',
ascApiKeyIssuerId: 'abc-123-def-456',
ascApiKeyId: 'ABCD',
},
},
},
});
const reader = new EasJsonReader('/project');
const baseProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'base');
const extendedProfile = await reader.getSubmitProfileAsync(Platform.IOS, 'extension');
expect(baseProfile).toEqual({
language: 'en-US',
appleId: '[email protected]',
ascAppId: '1223423523',
appleTeamId: 'QWERTY',
});
expect(extendedProfile).toEqual({
language: 'en-US',
appleId: '[email protected]',
ascAppId: '1223423523',
appleTeamId: 'ABCDEF',
ascApiKeyPath: './path-ABCD.p8',
ascApiKeyIssuerId: 'abc-123-def-456',
ascApiKeyId: 'ABCD',
});
});
+97
View File
@@ -0,0 +1,97 @@
import { Platform } from '@expo/eas-build-job';
import { MissingParentProfileError, MissingProfileError } from '../errors';
import { EasJson } from '../types';
import { BuildProfileSchema } from './schema';
import { BuildProfile, EasJsonBuildProfile } from './types';
type EasJsonBuildProfileResolved = Omit<EasJsonBuildProfile, 'extends'>;
export function resolveBuildProfile<T extends Platform>({
easJson,
platform,
profileName,
}: {
easJson: EasJson;
platform: T;
profileName: string;
}): BuildProfile<T> {
const easJsonProfile = resolveProfile({
easJson,
profileName,
});
const { android, ios, ...base } = easJsonProfile;
const withoutDefaults = mergeProfiles(base, easJsonProfile[platform] ?? {});
return mergeProfiles(getDefaultProfile(platform), withoutDefaults) as BuildProfile<T>;
}
function resolveProfile({
easJson,
profileName,
depth = 0,
}: {
easJson: EasJson;
profileName: string;
depth?: number;
}): EasJsonBuildProfileResolved {
if (depth >= 2) {
throw new Error(
'Too long chain of profile extensions, make sure "extends" keys do not make a cycle'
);
}
const profile = easJson.build?.[profileName];
if (!profile) {
if (depth === 0) {
throw new MissingProfileError(`Missing build profile in eas.json: ${profileName}`);
} else {
throw new MissingParentProfileError(
`Extending non-existent build profile in eas.json: ${profileName}`
);
}
}
const { extends: baseProfileName, ...rest } = profile;
if (baseProfileName) {
const baseProfile = resolveProfile({
easJson,
profileName: baseProfileName,
depth: depth + 1,
});
return mergeProfiles(baseProfile, rest);
} else {
return rest;
}
}
function mergeProfiles(
base: EasJsonBuildProfileResolved,
update: EasJsonBuildProfileResolved
): EasJsonBuildProfileResolved {
const result = {
...base,
...update,
};
if (base.env && update.env) {
result.env = {
...base.env,
...update.env,
};
}
if (base.android && update.android) {
result.android = mergeProfiles(base.android, update.android);
}
if (base.ios && update.ios) {
result.ios = mergeProfiles(base.ios, update.ios);
}
return result;
}
function getDefaultProfile<T extends Platform>(platform: T): EasJsonBuildProfile {
const defaultProfile = BuildProfileSchema.validate(
{},
{ allowUnknown: false, abortEarly: false, convert: true }
).value;
const { android, ios, ...base } = defaultProfile;
return mergeProfiles(base, defaultProfile[platform]);
}
@@ -1,16 +1,6 @@
import { Android, Ios } from '@expo/eas-build-job';
import Joi from 'joi';
import { AndroidReleaseStatus, AndroidReleaseTrack } from './EasSubmit.types';
const semverSchemaCheck = (value: any): any => {
if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
return value;
} else {
throw new Error(`${value} is not a valid version`);
}
};
const CacheSchema = Joi.object({
disabled: Joi.boolean(),
key: Joi.string().max(128),
@@ -19,8 +9,8 @@ const CacheSchema = Joi.object({
});
const CommonBuildProfileSchema = Joi.object({
credentialsSource: Joi.string().valid('local', 'remote'),
distribution: Joi.string().valid('store', 'internal'),
credentialsSource: Joi.string().valid('local', 'remote').default('remote'),
distribution: Joi.string().valid('store', 'internal').default('store'),
cache: CacheSchema,
releaseChannel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
channel: Joi.string().regex(/^[a-z\d][a-z\d._-]*$/),
@@ -34,6 +24,8 @@ const CommonBuildProfileSchema = Joi.object({
const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
Joi.object({
credentialsSource: Joi.string().valid('local', 'remote'),
distribution: Joi.string().valid('store', 'internal'),
withoutCredentials: Joi.boolean(),
image: Joi.string().valid(...Android.builderBaseImages),
@@ -52,6 +44,8 @@ const AndroidBuildProfileSchema = CommonBuildProfileSchema.concat(
const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
Joi.object({
credentialsSource: Joi.string().valid('local', 'remote'),
distribution: Joi.string().valid('store', 'internal'),
enterpriseProvisioning: Joi.string().valid('adhoc', 'universal'),
autoIncrement: Joi.alternatives().try(
Joi.boolean(),
@@ -70,7 +64,7 @@ const IosBuildProfileSchema = CommonBuildProfileSchema.concat(
})
);
const EasJsonBuildProfileSchema = CommonBuildProfileSchema.concat(
export const BuildProfileSchema = CommonBuildProfileSchema.concat(
Joi.object({
extends: Joi.string(),
android: AndroidBuildProfileSchema,
@@ -78,50 +72,10 @@ const EasJsonBuildProfileSchema = CommonBuildProfileSchema.concat(
})
);
export const AndroidSubmitProfileSchema = Joi.object({
serviceAccountKeyPath: Joi.string(),
track: Joi.string()
.valid(...Object.values(AndroidReleaseTrack))
.default(AndroidReleaseTrack.internal),
releaseStatus: Joi.string()
.valid(...Object.values(AndroidReleaseStatus))
.default(AndroidReleaseStatus.completed),
changesNotSentForReview: Joi.boolean().default(false),
applicationId: Joi.string(),
});
export const IosSubmitProfileSchema = Joi.object({
ascApiKeyPath: Joi.string(),
ascApiKeyId: Joi.string(),
ascApiKeyIssuerId: Joi.string(),
appleId: Joi.string(),
ascAppId: Joi.string(),
appleTeamId: Joi.string(),
sku: Joi.string(),
language: Joi.string().default('en-US'),
companyName: Joi.string(),
appName: Joi.string(),
bundleIdentifier: Joi.string(),
});
const EasJsonSubmitConfigurationSchema = Joi.object({
android: AndroidSubmitProfileSchema,
ios: IosSubmitProfileSchema,
});
export const CliConfigSchema = Joi.object({
version: Joi.string(),
requireCommit: Joi.boolean(),
});
export const MinimalEasJsonSchema = Joi.object({
cli: Joi.object(),
build: Joi.object().pattern(Joi.string(), Joi.object()),
submit: Joi.object().pattern(Joi.string(), Joi.object()),
});
export const EasJsonSchema = Joi.object({
cli: CliConfigSchema,
build: Joi.object().pattern(Joi.string(), EasJsonBuildProfileSchema),
submit: Joi.object().pattern(Joi.string(), EasJsonSubmitConfigurationSchema),
});
function semverSchemaCheck(value: any): any {
if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
return value;
} else {
throw new Error(`${value} is not a valid version`);
}
}
@@ -55,8 +55,10 @@ export interface IosBuildProfile extends CommonBuildProfile {
export type BuildProfile<TPlatform extends Platform = Platform> = TPlatform extends Platform.ANDROID
? AndroidBuildProfile
: TPlatform extends Platform.IOS
? IosBuildProfile
: TPlatform extends Platform
? AndroidBuildProfile | IosBuildProfile
: never;
: IosBuildProfile;
export interface EasJsonBuildProfile extends Partial<CommonBuildProfile> {
extends?: string;
[Platform.ANDROID]?: Partial<AndroidBuildProfile>;
[Platform.IOS]?: Partial<IosBuildProfile>;
}
+4
View File
@@ -1,3 +1,7 @@
export class InvalidEasJsonError extends Error {}
export class MissingEasJsonError extends Error {}
export class MissingProfileError extends Error {}
export class MissingParentProfileError extends Error {}
+6 -13
View File
@@ -1,20 +1,13 @@
export { AndroidReleaseStatus, AndroidReleaseTrack, SubmitProfile } from './submit/types';
export { getDefaultProfile as getDefaultSubmitProfile } from './submit/resolver';
export { EasJson, ProfileType } from './types';
export {
AndroidSubmitProfile,
AndroidReleaseStatus,
AndroidReleaseTrack,
IosSubmitProfile,
SubmitProfile,
} from './EasSubmit.types';
export { EasJson } from './EasJson.types';
export {
AndroidBuildProfile,
AndroidVersionAutoIncrement,
BuildProfile,
CredentialsSource,
DistributionType,
IosBuildProfile,
IosEnterpriseProvisioning,
IosVersionAutoIncrement,
AndroidVersionAutoIncrement,
} from './EasBuild.types';
export { EasJsonReader } from './EasJsonReader';
} from './build/types';
export { EasJsonReader } from './reader';
export * as errors from './errors';
+87
View File
@@ -0,0 +1,87 @@
import { Platform } from '@expo/eas-build-job';
import JsonFile from '@expo/json-file';
import fs from 'fs-extra';
import path from 'path';
import { resolveBuildProfile } from './build/resolver';
import { BuildProfile } from './build/types';
import { InvalidEasJsonError, MissingEasJsonError } from './errors';
import { EasJsonSchema } from './schema';
import { resolveSubmitProfile } from './submit/resolver';
import { SubmitProfile } from './submit/types';
import { EasJson } from './types';
export class EasJsonReader {
private easJson: EasJson | undefined;
constructor(private projectDir: string) {}
public static formatEasJsonPath(projectDir: string): string {
return path.join(projectDir, 'eas.json');
}
public async readAsync(): Promise<EasJson> {
if (this.easJson) {
return this.easJson;
}
try {
const easJsonPath = EasJsonReader.formatEasJsonPath(this.projectDir);
if (!(await fs.pathExists(easJsonPath))) {
throw new MissingEasJsonError(
`eas.json could not be found at ${easJsonPath}. Learn more at https://expo.fyi/eas-json`
);
}
const contents = JsonFile.read(easJsonPath);
const { value, error } = EasJsonSchema.validate(contents, {
allowUnknown: false,
abortEarly: false,
convert: true,
noDefaults: true,
});
if (error) {
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
this.easJson = value;
return value;
} catch (err: any) {
if (err.code === 'EJSONPARSE') {
err.message = `Found invalid JSON in eas.json. ${err.message}`;
}
throw err;
}
}
public async getBuildProfileNamesAsync(): Promise<string[]> {
const easJson = await this.readAsync();
return Object.keys(easJson?.build ?? {});
}
public async getBuildProfileAsync<T extends Platform>(
platform: T,
profileName: string
): Promise<BuildProfile<T>> {
const easJson = await this.readAsync();
return resolveBuildProfile({ easJson, platform, profileName });
}
public async getCliConfigAsync(): Promise<EasJson['cli'] | null> {
try {
const easJson = await this.readAsync();
return easJson.cli ?? null;
} catch (err: any) {
if (err instanceof MissingEasJsonError) {
return null;
}
throw err;
}
}
public async getSubmitProfileAsync<T extends Platform>(
platform: T,
profileName: string
): Promise<SubmitProfile<T>> {
const easJson = await this.readAsync();
return resolveSubmitProfile({ easJson, platform, profileName });
}
}
+13
View File
@@ -0,0 +1,13 @@
import Joi from 'joi';
import { BuildProfileSchema } from './build/schema';
import { SubmitProfileSchema } from './submit/schema';
export const EasJsonSchema = Joi.object({
cli: Joi.object({
version: Joi.string(),
requireCommit: Joi.boolean(),
}),
build: Joi.object().pattern(Joi.string(), BuildProfileSchema),
submit: Joi.object().pattern(Joi.string(), SubmitProfileSchema),
});
+114
View File
@@ -0,0 +1,114 @@
import { Platform } from '@expo/eas-build-job';
import envString from 'env-string';
import { MissingParentProfileError, MissingProfileError } from '../errors';
import { EasJson } from '../types';
import { AndroidSubmitProfileSchema, IosSubmitProfileSchema } from './schema';
import {
AndroidSubmitProfileFieldsToEvaluate,
IosSubmitProfileFieldsToEvaluate,
SubmitProfile,
} from './types';
export function resolveSubmitProfile<T extends Platform>({
easJson,
platform,
profileName,
}: {
easJson: EasJson;
platform: T;
profileName: string;
}): SubmitProfile<T> {
const submitProfile = resolveProfile({
easJson,
platform,
profileName,
});
const unevaluatedProfile = mergeProfiles(getDefaultProfile(platform), submitProfile);
return evaluateFields(platform, unevaluatedProfile);
}
function resolveProfile<T extends Platform>({
easJson,
profileName,
depth = 0,
platform,
}: {
platform: T;
easJson: EasJson;
profileName: string;
depth?: number;
}): SubmitProfile<T> | undefined {
if (depth >= 2) {
throw new Error(
'Too long chain of profile extensions, make sure "extends" keys do not make a cycle'
);
}
const profile = easJson.submit?.[profileName];
if (!profile) {
if (depth === 0) {
throw new MissingProfileError(`There is no submit profile named ${profileName} in eas.json`);
} else {
throw new MissingParentProfileError(
`Extending non-existent submit profile in eas.json: ${profileName}`
);
}
}
const { extends: baseProfileName, ...rest } = profile;
const platformProfile = rest[platform] as SubmitProfile<T> | undefined;
if (baseProfileName) {
const baseProfile = resolveProfile({
easJson,
platform,
profileName: baseProfileName,
depth: depth + 1,
});
return mergeProfiles(baseProfile, platformProfile);
} else {
return platformProfile;
}
}
function mergeProfiles<T extends Platform>(
base: SubmitProfile<T>,
update?: SubmitProfile<T>
): SubmitProfile<T>;
function mergeProfiles<T extends Platform>(
base?: SubmitProfile<T>,
update?: SubmitProfile<T>
): SubmitProfile<T> | undefined;
function mergeProfiles<T extends Platform>(
base?: SubmitProfile<T>,
update?: SubmitProfile<T>
): SubmitProfile<T> | undefined {
if (!update) {
return base;
}
return { ...base, ...update };
}
export function getDefaultProfile<T extends Platform>(platform: T): SubmitProfile<T> {
const Schema =
platform === Platform.ANDROID ? AndroidSubmitProfileSchema : IosSubmitProfileSchema;
return Schema.validate({}, { allowUnknown: false, abortEarly: false, convert: true }).value;
}
function evaluateFields<T extends Platform>(
platform: T,
profile: SubmitProfile<T>
): SubmitProfile<T> {
const fields =
platform === Platform.ANDROID
? AndroidSubmitProfileFieldsToEvaluate
: IosSubmitProfileFieldsToEvaluate;
const evaluatedProfile = { ...profile };
for (const field of fields) {
if (field in evaluatedProfile) {
// @ts-ignore
evaluatedProfile[field] = envString(evaluatedProfile[field], process.env);
}
}
return evaluatedProfile;
}
+35
View File
@@ -0,0 +1,35 @@
import Joi from 'joi';
import { AndroidReleaseStatus, AndroidReleaseTrack } from './types';
export const AndroidSubmitProfileSchema = Joi.object({
serviceAccountKeyPath: Joi.string(),
track: Joi.string()
.valid(...Object.values(AndroidReleaseTrack))
.default(AndroidReleaseTrack.internal),
releaseStatus: Joi.string()
.valid(...Object.values(AndroidReleaseStatus))
.default(AndroidReleaseStatus.completed),
changesNotSentForReview: Joi.boolean().default(false),
applicationId: Joi.string(),
});
export const IosSubmitProfileSchema = Joi.object({
ascApiKeyPath: Joi.string(),
ascApiKeyId: Joi.string(),
ascApiKeyIssuerId: Joi.string(),
appleId: Joi.string(),
ascAppId: Joi.string(),
appleTeamId: Joi.string(),
sku: Joi.string(),
language: Joi.string().default('en-US'),
companyName: Joi.string(),
appName: Joi.string(),
bundleIdentifier: Joi.string(),
});
export const SubmitProfileSchema = Joi.object({
extends: Joi.string(),
android: AndroidSubmitProfileSchema,
ios: IosSubmitProfileSchema,
});
@@ -47,10 +47,10 @@ export const IosSubmitProfileFieldsToEvaluate: (keyof IosSubmitProfile)[] = [
];
export type SubmitProfile<TPlatform extends Platform = Platform> =
TPlatform extends Platform.ANDROID
? AndroidSubmitProfile
: TPlatform extends Platform.IOS
? IosSubmitProfile
: TPlatform extends Platform
? AndroidSubmitProfile | IosSubmitProfile
: never;
TPlatform extends Platform.ANDROID ? AndroidSubmitProfile : IosSubmitProfile;
export interface EasJsonSubmitProfile {
extends?: string;
[Platform.ANDROID]?: AndroidSubmitProfile;
[Platform.IOS]?: IosSubmitProfile;
}
+21
View File
@@ -0,0 +1,21 @@
import { EasJsonBuildProfile } from './build/types';
import { EasJsonSubmitProfile } from './submit/types';
export type ProfileType = 'build' | 'submit';
export type EasJsonProfile<T extends ProfileType> = T extends 'build'
? EasJsonBuildProfile
: EasJsonSubmitProfile;
export enum CredentialsSource {
LOCAL = 'local',
REMOTE = 'remote',
}
export interface EasJson {
cli?: {
version?: string;
requireCommit?: boolean;
};
build?: { [profileName: string]: EasJsonBuildProfile };
submit?: { [profileName: string]: EasJsonSubmitProfile };
}
+4 -1
View File
@@ -66,7 +66,10 @@ function addEntry(tokens: markdown.Tokens, entry: Entry): void {
}
function formatEntry({ message, prNumber, author }: Entry): string {
const messageWithDot = message.endsWith('.') ? message : `${message}.`;
const capitalizedMessage = `${message[0].toUpperCase()}${message.slice(1)}`;
const messageWithDot = capitalizedMessage.endsWith('.')
? capitalizedMessage
: `${capitalizedMessage}.`;
return `${messageWithDot} ([#${prNumber}](https://github.com/expo/eas-cli/pull/${prNumber}) by [@${author}](https://github.com/${author}))`;
}
Generated
+29 -23
View File
@@ -848,14 +848,15 @@
mv "~2"
safe-json-stringify "~1"
"@expo/[email protected].8":
version "4.0.8"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.8.tgz#c131b36df3abbdccb9e60584597695533f3cc3b8"
integrity sha512-ukcHwoQtuRwu33e/t1Z4jz2UlG1yzBJ2Us4T7yoPwKi298KsmRtF9FoMUWDTPwe79MZzP1orOXgpCX2wIJQhMg==
"@expo/[email protected].11":
version "4.0.11"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.11.tgz#2c11c63ec0d3f7a56d6cb45c8340a1546f3cfc5c"
integrity sha512-hoQq+B1NlIqWeSLKbQQ19g2vzqKhXh2glRwRFCGvqKT2/UaweFU5w7jetNPOBlVIV1+TpQmhLNbTYako6Z3vnQ==
dependencies:
"@expo/config-types" "^43.0.1"
"@expo/json-file" "8.2.34"
"@expo/plist" "0.0.16"
"@expo/sdk-runtime-versions" "^1.0.0"
"@react-native/normalize-color" "^2.0.0"
chalk "^4.1.2"
debug "^4.3.1"
@@ -874,13 +875,13 @@
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-43.0.1.tgz#3e047dccb371741a540980eaff26fb0c95039c30"
integrity sha512-EtllpCGDdB/UdwAIs5YXJwBLpbFQNdlLLrxIvoILA9cXrpQMWkeDCT9lQPJzFRMFcLUaMuGvkzX2tR4tx5EQFQ==
"@expo/[email protected].8":
version "6.0.8"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.8.tgz#7dfa216eeb4d75d09e30648c70ed530a87b89a47"
integrity sha512-X/scIv8diX1h/ZmhgtVPPkU5jtb/aygqJnFplVB/9bADTlPF1gwNVw1OlTG9jeyDGxy/J2Syf/VyeteZx1d9lA==
"@expo/[email protected].11":
version "6.0.11"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.11.tgz#a00815ac29c13dfb069441dff6f0b56da69baa2f"
integrity sha512-ohmm/fjpqL3mk1Tj9BqmeoFuGNQxfMm2cQs0JHqBCXTjBUtprrH1j6wHdKR2ctNWQxpOlStPkC6CgPv+bd1+GA==
dependencies:
"@babel/code-frame" "~7.10.4"
"@expo/config-plugins" "4.0.8"
"@expo/config-plugins" "4.0.11"
"@expo/config-types" "^43.0.1"
"@expo/json-file" "8.2.34"
getenv "^1.0.0"
@@ -891,10 +892,10 @@
slugify "^1.3.4"
sucrase "^3.20.0"
"@expo/[email protected].57":
version "0.2.57"
resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.57.tgz#260a686a919e3b311975a850d36d381643433e1e"
integrity sha512-q+u/2pCx60onMEHaQxstEP88H6vEgcFhSRY5IflErFtOpgcN9gA6ZemBRnxYzC9OS8T1AF6zJqzdeIjMANjPrw==
"@expo/[email protected].61":
version "0.2.61"
resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.61.tgz#85aae117f285e05f7d17c3a759fad73b6a503455"
integrity sha512-8lv6FInuv/yV0dYSI5QRxpTXJzQizyGnAORIHFeaAdUPTkjjsGSEuqY8ynQV0pXxLcJ79DLQqxZ8QDjglevWpA==
dependencies:
joi "^17.4.2"
semver "^7.3.5"
@@ -970,10 +971,10 @@
base64-js "^1.2.3"
xmlbuilder "^14.0.0"
"@expo/[email protected].0":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-1.7.0.tgz#d47fb15c9b0c8af91b20c9472e5f848972b472d8"
integrity sha512-cOEVg43RusKOY/14SFmN+HCZllR+UEAr6Nv4kTI80vRpclSqn4WQaAqgSjZx5+i2cdVDfv9FeQwLdDwcmbkIIw==
"@expo/[email protected].1":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@expo/plugin-warn-if-update-available/-/plugin-warn-if-update-available-1.7.1.tgz#26e5dbf685801beb1e732dfa663944d280116e98"
integrity sha512-Fo4s9EDliMTBnfaoHOXBvHLQxrHQq34RqmfzZ3qQUPEOCT0hpElEcSXa2qOM0K0WPJzhciMGIEk2ZWhZeTVWxg==
dependencies:
"@oclif/command" "^1.6.0"
"@oclif/config" "^1.12.8"
@@ -985,13 +986,13 @@
lodash.template "^4.4.0"
semver "^7.3.2"
"@expo/[email protected].8":
version "3.0.8"
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.0.8.tgz#402bf4f030ff45023aa7be81ab8f934f1e5e62e9"
integrity sha512-Z04Lv2esctnyL5lhX8BYbF9vlg3FLWT220eEbrqbc/hX2LAfGoNHtn1C0XhrKo6osg330NYxerkSfKq4TUgCVg==
"@expo/[email protected].11":
version "3.0.11"
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.0.11.tgz#362d647b695bc377d8a5dc95788b2b3e00754f5a"
integrity sha512-RVtbTVgHGh2JSCng9xuvJAbvBW3pAWUvJLAbEkNqV/+mb2uPjDumXtyxcUfHSNX0Yjbtxw6LG61v6SNzGkfWlA==
dependencies:
"@expo/config" "6.0.8"
"@expo/config-plugins" "4.0.8"
"@expo/config" "6.0.11"
"@expo/config-plugins" "4.0.11"
"@expo/config-types" "^43.0.1"
"@expo/image-utils" "0.3.18"
"@expo/json-file" "8.2.34"
@@ -1019,6 +1020,11 @@
remove-trailing-slash "^0.1.0"
uuid "^8.3.2"
"@expo/sdk-runtime-versions@^1.0.0":
version "1.0.0"
resolved "https://registry.yarnpkg.com/@expo/sdk-runtime-versions/-/sdk-runtime-versions-1.0.0.tgz#d7ebd21b19f1c6b0395e50d78da4416941c57f7c"
integrity sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ==
"@expo/[email protected]":
version "1.5.0"
resolved "https://registry.yarnpkg.com/@expo/spawn-async/-/spawn-async-1.5.0.tgz#799827edd8c10ef07eb1a2ff9dcfe081d596a395"