convert to ESM

.eslintignore

@@ -5,4 +5,3 @@
 packages/eas-cli/src/graphql/generated.ts
 
 node_modules
-ts-declarations

.eslintrc.js

@@ -11,6 +11,7 @@ module.exports = {
         ignoreDeclarationSort: true,
       },
     ],
+    'flowtype/no-types-missing-file-annotation': 'off',
     curly: 'warn',
     'import/no-cycle': 'error',
     'import/no-extraneous-dependencies': [
@@ -26,10 +27,20 @@ module.exports = {
             name: 'lodash',
             message: "Don't use lodash, it's heavy!",
           },
+          {
+            name: 'node-fetch',
+            message: 'Use got instead, node-fetch is used only for the GraphQL client.',
+          },
         ],
       },
     ],
     'no-underscore-dangle': ['error', { allow: ['__typename'] }],
+    '@typescript-eslint/explicit-function-return-type': [
+      'warn',
+      {
+        allowExpressions: true,
+      },
+    ],
     'async-protect/async-suffix': 'error',
     'node/no-sync': 'error',
   },

.gitattributes

@@ -1,5 +1 @@
-* text eol=lf
-*.png binary
-*.jpg binary
-
 **/yarn.lock linguist-generated

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,5 +1,5 @@
 name: "\U0001F41B Bug Report in EAS CLI"
-labels: 'needs review'
+labels: 'bug'
 description: 'You want to report a reproducible bug or regression in EAS CLI.'
 body:
   - type: markdown
@@ -14,11 +14,6 @@ body:
   - type: markdown
     attributes:
       value: If you leave out sections there is a high likelihood your issue will be closed. If you have a question, not a bug report, please post it on our [forums](https://forums.expo.dev/) instead.
-  - type: input
-    attributes:
-      label: Build/Submit details page URL
-      description: If you're reporting an issue with EAS Build and/or EAS Submit, please provide the URL to the details page URL. The page can be only viewed by the Expo team members. Providing the URL is optional but it makes debugging the issue easier.
-      placeholder: https://expo.dev/accounts/ACCOUNT_NAME/projects/PROJECT_NAME/builds/BUILD_ID
   - type: textarea
     validations:
       required: true
@@ -26,18 +21,12 @@ body:
       label: Summary
       description: Describe the issue in 1 or 2 sentences
       placeholder: Clearly describe what the expected behavior is vs. what is actually happening. This should be as short as possible, while still communicating all the necessary information. If your summary is just 'X library/method isn't working', then you need to continue debugging yourself and provide more information.
-  - type: input
-    validations:
-      required: true
-    attributes:
-      label: Managed or bare?
-      description: Is your project managed or bare? Bare - Android and/or iOS native projects exist in your repo; Managed - you don't have native code (custom or 3rd party) in your project. See the [Workflows](https://docs.expo.dev/introduction/managed-vs-bare/) page for more information.
   - type: textarea
     validations:
       required: true
     attributes:
       label: Environment
-      description: Run `npx expo-env-info` and `npx expo-doctor`, and paste the output here.
+      placeholder: Run `eas diagnostics` and paste the output here
   - type: textarea
     validations:
       required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Expo Developers Discord
-    url: https://chat.expo.dev/
-    about: Join other developers in discussions regarding Expo and EAS.

.github/ISSUE_TEMPLATE/enhancement.yml

@@ -1,5 +1,5 @@
 name: "\U0001F64B Enhancement"
-labels: 'enhancement,needs review'
+labels: 'enhancement'
 description: 'Want us to add something to EAS CLI?'
 body:
   - type: markdown

.github/PULL_REQUEST_TEMPLATE

@@ -1,5 +1,9 @@
-<!-- If this PR requires a changelog entry, add it by commenting the PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`. -->
-<!-- You can skip the changelog check by labeling the PR with "no changelog". -->
+<!-- Thanks for contributing to _EAS CLI_! Before you submit your pull request, please make sure to check the following boxes by putting an x in the [ ] (don't: [x ], [ x], do: [x]) -->
+
+# Checklist
+
+- [ ] I've added an entry to [CHANGELOG.md](https://github.com/expo/eas-cli/blob/main/CHANGELOG.md#main) if necessary. You can comment this pull request with `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]` and CHANGELOG.md will be updated automatically.
+- [ ] I've tagged the changelog entry with `[EAS BUILD API]` if it's a part of a breaking change to EAS Build API (only possible when updating `@expo/eas-build-job` package).
 
 # Why
 

.github/codemention.yml

@@ -1,23 +0,0 @@
-rules:
-  - patterns: ['**/*']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/build/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/commands/build/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/submit/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
-  - patterns: ['packages/eas-cli/src/commands/submit.ts']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela', 'radoslawkrzemien']
-  - patterns: ['packages/eas-cli/src/update/**']
-    mentions: ['EvanBacon', 'byCedric', 'wschurman']
-  - patterns: ['packages/eas-cli/src/commands/update/**']
-    mentions: ['EvanBacon', 'byCedric', 'wschurman']
-  - patterns: ['packages/eas-cli/schema/**']
-    mentions: ['bycedric']
-  - patterns: ['packages/eas-cli/src/metadata/**']
-    mentions: ['bycedric']
-  - patterns: ['packages/eas-cli/src/commands/metadata/**']
-    mentions: ['bycedric']
-  - patterns: ['packages/eas-json/**']
-    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']

.github/internal-actions/notify-slack-on-fail-or-recover/.prettierrc

@@ -1,4 +0,0 @@
-{
-  "printWidth": 100,
-  "singleQuote": true
-}

.github/internal-actions/notify-slack-on-fail-or-recover/action.yml

@@ -1,53 +0,0 @@
-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: ''

.github/internal-actions/notify-slack-on-fail-or-recover/main.js

@@ -1,155 +0,0 @@
-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' };
-};

.github/internal-actions/notify-slack-on-fail-or-recover/package.json

@@ -1,12 +0,0 @@
-{
-  "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"
-  }
-}

.github/internal-actions/notify-slack-on-fail-or-recover/yarn.lock

@@ -1,8 +0,0 @@
-# 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==

.github/workflows/changelog.yml

@@ -1,40 +1,46 @@
-name: CHANGELOG.md PR check
-
 on:
-  pull_request:
-    types:
-      - opened
-      - synchronize
-      - labeled
-      - unlabeled
+  issue_comment:
+    types: [created]
 
-concurrency:
-  group: changelog-${{ github.ref }}
-  cancel-in-progress: true
+name: Changelog
 
 jobs:
-  pr-changelog-entry:
-    name: Check CHANGELOG.md updated
+  pr-commented:
     runs-on: ubuntu-latest
+    if: ${{ github.event.issue.pull_request && github.event.issue.user.login == github.event.comment.user.login && startsWith(github.event.comment.body, '/changelog-entry ') }}
     steps:
       - uses: actions/checkout@v2
-      - name: Check if CHANGELOG.md was updated
-        id: changelog-updated
-        uses: tj-actions/changed-files@v41
+      - uses: actions/setup-node@v1
         with:
-          files: CHANGELOG.md
-      - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent
-        if: steps.changelog-updated.outputs.any_changed == 'false' && !contains(github.event.pull_request.labels.*.name, 'no changelog')
-        uses: actions/github-script@v6
-        with:
-          script: |
-            core.setFailed('Please add a changelog entry!')
-      - uses: mshick/[email protected]
-        if: always()
-        with:
-          message-id: changelog-entry-check
-          refresh-message-position: true
-          message: ${{ contains(github.event.pull_request.labels.*.name, 'no changelog') && '⏩ The changelog entry check has been skipped since the "no changelog" label is present.' || '✅ Thank you for adding the changelog entry!' }}
-          message-failure: |
-            ❌ It looks like a changelog entry is missing for this PR. Add it manually to CHANGELOG.md.
-            ⏩ If this PR doesn't require a changelog entry, such as if it's an internal change that doesn't affect the user experience, you can add the "no changelog" label to the PR.
+          node-version: '16'
+      - name: Checkout Pull Request
+        run: hub pr checkout ${{ github.event.issue.number }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Install dependencies
+        working-directory: ./scripts
+        run: yarn install --frozen-lockfile --check-files
+      - name: Add changelog entry
+        working-directory: ./scripts
+        run: |
+          PARAMS=${PR_COMMENT_BODY#/changelog-entry }
+          if [[ ! "$PARAMS" =~ " " ]]; then
+            echo "Invalid /changelog-entry command"
+            exit 1
+          fi
+          CATEGORY=$( cut -d ' ' -f 1 <<< "$PARAMS" | xargs )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | xargs )
+          yarn changelog-entry "$CATEGORY" "$MESSAGE"
+        env:
+          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+          GITHUB_PR_NUMBER: ${{ github.event.issue.number }}
+          PR_COMMENT_BODY: ${{ github.event.comment.body }}
+      - name: Commit and push
+        run: |
+          # use the last commit author name and email
+          git config --global user.name "$(git --no-pager log --format=format:'%an' -n 1)"
+          git config --global user.email "$(git --no-pager log --format=format:'%ae' -n 1)"
+
+          git add CHANGELOG.md
+          git commit -m "update CHANGELOG.md"
+          git push

.github/workflows/codemention.yml

@@ -1,14 +0,0 @@
-name: codemention
-on:
-  pull_request_target:
-    types: [opened, synchronize, ready_for_review]
-jobs:
-  codemention:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - uses: tobyhs/[email protected]
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/install.yml

@@ -0,0 +1,18 @@
+name: Installer tests
+on:
+  push:
+    branches: [main]
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  test:
+    name: Run the installer
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@v2
+      - run: bash bin/install.sh
+      - run: eas --version

.github/workflows/issue-triage.yml

@@ -1,146 +0,0 @@
-name: Issue Triage
-on:
-  issues:
-    types: [labeled]
-
-jobs:
-  needs-repro:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'incomplete issue: missing or invalid repro') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hi there! It looks like your issue requires a minimal reproducible example, but it is invalid or absent. Please prepare such an example and share it in a new issue.
-
-              **The best way to get attention to your issue is to provide a clean and easy way for a developer to reproduce the issue on their own machine.** Please do not provide your entire project, or a project with more code than is necessary to reproduce the issue.
-
-              A side benefit of going through the process of narrowing down the minimal amount of code needed to reproduce the issue is that you may get lucky and discover that the bug is due to a mistake in your application code that you can quickly fix on your own.
-
-              ### Resources
-
-              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
-              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
-
-              ### Common concerns
-
-              #### "I've only been able to reproduce it in private, proprietary code"
-
-              You may not have spent enough time narrowing down the root cause of the issue. Try out the techniques discussed in this [manual debugging guide](https://expo.fyi/manual-debugging) to learn how to isolate the problem from the rest of your codebase.
-
-              #### "I didn't have time to create one"
-
-              That's understandable, it can take some time to prepare. We ask that you hold off on filing an issue until you are able to fully complete the required fields in the issue template.
-
-              #### "You can reproduce it by yourself by creating a project and following these steps"
-
-              This is useful knowledge, but it's still valuable to have the resulting project that is produced from running the steps, where you have verified you can reproduce the issue.
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  needs-info:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'incomplete issue: missing info') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! There isn't enough information provided in your issue description for us to be able to help you. The best way to get help is to provide information to enable other developers to understand the issue and reproduce it on their own machines.
-
-              Please create a new issue and fill out the entire issue template to the best of your ability. Refer to the following resources for more information on how to create a good issue report.
-
-              ### Resources
-
-              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
-              - ["How to create a Minimal, Reproducible Example"](https://stackoverflow.com/help/minimal-reproducible-example)
-              - ["How to narrow down the source of an error"](https://expo.fyi/manual-debugging)
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  issue-accepted:
-    runs-on: ubuntu-20.04
-    if: github.event.label.name == 'issue accepted'
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Thank you for filing this issue!
-              This comment acknowledges we believe this may be a bug and there’s enough information to investigate it.
-              However, we can’t promise any sort of timeline for resolution. We prioritize issues based on severity, breadth of impact, and alignment with our roadmap. If you’d like to help move it more quickly, you can continue to investigate it more deeply and/or you can open a pull request that fixes the cause.
-            `})
-
-  question:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'invalid issue: question') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! Our GitHub issues are reserved for bug reports.
-
-              If you have a question about Expo or related tools, please post on our forums at https://forums.expo.dev/ or join our Discord at https://chat.expo.dev/.
-
-              ### Resources
-
-              - ["How do I ask a good question?"](https://stackoverflow.com/help/how-to-ask)
-              - ["Join the community"](https://docs.expo.dev/next-steps/community/)
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })
-
-  feature-request:
-    runs-on: ubuntu-20.04
-    if: "${{ contains(github.event.label.name, 'invalid issue: feature request') }}"
-    steps:
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_GITHUB_TOKEN }}
-          script: |
-            github.issues.createComment({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: `Hello! Our GitHub issues are reserved for bug reports.
-
-              If you would like to request a feature, please post to https://expo.canny.io/feature-requests.
-            `})
-            github.issues.update({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              state: 'closed'
-            })

.github/workflows/release.yml

@@ -25,30 +25,22 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: 20
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets linux-x64,linux-arm
-      - id: x64
-        run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
-      - id: arm
-        run: echo "filename=$(ls eas-*-arm.tar.gz)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+        run: yarn oclif-dev pack --targets linux-x64,linux-arm
       - name: Upload linux-x64 tarball
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
-          asset_name: ${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-linux-x64.tar.gz
+          asset_name: eas-linux-x64.tar.gz
           asset_content_type: application/gzip
       - name: Upload linux-arm tarball
         uses: actions/upload-release-asset@v1
@@ -56,8 +48,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.arm.outputs.filename }}
-          asset_name: ${{ steps.arm.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-linux-arm.tar.gz
+          asset_name: eas-linux-arm.tar.gz
           asset_content_type: application/gzip
   build-mac:
     name: Build for macOS
@@ -66,42 +58,22 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: 20
-      - run: brew install python-setuptools
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn pretarball-ci
-          yarn oclif pack:tarballs --no-xz --targets darwin-x64,darwin-arm64
-      - id: x64
-        run: echo "filename=$(ls eas-*-x64.tar.gz)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
-      - id: arm64
-        run: echo "filename=$(ls eas-*-arm64.tar.gz)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist
+        run: yarn oclif-dev pack --targets darwin-x64
       - name: Upload darwin-x64 tarball
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.x64.outputs.filename }}
-          asset_name: ${{ steps.x64.outputs.filename }}
-          asset_content_type: application/gzip
-      - name: Upload darwin-arm64 tarball
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/${{ steps.arm64.outputs.filename }}
-          asset_name: ${{ steps.arm64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/eas-darwin-x64.tar.gz
+          asset_name: eas-darwin-x64.tar.gz
           asset_content_type: application/gzip
   build-windows:
     name: Build for Windows
@@ -109,29 +81,27 @@ jobs:
     needs: release
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: 20
+          node-version: '16'
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
-      - run: |
-          yarn pretarball-ci
-          yarn oclif pack:win
+      - run: yarn oclif-dev pack:win
         working-directory: ${{ github.workspace }}/packages/eas-cli
       - id: x64
-        run: echo "filename=$(ls eas-*-x64.exe)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
+        run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
       - id: x86
-        run: echo "filename=$(ls eas-*-x86.exe)" >> $GITHUB_OUTPUT
-        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
+        run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
+        working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win
       - name: Upload x64 installer
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win32/${{ steps.x64.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win/${{ steps.x64.outputs.filename }}
           asset_name: ${{ steps.x64.outputs.filename }}
           asset_content_type: application/gzip
       - name: Upload x86 installer
@@ -140,7 +110,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.release.outputs.upload_url }}
-          asset_path: packages/eas-cli/dist/win32/${{ steps.x86.outputs.filename }}
+          asset_path: packages/eas-cli/dist/win/${{ steps.x86.outputs.filename }}
           asset_name: ${{ steps.x86.outputs.filename }}
           asset_content_type: application/gzip
   publish-to-npm:
@@ -149,11 +119,11 @@ jobs:
     needs: [build-linux, build-mac, build-windows]
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: 20
+          node-version: '16'
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -162,31 +132,15 @@ jobs:
         run: yarn lerna publish from-package --yes --no-verify-access
         env:
           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
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
-      - name: Add latest-eas-build 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
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_ACCESS_TOKEN }}
   release-changelog:
     name: Update changelog and publish release
     runs-on: ubuntu-latest
     needs: publish-to-npm
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
         with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 20
+          node-version: '16'
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files
@@ -196,7 +150,7 @@ jobs:
         working-directory: ./scripts
         run: yarn --silent release-changelog $EAS_CLI_VERSION > /tmp/current-changelog
       - name: Publish release
-        run: gh release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
+        run: hub release edit v$EAS_CLI_VERSION --draft=false -F /tmp/current-changelog
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Commit and push
@@ -220,22 +174,9 @@ jobs:
         env:
           SLACK_CHANNEL: eas-cli
           SLACK_COLOR: ${{ job.status }}
-          SLACK_ICON: https://github.com/expo-bot.png?size=48
+          SLACK_ICON: https://github.com/expo-ci.png?size=48
           SLACK_TITLE: 'Released eas-cli@${{ env.EAS_CLI_VERSION }}'
           SLACK_MESSAGE: ${{ env.SLACK_CHANGELOG }}
-          SLACK_USERNAME: 'EAS CLI CI'
+          SLACK_USERNAME: 'Expo CI'
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_FOOTER: ''
-  open-pr-in-universe:
-    name: Open a PR with `@expo/eas-json` bump in universe
-    needs: publish-to-npm
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Open a PR with `@expo/eas-json` version bump in universe
-        uses: benc-uk/workflow-dispatch@v1
-        with:
-          repo: expo/universe
-          ref: main
-          workflow: update-eas-json.yml
-          token: ${{ secrets.EXPO_BOT_PAT }}

.github/workflows/size.yml

@@ -2,22 +2,17 @@ name: Size
 on:
   pull_request:
     types: [synchronize, opened]
-concurrency:
-  group: size-${{ github.ref }}
-  cancel-in-progress: true
 jobs:
   compare:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v1
         with:
-          node-version: 20
+          node-version: '16'
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'
           repo-token: '${{ secrets.GITHUB_TOKEN }}'
           pattern: './packages/eas-cli/dist/*.tar.gz'
           compression: 'none'
-          strip-hash: "v\\d+.\\d+.\\d+-\\w+-"
-          clean-script: 'clean'

.github/workflows/stale-issues.yml

@@ -1,24 +0,0 @@
-name: Close inactive issues
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: "0 0 * * *"
-
-jobs:
-  close-issues:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v4
-        with:
-          ascending: false
-          operations-per-run: 300
-          days-before-issue-stale: 30
-          days-before-issue-close: 7
-          stale-issue-label: "stale"
-          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity. If there is no activity in the next 7 days, the issue will be closed."
-          close-issue-message: "This issue was closed because it has been inactive for 7 days since being marked as stale. Please open a new issue if you believe you are encountering a related problem."
-          days-before-pr-stale: -1
-          days-before-pr-close: -1
-          enable-statistics: true
-          exempt-issue-labels: "needs review"
-          exempt-all-assignees: true

.github/workflows/test-scripts.yml

@@ -1,30 +0,0 @@
-name: Test scripts
-
-defaults:
-  run:
-    working-directory: scripts
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'scripts/**'
-  pull_request:
-    paths:
-      - 'scripts/**'
-
-concurrency:
-  group: test-scripts-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 20
-      - run: yarn install --frozen-lockfile --check-files
-      - run: yarn typecheck

.github/workflows/test.yml

@@ -1,61 +1,35 @@
 name: Run tests
-
 on:
   push:
     branches: [main]
   pull_request:
     types: [opened, synchronize]
 
-concurrency:
-  group: test-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['18', '20', '22']
+        node: ['12', '14', '16']
         include:
-          - node: '20'
+          - node: '16'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn typecheck
       - run: yarn test
         if: ${{ !matrix.coverage }}
-        env:
-          NODE_OPTIONS: --max-old-space-size=8192
       - run: yarn test --coverage
         if: ${{ matrix.coverage }}
-        env:
-          # Oclif seems to cause OOM errors when testing with coverage enabled.
-          # Remove this whenever we solved those OOM errors.
-          NODE_OPTIONS: --max-old-space-size=8192
       - run: yarn lint --max-warnings=0
-      - run: yarn install --frozen-lockfile --check-files
-        working-directory: ./scripts
+      - run: shellcheck bin/*.sh
       - uses: codecov/codecov-action@v1
         if: ${{ matrix.coverage }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-      - run: yarn lint-changelog
-
-  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 }}

.github/workflows/upgrade-eas-build-modules.yml

@@ -1,81 +0,0 @@
-name: Open a PR bumping eas-build modules
-
-on: workflow_dispatch
-
-jobs:
-  open-pr:
-    name: Open a PR bumping eas-build modules
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 20
-
-      - run: yarn install --frozen-lockfile
-
-      - name: Configure git
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Expo Bot"
-
-      - name: Upgrade eas-build modules
-        run: |
-          for DIR in packages/eas-cli packages/eas-json; do
-            pushd $DIR >/dev/null 2>&1
-              # packages are ordered according to output of `lerna list --toposort`
-              # https://github.com/expo/turtle-v2/pull/568
-              for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/steps" "@expo/turtle-spawn" "@expo/build-tools"; do
-                if grep -q $PACKAGE package.json; then
-                  echo "[$DIR] yarn --exact add $PACKAGE"
-                  yarn add --exact $PACKAGE
-                fi
-              done
-            popd >/dev/null 2>&1
-          done
-
-      - name: Set a branch name
-        id: bump-branch-name
-        run: |
-          HASH="$(echo $RANDOM | md5sum | head -c 10)"
-          BRANCH_NAME="@expo-bot/eas-build-bump-$HASH"
-
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-
-      - name: Create a branch, commit, and push
-        run: |
-          BRANCH_NAME="${{ steps.bump-branch-name.outputs.BRANCH_NAME }}"
-
-          git checkout -b $BRANCH_NAME
-          git add .
-          git commit -m "Upgrade eas-build dependencies"
-          git push origin $BRANCH_NAME
-
-      - name: Open a PR to main
-        uses: repo-sync/pull-request@v2
-        id: open-pr
-        with:
-          source_branch: '${{ steps.bump-branch-name.outputs.BRANCH_NAME }}'
-          destination_branch: 'main'
-          pr_title: 'Upgrade eas-build dependencies'
-          pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
-          pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
-          github_token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_PAT }}
-          script: |
-            github.issues.createComment({
-              issue_number: ${{ steps.open-pr.outputs.pr_number }},
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: "/changelog-entry chore Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies."
-            })

.gitignore

@@ -1,21 +1,14 @@
-# Build directories
-packages/*/build
-packages/eas-cli/dist
-packages/eas-cli/tmp
-scripts/build
-
-# Code editors
-.idea
-.history
-.vscode
-
-# macOS
-.DS_Store
-
-# Node
-node_modules
 *-debug.log
 *-error.log
 
-# Tests
+**/build/**
+!packages/eas-cli/src/commands/build/**
+!packages/eas-cli/src/build/**
+
+dist
+/package-lock.json
+tmp
+node_modules
 coverage
+.history
+.DS_Store

.prettierrc

@@ -2,8 +2,7 @@
   "printWidth": 100,
   "tabWidth": 2,
   "singleQuote": true,
-  "bracketSameLine": true,
+  "jsxBracketSameLine": true,
   "trailingComma": "es5",
-  "arrowParens": "avoid",
-  "endOfLine": "auto"
+  "arrowParens": "avoid"
 }

.vscode/settings.json

@@ -1,10 +0,0 @@
-{
-  "eslint.enable": true,
-  "search.exclude": {
-    "**/node_modules": true,
-    "**/bower_components": true,
-    "**/*.code-search": true,
-    "**/src/**/build/**": false,
-    "**/src/build/**": false,
-  }
-}

CODEOWNERS

@@ -0,0 +1,7 @@
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95
+
+packages/eas-cli/src/submit @barthap @dsokal
+packages/eas-cli/src/commands/submit.ts @barthap @dsokal
+
+packages/eas-json @dsokal @wkozyra95

CONTRIBUTING.md

@@ -1,67 +1,10 @@
-# Development
+## Releasing a new version
 
