Compare commits

...
30 Commits
Author SHA1 Message Date
Brent Vatne bb98e6de03 v0.34.1 2021-11-02 10:15:45 -07:00
Dominik Sokal 2604228233 add clean script 2021-11-02 13:41:47 +01:00
Dominik Sokal a7035d3469 clean up package.json 2021-11-02 13:37:00 +01:00
Dominik Sokal f6dce0e17c update CHANGELOG.md 2021-11-02 13:31:56 +01:00
Wojciech KozyraandDominik Sokal ccfa6f9fc3 [eas-cli] check if commit is required after dev client install (#722)
* check if commit is required after dev client install

* update CHANGELOG.md

* Update CHANGELOG.md

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

Co-authored-by: Dominik Sokal <[email protected]>
2021-11-02 12:51:49 +01:00
Dominik Sokal 0ee8e2f967 Update CONTRIBUTING.md 2021-11-02 11:29:27 +01:00
Quinlan Jung 94dc4c6e93 [eas-cli] asc api key graphql type and print support (#717)
* [eas-cli] asc api key graphql type and print support

* gql

* gql

* update CHANGELOG.md
2021-11-01 14:56:07 -07:00
Brent Vatne 4144e387d6 [eas-cli] Add missing period 2021-11-01 11:39:15 -07:00
Expo CI de4e05e1e0 update CHANGELOG.md 2021-11-01 18:30:08 +00:00
Brent Vatne 36118b700f v0.34.0 2021-11-01 11:23:56 -07:00
Dominik Sokal 2fb947b47a rename useDevelopmentClient to developmentClient (#711)
* generate graphql code

* rename useDevelopmentClient to developmentClient

* update CHANGELOG.md

* upgrade @expo/eas-build-job
2021-10-31 18:51:26 +01:00
gregfentonandWojciech Kozyra 0f1156e951 [eas-cli] correct warning message text (#715) (#716)
* [eas-cli] correct warning message text (#715)

* (minor) Incorrect instructions in warning message
Fixes #715

* Update packages/eas-cli/src/build/validate.ts

Co-authored-by: Wojciech Kozyra <[email protected]>
2021-10-29 10:47:14 +02:00
Quinlan Jung e9f8be92b7 [eas-cli] fix graphql (#713)
* [eas-cli] fix graphql

* update CHANGELOG.md
2021-10-28 11:51:40 -07:00
Quinlan Jung 6360ea9f8e [eas-cli] refactor credentials manager (#712)
* [eas-cli] refactor android manager

* refactor ios

* update CHANGELOG.md
2021-10-28 11:50:08 -07:00
Wojciech Kozyra ad2d8e80f0 add no commit workflow (#695) 2021-10-28 11:40:11 +02:00
Quinlan Jung bc0a5fdaa6 [eas-cli] remove unneeded parameters (#710)
* [eas-cli] remove unneeded parameters

* update CHANGELOG.md
2021-10-27 12:49:56 -07:00
Quinlan Jung d6cfc887c3 [eas-cli] enforce additionalTypenames on graphql queries (#709)
* [eas-cli] enforce additional typenames

* fix stuff

* update CHANGELOG.md
2021-10-26 11:07:26 -07:00
Quinlan Jung ce41c436aa [eas-cli] add additionalTypenames for other queries (#704)
* [eas-cli] add additionalTypenames for other queries

* update CHANGELOG.md
2021-10-25 16:50:32 -07:00
Quinlan Jung ec096eaaa2 [ENG-2143][eas-cli] add additionalTypenames for credentials (#703)
* [eas-cli] add additionalTypenames for credentials

* update CHANGELOG.md
2021-10-25 16:50:10 -07:00
Dominik Sokal 9c32dd5308 don't print logs to stderr (#708)
* don't print logs to stderr

* update CHANGELOG.md
2021-10-25 14:15:54 +02:00
Dominik Sokal 69d7ee9547 fix changelog workflow - use sed for trimming string 2021-10-25 14:03:04 +02:00
Dominik Sokal e2e4cb67ca better error message when eas.json is invalid (#707)
* better error message when eas.json is invalid

* add unit test

* update CHANGELOG.md
2021-10-25 13:19:27 +02:00
Dominik Sokal 4a08ad4997 unify eas.json and build job format (#701)
* unify eas.json and build job format

* update CHANGELOG.md
2021-10-25 09:56:30 +02:00
Expo CI 107a1c12bd update CHANGELOG.md 2021-10-22 18:16:12 +00:00
Brent Vatne 8fe5268a73 v0.33.1 2021-10-22 11:10:45 -07:00
Brent Vatne faba1ad8e3 [eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ (#706) 2021-10-22 11:09:50 -07:00
Dominik Sokal ea4885c710 fix typo 2021-10-21 10:10:47 +02:00
Brent Vatne 4d85002d2b [eas-cli] Update the submission prompt options 2021-10-20 11:43:55 -07:00
jkh 535b17f592 [eas-cli] use config-plugin to compute runtime version (#697) 2021-10-20 10:58:59 -07:00
Expo CI e556b45d4d update CHANGELOG.md 2021-10-20 15:49:25 +00:00
97 changed files with 2260 additions and 2055 deletions

No files matched your search

+2 -2
View File
@@ -28,8 +28,8 @@ jobs:
echo "Invalid /changelog-entry command"
exit 1
fi
CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | xargs )
MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | xargs )
CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
yarn changelog-entry "$CATEGORY" "$MESSAGE"
env:
GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+54 -12
View File
@@ -8,27 +8,69 @@ This is the log of notable changes to EAS CLI and related packages.
### 🎉 New features
### 🐛 Bug fixes
- Don't show commit prompt in no-commit workflow after installing `expo-dev-client`. ([#722](https://github.com/expo/eas-cli/pull/722) by [@wkozyra95](https://github.com/wkozyra95))
### 🧹 Chores
- Add App Store Connect Api Key graphql type and print support. ([#717](https://github.com/expo/eas-cli/pull/717) by [@quinlanj](https://github.com/quinlanj))
## [0.34.0](https://github.com/expo/eas-cli/releases/tag/0.34.0) - 2021-11-01
### 🛠 Breaking changes
- `[EAS BUILD API]` Use new build job format. ([#701](https://github.com/expo/eas-cli/pull/701) and [#711](https://github.com/expo/eas-cli/pull/711) by [@dsokal](https://github.com/dsokal))
- Don't print logs to `stderr`. ([#708](https://github.com/expo/eas-cli/pull/708) by [@dsokal](https://github.com/dsokal))
- Remove automatic migration for legacy `eas.json` format introduced in [v0.22.2](https://github.com/expo/eas-cli/releases/tag/v0.22.2). ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
- Add required `cli` field in root of `eas.json` ([#695](https://github.com/expo/eas-cli/pull/695) by [@wkozyra95](https://github.com/wkozyra95))
### 🐛 Bug fixes
- Better error message when eas.json is invalid. ([#707](https://github.com/expo/eas-cli/pull/707) by [@dsokal](https://github.com/dsokal))
- Fix credentials workflow for new users: add additionalTypenames for credentials. ([#703](https://github.com/expo/eas-cli/pull/703) by [@quinlanj](https://github.com/quinlanj))
### 🧹 Chores
- Add additionalTypenames for other queries. ([#704](https://github.com/expo/eas-cli/pull/704) by [@quinlanj](https://github.com/quinlanj))
- Fix errors after pulling down most recent graphql schema changes. ([#713](https://github.com/expo/eas-cli/pull/713) by [@quinlanj](https://github.com/quinlanj))
- Refactor credentials manager. ([#712](https://github.com/expo/eas-cli/pull/712) by [@quinlanj](https://github.com/quinlanj))
- Remove unneeded parameters. ([#710](https://github.com/expo/eas-cli/pull/710) by [@quinlanj](https://github.com/quinlanj))
- Enforce additionalTypenames for graphql queries. ([#709](https://github.com/expo/eas-cli/pull/709) by [@quinlanj](https://github.com/quinlanj))
## [0.33.1](https://github.com/expo/eas-cli/releases/tag/0.33.1) - 2021-10-22
### 🎉 New features
- Compute runtime version using config-plugins. ([#697](https://github.com/expo/eas-cli/pull/697) by [@jkhales](https://github.com/jkhales))
### 🐛 Bug fixes
- [eas-cli] Skip validating updates scripts integration, which no longer exist in SDK 43+ ([#706](https://github.com/expo/eas-cli/pull/706) by [@brentvatne](https://github.com/brentvatne))
## [0.33.0](https://github.com/expo/eas-cli/releases/tag/0.33.0) - 2021-10-20
### 🎉 New features
- Make "production" the default profile for building and submitting. ([#677](https://github.com/expo/eas-cli/pull/677)) by [@jonsamp](https://github.com/jonsamp)
- Previously, the default profile when running `eas build` or `eas submit` was "release". We're changing it to a more recognizable name that is consistent with our docs, which is now "production". You can always specify a profile manually with the `--profile` flag. For this major version, if you do not have a profile named "production", and still have a profile named "release", we will fall back to the "release" profile as the default, however you'll see a warning as we're going to remove that behavior in the next major release of EAS CLI.
- To upgrade, update **eas.json** to have a "production" profile in both the `build` and `submit` objects. If you already have a project set up, this will replace the existing "release" profile. After the change, eas.json should have the following profiles:
```json
{
"build": {
"production": { ... }
},
"submit": {
"production": { ... }
}
}
```
```json
{
"build": {
"production": { ... }
},
"submit": {
"production": { ... }
}
}
```
### 🐛 Bug fixes
- Skip the second prompt for Apple ID if the user is already signed in with Apple. ([#691](https://github.com/expo/eas-cli/pull/691) by [@dsokal](https://github.com/dsokal))
- Unify reading `app.json`. ([#692](https://github.com/expo/eas-cli/pull/692) by [@dsokal](https://github.com/dsokal))
### 🧹 Chores
## [0.32.0](https://github.com/expo/eas-cli/releases/tag/0.32.0) - 2021-10-15
### 🎉 New features
+1 -1
View File
@@ -4,7 +4,7 @@
2. Wait, the `release` workflow on GitHub Actions is going to take care of the rest (including publishing packages to npm and updating the changelog).
3. Check the changelog. If any of the entries have been tagged with `[EAS BUILD API]`
- Open `package.json` and note the version of `@expo/eas-build-job` used in the eas-cli.
- Find the `Publish` commit in [expo/eas-build](https://github.com/expo/eas-build/commit/) for that version. In most cases, it will be the latest `Publish` commit.
- Find the `Publish` commit in [expo/eas-build](https://github.com/expo/eas-build/commits) for that version. In most cases, it will be the latest `Publish` commit.
- Find the `eas-cli-local-build-plugin` version published in that commit.
![example publish commit](./.gh-assets/eas-build-publish-commit.png)
- Run `npm dist-tags add eas-cli-local-build-plugin@VERSION latest` with the version from the previous step.
+1 -1
View File
@@ -1,5 +1,5 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"version": "0.33.0"
"version": "0.34.1"
}
+2 -1
View File
@@ -10,7 +10,8 @@
"eas": "packages/eas-cli/bin/run",
"lint": "eslint . --ext .ts --ext .js",
"release": "lerna version",
"test": "jest"
"test": "jest",
"clean": "lerna run clean && rm -rf node_modules coverage"
},
"devDependencies": {
"@expo/oclif-dev-cli": "1.24.0-expo",
+26 -26
View File
@@ -73,7 +73,7 @@ ALIASES
$ eas login
```
_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/account/login.js)_
_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/account/login.js)_
## `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.33.0/packages/eas-cli/src/commands/account/logout.js)_
_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/account/logout.js)_
## `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.33.0/packages/eas-cli/src/commands/account/view.js)_
_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/account/view.js)_
## `eas analytics [STATUS]`
@@ -112,7 +112,7 @@ USAGE
$ eas analytics [STATUS]
```
_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/analytics.js)_
_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/analytics.js)_
## `eas build`
@@ -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.33.0/packages/eas-cli/src/commands/build/index.js)_
_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/index.js)_
## `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.33.0/packages/eas-cli/src/commands/build/cancel.js)_
_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/cancel.js)_
## `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.33.0/packages/eas-cli/src/commands/build/configure.js)_
_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/configure.js)_
## `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.33.0/packages/eas-cli/src/commands/build/list.js)_
_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/list.js)_
## `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.33.0/packages/eas-cli/src/commands/build/view.js)_
_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/build/view.js)_
## `eas config`
@@ -233,7 +233,7 @@ OPTIONS
--profile=profile
```
_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/config.js)_
_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/config.js)_
## `eas credentials`
@@ -244,7 +244,7 @@ USAGE
$ eas credentials
```
_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/credentials.js)_
_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/credentials.js)_
## `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.33.0/packages/eas-cli/src/commands/device/create.js)_
_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/device/create.js)_
## `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.33.0/packages/eas-cli/src/commands/device/list.js)_
_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/device/list.js)_
## `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.33.0/packages/eas-cli/src/commands/device/view.js)_
_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/device/view.js)_
## `eas diagnostics`
@@ -291,7 +291,7 @@ USAGE
$ eas diagnostics
```
_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/diagnostics.js)_
_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/diagnostics.js)_
## `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.33.0/packages/eas-cli/src/commands/project/info.js)_
_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/project/info.js)_
## `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.33.0/packages/eas-cli/src/commands/project/init.js)_
_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/project/init.js)_
## `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.33.0/packages/eas-cli/src/commands/secret/create.js)_
_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/secret/create.js)_
## `eas secret:delete`
@@ -367,7 +367,7 @@ DESCRIPTION
Unsure where to find the secret's ID? Run eas secrets:list
```
_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/secret/delete.js)_
_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/secret/delete.js)_
## `eas secret:list`
@@ -378,7 +378,7 @@ USAGE
$ eas secret:list
```
_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/secret/list.js)_
_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/secret/list.js)_
## `eas submit`
@@ -412,7 +412,7 @@ ALIASES
$ eas build:submit
```
_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/submit.js)_
_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/submit.js)_
## `eas webhook:create`
@@ -431,7 +431,7 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/webhook/create.js)_
_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/create.js)_
## `eas webhook:delete [ID]`
@@ -445,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.33.0/packages/eas-cli/src/commands/webhook/delete.js)_
_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/delete.js)_
## `eas webhook:list`
@@ -459,7 +459,7 @@ OPTIONS
--event=(BUILD) Event type that triggers the webhook
```
_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/webhook/list.js)_
_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/list.js)_
## `eas webhook:update`
@@ -479,7 +479,7 @@ OPTIONS
--url=url Webhook URL
```
_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.33.0/packages/eas-cli/src/commands/webhook/update.js)_
_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/update.js)_
## `eas webhook:view ID`
@@ -493,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.33.0/packages/eas-cli/src/commands/webhook/view.js)_
_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.34.1/packages/eas-cli/src/commands/webhook/view.js)_
<!-- commandsstop -->
+685 -169
View File
File diff suppressed because it is too large. Load diff
+8 -8
View File
@@ -1,7 +1,7 @@
{
"name": "eas-cli",
"description": "EAS command line tool",
"version": "0.33.0",
"version": "0.34.1",
"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.25",
"@expo/config": "6.0.2",
"@expo/config-plugins": "4.0.2",
"@expo/eas-build-job": "0.2.52",
"@expo/eas-json": "^0.33.0",
"@expo/config": "6.0.3",
"@expo/config-plugins": "4.0.3",
"@expo/eas-build-job": "0.2.57",
"@expo/eas-json": "^0.34.1",
"@expo/json-file": "8.2.33",
"@expo/pkcs12": "0.0.4",
"@expo/plist": "0.0.14",
"@expo/plugin-warn-if-update-available": "1.7.0",
"@expo/prebuild-config": "3.0.2",
"@expo/prebuild-config": "3.0.3",
"@expo/results": "1.0.0",
"@expo/rudder-sdk-node": "1.1.0",
"@expo/sdk-runtime-versions": "1.0.0",
@@ -113,7 +113,6 @@
"cli"
],
"license": "MIT",
"main": "build/index.js",
"oclif": {
"bin": "eas",
"commands": "./build/commands",
@@ -177,6 +176,7 @@
"typecheck": "tsc",
"test": "jest",
"version": "yarn oclif-dev readme && node patch-readme && git add README.md",
"generate-graphql-code": "graphql-codegen --config graphql-codegen.yml"
"generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
"clean": "rm -rf dist build node_modules yarn-error.log"
}
}
+3 -9
View File
@@ -4,13 +4,7 @@ import { URL } from 'url';
import { v4 as uuidv4 } from 'uuid';
import UserSettings from './user/UserSettings';
/**
* We use require() to exclude package.json from TypeScript's analysis since it lives outside
* the src directory and would change the directory structure of the emitted files
* under the build directory
*/
const packageJSON = require('../package.json');
import { easCliVersion } from './utils/easCli';
const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
darwin: 'Mac',
@@ -97,7 +91,7 @@ export function logEvent(name: string, properties: Record<string, any> = {}): vo
ensureUserIdentified();
const { userId, deviceId } = identifyData ?? {};
const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
rudderstackClient.track({
@@ -126,7 +120,7 @@ function getRudderStackContext(): Record<string, any> {
return {
os: { name: platform, version: os.release() },
device: { type: platform, model: platform },
app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
app: { name: 'eas cli', version: easCliVersion ?? undefined },
};
}
@@ -1,6 +1,5 @@
import { ExpoConfig } from '@expo/config';
import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
import fs from 'fs-extra';
import Log from '../../log';
import { getProjectAccountName } from '../../project/projectUtils';
@@ -10,17 +9,6 @@ import { ensureValidVersions } from '../utils/updates';
export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
ensureValidVersions(exp);
const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
const updatedBuildGradleContents =
AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
projectDir,
buildGradleContents
);
await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
}
const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
const androidManifest = await getAndroidManifestAsync(projectDir);
@@ -39,7 +27,7 @@ export async function syncUpdatesConfigurationAsync(
ensureValidVersions(exp);
const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
try {
await ensureUpdatesConfiguredAsync(projectDir, exp);
await ensureUpdatesConfiguredAsync(projectDir);
} catch (error) {
Log.error(
'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
@@ -62,15 +50,9 @@ export async function syncUpdatesConfigurationAsync(
}
}
async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
const gradleScriptApply = AndroidConfig.Updates.formatApplyLineForBuildGradle(projectDir);
throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
}
// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
// all that is needed on Expo SDK 43+ to configure expo-updates configuration in AndroidManifest.xml
async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
const androidManifest = await getAndroidManifestAsync(projectDir);
if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
@@ -9,7 +9,7 @@ import {
warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject,
} from '../../project/android/applicationId';
import { resolveWorkflowAsync } from '../../project/workflow';
import vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
import { ConfigureContext } from '../context';
import { isExpoUpdatesInstalled } from '../utils/updates';
import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
@@ -26,7 +26,7 @@ export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void
await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
await vcs.trackFileAsync(easGradlePath);
await getVcsClient().trackFileAsync(easGradlePath);
if (isExpoUpdatesInstalled(ctx.projectDir)) {
await configureUpdatesAsync(ctx.projectDir, ctx.exp);
@@ -17,15 +17,14 @@ export function transformJob(job: Android.Job): AndroidJobInput {
artifactPath: job.artifactPath,
username: job.username,
buildType: job.buildType && transformBuildType(job.buildType),
developmentClient: job.developmentClient,
};
}
function transformBuildType(buildType: Android.BuildType): AndroidBuildType {
if (buildType === Android.BuildType.APK) {
return AndroidBuildType.Apk;
} else if (buildType === Android.BuildType.APP_BUNDLE) {
return AndroidBuildType.AppBundle;
} else {
return AndroidBuildType.DevelopmentClient;
return AndroidBuildType.AppBundle;
}
}
@@ -6,7 +6,7 @@ import slash from 'slash';
import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
import { getUsername } from '../../project/projectUtils';
import { ensureLoggedInAsync } from '../../user/actions';
import vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
import { BuildContext } from '../context';
interface JobData {
@@ -27,7 +27,7 @@ export async function prepareJobAsync(
const username = getUsername(ctx.exp, await ensureLoggedInAsync());
const buildProfile: AndroidBuildProfile = ctx.buildProfile;
const projectRootDirectory =
slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
const { credentials } = jobData;
const buildCredentials = credentials
? {
@@ -70,12 +70,11 @@ export async function prepareJobAsync(
},
releaseChannel: ctx.buildProfile.releaseChannel,
updates: { channel: ctx.buildProfile.channel },
developmentClient: buildProfile.developmentClient,
gradleCommand: buildProfile.gradleCommand,
artifactPath: buildProfile.artifactPath,
buildType,
username,
buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
};
return sanitizeJob(job);
+2 -2
View File
@@ -13,7 +13,7 @@ import { uploadAsync } from '../uploads';
import { formatBytes } from '../utils/files';
import { createProgressTracker } from '../utils/progress';
import { sleepAsync } from '../utils/promise';
import vcs from '../vcs';
import { getVcsClient } from '../vcs';
import { BuildContext } from './context';
import { runLocalBuildAsync } from './local';
import { MetadataContext, collectMetadataAsync } from './metadata';
@@ -68,7 +68,7 @@ export async function prepareBuildRequestForPlatformAsync<
});
}
if (await vcs.hasUncommittedChangesAsync()) {
if (await getVcsClient().isCommitRequiredAsync()) {
Log.addNewLineIfNone();
await reviewAndCommitChangesAsync(
`[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
+14 -7
View File
@@ -10,7 +10,8 @@ import { RequestedPlatform } from '../platform';
import { resolveWorkflowAsync } from '../project/workflow';
import { confirmAsync, promptAsync } from '../prompts';
import { ensureLoggedInAsync } from '../user/actions';
import vcs from '../vcs';
import { easCliVersion } from '../utils/easCli';
import { getVcsClient } from '../vcs';
import { configureAndroidAsync } from './android/configure';
import { ConfigureContext } from './context';
import { configureIosAsync } from './ios/configure';
@@ -37,7 +38,7 @@ export async function ensureProjectConfiguredAsync(
projectDir,
platform: requestedPlatform,
});
if (await vcs.hasUncommittedChangesAsync()) {
if (await getVcsClient().isCommitRequiredAsync()) {
error(
'Build process requires clean working tree, please commit all your changes and run `eas build` again',
{ exit: 1 }
@@ -57,7 +58,7 @@ export async function configureAsync(options: {
platform: RequestedPlatform;
projectDir: string;
}): Promise<void> {
await vcs.ensureRepoExistsAsync();
await getVcsClient().ensureRepoExistsAsync();
await maybeBailOnRepoStatusAsync();
const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
@@ -86,16 +87,19 @@ export async function configureAsync(options: {
await configureIosAsync(ctx);
}
if (await vcs.hasUncommittedChangesAsync()) {
if (await getVcsClient().isCommitRequiredAsync()) {
Log.newLine();
await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
} else {
} else if (!(await getVcsClient().hasUncommittedChangesAsync())) {
Log.newLine();
Log.withTick('No changes were necessary, the project is already configured correctly.');
}
}
const EAS_JSON_MANAGED_DEFAULT: EasJson = {
cli: {
version: `>= ${easCliVersion}`,
},
build: {
development: {
developmentClient: true,
@@ -112,6 +116,9 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
};
const EAS_JSON_BARE_DEFAULT: EasJson = {
cli: {
version: `>= ${easCliVersion}`,
},
build: {
development: {
distribution: 'internal',
@@ -149,7 +156,7 @@ export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<v
: EAS_JSON_MANAGED_DEFAULT;
await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
await vcs.trackFileAsync(easJsonPath);
await getVcsClient().trackFileAsync(easJsonPath);
Log.withTick('Generated eas.json');
}
@@ -183,7 +190,7 @@ async function reviewAndCommitChangesAsync(
await commitPromptAsync({ initialCommitMessage });
Log.withTick('Committed changes');
} else if (selected === ShouldCommitChanges.ShowDiffFirst) {
await vcs.showDiffAsync();
await getVcsClient().showDiffAsync();
await reviewAndCommitChangesAsync(initialCommitMessage, false);
}
}
@@ -1,30 +1,16 @@
import { ExpoConfig } from '@expo/config';
import { IOSConfig } from '@expo/config-plugins';
import fs from 'fs-extra';
import Log from '../../log';
import { getProjectAccountName } from '../../project/projectUtils';
import { ensureLoggedInAsync } from '../../user/actions';
import vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
import { ensureValidVersions } from '../utils/updates';
import { readPlistAsync, writePlistAsync } from './plist';
export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
ensureValidVersions(exp);
const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
let xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
xcodeProject = IOSConfig.Updates.ensureBundleReactNativePhaseContainsConfigurationScript(
projectDir,
xcodeProject
);
await fs.writeFile(
IOSConfig.Paths.getPBXProjectPath(projectDir),
// eslint-disable-next-line node/no-sync
xcodeProject.writeSync()
);
}
let expoPlist = await readExpoPlistAsync(projectDir);
if (!IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
@@ -41,7 +27,7 @@ export async function syncUpdatesConfigurationAsync(
ensureValidVersions(exp);
const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
try {
await ensureUpdatesConfiguredAsync(projectDir, exp);
await ensureUpdatesConfiguredAsync(projectDir);
} catch (error) {
Log.error(
'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
@@ -62,15 +48,9 @@ export async function syncUpdatesConfigurationAsync(
}
}
async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
const xcodeProject = IOSConfig.XcodeUtils.getPbxproj(projectDir);
if (!IOSConfig.Updates.isShellScriptBuildPhaseConfigured(projectDir, xcodeProject)) {
const script = 'expo-updates/scripts/create-manifest-ios.sh';
const buildPhase = '"Bundle React Native code and images"';
throw new Error(`Path to ${script} is missing in a ${buildPhase} build phase.`);
}
// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
async function ensureUpdatesConfiguredAsync(projectDir: string): Promise<void> {
const expoPlist = await readExpoPlistAsync(projectDir);
if (!IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
throw new Error('Missing values in Expo.plist');
@@ -88,7 +68,7 @@ async function writeExpoPlistAsync(
): Promise<void> {
const expoPlistPath = IOSConfig.Paths.getExpoPlistPath(projectDir);
await writePlistAsync(expoPlistPath, expoPlist);
await vcs.trackFileAsync(expoPlistPath);
await getVcsClient().trackFileAsync(expoPlistPath);
}
export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
+3 -28
View File
@@ -1,12 +1,7 @@
import { Env, Ios } from '@expo/eas-build-job';
import nullthrows from 'nullthrows';
import {
DistributionType,
IosBuildType,
IosJobInput,
IosJobSecretsInput,
} from '../../graphql/generated';
import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
import { transformProjectArchive, transformWorkflow } from '../graphql';
export function transformJob(job: Ios.Job): IosJobInput {
@@ -16,30 +11,18 @@ export function transformJob(job: Ios.Job): IosJobInput {
projectRootDirectory: job.projectRootDirectory,
releaseChannel: job.releaseChannel,
updates: job.updates,
distribution: job.distribution && transformDistributionType(job.distribution),
secrets: transformIosSecrets(job.secrets),
builderEnvironment: job.builderEnvironment,
cache: job.cache,
scheme: job.scheme,
buildConfiguration: job.buildConfiguration,
artifactPath: job.artifactPath,
buildType: job.buildType && transformBuildType(job.buildType),
username: job.username,
developmentClient: job.developmentClient,
simulator: job.simulator,
};
}
function transformDistributionType(distributionType: Ios.DistributionType): DistributionType {
if (distributionType === 'store') {
return DistributionType.Store;
} else if (distributionType === 'internal') {
return DistributionType.Internal;
} else {
return DistributionType.Simulator;
}
}
function transformIosSecrets(secrets: {
buildCredentials?: Ios.BuildCredentials;
env?: Env;
@@ -61,11 +44,3 @@ function transformIosSecrets(secrets: {
environmentSecrets: secrets.env,
};
}
function transformBuildType(buildType: Ios.BuildType): IosBuildType {
if (buildType === Ios.BuildType.DEVELOPMENT_CLIENT) {
return IosBuildType.DevelopmentClient;
} else {
return IosBuildType.Release;
}
}
+4 -8
View File
@@ -5,7 +5,7 @@ import slash from 'slash';
import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
import { getUsername } from '../../project/projectUtils';
import { ensureLoggedInAsync } from '../../user/actions';
import vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
import { BuildContext } from '../context';
interface JobData {
@@ -25,7 +25,7 @@ export async function prepareJobAsync(
jobData: JobData
): Promise<Job> {
const projectRootDirectory =
slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
const username = getUsername(ctx.exp, await ensureLoggedInAsync());
const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
if (jobData.credentials) {
@@ -40,7 +40,6 @@ export async function prepareJobAsync(
platform: Platform.IOS,
projectArchive: jobData.projectArchive,
projectRootDirectory,
distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
builderEnvironment: {
image: ctx.buildProfile.image,
node: ctx.buildProfile.node,
@@ -61,14 +60,11 @@ export async function prepareJobAsync(
},
releaseChannel: ctx.buildProfile.releaseChannel,
updates: { channel: ctx.buildProfile.channel },
developmentClient: ctx.buildProfile.developmentClient,
simulator: ctx.buildProfile.simulator,
scheme: jobData.buildScheme,
buildConfiguration: ctx.buildProfile.buildConfiguration,
artifactPath: ctx.buildProfile.artifactPath,
buildType: ctx.buildProfile.developmentClient
? Ios.BuildType.DEVELOPMENT_CLIENT
: Ios.BuildType.RELEASE,
username,
};
return sanitizeJob(job);
+5 -10
View File
@@ -7,7 +7,8 @@ import { GradleBuildContext } from '../project/android/gradle';
import { getBundleIdentifierAsync } from '../project/ios/bundleIdentifier';
import { getUsername } from '../project/projectUtils';
import { ensureLoggedInAsync } from '../user/actions';
import vcs from '../vcs';
import { easCliVersion } from '../utils/easCli';
import { getVcsClient } from '../vcs';
import {
readChannelSafelyAsync as readAndroidChannelSafelyAsync,
readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
@@ -21,13 +22,6 @@ import {
import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
import { isExpoUpdatesInstalled } from './utils/updates';
/**
* We use require() to exclude package.json from TypeScript's analysis since it lives outside
* the src directory and would change the directory structure of the emitted files
* under the build directory
*/
const packageJSON = require('../../package.json');
export type MetadataContext<T extends Platform> = T extends Platform.ANDROID
? AndroidMetadataContext
: IosMetadataContext;
@@ -53,7 +47,7 @@ export async function collectMetadataAsync<T extends Platform>(
const metadata = {
trackingContext: ctx.trackingCtx,
...(await maybeResolveVersionsAsync(ctx, platformContext)),
cliVersion: packageJSON.version,
cliVersion: easCliVersion,
workflow: ctx.workflow,
credentialsSource: ctx.buildProfile.credentialsSource,
sdkVersion: ctx.exp.sdkVersion,
@@ -63,7 +57,8 @@ export async function collectMetadataAsync<T extends Platform>(
appName: ctx.exp.name,
appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
buildProfile: ctx.buildProfileName,
gitCommitHash: await vcs.getCommitHashAsync(),
gitCommitHash: await getVcsClient().getCommitHashAsync(),
isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
username: getUsername(ctx.exp, await ensureLoggedInAsync()),
...(ctx.platform === Platform.IOS && {
iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
@@ -9,8 +9,9 @@ import Log, { learnMore } from '../../log';
import { appPlatformDisplayNames } from '../../platform';
import { resolveWorkflowAsync } from '../../project/workflow';
import { confirmAsync } from '../../prompts';
import { expoCommandAsync } from '../../utils/expoCommand';
import { expoCommandAsync } from '../../utils/expoCli';
import { ProfileData } from '../../utils/profiles';
import { getVcsClient } from '../../vcs';
import { reviewAndCommitChangesAsync } from './repository';
export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
@@ -107,7 +108,9 @@ async function installExpoDevClientAsync(
Log.newLine();
await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
Log.newLine();
await reviewAndCommitChangesAsync('Install expo-dev-client', {
nonInteractive,
});
if (await getVcsClient().isCommitRequiredAsync()) {
await reviewAndCommitChangesAsync('Install expo-dev-client', {
nonInteractive,
});
}
}
+10 -7
View File
@@ -10,10 +10,10 @@ import { confirmAsync, promptAsync } from '../../prompts';
import { formatBytes } from '../../utils/files';
import { getTmpDirectory } from '../../utils/paths';
import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
import vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
export async function maybeBailOnRepoStatusAsync(): Promise<void> {
if (!(await vcs.hasUncommittedChangesAsync())) {
if (!(await getVcsClient().isCommitRequiredAsync())) {
return;
}
Log.addNewLineIfNone();
@@ -33,7 +33,7 @@ export async function maybeBailOnRepoStatusAsync(): Promise<void> {
}
export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
if (!(await vcs.hasUncommittedChangesAsync())) {
if (!(await getVcsClient().isCommitRequiredAsync())) {
return;
}
Log.addNewLineIfNone();
@@ -70,7 +70,7 @@ export async function commitPromptAsync({
initial: initialCommitMessage,
validate: (input: string) => input !== '',
});
await vcs.commitAsync({ commitAllFiles, commitMessage: message });
await getVcsClient().commitAsync({ commitAllFiles, commitMessage: message });
}
export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
@@ -95,7 +95,7 @@ export async function makeProjectTarballAsync(): Promise<{ path: string; size: n
startTimer(compressTimerLabel);
try {
await vcs.makeShallowCopyAsync(shallowClonePath);
await getVcsClient().makeShallowCopyAsync(shallowClonePath);
await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
'.',
]);
@@ -133,7 +133,10 @@ export async function reviewAndCommitChangesAsync(
{ nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
): Promise<void> {
if (process.env.EAS_BUILD_AUTOCOMMIT) {
await vcs.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
await getVcsClient().commitAsync({
commitMessage: initialCommitMessage,
commitAllFiles: false,
});
Log.withTick('Committed changes.');
return;
}
@@ -166,7 +169,7 @@ export async function reviewAndCommitChangesAsync(
await commitPromptAsync({ initialCommitMessage });
Log.withTick('Committed changes.');
} else if (selected === ShouldCommitChanges.ShowDiffFirst) {
await vcs.showDiffAsync();
await getVcsClient().showDiffAsync();
await reviewAndCommitChangesAsync(initialCommitMessage, {
nonInteractive,
askedFirstTime: false,
+4 -4
View File
@@ -3,7 +3,7 @@ import fs from 'fs-extra';
import path from 'path';
import Log, { learnMore } from '../log';
import vcs from '../vcs';
import { getVcsClient } from '../vcs';
import { BuildContext } from './context';
export function checkNodeEnvVariable(ctx: BuildContext<Platform>): void {
@@ -25,12 +25,12 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
if (!googleServicesFilePath) {
return;
}
const rootDir = path.normalize(await vcs.getRootPathAsync());
const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
if (
(await fs.pathExists(absGoogleServicesFilePath)) &&
(!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
(await vcs.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
(await getVcsClient().isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
) {
Log.warn(
`File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
@@ -41,7 +41,7 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
)}`
);
Log.warn(
'If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.'
`If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
);
Log.newLine();
}
@@ -1,4 +1,6 @@
import { EasJsonReader } from '@expo/eas-json';
import { Command } from '@oclif/command';
import semver from 'semver';
import {
AnalyticsEvent,
@@ -6,8 +8,13 @@ import {
initAsync as initAnalyticsAsync,
logEvent,
} from '../analytics';
import Log from '../log';
import { findProjectRootAsync } from '../project/projectUtils';
import { getUserAsync } from '../user/User';
import { ensureLoggedInAsync } from '../user/actions';
import { easCliVersion } from '../utils/easCli';
import { setVcsClient } from '../vcs';
import GitClient from '../vcs/clients/git';
export default abstract class EasCommand extends Command {
/**
@@ -20,7 +27,10 @@ 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();
if (this.requiresAuthentication) {
const { flags } = this.parse();
@@ -42,4 +52,18 @@ export default abstract class EasCommand extends Command {
await flushAnalyticsAsync();
return super.finally(err);
}
private async applyCliConfigAsync(): Promise<void> {
const projectDir = await findProjectRootAsync();
const easJsonReader = new EasJsonReader(projectDir);
const config = await easJsonReader.getCliConfigAsync();
if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
throw new Error(
`You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`
);
}
if (config?.requireCommit) {
setVcsClient(new GitClient());
}
}
}
@@ -17,7 +17,7 @@ import {
getProjectIdAsync,
} from '../../project/projectUtils';
import { promptAsync } from '../../prompts';
import vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
export async function createUpdateBranchOnAppAsync({
appId,
@@ -90,7 +90,8 @@ export default class BranchCreate extends EasCommand {
name: 'name',
message: 'Please name the branch:',
initial:
(await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
(await getVcsClient().getBranchNameAsync()) ||
`branch-${Math.random().toString(36).substr(2, 4)}`,
validate: value => (value ? true : validationMessage),
}));
}
@@ -43,7 +43,8 @@ async function getBranchInfoAsync({
{
appId,
name,
}
},
{ additionalTypenames: ['UpdateBranch'] }
)
.toPromise()
);
+2 -1
View File
@@ -44,7 +44,8 @@ export async function listBranchesAsync({
{
appId: projectId,
limit: BRANCHES_LIMIT,
}
},
{ additionalTypenames: ['UpdateBranch'] }
)
.toPromise()
);
+26 -55
View File
@@ -1,5 +1,6 @@
import { ExpoConfig, getConfig, getDefaultTarget } from '@expo/config';
import { getRuntimeVersionForSDKVersion } from '@expo/sdk-runtime-versions';
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';
@@ -28,11 +29,12 @@ import {
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 vcs from '../../vcs';
import { getVcsClient } from '../../vcs';
import { createUpdateBranchOnAppAsync } from './create';
import { listBranchesAsync } from './list';
import { viewUpdateBranchAsync } from './view';
@@ -60,7 +62,8 @@ async function getUpdateGroupAsync({
`,
{
group,
}
},
{ additionalTypenames: ['Update'] }
)
.toPromise()
);
@@ -168,13 +171,14 @@ export default class BranchPublish extends EasCommand {
isPublicConfig: true,
});
const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
const projectId = await getProjectIdAsync(exp);
if (!branchName && autoFlag) {
branchName =
(await vcs.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`;
(await getVcsClient().getBranchNameAsync()) ||
`branch-${Math.random().toString(36).substr(2, 4)}`;
}
if (!branchName) {
@@ -297,7 +301,7 @@ export default class BranchPublish extends EasCommand {
}
if (!message && autoFlag) {
message = (await vcs.getLastCommitMessageAsync())?.trim();
message = (await getVcsClient().getLastCommitMessageAsync())?.trim();
}
if (!message) {
@@ -311,7 +315,7 @@ export default class BranchPublish extends EasCommand {
message: `Please enter a publication message.`,
initial: republish
? `Republish "${oldMessage!}" - group: ${group}`
: (await vcs.getLastCommitMessageAsync())?.trim(),
: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
validate: value => (value ? true : validationMessage),
}));
}
@@ -388,59 +392,26 @@ export default class BranchPublish extends EasCommand {
}
}
function getRuntimeVersionObject(
async function getRuntimeVersionObjectAsync(
exp: ExpoConfig,
platformFlag: string,
platformFlag: PlatformFlag,
projectDir: string
): Record<string, string> {
let { runtimeVersion: defaultRuntimeVersion, sdkVersion } = exp;
): Promise<Record<string, string>> {
const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]) as Platform[];
// When a SDK version is supplied instead of a runtime version and we're in the managed workflow
// construct the runtimeVersion with special meaning indicating that the runtime is an
// Expo SDK preset runtime that can be launched in Expo Go.
const isManagedProject = getDefaultTarget(projectDir) === 'managed';
if (!defaultRuntimeVersion && sdkVersion && isManagedProject) {
Log.withTick('Generating runtime version from sdk version');
defaultRuntimeVersion = getRuntimeVersionForSDKVersion(sdkVersion);
}
const iOSRuntimeVersion = (exp as any).ios?.runtimeVersion; // TODO-JJ remove cast to any
const androidRuntimeVersion = (exp as any).android?.runtimeVersion; // TODO-JJ remove cast to any
let runtimeVersions: Record<string, string>;
switch (platformFlag) {
case 'ios': {
runtimeVersions = {
ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
};
break;
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.');
}
}
case 'android': {
runtimeVersions = {
android: androidRuntimeVersion ?? defaultRuntimeVersion,
};
break;
}
case 'all': {
runtimeVersions = {
ios: iOSRuntimeVersion ?? defaultRuntimeVersion,
android: androidRuntimeVersion ?? defaultRuntimeVersion,
};
break;
}
default:
throw new Error('Platform flag must be "ios", "android", or "all"');
}
if (Object.values(runtimeVersions).some(runtime => !runtime)) {
throw new Error(
"Couldn't find a 'runtimeVersion' for every platform. Please specify it under the 'expo' key in 'app.json'"
);
}
if (Object.values(runtimeVersions).some(runtime => typeof runtime !== 'string')) {
throw new Error(
`Please ensure that all of the runtime versions defined in the app.json are strings.`
);
}
return runtimeVersions;
return Object.fromEntries(
platforms.map(platform => [platform, Updates.getRuntimeVersion(exp, platform)])
);
}
function formatUpdateTitle(
+2 -1
View File
@@ -58,7 +58,8 @@ export async function viewUpdateBranchAsync({
appId,
name,
limit: PAGE_LIMIT,
}
},
{ additionalTypenames: ['UpdateBranch', 'Update'] }
)
.toPromise()
);
+55 -41
View File
@@ -1,14 +1,10 @@
import { Platform, Workflow } from '@expo/eas-build-job';
import {
BuildProfile,
EasJsonReader,
hasMismatchedExtendsAsync,
isUsingDeprecatedFormatAsync,
migrateAsync,
} from '@expo/eas-json';
import { BuildProfile, EasJsonReader } from '@expo/eas-json';
import { flags } from '@oclif/command';
import { error } from '@oclif/errors';
import chalk from 'chalk';
import figures from 'figures';
import fs from 'fs-extra';
import nullthrows from 'nullthrows';
import { prepareAndroidBuildAsync } from '../../build/android/build';
@@ -28,7 +24,7 @@ import {
SubmissionFragment,
} from '../../graphql/generated';
import { toAppPlatform, toPlatform } from '../../graphql/types/AppPlatform';
import Log from '../../log';
import Log, { learnMore, link } from '../../log';
import {
RequestedPlatform,
appPlatformDisplayNames,
@@ -42,16 +38,18 @@ import {
} from '../../project/isEasEnabledForProject';
import { validateMetroConfigForManagedWorkflowAsync } from '../../project/metroConfig';
import { findProjectRootAsync } from '../../project/projectUtils';
import { confirmAsync } from '../../prompts';
import { selectAsync } from '../../prompts';
import { createSubmissionContextAsync } from '../../submit/context';
import {
submitAsync,
waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
} from '../../submit/submit';
import { printSubmissionDetailsUrls } from '../../submit/utils/urls';
import { easCliVersion } from '../../utils/easCli';
import { enableJsonOutput } from '../../utils/json';
import { ProfileData, getProfilesAsync } from '../../utils/profiles';
import vcs from '../../vcs';
import { getVcsClient, setVcsClient } from '../../vcs';
import GitClient from '../../vcs/clients/git';
interface RawBuildFlags {
platform?: string;
@@ -148,7 +146,7 @@ export default class Build extends EasCommand {
const projectDir = await findProjectRootAsync();
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
await vcs.ensureRepoExistsAsync();
await getVcsClient().ensureRepoExistsAsync();
await ensureRepoIsCleanAsync(flags.nonInteractive);
await ensureProjectConfiguredAsync(projectDir, requestedPlatform);
@@ -394,36 +392,52 @@ export async function handleDeprecatedEasJsonAsync(
projectDir: string,
nonInteractive: boolean
): Promise<void> {
if (await isUsingDeprecatedFormatAsync(projectDir)) {
const hasMismatchedExtendsKeys = await hasMismatchedExtendsAsync(projectDir);
if (nonInteractive) {
Log.error('We detected that your eas.json is using a deprecated format.');
Log.error(
'We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json'
);
error('Unsupported eas.json format', { exit: 1 });
}
if (!(await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir)))) {
return;
}
const easJsonReader = new EasJsonReader(projectDir);
const rawEasJson = await easJsonReader.readRawAsync();
if (rawEasJson?.cli) {
return;
}
const confirm = await confirmAsync({
message:
'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
});
if (confirm) {
await migrateAsync(projectDir);
if (hasMismatchedExtendsKeys) {
Log.warn(
'"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms'
);
Log.warn(
'Migration was successful, but you need to manually adjust the extend rules for your profiles'
);
error('Fix eas.json manually', { exit: 1 });
}
} else {
Log.error(
"Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again"
);
error('Unsupported eas.json format', { exit: 1 });
}
if (nonInteractive) {
Log.warn(
`${
figures.warning
} Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${link(
'https://expo.fyi/eas-vcs-workflow'
)} for more information.`
);
Log.warn(
'This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.'
);
setVcsClient(new GitClient());
return;
}
Log.log(
`${chalk.bold(
'eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.'
)} ${learnMore('https://expo.fyi/eas-vcs-workflow')}`
);
Log.log(
`If you want to continue using the Git integration, you can opt in with ${chalk.bold(
'cli.requireCommit'
)} in ${chalk.bold('eas.json')} or with the following prompt.`
);
Log.newLine();
const mode = await selectAsync('Select your preferred Git integration', [
{ title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
{ title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
]);
rawEasJson.cli =
mode === 'requireCommit'
? { version: `>= ${easCliVersion}`, requireCommit: true }
: { version: `>= ${easCliVersion}` };
await fs.writeJSON(EasJsonReader.formatEasJsonPath(projectDir), rawEasJson, { spaces: 2 });
if (mode === 'requireCommit') {
setVcsClient(new GitClient());
}
}
@@ -49,7 +49,8 @@ async function getChannelByNameForAppAsync({
}
}
`,
{ appId, channelName }
{ appId, channelName },
{ additionalTypenames: ['UpdateChannel', 'UpdateBranch'] }
)
.toPromise()
);
@@ -58,7 +58,8 @@ async function getAllUpdateChannelForAppAsync({
}
}
`,
{ appId, offset: 0, limit: CHANNEL_LIMIT }
{ appId, offset: 0, limit: CHANNEL_LIMIT },
{ additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
)
.toPromise()
);
@@ -133,7 +133,8 @@ export async function getUpdateChannelByNameForAppAsync({
}
}
`,
{ appId, channelName }
{ appId, channelName },
{ additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
)
.toPromise()
);
+2 -3
View File
@@ -2,8 +2,7 @@ import envinfo from 'envinfo';
import EasCommand from '../commandUtils/EasCommand';
import Log from '../log';
const packageJSON = require('../../package.json');
import { easCliVersion } from '../utils/easCli';
export default class Diagnostics extends EasCommand {
static description = 'log environment info to the console';
@@ -30,7 +29,7 @@ export default class Diagnostics extends EasCommand {
npmGlobalPackages: ['eas-cli', 'expo-cli'],
},
{
title: `EAS CLI ${packageJSON.version} environment info`,
title: `EAS CLI ${easCliVersion} environment info`,
}
);
Log.log(info);
@@ -22,7 +22,8 @@ async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
}
}
`,
{ appId }
{ appId },
{ additionalTypenames: ['App'] }
)
.toPromise()
);
+2 -1
View File
@@ -39,7 +39,8 @@ export async function viewUpdateAsync({
`,
{
groupId,
}
},
{ additionalTypenames: ['Update'] }
)
.toPromise()
);
@@ -29,6 +29,9 @@ export const GoogleServiceAccountKeyQuery = {
`,
{
accountName,
},
{
additionalTypenames: ['GoogleServiceAccountKey'],
}
)
.toPromise()
@@ -6,8 +6,8 @@ import { AndroidAppBuildCredentialsFragment, IosDistributionType } from '../../g
import Log from '../../log';
import { findApplicationTarget, findTargetByName } from '../../project/ios/target';
import zipObject from '../../utils/expodash/zipObject';
import vcs from '../../vcs';
import GitClient from '../../vcs/git';
import { getVcsClient } from '../../vcs';
import GitClient from '../../vcs/clients/git';
import { CredentialsContext } from '../context';
import { App, Target, TargetCredentials } from '../ios/types';
import { readRawAsync } from './read';
@@ -294,8 +294,9 @@ async function updateFileAsync(
}
async function isFileUntrackedAsync(path: string): Promise<boolean> {
if (vcs instanceof GitClient) {
return await vcs.isFileUntrackedAsync(path);
const vcsClient = getVcsClient();
if (vcsClient instanceof GitClient) {
return await vcsClient.isFileUntrackedAsync(path);
}
return false;
}
@@ -10,7 +10,7 @@ export class CreateDistributionCertificate {
public async runAsync(
ctx: CredentialsContext
): Promise<AppleDistributionCertificateMutationResult> {
const distCert = await provideOrGenerateDistributionCertificateAsync(ctx, this.account.name);
const distCert = await provideOrGenerateDistributionCertificateAsync(ctx);
const result = await ctx.ios.createDistributionCertificateAsync(this.account, distCert);
Log.succeed('Created distribution certificate');
return result;
@@ -12,7 +12,7 @@ export class CreatePushKey {
throw new Error(`A new push key cannot be created in non-interactive mode.`);
}
const pushKey = await provideOrGeneratePushKeyAsync(ctx, this.account.name);
const pushKey = await provideOrGeneratePushKeyAsync(ctx);
const result = await ctx.ios.createPushKeyAsync(this.account, pushKey);
Log.succeed('Created push key');
return result;
@@ -152,8 +152,7 @@ Please remember that Apple Distribution Certificates are not application specifi
`;
export async function provideOrGenerateDistributionCertificateAsync(
ctx: CredentialsContext,
accountName: string
ctx: CredentialsContext
): Promise<DistributionCertificate> {
if (!ctx.nonInteractive) {
const userProvided = await promptForDistCertAsync(ctx);
@@ -168,13 +167,11 @@ export async function provideOrGenerateDistributionCertificateAsync(
if (!isValid) {
Log.warn("Provided Distribution Certificate is no longer valid on Apple's server");
}
return isValid
? userProvided
: await provideOrGenerateDistributionCertificateAsync(ctx, accountName);
return isValid ? userProvided : await provideOrGenerateDistributionCertificateAsync(ctx);
}
}
}
return await generateDistributionCertificateAsync(ctx, accountName);
return await generateDistributionCertificateAsync(ctx);
}
async function promptForDistCertAsync(
@@ -200,8 +197,7 @@ async function promptForDistCertAsync(
}
async function generateDistributionCertificateAsync(
ctx: CredentialsContext,
accountName: string
ctx: CredentialsContext
): Promise<DistributionCertificate> {
await ctx.appStore.ensureAuthenticatedAsync();
try {
@@ -246,7 +242,7 @@ async function generateDistributionCertificateAsync(
throw e;
}
}
return await generateDistributionCertificateAsync(ctx, accountName);
return await generateDistributionCertificateAsync(ctx);
}
function formatDistributionCertificateFromApple(
@@ -14,10 +14,7 @@ import { pushKeySchema } from '../credentials';
import { isPushKeyValidAndTrackedAsync } from '../validators/validatePushKey';
import { formatAppleTeam } from './AppleTeamUtils';
export async function provideOrGeneratePushKeyAsync(
ctx: CredentialsContext,
accountName: string
): Promise<PushKey> {
export async function provideOrGeneratePushKeyAsync(ctx: CredentialsContext): Promise<PushKey> {
if (!ctx.nonInteractive) {
const userProvided = await promptForPushKeyAsync(ctx);
if (userProvided) {
@@ -36,11 +33,11 @@ export async function provideOrGeneratePushKeyAsync(
if (useUserProvided) {
return userProvided;
}
return await provideOrGeneratePushKeyAsync(ctx, accountName);
return await provideOrGeneratePushKeyAsync(ctx);
}
}
}
return await generatePushKeyAsync(ctx, accountName);
return await generatePushKeyAsync(ctx);
}
async function promptForPushKeyAsync(ctx: CredentialsContext): Promise<PushKey | null> {
@@ -63,10 +60,7 @@ async function promptForPushKeyAsync(ctx: CredentialsContext): Promise<PushKey |
return userProvided;
}
async function generatePushKeyAsync(
ctx: CredentialsContext,
accountName: string
): Promise<PushKey> {
async function generatePushKeyAsync(ctx: CredentialsContext): Promise<PushKey> {
await ctx.appStore.ensureAuthenticatedAsync();
try {
return await ctx.appStore.createPushKeyAsync();
@@ -106,7 +100,7 @@ async function generatePushKeyAsync(
throw e;
}
}
return await generatePushKeyAsync(ctx, accountName);
return await generatePushKeyAsync(ctx);
}
function formatPushKeyFromApple(pushKey: PushKeyStoreInfo): string {
@@ -22,7 +22,10 @@ export const AppQuery = {
}
${print(AppFragmentNode)}
`,
{ fullName }
{ fullName },
{
additionalTypenames: ['App'],
}
)
.toPromise()
);
@@ -111,7 +111,10 @@ export const AppleDeviceQuery = {
}
}
`,
{ accountName, appleTeamIdentifier }
{ accountName, appleTeamIdentifier },
{
additionalTypenames: ['AppleDevice', 'AppleTeam'],
}
)
.toPromise()
);
@@ -147,7 +150,10 @@ export const AppleDeviceQuery = {
}
}
`,
{ accountName, identifier }
{ accountName, identifier },
{
additionalTypenames: ['AppleDevice', 'AppleTeam'],
}
)
.toPromise()
);
@@ -60,7 +60,11 @@ export const AppleDistributionCertificateQuery = {
iosDistributionType,
},
{
additionalTypenames: ['IosAppCredentials', 'IosAppBuildCredentials'],
additionalTypenames: [
'AppleDistributionCertificate',
'IosAppCredentials',
'IosAppBuildCredentials',
],
}
)
.toPromise()
@@ -93,6 +97,9 @@ export const AppleDistributionCertificateQuery = {
`,
{
accountName,
},
{
additionalTypenames: ['AppleDistributionCertificate'],
}
)
.toPromise()
@@ -77,7 +77,11 @@ export const AppleProvisioningProfileQuery = {
iosDistributionType,
},
{
additionalTypenames: ['IosAppCredentials', 'IosAppBuildCredentials'],
additionalTypenames: [
'AppleProvisioningProfile',
'IosAppCredentials',
'IosAppBuildCredentials',
],
}
)
.toPromise()
@@ -26,6 +26,9 @@ export const ApplePushKeyQuery = {
`,
{
accountName,
},
{
additionalTypenames: ['ApplePushKey'],
}
)
.toPromise()
@@ -28,7 +28,10 @@ export const AppleTeamQuery = {
}
}
`,
{ accountName }
{ accountName },
{
additionalTypenames: ['AppleTeam'],
}
)
.toPromise()
);
@@ -57,6 +60,9 @@ export const AppleTeamQuery = {
{
accountId,
appleTeamIdentifier,
},
{
additionalTypenames: ['AppleTeam'],
}
)
.toPromise()
@@ -30,6 +30,21 @@ export const IosAppCredentialsQuery = {
},
__typename: 'ApplePushKey',
},
appStoreConnectApiKeyForSubmissions: {
id: 'b8fe2225-3024-4ebe-9e36-7b9022d3b13e',
appleTeam: {
id: 'ca27f9f6-c7cb-40d1-8c41-c168e8548261',
appleTeamIdentifier: '77KQ969CHE',
appleTeamName: null,
__typename: 'AppleTeam',
},
issuerIdentifier: '69a6de93-e4e4-47e3-e053-5b8c7c11a4d1',
keyIdentifier: 'NYN468XNN3',
name: 'Expo Submissions pl94k8_lnS',
roles: ['ADMIN'],
updatedAt: '2020-10-13T18:39:04.463Z',
__typename: 'AppStoreConnectApiKey',
},
iosAppBuildCredentialsList: [
{
id: '6f8d0175-0caf-4922-b09b-eae757b83144',
@@ -2,47 +2,55 @@
exports[`print credentials prints the IosAppCredentials map 1`] = `
Array [
"iOS Credentials
Project @quinlanj/test52
Bundle Identifier com.quinlanj.test52
Apple Team test-apple-identifier
Push Key
Developer Portal ID 9839M6AY8W
Apple Team 77KQ969CHE
Updated 6 months ago
App Store Configuration
Distribution Certificate
Serial Number test-serial
Expiration Date Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 6 months ago
Provisioning Profile
Developer Portal ID test-profile-id
Status active
Expiration Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 5 months ago
Ad Hoc Configuration
Distribution Certificate
Serial Number test-serial
Expiration Date Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 6 months ago
Provisioning Profile
Developer Portal ID test-profile-id
Status active
Expiration Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 5 months ago
",
"iOS Credentials
Project @quinlanj/test52
Bundle Identifier com.quinlanj.test52
Apple Team test-apple-identifier
Push Key
Developer Portal ID 9839M6AY8W
Apple Team 77KQ969CHE
Updated 6 months ago
App Store Connect Api Key
Developer Portal ID NYN468XNN3
Name Expo Submissions pl94k8_lnS
Issuer ID 69a6de93-e4e4-47e3-e053-5b8c7c11a4d1
Roles ADMIN
Apple Team 77KQ969CHE
Updated 6 months ago
App Store Configuration
Distribution Certificate
Serial Number test-serial
Expiration Date Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 6 months ago
Provisioning Profile
Developer Portal ID test-profile-id
Status active
Expiration Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 5 months ago
Ad Hoc Configuration
Distribution Certificate
Serial Number test-serial
Expiration Date Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 6 months ago
Provisioning Profile
Developer Portal ID test-profile-id
Status active
Expiration Wed, 13 Oct 2021 18:28:44 UTC
Apple Team test-apple-identifier
Updated 5 months ago
",
]
`;
@@ -2,6 +2,7 @@ import chalk from 'chalk';
import dateformat from 'dateformat';
import {
AppStoreConnectApiKeyFragment,
AppleDeviceFragment,
ApplePushKeyFragment,
IosAppBuildCredentialsFragment,
@@ -91,7 +92,7 @@ export function displayIosCredentials(
continue;
}
const { appleTeam, pushKey } = targetAppCredentials;
const { appleTeam, pushKey, appStoreConnectApiKeyForSubmissions } = targetAppCredentials;
if (appleTeam) {
const { appleTeamIdentifier, appleTeamName } = appleTeam;
fields.push({
@@ -105,6 +106,10 @@ export function displayIosCredentials(
displayApplePushKey(pushKey, fields);
}
if (appStoreConnectApiKeyForSubmissions) {
displayAscApiKey(appStoreConnectApiKeyForSubmissions, fields);
}
const sortedIosAppBuildCredentialsList = sortBuildCredentialsByDistributionType(
targetAppCredentials.iosAppBuildCredentialsList
);
@@ -230,6 +235,35 @@ function displayApplePushKey(
fields.push({ label: '', value: '' });
}
function displayAscApiKey(
maybeAscApiKey: AppStoreConnectApiKeyFragment | null,
fields: { label: string; value: string }[]
): void {
fields.push({ label: 'App Store Connect Api Key', value: '' });
if (maybeAscApiKey) {
const { keyIdentifier, issuerIdentifier, appleTeam, name, roles, updatedAt } = maybeAscApiKey;
fields.push({ label: 'Developer Portal ID', value: keyIdentifier });
if (name) {
fields.push({ label: 'Name', value: name });
}
fields.push({ label: 'Issuer ID', value: issuerIdentifier });
if (roles) {
fields.push({ label: 'Roles', value: roles.join(',') });
}
if (appleTeam) {
const { appleTeamIdentifier, appleTeamName } = appleTeam;
fields.push({
label: 'Apple Team',
value: `${appleTeamIdentifier} ${appleTeamName ? `(${appleTeamName})` : ''}`,
});
}
fields.push({ label: 'Updated', value: `${fromNow(new Date(updatedAt))} ago` });
} else {
fields.push({ label: '', value: 'None assigned yet' });
}
fields.push({ label: '', value: '' });
}
function formatAppleDevice(device: AppleDeviceFragment): string {
let deviceString = '';
if (device.name) {
@@ -0,0 +1,50 @@
export type ActionInfo = {
value: AndroidActionType | IosActionType;
title: string;
scope: Scope;
};
export enum Scope {
Project,
Manager,
Account,
}
export enum AndroidActionType {
ManageBuildCredentials,
ManageFcm,
ManageGoogleServiceAccountKey,
ManageCredentialsJson,
GoBackToCaller,
GoBackToHighLevelActions,
CreateKeystore,
DownloadKeystore,
RemoveKeystore,
CreateFcm,
RemoveFcm,
CreateGsaKey,
UseExistingGsaKey,
RemoveGsaKey,
SetupGsaKey,
UpdateCredentialsJson,
SetupBuildCredentialsFromCredentialsJson,
}
export enum IosActionType {
ManageCredentialsJson,
ManageBuildCredentials,
ManagePushKey,
GoBackToCaller,
GoBackToHighLevelActions,
SetupBuildCredentials,
SetupBuildCredentialsFromCredentialsJson,
UpdateCredentialsJson,
UseExistingDistributionCertificate,
RemoveProvisioningProfile,
CreateDistributionCertificate,
RemoveDistributionCertificate,
SetupPushKey,
CreatePushKey,
UseExistingPushKey,
RemovePushKey,
}
@@ -0,0 +1,116 @@
import { ActionInfo, AndroidActionType, Scope } from './Actions';
export const highLevelActions: ActionInfo[] = [
{
value: AndroidActionType.ManageBuildCredentials,
title: 'Keystore: Manage everything needed to build your project',
scope: Scope.Manager,
},
{
value: AndroidActionType.ManageFcm,
title: 'Push Notifications: Manage your FCM Api Key',
scope: Scope.Manager,
},
{
value: AndroidActionType.ManageGoogleServiceAccountKey,
title: 'Google Service Account: Manage your Service Account Key',
scope: Scope.Manager,
},
{
value: AndroidActionType.ManageCredentialsJson,
title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
scope: Scope.Manager,
},
{
value: AndroidActionType.GoBackToCaller,
title: 'Go back',
scope: Scope.Manager,
},
];
export const credentialsJsonActions: ActionInfo[] = [
{
value: AndroidActionType.UpdateCredentialsJson,
title: 'Download credentials from EAS to credentials.json',
scope: Scope.Project,
},
{
value: AndroidActionType.SetupBuildCredentialsFromCredentialsJson,
title: 'Upload credentials from credentials.json to EAS',
scope: Scope.Project,
},
{
value: AndroidActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
export const buildCredentialsActions: ActionInfo[] = [
{
value: AndroidActionType.CreateKeystore,
title: 'Set up a new keystore',
scope: Scope.Project,
},
{
value: AndroidActionType.DownloadKeystore,
title: 'Download existing keystore',
scope: Scope.Project,
},
{
value: AndroidActionType.RemoveKeystore,
title: 'Delete your keystore',
scope: Scope.Project,
},
{
value: AndroidActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
export const fcmActions: ActionInfo[] = [
{
value: AndroidActionType.CreateFcm,
title: 'Upload an FCM Api Key',
scope: Scope.Project,
},
{
value: AndroidActionType.RemoveFcm,
title: 'Delete your FCM Api Key',
scope: Scope.Project,
},
{
value: AndroidActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
export const gsaKeyActions: ActionInfo[] = [
{
value: AndroidActionType.SetupGsaKey,
title: 'Setup a Google Service Account Key',
scope: Scope.Project,
},
{
value: AndroidActionType.CreateGsaKey,
title: 'Upload a Google Service Account Key',
scope: Scope.Project,
},
{
value: AndroidActionType.UseExistingGsaKey,
title: 'Use an existing Google Service Account Key',
scope: Scope.Project,
},
{
value: AndroidActionType.RemoveGsaKey,
title: 'Delete a Google Service Account Key',
scope: Scope.Project,
},
{
value: AndroidActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
@@ -0,0 +1,110 @@
import { CredentialsContext } from '../context';
import { ActionInfo, IosActionType, Scope } from './Actions';
export const highLevelActions: ActionInfo[] = [
{
value: IosActionType.ManageBuildCredentials,
title: 'Build Credentials: Manage everything needed to build your project',
scope: Scope.Manager,
},
{
value: IosActionType.ManagePushKey,
title: 'Push Notifications: Manage your Apple Push Notifications Key',
scope: Scope.Manager,
},
{
value: IosActionType.ManageCredentialsJson,
title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
scope: Scope.Manager,
},
{
value: IosActionType.GoBackToCaller,
title: 'Go back',
scope: Scope.Manager,
},
];
export const credentialsJsonActions: ActionInfo[] = [
{
value: IosActionType.UpdateCredentialsJson,
title: 'Download credentials from EAS to credentials.json',
scope: Scope.Project,
},
{
value: IosActionType.SetupBuildCredentialsFromCredentialsJson,
title: 'Upload credentials from credentials.json to EAS',
scope: Scope.Project,
},
{
value: IosActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
export function getPushKeyActions(ctx: CredentialsContext): ActionInfo[] {
return [
{
value: IosActionType.SetupPushKey,
title: 'Setup your project to use Push Notifications',
scope: Scope.Project,
},
{
value: IosActionType.CreatePushKey,
title: 'Add a new push key',
scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
},
{
value: IosActionType.UseExistingPushKey,
title: 'Use an existing push key',
scope: Scope.Project,
},
{
value: IosActionType.RemovePushKey,
title: 'Remove a push key from your account',
scope: Scope.Account,
},
{
value: IosActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
}
export function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[] {
return [
{
// This command will be triggered during build to ensure all credentials are ready
// I'm leaving it here for now to simplify testing
value: IosActionType.SetupBuildCredentials,
title: 'All: Set up all the required credentials to build your project',
scope: Scope.Project,
},
{
value: IosActionType.UseExistingDistributionCertificate,
title: 'Distribution Certificate: Use an existing one for your project',
scope: Scope.Project,
},
{
value: IosActionType.CreateDistributionCertificate,
title: `Distribution Certificate: Add a new one to your account`,
scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
},
{
value: IosActionType.RemoveDistributionCertificate,
title: 'Distribution Certificate: Delete one from your account',
scope: Scope.Account,
},
{
value: IosActionType.RemoveProvisioningProfile,
title: 'Provisioning Profile: Delete one from your project',
scope: Scope.Project,
},
{
value: IosActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
}
@@ -34,6 +34,14 @@ import {
displayEmptyAndroidCredentials,
} from '../android/utils/printCredentials';
import { CredentialsContext } from '../context';
import { ActionInfo, AndroidActionType, Scope } from './Actions';
import {
buildCredentialsActions,
credentialsJsonActions,
fcmActions,
gsaKeyActions,
highLevelActions,
} from './AndroidActions';
import { Action, PressAnyKeyToContinue } from './HelperActions';
import {
SelectAndroidBuildCredentials,
@@ -42,148 +50,6 @@ import {
} from './SelectAndroidBuildCredentials';
import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
enum ActionType {
ManageBuildCredentials,
ManageFcm,
ManageGoogleServiceAccountKey,
ManageCredentialsJson,
GoBackToCaller,
GoBackToHighLevelActions,
CreateKeystore,
DownloadKeystore,
RemoveKeystore,
CreateFcm,
RemoveFcm,
CreateGsaKey,
UseExistingGsaKey,
RemoveGsaKey,
SetupGsaKey,
UpdateCredentialsJson,
SetupBuildCredentialsFromCredentialsJson,
}
enum Scope {
Project,
Manager,
}
type ActionInfo = { value: ActionType; title: string; scope: Scope };
const highLevelActions: ActionInfo[] = [
{
value: ActionType.ManageBuildCredentials,
title: 'Keystore: Manage everything needed to build your project',
scope: Scope.Manager,
},
{
value: ActionType.ManageFcm,
title: 'Push Notifications: Manage your FCM Api Key',
scope: Scope.Manager,
},
{
value: ActionType.ManageGoogleServiceAccountKey,
title: 'Google Service Account: Manage your Service Account Key',
scope: Scope.Manager,
},
{
value: ActionType.ManageCredentialsJson,
title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
scope: Scope.Manager,
},
{
value: ActionType.GoBackToCaller,
title: 'Go back',
scope: Scope.Manager,
},
];
const credentialsJsonActions: ActionInfo[] = [
{
value: ActionType.UpdateCredentialsJson,
title: 'Download credentials from EAS to credentials.json',
scope: Scope.Project,
},
{
value: ActionType.SetupBuildCredentialsFromCredentialsJson,
title: 'Upload credentials from credentials.json to EAS',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
const buildCredentialsActions: ActionInfo[] = [
{
value: ActionType.CreateKeystore,
title: 'Set up a new keystore',
scope: Scope.Project,
},
{
value: ActionType.DownloadKeystore,
title: 'Download existing keystore',
scope: Scope.Project,
},
{
value: ActionType.RemoveKeystore,
title: 'Delete your keystore',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
const fcmActions: ActionInfo[] = [
{
value: ActionType.CreateFcm,
title: 'Upload an FCM Api Key',
scope: Scope.Project,
},
{
value: ActionType.RemoveFcm,
title: 'Delete your FCM Api Key',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
const gsaKeyActions: ActionInfo[] = [
{
value: ActionType.SetupGsaKey,
title: 'Setup a Google Service Account Key',
scope: Scope.Project,
},
{
value: ActionType.CreateGsaKey,
title: 'Upload a Google Service Account Key',
scope: Scope.Project,
},
{
value: ActionType.UseExistingGsaKey,
title: 'Use an existing Google Service Account Key',
scope: Scope.Project,
},
{
value: ActionType.RemoveGsaKey,
title: 'Delete a Google Service Account Key',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
export class ManageAndroid {
constructor(private callingAction: Action) {}
@@ -242,22 +108,22 @@ export class ManageAndroid {
throw new Error('Action not supported yet');
}
if (actionInfo.scope === Scope.Manager) {
if (chosenAction === ActionType.ManageBuildCredentials) {
if (chosenAction === AndroidActionType.ManageBuildCredentials) {
currentActions = buildCredentialsActions;
continue;
} else if (chosenAction === ActionType.ManageFcm) {
} else if (chosenAction === AndroidActionType.ManageFcm) {
currentActions = fcmActions;
continue;
} else if (chosenAction === ActionType.ManageGoogleServiceAccountKey) {
} else if (chosenAction === AndroidActionType.ManageGoogleServiceAccountKey) {
currentActions = gsaKeyActions;
continue;
} else if (chosenAction === ActionType.ManageCredentialsJson) {
} else if (chosenAction === AndroidActionType.ManageCredentialsJson) {
currentActions = credentialsJsonActions;
continue;
} else if (chosenAction === ActionType.GoBackToHighLevelActions) {
} else if (chosenAction === AndroidActionType.GoBackToHighLevelActions) {
currentActions = highLevelActions;
continue;
} else if (chosenAction === ActionType.GoBackToCaller) {
} else if (chosenAction === AndroidActionType.GoBackToCaller) {
return await this.callingAction.runAsync(ctx);
}
}
@@ -302,7 +168,7 @@ export class ManageAndroid {
private async runProjectSpecificActionAsync(
ctx: CredentialsContext,
action: ActionType,
action: AndroidActionType,
gradleContext?: GradleBuildContext
): Promise<void> {
assert(
@@ -310,7 +176,7 @@ export class ManageAndroid {
'You must be in your project directory in order to perform this action'
);
const appLookupParams = await getAppLookupParamsFromContextAsync(ctx, gradleContext);
if (action === ActionType.CreateKeystore) {
if (action === AndroidActionType.CreateKeystore) {
const selectBuildCredentialsResult = await new SelectAndroidBuildCredentials(
appLookupParams
).runAsync(ctx);
@@ -331,47 +197,47 @@ export class ManageAndroid {
}
);
}
} else if (action === ActionType.DownloadKeystore) {
} else if (action === AndroidActionType.DownloadKeystore) {
const buildCredentials = await new SelectExistingAndroidBuildCredentials(
appLookupParams
).runAsync(ctx);
if (buildCredentials) {
await new DownloadKeystore({ app: appLookupParams }).runAsync(ctx, buildCredentials);
}
} else if (action === ActionType.RemoveKeystore) {
} else if (action === AndroidActionType.RemoveKeystore) {
const buildCredentials = await new SelectExistingAndroidBuildCredentials(
appLookupParams
).runAsync(ctx);
if (buildCredentials) {
await new RemoveKeystore(appLookupParams).runAsync(ctx, buildCredentials);
}
} else if (action === ActionType.CreateFcm) {
} else if (action === AndroidActionType.CreateFcm) {
const fcm = await new CreateFcm(appLookupParams.account).runAsync(ctx);
await new AssignFcm(appLookupParams).runAsync(ctx, fcm);
} else if (action === ActionType.RemoveFcm) {
} else if (action === AndroidActionType.RemoveFcm) {
await new RemoveFcm(appLookupParams).runAsync(ctx);
} else if (action === ActionType.CreateGsaKey) {
} else if (action === AndroidActionType.CreateGsaKey) {
const gsaKey = await new CreateGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
await new AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
} else if (action === ActionType.UseExistingGsaKey) {
} else if (action === AndroidActionType.UseExistingGsaKey) {
const gsaKey = await new UseExistingGoogleServiceAccountKey(appLookupParams.account).runAsync(
ctx
);
if (gsaKey) {
await new AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
}
} else if (action === ActionType.RemoveGsaKey) {
} else if (action === AndroidActionType.RemoveGsaKey) {
await new SelectAndRemoveGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
} else if (action === ActionType.SetupGsaKey) {
} else if (action === AndroidActionType.SetupGsaKey) {
await new SetupGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
} else if (action === ActionType.UpdateCredentialsJson) {
} else if (action === AndroidActionType.UpdateCredentialsJson) {
const buildCredentials = await new SelectExistingAndroidBuildCredentials(
appLookupParams
).runAsync(ctx);
if (buildCredentials) {
await new UpdateCredentialsJson().runAsync(ctx, buildCredentials);
}
} else if (action === ActionType.SetupBuildCredentialsFromCredentialsJson) {
} else if (action === AndroidActionType.SetupBuildCredentialsFromCredentialsJson) {
await new SetupBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
}
}
@@ -38,145 +38,17 @@ import { AppLookupParams } from '../ios/api/GraphqlClient';
import { getManagedEntitlementsJsonAsync } from '../ios/appstore/entitlements';
import { App, IosAppCredentialsMap, Target } from '../ios/types';
import { displayIosCredentials } from '../ios/utils/printCredentials';
import { ActionInfo, IosActionType, Scope } from './Actions';
import { Action, PressAnyKeyToContinue } from './HelperActions';
import {
credentialsJsonActions,
getBuildCredentialsActions,
getPushKeyActions,
highLevelActions,
} from './IosActions';
import { SelectBuildProfileFromEasJson } from './SelectBuildProfileFromEasJson';
import { SelectIosDistributionTypeGraphqlFromBuildProfile } from './SelectIosDistributionTypeGraphqlFromBuildProfile';
enum ActionType {
ManageCredentialsJson,
ManageBuildCredentials,
ManagePushKey,
GoBackToCaller,
GoBackToHighLevelActions,
SetupBuildCredentials,
SetupBuildCredentialsFromCredentialsJson,
UpdateCredentialsJson,
UseExistingDistributionCertificate,
RemoveProvisioningProfile,
CreateDistributionCertificate,
RemoveDistributionCertificate,
SetupPushKey,
CreatePushKey,
UseExistingPushKey,
RemovePushKey,
}
enum Scope {
Project,
Account,
Manager,
}
type ActionInfo = { value: ActionType; title: string; scope: Scope };
const highLevelActions: ActionInfo[] = [
{
value: ActionType.ManageBuildCredentials,
title: 'Build Credentials: Manage everything needed to build your project',
scope: Scope.Manager,
},
{
value: ActionType.ManagePushKey,
title: 'Push Notifications: Manage your Apple Push Notifications Key',
scope: Scope.Manager,
},
{
value: ActionType.ManageCredentialsJson,
title: 'credentials.json: Upload/Download credentials between EAS servers and your local json ',
scope: Scope.Manager,
},
{
value: ActionType.GoBackToCaller,
title: 'Go back',
scope: Scope.Manager,
},
];
const credentialsJsonActions: ActionInfo[] = [
{
value: ActionType.UpdateCredentialsJson,
title: 'Download credentials from EAS to credentials.json',
scope: Scope.Project,
},
{
value: ActionType.SetupBuildCredentialsFromCredentialsJson,
title: 'Upload credentials from credentials.json to EAS',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
function getPushKeyActions(ctx: CredentialsContext): ActionInfo[] {
return [
{
value: ActionType.SetupPushKey,
title: 'Setup your project to use Push Notifications',
scope: Scope.Project,
},
{
value: ActionType.CreatePushKey,
title: 'Add a new push key',
scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
},
{
value: ActionType.UseExistingPushKey,
title: 'Use an existing push key',
scope: Scope.Project,
},
{
value: ActionType.RemovePushKey,
title: 'Remove a push key from your account',
scope: Scope.Account,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
}
function getBuildCredentialsActions(ctx: CredentialsContext): ActionInfo[] {
return [
{
// This command will be triggered during build to ensure all credentials are ready
// I'm leaving it here for now to simplify testing
value: ActionType.SetupBuildCredentials,
title: 'All: Set up all the required credentials to build your project',
scope: Scope.Project,
},
{
value: ActionType.UseExistingDistributionCertificate,
title: 'Distribution Certificate: Use an existing one for your project',
scope: Scope.Project,
},
{
value: ActionType.CreateDistributionCertificate,
title: `Distribution Certificate: Add a new one to your account`,
scope: ctx.hasProjectContext ? Scope.Project : Scope.Account,
},
{
value: ActionType.RemoveDistributionCertificate,
title: 'Distribution Certificate: Delete one from your account',
scope: Scope.Account,
},
{
value: ActionType.RemoveProvisioningProfile,
title: 'Provisioning Profile: Delete one from your project',
scope: Scope.Project,
},
{
value: ActionType.GoBackToHighLevelActions,
title: 'Go back',
scope: Scope.Manager,
},
];
}
export class ManageIos {
constructor(private callingAction: Action) {}
@@ -226,19 +98,19 @@ export class ManageIos {
throw new Error('Action not supported yet');
}
if (actionInfo.scope === Scope.Manager) {
if (chosenAction === ActionType.ManageBuildCredentials) {
if (chosenAction === IosActionType.ManageBuildCredentials) {
currentActions = buildCredentialsActions;
continue;
} else if (chosenAction === ActionType.ManageCredentialsJson) {
} else if (chosenAction === IosActionType.ManageCredentialsJson) {
currentActions = credentialsJsonActions;
continue;
} else if (chosenAction === ActionType.ManagePushKey) {
} else if (chosenAction === IosActionType.ManagePushKey) {
currentActions = pushKeyActions;
continue;
} else if (chosenAction === ActionType.GoBackToHighLevelActions) {
} else if (chosenAction === IosActionType.GoBackToHighLevelActions) {
currentActions = highLevelActions;
continue;
} else if (chosenAction === ActionType.GoBackToCaller) {
} else if (chosenAction === IosActionType.GoBackToCaller) {
return await this.callingAction.runAsync(ctx);
}
} else if (actionInfo.scope === Scope.Project) {
@@ -315,15 +187,15 @@ export class ManageIos {
private async runAccountSpecificActionAsync(
ctx: CredentialsContext,
account: Account,
action: ActionType
action: IosActionType
): Promise<void> {
if (action === ActionType.RemoveDistributionCertificate) {
if (action === IosActionType.RemoveDistributionCertificate) {
await new SelectAndRemoveDistributionCertificate(account).runAsync(ctx);
} else if (action === ActionType.CreateDistributionCertificate) {
} else if (action === IosActionType.CreateDistributionCertificate) {
await new CreateDistributionCertificate(account).runAsync(ctx);
} else if (action === ActionType.CreatePushKey) {
} else if (action === IosActionType.CreatePushKey) {
await new CreatePushKey(account).runAsync(ctx);
} else if (action === ActionType.RemovePushKey) {
} else if (action === IosActionType.RemovePushKey) {
await new SelectAndRemovePushKey(account).runAsync(ctx);
}
}
@@ -333,9 +205,9 @@ export class ManageIos {
app: App,
targets: Target[],
buildProfile: IosBuildProfile,
action: ActionType
action: IosActionType
): Promise<void> {
if (action === ActionType.SetupBuildCredentials) {
if (action === IosActionType.SetupBuildCredentials) {
await new SetupBuildCredentials({
app,
targets,
@@ -352,12 +224,12 @@ export class ManageIos {
buildProfile
).runAsync(ctx);
if (action === ActionType.SetupBuildCredentialsFromCredentialsJson) {
if (action === IosActionType.SetupBuildCredentialsFromCredentialsJson) {
await new SetupBuildCredentialsFromCredentialsJson(app, targets, distributionType).runAsync(
ctx
);
return;
} else if (action === ActionType.UpdateCredentialsJson) {
} else if (action === IosActionType.UpdateCredentialsJson) {
await new UpdateCredentialsJson(app, targets, distributionType).runAsync(ctx);
return;
}
@@ -365,7 +237,7 @@ export class ManageIos {
const target = await this.selectTargetAsync(targets);
const appLookupParams = getAppLookupParamsFromContext(ctx, target);
switch (action) {
case ActionType.UseExistingDistributionCertificate: {
case IosActionType.UseExistingDistributionCertificate: {
const distCert = await selectValidDistributionCertificateAsync(ctx, appLookupParams);
if (!distCert) {
return;
@@ -378,7 +250,7 @@ export class ManageIos {
);
return;
}
case ActionType.CreateDistributionCertificate: {
case IosActionType.CreateDistributionCertificate: {
const distCert = await new CreateDistributionCertificate(appLookupParams.account).runAsync(
ctx
);
@@ -395,7 +267,7 @@ export class ManageIos {
}
return;
}
case ActionType.RemoveProvisioningProfile: {
case IosActionType.RemoveProvisioningProfile: {
const iosAppCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(
appLookupParams
);
@@ -418,7 +290,7 @@ export class ManageIos {
}
return;
}
case ActionType.SetupPushKey: {
case IosActionType.SetupPushKey: {
const setupPushKeyAction = await new SetupPushKey(appLookupParams);
const isPushKeySetup = await setupPushKeyAction.isPushKeySetupAsync(ctx);
if (isPushKeySetup) {
@@ -430,7 +302,7 @@ export class ManageIos {
}
return;
}
case ActionType.CreatePushKey: {
case IosActionType.CreatePushKey: {
const pushKey = await new CreatePushKey(appLookupParams.account).runAsync(ctx);
const confirm = await confirmAsync({
message: `Do you want ${appLookupParams.projectName} to use the new Push Key?`,
@@ -440,7 +312,7 @@ export class ManageIos {
}
return;
}
case ActionType.UseExistingPushKey: {
case IosActionType.UseExistingPushKey: {
const selectedPushKey = await selectPushKeyAsync(ctx, appLookupParams.account);
if (selectedPushKey) {
await new AssignPushKey(appLookupParams).runAsync(ctx, selectedPushKey);
+16 -1
View File
@@ -1,12 +1,17 @@
import {
Client,
CombinedError as GraphqlError,
OperationContext,
OperationResult,
PromisifiedSource,
TypedDocumentNode,
cacheExchange,
createClient as createUrqlClient,
dedupExchange,
fetchExchange,
} from '@urql/core';
import { retryExchange } from '@urql/exchange-retry';
import { DocumentNode } from 'graphql';
// node-fetch is used here because @urql/core uses the fetch API under the hood
// don't use node-fetch elsewhere
// eslint-disable-next-line
@@ -57,7 +62,17 @@ export const graphqlClient = createUrqlClient({
}
return {};
},
});
}) as StricterClient;
/* Please specify additionalTypenames in your Graphql queries */
export interface StricterClient extends Client {
// eslint-disable-next-line @typescript-eslint/ban-types
query<Data = any, Variables extends object = {}>(
query: DocumentNode | TypedDocumentNode<Data, Variables> | string,
variables: Variables | undefined,
context: Partial<OperationContext> & { additionalTypenames: string[] }
): PromisifiedSource<OperationResult<Data, Variables>>;
}
export async function withErrorHandlingAsync<T>(promise: Promise<OperationResult<T>>): Promise<T> {
const { data, error } = await promise;
+120 -35
View File
@@ -147,6 +147,11 @@ export type Actor = {
firstName?: Maybe<Scalars['String']>;
created: Scalars['DateTime'];
isExpoAdmin: Scalars['Boolean'];
/**
* Best-effort human readable name for this actor for use in user interfaces during action attribution.
* For example, when displaying a sentence indicating that actor X created a build or published an update.
*/
displayName: Scalars['String'];
/** Associated accounts */
accounts: Array<Account>;
/** Access Tokens belonging to this actor */
@@ -212,7 +217,7 @@ export type Account = {
applePushKeys: Array<ApplePushKey>;
appleProvisioningProfiles: Array<AppleProvisioningProfile>;
appleDevices: Array<AppleDevice>;
appleAppSpecificPasswords: Array<AppleAppSpecificPassword>;
appStoreConnectApiKeys: Array<AppStoreConnectApiKey>;
/** Android credentials for account */
googleServiceAccountKeys: Array<GoogleServiceAccountKey>;
/** Environment secrets for an account */
@@ -435,6 +440,7 @@ export type App = Project & {
privacySetting: AppPrivacy;
latestReleaseId: Scalars['ID'];
pushSecurityEnabled: Scalars['Boolean'];
releaseChannels: Array<Scalars['String']>;
/** (EAS Build) Builds associated with this app */
builds: Array<Build>;
buildJobs: Array<BuildJob>;
@@ -590,6 +596,8 @@ export type AppActivityTimelineProjectActivitiesArgs = {
limit: Scalars['Int'];
createdBefore?: Maybe<Scalars['DateTime']>;
filterTypes?: Maybe<Array<ActivityTimelineProjectActivityType>>;
filterPlatforms?: Maybe<Array<AppPlatform>>;
filterReleaseChannels?: Maybe<Array<Scalars['String']>>;
};
@@ -705,6 +713,7 @@ export type Build = ActivityTimelineProjectActivity & BuildOrBuildJob & {
iosEnterpriseProvisioning?: Maybe<BuildIosEnterpriseProvisioning>;
buildProfile?: Maybe<Scalars['String']>;
gitCommitHash?: Maybe<Scalars['String']>;
isGitWorkingTreeDirty?: Maybe<Scalars['Boolean']>;
error?: Maybe<BuildError>;
submissions: Array<Submission>;
};
@@ -732,6 +741,7 @@ export type User = Actor & {
appetizeCode?: Maybe<Scalars['String']>;
emailVerified: Scalars['Boolean'];
isExpoAdmin: Scalars['Boolean'];
displayName: Scalars['String'];
isSecondFactorAuthenticationEnabled: Scalars['Boolean'];
/** Get all certified second factor authentication methods */
secondFactorDevices: Array<UserSecondFactorDevice>;
@@ -965,7 +975,7 @@ export type IosSubmissionConfig = {
__typename?: 'IosSubmissionConfig';
ascAppIdentifier: Scalars['String'];
appleIdUsername: Scalars['String'];
appleAppSpecificPasswordId?: Maybe<Scalars['String']>;
ascApiKeyId?: Maybe<Scalars['String']>;
};
export type SubmissionError = {
@@ -1112,7 +1122,7 @@ export type IosAppCredentials = {
appleAppIdentifier: AppleAppIdentifier;
iosAppBuildCredentialsList: Array<IosAppBuildCredentials>;
pushKey?: Maybe<ApplePushKey>;
appSpecificPassword?: Maybe<AppleAppSpecificPassword>;
appStoreConnectApiKeyForSubmissions?: Maybe<AppStoreConnectApiKey>;
/** @deprecated use iosAppBuildCredentialsList instead */
iosAppBuildCredentialsArray: Array<IosAppBuildCredentials>;
};
@@ -1244,16 +1254,38 @@ export type IosAppBuildCredentialsFilter = {
iosDistributionType?: Maybe<IosDistributionType>;
};
export type AppleAppSpecificPassword = {
__typename?: 'AppleAppSpecificPassword';
export type AppStoreConnectApiKey = {
__typename?: 'AppStoreConnectApiKey';
id: Scalars['ID'];
account: Account;
appleIdUsername: Scalars['String'];
passwordLabel?: Maybe<Scalars['String']>;
appleTeam?: Maybe<AppleTeam>;
issuerIdentifier: Scalars['String'];
keyIdentifier: Scalars['String'];
name?: Maybe<Scalars['String']>;
roles?: Maybe<Array<AppStoreConnectUserRole>>;
createdAt: Scalars['DateTime'];
updatedAt: Scalars['DateTime'];
};
export enum AppStoreConnectUserRole {
Admin = 'ADMIN',
Finance = 'FINANCE',
Technical = 'TECHNICAL',
AccountHolder = 'ACCOUNT_HOLDER',
ReadOnly = 'READ_ONLY',
Sales = 'SALES',
Marketing = 'MARKETING',
AppManager = 'APP_MANAGER',
Developer = 'DEVELOPER',
AccessToReports = 'ACCESS_TO_REPORTS',
CustomerSupport = 'CUSTOMER_SUPPORT',
CreateApps = 'CREATE_APPS',
CloudManagedDeveloperId = 'CLOUD_MANAGED_DEVELOPER_ID',
CloudManagedAppDistribution = 'CLOUD_MANAGED_APP_DISTRIBUTION',
ImageManager = 'IMAGE_MANAGER',
Unknown = 'UNKNOWN'
}
export type AndroidAppCredentialsFilter = {
legacyOnly?: Maybe<Scalars['Boolean']>;
applicationIdentifier?: Maybe<Scalars['String']>;
@@ -1426,6 +1458,7 @@ export type SubscriptionDetails = {
planId?: Maybe<Scalars['String']>;
addons: Array<AddonDetails>;
name?: Maybe<Scalars['String']>;
price: Scalars['Int'];
nextInvoice?: Maybe<Scalars['DateTime']>;
cancelledAt?: Maybe<Scalars['DateTime']>;
willCancel?: Maybe<Scalars['Boolean']>;
@@ -1439,6 +1472,8 @@ export type AddonDetails = {
id: Scalars['ID'];
planId: Scalars['String'];
name: Scalars['String'];
nextInvoice?: Maybe<Scalars['DateTime']>;
willCancel?: Maybe<Scalars['Boolean']>;
};
export type Charge = {
@@ -1514,7 +1549,10 @@ export type AppQuery = {
/** Look up app by app id */
byId: App;
byFullName: App;
/** Public apps in the app directory */
/**
* Public apps in the app directory
* @deprecated App directory no longer supported
*/
all: Array<App>;
};
@@ -1841,8 +1879,6 @@ export type RootMutation = {
googleServiceAccountKey: GoogleServiceAccountKeyMutation;
/** Mutations that modify an Identifier for an iOS App */
appleAppIdentifier: AppleAppIdentifierMutation;
/** Mutations that modify an App Specific Password for an Apple User Account */
appleAppSpecificPassword: AppleAppSpecificPasswordMutation;
/** Mutations that modify an Apple Device */
appleDevice: AppleDeviceMutation;
/** Mutations that modify an Apple Device registration request */
@@ -1855,6 +1891,8 @@ export type RootMutation = {
applePushKey: ApplePushKeyMutation;
/** Mutations that modify an Apple Team */
appleTeam: AppleTeamMutation;
/** Mutations that modify an App Store Connect Api Key */
appStoreConnectApiKey: AppStoreConnectApiKeyMutation;
/** Mutations that modify an App */
app?: Maybe<AppMutation>;
asset: AssetMutation;
@@ -1960,6 +1998,8 @@ export type AccountMutation = {
subscribeToProduct?: Maybe<Account>;
/** Cancels the active subscription */
cancelSubscription?: Maybe<Account>;
/** Requests a refund for the specified charge. Returns true if auto-refund was possible, otherwise requests a manual refund from support and returns false. */
requestRefund?: Maybe<Scalars['Boolean']>;
/**
* Makes a one time purchase
* @deprecated Build packs are no longer supported
@@ -2005,6 +2045,12 @@ export type AccountMutationCancelSubscriptionArgs = {
};
export type AccountMutationRequestRefundArgs = {
accountID: Scalars['ID'];
chargeIdentifier: Scalars['ID'];
};
export type AccountMutationBuyProductArgs = {
accountName: Scalars['ID'];
productId: Scalars['ID'];
@@ -2232,24 +2278,6 @@ export type AppleAppIdentifierInput = {
parentAppleAppId?: Maybe<Scalars['ID']>;
};
export type AppleAppSpecificPasswordMutation = {
__typename?: 'AppleAppSpecificPasswordMutation';
/** Create an App Specific Password for an Apple User Account */
createAppleAppSpecificPassword: AppleAppSpecificPassword;
};
export type AppleAppSpecificPasswordMutationCreateAppleAppSpecificPasswordArgs = {
appleAppSpecificPasswordInput: AppleAppSpecificPasswordInput;
accountId: Scalars['ID'];
};
export type AppleAppSpecificPasswordInput = {
appleIdUsername: Scalars['String'];
passwordLabel?: Maybe<Scalars['String']>;
appSpecificPassword: Scalars['String'];
};
export type AppleDeviceMutation = {
__typename?: 'AppleDeviceMutation';
/** Create an Apple Device */
@@ -2420,6 +2448,39 @@ export type AppleTeamInput = {
appleTeamName?: Maybe<Scalars['String']>;
};
export type AppStoreConnectApiKeyMutation = {
__typename?: 'AppStoreConnectApiKeyMutation';
/** Create an App Store Connect Api Key for an Apple Team */
createAppStoreConnectApiKey: AppStoreConnectApiKey;
/** Delete an App Store Connect Api Key */
deleteAppStoreConnectApiKey: DeleteAppStoreConnectApiKeyResult;
};
export type AppStoreConnectApiKeyMutationCreateAppStoreConnectApiKeyArgs = {
appStoreConnectApiKeyInput: AppStoreConnectApiKeyInput;
accountId: Scalars['ID'];
};
export type AppStoreConnectApiKeyMutationDeleteAppStoreConnectApiKeyArgs = {
id: Scalars['ID'];
};
export type AppStoreConnectApiKeyInput = {
issuerIdentifier: Scalars['String'];
keyIdentifier: Scalars['String'];
keyP8: Scalars['String'];
name?: Maybe<Scalars['String']>;
roles?: Maybe<Array<AppStoreConnectUserRole>>;
appleTeamId?: Maybe<Scalars['ID']>;
};
export type DeleteAppStoreConnectApiKeyResult = {
__typename?: 'deleteAppStoreConnectApiKeyResult';
id: Scalars['ID'];
};
export type AppMutation = {
__typename?: 'AppMutation';
/** Create an unpublished app */
@@ -2526,6 +2587,7 @@ export type AndroidJobInput = {
projectRootDirectory: Scalars['String'];
releaseChannel?: Maybe<Scalars['String']>;
updates?: Maybe<BuildUpdatesInput>;
developmentClient?: Maybe<Scalars['Boolean']>;
secrets?: Maybe<AndroidJobSecretsInput>;
builderEnvironment?: Maybe<AndroidBuilderEnvironmentInput>;
cache?: Maybe<BuildCacheInput>;
@@ -2591,6 +2653,7 @@ export type BuildCacheInput = {
export enum AndroidBuildType {
Apk = 'APK',
AppBundle = 'APP_BUNDLE',
/** @deprecated Use developmentClient option instead. */
DevelopmentClient = 'DEVELOPMENT_CLIENT'
}
@@ -2611,6 +2674,7 @@ export type BuildMetadataInput = {
appIdentifier?: Maybe<Scalars['String']>;
buildProfile?: Maybe<Scalars['String']>;
gitCommitHash?: Maybe<Scalars['String']>;
isGitWorkingTreeDirty?: Maybe<Scalars['Boolean']>;
username?: Maybe<Scalars['String']>;
};
@@ -2642,13 +2706,17 @@ export type IosJobInput = {
projectRootDirectory: Scalars['String'];
releaseChannel?: Maybe<Scalars['String']>;
updates?: Maybe<BuildUpdatesInput>;
/** @deprecated */
distribution?: Maybe<DistributionType>;
simulator?: Maybe<Scalars['Boolean']>;
developmentClient?: Maybe<Scalars['Boolean']>;
secrets?: Maybe<IosJobSecretsInput>;
builderEnvironment?: Maybe<IosBuilderEnvironmentInput>;
cache?: Maybe<BuildCacheInput>;
scheme?: Maybe<Scalars['String']>;
buildConfiguration?: Maybe<Scalars['String']>;
artifactPath?: Maybe<Scalars['String']>;
/** @deprecated */
buildType?: Maybe<IosBuildType>;
username?: Maybe<Scalars['String']>;
};
@@ -2680,6 +2748,7 @@ export type IosBuilderEnvironmentInput = {
env?: Maybe<Scalars['JSONObject']>;
};
/** @deprecated Use developmentClient option instead. */
export enum IosBuildType {
Release = 'RELEASE',
DevelopmentClient = 'DEVELOPMENT_CLIENT'
@@ -2725,8 +2794,8 @@ export type IosAppCredentialsMutation = {
createIosAppCredentials: IosAppCredentials;
/** Set the push key to be used in an iOS app */
setPushKey: IosAppCredentials;
/** Set the app-specific password to be used for an iOS app */
setAppSpecificPassword: IosAppCredentials;
/** Set the App Store Connect Api Key to be used for submitting an iOS app */
setAppStoreConnectApiKeyForSubmissions: IosAppCredentials;
};
@@ -2743,15 +2812,15 @@ export type IosAppCredentialsMutationSetPushKeyArgs = {
};
export type IosAppCredentialsMutationSetAppSpecificPasswordArgs = {
export type IosAppCredentialsMutationSetAppStoreConnectApiKeyForSubmissionsArgs = {
id: Scalars['ID'];
appSpecificPasswordId: Scalars['ID'];
ascApiKeyId: Scalars['ID'];
};
export type IosAppCredentialsInput = {
appleTeamId?: Maybe<Scalars['ID']>;
pushKeyId?: Maybe<Scalars['ID']>;
appSpecificPasswordId?: Maybe<Scalars['ID']>;
appStoreConnectApiKeyForSubmissionsId?: Maybe<Scalars['ID']>;
};
export type RobotMutation = {
@@ -2793,6 +2862,7 @@ export type Robot = Actor & {
firstName?: Maybe<Scalars['String']>;
created: Scalars['DateTime'];
isExpoAdmin: Scalars['Boolean'];
displayName: Scalars['String'];
/** Associated accounts */
accounts: Array<Account>;
/** Access Tokens belonging to this actor */
@@ -2863,11 +2933,11 @@ export type CreateIosSubmissionInput = {
};
export type IosSubmissionConfigInput = {
appleAppSpecificPasswordId?: Maybe<Scalars['String']>;
appleAppSpecificPassword?: Maybe<Scalars['String']>;
ascApiKey?: Maybe<AscApiKeyInput>;
ascApiKeyId?: Maybe<Scalars['String']>;
archiveUrl?: Maybe<Scalars['String']>;
appleIdUsername: Scalars['String'];
appleIdUsername?: Maybe<Scalars['String']>;
ascAppIdentifier: Scalars['String'];
};
@@ -3433,6 +3503,7 @@ export enum IosSchemeBuildConfiguration {
Debug = 'DEBUG'
}
/** @deprecated Use developmentClient option instead. */
export enum IosManagedBuildType {
Release = 'RELEASE',
DevelopmentClient = 'DEVELOPMENT_CLIENT'
@@ -5288,6 +5359,16 @@ export type AndroidKeystoreFragment = (
& Pick<AndroidKeystore, 'id' | 'type' | 'keystore' | 'keystorePassword' | 'keyAlias' | 'keyPassword' | 'md5CertificateFingerprint' | 'sha1CertificateFingerprint' | 'sha256CertificateFingerprint' | 'createdAt' | 'updatedAt'>
);
export type AppStoreConnectApiKeyFragment = (
{ __typename?: 'AppStoreConnectApiKey' }
& Pick<AppStoreConnectApiKey, 'id' | 'issuerIdentifier' | 'keyIdentifier' | 'name' | 'roles' | 'createdAt' | 'updatedAt'>
& { appleTeam?: Maybe<(
{ __typename?: 'AppleTeam' }
& Pick<AppleTeam, 'id'>
& AppleTeamFragment
)> }
);
export type AppleAppIdentifierFragment = (
{ __typename?: 'AppleAppIdentifier' }
& Pick<AppleAppIdentifier, 'id' | 'bundleIdentifier'>
@@ -5417,6 +5498,10 @@ export type CommonIosAppCredentialsWithoutBuildCredentialsFragment = (
{ __typename?: 'ApplePushKey' }
& Pick<ApplePushKey, 'id'>
& ApplePushKeyFragment
)>, appStoreConnectApiKeyForSubmissions?: Maybe<(
{ __typename?: 'AppStoreConnectApiKey' }
& Pick<AppStoreConnectApiKey, 'id'>
& AppStoreConnectApiKeyFragment
)> }
);
@@ -54,6 +54,7 @@ export const BuildQuery = {
{ buildId },
{
requestPolicy: useCache ? 'cache-first' : 'network-only',
additionalTypenames: ['Build'],
}
)
.toPromise()
@@ -89,7 +90,10 @@ export const BuildQuery = {
}
${print(BuildFragmentNode)}
`,
{ appId, offset, limit, filter }
{ appId, offset, limit, filter },
{
additionalTypenames: ['Build'],
}
)
.toPromise()
);
@@ -37,7 +37,10 @@ export const EnvironmentSecretsQuery = {
}
${print(EnvironmentSecretFragmentNode)}
`,
{ accountName }
{ accountName },
{
additionalTypenames: ['EnvironmentSecret'],
}
)
.toPromise()
);
@@ -62,7 +65,8 @@ export const EnvironmentSecretsQuery = {
}
${print(EnvironmentSecretFragmentNode)}
`,
{ appId }
{ appId },
{ additionalTypenames: ['EnvironmentSecret'] }
)
.toPromise()
);
@@ -19,7 +19,10 @@ export const ProjectQuery = {
}
}
`,
{ username, slug }
{ username, slug },
{
additionalTypenames: ['App', 'Snack'] /* typenames that use the Project type*/,
}
)
.toPromise()
);
@@ -21,7 +21,10 @@ export const PublishQuery = {
{
storageKeys,
},
{ requestPolicy: 'network-only' } // Since we reptitively query this to monitor the asset upload, we need to ensure it is not cached.
{
requestPolicy: 'network-only',
additionalTypenames: ['AssetMetadataResult'],
} // Since we reptitively query this to monitor the asset upload, we need to ensure it is not cached.
)
.toPromise()
);
@@ -40,7 +40,10 @@ export const SubmissionQuery = {
${print(SubmissionFragmentNode)}
`,
{ submissionId },
{ requestPolicy: useCache ? 'cache-first' : 'network-only' }
{
requestPolicy: useCache ? 'cache-first' : 'network-only',
additionalTypenames: ['Submission'],
}
)
.toPromise()
);
@@ -78,7 +81,8 @@ export const SubmissionQuery = {
}
${print(SubmissionFragmentNode)}
`,
{ appId, offset, limit, status, platform }
{ appId, offset, limit, status, platform },
{ additionalTypenames: ['Submission'] }
)
.toPromise()
);
@@ -26,7 +26,11 @@ export const UserQuery = {
isExpoAdmin
}
}
`
`,
/* variables */ undefined,
{
additionalTypenames: ['User'],
}
)
.toPromise()
);
@@ -31,7 +31,10 @@ export const WebhookQuery = {
}
${print(WebhookFragmentNode)}
`,
{ appId, webhookFilter }
{ appId, webhookFilter },
{
additionalTypenames: ['Webhook'],
}
)
.toPromise()
);
@@ -52,7 +55,10 @@ export const WebhookQuery = {
}
${print(WebhookFragmentNode)}
`,
{ webhookId }
{ webhookId },
{
additionalTypenames: ['Webhook'],
}
)
.toPromise()
);
@@ -0,0 +1,21 @@
import { print } from 'graphql';
import gql from 'graphql-tag';
import { AppleTeamFragmentNode } from './AppleTeam';
export const AppStoreConnectApiKeyFragmentNode = gql`
fragment AppStoreConnectApiKeyFragment on AppStoreConnectApiKey {
id
appleTeam {
id
...AppleTeamFragment
}
issuerIdentifier
keyIdentifier
name
roles
createdAt
updatedAt
}
${print(AppleTeamFragmentNode)}
`;
@@ -1,6 +1,7 @@
import gql from 'graphql-tag';
import { AppFragmentNode } from '../App';
import { AppStoreConnectApiKeyFragmentNode } from './AppStoreConnectApiKey';
import { AppleAppIdentifierFragmentNode } from './AppleAppIdentifier';
import { ApplePushKeyFragmentNode } from './ApplePushKey';
import { AppleTeamFragmentNode } from './AppleTeam';
@@ -25,11 +26,16 @@ export const CommonIosAppCredentialsWithoutBuildCredentialsFragmentNode = gql`
id
...ApplePushKeyFragment
}
appStoreConnectApiKeyForSubmissions {
id
...AppStoreConnectApiKeyFragment
}
}
${AppFragmentNode}
${AppleTeamFragmentNode}
${AppleAppIdentifierFragmentNode}
${ApplePushKeyFragmentNode}
${AppStoreConnectApiKeyFragmentNode}
`;
export const CommonIosAppCredentialsFragmentNode = gql`
+2 -14
View File
@@ -24,11 +24,11 @@ export default class Log {
}
public static error(...args: any[]): void {
Log.consoleError(...Log.withTextColor(args, chalk.red));
Log.consoleLog(...Log.withTextColor(args, chalk.red));
}
public static warn(...args: any[]): void {
Log.consoleWarn(...Log.withTextColor(args, chalk.yellow));
Log.consoleLog(...Log.withTextColor(args, chalk.yellow));
}
public static debug(...args: any[]): void {
@@ -59,18 +59,6 @@ export default class Log {
console.log(...args);
}
private static consoleWarn(...args: any[]): void {
Log.updateIsLastLineNewLine(args);
// eslint-disable-next-line no-console
console.warn(...args);
}
private static consoleError(...args: any[]): void {
Log.updateIsLastLineNewLine(args);
// eslint-disable-next-line no-console
console.error(...args);
}
private static withTextColor(args: any[], chalkColor: Color): string[] {
return args.map(arg => chalkColor(arg));
}
+2 -1
View File
@@ -231,7 +231,8 @@ export async function getBranchByNameAsync({
{
appId,
name,
}
},
{ additionalTypenames: ['UpdateBranch'] }
)
.toPromise()
);
+1 -1
View File
@@ -12,7 +12,7 @@ import { PresignedPost } from '../graphql/mutations/UploadSessionMutation';
import { PublishQuery } from '../graphql/queries/PublishQuery';
import Log from '../log';
import { uploadWithPresignedPostAsync } from '../uploads';
import { expoCommandAsync } from '../utils/expoCommand';
import { expoCommandAsync } from '../utils/expoCli';
import uniqBy from '../utils/expodash/uniqBy';
export const TIMEOUT_LIMIT = 60_000; // 1 minute
+4 -2
View File
@@ -3,7 +3,7 @@ import { Platform, Workflow } from '@expo/eas-build-job';
import fs from 'fs-extra';
import path from 'path';
import vcs from '../vcs';
import { getVcsClient } from '../vcs';
export async function resolveWorkflowAsync(
projectDir: string,
@@ -20,7 +20,9 @@ export async function resolveWorkflowAsync(
}
if (await fs.pathExists(platformWorkflowMarker)) {
return (await vcs.isFileIgnoredAsync(path.relative(projectDir, platformWorkflowMarker)))
return (await getVcsClient().isFileIgnoredAsync(
path.relative(projectDir, platformWorkflowMarker)
))
? Workflow.MANAGED
: Workflow.GENERIC;
} else {
+4 -4
View File
@@ -326,16 +326,16 @@ async function handlePromptSourceAsync(source: ArchivePromptSource): Promise<Arc
message: 'What would you like to submit?',
choices: [
{
title: 'Selected build from EAS',
title: 'Select a build from EAS',
value: ArchiveSourceType.buildList,
},
{ title: 'I have a url to the app archive', value: ArchiveSourceType.url },
{ title: 'Provide a URL to the app archive', value: ArchiveSourceType.url },
{
title: 'Local app binary file',
title: 'Provide a path to a local app binary file',
value: ArchiveSourceType.path,
},
{
title: 'A build identified by a build ID',
title: 'Provide a build ID to identify a build on EAS',
value: ArchiveSourceType.buildId,
},
],
@@ -109,7 +109,7 @@ export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmiss
// structuring order affects table rows order
return {
ascAppIdentifier,
appleIdUsername,
appleIdUsername: appleIdUsername ?? undefined,
projectId,
...(ascApiKeyResult
? { formattedAscApiKey: formatServiceAccountSummary(ascApiKeyResult) }
@@ -121,7 +121,7 @@ export default class IosSubmitter extends BaseSubmitter<Platform.IOS, IosSubmiss
type SummaryData = {
ascAppIdentifier: string;
appleIdUsername: string;
appleIdUsername?: string;
projectId: string;
formattedAscApiKey?: string;
} & ArchiveSourceSummaryFields;
+1
View File
@@ -75,6 +75,7 @@ export async function loginAsync({
'expo-session': sessionSecret,
},
},
additionalTypenames: [] /* UserQuery has immutable fields */,
}
)
.toPromise();
@@ -1,24 +1,25 @@
import { Platform } from '@expo/eas-build-job';
import { errors } from '@expo/eas-json';
import { getProfilesAsync } from '../profiles';
describe(getProfilesAsync, () => {
test('defaults to production profile', async () => {
const callback = jest.fn();
it('defaults to production profile', async () => {
const readProfileAsync = jest.fn();
const result = await getProfilesAsync({
platforms: [Platform.ANDROID, Platform.IOS],
profileName: undefined,
readProfileAsync: callback,
readProfileAsync,
});
expect(result[0].profileName).toBe('production');
expect(result[1].profileName).toBe('production');
expect(callback).toBeCalledWith(Platform.ANDROID, 'production');
expect(callback).toBeCalledWith(Platform.IOS, 'production');
expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'production');
});
test('defaults to release profile when production profile is non-existent', async () => {
const callback = jest
it('defaults to release profile when production profile is non-existent', async () => {
const readProfileAsync = jest
.fn()
.mockRejectedValueOnce(() => {
throw new Error();
@@ -30,19 +31,19 @@ describe(getProfilesAsync, () => {
const result = await getProfilesAsync({
platforms: [Platform.ANDROID, Platform.IOS],
profileName: undefined,
readProfileAsync: callback,
readProfileAsync,
});
expect(result[0].profileName).toBe('release');
expect(result[1].profileName).toBe('release');
expect(callback).toBeCalledWith(Platform.ANDROID, 'production');
expect(callback).toBeCalledWith(Platform.IOS, 'production');
expect(callback).toBeCalledWith(Platform.ANDROID, 'release');
expect(callback).toBeCalledWith(Platform.IOS, 'release');
expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'production');
expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'production');
expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'release');
expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'release');
});
test('fails when neither production or release profiles are present', async () => {
const callback = jest
it('fails when neither production or release profiles are present', async () => {
const readProfileAsync = jest
.fn()
.mockRejectedValueOnce(() => {
throw new Error();
@@ -55,22 +56,36 @@ describe(getProfilesAsync, () => {
getProfilesAsync({
platforms: [Platform.ANDROID],
profileName: undefined,
readProfileAsync: callback,
readProfileAsync,
})
).rejects.toThrowError(/There is no profile named "production" in eas.json/);
});
test('gets a specific profile', async () => {
const callback = jest.fn();
it('gets a specific profile', async () => {
const readProfileAsync = jest.fn();
const result = await getProfilesAsync({
platforms: [Platform.ANDROID, Platform.IOS],
profileName: 'custom-profile',
readProfileAsync: callback,
readProfileAsync,
});
expect(result[0].profileName).toBe('custom-profile');
expect(result[1].profileName).toBe('custom-profile');
expect(callback).toBeCalledWith(Platform.ANDROID, 'custom-profile');
expect(callback).toBeCalledWith(Platform.IOS, 'custom-profile');
expect(readProfileAsync).toBeCalledWith(Platform.ANDROID, 'custom-profile');
expect(readProfileAsync).toBeCalledWith(Platform.IOS, 'custom-profile');
});
it('throws validation error if eas.json is invalid', async () => {
const readProfileAsync = jest.fn().mockImplementation(() => {
throw new errors.InvalidEasJsonError('eas.json is not valid');
});
await expect(
getProfilesAsync({
platforms: [Platform.ANDROID, Platform.IOS],
profileName: undefined,
readProfileAsync,
})
).rejects.toThrowError(/eas.json is not valid/);
});
});
+3
View File
@@ -0,0 +1,3 @@
const packageJSON = require('../../package.json');
export const easCliVersion: string = packageJSON.version;
+9 -2
View File
@@ -1,4 +1,5 @@
import { Platform } from '@expo/eas-build-job';
import { errors } from '@expo/eas-json';
import Log from '../log';
@@ -26,14 +27,20 @@ export async function getProfilesAsync<T>({
try {
profile = await readProfileAsync(platform, 'production');
profileName = 'production';
} catch (error) {
} catch (errorOuter) {
if (errorOuter instanceof errors.InvalidEasJsonError) {
throw errorOuter;
}
try {
profile = await readProfileAsync(platform, 'release');
profileName = 'release';
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 (error) {
} catch (errorInner) {
if (errorInner instanceof errors.InvalidEasJsonError) {
throw errorInner;
}
throw new Error('There is no profile named "production" in eas.json');
}
}
@@ -0,0 +1,87 @@
import { vol } from 'memfs';
import { Ignore } from '../local';
jest.mock('fs');
beforeEach(() => {
vol.reset();
});
describe(Ignore, () => {
it('reads .gitignore from subdirectory', async () => {
vol.fromJSON(
{
'.gitignore': 'aaa',
'dir/.gitignore': 'bbb',
},
'/root'
);
const ignore = new Ignore('/root');
await ignore.initIgnoreAsync();
expect(ignore.ignores('aaa')).toBe(true);
expect(ignore.ignores('bbb')).toBe(false);
expect(ignore.ignores('dir/aaa')).toBe(true);
expect(ignore.ignores('dir/bbb')).toBe(true);
});
it('ignores .gitignore files if .easignore is present', async () => {
vol.fromJSON(
{
'.gitignore': 'aaa',
'.easignore': 'ccc',
'dir/.gitignore': 'bbb',
},
'/root'
);
const ignore = new Ignore('/root');
await ignore.initIgnoreAsync();
expect(ignore.ignores('aaa')).toBe(false);
expect(ignore.ignores('bbb')).toBe(false);
expect(ignore.ignores('ccc')).toBe(true);
expect((ignore as any).ignoreMapping.map((i: any) => i[0])).toEqual(['', '']);
});
it('ignores .gitignore files in node_modules content', async () => {
vol.fromJSON(
{
'.gitignore': 'aaa',
'dir/.gitignore': 'bbb',
'node_modules/.gitignore': 'bbb',
},
'/root'
);
const ignore = new Ignore('/root');
await ignore.initIgnoreAsync();
expect(ignore.ignores('aaa')).toBe(true);
expect(ignore.ignores('bbb')).toBe(false);
expect(ignore.ignores('node_modules/aaa')).toBe(true);
expect(ignore.ignores('node_modules/bbb')).toBe(true);
expect((ignore as any).ignoreMapping.map((i: any) => i[0])).toEqual(['', '', 'dir/']);
});
it('applies all gitignore files in parent directories', async () => {
vol.fromJSON(
{
'.gitignore': 'dir/ccc',
'dir/.gitignore': 'bbb',
},
'/root'
);
const ignore = new Ignore('/root');
await ignore.initIgnoreAsync();
expect(ignore.ignores('dir/ccc')).toBe(true);
});
it('ignores .git', async () => {
vol.fromJSON({}, '/root');
const ignore = new Ignore('/root');
await ignore.initIgnoreAsync();
expect(ignore.ignores('.git')).toBe(true);
});
});
+211
View File
@@ -0,0 +1,211 @@
import spawnAsync from '@expo/spawn-async';
import Log, { learnMore } from '../../log';
import { confirmAsync, promptAsync } from '../../prompts';
import {
doesGitRepoExistAsync,
getGitDiffOutputAsync,
gitDiffAsync,
gitStatusAsync,
isGitInstalledAsync,
} from '../git';
import { Client } from '../vcs';
export default class GitClient extends Client {
public async ensureRepoExistsAsync(): Promise<void> {
if (!(await isGitInstalledAsync())) {
throw new Error('git command not found, install it before proceeding');
}
if (await doesGitRepoExistAsync()) {
return;
}
Log.warn("It looks like you haven't initialized the git repository yet.");
Log.warn('EAS Build requires you to use a git repository for your project.');
const confirmInit = await confirmAsync({
message: `Would you like us to run 'git init' in the current directory for you?`,
});
if (!confirmInit) {
throw new Error(
'A git repository is required for building your project. Initialize it and run this command again.'
);
}
await spawnAsync('git', ['init']);
Log.log("We're going to make an initial commit for your repository.");
const { message } = await promptAsync({
type: 'text',
name: 'message',
message: 'Commit message:',
initial: 'Initial commit',
validate: (input: string) => input !== '',
});
await this.commitAsync({ commitAllFiles: true, commitMessage: message });
}
public async commitAsync({
commitMessage,
commitAllFiles,
}: {
commitMessage: string;
commitAllFiles?: boolean;
}): Promise<void> {
if (commitAllFiles) {
await spawnAsync('git', ['add', '-A']);
}
await spawnAsync('git', ['add', '-u']);
await spawnAsync('git', ['commit', '-m', commitMessage]);
}
public async isCommitRequiredAsync(): Promise<boolean> {
return await this.hasUncommittedChangesAsync();
}
public async hasUncommittedChangesAsync(): Promise<boolean> {
const changes = await gitStatusAsync({ showUntracked: true });
return changes.length > 0;
}
public async getRootPathAsync(): Promise<string> {
return (await spawnAsync('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
}
public async makeShallowCopyAsync(destinationPath: string): Promise<void> {
if (await this.hasUncommittedChangesAsync()) {
// it should already be checked before this function is called, but in case it wasn't
// we want to ensure that any changes were introduced by call to `setGitCaseSensitivityAsync`
throw new Error('You have some uncommitted changes in your repository.');
}
let gitRepoUri;
if (process.platform === 'win32') {
// getRootDirectoryAsync() will return C:/path/to/repo on Windows and path
// prefix should be file:///
gitRepoUri = `file:///${await this.getRootPathAsync()}`;
} else {
// getRootDirectoryAsync() will /path/to/repo, and path prefix should be
// file:/// so only file:// needs to be prepended
gitRepoUri = `file://${await this.getRootPathAsync()}`;
}
const isCaseSensitive = await isGitCaseSensitiveAsync();
await setGitCaseSensitivityAsync(true);
try {
if (await this.hasUncommittedChangesAsync()) {
Log.error('Detected inconsistent filename casing between your local filesystem and git.');
Log.error('This will likely cause your build to fail. Impacted files:');
await spawnAsync('git', ['status', '--short'], { stdio: 'inherit' });
Log.newLine();
Log.error(
`Error: Resolve filename casing inconsistencies before proceeding. ${learnMore(
'https://expo.fyi/macos-ignorecase'
)}`
);
throw new Error('You have some uncommitted changes in your repository.');
}
await spawnAsync('git', [
'clone',
'--no-hardlinks',
'--depth',
'1',
gitRepoUri,
destinationPath,
]);
} finally {
await setGitCaseSensitivityAsync(isCaseSensitive);
}
}
public async getCommitHashAsync(): Promise<string | undefined> {
try {
return (await spawnAsync('git', ['rev-parse', 'HEAD'])).stdout.trim();
} catch (err) {
return undefined;
}
}
public async trackFileAsync(file: string): Promise<void> {
await spawnAsync('git', ['add', '--intent-to-add', file]);
}
public async getBranchNameAsync(): Promise<string | null> {
try {
return (await spawnAsync('git', ['rev-parse', '--abbrev-ref', 'HEAD'])).stdout.trim();
} catch (e) {
return null;
}
}
public async getLastCommitMessageAsync(): Promise<string | null> {
try {
return (await spawnAsync('git', ['--no-pager', 'log', '-1', '--pretty=%B'])).stdout.trim();
} catch (e) {
return null;
}
}
public async showDiffAsync(): Promise<void> {
const outputTooLarge = (await getGitDiffOutputAsync()).split(/\r\n|\r|\n/).length > 100;
await gitDiffAsync({ withPager: outputTooLarge });
}
public async isFileUntrackedAsync(path: string): Promise<boolean> {
const withUntrackedFiles = await gitStatusAsync({ showUntracked: true });
const trackedFiles = await gitStatusAsync({ showUntracked: false });
const pathWithoutLeadingDot = path.replace(/^\.\//, ''); // remove leading './' from path
return (
withUntrackedFiles.includes(pathWithoutLeadingDot) &&
!trackedFiles.includes(pathWithoutLeadingDot)
);
}
public async isFileIgnoredAsync(filePath: string): Promise<boolean> {
try {
await spawnAsync('git', ['check-ignore', '-q', filePath]);
return true;
} catch (e) {
return false;
}
}
}
/**
* Checks if git is configured to be case sensitive
* @returns {boolean | undefined}
* - boolean - is git case sensitive
* - undefined - case sensitivity is not configured and git is using default behavior
*/
export async function isGitCaseSensitiveAsync(): Promise<boolean | undefined> {
if (process.platform !== 'darwin') {
return undefined;
}
try {
const result = await spawnAsync('git', ['config', '--get', 'core.ignorecase']);
const isIgnoreCaseEnabled = result.stdout.trim();
if (isIgnoreCaseEnabled === '') {
return undefined;
} else if (isIgnoreCaseEnabled === 'true') {
return false;
} else {
return true;
}
} catch (e) {
return undefined;
}
}
async function setGitCaseSensitivityAsync(enable: boolean | undefined): Promise<void> {
// we are assuming that if someone sets that on non-macos device then
// they know what they are doing
if (process.platform !== 'darwin') {
return;
}
if (enable === undefined) {
await spawnAsync('git', ['config', '--unset', 'core.ignorecase']);
} else {
await spawnAsync('git', ['config', 'core.ignorecase', String(!enable)]);
}
}
@@ -0,0 +1,28 @@
import spawnAsync from '@expo/spawn-async';
import path from 'path';
import { Ignore, makeShallowCopyAsync } from '../local';
import GitClient from './git';
export default class GitNoCommitClient extends GitClient {
public async isCommitRequiredAsync(): Promise<boolean> {
return false;
}
public async getRootPathAsync(): Promise<string> {
return (await spawnAsync('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
}
public async makeShallowCopyAsync(destinationPath: string): Promise<void> {
// normalize converts C:/some/path to C:\some\path on windows
const srcPath = path.normalize(await this.getRootPathAsync());
await makeShallowCopyAsync(srcPath, destinationPath);
}
public async isFileIgnoredAsync(filePath: string): Promise<boolean> {
// normalize converts C:/some/path to C:\some\path on windows
const ignore = new Ignore(await this.getRootPathAsync());
await ignore.initIgnoreAsync();
return ignore.ignores(filePath);
}
}
+19
View File
@@ -0,0 +1,19 @@
import { Ignore, getRootPath, makeShallowCopyAsync } from '../local';
import { Client } from '../vcs';
export default class NoVcsClient extends Client {
public async getRootPathAsync(): Promise<string> {
return getRootPath();
}
public async makeShallowCopyAsync(destinationPath: string): Promise<void> {
const srcPath = getRootPath();
await makeShallowCopyAsync(srcPath, destinationPath);
}
public async isFileIgnoredAsync(filePath: string): Promise<boolean> {
const ignore = new Ignore(getRootPath());
await ignore.initIgnoreAsync();
return ignore.ignores(filePath);
}
}
+8 -204
View File
@@ -1,166 +1,6 @@
import spawnAsync from '@expo/spawn-async';
import Log, { learnMore } from '../log';
import { confirmAsync, promptAsync } from '../prompts';
import { Client } from './vcs';
export default class GitClient extends Client {
public async ensureRepoExistsAsync(): Promise<void> {
if (!(await isGitInstalledAsync())) {
throw new Error('git command not found, install it before proceeding');
}
if (await doesGitRepoExistAsync()) {
return;
}
Log.warn("It looks like you haven't initialized the git repository yet.");
Log.warn('EAS Build requires you to use a git repository for your project.');
const confirmInit = await confirmAsync({
message: `Would you like to run 'git init' in the current directory?`,
});
if (!confirmInit) {
throw new Error(
'A git repository is required for building your project. Initialize it and run this command again.'
);
}
await spawnAsync('git', ['init']);
Log.log("We're going to make an initial commit for you repository.");
const { message } = await promptAsync({
type: 'text',
name: 'message',
message: 'Commit message:',
initial: 'Initial commit',
validate: (input: string) => input !== '',
});
await this.commitAsync({ commitAllFiles: true, commitMessage: message });
}
public async commitAsync({
commitMessage,
commitAllFiles,
}: {
commitMessage: string;
commitAllFiles?: boolean;
}): Promise<void> {
if (commitAllFiles) {
await spawnAsync('git', ['add', '-A']);
}
await spawnAsync('git', ['add', '-u']);
await spawnAsync('git', ['commit', '-m', commitMessage]);
}
public async hasUncommittedChangesAsync(): Promise<boolean> {
const changes = await gitStatusAsync({ showUntracked: true });
return changes.length > 0;
}
public async getRootPathAsync(): Promise<string> {
return (await spawnAsync('git', ['rev-parse', '--show-toplevel'])).stdout.trim();
}
public async makeShallowCopyAsync(destinationPath: string): Promise<void> {
if (await this.hasUncommittedChangesAsync()) {
// it should not happen, we need that to make sure that check before clone
// is always caused by case sensitivity
throw new Error('You have some uncommitted changes in your repository.');
}
let gitRepoUri;
if (process.platform === 'win32') {
// getRootDirectoryAsync() will return C:/path/to/repo on Windows and path
// prefix should be file:///
gitRepoUri = `file:///${await this.getRootPathAsync()}`;
} else {
// getRootDirectoryAsync() will /path/to/repo, and path prefix should be
// file:/// so only file:// needs to be prepended
gitRepoUri = `file://${await this.getRootPathAsync()}`;
}
const isCaseSensitive = await isGitCaseSensitiveAsync();
await setGitCaseSensitivityAsync(true);
try {
if (await this.hasUncommittedChangesAsync()) {
Log.error('Detected inconsistent filename casing between your local filesystem and git.');
Log.error('This will likely cause your build to fail. Impacted files:');
await spawnAsync('git', ['status', '--short'], { stdio: 'inherit' });
Log.newLine();
Log.error(
`Error: Resolve filename casing inconsistencies before proceeding. ${learnMore(
'https://expo.fyi/macos-ignorecase'
)}`
);
throw new Error('You have some uncommitted changes in your repository.');
}
await spawnAsync('git', [
'clone',
'--no-hardlinks',
'--depth',
'1',
gitRepoUri,
destinationPath,
]);
} finally {
await setGitCaseSensitivityAsync(isCaseSensitive);
}
}
public async getCommitHashAsync(): Promise<string | undefined> {
try {
return (await spawnAsync('git', ['rev-parse', 'HEAD'])).stdout.trim();
} catch (err) {
return undefined;
}
}
public async trackFileAsync(file: string): Promise<void> {
await spawnAsync('git', ['add', '--intent-to-add', file]);
}
public async getBranchNameAsync(): Promise<string | null> {
try {
return (await spawnAsync('git', ['rev-parse', '--abbrev-ref', 'HEAD'])).stdout.trim();
} catch (e) {
return null;
}
}
public async getLastCommitMessageAsync(): Promise<string | null> {
try {
return (await spawnAsync('git', ['--no-pager', 'log', '-1', '--pretty=%B'])).stdout.trim();
} catch (e) {
return null;
}
}
public async showDiffAsync(): Promise<void> {
const outputTooLarge = (await getGitDiffOutputAsync()).split(/\r\n|\r|\n/).length > 100;
await gitDiffAsync({ withPager: outputTooLarge });
}
public async isFileUntrackedAsync(path: string): Promise<boolean> {
const withUntrackedFiles = await gitStatusAsync({ showUntracked: true });
const trackedFiles = await gitStatusAsync({ showUntracked: false });
const pathWithoutLeadingDot = path.replace(/^\.\//, ''); // remove leading './' from path
return (
withUntrackedFiles.includes(pathWithoutLeadingDot) &&
!trackedFiles.includes(pathWithoutLeadingDot)
);
}
public async isFileIgnoredAsync(filePath: string): Promise<boolean> {
try {
await spawnAsync('git', ['check-ignore', '-q', filePath]);
return true;
} catch (e) {
return false;
}
}
}
async function isGitInstalledAsync(): Promise<boolean> {
export async function isGitInstalledAsync(): Promise<boolean> {
try {
await spawnAsync('git', ['--help']);
} catch (error: any) {
@@ -172,7 +12,7 @@ async function isGitInstalledAsync(): Promise<boolean> {
return true;
}
async function doesGitRepoExistAsync(): Promise<boolean> {
export async function doesGitRepoExistAsync(): Promise<boolean> {
try {
await spawnAsync('git', ['rev-parse', '--git-dir']);
return true;
@@ -184,54 +24,18 @@ async function doesGitRepoExistAsync(): Promise<boolean> {
interface GitStatusOptions {
showUntracked?: boolean;
}
async function gitStatusAsync({ showUntracked }: GitStatusOptions = {}): Promise<string> {
export async function gitStatusAsync({ showUntracked }: GitStatusOptions = {}): Promise<string> {
return (await spawnAsync('git', ['status', '-s', showUntracked ? '-uall' : '-uno'])).stdout;
}
async function getGitDiffOutputAsync(): Promise<string> {
export async function getGitDiffOutputAsync(): Promise<string> {
return (await spawnAsync('git', ['--no-pager', 'diff'])).stdout;
}
async function gitDiffAsync({ withPager = false }: { withPager?: boolean } = {}): Promise<void> {
export async function gitDiffAsync({
withPager = false,
}: { withPager?: boolean } = {}): Promise<void> {
const options = withPager ? [] : ['--no-pager'];
await spawnAsync('git', [...options, 'diff'], { stdio: ['ignore', 'inherit', 'inherit'] });
}
/**
* Checks if git is configured to be case sensitive
* @returns {boolean | undefined}
* - boolean - is git case senstive
* - undefined - case sensitivity is not configured and git is using default behavior
*/
async function isGitCaseSensitiveAsync(): Promise<boolean | undefined> {
if (process.platform !== 'darwin') {
return undefined;
}
try {
const result = await spawnAsync('git', ['config', '--get', 'core.ignorecase']);
const isIgnoreCaseEnabled = result.stdout.trim();
if (isIgnoreCaseEnabled === '') {
return undefined;
} else if (isIgnoreCaseEnabled === 'true') {
return false;
} else {
return true;
}
} catch (e) {
return undefined;
}
}
async function setGitCaseSensitivityAsync(enable: boolean | undefined): Promise<void> {
// we are assuming that if someone sets that on non-macos device then
// they know what they are doing
if (process.platform !== 'darwin') {
return;
}
if (enable === undefined) {
await spawnAsync('git', ['config', '--unset', 'core.ignorecase']);
} else {
await spawnAsync('git', ['config', 'core.ignorecase', String(!enable)]);
}
}
+14 -6
View File
@@ -1,18 +1,26 @@
import log from '../log';
import GitClient from './git';
import LocalClient from './local';
import GitNoCommitClient from './clients/gitNoCommit';
import NoVcsClient from './clients/noVcs';
import { Client } from './vcs';
const NO_VCS_WARNING = `Using EAS CLI without version control system is not recommended, use this mode only if you know what you are doing.`;
function resolveVcsClient(): Client {
let vcsClient = resolveDefaultVcsClient();
function resolveDefaultVcsClient(): Client {
if (process.env.EAS_NO_VCS) {
if (process.env.NODE_ENV !== 'test') {
log.warn(NO_VCS_WARNING);
}
return new LocalClient();
return new NoVcsClient();
}
return new GitClient();
return new GitNoCommitClient();
}
export default resolveVcsClient();
export function setVcsClient(client: Client): void {
vcsClient = client;
}
export function getVcsClient(): Client {
return vcsClient;
}
+65 -36
View File
@@ -1,37 +1,17 @@
import fg from 'fast-glob';
import fs from 'fs-extra';
import ignore, { Ignore } from 'ignore';
import createIgnore, { Ignore as SingleFileIgnore } from 'ignore';
import path from 'path';
import { Client } from './vcs';
const EASIGNORE_FILENAME = '.easignore';
const GITIGNORE_FILENAME = '.gitignore';
const DEFAULT_IGNORE = `
.git
node_modules
`;
export default class LocalClient extends Client {
public async getRootPathAsync(): Promise<string> {
return getRootPath();
}
public async makeShallowCopyAsync(destinationPath: string): Promise<void> {
const srcPath = getRootPath();
const ignore = await initIgnoreAsync();
await fs.copy(srcPath, destinationPath, {
filter: (srcFilePath: string) => {
if (srcFilePath === srcPath) {
return true;
}
return !ignore.ignores(path.relative(srcPath, srcFilePath));
},
});
}
public async isFileIgnoredAsync(filePath: string): Promise<boolean> {
return (await initIgnoreAsync()).ignores(filePath);
}
}
function getRootPath(): string {
export function getRootPath(): string {
const rootPath = process.env.EAS_PROJECT_ROOT ?? process.cwd();
if (!path.isAbsolute(rootPath)) {
return path.resolve(process.cwd(), rootPath);
@@ -39,17 +19,66 @@ function getRootPath(): string {
return rootPath;
}
async function initIgnoreAsync(): Promise<Ignore> {
const srcPath = getRootPath();
const easIgnorePath = path.join(srcPath, '.easignore');
const gitIgnorePath = path.join(srcPath, '.gitignore');
/**
* Ignore wraps the 'ignore' package to support multiple .gitignore files
* in subdirectories.
*
* Inconsistencies with git behavior:
* - if parent .gitignore has ignore rule and child has exception to that rule,
* file will still be ignored,
* - node_modules is always ignored,
* - if .easignore exists, .gitignore files are not used.
*/
export class Ignore {
private ignoreMapping: (readonly [string, SingleFileIgnore])[] = [];
let ignoreFile = DEFAULT_IGNORE;
if (await fs.pathExists(easIgnorePath)) {
ignoreFile = await fs.readFile(easIgnorePath, 'utf8');
} else if (await fs.pathExists(gitIgnorePath)) {
ignoreFile = await fs.readFile(gitIgnorePath, 'utf8');
constructor(private rootDir: string) {}
public async initIgnoreAsync(): Promise<void> {
const easIgnorePath = path.join(this.rootDir, EASIGNORE_FILENAME);
if (await fs.pathExists(easIgnorePath)) {
this.ignoreMapping = [
['', createIgnore().add(DEFAULT_IGNORE)],
['', createIgnore().add(await fs.readFile(easIgnorePath, 'utf8'))],
];
return;
}
const ignoreFilePaths = (
await fg(`**/${GITIGNORE_FILENAME}`, { cwd: this.rootDir, ignore: ['node_modules'] })
)
// ensure that parent dir is before child directories
.sort((a, b) => a.length - b.length && a.localeCompare(b));
const ignoreMapping = await Promise.all(
ignoreFilePaths.map(async filePath => {
return [
filePath.slice(0, filePath.length - GITIGNORE_FILENAME.length),
createIgnore().add(await fs.readFile(path.join(this.rootDir, filePath), 'utf8')),
] as const;
})
);
this.ignoreMapping = [['', createIgnore().add(DEFAULT_IGNORE)], ...ignoreMapping];
}
return ignore().add(ignoreFile);
public ignores(relativePath: string): boolean {
for (const [prefix, ignore] of this.ignoreMapping) {
if (relativePath.startsWith(prefix) && ignore.ignores(relativePath.slice(prefix.length))) {
return true;
}
}
return false;
}
}
export async function makeShallowCopyAsync(src: string, dst: string): Promise<void> {
const ignore = new Ignore(src);
await ignore.initIgnoreAsync();
await fs.copy(src, dst, {
filter: (srcFilePath: string) => {
if (srcFilePath === src) {
return true;
}
return !ignore.ignores(path.relative(src, srcFilePath));
},
});
}
+14 -5
View File
@@ -1,29 +1,38 @@
export abstract class Client {
// makeShallowCopyAsync should copy current project (result of getRootPathAsync()) to the specified
// destination, folder created this way will be uploaded "as is", so implementation should skip
// anything that is not commited to the repository. Most optimal solution is to create shallow clone
// anything that is not committed to the repository. Most optimal solution is to create shallow clone
// using tooling provided by specific VCS, that respects all ignore rules
public abstract makeShallowCopyAsync(destinationPath: string): Promise<void>;
// Find root of the repository.
//
// On windows path might look different depending on implementation
// - git based clients will return "C:/path/to/repo"
// - non-git clients will return "C:\path\to\repo"
public abstract getRootPathAsync(): Promise<string>;
// (optional) ensureRepoExistsAsync should verify whether repository exists and tooling is installed
// it's not required for minimal support, but lack of validation might cause the failure at a later stage.
public async ensureRepoExistsAsync(): Promise<void> {}
// (optional) hasUncommittedChangesAsync should check whether there are changes in local repository
// (optional) checks whether commit is necessary before calling makeShallowCopyAsync
//
// If it's not implemented method `makeShallowCopyAsync` needs to be able to include uncommited changes
// If it's not implemented method `makeShallowCopyAsync` needs to be able to include uncommitted changes
// when creating copy
public async hasUncommittedChangesAsync(): Promise<boolean> {
public async isCommitRequiredAsync(): Promise<boolean> {
return false;
}
// (optional) hasUncommittedChangesAsync should check whether there are changes in local repository
public async hasUncommittedChangesAsync(): Promise<boolean | undefined> {
return undefined;
}
// (optional) commitAsync commits changes
//
// - Should be implemented if hasUncommittedChangesAsync is implemented
// - If it's not implemented method `makeShallowCopyAsync` needs to be able to include uncommited changes
// - If it's not implemented method `makeShallowCopyAsync` needs to be able to include uncommitted changes
// in project copy
public async commitAsync(arg: {
commitMessage: string;
+8 -4
View File
@@ -1,15 +1,17 @@
{
"name": "@expo/eas-json",
"description": "A library for interacting with the eas.json",
"version": "0.33.0",
"description": "A library for interacting with eas.json",
"version": "0.34.1",
"author": "Expo <[email protected]>",
"bugs": "https://github.com/expo/eas-cli/issues",
"dependencies": {
"@expo/eas-build-job": "0.2.52",
"@expo/eas-build-job": "0.2.57",
"@expo/json-file": "8.2.33",
"chalk": "4.1.2",
"env-string": "1.0.1",
"fs-extra": "10.0.0",
"joi": "17.4.2",
"log-symbols": "4.1.0",
"tslib": "2.3.1"
},
"devDependencies": {
@@ -22,13 +24,15 @@
"homepage": "https://github.com/expo/eas-cli",
"license": "MIT",
"main": "build/index.js",
"types": "build/index.d.ts",
"repository": "expo/eas-cli",
"scripts": {
"build": "tsc --project tsconfig.build.json",
"watch": "yarn build --watch --preserveWatchOutput",
"typecheck": "tsc",
"prepack": "rm -rf build && yarn build",
"test": "jest"
"test": "jest",
"clean": "rm -rf build node_modules yarn-error.log"
},
"publishConfig": {
"access": "public"
@@ -1,58 +0,0 @@
import { Android, Cache, Ios } from '@expo/eas-build-job';
export enum CredentialsSource {
LOCAL = 'local',
REMOTE = 'remote',
}
export type AndroidDistributionType = 'store' | 'internal';
export type IosDistributionType = 'store' | 'internal' | 'simulator';
export type DistributionType = AndroidDistributionType | IosDistributionType;
export type IosEnterpriseProvisioning = 'adhoc' | 'universal';
export type VersionAutoIncrement = boolean | 'version' | 'buildNumber';
interface IosBuilderEnvironment extends Omit<Ios.BuilderEnvironment, 'image'> {
image?: Ios.BuilderEnvironment['image'];
}
export interface AndroidBuildProfile extends Android.BuilderEnvironment {
credentialsSource: CredentialsSource;
releaseChannel?: string;
channel?: string;
distribution: AndroidDistributionType;
cache: Cache;
withoutCredentials?: boolean;
buildType?: Android.BuildType;
gradleCommand?: string;
artifactPath?: string;
}
export interface IosBuildProfile extends IosBuilderEnvironment {
credentialsSource: CredentialsSource;
releaseChannel?: string;
channel?: string;
distribution: IosDistributionType;
enterpriseProvisioning?: IosEnterpriseProvisioning;
autoIncrement: VersionAutoIncrement;
cache: Cache;
artifactPath?: string;
scheme?: string;
schemeBuildConfiguration?: string;
buildType?: Ios.BuildType;
}
export type BuildProfile = AndroidBuildProfile | IosBuildProfile;
// EasConfig represents eas.json with one specific profile
export interface EasConfig {
builds: {
android?: AndroidBuildProfile;
ios?: IosBuildProfile;
};
}
@@ -1,190 +0,0 @@
import { Platform, Workflow } from '@expo/eas-build-job';
import fs from 'fs-extra';
import path from 'path';
import {
AndroidBuildProfile,
BuildProfile,
EasConfig,
IosBuildProfile,
} from './DeprecatedConfig.types';
import { EasJsonSchema, schemaBuildProfileMap } from './DeprecatedEasJsonSchema';
export interface EasJson {
builds: {
android?: { [key: string]: BuildProfilePreValidation };
ios?: { [key: string]: BuildProfilePreValidation };
};
}
interface BuildProfilePreValidation {
workflow?: Workflow;
extends?: string;
}
function intersect<T>(setA: Set<T>, setB: Set<T>): Set<T> {
return new Set([...setA].filter(i => setB.has(i)));
}
export class EasJsonReader {
constructor(private projectDir: string, private platform: 'android' | 'ios' | 'all') {}
/**
* Return build profile names for a particular platform.
* If platform is 'all', return common build profiles for all platforms
*/
public async getBuildProfileNamesAsync(): Promise<string[]> {
const easJson = await this.readRawAsync();
if (this.platform === 'android') {
return Object.keys(easJson?.builds?.android ?? {});
} else if (this.platform === 'ios') {
return Object.keys(easJson?.builds?.ios ?? {});
} else {
const intersectingProfileNames = intersect(
new Set(Object.keys(easJson?.builds?.ios ?? {})),
new Set(Object.keys(easJson?.builds?.android ?? {}))
);
return Array.from(intersectingProfileNames);
}
}
public async readAsync(buildProfileName: string): Promise<EasConfig> {
const easJson = await this.readRawAsync();
let androidConfig;
if (['android', 'all'].includes(this.platform)) {
androidConfig = this.validateBuildProfile<AndroidBuildProfile>(
Platform.ANDROID,
buildProfileName,
easJson.builds?.android || {}
);
}
let iosConfig;
if (['ios', 'all'].includes(this.platform)) {
iosConfig = this.validateBuildProfile<IosBuildProfile>(
Platform.IOS,
buildProfileName,
easJson.builds?.ios || {}
);
}
return {
builds: {
...(androidConfig ? { android: androidConfig } : {}),
...(iosConfig ? { ios: iosConfig } : {}),
},
};
}
public async validateAsync(): Promise<void> {
const easJson = await this.readRawAsync();
const androidProfiles = easJson.builds?.android ?? {};
for (const name of Object.keys(androidProfiles)) {
try {
this.validateBuildProfile(Platform.ANDROID, name, androidProfiles);
} catch (err: any) {
err.message = `Failed to validate Android build profile "${name}"\n${err.message}`;
throw err;
}
}
const iosProfiles = easJson.builds?.ios ?? {};
for (const name of Object.keys(iosProfiles)) {
try {
this.validateBuildProfile(Platform.IOS, name, iosProfiles);
} catch (err: any) {
err.message = `Failed to validate iOS build profile "${name}"\n${err.message}`;
throw err;
}
}
}
public async readRawAsync(): Promise<EasJson> {
const rawFile = await fs.readFile(path.join(this.projectDir, 'eas.json'), 'utf8');
const json = JSON.parse(rawFile);
const { value, error } = EasJsonSchema.validate(json, {
abortEarly: false,
});
if (error) {
throw new Error(`eas.json is not valid [${error.toString()}]`);
}
return value;
}
private validateBuildProfile<T extends BuildProfile>(
platform: Platform,
buildProfileName: string,
buildProfiles: Record<string, BuildProfilePreValidation>
): T {
const buildProfile = this.resolveBuildProfile(platform, buildProfileName, buildProfiles);
const schema = schemaBuildProfileMap[platform];
const { value, error } = schema.validate(buildProfile, {
stripUnknown: true,
convert: true,
abortEarly: false,
});
if (error) {
throw new Error(
`Object "${platform}.${buildProfileName}" in eas.json is not valid [${error.toString()}]`
);
}
return value;
}
private resolveBuildProfile(
platform: Platform,
buildProfileName: string,
buildProfiles: Record<string, BuildProfilePreValidation>,
depth: number = 0
): Record<string, any> {
if (depth >= 2) {
throw new Error(
'Too long chain of build profile extensions, make sure "extends" keys do not make a cycle'
);
}
const buildProfile = buildProfiles[buildProfileName];
if (!buildProfile) {
throw new Error(`There is no profile named ${buildProfileName} for platform ${platform}`);
}
const { extends: baseProfileName, ...buildProfileRest } = buildProfile;
if (baseProfileName) {
return deepMerge(
this.resolveBuildProfile(platform, baseProfileName, buildProfiles, depth + 1),
buildProfileRest
);
} else {
return buildProfileRest;
}
}
}
function isObject(value: any): boolean {
return typeof value === 'object' && value !== null;
}
export function deepMerge(
base: Record<string, any>,
update: Record<string, any>
): Record<string, any> {
const result: Record<string, any> = {};
Object.keys(base).forEach(key => {
const oldValue = base[key];
const newValue = update[key];
if (isObject(newValue) && isObject(oldValue)) {
result[key] = deepMerge(oldValue, newValue);
} else if (newValue !== undefined) {
result[key] = isObject(newValue) ? deepMerge({}, newValue) : newValue;
} else {
result[key] = isObject(oldValue) ? deepMerge({}, oldValue) : oldValue;
}
});
Object.keys(update).forEach(key => {
const newValue = update[key];
if (result[key] === undefined) {
result[key] = isObject(newValue) ? deepMerge({}, newValue) : newValue;
}
});
return result;
}
@@ -1,95 +0,0 @@
import { Android, Ios } from '@expo/eas-build-job';
import Joi, { CustomHelpers } from 'joi';
const semverSchemaCheck = (value: any, helpers: CustomHelpers): any => {
if (/^[0-9]+\.[0-9]+\.[0-9]+$/.test(value)) {
return value;
} else {
throw new Error(`${value} is not a valid version`);
}
};
const AndroidBuilderEnvironmentSchema = Joi.object({
image: Joi.string()
.valid(...Android.builderBaseImages)
.default('default'),
node: Joi.string().empty(null).custom(semverSchemaCheck),
yarn: Joi.string().empty(null).custom(semverSchemaCheck),
ndk: Joi.string().empty(null).custom(semverSchemaCheck),
expoCli: Joi.string().empty(null).custom(semverSchemaCheck),
env: Joi.object().pattern(Joi.string(), Joi.string().empty(null)).default({}),
});
const IosBuilderEnvironmentSchema = Joi.object({
image: Joi.string().valid(...Ios.builderBaseImages),
node: Joi.string().empty(null).custom(semverSchemaCheck),
yarn: Joi.string().empty(null).custom(semverSchemaCheck),
bundler: Joi.string().empty(null).custom(semverSchemaCheck),
fastlane: Joi.string().empty(null).custom(semverSchemaCheck),
cocoapods: Joi.string().empty(null).custom(semverSchemaCheck),
expoCli: Joi.string().empty(null).custom(semverSchemaCheck),
env: Joi.object().pattern(Joi.string(), Joi.string().empty(null)).default({}),
});
const CacheSchema = Joi.object({
disabled: Joi.boolean().default(false),
key: Joi.string().max(128),
cacheDefaultPaths: Joi.boolean().default(true),
customPaths: Joi.array().items(Joi.string()).default([]),
});
const AndroidSchema = Joi.object({
workflow: Joi.string(),
credentialsSource: Joi.string().valid('local', 'remote').default('remote'),
releaseChannel: Joi.string(),
channel: Joi.string(),
distribution: Joi.string().valid('store', 'internal').default('store'),
cache: CacheSchema.default(),
withoutCredentials: Joi.boolean().default(false),
artifactPath: Joi.string(),
gradleCommand: Joi.string(),
buildType: Joi.alternatives().conditional('distribution', {
is: 'internal',
then: Joi.string().valid('apk', 'development-client'),
otherwise: Joi.string().valid('apk', 'app-bundle', 'development-client'),
}),
}).concat(AndroidBuilderEnvironmentSchema);
const IosSchema = Joi.object({
workflow: Joi.string(),
credentialsSource: Joi.string().valid('local', 'remote').default('remote'),
releaseChannel: Joi.string(),
channel: Joi.string(),
distribution: Joi.string().valid('store', 'internal', 'simulator').default('store'),
enterpriseProvisioning: Joi.string().valid('adhoc', 'universal'),
autoIncrement: Joi.alternatives()
.try(Joi.boolean(), Joi.string().valid('version', 'buildNumber'))
.default(false),
cache: CacheSchema.default(),
artifactPath: Joi.string(),
scheme: Joi.string(),
schemeBuildConfiguration: Joi.string(),
buildType: Joi.string().valid('release', 'development-client'),
}).concat(IosBuilderEnvironmentSchema);
export const schemaBuildProfileMap: Record<string, Joi.Schema> = {
android: AndroidSchema,
ios: IosSchema,
};
export const EasJsonSchema = Joi.object({
builds: Joi.object({
android: Joi.object().pattern(
Joi.string(),
Joi.object({}).unknown(true) // profile is validated further only if build is for that platform
),
ios: Joi.object().pattern(
Joi.string(),
Joi.object({}).unknown(true) // profile is validated further only if build is for that platform
),
}),
});
+6
View File
@@ -19,7 +19,13 @@ export interface EasSubmitConfiguration {
[Platform.IOS]?: IosSubmitProfile;
}
export interface CliConfig {
version?: string;
requireCommit?: boolean;
}
export interface EasJson {
cli?: CliConfig;
build: { [profile: string]: RawBuildProfile };
submit?: { [profile: string]: EasSubmitConfiguration };
}
+42 -3
View File
@@ -4,9 +4,10 @@ import envString from 'env-string';
import path from 'path';
import { BuildProfile } from './EasBuild.types';
import { CredentialsSource, EasJson, RawBuildProfile } from './EasJson.types';
import { CliConfig, CredentialsSource, EasJson, RawBuildProfile } from './EasJson.types';
import {
AndroidSubmitProfileSchema,
CliConfigSchema,
EasJsonSchema,
IosSubmitProfileSchema,
MinimalEasJsonSchema,
@@ -16,8 +17,10 @@ import {
IosSubmitProfileFieldsToEvaluate,
SubmitProfile,
} from './EasSubmit.types';
import { InvalidEasJsonError } from './errors';
interface EasJsonPreValidation {
cli?: object;
build: { [profile: string]: object };
submit?: { [profile: string]: object };
}
@@ -27,11 +30,24 @@ const defaults = {
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[]> {
@@ -39,6 +55,29 @@ export class EasJsonReader {
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.code === 'ENOENT') {
return null;
}
throw err;
}
}
public async getSubmitProfileNamesAsync({ throwIfEasJsonDoesNotExist = true } = {}): Promise<
string[]
> {
@@ -121,7 +160,7 @@ export class EasJsonReader {
});
if (error) {
throw new Error(`eas.json is not valid [${error.toString()}]`);
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
return value as EasJson;
}
@@ -132,7 +171,7 @@ export class EasJsonReader {
const rawEasJson = JsonFile.read(easJsonPath);
const { value, error } = MinimalEasJsonSchema.validate(rawEasJson, { abortEarly: false });
if (error) {
throw new Error(`eas.json is not valid [${error.toString()}]`);
throw new InvalidEasJsonError(`eas.json is not valid [${error.toString()}]`);
}
return value;
} catch (err: any) {
+7
View File
@@ -107,12 +107,19 @@ const EasJsonSubmitConfigurationSchema = Joi.object({
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),
});
@@ -1,297 +0,0 @@
import { EasJson as DeprecatedEasJson } from '../DeprecatedEasJsonReader';
import { migrateProfile } from '../migrate';
test('migration for default manged eas.json', async () => {
const easJson = {
builds: {
android: {
release: {
buildType: 'app-bundle',
},
development: {
buildType: 'development-client',
distribution: 'internal',
},
},
ios: {
release: {
buildType: 'release',
},
development: {
buildType: 'development-client',
distribution: 'internal',
},
},
},
} as DeprecatedEasJson;
expect(migrateProfile(easJson, 'release')).toEqual({
android: {
buildType: 'app-bundle',
},
});
expect(migrateProfile(easJson, 'development')).toEqual({
developmentClient: true,
distribution: 'internal',
});
});
test('migration for default bare workflow eas.json', async () => {
const easJson = {
builds: {
android: {
release: {
gradleCommand: ':app:bundleRelease',
},
development: {
gradleCommand: ':app:assembleDebug',
distribution: 'internal',
},
},
ios: {
release: {
schemeBuildConfiguration: 'Release',
},
development: {
schemeBuildConfiguration: 'Debug',
distribution: 'internal',
},
},
},
} as DeprecatedEasJson;
expect(migrateProfile(easJson, 'release')).toEqual({
android: {
gradleCommand: ':app:bundleRelease',
},
ios: {
buildConfiguration: 'Release',
},
});
expect(migrateProfile(easJson, 'development')).toEqual({
distribution: 'internal',
android: {
gradleCommand: ':app:assembleDebug',
},
ios: {
buildConfiguration: 'Debug',
},
});
});
test('migration for example manged eas.json', async () => {
const easJson = {
builds: {
android: {
base: {
image: 'default',
env: {
EXAMPLE_ENV: 'example value',
},
},
release: {
extends: 'base',
env: {
ENVIRONMENT: 'production',
},
buildType: 'app-bundle',
},
staging: {
extends: 'base',
env: {
ENVIRONMENT: 'staging',
},
distribution: 'internal',
buildType: 'apk',
},
debug: {
extends: 'base',
withoutCredentials: true,
env: {
ENVIRONMENT: 'staging',
},
distribution: 'internal',
buildType: 'development-client',
},
},
ios: {
base: {
image: 'latest',
node: '12.13.0',
yarn: '1.22.5',
},
release: {
extends: 'base',
buildType: 'release',
env: {
ENVIRONMENT: 'production',
},
},
inhouse: {
extends: 'base',
distribution: 'internal',
enterpriseProvisioning: 'universal',
env: {
ENVIRONMENT: 'staging',
},
},
adhoc: {
extends: 'base',
distribution: 'internal',
env: {
ENVIRONMENT: 'staging',
},
},
client: {
extends: 'adhoc',
buildType: 'development-client',
},
},
},
} as DeprecatedEasJson;
expect(migrateProfile(easJson, 'base')).toEqual({
android: {
env: {
EXAMPLE_ENV: 'example value',
},
image: 'default',
},
ios: {
image: 'latest',
node: '12.13.0',
yarn: '1.22.5',
},
});
expect(migrateProfile(easJson, 'release')).toEqual({
extends: 'base',
android: {
buildType: 'app-bundle',
env: {
ENVIRONMENT: 'production',
},
},
ios: {
env: {
ENVIRONMENT: 'production',
},
},
});
expect(migrateProfile(easJson, 'staging')).toEqual({
android: {
buildType: 'apk',
distribution: 'internal',
env: {
ENVIRONMENT: 'staging',
},
},
});
expect(migrateProfile(easJson, 'inhouse')).toEqual({
ios: {
distribution: 'internal',
enterpriseProvisioning: 'universal',
env: {
ENVIRONMENT: 'staging',
},
},
});
});
test('migration for example bare workflow eas.json', async () => {
const easJson = {
builds: {
android: {
base: {
image: 'ubuntu-18.04-android-30-ndk-r19c',
ndk: '21.4.7075529',
env: {
EXAMPLE_ENV: 'example value',
},
},
release: {
extends: 'base',
env: {
ENVIRONMENT: 'production',
},
gradleCommand: ':app:bundleRelease',
},
staging: {
extends: 'base',
env: {
ENVIRONMENT: 'staging',
},
distribution: 'internal',
gradleCommand: ':app:assembleRelease',
},
debug: {
extends: 'base',
withoutCredentials: true,
env: {
ENVIRONMENT: 'staging',
},
distribution: 'internal',
gradleCommand: ':app:assembleDebug',
},
},
ios: {
base: {
image: 'latest',
node: '12.13.0',
yarn: '1.22.5',
},
release: {
extends: 'base',
schemeBuildConfiguration: 'Release',
scheme: 'testapp',
env: {
ENVIRONMENT: 'production',
},
},
inhouse: {
extends: 'base',
distribution: 'internal',
enterpriseProvisioning: 'universal',
scheme: 'testapp-enterprise',
env: {
ENVIRONMENT: 'staging',
},
},
adhoc: {
extends: 'base',
distribution: 'internal',
scheme: 'testapp',
env: {
ENVIRONMENT: 'staging',
},
},
},
},
} as DeprecatedEasJson;
expect(migrateProfile(easJson, 'base')).toEqual({
android: {
env: {
EXAMPLE_ENV: 'example value',
},
image: 'ubuntu-18.04-android-30-ndk-r19c',
ndk: '21.4.7075529',
},
ios: {
image: 'latest',
node: '12.13.0',
yarn: '1.22.5',
},
});
expect(migrateProfile(easJson, 'release')).toEqual({
extends: 'base',
android: {
env: {
ENVIRONMENT: 'production',
},
gradleCommand: ':app:bundleRelease',
},
ios: {
buildConfiguration: 'Release',
env: {
ENVIRONMENT: 'production',
},
scheme: 'testapp',
},
});
});
+1
View File
@@ -0,0 +1 @@
export class InvalidEasJsonError extends Error {}
+1 -1
View File
@@ -17,4 +17,4 @@ export {
AndroidVersionAutoIncrement,
} from './EasBuild.types';
export { EasJsonReader } from './EasJsonReader';
export { hasMismatchedExtendsAsync, isUsingDeprecatedFormatAsync, migrateAsync } from './migrate';
export * as errors from './errors';
-182
View File
@@ -1,182 +0,0 @@
import { Android, Ios } from '@expo/eas-build-job';
import JsonFile, { JSONObject } from '@expo/json-file';
import fs from 'fs-extra';
import path from 'path';
import { AndroidBuildProfile, IosBuildProfile } from './DeprecatedConfig.types';
import { EasJson as DeprecatedEasJson, EasJsonReader } from './DeprecatedEasJsonReader';
import { EasJson, RawBuildProfile } from './EasJson.types';
export async function isUsingDeprecatedFormatAsync(projectDir: string): Promise<boolean> {
const easJsonPath = path.join(projectDir, 'eas.json');
if (!(await fs.pathExists(easJsonPath))) {
return false;
}
const json = await readEasJsonAsync(projectDir);
return !!json?.builds;
}
export async function hasMismatchedExtendsAsync(projectDir: string): Promise<boolean> {
const rawEasJson = (await readEasJsonAsync(projectDir)) as unknown as DeprecatedEasJson;
const profiles = new Set<string>();
Object.keys(rawEasJson.builds.android ?? {}).forEach(profile => profiles.add(profile));
Object.keys(rawEasJson.builds.ios ?? {}).forEach(profile => profiles.add(profile));
let hasMismatchedExtendsKeys = false;
profiles.forEach(profileName => {
if (
rawEasJson?.builds?.ios?.[profileName]?.extends !==
rawEasJson?.builds?.android?.[profileName]?.extends
) {
hasMismatchedExtendsKeys = true;
}
});
return hasMismatchedExtendsKeys;
}
export async function migrateAsync(projectDir: string): Promise<void> {
const reader = new EasJsonReader(projectDir, 'all');
try {
await reader.validateAsync();
} catch (err: any) {
throw new Error(`Valid eas.json is required to migrate to the new format\n${err.message}`);
}
const rawEasJson = (await readEasJsonAsync(projectDir)) as unknown as DeprecatedEasJson;
const profiles = new Set<string>();
Object.keys(rawEasJson.builds.android ?? {}).forEach(profile => profiles.add(profile));
Object.keys(rawEasJson.builds.ios ?? {}).forEach(profile => profiles.add(profile));
const result: EasJson = {
build: {},
};
profiles.forEach(profileName => {
result.build[profileName] = migrateProfile(rawEasJson, profileName);
});
await fs.writeFile(path.join(projectDir, 'eas.json'), `${JSON.stringify(result, null, 2)}\n`);
}
async function readEasJsonAsync(projectDir: string): Promise<JSONObject> {
try {
const easJsonPath = path.join(projectDir, 'eas.json');
return JsonFile.read(easJsonPath);
} catch (err: any) {
if (err.code === 'EJSONPARSE') {
err.message = `Found invalid JSON in eas.json. ${err.message}`;
}
throw err;
}
}
interface MigrateContext {
androidProfile?: Partial<AndroidBuildProfile>;
iosProfile?: Partial<IosBuildProfile>;
}
export function migrateProfile(
rawEasJson: DeprecatedEasJson,
profileName: string
): RawBuildProfile {
const androidProfile = (rawEasJson?.builds?.android?.[profileName] ??
{}) as AndroidBuildProfile & { extends?: string };
const iosProfile = (rawEasJson?.builds?.ios?.[profileName] ?? {}) as IosBuildProfile & {
extends?: string;
};
let profile: RawBuildProfile = {
android: {},
ios: {},
};
const ctx = { androidProfile, iosProfile };
const androidCtx = { androidProfile };
const iosCtx = { iosProfile };
// simple common values
profile = migrateProperty('credentialsSource', profile, ctx);
profile = migrateProperty('releaseChannel', profile, ctx);
profile = migrateProperty('channel', profile, ctx);
profile = migrateProperty('node', profile, ctx);
profile = migrateProperty('yarn', profile, ctx);
profile = migrateProperty('expoCli', profile, ctx);
if (androidProfile.extends && androidProfile.extends === iosProfile.extends) {
profile = migrateProperty('extends', profile, ctx);
}
// android
profile = migrateProperty('image', profile, androidCtx);
profile = migrateProperty('ndk', profile, androidCtx);
profile = migrateProperty('gradleCommand', profile, androidCtx);
profile = migrateProperty('artifactPath', profile, androidCtx);
profile = migrateProperty('env', profile, androidCtx);
profile = migrateProperty('cache', profile, androidCtx);
profile = migrateProperty('withoutCredentials', profile, androidCtx);
// ios
profile = migrateProperty('enterpriseProvisioning', profile, iosCtx);
profile = migrateProperty('autoIncrement', profile, iosCtx);
profile = migrateProperty('image', profile, iosCtx);
profile = migrateProperty('bundler', profile, iosCtx);
profile = migrateProperty('fastlane', profile, iosCtx);
profile = migrateProperty('cocoapods', profile, iosCtx);
profile = migrateProperty('artifactPath', profile, iosCtx);
profile = migrateProperty('scheme', profile, iosCtx);
profile = migrateProperty('env', profile, iosCtx);
profile = migrateProperty('cache', profile, iosCtx);
profile = migrateProperty('developmentClient', profile, {
androidProfile: {
...androidProfile,
developmentClient:
androidProfile.buildType === Android.BuildType.DEVELOPMENT_CLIENT || undefined,
} as any,
iosProfile: {
...iosProfile,
developmentClient: iosProfile.buildType === Ios.BuildType.DEVELOPMENT_CLIENT || undefined,
} as any,
});
if (
androidProfile.buildType &&
androidProfile.buildType !== Android.BuildType.DEVELOPMENT_CLIENT
) {
profile.android!.buildType = androidProfile.buildType;
}
if (iosProfile.distribution === 'simulator') {
profile.ios!.simulator = true;
delete (iosProfile as any).distribution;
}
profile = migrateProperty('distribution', profile, ctx);
if (iosProfile.schemeBuildConfiguration) {
profile.ios!.buildConfiguration = iosProfile.schemeBuildConfiguration;
}
if (Object.keys(profile.android ?? {}).length === 0) {
delete profile.android;
}
if (Object.keys(profile.ios ?? {}).length === 0) {
delete profile.ios;
}
return profile;
}
function migrateProperty(
key: string,
profile: RawBuildProfile,
ctx: MigrateContext
): RawBuildProfile {
const androidProperty = (ctx.androidProfile as any)?.[key];
const iosProperty = (ctx.iosProfile as any)?.[key];
if (androidProperty && iosProperty && androidProperty === iosProperty) {
return { ...profile, [key]: androidProperty };
} else {
return {
...profile,
android: {
...profile.android,
...(androidProperty ? { [key]: androidProperty } : {}),
},
ios: {
...profile.ios,
...(iosProperty ? { [key]: iosProperty } : {}),
},
};
}
}
Generated
+26 -26
View File
@@ -848,10 +848,10 @@
mv "~2"
safe-json-stringify "~1"
"@expo/[email protected].2":
version "4.0.2"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.2.tgz#6c83ae373c12a240ccadc2322bd8267e4eb91f7b"
integrity sha512-j8IOVH0yL7ZDYcoozdpQb3ZuwUM/4eZ1QWy4icovjlyXGtRFyJvWZitZkA/7HK1+0mS2ZNSW28elp+LVTX3UfA==
"@expo/[email protected].3":
version "4.0.3"
resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-4.0.3.tgz#8680dea2709c70f3a9c9e77ca6057335758341a8"
integrity sha512-vJ+4YOXxAjznpIG0WQHNsbeeJQXS/ZxzVPHhOO3le8Lkl+WJ2eH7XypulPRalBI4E0WLFtzDzLIdnqYJyjzvaw==
dependencies:
"@expo/config-types" "^43.0.0"
"@expo/json-file" "8.2.33"
@@ -867,20 +867,20 @@
semver "^7.3.5"
slash "^3.0.0"
xcode "^3.0.1"
xml2js "^0.4.23"
xml2js "0.4.23"
"@expo/config-types@^43.0.0":
version "43.0.0"
resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-43.0.0.tgz#e283a4a1b72a655a6a2a745bd277caef58c8edb0"
integrity sha512-GBbEtLdGX40DJ1wTixWtOHseupA5xWclV57KNZ58ebauWAOyK3Fyni7GD2OCOzxTIFi1nSjqgO9JlMp3ayP4Tw==
"@expo/[email protected].2":
version "6.0.2"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.2.tgz#d778be85a6b9f9fdb1f453464ba4c3420ba410d1"
integrity sha512-UjNlbs3gYfYnb+8If5dijepRz2+J8sXdmF9bvGQ2LUULdpO0Bx7EbLErctzrFXlK3j7jw1esPWWNfVq5wIlEwg==
"@expo/[email protected].3":
version "6.0.3"
resolved "https://registry.yarnpkg.com/@expo/config/-/config-6.0.3.tgz#48e5d453ae00ca090ea47799f4a9f352d5136a89"
integrity sha512-Qo2OVDfKbCyLiG3g2vqrPQXBBGRB2I3ADIB/8nZ3Ypy7QhqOA1L7WYhTQQr3T1zknHTMzy7u61ArHweiAnEEpw==
dependencies:
"@babel/code-frame" "~7.10.4"
"@expo/config-plugins" "4.0.2"
"@expo/config-plugins" "4.0.3"
"@expo/config-types" "^43.0.0"
"@expo/json-file" "8.2.33"
getenv "^1.0.0"
@@ -891,18 +891,18 @@
slugify "^1.3.4"
sucrase "^3.20.0"
"@expo/[email protected]2":
version "0.2.52"
resolved "https://registry.yarnpkg.com/@expo/eas-build-job/-/eas-build-job-0.2.52.tgz#889025a412c21e2c77a0c42d342916e2a2569a50"
integrity sha512-1bfOp/dMOf3zbnfJnES3y2z/+pAwNUIIaicnMURY2JLars+3gkQOKm26nk+FnTTE/8QykmIocls6RhlPqCNnUg==
"@expo/[email protected]7":
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==
dependencies:
joi "^17.4.2"
semver "^7.3.5"
"@expo/[email protected]6":
version "0.3.16"
resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.16.tgz#df4b38b728d29ae8bed686866dc264a2d64577e6"
integrity sha512-ZggQK5w7awqYdA/TE0DT02nYxWirQm2r7NNy043zVtzBCtjhLpFpluk1v9W0pH4+nT1ChGk1c67j0mYRKcBkjg==
"@expo/[email protected]7":
version "0.3.17"
resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.17.tgz#75e2606749ffa1284de570245f668503e4a06c3f"
integrity sha512-zaOj24JK5F+pPGpULP8D9aAbApcR7ixV2GjT43YzZqjHuyxQ5knI+EsbmZ1TNnA1vNJJKMYrigB5+chcUGwkpw==
dependencies:
"@expo/spawn-async" "1.5.0"
chalk "^4.0.0"
@@ -985,15 +985,15 @@
lodash.template "^4.4.0"
semver "^7.3.2"
"@expo/[email protected].2":
version "3.0.2"
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.0.2.tgz#8b0fae285efbfede82d6b3aaee96ea8ea10307de"
integrity sha512-iEKcjbbwrICRgqAPNcyI3g2MkZx3gkmD9KE7flfWJwC+6XzYC8DBz9vN5mVAu8GX3S9H16sC2tF4ZspVC6WHDg==
"@expo/[email protected].3":
version "3.0.3"
resolved "https://registry.yarnpkg.com/@expo/prebuild-config/-/prebuild-config-3.0.3.tgz#448f48aab2a28af6b12dc1a95696dbd08f5668f3"
integrity sha512-7r/Wfzs2QNm8RvnbT1LFZ+Xkb3vrcLVGwkRt1BHPxmRFwq4SNwhkMyLPopQEjUhJU3AqLn6EKItS39+9c2f8vg==
dependencies:
"@expo/config" "6.0.2"
"@expo/config-plugins" "4.0.2"
"@expo/config" "6.0.3"
"@expo/config-plugins" "4.0.3"
"@expo/config-types" "^43.0.0"
"@expo/image-utils" "0.3.16"
"@expo/image-utils" "0.3.17"
"@expo/json-file" "8.2.33"
debug "^4.3.1"
fs-extra "^9.0.0"
@@ -10939,7 +10939,7 @@ xml-name-validator@^3.0.0:
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
xml2js@^0.4.23:
[email protected]:
version "0.4.23"
resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.23.tgz#a0c69516752421eb2ac758ee4d4ccf58843eac66"
integrity sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==