mirror of
https://github.com/expo/eas-cli.git
synced 2026-11-15 17:31:46 -10:00
Compare commits
123
Commits
v3.2.0
...
@quin/warnPlan
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0bcd94e83f | ||
|
|
da4b56a58d | ||
|
|
1080600af6 | ||
|
|
dcb6713f12 | ||
|
|
24a1d2d581 | ||
|
|
8af88c2d29 | ||
|
|
d416ac2162 | ||
|
|
7bf0493a4d | ||
|
|
91f32cc377 | ||
|
|
cf54f62bac | ||
|
|
3ef3e8447c | ||
|
|
ad64e1afad | ||
|
|
a0800cf7ef | ||
|
|
34436ee674 | ||
|
|
1072b75927 | ||
|
|
c0c9d2e7df | ||
|
|
19b831667f | ||
|
|
09db7da23b | ||
|
|
f08dde2469 | ||
|
|
213b5d240c | ||
|
|
16ebdce913 | ||
|
|
121ff7a718 | ||
|
|
360393f647 | ||
|
|
82d66054dc | ||
|
|
d8849dbf8c | ||
|
|
4d6b5f435b | ||
|
|
8fe7dfea29 | ||
|
|
8750155c25 | ||
|
|
a0fce1c773 | ||
|
|
cad3dca5df | ||
|
|
2ef6e79395 | ||
|
|
44270814a7 | ||
|
|
95155681db | ||
|
|
53fd599d0a | ||
|
|
b51201d010 | ||
|
|
f86c079733 | ||
|
|
843ec7407b | ||
|
|
537cd7872a | ||
|
|
007c40bed4 | ||
|
|
ba9f8d8ddd | ||
|
|
e4bd933e81 | ||
|
|
a6434bf6b8 | ||
|
|
19bad84109 | ||
|
|
5d9f8f9d76 | ||
|
|
d9d884d211 | ||
|
|
f902bb845b | ||
|
|
03c76c1e0e | ||
|
|
1d0d329cdb | ||
|
|
7ed1efb7d6 | ||
|
|
b7bfec0366 | ||
|
|
a5308f0d37 | ||
|
|
3ad644bb9d | ||
|
|
233e5451a8 | ||
|
|
ce954cdecc | ||
|
|
59bd1caf98 | ||
|
|
86877fdda3 | ||
|
|
9299c9b7cc | ||
|
|
64fb2e5b3a | ||
|
|
91fdbac773 | ||
|
|
507eadb914 | ||
|
|
f1cde7a291 | ||
|
|
8b9ad47d16 | ||
|
|
192984b47d | ||
|
|
2c36810ce7 | ||
|
|
bfa63f95fe | ||
|
|
c414b9f975 | ||
|
|
6946a085cb | ||
|
|
317d2fcbb6 | ||
|
|
dd61b4bb70 | ||
|
|
80fbf7cf62 | ||
|
|
26b6a17160 | ||
|
|
7f4e2eef95 | ||
|
|
88b683655c | ||
|
|
f3aa3d98d6 | ||
|
|
f852b9329d | ||
|
|
a2340531b0 | ||
|
|
39df3a1364 | ||
|
|
2f1d454582 | ||
|
|
e2560ea867 | ||
|
|
346d136b8b | ||
|
|
dd77312510 | ||
|
|
120a965368 | ||
|
|
050336b6fd | ||
|
|
7fc3e3fcdb | ||
|
|
2d117e5b4a | ||
|
|
131377bd2c | ||
|
|
ed61b0c41b | ||
|
|
9f4d3bfc56 | ||
|
|
306e7b1d71 | ||
|
|
a2b73844f0 | ||
|
|
ebbe786cd0 | ||
|
|
190172f06c | ||
|
|
2232a5ed59 | ||
|
|
ef3e9079e5 | ||
|
|
ec10eff1e6 | ||
|
|
3e3ec87622 | ||
|
|
f1cf92d63a | ||
|
|
7096daa116 | ||
|
|
6429e70a9a | ||
|
|
083381da82 | ||
|
|
1c1af2da86 | ||
|
|
72ce75e1ee | ||
|
|
ea553a1025 | ||
|
|
3a6bcb3f2e | ||
|
|
8b27255ce2 | ||
|
|
1f0ae27ea0 | ||
|
|
62d26ca32b | ||
|
|
3aebb54d11 | ||
|
|
0bf42e4cd4 | ||
|
|
ec4ef42f3c | ||
|
|
a70222d35d | ||
|
|
d20db0fff4 | ||
|
|
00ef6087f8 | ||
|
|
9c74c5c6b8 | ||
|
|
719febc519 | ||
|
|
9d9c99c0f6 | ||
|
|
e42031eaef | ||
|
|
9ec43bce84 | ||
|
|
488c3b3cb8 | ||
|
|
f5ac3d26a0 | ||
|
|
6be86d5119 | ||
|
|
04025802ac | ||
|
|
0a4c8785e6 |
No files matched your search
@@ -37,7 +37,7 @@ body:
|
|||||||
required: true
|
required: true
|
||||||
attributes:
|
attributes:
|
||||||
label: Environment
|
label: Environment
|
||||||
description: Run `npx expo-env-info` and `expo doctor`, and paste the output here.
|
description: Run `npx expo-env-info` and `npx expo-doctor`, and paste the output here.
|
||||||
- type: textarea
|
- type: textarea
|
||||||
validations:
|
validations:
|
||||||
required: false
|
required: false
|
||||||
|
|||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
"printWidth": 100,
|
||||||
|
"singleQuote": true
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
name: notify-slack-on-fail-or-recover
|
||||||
|
|
||||||
|
inputs:
|
||||||
|
channel:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
slack_webhook:
|
||||||
|
required: true
|
||||||
|
type: string
|
||||||
|
|
||||||
|
runs:
|
||||||
|
using: 'composite'
|
||||||
|
steps:
|
||||||
|
- name: Get previous workflow run status
|
||||||
|
uses: actions/github-script@v6
|
||||||
|
id: run-status
|
||||||
|
with:
|
||||||
|
script: |
|
||||||
|
const script = require('.github/internal-actions/notify-slack-on-fail-or-recover/main.js');
|
||||||
|
return await script({github, context, core});
|
||||||
|
|
||||||
|
- name: Commit subject
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
subject="$(git show --format=%s --quiet | sed 's/"/\\"/g')"
|
||||||
|
echo "${{ fromJSON(steps.run-status.outputs.result).previous }}"
|
||||||
|
echo "SUBJECT=$subject" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Send Slack Success Notification
|
||||||
|
if: fromJSON(steps.run-status.outputs.result).previous == 'failure' && fromJSON(steps.run-status.outputs.result).current == 'success'
|
||||||
|
uses: rtCamp/action-slack-notify@v2
|
||||||
|
env:
|
||||||
|
SLACK_CHANNEL: ${{ inputs.channel }}
|
||||||
|
SLACK_COLOR: good
|
||||||
|
SLACK_ICON: https://github.com/expo-bot.png?size=48
|
||||||
|
SLACK_TITLE: 'Fixed, was failing'
|
||||||
|
SLACK_MESSAGE: ${{ env.SUBJECT }}
|
||||||
|
SLACK_USERNAME: 'EAS CLI CI'
|
||||||
|
SLACK_WEBHOOK: ${{ inputs.slack_webhook }}
|
||||||
|
SLACK_FOOTER: ''
|
||||||
|
|
||||||
|
- name: Send Slack Failure Notification
|
||||||
|
if: fromJSON(steps.run-status.outputs.result).current == 'failure'
|
||||||
|
uses: rtCamp/action-slack-notify@v2
|
||||||
|
env:
|
||||||
|
SLACK_CHANNEL: ${{ inputs.channel }}
|
||||||
|
SLACK_COLOR: danger
|
||||||
|
SLACK_ICON: https://github.com/expo-bot.png?size=48
|
||||||
|
SLACK_TITLE: 'Failed'
|
||||||
|
SLACK_MESSAGE: ${{ env.SUBJECT }}
|
||||||
|
SLACK_USERNAME: 'EAS CLI CI'
|
||||||
|
SLACK_WEBHOOK: ${{ inputs.slack_webhook }}
|
||||||
|
SLACK_FOOTER: ''
|
||||||
@@ -0,0 +1,155 @@
|
|||||||
|
function updateOctokitInstance(github) {
|
||||||
|
updateGithubRestActions(github);
|
||||||
|
addConvenienceMethods(github);
|
||||||
|
}
|
||||||
|
|
||||||
|
function addConvenienceMethods(github) {
|
||||||
|
Object.assign(github, {
|
||||||
|
// checks if a run is a failure from the perspective of sending Slack
|
||||||
|
// notifications. Works for both runs and run attempts, which should be the
|
||||||
|
// same object shapes.
|
||||||
|
// When a run has not been completed, it fetches the jobs for the workflow
|
||||||
|
// to check if the job is "failing" instead of "failed".
|
||||||
|
async isFailedRun(run) {
|
||||||
|
console.log(`checking run: ${run.id}`);
|
||||||
|
console.log(`status: ${run.status}`);
|
||||||
|
console.log(`conclusion: ${run.conclusion}`);
|
||||||
|
console.log(`run_attempt: ${run.run_attempt}`);
|
||||||
|
|
||||||
|
if (run.status === 'completed') {
|
||||||
|
console.log('completed -- checking conclusion');
|
||||||
|
return run.conclusion === 'failure' || run.conclusion === 'timed_out';
|
||||||
|
}
|
||||||
|
|
||||||
|
const owner = run.repository.owner.login;
|
||||||
|
const repo = run.repository.name;
|
||||||
|
const jobsResp = await github.rest.actions.listJobsForWorkflowRun({
|
||||||
|
owner,
|
||||||
|
repo,
|
||||||
|
run_id: run.id,
|
||||||
|
});
|
||||||
|
|
||||||
|
console.log('checking jobs');
|
||||||
|
const jobs = jobsResp.data;
|
||||||
|
for (const job of jobs.jobs) {
|
||||||
|
if (job.conclusion === 'failure' || job.conclusion === 'timed_out') {
|
||||||
|
console.log('job failed');
|
||||||
|
return true;
|
||||||
|
} else if (job.status === 'completed') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const step of job.steps) {
|
||||||
|
if (step.conclusion === 'failure') {
|
||||||
|
console.log('job step failed');
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// github-script's Octokit/REST plugins are out of date, so we have to
|
||||||
|
// add our own custom endpoint method
|
||||||
|
// see https://octokit.github.io/rest.js/v18#custom-endpoint-methods for
|
||||||
|
// documentation
|
||||||
|
function updateGithubRestActions(github) {
|
||||||
|
Object.assign(github.rest.actions, {
|
||||||
|
getWorkflowRunAttempt: github.request.defaults({
|
||||||
|
method: 'GET',
|
||||||
|
url: '/repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}',
|
||||||
|
params: {
|
||||||
|
owner: {
|
||||||
|
required: true,
|
||||||
|
type: 'string',
|
||||||
|
},
|
||||||
|
repo: {
|
||||||
|
required: true,
|
||||||
|
type: 'string',
|
||||||
|
},
|
||||||
|
run_id: {
|
||||||
|
required: true,
|
||||||
|
type: 'number',
|
||||||
|
},
|
||||||
|
attempt_number: {
|
||||||
|
required: true,
|
||||||
|
type: 'number',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns { current: 'failure' } | { current: 'success', previous: 'success' | 'failure' } to indicate the failure status
|
||||||
|
// of the current and previous runs
|
||||||
|
module.exports = async ({ github }) => {
|
||||||
|
const { GITHUB_REPOSITORY, GITHUB_RUN_ID, GITHUB_REF_NAME } = process.env;
|
||||||
|
const [owner, repo] = GITHUB_REPOSITORY.split('/');
|
||||||
|
updateOctokitInstance(github);
|
||||||
|
|
||||||
|
const workflowRunResp = await github.rest.actions.getWorkflowRun({
|
||||||
|
owner,
|
||||||
|
repo,
|
||||||
|
run_id: GITHUB_RUN_ID,
|
||||||
|
});
|
||||||
|
|
||||||
|
const currentRun = workflowRunResp.data;
|
||||||
|
const listWorkflowRunsResp = await github.rest.actions.listWorkflowRuns({
|
||||||
|
owner,
|
||||||
|
repo,
|
||||||
|
workflow_id: currentRun.workflow_id,
|
||||||
|
branch: GITHUB_REF_NAME,
|
||||||
|
});
|
||||||
|
const { workflow_runs } = listWorkflowRunsResp.data;
|
||||||
|
|
||||||
|
if (workflow_runs.length === 1 && workflow_runs[0].run_attempt === 1) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const previousRuns = workflow_runs.filter(
|
||||||
|
(run) => run.status === 'completed' && run.conclusion !== 'cancelled'
|
||||||
|
);
|
||||||
|
|
||||||
|
if (await github.isFailedRun(currentRun)) {
|
||||||
|
return { current: 'failure', previous: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
if (currentRun.run_attempt === 1 && previousRuns.length > 0) {
|
||||||
|
return {
|
||||||
|
current: 'success',
|
||||||
|
previous: (await github.isFailedRun(previousRuns[0])) ? 'failure' : 'success',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
for (let i = currentRun.run_attempt - 1; i > 0; i--) {
|
||||||
|
const previousAttemptResp = await github.rest.actions.getWorkflowRunAttempt({
|
||||||
|
owner,
|
||||||
|
repo,
|
||||||
|
run_id: currentRun.id,
|
||||||
|
attempt_number: i,
|
||||||
|
});
|
||||||
|
const previousAttempt = previousAttemptResp.data;
|
||||||
|
if (
|
||||||
|
previousAttempt.conclusion === 'success' ||
|
||||||
|
previousAttempt.conclusion === 'failure' ||
|
||||||
|
previousAttempt.conclusion === 'timed_out'
|
||||||
|
) {
|
||||||
|
return {
|
||||||
|
current: 'success',
|
||||||
|
previous: (await github.isFailedRun(previousAttempt)) ? 'failure' : 'success',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (previousRuns.length > 0) {
|
||||||
|
return {
|
||||||
|
current: 'success',
|
||||||
|
previous: (await github.isFailedRun(previousRuns[0])) ? 'failure' : 'success',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return { current: 'success', previous: 'success' };
|
||||||
|
};
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
{
|
||||||
|
"name": "notify-slack-on-fail-or-recover",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "A GitHub Action to notify Expo Slack of build failures and recovery.",
|
||||||
|
"main": "main.js",
|
||||||
|
"author": "Expo",
|
||||||
|
"license": "UNLICENSED",
|
||||||
|
"private": true,
|
||||||
|
"devDependencies": {
|
||||||
|
"prettier": "^2.5.1"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
|
||||||
|
# yarn lockfile v1
|
||||||
|
|
||||||
|
|
||||||
|
[email protected]:
|
||||||
|
version "2.5.1"
|
||||||
|
resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
|
||||||
|
integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==
|
||||||
@@ -10,6 +10,8 @@ jobs:
|
|||||||
if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
|
if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.EXPO_BOT_PAT }}
|
||||||
- uses: actions/setup-node@v2
|
- uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: 18
|
node-version: 18
|
||||||
|
|||||||
@@ -36,10 +36,10 @@ jobs:
|
|||||||
yarn pretarball-ci
|
yarn pretarball-ci
|
||||||
yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
|
yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
|
||||||
- id: x64
|
- id: x64
|
||||||
run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
|
run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
|
||||||
working-directory: ${{ github.workspace }}/packages/eas-cli/dist
|
working-directory: ${{ github.workspace }}/packages/eas-cli/dist
|
||||||
- id: arm
|
- id: arm
|
||||||
run: echo "::set-output name=filename::$(ls eas-*-arm.tar.gz)"
|
run: echo "filename=$(ls eas-*-arm.tar.gz)" >> $GITHUB_OUTPUT
|
||||||
working-directory: ${{ github.workspace }}/packages/eas-cli/dist
|
working-directory: ${{ github.workspace }}/packages/eas-cli/dist
|
||||||
- name: Upload linux-x64 tarball
|
- name: Upload linux-x64 tarball
|
||||||
uses: actions/upload-release-asset@v1
|
uses: actions/upload-release-asset@v1
|
||||||
@@ -77,7 +77,7 @@ jobs:
|
|||||||
yarn pretarball-ci
|
yarn pretarball-ci
|
||||||
yarn oclif pack:tarballs --no-xz --targets darwin-x64
|
yarn oclif pack:tarballs --no-xz --targets darwin-x64
|
||||||
- id: x64
|
- id: x64
|
||||||
run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
|
run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
|
||||||
working-directory: ${{ github.workspace }}/packages/eas-cli/dist
|
working-directory: ${{ github.workspace }}/packages/eas-cli/dist
|
||||||
- name: Upload darwin-x64 tarball
|
- name: Upload darwin-x64 tarball
|
||||||
uses: actions/upload-release-asset@v1
|
uses: actions/upload-release-asset@v1
|
||||||
@@ -105,10 +105,10 @@ jobs:
|
|||||||
yarn oclif pack:win
|
yarn oclif pack:win
|
||||||
working-directory: ${{ github.workspace }}/packages/eas-cli
|
working-directory: ${{ github.workspace }}/packages/eas-cli
|
||||||
- id: x64
|
- id: x64
|
||||||
run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
|
run: echo "filename=$(ls eas-*-x64.exe)" >> $GITHUB_OUTPUT
|
||||||
working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
|
working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
|
||||||
- id: x86
|
- id: x86
|
||||||
run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
|
run: echo "filename=$(ls eas-*-x86.exe)" >> $GITHUB_OUTPUT
|
||||||
working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
|
working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
|
||||||
- name: Upload x64 installer
|
- name: Upload x64 installer
|
||||||
uses: actions/upload-release-asset@v1
|
uses: actions/upload-release-asset@v1
|
||||||
@@ -147,12 +147,22 @@ jobs:
|
|||||||
run: yarn lerna publish from-package --yes --no-verify-access
|
run: yarn lerna publish from-package --yes --no-verify-access
|
||||||
env:
|
env:
|
||||||
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
|
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
|
||||||
|
- name: Add latest-eas-build-staging tag
|
||||||
|
run: |
|
||||||
|
VERSION=$(cat lerna.json | jq -r .version)
|
||||||
|
echo //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN > ~/.npmrc
|
||||||
|
npm dist-tag add eas-cli@$VERSION latest-eas-build-staging
|
||||||
|
echo "Run \"npm dist-tag add eas-cli@$VERSION latest-eas-build\" to promote it to production."
|
||||||
|
env:
|
||||||
|
NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
|
||||||
release-changelog:
|
release-changelog:
|
||||||
name: Update changelog and publish release
|
name: Update changelog and publish release
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
needs: publish-to-npm
|
needs: publish-to-npm
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
|
with:
|
||||||
|
token: ${{ secrets.EXPO_BOT_PAT }}
|
||||||
- uses: actions/setup-node@v2
|
- uses: actions/setup-node@v2
|
||||||
with:
|
with:
|
||||||
node-version: 18
|
node-version: 18
|
||||||
@@ -189,9 +199,9 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
SLACK_CHANNEL: eas-cli
|
SLACK_CHANNEL: eas-cli
|
||||||
SLACK_COLOR: ${{ job.status }}
|
SLACK_COLOR: ${{ job.status }}
|
||||||
SLACK_ICON: https://github.com/expo-ci.png?size=48
|
SLACK_ICON: https://github.com/expo-bot.png?size=48
|
||||||
SLACK_TITLE: 'Released eas-cli@${{ env.EAS_CLI_VERSION }}'
|
SLACK_TITLE: 'Released eas-cli@${{ env.EAS_CLI_VERSION }}'
|
||||||
SLACK_MESSAGE: ${{ env.SLACK_CHANGELOG }}
|
SLACK_MESSAGE: ${{ env.SLACK_CHANGELOG }}
|
||||||
SLACK_USERNAME: 'Expo CI'
|
SLACK_USERNAME: 'EAS CLI CI'
|
||||||
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
|
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
|
||||||
SLACK_FOOTER: ''
|
SLACK_FOOTER: ''
|
||||||
@@ -39,3 +39,15 @@ jobs:
|
|||||||
if: ${{ matrix.coverage }}
|
if: ${{ matrix.coverage }}
|
||||||
with:
|
with:
|
||||||
token: ${{ secrets.CODECOV_TOKEN }}
|
token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
|
notify-slack:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
needs: test
|
||||||
|
name: Notify Slack
|
||||||
|
if: ${{ github.ref == 'refs/heads/main' && always() }}
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v2
|
||||||
|
- name: Notify Slack
|
||||||
|
uses: ./.github/internal-actions/notify-slack-on-fail-or-recover
|
||||||
|
with:
|
||||||
|
channel: eas-cli
|
||||||
|
slack_webhook: ${{ secrets.SLACK_WEBHOOK }}
|
||||||
+204
@@ -8,6 +8,210 @@ This is the log of notable changes to EAS CLI and related packages.
|
|||||||
|
|
||||||
### 🎉 New features
|
### 🎉 New features
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
## [3.9.3](https://github.com/expo/eas-cli/releases/tag/v3.9.3) - 2023-04-18
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fix prompts in `eas update`. ([#1797](https://github.com/expo/eas-cli/pull/1797) by [@wschurman](https://github.com/wschurman))
|
||||||
|
|
||||||
|
## [3.9.2](https://github.com/expo/eas-cli/releases/tag/v3.9.2) - 2023-04-13
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fixes the rollout percentages when ending a rollout. ([#1781](https://github.com/expo/eas-cli/pull/1781) by [@jonsamp](https://github.com/jonsamp))
|
||||||
|
- Print meaningful error message if `extra.eas.projectId` is not a string. ([#1788](https://github.com/expo/eas-cli/pull/1788) by [@dsokal](https://github.com/dsokal))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Show output of `expo install expo-updates`. ([#1782](https://github.com/expo/eas-cli/pull/1782) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Print deprecation warnings for deprecated `eas.json` fields. ([#1768](https://github.com/expo/eas-cli/pull/1768) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.9.1](https://github.com/expo/eas-cli/releases/tag/v3.9.1) - 2023-04-10
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Update apple utilities to work around the maintenance error. ([#1780](https://github.com/expo/eas-cli/pull/1780) by [@byCedric](https://github.com/byCedric))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Don't use defaults for the `cache.cacheDefaultPaths` build profile field. ([#1769](https://github.com/expo/eas-cli/pull/1769) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.9.0](https://github.com/expo/eas-cli/releases/tag/v3.9.0) - 2023-04-06
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Add support for roll back to embedded updates. ([#1754](https://github.com/expo/eas-cli/pull/1754), [#1755](https://github.com/expo/eas-cli/pull/1755) by [@wschurman](https://github.com/wschurman))
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Update `expoCommandAsync` to support the new Expo CLI bin path. ([#1772](https://github.com/expo/eas-cli/pull/1772) by [@gabrieldonadel](https://github.com/gabrieldonadel))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Use the `eas-cli` npm tag for checking for the local build plugin updates. ([#1759](https://github.com/expo/eas-cli/pull/1759) by [@dsokal](https://github.com/dsokal))
|
||||||
|
- Ignore `requireCommit` option in `eas build:internal`. ([#1760](https://github.com/expo/eas-cli/pull/1760) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Support parsing eas.json from a string. ([#1766](https://github.com/expo/eas-cli/pull/1766) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
|
||||||
|
## [3.8.1](https://github.com/expo/eas-cli/releases/tag/v3.8.1) - 2023-03-16
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Ensure public config is used as update. ([#1745](https://github.com/expo/eas-cli/pull/1745) by [@byCedric](https://github.com/byCedric))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Unify how the command errors are displayed. ([#1738](https://github.com/expo/eas-cli/pull/1738) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
|
||||||
|
- Unify the case of base error messages for command failures. ([#1744](https://github.com/expo/eas-cli/pull/1744) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
|
||||||
|
|
||||||
|
## [3.8.0](https://github.com/expo/eas-cli/releases/tag/v3.8.0) - 2023-03-13
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Add new `m-medium` and `m-large` resource classes. ([#1739](https://github.com/expo/eas-cli/pull/1739) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.7.2](https://github.com/expo/eas-cli/releases/tag/v3.7.2) - 2023-02-24
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Implement Apple's proprietary Hashcash algorithm for signing authentication requests. ([#1719](https://github.com/expo/eas-cli/pull/1719) by [@EvanBacon](https://github.com/EvanBacon))
|
||||||
|
|
||||||
|
## [3.7.1](https://github.com/expo/eas-cli/releases/tag/v3.7.1) - 2023-02-23
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Bump `@expo/apple-utils` to fix Apple developer auth. ([03c76c1](https://github.com/expo/eas-cli/commit/03c76c1e0efb9ec55e40b45e33c80b3479f920c3) by [@brentvatne](https://github.com/brentvatne))
|
||||||
|
|
||||||
|
## [3.7.0](https://github.com/expo/eas-cli/releases/tag/v3.7.0) - 2023-02-23
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Support variant detection for package*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))
|
||||||
|
|
||||||
|
## [3.6.1](https://github.com/expo/eas-cli/releases/tag/v3.6.1) - 2023-02-20
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Disable analytics when running behind a proxy. ([#1696](https://github.com/expo/eas-cli/pull/1696) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Clarify missing owner field error message for Robot users. ([#1702](https://github.com/expo/eas-cli/pull/1702) by [@wschurman](https://github.com/wschurman))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Validate the platform for local builds earlier. ([#1698](https://github.com/expo/eas-cli/pull/1698) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Display build message when picking build in `eas submit`, `eas build:resign`, and `eas build:run` commands. ([#1700](https://github.com/expo/eas-cli/pull/1700) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
- Add a link directly to a build phase logs in the EAS CLI build error message. ([#1699](https://github.com/expo/eas-cli/pull/1699) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.6.0](https://github.com/expo/eas-cli/releases/tag/v3.6.0) - 2023-02-14
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Use `sdkVersion` as default runtime version policy when running `eas update:configure`. ([#1669](https://github.com/expo/eas-cli/pull/1669) by [@jonsamp](https://github.com/jonsamp))
|
||||||
|
- Warn when project ID but no owner specified and mismatch logged in user. ([#1667](https://github.com/expo/eas-cli/pull/1667) by [@wschurman](https://github.com/wschurman))
|
||||||
|
- Return the build `message` if one is available. ([#1691](https://github.com/expo/eas-cli/pull/1691) by [@raulriera](https://github.com/raulriera))
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fix suggested application identifier to match owning account name. ([#1670](https://github.com/expo/eas-cli/pull/1670) by [@wschurman](https://github.com/wschurman))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Add Xcode 14.2 image to the VSCode schema. ([#1693](https://github.com/expo/eas-cli/pull/1693) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.5.2](https://github.com/expo/eas-cli/releases/tag/v3.5.2) - 2023-02-05
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Use the new developer-mdn.apple.com subdomain instead of developer.apple.com. ([#1673](https://github.com/expo/eas-cli/pull/1673) by [@brentvatne](https://github.com/brentvatne))
|
||||||
|
|
||||||
|
## [3.5.1](https://github.com/expo/eas-cli/releases/tag/v3.5.1) - 2023-02-01
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fix the issue with the `eas.json` envs being not available when resolving dynamic config. ([#1666](https://github.com/expo/eas-cli/pull/1666) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.5.0](https://github.com/expo/eas-cli/releases/tag/v3.5.0) - 2023-01-31
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Set `m1-medium` resource class for SDK version `>=48` and RN version `>=0.71` builds with unspecified resource class. ([#1655](https://github.com/expo/eas-cli/pull/1655) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fix undefined branchMappingLogic. ([#1653](https://github.com/expo/eas-cli/pull/1653) by [@quinlanj](https://github.com/quinlanj))
|
||||||
|
- Fix using local credentials for internal distribution builds with universal provisioning. ([#1657](https://github.com/expo/eas-cli/pull/1657) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Move image validation to the server side and better handle server validation errors in the eas-cli. ([#1650](https://github.com/expo/eas-cli/pull/1650) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
- Update metadata on the worker when using git-based builds. ([#1651](https://github.com/expo/eas-cli/pull/1651) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
|
||||||
|
## [3.4.1](https://github.com/expo/eas-cli/releases/tag/v3.4.1) - 2023-01-23
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fix incorrect exit code for successful local builds. ([#1649](https://github.com/expo/eas-cli/pull/1649) by [@dsokal](https://github.com/dsokal))
|
||||||
|
|
||||||
|
## [3.4.0](https://github.com/expo/eas-cli/releases/tag/v3.4.0) - 2023-01-20
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Add `--json` flag to `eas config` command. ([#1568](https://github.com/expo/eas-cli/pull/1568) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Add M1 resource class configuration to default eas.json when running eas build:configure on a new project. ([#1637](https://github.com/expo/eas-cli/pull/1637) by [@brentvatne](https://github.com/brentvatne))
|
||||||
|
- Add prompt to switch iOS builds to M1 if the build queue is long. ([#1642](https://github.com/expo/eas-cli/pull/1642) by [@dsokal](https://github.com/dsokal))
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Fix running commands with `--json` flag when EAS_NO_VCS is set. ([#1641](https://github.com/expo/eas-cli/pull/1641) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Remove unnecessary workaround for trailing backslash in .gitignore. ([#1622](https://github.com/expo/eas-cli/pull/1622) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Internal command that will be run on EAS worker when building from GitHub. ([#1568](https://github.com/expo/eas-cli/pull/1568) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
- Make the disabled tier error message more descriptive. ([#1635](https://github.com/expo/eas-cli/pull/1635) by [@dsokal](https://github.com/dsokal))
|
||||||
|
- Control some of the EAS Build error messages server-side. ([#1639](https://github.com/expo/eas-cli/pull/1639) by [@wkozyra95](https://github.com/wkozyra95))
|
||||||
|
|
||||||
|
## [3.3.2](https://github.com/expo/eas-cli/releases/tag/v3.3.2) - 2023-01-12
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Add missing key information about updates in `eas update --json` and `eas update:view --json`. ([#1619](https://github.com/expo/eas-cli/pull/1619) by [@byCedric](https://github.com/byCedric))
|
||||||
|
|
||||||
|
### 🧹 Chores
|
||||||
|
|
||||||
|
- Upgrade dependencies. ([#1617](https://github.com/expo/eas-cli/pull/1617) by [@dsokal](https://github.com/dsokal))
|
||||||
|
- Improve handling `SSOUser` type. ([#1621](https://github.com/expo/eas-cli/pull/1621) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.3.1](https://github.com/expo/eas-cli/releases/tag/v3.3.1) - 2023-01-11
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Revert missing key information about updates in `eas update --json` and `eas update:view --json`. ([d20db0f](https://github.com/expo/eas-cli/commit/d20db0fff42a6f4512fea426a66cb6f168e37f7c) by [@ide](https://github.com/ide))
|
||||||
|
|
||||||
|
## [3.3.0](https://github.com/expo/eas-cli/releases/tag/v3.3.0) - 2023-01-11
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
|
- Add ability to select resource class for a build in build profile. ([#1609](https://github.com/expo/eas-cli/pull/1609) by [@dsokal](https://github.com/dsokal))
|
||||||
|
- Deprecate `--resource-class` flag. ([#1615](https://github.com/expo/eas-cli/pull/1615) by [@dsokal](https://github.com/dsokal))
|
||||||
|
- Add new resource classes and update already available. ([#1616](https://github.com/expo/eas-cli/pull/1616) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Add missing key information about updates in `eas update --json` and `eas update:view --json`. ([#1611](https://github.com/expo/eas-cli/pull/1611) by [@byCedric](https://github.com/byCedric))
|
||||||
|
|
||||||
|
## [3.2.1](https://github.com/expo/eas-cli/releases/tag/v3.2.1) - 2023-01-09
|
||||||
|
|
||||||
|
### 🐛 Bug fixes
|
||||||
|
|
||||||
|
- Validate chosen build in the `eas build:run` command. ([#1614](https://github.com/expo/eas-cli/pull/1614) by [@szdziedzic](https://github.com/szdziedzic))
|
||||||
|
|
||||||
|
## [3.2.0](https://github.com/expo/eas-cli/releases/tag/v3.2.0) - 2023-01-09
|
||||||
|
|
||||||
|
### 🎉 New features
|
||||||
|
|
||||||
- Add `--channel` option to `update:republish`. ([#1580](https://github.com/expo/eas-cli/pull/1580) by [@byCedric](https://github.com/byCedric))
|
- Add `--channel` option to `update:republish`. ([#1580](https://github.com/expo/eas-cli/pull/1580) by [@byCedric](https://github.com/byCedric))
|
||||||
- Use `appVersion` as default runtime version policy when running `eas update:configure`. ([#1588](https://github.com/expo/eas-cli/pull/1588) by [@jonsamp](https://github.com/jonsamp))
|
- Use `appVersion` as default runtime version policy when running `eas update:configure`. ([#1588](https://github.com/expo/eas-cli/pull/1588) by [@jonsamp](https://github.com/jonsamp))
|
||||||
- Support `--json` flag in webhook list command. ([#1605](https://github.com/expo/eas-cli/pull/1605) by [@sheddy7](https://github.com/sheddy7))
|
- Support `--json` flag in webhook list command. ([#1605](https://github.com/expo/eas-cli/pull/1605) by [@sheddy7](https://github.com/sheddy7))
|
||||||
|
|||||||
@@ -12,3 +12,7 @@ The algorithm works as follows:
|
|||||||
- If there are any entries in the "🛠 Breaking changes" section, bump the MAJOR version.
|
- If there are any entries in the "🛠 Breaking changes" section, bump the MAJOR version.
|
||||||
- Otherwise, if there are any entries in the "🎉 New features", bump the MINOR version.
|
- Otherwise, if there are any entries in the "🎉 New features", bump the MINOR version.
|
||||||
- Otherwise, bump the PATCH version.
|
- Otherwise, bump the PATCH version.
|
||||||
|
|
||||||
|
## Updating EAS CLI version on EAS Build
|
||||||
|
|
||||||
|
The release process promotes the new version to staging. After verifying it works there, you can promote it to production with `npm dist-tag add eas-cli@{version} latest-eas-build`.
|
||||||
+2
-1
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"npmClient": "yarn",
|
"npmClient": "yarn",
|
||||||
"useWorkspaces": true,
|
"useWorkspaces": true,
|
||||||
"version": "3.2.0"
|
"version": "3.9.3",
|
||||||
|
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
|
||||||
}
|
}
|
||||||
+13
-12
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
"name": "eas-cli-root",
|
||||||
"private": true,
|
"private": true,
|
||||||
"workspaces": [
|
"workspaces": [
|
||||||
"packages/*"
|
"packages/*"
|
||||||
@@ -13,24 +14,24 @@
|
|||||||
"eas": "packages/eas-cli/bin/run",
|
"eas": "packages/eas-cli/bin/run",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"lint-changelog": "./scripts/bin/run lint-changelog",
|
"lint-changelog": "./scripts/bin/run lint-changelog",
|
||||||
"release": "./scripts/bin/run release",
|
"release": "lerna run rebuild && ./scripts/bin/run release",
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"clean": "lerna run clean && rm -rf node_modules coverage"
|
"clean": "lerna run clean && rm -rf node_modules coverage"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/jest": "29.2.0",
|
"@types/jest": "29.2.5",
|
||||||
"@types/node": "18.11.5",
|
"@types/node": "18.11.18",
|
||||||
"eslint": "8.26.0",
|
"eslint": "8.31.0",
|
||||||
"eslint-config-universe": "11.1.0",
|
"eslint-config-universe": "11.1.1",
|
||||||
"eslint-plugin-async-protect": "2.1.0",
|
"eslint-plugin-async-protect": "3.0.0",
|
||||||
"eslint-plugin-node": "11.1.0",
|
"eslint-plugin-node": "11.1.0",
|
||||||
"jest": "29.2.2",
|
"jest": "29.3.1",
|
||||||
"jest-watch-typeahead": "2.2.0",
|
"jest-watch-typeahead": "2.2.1",
|
||||||
"lerna": "6.0.1",
|
"lerna": "6.4.1",
|
||||||
"oclif": "3.2.22",
|
"oclif": "3.4.3",
|
||||||
"prettier": "2.7.1",
|
"prettier": "2.8.2",
|
||||||
"ts-jest": "29.0.3",
|
"ts-jest": "29.0.3",
|
||||||
"typescript": "4.8.4"
|
"typescript": "4.9.4"
|
||||||
},
|
},
|
||||||
"volta": {
|
"volta": {
|
||||||
"node": "18.6.0",
|
"node": "18.6.0",
|
||||||
|
|||||||
+86
-108
@@ -79,6 +79,7 @@ eas --help COMMAND
|
|||||||
* [`eas channel:create [NAME]`](#eas-channelcreate-name)
|
* [`eas channel:create [NAME]`](#eas-channelcreate-name)
|
||||||
* [`eas channel:edit [NAME]`](#eas-channeledit-name)
|
* [`eas channel:edit [NAME]`](#eas-channeledit-name)
|
||||||
* [`eas channel:list`](#eas-channellist)
|
* [`eas channel:list`](#eas-channellist)
|
||||||
|
* [`eas channel:rollout [CHANNEL]`](#eas-channelrollout-channel)
|
||||||
* [`eas channel:view [NAME]`](#eas-channelview-name)
|
* [`eas channel:view [NAME]`](#eas-channelview-name)
|
||||||
* [`eas config`](#eas-config)
|
* [`eas config`](#eas-config)
|
||||||
* [`eas credentials`](#eas-credentials)
|
* [`eas credentials`](#eas-credentials)
|
||||||
@@ -97,8 +98,6 @@ eas --help COMMAND
|
|||||||
* [`eas open`](#eas-open)
|
* [`eas open`](#eas-open)
|
||||||
* [`eas project:info`](#eas-projectinfo)
|
* [`eas project:info`](#eas-projectinfo)
|
||||||
* [`eas project:init`](#eas-projectinit)
|
* [`eas project:init`](#eas-projectinit)
|
||||||
* [`eas run`](#eas-run)
|
|
||||||
* [`eas run:run`](#eas-runrun)
|
|
||||||
* [`eas secret:create`](#eas-secretcreate)
|
* [`eas secret:create`](#eas-secretcreate)
|
||||||
* [`eas secret:delete`](#eas-secretdelete)
|
* [`eas secret:delete`](#eas-secretdelete)
|
||||||
* [`eas secret:list`](#eas-secretlist)
|
* [`eas secret:list`](#eas-secretlist)
|
||||||
@@ -132,7 +131,7 @@ ALIASES
|
|||||||
$ eas login
|
$ eas login
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/account/login.ts)_
|
_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/account/login.ts)_
|
||||||
|
|
||||||
## `eas account:logout`
|
## `eas account:logout`
|
||||||
|
|
||||||
@@ -149,7 +148,7 @@ ALIASES
|
|||||||
$ eas logout
|
$ eas logout
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/account/logout.ts)_
|
_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/account/logout.ts)_
|
||||||
|
|
||||||
## `eas account:view`
|
## `eas account:view`
|
||||||
|
|
||||||
@@ -166,7 +165,7 @@ ALIASES
|
|||||||
$ eas whoami
|
$ eas whoami
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/account/view.ts)_
|
_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/account/view.ts)_
|
||||||
|
|
||||||
## `eas analytics [STATUS]`
|
## `eas analytics [STATUS]`
|
||||||
|
|
||||||
@@ -180,7 +179,7 @@ DESCRIPTION
|
|||||||
display or change analytics settings
|
display or change analytics settings
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/analytics.ts)_
|
_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/analytics.ts)_
|
||||||
|
|
||||||
## `eas autocomplete [SHELL]`
|
## `eas autocomplete [SHELL]`
|
||||||
|
|
||||||
@@ -209,7 +208,7 @@ EXAMPLES
|
|||||||
$ eas autocomplete --refresh-cache
|
$ eas autocomplete --refresh-cache
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.4/src/commands/autocomplete/index.ts)_
|
_See code: [@oclif/plugin-autocomplete](https://github.com/oclif/plugin-autocomplete/blob/v1.3.10/src/commands/autocomplete/index.ts)_
|
||||||
|
|
||||||
## `eas branch:create [NAME]`
|
## `eas branch:create [NAME]`
|
||||||
|
|
||||||
@@ -230,7 +229,7 @@ DESCRIPTION
|
|||||||
create a branch
|
create a branch
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/branch/create.ts)_
|
_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/branch/create.ts)_
|
||||||
|
|
||||||
## `eas branch:delete [NAME]`
|
## `eas branch:delete [NAME]`
|
||||||
|
|
||||||
@@ -251,7 +250,7 @@ DESCRIPTION
|
|||||||
delete a branch
|
delete a branch
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/branch/delete.ts)_
|
_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/branch/delete.ts)_
|
||||||
|
|
||||||
## `eas branch:list`
|
## `eas branch:list`
|
||||||
|
|
||||||
@@ -271,7 +270,7 @@ DESCRIPTION
|
|||||||
list all branches
|
list all branches
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/branch/list.ts)_
|
_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/branch/list.ts)_
|
||||||
|
|
||||||
## `eas branch:rename`
|
## `eas branch:rename`
|
||||||
|
|
||||||
@@ -291,7 +290,7 @@ DESCRIPTION
|
|||||||
rename a branch
|
rename a branch
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/branch/rename.ts)_
|
_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/branch/rename.ts)_
|
||||||
|
|
||||||
## `eas branch:view [NAME]`
|
## `eas branch:view [NAME]`
|
||||||
|
|
||||||
@@ -314,7 +313,7 @@ DESCRIPTION
|
|||||||
view a branch
|
view a branch
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/branch/view.ts)_
|
_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/branch/view.ts)_
|
||||||
|
|
||||||
## `eas build`
|
## `eas build`
|
||||||
|
|
||||||
@@ -344,7 +343,7 @@ DESCRIPTION
|
|||||||
start a build
|
start a build
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/index.ts)_
|
_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/index.ts)_
|
||||||
|
|
||||||
## `eas build:cancel [BUILD_ID]`
|
## `eas build:cancel [BUILD_ID]`
|
||||||
|
|
||||||
@@ -361,7 +360,7 @@ DESCRIPTION
|
|||||||
cancel a build
|
cancel a build
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/cancel.ts)_
|
_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/cancel.ts)_
|
||||||
|
|
||||||
## `eas build:configure`
|
## `eas build:configure`
|
||||||
|
|
||||||
@@ -378,7 +377,7 @@ DESCRIPTION
|
|||||||
configure the project to support EAS Build
|
configure the project to support EAS Build
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/configure.ts)_
|
_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/configure.ts)_
|
||||||
|
|
||||||
## `eas build:inspect`
|
## `eas build:inspect`
|
||||||
|
|
||||||
@@ -413,7 +412,7 @@ DESCRIPTION
|
|||||||
inspect the state of the project at specific build stages, useful for troubleshooting
|
inspect the state of the project at specific build stages, useful for troubleshooting
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/inspect.ts)_
|
_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/inspect.ts)_
|
||||||
|
|
||||||
## `eas build:list`
|
## `eas build:list`
|
||||||
|
|
||||||
@@ -450,7 +449,7 @@ DESCRIPTION
|
|||||||
list all builds for your project
|
list all builds for your project
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/list.ts)_
|
_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/list.ts)_
|
||||||
|
|
||||||
## `eas build:resign`
|
## `eas build:resign`
|
||||||
|
|
||||||
@@ -476,7 +475,7 @@ DESCRIPTION
|
|||||||
re-sign a build archive
|
re-sign a build archive
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/resign.ts)_
|
_See code: [src/commands/build/resign.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/resign.ts)_
|
||||||
|
|
||||||
## `eas build:run`
|
## `eas build:run`
|
||||||
|
|
||||||
@@ -500,7 +499,7 @@ DESCRIPTION
|
|||||||
run simulator/emulator builds from eas-cli
|
run simulator/emulator builds from eas-cli
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/run.ts)_
|
_See code: [src/commands/build/run.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/run.ts)_
|
||||||
|
|
||||||
## `eas build:submit`
|
## `eas build:submit`
|
||||||
|
|
||||||
@@ -547,7 +546,7 @@ DESCRIPTION
|
|||||||
Update version of an app.
|
Update version of an app.
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/version/set.ts)_
|
_See code: [src/commands/build/version/set.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/version/set.ts)_
|
||||||
|
|
||||||
## `eas build:version:sync`
|
## `eas build:version:sync`
|
||||||
|
|
||||||
@@ -566,7 +565,7 @@ DESCRIPTION
|
|||||||
Update a version in native code with a value stored on EAS servers
|
Update a version in native code with a value stored on EAS servers
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/version/sync.ts)_
|
_See code: [src/commands/build/version/sync.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/version/sync.ts)_
|
||||||
|
|
||||||
## `eas build:view [BUILD_ID]`
|
## `eas build:view [BUILD_ID]`
|
||||||
|
|
||||||
@@ -583,7 +582,7 @@ DESCRIPTION
|
|||||||
view a build for your project
|
view a build for your project
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/build/view.ts)_
|
_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/build/view.ts)_
|
||||||
|
|
||||||
## `eas channel:create [NAME]`
|
## `eas channel:create [NAME]`
|
||||||
|
|
||||||
@@ -604,7 +603,7 @@ DESCRIPTION
|
|||||||
create a channel
|
create a channel
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/channel/create.ts)_
|
_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/channel/create.ts)_
|
||||||
|
|
||||||
## `eas channel:edit [NAME]`
|
## `eas channel:edit [NAME]`
|
||||||
|
|
||||||
@@ -626,7 +625,7 @@ DESCRIPTION
|
|||||||
point a channel at a new branch
|
point a channel at a new branch
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/channel/edit.ts)_
|
_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/channel/edit.ts)_
|
||||||
|
|
||||||
## `eas channel:list`
|
## `eas channel:list`
|
||||||
|
|
||||||
@@ -646,7 +645,31 @@ DESCRIPTION
|
|||||||
list all channels
|
list all channels
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/channel/list.ts)_
|
_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/channel/list.ts)_
|
||||||
|
|
||||||
|
## `eas channel:rollout [CHANNEL]`
|
||||||
|
|
||||||
|
Roll a new branch out on a channel incrementally.
|
||||||
|
|
||||||
|
```
|
||||||
|
USAGE
|
||||||
|
$ eas channel:rollout [CHANNEL] [--branch <value>] [--percent <value>] [--end] [--json --non-interactive]
|
||||||
|
|
||||||
|
ARGUMENTS
|
||||||
|
CHANNEL channel on which the rollout should be done
|
||||||
|
|
||||||
|
FLAGS
|
||||||
|
--branch=<value> branch to rollout
|
||||||
|
--end end the rollout
|
||||||
|
--json Enable JSON output, non-JSON messages will be printed to stderr.
|
||||||
|
--non-interactive Run the command in non-interactive mode.
|
||||||
|
--percent=<value> percent of users to send to the new branch
|
||||||
|
|
||||||
|
DESCRIPTION
|
||||||
|
Roll a new branch out on a channel incrementally.
|
||||||
|
```
|
||||||
|
|
||||||
|
_See code: [src/commands/channel/rollout.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/channel/rollout.ts)_
|
||||||
|
|
||||||
## `eas channel:view [NAME]`
|
## `eas channel:view [NAME]`
|
||||||
|
|
||||||
@@ -669,7 +692,7 @@ DESCRIPTION
|
|||||||
view a channel
|
view a channel
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/channel/view.ts)_
|
_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/channel/view.ts)_
|
||||||
|
|
||||||
## `eas config`
|
## `eas config`
|
||||||
|
|
||||||
@@ -677,18 +700,20 @@ display project configuration (app.json + eas.json)
|
|||||||
|
|
||||||
```
|
```
|
||||||
USAGE
|
USAGE
|
||||||
$ eas config [-p android|ios] [-e <value>]
|
$ eas config [-p android|ios] [-e <value>] [--json --non-interactive]
|
||||||
|
|
||||||
FLAGS
|
FLAGS
|
||||||
-e, --profile=PROFILE_NAME Name of the build profile from eas.json. Defaults to "production" if defined in
|
-e, --profile=PROFILE_NAME Name of the build profile from eas.json. Defaults to "production" if defined in
|
||||||
eas.json.
|
eas.json.
|
||||||
-p, --platform=(android|ios)
|
-p, --platform=(android|ios)
|
||||||
|
--json Enable JSON output, non-JSON messages will be printed to stderr.
|
||||||
|
--non-interactive Run the command in non-interactive mode.
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
display project configuration (app.json + eas.json)
|
display project configuration (app.json + eas.json)
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/config.ts)_
|
_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/config.ts)_
|
||||||
|
|
||||||
## `eas credentials`
|
## `eas credentials`
|
||||||
|
|
||||||
@@ -705,7 +730,7 @@ DESCRIPTION
|
|||||||
manage credentials
|
manage credentials
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/credentials.ts)_
|
_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/credentials.ts)_
|
||||||
|
|
||||||
## `eas device:create`
|
## `eas device:create`
|
||||||
|
|
||||||
@@ -719,7 +744,7 @@ DESCRIPTION
|
|||||||
register new Apple Devices to use for internal distribution
|
register new Apple Devices to use for internal distribution
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/device/create.ts)_
|
_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/device/create.ts)_
|
||||||
|
|
||||||
## `eas device:delete`
|
## `eas device:delete`
|
||||||
|
|
||||||
@@ -739,7 +764,7 @@ DESCRIPTION
|
|||||||
remove a registered device from your account
|
remove a registered device from your account
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/device/delete.ts)_
|
_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/device/delete.ts)_
|
||||||
|
|
||||||
## `eas device:list`
|
## `eas device:list`
|
||||||
|
|
||||||
@@ -760,7 +785,7 @@ DESCRIPTION
|
|||||||
list all registered devices for your account
|
list all registered devices for your account
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/device/list.ts)_
|
_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/device/list.ts)_
|
||||||
|
|
||||||
## `eas device:view [UDID]`
|
## `eas device:view [UDID]`
|
||||||
|
|
||||||
@@ -774,7 +799,7 @@ DESCRIPTION
|
|||||||
view a device for your project
|
view a device for your project
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/device/view.ts)_
|
_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/device/view.ts)_
|
||||||
|
|
||||||
## `eas diagnostics`
|
## `eas diagnostics`
|
||||||
|
|
||||||
@@ -788,7 +813,7 @@ DESCRIPTION
|
|||||||
display environment info
|
display environment info
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/diagnostics.ts)_
|
_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/diagnostics.ts)_
|
||||||
|
|
||||||
## `eas help [COMMAND]`
|
## `eas help [COMMAND]`
|
||||||
|
|
||||||
@@ -808,7 +833,7 @@ DESCRIPTION
|
|||||||
display help for eas-cli
|
display help for eas-cli
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.16/src/commands/help.ts)_
|
_See code: [@expo/plugin-help](https://github.com/expo/oclif-plugin-help/blob/v5.1.22/src/commands/help.ts)_
|
||||||
|
|
||||||
## `eas init`
|
## `eas init`
|
||||||
|
|
||||||
@@ -876,7 +901,7 @@ DESCRIPTION
|
|||||||
validate the local store configuration
|
validate the local store configuration
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/metadata/lint.ts)_
|
_See code: [src/commands/metadata/lint.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/metadata/lint.ts)_
|
||||||
|
|
||||||
## `eas metadata:pull`
|
## `eas metadata:pull`
|
||||||
|
|
||||||
@@ -893,7 +918,7 @@ DESCRIPTION
|
|||||||
generate the local store configuration from the app stores
|
generate the local store configuration from the app stores
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/metadata/pull.ts)_
|
_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/metadata/pull.ts)_
|
||||||
|
|
||||||
## `eas metadata:push`
|
## `eas metadata:push`
|
||||||
|
|
||||||
@@ -910,7 +935,7 @@ DESCRIPTION
|
|||||||
sync the local store configuration to the app stores
|
sync the local store configuration to the app stores
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/metadata/push.ts)_
|
_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/metadata/push.ts)_
|
||||||
|
|
||||||
## `eas open`
|
## `eas open`
|
||||||
|
|
||||||
@@ -924,7 +949,7 @@ DESCRIPTION
|
|||||||
open the project page in a web browser
|
open the project page in a web browser
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/open.ts)_
|
_See code: [src/commands/open.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/open.ts)_
|
||||||
|
|
||||||
## `eas project:info`
|
## `eas project:info`
|
||||||
|
|
||||||
@@ -938,7 +963,7 @@ DESCRIPTION
|
|||||||
information about the current project
|
information about the current project
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/project/info.ts)_
|
_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/project/info.ts)_
|
||||||
|
|
||||||
## `eas project:init`
|
## `eas project:init`
|
||||||
|
|
||||||
@@ -960,55 +985,7 @@ ALIASES
|
|||||||
$ eas init
|
$ eas init
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/project/init.ts)_
|
_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/project/init.ts)_
|
||||||
|
|
||||||
## `eas run`
|
|
||||||
|
|
||||||
run simulator build
|
|
||||||
|
|
||||||
```
|
|
||||||
USAGE
|
|
||||||
$ eas run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios|all] [--offset
|
|
||||||
<value>] [--limit <value>]
|
|
||||||
|
|
||||||
FLAGS
|
|
||||||
-p, --platform=(android|ios|all)
|
|
||||||
--id=<value> ID of the simulator build to run
|
|
||||||
--latest Run the latest simulator build for specified platform
|
|
||||||
--limit=<value> The number of items to fetch each query. Defaults to 50 and is capped at 100.
|
|
||||||
--offset=<value> Start queries from specified index. Use for paginating results. Defaults to 0.
|
|
||||||
--path=<value> Path to the simulator build file file
|
|
||||||
--url=<value> Simulator build archive url
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
run simulator build
|
|
||||||
```
|
|
||||||
|
|
||||||
_See code: [src/commands/run/index.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/run/index.ts)_
|
|
||||||
|
|
||||||
## `eas run:run`
|
|
||||||
|
|
||||||
run simulator build
|
|
||||||
|
|
||||||
```
|
|
||||||
USAGE
|
|
||||||
$ eas run:run [--latest | --id <value> | --path <value> | --url <value>] [-p android|ios|all] [--offset
|
|
||||||
<value>] [--limit <value>]
|
|
||||||
|
|
||||||
FLAGS
|
|
||||||
-p, --platform=(android|ios|all)
|
|
||||||
--id=<value> ID of the simulator build to run
|
|
||||||
--latest Run the latest simulator build for specified platform
|
|
||||||
--limit=<value> The number of items to fetch each query. Defaults to 50 and is capped at 100.
|
|
||||||
--offset=<value> Start queries from specified index. Use for paginating results. Defaults to 0.
|
|
||||||
--path=<value> Path to the simulator build file file
|
|
||||||
--url=<value> Simulator build archive url
|
|
||||||
|
|
||||||
DESCRIPTION
|
|
||||||
run simulator build
|
|
||||||
```
|
|
||||||
|
|
||||||
_See code: [src/commands/run/run.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/run/run.ts)_
|
|
||||||
|
|
||||||
## `eas secret:create`
|
## `eas secret:create`
|
||||||
|
|
||||||
@@ -1031,7 +1008,7 @@ DESCRIPTION
|
|||||||
create an environment secret on the current project or owner account
|
create an environment secret on the current project or owner account
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/secret/create.ts)_
|
_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/secret/create.ts)_
|
||||||
|
|
||||||
## `eas secret:delete`
|
## `eas secret:delete`
|
||||||
|
|
||||||
@@ -1049,7 +1026,7 @@ DESCRIPTION
|
|||||||
delete an environment secret by ID
|
delete an environment secret by ID
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/secret/delete.ts)_
|
_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/secret/delete.ts)_
|
||||||
|
|
||||||
## `eas secret:list`
|
## `eas secret:list`
|
||||||
|
|
||||||
@@ -1063,7 +1040,7 @@ DESCRIPTION
|
|||||||
list environment secrets available for your current app
|
list environment secrets available for your current app
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/secret/list.ts)_
|
_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/secret/list.ts)_
|
||||||
|
|
||||||
## `eas secret:push`
|
## `eas secret:push`
|
||||||
|
|
||||||
@@ -1083,7 +1060,7 @@ DESCRIPTION
|
|||||||
read environment secrets from env file and store on the server
|
read environment secrets from env file and store on the server
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/secret/push.ts)_
|
_See code: [src/commands/secret/push.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/secret/push.ts)_
|
||||||
|
|
||||||
## `eas submit`
|
## `eas submit`
|
||||||
|
|
||||||
@@ -1113,7 +1090,7 @@ ALIASES
|
|||||||
$ eas build:submit
|
$ eas build:submit
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/submit.ts)_
|
_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/submit.ts)_
|
||||||
|
|
||||||
## `eas update`
|
## `eas update`
|
||||||
|
|
||||||
@@ -1145,7 +1122,7 @@ DESCRIPTION
|
|||||||
publish an update group
|
publish an update group
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/update/index.ts)_
|
_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/update/index.ts)_
|
||||||
|
|
||||||
## `eas update:configure`
|
## `eas update:configure`
|
||||||
|
|
||||||
@@ -1163,7 +1140,7 @@ DESCRIPTION
|
|||||||
configure the project to support EAS Update
|
configure the project to support EAS Update
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/update/configure.ts)_
|
_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/update/configure.ts)_
|
||||||
|
|
||||||
## `eas update:delete GROUPID`
|
## `eas update:delete GROUPID`
|
||||||
|
|
||||||
@@ -1184,7 +1161,7 @@ DESCRIPTION
|
|||||||
delete all the updates in an update group
|
delete all the updates in an update group
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/update/delete.ts)_
|
_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/update/delete.ts)_
|
||||||
|
|
||||||
## `eas update:list`
|
## `eas update:list`
|
||||||
|
|
||||||
@@ -1206,11 +1183,11 @@ DESCRIPTION
|
|||||||
view the recent updates
|
view the recent updates
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/update/list.ts)_
|
_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/update/list.ts)_
|
||||||
|
|
||||||
## `eas update:republish`
|
## `eas update:republish`
|
||||||
|
|
||||||
rollback to an existing update
|
roll back to an existing update
|
||||||
|
|
||||||
```
|
```
|
||||||
USAGE
|
USAGE
|
||||||
@@ -1227,10 +1204,10 @@ FLAGS
|
|||||||
--non-interactive Run the command in non-interactive mode.
|
--non-interactive Run the command in non-interactive mode.
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
rollback to an existing update
|
roll back to an existing update
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/update/republish.ts)_
|
_See code: [src/commands/update/republish.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/update/republish.ts)_
|
||||||
|
|
||||||
## `eas update:view GROUPID`
|
## `eas update:view GROUPID`
|
||||||
|
|
||||||
@@ -1250,7 +1227,7 @@ DESCRIPTION
|
|||||||
update group details
|
update group details
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/update/view.ts)_
|
_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/update/view.ts)_
|
||||||
|
|
||||||
## `eas webhook:create`
|
## `eas webhook:create`
|
||||||
|
|
||||||
@@ -1271,7 +1248,7 @@ DESCRIPTION
|
|||||||
create a webhook
|
create a webhook
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/webhook/create.ts)_
|
_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/webhook/create.ts)_
|
||||||
|
|
||||||
## `eas webhook:delete [ID]`
|
## `eas webhook:delete [ID]`
|
||||||
|
|
||||||
@@ -1291,7 +1268,7 @@ DESCRIPTION
|
|||||||
delete a webhook
|
delete a webhook
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/webhook/delete.ts)_
|
_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/webhook/delete.ts)_
|
||||||
|
|
||||||
## `eas webhook:list`
|
## `eas webhook:list`
|
||||||
|
|
||||||
@@ -1299,16 +1276,17 @@ list webhooks
|
|||||||
|
|
||||||
```
|
```
|
||||||
USAGE
|
USAGE
|
||||||
$ eas webhook:list [--event BUILD|SUBMIT]
|
$ eas webhook:list [--event BUILD|SUBMIT] [--json]
|
||||||
|
|
||||||
FLAGS
|
FLAGS
|
||||||
--event=(BUILD|SUBMIT) Event type that triggers the webhook
|
--event=(BUILD|SUBMIT) Event type that triggers the webhook
|
||||||
|
--json Enable JSON output, non-JSON messages will be printed to stderr.
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
list webhooks
|
list webhooks
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/webhook/list.ts)_
|
_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/webhook/list.ts)_
|
||||||
|
|
||||||
## `eas webhook:update`
|
## `eas webhook:update`
|
||||||
|
|
||||||
@@ -1330,7 +1308,7 @@ DESCRIPTION
|
|||||||
update a webhook
|
update a webhook
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/webhook/update.ts)_
|
_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/webhook/update.ts)_
|
||||||
|
|
||||||
## `eas webhook:view ID`
|
## `eas webhook:view ID`
|
||||||
|
|
||||||
@@ -1347,7 +1325,7 @@ DESCRIPTION
|
|||||||
view a webhook
|
view a webhook
|
||||||
```
|
```
|
||||||
|
|
||||||
_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.2.0/packages/eas-cli/src/commands/webhook/view.ts)_
|
_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v3.9.3/packages/eas-cli/src/commands/webhook/view.ts)_
|
||||||
|
|
||||||
## `eas whoami`
|
## `eas whoami`
|
||||||
|
|
||||||
|
|||||||
Generated
+7517
-2682
File diff suppressed because it is too large.
Load diff
@@ -1,39 +1,40 @@
|
|||||||
{
|
{
|
||||||
"name": "eas-cli",
|
"name": "eas-cli",
|
||||||
"description": "EAS command line tool",
|
"description": "EAS command line tool",
|
||||||
"version": "3.2.0",
|
"version": "3.9.3",
|
||||||
"author": "Expo <[email protected]>",
|
"author": "Expo <[email protected]>",
|
||||||
"bin": {
|
"bin": {
|
||||||
"eas": "./bin/run"
|
"eas": "./bin/run"
|
||||||
},
|
},
|
||||||
"bugs": "https://github.com/expo/eas-cli/issues",
|
"bugs": "https://github.com/expo/eas-cli/issues",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@expo/apple-utils": "0.0.0-alpha.34",
|
"@expo/apple-utils": "1.2.0",
|
||||||
"@expo/code-signing-certificates": "0.0.3",
|
"@expo/code-signing-certificates": "0.0.5",
|
||||||
"@expo/config": "7.0.1",
|
"@expo/config": "7.0.3",
|
||||||
"@expo/config-plugins": "5.0.1",
|
"@expo/config-plugins": "5.0.4",
|
||||||
"@expo/config-types": "46.0.2",
|
"@expo/config-types": "47.0.0",
|
||||||
"@expo/eas-build-job": "0.2.97",
|
"@expo/eas-build-job": "1.0.7",
|
||||||
"@expo/eas-json": "3.0.0",
|
"@expo/eas-json": "3.9.2",
|
||||||
"@expo/json-file": "8.2.36",
|
"@expo/json-file": "8.2.37",
|
||||||
"@expo/multipart-body-parser": "1.1.0",
|
"@expo/multipart-body-parser": "1.1.0",
|
||||||
"@expo/osascript": "2.0.33",
|
"@expo/osascript": "2.0.33",
|
||||||
"@expo/package-manager": "0.0.56",
|
"@expo/package-manager": "0.0.57",
|
||||||
"@expo/pkcs12": "0.0.8",
|
"@expo/pkcs12": "0.0.8",
|
||||||
"@expo/plist": "0.0.18",
|
"@expo/plist": "0.0.20",
|
||||||
"@expo/plugin-help": "5.1.16",
|
"@expo/plugin-help": "5.1.22",
|
||||||
"@expo/plugin-warn-if-update-available": "2.4.0",
|
"@expo/plugin-warn-if-update-available": "2.5.0",
|
||||||
"@expo/prebuild-config": "5.0.3",
|
"@expo/prebuild-config": "5.0.7",
|
||||||
"@expo/results": "1.0.0",
|
"@expo/results": "1.0.0",
|
||||||
"@expo/rudder-sdk-node": "1.1.1",
|
"@expo/rudder-sdk-node": "1.1.1",
|
||||||
"@expo/spawn-async": "1.7.0",
|
"@expo/spawn-async": "1.7.0",
|
||||||
|
"@expo/steps": "1.0.8",
|
||||||
"@expo/timeago.js": "1.0.0",
|
"@expo/timeago.js": "1.0.0",
|
||||||
"@oclif/core": "1.19.2",
|
"@oclif/core": "1.23.2",
|
||||||
"@oclif/plugin-autocomplete": "1.3.4",
|
"@oclif/plugin-autocomplete": "1.3.10",
|
||||||
"@segment/ajv-human-errors": "^2.1.2",
|
"@segment/ajv-human-errors": "^2.1.2",
|
||||||
"@urql/core": "3.0.5",
|
"@urql/core": "3.1.1",
|
||||||
"@urql/exchange-retry": "1.0.0",
|
"@urql/exchange-retry": "1.0.0",
|
||||||
"ajv": "^8.11.0",
|
"ajv": "8.11.0",
|
||||||
"ajv-formats": "2.1.1",
|
"ajv-formats": "2.1.1",
|
||||||
"better-opn": "3.0.2",
|
"better-opn": "3.0.2",
|
||||||
"chalk": "4.1.2",
|
"chalk": "4.1.2",
|
||||||
@@ -52,14 +53,14 @@
|
|||||||
"graphql": "16.6.0",
|
"graphql": "16.6.0",
|
||||||
"graphql-tag": "2.12.6",
|
"graphql-tag": "2.12.6",
|
||||||
"https-proxy-agent": "5.0.1",
|
"https-proxy-agent": "5.0.1",
|
||||||
"ignore": "5.2.0",
|
"ignore": "5.2.4",
|
||||||
"indent-string": "4.0.0",
|
"indent-string": "4.0.0",
|
||||||
"jks-js": "1.1.0",
|
"jks-js": "1.1.0",
|
||||||
"joi": "17.6.4",
|
"joi": "17.7.0",
|
||||||
"keychain": "1.3.0",
|
"keychain": "1.3.0",
|
||||||
"log-symbols": "4.1.0",
|
"log-symbols": "4.1.0",
|
||||||
"mime": "3.0.0",
|
"mime": "3.0.0",
|
||||||
"minimatch": "5.1.0",
|
"minimatch": "5.1.2",
|
||||||
"nanoid": "3.3.4",
|
"nanoid": "3.3.4",
|
||||||
"node-fetch": "2.6.7",
|
"node-fetch": "2.6.7",
|
||||||
"node-forge": "1.3.1",
|
"node-forge": "1.3.1",
|
||||||
@@ -74,47 +75,47 @@
|
|||||||
"resolve-from": "5.0.0",
|
"resolve-from": "5.0.0",
|
||||||
"semver": "7.3.8",
|
"semver": "7.3.8",
|
||||||
"slash": "3.0.0",
|
"slash": "3.0.0",
|
||||||
"tar": "6.1.11",
|
"tar": "6.1.13",
|
||||||
"terminal-link": "2.1.1",
|
"terminal-link": "2.1.1",
|
||||||
"tslib": "2.4.0",
|
"tslib": "2.4.1",
|
||||||
"turndown": "7.1.1",
|
"turndown": "7.1.1",
|
||||||
"untildify": "4.0.0",
|
"untildify": "4.0.0",
|
||||||
"uuid": "9.0.0",
|
"uuid": "9.0.0",
|
||||||
"wrap-ansi": "7.0.0"
|
"wrap-ansi": "7.0.0"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@graphql-codegen/cli": "2.13.7",
|
"@graphql-codegen/cli": "2.16.3",
|
||||||
"@graphql-codegen/introspection": "2.2.1",
|
"@graphql-codegen/introspection": "2.2.3",
|
||||||
"@graphql-codegen/typescript": "2.8.0",
|
"@graphql-codegen/typescript": "2.8.7",
|
||||||
"@graphql-codegen/typescript-operations": "2.5.5",
|
"@graphql-codegen/typescript-operations": "2.5.12",
|
||||||
"@types/cli-progress": "3.11.0",
|
"@types/cli-progress": "3.11.0",
|
||||||
"@types/dateformat": "3.0.1",
|
"@types/dateformat": "3.0.1",
|
||||||
"@types/envinfo": "7.8.1",
|
"@types/envinfo": "7.8.1",
|
||||||
"@types/express": "4.17.14",
|
"@types/express": "4.17.15",
|
||||||
"@types/fs-extra": "9.0.13",
|
"@types/fs-extra": "9.0.13",
|
||||||
"@types/getenv": "^1.0.0",
|
"@types/getenv": "^1.0.0",
|
||||||
"@types/mime": "3.0.1",
|
"@types/mime": "3.0.1",
|
||||||
"@types/node-fetch": "2.6.2",
|
"@types/node-fetch": "2.6.2",
|
||||||
"@types/node-forge": "1.3.0",
|
"@types/node-forge": "1.3.1",
|
||||||
"@types/pngjs": "6.0.1",
|
"@types/pngjs": "6.0.1",
|
||||||
"@types/promise-retry": "1.1.3",
|
"@types/promise-retry": "1.1.3",
|
||||||
"@types/prompts": "2.4.1",
|
"@types/prompts": "2.4.2",
|
||||||
"@types/semver": "7.3.12",
|
"@types/semver": "7.3.13",
|
||||||
"@types/tar": "6.1.3",
|
"@types/tar": "6.1.3",
|
||||||
"@types/tough-cookie": "4.0.2",
|
"@types/tough-cookie": "4.0.2",
|
||||||
"@types/uuid": "8.3.4",
|
"@types/uuid": "9.0.0",
|
||||||
"@types/wrap-ansi": "3.0.0",
|
"@types/wrap-ansi": "3.0.0",
|
||||||
"axios": "0.27.2",
|
"axios": "0.27.2",
|
||||||
"eslint-plugin-graphql": "4.0.0",
|
"eslint-plugin-graphql": "4.0.0",
|
||||||
"express": "4.18.2",
|
"express": "4.18.2",
|
||||||
"memfs": "3.4.7",
|
"memfs": "3.4.13",
|
||||||
"mockdate": "3.0.5",
|
"mockdate": "3.0.5",
|
||||||
"nock": "13.2.9",
|
"nock": "13.2.9",
|
||||||
"rimraf": "3.0.2",
|
"rimraf": "3.0.2",
|
||||||
"ts-deepmerge": "4.0.0",
|
"ts-deepmerge": "4.0.0",
|
||||||
"ts-mockito": "2.6.1",
|
"ts-mockito": "2.6.1",
|
||||||
"ts-node": "10.9.1",
|
"ts-node": "10.9.1",
|
||||||
"typescript": "4.8.4"
|
"typescript": "4.9.4"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=14.0.0"
|
"node": ">=14.0.0"
|
||||||
@@ -202,7 +203,8 @@
|
|||||||
"repository": "expo/eas-cli",
|
"repository": "expo/eas-cli",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"postpack": "rimraf oclif.manifest.json",
|
"postpack": "rimraf oclif.manifest.json",
|
||||||
"prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
|
"prepack": "yarn rebuild && node ./scripts/prepack.js",
|
||||||
|
"rebuild": "rimraf build && yarn build",
|
||||||
"pretarball-ci": "./scripts/pretarball-ci.sh",
|
"pretarball-ci": "./scripts/pretarball-ci.sh",
|
||||||
"build": "tsc --project tsconfig.build.json",
|
"build": "tsc --project tsconfig.build.json",
|
||||||
"watch": "yarn build --watch --preserveWatchOutput",
|
"watch": "yarn build --watch --preserveWatchOutput",
|
||||||
|
|||||||
@@ -437,8 +437,8 @@
|
|||||||
"$ref": "#/definitions/apple/AppleKidsAge"
|
"$ref": "#/definitions/apple/AppleKidsAge"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"description": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n@see https://developer.apple.com/news/?id=091202019a",
|
"description": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n@see https://developer-mdn.apple.com/news/?id=091202019a",
|
||||||
"markdownDescription": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n\n[Learn more](https://developer.apple.com/news/?id=091202019a)"
|
"markdownDescription": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n\n[Learn more](https://developer-mdn.apple.com/news/?id=091202019a)"
|
||||||
},
|
},
|
||||||
"seventeenPlus": {
|
"seventeenPlus": {
|
||||||
"type": "boolean",
|
"type": "boolean",
|
||||||
|
|||||||
@@ -133,7 +133,9 @@ export async function createAnalyticsAsync(): Promise<AnalyticsWithOrchestration
|
|||||||
await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, false);
|
await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true);
|
const analyticsEnabled =
|
||||||
|
!process.env.https_proxy && // disable analytics if running behind proxy
|
||||||
|
(await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true));
|
||||||
if (!analyticsEnabled) {
|
if (!analyticsEnabled) {
|
||||||
return new NoOpAnalytics();
|
return new NoOpAnalytics();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,13 @@ import { v4 as uuid } from 'uuid';
|
|||||||
|
|
||||||
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
import { selectBuildToCancelAsync } from '../../commands/build/cancel';
|
import { selectBuildToCancelAsync } from '../../commands/build/cancel';
|
||||||
import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
|
import {
|
||||||
|
AppPlatform,
|
||||||
|
BuildFragment,
|
||||||
|
BuildPriority,
|
||||||
|
BuildResourceClass,
|
||||||
|
BuildStatus,
|
||||||
|
} from '../../graphql/generated';
|
||||||
import { BuildQuery } from '../../graphql/queries/BuildQuery';
|
import { BuildQuery } from '../../graphql/queries/BuildQuery';
|
||||||
import { confirmAsync, selectAsync } from '../../prompts';
|
import { confirmAsync, selectAsync } from '../../prompts';
|
||||||
|
|
||||||
@@ -85,5 +91,6 @@ function createMockBuildFragment({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
status: BuildStatus.InQueue,
|
status: BuildStatus.InQueue,
|
||||||
|
resourceClass: BuildResourceClass.AndroidMedium,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,362 @@
|
|||||||
|
import { Platform } from '@expo/eas-build-job';
|
||||||
|
import { CombinedError } from '@urql/core';
|
||||||
|
import { GraphQLError } from 'graphql/error';
|
||||||
|
|
||||||
|
import { EasCommandError } from '../../commandUtils/errors';
|
||||||
|
import Build from '../../commands/build';
|
||||||
|
import Log, { link } from '../../log';
|
||||||
|
import { handleBuildRequestError } from '../build';
|
||||||
|
import {
|
||||||
|
EasBuildDownForMaintenanceError,
|
||||||
|
EasBuildFreeTierDisabledAndroidError,
|
||||||
|
EasBuildFreeTierDisabledError,
|
||||||
|
EasBuildFreeTierDisabledIOSError,
|
||||||
|
EasBuildTooManyPendingBuildsError,
|
||||||
|
RequestValidationError,
|
||||||
|
TurtleDeprecatedJobFormatError,
|
||||||
|
} from '../errors';
|
||||||
|
|
||||||
|
beforeEach(() => {
|
||||||
|
jest.resetAllMocks();
|
||||||
|
});
|
||||||
|
|
||||||
|
const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `[
|
||||||
|
{
|
||||||
|
"message": "Error 1"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"message": "Error 2"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"message": "Error 3"
|
||||||
|
}
|
||||||
|
]`;
|
||||||
|
|
||||||
|
const EXPECTED_EAS_BUILD_DOWN_MESSAGE = `EAS Build is down for maintenance. Try again later. Check ${link(
|
||||||
|
'https://status.expo.dev/'
|
||||||
|
)} for updates.`;
|
||||||
|
|
||||||
|
const EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID = `You have already reached the maximum number of pending Android builds for your account. Try again later.`;
|
||||||
|
const EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS = `You have already reached the maximum number of pending iOS builds for your account. Try again later.`;
|
||||||
|
|
||||||
|
const EXPECTED_GENERIC_MESSAGE =
|
||||||
|
'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.';
|
||||||
|
|
||||||
|
const getGraphQLError = (message: string, errorCode: string): GraphQLError => {
|
||||||
|
return new GraphQLError(message, null, null, null, null, null, {
|
||||||
|
errorCode,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const assertReThrownError = (
|
||||||
|
caughtError: CombinedError | Error,
|
||||||
|
expectedType: typeof EasCommandError,
|
||||||
|
expectedMessage: string = 'Error 1'
|
||||||
|
): void => {
|
||||||
|
expect(caughtError).toBeInstanceOf(expectedType);
|
||||||
|
expect((caughtError as Error).message).toEqual(expectedMessage);
|
||||||
|
};
|
||||||
|
|
||||||
|
describe(Build.name, () => {
|
||||||
|
describe('handle build request errors', () => {
|
||||||
|
describe('logs graphQL errors to debug if present', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const logDebugSpy = jest.spyOn(Log, 'debug');
|
||||||
|
const graphQLErrors = ['Error 1', 'Error 2', 'Error 3'];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
expect(logDebugSpy).toBeCalledWith(EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const logDebugSpy = jest.spyOn(Log, 'debug');
|
||||||
|
const graphQLErrors = ['Error 1', 'Error 2', 'Error 3'];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
expect(logDebugSpy).toBeCalledWith(EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('logs nothing to debug if graphQLErrors not present', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const logDebugSpy = jest.spyOn(Log, 'debug');
|
||||||
|
const error = new Error('Generic error');
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
expect(logDebugSpy).toBeCalledWith(undefined);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const logDebugSpy = jest.spyOn(Log, 'debug');
|
||||||
|
const error = new Error('Generic error');
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
expect(logDebugSpy).toBeCalledWith(undefined);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('error is server-side defined error', () => {
|
||||||
|
describe('throws correct EasCommandError subclass', () => {
|
||||||
|
describe('for TURTLE_DEPRECATED_JOB_FORMAT', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('for EAS_BUILD_FREE_TIER_DISABLED', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it for EAS_BUILD_FREE_TIER_DISABLED_IOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_IOS');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledIOSError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it for EAS_BUILD_FREE_TIER_DISABLED_ANDROID', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, EasBuildFreeTierDisabledAndroidError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('for VALIDATION_ERROR', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, RequestValidationError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, RequestValidationError);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('error is other expected graphQL-related error', () => {
|
||||||
|
describe('throws correct EasCommandError subclass', () => {
|
||||||
|
describe('for EAS_BUILD_DOWN_FOR_MAINTENANCE', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(
|
||||||
|
caughtError as Error,
|
||||||
|
EasBuildDownForMaintenanceError,
|
||||||
|
EXPECTED_EAS_BUILD_DOWN_MESSAGE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(
|
||||||
|
caughtError as Error,
|
||||||
|
EasBuildDownForMaintenanceError,
|
||||||
|
EXPECTED_EAS_BUILD_DOWN_MESSAGE
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('for EAS_BUILD_TOO_MANY_PENDING_BUILDS', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(
|
||||||
|
caughtError as Error,
|
||||||
|
EasBuildTooManyPendingBuildsError,
|
||||||
|
EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(
|
||||||
|
caughtError as Error,
|
||||||
|
EasBuildTooManyPendingBuildsError,
|
||||||
|
EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
|
||||||
|
);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('error is unexpected graphQL-related error', () => {
|
||||||
|
describe('throws base Error class with custom message', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
|
||||||
|
const graphQLErrors = [graphQLError];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('error is unexpected non-graphQL-related error', () => {
|
||||||
|
describe('throws base Error class with propagated message', () => {
|
||||||
|
it('does it with Android', async () => {
|
||||||
|
const platform = Platform.ANDROID;
|
||||||
|
const error = new Error('Non-graphQL-related error');
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
expect(caughtError).toStrictEqual(error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('does it with iOS', async () => {
|
||||||
|
const platform = Platform.IOS;
|
||||||
|
const error = new Error('Non-graphQL-related error');
|
||||||
|
|
||||||
|
try {
|
||||||
|
handleBuildRequestError(error, platform);
|
||||||
|
} catch (caughtError) {
|
||||||
|
expect(caughtError).toStrictEqual(error);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -62,7 +62,7 @@ This means that it will most likely produce an AAB and you will not be able to i
|
|||||||
const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
|
const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
|
||||||
|
|
||||||
if (ctx.workflow === Workflow.MANAGED) {
|
if (ctx.workflow === Workflow.MANAGED) {
|
||||||
await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
|
await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
|
const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
|
||||||
@@ -124,7 +124,8 @@ export async function prepareAndroidBuildAsync(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
|
function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
|
||||||
return !ctx.buildProfile.withoutCredentials;
|
const isCustomBuild = ctx.buildProfile.config !== undefined;
|
||||||
|
return !ctx.buildProfile.withoutCredentials && !isCustomBuild;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function ensureAndroidCredentialsAsync(
|
async function ensureAndroidCredentialsAsync(
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
import { Android } from '@expo/eas-build-job';
|
import { Android } from '@expo/eas-build-job';
|
||||||
|
|
||||||
import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
|
import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
|
||||||
import { transformProjectArchive, transformWorkflow } from '../graphql';
|
import {
|
||||||
|
transformBuildMode,
|
||||||
|
transformBuildTrigger,
|
||||||
|
transformProjectArchive,
|
||||||
|
transformWorkflow,
|
||||||
|
} from '../graphql';
|
||||||
|
|
||||||
export function transformJob(job: Android.Job): AndroidJobInput {
|
export function transformJob(job: Android.Job): AndroidJobInput {
|
||||||
return {
|
return {
|
||||||
type: transformWorkflow(job.type),
|
type: transformWorkflow(job.type),
|
||||||
|
triggeredBy: transformBuildTrigger(job.triggeredBy),
|
||||||
projectArchive: transformProjectArchive(job.projectArchive),
|
projectArchive: transformProjectArchive(job.projectArchive),
|
||||||
projectRootDirectory: job.projectRootDirectory,
|
projectRootDirectory: job.projectRootDirectory,
|
||||||
releaseChannel: job.releaseChannel,
|
releaseChannel: job.releaseChannel,
|
||||||
@@ -21,6 +27,8 @@ export function transformJob(job: Android.Job): AndroidJobInput {
|
|||||||
buildType: job.buildType && transformBuildType(job.buildType),
|
buildType: job.buildType && transformBuildType(job.buildType),
|
||||||
developmentClient: job.developmentClient,
|
developmentClient: job.developmentClient,
|
||||||
experimental: job.experimental,
|
experimental: job.experimental,
|
||||||
|
mode: transformBuildMode(job.mode),
|
||||||
|
customBuildConfig: job.customBuildConfig,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +1,18 @@
|
|||||||
import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
|
import {
|
||||||
|
Android,
|
||||||
|
ArchiveSource,
|
||||||
|
BuildMode,
|
||||||
|
BuildTrigger,
|
||||||
|
Job,
|
||||||
|
Platform,
|
||||||
|
sanitizeJob,
|
||||||
|
} from '@expo/eas-build-job';
|
||||||
import { BuildProfile } from '@expo/eas-json';
|
import { BuildProfile } from '@expo/eas-json';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import slash from 'slash';
|
import slash from 'slash';
|
||||||
|
|
||||||
import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
|
import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
|
||||||
|
import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
|
||||||
import { getUsername } from '../../project/projectUtils';
|
import { getUsername } from '../../project/projectUtils';
|
||||||
import { getVcsClient } from '../../vcs';
|
import { getVcsClient } from '../../vcs';
|
||||||
import { BuildContext } from '../context';
|
import { BuildContext } from '../context';
|
||||||
@@ -16,7 +25,6 @@ interface JobData {
|
|||||||
const cacheDefaults = {
|
const cacheDefaults = {
|
||||||
disabled: false,
|
disabled: false,
|
||||||
customPaths: [],
|
customPaths: [],
|
||||||
cacheDefaultPaths: true,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function prepareJobAsync(
|
export async function prepareJobAsync(
|
||||||
@@ -41,11 +49,15 @@ export async function prepareJobAsync(
|
|||||||
}
|
}
|
||||||
: {};
|
: {};
|
||||||
|
|
||||||
let buildType = ctx.buildProfile.buildType;
|
let buildType = buildProfile.buildType;
|
||||||
if (!buildType && !buildProfile.gradleCommand && ctx.buildProfile.distribution === 'internal') {
|
if (!buildType && !buildProfile.gradleCommand && buildProfile.distribution === 'internal') {
|
||||||
buildType = Android.BuildType.APK;
|
buildType = Android.BuildType.APK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const maybeCustomBuildConfigPath = buildProfile.config
|
||||||
|
? getCustomBuildConfigPath(buildProfile.config)
|
||||||
|
: undefined;
|
||||||
|
|
||||||
const job: Android.Job = {
|
const job: Android.Job = {
|
||||||
type: ctx.workflow,
|
type: ctx.workflow,
|
||||||
platform: Platform.ANDROID,
|
platform: Platform.ANDROID,
|
||||||
@@ -67,8 +79,8 @@ export async function prepareJobAsync(
|
|||||||
secrets: {
|
secrets: {
|
||||||
...buildCredentials,
|
...buildCredentials,
|
||||||
},
|
},
|
||||||
releaseChannel: ctx.buildProfile.releaseChannel,
|
releaseChannel: buildProfile.releaseChannel,
|
||||||
updates: { channel: ctx.buildProfile.channel },
|
updates: { channel: buildProfile.channel },
|
||||||
developmentClient: buildProfile.developmentClient,
|
developmentClient: buildProfile.developmentClient,
|
||||||
gradleCommand: buildProfile.gradleCommand,
|
gradleCommand: buildProfile.gradleCommand,
|
||||||
applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
|
applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
|
||||||
@@ -81,8 +93,15 @@ export async function prepareJobAsync(
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
experimental: {
|
experimental: {
|
||||||
prebuildCommand: ctx.buildProfile.prebuildCommand,
|
prebuildCommand: buildProfile.prebuildCommand,
|
||||||
},
|
},
|
||||||
|
mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
|
||||||
|
triggeredBy: BuildTrigger.EAS_CLI,
|
||||||
|
...(maybeCustomBuildConfigPath && {
|
||||||
|
customBuildConfig: {
|
||||||
|
path: maybeCustomBuildConfigPath,
|
||||||
|
},
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
|
|
||||||
return sanitizeJob(job);
|
return sanitizeJob(job);
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
|
import { ArchiveSource, ArchiveSourceType, Job, Metadata, Platform } from '@expo/eas-build-job';
|
||||||
import { CredentialsSource } from '@expo/eas-json';
|
import { CredentialsSource, EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
|
||||||
|
import assert from 'assert';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import cliProgress from 'cli-progress';
|
import cliProgress from 'cli-progress';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
@@ -9,15 +10,17 @@ import { BuildEvent } from '../analytics/AnalyticsManager';
|
|||||||
import { withAnalyticsAsync } from '../analytics/common';
|
import { withAnalyticsAsync } from '../analytics/common';
|
||||||
import { getExpoWebsiteBaseUrl } from '../api';
|
import { getExpoWebsiteBaseUrl } from '../api';
|
||||||
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import { EasCommandError } from '../commandUtils/errors';
|
||||||
import {
|
import {
|
||||||
AppPlatform,
|
AppPlatform,
|
||||||
BuildFragment,
|
BuildFragment,
|
||||||
BuildParamsInput,
|
BuildParamsInput,
|
||||||
BuildPriority,
|
BuildPriority,
|
||||||
|
BuildResourceClass,
|
||||||
BuildStatus,
|
BuildStatus,
|
||||||
UploadSessionType,
|
UploadSessionType,
|
||||||
} from '../graphql/generated';
|
} from '../graphql/generated';
|
||||||
import { BuildResult } from '../graphql/mutations/BuildMutation';
|
import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
|
||||||
import { BuildQuery } from '../graphql/queries/BuildQuery';
|
import { BuildQuery } from '../graphql/queries/BuildQuery';
|
||||||
import Log, { learnMore, link } from '../log';
|
import Log, { learnMore, link } from '../log';
|
||||||
import { Ora, ora } from '../ora';
|
import { Ora, ora } from '../ora';
|
||||||
@@ -26,13 +29,25 @@ import {
|
|||||||
appPlatformEmojis,
|
appPlatformEmojis,
|
||||||
requestedPlatformDisplayNames,
|
requestedPlatformDisplayNames,
|
||||||
} from '../platform';
|
} from '../platform';
|
||||||
|
import { confirmAsync } from '../prompts';
|
||||||
import { uploadFileAtPathToGCSAsync } from '../uploads';
|
import { uploadFileAtPathToGCSAsync } from '../uploads';
|
||||||
import { formatBytes } from '../utils/files';
|
import { formatBytes } from '../utils/files';
|
||||||
|
import { printJsonOnlyOutput } from '../utils/json';
|
||||||
import { createProgressTracker } from '../utils/progress';
|
import { createProgressTracker } from '../utils/progress';
|
||||||
import { sleepAsync } from '../utils/promise';
|
import { sleepAsync } from '../utils/promise';
|
||||||
import { getVcsClient } from '../vcs';
|
import { getVcsClient } from '../vcs';
|
||||||
import { BuildContext } from './context';
|
import { BuildContext } from './context';
|
||||||
import { runLocalBuildAsync } from './local';
|
import {
|
||||||
|
EasBuildDownForMaintenanceError,
|
||||||
|
EasBuildFreeTierDisabledAndroidError,
|
||||||
|
EasBuildFreeTierDisabledError,
|
||||||
|
EasBuildFreeTierDisabledIOSError,
|
||||||
|
EasBuildTooManyPendingBuildsError,
|
||||||
|
RequestValidationError,
|
||||||
|
TurtleDeprecatedJobFormatError,
|
||||||
|
} from './errors';
|
||||||
|
import { transformMetadata } from './graphql';
|
||||||
|
import { LocalBuildMode, runLocalBuildAsync } from './local';
|
||||||
import { collectMetadataAsync } from './metadata';
|
import { collectMetadataAsync } from './metadata';
|
||||||
import { printDeprecationWarnings } from './utils/printBuildInfo';
|
import { printDeprecationWarnings } from './utils/printBuildInfo';
|
||||||
import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
|
import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
|
||||||
@@ -107,15 +122,24 @@ export async function prepareBuildRequestForPlatformAsync<
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const projectArchive = ctx.localBuildOptions.enable
|
let projectArchive: ArchiveSource | undefined;
|
||||||
? ({
|
if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
|
||||||
type: ArchiveSourceType.PATH,
|
projectArchive = {
|
||||||
path: (await makeProjectTarballAsync()).path,
|
type: ArchiveSourceType.PATH,
|
||||||
} as const)
|
path: (await makeProjectTarballAsync()).path,
|
||||||
: ({
|
};
|
||||||
type: ArchiveSourceType.GCS,
|
} else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
|
||||||
bucketKey: await uploadProjectAsync(ctx),
|
projectArchive = {
|
||||||
} as const);
|
type: ArchiveSourceType.PATH,
|
||||||
|
path: process.cwd(),
|
||||||
|
};
|
||||||
|
} else if (!ctx.localBuildOptions.localBuildMode) {
|
||||||
|
projectArchive = {
|
||||||
|
type: ArchiveSourceType.GCS,
|
||||||
|
bucketKey: await uploadProjectAsync(ctx),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
assert(projectArchive);
|
||||||
|
|
||||||
const metadata = await collectMetadataAsync(ctx);
|
const metadata = await collectMetadataAsync(ctx);
|
||||||
const buildParams = resolveBuildParamsInput(ctx);
|
const buildParams = resolveBuildParamsInput(ctx);
|
||||||
@@ -125,66 +149,55 @@ export async function prepareBuildRequestForPlatformAsync<
|
|||||||
});
|
});
|
||||||
|
|
||||||
return async () => {
|
return async () => {
|
||||||
if (ctx.localBuildOptions.enable) {
|
if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
|
||||||
await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
|
await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
|
||||||
return undefined;
|
return undefined;
|
||||||
} else {
|
} else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
|
||||||
|
await BuildMutation.updateBuildMetadataAsync(ctx.graphqlClient, {
|
||||||
|
buildId: nullthrows(process.env.EAS_BUILD_ID),
|
||||||
|
metadata: transformMetadata(metadata),
|
||||||
|
});
|
||||||
|
printJsonOnlyOutput({ job, metadata });
|
||||||
|
return undefined;
|
||||||
|
} else if (!ctx.localBuildOptions.localBuildMode) {
|
||||||
try {
|
try {
|
||||||
return await sendBuildRequestAsync(builder, job, metadata, buildParams);
|
return await sendBuildRequestAsync(builder, job, metadata, buildParams);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
handleBuildRequestError(error, job.platform);
|
handleBuildRequestError(error, job.platform);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
throw new Error('Unknown localBuildMode.');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleBuildRequestError(error: any, platform: Platform): never {
|
const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
|
||||||
if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
|
TURTLE_DEPRECATED_JOB_FORMAT: TurtleDeprecatedJobFormatError,
|
||||||
Log.error('EAS Build API has changed. Upgrade to the latest eas-cli version.');
|
EAS_BUILD_FREE_TIER_DISABLED: EasBuildFreeTierDisabledError,
|
||||||
throw new Error('Build request failed.');
|
EAS_BUILD_FREE_TIER_DISABLED_IOS: EasBuildFreeTierDisabledIOSError,
|
||||||
} else if (
|
EAS_BUILD_FREE_TIER_DISABLED_ANDROID: EasBuildFreeTierDisabledAndroidError,
|
||||||
error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
|
VALIDATION_ERROR: RequestValidationError,
|
||||||
) {
|
};
|
||||||
Log.error(
|
|
||||||
|
export function handleBuildRequestError(error: any, platform: Platform): never {
|
||||||
|
Log.debug(JSON.stringify(error.graphQLErrors, null, 2));
|
||||||
|
|
||||||
|
const graphQLErrorCode: string = error?.graphQLErrors?.[0]?.extensions?.errorCode;
|
||||||
|
if (graphQLErrorCode in SERVER_SIDE_DEFINED_ERRORS) {
|
||||||
|
const ErrorClass: typeof EasCommandError = SERVER_SIDE_DEFINED_ERRORS[graphQLErrorCode];
|
||||||
|
throw new ErrorClass(error?.graphQLErrors?.[0]?.message);
|
||||||
|
} else if (graphQLErrorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
|
||||||
|
throw new EasBuildDownForMaintenanceError(
|
||||||
`EAS Build is down for maintenance. Try again later. Check ${link(
|
`EAS Build is down for maintenance. Try again later. Check ${link(
|
||||||
'https://status.expo.dev/'
|
'https://status.expo.dev/'
|
||||||
)} for updates.`
|
)} for updates.`
|
||||||
);
|
);
|
||||||
throw new Error('Build request failed.');
|
} else if (graphQLErrorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
|
||||||
} else if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED') {
|
throw new EasBuildTooManyPendingBuildsError(
|
||||||
Log.error(
|
|
||||||
`EAS Build free tier is temporarily disabled and we are not accepting any new builds. Try again later. ${learnMore(
|
|
||||||
'https://expo.fyi/eas-build-queues'
|
|
||||||
)}`
|
|
||||||
);
|
|
||||||
throw new Error('Build request failed.');
|
|
||||||
} else if (
|
|
||||||
error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED_IOS'
|
|
||||||
) {
|
|
||||||
Log.error(
|
|
||||||
`EAS Build free tier is temporarily disabled for iOS and we are not accepting any new builds. Try again later. ${learnMore(
|
|
||||||
'https://expo.fyi/eas-build-queues'
|
|
||||||
)}`
|
|
||||||
);
|
|
||||||
throw new Error('Build request failed.');
|
|
||||||
} else if (
|
|
||||||
error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID'
|
|
||||||
) {
|
|
||||||
Log.error(
|
|
||||||
`EAS Build free tier is temporarily disabled for Android and we are not accepting any new builds. Try again later. ${learnMore(
|
|
||||||
'https://expo.fyi/eas-build-queues'
|
|
||||||
)}`
|
|
||||||
);
|
|
||||||
throw new Error('Build request failed.');
|
|
||||||
} else if (
|
|
||||||
error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
|
|
||||||
) {
|
|
||||||
Log.error(
|
|
||||||
`You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
|
`You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
|
||||||
);
|
);
|
||||||
throw new Error('Build request failed.');
|
|
||||||
} else if (error?.graphQLErrors) {
|
} else if (error?.graphQLErrors) {
|
||||||
Log.error(
|
throw new Error(
|
||||||
'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
|
'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -285,7 +298,12 @@ export type MaybeBuildFragment = BuildFragment | null;
|
|||||||
|
|
||||||
export async function waitForBuildEndAsync(
|
export async function waitForBuildEndAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
graphqlClient: ExpoGraphqlClient,
|
||||||
{ buildIds, accountName }: { buildIds: string[]; accountName: string },
|
{
|
||||||
|
buildIds,
|
||||||
|
accountName,
|
||||||
|
projectDir,
|
||||||
|
nonInteractive,
|
||||||
|
}: { buildIds: string[]; accountName: string; projectDir: string; nonInteractive: boolean },
|
||||||
{ intervalSec = 10 } = {}
|
{ intervalSec = 10 } = {}
|
||||||
): Promise<MaybeBuildFragment[]> {
|
): Promise<MaybeBuildFragment[]> {
|
||||||
let spinner;
|
let spinner;
|
||||||
@@ -302,7 +320,10 @@ export async function waitForBuildEndAsync(
|
|||||||
const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
|
const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
|
||||||
const { refetch } =
|
const { refetch } =
|
||||||
builds.length === 1
|
builds.length === 1
|
||||||
? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
|
? await handleSingleBuildProgressAsync(
|
||||||
|
{ build: builds[0], accountName, projectDir, nonInteractive },
|
||||||
|
{ spinner }
|
||||||
|
)
|
||||||
: await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
|
: await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
|
||||||
if (!refetch) {
|
if (!refetch) {
|
||||||
return builds;
|
return builds;
|
||||||
@@ -337,7 +358,17 @@ const queueProgressBar = new cliProgress.SingleBar(
|
|||||||
);
|
);
|
||||||
|
|
||||||
async function handleSingleBuildProgressAsync(
|
async function handleSingleBuildProgressAsync(
|
||||||
{ build, accountName }: { build: MaybeBuildFragment; accountName: string },
|
{
|
||||||
|
build,
|
||||||
|
accountName,
|
||||||
|
projectDir,
|
||||||
|
nonInteractive,
|
||||||
|
}: {
|
||||||
|
build: MaybeBuildFragment;
|
||||||
|
accountName: string;
|
||||||
|
projectDir: string;
|
||||||
|
nonInteractive: boolean;
|
||||||
|
},
|
||||||
{ spinner }: { spinner: Ora }
|
{ spinner }: { spinner: Ora }
|
||||||
): Promise<BuildProgressResult> {
|
): Promise<BuildProgressResult> {
|
||||||
if (build === null) {
|
if (build === null) {
|
||||||
@@ -376,7 +407,8 @@ async function handleSingleBuildProgressAsync(
|
|||||||
if (
|
if (
|
||||||
!queueProgressBarStarted &&
|
!queueProgressBarStarted &&
|
||||||
typeof build.initialQueuePosition === 'number' &&
|
typeof build.initialQueuePosition === 'number' &&
|
||||||
typeof build.queuePosition === 'number'
|
typeof build.queuePosition === 'number' &&
|
||||||
|
typeof build.estimatedWaitTimeLeftSeconds === 'number'
|
||||||
) {
|
) {
|
||||||
spinner.stopAndPersist();
|
spinner.stopAndPersist();
|
||||||
if (build.priority !== BuildPriority.High) {
|
if (build.priority !== BuildPriority.High) {
|
||||||
@@ -388,6 +420,55 @@ async function handleSingleBuildProgressAsync(
|
|||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (
|
||||||
|
build.platform === AppPlatform.Ios &&
|
||||||
|
[BuildResourceClass.IosIntelLarge, BuildResourceClass.IosIntelMedium].includes(
|
||||||
|
build.resourceClass
|
||||||
|
)
|
||||||
|
) {
|
||||||
|
let askToSwitchToM1 = false;
|
||||||
|
if (
|
||||||
|
build.priority === BuildPriority.High &&
|
||||||
|
build.estimatedWaitTimeLeftSeconds >= /* 10 minutes */ 10 * 60
|
||||||
|
) {
|
||||||
|
Log.newLine();
|
||||||
|
Log.warn(
|
||||||
|
`Warning: Priority queue wait time for legacy iOS Intel workers is longer than usual (more than 10 minutes).`
|
||||||
|
);
|
||||||
|
Log.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
|
||||||
|
Log.warn(
|
||||||
|
learnMore('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
|
||||||
|
learnMoreMessage: 'Learn more on switching to M1 workers.',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
askToSwitchToM1 = true;
|
||||||
|
} else if (
|
||||||
|
build.priority !== BuildPriority.High &&
|
||||||
|
build.estimatedWaitTimeLeftSeconds >= /* 120 minutes */ 120 * 60
|
||||||
|
) {
|
||||||
|
Log.newLine();
|
||||||
|
Log.warn(
|
||||||
|
`Warning: Free tier queue wait time for legacy iOS Intel workers is longer than usual.`
|
||||||
|
);
|
||||||
|
Log.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
|
||||||
|
Log.warn(
|
||||||
|
learnMore('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
|
||||||
|
learnMoreMessage: 'Learn more on switching to M1 workers.',
|
||||||
|
})
|
||||||
|
);
|
||||||
|
askToSwitchToM1 = true;
|
||||||
|
}
|
||||||
|
if (!nonInteractive && askToSwitchToM1) {
|
||||||
|
const shouldSwitchToM1 = await confirmAsync({
|
||||||
|
message: `Switch iOS builds to M1 workers (modifies build profiles in eas.json)?`,
|
||||||
|
});
|
||||||
|
if (shouldSwitchToM1) {
|
||||||
|
await updateIosBuildProfilesToUseM1WorkersAsync(projectDir);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Log.newLine();
|
Log.newLine();
|
||||||
Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
|
Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
|
||||||
queueProgressBar.start(
|
queueProgressBar.start(
|
||||||
@@ -529,3 +610,21 @@ function formatAccountSubscriptionsUrl(accountName: string): string {
|
|||||||
getExpoWebsiteBaseUrl()
|
getExpoWebsiteBaseUrl()
|
||||||
).toString();
|
).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir: string): Promise<void> {
|
||||||
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
|
await easJsonAccessor.readRawJsonAsync();
|
||||||
|
|
||||||
|
const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
|
||||||
|
easJsonAccessor.patch(easJsonRawObject => {
|
||||||
|
for (const profileName of profileNames) {
|
||||||
|
easJsonRawObject.build[profileName].ios = {
|
||||||
|
...easJsonRawObject.build[profileName].ios,
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
return easJsonRawObject;
|
||||||
|
});
|
||||||
|
await easJsonAccessor.writeAsync();
|
||||||
|
Log.withTick('Updated eas.json. Your next builds will run on M1 workers.');
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Platform, Workflow } from '@expo/eas-build-job';
|
import { Platform, Workflow } from '@expo/eas-build-job';
|
||||||
import { EasJson, EasJsonAccessor } from '@expo/eas-json';
|
import { EasJson, EasJsonAccessor, ResourceClass } from '@expo/eas-json';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
|
|
||||||
@@ -53,11 +53,21 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
|
|||||||
development: {
|
development: {
|
||||||
developmentClient: true,
|
developmentClient: true,
|
||||||
distribution: 'internal',
|
distribution: 'internal',
|
||||||
|
ios: {
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
preview: {
|
preview: {
|
||||||
distribution: 'internal',
|
distribution: 'internal',
|
||||||
|
ios: {
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
production: {
|
||||||
|
ios: {
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
production: {},
|
|
||||||
},
|
},
|
||||||
submit: {
|
submit: {
|
||||||
production: {},
|
production: {},
|
||||||
@@ -76,12 +86,20 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
|
|||||||
},
|
},
|
||||||
ios: {
|
ios: {
|
||||||
buildConfiguration: 'Debug',
|
buildConfiguration: 'Debug',
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
preview: {
|
preview: {
|
||||||
distribution: 'internal',
|
distribution: 'internal',
|
||||||
|
ios: {
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
production: {
|
||||||
|
ios: {
|
||||||
|
resourceClass: ResourceClass.M_MEDIUM,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
production: {},
|
|
||||||
},
|
},
|
||||||
submit: {
|
submit: {
|
||||||
production: {},
|
production: {},
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Platform } from '@expo/eas-build-job';
|
import { Platform } from '@expo/eas-build-job';
|
||||||
import { BuildProfile, EasJson } from '@expo/eas-json';
|
import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
|
||||||
import JsonFile from '@expo/json-file';
|
import JsonFile from '@expo/json-file';
|
||||||
import getenv from 'getenv';
|
import getenv from 'getenv';
|
||||||
import resolveFrom from 'resolve-from';
|
import resolveFrom from 'resolve-from';
|
||||||
@@ -9,7 +9,6 @@ import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/An
|
|||||||
import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
|
import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
|
||||||
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
import { CredentialsContext } from '../credentials/context';
|
import { CredentialsContext } from '../credentials/context';
|
||||||
import { BuildResourceClass } from '../graphql/generated';
|
|
||||||
import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
|
import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
|
||||||
import { resolveWorkflowAsync } from '../project/workflow';
|
import { resolveWorkflowAsync } from '../project/workflow';
|
||||||
import { Actor } from '../user/User';
|
import { Actor } from '../user/User';
|
||||||
@@ -17,6 +16,7 @@ import { createAndroidContextAsync } from './android/build';
|
|||||||
import { BuildContext, CommonContext } from './context';
|
import { BuildContext, CommonContext } from './context';
|
||||||
import { createIosContextAsync } from './ios/build';
|
import { createIosContextAsync } from './ios/build';
|
||||||
import { LocalBuildOptions } from './local';
|
import { LocalBuildOptions } from './local';
|
||||||
|
import { resolveBuildResourceClassAsync } from './utils/resourceClass';
|
||||||
|
|
||||||
export async function createBuildContextAsync<T extends Platform>({
|
export async function createBuildContextAsync<T extends Platform>({
|
||||||
buildProfileName,
|
buildProfileName,
|
||||||
@@ -28,7 +28,7 @@ export async function createBuildContextAsync<T extends Platform>({
|
|||||||
noWait,
|
noWait,
|
||||||
platform,
|
platform,
|
||||||
projectDir,
|
projectDir,
|
||||||
resourceClass,
|
resourceClassFlag,
|
||||||
message,
|
message,
|
||||||
actor,
|
actor,
|
||||||
graphqlClient,
|
graphqlClient,
|
||||||
@@ -44,7 +44,7 @@ export async function createBuildContextAsync<T extends Platform>({
|
|||||||
noWait: boolean;
|
noWait: boolean;
|
||||||
platform: T;
|
platform: T;
|
||||||
projectDir: string;
|
projectDir: string;
|
||||||
resourceClass: BuildResourceClass;
|
resourceClassFlag?: ResourceClass;
|
||||||
message?: string;
|
message?: string;
|
||||||
actor: Actor;
|
actor: Actor;
|
||||||
graphqlClient: ExpoGraphqlClient;
|
graphqlClient: ExpoGraphqlClient;
|
||||||
@@ -52,7 +52,6 @@ export async function createBuildContextAsync<T extends Platform>({
|
|||||||
getDynamicProjectConfigAsync: DynamicConfigContextFn;
|
getDynamicProjectConfigAsync: DynamicConfigContextFn;
|
||||||
}): Promise<BuildContext<T>> {
|
}): Promise<BuildContext<T>> {
|
||||||
const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
|
const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
|
||||||
|
|
||||||
const projectName = exp.slug;
|
const projectName = exp.slug;
|
||||||
const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
|
const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
|
||||||
const workflow = await resolveWorkflowAsync(projectDir, platform);
|
const workflow = await resolveWorkflowAsync(projectDir, platform);
|
||||||
@@ -88,6 +87,14 @@ export async function createBuildContextAsync<T extends Platform>({
|
|||||||
};
|
};
|
||||||
analytics.logEvent(BuildEvent.BUILD_COMMAND, analyticsEventProperties);
|
analytics.logEvent(BuildEvent.BUILD_COMMAND, analyticsEventProperties);
|
||||||
|
|
||||||
|
const resourceClass = await resolveBuildResourceClassAsync(
|
||||||
|
buildProfile,
|
||||||
|
platform,
|
||||||
|
projectDir,
|
||||||
|
exp,
|
||||||
|
resourceClassFlag
|
||||||
|
);
|
||||||
|
|
||||||
const commonContext: CommonContext<T> = {
|
const commonContext: CommonContext<T> = {
|
||||||
accountName: account.name,
|
accountName: account.name,
|
||||||
buildProfile,
|
buildProfile,
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
import { EasCommandError } from '../commandUtils/errors';
|
||||||
|
|
||||||
|
export class TurtleDeprecatedJobFormatError extends EasCommandError {}
|
||||||
|
|
||||||
|
export class EasBuildFreeTierDisabledError extends EasCommandError {}
|
||||||
|
|
||||||
|
export class EasBuildFreeTierDisabledIOSError extends EasCommandError {}
|
||||||
|
|
||||||
|
export class EasBuildFreeTierDisabledAndroidError extends EasCommandError {}
|
||||||
|
|
||||||
|
export class RequestValidationError extends EasCommandError {}
|
||||||
|
|
||||||
|
export class EasBuildDownForMaintenanceError extends EasCommandError {}
|
||||||
|
|
||||||
|
export class EasBuildTooManyPendingBuildsError extends EasCommandError {}
|
||||||
@@ -1,11 +1,19 @@
|
|||||||
import { ArchiveSource, ArchiveSourceType, Metadata, Workflow } from '@expo/eas-build-job';
|
import {
|
||||||
|
ArchiveSource,
|
||||||
|
ArchiveSourceType,
|
||||||
|
BuildTrigger,
|
||||||
|
Metadata,
|
||||||
|
Workflow,
|
||||||
|
} from '@expo/eas-build-job';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
BuildCredentialsSource,
|
BuildCredentialsSource,
|
||||||
BuildIosEnterpriseProvisioning,
|
BuildIosEnterpriseProvisioning,
|
||||||
BuildMetadataInput,
|
BuildMetadataInput,
|
||||||
|
BuildMode,
|
||||||
BuildWorkflow,
|
BuildWorkflow,
|
||||||
DistributionType,
|
DistributionType,
|
||||||
|
BuildTrigger as GraphQLBuildTrigger,
|
||||||
ProjectArchiveSourceInput,
|
ProjectArchiveSourceInput,
|
||||||
ProjectArchiveSourceType,
|
ProjectArchiveSourceType,
|
||||||
} from '../graphql/generated';
|
} from '../graphql/generated';
|
||||||
@@ -34,6 +42,7 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
|
|||||||
export function transformMetadata(metadata: Metadata): BuildMetadataInput {
|
export function transformMetadata(metadata: Metadata): BuildMetadataInput {
|
||||||
return {
|
return {
|
||||||
...metadata,
|
...metadata,
|
||||||
|
buildMode: metadata.buildMode && transformBuildMode(metadata.buildMode),
|
||||||
credentialsSource:
|
credentialsSource:
|
||||||
metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
|
metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
|
||||||
distribution: metadata.distribution && transformDistribution(metadata.distribution),
|
distribution: metadata.distribution && transformDistribution(metadata.distribution),
|
||||||
@@ -81,3 +90,25 @@ export function transformIosEnterpriseProvisioning(
|
|||||||
return BuildIosEnterpriseProvisioning.Universal;
|
return BuildIosEnterpriseProvisioning.Universal;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: check what in metadata
|
||||||
|
export function transformBuildMode(buildMode: string): BuildMode {
|
||||||
|
if (buildMode === 'build') {
|
||||||
|
return BuildMode.Build;
|
||||||
|
} else if (buildMode === 'resign') {
|
||||||
|
return BuildMode.Resign;
|
||||||
|
} else if (buildMode === 'custom') {
|
||||||
|
return BuildMode.Custom;
|
||||||
|
} else {
|
||||||
|
throw new Error(`Unsupported build mode: ${buildMode}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function transformBuildTrigger(buildTrigger: BuildTrigger): GraphQLBuildTrigger {
|
||||||
|
if (buildTrigger === BuildTrigger.EAS_CLI) {
|
||||||
|
return GraphQLBuildTrigger.EasCli;
|
||||||
|
} else if (buildTrigger === BuildTrigger.GIT_BASED_INTEGRATION) {
|
||||||
|
return GraphQLBuildTrigger.GitBasedIntegration;
|
||||||
|
}
|
||||||
|
throw new Error('Unknown build trigger');
|
||||||
|
}
|
||||||
@@ -27,7 +27,7 @@ export async function createIosContextAsync(
|
|||||||
const { buildProfile } = ctx;
|
const { buildProfile } = ctx;
|
||||||
|
|
||||||
if (ctx.workflow === Workflow.MANAGED) {
|
if (ctx.workflow === Workflow.MANAGED) {
|
||||||
await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
|
await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
checkNodeEnvVariable(ctx);
|
checkNodeEnvVariable(ctx);
|
||||||
|
|||||||
@@ -55,5 +55,6 @@ export async function ensureIosCredentialsForBuildResignAsync(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
|
function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
|
||||||
return !buildCtx.buildProfile.simulator;
|
const isCustomBuild = buildCtx.buildProfile.config !== undefined;
|
||||||
|
return !buildCtx.buildProfile.simulator && !isCustomBuild;
|
||||||
}
|
}
|
||||||
@@ -2,16 +2,22 @@ import { Ios } from '@expo/eas-build-job';
|
|||||||
import nullthrows from 'nullthrows';
|
import nullthrows from 'nullthrows';
|
||||||
|
|
||||||
import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
|
import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
|
||||||
import { transformProjectArchive, transformWorkflow } from '../graphql';
|
import {
|
||||||
|
transformBuildMode,
|
||||||
|
transformBuildTrigger,
|
||||||
|
transformProjectArchive,
|
||||||
|
transformWorkflow,
|
||||||
|
} from '../graphql';
|
||||||
|
|
||||||
export function transformJob(job: Ios.Job): IosJobInput {
|
export function transformJob(job: Ios.Job): IosJobInput {
|
||||||
return {
|
return {
|
||||||
type: transformWorkflow(job.type),
|
type: transformWorkflow(job.type),
|
||||||
|
triggeredBy: transformBuildTrigger(job.triggeredBy),
|
||||||
projectArchive: transformProjectArchive(job.projectArchive),
|
projectArchive: transformProjectArchive(job.projectArchive),
|
||||||
projectRootDirectory: job.projectRootDirectory,
|
projectRootDirectory: nullthrows(job.projectRootDirectory),
|
||||||
releaseChannel: job.releaseChannel,
|
releaseChannel: job.releaseChannel,
|
||||||
updates: job.updates,
|
updates: job.updates,
|
||||||
secrets: transformIosSecrets(job.secrets),
|
secrets: job.secrets ? transformIosSecrets(job.secrets) : undefined,
|
||||||
builderEnvironment: job.builderEnvironment,
|
builderEnvironment: job.builderEnvironment,
|
||||||
cache: job.cache,
|
cache: job.cache,
|
||||||
version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
|
version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
|
||||||
@@ -23,6 +29,8 @@ export function transformJob(job: Ios.Job): IosJobInput {
|
|||||||
developmentClient: job.developmentClient,
|
developmentClient: job.developmentClient,
|
||||||
simulator: job.simulator,
|
simulator: job.simulator,
|
||||||
experimental: job.experimental,
|
experimental: job.experimental,
|
||||||
|
mode: transformBuildMode(job.mode),
|
||||||
|
customBuildConfig: job.customBuildConfig,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,20 @@
|
|||||||
import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
|
import {
|
||||||
|
ArchiveSource,
|
||||||
|
BuildMode,
|
||||||
|
BuildTrigger,
|
||||||
|
Ios,
|
||||||
|
Job,
|
||||||
|
Platform,
|
||||||
|
sanitizeJob,
|
||||||
|
} from '@expo/eas-build-job';
|
||||||
|
import { BuildProfile } from '@expo/eas-json';
|
||||||
import nullthrows from 'nullthrows';
|
import nullthrows from 'nullthrows';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import slash from 'slash';
|
import slash from 'slash';
|
||||||
|
|
||||||
import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
|
import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
|
||||||
import { IosJobSecretsInput } from '../../graphql/generated';
|
import { IosJobSecretsInput } from '../../graphql/generated';
|
||||||
|
import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
|
||||||
import { getUsername } from '../../project/projectUtils';
|
import { getUsername } from '../../project/projectUtils';
|
||||||
import { getVcsClient } from '../../vcs';
|
import { getVcsClient } from '../../vcs';
|
||||||
import { BuildContext } from '../context';
|
import { BuildContext } from '../context';
|
||||||
@@ -18,17 +28,17 @@ interface JobData {
|
|||||||
const cacheDefaults = {
|
const cacheDefaults = {
|
||||||
disabled: false,
|
disabled: false,
|
||||||
customPaths: [],
|
customPaths: [],
|
||||||
cacheDefaultPaths: true,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
export async function prepareJobAsync(
|
export async function prepareJobAsync(
|
||||||
ctx: BuildContext<Platform.IOS>,
|
ctx: BuildContext<Platform.IOS>,
|
||||||
jobData: JobData
|
jobData: JobData
|
||||||
): Promise<Job> {
|
): Promise<Job> {
|
||||||
|
const username = getUsername(ctx.exp, ctx.user);
|
||||||
|
const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
|
||||||
const projectRootDirectory =
|
const projectRootDirectory =
|
||||||
slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
|
slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
|
||||||
const username = getUsername(ctx.exp, ctx.user);
|
const buildCredentials: Ios.BuildSecrets['buildCredentials'] = {};
|
||||||
const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
|
|
||||||
if (jobData.credentials) {
|
if (jobData.credentials) {
|
||||||
const targetNames = Object.keys(jobData.credentials);
|
const targetNames = Object.keys(jobData.credentials);
|
||||||
for (const targetName of targetNames) {
|
for (const targetName of targetNames) {
|
||||||
@@ -36,38 +46,41 @@ export async function prepareJobAsync(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const maybeCustomBuildConfigPath = buildProfile.config
|
||||||
|
? getCustomBuildConfigPath(buildProfile.config)
|
||||||
|
: undefined;
|
||||||
|
|
||||||
const job: Ios.Job = {
|
const job: Ios.Job = {
|
||||||
type: ctx.workflow,
|
type: ctx.workflow,
|
||||||
platform: Platform.IOS,
|
platform: Platform.IOS,
|
||||||
projectArchive: jobData.projectArchive,
|
projectArchive: jobData.projectArchive,
|
||||||
projectRootDirectory,
|
projectRootDirectory,
|
||||||
builderEnvironment: {
|
builderEnvironment: {
|
||||||
image: ctx.buildProfile.image,
|
image: buildProfile.image,
|
||||||
node: ctx.buildProfile.node,
|
node: buildProfile.node,
|
||||||
yarn: ctx.buildProfile.yarn,
|
yarn: buildProfile.yarn,
|
||||||
bundler: ctx.buildProfile.bundler,
|
bundler: buildProfile.bundler,
|
||||||
cocoapods: ctx.buildProfile.cocoapods,
|
cocoapods: buildProfile.cocoapods,
|
||||||
fastlane: ctx.buildProfile.fastlane,
|
fastlane: buildProfile.fastlane,
|
||||||
expoCli: ctx.buildProfile.expoCli,
|
expoCli: buildProfile.expoCli,
|
||||||
env: ctx.buildProfile.env,
|
env: buildProfile.env,
|
||||||
},
|
},
|
||||||
cache: {
|
cache: {
|
||||||
...cacheDefaults,
|
...cacheDefaults,
|
||||||
...ctx.buildProfile.cache,
|
...buildProfile.cache,
|
||||||
clear: ctx.clearCache,
|
clear: ctx.clearCache,
|
||||||
},
|
},
|
||||||
secrets: {
|
secrets: {
|
||||||
buildCredentials,
|
buildCredentials,
|
||||||
},
|
},
|
||||||
releaseChannel: ctx.buildProfile.releaseChannel,
|
releaseChannel: buildProfile.releaseChannel,
|
||||||
updates: { channel: ctx.buildProfile.channel },
|
updates: { channel: buildProfile.channel },
|
||||||
developmentClient: ctx.buildProfile.developmentClient,
|
developmentClient: buildProfile.developmentClient,
|
||||||
simulator: ctx.buildProfile.simulator,
|
simulator: buildProfile.simulator,
|
||||||
scheme: jobData.buildScheme,
|
scheme: jobData.buildScheme,
|
||||||
buildConfiguration: ctx.buildProfile.buildConfiguration,
|
buildConfiguration: buildProfile.buildConfiguration,
|
||||||
applicationArchivePath:
|
applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
|
||||||
ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
|
buildArtifactPaths: buildProfile.buildArtifactPaths,
|
||||||
buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
|
|
||||||
username,
|
username,
|
||||||
...(ctx.ios.buildNumberOverride && {
|
...(ctx.ios.buildNumberOverride && {
|
||||||
version: {
|
version: {
|
||||||
@@ -75,8 +88,15 @@ export async function prepareJobAsync(
|
|||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
experimental: {
|
experimental: {
|
||||||
prebuildCommand: ctx.buildProfile.prebuildCommand,
|
prebuildCommand: buildProfile.prebuildCommand,
|
||||||
},
|
},
|
||||||
|
mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
|
||||||
|
triggeredBy: BuildTrigger.EAS_CLI,
|
||||||
|
...(maybeCustomBuildConfigPath && {
|
||||||
|
customBuildConfig: {
|
||||||
|
path: maybeCustomBuildConfigPath,
|
||||||
|
},
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
return sanitizeJob(job);
|
return sanitizeJob(job);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,10 +6,28 @@ import semver from 'semver';
|
|||||||
import { ora } from '../ora';
|
import { ora } from '../ora';
|
||||||
|
|
||||||
const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
|
const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
|
||||||
const PLUGIN_PACKAGE_VERSION = '0.0.120';
|
const PLUGIN_PACKAGE_VERSION = '0.0.128';
|
||||||
|
|
||||||
|
export enum LocalBuildMode {
|
||||||
|
/**
|
||||||
|
* Local build that users can run on their own machines. Instead
|
||||||
|
* of sending build request to EAS Servers it's passing it as an argument
|
||||||
|
* to local-build-plugin, that will run the build locally.
|
||||||
|
*
|
||||||
|
* Triggered when running `eas build --local`.
|
||||||
|
*/
|
||||||
|
LOCAL_BUILD_PLUGIN = 'local-build-plugin',
|
||||||
|
/**
|
||||||
|
* Type of local build that is not accessible to users directly. When
|
||||||
|
* cloud build is triggered by git based integration, we are running
|
||||||
|
* in this mode. Instead of sending build request to EAS Servers it's
|
||||||
|
* printing it to the stdout as JSON, so EAS Build worker can read it.
|
||||||
|
*/
|
||||||
|
INTERNAL = 'internal',
|
||||||
|
}
|
||||||
|
|
||||||
export interface LocalBuildOptions {
|
export interface LocalBuildOptions {
|
||||||
enable: boolean;
|
localBuildMode?: LocalBuildMode;
|
||||||
skipCleanup?: boolean;
|
skipCleanup?: boolean;
|
||||||
skipNativeBuild?: boolean;
|
skipNativeBuild?: boolean;
|
||||||
artifactsDir?: string;
|
artifactsDir?: string;
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { Updates } from '@expo/config-plugins';
|
import { Updates } from '@expo/config-plugins';
|
||||||
import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
|
import { BuildMode, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
|
||||||
import { IosEnterpriseProvisioning } from '@expo/eas-json';
|
import { IosEnterpriseProvisioning } from '@expo/eas-json';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
import resolveFrom from 'resolve-from';
|
import resolveFrom from 'resolve-from';
|
||||||
@@ -37,7 +37,7 @@ export async function collectMetadataAsync<T extends Platform>(
|
|||||||
credentialsSource: ctx.buildProfile.credentialsSource,
|
credentialsSource: ctx.buildProfile.credentialsSource,
|
||||||
sdkVersion: ctx.exp.sdkVersion,
|
sdkVersion: ctx.exp.sdkVersion,
|
||||||
runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
|
runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
|
||||||
reactNativeVersion: await getReactNativeVersionAsync(ctx),
|
reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
|
||||||
...channelOrReleaseChannel,
|
...channelOrReleaseChannel,
|
||||||
distribution,
|
distribution,
|
||||||
appName: ctx.exp.name,
|
appName: ctx.exp.name,
|
||||||
@@ -57,6 +57,7 @@ export async function collectMetadataAsync<T extends Platform>(
|
|||||||
}),
|
}),
|
||||||
runWithNoWaitFlag: ctx.noWait,
|
runWithNoWaitFlag: ctx.noWait,
|
||||||
runFromCI: ctx.runFromCI,
|
runFromCI: ctx.runFromCI,
|
||||||
|
buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
|
||||||
};
|
};
|
||||||
return sanitizeMetadata(metadata);
|
return sanitizeMetadata(metadata);
|
||||||
}
|
}
|
||||||
@@ -155,11 +156,9 @@ async function getNativeChannelAsync<T extends Platform>(
|
|||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function getReactNativeVersionAsync(
|
export async function getReactNativeVersionAsync(projectDir: string): Promise<string | undefined> {
|
||||||
ctx: BuildContext<Platform>
|
|
||||||
): Promise<string | undefined> {
|
|
||||||
try {
|
try {
|
||||||
const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
|
const reactNativePackageJsonPath = resolveFrom(projectDir, 'react-native/package.json');
|
||||||
return (await fs.readJson(reactNativePackageJsonPath)).version;
|
return (await fs.readJson(reactNativePackageJsonPath)).version;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
Log.debug('Failed to resolve react-native version:');
|
Log.debug('Failed to resolve react-native version:');
|
||||||
|
|||||||
@@ -74,11 +74,11 @@ export async function listAndSelectBuildOnAppAsync(
|
|||||||
selectPromptDisabledFunction?: (build: BuildFragment) => boolean;
|
selectPromptDisabledFunction?: (build: BuildFragment) => boolean;
|
||||||
selectPromptWarningMessage?: string;
|
selectPromptWarningMessage?: string;
|
||||||
}
|
}
|
||||||
): Promise<BuildFragment | void> {
|
): Promise<BuildFragment | null> {
|
||||||
if (paginatedQueryOptions.nonInteractive) {
|
if (paginatedQueryOptions.nonInteractive) {
|
||||||
throw new Error('Unable to select a build in non-interactive mode.');
|
throw new Error('Unable to select a build in non-interactive mode.');
|
||||||
} else {
|
} else {
|
||||||
return await paginatedQueryWithSelectPromptAsync({
|
const selectedBuild = await paginatedQueryWithSelectPromptAsync({
|
||||||
limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
|
limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
|
||||||
offset: paginatedQueryOptions.offset,
|
offset: paginatedQueryOptions.offset,
|
||||||
queryToPerform: (limit, offset) =>
|
queryToPerform: (limit, offset) =>
|
||||||
@@ -95,13 +95,10 @@ export async function listAndSelectBuildOnAppAsync(
|
|||||||
selectPromptWarningMessage,
|
selectPromptWarningMessage,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
return selectedBuild ?? null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatBuildChoiceValue(value: string | undefined | null): string {
|
|
||||||
return value ? chalk.bold(value) : 'Unknown';
|
|
||||||
}
|
|
||||||
|
|
||||||
function createBuildToPartialChoiceMaker(
|
function createBuildToPartialChoiceMaker(
|
||||||
selectPromptDisabledFunction?: (build: BuildFragment) => boolean
|
selectPromptDisabledFunction?: (build: BuildFragment) => boolean
|
||||||
) {
|
) {
|
||||||
@@ -118,19 +115,34 @@ function createBuildToPartialChoiceMaker(
|
|||||||
? `${build.gitCommitHash.slice(0, 7)} "${chalk.bold(
|
? `${build.gitCommitHash.slice(0, 7)} "${chalk.bold(
|
||||||
splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
|
splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
|
||||||
)}"`
|
)}"`
|
||||||
: 'Unknown';
|
: null;
|
||||||
|
|
||||||
|
const descriptionItems: { name: string; value: string | null }[] = [
|
||||||
|
{ name: 'Version', value: build.appVersion ? chalk.bold(build.appVersion) : null },
|
||||||
|
{ name: 'Commit', value: formattedCommitData },
|
||||||
|
{
|
||||||
|
name: 'Message',
|
||||||
|
value: build.message
|
||||||
|
? chalk.bold(
|
||||||
|
build.message.length > 200 ? `${build.message.slice(0, 200)}...` : build.message
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: build.platform === AppPlatform.Ios ? 'Build number' : 'Version code',
|
||||||
|
value: build.appBuildVersion ? chalk.bold(build.appBuildVersion) : null,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const filteredDescriptionArray: string[] = descriptionItems
|
||||||
|
.filter(item => item.value)
|
||||||
|
.map(item => `${chalk.bold(item.name)}: ${item.value}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
title: `${chalk.bold(`ID:`)} ${build.id} (${chalk.bold(
|
title: `${chalk.bold(`ID:`)} ${build.id} (${chalk.bold(
|
||||||
`${fromNow(new Date(build.completedAt))} ago`
|
`${fromNow(new Date(build.completedAt))} ago`
|
||||||
)})`,
|
)})`,
|
||||||
description: [
|
description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
|
||||||
`\t${chalk.bold(`Version:`)} ${formatBuildChoiceValue(build.appVersion)}`,
|
|
||||||
`\t${chalk.bold(
|
|
||||||
build.platform === AppPlatform.Ios ? 'Build number:' : 'Version code:'
|
|
||||||
)} ${formatBuildChoiceValue(build.appBuildVersion)}`,
|
|
||||||
`\t${chalk.bold(`Commit:`)} ${formattedCommitData}`,
|
|
||||||
].join('\n'),
|
|
||||||
disabled: selectPromptDisabledFunction?.(build),
|
disabled: selectPromptDisabledFunction?.(build),
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -145,7 +157,7 @@ export async function getLatestBuildAsync(
|
|||||||
projectId: string;
|
projectId: string;
|
||||||
filter?: BuildFilter;
|
filter?: BuildFilter;
|
||||||
}
|
}
|
||||||
): Promise<BuildFragment> {
|
): Promise<BuildFragment | null> {
|
||||||
const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
|
const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
|
||||||
appId: projectId,
|
appId: projectId,
|
||||||
limit: 1,
|
limit: 1,
|
||||||
@@ -154,7 +166,7 @@ export async function getLatestBuildAsync(
|
|||||||
});
|
});
|
||||||
|
|
||||||
if (builds.length === 0) {
|
if (builds.length === 0) {
|
||||||
throw new Error('Found no build matching the provided criteria.');
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return builds[0];
|
return builds[0];
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import {
|
|||||||
EasJson,
|
EasJson,
|
||||||
EasJsonAccessor,
|
EasJsonAccessor,
|
||||||
EasJsonUtils,
|
EasJsonUtils,
|
||||||
|
ResourceClass,
|
||||||
SubmitProfile,
|
SubmitProfile,
|
||||||
} from '@expo/eas-json';
|
} from '@expo/eas-json';
|
||||||
import assert from 'assert';
|
import assert from 'assert';
|
||||||
@@ -17,7 +18,6 @@ import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGr
|
|||||||
import {
|
import {
|
||||||
AppPlatform,
|
AppPlatform,
|
||||||
BuildFragment,
|
BuildFragment,
|
||||||
BuildResourceClass,
|
|
||||||
BuildStatus,
|
BuildStatus,
|
||||||
BuildWithSubmissionsFragment,
|
BuildWithSubmissionsFragment,
|
||||||
SubmissionFragment,
|
SubmissionFragment,
|
||||||
@@ -31,6 +31,7 @@ import {
|
|||||||
appPlatformEmojis,
|
appPlatformEmojis,
|
||||||
toPlatforms,
|
toPlatforms,
|
||||||
} from '../platform';
|
} from '../platform';
|
||||||
|
import { validateCustomBuildConfigAsync } from '../project/customBuildConfig';
|
||||||
import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
|
import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
|
||||||
import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
|
import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
|
||||||
import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
|
import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
|
||||||
@@ -62,7 +63,6 @@ import { BuildContext } from './context';
|
|||||||
import { createBuildContextAsync } from './createContext';
|
import { createBuildContextAsync } from './createContext';
|
||||||
import { prepareIosBuildAsync } from './ios/build';
|
import { prepareIosBuildAsync } from './ios/build';
|
||||||
import { LocalBuildOptions } from './local';
|
import { LocalBuildOptions } from './local';
|
||||||
import { UserInputResourceClass } from './types';
|
|
||||||
import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
|
import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
|
||||||
import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
|
import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
|
||||||
import { ensureRepoIsCleanAsync } from './utils/repository';
|
import { ensureRepoIsCleanAsync } from './utils/repository';
|
||||||
@@ -80,47 +80,10 @@ export interface BuildFlags {
|
|||||||
autoSubmit: boolean;
|
autoSubmit: boolean;
|
||||||
submitProfile?: string;
|
submitProfile?: string;
|
||||||
localBuildOptions: LocalBuildOptions;
|
localBuildOptions: LocalBuildOptions;
|
||||||
userInputResourceClass?: UserInputResourceClass;
|
resourceClass?: ResourceClass;
|
||||||
message?: string;
|
message?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const iosUserInputResourceClassToBuildResourceClassMapping: Record<
|
|
||||||
UserInputResourceClass,
|
|
||||||
BuildResourceClass
|
|
||||||
> = {
|
|
||||||
[UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
|
|
||||||
[UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
|
|
||||||
[UserInputResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosM1Large,
|
|
||||||
};
|
|
||||||
|
|
||||||
const androidUserInputResourceClassToBuildResourceClassMapping: Record<
|
|
||||||
Exclude<UserInputResourceClass, UserInputResourceClass.M1_EXPERIMENTAL>,
|
|
||||||
BuildResourceClass
|
|
||||||
> = {
|
|
||||||
[UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
|
|
||||||
[UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
|
|
||||||
};
|
|
||||||
|
|
||||||
function resolveResourceClass(
|
|
||||||
platform: Platform,
|
|
||||||
resourceClassInput: UserInputResourceClass
|
|
||||||
): BuildResourceClass {
|
|
||||||
if (platform !== Platform.IOS && resourceClassInput === UserInputResourceClass.M1_EXPERIMENTAL) {
|
|
||||||
throw new Error(
|
|
||||||
`Resource class ${UserInputResourceClass.M1_EXPERIMENTAL} is only available for iOS builds`
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return platform === Platform.ANDROID
|
|
||||||
? androidUserInputResourceClassToBuildResourceClassMapping[
|
|
||||||
resourceClassInput as Exclude<
|
|
||||||
UserInputResourceClass,
|
|
||||||
UserInputResourceClass.M1_EXPERIMENTAL
|
|
||||||
>
|
|
||||||
]
|
|
||||||
: iosUserInputResourceClassToBuildResourceClassMapping[resourceClassInput];
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function runBuildAndSubmitAsync(
|
export async function runBuildAndSubmitAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
graphqlClient: ExpoGraphqlClient,
|
||||||
analytics: Analytics,
|
analytics: Analytics,
|
||||||
@@ -136,7 +99,7 @@ export async function runBuildAndSubmitAsync(
|
|||||||
projectDir,
|
projectDir,
|
||||||
nonInteractive: flags.nonInteractive,
|
nonInteractive: flags.nonInteractive,
|
||||||
});
|
});
|
||||||
const easJsonAccessor = new EasJsonAccessor(projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
const easJsonCliConfig: EasJson['cli'] =
|
const easJsonCliConfig: EasJson['cli'] =
|
||||||
(await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
|
(await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
|
||||||
|
|
||||||
@@ -156,6 +119,7 @@ export async function runBuildAndSubmitAsync(
|
|||||||
|
|
||||||
for (const buildProfile of buildProfiles) {
|
for (const buildProfile of buildProfiles) {
|
||||||
validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
|
validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
|
||||||
|
await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
|
||||||
}
|
}
|
||||||
|
|
||||||
const startedBuilds: {
|
const startedBuilds: {
|
||||||
@@ -170,10 +134,6 @@ export async function runBuildAndSubmitAsync(
|
|||||||
flags,
|
flags,
|
||||||
moreBuilds: platforms.length > 1,
|
moreBuilds: platforms.length > 1,
|
||||||
buildProfile,
|
buildProfile,
|
||||||
resourceClass: resolveResourceClass(
|
|
||||||
buildProfile.platform,
|
|
||||||
flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
|
|
||||||
),
|
|
||||||
easJsonCliConfig,
|
easJsonCliConfig,
|
||||||
actor,
|
actor,
|
||||||
graphqlClient,
|
graphqlClient,
|
||||||
@@ -186,7 +146,7 @@ export async function runBuildAndSubmitAsync(
|
|||||||
buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
|
buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (flags.localBuildOptions.enable) {
|
if (flags.localBuildOptions.localBuildMode) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -240,6 +200,8 @@ export async function runBuildAndSubmitAsync(
|
|||||||
const builds = await waitForBuildEndAsync(graphqlClient, {
|
const builds = await waitForBuildEndAsync(graphqlClient, {
|
||||||
buildIds: startedBuilds.map(({ build }) => build.id),
|
buildIds: startedBuilds.map(({ build }) => build.id),
|
||||||
accountName,
|
accountName,
|
||||||
|
projectDir,
|
||||||
|
nonInteractive: flags.nonInteractive,
|
||||||
});
|
});
|
||||||
if (!flags.json) {
|
if (!flags.json) {
|
||||||
printBuildResults(builds);
|
printBuildResults(builds);
|
||||||
@@ -279,7 +241,6 @@ async function prepareAndStartBuildAsync({
|
|||||||
flags,
|
flags,
|
||||||
moreBuilds,
|
moreBuilds,
|
||||||
buildProfile,
|
buildProfile,
|
||||||
resourceClass,
|
|
||||||
easJsonCliConfig,
|
easJsonCliConfig,
|
||||||
actor,
|
actor,
|
||||||
graphqlClient,
|
graphqlClient,
|
||||||
@@ -290,7 +251,6 @@ async function prepareAndStartBuildAsync({
|
|||||||
flags: BuildFlags;
|
flags: BuildFlags;
|
||||||
moreBuilds: boolean;
|
moreBuilds: boolean;
|
||||||
buildProfile: ProfileData<'build'>;
|
buildProfile: ProfileData<'build'>;
|
||||||
resourceClass: BuildResourceClass;
|
|
||||||
easJsonCliConfig: EasJson['cli'];
|
easJsonCliConfig: EasJson['cli'];
|
||||||
actor: Actor;
|
actor: Actor;
|
||||||
graphqlClient: ExpoGraphqlClient;
|
graphqlClient: ExpoGraphqlClient;
|
||||||
@@ -299,7 +259,7 @@ async function prepareAndStartBuildAsync({
|
|||||||
}): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
|
}): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
|
||||||
const buildCtx = await createBuildContextAsync({
|
const buildCtx = await createBuildContextAsync({
|
||||||
buildProfileName: buildProfile.profileName,
|
buildProfileName: buildProfile.profileName,
|
||||||
resourceClass,
|
resourceClassFlag: flags.resourceClass,
|
||||||
clearCache: flags.clearCache,
|
clearCache: flags.clearCache,
|
||||||
buildProfile: buildProfile.profile,
|
buildProfile: buildProfile.profile,
|
||||||
nonInteractive: flags.nonInteractive,
|
nonInteractive: flags.nonInteractive,
|
||||||
|
|||||||
@@ -12,13 +12,3 @@ export enum BuildDistributionType {
|
|||||||
INTERNAL = 'internal',
|
INTERNAL = 'internal',
|
||||||
SIMULATOR = 'simulator',
|
SIMULATOR = 'simulator',
|
||||||
}
|
}
|
||||||
|
|
||||||
export enum UserInputResourceClass {
|
|
||||||
DEFAULT = 'default',
|
|
||||||
LARGE = 'large',
|
|
||||||
/**
|
|
||||||
* @experimental
|
|
||||||
* This resource class is not yet ready to be used in production. For testing purposes only. Might be deprecated / deleted at any time.
|
|
||||||
*/
|
|
||||||
M1_EXPERIMENTAL = 'm1-experimental',
|
|
||||||
}
|
|
||||||
@@ -38,6 +38,10 @@ export function formatGraphQLBuild(build: BuildFragment): string {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: 'Message',
|
||||||
|
value: build.message,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Distribution',
|
label: 'Distribution',
|
||||||
value: build.distribution?.toLowerCase(),
|
value: build.distribution?.toLowerCase(),
|
||||||
|
|||||||
@@ -15,6 +15,32 @@ import Log, { learnMore, link } from '../../log';
|
|||||||
import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
|
import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
|
||||||
import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
|
import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
|
||||||
|
|
||||||
|
function terminalLinkFallback(url: string, text: string): string {
|
||||||
|
return `${text} (${url})`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const errorCodeToErrorMessageOverride: Record<string, (build: BuildFragment) => string> = {
|
||||||
|
EAS_BUILD_UNKNOWN_FASTLANE_ERROR: build =>
|
||||||
|
`The ${link(getBuildLogsUrl(build, 'run-fastlane'), {
|
||||||
|
text: '"Run fastlane"',
|
||||||
|
fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-fastlane'), '"Run fastlane"'),
|
||||||
|
})} step failed with an unknown error. Refer to the ${link(
|
||||||
|
getBuildLogsUrl(build, 'xcode-logs'),
|
||||||
|
{
|
||||||
|
text: '"Xcode logs"',
|
||||||
|
fallback: terminalLinkFallback(getBuildLogsUrl(build, 'xcode-logs'), '"Xcode logs"'),
|
||||||
|
}
|
||||||
|
)} phase for additional, more detailed logs`,
|
||||||
|
EAS_BUILD_UNKNOWN_GRADLE_ERROR: build =>
|
||||||
|
`Gradle build failed with unknown error. See logs for the ${link(
|
||||||
|
getBuildLogsUrl(build, 'run-gradlew'),
|
||||||
|
{
|
||||||
|
text: '"Run gradlew"',
|
||||||
|
fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-gradlew'), '"Run gradlew"'),
|
||||||
|
}
|
||||||
|
)} phase for more information.`,
|
||||||
|
};
|
||||||
|
|
||||||
export function printLogsUrls(builds: BuildFragment[]): void {
|
export function printLogsUrls(builds: BuildFragment[]): void {
|
||||||
if (builds.length === 1) {
|
if (builds.length === 1) {
|
||||||
Log.log(`Build details: ${link(getBuildLogsUrl(builds[0]))}`);
|
Log.log(`Build details: ${link(getBuildLogsUrl(builds[0]))}`);
|
||||||
@@ -31,7 +57,6 @@ export function printLogsUrls(builds: BuildFragment[]): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function printBuildResults(builds: (BuildFragment | null)[]): void {
|
export function printBuildResults(builds: (BuildFragment | null)[]): void {
|
||||||
Log.newLine();
|
|
||||||
if (builds.length === 1) {
|
if (builds.length === 1) {
|
||||||
const [build] = builds;
|
const [build] = builds;
|
||||||
assert(build, 'Build should be defined');
|
assert(build, 'Build should be defined');
|
||||||
@@ -42,8 +67,8 @@ export function printBuildResults(builds: (BuildFragment | null)[]): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function printBuildResult(build: BuildFragment): void {
|
function printBuildResult(build: BuildFragment): void {
|
||||||
Log.addNewLineIfNone();
|
|
||||||
if (build.status === BuildStatus.Errored) {
|
if (build.status === BuildStatus.Errored) {
|
||||||
|
Log.addNewLineIfNone();
|
||||||
const userError = build.error;
|
const userError = build.error;
|
||||||
Log.error(
|
Log.error(
|
||||||
`${appPlatformEmojis[build.platform]} ${
|
`${appPlatformEmojis[build.platform]} ${
|
||||||
@@ -51,11 +76,12 @@ function printBuildResult(build: BuildFragment): void {
|
|||||||
} build failed${userError ? ':' : ''}`
|
} build failed${userError ? ':' : ''}`
|
||||||
);
|
);
|
||||||
if (userError) {
|
if (userError) {
|
||||||
printUserError(userError);
|
printUserError(userError, build);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (build.status === BuildStatus.Canceled) {
|
if (build.status === BuildStatus.Canceled) {
|
||||||
|
Log.addNewLineIfNone();
|
||||||
Log.error(
|
Log.error(
|
||||||
`${appPlatformEmojis[build.platform]} ${
|
`${appPlatformEmojis[build.platform]} ${
|
||||||
appPlatformDisplayNames[build.platform]
|
appPlatformDisplayNames[build.platform]
|
||||||
@@ -65,6 +91,7 @@ function printBuildResult(build: BuildFragment): void {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (build.distribution === DistributionType.Internal) {
|
if (build.distribution === DistributionType.Internal) {
|
||||||
|
Log.addNewLineIfNone();
|
||||||
const logsUrl = getBuildLogsUrl(build);
|
const logsUrl = getBuildLogsUrl(build);
|
||||||
// It's tricky to install the .apk file directly on Android so let's fallback
|
// It's tricky to install the .apk file directly on Android so let's fallback
|
||||||
// to the build details page and let people press the button to download there
|
// to the build details page and let people press the button to download there
|
||||||
@@ -82,9 +109,14 @@ function printBuildResult(build: BuildFragment): void {
|
|||||||
} else {
|
} else {
|
||||||
// TODO: it looks like buildUrl could possibly be undefined, based on the code below.
|
// TODO: it looks like buildUrl could possibly be undefined, based on the code below.
|
||||||
// we should account for this case better if it is possible
|
// we should account for this case better if it is possible
|
||||||
const url = build.artifacts?.buildUrl ?? '';
|
const url = build.artifacts?.buildUrl;
|
||||||
Log.log(`${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`);
|
if (url) {
|
||||||
Log.log(`${link(url)}`);
|
Log.addNewLineIfNone();
|
||||||
|
Log.log(
|
||||||
|
`${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`
|
||||||
|
);
|
||||||
|
Log.log(link(url));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -105,9 +137,22 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function printUserError(error: BuildError): void {
|
export function printUserError(error: BuildError, build: BuildFragment): void {
|
||||||
Log.error(error.message);
|
const maybeErrorMessageOverride = maybeGetErrorMessageOverride(error, build);
|
||||||
if (error.docsUrl) {
|
if (maybeErrorMessageOverride) {
|
||||||
Log.error(learnMore(error.docsUrl, { dim: false }));
|
Log.error(maybeErrorMessageOverride);
|
||||||
|
} else {
|
||||||
|
Log.error(error.message);
|
||||||
|
if (error.docsUrl) {
|
||||||
|
Log.error(learnMore(error.docsUrl, { dim: false }));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function maybeGetErrorMessageOverride(error: BuildError, build: BuildFragment): string | null {
|
||||||
|
if (!(error.errorCode in errorCodeToErrorMessageOverride)) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return errorCodeToErrorMessageOverride[error.errorCode](build);
|
||||||
|
}
|
||||||
@@ -0,0 +1,123 @@
|
|||||||
|
import { ExpoConfig } from '@expo/config-types';
|
||||||
|
import { Platform } from '@expo/eas-build-job';
|
||||||
|
import { BuildProfile, ResourceClass } from '@expo/eas-json';
|
||||||
|
import chalk from 'chalk';
|
||||||
|
import semver from 'semver';
|
||||||
|
|
||||||
|
import { BuildResourceClass } from '../../graphql/generated';
|
||||||
|
import Log from '../../log';
|
||||||
|
import { getReactNativeVersionAsync } from '../metadata';
|
||||||
|
|
||||||
|
type AndroidResourceClass = Exclude<
|
||||||
|
ResourceClass,
|
||||||
|
| ResourceClass.M1_EXPERIMENTAL
|
||||||
|
| ResourceClass.M1_MEDIUM
|
||||||
|
| ResourceClass.M1_LARGE
|
||||||
|
| ResourceClass.INTEL_MEDIUM
|
||||||
|
| ResourceClass.M_MEDIUM
|
||||||
|
| ResourceClass.M_LARGE
|
||||||
|
>;
|
||||||
|
|
||||||
|
const iosResourceClassToBuildResourceClassMapping: Record<ResourceClass, BuildResourceClass> = {
|
||||||
|
[ResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
|
||||||
|
[ResourceClass.LARGE]: BuildResourceClass.IosLarge,
|
||||||
|
[ResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosMMedium,
|
||||||
|
[ResourceClass.M1_MEDIUM]: BuildResourceClass.IosMMedium,
|
||||||
|
[ResourceClass.M1_LARGE]: BuildResourceClass.IosMLarge,
|
||||||
|
[ResourceClass.INTEL_MEDIUM]: BuildResourceClass.IosIntelMedium,
|
||||||
|
[ResourceClass.MEDIUM]: BuildResourceClass.IosMedium,
|
||||||
|
[ResourceClass.M_MEDIUM]: BuildResourceClass.IosMMedium,
|
||||||
|
[ResourceClass.M_LARGE]: BuildResourceClass.IosMLarge,
|
||||||
|
};
|
||||||
|
|
||||||
|
const androidResourceClassToBuildResourceClassMapping: Record<
|
||||||
|
AndroidResourceClass,
|
||||||
|
BuildResourceClass
|
||||||
|
> = {
|
||||||
|
[ResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
|
||||||
|
[ResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
|
||||||
|
[ResourceClass.MEDIUM]: BuildResourceClass.AndroidMedium,
|
||||||
|
};
|
||||||
|
|
||||||
|
export async function resolveBuildResourceClassAsync<T extends Platform>(
|
||||||
|
profile: BuildProfile<T>,
|
||||||
|
platform: Platform,
|
||||||
|
projectDir: string,
|
||||||
|
exp: ExpoConfig,
|
||||||
|
resourceClassFlag?: ResourceClass
|
||||||
|
): Promise<BuildResourceClass> {
|
||||||
|
const profileResourceClass = profile.resourceClass;
|
||||||
|
|
||||||
|
if (profileResourceClass && resourceClassFlag && resourceClassFlag !== profileResourceClass) {
|
||||||
|
Log.warn(
|
||||||
|
`Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing the "${resourceClassFlag}" as the override.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
const selectedResourceClass = resourceClassFlag ?? profileResourceClass;
|
||||||
|
|
||||||
|
return platform === Platform.IOS
|
||||||
|
? await resolveIosResourceClassAsync(exp, projectDir, resourceClassFlag ?? profileResourceClass)
|
||||||
|
: resolveAndroidResourceClass(selectedResourceClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): BuildResourceClass {
|
||||||
|
if (
|
||||||
|
selectedResourceClass &&
|
||||||
|
[
|
||||||
|
ResourceClass.M1_EXPERIMENTAL,
|
||||||
|
ResourceClass.M1_MEDIUM,
|
||||||
|
ResourceClass.M1_LARGE,
|
||||||
|
ResourceClass.INTEL_MEDIUM,
|
||||||
|
].includes(selectedResourceClass)
|
||||||
|
) {
|
||||||
|
throw new Error(`Resource class ${selectedResourceClass} is only available for iOS builds`);
|
||||||
|
}
|
||||||
|
|
||||||
|
const resourceClass = selectedResourceClass ?? ResourceClass.DEFAULT;
|
||||||
|
|
||||||
|
return androidResourceClassToBuildResourceClassMapping[resourceClass as AndroidResourceClass];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function resolveIosResourceClassAsync(
|
||||||
|
exp: ExpoConfig,
|
||||||
|
projectDir: string,
|
||||||
|
selectedResourceClass?: ResourceClass
|
||||||
|
): Promise<BuildResourceClass> {
|
||||||
|
const resourceClass =
|
||||||
|
selectedResourceClass ?? (await resolveIosDefaultRequestedResourceClassAsync(exp, projectDir));
|
||||||
|
|
||||||
|
if ([ResourceClass.M1_EXPERIMENTAL, ResourceClass.M1_MEDIUM].includes(resourceClass)) {
|
||||||
|
Log.warn(
|
||||||
|
`Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
|
||||||
|
'm-medium'
|
||||||
|
)} instead.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (resourceClass === ResourceClass.M1_LARGE) {
|
||||||
|
Log.warn(
|
||||||
|
`Resource class ${chalk.bold('m1-large')} is deprecated. Use ${chalk.bold(
|
||||||
|
'm-large'
|
||||||
|
)} instead.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return iosResourceClassToBuildResourceClassMapping[resourceClass];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function resolveIosDefaultRequestedResourceClassAsync(
|
||||||
|
exp: ExpoConfig,
|
||||||
|
projectDir: string
|
||||||
|
): Promise<ResourceClass> {
|
||||||
|
const { sdkVersion } = exp;
|
||||||
|
const reactNativeVersion = await getReactNativeVersionAsync(projectDir);
|
||||||
|
if (
|
||||||
|
(sdkVersion && semver.satisfies(sdkVersion, '>=48')) ||
|
||||||
|
(reactNativeVersion && semver.satisfies(reactNativeVersion, '>=0.71.0'))
|
||||||
|
) {
|
||||||
|
return ResourceClass.M_MEDIUM;
|
||||||
|
} else {
|
||||||
|
return ResourceClass.DEFAULT;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -10,12 +10,14 @@ export function getProjectDashboardUrl(accountName: string, projectName: string)
|
|||||||
).toString();
|
).toString();
|
||||||
}
|
}
|
||||||
|
|
||||||
export function getBuildLogsUrl(build: BuildFragment): string {
|
export function getBuildLogsUrl(build: BuildFragment, hash?: string): string {
|
||||||
const { project } = build;
|
const { project } = build;
|
||||||
const url =
|
const url =
|
||||||
project.__typename !== 'App'
|
project.__typename !== 'App'
|
||||||
? `/builds/${build.id}`
|
? `/builds/${build.id}`
|
||||||
: `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
|
: `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}${
|
||||||
|
hash ? `#${hash}` : ''
|
||||||
|
}`;
|
||||||
|
|
||||||
return new URL(url, getExpoWebsiteBaseUrl()).toString();
|
return new URL(url, getExpoWebsiteBaseUrl()).toString();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export function getBranchMapping(branchMappingString?: string): {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const isRollout = branchMapping.data.length === 2;
|
const isRollout = branchMapping.data.length === 2;
|
||||||
const rolloutPercent = branchMapping.data[0].branchMappingLogic.operand;
|
const rolloutPercent = branchMapping.data[0]?.branchMappingLogic.operand;
|
||||||
|
|
||||||
switch (branchMapping.data.length) {
|
switch (branchMapping.data.length) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Command } from '@oclif/core';
|
import { Command } from '@oclif/core';
|
||||||
|
import { CombinedError } from '@urql/core';
|
||||||
import nullthrows from 'nullthrows';
|
import nullthrows from 'nullthrows';
|
||||||
|
|
||||||
import {
|
import {
|
||||||
@@ -6,6 +7,7 @@ import {
|
|||||||
CommandEvent,
|
CommandEvent,
|
||||||
createAnalyticsAsync,
|
createAnalyticsAsync,
|
||||||
} from '../analytics/AnalyticsManager';
|
} from '../analytics/AnalyticsManager';
|
||||||
|
import Log from '../log';
|
||||||
import SessionManager from '../user/SessionManager';
|
import SessionManager from '../user/SessionManager';
|
||||||
import AnalyticsContextField from './context/AnalyticsContextField';
|
import AnalyticsContextField from './context/AnalyticsContextField';
|
||||||
import ContextField from './context/ContextField';
|
import ContextField from './context/ContextField';
|
||||||
@@ -16,6 +18,7 @@ import { OptionalProjectConfigContextField } from './context/OptionalProjectConf
|
|||||||
import ProjectConfigContextField from './context/ProjectConfigContextField';
|
import ProjectConfigContextField from './context/ProjectConfigContextField';
|
||||||
import ProjectDirContextField from './context/ProjectDirContextField';
|
import ProjectDirContextField from './context/ProjectDirContextField';
|
||||||
import SessionManagementContextField from './context/SessionManagementContextField';
|
import SessionManagementContextField from './context/SessionManagementContextField';
|
||||||
|
import { EasCommandError } from './errors';
|
||||||
|
|
||||||
type ContextInput<
|
type ContextInput<
|
||||||
T extends {
|
T extends {
|
||||||
@@ -33,6 +36,8 @@ type ContextOutput<
|
|||||||
[P in keyof T]: T[P];
|
[P in keyof T]: T[P];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const BASE_GRAPHQL_ERROR_MESSAGE: string = 'GraphQL request failed.';
|
||||||
|
|
||||||
export default abstract class EasCommand extends Command {
|
export default abstract class EasCommand extends Command {
|
||||||
protected static readonly ContextOptions = {
|
protected static readonly ContextOptions = {
|
||||||
/**
|
/**
|
||||||
@@ -103,6 +108,18 @@ export default abstract class EasCommand extends Command {
|
|||||||
*/
|
*/
|
||||||
static contextDefinition: ContextInput = {};
|
static contextDefinition: ContextInput = {};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The user session manager. Responsible for coordinating all user session related state.
|
||||||
|
* If needed in a subclass, use the SessionManager ContextOption.
|
||||||
|
*/
|
||||||
|
private sessionManagerInternal?: SessionManager;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The analytics manager. Used for logging analytics.
|
||||||
|
* It is set up here to ensure a consistent setup.
|
||||||
|
*/
|
||||||
|
private analyticsInternal?: AnalyticsWithOrchestration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute the context in the contextDefinition to satisfy command prerequisites.
|
* Execute the context in the contextDefinition to satisfy command prerequisites.
|
||||||
*/
|
*/
|
||||||
@@ -132,20 +149,10 @@ export default abstract class EasCommand extends Command {
|
|||||||
return Object.fromEntries(contextValuePairs);
|
return Object.fromEntries(contextValuePairs);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The user session manager. Responsible for coordinating all user session related state.
|
|
||||||
* If needed in a subclass, use the SessionManager ContextOption.
|
|
||||||
*/
|
|
||||||
private sessionManagerInternal?: SessionManager;
|
|
||||||
private get sessionManager(): SessionManager {
|
private get sessionManager(): SessionManager {
|
||||||
return nullthrows(this.sessionManagerInternal);
|
return nullthrows(this.sessionManagerInternal);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The analytics manager. Used for logging analytics.
|
|
||||||
* It is set up here to ensure a consistent set up.
|
|
||||||
*/
|
|
||||||
private analyticsInternal?: AnalyticsWithOrchestration;
|
|
||||||
private get analytics(): AnalyticsWithOrchestration {
|
private get analytics(): AnalyticsWithOrchestration {
|
||||||
return nullthrows(this.analyticsInternal);
|
return nullthrows(this.analyticsInternal);
|
||||||
}
|
}
|
||||||
@@ -175,4 +182,19 @@ export default abstract class EasCommand extends Command {
|
|||||||
await this.analytics.flushAsync();
|
await this.analytics.flushAsync();
|
||||||
return super.finally(err);
|
return super.finally(err);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected override catch(err: Error): Promise<any> {
|
||||||
|
let baseMessage = `${this.id} command failed.`;
|
||||||
|
if (err instanceof EasCommandError) {
|
||||||
|
Log.error(err.message);
|
||||||
|
} else if (err instanceof CombinedError && err?.graphQLErrors) {
|
||||||
|
const cleanMessage = err.message.replace('[GraphQL] ', '');
|
||||||
|
Log.error(cleanMessage);
|
||||||
|
baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
|
||||||
|
} else {
|
||||||
|
Log.error(err.message);
|
||||||
|
}
|
||||||
|
Log.debug(err);
|
||||||
|
throw new Error(baseMessage);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,7 @@
|
|||||||
|
import { CombinedError } from '@urql/core';
|
||||||
|
|
||||||
import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
|
import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
|
||||||
|
import Log from '../../log';
|
||||||
import SessionManager from '../../user/SessionManager';
|
import SessionManager from '../../user/SessionManager';
|
||||||
import EasCommand from '../EasCommand';
|
import EasCommand from '../EasCommand';
|
||||||
|
|
||||||
@@ -11,6 +14,7 @@ jest.mock('../../analytics/AnalyticsManager', () => {
|
|||||||
createAnalyticsAsync: jest.fn(),
|
createAnalyticsAsync: jest.fn(),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
jest.mock('../../log');
|
||||||
|
|
||||||
let originalProcessArgv: string[];
|
let originalProcessArgv: string[];
|
||||||
|
|
||||||
@@ -40,7 +44,7 @@ const createTestEasCommand = (): typeof EasCommand => {
|
|||||||
async runAsync(): Promise<void> {}
|
async runAsync(): Promise<void> {}
|
||||||
}
|
}
|
||||||
|
|
||||||
TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
|
TestEasCommand.id = 'testEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
|
||||||
return TestEasCommand;
|
return TestEasCommand;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -96,5 +100,71 @@ describe(EasCommand.name, () => {
|
|||||||
|
|
||||||
expect(analytics.flushAsync).toHaveBeenCalled();
|
expect(analytics.flushAsync).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe('catch', () => {
|
||||||
|
it('logs the message', async () => {
|
||||||
|
const TestEasCommand = createTestEasCommand();
|
||||||
|
const logErrorSpy = jest.spyOn(Log, 'error');
|
||||||
|
const logDebugSpy = jest.spyOn(Log, 'debug');
|
||||||
|
const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
|
||||||
|
const error = new Error('Unexpected, internal error message');
|
||||||
|
runAsyncMock.mockImplementation(() => {
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await TestEasCommand.run();
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
expect(logErrorSpy).toBeCalledWith('Unexpected, internal error message');
|
||||||
|
expect(logDebugSpy).toBeCalledWith(error);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('logs the cleaned message if needed', async () => {
|
||||||
|
const TestEasCommand = createTestEasCommand();
|
||||||
|
const logErrorSpy = jest.spyOn(Log, 'error');
|
||||||
|
const logDebugSpy = jest.spyOn(Log, 'debug');
|
||||||
|
const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
|
||||||
|
const graphQLErrors = ['Unexpected GraphQL error message'];
|
||||||
|
const error = new CombinedError({ graphQLErrors });
|
||||||
|
runAsyncMock.mockImplementation(() => {
|
||||||
|
throw error;
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await TestEasCommand.run();
|
||||||
|
} catch {}
|
||||||
|
|
||||||
|
expect(logErrorSpy).toBeCalledWith('Unexpected GraphQL error message');
|
||||||
|
expect(logDebugSpy).toBeCalledWith(error);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('re-throws the error with default base message', async () => {
|
||||||
|
const TestEasCommand = createTestEasCommand();
|
||||||
|
const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
|
||||||
|
runAsyncMock.mockImplementation(() => {
|
||||||
|
throw new Error('Error message');
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await TestEasCommand.run();
|
||||||
|
} catch (caughtError) {
|
||||||
|
expect(caughtError).toBeInstanceOf(Error);
|
||||||
|
expect((caughtError as Error).message).toEqual('testEasCommand command failed.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
it('re-throws the error with a different default base message in case of graphQLError', async () => {
|
||||||
|
const TestEasCommand = createTestEasCommand();
|
||||||
|
const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
|
||||||
|
runAsyncMock.mockImplementation(() => {
|
||||||
|
const graphQLErrors = ['Unexpected GraphQL error message'];
|
||||||
|
throw new CombinedError({ graphQLErrors });
|
||||||
|
});
|
||||||
|
try {
|
||||||
|
await TestEasCommand.run();
|
||||||
|
} catch (caughtError) {
|
||||||
|
expect(caughtError).toBeInstanceOf(Error);
|
||||||
|
expect((caughtError as Error).message).toEqual('GraphQL request failed.');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -5,7 +5,7 @@ import ContextField, { ContextOptions } from './ContextField';
|
|||||||
import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
|
import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
|
||||||
import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
|
import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
|
||||||
|
|
||||||
export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
|
export type DynamicConfigContextFn = (options: ExpoConfigOptions) => Promise<{
|
||||||
projectId: string;
|
projectId: string;
|
||||||
exp: ExpoConfig;
|
exp: ExpoConfig;
|
||||||
projectDir: string;
|
projectDir: string;
|
||||||
@@ -16,8 +16,8 @@ export class DynamicProjectConfigContextField extends ContextField<DynamicConfig
|
|||||||
nonInteractive,
|
nonInteractive,
|
||||||
sessionManager,
|
sessionManager,
|
||||||
}: ContextOptions): Promise<DynamicConfigContextFn> {
|
}: ContextOptions): Promise<DynamicConfigContextFn> {
|
||||||
|
const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
|
||||||
return async (options?: ExpoConfigOptions) => {
|
return async (options?: ExpoConfigOptions) => {
|
||||||
const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
|
|
||||||
const expBefore = getExpoConfig(projectDir, options);
|
const expBefore = getExpoConfig(projectDir, options);
|
||||||
const projectId = await getProjectIdAsync(sessionManager, expBefore, {
|
const projectId = await getProjectIdAsync(sessionManager, expBefore, {
|
||||||
nonInteractive,
|
nonInteractive,
|
||||||
|
|||||||
+95
-2
@@ -15,7 +15,6 @@ jest.mock('fs');
|
|||||||
|
|
||||||
jest.mock('../../../../graphql/queries/AppQuery');
|
jest.mock('../../../../graphql/queries/AppQuery');
|
||||||
jest.mock('../../contextUtils/findProjectDirAndVerifyProjectSetupAsync');
|
jest.mock('../../contextUtils/findProjectDirAndVerifyProjectSetupAsync');
|
||||||
jest.mock('../../../../user/User');
|
|
||||||
jest.mock('../../../../ora', () => ({
|
jest.mock('../../../../ora', () => ({
|
||||||
ora: () => ({
|
ora: () => ({
|
||||||
start: () => ({ succeed: () => {}, fail: () => {} }),
|
start: () => ({ succeed: () => {}, fail: () => {} }),
|
||||||
@@ -107,7 +106,79 @@ describe(getProjectIdAsync, () => {
|
|||||||
{ nonInteractive: false }
|
{ nonInteractive: false }
|
||||||
)
|
)
|
||||||
).rejects.toThrow(
|
).rejects.toThrow(
|
||||||
`Project config: Project identified by "extra.eas.projectId" (notnotbrent) is not owned by owner specified in the "owner" field (wat). ${learnMore(
|
`Project config: Owner of project identified by "extra.eas.projectId" (notnotbrent) does not match owner specified in the "owner" field (wat). ${learnMore(
|
||||||
|
'https://expo.fyi/eas-project-id'
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws when the owner is not specified and is different than logged in user', async () => {
|
||||||
|
jest.mocked(getConfig).mockReturnValue({
|
||||||
|
exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
|
||||||
|
} as any);
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
fullName: '@totallybrent/test',
|
||||||
|
slug: 'test',
|
||||||
|
ownerAccount: { name: 'totallybrent' } as any,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
getProjectIdAsync(
|
||||||
|
sessionManager,
|
||||||
|
{ name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
|
||||||
|
{ nonInteractive: false }
|
||||||
|
)
|
||||||
|
).rejects.toThrow(
|
||||||
|
`Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) does not match the logged in user (notnotbrent) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
|
||||||
|
'https://expo.fyi/eas-project-id'
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('throws when the owner is not specified and is different than logged in user which is a robot', async () => {
|
||||||
|
const sessionManagerMock = mock<SessionManager>();
|
||||||
|
when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
|
||||||
|
actor: {
|
||||||
|
__typename: 'Robot',
|
||||||
|
id: 'robot_id',
|
||||||
|
accounts: [
|
||||||
|
{
|
||||||
|
id: 'account_id_1',
|
||||||
|
name: 'notnotbrent',
|
||||||
|
users: [{ role: Role.Admin, actor: { id: 'robot_id' } }],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'account_id_2',
|
||||||
|
name: 'dominik',
|
||||||
|
users: [{ role: Role.ViewOnly, actor: { id: 'robot_id' } }],
|
||||||
|
},
|
||||||
|
],
|
||||||
|
isExpoAdmin: false,
|
||||||
|
featureGates: {},
|
||||||
|
},
|
||||||
|
authenticationInfo: { accessToken: 'fake', sessionSecret: null },
|
||||||
|
});
|
||||||
|
const sessionManagerRobot = instance(sessionManagerMock);
|
||||||
|
|
||||||
|
jest.mocked(getConfig).mockReturnValue({
|
||||||
|
exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
|
||||||
|
} as any);
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
fullName: '@totallybrent/test',
|
||||||
|
slug: 'test',
|
||||||
|
ownerAccount: { name: 'totallybrent' } as any,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
getProjectIdAsync(
|
||||||
|
sessionManagerRobot,
|
||||||
|
{ name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
|
||||||
|
{ nonInteractive: false }
|
||||||
|
)
|
||||||
|
).rejects.toThrow(
|
||||||
|
`Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
|
||||||
'https://expo.fyi/eas-project-id'
|
'https://expo.fyi/eas-project-id'
|
||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
@@ -181,4 +252,26 @@ describe(getProjectIdAsync, () => {
|
|||||||
getProjectIdAsync(sessionManager, { name: 'test', slug: 'test' }, { nonInteractive: false })
|
getProjectIdAsync(sessionManager, { name: 'test', slug: 'test' }, { nonInteractive: false })
|
||||||
).rejects.toThrow();
|
).rejects.toThrow();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('throws if extra.eas.projectId is not a string', async () => {
|
||||||
|
jest.mocked(getConfig).mockReturnValue({
|
||||||
|
exp: { name: 'test', slug: 'test', extra: { eas: { projectId: 1234 } } },
|
||||||
|
} as any);
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
fullName: '@notnotbrent/test',
|
||||||
|
slug: 'test',
|
||||||
|
ownerAccount: { name: 'notnotbrent' } as any,
|
||||||
|
});
|
||||||
|
|
||||||
|
await expect(
|
||||||
|
getProjectIdAsync(
|
||||||
|
sessionManager,
|
||||||
|
{ name: 'test', slug: 'wat', extra: { eas: { projectId: 1234 } } },
|
||||||
|
{ nonInteractive: false }
|
||||||
|
)
|
||||||
|
).rejects.toThrow(
|
||||||
|
`Project config: "extra.eas.projectId" must be a string, found number. If you're not sure how to set it up on your own, remove the property entirely and it will be automatically configured on the next EAS CLI run.`
|
||||||
|
);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
+1
-1
@@ -12,7 +12,7 @@ import { getVcsClient, setVcsClient } from '../../../vcs';
|
|||||||
import GitClient from '../../../vcs/clients/git';
|
import GitClient from '../../../vcs/clients/git';
|
||||||
|
|
||||||
async function applyCliConfigAsync(projectDir: string): Promise<void> {
|
async function applyCliConfigAsync(projectDir: string): Promise<void> {
|
||||||
const easJsonAccessor = new EasJsonAccessor(projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
|
const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
|
||||||
if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
|
if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ import { getExpoConfig } from '../../../project/expoConfig';
|
|||||||
import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
|
import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
|
||||||
import { toAppPrivacy } from '../../../project/projectUtils';
|
import { toAppPrivacy } from '../../../project/projectUtils';
|
||||||
import SessionManager from '../../../user/SessionManager';
|
import SessionManager from '../../../user/SessionManager';
|
||||||
import { Actor } from '../../../user/User';
|
import { Actor, getActorUsername } from '../../../user/User';
|
||||||
import { createGraphqlClient } from './createGraphqlClient';
|
import { createGraphqlClient } from './createGraphqlClient';
|
||||||
import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
|
import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
|
||||||
|
|
||||||
@@ -89,18 +89,50 @@ export async function getProjectIdAsync(
|
|||||||
|
|
||||||
const localProjectId = exp.extra?.eas?.projectId;
|
const localProjectId = exp.extra?.eas?.projectId;
|
||||||
if (localProjectId) {
|
if (localProjectId) {
|
||||||
|
if (typeof localProjectId !== 'string') {
|
||||||
|
throw new Error(
|
||||||
|
`Project config: "extra.eas.projectId" must be a string, found ${typeof localProjectId}. If you're not sure how to set it up on your own, remove the property entirely and it will be automatically configured on the next EAS CLI run.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// check that the local project ID matches account and slug
|
// check that the local project ID matches account and slug
|
||||||
const appForProjectId = await AppQuery.byIdAsync(graphqlClient, localProjectId);
|
const appForProjectId = await AppQuery.byIdAsync(graphqlClient, localProjectId);
|
||||||
if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
|
if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Project config: Project identified by "extra.eas.projectId" (${
|
`Project config: Owner of project identified by "extra.eas.projectId" (${
|
||||||
appForProjectId.ownerAccount.name
|
appForProjectId.ownerAccount.name
|
||||||
}) is not owned by owner specified in the "owner" field (${exp.owner}). ${learnMore(
|
}) does not match owner specified in the "owner" field (${exp.owner}). ${learnMore(
|
||||||
'https://expo.fyi/eas-project-id'
|
'https://expo.fyi/eas-project-id'
|
||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const actorUsername = getActorUsername(actor);
|
||||||
|
if (!exp.owner && appForProjectId.ownerAccount.name !== actorUsername) {
|
||||||
|
if (actorUsername) {
|
||||||
|
throw new Error(
|
||||||
|
`Project config: Owner of project identified by "extra.eas.projectId" (${
|
||||||
|
appForProjectId.ownerAccount.name
|
||||||
|
}) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${
|
||||||
|
appForProjectId.ownerAccount.name
|
||||||
|
}" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
|
||||||
|
'https://expo.fyi/eas-project-id'
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// robot caller
|
||||||
|
throw new Error(
|
||||||
|
`Project config: Owner of project identified by "extra.eas.projectId" (${
|
||||||
|
appForProjectId.ownerAccount.name
|
||||||
|
}) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "${
|
||||||
|
appForProjectId.ownerAccount.name
|
||||||
|
}" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
|
||||||
|
'https://expo.fyi/eas-project-id'
|
||||||
|
)}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (exp.slug && exp.slug !== appForProjectId.slug) {
|
if (exp.slug && exp.slug !== appForProjectId.slug) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Project config: Slug for project identified by "extra.eas.projectId" (${
|
`Project config: Slug for project identified by "extra.eas.projectId" (${
|
||||||
@@ -132,6 +164,8 @@ export async function getProjectIdAsync(
|
|||||||
throw new Error(
|
throw new Error(
|
||||||
'The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner'
|
'The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner'
|
||||||
);
|
);
|
||||||
|
case 'SSOUser':
|
||||||
|
throw new Error('SSO users are not supported yet.');
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
export class EasCommandError extends Error {
|
||||||
|
// constructor is not useless, since the constructor for Error allows for optional `message`
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-useless-constructor
|
||||||
|
constructor(message: string) {
|
||||||
|
super(message);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
import { Platform } from '@expo/eas-build-job';
|
import { Platform } from '@expo/eas-build-job';
|
||||||
import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
|
import { EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
|
||||||
import { Errors, Flags } from '@oclif/core';
|
import { Errors, Flags } from '@oclif/core';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import figures from 'figures';
|
import figures from 'figures';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
|
||||||
|
import { LocalBuildMode } from '../../build/local';
|
||||||
import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
|
import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
|
||||||
import { UserInputResourceClass } from '../../build/types';
|
|
||||||
import EasCommand from '../../commandUtils/EasCommand';
|
import EasCommand from '../../commandUtils/EasCommand';
|
||||||
import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
|
import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
|
||||||
import { StatuspageServiceName } from '../../graphql/generated';
|
import { StatuspageServiceName } from '../../graphql/generated';
|
||||||
@@ -31,7 +31,7 @@ interface RawBuildFlags {
|
|||||||
json: boolean;
|
json: boolean;
|
||||||
'auto-submit': boolean;
|
'auto-submit': boolean;
|
||||||
'auto-submit-with-profile'?: string;
|
'auto-submit-with-profile'?: string;
|
||||||
'resource-class'?: UserInputResourceClass;
|
'resource-class'?: ResourceClass;
|
||||||
message?: string;
|
message?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -85,8 +85,13 @@ export default class Build extends EasCommand {
|
|||||||
exclusive: ['auto-submit'],
|
exclusive: ['auto-submit'],
|
||||||
}),
|
}),
|
||||||
'resource-class': Flags.enum({
|
'resource-class': Flags.enum({
|
||||||
options: Object.values(UserInputResourceClass),
|
options: Object.values(ResourceClass),
|
||||||
hidden: true,
|
hidden: true,
|
||||||
|
deprecated: {
|
||||||
|
message: chalk.yellow(
|
||||||
|
'The --resource-class flag has been deprecated. Define the resource class in eas.json.\nLearn more: https://docs.expo.dev/build-reference/eas-json/'
|
||||||
|
),
|
||||||
|
},
|
||||||
description: 'The instance type that will be used to run this build [experimental]',
|
description: 'The instance type that will be used to run this build [experimental]',
|
||||||
}),
|
}),
|
||||||
message: Flags.string({
|
message: Flags.string({
|
||||||
@@ -122,7 +127,7 @@ export default class Build extends EasCommand {
|
|||||||
|
|
||||||
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
|
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
|
||||||
|
|
||||||
if (!flags.localBuildOptions.enable) {
|
if (!flags.localBuildOptions.localBuildMode) {
|
||||||
await maybeWarnAboutEasOutagesAsync(
|
await maybeWarnAboutEasOutagesAsync(
|
||||||
graphqlClient,
|
graphqlClient,
|
||||||
flags.autoSubmit
|
flags.autoSubmit
|
||||||
@@ -156,17 +161,6 @@ export default class Build extends EasCommand {
|
|||||||
if (flags.json && !nonInteractive) {
|
if (flags.json && !nonInteractive) {
|
||||||
Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
|
Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
|
||||||
}
|
}
|
||||||
if (
|
|
||||||
flags['resource-class'] === UserInputResourceClass.M1_EXPERIMENTAL &&
|
|
||||||
flags.platform !== Platform.IOS
|
|
||||||
) {
|
|
||||||
Errors.error(
|
|
||||||
`Resource class ${UserInputResourceClass.M1_EXPERIMENTAL} is only available for iOS builds`,
|
|
||||||
{
|
|
||||||
exit: 1,
|
|
||||||
}
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
const requestedPlatform =
|
const requestedPlatform =
|
||||||
flags.platform &&
|
flags.platform &&
|
||||||
@@ -201,19 +195,17 @@ export default class Build extends EasCommand {
|
|||||||
nonInteractive,
|
nonInteractive,
|
||||||
localBuildOptions: flags['local']
|
localBuildOptions: flags['local']
|
||||||
? {
|
? {
|
||||||
enable: true,
|
localBuildMode: LocalBuildMode.LOCAL_BUILD_PLUGIN,
|
||||||
verbose: true,
|
verbose: true,
|
||||||
artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
|
artifactPath: flags.output && path.resolve(process.cwd(), flags.output),
|
||||||
}
|
}
|
||||||
: {
|
: {},
|
||||||
enable: false,
|
|
||||||
},
|
|
||||||
wait: flags['wait'],
|
wait: flags['wait'],
|
||||||
clearCache: flags['clear-cache'],
|
clearCache: flags['clear-cache'],
|
||||||
json: flags['json'],
|
json: flags['json'],
|
||||||
autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
|
autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
|
||||||
submitProfile: flags['auto-submit-with-profile'] ?? profile,
|
submitProfile: flags['auto-submit-with-profile'] ?? profile,
|
||||||
userInputResourceClass: flags['resource-class'] ?? UserInputResourceClass.DEFAULT,
|
resourceClass: flags['resource-class'],
|
||||||
message,
|
message,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -223,7 +215,7 @@ export default class Build extends EasCommand {
|
|||||||
): Promise<BuildFlags> {
|
): Promise<BuildFlags> {
|
||||||
const requestedPlatform = await selectRequestedPlatformAsync(flags.requestedPlatform);
|
const requestedPlatform = await selectRequestedPlatformAsync(flags.requestedPlatform);
|
||||||
|
|
||||||
if (flags.localBuildOptions.enable) {
|
if (flags.localBuildOptions.localBuildMode) {
|
||||||
if (flags.autoSubmit) {
|
if (flags.autoSubmit) {
|
||||||
// TODO: implement this
|
// TODO: implement this
|
||||||
Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
|
Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
|
||||||
@@ -235,6 +227,13 @@ export default class Build extends EasCommand {
|
|||||||
});
|
});
|
||||||
} else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
|
} else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
|
||||||
Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
|
Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
|
||||||
|
} else if (
|
||||||
|
!['linux', 'darwin'].includes(process.platform) &&
|
||||||
|
requestedPlatform === RequestedPlatform.Android
|
||||||
|
) {
|
||||||
|
Errors.error('Unsupported platform, macOS or Linux is required to build apps for Android', {
|
||||||
|
exit: 1,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -252,7 +251,7 @@ export async function handleDeprecatedEasJsonAsync(
|
|||||||
if (!(await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir)))) {
|
if (!(await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir)))) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const easJsonAccessor = new EasJsonAccessor(projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
|
const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
|
||||||
const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [
|
const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [
|
||||||
[Platform.ANDROID, profileName],
|
[Platform.ANDROID, profileName],
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import fs from 'fs-extra';
|
|||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
|
|
||||||
|
import { LocalBuildMode } from '../../build/local';
|
||||||
import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
|
import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
|
||||||
import EasCommand from '../../commandUtils/EasCommand';
|
import EasCommand from '../../commandUtils/EasCommand';
|
||||||
import Log from '../../log';
|
import Log from '../../log';
|
||||||
@@ -110,7 +111,7 @@ export default class BuildInspect extends EasCommand {
|
|||||||
requestedPlatform: flags.platform,
|
requestedPlatform: flags.platform,
|
||||||
profile: flags.profile,
|
profile: flags.profile,
|
||||||
localBuildOptions: {
|
localBuildOptions: {
|
||||||
enable: true,
|
localBuildMode: LocalBuildMode.LOCAL_BUILD_PLUGIN,
|
||||||
...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
|
...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
|
||||||
...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
|
...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
|
||||||
verbose: flags.verbose,
|
verbose: flags.verbose,
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
import { Flags } from '@oclif/core';
|
||||||
|
|
||||||
|
import { handleDeprecatedEasJsonAsync } from '.';
|
||||||
|
import { LocalBuildMode } from '../../build/local';
|
||||||
|
import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
|
||||||
|
import EasCommand from '../../commandUtils/EasCommand';
|
||||||
|
import { RequestedPlatform } from '../../platform';
|
||||||
|
import { enableJsonOutput } from '../../utils/json';
|
||||||
|
import { setVcsClient } from '../../vcs';
|
||||||
|
import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This command will be run on the EAS Build workers, when building
|
||||||
|
* directly from git. This command resolves credentials and other
|
||||||
|
* build configuration, that normally would be included in the
|
||||||
|
* job and metadata objects, and prints them to stdout.
|
||||||
|
*/
|
||||||
|
export default class BuildInternal extends EasCommand {
|
||||||
|
static override hidden = true;
|
||||||
|
|
||||||
|
static override flags = {
|
||||||
|
platform: Flags.enum({
|
||||||
|
char: 'p',
|
||||||
|
options: ['android', 'ios'],
|
||||||
|
required: true,
|
||||||
|
}),
|
||||||
|
profile: Flags.string({
|
||||||
|
char: 'e',
|
||||||
|
description:
|
||||||
|
'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
|
||||||
|
helpValue: 'PROFILE_NAME',
|
||||||
|
}),
|
||||||
|
};
|
||||||
|
|
||||||
|
static override contextDefinition = {
|
||||||
|
...this.ContextOptions.LoggedIn,
|
||||||
|
...this.ContextOptions.DynamicProjectConfig,
|
||||||
|
...this.ContextOptions.ProjectDir,
|
||||||
|
...this.ContextOptions.Analytics,
|
||||||
|
};
|
||||||
|
|
||||||
|
async runAsync(): Promise<void> {
|
||||||
|
const { flags } = await this.parse(BuildInternal);
|
||||||
|
// This command is always run with implicit --non-interactive and --json options
|
||||||
|
enableJsonOutput();
|
||||||
|
|
||||||
|
const {
|
||||||
|
loggedIn: { actor, graphqlClient },
|
||||||
|
getDynamicProjectConfigAsync,
|
||||||
|
projectDir,
|
||||||
|
analytics,
|
||||||
|
} = await this.getContextAsync(BuildInternal, {
|
||||||
|
nonInteractive: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
setVcsClient(new GitNoCommitClient());
|
||||||
|
|
||||||
|
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
|
||||||
|
|
||||||
|
await runBuildAndSubmitAsync(
|
||||||
|
graphqlClient,
|
||||||
|
analytics,
|
||||||
|
projectDir,
|
||||||
|
{
|
||||||
|
requestedPlatform: flags.platform as RequestedPlatform,
|
||||||
|
profile: flags.profile,
|
||||||
|
nonInteractive: true,
|
||||||
|
wait: false,
|
||||||
|
clearCache: false,
|
||||||
|
json: true,
|
||||||
|
autoSubmit: false,
|
||||||
|
localBuildOptions: {
|
||||||
|
localBuildMode: LocalBuildMode.INTERNAL,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
actor,
|
||||||
|
getDynamicProjectConfigAsync
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -121,7 +121,7 @@ export default class BuildResign extends EasCommand {
|
|||||||
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
|
await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
|
||||||
|
|
||||||
await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasBuild]);
|
await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasBuild]);
|
||||||
const easJsonAccessor = new EasJsonAccessor(projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
const easJsonCliConfig: EasJson['cli'] =
|
const easJsonCliConfig: EasJson['cli'] =
|
||||||
(await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
|
(await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
|
||||||
|
|
||||||
@@ -199,6 +199,8 @@ export default class BuildResign extends EasCommand {
|
|||||||
const buildResult = await waitForBuildEndAsync(graphqlClient, {
|
const buildResult = await waitForBuildEndAsync(graphqlClient, {
|
||||||
buildIds: [newBuild.id],
|
buildIds: [newBuild.id],
|
||||||
accountName: account.name,
|
accountName: account.name,
|
||||||
|
nonInteractive,
|
||||||
|
projectDir,
|
||||||
});
|
});
|
||||||
if (!flags.json) {
|
if (!flags.json) {
|
||||||
printBuildResults(buildResult);
|
printBuildResults(buildResult);
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import {
|
|||||||
import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
|
import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
|
||||||
import { BuildQuery } from '../../graphql/queries/BuildQuery';
|
import { BuildQuery } from '../../graphql/queries/BuildQuery';
|
||||||
import Log from '../../log';
|
import Log from '../../log';
|
||||||
|
import { appPlatformDisplayNames } from '../../platform';
|
||||||
import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
|
import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
|
||||||
import { promptAsync } from '../../prompts';
|
import { promptAsync } from '../../prompts';
|
||||||
import { RunArchiveFlags, runAsync } from '../../run/run';
|
import { RunArchiveFlags, runAsync } from '../../run/run';
|
||||||
@@ -150,6 +151,35 @@ async function resolvePlatformAsync(platform?: string): Promise<AppPlatform> {
|
|||||||
return selectedPlatform;
|
return selectedPlatform;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function validateChosenBuild(
|
||||||
|
maybeBuild: BuildFragment | null,
|
||||||
|
selectedPlatform: AppPlatform
|
||||||
|
): BuildFragment {
|
||||||
|
if (!maybeBuild) {
|
||||||
|
throw new Error('There are no simulator/emulator builds that can be run for this project.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (selectedPlatform !== maybeBuild.platform) {
|
||||||
|
throw new Error(
|
||||||
|
`The selected build is for ${
|
||||||
|
appPlatformDisplayNames[maybeBuild.platform]
|
||||||
|
}, but you selected ${appPlatformDisplayNames[selectedPlatform]}`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (maybeBuild.status !== BuildStatus.Finished) {
|
||||||
|
throw new Error('The selected build is not finished.');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isRunnableOnSimulatorOrEmulator(maybeBuild)) {
|
||||||
|
throw new Error(
|
||||||
|
'Artifacts for the latest build have expired and are no longer available, or this is not a simulator/emulator build.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return maybeBuild;
|
||||||
|
}
|
||||||
|
|
||||||
async function maybeGetBuildAsync(
|
async function maybeGetBuildAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
graphqlClient: ExpoGraphqlClient,
|
||||||
flags: RunCommandFlags,
|
flags: RunCommandFlags,
|
||||||
@@ -160,7 +190,8 @@ async function maybeGetBuildAsync(
|
|||||||
flags.selectedPlatform === AppPlatform.Ios ? DistributionType.Simulator : undefined;
|
flags.selectedPlatform === AppPlatform.Ios ? DistributionType.Simulator : undefined;
|
||||||
|
|
||||||
if (flags.runArchiveFlags.id) {
|
if (flags.runArchiveFlags.id) {
|
||||||
return BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
|
const build = await BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
|
||||||
|
return validateChosenBuild(build, flags.selectedPlatform);
|
||||||
} else if (
|
} else if (
|
||||||
!flags.runArchiveFlags.id &&
|
!flags.runArchiveFlags.id &&
|
||||||
!flags.runArchiveFlags.path &&
|
!flags.runArchiveFlags.path &&
|
||||||
@@ -169,7 +200,7 @@ async function maybeGetBuildAsync(
|
|||||||
) {
|
) {
|
||||||
const build = await listAndSelectBuildOnAppAsync(graphqlClient, {
|
const build = await listAndSelectBuildOnAppAsync(graphqlClient, {
|
||||||
projectId,
|
projectId,
|
||||||
title: `Select ${flags.selectedPlatform === AppPlatform.Ios ? 'iOS' : 'Android'} ${
|
title: `Select ${appPlatformDisplayNames[flags.selectedPlatform]} ${
|
||||||
flags.selectedPlatform === AppPlatform.Ios ? 'simulator' : 'emulator'
|
flags.selectedPlatform === AppPlatform.Ios ? 'simulator' : 'emulator'
|
||||||
} build to run for ${await getDisplayNameForProjectIdAsync(graphqlClient, projectId)} app`,
|
} build to run for ${await getDisplayNameForProjectIdAsync(graphqlClient, projectId)} app`,
|
||||||
filter: {
|
filter: {
|
||||||
@@ -182,10 +213,9 @@ async function maybeGetBuildAsync(
|
|||||||
selectPromptWarningMessage:
|
selectPromptWarningMessage:
|
||||||
'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
|
'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
|
||||||
});
|
});
|
||||||
|
return validateChosenBuild(build, flags.selectedPlatform);
|
||||||
return build ?? null;
|
|
||||||
} else if (flags.runArchiveFlags.latest) {
|
} else if (flags.runArchiveFlags.latest) {
|
||||||
return await getLatestBuildAsync(graphqlClient, {
|
const latestBuild = await getLatestBuildAsync(graphqlClient, {
|
||||||
projectId,
|
projectId,
|
||||||
filter: {
|
filter: {
|
||||||
platform: flags.selectedPlatform,
|
platform: flags.selectedPlatform,
|
||||||
@@ -193,6 +223,8 @@ async function maybeGetBuildAsync(
|
|||||||
status: BuildStatus.Finished,
|
status: BuildStatus.Finished,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
return validateChosenBuild(latestBuild, flags.selectedPlatform);
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export default class BuildVersionSetView extends EasCommand {
|
|||||||
public async runAsync(): Promise<void> {
|
public async runAsync(): Promise<void> {
|
||||||
const { flags } = await this.parse(BuildVersionSetView);
|
const { flags } = await this.parse(BuildVersionSetView);
|
||||||
const {
|
const {
|
||||||
loggedIn: { actor, graphqlClient },
|
loggedIn: { graphqlClient },
|
||||||
getDynamicProjectConfigAsync,
|
getDynamicProjectConfigAsync,
|
||||||
projectDir,
|
projectDir,
|
||||||
} = await this.getContextAsync(BuildVersionSetView, {
|
} = await this.getContextAsync(BuildVersionSetView, {
|
||||||
@@ -54,7 +54,7 @@ export default class BuildVersionSetView extends EasCommand {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const platform = await selectPlatformAsync(flags.platform);
|
const platform = await selectPlatformAsync(flags.platform);
|
||||||
const easJsonAccessor = new EasJsonAccessor(projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
|
await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
|
||||||
const profile = await EasJsonUtils.getBuildProfileAsync(
|
const profile = await EasJsonUtils.getBuildProfileAsync(
|
||||||
easJsonAccessor,
|
easJsonAccessor,
|
||||||
@@ -67,13 +67,14 @@ export default class BuildVersionSetView extends EasCommand {
|
|||||||
|
|
||||||
validateAppConfigForRemoteVersionSource(exp, platform);
|
validateAppConfigForRemoteVersionSource(exp, platform);
|
||||||
|
|
||||||
const applicationIdentifier = await getApplicationIdentifierAsync(
|
const applicationIdentifier = await getApplicationIdentifierAsync({
|
||||||
|
graphqlClient,
|
||||||
projectDir,
|
projectDir,
|
||||||
|
projectId,
|
||||||
exp,
|
exp,
|
||||||
profile,
|
buildProfile: profile,
|
||||||
platform,
|
platform,
|
||||||
actor
|
});
|
||||||
);
|
|
||||||
const remoteVersions = await AppVersionQuery.latestVersionAsync(
|
const remoteVersions = await AppVersionQuery.latestVersionAsync(
|
||||||
graphqlClient,
|
graphqlClient,
|
||||||
projectId,
|
projectId,
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ export default class BuildVersionSyncView extends EasCommand {
|
|||||||
public async runAsync(): Promise<void> {
|
public async runAsync(): Promise<void> {
|
||||||
const { flags } = await this.parse(BuildVersionSyncView);
|
const { flags } = await this.parse(BuildVersionSyncView);
|
||||||
const {
|
const {
|
||||||
loggedIn: { actor, graphqlClient },
|
loggedIn: { graphqlClient },
|
||||||
getDynamicProjectConfigAsync,
|
getDynamicProjectConfigAsync,
|
||||||
projectDir,
|
projectDir,
|
||||||
} = await this.getContextAsync(BuildVersionSyncView, {
|
} = await this.getContextAsync(BuildVersionSyncView, {
|
||||||
@@ -71,7 +71,7 @@ export default class BuildVersionSyncView extends EasCommand {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
|
const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
|
||||||
const easJsonAccessor = new EasJsonAccessor(projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
|
await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
|
||||||
|
|
||||||
const platforms = toPlatforms(requestedPlatform);
|
const platforms = toPlatforms(requestedPlatform);
|
||||||
@@ -89,13 +89,14 @@ export default class BuildVersionSyncView extends EasCommand {
|
|||||||
validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
|
validateAppConfigForRemoteVersionSource(exp, profileInfo.platform);
|
||||||
const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];
|
const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];
|
||||||
|
|
||||||
const applicationIdentifier = await getApplicationIdentifierAsync(
|
const applicationIdentifier = await getApplicationIdentifierAsync({
|
||||||
|
graphqlClient,
|
||||||
projectDir,
|
projectDir,
|
||||||
|
projectId,
|
||||||
exp,
|
exp,
|
||||||
profileInfo.profile,
|
buildProfile: profileInfo.profile,
|
||||||
profileInfo.platform,
|
platform: profileInfo.platform,
|
||||||
actor
|
});
|
||||||
);
|
|
||||||
const remoteVersions = await AppVersionQuery.latestVersionAsync(
|
const remoteVersions = await AppVersionQuery.latestVersionAsync(
|
||||||
graphqlClient,
|
graphqlClient,
|
||||||
projectId,
|
projectId,
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import { Flags } from '@oclif/core';
|
import { Flags } from '@oclif/core';
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
|
|
||||||
|
import { selectBranchOnAppAsync } from '../../branch/queries';
|
||||||
|
import { selectChannelOnAppAsync } from '../../channel/queries';
|
||||||
import { BranchMapping, getBranchMapping } from '../../channel/utils';
|
import { BranchMapping, getBranchMapping } from '../../channel/utils';
|
||||||
import EasCommand from '../../commandUtils/EasCommand';
|
import EasCommand from '../../commandUtils/EasCommand';
|
||||||
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
@@ -132,13 +134,11 @@ async function startRolloutAsync(
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const logMessage = `️Started a rollout of branch ${chalk.bold(
|
const logMessage = `Started a rollout of branch ${chalk.bold(branchName)} on channel ${chalk.bold(
|
||||||
|
channelName!
|
||||||
|
)}! ${chalk.bold(percent)}% of users will be directed to branch ${chalk.bold(
|
||||||
branchName
|
branchName
|
||||||
)} onto channel ${chalk.bold(channelName!)}! ${chalk.bold(
|
)}, ${chalk.bold(100 - percent)}% to branch ${chalk.bold(oldBranch.name)}.`;
|
||||||
percent
|
|
||||||
)}% of users will be directed to branch ${chalk.bold(branchName)}, ${chalk.bold(
|
|
||||||
100 - percent
|
|
||||||
)}% to branch ${chalk.bold(oldBranch.name)}.`;
|
|
||||||
|
|
||||||
return { newChannelInfo, logMessage };
|
return { newChannelInfo, logMessage };
|
||||||
}
|
}
|
||||||
@@ -190,7 +190,7 @@ async function editRolloutAsync(
|
|||||||
branchMapping: JSON.stringify(newBranchMapping),
|
branchMapping: JSON.stringify(newBranchMapping),
|
||||||
});
|
});
|
||||||
|
|
||||||
const logMessage = `️Rollout of branch ${chalk.bold(newBranch.name)} onto channel ${chalk.bold(
|
const logMessage = `Rollout of branch ${chalk.bold(newBranch.name)} on channel ${chalk.bold(
|
||||||
channelName!
|
channelName!
|
||||||
)} updated from ${chalk.bold(currentPercent)}% to ${chalk.bold(percent)}%. ${chalk.bold(
|
)} updated from ${chalk.bold(currentPercent)}% to ${chalk.bold(percent)}%. ${chalk.bold(
|
||||||
percent
|
percent
|
||||||
@@ -256,11 +256,11 @@ async function endRolloutAsync(
|
|||||||
'Ending the rollout will send all traffic to a single branch. Which one should that be?',
|
'Ending the rollout will send all traffic to a single branch. Which one should that be?',
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
title: `${newBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
|
title: `${newBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
|
||||||
value: true,
|
value: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
title: `${oldBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
|
title: `${oldBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
|
||||||
value: false,
|
value: false,
|
||||||
},
|
},
|
||||||
]
|
]
|
||||||
@@ -284,7 +284,7 @@ async function endRolloutAsync(
|
|||||||
channelId: channel.id,
|
channelId: channel.id,
|
||||||
branchMapping: JSON.stringify(newBranchMapping),
|
branchMapping: JSON.stringify(newBranchMapping),
|
||||||
});
|
});
|
||||||
const logMessage = `️Rollout on channel ${chalk.bold(
|
const logMessage = `Rollout on channel ${chalk.bold(
|
||||||
channelName
|
channelName
|
||||||
)} ended. All traffic is now sent to branch ${chalk.bold(
|
)} ended. All traffic is now sent to branch ${chalk.bold(
|
||||||
endOnNewBranch ? newBranch.name : oldBranch.name
|
endOnNewBranch ? newBranch.name : oldBranch.name
|
||||||
@@ -294,14 +294,12 @@ async function endRolloutAsync(
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default class ChannelRollout extends EasCommand {
|
export default class ChannelRollout extends EasCommand {
|
||||||
static override hidden = true;
|
static override description = 'Roll a new branch out on a channel incrementally.';
|
||||||
static override description = 'Rollout a new branch out to a channel incrementally.';
|
|
||||||
|
|
||||||
static override args = [
|
static override args = [
|
||||||
{
|
{
|
||||||
name: 'channel',
|
name: 'channel',
|
||||||
required: true,
|
description: 'channel on which the rollout should be done',
|
||||||
description: 'rollout that the channel is on',
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -311,7 +309,7 @@ export default class ChannelRollout extends EasCommand {
|
|||||||
required: false,
|
required: false,
|
||||||
}),
|
}),
|
||||||
percent: Flags.integer({
|
percent: Flags.integer({
|
||||||
description: 'percent of traffic to redirect to the new branch',
|
description: 'percent of users to send to the new branch',
|
||||||
required: false,
|
required: false,
|
||||||
}),
|
}),
|
||||||
end: Flags.boolean({
|
end: Flags.boolean({
|
||||||
@@ -328,7 +326,7 @@ export default class ChannelRollout extends EasCommand {
|
|||||||
|
|
||||||
async runAsync(): Promise<void> {
|
async runAsync(): Promise<void> {
|
||||||
const {
|
const {
|
||||||
args: { channel: channelName },
|
args: { channel: channelNameArg },
|
||||||
flags: {
|
flags: {
|
||||||
json: jsonFlag,
|
json: jsonFlag,
|
||||||
end: endFlag,
|
end: endFlag,
|
||||||
@@ -349,9 +347,23 @@ export default class ChannelRollout extends EasCommand {
|
|||||||
|
|
||||||
const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
|
const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
|
||||||
|
|
||||||
|
let channelName: string = channelNameArg;
|
||||||
|
if (!channelName) {
|
||||||
|
const { name } = await selectChannelOnAppAsync(graphqlClient, {
|
||||||
|
projectId,
|
||||||
|
selectionPromptTitle: 'Select a channel on which to perform a rollout',
|
||||||
|
paginatedQueryOptions: {
|
||||||
|
json: jsonFlag,
|
||||||
|
nonInteractive,
|
||||||
|
offset: 0,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
channelName = name;
|
||||||
|
}
|
||||||
|
|
||||||
const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
|
const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
|
||||||
appId: projectId,
|
appId: projectId,
|
||||||
channelName: channelName!,
|
channelName,
|
||||||
});
|
});
|
||||||
if (!channel) {
|
if (!channel) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
@@ -396,7 +408,15 @@ export default class ChannelRollout extends EasCommand {
|
|||||||
if (!isRollout) {
|
if (!isRollout) {
|
||||||
rolloutMutationResult = await startRolloutAsync(graphqlClient, {
|
rolloutMutationResult = await startRolloutAsync(graphqlClient, {
|
||||||
channelName,
|
channelName,
|
||||||
branchName: branchName ?? (await promptForBranchNameAsync(channelName, nonInteractive)),
|
branchName:
|
||||||
|
branchName ??
|
||||||
|
(await promptForBranchNameAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectId,
|
||||||
|
channelName,
|
||||||
|
nonInteractive,
|
||||||
|
json: jsonFlag,
|
||||||
|
})),
|
||||||
percent,
|
percent,
|
||||||
nonInteractive,
|
nonInteractive,
|
||||||
projectId,
|
projectId,
|
||||||
@@ -433,18 +453,36 @@ export default class ChannelRollout extends EasCommand {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function promptForBranchNameAsync(
|
async function promptForBranchNameAsync({
|
||||||
channelName: string,
|
graphqlClient,
|
||||||
nonInteractive: boolean
|
projectId,
|
||||||
): Promise<string> {
|
channelName,
|
||||||
|
nonInteractive,
|
||||||
|
json,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectId: string;
|
||||||
|
channelName: string;
|
||||||
|
nonInteractive: boolean;
|
||||||
|
json: boolean;
|
||||||
|
}): Promise<string> {
|
||||||
if (nonInteractive) {
|
if (nonInteractive) {
|
||||||
throw new Error('Must supply branch flag in non-interactive mode');
|
throw new Error('Must supply branch flag in non-interactive mode');
|
||||||
}
|
}
|
||||||
const { name } = await promptAsync({
|
|
||||||
type: 'text',
|
const { name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
|
||||||
name: 'name',
|
projectId,
|
||||||
message: `Select a branch to rollout onto ${channelName}`,
|
promptTitle: `Which branch would you like roll out on ${channelName}?`,
|
||||||
validate: value => (value ? true : 'A branch must be specified.'),
|
displayTextForListItem: updateBranch => ({
|
||||||
|
title: updateBranch.name,
|
||||||
|
}),
|
||||||
|
// discard limit and offset because this query is not their intended target
|
||||||
|
paginatedQueryOptions: {
|
||||||
|
json,
|
||||||
|
nonInteractive,
|
||||||
|
offset: 0,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
return name;
|
|
||||||
|
return branchName;
|
||||||
}
|
}
|
||||||
@@ -5,10 +5,12 @@ import { Flags } from '@oclif/core';
|
|||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
|
|
||||||
import EasCommand from '../commandUtils/EasCommand';
|
import EasCommand from '../commandUtils/EasCommand';
|
||||||
|
import { EasNonInteractiveAndJsonFlags } from '../commandUtils/flags';
|
||||||
import { toAppPlatform } from '../graphql/types/AppPlatform';
|
import { toAppPlatform } from '../graphql/types/AppPlatform';
|
||||||
import Log from '../log';
|
import Log from '../log';
|
||||||
import { appPlatformEmojis } from '../platform';
|
import { appPlatformEmojis } from '../platform';
|
||||||
import { selectAsync } from '../prompts';
|
import { selectAsync } from '../prompts';
|
||||||
|
import { enableJsonOutput, printJsonOnlyOutput } from '../utils/json';
|
||||||
|
|
||||||
export default class Config extends EasCommand {
|
export default class Config extends EasCommand {
|
||||||
static override description = 'display project configuration (app.json + eas.json)';
|
static override description = 'display project configuration (app.json + eas.json)';
|
||||||
@@ -21,6 +23,11 @@ export default class Config extends EasCommand {
|
|||||||
'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
|
'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
|
||||||
helpValue: 'PROFILE_NAME',
|
helpValue: 'PROFILE_NAME',
|
||||||
}),
|
}),
|
||||||
|
// This option is used only on EAS Build worker to read build profile from eas.json.
|
||||||
|
'eas-json-only': Flags.boolean({
|
||||||
|
hidden: true,
|
||||||
|
}),
|
||||||
|
...EasNonInteractiveAndJsonFlags,
|
||||||
};
|
};
|
||||||
|
|
||||||
static override contextDefinition = {
|
static override contextDefinition = {
|
||||||
@@ -30,12 +37,15 @@ export default class Config extends EasCommand {
|
|||||||
|
|
||||||
async runAsync(): Promise<void> {
|
async runAsync(): Promise<void> {
|
||||||
const { flags } = await this.parse(Config);
|
const { flags } = await this.parse(Config);
|
||||||
|
if (flags.json) {
|
||||||
|
enableJsonOutput();
|
||||||
|
}
|
||||||
const { platform: maybePlatform, profile: maybeProfile } = flags;
|
const { platform: maybePlatform, profile: maybeProfile } = flags;
|
||||||
const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
|
const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
|
||||||
nonInteractive: false,
|
nonInteractive: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
const accessor = new EasJsonAccessor(projectDir);
|
const accessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
const profileName =
|
const profileName =
|
||||||
maybeProfile ??
|
maybeProfile ??
|
||||||
(await selectAsync(
|
(await selectAsync(
|
||||||
@@ -61,21 +71,37 @@ export default class Config extends EasCommand {
|
|||||||
]));
|
]));
|
||||||
|
|
||||||
const profile = await EasJsonUtils.getBuildProfileAsync(accessor, platform, profileName);
|
const profile = await EasJsonUtils.getBuildProfileAsync(accessor, platform, profileName);
|
||||||
const { exp: config } = await getDynamicProjectConfigAsync({
|
if (flags['eas-json-only']) {
|
||||||
env: profile.env,
|
if (flags.json) {
|
||||||
isPublicConfig: true,
|
printJsonOnlyOutput({ buildProfile: profile });
|
||||||
});
|
} else {
|
||||||
|
const appPlatform = toAppPlatform(platform);
|
||||||
|
const platformEmoji = appPlatformEmojis[appPlatform];
|
||||||
|
Log.log(`${platformEmoji} ${chalk.bold(`Build profile "${profileName}"`)}`);
|
||||||
|
Log.newLine();
|
||||||
|
Log.log(JSON.stringify(profile, null, 2));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const { exp: appConfig } = await getDynamicProjectConfigAsync({
|
||||||
|
env: profile.env,
|
||||||
|
isPublicConfig: true,
|
||||||
|
});
|
||||||
|
|
||||||
Log.addNewLineIfNone();
|
if (flags.json) {
|
||||||
Log.log(chalk.bold(getProjectConfigDescription(projectDir)));
|
printJsonOnlyOutput({ buildProfile: profile, appConfig });
|
||||||
Log.newLine();
|
} else {
|
||||||
Log.log(JSON.stringify(config, null, 2));
|
Log.addNewLineIfNone();
|
||||||
Log.newLine();
|
Log.log(chalk.bold(getProjectConfigDescription(projectDir)));
|
||||||
Log.newLine();
|
Log.newLine();
|
||||||
const appPlatform = toAppPlatform(platform);
|
Log.log(JSON.stringify(appConfig, null, 2));
|
||||||
const platformEmoji = appPlatformEmojis[appPlatform];
|
Log.newLine();
|
||||||
Log.log(`${platformEmoji} ${chalk.bold(`Build profile "${profileName}"`)}`);
|
Log.newLine();
|
||||||
Log.newLine();
|
const appPlatform = toAppPlatform(platform);
|
||||||
Log.log(JSON.stringify(profile, null, 2));
|
const platformEmoji = appPlatformEmojis[appPlatform];
|
||||||
|
Log.log(`${platformEmoji} ${chalk.bold(`Build profile "${profileName}"`)}`);
|
||||||
|
Log.newLine();
|
||||||
|
Log.log(JSON.stringify(profile, null, 2));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -44,7 +44,7 @@ export default class MetadataLint extends EasCommand {
|
|||||||
|
|
||||||
const submitProfiles = await getProfilesAsync({
|
const submitProfiles = await getProfilesAsync({
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
easJsonAccessor: new EasJsonAccessor(projectDir),
|
easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
|
||||||
platforms: [Platform.IOS],
|
platforms: [Platform.IOS],
|
||||||
profileName: flags.profile,
|
profileName: flags.profile,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ export default class MetadataPull extends EasCommand {
|
|||||||
|
|
||||||
const submitProfiles = await getProfilesAsync({
|
const submitProfiles = await getProfilesAsync({
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
easJsonAccessor: new EasJsonAccessor(projectDir),
|
easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
|
||||||
platforms: [Platform.IOS],
|
platforms: [Platform.IOS],
|
||||||
profileName: flags.profile,
|
profileName: flags.profile,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ export default class MetadataPush extends EasCommand {
|
|||||||
|
|
||||||
const submitProfiles = await getProfilesAsync({
|
const submitProfiles = await getProfilesAsync({
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
easJsonAccessor: new EasJsonAccessor(projectDir),
|
easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
|
||||||
platforms: [Platform.IOS],
|
platforms: [Platform.IOS],
|
||||||
profileName: flags.profile,
|
profileName: flags.profile,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -344,12 +344,38 @@ describe(ProjectInit.name, () => {
|
|||||||
describe('when it is already configured', () => {
|
describe('when it is already configured', () => {
|
||||||
beforeEach(() => {
|
beforeEach(() => {
|
||||||
mockTestProject({ configuredProjectId: '1234', configuredOwner: jester.accounts[0].name });
|
mockTestProject({ configuredProjectId: '1234', configuredOwner: jester.accounts[0].name });
|
||||||
|
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
it('does not configure', async () => {
|
it('does not configure', async () => {
|
||||||
await new ProjectInit([], commandOptions).run();
|
await new ProjectInit([], commandOptions).run();
|
||||||
expect(saveProjectIdToAppConfigAsync).not.toHaveBeenCalled();
|
expect(saveProjectIdToAppConfigAsync).not.toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('checks owner and slug consistency', async () => {
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-124',
|
||||||
|
fullName: '@jester2/testing-124',
|
||||||
|
ownerAccount: jester2.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
|
jest.mocked(confirmAsync).mockResolvedValue(true);
|
||||||
|
jest.mocked(modifyConfigAsync).mockResolvedValue({ type: 'success', config: {} as any });
|
||||||
|
|
||||||
|
await new ProjectInit([], commandOptions).run();
|
||||||
|
|
||||||
|
expect(confirmAsync).toHaveBeenCalled();
|
||||||
|
expect(modifyConfigAsync).toHaveBeenCalledTimes(2);
|
||||||
|
expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { owner: 'jester2' });
|
||||||
|
expect(modifyConfigAsync).toHaveBeenCalledWith('/test-project', { slug: 'testing-124' });
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('when it is not yet configured', () => {
|
describe('when it is not yet configured', () => {
|
||||||
@@ -365,6 +391,14 @@ describe(ProjectInit.name, () => {
|
|||||||
|
|
||||||
it('prompts for confirmation to link', async () => {
|
it('prompts for confirmation to link', async () => {
|
||||||
jest.mocked(confirmAsync).mockResolvedValue(true);
|
jest.mocked(confirmAsync).mockResolvedValue(true);
|
||||||
|
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
await new ProjectInit([], commandOptions).run();
|
await new ProjectInit([], commandOptions).run();
|
||||||
expect(saveProjectIdToAppConfigAsync).toHaveBeenCalledWith('/test-project', '123456');
|
expect(saveProjectIdToAppConfigAsync).toHaveBeenCalledWith('/test-project', '123456');
|
||||||
expect(confirmAsync).toHaveBeenCalledTimes(1);
|
expect(confirmAsync).toHaveBeenCalledTimes(1);
|
||||||
@@ -384,6 +418,14 @@ describe(ProjectInit.name, () => {
|
|||||||
it('asks to create it', async () => {
|
it('asks to create it', async () => {
|
||||||
jest.mocked(confirmAsync).mockResolvedValue(true);
|
jest.mocked(confirmAsync).mockResolvedValue(true);
|
||||||
jest.mocked(AppMutation.createAppAsync).mockResolvedValue('0129');
|
jest.mocked(AppMutation.createAppAsync).mockResolvedValue('0129');
|
||||||
|
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '0129',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
await new ProjectInit([], commandOptions).run();
|
await new ProjectInit([], commandOptions).run();
|
||||||
expect(saveProjectIdToAppConfigAsync).toHaveBeenCalledWith('/test-project', '0129');
|
expect(saveProjectIdToAppConfigAsync).toHaveBeenCalledWith('/test-project', '0129');
|
||||||
expect(confirmAsync).toHaveBeenCalledTimes(1);
|
expect(confirmAsync).toHaveBeenCalledTimes(1);
|
||||||
|
|||||||
@@ -194,7 +194,6 @@ export default class ProjectInit extends EasCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static async initializeWithExplicitIDAsync(
|
private static async initializeWithExplicitIDAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
|
||||||
projectId: string,
|
projectId: string,
|
||||||
projectDir: string,
|
projectDir: string,
|
||||||
{ force, nonInteractive }: InitializeMethodOptions
|
{ force, nonInteractive }: InitializeMethodOptions
|
||||||
@@ -203,17 +202,13 @@ export default class ProjectInit extends EasCommand {
|
|||||||
force,
|
force,
|
||||||
nonInteractive,
|
nonInteractive,
|
||||||
});
|
});
|
||||||
await this.ensureOwnerSlugConsistencyAsync(graphqlClient, projectId, projectDir, {
|
|
||||||
force,
|
|
||||||
nonInteractive,
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async initializeWithInteractiveSelectionAsync(
|
private static async initializeWithInteractiveSelectionAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
graphqlClient: ExpoGraphqlClient,
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
projectDir: string
|
projectDir: string
|
||||||
): Promise<void> {
|
): Promise<string> {
|
||||||
const exp = getExpoConfig(projectDir);
|
const exp = getExpoConfig(projectDir);
|
||||||
const existingProjectId = exp.extra?.eas?.projectId;
|
const existingProjectId = exp.extra?.eas?.projectId;
|
||||||
|
|
||||||
@@ -223,7 +218,7 @@ export default class ProjectInit extends EasCommand {
|
|||||||
existingProjectId
|
existingProjectId
|
||||||
)}). To re-configure, remove the "extra.eas.projectId" field from your app config.`
|
)}). To re-configure, remove the "extra.eas.projectId" field from your app config.`
|
||||||
);
|
);
|
||||||
return;
|
return existingProjectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
const allAccounts = actor.accounts;
|
const allAccounts = actor.accounts;
|
||||||
@@ -243,7 +238,9 @@ export default class ProjectInit extends EasCommand {
|
|||||||
const sortedAccounts =
|
const sortedAccounts =
|
||||||
actor.__typename === 'Robot'
|
actor.__typename === 'Robot'
|
||||||
? allAccounts
|
? allAccounts
|
||||||
: [...allAccounts].sort((a, _b) => (a.name === actor.username ? -1 : 1));
|
: [...allAccounts].sort((a, _b) =>
|
||||||
|
actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0
|
||||||
|
);
|
||||||
|
|
||||||
const choices = sortedAccounts.map(account => ({
|
const choices = sortedAccounts.map(account => ({
|
||||||
title: account.name,
|
title: account.name,
|
||||||
@@ -285,7 +282,7 @@ export default class ProjectInit extends EasCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, existingProjectIdOnServer);
|
await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, existingProjectIdOnServer);
|
||||||
return;
|
return existingProjectIdOnServer;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(accountName)) {
|
if (!accountNamesWhereUserHasSufficientPermissionsToCreateApp.has(accountName)) {
|
||||||
@@ -321,24 +318,36 @@ export default class ProjectInit extends EasCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, createdProjectId);
|
await ProjectInit.saveProjectIdAndLogSuccessAsync(projectDir, createdProjectId);
|
||||||
|
return createdProjectId;
|
||||||
}
|
}
|
||||||
|
|
||||||
async runAsync(): Promise<void> {
|
async runAsync(): Promise<void> {
|
||||||
const {
|
const {
|
||||||
flags: { id, force, 'non-interactive': nonInteractive },
|
flags: { id: idArgument, force, 'non-interactive': nonInteractive },
|
||||||
} = await this.parse(ProjectInit);
|
} = await this.parse(ProjectInit);
|
||||||
const {
|
const {
|
||||||
loggedIn: { actor, graphqlClient },
|
loggedIn: { actor, graphqlClient },
|
||||||
projectDir,
|
projectDir,
|
||||||
} = await this.getContextAsync(ProjectInit, { nonInteractive });
|
} = await this.getContextAsync(ProjectInit, { nonInteractive });
|
||||||
|
|
||||||
if (id) {
|
let idForConsistency: string;
|
||||||
await ProjectInit.initializeWithExplicitIDAsync(graphqlClient, id, projectDir, {
|
if (idArgument) {
|
||||||
|
await ProjectInit.initializeWithExplicitIDAsync(idArgument, projectDir, {
|
||||||
force,
|
force,
|
||||||
nonInteractive,
|
nonInteractive,
|
||||||
});
|
});
|
||||||
|
idForConsistency = idArgument;
|
||||||
} else {
|
} else {
|
||||||
await ProjectInit.initializeWithInteractiveSelectionAsync(graphqlClient, actor, projectDir);
|
idForConsistency = await ProjectInit.initializeWithInteractiveSelectionAsync(
|
||||||
|
graphqlClient,
|
||||||
|
actor,
|
||||||
|
projectDir
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await ProjectInit.ensureOwnerSlugConsistencyAsync(graphqlClient, idForConsistency, projectDir, {
|
||||||
|
force,
|
||||||
|
nonInteractive,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -115,7 +115,7 @@ export default class Submit extends EasCommand {
|
|||||||
const platforms = toPlatforms(flagsWithPlatform.requestedPlatform);
|
const platforms = toPlatforms(flagsWithPlatform.requestedPlatform);
|
||||||
const submissionProfiles = await getProfilesAsync({
|
const submissionProfiles = await getProfilesAsync({
|
||||||
type: 'submit',
|
type: 'submit',
|
||||||
easJsonAccessor: new EasJsonAccessor(projectDir),
|
easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
|
||||||
platforms,
|
platforms,
|
||||||
profileName: flagsWithPlatform.profile,
|
profileName: flagsWithPlatform.profile,
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,6 +1,14 @@
|
|||||||
import { AppJSONConfig, PackageJSONConfig, Platform, getConfig } from '@expo/config';
|
import {
|
||||||
|
AppJSONConfig,
|
||||||
|
ExpoConfig,
|
||||||
|
GetConfigOptions,
|
||||||
|
PackageJSONConfig,
|
||||||
|
Platform,
|
||||||
|
getConfig,
|
||||||
|
} from '@expo/config';
|
||||||
import { Updates } from '@expo/config-plugins';
|
import { Updates } from '@expo/config-plugins';
|
||||||
import { vol } from 'memfs';
|
import { vol } from 'memfs';
|
||||||
|
import nullthrows from 'nullthrows';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { instance, mock } from 'ts-mockito';
|
import { instance, mock } from 'ts-mockito';
|
||||||
|
|
||||||
@@ -12,6 +20,7 @@ import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/cr
|
|||||||
import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
|
import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
|
||||||
import FeatureGating from '../../../commandUtils/gating/FeatureGating';
|
import FeatureGating from '../../../commandUtils/gating/FeatureGating';
|
||||||
import { jester } from '../../../credentials/__tests__/fixtures-constants';
|
import { jester } from '../../../credentials/__tests__/fixtures-constants';
|
||||||
|
import { UpdateFragment } from '../../../graphql/generated';
|
||||||
import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
|
import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
|
||||||
import { AppQuery } from '../../../graphql/queries/AppQuery';
|
import { AppQuery } from '../../../graphql/queries/AppQuery';
|
||||||
import { collectAssetsAsync, uploadAssetsAsync } from '../../../project/publish';
|
import { collectAssetsAsync, uploadAssetsAsync } from '../../../project/publish';
|
||||||
@@ -19,6 +28,20 @@ import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchName
|
|||||||
|
|
||||||
const projectRoot = '/test-project';
|
const projectRoot = '/test-project';
|
||||||
const commandOptions = { root: projectRoot } as any;
|
const commandOptions = { root: projectRoot } as any;
|
||||||
|
const updateStub: UpdateFragment = {
|
||||||
|
id: 'update-1234',
|
||||||
|
group: 'group-1234',
|
||||||
|
branch: { id: 'branch-1234', name: 'main' },
|
||||||
|
message: 'test message',
|
||||||
|
runtimeVersion: 'exposdk:47.0.0',
|
||||||
|
platform: 'ios',
|
||||||
|
gitCommitHash: 'commit',
|
||||||
|
manifestFragment: JSON.stringify({ fake: 'manifest' }),
|
||||||
|
isRollBackToEmbedded: false,
|
||||||
|
manifestPermalink: 'https://expo.dev/fake/manifest/link',
|
||||||
|
codeSigningInfo: null,
|
||||||
|
createdAt: '2022-01-01T12:00:00Z',
|
||||||
|
};
|
||||||
|
|
||||||
jest.mock('fs');
|
jest.mock('fs');
|
||||||
jest.mock('@expo/config');
|
jest.mock('@expo/config');
|
||||||
@@ -32,7 +55,7 @@ jest.mock('../../../graphql/queries/AppQuery');
|
|||||||
jest.mock('../../../graphql/queries/UpdateQuery');
|
jest.mock('../../../graphql/queries/UpdateQuery');
|
||||||
jest.mock('../../../ora', () => ({
|
jest.mock('../../../ora', () => ({
|
||||||
ora: () => ({
|
ora: () => ({
|
||||||
start: () => ({ succeed: () => {}, fail: () => {} }),
|
start: () => ({ succeed: () => {}, fail: () => {}, stop: () => {} }),
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
jest.mock('../../../project/publish', () => ({
|
jest.mock('../../../project/publish', () => ({
|
||||||
@@ -44,7 +67,10 @@ jest.mock('../../../project/publish', () => ({
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
describe(UpdatePublish.name, () => {
|
describe(UpdatePublish.name, () => {
|
||||||
afterEach(() => vol.reset());
|
afterEach(() => {
|
||||||
|
vol.reset();
|
||||||
|
jest.mocked(PublishMutation.publishUpdateGroupAsync).mockClear();
|
||||||
|
});
|
||||||
|
|
||||||
// Deprecated and split to a new command: update:republish
|
// Deprecated and split to a new command: update:republish
|
||||||
it('errors with --republish', async () => {
|
it('errors with --republish', async () => {
|
||||||
@@ -66,7 +92,7 @@ describe(UpdatePublish.name, () => {
|
|||||||
mockTestProject();
|
mockTestProject();
|
||||||
|
|
||||||
await expect(new UpdatePublish(flags, commandOptions).run()).rejects.toThrow(
|
await expect(new UpdatePublish(flags, commandOptions).run()).rejects.toThrow(
|
||||||
'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto'
|
'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.'
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -81,15 +107,9 @@ describe(UpdatePublish.name, () => {
|
|||||||
createdBranch: false,
|
createdBranch: false,
|
||||||
});
|
});
|
||||||
|
|
||||||
jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
|
jest
|
||||||
platforms.map(platform => ({
|
.mocked(PublishMutation.publishUpdateGroupAsync)
|
||||||
id: 'update123',
|
.mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
|
||||||
group: 'group123',
|
|
||||||
runtimeVersion,
|
|
||||||
platform,
|
|
||||||
manifestPermalink: 'https://example.com/update123/manifest',
|
|
||||||
}))
|
|
||||||
);
|
|
||||||
|
|
||||||
await new UpdatePublish(flags, commandOptions).run();
|
await new UpdatePublish(flags, commandOptions).run();
|
||||||
|
|
||||||
@@ -110,11 +130,9 @@ describe(UpdatePublish.name, () => {
|
|||||||
|
|
||||||
jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
|
jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
|
||||||
platforms.map(platform => ({
|
platforms.map(platform => ({
|
||||||
id: 'update123',
|
...updateStub,
|
||||||
group: 'group123',
|
|
||||||
runtimeVersion,
|
runtimeVersion,
|
||||||
platform,
|
platform,
|
||||||
manifestPermalink: 'https://example.com/update123/manifest',
|
|
||||||
}))
|
}))
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -130,14 +148,59 @@ describe(UpdatePublish.name, () => {
|
|||||||
|
|
||||||
expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
|
expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('creates a new update with the public expo config', async () => {
|
||||||
|
const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
|
||||||
|
|
||||||
|
// Add configuration to the project that should not be included in the update
|
||||||
|
const { appJson } = mockTestProject({
|
||||||
|
expoConfig: {
|
||||||
|
hooks: {
|
||||||
|
postPublish: [
|
||||||
|
{
|
||||||
|
file: 'custom-hook.js',
|
||||||
|
config: { some: 'config' },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const { platforms, runtimeVersion } = mockTestExport({ platforms: ['ios'] });
|
||||||
|
|
||||||
|
// Mock an existing branch, so we don't create a new one
|
||||||
|
jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
|
||||||
|
branchId: 'branch123',
|
||||||
|
createdBranch: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest
|
||||||
|
.mocked(PublishMutation.publishUpdateGroupAsync)
|
||||||
|
.mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
|
||||||
|
|
||||||
|
await new UpdatePublish(flags, commandOptions).run();
|
||||||
|
|
||||||
|
// Pull the publish data from the mocked publish function
|
||||||
|
const publishData = jest.mocked(PublishMutation.publishUpdateGroupAsync).mock.calls[0][1][0];
|
||||||
|
// Pull the Expo config from the publish data
|
||||||
|
const expoConfig = nullthrows(publishData.updateInfoGroup).ios!.extra.expoClient;
|
||||||
|
|
||||||
|
// Ensure the basic properties are present
|
||||||
|
expect(expoConfig).toHaveProperty('name', appJson.expo.name);
|
||||||
|
expect(expoConfig).toHaveProperty('slug', appJson.expo.slug);
|
||||||
|
// Ensure non-public config is not present
|
||||||
|
expect(expoConfig).not.toHaveProperty('hooks');
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
/** Create a new in-memory project, copied from src/commands/update/__tests__/republish.test.ts */
|
/** Create a new in-memory project, copied from src/commands/update/__tests__/republish.test.ts */
|
||||||
function mockTestProject({
|
function mockTestProject({
|
||||||
configuredProjectId = '1234',
|
configuredProjectId = '1234',
|
||||||
|
expoConfig = {},
|
||||||
}: {
|
}: {
|
||||||
configuredProjectId?: string;
|
configuredProjectId?: string;
|
||||||
} = {}): { projectId: string } {
|
expoConfig?: Partial<ExpoConfig>;
|
||||||
|
} = {}): { projectId: string; appJson: AppJSONConfig } {
|
||||||
const packageJSON: PackageJSONConfig = {
|
const packageJSON: PackageJSONConfig = {
|
||||||
name: 'testing123',
|
name: 'testing123',
|
||||||
version: '0.1.0',
|
version: '0.1.0',
|
||||||
@@ -157,6 +220,7 @@ function mockTestProject({
|
|||||||
projectId: configuredProjectId,
|
projectId: configuredProjectId,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
...expoConfig,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -174,11 +238,27 @@ function mockTestProject({
|
|||||||
jest.mocked(getConfig).mockReturnValue(mockManifest as any);
|
jest.mocked(getConfig).mockReturnValue(mockManifest as any);
|
||||||
jest
|
jest
|
||||||
.spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
|
.spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
|
||||||
.mockResolvedValue(async () => ({
|
.mockResolvedValue(async (options?: GetConfigOptions) => {
|
||||||
exp: mockManifest.exp,
|
let exp = { ...mockManifest.exp };
|
||||||
projectDir: projectRoot,
|
|
||||||
projectId: configuredProjectId,
|
// Fake a limited public config
|
||||||
}));
|
if (options?.isPublicConfig) {
|
||||||
|
exp = {
|
||||||
|
name: mockManifest.exp.name,
|
||||||
|
version: mockManifest.exp.version,
|
||||||
|
slug: mockManifest.exp.slug,
|
||||||
|
sdkVersion: mockManifest.exp.sdkVersion,
|
||||||
|
owner: mockManifest.exp.owner,
|
||||||
|
extra: mockManifest.exp.extra,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
exp,
|
||||||
|
projectDir: projectRoot,
|
||||||
|
projectId: configuredProjectId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
jest.spyOn(LoggedInContextField.prototype, 'getValueAsync').mockResolvedValue({
|
jest.spyOn(LoggedInContextField.prototype, 'getValueAsync').mockResolvedValue({
|
||||||
actor: jester,
|
actor: jester,
|
||||||
@@ -193,7 +273,7 @@ function mockTestProject({
|
|||||||
ownerAccount: jester.accounts[0],
|
ownerAccount: jester.accounts[0],
|
||||||
});
|
});
|
||||||
|
|
||||||
return { projectId: configuredProjectId };
|
return { projectId: configuredProjectId, appJson: appJSON };
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Create a new in-memory export of the project */
|
/** Create a new in-memory export of the project */
|
||||||
@@ -240,6 +320,8 @@ function mockTestExport({
|
|||||||
uniqueAssetCount: platforms.length,
|
uniqueAssetCount: platforms.length,
|
||||||
uniqueUploadedAssetCount: platforms.length,
|
uniqueUploadedAssetCount: platforms.length,
|
||||||
assetLimitPerUpdateGroup: 9001,
|
assetLimitPerUpdateGroup: 9001,
|
||||||
|
launchAssetCount: 2,
|
||||||
|
uniqueUploadedAssetPaths: [],
|
||||||
});
|
});
|
||||||
|
|
||||||
jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
|
jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
|
||||||
|
|||||||
@@ -27,6 +27,8 @@ const updateStub: UpdateFragment = {
|
|||||||
platform: 'ios',
|
platform: 'ios',
|
||||||
gitCommitHash: 'commit',
|
gitCommitHash: 'commit',
|
||||||
manifestFragment: JSON.stringify({ fake: 'manifest' }),
|
manifestFragment: JSON.stringify({ fake: 'manifest' }),
|
||||||
|
isRollBackToEmbedded: false,
|
||||||
|
manifestPermalink: 'https://expo.dev/fake/manifest/link',
|
||||||
codeSigningInfo: null,
|
codeSigningInfo: null,
|
||||||
createdAt: '2022-01-01T12:00:00Z',
|
createdAt: '2022-01-01T12:00:00Z',
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -0,0 +1,257 @@
|
|||||||
|
import {
|
||||||
|
AppJSONConfig,
|
||||||
|
ExpoConfig,
|
||||||
|
GetConfigOptions,
|
||||||
|
PackageJSONConfig,
|
||||||
|
getConfig,
|
||||||
|
} from '@expo/config';
|
||||||
|
import { Updates } from '@expo/config-plugins';
|
||||||
|
import { vol } from 'memfs';
|
||||||
|
import nullthrows from 'nullthrows';
|
||||||
|
import path from 'path';
|
||||||
|
import { instance, mock } from 'ts-mockito';
|
||||||
|
|
||||||
|
import { ensureBranchExistsAsync } from '../../../branch/queries';
|
||||||
|
import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
|
||||||
|
import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
|
||||||
|
import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
|
||||||
|
import FeatureGating from '../../../commandUtils/gating/FeatureGating';
|
||||||
|
import { jester } from '../../../credentials/__tests__/fixtures-constants';
|
||||||
|
import { UpdateFragment } from '../../../graphql/generated';
|
||||||
|
import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
|
||||||
|
import { AppQuery } from '../../../graphql/queries/AppQuery';
|
||||||
|
import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
|
||||||
|
import UpdateRollBackToEmbedded from '../roll-back-to-embedded';
|
||||||
|
|
||||||
|
const projectRoot = '/test-project';
|
||||||
|
const commandOptions = { root: projectRoot } as any;
|
||||||
|
const updateStub: UpdateFragment = {
|
||||||
|
id: 'update-1234',
|
||||||
|
group: 'group-1234',
|
||||||
|
branch: { id: 'branch-1234', name: 'main' },
|
||||||
|
message: 'test message',
|
||||||
|
runtimeVersion: 'exposdk:47.0.0',
|
||||||
|
platform: 'ios',
|
||||||
|
gitCommitHash: 'commit',
|
||||||
|
manifestFragment: JSON.stringify({ fake: 'manifest' }),
|
||||||
|
isRollBackToEmbedded: false,
|
||||||
|
manifestPermalink: 'https://expo.dev/fake/manifest/link',
|
||||||
|
codeSigningInfo: null,
|
||||||
|
createdAt: '2022-01-01T12:00:00Z',
|
||||||
|
};
|
||||||
|
|
||||||
|
jest.mock('fs');
|
||||||
|
jest.mock('@expo/config');
|
||||||
|
jest.mock('@expo/config-plugins');
|
||||||
|
jest.mock('../../../branch/queries');
|
||||||
|
jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
|
||||||
|
jest.mock('../../../update/configure');
|
||||||
|
jest.mock('../../../update/getBranchNameFromChannelNameAsync');
|
||||||
|
jest.mock('../../../graphql/mutations/PublishMutation');
|
||||||
|
jest.mock('../../../graphql/queries/AppQuery');
|
||||||
|
jest.mock('../../../graphql/queries/UpdateQuery');
|
||||||
|
jest.mock('../../../ora', () => ({
|
||||||
|
ora: () => ({
|
||||||
|
start: () => ({ succeed: () => {}, fail: () => {}, stop: () => {} }),
|
||||||
|
}),
|
||||||
|
}));
|
||||||
|
jest.mock('../../../project/publish', () => ({
|
||||||
|
...jest.requireActual('../../../project/publish'),
|
||||||
|
buildBundlesAsync: jest.fn(),
|
||||||
|
collectAssetsAsync: jest.fn(),
|
||||||
|
resolveInputDirectoryAsync: jest.fn((inputDir = 'dist') => path.join(projectRoot, inputDir)),
|
||||||
|
uploadAssetsAsync: jest.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe(UpdateRollBackToEmbedded.name, () => {
|
||||||
|
afterEach(() => vol.reset());
|
||||||
|
|
||||||
|
it('errors with both --channel and --branch', async () => {
|
||||||
|
const flags = ['--channel=channel123', '--branch=branch123'];
|
||||||
|
|
||||||
|
mockTestProject();
|
||||||
|
|
||||||
|
await expect(new UpdateRollBackToEmbedded(flags, commandOptions).run()).rejects.toThrow(
|
||||||
|
'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates a roll back to embedded with --non-interactive, --branch, and --message', async () => {
|
||||||
|
const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
|
||||||
|
|
||||||
|
mockTestProject();
|
||||||
|
const platforms = ['android', 'ios'];
|
||||||
|
const runtimeVersion = 'exposdk:47.0.0';
|
||||||
|
jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
|
||||||
|
|
||||||
|
jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
|
||||||
|
branchId: 'branch123',
|
||||||
|
createdBranch: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest
|
||||||
|
.mocked(PublishMutation.publishUpdateGroupAsync)
|
||||||
|
.mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
|
||||||
|
|
||||||
|
await new UpdateRollBackToEmbedded(flags, commandOptions).run();
|
||||||
|
|
||||||
|
expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates a roll back to embedded with --non-interactive, --channel, and --message', async () => {
|
||||||
|
const flags = ['--non-interactive', '--channel=channel123', '--message=abc'];
|
||||||
|
|
||||||
|
const { projectId } = mockTestProject();
|
||||||
|
const platforms = ['android', 'ios'];
|
||||||
|
const runtimeVersion = 'exposdk:47.0.0';
|
||||||
|
jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
|
||||||
|
|
||||||
|
jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
|
||||||
|
jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
|
||||||
|
branchId: 'branch123',
|
||||||
|
createdBranch: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
|
||||||
|
platforms.map(platform => ({
|
||||||
|
...updateStub,
|
||||||
|
runtimeVersion,
|
||||||
|
platform,
|
||||||
|
}))
|
||||||
|
);
|
||||||
|
|
||||||
|
await new UpdateRollBackToEmbedded(flags, commandOptions).run();
|
||||||
|
|
||||||
|
expect(ensureBranchExistsAsync).toHaveBeenCalledWith(
|
||||||
|
expect.any(Object), // graphql client
|
||||||
|
{
|
||||||
|
appId: projectId,
|
||||||
|
branchName: 'branchFromChannel',
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
|
it('creates a roll back to embedded with the public expo config', async () => {
|
||||||
|
const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
|
||||||
|
|
||||||
|
// Add configuration to the project that should not be included in the update
|
||||||
|
mockTestProject({
|
||||||
|
expoConfig: {
|
||||||
|
hooks: {
|
||||||
|
postPublish: [
|
||||||
|
{
|
||||||
|
file: 'custom-hook.js',
|
||||||
|
config: { some: 'config' },
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const platforms = ['ios'];
|
||||||
|
const runtimeVersion = 'exposdk:47.0.0';
|
||||||
|
jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
|
||||||
|
|
||||||
|
// Mock an existing branch, so we don't create a new one
|
||||||
|
jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
|
||||||
|
branchId: 'branch123',
|
||||||
|
createdBranch: false,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest
|
||||||
|
.mocked(PublishMutation.publishUpdateGroupAsync)
|
||||||
|
.mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
|
||||||
|
|
||||||
|
await new UpdateRollBackToEmbedded(flags, commandOptions).run();
|
||||||
|
|
||||||
|
// Pull the publish data from the mocked publish function
|
||||||
|
const publishData = jest.mocked(PublishMutation.publishUpdateGroupAsync).mock.calls[0][1][0];
|
||||||
|
expect(nullthrows(publishData.rollBackToEmbeddedInfoGroup).ios).toBe(true);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
/** Create a new in-memory project, based on src/commands/project/__tests__/init.test.ts */
|
||||||
|
function mockTestProject({
|
||||||
|
configuredProjectId = '1234',
|
||||||
|
expoConfig = {},
|
||||||
|
}: {
|
||||||
|
configuredProjectId?: string;
|
||||||
|
expoConfig?: Partial<ExpoConfig>;
|
||||||
|
} = {}): { projectId: string; appJson: AppJSONConfig } {
|
||||||
|
const packageJSON: PackageJSONConfig = {
|
||||||
|
name: 'testing123',
|
||||||
|
version: '0.1.0',
|
||||||
|
description: 'fake description',
|
||||||
|
main: 'index.js',
|
||||||
|
};
|
||||||
|
|
||||||
|
const appJSON: AppJSONConfig = {
|
||||||
|
expo: {
|
||||||
|
name: 'testing 123',
|
||||||
|
version: '0.1.0',
|
||||||
|
slug: 'testing-123',
|
||||||
|
sdkVersion: '33.0.0',
|
||||||
|
owner: jester.accounts[0].name,
|
||||||
|
extra: {
|
||||||
|
eas: {
|
||||||
|
projectId: configuredProjectId,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
...expoConfig,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
vol.fromJSON(
|
||||||
|
{
|
||||||
|
'package.json': JSON.stringify(packageJSON),
|
||||||
|
'app.json': JSON.stringify(appJSON),
|
||||||
|
},
|
||||||
|
projectRoot
|
||||||
|
);
|
||||||
|
|
||||||
|
const mockManifest = { exp: appJSON.expo };
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
|
||||||
|
|
||||||
|
jest.mocked(getConfig).mockReturnValue(mockManifest as any);
|
||||||
|
jest
|
||||||
|
.spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
|
||||||
|
.mockResolvedValue(async (options?: GetConfigOptions) => {
|
||||||
|
let exp = { ...mockManifest.exp };
|
||||||
|
|
||||||
|
// Fake a limited public config
|
||||||
|
if (options?.isPublicConfig) {
|
||||||
|
exp = {
|
||||||
|
name: mockManifest.exp.name,
|
||||||
|
version: mockManifest.exp.version,
|
||||||
|
slug: mockManifest.exp.slug,
|
||||||
|
sdkVersion: mockManifest.exp.sdkVersion,
|
||||||
|
owner: mockManifest.exp.owner,
|
||||||
|
extra: mockManifest.exp.extra,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
exp,
|
||||||
|
projectDir: projectRoot,
|
||||||
|
projectId: configuredProjectId,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
jest.spyOn(LoggedInContextField.prototype, 'getValueAsync').mockResolvedValue({
|
||||||
|
actor: jester,
|
||||||
|
featureGating: new FeatureGating({}, new FeatureGateEnvOverrides()),
|
||||||
|
graphqlClient,
|
||||||
|
});
|
||||||
|
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
|
return { projectId: configuredProjectId, appJson: appJSON };
|
||||||
|
}
|
||||||
@@ -1,13 +1,9 @@
|
|||||||
import { ExpoConfig, Platform as PublishPlatform } from '@expo/config';
|
import { Platform as PublishPlatform } from '@expo/config';
|
||||||
import { Updates } from '@expo/config-plugins';
|
|
||||||
import { Platform, Workflow } from '@expo/eas-build-job';
|
|
||||||
import { Errors, Flags } from '@oclif/core';
|
import { Errors, Flags } from '@oclif/core';
|
||||||
import assert from 'assert';
|
|
||||||
import chalk from 'chalk';
|
import chalk from 'chalk';
|
||||||
import nullthrows from 'nullthrows';
|
import nullthrows from 'nullthrows';
|
||||||
|
|
||||||
import { ensureBranchExistsAsync, selectBranchOnAppAsync } from '../../branch/queries';
|
import { ensureBranchExistsAsync } from '../../branch/queries';
|
||||||
import { getDefaultBranchNameAsync } from '../../branch/utils';
|
|
||||||
import { getUpdateGroupUrl } from '../../build/utils/url';
|
import { getUpdateGroupUrl } from '../../build/utils/url';
|
||||||
import { ensureChannelExistsAsync } from '../../channel/queries';
|
import { ensureChannelExistsAsync } from '../../channel/queries';
|
||||||
import EasCommand from '../../commandUtils/EasCommand';
|
import EasCommand from '../../commandUtils/EasCommand';
|
||||||
@@ -23,28 +19,32 @@ import {
|
|||||||
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
|
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
|
||||||
import Log, { learnMore, link } from '../../log';
|
import Log, { learnMore, link } from '../../log';
|
||||||
import { ora } from '../../ora';
|
import { ora } from '../../ora';
|
||||||
import { RequestedPlatform, requestedPlatformDisplayNames } from '../../platform';
|
import { RequestedPlatform } from '../../platform';
|
||||||
import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
|
import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
|
||||||
import {
|
import {
|
||||||
ExpoCLIExportPlatformFlag,
|
ExpoCLIExportPlatformFlag,
|
||||||
buildBundlesAsync,
|
buildBundlesAsync,
|
||||||
buildUnsortedUpdateInfoGroupAsync,
|
buildUnsortedUpdateInfoGroupAsync,
|
||||||
collectAssetsAsync,
|
collectAssetsAsync,
|
||||||
|
defaultPublishPlatforms,
|
||||||
filterExportedPlatformsByFlag,
|
filterExportedPlatformsByFlag,
|
||||||
|
getBranchNameForCommandAsync,
|
||||||
|
getRequestedPlatform,
|
||||||
|
getRuntimeToPlatformMappingFromRuntimeVersions,
|
||||||
|
getRuntimeVersionObjectAsync,
|
||||||
|
getUpdateMessageForCommandAsync,
|
||||||
isUploadedAssetCountAboveWarningThreshold,
|
isUploadedAssetCountAboveWarningThreshold,
|
||||||
resolveInputDirectoryAsync,
|
resolveInputDirectoryAsync,
|
||||||
uploadAssetsAsync,
|
uploadAssetsAsync,
|
||||||
} from '../../project/publish';
|
} from '../../project/publish';
|
||||||
import { resolveWorkflowAsync } from '../../project/workflow';
|
|
||||||
import { promptAsync } from '../../prompts';
|
|
||||||
import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
|
import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
|
||||||
import { getBranchNameFromChannelNameAsync } from '../../update/getBranchNameFromChannelNameAsync';
|
import { getUpdateGroupJsonInfo } from '../../update/utils';
|
||||||
import { formatUpdateMessage, truncateString as truncateUpdateMessage } from '../../update/utils';
|
import { maybeWarnAboutEasPlanOverageAsync } from '../../utils/billing';
|
||||||
import {
|
import {
|
||||||
checkManifestBodyAgainstUpdateInfoGroup,
|
checkManifestBodyAgainstUpdateInfoGroup,
|
||||||
getCodeSigningInfoAsync,
|
getCodeSigningInfoAsync,
|
||||||
getManifestBodyAsync,
|
getManifestBodyAsync,
|
||||||
signManifestBody,
|
signBody,
|
||||||
} from '../../utils/code-signing';
|
} from '../../utils/code-signing';
|
||||||
import uniqBy from '../../utils/expodash/uniqBy';
|
import uniqBy from '../../utils/expodash/uniqBy';
|
||||||
import formatFields from '../../utils/formatFields';
|
import formatFields from '../../utils/formatFields';
|
||||||
@@ -52,8 +52,6 @@ import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
|
|||||||
import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
|
import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
|
||||||
import { getVcsClient } from '../../vcs';
|
import { getVcsClient } from '../../vcs';
|
||||||
|
|
||||||
export const defaultPublishPlatforms: Partial<PublishPlatform>[] = ['android', 'ios'];
|
|
||||||
|
|
||||||
type RawUpdateFlags = {
|
type RawUpdateFlags = {
|
||||||
auto: boolean;
|
auto: boolean;
|
||||||
branch?: string;
|
branch?: string;
|
||||||
@@ -84,21 +82,6 @@ type UpdateFlags = {
|
|||||||
nonInteractive: boolean;
|
nonInteractive: boolean;
|
||||||
};
|
};
|
||||||
|
|
||||||
function getRequestedPlatform(platform: ExpoCLIExportPlatformFlag): RequestedPlatform | null {
|
|
||||||
switch (platform) {
|
|
||||||
case 'android':
|
|
||||||
return RequestedPlatform.Android;
|
|
||||||
case 'ios':
|
|
||||||
return RequestedPlatform.Ios;
|
|
||||||
case 'web':
|
|
||||||
return null;
|
|
||||||
case 'all':
|
|
||||||
return RequestedPlatform.All;
|
|
||||||
default:
|
|
||||||
throw new Error(`Unsupported platform: ${platform}`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default class UpdatePublish extends EasCommand {
|
export default class UpdatePublish extends EasCommand {
|
||||||
static override description = 'publish an update group';
|
static override description = 'publish an update group';
|
||||||
|
|
||||||
@@ -162,18 +145,18 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
async runAsync(): Promise<void> {
|
async runAsync(): Promise<void> {
|
||||||
const { flags: rawFlags } = await this.parse(UpdatePublish);
|
const { flags: rawFlags } = await this.parse(UpdatePublish);
|
||||||
const paginatedQueryOptions = getPaginatedQueryOptions(rawFlags);
|
const paginatedQueryOptions = getPaginatedQueryOptions(rawFlags);
|
||||||
let {
|
const {
|
||||||
auto: autoFlag,
|
auto: autoFlag,
|
||||||
platform: platformFlag,
|
platform: platformFlag,
|
||||||
channelName,
|
channelName: channelNameArg,
|
||||||
updateMessage,
|
updateMessage: updateMessageArg,
|
||||||
inputDir,
|
inputDir,
|
||||||
skipBundler,
|
skipBundler,
|
||||||
privateKeyPath,
|
privateKeyPath,
|
||||||
json: jsonFlag,
|
json: jsonFlag,
|
||||||
nonInteractive,
|
nonInteractive,
|
||||||
|
branchName: branchNameArg,
|
||||||
} = this.sanitizeFlags(rawFlags);
|
} = this.sanitizeFlags(rawFlags);
|
||||||
let branchName = this.sanitizeFlags(rawFlags).branchName;
|
|
||||||
|
|
||||||
const {
|
const {
|
||||||
getDynamicProjectConfigAsync,
|
getDynamicProjectConfigAsync,
|
||||||
@@ -194,10 +177,7 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
isPublicConfig: true,
|
isPublicConfig: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { exp: expPrivate } = await getDynamicProjectConfigAsync({
|
await maybeWarnAboutEasPlanOverageAsync(graphqlClient, projectId);
|
||||||
isPublicConfig: false,
|
|
||||||
});
|
|
||||||
|
|
||||||
await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
|
await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
|
||||||
|
|
||||||
await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
|
await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
|
||||||
@@ -207,75 +187,28 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
projectId,
|
projectId,
|
||||||
});
|
});
|
||||||
|
|
||||||
const { exp } = await getDynamicProjectConfigAsync();
|
const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
|
||||||
|
const { exp: expPrivate } = await getDynamicProjectConfigAsync({
|
||||||
|
isPublicConfig: false,
|
||||||
|
});
|
||||||
const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
|
const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
|
||||||
|
|
||||||
let realizedPlatforms: PublishPlatform[] = [];
|
const branchName = await getBranchNameForCommandAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectId,
|
||||||
|
channelNameArg,
|
||||||
|
branchNameArg,
|
||||||
|
autoFlag,
|
||||||
|
nonInteractive,
|
||||||
|
paginatedQueryOptions,
|
||||||
|
});
|
||||||
|
|
||||||
if (channelName && branchName) {
|
const updateMessage = await getUpdateMessageForCommandAsync({
|
||||||
throw new Error(
|
updateMessageArg,
|
||||||
'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto'
|
autoFlag,
|
||||||
);
|
nonInteractive,
|
||||||
}
|
jsonFlag,
|
||||||
|
});
|
||||||
if (channelName) {
|
|
||||||
branchName = await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelName);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!branchName) {
|
|
||||||
if (autoFlag) {
|
|
||||||
branchName = await getDefaultBranchNameAsync();
|
|
||||||
} else if (nonInteractive) {
|
|
||||||
throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode');
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
const branch = await selectBranchOnAppAsync(graphqlClient, {
|
|
||||||
projectId,
|
|
||||||
promptTitle: `Which branch would you like to publish on?`,
|
|
||||||
displayTextForListItem: updateBranch => ({
|
|
||||||
title: `${updateBranch.name} ${chalk.grey(
|
|
||||||
`- current update: ${formatUpdateMessage(updateBranch.updates[0])}`
|
|
||||||
)}`,
|
|
||||||
}),
|
|
||||||
paginatedQueryOptions,
|
|
||||||
});
|
|
||||||
branchName = branch.name;
|
|
||||||
} catch {
|
|
||||||
// unable to select a branch (network error or no branches for project)
|
|
||||||
({ name: branchName } = await promptAsync({
|
|
||||||
type: 'text',
|
|
||||||
name: 'name',
|
|
||||||
message: 'No branches found. Provide a branch name:',
|
|
||||||
initial: await getDefaultBranchNameAsync(),
|
|
||||||
validate: value => (value ? true : 'Branch name may not be empty.'),
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
assert(branchName, 'Branch name must be specified.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!updateMessage && autoFlag) {
|
|
||||||
updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!updateMessage) {
|
|
||||||
if (nonInteractive) {
|
|
||||||
throw new Error('Must supply --message or use --auto when in non-interactive mode');
|
|
||||||
}
|
|
||||||
|
|
||||||
const validationMessage = 'publish message may not be empty.';
|
|
||||||
if (jsonFlag) {
|
|
||||||
throw new Error(validationMessage);
|
|
||||||
}
|
|
||||||
({ updateMessage } = await promptAsync({
|
|
||||||
type: 'text',
|
|
||||||
name: 'updateMessage',
|
|
||||||
message: `Provide an update message.`,
|
|
||||||
initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
|
|
||||||
validate: (value: any) => (value ? true : validationMessage),
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
|
|
||||||
// build bundle and upload assets for a new publish
|
// build bundle and upload assets for a new publish
|
||||||
if (!skipBundler) {
|
if (!skipBundler) {
|
||||||
@@ -296,6 +229,7 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
|
let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
|
||||||
let uploadedAssetCount = 0;
|
let uploadedAssetCount = 0;
|
||||||
let assetLimitPerUpdateGroup = 0;
|
let assetLimitPerUpdateGroup = 0;
|
||||||
|
let realizedPlatforms: PublishPlatform[] = [];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const collectedAssets = await collectAssetsAsync(distRoot);
|
const collectedAssets = await collectAssetsAsync(distRoot);
|
||||||
@@ -314,31 +248,42 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
|
uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
|
||||||
assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
|
assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
|
||||||
unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
|
unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
|
||||||
const uploadAssetSuccessMessage = uploadedAssetCount
|
|
||||||
? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'platform' : 'platforms'}`
|
// NOTE(cedric): we assume that bundles are always uploaded, and always are part of
|
||||||
: `Uploaded: No changes detected`;
|
// `uploadedAssetCount`, perferably we don't assume. For that, we need to refactor the
|
||||||
assetSpinner.succeed(uploadAssetSuccessMessage);
|
// `uploadAssetsAsync` and be able to determine asset type from the uploaded assets.
|
||||||
|
const uploadedBundleCount = uploadResults.launchAssetCount;
|
||||||
|
const uploadedNormalAssetCount = Math.max(0, uploadedAssetCount - uploadedBundleCount);
|
||||||
|
const reusedNormalAssetCount = uploadResults.uniqueAssetCount - uploadedNormalAssetCount;
|
||||||
|
|
||||||
|
assetSpinner.stop();
|
||||||
|
Log.withTick(
|
||||||
|
`Uploaded ${uploadedBundleCount} app ${uploadedBundleCount === 1 ? 'bundle' : 'bundles'}`
|
||||||
|
);
|
||||||
|
if (uploadedNormalAssetCount === 0) {
|
||||||
|
Log.withTick(`Uploading assets skipped - no new assets found`);
|
||||||
|
} else {
|
||||||
|
let message = `Uploaded ${uploadedNormalAssetCount} ${
|
||||||
|
uploadedNormalAssetCount === 1 ? 'asset' : 'assets'
|
||||||
|
}`;
|
||||||
|
if (reusedNormalAssetCount > 0) {
|
||||||
|
message += ` (reused ${reusedNormalAssetCount} ${
|
||||||
|
reusedNormalAssetCount === 1 ? 'asset' : 'assets'
|
||||||
|
})`;
|
||||||
|
}
|
||||||
|
Log.withTick(message);
|
||||||
|
}
|
||||||
|
for (const uploadedAssetPath of uploadResults.uniqueUploadedAssetPaths) {
|
||||||
|
Log.debug(chalk.dim(`- ${uploadedAssetPath}`));
|
||||||
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
assetSpinner.fail('Failed to upload');
|
assetSpinner.fail('Failed to upload');
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
const truncatedMessage = truncateUpdateMessage(updateMessage!, 1024);
|
|
||||||
if (truncatedMessage !== updateMessage) {
|
|
||||||
Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
|
|
||||||
}
|
|
||||||
|
|
||||||
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
|
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
|
||||||
|
const runtimeToPlatformMapping =
|
||||||
const runtimeToPlatformMapping: { runtimeVersion: string; platforms: string[] }[] = [];
|
getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
|
||||||
for (const runtime of runtimeVersions) {
|
|
||||||
const platforms = runtimeVersions
|
|
||||||
.filter(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)
|
|
||||||
.map(({ platform }) => platform);
|
|
||||||
if (!runtimeToPlatformMapping.find(item => item.runtimeVersion === runtime.runtimeVersion)) {
|
|
||||||
runtimeToPlatformMapping.push({ runtimeVersion: runtime.runtimeVersion, platforms });
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
|
const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
|
||||||
appId: projectId,
|
appId: projectId,
|
||||||
@@ -373,7 +318,7 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
branchId,
|
branchId,
|
||||||
updateInfoGroup: localUpdateInfoGroup,
|
updateInfoGroup: localUpdateInfoGroup,
|
||||||
runtimeVersion,
|
runtimeVersion,
|
||||||
message: truncatedMessage,
|
message: updateMessage,
|
||||||
gitCommitHash,
|
gitCommitHash,
|
||||||
isGitWorkingTreeDirty,
|
isGitWorkingTreeDirty,
|
||||||
awaitingCodeSigningInfo: !!codeSigningInfo,
|
awaitingCodeSigningInfo: !!codeSigningInfo,
|
||||||
@@ -390,7 +335,10 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
|
|
||||||
const updatesTemp = [...newUpdates];
|
const updatesTemp = [...newUpdates];
|
||||||
const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
|
const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
|
||||||
const newUpdates = updatesTemp.splice(0, Object.keys(updateGroup.updateInfoGroup).length);
|
const newUpdates = updatesTemp.splice(
|
||||||
|
0,
|
||||||
|
Object.keys(nullthrows(updateGroup.updateInfoGroup)).length
|
||||||
|
);
|
||||||
return {
|
return {
|
||||||
updateGroup,
|
updateGroup,
|
||||||
newUpdates,
|
newUpdates,
|
||||||
@@ -410,11 +358,13 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
checkManifestBodyAgainstUpdateInfoGroup(
|
checkManifestBodyAgainstUpdateInfoGroup(
|
||||||
manifestBody,
|
manifestBody,
|
||||||
nullthrows(
|
nullthrows(
|
||||||
updateGroup.updateInfoGroup[newUpdate.platform as keyof UpdateInfoGroup]
|
nullthrows(updateGroup.updateInfoGroup)[
|
||||||
|
newUpdate.platform as keyof UpdateInfoGroup
|
||||||
|
]
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
const manifestSignature = signManifestBody(manifestBody, codeSigningInfo);
|
const manifestSignature = signBody(manifestBody, codeSigningInfo);
|
||||||
|
|
||||||
await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
|
await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
|
||||||
alg: codeSigningInfo.codeSigningMetadata.alg,
|
alg: codeSigningInfo.codeSigningMetadata.alg,
|
||||||
@@ -434,7 +384,7 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (jsonFlag) {
|
if (jsonFlag) {
|
||||||
printJsonOnlyOutput(newUpdates);
|
printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
|
||||||
} else {
|
} else {
|
||||||
if (new Set(newUpdates.map(update => update.group)).size > 1) {
|
if (new Set(newUpdates.map(update => update.group)).size > 1) {
|
||||||
Log.addNewLineIfNone();
|
Log.addNewLineIfNone();
|
||||||
@@ -476,7 +426,7 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
|
? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
|
||||||
: []),
|
: []),
|
||||||
...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
|
...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
|
||||||
{ label: 'Message', value: truncatedMessage },
|
{ label: 'Message', value: updateMessage },
|
||||||
...(gitCommitHash
|
...(gitCommitHash
|
||||||
? [
|
? [
|
||||||
{
|
{
|
||||||
@@ -547,41 +497,3 @@ export default class UpdatePublish extends EasCommand {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
|
|
||||||
async function getRuntimeVersionObjectAsync(
|
|
||||||
exp: ExpoConfig,
|
|
||||||
platforms: PublishPlatform[],
|
|
||||||
projectDir: string
|
|
||||||
): Promise<{ platform: string; runtimeVersion: string }[]> {
|
|
||||||
for (const platform of platforms) {
|
|
||||||
if (platform === 'web') {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
|
|
||||||
if (isPolicy) {
|
|
||||||
const isManaged =
|
|
||||||
(await resolveWorkflowAsync(projectDir, platform as Platform)) === Workflow.MANAGED;
|
|
||||||
if (!isManaged) {
|
|
||||||
throw new Error(
|
|
||||||
'Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.'
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return [...new Set(platforms)].map(platform => {
|
|
||||||
if (platform === 'web') {
|
|
||||||
return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
platform,
|
|
||||||
runtimeVersion: nullthrows(
|
|
||||||
Updates.getRuntimeVersion(exp, platform),
|
|
||||||
`Unable to determine runtime version for ${
|
|
||||||
requestedPlatformDisplayNames[platform]
|
|
||||||
}. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
|
|
||||||
),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -56,7 +56,7 @@ type UpdateToRepublish = {
|
|||||||
>;
|
>;
|
||||||
|
|
||||||
export default class UpdateRepublish extends EasCommand {
|
export default class UpdateRepublish extends EasCommand {
|
||||||
static override description = 'rollback to an existing update';
|
static override description = 'roll back to an existing update';
|
||||||
|
|
||||||
static override flags = {
|
static override flags = {
|
||||||
channel: Flags.string({
|
channel: Flags.string({
|
||||||
|
|||||||
@@ -0,0 +1,389 @@
|
|||||||
|
import { Platform as PublishPlatform } from '@expo/config';
|
||||||
|
import { Errors, Flags } from '@oclif/core';
|
||||||
|
import chalk from 'chalk';
|
||||||
|
import nullthrows from 'nullthrows';
|
||||||
|
|
||||||
|
import { ensureBranchExistsAsync } from '../../branch/queries';
|
||||||
|
import { getUpdateGroupUrl } from '../../build/utils/url';
|
||||||
|
import { ensureChannelExistsAsync } from '../../channel/queries';
|
||||||
|
import EasCommand from '../../commandUtils/EasCommand';
|
||||||
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
|
||||||
|
import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
|
||||||
|
import fetch from '../../fetch';
|
||||||
|
import {
|
||||||
|
PublishUpdateGroupInput,
|
||||||
|
StatuspageServiceName,
|
||||||
|
UpdatePublishMutation,
|
||||||
|
} from '../../graphql/generated';
|
||||||
|
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
|
||||||
|
import Log, { link } from '../../log';
|
||||||
|
import { ora } from '../../ora';
|
||||||
|
import { RequestedPlatform } from '../../platform';
|
||||||
|
import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
|
||||||
|
import {
|
||||||
|
ExpoCLIExportPlatformFlag,
|
||||||
|
defaultPublishPlatforms,
|
||||||
|
getBranchNameForCommandAsync,
|
||||||
|
getRequestedPlatform,
|
||||||
|
getRuntimeToPlatformMappingFromRuntimeVersions,
|
||||||
|
getRuntimeVersionObjectAsync,
|
||||||
|
getUpdateMessageForCommandAsync,
|
||||||
|
} from '../../project/publish';
|
||||||
|
import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
|
||||||
|
import { getUpdateGroupJsonInfo } from '../../update/utils';
|
||||||
|
import {
|
||||||
|
CodeSigningInfo,
|
||||||
|
checkDirectiveBodyAgainstUpdateInfoGroup,
|
||||||
|
getCodeSigningInfoAsync,
|
||||||
|
getDirectiveBodyAsync,
|
||||||
|
signBody,
|
||||||
|
} from '../../utils/code-signing';
|
||||||
|
import uniqBy from '../../utils/expodash/uniqBy';
|
||||||
|
import formatFields from '../../utils/formatFields';
|
||||||
|
import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
|
||||||
|
import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
|
||||||
|
import { getVcsClient } from '../../vcs';
|
||||||
|
|
||||||
|
type RawUpdateFlags = {
|
||||||
|
auto: boolean;
|
||||||
|
branch?: string;
|
||||||
|
channel?: string;
|
||||||
|
message?: string;
|
||||||
|
platform: string;
|
||||||
|
'private-key-path'?: string;
|
||||||
|
'non-interactive': boolean;
|
||||||
|
json: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
type UpdateFlags = {
|
||||||
|
auto: boolean;
|
||||||
|
platform: ExpoCLIExportPlatformFlag;
|
||||||
|
branchName?: string;
|
||||||
|
channelName?: string;
|
||||||
|
updateMessage?: string;
|
||||||
|
privateKeyPath?: string;
|
||||||
|
json: boolean;
|
||||||
|
nonInteractive: boolean;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default class UpdateRollBackToEmbedded extends EasCommand {
|
||||||
|
static override hidden = true; // until we launch
|
||||||
|
static override description = 'roll back to the embedded update';
|
||||||
|
|
||||||
|
static override flags = {
|
||||||
|
branch: Flags.string({
|
||||||
|
description: 'Branch to publish the rollback to embedded update group on',
|
||||||
|
required: false,
|
||||||
|
}),
|
||||||
|
channel: Flags.string({
|
||||||
|
description: 'Channel that the published rollback to embedded update should affect',
|
||||||
|
required: false,
|
||||||
|
}),
|
||||||
|
message: Flags.string({
|
||||||
|
description: 'A short message describing the rollback to embedded update',
|
||||||
|
required: false,
|
||||||
|
}),
|
||||||
|
platform: Flags.enum({
|
||||||
|
char: 'p',
|
||||||
|
options: [...defaultPublishPlatforms, 'all'],
|
||||||
|
default: 'all',
|
||||||
|
required: false,
|
||||||
|
}),
|
||||||
|
auto: Flags.boolean({
|
||||||
|
description:
|
||||||
|
'Use the current git branch and commit message for the EAS branch and update message',
|
||||||
|
default: false,
|
||||||
|
}),
|
||||||
|
'private-key-path': Flags.string({
|
||||||
|
description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
|
||||||
|
required: false,
|
||||||
|
}),
|
||||||
|
...EasNonInteractiveAndJsonFlags,
|
||||||
|
};
|
||||||
|
|
||||||
|
static override contextDefinition = {
|
||||||
|
...this.ContextOptions.DynamicProjectConfig,
|
||||||
|
...this.ContextOptions.LoggedIn,
|
||||||
|
};
|
||||||
|
|
||||||
|
async runAsync(): Promise<void> {
|
||||||
|
const { flags: rawFlags } = await this.parse(UpdateRollBackToEmbedded);
|
||||||
|
const paginatedQueryOptions = getPaginatedQueryOptions(rawFlags);
|
||||||
|
const {
|
||||||
|
auto: autoFlag,
|
||||||
|
platform: platformFlag,
|
||||||
|
channelName: channelNameArg,
|
||||||
|
updateMessage: updateMessageArg,
|
||||||
|
privateKeyPath,
|
||||||
|
json: jsonFlag,
|
||||||
|
nonInteractive,
|
||||||
|
branchName: branchNameArg,
|
||||||
|
} = this.sanitizeFlags(rawFlags);
|
||||||
|
|
||||||
|
const {
|
||||||
|
getDynamicProjectConfigAsync,
|
||||||
|
loggedIn: { graphqlClient },
|
||||||
|
} = await this.getContextAsync(UpdateRollBackToEmbedded, {
|
||||||
|
nonInteractive,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (jsonFlag) {
|
||||||
|
enableJsonOutput();
|
||||||
|
}
|
||||||
|
|
||||||
|
const {
|
||||||
|
exp: expPossiblyWithoutEasUpdateConfigured,
|
||||||
|
projectId,
|
||||||
|
projectDir,
|
||||||
|
} = await getDynamicProjectConfigAsync({
|
||||||
|
isPublicConfig: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
|
||||||
|
|
||||||
|
await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
|
||||||
|
exp: expPossiblyWithoutEasUpdateConfigured,
|
||||||
|
platform: getRequestedPlatform(platformFlag),
|
||||||
|
projectDir,
|
||||||
|
projectId,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
|
||||||
|
const { exp: expPrivate } = await getDynamicProjectConfigAsync({
|
||||||
|
isPublicConfig: false,
|
||||||
|
});
|
||||||
|
const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
|
||||||
|
|
||||||
|
const branchName = await getBranchNameForCommandAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectId,
|
||||||
|
channelNameArg,
|
||||||
|
branchNameArg,
|
||||||
|
autoFlag,
|
||||||
|
nonInteractive,
|
||||||
|
paginatedQueryOptions,
|
||||||
|
});
|
||||||
|
|
||||||
|
const updateMessage = await getUpdateMessageForCommandAsync({
|
||||||
|
updateMessageArg,
|
||||||
|
autoFlag,
|
||||||
|
nonInteractive,
|
||||||
|
jsonFlag,
|
||||||
|
});
|
||||||
|
|
||||||
|
const realizedPlatforms: PublishPlatform[] =
|
||||||
|
platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
|
||||||
|
|
||||||
|
const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
|
||||||
|
appId: projectId,
|
||||||
|
branchName,
|
||||||
|
});
|
||||||
|
if (createdBranch) {
|
||||||
|
await ensureChannelExistsAsync(graphqlClient, {
|
||||||
|
appId: projectId,
|
||||||
|
branchId,
|
||||||
|
channelName: branchName,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);
|
||||||
|
|
||||||
|
const vcsClient = getVcsClient();
|
||||||
|
|
||||||
|
const gitCommitHash = await vcsClient.getCommitHashAsync();
|
||||||
|
const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
|
||||||
|
|
||||||
|
const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
|
||||||
|
|
||||||
|
let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
|
||||||
|
const publishSpinner = ora('Publishing...').start();
|
||||||
|
try {
|
||||||
|
newUpdates = await this.publishRollbacksAsync({
|
||||||
|
graphqlClient,
|
||||||
|
isGitWorkingTreeDirty,
|
||||||
|
gitCommitHash,
|
||||||
|
updateMessage,
|
||||||
|
branchId,
|
||||||
|
codeSigningInfo,
|
||||||
|
runtimeVersions,
|
||||||
|
realizedPlatforms,
|
||||||
|
});
|
||||||
|
publishSpinner.succeed('Published!');
|
||||||
|
} catch (e) {
|
||||||
|
publishSpinner.fail('Failed to publish updates');
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (jsonFlag) {
|
||||||
|
printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
|
||||||
|
} else {
|
||||||
|
if (new Set(newUpdates.map(update => update.group)).size > 1) {
|
||||||
|
Log.addNewLineIfNone();
|
||||||
|
Log.log(
|
||||||
|
'👉 Since multiple runtime versions are defined, multiple update groups have been published.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
Log.addNewLineIfNone();
|
||||||
|
|
||||||
|
for (const runtime of uniqBy(runtimeVersions, version => version.runtimeVersion)) {
|
||||||
|
const newUpdatesForRuntimeVersion = newUpdates.filter(
|
||||||
|
update => update.runtimeVersion === runtime.runtimeVersion
|
||||||
|
);
|
||||||
|
if (newUpdatesForRuntimeVersion.length === 0) {
|
||||||
|
throw new Error(
|
||||||
|
`Publish response is missing updates with runtime ${runtime.runtimeVersion}.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
|
||||||
|
const newAndroidUpdate = newUpdatesForRuntimeVersion.find(
|
||||||
|
update => update.platform === 'android'
|
||||||
|
);
|
||||||
|
const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
|
||||||
|
const updateGroupId = newUpdatesForRuntimeVersion[0].group;
|
||||||
|
|
||||||
|
const projectName = exp.slug;
|
||||||
|
const accountName = (await getOwnerAccountForProjectIdAsync(graphqlClient, projectId)).name;
|
||||||
|
const updateGroupUrl = getUpdateGroupUrl(accountName, projectName, updateGroupId);
|
||||||
|
const updateGroupLink = link(updateGroupUrl, { dim: false });
|
||||||
|
|
||||||
|
Log.log(
|
||||||
|
formatFields([
|
||||||
|
{ label: 'Branch', value: branchName },
|
||||||
|
{ label: 'Runtime version', value: runtime.runtimeVersion },
|
||||||
|
{ label: 'Platform', value: platforms.join(', ') },
|
||||||
|
{ label: 'Update group ID', value: updateGroupId },
|
||||||
|
...(newAndroidUpdate
|
||||||
|
? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
|
||||||
|
: []),
|
||||||
|
...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
|
||||||
|
{ label: 'Message', value: updateMessage },
|
||||||
|
...(gitCommitHash
|
||||||
|
? [
|
||||||
|
{
|
||||||
|
label: 'Commit',
|
||||||
|
value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
|
||||||
|
},
|
||||||
|
]
|
||||||
|
: []),
|
||||||
|
{ label: 'Website link', value: updateGroupLink },
|
||||||
|
])
|
||||||
|
);
|
||||||
|
Log.addNewLineIfNone();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async publishRollbacksAsync({
|
||||||
|
graphqlClient,
|
||||||
|
isGitWorkingTreeDirty,
|
||||||
|
gitCommitHash,
|
||||||
|
updateMessage,
|
||||||
|
branchId,
|
||||||
|
codeSigningInfo,
|
||||||
|
runtimeVersions,
|
||||||
|
realizedPlatforms,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
isGitWorkingTreeDirty: boolean | undefined;
|
||||||
|
gitCommitHash: string | undefined;
|
||||||
|
updateMessage: string;
|
||||||
|
branchId: string;
|
||||||
|
codeSigningInfo: CodeSigningInfo | undefined;
|
||||||
|
runtimeVersions: { platform: string; runtimeVersion: string }[];
|
||||||
|
realizedPlatforms: PublishPlatform[];
|
||||||
|
}): Promise<UpdatePublishMutation['updateBranch']['publishUpdateGroups']> {
|
||||||
|
const runtimeToPlatformMapping =
|
||||||
|
getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
|
||||||
|
const rollbackInfoGroups = Object.fromEntries(
|
||||||
|
realizedPlatforms.map(platform => [platform, true])
|
||||||
|
);
|
||||||
|
|
||||||
|
// Sort the updates into different groups based on their platform specific runtime versions
|
||||||
|
const updateGroups: PublishUpdateGroupInput[] = runtimeToPlatformMapping.map(
|
||||||
|
({ runtimeVersion, platforms }) => {
|
||||||
|
const localRollbackInfoGroup = Object.fromEntries(
|
||||||
|
platforms.map(platform => [platform, rollbackInfoGroups[platform]])
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
branchId,
|
||||||
|
rollBackToEmbeddedInfoGroup: localRollbackInfoGroup,
|
||||||
|
runtimeVersion,
|
||||||
|
message: updateMessage,
|
||||||
|
gitCommitHash,
|
||||||
|
isGitWorkingTreeDirty,
|
||||||
|
awaitingCodeSigningInfo: !!codeSigningInfo,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
const newUpdates = await PublishMutation.publishUpdateGroupAsync(graphqlClient, updateGroups);
|
||||||
|
|
||||||
|
if (codeSigningInfo) {
|
||||||
|
Log.log('🔒 Signing roll back');
|
||||||
|
|
||||||
|
const updatesTemp = [...newUpdates];
|
||||||
|
const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
|
||||||
|
const newUpdates = updatesTemp.splice(
|
||||||
|
0,
|
||||||
|
Object.keys(nullthrows(updateGroup.rollBackToEmbeddedInfoGroup)).length
|
||||||
|
);
|
||||||
|
return {
|
||||||
|
updateGroup,
|
||||||
|
newUpdates,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
await Promise.all(
|
||||||
|
updateGroupsAndTheirUpdates.map(async ({ newUpdates }) => {
|
||||||
|
await Promise.all(
|
||||||
|
newUpdates.map(async newUpdate => {
|
||||||
|
const response = await fetch(newUpdate.manifestPermalink, {
|
||||||
|
method: 'GET',
|
||||||
|
headers: { accept: 'multipart/mixed' },
|
||||||
|
});
|
||||||
|
const directiveBody = nullthrows(await getDirectiveBodyAsync(response));
|
||||||
|
|
||||||
|
checkDirectiveBodyAgainstUpdateInfoGroup(directiveBody);
|
||||||
|
|
||||||
|
const directiveSignature = signBody(directiveBody, codeSigningInfo);
|
||||||
|
|
||||||
|
await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
|
||||||
|
alg: codeSigningInfo.codeSigningMetadata.alg,
|
||||||
|
keyid: codeSigningInfo.codeSigningMetadata.keyid,
|
||||||
|
sig: directiveSignature,
|
||||||
|
});
|
||||||
|
})
|
||||||
|
);
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return newUpdates;
|
||||||
|
}
|
||||||
|
|
||||||
|
private sanitizeFlags(flags: RawUpdateFlags): UpdateFlags {
|
||||||
|
const nonInteractive = flags['non-interactive'] ?? false;
|
||||||
|
|
||||||
|
const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
|
||||||
|
if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
|
||||||
|
Errors.error(
|
||||||
|
'--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified',
|
||||||
|
{ exit: 1 }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
auto,
|
||||||
|
branchName,
|
||||||
|
channelName,
|
||||||
|
updateMessage,
|
||||||
|
platform: flags.platform as RequestedPlatform,
|
||||||
|
privateKeyPath: flags['private-key-path'],
|
||||||
|
nonInteractive,
|
||||||
|
json: flags.json ?? false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,7 +4,11 @@ import EasCommand from '../../commandUtils/EasCommand';
|
|||||||
import { EasJsonOnlyFlag } from '../../commandUtils/flags';
|
import { EasJsonOnlyFlag } from '../../commandUtils/flags';
|
||||||
import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
|
import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
|
||||||
import Log from '../../log';
|
import Log from '../../log';
|
||||||
import { formatUpdateGroup, getUpdateGroupDescriptions } from '../../update/utils';
|
import {
|
||||||
|
formatUpdateGroup,
|
||||||
|
getUpdateGroupDescriptions,
|
||||||
|
getUpdateGroupJsonInfo,
|
||||||
|
} from '../../update/utils';
|
||||||
import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
|
import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
|
||||||
|
|
||||||
export default class UpdateView extends EasCommand {
|
export default class UpdateView extends EasCommand {
|
||||||
@@ -41,11 +45,12 @@ export default class UpdateView extends EasCommand {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId });
|
const updatesByGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId });
|
||||||
const [updateGroupDescription] = getUpdateGroupDescriptions([updatesByGroup]);
|
|
||||||
|
|
||||||
if (jsonFlag) {
|
if (jsonFlag) {
|
||||||
printJsonOnlyOutput(updateGroupDescription);
|
printJsonOnlyOutput(getUpdateGroupJsonInfo(updatesByGroup));
|
||||||
} else {
|
} else {
|
||||||
|
const [updateGroupDescription] = getUpdateGroupDescriptions([updatesByGroup]);
|
||||||
|
|
||||||
Log.log(chalk.bold('Update group:'));
|
Log.log(chalk.bold('Update group:'));
|
||||||
|
|
||||||
Log.log(formatUpdateGroup(updateGroupDescription));
|
Log.log(formatUpdateGroup(updateGroupDescription));
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import { getAppFromContextAsync } from './actions/BuildCredentialsUtils';
|
|||||||
import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
|
import { SetUpBuildCredentials } from './actions/SetUpBuildCredentials';
|
||||||
import { SetUpPushKey } from './actions/SetUpPushKey';
|
import { SetUpPushKey } from './actions/SetUpPushKey';
|
||||||
import { App, IosCredentials, Target } from './types';
|
import { App, IosCredentials, Target } from './types';
|
||||||
import { isAdHocProfile } from './utils/provisioningProfile';
|
import { isAdHocProfile, isEnterpriseUniversalProfile } from './utils/provisioningProfile';
|
||||||
|
|
||||||
interface Options {
|
interface Options {
|
||||||
app: App;
|
app: App;
|
||||||
@@ -128,7 +128,7 @@ export default class IosCredentialsProvider {
|
|||||||
private async disablePushNotificationsSetupInEasJsonAsync(
|
private async disablePushNotificationsSetupInEasJsonAsync(
|
||||||
ctx: CredentialsContext
|
ctx: CredentialsContext
|
||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const easJsonAccessor = new EasJsonAccessor(ctx.projectDir);
|
const easJsonAccessor = EasJsonAccessor.fromProjectPath(ctx.projectDir);
|
||||||
await easJsonAccessor.readRawJsonAsync();
|
await easJsonAccessor.readRawJsonAsync();
|
||||||
easJsonAccessor.patch(easJsonRawObject => {
|
easJsonAccessor.patch(easJsonRawObject => {
|
||||||
easJsonRawObject.cli = {
|
easJsonRawObject.cli = {
|
||||||
@@ -143,17 +143,32 @@ export default class IosCredentialsProvider {
|
|||||||
|
|
||||||
private assertProvisioningProfileType(provisioningProfile: string, targetName?: string): void {
|
private assertProvisioningProfileType(provisioningProfile: string, targetName?: string): void {
|
||||||
const isAdHoc = isAdHocProfile(provisioningProfile);
|
const isAdHoc = isAdHocProfile(provisioningProfile);
|
||||||
if (this.options.distribution === 'internal' && !isAdHoc) {
|
const isEnterprise = isEnterpriseUniversalProfile(provisioningProfile);
|
||||||
throw new Error(
|
if (this.options.distribution === 'internal') {
|
||||||
`You must use an adhoc provisioning profile${
|
if (this.options.enterpriseProvisioning === 'universal' && !isEnterprise) {
|
||||||
targetName ? ` (target '${targetName})'` : ''
|
throw new Error(
|
||||||
} for internal distribution`
|
`You must use a universal provisioning profile${
|
||||||
);
|
targetName ? ` (target '${targetName})'` : ''
|
||||||
} else if (this.options.distribution !== 'internal' && isAdHoc) {
|
} for internal distribution if you specified "enterpriseProvisioning": "universal" in eas.json`
|
||||||
|
);
|
||||||
|
} else if (this.options.enterpriseProvisioning === 'adhoc' && !isAdHoc) {
|
||||||
|
throw new Error(
|
||||||
|
`You must use an adhoc provisioning profile${
|
||||||
|
targetName ? ` (target '${targetName})'` : ''
|
||||||
|
} for internal distribution if you specified "enterpriseProvisioning": "adhoc" in eas.json`
|
||||||
|
);
|
||||||
|
} else if (!this.options.enterpriseProvisioning && !isEnterprise && !isAdHoc) {
|
||||||
|
throw new Error(
|
||||||
|
`You must use an adhoc provisioning profile${
|
||||||
|
targetName ? ` (target '${targetName})'` : ''
|
||||||
|
} for internal distribution.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
} else if (isAdHoc) {
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`You can't use an adhoc provisioning profile${
|
`You can't use an adhoc provisioning profile${
|
||||||
targetName ? ` (target '${targetName}')` : ''
|
targetName ? ` (target '${targetName}')` : ''
|
||||||
} for app store distribution`
|
} for app store distribution.`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -348,7 +348,7 @@ describe(syncCapabilitiesForEntitlementsAsync, () => {
|
|||||||
'com.apple.developer.healthkit': true,
|
'com.apple.developer.healthkit': true,
|
||||||
})
|
})
|
||||||
).rejects.toThrowError(
|
).rejects.toThrowError(
|
||||||
`https://developer.apple.com/account/resources/identifiers/bundleId/edit/XXX333`
|
`https://developer-mdn.apple.com/account/resources/identifiers/bundleId/edit/XXX333`
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import { formatContractMessage } from '../contractMessages';
|
|||||||
const expiredMembership = {
|
const expiredMembership = {
|
||||||
subject: 'Developer Program Membership Expired',
|
subject: 'Developer Program Membership Expired',
|
||||||
message:
|
message:
|
||||||
"Your membership has expired, and your apps have been removed from the App Store until you renew your membership. To renew, a user with the Account Holder role must <a href='http://developer.apple.com/membercenter/index.action' target='_blank'>sign in</a> and renew the membership on the Apple Developer website. <a href='https://developer.apple.com/support/renewal/' target='_blank'>Learn More</a>.",
|
"Your membership has expired, and your apps have been removed from the App Store until you renew your membership. To renew, a user with the Account Holder role must <a href='http://developer-mdn.apple.com/membercenter/index.action' target='_blank'>sign in</a> and renew the membership on the Apple Developer website. <a href='https://developer-mdn.apple.com/support/renewal/' target='_blank'>Learn More</a>.",
|
||||||
};
|
};
|
||||||
const paymentReturned = {
|
const paymentReturned = {
|
||||||
subject: 'Payment Returned',
|
subject: 'Payment Returned',
|
||||||
@@ -15,12 +15,12 @@ const paymentReturned = {
|
|||||||
const licenseAgreementUpdated = {
|
const licenseAgreementUpdated = {
|
||||||
subject: 'Apple Developer Program License Agreement Updated',
|
subject: 'Apple Developer Program License Agreement Updated',
|
||||||
message:
|
message:
|
||||||
'The updated Apple Developer Program License Agreement needs to be reviewed. In order to update your existing apps and submit new apps to the App Store, the Account Holder must review and accept the updated agreement by signing in to their <a href="https://developer.apple.com/account" target="_blank">account</a> on the Apple Developer website.',
|
'The updated Apple Developer Program License Agreement needs to be reviewed. In order to update your existing apps and submit new apps to the App Store, the Account Holder must review and accept the updated agreement by signing in to their <a href="https://developer-mdn.apple.com/account" target="_blank">account</a> on the Apple Developer website.',
|
||||||
};
|
};
|
||||||
const paidLicenseAgreementUpdated = {
|
const paidLicenseAgreementUpdated = {
|
||||||
subject: '',
|
subject: '',
|
||||||
message:
|
message:
|
||||||
'<b>Review the updated Paid Applications Schedule.</b><br />In order to update your existing apps, create new in-app purchases, and submit new apps to the App Store, the user with the Legal role (Account Holder) must review and accept the Paid Applications Schedule (Schedule 2 to the Apple Developer Program License Agreement) in the Agreements, Tax, and Banking module.<br /><br /> To accept this agreement, they must have already accepted the latest version of the Apple Developer Program License Agreement in their <a href="http://developer.apple.com/membercenter/index.action">account on the developer website<a/>.<br />',
|
'<b>Review the updated Paid Applications Schedule.</b><br />In order to update your existing apps, create new in-app purchases, and submit new apps to the App Store, the user with the Legal role (Account Holder) must review and accept the Paid Applications Schedule (Schedule 2 to the Apple Developer Program License Agreement) in the Agreements, Tax, and Banking module.<br /><br /> To accept this agreement, they must have already accepted the latest version of the Apple Developer Program License Agreement in their <a href="http://developer-mdn.apple.com/membercenter/index.action">account on the developer website<a/>.<br />',
|
||||||
};
|
};
|
||||||
|
|
||||||
describe(formatContractMessage, () => {
|
describe(formatContractMessage, () => {
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ export async function syncCapabilitiesForEntitlementsAsync(
|
|||||||
inspect(modifiedRequest, { depth: null, colors: true })
|
inspect(modifiedRequest, { depth: null, colors: true })
|
||||||
);
|
);
|
||||||
throw new Error(
|
throw new Error(
|
||||||
`Unexpected error occurred while attempting to update capabilities for app "${bundleId.attributes.identifier}".\nCapabilities can be modified manually in the Apple developer console at https://developer.apple.com/account/resources/identifiers/bundleId/edit/${bundleId.id}.\nAuto capability syncing can be disabled with the environment variable \`EXPO_NO_CAPABILITY_SYNC=1\`.\n${error.message}`
|
`Unexpected error occurred while attempting to update capabilities for app "${bundleId.attributes.identifier}".\nCapabilities can be modified manually in the Apple developer console at https://developer-mdn.apple.com/account/resources/identifiers/bundleId/edit/${bundleId.id}.\nAuto capability syncing can be disabled with the environment variable \`EXPO_NO_CAPABILITY_SYNC=1\`.\n${error.message}`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -266,7 +266,7 @@ type CapabilityClassifier = {
|
|||||||
|
|
||||||
// NOTE(Bacon): From manually toggling values in Xcode and checking the git diff and network requests.
|
// NOTE(Bacon): From manually toggling values in Xcode and checking the git diff and network requests.
|
||||||
// Last Updated: July 22nd, 2021
|
// Last Updated: July 22nd, 2021
|
||||||
// https://developer.apple.com/documentation/bundleresources/entitlements
|
// https://developer-mdn.apple.com/documentation/bundleresources/entitlements
|
||||||
export const CapabilityMapping: CapabilityClassifier[] = [
|
export const CapabilityMapping: CapabilityClassifier[] = [
|
||||||
{
|
{
|
||||||
name: 'HomeKit',
|
name: 'HomeKit',
|
||||||
@@ -413,7 +413,7 @@ export const CapabilityMapping: CapabilityClassifier[] = [
|
|||||||
getOptions: getBooleanOptions,
|
getOptions: getBooleanOptions,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_default-data-protection
|
// https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_default-data-protection
|
||||||
name: 'Data Protection',
|
name: 'Data Protection',
|
||||||
entitlement: 'com.apple.developer.default-data-protection',
|
entitlement: 'com.apple.developer.default-data-protection',
|
||||||
capability: CapabilityType.DATA_PROTECTION,
|
capability: CapabilityType.DATA_PROTECTION,
|
||||||
@@ -446,7 +446,7 @@ export const CapabilityMapping: CapabilityClassifier[] = [
|
|||||||
getOptions: getBooleanOptions,
|
getOptions: getBooleanOptions,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_networking_networkextension
|
// https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_networking_networkextension
|
||||||
name: 'Network Extensions',
|
name: 'Network Extensions',
|
||||||
entitlement: 'com.apple.developer.networking.networkextension',
|
entitlement: 'com.apple.developer.networking.networkextension',
|
||||||
capability: CapabilityType.NETWORK_EXTENSIONS,
|
capability: CapabilityType.NETWORK_EXTENSIONS,
|
||||||
@@ -465,7 +465,7 @@ export const CapabilityMapping: CapabilityClassifier[] = [
|
|||||||
getOptions: getDefinedOptions,
|
getOptions: getDefinedOptions,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_nfc_readersession_formats
|
// https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_nfc_readersession_formats
|
||||||
name: 'NFC Tag Reading',
|
name: 'NFC Tag Reading',
|
||||||
entitlement: 'com.apple.developer.nfc.readersession.formats',
|
entitlement: 'com.apple.developer.nfc.readersession.formats',
|
||||||
capability: CapabilityType.NFC_TAG_READING,
|
capability: CapabilityType.NFC_TAG_READING,
|
||||||
@@ -482,7 +482,7 @@ export const CapabilityMapping: CapabilityClassifier[] = [
|
|||||||
getOptions: getDefinedOptions,
|
getOptions: getDefinedOptions,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
// https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_networking_vpn_api
|
// https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_networking_vpn_api
|
||||||
name: 'Push Notifications',
|
name: 'Push Notifications',
|
||||||
// com.apple.developer.aps-environment
|
// com.apple.developer.aps-environment
|
||||||
entitlement: 'aps-environment',
|
entitlement: 'aps-environment',
|
||||||
@@ -515,8 +515,8 @@ export const CapabilityMapping: CapabilityClassifier[] = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
// Not in Xcode
|
// Not in Xcode
|
||||||
// https://developer.apple.com/documentation/devicecheck/preparing_to_use_the_app_attest_service
|
// https://developer-mdn.apple.com/documentation/devicecheck/preparing_to_use_the_app_attest_service
|
||||||
// https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_devicecheck_appattest-environment
|
// https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_devicecheck_appattest-environment
|
||||||
name: 'App Attest',
|
name: 'App Attest',
|
||||||
entitlement: 'com.apple.developer.devicecheck.appattest-environment',
|
entitlement: 'com.apple.developer.devicecheck.appattest-environment',
|
||||||
capability: CapabilityType.APP_ATTEST,
|
capability: CapabilityType.APP_ATTEST,
|
||||||
@@ -725,10 +725,10 @@ export const CapabilityMapping: CapabilityClassifier[] = [
|
|||||||
// it's not clear if it needs to be updated.
|
// it's not clear if it needs to be updated.
|
||||||
|
|
||||||
// "Contact Notes" requires the user to ask Apple in a form:
|
// "Contact Notes" requires the user to ask Apple in a form:
|
||||||
// https://developer.apple.com/contact/request/contact-note-field
|
// https://developer-mdn.apple.com/contact/request/contact-note-field
|
||||||
// com.apple.developer.contacts.notes: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_contacts_notes/
|
// com.apple.developer.contacts.notes: https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_contacts_notes/
|
||||||
|
|
||||||
// "Exposure Notification" requires the user to ask Apple in a form:
|
// "Exposure Notification" requires the user to ask Apple in a form:
|
||||||
// https://developer.apple.com/contact/request/exposure-notification-entitlement
|
// https://developer-mdn.apple.com/contact/request/exposure-notification-entitlement
|
||||||
// com.apple.developer.exposure-notification: https://developer.apple.com/documentation/bundleresources/entitlements/com_apple_developer_exposure-notification/
|
// com.apple.developer.exposure-notification: https://developer-mdn.apple.com/documentation/bundleresources/entitlements/com_apple_developer_exposure-notification/
|
||||||
];
|
];
|
||||||
@@ -26,6 +26,11 @@ export function isAdHocProfile(dataBase64: string): boolean {
|
|||||||
return Array.isArray(provisionedDevices);
|
return Array.isArray(provisionedDevices);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function isEnterpriseUniversalProfile(dataBase64: string): boolean {
|
||||||
|
const profilePlist = parse(dataBase64);
|
||||||
|
return !!profilePlist['ProvisionsAllDevices'];
|
||||||
|
}
|
||||||
|
|
||||||
export function parse(dataBase64: string): PlistObject {
|
export function parse(dataBase64: string): PlistObject {
|
||||||
try {
|
try {
|
||||||
const buffer = Buffer.from(dataBase64, 'base64');
|
const buffer = Buffer.from(dataBase64, 'base64');
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
|
|||||||
private easJsonAccessor: EasJsonAccessor;
|
private easJsonAccessor: EasJsonAccessor;
|
||||||
|
|
||||||
constructor(projectDir: string, private platform: T) {
|
constructor(projectDir: string, private platform: T) {
|
||||||
this.easJsonAccessor = new EasJsonAccessor(projectDir);
|
this.easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
|
||||||
}
|
}
|
||||||
|
|
||||||
async runAsync(): Promise<BuildProfile<T>> {
|
async runAsync(): Promise<BuildProfile<T>> {
|
||||||
|
|||||||
+871
-175
File diff suppressed because it is too large.
Load diff
@@ -18,6 +18,8 @@ import {
|
|||||||
IosJobOverridesInput,
|
IosJobOverridesInput,
|
||||||
RetryIosBuildMutation,
|
RetryIosBuildMutation,
|
||||||
RetryIosBuildMutationVariables,
|
RetryIosBuildMutationVariables,
|
||||||
|
UpdateBuildMetadataMutation,
|
||||||
|
UpdateBuildMetadataMutationVariables,
|
||||||
} from '../generated';
|
} from '../generated';
|
||||||
import { BuildFragmentNode } from '../types/Build';
|
import { BuildFragmentNode } from '../types/Build';
|
||||||
|
|
||||||
@@ -119,6 +121,33 @@ export const BuildMutation = {
|
|||||||
);
|
);
|
||||||
return nullthrows(data.build?.createIosBuild);
|
return nullthrows(data.build?.createIosBuild);
|
||||||
},
|
},
|
||||||
|
async updateBuildMetadataAsync(
|
||||||
|
graphqlClient: ExpoGraphqlClient,
|
||||||
|
input: {
|
||||||
|
buildId: string;
|
||||||
|
metadata: BuildMetadataInput;
|
||||||
|
}
|
||||||
|
): Promise<BuildFragment> {
|
||||||
|
const data = await withErrorHandlingAsync(
|
||||||
|
graphqlClient
|
||||||
|
.mutation<UpdateBuildMetadataMutation, UpdateBuildMetadataMutationVariables>(
|
||||||
|
gql`
|
||||||
|
mutation UpdateBuildMetadataMutation($buildId: ID!, $metadata: BuildMetadataInput!) {
|
||||||
|
build {
|
||||||
|
updateBuildMetadata(buildId: $buildId, metadata: $metadata) {
|
||||||
|
id
|
||||||
|
...BuildFragment
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
${print(BuildFragmentNode)}
|
||||||
|
`,
|
||||||
|
input
|
||||||
|
)
|
||||||
|
.toPromise()
|
||||||
|
);
|
||||||
|
return nullthrows(data.build?.updateBuildMetadata);
|
||||||
|
},
|
||||||
async retryIosBuildAsync(
|
async retryIosBuildAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
graphqlClient: ExpoGraphqlClient,
|
||||||
input: {
|
input: {
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { print } from 'graphql';
|
||||||
import gql from 'graphql-tag';
|
import gql from 'graphql-tag';
|
||||||
|
|
||||||
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
@@ -8,8 +9,10 @@ import {
|
|||||||
GetSignedUploadMutationVariables,
|
GetSignedUploadMutationVariables,
|
||||||
PublishUpdateGroupInput,
|
PublishUpdateGroupInput,
|
||||||
SetCodeSigningInfoMutation,
|
SetCodeSigningInfoMutation,
|
||||||
|
UpdateFragment,
|
||||||
UpdatePublishMutation,
|
UpdatePublishMutation,
|
||||||
} from '../generated';
|
} from '../generated';
|
||||||
|
import { UpdateFragmentNode } from '../types/Update';
|
||||||
|
|
||||||
export const PublishMutation = {
|
export const PublishMutation = {
|
||||||
async getUploadURLsAsync(
|
async getUploadURLsAsync(
|
||||||
@@ -39,7 +42,7 @@ export const PublishMutation = {
|
|||||||
async publishUpdateGroupAsync(
|
async publishUpdateGroupAsync(
|
||||||
graphqlClient: ExpoGraphqlClient,
|
graphqlClient: ExpoGraphqlClient,
|
||||||
publishUpdateGroupsInput: PublishUpdateGroupInput[]
|
publishUpdateGroupsInput: PublishUpdateGroupInput[]
|
||||||
): Promise<UpdatePublishMutation['updateBranch']['publishUpdateGroups']> {
|
): Promise<UpdateFragment[]> {
|
||||||
const data = await withErrorHandlingAsync(
|
const data = await withErrorHandlingAsync(
|
||||||
graphqlClient
|
graphqlClient
|
||||||
.mutation<UpdatePublishMutation>(
|
.mutation<UpdatePublishMutation>(
|
||||||
@@ -48,13 +51,11 @@ export const PublishMutation = {
|
|||||||
updateBranch {
|
updateBranch {
|
||||||
publishUpdateGroups(publishUpdateGroupsInput: $publishUpdateGroupsInput) {
|
publishUpdateGroups(publishUpdateGroupsInput: $publishUpdateGroupsInput) {
|
||||||
id
|
id
|
||||||
group
|
...UpdateFragment
|
||||||
runtimeVersion
|
|
||||||
platform
|
|
||||||
manifestPermalink
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
${print(UpdateFragmentNode)}
|
||||||
`,
|
`,
|
||||||
{ publishUpdateGroupsInput }
|
{ publishUpdateGroupsInput }
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -0,0 +1,66 @@
|
|||||||
|
import assert from 'assert';
|
||||||
|
import gql from 'graphql-tag';
|
||||||
|
|
||||||
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import { withErrorHandlingAsync } from '../client';
|
||||||
|
import { BillingUpdateByAccountQuery } from '../generated';
|
||||||
|
|
||||||
|
export const BillingUpdateQuery = {
|
||||||
|
async byAccountIdAsync(
|
||||||
|
graphqlClient: ExpoGraphqlClient,
|
||||||
|
accountId: string,
|
||||||
|
date: Date
|
||||||
|
): Promise<BillingUpdateByAccountQuery['account']['byId']> {
|
||||||
|
const data = await withErrorHandlingAsync(
|
||||||
|
graphqlClient
|
||||||
|
.query<BillingUpdateByAccountQuery>(
|
||||||
|
gql`
|
||||||
|
query BillingUpdateByAccountQuery($accountId: String!, $date: DateTime!) {
|
||||||
|
account {
|
||||||
|
byId(accountId: $accountId) {
|
||||||
|
id
|
||||||
|
billing {
|
||||||
|
id
|
||||||
|
subscription {
|
||||||
|
id
|
||||||
|
name
|
||||||
|
meteredBillingStatus {
|
||||||
|
EAS_UPDATE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
usageMetrics {
|
||||||
|
byBillingPeriod(date: $date, service: UPDATES) {
|
||||||
|
id
|
||||||
|
planMetrics {
|
||||||
|
id
|
||||||
|
serviceMetric
|
||||||
|
metricType
|
||||||
|
value
|
||||||
|
limit
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`,
|
||||||
|
{ accountId, date },
|
||||||
|
{
|
||||||
|
additionalTypenames: [
|
||||||
|
'Account',
|
||||||
|
'Billing',
|
||||||
|
'SubscriptionDetails',
|
||||||
|
'AccountUsageMetrics',
|
||||||
|
'UsageMetricTotal',
|
||||||
|
'EstimatedUsage',
|
||||||
|
],
|
||||||
|
}
|
||||||
|
)
|
||||||
|
.toPromise()
|
||||||
|
);
|
||||||
|
|
||||||
|
assert(data.account, 'GraphQL: `account` not defined in server response');
|
||||||
|
return data.account.byId;
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -26,6 +26,9 @@ export const UserQuery = {
|
|||||||
... on Robot {
|
... on Robot {
|
||||||
firstName
|
firstName
|
||||||
}
|
}
|
||||||
|
... on SSOUser {
|
||||||
|
username
|
||||||
|
}
|
||||||
accounts {
|
accounts {
|
||||||
id
|
id
|
||||||
...AccountFragment
|
...AccountFragment
|
||||||
|
|||||||
@@ -0,0 +1,29 @@
|
|||||||
|
import gql from 'graphql-tag';
|
||||||
|
|
||||||
|
export const AccountUpdatesUsageFragmentNode = gql`
|
||||||
|
fragment AccountUpdatesUsageFragment on Account {
|
||||||
|
id
|
||||||
|
billing {
|
||||||
|
id
|
||||||
|
subscription {
|
||||||
|
id
|
||||||
|
name
|
||||||
|
meteredBillingStatus {
|
||||||
|
EAS_UPDATE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
usageMetrics {
|
||||||
|
byBillingPeriod(date: $date, service: UPDATES) {
|
||||||
|
id
|
||||||
|
planMetrics {
|
||||||
|
id
|
||||||
|
serviceMetric
|
||||||
|
metricType
|
||||||
|
value
|
||||||
|
limit
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
`;
|
||||||
@@ -52,7 +52,9 @@ export const BuildFragmentNode = gql`
|
|||||||
priority
|
priority
|
||||||
createdAt
|
createdAt
|
||||||
updatedAt
|
updatedAt
|
||||||
|
message
|
||||||
completedAt
|
completedAt
|
||||||
|
resourceClass
|
||||||
}
|
}
|
||||||
`;
|
`;
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ export const UpdateFragmentNode = gql`
|
|||||||
runtimeVersion
|
runtimeVersion
|
||||||
platform
|
platform
|
||||||
manifestFragment
|
manifestFragment
|
||||||
|
isRollBackToEmbedded
|
||||||
|
manifestPermalink
|
||||||
gitCommitHash
|
gitCommitHash
|
||||||
actor {
|
actor {
|
||||||
__typename
|
__typename
|
||||||
|
|||||||
@@ -90,11 +90,12 @@ export default class Log {
|
|||||||
*/
|
*/
|
||||||
export function link(
|
export function link(
|
||||||
url: string,
|
url: string,
|
||||||
{ text = url, dim = true }: { text?: string; dim?: boolean } = {}
|
{ text = url, fallback, dim = true }: { text?: string; dim?: boolean; fallback?: string } = {}
|
||||||
): string {
|
): string {
|
||||||
// Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
|
// Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
|
||||||
const output = terminalLink(text, url, {
|
const output = terminalLink(text, url, {
|
||||||
fallback: () => (text === url ? chalk.underline(url) : `${text}: ${chalk.underline(url)}`),
|
fallback: () =>
|
||||||
|
fallback ?? (text === url ? chalk.underline(url) : `${text}: ${chalk.underline(url)}`),
|
||||||
});
|
});
|
||||||
return dim ? chalk.dim(output) : output;
|
return dim ? chalk.dim(output) : output;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ const KEYWORD_CHARACTER_LIMIT = 100;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Keywords are limited to 100 characters when converted to a comma separated string.
|
* Keywords are limited to 100 characters when converted to a comma separated string.
|
||||||
* @see https://developer.apple.com/app-store/search/
|
* @see https://developer-mdn.apple.com/app-store/search/
|
||||||
*/
|
*/
|
||||||
export const infoKeywordLength: IssueRule = {
|
export const infoKeywordLength: IssueRule = {
|
||||||
id: 'apple.info.keyword.length',
|
id: 'apple.info.keyword.length',
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export interface AppleRelease {
|
|||||||
export interface AppleInfo {
|
export interface AppleInfo {
|
||||||
title: string;
|
title: string;
|
||||||
subtitle?: string;
|
subtitle?: string;
|
||||||
/** Does not effect ASO https://developer.apple.com/app-store/product-page/ */
|
/** Does not effect ASO https://developer-mdn.apple.com/app-store/product-page/ */
|
||||||
promoText?: string;
|
promoText?: string;
|
||||||
description?: string;
|
description?: string;
|
||||||
keywords?: string[];
|
keywords?: string[];
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import { instance, mock } from 'ts-mockito';
|
|||||||
import { v4 as uuidv4 } from 'uuid';
|
import { v4 as uuidv4 } from 'uuid';
|
||||||
|
|
||||||
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
import { defaultPublishPlatforms } from '../../commands/update';
|
|
||||||
import { AssetMetadataStatus } from '../../graphql/generated';
|
import { AssetMetadataStatus } from '../../graphql/generated';
|
||||||
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
|
import { PublishMutation } from '../../graphql/mutations/PublishMutation';
|
||||||
import { PublishQuery } from '../../graphql/queries/PublishQuery';
|
import { PublishQuery } from '../../graphql/queries/PublishQuery';
|
||||||
@@ -14,9 +13,12 @@ import {
|
|||||||
buildUnsortedUpdateInfoGroupAsync,
|
buildUnsortedUpdateInfoGroupAsync,
|
||||||
collectAssetsAsync,
|
collectAssetsAsync,
|
||||||
convertAssetToUpdateInfoGroupFormatAsync,
|
convertAssetToUpdateInfoGroupFormatAsync,
|
||||||
|
defaultPublishPlatforms,
|
||||||
filterExportedPlatformsByFlag,
|
filterExportedPlatformsByFlag,
|
||||||
filterOutAssetsThatAlreadyExistAsync,
|
filterOutAssetsThatAlreadyExistAsync,
|
||||||
|
getAssetHashFromPath,
|
||||||
getBase64URLEncoding,
|
getBase64URLEncoding,
|
||||||
|
getOriginalPathFromAssetMap,
|
||||||
getStorageKey,
|
getStorageKey,
|
||||||
getStorageKeyForAssetAsync,
|
getStorageKeyForAssetAsync,
|
||||||
guessContentTypeFromExtension,
|
guessContentTypeFromExtension,
|
||||||
@@ -279,9 +281,55 @@ describe(resolveInputDirectoryAsync, () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe(getAssetHashFromPath, () => {
|
||||||
|
it('returns asset hash from path', () => {
|
||||||
|
expect(getAssetHashFromPath('assets/5b2a819c71d035ca45d223e4c47ed4f9')).toBe(
|
||||||
|
'5b2a819c71d035ca45d223e4c47ed4f9'
|
||||||
|
);
|
||||||
|
});
|
||||||
|
it('returns null for incorrect path', () => {
|
||||||
|
expect(getAssetHashFromPath('assets/this/is/not/a/hash.jpg')).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe(getOriginalPathFromAssetMap, () => {
|
||||||
|
// Partial assetmap.json, with only fields we need
|
||||||
|
const fakeAssetMap = {
|
||||||
|
'5b2a819c71d035ca45d223e4c47ed4f9': {
|
||||||
|
httpServerLocation: '/assets/src/assets',
|
||||||
|
name: 'asset-420',
|
||||||
|
type: 'jpg',
|
||||||
|
},
|
||||||
|
};
|
||||||
|
it('returns null path when asset map is null', () => {
|
||||||
|
expect(
|
||||||
|
getOriginalPathFromAssetMap(null, {
|
||||||
|
path: 'assets/5b2a819c71d035ca45d223e4c47ed4f9',
|
||||||
|
ext: 'jpg',
|
||||||
|
})
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
|
it('returns null when asset is not found in asset map', () => {
|
||||||
|
expect(
|
||||||
|
getOriginalPathFromAssetMap(fakeAssetMap, {
|
||||||
|
path: 'assets/fb64d3b2fb71b3d739ad5c13a93e12c5',
|
||||||
|
ext: 'jpg',
|
||||||
|
})
|
||||||
|
).toBeNull();
|
||||||
|
});
|
||||||
|
it('returns reconstructed original path from existing asset in asset map', () => {
|
||||||
|
expect(
|
||||||
|
getOriginalPathFromAssetMap(fakeAssetMap, {
|
||||||
|
path: 'assets/5b2a819c71d035ca45d223e4c47ed4f9',
|
||||||
|
ext: 'jpg',
|
||||||
|
})
|
||||||
|
).toBe('/src/assets/asset-420.jpg');
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
describe(collectAssetsAsync, () => {
|
describe(collectAssetsAsync, () => {
|
||||||
it('builds an update info group', async () => {
|
it('builds an update info group', async () => {
|
||||||
const fakeHash = 'md5-hash-of-jpg';
|
const fakeHash = 'hdahukw8adhawi8fawhfa8';
|
||||||
const bundles = {
|
const bundles = {
|
||||||
android: 'android-bundle-code',
|
android: 'android-bundle-code',
|
||||||
ios: 'ios-bundle-code',
|
ios: 'ios-bundle-code',
|
||||||
@@ -294,6 +342,7 @@ describe(collectAssetsAsync, () => {
|
|||||||
fileExtension: '.jpg',
|
fileExtension: '.jpg',
|
||||||
contentType: 'image/jpeg',
|
contentType: 'image/jpeg',
|
||||||
path: `${inputDir}/assets/${fakeHash}`,
|
path: `${inputDir}/assets/${fakeHash}`,
|
||||||
|
originalPath: `assets/wat.jpg`,
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -326,6 +375,24 @@ describe(collectAssetsAsync, () => {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
);
|
);
|
||||||
|
await fs.writeFile(
|
||||||
|
path.resolve(inputDir, 'assetmap.json'),
|
||||||
|
JSON.stringify({
|
||||||
|
[fakeHash]: {
|
||||||
|
__packager_asset: true,
|
||||||
|
fileSystemLocation: '/Users/blah/temp/assets',
|
||||||
|
httpServerLocation: 'assets/assets',
|
||||||
|
width: 2339,
|
||||||
|
height: 1560,
|
||||||
|
scales: [1],
|
||||||
|
files: ['/Users/blah/temp/assets/wat.jpg'],
|
||||||
|
hash: fakeHash,
|
||||||
|
name: 'wat',
|
||||||
|
type: 'jpg',
|
||||||
|
fileHashes: [fakeHash],
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
expect(await collectAssetsAsync(inputDir)).toEqual({
|
expect(await collectAssetsAsync(inputDir)).toEqual({
|
||||||
android: {
|
android: {
|
||||||
@@ -410,6 +477,7 @@ describe(uploadAssetsAsync, () => {
|
|||||||
const androidBundlePath = uuidv4();
|
const androidBundlePath = uuidv4();
|
||||||
const iosBundlePath = uuidv4();
|
const iosBundlePath = uuidv4();
|
||||||
const dummyFilePath = uuidv4();
|
const dummyFilePath = uuidv4();
|
||||||
|
const dummyOriginalFilePath = uuidv4();
|
||||||
const userDefinedPath = uuidv4();
|
const userDefinedPath = uuidv4();
|
||||||
const testProjectId = uuidv4();
|
const testProjectId = uuidv4();
|
||||||
const expectedAssetLimit = 1400;
|
const expectedAssetLimit = 1400;
|
||||||
@@ -427,7 +495,15 @@ describe(uploadAssetsAsync, () => {
|
|||||||
contentType: 'application/javascript',
|
contentType: 'application/javascript',
|
||||||
path: androidBundlePath,
|
path: androidBundlePath,
|
||||||
},
|
},
|
||||||
assets: [userDefinedAsset, { type: 'jpg', contentType: 'image/jpeg', path: dummyFilePath }],
|
assets: [
|
||||||
|
userDefinedAsset,
|
||||||
|
{
|
||||||
|
type: 'jpg',
|
||||||
|
contentType: 'image/jpeg',
|
||||||
|
path: dummyFilePath,
|
||||||
|
originalPath: dummyOriginalFilePath,
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
ios: {
|
ios: {
|
||||||
launchAsset: {
|
launchAsset: {
|
||||||
@@ -435,7 +511,15 @@ describe(uploadAssetsAsync, () => {
|
|||||||
contentType: 'application/javascript',
|
contentType: 'application/javascript',
|
||||||
path: androidBundlePath,
|
path: androidBundlePath,
|
||||||
},
|
},
|
||||||
assets: [userDefinedAsset, { type: 'jpg', contentType: 'image/jpeg', path: dummyFilePath }],
|
assets: [
|
||||||
|
userDefinedAsset,
|
||||||
|
{
|
||||||
|
type: 'jpg',
|
||||||
|
contentType: 'image/jpeg',
|
||||||
|
path: dummyFilePath,
|
||||||
|
originalPath: dummyOriginalFilePath,
|
||||||
|
},
|
||||||
|
],
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -490,8 +574,10 @@ describe(uploadAssetsAsync, () => {
|
|||||||
uploadAssetsAsync(graphqlClient, assetsForUpdateInfoGroup, testProjectId)
|
uploadAssetsAsync(graphqlClient, assetsForUpdateInfoGroup, testProjectId)
|
||||||
).resolves.toEqual({
|
).resolves.toEqual({
|
||||||
assetCount: 6,
|
assetCount: 6,
|
||||||
|
launchAssetCount: 2,
|
||||||
uniqueAssetCount: 3,
|
uniqueAssetCount: 3,
|
||||||
uniqueUploadedAssetCount: 0,
|
uniqueUploadedAssetCount: 0,
|
||||||
|
uniqueUploadedAssetPaths: [],
|
||||||
assetLimitPerUpdateGroup: expectedAssetLimit,
|
assetLimitPerUpdateGroup: expectedAssetLimit,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -526,8 +612,10 @@ describe(uploadAssetsAsync, () => {
|
|||||||
uploadAssetsAsync(graphqlClient, assetsForUpdateInfoGroup, testProjectId)
|
uploadAssetsAsync(graphqlClient, assetsForUpdateInfoGroup, testProjectId)
|
||||||
).resolves.toEqual({
|
).resolves.toEqual({
|
||||||
assetCount: 6,
|
assetCount: 6,
|
||||||
|
launchAssetCount: 2,
|
||||||
uniqueAssetCount: 3,
|
uniqueAssetCount: 3,
|
||||||
uniqueUploadedAssetCount: 2,
|
uniqueUploadedAssetCount: 2,
|
||||||
|
uniqueUploadedAssetPaths: [],
|
||||||
assetLimitPerUpdateGroup: expectedAssetLimit,
|
assetLimitPerUpdateGroup: expectedAssetLimit,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -1,8 +1,11 @@
|
|||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
import { vol } from 'memfs';
|
import { vol } from 'memfs';
|
||||||
import os from 'os';
|
import os from 'os';
|
||||||
|
import { instance, mock } from 'ts-mockito';
|
||||||
|
|
||||||
import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
|
import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import { jester, jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
|
||||||
|
import { AppQuery } from '../../../graphql/queries/AppQuery';
|
||||||
import { promptAsync } from '../../../prompts';
|
import { promptAsync } from '../../../prompts';
|
||||||
import {
|
import {
|
||||||
ensureApplicationIdIsDefinedForManagedProjectAsync,
|
ensureApplicationIdIsDefinedForManagedProjectAsync,
|
||||||
@@ -11,6 +14,7 @@ import {
|
|||||||
|
|
||||||
jest.mock('fs');
|
jest.mock('fs');
|
||||||
jest.mock('../../../prompts');
|
jest.mock('../../../prompts');
|
||||||
|
jest.mock('../../../graphql/queries/AppQuery');
|
||||||
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
|
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
@@ -103,6 +107,8 @@ describe(getApplicationIdAsync, () => {
|
|||||||
describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
|
describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
|
||||||
describe('managed project + android.package missing in app config', () => {
|
describe('managed project + android.package missing in app config', () => {
|
||||||
it('throws an error if using app.config.js', async () => {
|
it('throws an error if using app.config.js', async () => {
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>());
|
||||||
|
|
||||||
vol.fromJSON(
|
vol.fromJSON(
|
||||||
{
|
{
|
||||||
'app.config.js': 'module.exports = { blah: {} };',
|
'app.config.js': 'module.exports = { blah: {} };',
|
||||||
@@ -110,10 +116,23 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
|
|||||||
'/app'
|
'/app'
|
||||||
);
|
);
|
||||||
await expect(
|
await expect(
|
||||||
ensureApplicationIdIsDefinedForManagedProjectAsync('/app', {} as any, mockJester)
|
ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir: '/app',
|
||||||
|
projectId: '',
|
||||||
|
exp: {} as any,
|
||||||
|
})
|
||||||
).rejects.toThrowError(/we can't update this file programmatically/);
|
).rejects.toThrowError(/we can't update this file programmatically/);
|
||||||
});
|
});
|
||||||
it('prompts for the Android package if using app.json', async () => {
|
it('prompts for the Android package if using app.json', async () => {
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>());
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
vol.fromJSON(
|
vol.fromJSON(
|
||||||
{
|
{
|
||||||
'app.json': '{ "expo": {} }',
|
'app.json': '{ "expo": {} }',
|
||||||
@@ -126,11 +145,26 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
ensureApplicationIdIsDefinedForManagedProjectAsync('/app', {} as any, mockJester)
|
ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir: '/app',
|
||||||
|
projectId: '',
|
||||||
|
exp: {} as any,
|
||||||
|
})
|
||||||
).resolves.toBe('com.expo.notdominik');
|
).resolves.toBe('com.expo.notdominik');
|
||||||
expect(promptAsync).toHaveBeenCalled();
|
expect(promptAsync).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
|
|
||||||
it('puts the Android package in app.json', async () => {
|
it('puts the Android package in app.json', async () => {
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>());
|
||||||
|
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
vol.fromJSON(
|
vol.fromJSON(
|
||||||
{
|
{
|
||||||
'app.json': '{ "expo": {} }',
|
'app.json': '{ "expo": {} }',
|
||||||
@@ -143,7 +177,12 @@ describe(ensureApplicationIdIsDefinedForManagedProjectAsync, () => {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
ensureApplicationIdIsDefinedForManagedProjectAsync('/app', {} as any, mockJester)
|
ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir: '/app',
|
||||||
|
projectId: '',
|
||||||
|
exp: {} as any,
|
||||||
|
})
|
||||||
).resolves.toBe('com.expo.notdominik');
|
).resolves.toBe('com.expo.notdominik');
|
||||||
const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));
|
const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));
|
||||||
expect(appJson).toMatchObject({
|
expect(appJson).toMatchObject({
|
||||||
|
|||||||
@@ -7,22 +7,31 @@ import fs from 'fs-extra';
|
|||||||
import nullthrows from 'nullthrows';
|
import nullthrows from 'nullthrows';
|
||||||
|
|
||||||
import { readAppJson } from '../../build/utils/appJson';
|
import { readAppJson } from '../../build/utils/appJson';
|
||||||
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
import env from '../../env';
|
import env from '../../env';
|
||||||
import Log, { learnMore } from '../../log';
|
import Log, { learnMore } from '../../log';
|
||||||
import { getProjectConfigDescription, getUsername } from '../../project/projectUtils';
|
import {
|
||||||
|
getOwnerAccountForProjectIdAsync,
|
||||||
|
getProjectConfigDescription,
|
||||||
|
} from '../../project/projectUtils';
|
||||||
import { promptAsync } from '../../prompts';
|
import { promptAsync } from '../../prompts';
|
||||||
import { Actor } from '../../user/User';
|
|
||||||
import { resolveWorkflowAsync } from '../workflow';
|
import { resolveWorkflowAsync } from '../workflow';
|
||||||
import { GradleBuildContext } from './gradle';
|
import { GradleBuildContext } from './gradle';
|
||||||
import * as gradleUtils from './gradleUtils';
|
import * as gradleUtils from './gradleUtils';
|
||||||
|
|
||||||
export const INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
|
export const INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
|
||||||
|
|
||||||
export async function ensureApplicationIdIsDefinedForManagedProjectAsync(
|
export async function ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||||
projectDir: string,
|
graphqlClient,
|
||||||
exp: ExpoConfig,
|
projectDir,
|
||||||
actor: Actor
|
projectId,
|
||||||
): Promise<string> {
|
exp,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectDir: string;
|
||||||
|
projectId: string;
|
||||||
|
exp: ExpoConfig;
|
||||||
|
}): Promise<string> {
|
||||||
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
|
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
|
||||||
assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
|
assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
|
||||||
|
|
||||||
@@ -31,7 +40,7 @@ export async function ensureApplicationIdIsDefinedForManagedProjectAsync(
|
|||||||
moduleName: gradleUtils.DEFAULT_MODULE_NAME,
|
moduleName: gradleUtils.DEFAULT_MODULE_NAME,
|
||||||
});
|
});
|
||||||
} catch {
|
} catch {
|
||||||
return await configureApplicationIdAsync(projectDir, exp, actor);
|
return await configureApplicationIdAsync({ graphqlClient, projectDir, projectId, exp });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -110,11 +119,17 @@ export async function getApplicationIdAsync(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function configureApplicationIdAsync(
|
async function configureApplicationIdAsync({
|
||||||
projectDir: string,
|
graphqlClient,
|
||||||
exp: ExpoConfig,
|
projectDir,
|
||||||
actor: Actor
|
projectId,
|
||||||
): Promise<string> {
|
exp,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectDir: string;
|
||||||
|
projectId: string;
|
||||||
|
exp: ExpoConfig;
|
||||||
|
}): Promise<string> {
|
||||||
const paths = getConfigFilePaths(projectDir);
|
const paths = getConfigFilePaths(projectDir);
|
||||||
// we can't automatically update app.config.js
|
// we can't automatically update app.config.js
|
||||||
if (paths.dynamicConfigPath) {
|
if (paths.dynamicConfigPath) {
|
||||||
@@ -132,7 +147,11 @@ async function configureApplicationIdAsync(
|
|||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
|
|
||||||
const suggestedAndroidApplicationId = await getSuggestedApplicationIdAsync(exp, actor);
|
const suggestedAndroidApplicationId = await getSuggestedApplicationIdAsync(
|
||||||
|
graphqlClient,
|
||||||
|
exp,
|
||||||
|
projectId
|
||||||
|
);
|
||||||
const { packageName } = await promptAsync({
|
const { packageName } = await promptAsync({
|
||||||
name: 'packageName',
|
name: 'packageName',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
@@ -174,8 +193,9 @@ export function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getSuggestedApplicationIdAsync(
|
async function getSuggestedApplicationIdAsync(
|
||||||
|
graphqlClient: ExpoGraphqlClient,
|
||||||
exp: ExpoConfig,
|
exp: ExpoConfig,
|
||||||
actor: Actor
|
projectId: string
|
||||||
): Promise<string | undefined> {
|
): Promise<string | undefined> {
|
||||||
// Attempt to use the ios bundle id first since it's convenient to have them aligned.
|
// Attempt to use the ios bundle id first since it's convenient to have them aligned.
|
||||||
const maybeBundleId = IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
|
const maybeBundleId = IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
|
||||||
@@ -183,9 +203,9 @@ async function getSuggestedApplicationIdAsync(
|
|||||||
return maybeBundleId;
|
return maybeBundleId;
|
||||||
} else {
|
} else {
|
||||||
// the only callsite is heavily interactive
|
// the only callsite is heavily interactive
|
||||||
const username = getUsername(exp, actor);
|
const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
|
||||||
// It's common to use dashes in your node project name, strip them from the suggested package name.
|
// It's common to use dashes in your node project name, strip them from the suggested package name.
|
||||||
const possibleId = `com.${username}.${exp.slug}`.split('-').join('');
|
const possibleId = `com.${account.name}.${exp.slug}`.split('-').join('');
|
||||||
if (isApplicationIdValid(possibleId)) {
|
if (isApplicationIdValid(possibleId)) {
|
||||||
return possibleId;
|
return possibleId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ export function parseGradleCommand(cmd: string, buildGradle: AppBuildGradle): Gr
|
|||||||
const [moduleName, taskName] =
|
const [moduleName, taskName] =
|
||||||
splitCmd.length > 1 ? [splitCmd[0], splitCmd[1]] : [undefined, splitCmd[0]];
|
splitCmd.length > 1 ? [splitCmd[0], splitCmd[1]] : [undefined, splitCmd[0]];
|
||||||
|
|
||||||
const matchResult = taskName.match(/(build|bundle|assemble)(.*)(Release|Debug)/);
|
const matchResult = taskName.match(/(build|bundle|assemble|package)(.*)(Release|Debug)/);
|
||||||
if (!matchResult) {
|
if (!matchResult) {
|
||||||
throw new Error(`Failed to parse gradle command: ${cmd}`);
|
throw new Error(`Failed to parse gradle command: ${cmd}`);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import { ExpoConfig } from '@expo/config';
|
|||||||
import { Platform, Workflow } from '@expo/eas-build-job';
|
import { Platform, Workflow } from '@expo/eas-build-job';
|
||||||
import { BuildProfile } from '@expo/eas-json';
|
import { BuildProfile } from '@expo/eas-json';
|
||||||
|
|
||||||
import { Actor } from '../user/User';
|
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
import {
|
import {
|
||||||
ensureApplicationIdIsDefinedForManagedProjectAsync,
|
ensureApplicationIdIsDefinedForManagedProjectAsync,
|
||||||
getApplicationIdAsync,
|
getApplicationIdAsync,
|
||||||
@@ -16,19 +16,32 @@ import { resolveXcodeBuildContextAsync } from './ios/scheme';
|
|||||||
import { findApplicationTarget, resolveTargetsAsync } from './ios/target';
|
import { findApplicationTarget, resolveTargetsAsync } from './ios/target';
|
||||||
import { resolveWorkflowAsync } from './workflow';
|
import { resolveWorkflowAsync } from './workflow';
|
||||||
|
|
||||||
export async function getApplicationIdentifierAsync(
|
export async function getApplicationIdentifierAsync({
|
||||||
projectDir: string,
|
graphqlClient,
|
||||||
exp: ExpoConfig,
|
projectDir,
|
||||||
buildProfile: BuildProfile,
|
projectId,
|
||||||
platform: Platform,
|
exp,
|
||||||
actor: Actor
|
buildProfile,
|
||||||
): Promise<string> {
|
platform,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectDir: string;
|
||||||
|
projectId: string;
|
||||||
|
exp: ExpoConfig;
|
||||||
|
buildProfile: BuildProfile;
|
||||||
|
platform: Platform;
|
||||||
|
}): Promise<string> {
|
||||||
if (platform === Platform.ANDROID) {
|
if (platform === Platform.ANDROID) {
|
||||||
const profile = buildProfile as BuildProfile<Platform.ANDROID>;
|
const profile = buildProfile as BuildProfile<Platform.ANDROID>;
|
||||||
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
|
const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
|
||||||
|
|
||||||
if (workflow === Workflow.MANAGED) {
|
if (workflow === Workflow.MANAGED) {
|
||||||
return await ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, exp, actor);
|
return await ensureApplicationIdIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir,
|
||||||
|
projectId,
|
||||||
|
exp,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const gradleContext = await resolveGradleBuildContextAsync(projectDir, profile);
|
const gradleContext = await resolveGradleBuildContextAsync(projectDir, profile);
|
||||||
@@ -37,7 +50,12 @@ export async function getApplicationIdentifierAsync(
|
|||||||
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
|
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
|
||||||
const profile = buildProfile as BuildProfile<Platform.IOS>;
|
const profile = buildProfile as BuildProfile<Platform.IOS>;
|
||||||
if (workflow === Workflow.MANAGED) {
|
if (workflow === Workflow.MANAGED) {
|
||||||
return await ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir, exp, actor);
|
return await ensureBundleIdentifierIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir,
|
||||||
|
projectId,
|
||||||
|
exp,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
const xcodeBuildContext = await resolveXcodeBuildContextAsync(
|
const xcodeBuildContext = await resolveXcodeBuildContextAsync(
|
||||||
|
|||||||
@@ -0,0 +1,47 @@
|
|||||||
|
import { Platform } from '@expo/eas-build-job';
|
||||||
|
import { BuildProfile } from '@expo/eas-json';
|
||||||
|
import { errors, readAndValidateBuildConfigAsync } from '@expo/steps';
|
||||||
|
import chalk from 'chalk';
|
||||||
|
import fs from 'fs-extra';
|
||||||
|
import path from 'path';
|
||||||
|
|
||||||
|
export async function validateCustomBuildConfigAsync(
|
||||||
|
projectDir: string,
|
||||||
|
profile: BuildProfile<Platform>
|
||||||
|
): Promise<void> {
|
||||||
|
if (!profile.config) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
const relativeConfigPath = getCustomBuildConfigPath(profile.config);
|
||||||
|
const configPath = path.join(projectDir, relativeConfigPath);
|
||||||
|
if (!(await fs.pathExists(configPath))) {
|
||||||
|
throw new Error(
|
||||||
|
`Custom build configuration file ${chalk.bold(relativeConfigPath)} does not exist.`
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await readAndValidateBuildConfigAsync(configPath, { skipNamespacedFunctionsCheck: true });
|
||||||
|
} catch (err) {
|
||||||
|
if (err instanceof errors.BuildConfigYAMLError) {
|
||||||
|
throw new Error(
|
||||||
|
`Custom build configuration file ${chalk.bold(
|
||||||
|
relativeConfigPath
|
||||||
|
)} contains invalid YAML.\n\n${err.message}`
|
||||||
|
);
|
||||||
|
} else if (err instanceof errors.BuildConfigError) {
|
||||||
|
throw new Error(
|
||||||
|
`Custom build configuration file ${chalk.bold(
|
||||||
|
relativeConfigPath
|
||||||
|
)} contains invalid configuration. Please check the docs!\n${err.message}`
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getCustomBuildConfigPath(configFilename: string): string {
|
||||||
|
return path.join('.eas/build', configFilename);
|
||||||
|
}
|
||||||
@@ -2,8 +2,11 @@ import fs from 'fs-extra';
|
|||||||
import { vol } from 'memfs';
|
import { vol } from 'memfs';
|
||||||
import os from 'os';
|
import os from 'os';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
|
import { instance, mock } from 'ts-mockito';
|
||||||
|
|
||||||
import { jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
|
import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import { jester, jester as mockJester } from '../../../credentials/__tests__/fixtures-constants';
|
||||||
|
import { AppQuery } from '../../../graphql/queries/AppQuery';
|
||||||
import { promptAsync } from '../../../prompts';
|
import { promptAsync } from '../../../prompts';
|
||||||
import {
|
import {
|
||||||
ensureBundleIdentifierIsDefinedForManagedProjectAsync,
|
ensureBundleIdentifierIsDefinedForManagedProjectAsync,
|
||||||
@@ -13,6 +16,7 @@ import {
|
|||||||
|
|
||||||
jest.mock('fs');
|
jest.mock('fs');
|
||||||
jest.mock('../../../prompts');
|
jest.mock('../../../prompts');
|
||||||
|
jest.mock('../../../graphql/queries/AppQuery');
|
||||||
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
|
jest.mock('../../../user/actions', () => ({ ensureLoggedInAsync: jest.fn(() => mockJester) }));
|
||||||
|
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
@@ -86,6 +90,7 @@ describe(getBundleIdentifierAsync, () => {
|
|||||||
describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
|
describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
|
||||||
describe('managed project + ios.bundleIdentifier missing in app config', () => {
|
describe('managed project + ios.bundleIdentifier missing in app config', () => {
|
||||||
it('throws an error if using app.config.js', async () => {
|
it('throws an error if using app.config.js', async () => {
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>());
|
||||||
vol.fromJSON(
|
vol.fromJSON(
|
||||||
{
|
{
|
||||||
'app.config.js': 'module.exports = { blah: {} };',
|
'app.config.js': 'module.exports = { blah: {} };',
|
||||||
@@ -93,10 +98,23 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
|
|||||||
'/app'
|
'/app'
|
||||||
);
|
);
|
||||||
await expect(
|
await expect(
|
||||||
ensureBundleIdentifierIsDefinedForManagedProjectAsync('/app', {} as any, mockJester)
|
ensureBundleIdentifierIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir: '/app',
|
||||||
|
projectId: '1234',
|
||||||
|
exp: {} as any,
|
||||||
|
})
|
||||||
).rejects.toThrowError(/we can't update this file programmatically/);
|
).rejects.toThrowError(/we can't update this file programmatically/);
|
||||||
});
|
});
|
||||||
it('prompts for the bundle identifier if using app.json', async () => {
|
it('prompts for the bundle identifier if using app.json', async () => {
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>());
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
vol.fromJSON(
|
vol.fromJSON(
|
||||||
{
|
{
|
||||||
'app.json': '{ "expo": {} }',
|
'app.json': '{ "expo": {} }',
|
||||||
@@ -109,11 +127,24 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
ensureBundleIdentifierIsDefinedForManagedProjectAsync('/app', {} as any, mockJester)
|
ensureBundleIdentifierIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir: '/app',
|
||||||
|
projectId: '1234',
|
||||||
|
exp: {} as any,
|
||||||
|
})
|
||||||
).resolves.toBe('com.expo.notdominik');
|
).resolves.toBe('com.expo.notdominik');
|
||||||
expect(promptAsync).toHaveBeenCalled();
|
expect(promptAsync).toHaveBeenCalled();
|
||||||
});
|
});
|
||||||
it('puts the bundle identifier in app.json', async () => {
|
it('puts the bundle identifier in app.json', async () => {
|
||||||
|
const graphqlClient = instance(mock<ExpoGraphqlClient>());
|
||||||
|
jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
|
||||||
|
id: '1234',
|
||||||
|
slug: 'testing-123',
|
||||||
|
fullName: '@jester/testing-123',
|
||||||
|
ownerAccount: jester.accounts[0],
|
||||||
|
});
|
||||||
|
|
||||||
vol.fromJSON(
|
vol.fromJSON(
|
||||||
{
|
{
|
||||||
'app.json': '{ "expo": {} }',
|
'app.json': '{ "expo": {} }',
|
||||||
@@ -126,7 +157,12 @@ describe(ensureBundleIdentifierIsDefinedForManagedProjectAsync, () => {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
await expect(
|
await expect(
|
||||||
ensureBundleIdentifierIsDefinedForManagedProjectAsync('/app', {} as any, mockJester)
|
ensureBundleIdentifierIsDefinedForManagedProjectAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir: '/app',
|
||||||
|
projectId: '1234',
|
||||||
|
exp: {} as any,
|
||||||
|
})
|
||||||
).resolves.toBe('com.expo.notdominik');
|
).resolves.toBe('com.expo.notdominik');
|
||||||
const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));
|
const appJson = JSON.parse(await fs.readFile('/app/app.json', 'utf-8'));
|
||||||
expect(appJson).toMatchObject({
|
expect(appJson).toMatchObject({
|
||||||
|
|||||||
@@ -6,26 +6,37 @@ import chalk from 'chalk';
|
|||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
|
|
||||||
import { readAppJson } from '../../build/utils/appJson';
|
import { readAppJson } from '../../build/utils/appJson';
|
||||||
|
import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
import Log, { learnMore } from '../../log';
|
import Log, { learnMore } from '../../log';
|
||||||
import { promptAsync } from '../../prompts';
|
import { promptAsync } from '../../prompts';
|
||||||
import { Actor } from '../../user/User';
|
import { getOwnerAccountForProjectIdAsync, getProjectConfigDescription } from '../projectUtils';
|
||||||
import { getProjectConfigDescription, getUsername } from '../projectUtils';
|
|
||||||
import { resolveWorkflowAsync } from '../workflow';
|
import { resolveWorkflowAsync } from '../workflow';
|
||||||
|
|
||||||
export const INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;
|
export const INVALID_BUNDLE_IDENTIFIER_MESSAGE = `Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.`;
|
||||||
|
|
||||||
export async function ensureBundleIdentifierIsDefinedForManagedProjectAsync(
|
export async function ensureBundleIdentifierIsDefinedForManagedProjectAsync({
|
||||||
projectDir: string,
|
graphqlClient,
|
||||||
exp: ExpoConfig,
|
projectDir,
|
||||||
actor: Actor
|
projectId,
|
||||||
): Promise<string> {
|
exp,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectDir: string;
|
||||||
|
projectId: string;
|
||||||
|
exp: ExpoConfig;
|
||||||
|
}): Promise<string> {
|
||||||
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
|
const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
|
||||||
assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
|
assert(workflow === Workflow.MANAGED, 'This function should be called only for managed projects');
|
||||||
|
|
||||||
try {
|
try {
|
||||||
return await getBundleIdentifierAsync(projectDir, exp);
|
return await getBundleIdentifierAsync(projectDir, exp);
|
||||||
} catch {
|
} catch {
|
||||||
return await configureBundleIdentifierAsync(projectDir, exp, actor);
|
return await configureBundleIdentifierAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectDir,
|
||||||
|
exp,
|
||||||
|
projectId,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -100,11 +111,17 @@ export async function getBundleIdentifierAsync(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function configureBundleIdentifierAsync(
|
async function configureBundleIdentifierAsync({
|
||||||
projectDir: string,
|
graphqlClient,
|
||||||
exp: ExpoConfig,
|
projectDir,
|
||||||
actor: Actor
|
projectId,
|
||||||
): Promise<string> {
|
exp,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectDir: string;
|
||||||
|
projectId: string;
|
||||||
|
exp: ExpoConfig;
|
||||||
|
}): Promise<string> {
|
||||||
const paths = getConfigFilePaths(projectDir);
|
const paths = getConfigFilePaths(projectDir);
|
||||||
// we can't automatically update app.config.js
|
// we can't automatically update app.config.js
|
||||||
if (paths.dynamicConfigPath) {
|
if (paths.dynamicConfigPath) {
|
||||||
@@ -122,7 +139,11 @@ async function configureBundleIdentifierAsync(
|
|||||||
)}`
|
)}`
|
||||||
);
|
);
|
||||||
|
|
||||||
const suggestedBundleIdentifier = await getSuggestedBundleIdentifierAsync(exp, actor);
|
const suggestedBundleIdentifier = await getSuggestedBundleIdentifierAsync(
|
||||||
|
graphqlClient,
|
||||||
|
exp,
|
||||||
|
projectId
|
||||||
|
);
|
||||||
const { bundleIdentifier } = await promptAsync({
|
const { bundleIdentifier } = await promptAsync({
|
||||||
name: 'bundleIdentifier',
|
name: 'bundleIdentifier',
|
||||||
type: 'text',
|
type: 'text',
|
||||||
@@ -169,8 +190,9 @@ export function isWildcardBundleIdentifier(bundleIdentifier: string): boolean {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function getSuggestedBundleIdentifierAsync(
|
async function getSuggestedBundleIdentifierAsync(
|
||||||
|
graphqlClient: ExpoGraphqlClient,
|
||||||
exp: ExpoConfig,
|
exp: ExpoConfig,
|
||||||
actor: Actor
|
projectId: string
|
||||||
): Promise<string | undefined> {
|
): Promise<string | undefined> {
|
||||||
// Attempt to use the android package name first since it's convenient to have them aligned.
|
// Attempt to use the android package name first since it's convenient to have them aligned.
|
||||||
const maybeAndroidPackage = AndroidConfig.Package.getPackage(exp);
|
const maybeAndroidPackage = AndroidConfig.Package.getPackage(exp);
|
||||||
@@ -178,9 +200,9 @@ async function getSuggestedBundleIdentifierAsync(
|
|||||||
return maybeAndroidPackage;
|
return maybeAndroidPackage;
|
||||||
} else {
|
} else {
|
||||||
// the only callsite is heavily interactive
|
// the only callsite is heavily interactive
|
||||||
const username = getUsername(exp, actor);
|
const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
|
||||||
// It's common to use dashes in your node project name, strip them from the suggested package name.
|
// It's common to use dashes in your node project name, strip them from the suggested package name.
|
||||||
const possibleId = `com.${username}.${exp.slug}`.split('-').join('');
|
const possibleId = `com.${account.name}.${exp.slug}`.split('-').join('');
|
||||||
if (isBundleIdentifierValid(possibleId)) {
|
if (isBundleIdentifierValid(possibleId)) {
|
||||||
return possibleId;
|
return possibleId;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -264,7 +264,7 @@ export function getApplePlatformFromSdkRoot(target: Target): ApplePlatform | nul
|
|||||||
* Get Apple Platform from the Xcode TARGETED_DEVICE_FAMILY where possible.
|
* Get Apple Platform from the Xcode TARGETED_DEVICE_FAMILY where possible.
|
||||||
*
|
*
|
||||||
* References:
|
* References:
|
||||||
* https://developer.apple.com/library/archive/documentation/DeveloperTools/Reference/XcodeBuildSettingRef/1-Build_Setting_Reference/build_setting_ref.html
|
* https://developer-mdn.apple.com/library/archive/documentation/DeveloperTools/Reference/XcodeBuildSettingRef/1-Build_Setting_Reference/build_setting_ref.html
|
||||||
* https://stackoverflow.com/questions/39677524/xcode-8-how-to-change-targeted-device-family#comment100316573_39677659
|
* https://stackoverflow.com/questions/39677524/xcode-8-how-to-change-targeted-device-family#comment100316573_39677659
|
||||||
*
|
*
|
||||||
* @returns - Apple Platform when known, defaults to null when unknown
|
* @returns - Apple Platform when known, defaults to null when unknown
|
||||||
|
|||||||
@@ -25,6 +25,8 @@ export function getUsername(exp: ExpoConfig, user: Actor): string | undefined {
|
|||||||
}
|
}
|
||||||
// robot users don't have usernames
|
// robot users don't have usernames
|
||||||
return undefined;
|
return undefined;
|
||||||
|
case 'SSOUser':
|
||||||
|
throw new Error('SSO users are not supported yet.');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,21 +1,36 @@
|
|||||||
import { ExpoConfig, Platform } from '@expo/config';
|
import { ExpoConfig, Platform } from '@expo/config';
|
||||||
|
import { Updates } from '@expo/config-plugins';
|
||||||
|
import { Platform as EASBuildJobPlatform, Workflow } from '@expo/eas-build-job';
|
||||||
import JsonFile from '@expo/json-file';
|
import JsonFile from '@expo/json-file';
|
||||||
|
import assert from 'assert';
|
||||||
|
import chalk from 'chalk';
|
||||||
import crypto from 'crypto';
|
import crypto from 'crypto';
|
||||||
import fs from 'fs-extra';
|
import fs from 'fs-extra';
|
||||||
import Joi from 'joi';
|
import Joi from 'joi';
|
||||||
import mime from 'mime';
|
import mime from 'mime';
|
||||||
|
import nullthrows from 'nullthrows';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import promiseLimit from 'promise-limit';
|
import promiseLimit from 'promise-limit';
|
||||||
|
|
||||||
|
import { selectBranchOnAppAsync } from '../branch/queries';
|
||||||
|
import { getDefaultBranchNameAsync } from '../branch/utils';
|
||||||
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
|
||||||
|
import { PaginatedQueryOptions } from '../commandUtils/pagination';
|
||||||
import { AssetMetadataStatus, PartialManifestAsset } from '../graphql/generated';
|
import { AssetMetadataStatus, PartialManifestAsset } from '../graphql/generated';
|
||||||
import { PublishMutation } from '../graphql/mutations/PublishMutation';
|
import { PublishMutation } from '../graphql/mutations/PublishMutation';
|
||||||
import { PublishQuery } from '../graphql/queries/PublishQuery';
|
import { PublishQuery } from '../graphql/queries/PublishQuery';
|
||||||
import Log from '../log';
|
import Log, { learnMore } from '../log';
|
||||||
|
import { RequestedPlatform, requestedPlatformDisplayNames } from '../platform';
|
||||||
|
import { promptAsync } from '../prompts';
|
||||||
|
import { getBranchNameFromChannelNameAsync } from '../update/getBranchNameFromChannelNameAsync';
|
||||||
|
import { formatUpdateMessage, truncateString as truncateUpdateMessage } from '../update/utils';
|
||||||
import { PresignedPost, uploadWithPresignedPostWithRetryAsync } from '../uploads';
|
import { PresignedPost, uploadWithPresignedPostWithRetryAsync } from '../uploads';
|
||||||
import { expoCommandAsync, shouldUseVersionedExpoCLI } from '../utils/expoCli';
|
import { expoCommandAsync, shouldUseVersionedExpoCLI } from '../utils/expoCli';
|
||||||
import chunk from '../utils/expodash/chunk';
|
import chunk from '../utils/expodash/chunk';
|
||||||
|
import { truthy } from '../utils/expodash/filter';
|
||||||
import uniqBy from '../utils/expodash/uniqBy';
|
import uniqBy from '../utils/expodash/uniqBy';
|
||||||
|
import { getVcsClient } from '../vcs';
|
||||||
|
import { resolveWorkflowAsync } from './workflow';
|
||||||
|
|
||||||
export type ExpoCLIExportPlatformFlag = Platform | 'all';
|
export type ExpoCLIExportPlatformFlag = Platform | 'all';
|
||||||
|
|
||||||
@@ -30,6 +45,8 @@ export type RawAsset = {
|
|||||||
fileExtension?: string;
|
fileExtension?: string;
|
||||||
contentType: string;
|
contentType: string;
|
||||||
path: string;
|
path: string;
|
||||||
|
/** Original asset path derrived from asset map, or exported folder */
|
||||||
|
originalPath?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
type CollectedAssets = {
|
type CollectedAssets = {
|
||||||
@@ -52,6 +69,16 @@ type UpdateInfoGroup = {
|
|||||||
[key in Platform]: ManifestFragment;
|
[key in Platform]: ManifestFragment;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Partial copy of `@expo/dev-server` `BundleAssetWithFileHashes`
|
||||||
|
type AssetMap = Record<
|
||||||
|
string,
|
||||||
|
{
|
||||||
|
httpServerLocation: string;
|
||||||
|
name: string;
|
||||||
|
type: string;
|
||||||
|
}
|
||||||
|
>;
|
||||||
|
|
||||||
const fileMetadataJoi = Joi.object({
|
const fileMetadataJoi = Joi.object({
|
||||||
assets: Joi.array()
|
assets: Joi.array()
|
||||||
.required()
|
.required()
|
||||||
@@ -170,6 +197,7 @@ export async function buildBundlesAsync({
|
|||||||
'--output-dir',
|
'--output-dir',
|
||||||
inputDir,
|
inputDir,
|
||||||
'--dump-sourcemap',
|
'--dump-sourcemap',
|
||||||
|
'--dump-assetmap',
|
||||||
'--platform',
|
'--platform',
|
||||||
platformFlag,
|
platformFlag,
|
||||||
]);
|
]);
|
||||||
@@ -182,6 +210,7 @@ export async function buildBundlesAsync({
|
|||||||
'--experimental-bundle',
|
'--experimental-bundle',
|
||||||
'--non-interactive',
|
'--non-interactive',
|
||||||
'--dump-sourcemap',
|
'--dump-sourcemap',
|
||||||
|
'--dump-assetmap',
|
||||||
'--platform',
|
'--platform',
|
||||||
platformFlag,
|
platformFlag,
|
||||||
]);
|
]);
|
||||||
@@ -246,9 +275,48 @@ export function filterExportedPlatformsByFlag<T extends Partial<Record<Platform,
|
|||||||
return { [platform]: record[platform] } as T;
|
return { [platform]: record[platform] } as T;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Try to load the asset map for logging the names of assets published */
|
||||||
|
export async function loadAssetMapAsync(distRoot: string): Promise<AssetMap | null> {
|
||||||
|
const assetMapPath = path.join(distRoot, 'assetmap.json');
|
||||||
|
|
||||||
|
if (!(await fs.pathExists(assetMapPath))) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const assetMap: AssetMap = JsonFile.read(path.join(distRoot, 'assetmap.json'));
|
||||||
|
// TODO: basic validation?
|
||||||
|
return assetMap;
|
||||||
|
}
|
||||||
|
|
||||||
|
// exposed for testing
|
||||||
|
export function getAssetHashFromPath(assetPath: string): string | null {
|
||||||
|
const [, hash] = assetPath.match(new RegExp(/assets\/([a-z0-9]+)$/, 'i')) ?? [];
|
||||||
|
return hash ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// exposed for testing
|
||||||
|
export function getOriginalPathFromAssetMap(
|
||||||
|
assetMap: AssetMap | null,
|
||||||
|
asset: { path: string; ext: string }
|
||||||
|
): string | null {
|
||||||
|
if (!assetMap) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
const assetHash = getAssetHashFromPath(asset.path);
|
||||||
|
const assetMapEntry = assetHash && assetMap[assetHash];
|
||||||
|
|
||||||
|
if (!assetMapEntry) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
const pathPrefix = assetMapEntry.httpServerLocation.substring('/assets'.length);
|
||||||
|
return `${pathPrefix}/${assetMapEntry.name}.${assetMapEntry.type}`;
|
||||||
|
}
|
||||||
|
|
||||||
/** Given a directory, load the metadata.json and collect the assets for each platform. */
|
/** Given a directory, load the metadata.json and collect the assets for each platform. */
|
||||||
export async function collectAssetsAsync(dir: string): Promise<CollectedAssets> {
|
export async function collectAssetsAsync(dir: string): Promise<CollectedAssets> {
|
||||||
const metadata = loadMetadata(dir);
|
const metadata = loadMetadata(dir);
|
||||||
|
const assetmap = await loadAssetMapAsync(dir);
|
||||||
|
|
||||||
const collectedAssets: CollectedAssets = {};
|
const collectedAssets: CollectedAssets = {};
|
||||||
|
|
||||||
@@ -261,6 +329,7 @@ export async function collectAssetsAsync(dir: string): Promise<CollectedAssets>
|
|||||||
},
|
},
|
||||||
assets: metadata.fileMetadata[platform].assets.map(asset => ({
|
assets: metadata.fileMetadata[platform].assets.map(asset => ({
|
||||||
fileExtension: asset.ext ? ensureLeadingPeriod(asset.ext) : undefined,
|
fileExtension: asset.ext ? ensureLeadingPeriod(asset.ext) : undefined,
|
||||||
|
originalPath: getOriginalPathFromAssetMap(assetmap, asset) ?? undefined,
|
||||||
contentType: guessContentTypeFromExtension(asset.ext),
|
contentType: guessContentTypeFromExtension(asset.ext),
|
||||||
path: path.join(dir, asset.path),
|
path: path.join(dir, asset.path),
|
||||||
})),
|
})),
|
||||||
@@ -294,9 +363,17 @@ export async function filterOutAssetsThatAlreadyExistAsync(
|
|||||||
}
|
}
|
||||||
|
|
||||||
type AssetUploadResult = {
|
type AssetUploadResult = {
|
||||||
|
/** All found assets within the exported folder per platform */
|
||||||
assetCount: number;
|
assetCount: number;
|
||||||
|
/** The uploaded JS bundles, per platform */
|
||||||
|
launchAssetCount: number;
|
||||||
|
/** All unique assets within the exported folder with platforms combined */
|
||||||
uniqueAssetCount: number;
|
uniqueAssetCount: number;
|
||||||
|
/** All unique assets uploaded */
|
||||||
uniqueUploadedAssetCount: number;
|
uniqueUploadedAssetCount: number;
|
||||||
|
/** All (non-launch) asset original paths, used for logging */
|
||||||
|
uniqueUploadedAssetPaths: string[];
|
||||||
|
/** The asset limit received from the server */
|
||||||
assetLimitPerUpdateGroup: number;
|
assetLimitPerUpdateGroup: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -308,7 +385,9 @@ export async function uploadAssetsAsync(
|
|||||||
): Promise<AssetUploadResult> {
|
): Promise<AssetUploadResult> {
|
||||||
let assets: RawAsset[] = [];
|
let assets: RawAsset[] = [];
|
||||||
let platform: keyof CollectedAssets;
|
let platform: keyof CollectedAssets;
|
||||||
|
const launchAssets: RawAsset[] = [];
|
||||||
for (platform in assetsForUpdateInfoGroup) {
|
for (platform in assetsForUpdateInfoGroup) {
|
||||||
|
launchAssets.push(assetsForUpdateInfoGroup[platform]!.launchAsset);
|
||||||
assets = [
|
assets = [
|
||||||
...assets,
|
...assets,
|
||||||
assetsForUpdateInfoGroup[platform]!.launchAsset,
|
assetsForUpdateInfoGroup[platform]!.launchAsset,
|
||||||
@@ -335,6 +414,7 @@ export async function uploadAssetsAsync(
|
|||||||
updateSpinnerText?.(totalAssets, totalAssets);
|
updateSpinnerText?.(totalAssets, totalAssets);
|
||||||
let missingAssets = await filterOutAssetsThatAlreadyExistAsync(graphqlClient, uniqueAssets);
|
let missingAssets = await filterOutAssetsThatAlreadyExistAsync(graphqlClient, uniqueAssets);
|
||||||
const uniqueUploadedAssetCount = missingAssets.length;
|
const uniqueUploadedAssetCount = missingAssets.length;
|
||||||
|
const uniqueUploadedAssetPaths = missingAssets.map(asset => asset.originalPath).filter(truthy);
|
||||||
|
|
||||||
const missingAssetChunks = chunk(missingAssets, 100);
|
const missingAssetChunks = chunk(missingAssets, 100);
|
||||||
const specifications: string[] = [];
|
const specifications: string[] = [];
|
||||||
@@ -372,8 +452,10 @@ export async function uploadAssetsAsync(
|
|||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
assetCount: assets.length,
|
assetCount: assets.length,
|
||||||
|
launchAssetCount: launchAssets.length,
|
||||||
uniqueAssetCount: uniqueAssets.length,
|
uniqueAssetCount: uniqueAssets.length,
|
||||||
uniqueUploadedAssetCount,
|
uniqueUploadedAssetCount,
|
||||||
|
uniqueUploadedAssetPaths,
|
||||||
assetLimitPerUpdateGroup,
|
assetLimitPerUpdateGroup,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -385,3 +467,188 @@ export function isUploadedAssetCountAboveWarningThreshold(
|
|||||||
const warningThreshold = Math.floor(assetLimitPerUpdateGroup * 0.75);
|
const warningThreshold = Math.floor(assetLimitPerUpdateGroup * 0.75);
|
||||||
return uploadedAssetCount > warningThreshold;
|
return uploadedAssetCount > warningThreshold;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function getBranchNameForCommandAsync({
|
||||||
|
graphqlClient,
|
||||||
|
projectId,
|
||||||
|
channelNameArg,
|
||||||
|
branchNameArg,
|
||||||
|
autoFlag,
|
||||||
|
nonInteractive,
|
||||||
|
paginatedQueryOptions,
|
||||||
|
}: {
|
||||||
|
graphqlClient: ExpoGraphqlClient;
|
||||||
|
projectId: string;
|
||||||
|
channelNameArg: string | undefined;
|
||||||
|
branchNameArg: string | undefined;
|
||||||
|
autoFlag: boolean;
|
||||||
|
nonInteractive: boolean;
|
||||||
|
paginatedQueryOptions: PaginatedQueryOptions;
|
||||||
|
}): Promise<string> {
|
||||||
|
if (channelNameArg && branchNameArg) {
|
||||||
|
throw new Error(
|
||||||
|
'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (channelNameArg) {
|
||||||
|
return await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelNameArg);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (branchNameArg) {
|
||||||
|
return branchNameArg;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (autoFlag) {
|
||||||
|
return await getDefaultBranchNameAsync();
|
||||||
|
} else if (nonInteractive) {
|
||||||
|
throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode.');
|
||||||
|
} else {
|
||||||
|
let branchName: string;
|
||||||
|
|
||||||
|
try {
|
||||||
|
const branch = await selectBranchOnAppAsync(graphqlClient, {
|
||||||
|
projectId,
|
||||||
|
promptTitle: `Which branch would you like to use?`,
|
||||||
|
displayTextForListItem: updateBranch => ({
|
||||||
|
title: `${updateBranch.name} ${chalk.grey(
|
||||||
|
`- current update: ${formatUpdateMessage(updateBranch.updates[0])}`
|
||||||
|
)}`,
|
||||||
|
}),
|
||||||
|
paginatedQueryOptions,
|
||||||
|
});
|
||||||
|
branchName = branch.name;
|
||||||
|
} catch {
|
||||||
|
// unable to select a branch (network error or no branches for project)
|
||||||
|
const { name } = await promptAsync({
|
||||||
|
type: 'text',
|
||||||
|
name: 'name',
|
||||||
|
message: 'No branches found. Provide a branch name:',
|
||||||
|
initial: await getDefaultBranchNameAsync(),
|
||||||
|
validate: value => (value ? true : 'Branch name may not be empty.'),
|
||||||
|
});
|
||||||
|
branchName = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
assert(branchName, 'Branch name must be specified.');
|
||||||
|
return branchName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function getUpdateMessageForCommandAsync({
|
||||||
|
updateMessageArg,
|
||||||
|
autoFlag,
|
||||||
|
nonInteractive,
|
||||||
|
jsonFlag,
|
||||||
|
}: {
|
||||||
|
updateMessageArg: string | undefined;
|
||||||
|
autoFlag: boolean;
|
||||||
|
nonInteractive: boolean;
|
||||||
|
jsonFlag: boolean;
|
||||||
|
}): Promise<string> {
|
||||||
|
let updateMessage = updateMessageArg;
|
||||||
|
if (!updateMessageArg && autoFlag) {
|
||||||
|
updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!updateMessage) {
|
||||||
|
if (nonInteractive) {
|
||||||
|
throw new Error('Must supply --message or use --auto when in non-interactive mode');
|
||||||
|
}
|
||||||
|
|
||||||
|
const validationMessage = 'publish message may not be empty.';
|
||||||
|
if (jsonFlag) {
|
||||||
|
throw new Error(validationMessage);
|
||||||
|
}
|
||||||
|
const { updateMessageLocal } = await promptAsync({
|
||||||
|
type: 'text',
|
||||||
|
name: 'updateMessageLocal',
|
||||||
|
message: `Provide an update message:`,
|
||||||
|
initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
|
||||||
|
validate: (value: any) => (value ? true : validationMessage),
|
||||||
|
});
|
||||||
|
updateMessage = updateMessageLocal;
|
||||||
|
}
|
||||||
|
|
||||||
|
assert(updateMessage, 'Update message must be specified.');
|
||||||
|
|
||||||
|
const truncatedMessage = truncateUpdateMessage(updateMessage, 1024);
|
||||||
|
if (truncatedMessage !== updateMessage) {
|
||||||
|
Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
|
||||||
|
}
|
||||||
|
|
||||||
|
return updateMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const defaultPublishPlatforms: Platform[] = ['android', 'ios'];
|
||||||
|
|
||||||
|
export function getRequestedPlatform(
|
||||||
|
platform: ExpoCLIExportPlatformFlag
|
||||||
|
): RequestedPlatform | null {
|
||||||
|
switch (platform) {
|
||||||
|
case 'android':
|
||||||
|
return RequestedPlatform.Android;
|
||||||
|
case 'ios':
|
||||||
|
return RequestedPlatform.Ios;
|
||||||
|
case 'web':
|
||||||
|
return null;
|
||||||
|
case 'all':
|
||||||
|
return RequestedPlatform.All;
|
||||||
|
default:
|
||||||
|
throw new Error(`Unsupported platform: ${platform}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
|
||||||
|
export async function getRuntimeVersionObjectAsync(
|
||||||
|
exp: ExpoConfig,
|
||||||
|
platforms: Platform[],
|
||||||
|
projectDir: string
|
||||||
|
): Promise<{ platform: string; runtimeVersion: string }[]> {
|
||||||
|
for (const platform of platforms) {
|
||||||
|
if (platform === 'web') {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
|
||||||
|
if (isPolicy) {
|
||||||
|
const isManaged =
|
||||||
|
(await resolveWorkflowAsync(projectDir, platform as EASBuildJobPlatform)) ===
|
||||||
|
Workflow.MANAGED;
|
||||||
|
if (!isManaged) {
|
||||||
|
throw new Error(
|
||||||
|
'Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.'
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return [...new Set(platforms)].map(platform => {
|
||||||
|
if (platform === 'web') {
|
||||||
|
return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
platform,
|
||||||
|
runtimeVersion: nullthrows(
|
||||||
|
Updates.getRuntimeVersion(exp, platform),
|
||||||
|
`Unable to determine runtime version for ${
|
||||||
|
requestedPlatformDisplayNames[platform]
|
||||||
|
}. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
|
||||||
|
),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
export function getRuntimeToPlatformMappingFromRuntimeVersions(
|
||||||
|
runtimeVersions: { platform: string; runtimeVersion: string }[]
|
||||||
|
): { runtimeVersion: string; platforms: string[] }[] {
|
||||||
|
const runtimeToPlatformMapping: { runtimeVersion: string; platforms: string[] }[] = [];
|
||||||
|
for (const runtime of runtimeVersions) {
|
||||||
|
const platforms = runtimeVersions
|
||||||
|
.filter(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)
|
||||||
|
.map(({ platform }) => platform);
|
||||||
|
if (!runtimeToPlatformMapping.find(item => item.runtimeVersion === runtime.runtimeVersion)) {
|
||||||
|
runtimeToPlatformMapping.push({ runtimeVersion: runtime.runtimeVersion, platforms });
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return runtimeToPlatformMapping;
|
||||||
|
}
|
||||||
@@ -317,30 +317,48 @@ async function handleBuildListSourceAsync(
|
|||||||
}
|
}
|
||||||
|
|
||||||
function formatBuildChoice(build: BuildFragment, expiryDate: Date): prompts.Choice {
|
function formatBuildChoice(build: BuildFragment, expiryDate: Date): prompts.Choice {
|
||||||
const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel } =
|
const {
|
||||||
build;
|
id,
|
||||||
|
updatedAt,
|
||||||
const formatValue = (field?: string | null): string => (field ? chalk.bold(field) : 'Unknown');
|
runtimeVersion,
|
||||||
|
buildProfile,
|
||||||
|
gitCommitHash,
|
||||||
|
gitCommitMessage,
|
||||||
|
channel,
|
||||||
|
message,
|
||||||
|
} = build;
|
||||||
const buildDate = new Date(updatedAt);
|
const buildDate = new Date(updatedAt);
|
||||||
|
|
||||||
|
const splitCommitMessage = gitCommitMessage?.split('\n');
|
||||||
const formattedCommitData =
|
const formattedCommitData =
|
||||||
gitCommitHash && gitCommitMessage
|
gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
|
||||||
? `${gitCommitHash.slice(0, 7)} "${chalk.bold(gitCommitMessage)}"`
|
? `${gitCommitHash.slice(0, 7)} "${chalk.bold(
|
||||||
: 'Unknown';
|
splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
|
||||||
|
)}"`
|
||||||
|
: null;
|
||||||
|
|
||||||
const title = `${chalk.bold(`ID:`)} ${id} (${chalk.bold(`${fromNow(buildDate)} ago`)})`;
|
const title = `${chalk.bold(`ID:`)} ${id} (${chalk.bold(`${fromNow(buildDate)} ago`)})`;
|
||||||
|
|
||||||
const description = [
|
const descriptionItems: { name: string; value: string | null }[] = [
|
||||||
`\t${chalk.bold(`Profile:`)} ${formatValue(buildProfile)}`,
|
{ name: 'Profile', value: buildProfile ? chalk.bold(buildProfile) : null },
|
||||||
`\t${chalk.bold(`Channel:`)} ${formatValue(channel)}`,
|
{ name: 'Channel', value: channel ? chalk.bold(channel) : null },
|
||||||
`\t${chalk.bold(`Runtime version:`)} ${formatValue(runtimeVersion)}`,
|
{ name: 'Runtime version', value: runtimeVersion ? chalk.bold(runtimeVersion) : null },
|
||||||
`\t${chalk.bold(`Commit:`)} ${formattedCommitData}`,
|
{ name: 'Commit', value: formattedCommitData },
|
||||||
].join('\n');
|
{
|
||||||
|
name: 'Message',
|
||||||
|
value: message
|
||||||
|
? chalk.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
|
||||||
|
: null,
|
||||||
|
},
|
||||||
|
];
|
||||||
|
|
||||||
|
const filteredDescriptionArray: string[] = descriptionItems
|
||||||
|
.filter(item => item.value)
|
||||||
|
.map(item => `${chalk.bold(item.name)}: ${item.value}`);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
title,
|
title,
|
||||||
description,
|
description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
|
||||||
value: build,
|
value: build,
|
||||||
disabled: buildDate < expiryDate,
|
disabled: buildDate < expiryDate,
|
||||||
};
|
};
|
||||||
|
|||||||
Loaded 100 of 130 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user