-Set up an alias for the EAS CLI so you can try it in projects all around your computer. The project is compiled on the fly so you don't need to run a build (watch) command.
-
-> The only exception is when you just cloned the repository or there have been changes in `packages/eas-json`. In that case, you'll have to run `yarn build` in the root.
-
-Open your `.zshrc` or other config file and add:
-
-```
-alias easd="/PATH/TO/eas-cli/bin/run"
-```
-
-Then use it with `easd` like `easd build`.
-
-If you're making changes to `packages/eas-json` or prefer/need to work with production code, start the build command in watch mode with:
-
-```
-yarn start
-```
-
-If it is easier for you to work with the code locally with compiler options set to:
-
-```json
-...
-"compilerOptions": {
-    ...
-    "noUnusedLocals": false,
-    "noUnusedParameters": false,
-    ...
-}
-...
-```
-
-you can consider using:
-
-```
-yarn start-allow-unused
-```
-
-## Format
-
-- Be sure to update the [`CHANGELOG.md`](./CHANGELOG.md) with changes for every PR. There is a changelog bot that can generate the proper entry for you. The instructions on how to use it are in the PR description placeholder.
-- End `async` functions with `Async` like `runAsync`. This is just how we format functions at Expo.
-- Utilize the unified `Log` module instead of `console.log`.
-
-## Using local and staging API
-
-For development against local API:
-
-- Set up the API server as described at https://github.com/expo/universe/tree/main/server/www.
-- Set the `EXPO_LOCAL=1` env variable either on every command run (e.g. `EXPO_LOCAL=1 easd ...`) or more permamently with `export EXPO_LOCAL=1` (works in a current shell session).
-
-For development against staging API:
-
-- Set the `EXPO_STAGING=1` env variable either on every command run (e.g. `EXPO_STAGING=1 easd ...`) or more permamently with `export EXPO_STAGING=1` (works in a current shell session).
-
-## Working on local builds (`eas build --local`)
-
-See https://github.com/expo/eas-build/blob/main/DEVELOPMENT.md for how to set up your environment when making changes to [`eas-cli-local-build-plugin`](https://github.com/expo/eas-build/tree/main/packages/local-build-plugin) and/or [`build-tools`](https://github.com/expo/eas-build/tree/main/packages/build-tools).
-
-## Testing
-
-Run `yarn test` either in the repository root or in a package directory that you're working on.
-
-## Releasing
-
-See [RELEASING.md](./RELEASING.md).
+1. Run `yarn release` in the repository root folder.
+2. Wait, the `release` workflow on GitHub Actions is going to take care of the rest (including publishing packages to npm and updating the changelog).
+3. Check the changelog. If any of the entries have been tagged with `[EAS BUILD API]`
+   - Open `package.json` and note the version of `@expo/eas-build-job` used in the eas-cli.
+   - Find the `Publish` commit in [expo/eas-build](https://github.com/expo/eas-build/commit/) for that version. In most cases, it will be the latest `Publish` commit.
+   - Find the `eas-cli-local-build-plugin` version published in that commit.
+     ![example publish commit](./.gh-assets/eas-build-publish-commit.png)
+   - Run `npm dist-tags add eas-cli-local-build-plugin@VERSION latest` with the version from the previous step.

RELEASING.md

@@ -1,14 +0,0 @@
-# Releasing EAS CLI
-
-1. Run `yarn release` in the repository root folder. The next version is chosen automatically based on the changelog entries. If you want to use different version, pass the version string as a positional argument to the command, e.g. `yarn release 1.2.3`.
-2. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.
-
-## Choosing the next version
-
-As stated above, the next EAS CLI version is chosen automatically based on the existing changelog entries under the unreleased section in **CHANGELOG.md**.
-
-The algorithm works as follows:
-
-- 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, bump the PATCH version.

SECURITY.md

@@ -1,5 +0,0 @@
-# Security Policy
-
-## Reporting a Vulnerability
-
-Instead of opening a GitHub issue for security vulnerabilities, send an email to our secure inbox: secure@expo.io.

bin/install.sh

@@ -0,0 +1,131 @@
+#!/bin/bash
+
+# This script downloads the latest release version of EAS CLI from GitHub and
+# installs it in /usr/local/bin
+
+{
+  # All code is inside a block to ensure the script executes only when
+  # downloaded completely.
+
+  set -euo pipefail
+
+  prefix="${EAS_PREFIX:-/usr/local}"
+  temp_dir="$(mktemp -d)"
+  
+  if  [ -t 1 ] && [ -z "${NO_COLOR:-}" ]
+  then
+    # Use colors when stdout is a terminal and NO_COLOR isn't set.
+    text_bold=$'\033[1m'
+    text_normal=$'\033[22m'
+    text_red=$'\033[31m'
+    text_default_color=$'\033[39m'
+  else
+    # Disable colors
+    text_bold=""
+    text_normal=""
+    text_red=""
+    text_default_color=""
+  fi
+
+  abort() {
+    echo -e "$text_bold$text_red$1$text_normal$text_default_color"
+    exit 1
+  }
+
+  install() {
+    needs_sudo=""
+    # Make sure path exists and can be written to by the current user.
+    if ! mkdir -p "$prefix/lib" || [[ ! -w "$prefix/lib" ]]
+    then
+      needs_sudo=true
+    fi
+    if ! mkdir -p "$prefix/bin" || [[ ! -w "$prefix/bin" ]]
+    then
+      needs_sudo=true
+    fi
+    if ! rm -rf "$prefix/lib/eas"
+    then
+      needs_sudo=true
+    fi
+    # Run commands with sudo if necessary.
+    if [ -n "$needs_sudo" ]
+    then
+      if [ "$EUID" -ne 0 ]
+      then
+        echo "Installing requires superuser access."
+        echo "The sudo command will prompt for your password."
+      fi
+      sudo rm -rf "$prefix/lib/eas"
+      sudo mv "$temp_dir/eas" "$prefix/lib/eas"
+      sudo ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
+    else
+      mv "$temp_dir/eas" "$prefix/lib/eas"
+      ln -fs "$prefix/lib/eas/bin/eas" "$prefix/bin/eas"
+    fi
+  }
+
+  if [[ ! ":$PATH:" == *":$prefix/bin:"* ]]; then
+    abort "Your path is missing $prefix/bin, you need to add this to \$PATH use this installer."
+  fi
+  
+  hardware="$(uname -m)"
+  case "$hardware" in
+    x86_64)
+      arch="x64"
+      ;;
+    arm*)
+      arch="arm"
+      ;;
+    *)
+      abort "Unsupported CPU architecture $hardware."
+      ;;
+  esac
+
+  case "$(uname -s)" in
+    Darwin*)
+      platform="darwin"
+      if [[ "$arch" != "x64" ]]; then
+        abort "Unsupported CPU architecture $hardware on macOS."
+      fi
+      ;;
+    Linux*)
+      platform="linux"
+      ;;
+    *)
+      abort "This installer is supported only on macOS, Linux, and Windows Subsystem for Linux."
+      ;;
+  esac
+
+  url="https://github.com/expo/eas-cli/releases/latest/download/eas-$platform-$arch.tar.gz"
+  echo "Installing EAS CLI from $url"
+
+  mkdir -p "$temp_dir"
+  cd "$temp_dir"
+  
+  echo
+  echo "Downloading..."
+  if [ "$(command -v curl)" ]
+  then
+    curl --location --progress-bar "$url" | tar xz
+  else
+    wget -O- "$url" | tar xz
+  fi
+
+  # Move the installation over and link the executable (may require sudo)
+  install
+
+  # Test the bundled node binary and if it doesn't work remove it (fall back to
+  # node installed in path).
+  "$prefix/lib/eas/bin/node" -v > /dev/null || {
+    rm "$prefix/lib/eas/bin/node"
+  }
+
+  # Test the CLI
+  executable=$(command -v eas) || abort "Could not run eas after installation."
+  echo
+  echo -e "EAS CLI is installed to ${executable}"
+  eas --version
+
+  echo
+  echo -e "Type ${text_bold}eas --help${text_normal} to get started."
+}

bin/run

@@ -1 +1 @@
-../packages/eas-cli/bin/dev
+../packages/eas-cli/bin/run

jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  projects: [
+    require('./packages/eas-cli/jest.config.js'),
+    require('./packages/eas-json/jest.config.js'),
+  ],
+  testPathIgnorePatterns: ['.*'],
+};

jest.config.ts

@@ -1,15 +0,0 @@
-import type { Config } from 'jest';
-
-// eslint-disable-next-line import/no-relative-packages
-import easCliConfig from './packages/eas-cli/jest.config';
-// eslint-disable-next-line import/no-relative-packages
-import easJsonConfig from './packages/eas-json/jest.config';
-
-const config: Config = {
-  projects: [easCliConfig, easJsonConfig],
-  testPathIgnorePatterns: ['.*'],
-  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
-  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
-};
-
-export default config;

jest/jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  preset: 'ts-jest',
+  testEnvironment: 'node',
+  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
+  watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
+  collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
+};

jest/jest.config.ts

@@ -1,9 +0,0 @@
-import type { Config } from 'jest';
-
-const config: Config = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
-};
-
-export default config;

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
-  "version": "12.5.3",
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+  "useWorkspaces": true,
+  "version": "0.31.1"
 }

package.json

@@ -1,41 +1,35 @@
 {
-  "name": "eas-cli-root",
   "private": true,
-  "workspaces": [
-    "packages/*"
-  ],
+  "workspaces": ["packages/*"],
   "scripts": {
     "build": "lerna run build",
-    "build:tarballs:linux": "yarn build-for-size-check",
-    "build-for-size-check": "yarn build && yarn workspace eas-cli pretarball-ci && CLI_SIZE_CHECK=1 yarn workspace eas-cli oclif pack:tarballs --no-xz --targets linux-x64",
+    "build:tarballs:linux": "yarn build && yarn workspace eas-cli oclif-dev pack --targets linux-x64",
     "typecheck": "lerna run typecheck",
-    "start": "lerna run watch --stream --parallel",
-    "start-allow-unused": "lerna run watch-allow-unused --stream --parallel",
+    "start": "lerna run watch --parallel",
     "watch": "yarn start",
     "eas": "packages/eas-cli/bin/run",
-    "lint": "eslint .",
-    "lint-changelog": "./scripts/bin/run lint-changelog",
-    "release": "lerna run rebuild && ./scripts/bin/run release",
+    "lint": "eslint . --ext .ts --ext .js",
+    "release": "lerna version",
     "test": "jest",
-    "clean": "lerna run clean && rm -rf node_modules coverage"
+    "clean": "lerna run clean"
   },
   "devDependencies": {
-    "@types/jest": "29.5.11",
-    "@types/node": "20.11.0",
-    "eslint": "8.56.0",
-    "eslint-config-universe": "13.0.0",
-    "eslint-plugin-async-protect": "3.1.0",
+    "@expo/oclif-dev-cli": "1.24.0-expo",
+    "@types/jest": "27.0.1",
+    "@types/node": "16.7.8",
+    "eslint": "7.32.0",
+    "eslint-config-universe": "8.0.0",
+    "eslint-plugin-async-protect": "1.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "29.7.0",
-    "jest-watch-typeahead": "2.2.2",
-    "lerna": "7.4.2",
-    "oclif": "^3.9.0",
-    "prettier": "3.1.1",
-    "ts-jest": "29.1.1",
-    "typescript": "5.3.3"
+    "jest": "27.1.0",
+    "jest-watch-typeahead": "0.6.4",
+    "lerna": "4.0.0",
+    "prettier": "2.3.2",
+    "ts-jest": "27.0.5",
+    "typescript": "4.4.2"
   },
   "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "node": "16.10.0",
+    "yarn": "1.22.15"
   }
 }

packages/eas-cli/.eslintrc.js

@@ -2,24 +2,6 @@ const rootEslintrc = require('../../.eslintrc.js');
 
 module.exports = {
   rules: {
-    'no-restricted-properties': [
-      'warn',
-      {
-        object: 'it',
-        property: 'only',
-        message: 'it.only should not be committed to main.',
-      },
-      {
-        object: 'test',
-        property: 'only',
-        message: 'test.only should not be committed to main.',
-      },
-      {
-        object: 'describe',
-        property: 'only',
-        message: 'describe.only should not be committed to main.',
-      },
-    ],
     'no-restricted-imports': [
       'error',
       {

packages/eas-cli/annotate-graphql-codegen.sh

@@ -1,15 +1,13 @@
-const fs = require('fs/promises');
+#!/usr/bin/env sh
 
-const path = './src/graphql/generated.ts';
+OUTFILE="src/graphql/generated.ts"
 
-(async () => {
-  const generatedCode = await fs.readFile(path, 'utf8');
-  const comment = `/**
+content="/**
  * This file was generated using GraphQL Codegen
  * Command: yarn generate-graphql-code
  * Run this during development for automatic type generation when editing GraphQL documents
  * For more info and docs, visit https://graphql-code-generator.com/
- */\n\n`;
+ */
+"
 
-  await fs.writeFile(path, comment + generatedCode);
-})();
+printf '%s\n%s\n' "$content" "$(cat $OUTFILE)" > $OUTFILE

packages/eas-cli/bin/dev

@@ -1,17 +0,0 @@
-#!/usr/bin/env node
-
-const oclif = require('@oclif/core');
-const path = require('path');
-
-const project = path.join(__dirname, '..', 'tsconfig.json');
-
-// In dev mode -> use ts-node and dev plugins
-process.env.NODE_ENV = 'development';
-
-require('ts-node').register({ project });
-
-// In dev mode, always show stack traces
-oclif.settings.disableJsonFlag = true
-
-// Start the CLI
-oclif.run().then(oclif.flush).catch(oclif.Errors.handle);

packages/eas-cli/bin/dev.cmd

@@ -1,3 +0,0 @@
-@echo off
-
-node "%~dp0\dev" %*

packages/eas-cli/bin/run

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-require('@oclif/core')
+require('@oclif/command')
   .run()
-  .then(require('@oclif/core/flush'))
-  .catch(require('@oclif/core/handle'));
+  .then(require('@oclif/command/flush'))
+  .catch(require('@oclif/errors/handle'));

packages/eas-cli/graphql-codegen.yml

@@ -1,13 +1,10 @@
 overwrite: true
-schema: 'https://staging-api.expo.dev/graphql'
+schema: 'https://staging.exp.host/--/graphql'
 documents:
   - 'src/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
   - 'src/credentials/android/api/graphql/**/!(*.d).{ts,tsx}'
   - 'src/commands/**/*.ts'
-  - 'src/branch/**/*.ts'
-  - 'src/channel/**/*.ts'
-  - 'src/worker/**/*.ts'
 generates:
   src/graphql/generated.ts:
     plugins:
@@ -17,7 +14,7 @@ generates:
       dedupeOperationSuffix: true
     hooks:
       afterOneFileWrite:
-        - 'node ./scripts/annotate-graphql-codegen.js'
+        - ./annotate-graphql-codegen.sh
   ./graphql.schema.json:
     plugins:
       - 'introspection'

packages/eas-cli/jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  ...require('../../jest/jest.config.js'),
+  rootDir: __dirname,
+  roots: ['src', '__mocks__'],
+  globalSetup: './jest/global-setup.ts',
+  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
+};

packages/eas-cli/jest.config.ts

@@ -1,14 +0,0 @@
-import type { Config } from 'jest';
-
-// eslint-disable-next-line import/no-relative-packages
-import baseConfig from '../../jest/jest.config';
-
-const config: Config = {
-  ...baseConfig,
-  rootDir: __dirname,
-  roots: ['src', '__mocks__'],
-  globalSetup: './jest/global-setup.ts',
-  setupFilesAfterEnv: ['./jest/setup-after-env.ts'],
-};
-
-export default config;

packages/eas-cli/jest/global-setup.ts

@@ -2,5 +2,4 @@ module.exports = async () => {
   process.env.TZ = 'UTC';
   process.env.EAS_NO_VCS = '1';
   process.env.EAS_PROJECT_ROOT = '/app';
-  process.env.FORCE_COLOR = '1';
 };

packages/eas-cli/package.json

@@ -1,138 +1,111 @@
 {
   "name": "eas-cli",
+  "type": "module",
   "description": "EAS command line tool",
-  "version": "12.5.3",
+  "version": "0.31.1",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "1.8.0",
-    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "8.5.4",
-    "@expo/config-plugins": "7.8.4",
-    "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.136",
-    "@expo/eas-json": "12.5.2",
-    "@expo/env": "^0.3.0",
-    "@expo/json-file": "8.2.37",
-    "@expo/logger": "1.0.117",
-    "@expo/multipart-body-parser": "1.1.0",
-    "@expo/osascript": "2.0.33",
-    "@expo/package-manager": "1.1.2",
-    "@expo/pkcs12": "0.0.8",
-    "@expo/plist": "0.0.20",
-    "@expo/plugin-help": "5.1.23",
-    "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "6.7.3",
+    "@expo/apple-utils": "0.0.0-alpha.25",
+    "@expo/config": "6.0.2",
+    "@expo/config-plugins": "4.0.2",
+    "@expo/eas-build-job": "0.2.52",
+    "@expo/eas-json": "^0.31.0",
+    "@expo/json-file": "8.2.33",
+    "@expo/pkcs12": "0.0.4",
+    "@expo/plist": "0.0.14",
+    "@expo/plugin-warn-if-update-available": "1.7.0",
+    "@expo/prebuild-config": "3.0.2",
     "@expo/results": "1.0.0",
-    "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.136",
+    "@expo/rudder-sdk-node": "1.1.0",
+    "@expo/sdk-runtime-versions": "1.0.0",
+    "@expo/spawn-async": "1.5.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "^1.26.2",
-    "@oclif/plugin-autocomplete": "^2.3.10",
-    "@segment/ajv-human-errors": "^2.1.2",
-    "@urql/core": "4.0.11",
-    "@urql/exchange-retry": "1.2.0",
-    "ajv": "8.11.0",
-    "ajv-formats": "2.1.1",
-    "better-opn": "3.0.2",
+    "@oclif/command": "1.8.0",
+    "@oclif/config": "1.17.0",
+    "@oclif/errors": "1.3.5",
+    "@oclif/plugin-help": "3.2.3",
+    "@urql/core": "2.3.1",
+    "@urql/exchange-retry": "0.3.0",
     "chalk": "4.1.2",
-    "cli-progress": "3.12.0",
-    "dateformat": "4.6.3",
-    "dotenv": "16.3.1",
+    "cli-table3": "0.6.0",
+    "dateformat": "4.5.1",
     "env-paths": "2.2.0",
-    "envinfo": "7.11.0",
-    "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.3.2",
+    "envinfo": "7.8.1",
+    "fast-glob": "3.2.7",
     "figures": "3.2.0",
-    "form-data": "4.0.0",
-    "fs-extra": "11.2.0",
+    "form-data": "3.0.0",
+    "fs-extra": "10.0.0",
     "getenv": "1.0.0",
-    "gradle-to-js": "2.0.1",
-    "graphql": "16.8.1",
-    "graphql-tag": "2.12.6",
-    "https-proxy-agent": "5.0.1",
-    "ignore": "5.3.0",
+    "got": "11.8.2",
+    "gradle-to-js": "2.0.0",
+    "graphql": "15.5.1",
+    "graphql-tag": "2.12.5",
+    "ignore": "5.1.8",
     "indent-string": "4.0.0",
-    "jks-js": "1.1.0",
-    "joi": "17.11.0",
-    "jsonwebtoken": "9.0.0",
-    "keychain": "1.5.0",
+    "jks-js": "1.0.1",
+    "joi": "17.4.2",
+    "keychain": "1.3.0",
     "log-symbols": "4.1.0",
-    "mime": "3.0.0",
-    "minimatch": "5.1.2",
-    "minizlib": "3.0.1",
-    "nanoid": "3.3.4",
-    "node-fetch": "2.6.7",
-    "node-forge": "1.3.1",
+    "mime": "2.5.2",
+    "minimatch": "3.0.4",
+    "nanoid": "3.1.25",
+    "node-fetch": "2.6.1",
+    "node-forge": "0.10.0",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
-    "pngjs": "7.0.0",
-    "promise-limit": "2.7.0",
-    "promise-retry": "2.0.1",
-    "prompts": "2.4.2",
+    "prompts": "2.3.2",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.5.4",
+    "semver": "7.3.5",
     "slash": "3.0.0",
-    "tar": "6.2.1",
-    "tar-stream": "3.1.7",
+    "strip-ansi": "6.0.0",
+    "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "tslib": "2.6.2",
-    "turndown": "7.1.2",
+    "tslib": "2.3.1",
+    "turndown": "7.1.1",
     "untildify": "4.0.0",
-    "uuid": "9.0.1",
-    "wrap-ansi": "7.0.0",
-    "zod": "^3.23.8"
+    "uuid": "8.3.2",
+    "wrap-ansi": "7.0.0"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.0",
-    "@graphql-codegen/introspection": "4.0.0",
-    "@graphql-codegen/typescript": "4.0.1",
-    "@graphql-codegen/typescript-operations": "4.0.1",
-    "@types/cli-progress": "3.11.5",
+    "@graphql-codegen/cli": "^1.19.2",
+    "@graphql-codegen/introspection": "^1.18.0",
+    "@graphql-codegen/typescript": "^1.17.11",
+    "@graphql-codegen/typescript-operations": "^1.17.10",
     "@types/dateformat": "3.0.1",
-    "@types/envinfo": "7.8.3",
-    "@types/express": "4.17.15",
-    "@types/fs-extra": "11.0.4",
+    "@types/envinfo": "7.8.1",
+    "@types/form-data": "^2.5.0",
+    "@types/fs-extra": "9.0.12",
     "@types/getenv": "^1.0.0",
-    "@types/jsonwebtoken": "8.5.1",
-    "@types/mime": "3.0.1",
-    "@types/node-fetch": "2.6.2",
-    "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.4",
-    "@types/promise-retry": "1.1.3",
-    "@types/prompts": "2.4.2",
-    "@types/semver": "7.5.6",
-    "@types/tar": "6.1.10",
-    "@types/tar-stream": "3.1.3",
-    "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.7",
+    "@types/mime": "2.0.3",
+    "@types/node-fetch": "^2.5.7",
+    "@types/node-forge": "^0.9.5",
+    "@types/prompts": "^2.0.9",
+    "@types/semver": "7.3.8",
+    "@types/tar": "4.0.5",
+    "@types/tough-cookie": "4.0.1",
+    "@types/uuid": "8.3.1",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "0.28.1",
+    "axios": "0.21.4",
     "eslint-plugin-graphql": "4.0.0",
-    "express": "4.20.0",
-    "memfs": "3.4.13",
-    "mockdate": "3.0.5",
-    "nock": "13.4.0",
-    "rimraf": "3.0.2",
-    "ts-deepmerge": "6.2.0",
-    "ts-mockito": "2.6.1",
-    "ts-node": "10.9.2",
-    "typescript": "5.3.3"
+    "memfs": "3.2.2",
+    "mockdate": "^3.0.2",
+    "nock": "^13.0.5",
+    "tempy": "0.7.0",
+    "ts-deepmerge": "1.0.8"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=12.0.0"
   },
   "files": [
     "/bin",
     "/build",
-    "/oclif.manifest.json",
-    "/schema"
+    "/oclif.manifest.json"
   ],
   "homepage": "https://github.com/expo/eas-cli",
   "keywords": [
@@ -145,16 +118,12 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@oclif/plugin-autocomplete",
-      "@expo/plugin-help",
+      "@oclif/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
     "topics": {
       "account": {
-        "description": "manage account"
-      },
-      "branch": {
-        "description": "manage update branches"
+        "description": "manage your account"
       },
       "build": {
         "description": "build app binaries"
@@ -163,13 +132,10 @@
         "description": "manage update channels"
       },
       "device": {
-        "description": "manage Apple devices for Internal Distribution"
-      },
-      "metadata": {
-        "description": "manage store configuration"
+        "description": "manage your Apple devices for internal distribution"
       },
       "project": {
-        "description": "manage project"
+        "description": "manage your project"
       },
       "release": {
         "description": "manage update releases"
@@ -186,11 +152,11 @@
     },
     "warn-if-update-available": {
       "timeoutInDays": 0.5,
-      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
+      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\n<%= chalk.dim('Proceeding with outdated version') %>\n"
     },
     "update": {
       "node": {
-        "version": "18.6.0"
+        "version": "12.13.0"
       },
       "s3": {
         "templates": {
@@ -200,32 +166,18 @@
           }
         }
       }
-    },
-    "additionalHelpFlags": [
-      "-h"
-    ],
-    "additionalVersionFlags": [
-      "-v"
-    ]
+    }
   },
   "repository": "expo/eas-cli",
   "scripts": {
-    "postpack": "rimraf oclif.manifest.json",
-    "prepack": "yarn rebuild && node ./scripts/prepack.js",
-    "rebuild": "rimraf build && yarn build",
-    "pretarball-ci": "./scripts/pretarball-ci.sh",
+    "postpack": "rm -f oclif.manifest.json",
+    "prepack": "rm -rf build && yarn build && yarn oclif-dev manifest && yarn oclif-dev readme && node patch-readme",
     "build": "tsc --project tsconfig.build.json",
-    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
     "watch": "yarn build --watch --preserveWatchOutput",
-    "watch-allow-unused": "yarn build-allow-unused --watch --preserveWatchOutput",
     "typecheck": "tsc",
     "test": "jest",
-    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
+    "version": "yarn oclif-dev readme && node patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rimraf dist build tmp node_modules yarn-error.log"
-  },
-  "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "clean": "rm -rf build node_modules"
   }
 }

packages/eas-cli/patch-readme.js

@@ -0,0 +1,12 @@
+const { promises: fs } = require('fs');
+
+(async () => {
+  // Patch `oclif-dev readme` path and link generation
+  let readmeContent = await fs.readFile('README.md', 'utf8');
+  readmeContent = readmeContent.replace(/\[build\//g, '[src/');
+  readmeContent = readmeContent.replace(/build\/commands/g, 'packages/eas-cli/src/commands');
+  await fs.writeFile('README.md', readmeContent);
+
+  // eslint-disable-next-line no-console
+  console.log('Patched README path generation');
+})();

packages/eas-cli/schema/metadata-0.json

@@ -1,793 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-06/schema",
-  "type": "object",
-  "definitions": {
-    "apple": {
-      "AppleKidsAge": {
-        "enum": [
-          "FIVE_AND_UNDER",
-          "SIX_TO_EIGHT",
-          "NINE_TO_ELEVEN"
-        ]
-      },
-      "AppleRating": {
-        "enum": [
-          "NONE",
-          "INFREQUENT_OR_MILD",
-          "FREQUENT_OR_INTENSE"
-        ]
-      },
-      "AppleCategory": {
-        "type": "array",
-        "description": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array.",
-        "markdownDescription": "App Store categories for the app, can add up to two categories. The first item in this list is the primary category, the second is the secondary and optional category. `STICKERS` and `GAMES` categories can add up to two additional subcategories, written as nested array. E.g.\n\n- `[\"SPORTS\"]`\n- `[\"SPORTS\", \"LIFESTYLE\"]`\n- `[[\"GAMES\", \"GAMES_CARD\"], \"ENTERTAINMENT\"]`\n- `[\"GAMES\", \"WEATHER\"]`",
-        "minItems": 1,
-        "maxItems": 2,
-        "uniqueItems": true,
-        "defaultSnippets": [
-          {
-            "label": "Basic categories",
-            "description": "Add two simple categories",
-            "body": [
-              "$1",
-              "$2"
-            ]
-          },
-          {
-            "label": "Category with subcategories",
-            "description": "Add a category containing subcategories",
-            "body": [
-              [
-                "${1|GAMES,STICKERS|}",
-                "$3",
-                "$4"
-              ]
-            ]
-          }
-        ],
-        "items": {
-          "oneOf": [
-            {
-              "$ref": "#/definitions/apple/AppleCategory/categories/root"
-            },
-            {
-              "$ref": "#/definitions/apple/AppleCategory/categories/parent"
-            },
-            {
-              "type": "array",
-              "description": "The GAMES category can have additional subcategories",
-              "minItems": 1,
-              "maxItems": 3,
-              "uniqueItems": true,
-              "items": [
-                {
-                  "const": "GAMES"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/games"
-                }
-              ]
-            },
-            {
-              "type": "array",
-              "description": "The STICKERS category can have additional subcategories",
-              "minItems": 1,
-              "maxItems": 3,
-              "uniqueItems": true,
-              "items": [
-                {
-                  "const": "STICKERS"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
-                },
-                {
-                  "$ref": "#/definitions/apple/AppleCategory/categories/stickers"
-                }
-              ]
-            }
-          ]
-        },
-        "categories": {
-          "root": {
-            "enum": [
-              "BUSINESS",
-              "SOCIAL_NETWORKING",
-              "MEDICAL",
-              "FOOD_AND_DRINK",
-              "EDUCATION",
-              "BOOKS",
-              "SPORTS",
-              "FINANCE",
-              "REFERENCE",
-              "GRAPHICS_AND_DESIGN",
-              "DEVELOPER_TOOLS",
-              "HEALTH_AND_FITNESS",
-              "MUSIC",
-              "WEATHER",
-              "TRAVEL",
-              "ENTERTAINMENT",
-              "LIFESTYLE",
-              "MAGAZINES_AND_NEWSPAPERS",
-              "UTILITIES",
-              "SHOPPING",
-              "PRODUCTIVITY",
-              "NEWS",
-              "PHOTO_AND_VIDEO",
-              "NAVIGATION"
-            ]
-          },
-          "parent": {
-            "enum": [
-              "GAMES",
-              "STICKERS"
-            ]
-          },
-          "games": {
-            "enum": [
-              "GAMES_SPORTS",
-              "GAMES_WORD",
-              "GAMES_MUSIC",
-              "GAMES_ADVENTURE",
-              "GAMES_ACTION",
-              "GAMES_ROLE_PLAYING",
-              "GAMES_CASUAL",
-              "GAMES_BOARD",
-              "GAMES_TRIVIA",
-              "GAMES_CARD",
-              "GAMES_PUZZLE",
-              "GAMES_CASINO",
-              "GAMES_STRATEGY",
-              "GAMES_SIMULATION",
-              "GAMES_RACING",
-              "GAMES_FAMILY"
-            ]
-          },
-          "stickers": {
-            "enum": [
-              "STICKERS_PLACES_AND_OBJECTS",
-              "STICKERS_EMOJI_AND_EXPRESSIONS",
-              "STICKERS_CELEBRATIONS",
-              "STICKERS_CELEBRITIES",
-              "STICKERS_MOVIES_AND_TV",
-              "STICKERS_SPORTS_AND_ACTIVITIES",
-              "STICKERS_EATING_AND_DRINKING",
-              "STICKERS_CHARACTERS",
-              "STICKERS_ANIMALS",
-              "STICKERS_FASHION",
-              "STICKERS_ART",
-              "STICKERS_GAMING",
-              "STICKERS_KIDS_AND_FAMILY",
-              "STICKERS_PEOPLE",
-              "STICKERS_MUSIC"
-            ]
-          }
-        }
-      },
-      "AppleInfo": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": [
-          "title",
-          "privacyPolicyUrl"
-        ],
-        "defaultSnippets": [
-          {
-            "label": "Basic",
-            "description": "Create the minimum required locale properties",
-            "body": {
-              "title": "${1:App title}",
-              "privacyPolicyUrl": "https://${3:www.}"
-            }
-          },
-          {
-            "label": "Full",
-            "description": "Create all available locale properties",
-            "body": {
-              "title": "${1:App title}",
-              "subtitle": "${2:Subtitle for your app}",
-              "description": "${3:A longer description of what your app does}",
-              "keywords": [
-                "${4:keyword}"
-              ],
-              "releaseNotes": "${5:Bug fixes and improved stability}",
-              "promoText": "${6:Short tagline for your app}",
-              "marketingUrl": "https://${7:www.}",
-              "supportUrl": "https://${8:www.}",
-              "privacyPolicyUrl": "https://${9:www.}",
-              "privacyChoicesUrl": "https://${10:www.}"
-            }
-          }
-        ],
-        "properties": {
-          "title": {
-            "type": "string",
-            "description": "Name of the app in the store. This should be similar to the installed app name.",
-            "minLength": 2,
-            "maxLength": 30,
-            "meta": {
-              "storeInfo": "The name will be reviewed before it is made available on the App Store."
-            }
-          },
-          "subtitle": {
-            "type": "string",
-            "description": "Subtext for the app. Example: 'A Fun Game For Friends'",
-            "maxLength": 30,
-            "meta": {
-              "storeInfo": "The subtitle will be reviewed before it is made available on the App Store."
-            }
-          },
-          "description": {
-            "type": "string",
-            "description": "Main description of what the app does",
-            "minLength": 10,
-            "maxLength": 4000,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "keywords": {
-            "type": "array",
-            "description": "List of keywords to help users find the app in the App Store",
-            "uniqueItems": true,
-            "items": {
-              "maxLength": 100,
-              "type": "string"
-            },
-            "meta": {
-              "versioned": true
-            }
-          },
-          "releaseNotes": {
-            "type": "string",
-            "description": "Changes since the last public version",
-            "maxLength": 4000,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "promoText": {
-            "type": "string",
-            "description": "Short tagline for the app",
-            "maxLength": 170,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true,
-              "aso": false
-            }
-          },
-          "marketingUrl": {
-            "type": "string",
-            "description": "URL to the app marketing page",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "supportUrl": {
-            "type": "string",
-            "description": "URL to the app support page",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "privacyPolicyText": {
-            "type": "string",
-            "description": "Privacy policy for Apple TV"
-          },
-          "privacyPolicyUrl": {
-            "type": "string",
-            "description": "A URL that links to your privacy policy. A privacy policy is required for all apps.",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true
-            }
-          },
-          "privacyChoicesUrl": {
-            "type": "string",
-            "description": "A URL where users can modify and delete the data collected from the app, or decide how their data is used and shared.",
-            "maxLength": 255,
-            "meta": {
-              "versioned": true,
-              "liveEdits": true,
-              "optional": true
-            }
-          }
-        }
-      },
-      "AppleAdvisory": {
-        "type": "object",
-        "additionalProperties": false,
-        "required": [
-          "alcoholTobaccoOrDrugUseOrReferences",
-          "contests",
-          "gamblingSimulated",
-          "horrorOrFearThemes",
-          "matureOrSuggestiveThemes",
-          "medicalOrTreatmentInformation",
-          "profanityOrCrudeHumor",
-          "sexualContentGraphicAndNudity",
-          "sexualContentOrNudity",
-          "violenceCartoonOrFantasy",
-          "violenceRealistic",
-          "violenceRealisticProlongedGraphicOrSadistic",
-          "gambling",
-          "unrestrictedWebAccess",
-          "kidsAgeBand",
-          "seventeenPlus"
-        ],
-        "defaultSnippets": [
-          {
-            "label": "Basic",
-            "description": "Create an advisory that disables all age-rated properties, for when your app does nothing",
-            "body": {
-              "alcoholTobaccoOrDrugUseOrReferences": "NONE",
-              "contests": "NONE",
-              "gamblingSimulated": "NONE",
-              "horrorOrFearThemes": "NONE",
-              "matureOrSuggestiveThemes": "NONE",
-              "medicalOrTreatmentInformation": "NONE",
-              "profanityOrCrudeHumor": "NONE",
-              "sexualContentGraphicAndNudity": "NONE",
-              "sexualContentOrNudity": "NONE",
-              "violenceCartoonOrFantasy": "NONE",
-              "violenceRealistic": "NONE",
-              "violenceRealisticProlongedGraphicOrSadistic": "NONE",
-              "gambling": false,
-              "unrestrictedWebAccess": false,
-              "kidsAgeBand": null,
-              "seventeenPlus": false
-            }
-          },
-          {
-            "label": "Full",
-            "description": "Create an advisory that enables some of the age-rated properties",
-            "body": {
-              "alcoholTobaccoOrDrugUseOrReferences": "${1|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "contests": "${2|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "gamblingSimulated": "${3|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "horrorOrFearThemes": "${4|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "matureOrSuggestiveThemes": "${5|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "medicalOrTreatmentInformation": "${6|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "profanityOrCrudeHumor": "${7|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "sexualContentGraphicAndNudity": "${8|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "sexualContentOrNudity": "${9|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "violenceCartoonOrFantasy": "${10|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "violenceRealistic": "${11|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "violenceRealisticProlongedGraphicOrSadistic": "${12|NONE,INFREQUENT_OR_MILD,FREQUENT_OR_INTENSE|}",
-              "unrestrictedWebAccess": false,
-              "gambling": false,
-              "kidsAgeBand": null,
-              "seventeenPlus": false
-            }
-          }
-        ],
-        "properties": {
-          "alcoholTobaccoOrDrugUseOrReferences": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain alcohol, tobacco, or drug use or references?"
-          },
-          "contests": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain contests?"
-          },
-          "gamblingSimulated": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain simulated gambling?"
-          },
-          "medicalOrTreatmentInformation": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain medical or treatment information?"
-          },
-          "profanityOrCrudeHumor": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain profanity or crude humor?"
-          },
-          "sexualContentGraphicAndNudity": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain graphic sexual content and nudity?"
-          },
-          "sexualContentOrNudity": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain sexual content or nudity?"
-          },
-          "horrorOrFearThemes": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain horror or fear themes?"
-          },
-          "matureOrSuggestiveThemes": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain mature or suggestive themes?"
-          },
-          "violenceCartoonOrFantasy": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain cartoon or fantasy violence?"
-          },
-          "violenceRealisticProlongedGraphicOrSadistic": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain prolonged graphic or sadistic realistic violence?"
-          },
-          "violenceRealistic": {
-            "$ref": "#/definitions/apple/AppleRating",
-            "description": "Does the app contain realistic violence?"
-          },
-          "unrestrictedWebAccess": {
-            "type": "boolean",
-            "description": "Does your app contain unrestricted web access, such as with an embedded browser?"
-          },
-          "gambling": {
-            "type": "boolean",
-            "description": "Does your app contain gambling?"
-          },
-          "kidsAgeBand": {
-            "oneOf": [
-              {
-                "type": "null"
-              },
-              {
-                "$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-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-mdn.apple.com/news/?id=091202019a)"
-          },
-          "seventeenPlus": {
-            "type": "boolean",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
-            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          }
-        }
-      },
-      "AppleRelease": {
-        "type": "object",
-        "description": "Configure how the app is released in the app store.",
-        "additionalProperties": false,
-        "properties": {
-          "automaticRelease": {
-            "description": "If and how the app should automatically be released when approved by App Store review.",
-            "markdownDescription": "If and how the app should automatically be released when approved by App Store review.\n- `false` - Manually release the app after store approval. (default behavior)\n- `true` - Automatically release after store approval.\n- `Date` - Automatically schedule release on this date, after store approval.\n\nApple does not guarantee that your app is available at the chosen scheduled release date.",
-            "oneOf": [
-              {
-                "type": "string",
-                "format": "date-time"
-              },
-              {
-                "type": "boolean"
-              }
-            ],
-            "defaultSnippets": [
-              {
-                "label": "Manual release",
-                "description": "Manually release the app after store approval",
-                "body": false
-              },
-              {
-                "label": "Automatic release",
-                "description": "Automatically release the app after store approval",
-                "body": true
-              },
-              {
-                "label": "Scheduled release",
-                "description": "Automatically release the app on this date, and store approval",
-                "body": "$CURRENT_YEAR-${1:$CURRENT_MONTH}-${2:$CURRENT_DATE}T${3:$CURRENT_HOUR}:00:00+00:00"
-              }
-            ]
-          },
-          "phasedRelease": {
-            "type": "boolean",
-            "description": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates. Keep in mind that this version will still be available to all users as a manual update from the App Store. You can pause the phased release for up to 30 days or release this update to all users at any time.\n@see https://help.apple.com/app-store-connect/#/dev3d65fcee1",
-            "markdownDescription": "Phased release for automatic updates lets you gradually release this update over a 7-day period to users who have turned on automatic updates.\n\nKeep in mind that this version will still be available to all users as a manual update from the App Store.\n\nYou can pause the phased release for up to 30 days or release this update to all users at any time.\n\n[Learn More](https://help.apple.com/app-store-connect/#/dev3d65fcee1)"
-          }
-        }
-      },
-      "AppleReview": {
-        "type": "object",
-        "description": "Info provided to the App Store review team to help them understand how to use your app.",
-        "required": [
-          "firstName",
-          "lastName",
-          "email",
-          "phone"
-        ],
-        "defaultSnippets": [
-          {
-            "label": "Basic",
-            "description": "Only define the contact details in case communcation is needed with the App Store review team.",
-            "body": {
-              "firstName": "$1",
-              "lastName": "$2",
-              "email": "$3",
-              "phone": "+$4"
-            }
-          },
-          {
-            "label": "Full",
-            "description": "Define the demo account credentials, additional info, and contact details for the App Store review team.",
-            "body": {
-              "firstName": "$1",
-              "lastName": "$2",
-              "email": "$3",
-              "phone": "+$4",
-              "demoUsername": "$5",
-              "demoPassword": "$6",
-              "demoRequired": true,
-              "notes": "$7"
-            }
-          }
-        ],
-        "properties": {
-          "firstName": {
-            "type": "string",
-            "description": "First name of contact in case communication is needed with the App Store review team.",
-            "minLength": 1
-          },
-          "lastName": {
-            "type": "string",
-            "description": "Last name of contact in case communication is needed with the App Store review team.",
-            "minLength": 1
-          },
-          "email": {
-            "type": "string",
-            "description": "Email address of contact in case communication is needed with the App Store review team.",
-            "format": "email"
-          },
-          "phone": {
-            "type": "string",
-            "description": "Phone number of contact in case communication is needed with the App Store review team. Preface the phone number with ‘+’ followed by the country code (for example, +44 844 209 0611)"
-          },
-          "demoUsername": {
-            "type": "string",
-            "description": "The user name to sign in to your app to review its features."
-          },
-          "demoPassword": {
-            "type": "string",
-            "description": "The password to sign in to your app to review its features."
-          },
-          "demoRequired": {
-            "type": "boolean",
-            "description": "A Boolean value that indicates if sign-in information is required to review all the features of your app. If users sign in using social media, provide information for an account for review. Credentials must be valid and active for duration of review.",
-            "markdownDescription": "A Boolean value that indicates if sign-in information is required to review all the features of your app. If users sign in using social media, provide information for an account for review.\n\n**Credentials must be valid and active for duration of review.**"
-          },
-          "notes": {
-            "type": "string",
-            "description": "Additional information about your app that can help during the review process. Do not include demo account details.",
-            "markdownDescription": "Additional information about your app that can help during the review process.\n\n**Do not include demo account details.**",
-            "minLength": 2,
-            "maxLength": 4000
-          }
-        }
-      }
-    },
-    "AppleConfig": {
-      "type": "object",
-      "description": "Configuration that is specific to the Apple App Store.",
-      "additionalProperties": false,
-      "properties": {
-        "version": {
-          "type": "string",
-          "description": "The version string to edit, or create, if it doesn't exist. All the metadata will be stored on this app version.",
-          "minLength": 1,
-          "defaultSnippets": [
-            {
-              "body": "${1:1}.${2:0}"
-            }
-          ]
-        },
-        "copyright": {
-          "type": "string",
-          "description": "The updated company copyright. Example: 2021 Evan Bacon",
-          "defaultSnippets": [
-            {
-              "body": "$CURRENT_YEAR ${1:name}"
-            }
-          ],
-          "meta": {
-            "versioned": true,
-            "liveEdits": true,
-            "storeInfo": "The name of the person or entity that owns the exclusive rights to your app, preceded by the year the rights were obtained (for example, \"2008 Acme Inc.\"). Do not provide a URL."
-          }
-        },
-        "advisory": {
-          "$ref": "#/definitions/apple/AppleAdvisory"
-        },
-        "categories": {
-          "$ref": "#/definitions/apple/AppleCategory"
-        },
-        "info": {
-          "description": "Localized core app info",
-          "type": "object",
-          "additionalProperties": false,
-          "properties": {
-            "ar-SA": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Arabic"
-            },
-            "ca": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Catalan"
-            },
-            "zh-Hans": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Chinese (Simplified)"
-            },
-            "zh-Hant": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Chinese (Traditional)"
-            },
-            "hr": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Croatian"
-            },
-            "cs": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Czech"
-            },
-            "da": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Danish"
-            },
-            "nl-NL": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Dutch"
-            },
-            "en-AU": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (Australia)"
-            },
-            "en-CA": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (Canada)"
-            },
-            "en-GB": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (U.K.)"
-            },
-            "en-US": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "English (U.S.)"
-            },
-            "fi": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Finnish"
-            },
-            "fr-FR": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "French"
-            },
-            "fr-CA": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "French (Canada)"
-            },
-            "de-DE": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "German"
-            },
-            "el": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Greek"
-            },
-            "he": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Hebrew"
-            },
-            "hi": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Hindi"
-            },
-            "hu": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Hungarian"
-            },
-            "id": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Indonesian"
-            },
-            "it": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Italian"
-            },
-            "ja": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Japanese"
-            },
-            "ko": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Korean"
-            },
-            "ms": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Malay"
-            },
-            "no": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Norwegian"
-            },
-            "pl": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Polish"
-            },
-            "pt-BR": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Portuguese (Brazil)"
-            },
-            "pt-PT": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Portuguese (Portugal)"
-            },
-            "ro": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Romanian"
-            },
-            "ru": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Russian"
-            },
-            "sk": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Slovak"
-            },
-            "es-MX": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Spanish (Mexico)"
-            },
-            "es-ES": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Spanish (Spain)"
-            },
-            "sv": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Swedish"
-            },
-            "th": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Thai"
-            },
-            "tr": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Turkish"
-            },
-            "uk": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Ukrainian"
-            },
-            "vi": {
-              "$ref": "#/definitions/apple/AppleInfo",
-              "description": "Vietnamese"
-            }
-          }
-        },
-        "release": {
-          "$ref": "#/definitions/apple/AppleRelease",
-          "description": "Release strategy"
-        },
-        "review": {
-          "$ref": "#/definitions/apple/AppleReview",
-          "description": "Info for the App Store reviewer"
-        }
-      }
-    }
-  },
-  "properties": {
-    "configVersion": {
-      "enum": [0],
-      "description": "The EAS metadata store configuration version"
-    },
-    "apple": {
-      "$ref": "#/definitions/AppleConfig"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "configVersion",
-    "apple"
-  ]
-}

packages/eas-cli/scripts/patch-readme.js

@@ -1,11 +0,0 @@
-const fs = require('fs/promises');
-
-(async () => {
-  // Patch `oclif readme` path and link generation
-  let readmeContent = await fs.readFile('README.md', 'utf8');
-  readmeContent = readmeContent.replace(/src\/commands/g, 'packages/eas-cli/src/commands');
-  await fs.writeFile('README.md', readmeContent);
-
-  // eslint-disable-next-line no-console
-  console.log('Patched README path generation');
-})();

packages/eas-cli/scripts/prepack.js

@@ -1,7 +0,0 @@
-const spawn = require('@expo/spawn-async');
-
-(async () => {
-  if (!process.env.CLI_SIZE_CHECK) {
-    await spawn('yarn', ['oclif', 'manifest'], { stdio: 'inherit' });
-  }
-})();

packages/eas-cli/scripts/pretarball-ci.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-EAS_CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
-PACKAGE_JSON_PATH="$EAS_CLI_DIR/package.json"
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  sed -i '' "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-else
-  sed -i  "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-fi

packages/eas-cli/src/.eslintrc.js

@@ -1,40 +0,0 @@
-module.exports = {
-  extends: ['universe/shared/typescript-analysis'],
-  overrides: [
-    {
-      files: ['*.ts', '*.d.ts'],
-      parserOptions: {
-        project: './packages/eas-cli/tsconfig.json',
-      },
-      rules: {
-        '@typescript-eslint/explicit-function-return-type': [
-          'warn',
-          {
-            allowExpressions: true,
-          },
-        ],
-        '@typescript-eslint/prefer-nullish-coalescing': ['warn', { ignorePrimitives: true }],
-        '@typescript-eslint/no-confusing-void-expression': 'warn',
-        '@typescript-eslint/await-thenable': 'error',
-        '@typescript-eslint/no-misused-promises': [
-          'error',
-          {
-            checksVoidReturn: false,
-          },
-        ],
-        '@typescript-eslint/no-floating-promises': 'error',
-        'no-void': ['warn', { allowAsStatement: true }],
-        'no-return-await': 'off',
-        '@typescript-eslint/return-await': ['error', 'always'],
-        '@typescript-eslint/no-confusing-non-null-assertion': 'warn',
-        '@typescript-eslint/no-extra-non-null-assertion': 'warn',
-        '@typescript-eslint/prefer-as-const': 'warn',
-        '@typescript-eslint/prefer-includes': 'warn',
-        '@typescript-eslint/prefer-readonly': 'warn',
-        '@typescript-eslint/prefer-string-starts-ends-with': 'warn',
-        '@typescript-eslint/prefer-ts-expect-error': 'warn',
-        '@typescript-eslint/no-unnecessary-type-assertion': 'warn',
-      },
-    },
-  ],
-};

packages/eas-cli/src/ApiV2Error.ts

@@ -1,20 +1,24 @@
 import { JSONValue } from '@expo/json-file';
+import { HTTPError, RequestError } from 'got/dist/source';
 
-export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
+export default class ApiV2Error extends RequestError {
+  readonly name = 'ApiV2Error';
   readonly expoApiV2ErrorCode: string;
   readonly expoApiV2ErrorDetails?: JSONValue;
   readonly expoApiV2ErrorServerStack?: string;
   readonly expoApiV2ErrorMetadata?: object;
 
-  constructor(response: {
-    message: string;
-    code: string;
-    stack?: string;
-    details?: JSONValue;
-    metadata?: object;
-  }) {
-    super(response.message);
+  constructor(
+    originalError: HTTPError,
+    response: {
+      message: string;
+      code: string;
+      stack?: string;
+      details?: JSONValue;
+      metadata?: object;
+    }
+  ) {
+    super(response.message, originalError, originalError.request);
     this.expoApiV2ErrorCode = response.code;
     this.expoApiV2ErrorDetails = response.details;
     this.expoApiV2ErrorServerStack = response.stack;

packages/eas-cli/src/__tests__/api-test.ts

@@ -1,13 +1,14 @@
 import assert from 'assert';
+import { RequestError } from 'got/dist/source';
 import nock from 'nock';
 
-import { ApiV2Error } from '../ApiV2Error';
-import { ApiV2Client, getExpoApiBaseUrl } from '../api';
+import ApiV2Error from '../ApiV2Error';
+import { apiClient, getExpoApiBaseUrl } from '../api';
 
-describe(ApiV2Client, () => {
+describe('apiClient', () => {
   it('converts Expo APIv2 error to ApiV2Error', async () => {
     nock(getExpoApiBaseUrl())
-      .post('/v2/test')
+      .post('/--/api/v2/test')
       .reply(400, {
         errors: [
           {
@@ -22,9 +23,7 @@ describe(ApiV2Client, () => {
 
     let error: Error | null = null;
     try {
-      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
-        body: {},
-      });
+      await apiClient.post('test');
     } catch (e: any) {
       error = e;
     }
@@ -40,17 +39,15 @@ describe(ApiV2Client, () => {
   });
 
   it('does not convert non-APIv2 error to ApiV2Error', async () => {
-    nock(getExpoApiBaseUrl()).post('/v2/test').reply(500, 'Something went wrong');
+    nock(getExpoApiBaseUrl()).post('/--/api/v2/test').reply(500, 'Something went wrong');
 
     let error: Error | null = null;
     try {
-      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
-        body: {},
-      });
+      await apiClient.post('test');
     } catch (e: any) {
       error = e;
     }
-    expect(error).not.toBeNull();
+    expect(error).toBeInstanceOf(RequestError);
     expect(error).not.toBeInstanceOf(ApiV2Error);
   });
 });

packages/eas-cli/src/__tests__/commands/__snapshots__/build-version-get-test.ts.snap

@@ -1,5 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BuildVersionGetView reading version aborts when the appVersionSource is not specified and the user chooses to set it to LOCAL 1`] = `"Aborting..."`;
-
-exports[`BuildVersionGetView reading version when appVersionSource is set to local  1`] = `"This project is not configured for using remote version source. Add {"cli": { "appVersionSource": "remote" }} in eas.json or re-run this command without "--non-interactive" flag."`;

packages/eas-cli/src/__tests__/commands/build-version-get-test.ts

@@ -1,232 +0,0 @@
-import chalk from 'chalk';
-
-import {
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-  withLocalVersionSource,
-  withRemoteVersionSource,
-} from './utils';
-import BuildVersionGetView from '../../commands/build/version/get';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import { AppVersionSourceUpdateOption } from '../../project/remoteVersionSource';
-import * as prompts from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-jest.mock('../../project/applicationIdentifier');
-jest.mock('fs');
-jest.mock('../../log');
-jest.mock('../../utils/json');
-jest.mock('../../graphql/queries/AppVersionQuery');
-jest.mock('../../prompts');
-
-describe(BuildVersionGetView, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  test('reading version for platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(Log.log).toHaveBeenCalledWith(`Android versionCode - ${chalk.bold('100')}`);
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-
-  test('reading version for platform android when the appVersionSource is not specified and the user chooses to set it to REMOTE', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_REMOTE);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(Log.log).toHaveBeenCalledWith(`Android versionCode - ${chalk.bold('100')}`);
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-
-  test('reading version for platform android when no remote version is set', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(Log.log).toHaveBeenCalledWith(`No remote versions are configured for this project.`);
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-
-  test('reading version with --json flag for platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(enableJsonOutput).toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
-      versionCode: '100',
-    });
-  });
-
-  test('reading version with --json flag for platform ios', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=ios'],
-      ctx
-    );
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'IOS',
-      'eas.test.com'
-    );
-    expect(enableJsonOutput).toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({
-      buildNumber: '100',
-    });
-  });
-
-  test('reading version with --json flag when no remote version is set', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(enableJsonOutput).toHaveBeenCalled();
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith({});
-  });
-
-  test('reading version when appVersionSource is set to local ', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
-  });
-
-  test('reading version aborts when the appVersionSource is not specified and the user chooses to set it to LOCAL', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowErrorMatchingSnapshot();
-  });
-
-  test('reading version aborts when the appVersionSource is not specified and the user chooses to configure it manually', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.ABORT);
-
-    const cmd = mockTestCommand(BuildVersionGetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborted.');
-  });
-
-  test('reading version sets appVersionSource to LOCAL and aborts when the appVersionSource is not specified and is run in non-interactive mode', async () => {
-    const ctx = mockCommandContext(BuildVersionGetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-
-    const cmd = mockTestCommand(
-      BuildVersionGetView,
-      ['--non-interactive', '--json', '--platform=android'],
-      ctx
-    );
-    await expect(cmd.run()).rejects.toThrowError(
-      `This project is not configured for using remote version source. Add ${chalk.bold(
-        '{"cli": { "appVersionSource": "remote" }}'
-      )} in eas.json or re-run this command without "--non-interactive" flag.`
-    );
-  });
-});

packages/eas-cli/src/__tests__/commands/build-version-set-test.ts

@@ -1,207 +0,0 @@
-import fs from 'fs-extra';
-import path from 'path';
-
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-  withLocalVersionSource,
-  withRemoteVersionSource,
-} from './utils';
-import BuildVersionSetView from '../../commands/build/version/set';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log from '../../log';
-import { AppVersionSourceUpdateOption } from '../../project/remoteVersionSource';
-import * as prompts from '../../prompts';
-
-jest.mock('../../project/applicationIdentifier');
-jest.mock('../../graphql/queries/AppVersionQuery');
-jest.mock('../../graphql/queries/AppQuery');
-jest.mock('../../graphql/mutations/AppVersionMutation');
-jest.mock('fs');
-jest.mock('../../log');
-jest.mock('../../prompts');
-jest.mock('../../utils/json');
-
-describe(BuildVersionSetView, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('setting version for platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(AppVersionMutation.createAppVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      expect.objectContaining({
-        buildVersion: '1000',
-        storeVersion: '1.0.0',
-      })
-    );
-  });
-
-  test('setting version for platform android when the appVersionSource is not specified and the user chooses to set it to REMOTE', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(prompts.promptAsync).mockImplementationOnce(async () => ({
-      version: '1000',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_REMOTE);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(AppVersionMutation.createAppVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      expect.objectContaining({
-        buildVersion: '1000',
-        storeVersion: '1.0.0',
-      })
-    );
-  });
-
-  test('printing current remote version before prompting for a new one', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '100',
-      storeVersion: '1.0.0',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(Log.log).toHaveBeenCalledWith(expect.stringMatching('configured with versionCode 100'));
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-  });
-
-  test('printing info that there is no remote version configured', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-    expect(Log.log).toHaveBeenCalledWith(
-      expect.stringMatching('does not have any versionCode configured')
-    );
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-  });
-
-  test('setting version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('setting version aborts when the appVersionSource is not specified and the user chooses to set it to LOCAL, and they refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementationOnce(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('setting version when appVersionSource is set to local and user allows auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-
-  test('setting version when the appVersionSource is not specified and the user chooses to set it to LOCAL, and they allow auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementationOnce(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-
-  test('setting version aborts when the appVersionSource is not specified and the user chooses to configure manually', async () => {
-    const ctx = mockCommandContext(BuildVersionSetView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.ABORT);
-
-    const cmd = mockTestCommand(BuildVersionSetView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborted.');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-});

packages/eas-cli/src/__tests__/commands/build-version-sync-test.ts

@@ -1,271 +0,0 @@
-import { Workflow } from '@expo/eas-build-job';
-import fs from 'fs-extra';
-import path from 'path';
-
-import {
-  getMockAppFragment,
-  getMockEasJson,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-  withLocalVersionSource,
-  withRemoteVersionSource,
-} from './utils';
-import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../build/android/version';
-import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../build/ios/version';
-import BuildVersionSyncView from '../../commands/build/version/sync';
-import { Target } from '../../credentials/ios/types';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import { getAppBuildGradleAsync } from '../../project/android/gradleUtils';
-import { resolveTargetsAsync } from '../../project/ios/target';
-import { AppVersionSourceUpdateOption } from '../../project/remoteVersionSource';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import * as prompts from '../../prompts';
-
-jest.mock('../../build/android/version');
-jest.mock('../../build/ios/version');
-jest.mock('../../project/applicationIdentifier');
-jest.mock('../../graphql/queries/AppVersionQuery');
-jest.mock('../../graphql/queries/AppQuery');
-jest.mock('../../graphql/mutations/AppVersionMutation');
-jest.mock('../../project/workflow');
-jest.mock('../../project/android/gradleUtils');
-jest.mock('../../project/ios/target');
-jest.mock('../../project/ios/scheme');
-jest.mock('fs');
-jest.mock('../../log');
-jest.mock('../../prompts');
-jest.mock('../../utils/json');
-
-describe(BuildVersionSyncView, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  test('syncing version for managed project on platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(syncAndroidAsync).not.toHaveBeenCalled();
-  });
-
-  test('syncing version for managed project on platform android when appVersionSource is not set and the user chooses to set it to REMOTE', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementationOnce(async () => ({
-      version: '1000',
-    }));
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_REMOTE);
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(syncAndroidAsync).not.toHaveBeenCalled();
-  });
-
-  test('syncing version for bare project on platform android', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.GENERIC);
-    jest.mocked(getAppBuildGradleAsync).mockImplementation(async () => ({
-      android: {},
-    }));
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    const syncAndroidAsync = jest.spyOn(cmd, 'syncAndroidAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'ANDROID',
-      'eas.test.com'
-    );
-    expect(syncAndroidAsync).toHaveBeenCalled();
-    expect(updateAndroidNativeVersionsAsync).toHaveBeenCalledWith({
-      projectDir: ctx.projectDir,
-      versionCode: 1000,
-    });
-  });
-
-  test('syncing version for managed project on platform ios', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.MANAGED);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=ios'], ctx);
-    const syncIosAsync = jest.spyOn(cmd, 'syncIosAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'IOS',
-      'eas.test.com'
-    );
-    expect(syncIosAsync).not.toHaveBeenCalled();
-  });
-
-  test('syncing version for bare project on platform ios', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withRemoteVersionSource(getMockEasJson()),
-    });
-    const fakeTarget: Target = {
-      targetName: 'testapp',
-      bundleIdentifier: 'eas.test.com',
-      entitlements: {},
-    };
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => ({
-      buildVersion: '1000',
-      storeVersion: '0.0.1',
-    }));
-    jest.mocked(prompts.promptAsync).mockImplementation(async () => ({
-      version: '1000',
-    }));
-    jest.mocked(resolveWorkflowAsync).mockImplementation(async () => Workflow.GENERIC);
-    jest.mocked(resolveTargetsAsync).mockImplementation(async () => [fakeTarget]);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=ios'], ctx);
-    const syncIosAsync = jest.spyOn(cmd, 'syncIosAsync' as any);
-
-    await cmd.run();
-    expect(AppVersionQuery.latestVersionAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'IOS',
-      'eas.test.com'
-    );
-    expect(syncIosAsync).toHaveBeenCalled();
-    expect(updateIosNativeVersionsAsync).toHaveBeenCalledWith({
-      buildNumber: '1000',
-      projectDir: ctx.projectDir,
-      targets: [fakeTarget],
-    });
-  });
-
-  test('syncing version aborts when appVersionSource is set to local and users refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('syncing version aborts when appVersionSource is not set and the user chooses to set it to LOCAL, and they refuse auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => false);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborting...');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-
-  test('syncing version when appVersionSource is set to local and user allows auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {
-      easJson: withLocalVersionSource(getMockEasJson()),
-    });
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-
-  test('syncing version when appVersionSource is not set and the user chooses to set it to LOCAL and they allow auto configuration', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.SET_TO_LOCAL);
-    jest.mocked(prompts.confirmAsync).mockImplementation(async () => true);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await cmd.run();
-
-    const easJsonAfterCmd = await fs.readJson(path.join(ctx.projectDir, 'eas.json'));
-    expect(easJsonAfterCmd.cli.appVersionSource).toBe('remote');
-  });
-
-  test('syncing version aborts when appVersionSource is not set and the user chooses to configure manually', async () => {
-    const ctx = mockCommandContext(BuildVersionSyncView, {});
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockImplementation(async () => null);
-    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
-    jest
-      .mocked(prompts.selectAsync)
-      .mockImplementationOnce(async () => AppVersionSourceUpdateOption.ABORT);
-
-    const cmd = mockTestCommand(BuildVersionSyncView, ['--platform=android'], ctx);
-    await expect(cmd.run()).rejects.toThrowError('Aborted.');
-    expect(AppVersionMutation.createAppVersionAsync).not.toHaveBeenCalledWith();
-  });
-});

packages/eas-cli/src/__tests__/commands/utils.ts

@@ -1,170 +0,0 @@
-import { ExpoConfig } from '@expo/config-types';
-import { AppVersionSource, EasJson } from '@expo/eas-json';
-import { Command, Config } from '@oclif/core';
-import { vol } from 'memfs';
-import path from 'path';
-import { v4 as uuidv4 } from 'uuid';
-
-import { ContextInput, ContextOutput } from '../../commandUtils/EasCommand';
-import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
-import { AppFragment, Role } from '../../graphql/generated';
-
-export function getMockEasJson(): EasJson {
-  return {
-    cli: {},
-    build: {
-      production: {},
-    },
-  };
-}
-
-export const mockProjectId = 'fake-project-id';
-
-export function getMockAppFragment(): AppFragment {
-  return {
-    id: mockProjectId,
-    slug: 'testapp',
-    name: 'testapp',
-    fullName: '@testuser/testpp',
-    ownerAccount: {
-      id: 'test-account-id',
-      name: 'testuser',
-      users: [
-        {
-          role: Role.Owner,
-          actor: {
-            id: 'test-user-id',
-          },
-        },
-      ],
-    },
-  };
-}
-
-export function getMockExpoConfig(): ExpoConfig {
-  return {
-    name: 'testapp',
-    slug: 'tetsapp',
-    extra: {
-      projectId: mockProjectId,
-    },
-  };
-}
-
-export interface LocalProjectContext {
-  projectDir: string;
-  exp?: ExpoConfig;
-  appId?: string;
-}
-
-export function mockCommandContext<
-  C extends {
-    [name: string]: any;
-  } = object,
->(
-  commandClass: { contextDefinition: ContextInput<C> },
-  overrides: {
-    easJson?: EasJson;
-    exp?: ExpoConfig;
-    projectId?: string;
-    getDynamicPrivateProjectConfigAsync?: DynamicConfigContextFn;
-    getDynamicPublicProjectConfigAsync?: DynamicConfigContextFn;
-  }
-): ContextOutput<C> {
-  const projectDir = path.join('/test', uuidv4());
-  vol.reset();
-  vol.fromJSON({ 'eas.json': JSON.stringify(overrides.easJson ?? getMockEasJson()) }, projectDir);
-  const contextDefinition = commandClass.contextDefinition;
-
-  const result: any = {};
-  for (const [contextKey] of Object.entries(contextDefinition)) {
-    if (contextKey === 'loggedIn') {
-      result.loggedIn = {};
-    }
-
-    if (contextKey === 'projectDir') {
-      result.projectDir = projectDir;
-    }
-    if (contextKey === 'maybeLoggedIn') {
-      result.maybeLoggedIn = {};
-    }
-    if (contextKey === 'sessionManager') {
-      result.sessionManager = {};
-    }
-    if (contextKey === 'projectConfig') {
-      result.projectConfig = {
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      };
-    }
-    if (contextKey === 'getDynamicPrivateProjectConfigAsync') {
-      result.getDynamicPrivateProjectConfigAsync = () => ({
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      });
-    }
-
-    if (contextKey === 'getDynamicPublicProjectConfigAsync') {
-      result.getDynamicPublicProjectConfigAsync = () => ({
-        exp: overrides.exp ?? getMockExpoConfig(),
-        projectId: overrides.projectId ?? mockProjectId,
-        projectDir,
-      });
-    }
-  }
-  return result;
-}
-
-export function mockTestCommand<T extends Command>(
-  commandConstructor: new (argv: string[], config: Config) => T,
-  argv: string[],
-  ctx: any
-): T {
-  const cmd = new commandConstructor(argv, new Config({ root: __dirname }));
-  (cmd as any).getContextAsync = jest.fn(() => ctx);
-  return cmd;
-}
-
-export class NoErrorThrownError extends Error {}
-
-export const getErrorAsync = async <TError = any>(
-  call: () => unknown
-): Promise<TError | NoErrorThrownError> => {
-  try {
-    await call();
-    throw new NoErrorThrownError();
-  } catch (error: unknown) {
-    return error as TError;
-  }
-};
-
-export const getError = <TError = any>(call: () => unknown): TError | NoErrorThrownError => {
-  try {
-    call();
-    throw new NoErrorThrownError();
-  } catch (error: unknown) {
-    return error as TError;
-  }
-};
-
-export function withRemoteVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.REMOTE,
-    },
-  };
-}
-
-export function withLocalVersionSource(easJson: EasJson): EasJson {
-  return {
-    ...easJson,
-    cli: {
-      ...easJson.cli,
-      appVersionSource: AppVersionSource.LOCAL,
-    },
-  };
-}

packages/eas-cli/src/__tests__/project-utils.ts

@@ -0,0 +1,60 @@
+import { Actor } from '../user/User';
+
+interface MockProject {
+  projectRoot: string;
+  projectTree: Record<string, string>;
+  appJSON: AppJSON;
+  packageJSON: PackageJSON;
+}
+
+interface PackageJSON {
+  name: string;
+  version: string;
+  description: string;
+  main: string;
+}
+
+interface AppJSON {
+  expo: {
+    name: string;
+    version: string;
+    slug: string;
+    sdkVersion: string;
+    owner?: string;
+    [key: string]: any;
+  };
+}
+
+export function createTestProject(
+  user: Actor,
+  appJSONExtraData?: Record<string, object | string>
+): MockProject {
+  const projectRoot = '/test-project';
+  const packageJSON: PackageJSON = {
+    name: 'testing123',
+    version: '0.1.0',
+    description: 'fake description',
+    main: 'index.js',
+  };
+
+  const owner = appJSONExtraData?.owner as string | undefined;
+  const appJSON: AppJSON = {
+    expo: {
+      name: 'testing 123',
+      version: '0.1.0',
+      slug: 'testing-123',
+      sdkVersion: '33.0.0',
+      owner: owner ?? (user.__typename === 'User' ? user.username : undefined),
+      ...appJSONExtraData,
+    },
+  };
+  return {
+    appJSON,
+    packageJSON,
+    projectRoot,
+    projectTree: {
+      [projectRoot + '/package.json']: JSON.stringify(packageJSON, null, 2),
+      [projectRoot + '/app.json']: JSON.stringify(appJSON, null, 2),
+    },
+  };
+}

packages/eas-cli/src/__tests__/utils.ts

@@ -0,0 +1,3 @@
+export function asMock(fn: any): jest.Mock {
+  return fn as jest.Mock;
+}

packages/eas-cli/src/analytics.ts

@@ -0,0 +1,135 @@
+import RudderAnalytics from '@expo/rudder-sdk-node';
+import os from 'os';
+import { URL } from 'url';
+import { v4 as uuidv4 } from 'uuid';
+
+import UserSettings from './user/UserSettings';
+
+/**
+ * We use require() to exclude package.json from TypeScript's analysis since it lives outside
+ * the src directory and would change the directory structure of the emitted files
+ * under the build directory
+ */
+const packageJSON = require('../package.json');
+
+const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
+  darwin: 'Mac',
+  win32: 'Windows',
+  linux: 'Linux',
+};
+
+let rudderstackClient: RudderAnalytics | null = null;
+let userIdentified = false;
+let identifyData: {
+  userId: string;
+  deviceId: string;
+  traits: Record<string, any>;
+} | null = null;
+
+export async function initAsync(): Promise<void> {
+  // TODO: remove after some time
+  const amplitudeEnabled = await UserSettings.getAsync('amplitudeEnabled', null);
+  if (amplitudeEnabled !== null) {
+    await UserSettings.setAsync('analyticsEnabled', amplitudeEnabled);
+    await UserSettings.deleteKeyAsync('amplitudeEnabled');
+  }
+  const amplitudeDeviceId = await UserSettings.getAsync('amplitudeDeviceId', null);
+  if (amplitudeDeviceId !== null) {
+    await UserSettings.setAsync('analyticsDeviceId', amplitudeDeviceId);
+    await UserSettings.deleteKeyAsync('amplitudeDeviceId');
+  }
+  // TODO: cut here
+  if (process.env.DISABLE_EAS_ANALYTICS) {
+    await UserSettings.setAsync('analyticsEnabled', false);
+  }
+
+  const analyticsEnabled = await UserSettings.getAsync('analyticsEnabled', true);
+  if (analyticsEnabled) {
+    const config =
+      process.env.EXPO_STAGING || process.env.EXPO_LOCAL
+        ? {
+            // staging environment
+            rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          }
+        : {
+            // prod environment
+            rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
+            rudderstackDataPlaneURL: 'https://cdp.expo.dev',
+          };
+
+    rudderstackClient = new RudderAnalytics(
+      config.rudderstackWriteKey,
+      new URL('/v1/batch', config.rudderstackDataPlaneURL).toString(),
+      {
+        flushInterval: 300,
+      }
+    );
+  }
+}
+
+export async function setUserDataAsync(userId: string, traits: Record<string, any>): Promise<void> {
+  const savedDeviceId = await UserSettings.getAsync('analyticsDeviceId', null);
+  const deviceId = savedDeviceId ?? uuidv4();
+  if (!savedDeviceId) {
+    await UserSettings.setAsync('analyticsDeviceId', deviceId);
+  }
+
+  identifyData = {
+    userId,
+    deviceId,
+    traits,
+  };
+
+  ensureUserIdentified();
+}
+
+export async function flushAsync(): Promise<void> {
+  if (rudderstackClient) {
+    await rudderstackClient.flush();
+  }
+}
+
+export function logEvent(name: string, properties: Record<string, any> = {}): void {
+  if (!rudderstackClient) {
+    return;
+  }
+  ensureUserIdentified();
+
+  const { userId, deviceId } = identifyData ?? {};
+  const commonEventProperties = { source_version: packageJSON?.version, source: 'eas cli' };
+
+  const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
+  rudderstackClient.track({
+    event: name,
+    properties: { ...properties, ...commonEventProperties },
+    ...identity,
+    context: getRudderStackContext(),
+  });
+}
+
+function ensureUserIdentified(): void {
+  if (!rudderstackClient || userIdentified || !identifyData) {
+    return;
+  }
+
+  rudderstackClient.identify({
+    userId: identifyData.userId,
+    anonymousId: identifyData.deviceId,
+    traits: identifyData.traits,
+  });
+  userIdentified = true;
+}
+
+function getRudderStackContext(): Record<string, any> {
+  const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
+  return {
+    os: { name: platform, version: os.release() },
+    device: { type: platform, model: platform },
+    app: { name: 'eas cli', version: packageJSON?.version ?? undefined },
+  };
+}
+
+export enum AnalyticsEvent {
+  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
+}

packages/eas-cli/src/analytics/AnalyticsManager.ts

@@ -1,234 +0,0 @@
-import RudderAnalytics from '@expo/rudder-sdk-node';
-import os from 'os';
-import { URL } from 'url';
-import { v4 as uuidv4 } from 'uuid';
-
-import { Actor, getActorDisplayName } from '../user/User';
-import UserSettings from '../user/UserSettings';
-import { easCliVersion } from '../utils/easCli';
-
-const PLATFORM_TO_ANALYTICS_PLATFORM: Partial<Record<NodeJS.Platform, string>> = {
-  darwin: 'Mac',
-  win32: 'Windows',
-  linux: 'Linux',
-};
-
-export type AnalyticsEvent = CommandEvent | BuildEvent | SubmissionEvent | MetadataEvent;
-
-export enum CommandEvent {
-  ACTION = 'action', // generic event type which is used to determine the 'daily active user' stat, include an `action: eas ${subcommand}` property inside of the event properties object
-}
-
-export enum SubmissionEvent {
-  SUBMIT_COMMAND = 'submit cli submit command',
-  SUBMIT_COMMAND_ATTEMPT = 'submit cli attempt',
-  SUBMIT_COMMAND_SUCCESS = 'submit cli success',
-  SUBMIT_COMMAND_FAIL = 'submit cli fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'submit cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'submit cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'submit cli gather credentials fail',
-  GATHER_ARCHIVE_ATTEMPT = 'submit cli gather archive attempt',
-  GATHER_ARCHIVE_SUCCESS = 'submit cli gather archive success',
-  GATHER_ARCHIVE_FAIL = 'submit cli gather archive fail',
-  SUBMIT_REQUEST_ATTEMPT = 'submit cli request attempt',
-  SUBMIT_REQUEST_SUCCESS = 'submit cli request success',
-  SUBMIT_REQUEST_FAIL = 'submit cli request fail',
-  API_KEY_DOWNLOAD_FAIL = 'submit cli credentials api key download fail',
-  API_KEY_DOWNLOAD_RETRY = 'submit cli credentials api key download fail temporary',
-  API_KEY_DOWNLOAD_SUCCESS = 'submit cli credentials api key download succeed',
-}
-
-export enum BuildEvent {
-  BUILD_COMMAND = 'build cli build command',
-  PROJECT_UPLOAD_ATTEMPT = 'build cli project upload attempt',
-  PROJECT_UPLOAD_SUCCESS = 'build cli project upload success',
-  PROJECT_UPLOAD_FAIL = 'build cli project upload fail',
-  GATHER_CREDENTIALS_ATTEMPT = 'build cli gather credentials attempt',
-  GATHER_CREDENTIALS_SUCCESS = 'build cli gather credentials success',
-  GATHER_CREDENTIALS_FAIL = 'build cli gather credentials fail',
-  CONFIGURE_PROJECT_ATTEMPT = 'build cli configure project attempt',
-  CONFIGURE_PROJECT_SUCCESS = 'build cli configure project success',
-  CONFIGURE_PROJECT_FAIL = 'build cli configure project fail',
-  BUILD_REQUEST_ATTEMPT = 'build cli build request attempt',
-  BUILD_REQUEST_SUCCESS = 'build cli build request success',
-  BUILD_REQUEST_FAIL = 'build cli build request fail',
-
-  BUILD_STATUS_COMMAND = 'build cli build status',
-
-  CREDENTIALS_SYNC_COMMAND = 'build cli credentials sync command',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = 'build cli credentials sync update local attempt',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = 'build cli credentials sync update local success',
-  CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = 'build cli credentials sync update local fail',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = 'build cli credentials sync update remote attempt',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = 'build cli credentials sync update remote success',
-  CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = 'build cli credentials sync update remote fail',
-
-  ANDROID_KEYSTORE_CREATE = 'build cli credentials keystore create',
-}
-
-export enum MetadataEvent {
-  APPLE_METADATA_DOWNLOAD = 'metadata cli download apple response',
-  APPLE_METADATA_UPLOAD = 'metadata cli upload apple response',
-}
-
-export type AnalyticsEventProperties = Record<string, string | number | boolean>;
-
-/**
- * The interface for commands to use to log events to analytics.
- */
-export interface Analytics {
-  logEvent(name: AnalyticsEvent, properties: AnalyticsEventProperties): void;
-}
-
-/**
- * The interface for commands to use to orchestrate the analytics system. Should only be necessary to use
- * this within EASCommand.
- */
-export interface AnalyticsWithOrchestration extends Analytics {
-  setActor(actor: Actor): void;
-  flushAsync(): Promise<void>;
-}
-
-const USER_SETTINGS_KEY_AMPLITUDE_ENABLED = 'amplitudeEnabled';
-const USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID = 'amplitudeDeviceId';
-const USER_SETTINGS_KEY_ANALYTICS_ENABLED = 'analyticsEnabled';
-const USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID = 'analyticsDeviceId';
-
-/**
- * Sets the user's analytics enabled preference. Note that this will only take effect
- * upon the next run of the CLI.
- */
-export async function setAnalyticsEnabledAsync(enabled: boolean): Promise<void> {
-  await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, enabled);
-}
-
-/**
- * Returns the user's analytics enabled preference.
- */
-export async function getAnalyticsEnabledAsync(): Promise<boolean> {
-  const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, null);
-  return !!analyticsEnabled;
-}
-
-/**
- * Create an instance of Analytics based on the user's analytics enabled preferences.
- */
-export async function createAnalyticsAsync(): Promise<AnalyticsWithOrchestration> {
-  // TODO: remove after some time
-  const amplitudeEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_AMPLITUDE_ENABLED, null);
-  if (amplitudeEnabled !== null) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, amplitudeEnabled);
-    await UserSettings.deleteKeyAsync(USER_SETTINGS_KEY_AMPLITUDE_ENABLED);
-  }
-  const amplitudeDeviceId = await UserSettings.getAsync(
-    USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID,
-    null
-  );
-  if (amplitudeDeviceId !== null) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID, amplitudeDeviceId);
-    await UserSettings.deleteKeyAsync(USER_SETTINGS_KEY_AMPLITUDE_DEVICE_ID);
-  }
-
-  if (process.env.DISABLE_EAS_ANALYTICS) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, false);
-  }
-
-  const analyticsEnabled =
-    !process.env.https_proxy && // disable analytics if running behind proxy
-    (await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true));
-  if (!analyticsEnabled) {
-    return new NoOpAnalytics();
-  }
-
-  const persistedDeviceId = await UserSettings.getAsync(
-    USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID,
-    null
-  );
-  const deviceId = persistedDeviceId ?? uuidv4();
-  if (!persistedDeviceId) {
-    await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_DEVICE_ID, deviceId);
-  }
-  return new RudderstackAnalytics(deviceId);
-}
-
-class NoOpAnalytics implements AnalyticsWithOrchestration {
-  logEvent(): void {}
-  setActor(): void {}
-  async flushAsync(): Promise<void> {}
-}
-
-const RudderstackAnalyticsConfig =
-  process.env.EXPO_STAGING || process.env.EXPO_LOCAL
-    ? {
-        // staging environment
-        rudderstackWriteKey: '1wpX20Da4ltFGSXbPFYUL00Chb7',
-        rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-      }
-    : {
-        // prod environment
-        rudderstackWriteKey: '1wpXLFxmujq86etH6G6cc90hPcC',
-        rudderstackDataPlaneURL: 'https://cdp.expo.dev',
-      };
-
-class RudderstackAnalytics implements AnalyticsWithOrchestration {
-  private readonly rudderstackClient = new RudderAnalytics(
-    RudderstackAnalyticsConfig.rudderstackWriteKey,
-    new URL('/v1/batch', RudderstackAnalyticsConfig.rudderstackDataPlaneURL).toString(),
-    {
-      flushInterval: 300,
-    }
-  );
-
-  private identifiedActor: Actor | null = null;
-
-  constructor(private readonly persistentDeviceId: string) {
-    // identify once with just anonymous ID. Once the actor is fetched, re-indentify with
-    // both so that they can be associated
-    this.rudderstackClient.identify({
-      anonymousId: persistentDeviceId,
-    });
-  }
-
-  public setActor(actor: Actor): void {
-    if (this.identifiedActor) {
-      return;
-    }
-
-    this.rudderstackClient.identify({
-      userId: actor.id,
-      anonymousId: this.persistentDeviceId,
-      traits: {
-        username: getActorDisplayName(actor),
-        user_id: actor.id,
-        user_type: actor.__typename,
-      },
-    });
-    this.identifiedActor = actor;
-  }
-
-  public logEvent(name: AnalyticsEvent, properties: AnalyticsEventProperties): void {
-    const userId = this.identifiedActor?.id;
-    const deviceId = this.persistentDeviceId;
-    const commonEventProperties = { source_version: easCliVersion, source: 'eas cli' };
-    const identity = { userId: userId ?? undefined, anonymousId: deviceId ?? uuidv4() };
-    this.rudderstackClient.track({
-      event: name,
-      properties: { ...properties, ...commonEventProperties },
-      ...identity,
-      context: this.getRudderStackContext(),
-    });
-  }
-
-  public async flushAsync(): Promise<void> {
-    await this.rudderstackClient.flush();
-  }
-
-  private getRudderStackContext(): Record<string, any> {
-    const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os.platform()] || os.platform();
-    return {
-      os: { name: platform, version: os.release() },
-      device: { type: platform, model: platform },
-      app: { name: 'eas cli', version: easCliVersion ?? undefined },
-    };
-  }
-}

packages/eas-cli/src/analytics/common.ts

@@ -1,30 +0,0 @@
-import { Analytics, AnalyticsEvent, AnalyticsEventProperties } from './AnalyticsManager';
-
-export async function withAnalyticsAsync<Result>(
-  analytics: Analytics,
-  fn: () => Promise<Result>,
-  {
-    attemptEvent,
-    successEvent,
-    failureEvent,
-    properties,
-  }: {
-    attemptEvent: AnalyticsEvent;
-    successEvent: AnalyticsEvent;
-    failureEvent: AnalyticsEvent;
-    properties: AnalyticsEventProperties;
-  }
-): Promise<Result> {
-  try {
-    analytics.logEvent(attemptEvent, properties);
-    const result = await fn();
-    analytics.logEvent(successEvent, properties);
-    return result;
-  } catch (error: any) {
-    analytics.logEvent(failureEvent, {
-      ...properties,
-      reason: error.message,
-    });
-    throw error;
-  }
-}

packages/eas-cli/src/api.ts

@@ -1,87 +1,50 @@
-import { JSONValue } from '@expo/json-file';
+import got, { HTTPError, NormalizedOptions, RequestError } from 'got';
 
-import { ApiV2Error } from './ApiV2Error';
-import fetch, { RequestError, RequestInit } from './fetch';
+import ApiV2Error from './ApiV2Error';
+import { getAccessToken, getSessionSecret } from './user/sessionStorage';
 
-interface RequestOptions {
-  body: JSONValue;
-}
-
-export class ApiV2Client {
-  constructor(
-    private readonly authInfo: {
-      accessToken: string | null;
-      sessionSecret: string | null;
-    }
-  ) {}
-
-  public async putAsync(path: string, options: RequestOptions): Promise<any> {
-    return await this.requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
-  }
-
-  public async postAsync(path: string, options: RequestOptions): Promise<any> {
-    return await this.requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
-  }
-
-  public async deleteAsync(path: string): Promise<any> {
-    return await this.requestAsync(path, { method: 'DELETE' });
-  }
-
-  public async getAsync(path: string): Promise<any> {
-    return await this.requestAsync(path, { method: 'GET' });
-  }
-
-  private getAuthHeaders(): Record<string, string> {
-    const token = this.authInfo.accessToken;
-    if (token) {
-      return { authorization: `Bearer ${token}` };
-    }
-    const sessionSecret = this.authInfo.sessionSecret;
-    if (sessionSecret) {
-      return { 'expo-session': sessionSecret };
-    }
-    return {};
-  }
-
-  private async requestAsync(path: string, options: RequestInit): Promise<any> {
-    try {
-      const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
-        ...options,
-        headers: {
-          'Content-Type': 'application/json',
-          ...this.getAuthHeaders(),
-        },
-      });
-      return await response.json();
-    } catch (err) {
-      await ApiV2Client.handleApiErrorAsync(err);
-    }
-  }
-
-  private static async handleApiErrorAsync(err: any): Promise<void> {
-    if (err instanceof RequestError) {
-      let result: { [key: string]: any };
-      try {
-        result = (await err.response.json()) as { [key: string]: any };
-      } catch {
-        throw new Error(`Malformed api response: ${await err.response.text()}`);
-      }
-      if (result.errors?.length) {
-        throw new ApiV2Error(result.errors[0]);
-      }
-    } else {
-      throw err;
-    }
-  }
-}
+export const apiClient = got.extend({
+  prefixUrl: getExpoApiBaseUrl() + '/--/api/v2/',
+  hooks: {
+    beforeRequest: [
+      (options: NormalizedOptions) => {
+        const token = getAccessToken();
+        if (token) {
+          options.headers.authorization = `Bearer ${token}`;
+          return;
+        }
+        const sessionSecret = getSessionSecret();
+        if (sessionSecret) {
+          options.headers['expo-session'] = sessionSecret;
+        }
+      },
+    ],
+    beforeError: [
+      (error: RequestError): RequestError => {
+        if (error instanceof HTTPError) {
+          let result: { [key: string]: any };
+          try {
+            result = JSON.parse(error.response.body as string);
+          } catch (e2) {
+            return error;
+          }
+          if (result.errors?.length) {
+            return new ApiV2Error(error, result.errors[0]);
+          }
+        }
+        return error;
+      },
+    ],
+  },
+});
 
 export function getExpoApiBaseUrl(): string {
   if (process.env.EXPO_STAGING) {
-    return `https://staging-api.expo.dev`;
+    return `https://staging.exp.host`;
   } else if (process.env.EXPO_LOCAL) {
     return `http://127.0.0.1:3000`;
   } else {
-    return `https://api.expo.dev`;
+    return `https://exp.host`;
   }
 }
 
@@ -94,13 +57,3 @@ export function getExpoWebsiteBaseUrl(): string {
     return `https://expo.dev`;
   }
 }
-
-export function getEASUpdateURL(projectId: string): string {
-  if (process.env.EXPO_STAGING) {
-    return new URL(projectId, `https://staging-u.expo.dev`).href;
-  } else if (process.env.EXPO_LOCAL) {
-    return new URL(`expo-updates/${projectId}`, `http://127.0.0.1:3000`).href;
-  } else {
-    return new URL(projectId, `https://u.expo.dev`).href;
-  }
-}

packages/eas-cli/src/branch/__tests__/fixtures.ts

@@ -1,12 +0,0 @@
-import { UpdateBranchBasicInfoFragment } from '../../graphql/generated';
-
-export const testBasicBranchInfo: UpdateBranchBasicInfoFragment = {
-  id: 'c4fec95d-7ab1-4d35-bfe6-fe7ff05beda9',
-  name: 'development',
-  __typename: 'UpdateBranch',
-};
-export const testBasicBranchInfo2: UpdateBranchBasicInfoFragment = {
-  id: '43ccb8a4-8aaa-47f0-9790-dcc80933441b',
-  name: 'preview',
-  __typename: 'UpdateBranch',
-};

packages/eas-cli/src/branch/actions/SelectBranch.ts

@@ -1,107 +0,0 @@
-import { EASUpdateAction, EASUpdateContext, NonInteractiveError } from '../../eas-update/utils';
-import { UpdateBranchBasicInfoFragment } from '../../graphql/generated';
-import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import {
-  Connection,
-  Edge,
-  FilterPagination,
-  QueryParams,
-  selectPaginatedAsync,
-} from '../../utils/relay';
-
-/**
- * Select a branch for the project.
- *
- * @constructor
- * @param {function} options.filterPredicate - A predicate to filter the branches that are shown to the user. It takes a branchInfo object as a parameter and returns a boolean.
- * @param {string} options.printedType - The type of branch printed to the user. Defaults to 'branch'.
- * @param {number} options.pageSize - The number of branches to show per page. Defaults to 100.
- * @param {function} options.beforeEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called before each query.
- * @args externalQueryParams The query params for the pagination.
- * @args totalNodesFetched The total number of nodes fetched so far.
- * @args dataset The dataset so far.
- * @param {function} options.afterEachFilterQuery Optional. If a filter predicate was specified, this callback function will be called after each query.
- * @args externalQueryParams The query params for the pagination.
- * @args totalNodesFetched The total number of nodes fetched so far.
- * @args dataset The dataset so far.
- * @args willFetchAgain If the query will fetch again to get a complete page.
- */
-export class SelectBranch implements EASUpdateAction<UpdateBranchBasicInfoFragment | null> {
-  constructor(
-    private readonly options: {
-      filterPredicate?: (branchInfo: UpdateBranchBasicInfoFragment) => boolean;
-      printedType?: string;
-      pageSize?: number;
-      beforeEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateBranchBasicInfoFragment>[]
-      ) => void;
-      afterEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateBranchBasicInfoFragment>[],
-        willFetchAgain: boolean
-      ) => void;
-    } = {}
-  ) {}
-
-  async queryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams
-  ): Promise<Connection<UpdateBranchBasicInfoFragment>> {
-    const { graphqlClient, app } = ctx;
-    const { projectId } = app;
-    return await BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync(graphqlClient, {
-      appId: projectId,
-      ...queryParams,
-    });
-  }
-
-  async filterQueryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams,
-    filterPredicate: (branchInfo: UpdateBranchBasicInfoFragment) => boolean
-  ): Promise<Connection<UpdateBranchBasicInfoFragment>> {
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateBranchBasicInfoFragment>> =>
-      await this.queryAsync(ctx, queryParams);
-    return await FilterPagination.getPageAsync({
-      queryParams,
-      queryAsync,
-      filterPredicate,
-      beforeEachQuery: this.options.beforeEachFilterQuery,
-      afterEachQuery: this.options.afterEachFilterQuery,
-    });
-  }
-
-  public async runAsync(ctx: EASUpdateContext): Promise<UpdateBranchBasicInfoFragment | null> {
-    const { nonInteractive } = ctx;
-    const { filterPredicate } = this.options;
-    const printedType = this.options.printedType ?? 'branch';
-    const pageSize = this.options.pageSize ?? 100;
-    if (nonInteractive) {
-      throw new NonInteractiveError(
-        `${printedType} selection cannot be run in non-interactive mode.`
-      );
-    }
-
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateBranchBasicInfoFragment>> =>
-      filterPredicate
-        ? await this.filterQueryAsync(ctx, queryParams, filterPredicate)
-        : await this.queryAsync(ctx, queryParams);
-
-    const getTitleAsync = async (branchInfo: UpdateBranchBasicInfoFragment): Promise<string> =>
-      branchInfo.name;
-
-    return await selectPaginatedAsync({
-      queryAsync,
-      getTitleAsync,
-      printedType,
-      pageSize,
-    });
-  }
-}

packages/eas-cli/src/branch/actions/__tests__/SelectBranch-test.ts

@@ -1,92 +0,0 @@
-import { createCtxMock } from '../../../eas-update/__tests__/fixtures';
-import { NonInteractiveError } from '../../../eas-update/utils';
-import { UpdateBranchBasicInfoFragment } from '../../../graphql/generated';
-import { BranchQuery } from '../../../graphql/queries/BranchQuery';
-import { promptAsync } from '../../../prompts';
-import { testBasicBranchInfo, testBasicBranchInfo2 } from '../../__tests__/fixtures';
-import { SelectBranch } from '../SelectBranch';
-
-jest.mock('../../../prompts');
-jest.mock('../../../graphql/queries/BranchQuery');
-describe(SelectBranch, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  it('returns null if project has no branchs', async () => {
-    const ctx = createCtxMock();
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    const selectBranch = new SelectBranch();
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBeNull();
-  });
-  it('still prompts if project has only one branch', async () => {
-    const ctx = createCtxMock();
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [{ node: testBasicBranchInfo, cursor: 'cursor' }],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
-      item: testBasicBranchInfo,
-    }));
-    const selectBranch = new SelectBranch();
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBe(testBasicBranchInfo);
-    expect(promptAsync).toHaveBeenCalledTimes(1);
-  });
-  it('returns the selected branch', async () => {
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [
-        { node: testBasicBranchInfo, cursor: 'cursor' },
-        { node: testBasicBranchInfo2, cursor: 'cursor' },
-      ],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    jest.mocked(promptAsync).mockImplementation(async () => ({
-      item: testBasicBranchInfo,
-    }));
-    const ctx = createCtxMock();
-    const selectBranch = new SelectBranch();
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBe(testBasicBranchInfo);
-  });
-  it('returns the only available branch with a filter', async () => {
-    jest.mocked(BranchQuery.listBranchesBasicInfoPaginatedOnAppAsync).mockResolvedValue({
-      edges: [
-        { node: testBasicBranchInfo, cursor: 'cursor' },
-        { node: testBasicBranchInfo2, cursor: 'cursor' },
-      ],
-      pageInfo: {
-        hasPreviousPage: false,
-        hasNextPage: false,
-      },
-    });
-    const ctx = createCtxMock();
-    const selectBranch = new SelectBranch({
-      filterPredicate: (branchInfo: UpdateBranchBasicInfoFragment) =>
-        branchInfo === testBasicBranchInfo,
-    });
-    const branch = await selectBranch.runAsync(ctx);
-    expect(branch).toBe(testBasicBranchInfo);
-  });
-  it('throws an error in Non-Interactive Mode', async () => {
-    const ctx = createCtxMock({
-      nonInteractive: true,
-    });
-    const selectBranch = new SelectBranch();
-
-    // dont fail if users are running in non-interactive mode
-    await expect(selectBranch.runAsync(ctx)).rejects.toThrowError(NonInteractiveError);
-  });
-});

packages/eas-cli/src/branch/queries.ts

@@ -1,186 +0,0 @@
-import chalk from 'chalk';
-import gql from 'graphql-tag';
-
-import { BranchNotFoundError } from './utils';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { withErrorHandlingAsync } from '../graphql/client';
-import {
-  CreateUpdateBranchForAppMutation,
-  CreateUpdateBranchForAppMutationVariables,
-  UpdateBranch,
-  UpdateBranchFragment,
-} from '../graphql/generated';
-import { BranchQuery } from '../graphql/queries/BranchQuery';
-import Log from '../log';
-import { formatBranch, getBranchDescription } from '../update/utils';
-import { printJsonOnlyOutput } from '../utils/json';
-import {
-  SelectPromptEntry,
-  paginatedQueryWithConfirmPromptAsync,
-  paginatedQueryWithSelectPromptAsync,
-} from '../utils/queries';
-
-export const BRANCHES_LIMIT = 50;
-
-export async function selectBranchOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    promptTitle,
-    displayTextForListItem,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    displayTextForListItem: (queryItem: UpdateBranchFragment) => SelectPromptEntry;
-    promptTitle: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<UpdateBranchFragment> {
-  if (paginatedQueryOptions.nonInteractive) {
-    throw new Error('Unable to select a branch in non-interactive mode.');
-  }
-
-  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
-    limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
-    offset: paginatedQueryOptions.offset,
-    queryToPerform: (limit, offset) =>
-      queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
-    promptOptions: {
-      title: promptTitle,
-      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      makePartialChoiceObject: displayTextForListItem,
-    },
-  });
-  if (!selectedBranch) {
-    throw new Error(`Could not find any branches for project "${projectId}"`);
-  }
-  return selectedBranch;
-}
-
-export async function listAndRenderBranchesOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<void> {
-  if (paginatedQueryOptions.nonInteractive) {
-    const branches = await queryBranchesOnProjectAsync(
-      graphqlClient,
-      paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
-      paginatedQueryOptions.offset,
-      projectId
-    );
-    renderPageOfBranches(branches, paginatedQueryOptions);
-  } else {
-    await paginatedQueryWithConfirmPromptAsync({
-      limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
-      offset: paginatedQueryOptions.offset,
-      queryToPerform: (limit, offset) =>
-        queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
-      promptOptions: {
-        title: 'Load more branches?',
-        renderListItems: branches => {
-          renderPageOfBranches(branches, paginatedQueryOptions);
-        },
-      },
-    });
-  }
-}
-
-async function queryBranchesOnProjectAsync(
-  graphqlClient: ExpoGraphqlClient,
-  limit: number,
-  offset: number,
-  projectId: string
-): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesOnAppAsync(graphqlClient, {
-    appId: projectId,
-    limit,
-    offset,
-  });
-}
-
-function renderPageOfBranches(
-  currentPage: UpdateBranchFragment[],
-  { json }: PaginatedQueryOptions
-): void {
-  if (json) {
-    printJsonOnlyOutput(currentPage);
-  } else {
-    Log.addNewLineIfNone();
-    Log.log(chalk.bold('Branches:'));
-    Log.addNewLineIfNone();
-    Log.log(
-      currentPage
-        .map(branch => formatBranch(getBranchDescription(branch)))
-        .join(`\n\n${chalk.dim('———')}\n\n`)
-    );
-  }
-}
-
-export async function createUpdateBranchOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { appId, name }: CreateUpdateBranchForAppMutationVariables
-): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
-  const result = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
-        gql`
-          mutation CreateUpdateBranchForApp($appId: ID!, $name: String!) {
-            updateBranch {
-              createUpdateBranchForApp(appId: $appId, name: $name) {
-                id
-                name
-              }
-            }
-          }
-        `,
-        {
-          appId,
-          name,
-        }
-      )
-      .toPromise()
-  );
-  const newBranch = result.updateBranch.createUpdateBranchForApp;
-  if (!newBranch) {
-    throw new Error(`Could not create branch ${name}.`);
-  }
-  return newBranch;
-}
-
-export async function ensureBranchExistsAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    appId,
-    branchName,
-  }: {
-    appId: string;
-    branchName: string;
-  }
-): Promise<{ branchId: string; createdBranch: boolean }> {
-  try {
-    const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
-      appId,
-      name: branchName,
-    });
-
-    const { id } = updateBranch;
-    return { branchId: id, createdBranch: false };
-  } catch (error) {
-    if (error instanceof BranchNotFoundError) {
-      const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
-        appId,
-        name: branchName,
-      });
-      return { branchId: newUpdateBranch.id, createdBranch: true };
-    } else {
-      throw error;
-    }
-  }
-}

packages/eas-cli/src/branch/utils.ts

@@ -1,13 +0,0 @@
-import { Client } from '../vcs/vcs';
-
-export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string> {
-  return (
-    (await vcsClient.getBranchNameAsync()) || `branch-${Math.random().toString(36).substring(2, 4)}`
-  );
-}
-
-export class BranchNotFoundError extends Error {
-  constructor(message?: string) {
-    super(message ?? 'Branch not found.');
-  }
-}

packages/eas-cli/src/build/__tests__/cancel-test.ts

@@ -1,90 +0,0 @@
-import { instance, mock } from 'ts-mockito';
-import { v4 as uuid } from 'uuid';
-
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { selectBuildToCancelAsync } from '../../commands/build/cancel';
-import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { confirmAsync, selectAsync } from '../../prompts';
-
-jest.mock('../../ora', () => ({
-  ora: jest.fn().mockImplementation(() => ({
-    start: jest.fn().mockImplementation(() => ({
-      stop: jest.fn(),
-      fail: jest.fn(),
-    })),
-  })),
-}));
-jest.mock('../../prompts', () => {
-  return {
-    selectAsync: jest.fn(),
-    confirmAsync: jest.fn(),
-  };
-});
-
-jest.mock('../../graphql/queries/BuildQuery', () => {
-  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
-  return {
-    BuildQuery: {
-      ...actual.BuildQuery,
-      viewBuildsOnAppAsync: jest.fn(),
-    },
-  };
-});
-
-describe(selectBuildToCancelAsync.name, () => {
-  const selectedBuildId = uuid();
-  const projectId = uuid();
-
-  beforeEach(() => {
-    jest
-      .mocked(BuildQuery.viewBuildsOnAppAsync)
-      .mockImplementation(async () => [
-        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
-      ]);
-  });
-
-  it('does not return build id when confirmation is rejected', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
-    await expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
-  });
-
-  it('returns build id when confirmation is confirmed', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
-    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
-    await expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
-      selectedBuildId
-    );
-  });
-});
-
-function createMockBuildFragment({
-  projectId,
-  buildId,
-}: {
-  projectId: string;
-  buildId?: string;
-}): BuildFragment {
-  return {
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    platform: AppPlatform.Android,
-    id: buildId ?? uuid(),
-    priority: BuildPriority.Normal,
-    project: {
-      __typename: 'App',
-      slug: 'test-project',
-      id: projectId,
-      name: 'test-project',
-      ownerAccount: {
-        __typename: 'Account',
-        id: uuid(),
-        name: 'test-account',
-      },
-    },
-    status: BuildStatus.InQueue,
-    isForIosSimulator: false,
-  };
-}

packages/eas-cli/src/build/__tests__/configure-test.ts

@@ -1,77 +0,0 @@
-import { AppVersionSource, EasJsonAccessor } from '@expo/eas-json';
-import fs from 'fs-extra';
-import { vol } from 'memfs';
-
-import { easCliVersion } from '../../utils/easCli';
-import GitClient from '../../vcs/clients/git';
-import { Client } from '../../vcs/vcs';
-import { ensureProjectConfiguredAsync } from '../configure';
-
-jest.mock('fs');
-jest.mock('../../vcs/vcs');
-jest.mock('../../vcs/clients/git');
-
-beforeEach(async () => {
-  vol.reset();
-});
-
-describe(ensureProjectConfiguredAsync, () => {
-  it('returns false and does not configure if eas.json exists', async () => {
-    vol.fromJSON({
-      './eas.json': JSON.stringify({
-        cli: {
-          version: `>= ${easCliVersion}`,
-        },
-        build: {
-          development: {
-            developmentClient: true,
-            distribution: 'internal',
-          },
-          preview: {
-            distribution: 'internal',
-          },
-          production: {},
-        },
-        submit: {
-          production: {},
-        },
-      }),
-    });
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-    const vcsClientMock = jest.mocked(new GitClient());
-    vcsClientMock.showChangedFilesAsync.mockImplementation(async () => {});
-    vcsClientMock.isCommitRequiredAsync.mockImplementation(async () => false);
-    vcsClientMock.trackFileAsync.mockImplementation(async () => {});
-    const result = await ensureProjectConfiguredAsync({
-      projectDir: '.',
-      nonInteractive: false,
-      vcsClient: vcsClientMock as unknown as Client,
-    });
-    expect(result).toBeFalsy();
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-  });
-  it('returns true and configures if eas.json does not exist', async () => {
-    const writeFileMock = jest.spyOn(fs, 'writeFile');
-    writeFileMock.mockImplementation(async (...args) => {
-      const easJsonPath = args[0] as string;
-      const easJsonData = args[1] as string;
-      vol.fromJSON({
-        [easJsonPath]: easJsonData,
-      });
-    });
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeFalsy();
-    const vcsClientMock = jest.mocked(new GitClient());
-    vcsClientMock.showChangedFilesAsync.mockImplementation(async () => {});
-    vcsClientMock.isCommitRequiredAsync.mockImplementation(async () => false);
-    vcsClientMock.trackFileAsync.mockImplementation(async () => {});
-    const result = await ensureProjectConfiguredAsync({
-      projectDir: '.',
-      nonInteractive: false,
-      vcsClient: vcsClientMock as unknown as Client,
-    });
-    expect(result).toBeTruthy();
-    await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-    const easJson = await EasJsonAccessor.fromProjectPath('.').readAsync();
-    expect(easJson.cli?.appVersionSource).toEqual(AppVersionSource.REMOTE);
-  });
-});

packages/eas-cli/src/build/__tests__/delete-test.ts

@@ -1,90 +0,0 @@
-import { instance, mock } from 'ts-mockito';
-import { v4 as uuid } from 'uuid';
-
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { selectBuildToDeleteAsync } from '../../commands/build/delete';
-import { AppPlatform, BuildFragment, BuildPriority, BuildStatus } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { confirmAsync, selectAsync } from '../../prompts';
-
-jest.mock('../../ora', () => ({
-  ora: jest.fn().mockImplementation(() => ({
-    start: jest.fn().mockImplementation(() => ({
-      stop: jest.fn(),
-      fail: jest.fn(),
-    })),
-  })),
-}));
-jest.mock('../../prompts', () => {
-  return {
-    selectAsync: jest.fn(),
-    confirmAsync: jest.fn(),
-  };
-});
-
-jest.mock('../../graphql/queries/BuildQuery', () => {
-  const actual = jest.requireActual('../../graphql/queries/BuildQuery');
-  return {
-    BuildQuery: {
-      ...actual.BuildQuery,
-      viewBuildsOnAppAsync: jest.fn(),
-    },
-  };
-});
-
-describe(selectBuildToDeleteAsync.name, () => {
-  const selectedBuildId = uuid();
-  const projectId = uuid();
-
-  beforeEach(() => {
-    jest
-      .mocked(BuildQuery.viewBuildsOnAppAsync)
-      .mockImplementation(async () => [
-        createMockBuildFragment({ projectId, buildId: selectedBuildId }),
-      ]);
-  });
-
-  it('does not return build id when confirmation is rejected', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    jest.mocked(confirmAsync).mockResolvedValueOnce(false);
-    await expect(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
-  });
-
-  it('returns build id when confirmation is confirmed', async () => {
-    const graphqlClient = instance(mock<ExpoGraphqlClient>());
-    jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
-    jest.mocked(confirmAsync).mockResolvedValueOnce(true);
-    await expect(selectBuildToDeleteAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
-      selectedBuildId
-    );
-  });
-});
-
-function createMockBuildFragment({
-  projectId,
-  buildId,
-}: {
-  projectId: string;
-  buildId?: string;
-}): BuildFragment {
-  return {
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-    platform: AppPlatform.Android,
-    id: buildId ?? uuid(),
-    priority: BuildPriority.Normal,
-    project: {
-      __typename: 'App',
-      slug: 'test-project',
-      id: projectId,
-      name: 'test-project',
-      ownerAccount: {
-        __typename: 'Account',
-        id: uuid(),
-        name: 'test-account',
-      },
-    },
-    status: BuildStatus.InQueue,
-    isForIosSimulator: false,
-  };
-}

packages/eas-cli/src/build/__tests__/handleBuildRequestError-test.ts

@@ -1,597 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { CombinedError } from '@urql/core';
-import { GraphQLError } from 'graphql/error';
-import { v4 as uuidv4 } from 'uuid';
-
-import { getError } from '../../__tests__/commands/utils';
-import { EasCommandError } from '../../commandUtils/errors';
-import Build from '../../commands/build';
-import Log, { link } from '../../log';
-import { handleBuildRequestError } from '../build';
-import {
-  EasBuildDownForMaintenanceError,
-  EasBuildFreeTierDisabledAndroidError,
-  EasBuildFreeTierDisabledError,
-  EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
-  EasBuildTooManyPendingBuildsError,
-  RequestValidationError,
-  TurtleDeprecatedJobFormatError,
-} from '../errors';
-
-beforeEach(() => {
-  jest.resetAllMocks();
-});
-
-const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `[
-  {
-    "name": "GraphQLError",
-    "extensions": {},
-    "message": "Error 1"
-  },
-  {
-    "name": "GraphQLError",
-    "extensions": {},
-    "message": "Error 2"
-  },
-  {
-    "name": "GraphQLError",
-    "extensions": {},
-    "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 mockRequestId = uuidv4();
-const getGraphQLError = (message: string, errorCode: string): GraphQLError => {
-  return new GraphQLError(message, null, null, null, null, null, {
-    errorCode,
-    requestId: mockRequestId,
-  });
-};
-
-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('for TURTLE_DEPRECATED_JOB_FORMAT', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              TurtleDeprecatedJobFormatError,
-              'Error 1'
-            );
-          });
-
-          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError(
-              'Error 1',
-              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
-            );
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError =
-              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
-                handleBuildRequestError(error, platform);
-              });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildResourceClassNotAvailableInFreeTierError,
-              'Error 1'
-            );
-          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'TURTLE_DEPRECATED_JOB_FORMAT');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<TurtleDeprecatedJobFormatError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              TurtleDeprecatedJobFormatError,
-              'Error 1'
-            );
-          });
-
-          it('throws correct EasBuildResourceClassNotAvailableInFreeTierError', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError(
-              'Error 1',
-              'EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER'
-            );
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError =
-              getError<EasBuildResourceClassNotAvailableInFreeTierError>(() => {
-                handleBuildRequestError(error, platform);
-              });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildResourceClassNotAvailableInFreeTierError,
-              'Error 1'
-            );
-          });
-        });
-      });
-
-      describe('for EAS_BUILD_FREE_TIER_DISABLED', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildFreeTierDisabledError,
-              'Error 1'
-            );
-          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildFreeTierDisabledError,
-              'Error 1'
-            );
-          });
-        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_DISABLED_IOS', () => {
-        it('throws correct EasCommandError subclass', 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, 'Error 1');
-          }
-        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_DISABLED_ANDROID', () => {
-        it('throws correct EasCommandError subclass', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-
-          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierDisabledAndroidError>(
-            () => {
-              handleBuildRequestError(error, platform);
-            }
-          );
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierDisabledAndroidError,
-            'Error 1'
-          );
-        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED', () => {
-        it('throws correct EasCommandError subclass', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-
-          const handleBuildRequestErrorThrownError = getError<EasBuildFreeTierLimitExceededError>(
-            () => {
-              handleBuildRequestError(error, platform);
-            }
-          );
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierLimitExceededError,
-            'Error 1'
-          );
-        });
-      });
-      describe('for EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED', () => {
-        it('throws correct EasCommandError subclass', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-
-          const handleBuildRequestErrorThrownError =
-            getError<EasBuildFreeTierIosLimitExceededError>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-          assertReThrownError(
-            handleBuildRequestErrorThrownError,
-            EasBuildFreeTierIosLimitExceededError,
-            'Error 1'
-          );
-        });
-      });
-
-      describe('for VALIDATION_ERROR', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              RequestValidationError,
-              'Error 1'
-            );
-          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'VALIDATION_ERROR');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<RequestValidationError>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              RequestValidationError,
-              'Error 1'
-            );
-          });
-        });
-      });
-    });
-
-    describe('error is other expected graphQL-related error', () => {
-      describe('for EAS_BUILD_DOWN_FOR_MAINTENANCE', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildDownForMaintenanceError,
-              EXPECTED_EAS_BUILD_DOWN_MESSAGE
-            );
-          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_DOWN_FOR_MAINTENANCE');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<EasBuildDownForMaintenanceError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildDownForMaintenanceError,
-              EXPECTED_EAS_BUILD_DOWN_MESSAGE
-            );
-          });
-        });
-      });
-
-      describe('for EAS_BUILD_TOO_MANY_PENDING_BUILDS', () => {
-        describe('with Android', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildTooManyPendingBuildsError,
-              EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID
-            );
-          });
-        });
-        describe('with iOS', () => {
-          it('throws correct EasCommandError subclass', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'EAS_BUILD_TOO_MANY_PENDING_BUILDS');
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-
-            const handleBuildRequestErrorThrownError = getError<EasBuildTooManyPendingBuildsError>(
-              () => {
-                handleBuildRequestError(error, platform);
-              }
-            );
-
-            assertReThrownError(
-              handleBuildRequestErrorThrownError,
-              EasBuildTooManyPendingBuildsError,
-              EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
-            );
-          });
-        });
-      });
-    });
-
-    describe('error is unexpected graphQL-related error', () => {
-      describe('with Android', () => {
-        it('throws base Error class with custom message', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        it('throws base Error class with message including all error messages if combined error has multiple GraphQL errors', async () => {
-          const platform = Platform.ANDROID;
-          const graphQLErrors = [
-            getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR'),
-            getGraphQLError('Error 2', 'OTHER_GRAPHQL_ERROR'),
-            getGraphQLError('Error 3', 'YET_ANOTHER_GRAPHQL_ERROR'),
-          ];
-          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage =
-            `${EXPECTED_GENERIC_MESSAGE}\n` +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 1\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 2\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 3';
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        describe('without request ID', () => {
-          it('throws base Error class with custom message without request ID line', async () => {
-            const platform = Platform.ANDROID;
-            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
-            delete graphQLError.extensions.requestId;
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
-
-            const handleBuildRequestErrorThrownError = getError<Error>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-          });
-        });
-      });
-      describe('with iOS', () => {
-        it('throws base Error class with custom message', async () => {
-          const platform = Platform.IOS;
-          const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
-          const graphQLErrors = [graphQLError];
-          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nRequest ID: ${mockRequestId}\nError message: Error 1`;
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        it('throws base Error class with message including all error messages if combined error has multiple GraphQL errors', async () => {
-          const platform = Platform.IOS;
-          const graphQLErrors = [
-            getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR'),
-            getGraphQLError('Error 2', 'OTHER_GRAPHQL_ERROR'),
-            getGraphQLError('Error 3', 'YET_ANOTHER_GRAPHQL_ERROR'),
-          ];
-          const error = new CombinedError({ graphQLErrors });
-          const expectedMessage =
-            `${EXPECTED_GENERIC_MESSAGE}\n` +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 1\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 2\n' +
-            `Request ID: ${mockRequestId}\n` +
-            'Error message: Error 3';
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-        });
-        describe('without request ID', () => {
-          it('throws base Error class with custom message without request ID line', async () => {
-            const platform = Platform.IOS;
-            const graphQLError = getGraphQLError('Error 1', 'UNKNOWN_GRAPHQL_ERROR');
-            delete graphQLError.extensions.requestId;
-            const graphQLErrors = [graphQLError];
-            const error = new CombinedError({ graphQLErrors });
-            const expectedMessage = `${EXPECTED_GENERIC_MESSAGE}\nError message: Error 1`;
-
-            const handleBuildRequestErrorThrownError = getError<Error>(() => {
-              handleBuildRequestError(error, platform);
-            });
-
-            assertReThrownError(handleBuildRequestErrorThrownError, Error, expectedMessage);
-          });
-        });
-      });
-    });
-
-    describe('error is unexpected non-graphQL-related error', () => {
-      describe('with Android', () => {
-        it('throws base Error class with propagated message', async () => {
-          const platform = Platform.ANDROID;
-          const error = new Error('Non-graphQL-related error');
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
-        });
-      });
-      describe('with iOS', () => {
-        it('throws base Error class with propagated message', async () => {
-          const platform = Platform.IOS;
-          const error = new Error('Non-graphQL-related error');
-
-          const handleBuildRequestErrorThrownError = getError<Error>(() => {
-            handleBuildRequestError(error, platform);
-          });
-
-          expect(handleBuildRequestErrorThrownError).toStrictEqual(error);
-        });
-      });
-    });
-  });
-});

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

@@ -1,14 +0,0 @@
-import { truncateGitCommitMessage } from '../metadata';
-
-describe(truncateGitCommitMessage, () => {
-  it('returns undefined if no message was passed', () => {
-    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
-  });
-  it('returns commit message', () => {
-    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
-  });
-
-  it('truncates long commit messages', () => {
-    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
-  });
-});

packages/eas-cli/src/build/__tests__/validate-test.ts

@@ -1,142 +0,0 @@
-import { Platform, Workflow } from '@expo/eas-build-job';
-import { ExitError } from '@oclif/core/lib/errors';
-import path from 'path';
-import { instance, mock, when } from 'ts-mockito';
-
-import { CommonContext } from '../context';
-import { validatePNGsForManagedProjectAsync } from '../validate';
-
-const fixturesPath = path.join(__dirname, 'fixtures');
-
-describe(validatePNGsForManagedProjectAsync, () => {
-  it('does not validate PNGs for generic projects', async () => {
-    const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-    when(ctxMock.workflow).thenReturn(Workflow.GENERIC);
-    const ctx = instance(ctxMock);
-    await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-  });
-
-  it('does not validate PNGs for projects with SDK >= 47', async () => {
-    const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-    when(ctxMock.workflow).thenReturn(Workflow.GENERIC);
-    when(ctxMock.exp).thenReturn({
-      name: 'blah',
-      slug: 'blah',
-      android: { adaptiveIcon: { foregroundImage: 'assets/icon.jpg' } },
-      sdkVersion: '47.0.0',
-    });
-    const ctx = instance(ctxMock);
-    await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-  });
-
-  describe(Platform.ANDROID, () => {
-    it('exits if foregroundImage is not a file with .png extension', async () => {
-      const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.ANDROID);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        android: { adaptiveIcon: { foregroundImage: 'assets/icon.jpg' } },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('exits if foregroundImage is not a png file', async () => {
-      const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.ANDROID);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        android: { adaptiveIcon: { foregroundImage: path.join(fixturesPath, 'icon-jpg.png') } },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('does not throw if foregroundImage is a png file', async () => {
-      const ctxMock = mock<CommonContext<Platform.ANDROID>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.ANDROID);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        android: { adaptiveIcon: { foregroundImage: path.join(fixturesPath, 'icon-alpha.png') } },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-    });
-  });
-
-  // Validating iOS PNGs is currently disabled
-  // See https://github.com/expo/eas-cli/pull/1477 for context
-  xdescribe(Platform.IOS, () => {
-    it('exits if icon is not a file with .png extension', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'assets/icon.jpg') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('exits if icon is not a png file', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'icon-jpg.png') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('exits if icon has alpha channel (transparency)', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'icon-alpha.png') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).rejects.toThrow(ExitError);
-    });
-
-    it('does not throw if icon is a png file and does not have alpha channel', async () => {
-      const ctxMock = mock<CommonContext<Platform.IOS>>();
-      when(ctxMock.workflow).thenReturn(Workflow.MANAGED);
-      when(ctxMock.platform).thenReturn(Platform.IOS);
-      when(ctxMock.exp).thenReturn({
-        name: 'blah',
-        slug: 'blah',
-        ios: { icon: path.join(fixturesPath, 'icon-no-alpha.png') },
-        sdkVersion: '46.0.0',
-      });
-      const ctx = instance(ctxMock);
-
-      await expect(validatePNGsForManagedProjectAsync(ctx)).resolves.not.toThrow();
-    });
-  });
-});

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

@@ -0,0 +1,115 @@
+import { ExpoConfig } from '@expo/config';
+import { AndroidConfig, AndroidManifest } from '@expo/config-plugins';
+import fs from 'fs-extra';
+
+import Log from '../../log';
+import { getProjectAccountName } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { ensureValidVersions } from '../utils/updates';
+
+export async function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
+
+  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
+    const updatedBuildGradleContents =
+      AndroidConfig.Updates.ensureBuildGradleContainsConfigurationScript(
+        projectDir,
+        buildGradleContents
+      );
+    await fs.writeFile(buildGradlePath, updatedBuildGradleContents);
+  }
+
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  const androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
+    const result = AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
+
+    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, result);
+  }
+}
+
+export async function syncUpdatesConfigurationAsync(
+  projectDir: string,
+  exp: ExpoConfig
+): Promise<void> {
+  ensureValidVersions(exp);
+  const accountName = getProjectAccountName(exp, await ensureLoggedInAsync());
+  try {
+    await ensureUpdatesConfiguredAsync(projectDir, exp);
+  } catch (error) {
+    Log.error(
+      'expo-updates module is not configured. Please run "eas build:configure" first to configure the project'
+    );
+    throw error;
+  }
+
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  let androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
+    androidManifest = AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
+    await AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, androidManifest);
+  }
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
+    Log.warn(
+      'Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project'
+    );
+  }
+}
+
+async function ensureUpdatesConfiguredAsync(projectDir: string, exp: ExpoConfig): Promise<void> {
+  const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+  const buildGradleContents = await fs.readFile(buildGradlePath, 'utf8');
+
+  if (!AndroidConfig.Updates.isBuildGradleConfigured(projectDir, buildGradleContents)) {
+    const gradleScriptApply = AndroidConfig.Updates.formatApplyLineForBuildGradle(projectDir);
+    throw new Error(`Missing ${gradleScriptApply} in ${buildGradlePath}`);
+  }
+
+  const androidManifest = await getAndroidManifestAsync(projectDir);
+
+  if (!AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
+    throw new Error('Missing values in AndroidManifest.xml');
+  }
+}
+
+export async function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const androidManifest = await getAndroidManifestAsync(projectDir);
+    return AndroidConfig.Manifest.getMainApplicationMetaDataValue(
+      androidManifest,
+      AndroidConfig.Updates.Config.RELEASE_CHANNEL
+    );
+  } catch (err) {
+    return null;
+  }
+}
+
+export async function readChannelSafelyAsync(projectDir: string): Promise<string | null> {
+  try {
+    const androidManifest = await getAndroidManifestAsync(projectDir);
+    const stringifiedRequestHeaders = AndroidConfig.Manifest.getMainApplicationMetaDataValue(
+      androidManifest,
+      AndroidConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY
+    );
+    if (!stringifiedRequestHeaders) {
+      return null;
+    }
+    return JSON.parse(stringifiedRequestHeaders)['expo-channel-name'] ?? null;
+  } catch (err) {
+    return null;
+  }
+}
+
+async function getAndroidManifestAsync(projectDir: string): Promise<AndroidManifest> {
+  const androidManifestPath = await AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
+  if (!androidManifestPath) {
+    throw new Error(`Could not find AndroidManifest.xml in project directory: "${projectDir}"`);
+  }
+  return AndroidConfig.Manifest.readAndroidManifestAsync(androidManifestPath);
+}

packages/eas-cli/src/build/android/__tests__/version-test.ts

@@ -8,7 +8,6 @@ import os from 'os';
 import path from 'path';
 
 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
-import { resolveVcsClient } from '../../../vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -19,8 +18,6 @@ import {
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
 
-const vcsClient = resolveVcsClient();
-
 afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
@@ -34,7 +31,7 @@ beforeEach(async () => {
   await fs.mkdirp(os.tmpdir());
 });
 
-// bare workflow
+// generic workflow
 describe(bumpVersionAsync, () => {
   it('throws an informative error when multiple flavors are detected in the android project', async () => {
     await initProjectWithGradleFileAsync(
@@ -72,64 +69,64 @@ describe(bumpVersionAsync, () => {
   });
   it('bumps expo.android.versionCode and buildGradle versionCode when strategy = BumpStrategy.VERSION_CODE', async () => {
     const nativeVersionCode = 100; // this should be overwritten by bumpVersionAsync
-    const fakeExp = initBareWorkflowProject({ versionCode: nativeVersionCode });
+    const fakeExp = initGenericProject({ versionCode: nativeVersionCode });
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.VERSION_CODE,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('3.0.0');
     expect(fakeExp.android?.versionCode).toBe(124);
     expect(appJSON.expo.version).toBe('3.0.0');
     expect(appJSON.expo.android.versionCode).toBe(124);
 
-    const buildGradle = await getAppBuildGradleAsync('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
     assert(buildGradle);
     expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('124');
     expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
   });
 
-  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.APP_VERSION', async () => {
+  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
     const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
-    const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });
+    const fakeExp = initGenericProject({ versionName: nativeVersionName });
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('3.0.1');
     expect(fakeExp.android?.versionCode).toBe(123);
     expect(appJSON.expo.version).toBe('3.0.1');
     expect(appJSON.expo.android.versionCode).toBe(123);
 
-    const buildGradle = await getAppBuildGradleAsync('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
     assert(buildGradle);
     expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
     expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.1');
   });
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
-    const fakeExp = initBareWorkflowProject();
+    const fakeExp = initGenericProject();
 
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('3.0.0');
     expect(fakeExp.android?.versionCode).toBe(123);
     expect(appJSON.expo.version).toBe('3.0.0');
     expect(appJSON.expo.android.versionCode).toBe(123);
 
-    const buildGradle = await getAppBuildGradleAsync('/app');
+    const buildGradle = await getAppBuildGradleAsync('/repo');
     assert(buildGradle);
     expect(resolveConfigValue(buildGradle, 'versionCode')).toBe('123');
     expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
@@ -143,11 +140,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.VERSION_CODE,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('5.0.0');
     expect(fakeExp.android?.versionCode).toBe(127);
     expect(appJSON.expo.version).toBe('5.0.0');
@@ -159,11 +156,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('5.0.1');
     expect(fakeExp.android?.versionCode).toBe(126);
     expect(appJSON.expo.version).toBe('5.0.1');
@@ -175,11 +172,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     expect(fakeExp.version).toBe('5.0.0');
     expect(fakeExp.android?.versionCode).toBe(126);
     expect(appJSON.expo.version).toBe('5.0.0');
@@ -188,14 +185,13 @@ describe(bumpVersionInAppJsonAsync, () => {
 });
 
 describe(maybeResolveVersionsAsync, () => {
-  describe('bare project', () => {
+  describe('generic project', () => {
     it('reads the versions from native code', async () => {
-      const exp = initBareWorkflowProject();
+      const exp = initGenericProject();
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/app',
+        '/repo',
         exp,
-        {} as BuildProfile<Platform.ANDROID>,
-        vcsClient
+        {} as BuildProfile<Platform.ANDROID>
       );
       expect(appVersion).toBe('3.0.0');
       expect(appBuildVersion).toBe('123');
@@ -205,10 +201,9 @@ describe(maybeResolveVersionsAsync, () => {
     it('reads the versions from expo config', async () => {
       const exp = initManagedProject();
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
-        '/app',
+        '/repo',
         exp,
-        {} as BuildProfile<Platform.ANDROID>,
-        vcsClient
+        {} as BuildProfile<Platform.ANDROID>
       );
       expect(appVersion).toBe('5.0.0');
       expect(appBuildVersion).toBe('126');
@@ -216,7 +211,7 @@ describe(maybeResolveVersionsAsync, () => {
   });
 });
 
-function initBareWorkflowProject({
+function initGenericProject({
   versionCode = 123,
   versionName = '3.0.0',
 }: {
@@ -245,7 +240,7 @@ function initBareWorkflowProject({
 }`,
       './android/app/src/main/AndroidManifest.xml': 'fake',
     },
-    '/app'
+    '/repo'
   );
 
   return fakeExp;
@@ -266,7 +261,7 @@ function initManagedProject(): ExpoConfig {
         expo: fakeExp,
       }),
     },
-    '/app'
+    '/repo'
   );
 
   return fakeExp;

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

@@ -1,42 +1,36 @@
-import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import { AppVersionSource } from '@expo/eas-json';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteVersionCodeAsync } from './version';
 import AndroidCredentialsProvider, {
   AndroidCredentials,
 } from '../../credentials/android/AndroidCredentialsProvider';
-import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
 } from '../../project/android/applicationId';
-import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
+import { GradleBuildContext, resolveGradleBuildContextAsync } from '../../project/android/gradle';
 import { toggleConfirmAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
 import {
   BuildRequestSender,
   CredentialsResult,
   JobData,
   prepareBuildRequestForPlatformAsync,
 } from '../build';
-import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
+import { BuildContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
-import {
-  checkGoogleServicesFileAsync,
-  checkNodeEnvVariable,
-  validatePNGsForManagedProjectAsync,
-} from '../validate';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { validateAndSyncProjectConfigurationAsync } from './configure';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
 
-export async function createAndroidContextAsync(
-  ctx: CommonContext<Platform.ANDROID>
-): Promise<AndroidBuildContext> {
+export async function prepareAndroidBuildAsync(
+  ctx: BuildContext<Platform.ANDROID>
+): Promise<BuildRequestSender> {
   const { buildProfile } = ctx;
 
   if (buildProfile.distribution === 'internal' && buildProfile.gradleCommand?.match(/bundle/)) {
@@ -50,85 +44,52 @@ This means that it will most likely produce an AAB and you will not be able to i
     Log.newLine();
     const confirmed = await toggleConfirmAsync({ message: 'Would you like to proceed?' });
     if (!confirmed) {
-      Log.error('Update eas.json and come back again.');
+      Log.error('Please update eas.json and come back again.');
       process.exit(1);
     }
   }
 
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
-  await validatePNGsForManagedProjectAsync(ctx);
 
-  const gradleContext = await resolveGradleBuildContextAsync(
-    ctx.projectDir,
-    buildProfile,
-    ctx.vcsClient
-  );
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
 
   if (ctx.workflow === Workflow.MANAGED) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
   }
 
-  const applicationId = await getApplicationIdAsync(
-    ctx.projectDir,
-    ctx.exp,
-    ctx.vcsClient,
-    gradleContext
-  );
-  const versionCodeOverride =
-    ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
-          projectDir: ctx.projectDir,
-          projectId: ctx.projectId,
-          exp: ctx.exp,
-          applicationId,
-          buildProfile,
-          vcsClient: ctx.vcsClient,
-        })
-      : undefined;
-
-  return { applicationId, gradleContext, versionCodeOverride };
-}
-
-export async function prepareAndroidBuildAsync(
-  ctx: BuildContext<Platform.ANDROID>
-): Promise<BuildRequestSender> {
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.ANDROID>) => {
-      return await ensureAndroidCredentialsAsync(ctx);
+      return await ensureAndroidCredentialsAsync(ctx, gradleContext);
     },
-    syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+    ensureProjectConfiguredAsync: async () => {
+      await validateAndSyncProjectConfigurationAsync({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
-        localAutoIncrement:
-          ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-            ? false
-            : ctx.buildProfile.autoIncrement,
-        vcsClient: ctx.vcsClient,
-        env: ctx.env,
+        buildProfile,
       });
     },
+    getMetadataContext: () => ({
+      gradleContext,
+    }),
     prepareJobAsync: async (
       ctx: BuildContext<Platform.ANDROID>,
       jobData: JobData<AndroidCredentials>
-    ): Promise<Android.Job> => {
+    ): Promise<Job> => {
       return await prepareJobAsync(ctx, jobData);
     },
     sendBuildRequestAsync: async (
       appId: string,
       job: Android.Job,
-      metadata: Metadata,
-      buildParams: BuildParamsInput
+      metadata: Metadata
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
-      return await BuildMutation.createAndroidBuildAsync(ctx.graphqlClient, {
+      return await BuildMutation.createAndroidBuildAsync({
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,
-        buildParams,
       });
     },
   });
@@ -139,7 +100,8 @@ function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean
 }
 
 async function ensureAndroidCredentialsAsync(
-  ctx: BuildContext<Platform.ANDROID>
+  ctx: BuildContext<Platform.ANDROID>,
+  gradleContext?: GradleBuildContext
 ): Promise<CredentialsResult<AndroidCredentials> | undefined> {
   if (!shouldProvideCredentials(ctx)) {
     return;
@@ -147,13 +109,12 @@ async function ensureAndroidCredentialsAsync(
   const androidApplicationIdentifier = await getApplicationIdAsync(
     ctx.projectDir,
     ctx.exp,
-    ctx.vcsClient,
-    ctx.android.gradleContext
+    gradleContext
   );
   const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
     app: {
       account: nullthrows(
-        ctx.user.accounts.find(a => a.name === ctx.accountName),
+        findAccountByName(ctx.user.accounts, ctx.accountName),
         `You do not have access to account: ${ctx.accountName}`
       ),
       projectName: ctx.projectName,

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

@@ -0,0 +1,75 @@
+import { ExpoConfig } from '@expo/config';
+import { AndroidConfig } from '@expo/config-plugins';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { AndroidBuildProfile, AndroidVersionAutoIncrement } from '@expo/eas-json';
+
+import Log from '../../log';
+import {
+  ensureApplicationIdIsDefinedForManagedProjectAsync,
+  warnIfAndroidPackageDefinedInAppConfigForGenericProject,
+} from '../../project/android/applicationId';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import vcs from '../../vcs';
+import { ConfigureContext } from '../context';
+import { isExpoUpdatesInstalled } from '../utils/updates';
+import { configureUpdatesAsync, syncUpdatesConfigurationAsync } from './UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
+
+export async function configureAndroidAsync(ctx: ConfigureContext): Promise<void> {
+  if (!ctx.hasAndroidNativeProject) {
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp);
+    return;
+  }
+
+  warnIfAndroidPackageDefinedInAppConfigForGenericProject(ctx.projectDir, ctx.exp);
+
+  await AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
+
+  const easGradlePath = AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
+  await vcs.trackFileAsync(easGradlePath);
+
+  if (isExpoUpdatesInstalled(ctx.projectDir)) {
+    await configureUpdatesAsync(ctx.projectDir, ctx.exp);
+  }
+  Log.withTick('Android project configured');
+}
+
+export async function validateAndSyncProjectConfigurationAsync({
+  projectDir,
+  exp,
+  buildProfile,
+}: {
+  projectDir: string;
+  exp: ExpoConfig;
+  buildProfile: AndroidBuildProfile;
+}): Promise<void> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
+  const { autoIncrement } = buildProfile;
+  const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement ?? false);
+
+  if (workflow === Workflow.GENERIC) {
+    if (!(await AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
+      throw new Error(
+        'Project is not configured. Please run "eas build:configure" to configure the project.'
+      );
+    }
+    if (isExpoUpdatesInstalled(projectDir)) {
+      await syncUpdatesConfigurationAsync(projectDir, exp);
+    }
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  } else {
+    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
+  }
+}
+
+function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
+  if (autoIncrement === true) {
+    return BumpStrategy.VERSION_CODE;
+  } else if (autoIncrement === false) {
+    return BumpStrategy.NOOP;
+  } else if (autoIncrement === 'versionCode') {
+    return BumpStrategy.VERSION_CODE;
+  } else {
+    return BumpStrategy.APP_VERSION;
+  }
+}

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

@@ -1,44 +1,31 @@
 import { Android } from '@expo/eas-build-job';
 
 import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
-import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
-  transformBuildMode,
-  transformBuildTrigger,
-  transformProjectArchive,
-  transformWorkflow,
-} from '../graphql';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {
     type: transformWorkflow(job.type),
-    triggeredBy: transformBuildTrigger(job.triggeredBy),
     projectArchive: transformProjectArchive(job.projectArchive),
     projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
     updates: job.updates,
     secrets: job.secrets,
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
-    version: job.version?.versionCode ? { versionCode: job.version.versionCode } : undefined,
     gradleCommand: job.gradleCommand,
-    applicationArchivePath: job.applicationArchivePath,
-    buildArtifactPaths: job.buildArtifactPaths,
+    artifactPath: job.artifactPath,
     username: job.username,
     buildType: job.buildType && transformBuildType(job.buildType),
-    developmentClient: job.developmentClient,
-    experimental: job.experimental,
-    mode: transformBuildMode(job.mode),
-    customBuildConfig: job.customBuildConfig,
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
   };
 }
 
 function transformBuildType(buildType: Android.BuildType): AndroidBuildType {
   if (buildType === Android.BuildType.APK) {
     return AndroidBuildType.Apk;
-  } else {
+  } else if (buildType === Android.BuildType.APP_BUNDLE) {
     return AndroidBuildType.AppBundle;
+  } else {
+    return AndroidBuildType.DevelopmentClient;
   }
 }

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

@@ -1,18 +1,12 @@
-import {
-  Android,
-  ArchiveSource,
-  BuildMode,
-  BuildTrigger,
-  Platform,
-  sanitizeBuildJob,
-} from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
+import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
+import { AndroidBuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import vcs from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -22,17 +16,18 @@ interface JobData {
 
 const cacheDefaults = {
   disabled: false,
-  paths: [],
+  customPaths: [],
+  cacheDefaultPaths: true,
 };
 
 export async function prepareJobAsync(
   ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData
-): Promise<Android.Job> {
-  const username = getUsername(ctx.exp, ctx.user);
-  const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
+): Promise<Job> {
+  const username = getUsername(ctx.exp, await ensureLoggedInAsync());
+  const buildProfile: AndroidBuildProfile = ctx.buildProfile;
   const projectRootDirectory =
-    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await vcs.getRootPathAsync(), ctx.projectDir)) || '.';
   const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
@@ -47,24 +42,11 @@ export async function prepareJobAsync(
       }
     : {};
 
-  let buildType = buildProfile.buildType;
-  if (!buildType && !buildProfile.gradleCommand && buildProfile.distribution === 'internal') {
+  let buildType = ctx.buildProfile.buildType;
+  if (!buildType && !buildProfile.gradleCommand && ctx.buildProfile.distribution === 'internal') {
     buildType = Android.BuildType.APK;
   }
 
-  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
-    : undefined;
-
-  let buildMode;
-  if (ctx.repack) {
-    buildMode = BuildMode.REPACK;
-  } else if (buildProfile.config) {
-    buildMode = BuildMode.CUSTOM;
-  } else {
-    buildMode = BuildMode.BUILD;
-  }
-
   const job: Android.Job = {
     type: ctx.workflow,
     platform: Platform.ANDROID,
@@ -73,10 +55,9 @@ export async function prepareJobAsync(
     builderEnvironment: {
       image: buildProfile.image,
       node: buildProfile.node,
-      pnpm: buildProfile.pnpm,
-      bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
+      expoCli: buildProfile.expoCli,
       env: buildProfile.env,
     },
     cache: {
@@ -87,35 +68,15 @@ export async function prepareJobAsync(
     secrets: {
       ...buildCredentials,
     },
-    updates: { channel: buildProfile.channel },
-    developmentClient: buildProfile.developmentClient,
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
+
     gradleCommand: buildProfile.gradleCommand,
-    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
-    buildArtifactPaths: buildProfile.buildArtifactPaths,
-    buildType,
+    artifactPath: buildProfile.artifactPath,
+
     username,
-    ...(ctx.android.versionCodeOverride && {
-      version: {
-        versionCode: ctx.android.versionCodeOverride,
-      },
-    }),
-    experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
-    },
-    mode: buildMode,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
-    ...(ctx.repack && {
-      customBuildConfig: {
-        path: '__eas/repack.yml',
-      },
-    }),
-    loggerLevel: ctx.loggerLevel,
+    buildType: buildProfile.developmentClient ? Android.BuildType.DEVELOPMENT_CLIENT : buildType,
   };
 
-  return sanitizeBuildJob(job) as Android.Job;
+  return sanitizeJob(job);
 }

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

@@ -1,72 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-import { AndroidConfig } from '@expo/config-plugins';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
-import { AndroidVersionAutoIncrement } from '@expo/eas-json';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
-import Log from '../../log';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
-import { Client } from '../../vcs/vcs';
-
-export async function syncProjectConfigurationAsync({
-  projectDir,
-  exp,
-  localAutoIncrement,
-  vcsClient,
-  env,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  localAutoIncrement?: AndroidVersionAutoIncrement;
-  vcsClient: Client;
-  env: Env | undefined;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
-  const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
-
-  if (workflow === Workflow.GENERIC) {
-    await cleanUpOldEasBuildGradleScriptAsync(projectDir);
-    if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync({ projectDir, exp, workflow, env });
-    }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  } else {
-    await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
-  }
-}
-
-function resolveVersionBumpStrategy(autoIncrement: AndroidVersionAutoIncrement): BumpStrategy {
-  if (autoIncrement === true) {
-    return BumpStrategy.VERSION_CODE;
-  } else if (autoIncrement === false) {
-    return BumpStrategy.NOOP;
-  } else if (autoIncrement === 'versionCode') {
-    return BumpStrategy.VERSION_CODE;
-  } else {
-    return BumpStrategy.APP_VERSION;
-  }
-}
-
-// TODO: remove this after a few months
-export async function cleanUpOldEasBuildGradleScriptAsync(projectDir: string): Promise<void> {
-  const easBuildGradlePath = path.join(projectDir, 'android', 'app', 'eas-build.gradle');
-  if (await fs.pathExists(easBuildGradlePath)) {
-    Log.withTick(`Removing ${chalk.bold('eas-build.gradle')} as it's not longer necessary`);
-    await fs.remove(easBuildGradlePath);
-
-    const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-    const buildGradleContents = await fs.readFile(buildGradlePath, 'utf-8');
-    const buildGradleContentsWithoutApply = buildGradleContents.replace(
-      /apply from: ["'].\/eas-build.gradle["']\n/,
-      ''
-    );
-    if (buildGradleContentsWithoutApply !== buildGradleContents) {
-      await fs.writeFile(buildGradlePath, buildGradleContentsWithoutApply);
-    }
-  }
-}

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

@@ -1,24 +1,17 @@
 import { ExpoConfig } from '@expo/config';
-import { AndroidConfig, Updates } from '@expo/config-plugins';
+import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { AppPlatform } from '../../graphql/generated';
-import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
 import Log from '../../log';
-import { ora } from '../../ora';
 import {
   getAppBuildGradleAsync,
   parseGradleCommand,
   resolveConfigValue,
 } from '../../project/android/gradleUtils';
-import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
-import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
@@ -44,7 +37,7 @@ export async function bumpVersionAsync({
 
   const buildGradle = await getAppBuildGradleAsync(projectDir);
   const isMultiFlavor =
-    buildGradle.android?.productFlavors ?? buildGradle.android?.flavorDimensions;
+    buildGradle.android?.productFlavors || buildGradle.android?.flavorDimensions;
   if (isMultiFlavor) {
     throw new Error(
       'Automatic version bumping is not supported for multi-flavor Android projects.'
@@ -53,10 +46,9 @@ export async function bumpVersionAsync({
 
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await updateNativeVersionsAsync({
+  await writeVersionsToBuildGradleAsync({
     projectDir,
-    version: exp.version,
-    versionCode: exp.android?.versionCode,
+    exp,
   });
   Log.log('Synchronized versions with build gradle');
 }
@@ -82,7 +74,7 @@ export async function bumpVersionInAppJsonAsync({
     await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const versionCode = AndroidConfig.Version.getVersionCode(exp);
-    const bumpedVersionCode = getNextVersionCode(versionCode);
+    const bumpedVersionCode = versionCode + 1;
     Log.log(
       `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
         versionCode
@@ -97,10 +89,9 @@ export async function bumpVersionInAppJsonAsync({
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildProfile: BuildProfile<Platform.ANDROID>,
-  vcsClient: Client
+  buildProfile: BuildProfile<Platform.ANDROID>
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
     const buildGradle = await getAppBuildGradleAsync(projectDir);
     try {
@@ -114,7 +105,7 @@ export async function maybeResolveVersionsAsync(
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
       };
-    } catch {
+    } catch (err: any) {
       return {};
     }
   } else {
@@ -125,33 +116,21 @@ export async function maybeResolveVersionsAsync(
   }
 }
 
-export async function updateNativeVersionsAsync({
+async function writeVersionsToBuildGradleAsync({
   projectDir,
-  version,
-  versionCode,
+  exp,
 }: {
   projectDir: string;
-  version?: string;
-  versionCode?: number;
-}): Promise<void> {
+  exp: ExpoConfig;
+}): Promise<string> {
   const buildGradle = await readBuildGradleAsync(projectDir);
   if (!buildGradle) {
     throw new Error('This project is missing a build.gradle file.');
   }
-  let updatedBuildGradle = buildGradle;
-  if (version !== undefined) {
-    updatedBuildGradle = updatedBuildGradle.replace(
-      new RegExp(`versionName ".*"`),
-      `versionName "${version}"`
-    );
-  }
-  if (versionCode !== undefined) {
-    updatedBuildGradle = updatedBuildGradle.replace(
-      new RegExp(`versionCode.*`),
-      `versionCode ${versionCode}`
-    );
-  }
+  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
+  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
   await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
+  return updatedBuildGradle;
 }
 
 async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {
@@ -172,107 +151,3 @@ async function writeBuildGradleAsync({
   const buildGradlePath = AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
   await fs.writeFile(buildGradlePath, buildGradle);
 }
-
-/**
- * Returns buildNumber that will be used for the next build. If current build profile
- * has an 'autoIncrement' option set, it increments the version on server.
- */
-export async function resolveRemoteVersionCodeAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectDir,
-    projectId,
-    exp,
-    applicationId,
-    buildProfile,
-    vcsClient,
-  }: {
-    projectDir: string;
-    projectId: string;
-    exp: ExpoConfig;
-    applicationId: string;
-    buildProfile: BuildProfile<Platform.ANDROID>;
-    vcsClient: Client;
-  }
-): Promise<string> {
-  const remoteVersions = await AppVersionQuery.latestVersionAsync(
-    graphqlClient,
-    projectId,
-    AppPlatform.Android,
-    applicationId
-  );
-
-  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
-  let currentBuildVersion: string;
-  if (remoteVersions?.buildVersion) {
-    currentBuildVersion = remoteVersions.buildVersion;
-  } else {
-    if (localVersions.appBuildVersion) {
-      Log.warn(
-        'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
-      );
-      currentBuildVersion = localVersions.appBuildVersion;
-    } else {
-      Log.error(
-        `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
-      );
-      throw new Error('Remote versions are not configured.');
-    }
-  }
-  if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
-    return currentBuildVersion;
-  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
-    const spinner = ora(
-      `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
-    ).start();
-    try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
-        appId: projectId,
-        platform: AppPlatform.Android,
-        applicationIdentifier: applicationId,
-        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
-        buildVersion: currentBuildVersion,
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
-          undefined,
-      });
-      spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
-    } catch (err) {
-      spinner.fail(`Failed to initialize versionCode with ${chalk.bold(currentBuildVersion)}.`);
-      throw err;
-    }
-    return currentBuildVersion;
-  } else {
-    const nextBuildVersion = getNextVersionCode(currentBuildVersion);
-    const spinner = ora(
-      `Incrementing versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-        nextBuildVersion
-      )}.`
-    ).start();
-    try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
-        appId: projectId,
-        platform: AppPlatform.Android,
-        applicationIdentifier: applicationId,
-        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
-        buildVersion: String(nextBuildVersion),
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
-          undefined,
-      });
-      spinner.succeed(
-        `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-          nextBuildVersion
-        )}.`
-      );
-    } catch (err) {
-      spinner.fail(
-        `Failed to increment versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(
-          nextBuildVersion
-        )}.`
-      );
-      throw err;
-    }
-    return String(nextBuildVersion);
-  }
-}

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

@@ -1,74 +1,26 @@
-import {
-  ArchiveSource,
-  ArchiveSourceType,
-  BuildJob,
-  FingerprintSource,
-  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 assert from 'assert';
 import chalk from 'chalk';
-import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
-import { GraphQLError } from 'graphql/error';
-import nullthrows from 'nullthrows';
 
-import { BuildContext } from './context';
-import {
-  EasBuildDownForMaintenanceError,
-  EasBuildFreeTierDisabledAndroidError,
-  EasBuildFreeTierDisabledError,
-  EasBuildFreeTierDisabledIOSError,
-  EasBuildFreeTierIosLimitExceededError,
-  EasBuildFreeTierLimitExceededError,
-  EasBuildLegacyResourceClassNotAvailableError,
-  EasBuildProjectArchiveUploadError,
-  EasBuildResourceClassNotAvailableInFreeTierError,
-  EasBuildTooManyPendingBuildsError,
-  RequestValidationError,
-  TurtleDeprecatedJobFormatError,
-} from './errors';
-import { transformMetadata } from './graphql';
-import { LocalBuildMode, runLocalBuildAsync } from './local';
-import { collectMetadataAsync } from './metadata';
-import { printDeprecationWarnings } from './utils/printBuildInfo';
-import {
-  LocalFile,
-  makeProjectMetadataFileAsync,
-  makeProjectTarballAsync,
-  reviewAndCommitChangesAsync,
-} from './utils/repository';
-import { BuildEvent } from '../analytics/AnalyticsManager';
-import { withAnalyticsAsync } from '../analytics/common';
-import { getExpoWebsiteBaseUrl } from '../api';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasCommandError } from '../commandUtils/errors';
-import {
-  AppPlatform,
-  BuildFragment,
-  BuildParamsInput,
-  BuildPriority,
-  BuildStatus,
-  UploadSessionType,
-} from '../graphql/generated';
-import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
+import { BuildFragment, BuildStatus, UploadSessionType } from '../graphql/generated';
+import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log, { learnMore, link } from '../log';
-import { Ora, ora } from '../ora';
-import {
-  RequestedPlatform,
-  appPlatformDisplayNames,
-  appPlatformEmojis,
-  requestedPlatformDisplayNames,
-} from '../platform';
-import { maybeUploadFingerprintAsync } from '../project/maybeUploadFingerprintAsync';
-import { resolveRuntimeVersionAsync } from '../project/resolveRuntimeVersionAsync';
-import { uploadFileAtPathToGCSAsync } from '../uploads';
+import Log, { learnMore } from '../log';
+import { ora } from '../ora';
+import { requestedPlatformDisplayNames } from '../platform';
+import { uploadAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
-import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
+import vcs from '../vcs';
+import { BuildContext } from './context';
+import { runLocalBuildAsync } from './local';
+import { MetadataContext, collectMetadataAsync } from './metadata';
+import { TrackingContext } from './types';
+import Analytics, { Event } from './utils/analytics';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -80,251 +32,145 @@ export interface JobData<Credentials> {
   projectArchive: ArchiveSource;
 }
 
-interface Builder<TPlatform extends Platform, Credentials, TJob extends BuildJob> {
+interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
   ctx: BuildContext<TPlatform>;
 
   ensureCredentialsAsync(
     ctx: BuildContext<TPlatform>
   ): Promise<CredentialsResult<Credentials> | undefined>;
-  syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
-  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<BuildJob>;
-  sendBuildRequestAsync(
-    appId: string,
-    job: TJob,
-    metadata: Metadata,
-    buildParams: BuildParamsInput
-  ): Promise<BuildResult>;
+  ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+  getMetadataContext: () => MetadataContext<TPlatform>;
+  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
+  sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }
 
 export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
 
-function resolveBuildParamsInput<T extends Platform>(
-  ctx: BuildContext<T>,
-  metadata: Metadata
-): BuildParamsInput {
-  return {
-    resourceClass: ctx.resourceClass,
-    sdkVersion: metadata.sdkVersion,
-    reactNativeVersion: metadata.reactNativeVersion,
-  };
-}
-
 export async function prepareBuildRequestForPlatformAsync<
   TPlatform extends Platform,
   Credentials,
-  TJob extends BuildJob,
+  TJob extends Job
 >(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender> {
   const { ctx } = builder;
   const credentialsResult = await withAnalyticsAsync(
-    ctx.analytics,
     async () => await builder.ensureCredentialsAsync(ctx),
     {
-      attemptEvent: BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
-      successEvent: BuildEvent.GATHER_CREDENTIALS_SUCCESS,
-      failureEvent: BuildEvent.GATHER_CREDENTIALS_FAIL,
-      properties: ctx.analyticsEventProperties,
+      successEvent: Event.GATHER_CREDENTIALS_SUCCESS,
+      failureEvent: Event.GATHER_CREDENTIALS_FAIL,
+      trackingCtx: ctx.trackingCtx,
     }
   );
+  if (!ctx.skipProjectConfiguration) {
+    await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
+      successEvent: Event.CONFIGURE_PROJECT_SUCCESS,
+      failureEvent: Event.CONFIGURE_PROJECT_FAIL,
+      trackingCtx: ctx.trackingCtx,
+    });
+  }
 
-  await withAnalyticsAsync(
-    ctx.analytics,
-    async () => {
-      await builder.syncProjectConfigurationAsync(ctx);
-    },
-    {
-      attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-      successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-      failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
-      properties: ctx.analyticsEventProperties,
-    }
-  );
-
-  if (await ctx.vcsClient.isCommitRequiredAsync()) {
+  if (await vcs.hasUncommittedChangesAsync()) {
     Log.addNewLineIfNone();
-    const platformToRequestedPlatform: Record<Platform, RequestedPlatform> = {
-      [Platform.ANDROID]: RequestedPlatform.Android,
-      [Platform.IOS]: RequestedPlatform.Ios,
-    };
     await reviewAndCommitChangesAsync(
-      ctx.vcsClient,
-      `[EAS Build] Run EAS Build for ${
-        requestedPlatformDisplayNames[platformToRequestedPlatform[ctx.platform]]
-      }`,
+      `[EAS Build] Run EAS Build for ${requestedPlatformDisplayNames[ctx.platform as Platform]}`,
       { nonInteractive: ctx.nonInteractive }
     );
   }
 
-  let projectArchive: ArchiveSource | undefined;
-  if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-    const projectPath = (await makeProjectTarballAsync(ctx.vcsClient)).path;
-    projectArchive = {
-      type: ArchiveSourceType.PATH,
-      path: projectPath,
-    };
-  } else if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
-    projectArchive = {
-      type: ArchiveSourceType.PATH,
-      path: process.cwd(),
-    };
-  } else if (!ctx.localBuildOptions.localBuildMode) {
-    projectArchive = {
-      type: ArchiveSourceType.GCS,
-      ...(await uploadProjectAsync(ctx)),
-    };
-  }
-  assert(projectArchive);
+  const projectArchive = ctx.local
+    ? ({
+        type: ArchiveSourceType.PATH,
+        path: (await makeProjectTarballAsync()).path,
+      } as const)
+    : ({
+        type: ArchiveSourceType.S3,
+        bucketKey: await uploadProjectAsync(ctx),
+      } as const);
 
-  const runtimeMetadata = await createAndMaybeUploadFingerprintAsync(ctx);
-  const metadata = await collectMetadataAsync(ctx, runtimeMetadata);
-  const buildParams = resolveBuildParamsInput(ctx, metadata);
+  const metadataContext = builder.getMetadataContext();
+  const metadata = await collectMetadataAsync(ctx, metadataContext);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
   });
 
   return async () => {
-    if (ctx.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions, ctx.env);
+    if (ctx.local) {
+      await runLocalBuildAsync(job);
       return undefined;
-    } 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 {
-        return await sendBuildRequestAsync(builder, job, metadata, buildParams);
-      } catch (error: any) {
-        handleBuildRequestError(error, job.platform);
-      }
     } else {
-      throw new Error('Unknown localBuildMode.');
+      try {
+        return await sendBuildRequestAsync(builder, job, metadata);
+      } catch (error: any) {
+        if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+          Log.error('EAS Build API has changed, please upgrade to the latest eas-cli version.');
+          throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
+        ) {
+          Log.error(
+            'EAS Build is down for maintenance, please try again later. Check https://status.expo.dev/ for updates.'
+          );
+          throw new Error('Build request failed.');
+        } else if (
+          error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED'
+        ) {
+          Log.error(
+            'EAS Build free tier is temporarily disabled, please try again later. Check https://status.expo.dev/ for updates.'
+          );
+          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[job.platform]
+            } builds for your account. Try again later.`
+          );
+          throw new Error('Build request failed.');
+        } else if (error?.graphQLErrors) {
+          Log.error(
+            'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, please report the issue.'
+          );
+        }
+        throw error;
+      }
     }
   };
 }
 
-const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
-  TURTLE_DEPRECATED_JOB_FORMAT: TurtleDeprecatedJobFormatError,
-  EAS_BUILD_FREE_TIER_DISABLED: EasBuildFreeTierDisabledError,
-  EAS_BUILD_FREE_TIER_DISABLED_IOS: EasBuildFreeTierDisabledIOSError,
-  EAS_BUILD_FREE_TIER_DISABLED_ANDROID: EasBuildFreeTierDisabledAndroidError,
-  EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED: EasBuildFreeTierLimitExceededError,
-  EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED: EasBuildFreeTierIosLimitExceededError,
-  EAS_BUILD_RESOURCE_CLASS_NOT_AVAILABLE_IN_FREE_TIER:
-    EasBuildResourceClassNotAvailableInFreeTierError,
-  EAS_BUILD_LEGACY_RESOURCE_CLASS_NOT_AVAILABLE: EasBuildLegacyResourceClassNotAvailableError,
-  VALIDATION_ERROR: RequestValidationError,
-};
-
-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(
-        'https://status.expo.dev/'
-      )} for updates.`
-    );
-  } else if (graphQLErrorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
-    throw new EasBuildTooManyPendingBuildsError(
-      `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
-    );
-  } else if (error?.graphQLErrors) {
-    const errorMessage = error.graphQLErrors
-      .map((graphQLError: GraphQLError) => {
-        const requestIdLine = graphQLError?.extensions?.requestId
-          ? `\nRequest ID: ${graphQLError.extensions.requestId}`
-          : '';
-        const errorMessageLine = graphQLError?.message
-          ? `\nError message: ${graphQLError.message}`
-          : '';
-        return `${requestIdLine}${errorMessageLine}`;
-      })
-      .join('');
-    throw new Error(
-      `Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.${errorMessage}`
-    );
-  }
-  throw error;
-}
-
 async function uploadProjectAsync<TPlatform extends Platform>(
   ctx: BuildContext<TPlatform>
-): Promise<{
-  bucketKey: string;
-  metadataLocation?: string;
-}> {
+): Promise<string> {
   let projectTarballPath;
   try {
     return await withAnalyticsAsync(
-      ctx.analytics,
       async () => {
-        Log.newLine();
-        Log.log(
-          `Compressing project files and uploading to EAS Build. ${learnMore(
-            'https://expo.fyi/eas-build-archive'
-          )}`
-        );
-        const projectTarball = await makeProjectTarballAsync(ctx.vcsClient);
-
-        if (projectTarball.size > 1024 * 1024 * 100) {
-          Log.warn(
-            `Your project archive is ${formatBytes(
-              projectTarball.size
-            )}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk.bold(
-              '.easignore'
-            )} file. ${learnMore('https://expo.fyi/eas-build-archive')}`
-          );
-        }
-
-        if (projectTarball.size > 2 * 1024 * 1024 * 1024) {
-          throw new Error('Project archive is too big. Maximum allowed size is 2GB.');
-        }
-
+        const projectTarball = await makeProjectTarballAsync();
         projectTarballPath = projectTarball.path;
-        const [bucketKey, { metadataLocation }] = await Promise.all([
-          uploadFileAtPathToGCSAsync(
-            ctx.graphqlClient,
-            UploadSessionType.EasBuildGcsProjectSources,
-            projectTarball.path,
-            createProgressTracker({
-              total: projectTarball.size,
-              message: ratio =>
-                `Uploading to EAS Build (${formatBytes(
-                  projectTarball.size * ratio
-                )} / ${formatBytes(projectTarball.size)})`,
-              completedMessage: (duration: string) => `Uploaded to EAS ${chalk.dim(duration)}`,
-            })
-          ),
-          uploadMetadataFileAsync<TPlatform>(projectTarball, ctx),
-        ]);
 
-        if (metadataLocation) {
-          return { bucketKey, metadataLocation };
-        }
-        return { bucketKey };
+        const { bucketKey } = await uploadAsync(
+          UploadSessionType.EasBuildProjectSources,
+          projectTarball.path,
+          createProgressTracker({
+            total: projectTarball.size,
+            message: ratio =>
+              `Uploading to EAS Build (${formatBytes(projectTarball.size * ratio)} / ${formatBytes(
+                projectTarball.size
+              )})`,
+            completedMessage: (duration: string) =>
+              `Uploaded to EAS ${chalk.dim(duration)} ${learnMore(
+                'https://expo.fyi/eas-build-archive'
+              )}`,
+          })
+        );
+        return bucketKey;
       },
       {
-        attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
-        successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
-        failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
-        properties: ctx.analyticsEventProperties,
+        successEvent: Event.PROJECT_UPLOAD_SUCCESS,
+        failureEvent: Event.PROJECT_UPLOAD_FAIL,
+        trackingCtx: ctx.trackingCtx,
       }
     );
-  } catch (err: any) {
-    let errMessage = 'Failed to upload the project tarball to EAS Build';
-
-    if (err.message) {
-      errMessage += `\n\nReason: ${err.message}`;
-    }
-
-    throw new EasBuildProjectArchiveUploadError(errMessage);
   } finally {
     if (projectTarballPath) {
       await fs.remove(projectTarballPath);
@@ -332,49 +178,13 @@ async function uploadProjectAsync<TPlatform extends Platform>(
   }
 }
 
-async function uploadMetadataFileAsync<TPlatform extends Platform>(
-  projectTarball: LocalFile,
-  ctx: BuildContext<TPlatform>
-): Promise<{ metadataLocation: string | null }> {
-  let projectMetadataFile: LocalFile | null = null;
-  try {
-    projectMetadataFile = await makeProjectMetadataFileAsync(projectTarball.path);
-
-    const metadataLocation = await uploadFileAtPathToGCSAsync(
-      ctx.graphqlClient,
-      UploadSessionType.EasBuildGcsProjectMetadata,
-      projectMetadataFile.path
-    );
-    return { metadataLocation };
-  } catch (err: any) {
-    let errMessage = 'Failed to upload metadata to EAS Build';
-
-    if (err.message) {
-      errMessage += `\n\nReason: ${err.message}`;
-    }
-
-    Log.warn(errMessage);
-    return { metadataLocation: null };
-  } finally {
-    if (projectMetadataFile) {
-      await fs.remove(projectMetadataFile.path);
-    }
-  }
-}
-
-async function sendBuildRequestAsync<
-  TPlatform extends Platform,
-  Credentials,
-  TJob extends BuildJob,
->(
+async function sendBuildRequestAsync<TPlatform extends Platform, Credentials, TJob extends Job>(
   builder: Builder<TPlatform, Credentials, TJob>,
   job: TJob,
-  metadata: Metadata,
-  buildParams: BuildParamsInput
+  metadata: Metadata
 ): Promise<BuildFragment> {
   const { ctx } = builder;
   return await withAnalyticsAsync(
-    ctx.analytics,
     async () => {
       if (Log.isDebug) {
         Log.log(`Starting ${requestedPlatformDisplayNames[job.platform]} build`);
@@ -383,316 +193,139 @@ async function sendBuildRequestAsync<
       const { build, deprecationInfo } = await builder.sendBuildRequestAsync(
         ctx.projectId,
         job,
-        metadata,
-        buildParams
+        metadata
       );
 
       printDeprecationWarnings(deprecationInfo);
       return build;
     },
     {
-      attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
-      successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
-      failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
-      properties: ctx.analyticsEventProperties,
+      successEvent: Event.BUILD_REQUEST_SUCCESS,
+      failureEvent: Event.BUILD_REQUEST_FAIL,
+      trackingCtx: ctx.trackingCtx,
     }
   );
 }
 
-export type MaybeBuildFragment = BuildFragment | null;
+async function withAnalyticsAsync<Result>(
+  fn: () => Promise<Result>,
+  analytics: {
+    successEvent: Event;
+    failureEvent: Event;
+    trackingCtx: TrackingContext;
+  }
+): Promise<Result> {
+  try {
+    const result = await fn();
+    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
+    return result;
+  } catch (error: any) {
+    Analytics.logEvent(analytics.failureEvent, {
+      ...analytics.trackingCtx,
+      reason: error.message,
+    });
+    throw error;
+  }
+}
 
 export async function waitForBuildEndAsync(
-  graphqlClient: ExpoGraphqlClient,
-  { buildIds, accountName }: { buildIds: string[]; accountName: string },
-  { intervalSec = 10 } = {}
-): Promise<MaybeBuildFragment[]> {
-  let spinner;
-  let originalSpinnerText;
-  if (buildIds.length === 1) {
-    Log.log('Waiting for build to complete. You can press Ctrl+C to exit.');
-    originalSpinnerText = 'Waiting for build to complete.';
-    spinner = ora(originalSpinnerText).start();
-  } else {
-    originalSpinnerText = 'Waiting for builds to complete. You can press Ctrl+C to exit.';
-    spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
-  }
-  while (true) {
-    const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
-    const { refetch } =
-      builds.length === 1
-        ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
-        : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
-    if (!refetch) {
-      return builds;
+  buildIds: string[],
+  { timeoutSec = 3600, intervalSec = 30 } = {}
+): Promise<(BuildFragment | null)[]> {
+  Log.log(
+    `Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`
+  );
+  const spinner = ora().start();
+  let time = new Date().getTime();
+  const endTime = time + timeoutSec * 1000;
+  while (time <= endTime) {
+    const builds: (BuildFragment | null)[] = await Promise.all(
+      buildIds.map(async buildId => {
+        try {
+          return await BuildQuery.byIdAsync(buildId, { useCache: false });
+        } catch (err) {
+          Log.debug('Failed to fetch the build status', err);
+          return null;
+        }
+      })
+    );
+    if (builds.length === 1) {
+      const [build] = builds;
+      if (build !== null) {
+        switch (build.status) {
+          case BuildStatus.Finished:
+            spinner.succeed('Build finished');
+            return builds;
+          case BuildStatus.New:
+            spinner.text = 'Build created';
+            break;
+          case BuildStatus.InQueue:
+            spinner.text = 'Build queued...';
+            break;
+          case BuildStatus.Canceled:
+            spinner.text = 'Build canceled';
+            spinner.stopAndPersist();
+            return builds;
+          case BuildStatus.InProgress:
+            spinner.text = 'Build in progress...';
+            break;
+          case BuildStatus.Errored:
+            spinner.fail('Build failed');
+            if (build.error) {
+              return builds;
+            } else {
+              throw new Error(`Standalone build failed!`);
+            }
+          default:
+            spinner.warn('Unknown status');
+            throw new Error(`Unknown build status: ${build.status} - aborting!`);
+        }
+      } else {
+        if (!spinner.text) {
+          spinner.text = 'Could not fetch the build status. Check your network connection.';
+        }
+      }
+    } else {
+      if (builds.filter(build => build?.status === BuildStatus.Finished).length === builds.length) {
+        spinner.succeed('All builds have finished');
+        return builds;
+      } else if (
+        builds.filter(build =>
+          build?.status
+            ? [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(
+                build.status
+              )
+            : false
+        ).length === builds.length
+      ) {
+        spinner.fail('Some of the builds were canceled or failed.');
+        return builds;
+      } else {
+        const newBuilds = builds.filter(build => build?.status === BuildStatus.New).length;
+        const inQueue = builds.filter(build => build?.status === BuildStatus.InQueue).length;
+        const inProgress = builds.filter(build => build?.status === BuildStatus.InProgress).length;
+        const errored = builds.filter(build => build?.status === BuildStatus.Errored).length;
+        const finished = builds.filter(build => build?.status === BuildStatus.Finished).length;
+        const canceled = builds.filter(build => build?.status === BuildStatus.Canceled).length;
+        const unknown = builds.length - newBuilds - inQueue - inProgress - errored - finished;
+        spinner.text = [
+          newBuilds && `Builds created: ${newBuilds}`,
+          inQueue && `Builds in queue: ${inQueue}`,
+          inProgress && `Builds in progress: ${inProgress}`,
+          canceled && `Builds canceled: ${canceled}`,
+          errored && chalk.red(`Builds failed: ${errored}`),
+          finished && chalk.green(`Builds finished: ${finished}`),
+          unknown && chalk.red(`Builds with unknown status: ${unknown}`),
+        ]
+          .filter(i => i)
+          .join('\t');
+      }
     }
+    time = new Date().getTime();
     await sleepAsync(intervalSec * 1000);
   }
-}
-
-async function getBuildsSafelyAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildIds: string[]
-): Promise<MaybeBuildFragment[]> {
-  const promises = buildIds.map(async buildId => {
-    try {
-      return await BuildQuery.byIdAsync(graphqlClient, buildId, { useCache: false });
-    } catch (err) {
-      Log.debug('Failed to fetch the build status', err);
-      return null;
-    }
-  });
-  return await Promise.all(promises);
-}
-
-interface BuildProgressResult {
-  refetch: boolean;
-}
-
-let queueProgressBarStarted = false;
-const queueProgressBar = new cliProgress.SingleBar(
-  { format: '|{bar}| {estimatedWaitTime}' },
-  cliProgress.Presets.rect
-);
-
-async function handleSingleBuildProgressAsync(
-  {
-    build,
-    accountName,
-  }: {
-    build: MaybeBuildFragment;
-    accountName: string;
-  },
-  { spinner }: { spinner: Ora }
-): Promise<BuildProgressResult> {
-  if (build === null) {
-    spinner.text = 'Could not fetch the build status. Check your network connection.';
-    return { refetch: true };
-  }
-
-  if (queueProgressBarStarted && build?.status && build.status !== BuildStatus.InQueue) {
-    if (build.status === BuildStatus.InProgress) {
-      queueProgressBar.update(queueProgressBar.getTotal(), {
-        estimatedWaitTime: '',
-      });
-    }
-    queueProgressBar.stop();
-    Log.newLine();
-    queueProgressBarStarted = false;
-    spinner.start('Build is about to start');
-  }
-
-  switch (build.status) {
-    case BuildStatus.Finished:
-      spinner.succeed('Build finished');
-      return { refetch: false };
-    case BuildStatus.New:
-      spinner.text = `Build concurrency limit reached for your account. Build will enter queue once a concurrency becomes available. Add additional concurrencies at ${link(
-        formatAccountBillingUrl(accountName)
-      )}.`;
-      break;
-    case BuildStatus.InQueue: {
-      spinner.text = 'Build queued...';
-      const progressBarPayload =
-        typeof build.estimatedWaitTimeLeftSeconds === 'number'
-          ? { estimatedWaitTime: formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds) }
-          : { estimatedWaitTime: '' };
-
-      if (
-        !queueProgressBarStarted &&
-        typeof build.initialQueuePosition === 'number' &&
-        typeof build.queuePosition === 'number' &&
-        typeof build.estimatedWaitTimeLeftSeconds === 'number'
-      ) {
-        spinner.stopAndPersist();
-        if (build.priority !== BuildPriority.High) {
-          Log.newLine();
-          Log.log('Start builds sooner in the priority queue.');
-          Log.log(
-            `Sign up for EAS Production or Enterprise at ${link(
-              formatAccountBillingUrl(accountName)
-            )}`
-          );
-        }
-
-        Log.newLine();
-        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
-        queueProgressBar.start(
-          build.initialQueuePosition + 1,
-          build.initialQueuePosition - build.queuePosition + 1,
-          progressBarPayload
-        );
-        queueProgressBarStarted = true;
-      }
-      if (typeof build.queuePosition === 'number') {
-        queueProgressBar.update(build.queuePosition, progressBarPayload);
-      }
-      break;
-    }
-    case BuildStatus.PendingCancel:
-    case BuildStatus.Canceled:
-      spinner.fail('Build canceled');
-      return { refetch: false };
-    case BuildStatus.InProgress:
-      spinner.text = 'Build in progress...';
-      break;
-    case BuildStatus.Errored:
-      spinner.fail('Build failed');
-      if (build.error) {
-        return { refetch: false };
-      } else {
-        throw new Error('Standalone build failed!');
-      }
-    default:
-      spinner.warn('Unknown status');
-      throw new Error(`Unknown build status: ${build.status} - aborting!`);
-  }
-  return { refetch: true };
-}
-
-const priorityToQueueDisplayName: Record<BuildPriority, string> = {
-  [BuildPriority.Normal]: 'Free tier queue',
-  [BuildPriority.NormalPlus]: 'Free tier queue',
-  [BuildPriority.High]: 'priority queue',
-};
-
-const statusToDisplayName: Record<BuildStatus, string> = {
-  [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
-  [BuildStatus.InQueue]: 'in queue',
-  [BuildStatus.InProgress]: 'in progress',
-  [BuildStatus.PendingCancel]: 'canceled',
-  [BuildStatus.Canceled]: 'canceled',
-  [BuildStatus.Finished]: 'finished',
-  [BuildStatus.Errored]: 'failed',
-};
-
-const platforms = [AppPlatform.Android, AppPlatform.Ios];
-
-async function handleMultipleBuildsProgressAsync(
-  { builds: maybeBuilds }: { builds: MaybeBuildFragment[] },
-  { spinner, originalSpinnerText }: { spinner: Ora; originalSpinnerText: string }
-): Promise<BuildProgressResult> {
-  const buildCount = maybeBuilds.length;
-  const builds = maybeBuilds.filter<BuildFragment>(isBuildFragment);
-
-  const allFinished =
-    builds.filter(build => build.status === BuildStatus.Finished).length === buildCount;
-  const allSettled =
-    builds.filter(build =>
-      [
-        BuildStatus.Finished,
-        BuildStatus.Errored,
-        BuildStatus.Canceled,
-        BuildStatus.PendingCancel,
-      ].includes(build.status)
-    ).length === buildCount;
-
-  if (allSettled) {
-    if (allFinished) {
-      spinner.succeed(formatSettledBuildsText(builds));
-    } else {
-      spinner.fail(formatSettledBuildsText(builds));
-    }
-    return { refetch: false };
-  } else {
-    spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
-    return { refetch: true };
-  }
-}
-
-function formatSettledBuildsText(builds: BuildFragment[]): string {
-  return platforms
-    .map(platform => {
-      const build = nullthrows(
-        builds.find(build => build.platform === platform),
-        `Build for platform ${platform} must be defined in this context`
-      );
-      return `${appPlatformEmojis[platform]} ${
-        appPlatformDisplayNames[platform]
-      } build - status: ${chalk.bold(statusToDisplayName[build.status])}`;
-    })
-    .join('\n  ');
-}
-
-function formatPendingBuildsText(originalSpinnerText: string, builds: BuildFragment[]): string {
-  return [
-    originalSpinnerText,
-    ...platforms.map(platform => {
-      const build = builds.find(build => build.platform === platform);
-      const status = build ? statusToDisplayName[build.status] : 'unknown';
-      let extraInfo = '';
-      if (
-        build?.status === BuildStatus.InQueue &&
-        typeof build.initialQueuePosition === 'number' &&
-        typeof build.queuePosition === 'number'
-      ) {
-        const percent = Math.floor(
-          ((build.initialQueuePosition - build.queuePosition + 1) /
-            (build.initialQueuePosition + 1)) *
-            100
-        );
-        const estimatedWaitTime =
-          typeof build.estimatedWaitTimeLeftSeconds === 'number'
-            ? ` - ${formatEstimatedWaitTime(build.estimatedWaitTimeLeftSeconds)}`
-            : '';
-        extraInfo = ` - queue progress: ${chalk.bold(`${percent}%`)}${estimatedWaitTime}`;
-      }
-      return `${appPlatformEmojis[platform]} ${
-        appPlatformDisplayNames[platform]
-      } build - status: ${chalk.bold(status)}${extraInfo}`;
-    }),
-  ].join('\n  ');
-}
-
-function isBuildFragment(maybeBuild: MaybeBuildFragment): maybeBuild is BuildFragment {
-  return maybeBuild !== null;
-}
-
-function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
-  if (estimatedWaitTimeLeftSeconds < 5 * 60) {
-    return 'starting soon...';
-  } else {
-    const n = Math.floor(estimatedWaitTimeLeftSeconds / (10 * 60)) + 1;
-    return `starting in about ${n}0 minutes...`;
-  }
-}
-
-function formatAccountBillingUrl(accountName: string): string {
-  return new URL(`/accounts/${accountName}/settings/billing`, getExpoWebsiteBaseUrl()).toString();
-}
-
-async function createAndMaybeUploadFingerprintAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<{
-  runtimeVersion?: string;
-  fingerprintSource?: FingerprintSource;
-}> {
-  const resolvedRuntimeVersion = await resolveRuntimeVersionAsync({
-    exp: ctx.exp,
-    platform: ctx.platform,
-    workflow: ctx.workflow,
-    projectDir: ctx.projectDir,
-    env: ctx.env,
-    cwd: ctx.projectDir,
-  });
-
-  if (!resolvedRuntimeVersion) {
-    return {};
-  }
-
-  /**
-   * It's ok for fingerprintSources or runtimeVersion to be empty
-   * fingerprintSources only exist if the project is using runtimeVersion.policy: fingerprint
-   */
-  if (!resolvedRuntimeVersion.fingerprint || !resolvedRuntimeVersion.runtimeVersion) {
-    return {
-      runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
-    };
-  }
-
-  return await maybeUploadFingerprintAsync({
-    runtimeVersion: resolvedRuntimeVersion.runtimeVersion,
-    fingerprint: resolvedRuntimeVersion.fingerprint,
-    graphqlClient: ctx.graphqlClient,
-    localBuildMode: ctx.localBuildOptions.localBuildMode,
-  });
+  spinner.warn('Timed out');
+  throw new Error(
+    'Timeout reached! It is taking longer than expected to finish the build, aborting...'
+  );
 }

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

@@ -1,87 +1,183 @@
-import { AppVersionSource, EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { getConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { EasJson, EasJsonReader } from '@expo/eas-json';
+import { error } from '@oclif/errors';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import Log, { learnMore } from '../log';
-import { easCliVersion } from '../utils/easCli';
-import { Client } from '../vcs/vcs';
+import { RequestedPlatform } from '../platform';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { confirmAsync, promptAsync } from '../prompts';
+import { ensureLoggedInAsync } from '../user/actions';
+import vcs from '../vcs';
+import { configureAndroidAsync } from './android/configure';
+import { ConfigureContext } from './context';
+import { configureIosAsync } from './ios/configure';
+import { commitPromptAsync, maybeBailOnRepoStatusAsync } from './utils/repository';
 
-interface ConfigureParams {
-  projectDir: string;
-  nonInteractive: boolean;
-  vcsClient: Client;
-}
+const configureCommitMessage = {
+  [RequestedPlatform.Android]: 'Configure EAS Build for Android',
+  [RequestedPlatform.Ios]: 'Configure EAS Build for iOS',
+  [RequestedPlatform.All]: 'Configure EAS Build',
+};
 
-export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
-  return await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir));
-}
-
-/**
- * Creates eas.json if it does not exist.
- *
- * Returns:
- * - false - if eas.json already exists
- * - true - if eas.json was created by the function
- */
 export async function ensureProjectConfiguredAsync(
-  configureParams: ConfigureParams
-): Promise<boolean> {
-  if (await easJsonExistsAsync(configureParams.projectDir)) {
-    return false;
+  projectDir: string,
+  requestedPlatform: RequestedPlatform
+): Promise<void> {
+  if (await fs.pathExists(EasJsonReader.formatEasJsonPath(projectDir))) {
+    return;
   }
 
-  await configureAsync(configureParams);
-  return true;
-}
-
-async function configureAsync({
-  projectDir,
-  nonInteractive,
-  vcsClient,
-}: ConfigureParams): Promise<void> {
-  await maybeBailOnRepoStatusAsync(vcsClient, nonInteractive);
-
-  await createEasJsonAsync(projectDir, vcsClient);
-
-  if (await vcsClient.isCommitRequiredAsync()) {
-    Log.newLine();
-    await reviewAndCommitChangesAsync(vcsClient, 'Configure EAS Build', {
-      nonInteractive,
+  const message = 'This project is not configured to build with EAS. Set it up now?';
+  const confirm = await confirmAsync({ message });
+  if (confirm) {
+    await configureAsync({
+      projectDir,
+      platform: requestedPlatform,
     });
+    if (await vcs.hasUncommittedChangesAsync()) {
+      error(
+        'Build process requires clean working tree, please commit all your changes and run `eas build` again',
+        { exit: 1 }
+      );
+    }
+  } else {
+    error(
+      `Aborting, please run ${chalk.bold('eas build:configure')} or create eas.json (${learnMore(
+        'https://docs.expo.dev/build/eas-json'
+      )})`,
+      { exit: 1 }
+    );
   }
 }
 
-const EAS_JSON_DEFAULT: EasJson = {
-  cli: {
-    version: `>= ${easCliVersion}`,
-    appVersionSource: AppVersionSource.REMOTE,
-  },
+export async function configureAsync(options: {
+  platform: RequestedPlatform;
+  projectDir: string;
+}): Promise<void> {
+  await vcs.ensureRepoExistsAsync();
+  await maybeBailOnRepoStatusAsync();
+
+  const { exp } = getConfig(options.projectDir, { skipSDKVersionRequirement: true });
+
+  const ctx: ConfigureContext = {
+    user: await ensureLoggedInAsync(),
+    projectDir: options.projectDir,
+    exp,
+    requestedPlatform: options.platform,
+    shouldConfigureAndroid: [RequestedPlatform.All, RequestedPlatform.Android].includes(
+      options.platform
+    ),
+    shouldConfigureIos: [RequestedPlatform.All, RequestedPlatform.Ios].includes(options.platform),
+    hasAndroidNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.ANDROID)) === Workflow.GENERIC,
+    hasIosNativeProject:
+      (await resolveWorkflowAsync(options.projectDir, Platform.IOS)) === Workflow.GENERIC,
+  };
+
+  Log.newLine();
+  await ensureEasJsonExistsAsync(ctx);
+  if (ctx.shouldConfigureAndroid) {
+    await configureAndroidAsync(ctx);
+  }
+  if (ctx.shouldConfigureIos) {
+    await configureIosAsync(ctx);
+  }
+
+  if (await vcs.hasUncommittedChangesAsync()) {
+    Log.newLine();
+    await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
+  } else {
+    Log.newLine();
+    Log.withTick('No changes were necessary, the project is already configured correctly.');
+  }
+}
+
+const EAS_JSON_MANAGED_DEFAULT: EasJson = {
   build: {
+    release: {},
     development: {
       developmentClient: true,
       distribution: 'internal',
     },
-    preview: {
-      distribution: 'internal',
-    },
-    production: {
-      autoIncrement: true,
-    },
   },
   submit: {
-    production: {},
+    release: {},
   },
 };
 
-async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
-  const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
+const EAS_JSON_GENERIC_DEFAULT: EasJson = {
+  build: {
+    release: {},
+    development: {
+      distribution: 'internal',
+      android: {
+        gradleCommand: ':app:assembleDebug',
+      },
+      ios: {
+        buildConfiguration: 'Debug',
+      },
+    },
+  },
+  submit: {
+    release: {},
+  },
+};
 
-  await fs.writeFile(easJsonPath, `${JSON.stringify(EAS_JSON_DEFAULT, null, 2)}\n`);
-  await vcsClient.trackFileAsync(easJsonPath);
-  Log.withTick(
-    `Generated ${chalk.bold('eas.json')}. ${learnMore(
-      'https://docs.expo.dev/build-reference/eas-json/'
-    )}`
-  );
+export async function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void> {
+  const easJsonPath = EasJsonReader.formatEasJsonPath(ctx.projectDir);
+
+  if (await fs.pathExists(easJsonPath)) {
+    const reader = new EasJsonReader(ctx.projectDir);
+    await reader.readAndValidateAsync();
+
+    Log.withTick('Validated eas.json');
+    return;
+  }
+
+  const easJson =
+    ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
+      ? EAS_JSON_GENERIC_DEFAULT
+      : EAS_JSON_MANAGED_DEFAULT;
+
+  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+  await vcs.trackFileAsync(easJsonPath);
+  Log.withTick('Generated eas.json');
+}
+
+enum ShouldCommitChanges {
+  Yes,
+  ShowDiffFirst,
+  Skip,
+}
+
+async function reviewAndCommitChangesAsync(
+  initialCommitMessage: string,
+  askedFirstTime: boolean = true
+): Promise<void> {
+  const { selected } = await promptAsync({
+    type: 'select',
+    name: 'selected',
+    message: 'Can we commit these changes to git for you?',
+    choices: [
+      { title: 'Yes', value: ShouldCommitChanges.Yes },
+      ...(askedFirstTime
+        ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
+        : []),
+      {
+        title: 'Skip committing changes, I will do it later on my own',
+        value: ShouldCommitChanges.Skip,
+      },
+    ],
+  });
+
+  if (selected === ShouldCommitChanges.Yes) {
+    await commitPromptAsync({ initialCommitMessage });
+    Log.withTick('Committed changes');
+  } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
+    await vcs.showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, false);
+  }
 }

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

@@ -1,67 +1,155 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJson } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
-import { NodePackageManager } from '@expo/package-manager';
+import { AndroidBuildProfile, BuildProfile, IosBuildProfile } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
+import resolveFrom from 'resolve-from';
+import { v4 as uuidv4 } from 'uuid';
 
-import { LocalBuildOptions } from './local';
-import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
-import { Target } from '../credentials/ios/types';
-import { BuildResourceClass } from '../graphql/generated';
-import { GradleBuildContext } from '../project/android/gradle';
-import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
-import { XcodeBuildContext } from '../project/ios/scheme';
+import { RequestedPlatform } from '../platform';
+import { getExpoConfig } from '../project/expoConfig';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { findAccountByName } from '../user/Account';
 import { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
+import { ensureLoggedInAsync } from '../user/actions';
+import { TrackingContext } from './types';
+import Analytics, { Event } from './utils/analytics';
 
-export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
-
-export interface AndroidBuildContext {
-  applicationId: string;
-  gradleContext?: GradleBuildContext;
-  versionCodeOverride?: string;
-}
-
-export interface IosBuildContext {
-  bundleIdentifier: string;
-  applicationTarget: Target;
-  targets: Target[];
-  xcodeBuildContext: XcodeBuildContext;
-  buildNumberOverride?: string;
+export interface ConfigureContext {
+  user: Actor;
+  projectDir: string;
+  exp: ExpoConfig;
+  requestedPlatform: RequestedPlatform;
+  shouldConfigureAndroid: boolean;
+  shouldConfigureIos: boolean;
+  hasAndroidNativeProject: boolean;
+  hasIosNativeProject: boolean;
 }
 
 export interface BuildContext<T extends Platform> {
   accountName: string;
-  easJsonCliConfig: EasJson['cli'];
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
-  resourceClass: BuildResourceClass;
   clearCache: boolean;
   credentialsCtx: CredentialsContext;
   exp: ExpoConfig;
-  localBuildOptions: LocalBuildOptions;
+  local: boolean;
   nonInteractive: boolean;
-  noWait: boolean;
-  runFromCI: boolean;
   platform: T;
   projectDir: string;
   projectId: string;
   projectName: string;
-  message?: string;
-  analyticsEventProperties: AnalyticsEventProperties;
+  skipProjectConfiguration: boolean;
+  trackingCtx: TrackingContext;
   user: Actor;
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
   workflow: Workflow;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
-  ios: T extends Platform.IOS ? IosBuildContext : undefined;
-  developmentClient: boolean;
-  requiredPackageManager: NodePackageManager['name'] | null;
-  vcsClient: Client;
-  loggerLevel?: LoggerLevel;
-  repack: boolean;
-  env: Record<string, string>;
+}
+
+export async function createBuildContextAsync<T extends Platform>({
+  buildProfileName,
+  buildProfile,
+  clearCache = false,
+  local,
+  nonInteractive = false,
+  platform,
+  projectDir,
+  skipProjectConfiguration = false,
+}: {
+  buildProfileName: string;
+  buildProfile: BuildProfile<T>;
+  clearCache: boolean;
+  local: boolean;
+  nonInteractive: boolean;
+  platform: T;
+  projectDir: string;
+  skipProjectConfiguration: boolean;
+}): Promise<BuildContext<T>> {
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
+  const user = await ensureLoggedInAsync();
+  const accountName = getProjectAccountName(exp, user);
+  const projectName = exp.slug;
+  const projectId = await getProjectIdAsync(exp, { env: buildProfile.env });
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
+  const accountId = findAccountByName(user.accounts, accountName)?.id;
+
+  const credentialsCtx = new CredentialsContext({
+    exp,
+    nonInteractive,
+    projectDir,
+    user,
+  });
+
+  const devClientProperties = getDevClientEventProperties({
+    platform,
+    projectDir,
+    buildProfile,
+  });
+  const trackingCtx = {
+    tracking_id: uuidv4(),
+    platform,
+    ...(accountId && { account_id: accountId }),
+    account_name: accountName,
+    project_id: projectId,
+    project_type: workflow,
+    ...devClientProperties,
+  };
+  Analytics.logEvent(Event.BUILD_COMMAND, trackingCtx);
+
+  return {
+    accountName,
+    buildProfile,
+    buildProfileName,
+    clearCache,
+    credentialsCtx,
+    exp,
+    local,
+    nonInteractive,
+    platform,
+    projectDir,
+    projectId,
+    projectName,
+    skipProjectConfiguration,
+    trackingCtx,
+    user,
+    workflow,
+  };
+}
+
+function getDevClientEventProperties({
+  platform,
+  projectDir,
+  buildProfile,
+}: {
+  platform: Platform;
+  projectDir: string;
+  buildProfile: AndroidBuildProfile | IosBuildProfile;
+}): Partial<TrackingContext> {
+  let includesDevClient;
+  const version = tryGetDevClientVersion(projectDir);
+  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
+  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
+    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+  } else if (buildProfile.developmentClient) {
+    includesDevClient = true;
+  } else {
+    includesDevClient = false;
+  }
+
+  if (version) {
+    return { dev_client: includesDevClient, dev_client_version: version };
+  } else {
+    return { dev_client: includesDevClient };
+  }
+}
+
+function tryGetDevClientVersion(projectDir: string): string | null {
+  try {
+    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
+    return pkg.version?.toString() ?? null;
+  } catch {
+    return null;
+  }
 }

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

@@ -1,206 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
-import JsonFile from '@expo/json-file';
-import { LoggerLevel } from '@expo/logger';
-import { resolvePackageManager } from '@expo/package-manager';
-import getenv from 'getenv';
-import resolveFrom from 'resolve-from';
-import { v4 as uuidv4 } from 'uuid';
-
-import { createAndroidContextAsync } from './android/build';
-import { BuildContext, CommonContext } from './context';
-import { createIosContextAsync } from './ios/build';
-import { LocalBuildMode, LocalBuildOptions } from './local';
-import { resolveBuildResourceClassAsync } from './utils/resourceClass';
-import { Analytics, AnalyticsEventProperties, BuildEvent } from '../analytics/AnalyticsManager';
-import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { CredentialsContext } from '../credentials/context';
-import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
-import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
-import { resolveWorkflowAsync } from '../project/workflow';
-import { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
-
-export async function createBuildContextAsync<T extends Platform>({
-  buildProfileName,
-  buildProfile,
-  easJsonCliConfig,
-  clearCache = false,
-  localBuildOptions,
-  nonInteractive,
-  noWait,
-  platform,
-  projectDir,
-  resourceClassFlag,
-  message,
-  actor,
-  graphqlClient,
-  analytics,
-  vcsClient,
-  getDynamicPrivateProjectConfigAsync,
-  customBuildConfigMetadata,
-  buildLoggerLevel,
-  freezeCredentials,
-  repack,
-  env,
-}: {
-  buildProfileName: string;
-  buildProfile: BuildProfile<T>;
-  easJsonCliConfig: EasJson['cli'];
-  clearCache: boolean;
-  localBuildOptions: LocalBuildOptions;
-  nonInteractive: boolean;
-  noWait: boolean;
-  platform: T;
-  projectDir: string;
-  resourceClassFlag?: ResourceClass;
-  message?: string;
-  actor: Actor;
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
-  vcsClient: Client;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  repack: boolean;
-  env: Record<string, string>;
-}): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
-    env,
-  });
-  const projectName = exp.slug;
-  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
-  const accountId = account.id;
-  const runFromCI = getenv.boolish('CI', false);
-  const developmentClient =
-    buildProfile.developmentClient ??
-    (platform === Platform.ANDROID
-      ? (buildProfile as BuildProfile<Platform.ANDROID>)?.gradleCommand === ':app:assembleDebug'
-      : (buildProfile as BuildProfile<Platform.IOS>)?.buildConfiguration === 'Debug') ??
-    false;
-
-  const requiredPackageManager = resolvePackageManager(projectDir);
-
-  const credentialsCtx = new CredentialsContext({
-    projectInfo: { exp, projectId },
-    nonInteractive,
-    projectDir,
-    user: actor,
-    graphqlClient,
-    analytics,
-    env,
-    easJsonCliConfig,
-    vcsClient,
-    freezeCredentials,
-  });
-
-  const devClientProperties = getDevClientEventProperties({
-    platform,
-    projectDir,
-    buildProfile,
-  });
-  const analyticsEventProperties = {
-    tracking_id: uuidv4(),
-    platform,
-    ...(exp.sdkVersion && { sdk_version: exp.sdkVersion }),
-    ...(accountId && { account_id: accountId }),
-    project_id: projectId,
-    project_type: workflow,
-    ...devClientProperties,
-    no_wait: noWait,
-    run_from_ci: runFromCI,
-    local: localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN,
-  };
-  analytics.logEvent(BuildEvent.BUILD_COMMAND, analyticsEventProperties);
-
-  const resourceClass = await resolveBuildResourceClassAsync(
-    buildProfile,
-    platform,
-    resourceClassFlag
-  );
-
-  const commonContext: CommonContext<T> = {
-    accountName: account.name,
-    buildProfile,
-    buildProfileName,
-    resourceClass,
-    easJsonCliConfig,
-    clearCache,
-    credentialsCtx,
-    exp,
-    localBuildOptions,
-    nonInteractive,
-    noWait,
-    platform,
-    projectDir,
-    projectId,
-    projectName,
-    analyticsEventProperties,
-    user: actor,
-    graphqlClient,
-    analytics,
-    vcsClient,
-    workflow,
-    message,
-    runFromCI,
-    customBuildConfigMetadata,
-    developmentClient,
-    requiredPackageManager,
-    loggerLevel: buildLoggerLevel,
-    repack,
-    env,
-  };
-  if (platform === Platform.ANDROID) {
-    const common = commonContext as CommonContext<Platform.ANDROID>;
-    return {
-      ...common,
-      android: await createAndroidContextAsync(common),
-    } as BuildContext<T>;
-  } else {
-    const common = commonContext as CommonContext<Platform.IOS>;
-    return {
-      ...common,
-      ios: await createIosContextAsync(common),
-    } as BuildContext<T>;
-  }
-}
-
-function getDevClientEventProperties({
-  platform,
-  projectDir,
-  buildProfile,
-}: {
-  platform: Platform;
-  projectDir: string;
-  buildProfile: BuildProfile;
-}): Partial<AnalyticsEventProperties> {
-  let includesDevClient;
-  const version = tryGetDevClientVersion(projectDir);
-  if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.gradleCommand?.includes('Debug'));
-  } else if (platform === Platform.IOS && 'buildConfiguration' in buildProfile) {
-    includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
-  } else if (buildProfile.developmentClient) {
-    includesDevClient = true;
-  } else {
-    includesDevClient = false;
-  }
-
-  if (version) {
-    return { dev_client: includesDevClient, dev_client_version: version };
-  } else {
-    return { dev_client: includesDevClient };
-  }
-}
-
-function tryGetDevClientVersion(projectDir: string): string | null {
-  try {
-    const pkg = JsonFile.read(resolveFrom(projectDir, 'expo-dev-client/package.json'));
-    return pkg.version?.toString() ?? null;
-  } catch {
-    return null;
-  }
-}

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

@@ -1,25 +0,0 @@
-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 EasBuildFreeTierLimitExceededError extends EasCommandError {}
-
-export class EasBuildFreeTierIosLimitExceededError extends EasCommandError {}
-
-export class EasBuildResourceClassNotAvailableInFreeTierError extends EasCommandError {}
-
-export class EasBuildLegacyResourceClassNotAvailableError extends EasCommandError {}
-
-export class RequestValidationError extends EasCommandError {}
-
-export class EasBuildDownForMaintenanceError extends EasCommandError {}
-
-export class EasBuildTooManyPendingBuildsError extends EasCommandError {}
-
-export class EasBuildProjectArchiveUploadError extends EasCommandError {}

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

@@ -1,109 +0,0 @@
-import { Env } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
-import { EnvironmentVariablesQuery } from '../graphql/queries/EnvironmentVariablesQuery';
-import Log, { learnMore } from '../log';
-
-function isEnvironment(env: string): env is EnvironmentVariableEnvironment {
-  return Object.values(EnvironmentVariableEnvironment).includes(
-    env as EnvironmentVariableEnvironment
-  );
-}
-
-export async function evaluateConfigWithEnvVarsAsync<Config extends { projectId: string }, Opts>({
-  buildProfile,
-  buildProfileName,
-  graphqlClient,
-  getProjectConfig,
-  opts,
-}: {
-  buildProfile: BuildProfile;
-  buildProfileName: string;
-  graphqlClient: ExpoGraphqlClient | null;
-  opts: Opts;
-  getProjectConfig(opts: Opts): Promise<Config>;
-}): Promise<Config & { env: Env }> {
-  if (!graphqlClient) {
-    Log.warn('An Expo user account is required to fetch environment variables.');
-    const config = await getProjectConfig(opts);
-    return { env: buildProfile.env ?? {}, ...config };
-  }
-  const { projectId } = await getProjectConfig({ env: buildProfile.env, ...opts });
-  const env = await resolveEnvVarsAsync({
-    buildProfile,
-    buildProfileName,
-    graphqlClient,
-    projectId,
-  });
-  const config = await getProjectConfig({ ...opts, env });
-
-  return { env, ...config };
-}
-
-async function resolveEnvVarsAsync({
-  buildProfile,
-  buildProfileName,
-  graphqlClient,
-  projectId,
-}: {
-  buildProfile: BuildProfile;
-  buildProfileName: string;
-  graphqlClient: ExpoGraphqlClient;
-  projectId: string;
-}): Promise<Env> {
-  const environment =
-    buildProfile.environment?.toUpperCase() ?? process.env.EAS_CURRENT_ENVIRONMENT;
-
-  if (!environment || !isEnvironment(environment)) {
-    Log.log(
-      `Loaded "env" configuration for the "${buildProfileName}" profile: ${
-        buildProfile.env && Object.keys(buildProfile.env).length > 0
-          ? Object.keys(buildProfile.env).join(', ')
-          : 'no environment variables specified'
-      }. ${learnMore('https://docs.expo.dev/build-reference/variables/')}`
-    );
-    return { ...buildProfile.env };
-  }
-
-  try {
-    const environmentVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(
-      graphqlClient,
-      {
-        appId: projectId,
-        environment,
-      }
-    );
-    const serverEnvVars = Object.fromEntries(
-      environmentVariables
-        .filter(({ name, value }) => name && value)
-        .map(({ name, value }) => [name, value])
-    ) as Record<string, string>;
-
-    const envVarsWithSource: Record<string, 'build profile' | 'EAS server'> = {
-      ...Object.fromEntries(Object.keys(serverEnvVars).map(key => [key, 'EAS server'])),
-      ...(buildProfile.env
-        ? Object.fromEntries(Object.keys(buildProfile.env).map(key => [key, 'build profile']))
-        : null),
-    };
-    Log.log(
-      `Loaded "env" configuration for the "${buildProfileName}" profile and "${environment.toLowerCase()}" environment: ${
-        Object.keys(envVarsWithSource).length > 0
-          ? Object.keys(envVarsWithSource)
-              .map(key => `${key} (source: ${envVarsWithSource[key]})`)
-              .join('\n')
-          : 'no environment variables specified'
-      }\n${learnMore('https://docs.expo.dev/build-reference/variables/')}`
-    );
-
-    return { ...serverEnvVars, ...buildProfile.env };
-  } catch (e) {
-    Log.error(`Failed to pull env variables for environment ${environment} from EAS servers`);
-    Log.error(e);
-    Log.error(
-      'This can possibly be a bug in EAS/EAS CLI. Report it here: https://github.com/expo/eas-cli/issues'
-    );
-    return { ...buildProfile.env };
-  }
-}