[14/n][eas-cli] Simplify credentials manager and device create for within-project-only running

.eslintignore

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

.eslintrc.js

@@ -30,6 +30,12 @@ module.exports = {
       },
     ],
     '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,2 @@
 * text eol=lf
-*.png binary
-*.jpg binary
-
 **/yarn.lock linguist-generated

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -37,7 +37,7 @@ body:
       required: true
     attributes:
       label: Environment
-      description: Run `npx expo-env-info` and `npx expo-doctor`, and paste the output here.
+      description: Run `npx expo-env-info` and `expo doctor`, 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/PULL_REQUEST_TEMPLATE

@@ -1,5 +1,8 @@
-<!-- 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.
 
 # Why
 

.github/codemention.yml

@@ -1,24 +0,0 @@
-commentConfiguration:
-  preamble: 'Subscribed to pull request'
-  epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
-rules:
-  - patterns: ['**/*']
-    mentions: ['sjchmiela']
-  - patterns: ['packages/eas-cli/src/update/**']
-    mentions: ['wschurman', 'quinlanj']
-  - patterns: ['packages/eas-cli/src/commands/update/**']
-    mentions: ['wschurman', 'quinlanj']
-  - patterns: ['packages/eas-cli/src/channel/**']
-    mentions: ['wschurman', 'quinlanj']
-  - patterns: ['packages/eas-cli/src/commands/channel/**']
-    mentions: ['wschurman', 'quinlanj']
-  - 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-cli/src/worker/**']
-    mentions: ['kitten', 'kadikraman']
-  - patterns: ['packages/eas-cli/src/commands/deploy/**']
-    mentions: ['kitten', 'kadikraman']

.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@b1ba699b304f2083b602164e06a89b868c84f076
+      - uses: actions/setup-node@v2
         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: 18
+      - 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" | sed -e 's/^[[:space:]]*//' )
+          MESSAGE=$( cut -d ' ' -f 2- <<< "$PARAMS" | sed -e 's/^[[:space:]]*//' )
+          yarn changelog-entry "$CATEGORY" "$MESSAGE"
+        env:
+          GITHUB_PR_AUTHOR: ${{ github.event.issue.user.login }}
+          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/release.yml

@@ -18,7 +18,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: 'eas-cli@${{ env.EAS_CLI_VERSION }}'
           draft: true
   build-linux:
     name: Build for Linux
@@ -28,23 +27,19 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
-      - name: Ensure GraphQL schema and generated code is up-to-date
-        working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn verify-graphql-code
       - 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
+        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist
       - id: arm
-        run: echo "filename=$(ls eas-*-arm.tar.gz)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=filename::$(ls eas-*-arm.tar.gz)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist
       - name: Upload linux-x64 tarball
         uses: actions/upload-release-asset@v1
@@ -73,22 +68,16 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
-      - run: brew install python-setuptools
-        env:
-          HOMEBREW_NO_AUTO_UPDATE: 1
+          node-version: 18
       - 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
+          yarn oclif pack:tarballs --no-xz --targets darwin-x64
       - 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
+        run: echo "::set-output name=filename::$(ls eas-*-x64.tar.gz)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist
       - name: Upload darwin-x64 tarball
         uses: actions/upload-release-asset@v1
@@ -99,15 +88,6 @@ jobs:
           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_content_type: application/gzip
   build-windows:
     name: Build for Windows
     runs-on: ubuntu-latest
@@ -116,7 +96,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -125,10 +105,10 @@ jobs:
           yarn oclif pack:win
         working-directory: ${{ github.workspace }}/packages/eas-cli
       - id: x64
-        run: echo "filename=$(ls eas-*-x64.exe)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=filename::$(ls eas-*-x64.exe)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
       - id: x86
-        run: echo "filename=$(ls eas-*-x86.exe)" >> $GITHUB_OUTPUT
+        run: echo "::set-output name=filename::$(ls eas-*-x86.exe)"
         working-directory: ${{ github.workspace }}/packages/eas-cli/dist/win32
       - name: Upload x64 installer
         uses: actions/upload-release-asset@v1
@@ -158,7 +138,7 @@ jobs:
         with:
           registry-url: 'https://registry.npmjs.org/'
           scope: 'expo'
-          node-version: 20
+          node-version: 18
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -167,31 +147,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
-        with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files
@@ -201,7 +165,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
@@ -225,9 +189,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: ''

.github/workflows/size.yml

@@ -2,9 +2,6 @@ name: Size
 on:
   pull_request:
     types: [synchronize, opened]
-concurrency:
-  group: size-${{ github.ref }}
-  cancel-in-progress: true
 jobs:
   compare:
     runs-on: ubuntu-latest
@@ -12,7 +9,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'

.github/workflows/test-graphql.yml

@@ -1,30 +0,0 @@
-name: Ensure GraphQL schema and generated code is up-to-date
-
-on:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-    paths:
-      - .github/workflows/test-graphql.yml
-      - packages/eas-cli/src/**
-  schedule:
-    - cron: '0 8 * * *' # 8:00 AM UTC time every day
-
-concurrency:
-  group: test-graphql-${{ github.ref }}
-  cancel-in-progress: true
-
-jobs:
-  test:
-    name: Ensure GraphQL schema and generated code is up-to-date
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 22
-      - run: yarn install --frozen-lockfile
-      - run: yarn verify-graphql-code
-        working-directory: packages/eas-cli

.github/workflows/test-scripts.yml

@@ -13,10 +13,6 @@ on:
     paths:
       - 'scripts/**'
 
-concurrency:
-  group: test-scripts-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -25,6 +21,6 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: 20
+          node-version: 18
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn typecheck

.github/workflows/test.yml

@@ -1,23 +1,18 @@
 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: ['14', '16', '18']
         include:
-          - node: '20'
+          - node: '18'
             coverage: true
     name: Test with Node ${{ matrix.node }}
     steps:
@@ -28,37 +23,16 @@ jobs:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn typecheck
-      - run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Test"
       - 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
+          NODE_OPTIONS: --max-old-space-size=4096
       - run: yarn lint --max-warnings=0
-      - run: yarn install --frozen-lockfile --check-files
-        working-directory: ./scripts
       - 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: 'sjchmiela'
-          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."
-            })

.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,16 @@
+* @dsokal @wkozyra95
+
+packages/eas-cli/src/build @dsokal @wkozyra95
+packages/eas-cli/src/commands/build @dsokal @wkozyra95
+
+packages/eas-cli/src/submit @dsokal
+packages/eas-cli/src/commands/submit.ts @dsokal
+
+packages/eas-cli/src/update @kgc00 @wschurman
+packages/eas-cli/src/commands/update @kgc00 @wschurman
+
+packages/eas-cli/schema @bycedric
+packages/eas-cli/src/metadata @bycedric
+packages/eas-cli/src/commands/metadata @bycedric
+
+packages/eas-json @dsokal @wkozyra95

CONTRIBUTING.md

@@ -1,67 +1,4 @@
-# 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. That's it! GitHub Actions is going to take care of the rest. Watch the #eas-cli Slack channel for a successful release notification.

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.

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": "16.17.3",
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+  "useWorkspaces": true,
+  "version": "2.1.0"
 }

package.json

@@ -1,5 +1,4 @@
 {
-  "name": "eas-cli-root",
   "private": true,
   "workspaces": [
     "packages/*"
@@ -9,33 +8,31 @@
     "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",
     "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",
+    "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
     "test": "jest",
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "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",
+    "@types/jest": "28.1.6",
+    "@types/node": "18.6.5",
+    "eslint": "8.21.0",
+    "eslint-config-universe": "11.1.0",
+    "eslint-plugin-async-protect": "2.1.0",
     "eslint-plugin-node": "11.1.0",
-    "jest": "29.7.0",
-    "jest-watch-typeahead": "2.2.2",
-    "lerna": "8.2.3",
-    "oclif": "^3.9.0",
-    "prettier": "3.1.1",
-    "ts-jest": "29.1.1",
-    "typescript": "5.3.3"
+    "jest": "28.1.3",
+    "jest-watch-typeahead": "2.0.0",
+    "lerna": "4.0.0",
+    "oclif": "3.1.2",
+    "prettier": "2.7.1",
+    "ts-jest": "28.0.7",
+    "typescript": "4.7.4"
   },
   "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

packages/eas-build-cache-provider/README.md

@@ -1,22 +0,0 @@
-# eas-build-cache-provider
-
-A build cache provider plugin for the Expo CLI
-
-To use the EAS remote build provider plugin, install the `eas-build-cache-provider` package as a developer dependency:
-
-```bash
-npm install --save-dev eas-build-cache-provider
-```
-
-Then, update your **app.json** to include the `buildCacheProvider` property and its provider under `experiments`:
-
-```json
-{
-  "expo": {
-    ...
-    "experiments": {
-      "buildCacheProvider": "eas"
-    }
-  }
-}
-```

packages/eas-build-cache-provider/package.json

@@ -1,58 +0,0 @@
-{
-  "name": "eas-build-cache-provider",
-  "description": "A build cache provider plugin for the Expo CLI",
-  "version": "16.4.2",
-  "author": "Expo <[email protected]>",
-  "bugs": "https://github.com/expo/eas-cli/issues",
-  "dependencies": {
-    "@babel/code-frame": "7.23.5",
-    "@expo/config": "11.0.10",
-    "@expo/spawn-async": "^1.7.2",
-    "chalk": "4.1.2",
-    "figures": "3.2.0",
-    "fs-extra": "11.2.0",
-    "getenv": "1.0.0",
-    "log-symbols": "4.1.0",
-    "semver": "7.5.2",
-    "terminal-link": "2.1.1",
-    "tslib": "2.4.1"
-  },
-  "devDependencies": {
-    "@tsconfig/node18": "18.2.4",
-    "@types/babel__code-frame": "7.0.3",
-    "@types/fs-extra": "11.0.4",
-    "@types/getenv": "^1.0.0",
-    "memfs": "3.4.13",
-    "rimraf": "3.0.2",
-    "typescript": "5.3.3"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  },
-  "homepage": "https://github.com/expo/eas-cli",
-  "license": "MIT",
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
-  "repository": "expo/eas-cli",
-  "scripts": {
-    "build": "tsc --project tsconfig.build.json",
-    "build-allow-unused": "tsc --project tsconfig.allowUnused.json",
-    "watch": "yarn build --watch --preserveWatchOutput",
-    "watch-allow-unused": "yarn build-allow-unused --watch --preserveWatchOutput",
-    "typecheck": "tsc",
-    "prepack": "yarn rebuild",
-    "rebuild": "rimraf build && yarn build",
-    "test": "jest",
-    "clean": "rimraf build node_modules yarn-error.log"
-  },
-  "files": [
-    "/build"
-  ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
-  }
-}

packages/eas-build-cache-provider/src/.eslintrc.js

@@ -1,19 +0,0 @@
-module.exports = {
-  extends: ['universe/shared/typescript-analysis'],
-  overrides: [
-    {
-      files: ['*.ts', '*.d.ts'],
-      parserOptions: {
-        project: './packages/eas-build-cache-provider/tsconfig.json',
-      },
-      rules: {
-        '@typescript-eslint/explicit-function-return-type': [
-          'warn',
-          {
-            allowExpressions: true,
-          },
-        ],
-      },
-    },
-  ],
-};

packages/eas-build-cache-provider/src/helpers.ts

@@ -1,38 +0,0 @@
-import { RunOptions, getPackageJson } from '@expo/config';
-import { SpawnResult } from '@expo/spawn-async';
-
-export function isSpawnResultError(obj: any): obj is Error & SpawnResult {
-  return (
-    obj &&
-    'message' in obj &&
-    obj.status !== undefined &&
-    obj.stdout !== undefined &&
-    obj.stderr !== undefined
-  );
-}
-
-export function isDevClientBuild({
-  runOptions,
-  projectRoot,
-}: {
-  runOptions: RunOptions;
-  projectRoot: string;
-}): boolean {
-  if (!hasDirectDevClientDependency(projectRoot)) {
-    return false;
-  }
-
-  if ('variant' in runOptions && runOptions.variant !== undefined) {
-    return runOptions.variant === 'debug';
-  }
-  if ('configuration' in runOptions && runOptions.configuration !== undefined) {
-    return runOptions.configuration === 'Debug';
-  }
-
-  return true;
-}
-
-export function hasDirectDevClientDependency(projectRoot: string): boolean {
-  const { dependencies = {}, devDependencies = {} } = getPackageJson(projectRoot);
-  return !!dependencies['expo-dev-client'] || !!devDependencies['expo-dev-client'];
-}

packages/eas-build-cache-provider/src/index.ts

@@ -1,136 +0,0 @@
-import {
-  BuildCacheProviderPlugin,
-  CalculateFingerprintHashProps,
-  ResolveBuildCacheProps,
-  UploadBuildCacheProps,
-} from '@expo/config';
-import spawnAsync from '@expo/spawn-async';
-import chalk from 'chalk';
-import fs from 'fs-extra';
-import path from 'path';
-
-import { isDevClientBuild, isSpawnResultError } from './helpers';
-import Log from './log';
-
-async function resolveBuildCacheAsync({
-  projectRoot,
-  platform,
-  fingerprintHash,
-  runOptions,
-}: ResolveBuildCacheProps): Promise<string | null> {
-  const easJsonPath = path.join(projectRoot, 'eas.json');
-  if (!(await fs.exists(easJsonPath))) {
-    Log.debug('eas.json not found, skip checking for remote builds');
-    return null;
-  }
-
-  Log.log(
-    chalk`{whiteBright \u203A} {bold Searching builds with matching fingerprint on EAS servers}`
-  );
-  try {
-    const results = await spawnAsync(
-      'npx',
-      [
-        'eas-cli',
-        'build:download',
-        `--platform=${platform}`,
-        `--fingerprint=${fingerprintHash}`,
-        '--non-interactive',
-        isDevClientBuild({ runOptions, projectRoot }) ? '--dev-client' : '--no-dev-client',
-        '--json',
-      ],
-      {
-        cwd: projectRoot,
-      }
-    );
-
-    Log.log(chalk`{whiteBright \u203A} {bold Successfully downloaded cached build}`);
-    // {
-    //   "path": "/var/folders/03/lppcpcnn61q3mz5ckzmzd8w80000gn/T/eas-cli-nodejs/eas-build-run-cache/c0f9ba9c-0cf1-4c5c-8566-b28b7971050f_22f1bbfa-1c09-4b67-9e4a-721906546b58.app"
-    // }
-    const json = JSON.parse(results.stdout.trim());
-    return json?.path;
-  } catch (error) {
-    Log.debug('eas-cli error:', error);
-    // @TODO(2025-04-11): remove this in a future release
-    if (isSpawnResultError(error) && error.stderr.includes('command build:download not found')) {
-      Log.warn(
-        `To take advantage of EAS build cache provider, upgrade your eas-cli installation to latest.`
-      );
-    }
-    return null;
-  }
-}
-
-async function uploadBuildCacheAsync({
-  projectRoot,
-  platform,
-  fingerprintHash,
-  buildPath,
-}: UploadBuildCacheProps): Promise<string | null> {
-  const easJsonPath = path.join(projectRoot, 'eas.json');
-  if (!(await fs.exists(easJsonPath))) {
-    Log.debug('eas.json not found, skip uploading builds');
-    return null;
-  }
-
-  try {
-    Log.log(chalk`{whiteBright \u203A} {bold Uploading build to EAS}`);
-    const results = await spawnAsync(
-      'npx',
-      [
-        'eas-cli',
-        'upload',
-        `--platform=${platform}`,
-        `--fingerprint=${fingerprintHash}`,
-        buildPath ? `--build-path=${buildPath}` : '',
-        '--non-interactive',
-        '--json',
-      ],
-      {
-        cwd: projectRoot,
-      }
-    );
-    // {
-    //   "url": "/var/folders/03/lppcpcnn61q3mz5ckzmzd8w80000gn/T/eas-cli-nodejs/eas-build-run-cache/c0f9ba9c-0cf1-4c5c-8566-b28b7971050f_22f1bbfa-1c09-4b67-9e4a-721906546b58.app"
-    // }
-    const json = JSON.parse(results.stdout.trim());
-    Log.log(chalk`{whiteBright \u203A} {bold Build successfully uploaded: ${json?.url}}`);
-    return json?.url;
-  } catch (error) {
-    Log.debug('eas-cli error:', error);
-  }
-  return null;
-}
-
-async function calculateEASFingerprintHashAsync({
-  projectRoot,
-  platform,
-}: CalculateFingerprintHashProps): Promise<string | null> {
-  // prefer using `eas fingerprint:generate` because it automatically upload sources
-  try {
-    const results = await spawnAsync(
-      'npx',
-      ['eas-cli', 'fingerprint:generate', `--platform=${platform}`, '--json', '--non-interactive'],
-      {
-        cwd: projectRoot,
-      }
-    );
-    // {
-    //   "hash": "203f960b965e154b77dc31c6c42e5582e8d77196"
-    // }
-    const json = JSON.parse(results.stdout.trim());
-    return json?.hash;
-  } catch (error) {
-    Log.debug('eas-cli error:', error);
-  }
-  return null;
-}
-
-const EASBuildCacheProvider: BuildCacheProviderPlugin = {
-  resolveBuildCache: resolveBuildCacheAsync,
-  uploadBuildCache: uploadBuildCacheAsync,
-  calculateFingerprintHash: calculateEASFingerprintHashAsync,
-};
-
-export default EASBuildCacheProvider;

packages/eas-build-cache-provider/src/log.ts

@@ -1,121 +0,0 @@
-import chalk from 'chalk';
-import figures from 'figures';
-import { boolish } from 'getenv';
-import logSymbols from 'log-symbols';
-import terminalLink from 'terminal-link';
-
-type Color = (...text: string[]) => string;
-
-export default class Log {
-  public static readonly isDebug = boolish('EXPO_DEBUG', false);
-
-  public static log(...args: any[]): void {
-    Log.consoleLog(...args);
-  }
-
-  public static newLine(): void {
-    Log.consoleLog();
-  }
-
-  public static addNewLineIfNone(): void {
-    if (!Log.isLastLineNewLine) {
-      Log.newLine();
-    }
-  }
-
-  public static error(...args: any[]): void {
-    Log.consoleLog(...Log.withTextColor(args, chalk.red));
-  }
-
-  public static warn(...args: any[]): void {
-    Log.consoleLog(...Log.withTextColor(args, chalk.yellow));
-  }
-
-  public static debug(...args: any[]): void {
-    if (Log.isDebug) {
-      Log.consoleLog(...args);
-    }
-  }
-
-  public static gray(...args: any[]): void {
-    Log.consoleLog(...Log.withTextColor(args, chalk.gray));
-  }
-
-  public static warnDeprecatedFlag(flag: string, message: string): void {
-    Log.warn(`› ${chalk.bold('--' + flag)} flag is deprecated. ${message}`);
-  }
-
-  public static fail(message: string): void {
-    Log.log(`${chalk.red(logSymbols.error)} ${message}`);
-  }
-
-  public static succeed(message: string): void {
-    Log.log(`${chalk.green(logSymbols.success)} ${message}`);
-  }
-
-  public static withTick(...args: any[]): void {
-    Log.consoleLog(chalk.green(figures.tick), ...args);
-  }
-
-  public static withInfo(...args: any[]): void {
-    Log.consoleLog(chalk.green(figures.info), ...args);
-  }
-
-  private static consoleLog(...args: any[]): void {
-    Log.updateIsLastLineNewLine(args);
-    // eslint-disable-next-line no-console
-    console.log(...args);
-  }
-
-  private static withTextColor(args: any[], chalkColor: Color): string[] {
-    return args.map(arg => chalkColor(arg));
-  }
-
-  private static isLastLineNewLine = false;
-  private static updateIsLastLineNewLine(args: any[]): void {
-    if (args.length === 0) {
-      Log.isLastLineNewLine = true;
-    } else {
-      const lastArg = args[args.length - 1];
-      if (typeof lastArg === 'string' && (lastArg === '' || lastArg.match(/[\r\n]$/))) {
-        Log.isLastLineNewLine = true;
-      } else {
-        Log.isLastLineNewLine = false;
-      }
-    }
-  }
-}
-
-/**
- * Prints a link for given URL, using text if provided, otherwise text is just the URL.
- * Format links as dim (unless disabled) and with an underline.
- *
- * @example https://expo.dev
- */
-export function link(
-  url: string,
-  { text = url, fallback, dim = true }: { text?: string; dim?: boolean; fallback?: string } = {}
-): string {
-  // Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
-  const output = terminalLink(text, url, {
-    fallback: () =>
-      fallback ?? (text === url ? chalk.underline(url) : `${text}: ${chalk.underline(url)}`),
-  });
-  return dim ? chalk.dim(output) : output;
-}
-
-/**
- * Provide a consistent "Learn more" link experience.
- * Format links as dim (unless disabled) with an underline.
- *
- * @example Learn more: https://expo.dev
- */
-export function learnMore(
-  url: string,
-  {
-    learnMoreMessage: maybeLearnMoreMessage,
-    dim = true,
-  }: { learnMoreMessage?: string; dim?: boolean } = {}
-): string {
-  return link(url, { text: maybeLearnMoreMessage ?? 'Learn more', dim });
-}

packages/eas-build-cache-provider/tsconfig.build.json

@@ -1,4 +0,0 @@
-{
-  "extends": "./tsconfig",
-  "exclude": ["**/__mocks__/*", "**/__tests__/*"]
-}

packages/eas-build-cache-provider/tsconfig.json

@@ -1,18 +0,0 @@
-{
-  "extends": "@tsconfig/node18/tsconfig.json",
-  "compilerOptions": {
-    "declaration": true,
-    "importHelpers": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noFallthroughCasesInSwitch": true,
-    "noImplicitOverride": true,
-    "noImplicitReturns": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "outDir": "build",
-    "rootDir": "src",
-    "typeRoots": ["../../node_modules/@types", "../../ts-declarations", "./node_modules/@types"]
-  },
-  "include": ["src/**/*"]
-}

packages/eas-cli/__mocks__/fs.ts

@@ -12,6 +12,3 @@ if (process.env.TMPDIR) {
 (fs.realpath as any).native = jest.fn();
 
 module.exports = fs;
-
-// Ensure requiring node:fs returns the mock too. This is needed for expo/config and expo/json-file.
-jest.mock('node:fs', () => fs);

packages/eas-cli/graphql-codegen.yml

@@ -1,7 +1,10 @@
 overwrite: true
 schema: 'https://staging-api.expo.dev/graphql'
 documents:
-  - 'src/**/!(*.d).ts'
+  - 'src/graphql/**/!(*.d).{ts,tsx}'
+  - 'src/credentials/ios/api/graphql/**/!(*.d).{ts,tsx}'
+  - 'src/credentials/android/api/graphql/**/!(*.d).{ts,tsx}'
+  - 'src/commands/**/*.ts'
 generates:
   src/graphql/generated.ts:
     plugins:

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,116 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.17.3",
+  "version": "2.1.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "2.1.12",
-    "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "10.0.6",
-    "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "1.0.173",
-    "@expo/eas-json": "16.13.2",
-    "@expo/env": "^1.0.0",
-    "@expo/json-file": "8.3.3",
-    "@expo/logger": "1.0.117",
-    "@expo/multipart-body-parser": "2.0.0",
-    "@expo/osascript": "2.1.4",
-    "@expo/package-manager": "1.7.0",
-    "@expo/pkcs12": "0.1.3",
-    "@expo/plist": "0.2.0",
-    "@expo/plugin-help": "5.1.23",
-    "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "8.0.17",
+    "@expo/apple-utils": "0.0.0-alpha.34",
+    "@expo/code-signing-certificates": "0.0.2",
+    "@expo/config": "7.0.1",
+    "@expo/config-plugins": "5.0.1",
+    "@expo/config-types": "46.0.2",
+    "@expo/eas-build-job": "0.2.94",
+    "@expo/eas-json": "2.1.0",
+    "@expo/json-file": "8.2.36",
+    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/package-manager": "0.0.56",
+    "@expo/pkcs12": "0.0.8",
+    "@expo/plist": "0.0.18",
+    "@expo/plugin-autocomplete": "1.4.0",
+    "@expo/plugin-help": "5.3.0",
+    "@expo/plugin-warn-if-update-available": "2.3.0",
+    "@expo/prebuild-config": "5.0.3",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.173",
+    "@expo/spawn-async": "1.7.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",
+    "@oclif/core": "1.13.10",
+    "@urql/core": "2.6.1",
+    "@urql/exchange-retry": "0.3.3",
+    "ajv": "^6.12.6",
     "better-opn": "3.0.2",
-    "bplist-parser": "^0.3.0",
     "chalk": "4.1.2",
-    "cli-progress": "3.12.0",
+    "cli-progress": "3.11.2",
+    "cli-table3": "0.6.2",
     "dateformat": "4.6.3",
-    "diff": "7.0.0",
-    "dotenv": "16.3.1",
     "env-paths": "2.2.0",
-    "envinfo": "7.11.0",
+    "envinfo": "7.8.1",
     "fast-deep-equal": "3.1.3",
-    "fast-glob": "3.3.2",
+    "fast-glob": "3.2.11",
     "figures": "3.2.0",
-    "form-data": "^4.0.4",
-    "fs-extra": "11.2.0",
+    "form-data": "4.0.0",
+    "fs-extra": "10.1.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
-    "graphql": "16.8.1",
+    "graphql": "16.5.0",
     "graphql-tag": "2.12.6",
     "https-proxy-agent": "5.0.1",
-    "ignore": "5.3.0",
+    "ignore": "5.2.0",
     "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.2",
+    "joi": "17.6.0",
+    "keychain": "1.3.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
-    "minimatch": "5.1.2",
-    "minizlib": "3.0.1",
-    "nanoid": "3.3.8",
+    "minimatch": "5.1.0",
+    "nanoid": "3.3.4",
     "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
-    "node-stream-zip": "1.15.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",
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
-    "semver": "7.5.4",
-    "set-interval-async": "3.0.3",
+    "semver": "7.3.7",
     "slash": "3.0.0",
-    "tar": "6.2.1",
-    "tar-stream": "3.1.7",
+    "tar": "6.1.11",
     "terminal-link": "2.1.1",
-    "tslib": "2.6.2",
-    "turndown": "7.1.2",
+    "tslib": "2.4.0",
+    "turndown": "7.1.1",
     "untildify": "4.0.0",
-    "uuid": "9.0.1",
-    "wrap-ansi": "7.0.0",
-    "yaml": "2.6.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",
-    "@tsconfig/node18": "18.2.4",
-    "@types/cli-progress": "3.11.5",
+    "@graphql-codegen/cli": "2.11.5",
+    "@graphql-codegen/introspection": "2.2.1",
+    "@graphql-codegen/typescript": "2.7.3",
+    "@graphql-codegen/typescript-operations": "2.5.3",
+    "@types/cli-progress": "3.11.0",
     "@types/dateformat": "3.0.1",
-    "@types/diff": "6.0.0",
-    "@types/envinfo": "7.8.3",
-    "@types/express": "4.17.15",
-    "@types/fs-extra": "11.0.4",
+    "@types/envinfo": "7.8.1",
+    "@types/fs-extra": "9.0.13",
     "@types/getenv": "^1.0.0",
-    "@types/jsonwebtoken": "8.5.1",
-    "@types/mime": "3.0.1",
-    "@types/node-fetch": "2.6.12",
-    "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.4",
+    "@types/mime": "2.0.3",
+    "@types/node-fetch": "2.6.2",
+    "@types/node-forge": "1.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/prompts": "2.0.14",
+    "@types/semver": "7.3.10",
+    "@types/tar": "6.1.2",
     "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.7",
+    "@types/uuid": "8.3.4",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "1.11.0",
+    "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
-    "express": "4.20.0",
-    "memfs": "3.4.13",
+    "memfs": "3.4.7",
     "mockdate": "3.0.5",
-    "nock": "13.4.0",
+    "nock": "13.2.9",
     "rimraf": "3.0.2",
-    "ts-deepmerge": "6.2.0",
+    "ts-deepmerge": "2.0.5",
     "ts-mockito": "2.6.1",
-    "ts-node": "10.9.2",
-    "typescript": "5.3.3"
+    "ts-node": "10.9.1",
+    "typescript": "4.7.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
@@ -151,7 +129,7 @@
     "bin": "eas",
     "commands": "./build/commands",
     "plugins": [
-      "@oclif/plugin-autocomplete",
+      "@expo/plugin-autocomplete",
       "@expo/plugin-help",
       "@expo/plugin-warn-if-update-available"
     ],
@@ -183,22 +161,16 @@
       "secret": {
         "description": "manage project and account secrets"
       },
-      "env": {
-        "description": "manage project and account environment variables"
-      },
       "update": {
         "description": "manage individual updates"
       },
       "webhook": {
         "description": "manage webhooks"
-      },
-      "workflow": {
-        "description": "manage workflows"
       }
     },
     "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:') %>\n<%= chalk.dim(chalk.bold('npm install -g eas-cli')) %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
+      "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"
     },
     "update": {
       "node": {
@@ -223,22 +195,18 @@
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rimraf oclif.manifest.json",
-    "prepack": "yarn rebuild && node ./scripts/prepack.js",
-    "rebuild": "rimraf build && yarn build",
+    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
     "pretarball-ci": "./scripts/pretarball-ci.sh",
     "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",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "verify-graphql-code": "./scripts/verify-graphql.sh",
     "clean": "rimraf dist build tmp node_modules yarn-error.log"
   },
   "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

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

@@ -1,20 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-06/schema",
   "type": "object",
-  "properties": {
-    "configVersion": {
-      "enum": [0],
-      "description": "The EAS metadata store configuration version"
-    },
-    "apple": {
-      "$ref": "#/definitions/AppleConfig"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "configVersion",
-    "apple"
-  ],
   "definitions": {
     "apple": {
       "AppleKidsAge": {
@@ -337,8 +323,7 @@
           "gambling",
           "unrestrictedWebAccess",
           "kidsAgeBand",
-          "ageRatingOverride",
-          "koreaAgeRatingOverride"
+          "seventeenPlus"
         ],
         "defaultSnippets": [
           {
@@ -360,9 +345,7 @@
               "gambling": false,
               "unrestrictedWebAccess": false,
               "kidsAgeBand": null,
-              "ageRatingOverride": "NONE",
-              "koreaAgeRatingOverride": "NONE",
-              "lootBox": false
+              "seventeenPlus": false
             }
           },
           {
@@ -384,9 +367,7 @@
               "unrestrictedWebAccess": false,
               "gambling": false,
               "kidsAgeBand": null,
-              "ageRatingOverride": "${13|NONE,SEVENTEEN_PLUS,UNRATED|}",
-              "koreaAgeRatingOverride": "${14|NONE,FIFTEEN_PLUS,NINETEEN_PLUS|}",
-              "lootBox": false
+              "seventeenPlus": false
             }
           }
         ],
@@ -456,29 +437,13 @@
                 "$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)"
+            "description": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n@see https://developer.apple.com/news/?id=091202019a",
+            "markdownDescription": "When parents visit the Kids category on the App Store, they expect the apps they find will protect their children’s data, provide only age-appropriate content, and require a parental gate in order to link out of the app, request permissions, or present purchasing opportunities. It’s critical that no personally identifiable information or device information be transmitted to third parties, and that advertisements are human-reviewed for age appropriateness in order to be displayed.\n\n[Learn more](https://developer.apple.com/news/?id=091202019a)"
           },
           "seventeenPlus": {
             "type": "boolean",
-            "deprecated": true,
-            "deprecationMessage": "This property is deprecated, use `ageRatingOverride` instead.",
             "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)"
-          },
-          "ageRatingOverride": {
-            "$ref": "#/definitions/apple/AppleAgeRatingOverride",
-            "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\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\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\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "koreaAgeRatingOverride": {
-            "$ref": "#/definitions/apple/AppleKoreaAgeRatingOverride",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\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 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "lootBox": {
-            "type": "boolean",
-            "description": "Does your app contain purchasable loot boxes? These virtual containers provide players with in-game items, including functional cards or cosmetic modifications, based on random chance."
           }
         }
       },
@@ -600,20 +565,6 @@
             "maxLength": 4000
           }
         }
-      },
-      "AppleAgeRatingOverride": {
-        "enum": [
-          "NONE",
-          "SEVENTEEN_PLUS",
-          "UNRATED"
-        ]
-      },
-      "AppleKoreaAgeRatingOverride": {
-        "enum": [
-          "NONE",
-          "FIFTEEN_PLUS",
-          "NINETEEN_PLUS"
-        ]
       }
     },
     "AppleConfig": {
@@ -824,5 +775,19 @@
         }
       }
     }
-  }
+  },
+  "properties": {
+    "configVersion": {
+      "const": 0,
+      "description": "The EAS metadata store configuration version"
+    },
+    "apple": {
+      "$ref": "#/definitions/AppleConfig"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "configVersion",
+    "apple"
+  ]
 }

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

@@ -3,7 +3,8 @@ 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');
+  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

packages/eas-cli/scripts/verify-graphql.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-function cleanup()
-{
-  echo 'Cleaning up...'
-  rm -f graphql.schema.json.bak src/graphql/generated.ts.bak
-}
-
-# Fail if anything errors
-set -eox pipefail
-# If this script exits, trap it first and clean up
-trap cleanup EXIT
-
-cp graphql.schema.json graphql.schema.json.bak
-cp src/graphql/generated.ts src/graphql/generated.ts.bak
-
-yarn generate-graphql-code
-if cmp -s graphql.schema.json graphql.schema.json.bak; then
-    echo "GraphQL schema is up-to-date"
-    if cmp -s src/graphql/generated.ts src/graphql/generated.ts.bak; then
-        echo "GraphQL generated code is up-to-date"
-        exit 0
-    else
-        echo "GraphQL code has changed but has not been regenerated. Run `yarn generate-graphql-code` and commit the changes."
-        exit 1
-    fi
-else
-    echo "GraphQL schema has changed on the server. Running `yarn tsc` to check for breaking changes..."
-    yarn tsc
-    # If there are no errors, then the schema is backwards compatible
-    exit 0
-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,26 +0,0 @@
-import { JSONValue } from '@expo/json-file';
-
-export class ApiV2Error extends Error {
-  override readonly name = 'ApiV2Error';
-  readonly expoApiV2ErrorCode: string;
-  readonly expoApiV2ErrorDetails?: JSONValue;
-  readonly expoApiV2ErrorServerStack?: string;
-  readonly expoApiV2ErrorMetadata?: object;
-  readonly expoApiV2ErrorRequestId?: string;
-
-  constructor(response: {
-    message: string;
-    code: string;
-    stack?: string;
-    details?: JSONValue;
-    metadata?: object;
-    requestId?: string;
-  }) {
-    super(response.message);
-    this.expoApiV2ErrorCode = response.code;
-    this.expoApiV2ErrorDetails = response.details;
-    this.expoApiV2ErrorServerStack = response.stack;
-    this.expoApiV2ErrorMetadata = response.metadata;
-    this.expoApiV2ErrorRequestId = response.requestId;
-  }
-}

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

@@ -1,10 +1,9 @@
 import assert from 'assert';
 import nock from 'nock';
 
-import { ApiV2Error } from '../ApiV2Error';
-import { ApiV2Client, getExpoApiBaseUrl } from '../api';
+import { ApiV2Error, api, getExpoApiBaseUrl } from '../api';
 
-describe(ApiV2Client, () => {
+describe('apiClient', () => {
   it('converts Expo APIv2 error to ApiV2Error', async () => {
     nock(getExpoApiBaseUrl())
       .post('/v2/test')
@@ -16,16 +15,13 @@ describe(ApiV2Client, () => {
             stack: 'line 1: hello',
             details: { who: 'world' },
             metadata: { an: 'object' },
-            requestId: 'request-id',
           },
         ],
       });
 
     let error: Error | null = null;
     try {
-      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
-        body: {},
-      });
+      await api.postAsync('test', { body: {} });
     } catch (e: any) {
       error = e;
     }
@@ -38,7 +34,6 @@ describe(ApiV2Client, () => {
     expect(error.expoApiV2ErrorDetails).toEqual({ who: 'world' });
     expect(error.expoApiV2ErrorMetadata).toEqual({ an: 'object' });
     expect(error.expoApiV2ErrorServerStack).toEqual('line 1: hello');
-    expect(error.expoApiV2ErrorRequestId).toEqual('request-id');
   });
 
   it('does not convert non-APIv2 error to ApiV2Error', async () => {
@@ -46,9 +41,7 @@ describe(ApiV2Client, () => {
 
     let error: Error | null = null;
     try {
-      await new ApiV2Client({ accessToken: null, sessionSecret: null }).postAsync('test', {
-        body: {},
-      });
+      await api.postAsync('test', { body: {} });
     } catch (e: any) {
       error = e;
     }

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,307 +0,0 @@
-import { ExpoConfig } from '@expo/config';
-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,
-  WorkflowJobStatus,
-  WorkflowJobType,
-  WorkflowRunByIdWithJobsQuery,
-  WorkflowRunFragment,
-  WorkflowRunStatus,
-  WorkflowRunTriggerEventType,
-} 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 === 'projectId') {
-      result.projectId = overrides.projectId ?? mockProjectId;
-    }
-    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,
-    },
-  };
-}
-
-export function getMockEmptyWorkflowRunsFragment(): WorkflowRunFragment[] {
-  return getMockWorkflowRunsFragment();
-}
-
-export function getMockWorkflowRunsFragment(
-  params?:
-    | undefined
-    | {
-        successes?: number;
-        failures?: number;
-        pending?: number;
-        withJobs?: number;
-      }
-): WorkflowRunFragment[] {
-  const { successes = 0, failures = 0, pending = 0, withJobs = 0 } = params ?? {};
-  const runs: any[] = [];
-  for (let i = 0; i < successes; i++) {
-    runs.push({
-      id: `success-${i}`,
-      status: WorkflowRunStatus.Success,
-      errors: [],
-      createdAt: '2022-01-01T00:00:00.000Z',
-      updatedAt: '2022-01-01T00:00:00.000Z',
-      gitCommitHash: '1234567890',
-      gitCommitMessage: 'commit message',
-      workflow: {
-        name: 'build',
-        id: 'build',
-        fileName: 'build.yml',
-      },
-    });
-  }
-  for (let i = 0; i < failures; i++) {
-    runs.push({
-      id: `failure-${i}`,
-      errors: ['Failed'],
-      status: WorkflowRunStatus.Failure,
-      createdAt: '2022-01-01T00:00:00.000Z',
-      updatedAt: '2022-01-01T00:00:00.000Z',
-      gitCommitHash: '1234567890',
-      gitCommitMessage: 'commit message',
-      workflow: {
-        name: 'build',
-        id: 'build',
-        fileName: 'build.yml',
-      },
-    });
-  }
-  for (let i = 0; i < pending; i++) {
-    runs.push({
-      id: `pending-${i}`,
-      errors: [],
-      status: WorkflowRunStatus.InProgress,
-      createdAt: '2022-01-01T00:00:00.000Z',
-      updatedAt: '2022-01-01T00:00:00.000Z',
-      gitCommitHash: '1234567890',
-      gitCommitMessage: 'commit message',
-      workflow: {
-        name: 'build',
-        id: 'build',
-        fileName: 'build.yml',
-      },
-    });
-  }
-  for (let i = 0; i < withJobs; i++) {
-    runs.push(getMockWorkflowRunWithJobsFragment());
-  }
-  return runs;
-}
-
-export function getMockWorkflowJobFragment(
-  runId?: string
-): WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number] {
-  return {
-    id: 'job1',
-    key: 'job1',
-    name: 'job1',
-    status: WorkflowJobStatus.Success,
-    type: WorkflowJobType.Build,
-    createdAt: '2022-01-01T00:00:00.000Z',
-    updatedAt: '2022-01-01T00:00:00.000Z',
-    outputs: {},
-    errors: [],
-    workflowRun: {
-      id: runId ?? 'build1',
-    },
-    turtleJobRun: {
-      id: 'job1',
-      logFileUrls: ['https://example.com/log1'],
-      errors: [],
-    },
-  };
-}
-
-export function getMockWorkflowRunWithJobsFragment(
-  runID?: string
-): WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'] {
-  const id = runID ?? 'build1';
-  return {
-    id,
-    status: WorkflowRunStatus.Failure,
-    triggerEventType: WorkflowRunTriggerEventType.Manual,
-    createdAt: '2022-01-01T00:00:00.000Z',
-    updatedAt: '2022-01-01T00:00:00.000Z',
-    gitCommitHash: '1234567890',
-    gitCommitMessage: 'commit message',
-    errors: [],
-    workflow: {
-      id: 'build',
-      name: 'build',
-      fileName: 'build.yml',
-      app: {
-        id: mockProjectId,
-        __typename: 'App',
-        name: 'App',
-        ownerAccount: {
-          id: 'account-id',
-          name: 'account-name',
-          __typename: 'Account',
-        },
-      },
-    },
-    jobs: [getMockWorkflowJobFragment(id)],
-  };
-}

packages/eas-cli/src/__tests__/commands/workflow-logs-test.ts

@@ -1,188 +0,0 @@
-import {
-  getMockEmptyWorkflowRunsFragment,
-  getMockWorkflowJobFragment,
-  getMockWorkflowRunWithJobsFragment,
-  getMockWorkflowRunsFragment,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
-import { fetchRawLogsForJobAsync } from '../../commandUtils/workflow/fetchLogs';
-import WorkflowLogView from '../../commands/workflow/logs';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { WorkflowJobQuery } from '../../graphql/queries/WorkflowJobQuery';
-import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
-import Log from '../../log';
-import { promptAsync } 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/queries/WorkflowJobQuery');
-jest.mock('../../graphql/queries/WorkflowRunQuery');
-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');
-jest.mock('../../commandUtils/workflow/fetchLogs');
-
-describe(WorkflowLogView, () => {
-  beforeEach(() => {
-    jest.mocked(WorkflowJobQuery.byIdAsync).mockResolvedValue(getMockWorkflowJobFragment());
-    jest
-      .mocked(WorkflowRunQuery.withJobsByIdAsync)
-      .mockResolvedValue(getMockWorkflowRunWithJobsFragment());
-  });
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  test('view logs, passing in no parameters, no runs found', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockEmptyWorkflowRunsFragment());
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      undefined,
-      20
-    );
-    expect(Log.error).toHaveBeenCalledWith('No workflow runs found');
-  });
-  test('view logs, passing in no parameters, runs found, no jobs', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockWorkflowRunsFragment({ successes: 1 }));
-    jest.mocked(promptAsync).mockResolvedValue({ selectedRun: 'build1' });
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      undefined,
-      20
-    );
-    expect(Log.error).toHaveBeenCalledWith('No job found');
-  });
-  test('view logs, passing in no parameters, runs found, jobs found, step selected, no logs', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockWorkflowRunsFragment({ withJobs: 1 }));
-    let promptCalls = 0;
-    jest.mocked(promptAsync).mockImplementation(async () => {
-      if (promptCalls === 0) {
-        promptCalls++;
-        return { selectedRun: 'build1' };
-      } else if (promptCalls === 1) {
-        promptCalls++;
-        return { selectedJob: 0 };
-      } else {
-        return { selectedStep: 'step1' };
-      }
-    });
-    jest.mocked(fetchRawLogsForJobAsync).mockResolvedValue(null);
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      undefined,
-      20
-    );
-    expect(promptAsync).toHaveBeenCalledTimes(2);
-    expect(Log.error).toHaveBeenCalledWith('No logs found');
-  });
-  test('view logs, passing in no parameters, runs found, jobs found, step selected, logs found', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowLogView, [], ctx);
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockWorkflowRunsFragment({ withJobs: 1 }));
-    let promptCalls = 0;
-    jest.mocked(promptAsync).mockImplementation(async () => {
-      if (promptCalls === 0) {
-        promptCalls++;
-        return { selectedRun: 'build1' };
-      } else if (promptCalls === 1) {
-        promptCalls++;
-        return { selectedJob: 0 };
-      } else {
-        return { selectedStep: 'step1' };
-      }
-    });
-    jest
-      .mocked(fetchRawLogsForJobAsync)
-      .mockResolvedValue(
-        '{"result":"test","marker":"test","buildStepDisplayName":"step1","buildStepInternalId":"step1","time":"2022-01-01T00:00:00.000Z","msg":"test"}'
-      );
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      undefined,
-      20
-    );
-    expect(promptAsync).toHaveBeenCalledTimes(3);
-    expect(Log.error).not.toHaveBeenCalled();
-    expect(Log.log).toHaveBeenCalledWith('  2022-01-01T00:00:00.000Z test');
-  });
-  test('view logs for a workflow job, passing in a job ID, all steps', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    const cmd = mockTestCommand(WorkflowLogView, ['job1', '--all-steps'], ctx);
-    await cmd.run();
-    expect(WorkflowJobQuery.byIdAsync).toHaveBeenCalledWith(ctx.loggedIn.graphqlClient, 'job1', {
-      useCache: false,
-    });
-  });
-  test('view logs for a workflow job, passing in a run ID', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    jest.mocked(promptAsync).mockResolvedValue({ selectedJob: 'job1' });
-    jest.mocked(WorkflowJobQuery.byIdAsync).mockRejectedValue(new Error('Job not found'));
-    const cmd = mockTestCommand(WorkflowLogView, ['build1', '--all-steps'], ctx);
-    await cmd.run();
-    expect(WorkflowRunQuery.withJobsByIdAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      'build1',
-      {
-        useCache: false,
-      }
-    );
-  });
-  test('view logs for a workflow job, passing in a run ID, non-interactive', async () => {
-    const ctx = mockCommandContext(WorkflowLogView, {
-      projectId: mockProjectId,
-    });
-    jest.mocked(promptAsync).mockResolvedValue({ selectedJob: 'job1' });
-    jest.mocked(WorkflowJobQuery.byIdAsync).mockRejectedValue(new Error('Job not found'));
-    const cmd = mockTestCommand(WorkflowLogView, ['build1', '--non-interactive'], ctx);
-    try {
-      await cmd.run();
-    } catch (e) {
-      expect(e).toBeInstanceOf(Error);
-      expect((e as Error).message).toEqual('No workflow job found that matched the provided ID');
-    }
-  });
-});

packages/eas-cli/src/__tests__/commands/workflow-runs-test.ts

@@ -1,184 +0,0 @@
-import {
-  getMockEmptyWorkflowRunsFragment,
-  getMockWorkflowRunsFragment,
-  mockCommandContext,
-  mockProjectId,
-  mockTestCommand,
-} from './utils';
-import WorkflowRunList from '../../commands/workflow/runs';
-import { WorkflowRunStatus, WorkflowRunTriggerEventType } from '../../graphql/generated';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-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/queries/WorkflowRunQuery');
-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(WorkflowRunList, () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-  test('list workflow runs with default params', async () => {
-    const ctx = mockCommandContext(WorkflowRunList, {
-      projectId: mockProjectId,
-    });
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockEmptyWorkflowRunsFragment());
-    const cmd = mockTestCommand(WorkflowRunList, [], ctx);
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      undefined,
-      10
-    );
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-  test('list workflow runs with custom limit', async () => {
-    const ctx = mockCommandContext(WorkflowRunList, {
-      projectId: mockProjectId,
-    });
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockEmptyWorkflowRunsFragment());
-    const cmd = mockTestCommand(WorkflowRunList, ['--limit', '100'], ctx);
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      undefined,
-      100
-    );
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-  test('list workflow runs with specific filename', async () => {
-    const ctx = mockCommandContext(WorkflowRunList, {
-      projectId: mockProjectId,
-    });
-    jest.mocked(WorkflowRunQuery.byAppIdFileNameAndStatusAsync).mockResolvedValue([
-      {
-        id: 'build',
-        status: WorkflowRunStatus.Success,
-        triggerEventType: WorkflowRunTriggerEventType.Manual,
-        createdAt: '2022-01-01T00:00:00.000Z',
-        updatedAt: '2022-01-01T00:00:00.000Z',
-        errors: [],
-        gitCommitHash: '1234567890',
-        gitCommitMessage: 'commit message',
-        workflow: {
-          id: 'build',
-          name: 'build',
-          fileName: 'build.yml',
-        },
-      },
-    ]);
-    const cmd = mockTestCommand(WorkflowRunList, ['--workflow', 'build.yml'], ctx);
-    await cmd.run();
-    expect(WorkflowRunQuery.byAppIdFileNameAndStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'build.yml',
-      undefined,
-      10
-    );
-    expect(enableJsonOutput).not.toHaveBeenCalled();
-    expect(printJsonOnlyOutput).not.toHaveBeenCalled();
-  });
-  test('list only workflow runs with status FAILURE, get json output', async () => {
-    const ctx = mockCommandContext(WorkflowRunList, {
-      projectId: mockProjectId,
-    });
-    jest
-      .mocked(AppQuery.byIdWorkflowRunsFilteredByStatusAsync)
-      .mockResolvedValue(getMockWorkflowRunsFragment({ failures: 1 }));
-    const cmd = mockTestCommand(WorkflowRunList, ['--status', 'FAILURE', '--json'], ctx);
-    await cmd.run();
-    expect(AppQuery.byIdWorkflowRunsFilteredByStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      WorkflowRunStatus.Failure,
-      10
-    );
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith([
-      {
-        id: 'failure-0',
-        status: 'FAILURE',
-        gitCommitHash: '1234567890',
-        gitCommitMessage: 'commit message',
-        trigger: '',
-        triggerType: 'Other',
-        startedAt: '2022-01-01T00:00:00.000Z',
-        finishedAt: '2022-01-01T00:00:00.000Z',
-        workflowId: 'build',
-        workflowName: 'build',
-        workflowFileName: 'build.yml',
-      },
-    ]);
-  });
-  test('list only workflow runs with specific filename and status FAILURE, get json output', async () => {
-    const ctx = mockCommandContext(WorkflowRunList, {
-      projectId: mockProjectId,
-    });
-    jest.mocked(WorkflowRunQuery.byAppIdFileNameAndStatusAsync).mockResolvedValue([
-      {
-        id: 'build1',
-        status: WorkflowRunStatus.Failure,
-        triggerEventType: WorkflowRunTriggerEventType.Manual,
-        createdAt: '2022-01-01T00:00:00.000Z',
-        updatedAt: '2022-01-01T00:00:00.000Z',
-        gitCommitHash: '1234567890',
-        gitCommitMessage: 'commit message',
-        errors: [],
-        workflow: {
-          id: 'build',
-          name: 'build',
-          fileName: 'build.yml',
-        },
-      },
-    ]);
-    const cmd = mockTestCommand(
-      WorkflowRunList,
-      ['--workflow', 'build.yml', '--status', 'FAILURE', '--json'],
-      ctx
-    );
-    await cmd.run();
-    expect(WorkflowRunQuery.byAppIdFileNameAndStatusAsync).toHaveBeenCalledWith(
-      ctx.loggedIn.graphqlClient,
-      mockProjectId,
-      'build.yml',
-      WorkflowRunStatus.Failure,
-      10
-    );
-    expect(printJsonOnlyOutput).toHaveBeenCalledWith([
-      {
-        id: 'build1',
-        status: 'FAILURE',
-        gitCommitHash: '1234567890',
-        gitCommitMessage: 'commit message',
-        trigger: '',
-        triggerType: 'Manual',
-        startedAt: '2022-01-01T00:00:00.000Z',
-        finishedAt: '2022-01-01T00:00:00.000Z',
-        workflowId: 'build',
-        workflowName: 'build',
-        workflowFileName: 'build.yml',
-      },
-    ]);
-  });
-});

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

@@ -0,0 +1,17 @@
+import { fixS3Url } from '../uploads';
+
+describe(fixS3Url, () => {
+  it('fixes broken links', () => {
+    const input =
+      'https://submission-service-archives.s3.amazonaws.com/production%2Fdc98ca84-1473-4cb3-ae81-8c7b291cb27e%2F4424aa95-b985-4e2f-8755-9507b1037c1c';
+    const expectedOutput =
+      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
+    expect(fixS3Url(input)).toBe(expectedOutput);
+  });
+
+  it('does not change correct urls', () => {
+    const correctUrl =
+      'https://submission-service-archives.s3.amazonaws.com/production/dc98ca84-1473-4cb3-ae81-8c7b291cb27e/4424aa95-b985-4e2f-8755-9507b1037c1c';
+    expect(fixS3Url(correctUrl)).toBe(correctUrl);
+  });
+});

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,28 +1,23 @@
-import { Analytics, AnalyticsEvent, AnalyticsEventProperties } from './AnalyticsManager';
+import { Analytics, Event } from './events';
+
+export type TrackingContext = Record<string, string | number | boolean>;
 
 export async function withAnalyticsAsync<Result>(
-  analytics: Analytics,
   fn: () => Promise<Result>,
-  {
-    attemptEvent,
-    successEvent,
-    failureEvent,
-    properties,
-  }: {
-    attemptEvent: AnalyticsEvent;
-    successEvent: AnalyticsEvent;
-    failureEvent: AnalyticsEvent;
-    properties: AnalyticsEventProperties;
+  analytics: {
+    attemptEvent: Event;
+    successEvent: Event;
+    failureEvent: Event;
+    trackingCtx: TrackingContext;
   }
 ): Promise<Result> {
   try {
-    analytics.logEvent(attemptEvent, properties);
     const result = await fn();
-    analytics.logEvent(successEvent, properties);
+    Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
     return result;
   } catch (error: any) {
-    analytics.logEvent(failureEvent, {
-      ...properties,
+    Analytics.logEvent(analytics.failureEvent, {
+      ...analytics.trackingCtx,
       reason: error.message,
     });
     throw error;

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

@@ -0,0 +1,60 @@
+import { logEvent } from './rudderstackClient';
+export type Event = BuildEvent | SubmissionEvent | MetadataEvent;
+
+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 class Analytics {
+  static logEvent(name: Event, properties: Record<string, any>): void {
+    logEvent(name, properties);
+  }
+}

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

@@ -0,0 +1,129 @@
+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';
+import { easCliVersion } from '../utils/easCli';
+
+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: easCliVersion, 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: easCliVersion ?? 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/api.ts

@@ -1,78 +1,93 @@
 import { JSONValue } from '@expo/json-file';
 
-import { ApiV2Error } from './ApiV2Error';
 import fetch, { RequestError, RequestInit } from './fetch';
+import { getAccessToken, getSessionSecret } from './user/sessionStorage';
+
+export class ApiV2Error extends Error {
+  override 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);
+    this.expoApiV2ErrorCode = response.code;
+    this.expoApiV2ErrorDetails = response.details;
+    this.expoApiV2ErrorServerStack = response.stack;
+    this.expoApiV2ErrorMetadata = response.metadata;
+  }
+}
 
 interface RequestOptions {
   body: JSONValue;
 }
 
-export class ApiV2Client {
-  constructor(
-    private readonly authInfo: {
-      accessToken: string | null;
-      sessionSecret: string | null;
-    }
-  ) {}
+export const api = {
+  async putAsync(path: string, options: RequestOptions): Promise<any> {
+    return await requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
+  },
 
-  public async putAsync(path: string, options: RequestOptions): Promise<any> {
-    return await this.requestAsync(path, { method: 'PUT', body: JSON.stringify(options.body) });
+  async postAsync(path: string, options: RequestOptions): Promise<any> {
+    return await requestAsync(path, { method: 'POST', body: JSON.stringify(options.body) });
+  },
+
+  async deleteAsync(path: string): Promise<any> {
+    return await requestAsync(path, { method: 'DELETE' });
+  },
+
+  async getAsync(path: string): Promise<any> {
+    return await requestAsync(path, { method: 'GET' });
+  },
+};
+
+async function requestAsync(path: string, options: RequestInit): Promise<any> {
+  try {
+    const response = await fetch(`${getExpoApiBaseUrl()}/v2/${path}`, {
+      ...options,
+      headers: {
+        'Content-Type': 'application/json',
+        ...getAuthHeaders(),
+      },
+    });
+    return await response.json();
+  } catch (err) {
+    await handleApiErrorAsync(err);
   }
+}
 
-  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> {
+async function handleApiErrorAsync(err: any): Promise<void> {
+  if (err instanceof RequestError) {
+    let result: { [key: string]: 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);
+      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;
   }
+}
 
-  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;
-    }
+function getAuthHeaders(): Record<string, string> {
+  const token = getAccessToken();
+  if (token) {
+    return { authorization: `Bearer ${token}` };
   }
+  const sessionSecret = getSessionSecret();
+  if (sessionSecret) {
+    return { 'expo-session': sessionSecret };
+  }
+  return {};
 }
 
 export function getExpoApiBaseUrl(): string {
@@ -95,11 +110,7 @@ export function getExpoWebsiteBaseUrl(): string {
   }
 }
 
-export function getEASUpdateURL(projectId: string, manifestHostOverride: string | null): string {
-  if (manifestHostOverride) {
-    return new URL(projectId, `https://${manifestHostOverride}`).href;
-  }
-
+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) {

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,44 +1,30 @@
 import chalk from 'chalk';
-import { print } from 'graphql';
-import gql from 'graphql-tag';
+import CliTable from 'cli-table3';
 
-import { BranchNotFoundError } from './utils';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { withErrorHandlingAsync } from '../graphql/client';
-import {
-  CreateUpdateBranchForAppMutation,
-  CreateUpdateBranchForAppMutationVariables,
-  UpdateBranchBasicInfoFragment,
-  UpdateBranchFragment,
-} from '../graphql/generated';
+import { UpdateBranchFragment } from '../graphql/generated';
 import { BranchQuery } from '../graphql/queries/BranchQuery';
-import { UpdateBranchBasicInfoFragmentNode } from '../graphql/types/UpdateBranchBasicInfo';
 import Log from '../log';
-import { formatBranch, getBranchDescription } from '../update/utils';
+import { UPDATE_COLUMNS, formatUpdateMessage, getPlatformsForGroup } 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> {
+export async function selectBranchOnAppAsync({
+  projectId,
+  promptTitle,
+  displayTextForListItem,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
+  promptTitle: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<UpdateBranchFragment> {
   if (paginatedQueryOptions.nonInteractive) {
     throw new Error('Unable to select a branch in non-interactive mode.');
   }
@@ -46,12 +32,11 @@ export async function selectBranchOnAppAsync(
   const selectedBranch = await paginatedQueryWithSelectPromptAsync({
     limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
     offset: paginatedQueryOptions.offset,
-    queryToPerform: (limit, offset) =>
-      queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
+    queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
     promptOptions: {
       title: promptTitle,
       getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      makePartialChoiceObject: displayTextForListItem,
+      createDisplayTextForSelectionPromptListItem: displayTextForListItem,
     },
   });
   if (!selectedBranch) {
@@ -60,19 +45,15 @@ export async function selectBranchOnAppAsync(
   return selectedBranch;
 }
 
-export async function listAndRenderBranchesOnAppAsync(
-  graphqlClient: ExpoGraphqlClient,
-  {
-    projectId,
-    paginatedQueryOptions,
-  }: {
-    projectId: string;
-    paginatedQueryOptions: PaginatedQueryOptions;
-  }
-): Promise<void> {
+export async function listAndRenderBranchesOnAppAsync({
+  projectId,
+  paginatedQueryOptions,
+}: {
+  projectId: string;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<void> {
   if (paginatedQueryOptions.nonInteractive) {
     const branches = await queryBranchesOnProjectAsync(
-      graphqlClient,
       paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
       paginatedQueryOptions.offset,
       projectId
@@ -82,25 +63,21 @@ export async function listAndRenderBranchesOnAppAsync(
     await paginatedQueryWithConfirmPromptAsync({
       limit: paginatedQueryOptions.limit ?? BRANCHES_LIMIT,
       offset: paginatedQueryOptions.offset,
-      queryToPerform: (limit, offset) =>
-        queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
+      queryToPerform: (limit, offset) => queryBranchesOnProjectAsync(limit, offset, projectId),
       promptOptions: {
         title: 'Load more branches?',
-        renderListItems: branches => {
-          renderPageOfBranches(branches, paginatedQueryOptions);
-        },
+        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
       },
     });
   }
 }
 
 async function queryBranchesOnProjectAsync(
-  graphqlClient: ExpoGraphqlClient,
   limit: number,
   offset: number,
   projectId: string
 ): Promise<UpdateBranchFragment[]> {
-  return await BranchQuery.listBranchesOnAppAsync(graphqlClient, {
+  return await BranchQuery.listBranchesOnAppAsync({
     appId: projectId,
     limit,
     offset,
@@ -114,76 +91,34 @@ function renderPageOfBranches(
   if (json) {
     printJsonOnlyOutput(currentPage);
   } else {
+    const table = new CliTable({
+      head: ['Branch', ...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    table.push(
+      ...currentPage.map(branch => {
+        if (branch.updates.length === 0) {
+          return [branch.name, 'N/A', 'N/A', 'N/A', 'N/A'];
+        }
+
+        const latestUpdateOnBranch = branch.updates[0];
+        return [
+          branch.name,
+          formatUpdateMessage(latestUpdateOnBranch),
+          latestUpdateOnBranch.runtimeVersion,
+          latestUpdateOnBranch.group,
+          getPlatformsForGroup({
+            group: latestUpdateOnBranch.group,
+            updates: branch.updates,
+          }),
+        ];
+      })
+    );
+
     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<UpdateBranchBasicInfoFragment> {
-  const result = await withErrorHandlingAsync(
-    graphqlClient
-      .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
-        gql`
-          mutation CreateUpdateBranchForApp($appId: ID!, $name: String!) {
-            updateBranch {
-              createUpdateBranchForApp(appId: $appId, name: $name) {
-                id
-                ...UpdateBranchBasicInfoFragment
-              }
-            }
-          }
-          ${print(UpdateBranchBasicInfoFragmentNode)}
-        `,
-        {
-          appId,
-          name,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
-      )
-      .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<{ branch: UpdateBranchBasicInfoFragment; createdBranch: boolean }> {
-  try {
-    const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
-      appId,
-      name: branchName,
-    });
-
-    return { branch: updateBranch, createdBranch: false };
-  } catch (error) {
-    if (error instanceof BranchNotFoundError) {
-      const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
-        appId,
-        name: branchName,
-      });
-      return { branch: newUpdateBranch, createdBranch: true };
-    } else {
-      throw error;
-    }
+    Log.log(table.toString());
   }
 }

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

@@ -1,7 +1,10 @@
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
 
-export async function getDefaultBranchNameAsync(vcsClient: Client): Promise<string | null> {
-  return await vcsClient.getBranchNameAsync();
+export async function getDefaultBranchNameAsync(): Promise<string> {
+  return (
+    (await getVcsClient().getBranchNameAsync()) ||
+    `branch-${Math.random().toString(36).substring(2, 4)}`
+  );
 }
 
 export class BranchNotFoundError extends Error {

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

@@ -1,7 +1,5 @@
-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';
@@ -45,18 +43,14 @@ describe(selectBuildToCancelAsync.name, () => {
   });
 
   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);
+    expect(selectBuildToCancelAsync(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
-    );
+    expect(selectBuildToCancelAsync(projectId, 'blah')).resolves.toEqual(selectedBuildId);
   });
 });
 
@@ -85,6 +79,5 @@ function createMockBuildFragment({
       },
     },
     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({ requireCommit: false }));
-    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({ requireCommit: false }));
-    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__/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/__tests__/build-test.ts

@@ -1,26 +0,0 @@
-import Log from '../../../log';
-import { maybeWarnAboutNonStandardBuildType } from '../build';
-
-const warn = jest.spyOn(Log, 'warn');
-
-describe('maybeWarnAboutNonStandardBuildType', () => {
-  it('should not warn about non-standard build type', () => {
-    const buildProfile = {
-      gradleCommand: ':app:buildRelease',
-    };
-
-    maybeWarnAboutNonStandardBuildType({ buildProfile, buildType: 'release' });
-
-    expect(warn).not.toHaveBeenCalled();
-  });
-
-  it('should warn about non-standard build type', () => {
-    const buildProfile = {
-      gradleCommand: ':app:buildStage',
-    };
-
-    maybeWarnAboutNonStandardBuildType({ buildProfile, buildType: 'stage' });
-
-    expect(warn).toHaveBeenCalled();
-  });
-});

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

@@ -1,45 +1,22 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
-import { AndroidBuildProfile } from '@expo/eas-json/build/build/types';
 import assert from 'assert';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
 import path from 'path';
-import { instance, mock } from 'ts-mockito';
 
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
-import { resolveVcsClient } from '../../../vcs';
-import { Client } from '../../../vcs/vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
   maybeResolveVersionsAsync,
-  resolveRemoteVersionCodeAsync,
 } from '../version';
 
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
-jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
-jest.mock('../../../vcs/vcs');
-jest.mock('../../../graphql/queries/AppVersionQuery');
-jest.mock('../../../graphql/mutations/AppVersionMutation');
-jest.mock('../../../ora', () => ({
-  ora: jest.fn().mockImplementation(() => ({
-    start: jest.fn().mockImplementation(() => ({
-      succeed: jest.fn(),
-      stop: jest.fn(),
-      fail: jest.fn(),
-    })),
-  })),
-}));
-
-const vcsClient = resolveVcsClient();
 
 afterAll(async () => {
   // do not remove the following line
@@ -214,8 +191,7 @@ describe(maybeResolveVersionsAsync, () => {
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/app',
         exp,
-        {} as BuildProfile<Platform.ANDROID>,
-        vcsClient
+        {} as BuildProfile<Platform.ANDROID>
       );
       expect(appVersion).toBe('3.0.0');
       expect(appBuildVersion).toBe('123');
@@ -227,8 +203,7 @@ describe(maybeResolveVersionsAsync, () => {
       const { appVersion, appBuildVersion } = await maybeResolveVersionsAsync(
         '/app',
         exp,
-        {} as BuildProfile<Platform.ANDROID>,
-        vcsClient
+        {} as BuildProfile<Platform.ANDROID>
       );
       expect(appVersion).toBe('5.0.0');
       expect(appBuildVersion).toBe('126');
@@ -236,160 +211,12 @@ describe(maybeResolveVersionsAsync, () => {
   });
 });
 
-describe(resolveRemoteVersionCodeAsync, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('uses current remote versionCode when remote version set, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
-      buildVersion: '11',
-      storeVersion: '1.2.3',
-    });
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject();
-
-    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationId: 'fakeApplicationId',
-      buildProfile: {} as AndroidBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('11');
-    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
-  });
-
-  it('initializes versionCode from local files when remote version not set, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ versionCode: 22, versionName: '2.3.4' });
-
-    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationId: 'fakeApplicationId',
-      buildProfile: {} as AndroidBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('22');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
-  });
-
-  it('initializes versionCode starting with 1 when remote version not set and not set in local files, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ versionCode: null, versionName: null });
-
-    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationId: 'fakeApplicationId',
-      buildProfile: {} as AndroidBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('1');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
-  });
-
-  it('increments current remote versionCode when remote version set, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
-      buildVersion: '11',
-      storeVersion: '1.2.3',
-    });
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject();
-
-    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationId: 'fakeApplicationId',
-      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('12');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('3.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
-  });
-
-  it('increments versionCode from local files when remote version not set, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ versionCode: 22, versionName: '2.3.4' });
-
-    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationId: 'fakeApplicationId',
-      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('23');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
-  });
-
-  it('initializes versionCode starting with 1 when remote version not set and not set in local files, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ versionCode: null, versionName: null });
-
-    const result = await resolveRemoteVersionCodeAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationId: 'fakeApplicationId',
-      buildProfile: { autoIncrement: true } as AndroidBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('1');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
-  });
-});
-
 function initBareWorkflowProject({
   versionCode = 123,
   versionName = '3.0.0',
 }: {
-  versionCode?: number | null;
-  versionName?: string | null;
+  versionCode?: number;
+  versionName?: string;
 } = {}): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
@@ -407,8 +234,8 @@ function initBareWorkflowProject({
       './android/app/build.gradle': `android {
   defaultConfig {
     applicationId "com.expo.testapp"
-    ${versionCode ? `versionCode "${versionCode}"` : ''}
-    ${versionName ? `versionName "${versionName}"` : ''}
+    versionCode ${versionCode}
+    versionName "${versionName}"
   }
 }`,
       './android/app/src/main/AndroidManifest.xml': 'fake',

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

@@ -1,19 +1,14 @@
-import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
-import getenv from 'getenv';
 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, { learnMore } from '../../log';
+import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
@@ -29,11 +24,11 @@ import {
 import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
 import { transformMetadata } from '../graphql';
 import { logCredentialsSource } from '../utils/credentials';
-import {
-  checkGoogleServicesFileAsync,
-  checkNodeEnvVariable,
-  validatePNGsForManagedProjectAsync,
-} from '../validate';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteVersionCodeAsync } from './version';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>
@@ -58,37 +53,22 @@ This means that it will most likely produce an AAB and you will not be able to i
 
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
-  await validatePNGsForManagedProjectAsync(ctx);
 
-  const gradleContext = await resolveGradleBuildContextAsync(
-    ctx.projectDir,
-    buildProfile,
-    ctx.vcsClient
-  );
-
-  if (gradleContext?.buildType) {
-    maybeWarnAboutNonStandardBuildType({ buildProfile, buildType: gradleContext.buildType });
-  }
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
 
   if (ctx.workflow === Workflow.MANAGED) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
   }
 
-  const applicationId = await getApplicationIdAsync(
-    ctx.projectDir,
-    ctx.exp,
-    ctx.vcsClient,
-    gradleContext
-  );
+  const applicationId = await getApplicationIdAsync(ctx.projectDir, ctx.exp, gradleContext);
   const versionCodeOverride =
     ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteVersionCodeAsync(ctx.graphqlClient, {
+      ? await resolveRemoteVersionCodeAsync({
           projectDir: ctx.projectDir,
           projectId: ctx.projectId,
           exp: ctx.exp,
           applicationId,
           buildProfile,
-          vcsClient: ctx.vcsClient,
         })
       : undefined;
 
@@ -111,14 +91,13 @@ export async function prepareAndroidBuildAsync(
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        vcsClient: ctx.vcsClient,
-        env: ctx.env,
+        projectId: ctx.projectId,
       });
     },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.ANDROID>,
       jobData: JobData<AndroidCredentials>
-    ): Promise<Android.Job> => {
+    ): Promise<Job> => {
       return await prepareJobAsync(ctx, jobData);
     },
     sendBuildRequestAsync: async (
@@ -129,7 +108,7 @@ export async function prepareAndroidBuildAsync(
     ): 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,
@@ -152,11 +131,9 @@ async function ensureAndroidCredentialsAsync(
   const androidApplicationIdentifier = await getApplicationIdAsync(
     ctx.projectDir,
     ctx.exp,
-    ctx.vcsClient,
     ctx.android.gradleContext
   );
   const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
-    name: ctx.buildProfile.keystoreName,
     app: {
       account: nullthrows(
         ctx.user.accounts.find(a => a.name === ctx.accountName),
@@ -173,38 +150,3 @@ async function ensureAndroidCredentialsAsync(
     source: credentialsSource,
   };
 }
-
-export function maybeWarnAboutNonStandardBuildType({
-  buildProfile,
-  buildType,
-}: {
-  buildProfile: Pick<CommonContext<Platform.ANDROID>['buildProfile'], 'gradleCommand'>;
-  buildType: string;
-}): void {
-  const shouldSuppressWarning = getenv.boolish('EAS_BUILD_NO_GRADLE_BUILD_TYPE_WARNING', false);
-
-  if (shouldSuppressWarning) {
-    return;
-  }
-
-  const knownValidBuildTypes = ['debug', 'release'];
-  if (!knownValidBuildTypes.includes(buildType)) {
-    Log.warn(
-      `Custom gradle command "${chalk.bold(
-        buildProfile.gradleCommand
-      )}" has non-standard build type: "${chalk.bold(
-        buildType
-      )}". Expected the command to end with "${chalk.bold('...Debug')}" or "${chalk.bold(
-        '...Release'
-      )}"`
-    );
-    Log.warn(
-      `Ensure the command is spelled correctly and ${chalk.bold(
-        'build.gradle'
-      )} is configured correctly. To suppress this warning, set ${chalk.bold(
-        'EAS_BUILD_NO_GRADLE_BUILD_TYPE_WARNING=true'
-      )}.`
-    );
-    Log.warn(learnMore('https://developer.android.com/build/build-variants#build-types'));
-  }
-}

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

@@ -1,21 +1,14 @@
 import { Android } from '@expo/eas-build-job';
 
 import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
-import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
-  transformBuildMode,
-  transformBuildTrigger,
-  transformProjectArchive,
-  transformWorkflow,
-} from '../graphql';
-import { buildProfileEnvironmentToEnvironment } from '../utils/environment';
+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,
@@ -28,12 +21,6 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     buildType: job.buildType && transformBuildType(job.buildType),
     developmentClient: job.developmentClient,
     experimental: job.experimental,
-    mode: transformBuildMode(job.mode),
-    customBuildConfig: job.customBuildConfig,
-    environment: buildProfileEnvironmentToEnvironment(job.environment),
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
   };
 }
 

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

@@ -1,18 +1,11 @@
-import {
-  Android,
-  ArchiveSource,
-  BuildMode,
-  BuildTrigger,
-  Platform,
-  sanitizeBuildJob,
-} from '@expo/eas-build-job';
+import { Android, ArchiveSource, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
-import { getUsernameForBuildMetadataAndBuildJob } from '../../project/projectUtils';
+import { getUsername } from '../../project/projectUtils';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -22,17 +15,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 = getUsernameForBuildMetadataAndBuildJob(ctx.user);
+): Promise<Job> {
+  const username = getUsername(ctx.exp, ctx.user);
   const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
   const projectRootDirectory =
-    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
   const { credentials } = jobData;
   const buildCredentials = credentials
     ? {
@@ -47,22 +41,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 (buildProfile.config) {
-    buildMode = BuildMode.CUSTOM;
-  } else {
-    buildMode = BuildMode.BUILD;
-  }
-
   const job: Android.Job = {
     type: ctx.workflow,
     platform: Platform.ANDROID,
@@ -71,15 +54,10 @@ export async function prepareJobAsync(
     builderEnvironment: {
       image: buildProfile.image,
       node: buildProfile.node,
-      corepack: buildProfile.corepack,
-      pnpm: buildProfile.pnpm,
-      bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
-      env: {
-        ...buildProfile.env,
-        ...(ctx.isVerboseLoggingEnabled ? { EAS_VERBOSE: '1' } : {}),
-      },
+      expoCli: buildProfile.expoCli,
+      env: buildProfile.env,
     },
     cache: {
       ...cacheDefaults,
@@ -89,12 +67,12 @@ export async function prepareJobAsync(
     secrets: {
       ...buildCredentials,
     },
-    updates: { channel: buildProfile.channel },
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
     developmentClient: buildProfile.developmentClient,
     gradleCommand: buildProfile.gradleCommand,
     applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
     buildArtifactPaths: buildProfile.buildArtifactPaths,
-    environment: ctx.buildProfile.environment,
     buildType,
     username,
     ...(ctx.android.versionCodeOverride && {
@@ -103,21 +81,9 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
     },
-    mode: buildMode,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
-    loggerLevel: ctx.loggerLevel,
-    // Technically, these are unused, but let's include them here for type consistency.
-    // See: https://github.com/expo/eas-build/pull/454
-    appId: ctx.projectId,
-    initiatingUserId: ctx.user.id,
   };
 
-  return sanitizeBuildJob(job) as Android.Job;
+  return sanitizeJob(job);
 }

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

@@ -1,38 +1,35 @@
 import { ExpoConfig } from '@expo/config';
 import { AndroidConfig } from '@expo/config-plugins';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
+import { 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';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   localAutoIncrement,
-  vcsClient,
-  env,
+  projectId,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   localAutoIncrement?: AndroidVersionAutoIncrement;
-  vcsClient: Client;
-  env: Env | undefined;
+  projectId: string;
 }): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     await cleanUpOldEasBuildGradleScriptAsync(projectDir);
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync({ projectDir, exp, workflow, env });
+      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   } else {

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

@@ -5,7 +5,6 @@ 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';
@@ -18,7 +17,6 @@ import {
 } 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 +42,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.'
@@ -97,10 +95,9 @@ export async function bumpVersionInAppJsonAsync({
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildProfile: BuildProfile<Platform.ANDROID>,
-  vcsClient: Client
-): Promise<{ appVersion?: string; appBuildVersion?: string; isVersionInitialized?: boolean }> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+  buildProfile: BuildProfile<Platform.ANDROID>
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID);
   if (workflow === Workflow.GENERIC) {
     const buildGradle = await getAppBuildGradleAsync(projectDir);
     try {
@@ -113,11 +110,6 @@ export async function maybeResolveVersionsAsync(
           resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
-        isVersionInitialized: !resolveConfigValue(
-          buildGradle,
-          'versionCode',
-          parsedGradleCommand?.flavor
-        ),
       };
     } catch {
       return {};
@@ -182,45 +174,35 @@ async function writeBuildGradleAsync({
  * 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> {
+export async function resolveRemoteVersionCodeAsync({
+  projectDir,
+  projectId,
+  exp,
+  applicationId,
+  buildProfile,
+}: {
+  projectDir: string;
+  projectId: string;
+  exp: ExpoConfig;
+  applicationId: string;
+  buildProfile: BuildProfile<Platform.ANDROID>;
+}): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
-    graphqlClient,
     projectId,
     AppPlatform.Android,
     applicationId
   );
 
-  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
+  const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
   let currentBuildVersion: string;
-  let shouldInitializeVersionCode = false;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
   } else {
     if (localVersions.appBuildVersion) {
-      Log.log(
-        chalk.green(
-          'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
-        )
+      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;
-      shouldInitializeVersionCode = localVersions.isVersionInitialized ?? false;
     } 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.`
@@ -230,23 +212,18 @@ export async function resolveRemoteVersionCodeAsync(
   }
   if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
     return currentBuildVersion;
-  } else if (
-    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
-    shouldInitializeVersionCode
-  ) {
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
     const spinner = ora(
       `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
     ).start();
     try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+      await AppVersionMutation.createAppVersionAsync({
         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,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
       });
       spinner.succeed(`Initialized versionCode with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -262,15 +239,13 @@ export async function resolveRemoteVersionCodeAsync(
       )}.`
     ).start();
     try {
-      await AppVersionMutation.createAppVersionAsync(graphqlClient, {
+      await AppVersionMutation.createAppVersionAsync({
         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,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.ANDROID) ?? undefined,
       });
       spinner.succeed(
         `Incremented versionCode from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -1,52 +1,13 @@
-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,
-  assertProjectTarballSizeDoesNotExceedLimit,
-  makeProjectMetadataFileAsync,
-  makeProjectTarballAsync,
-  maybeWarnAboutProjectTarballSize,
-  reviewAndCommitChangesAsync,
-} from './utils/repository';
-import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
+import { BuildEvent } from '../analytics/events';
 import { getExpoWebsiteBaseUrl } from '../api';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasCommandError } from '../commandUtils/errors';
-import { createFingerprintAsync } from '../fingerprint/cli';
 import {
   AppPlatform,
   BuildFragment,
@@ -55,23 +16,25 @@ import {
   BuildStatus,
   UploadSessionType,
 } from '../graphql/generated';
-import { BuildMutation, BuildResult } from '../graphql/mutations/BuildMutation';
+import { BuildResult } from '../graphql/mutations/BuildMutation';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
-import Log, { learnMore, link } from '../log';
+import Log, { learnMore } 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 { uploadFileAtPathToS3Async } from '../uploads';
 import { formatBytes } from '../utils/files';
-import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
+import { getVcsClient } from '../vcs';
+import { BuildContext } from './context';
+import { runLocalBuildAsync } from './local';
+import { collectMetadataAsync } from './metadata';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -83,14 +46,14 @@ 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>;
+  prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
   sendBuildRequestAsync(
     appId: string,
     job: TJob,
@@ -101,158 +64,100 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends BuildJob
 
 export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
 
-function resolveBuildParamsInput<T extends Platform>(
-  ctx: BuildContext<T>,
-  metadata: Metadata
-): BuildParamsInput {
+function resolveBuildParamsInput<T extends Platform>(ctx: BuildContext<T>): 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,
+      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,
-    }
-  );
+  await withAnalyticsAsync(async () => await builder.syncProjectConfigurationAsync(ctx), {
+    attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+    successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+    failureEvent: BuildEvent.CONFIGURE_PROJECT_FAIL,
+    trackingCtx: ctx.trackingCtx,
+  });
 
-  if (await ctx.vcsClient.isCommitRequiredAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
     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.localBuildOptions.enable
+    ? ({
+        type: ArchiveSourceType.PATH,
+        path: (await makeProjectTarballAsync()).path,
+      } as const)
+    : ({
+        type: ArchiveSourceType.S3,
+        bucketKey: await uploadProjectAsync(ctx),
+      } as const);
 
-  const runtimeAndFingerprintMetadata =
-    await computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync(ctx);
-  const metadata = await collectMetadataAsync(ctx, runtimeAndFingerprintMetadata);
-  const buildParams = resolveBuildParamsInput(ctx, metadata);
+  const metadata = await collectMetadataAsync(ctx);
+  const buildParams = resolveBuildParamsInput(ctx);
   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.localBuildOptions.enable) {
+      await runLocalBuildAsync(job, metadata, ctx.localBuildOptions);
       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) {
+    } else {
       try {
         return await sendBuildRequestAsync(builder, job, metadata, buildParams);
       } catch (error: any) {
         handleBuildRequestError(error, job.platform);
       }
-    } else {
-      throw new Error('Unknown localBuildMode.');
     }
   };
 }
 
-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.`
+function handleBuildRequestError(error: any, platform: Platform): never {
+  if (error?.graphQLErrors?.[0]?.extensions?.errorCode === 'TURTLE_DEPRECATED_JOB_FORMAT') {
+    Log.error('EAS Build API has changed. 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. Try again later. Check https://status.expo.dev/ for updates.'
     );
-  } else if (graphQLErrorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
-    throw new EasBuildTooManyPendingBuildsError(
+    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. 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[platform]} builds for your account. Try again later.`
     );
+    throw new Error('Build request failed.');
   } 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}`
+    Log.error(
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
     );
   }
   throw error;
@@ -260,14 +165,10 @@ export function handleBuildRequestError(error: any, platform: Platform): never {
 
 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(
@@ -275,49 +176,41 @@ async function uploadProjectAsync<TPlatform extends Platform>(
             'https://expo.fyi/eas-build-archive'
           )}`
         );
-        const projectTarball = await makeProjectTarballAsync(ctx.vcsClient);
+        const projectTarball = await makeProjectTarballAsync();
 
-        maybeWarnAboutProjectTarballSize(projectTarball.size);
-        assertProjectTarballSizeDoesNotExceedLimit(projectTarball.size);
+        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')}`
+          );
+        }
 
         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 uploadFileAtPathToS3Async(
+          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)}`,
+          })
+        );
+        return bucketKey;
       },
       {
         attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
         successEvent: BuildEvent.PROJECT_UPLOAD_SUCCESS,
         failureEvent: BuildEvent.PROJECT_UPLOAD_FAIL,
-        properties: ctx.analyticsEventProperties,
+        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);
@@ -325,41 +218,7 @@ 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,
@@ -367,7 +226,6 @@ async function sendBuildRequestAsync<
 ): Promise<BuildFragment> {
   const { ctx } = builder;
   return await withAnalyticsAsync(
-    ctx.analytics,
     async () => {
       if (Log.isDebug) {
         Log.log(`Starting ${requestedPlatformDisplayNames[job.platform]} build`);
@@ -387,15 +245,14 @@ async function sendBuildRequestAsync<
       attemptEvent: BuildEvent.BUILD_REQUEST_ATTEMPT,
       successEvent: BuildEvent.BUILD_REQUEST_SUCCESS,
       failureEvent: BuildEvent.BUILD_REQUEST_FAIL,
-      properties: ctx.analyticsEventProperties,
+      trackingCtx: ctx.trackingCtx,
     }
   );
 }
 
-export type MaybeBuildFragment = BuildFragment | null;
+type MaybeBuildFragment = BuildFragment | null;
 
 export async function waitForBuildEndAsync(
-  graphqlClient: ExpoGraphqlClient,
   { buildIds, accountName }: { buildIds: string[]; accountName: string },
   { intervalSec = 10 } = {}
 ): Promise<MaybeBuildFragment[]> {
@@ -410,7 +267,7 @@ export async function waitForBuildEndAsync(
     spinner = ora('Waiting for builds to complete. You can press Ctrl+C to exit.').start();
   }
   while (true) {
-    const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
+    const builds = await getBuildsSafelyAsync(buildIds);
     const { refetch } =
       builds.length === 1
         ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
@@ -422,13 +279,10 @@ export async function waitForBuildEndAsync(
   }
 }
 
-async function getBuildsSafelyAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildIds: string[]
-): Promise<MaybeBuildFragment[]> {
+async function getBuildsSafelyAsync(buildIds: string[]): Promise<MaybeBuildFragment[]> {
   const promises = buildIds.map(async buildId => {
     try {
-      return await BuildQuery.byIdAsync(graphqlClient, buildId, { useCache: false });
+      return await BuildQuery.byIdAsync(buildId, { useCache: false });
     } catch (err) {
       Log.debug('Failed to fetch the build status', err);
       return null;
@@ -448,13 +302,7 @@ const queueProgressBar = new cliProgress.SingleBar(
 );
 
 async function handleSingleBuildProgressAsync(
-  {
-    build,
-    accountName,
-  }: {
-    build: MaybeBuildFragment;
-    accountName: string;
-  },
+  { build, accountName }: { build: MaybeBuildFragment; accountName: string },
   { spinner }: { spinner: Ora }
 ): Promise<BuildProgressResult> {
   if (build === null) {
@@ -479,8 +327,8 @@ async function handleSingleBuildProgressAsync(
       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)
+      spinner.text = `Build is waiting to enter the queue. Check your concurrency limit at ${chalk.underline(
+        formatAccountSubscriptionsUrl(accountName)
       )}.`;
       break;
     case BuildStatus.InQueue: {
@@ -493,16 +341,18 @@ async function handleSingleBuildProgressAsync(
       if (
         !queueProgressBarStarted &&
         typeof build.initialQueuePosition === 'number' &&
-        typeof build.queuePosition === 'number' &&
-        typeof build.estimatedWaitTimeLeftSeconds === 'number'
+        typeof build.queuePosition === 'number'
       ) {
         spinner.stopAndPersist();
         if (build.priority !== BuildPriority.High) {
           Log.newLine();
           Log.log('Start builds sooner in the priority queue.');
-          Log.log(`Sign up for a paid plan at ${link(formatAccountBillingUrl(accountName))}`);
+          Log.log(
+            `Sign up for EAS Production or Enterprise at ${chalk.underline(
+              formatAccountSubscriptionsUrl(accountName)
+            )}`
+          );
         }
-
         Log.newLine();
         Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
         queueProgressBar.start(
@@ -517,7 +367,6 @@ async function handleSingleBuildProgressAsync(
       }
       break;
     }
-    case BuildStatus.PendingCancel:
     case BuildStatus.Canceled:
       spinner.fail('Build canceled');
       return { refetch: false };
@@ -539,8 +388,8 @@ async function handleSingleBuildProgressAsync(
 }
 
 const priorityToQueueDisplayName: Record<BuildPriority, string> = {
-  [BuildPriority.Normal]: 'Free tier queue',
-  [BuildPriority.NormalPlus]: 'Free tier queue',
+  [BuildPriority.Normal]: 'queue',
+  [BuildPriority.NormalPlus]: 'queue',
   [BuildPriority.High]: 'priority queue',
 };
 
@@ -548,7 +397,6 @@ 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',
@@ -567,12 +415,7 @@ async function handleMultipleBuildsProgressAsync(
     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)
+      [BuildStatus.Finished, BuildStatus.Errored, BuildStatus.Canceled].includes(build.status)
     ).length === buildCount;
 
   if (allSettled) {
@@ -645,105 +488,9 @@ function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds: number): string {
   }
 }
 
-function formatAccountBillingUrl(accountName: string): string {
-  return new URL(`/accounts/${accountName}/settings/billing`, getExpoWebsiteBaseUrl()).toString();
-}
-
-async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<{
-  runtimeVersion?: string | undefined;
-  fingerprintHash?: string | undefined;
-  fingerprintSource?: FingerprintSource | undefined;
-}> {
-  const runtimeAndFingerprintMetadata =
-    await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
-  if (!runtimeAndFingerprintMetadata?.fingerprintHash) {
-    const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx);
-    return {
-      ...runtimeAndFingerprintMetadata,
-      ...fingerprint,
-    };
-  } else {
-    return {
-      ...runtimeAndFingerprintMetadata,
-      fingerprintHash: runtimeAndFingerprintMetadata.runtimeVersion,
-    };
-  }
-}
-
-async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<{
-  runtimeVersion?: string;
-  fingerprintSource?: FingerprintSource;
-  fingerprintHash?: string;
-}> {
-  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.expoUpdatesRuntimeFingerprint ||
-    !resolvedRuntimeVersion.runtimeVersion
-  ) {
-    return {
-      runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
-    };
-  }
-
-  const uploadedFingerprint = await maybeUploadFingerprintAsync({
-    hash: resolvedRuntimeVersion.runtimeVersion,
-    fingerprint: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprint,
-    graphqlClient: ctx.graphqlClient,
-    localBuildMode: ctx.localBuildOptions.localBuildMode,
-  });
-  return {
-    runtimeVersion: uploadedFingerprint.hash,
-    fingerprintSource: uploadedFingerprint.fingerprintSource,
-    fingerprintHash: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprintHash ?? undefined,
-  };
-}
-
-async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  { debug }: { debug?: boolean } = {}
-): Promise<{
-  fingerprintHash?: string;
-  fingerprintSource?: FingerprintSource;
-}> {
-  const fingerprint = await createFingerprintAsync(ctx.projectDir, {
-    workflow: ctx.workflow,
-    platforms: [ctx.platform],
-    env: ctx.env,
-  });
-  if (!fingerprint) {
-    return {};
-  }
-  const uploadedFingerprint = await maybeUploadFingerprintAsync({
-    hash: fingerprint.hash,
-    fingerprint: {
-      fingerprintSources: fingerprint.sources,
-      isDebugFingerprintSource: debug ?? false,
-    },
-    graphqlClient: ctx.graphqlClient,
-    localBuildMode: ctx.localBuildOptions.localBuildMode,
-  });
-  return {
-    fingerprintHash: uploadedFingerprint.hash,
-    fingerprintSource: uploadedFingerprint.fingerprintSource,
-  };
+function formatAccountSubscriptionsUrl(accountName: string): string {
+  return new URL(
+    `/accounts/${accountName}/settings/subscriptions`,
+    getExpoWebsiteBaseUrl()
+  ).toString();
 }

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

@@ -1,21 +1,17 @@
-import { AppVersionSource, EasJson, EasJsonAccessor } from '@expo/eas-json';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
-import Log, { learnMore } from '../log';
-import { ora } from '../ora';
+import Log from '../log';
+import { resolveWorkflowAsync } from '../project/workflow';
 import { easCliVersion } from '../utils/easCli';
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
+import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 interface ConfigureParams {
   projectDir: string;
   nonInteractive: boolean;
-  vcsClient: Client;
-}
-
-export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
-  return await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir));
 }
 
 /**
@@ -28,7 +24,7 @@ export async function easJsonExistsAsync(projectDir: string): Promise<boolean> {
 export async function ensureProjectConfiguredAsync(
   configureParams: ConfigureParams
 ): Promise<boolean> {
-  if (await easJsonExistsAsync(configureParams.projectDir)) {
+  if (await fs.pathExists(EasJsonAccessor.formatEasJsonPath(configureParams.projectDir))) {
     return false;
   }
 
@@ -36,99 +32,22 @@ export async function ensureProjectConfiguredAsync(
   return true;
 }
 
-async function configureAsync({
-  projectDir,
-  nonInteractive,
-  vcsClient,
-}: ConfigureParams): Promise<void> {
-  await maybeBailOnRepoStatusAsync(vcsClient, nonInteractive);
+async function configureAsync({ projectDir, nonInteractive }: ConfigureParams): Promise<void> {
+  await maybeBailOnRepoStatusAsync();
 
-  await createEasJsonAsync(projectDir, vcsClient);
+  await createEasJsonAsync(projectDir);
 
-  if (await vcsClient.isCommitRequiredAsync()) {
+  if (await getVcsClient().isCommitRequiredAsync()) {
     Log.newLine();
-    await reviewAndCommitChangesAsync(vcsClient, 'Configure EAS Build', {
+    await reviewAndCommitChangesAsync('Configure EAS Build', {
       nonInteractive,
     });
   }
 }
 
-export async function doesBuildProfileExistAsync({
-  projectDir,
-  profileName,
-}: {
-  projectDir: string;
-  profileName: string;
-}): Promise<boolean> {
-  try {
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    const easJson = await easJsonAccessor.readRawJsonAsync();
-    if (!easJson.build?.[profileName]) {
-      return false;
-    }
-    return true;
-  } catch (error) {
-    Log.error(`We were unable to read ${chalk.bold('eas.json')} contents. Error: ${error}.`);
-    throw error;
-  }
-}
-
-export async function createBuildProfileAsync({
-  projectDir,
-  profileName,
-  profileContents,
-  vcsClient,
-  nonInteractive,
-}: {
-  projectDir: string;
-  profileName: string;
-  profileContents: Record<string, any>;
-  vcsClient: Client;
-  nonInteractive: boolean;
-}): Promise<void> {
-  const spinner = ora(`Adding "${profileName}" build profile to ${chalk.bold('eas.json')}`).start();
-  try {
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await easJsonAccessor.readRawJsonAsync();
-
-    easJsonAccessor.patch(easJsonRawObject => {
-      return {
-        ...easJsonRawObject,
-        build: {
-          ...easJsonRawObject.build,
-          [profileName]: profileContents,
-        },
-      };
-    });
-    await easJsonAccessor.writeAsync();
-    spinner.succeed(
-      `Successfully added "${profileName}" build profile to ${chalk.bold('eas.json')}.`
-    );
-
-    if (await vcsClient.isCommitRequiredAsync()) {
-      Log.newLine();
-      await reviewAndCommitChangesAsync(
-        vcsClient,
-        `Add "${profileName}" build profile to eas.json`,
-        {
-          nonInteractive,
-        }
-      );
-    }
-  } catch (error) {
-    spinner.fail(
-      `We were not able to configure "${profileName}" build profile inside of ${chalk.bold(
-        'eas.json'
-      )}. Error: ${error}.`
-    );
-    throw error;
-  }
-}
-
-const EAS_JSON_DEFAULT: EasJson = {
+const EAS_JSON_MANAGED_DEFAULT: EasJson = {
   cli: {
     version: `>= ${easCliVersion}`,
-    appVersionSource: AppVersionSource.REMOTE,
   },
   build: {
     development: {
@@ -138,23 +57,50 @@ const EAS_JSON_DEFAULT: EasJson = {
     preview: {
       distribution: 'internal',
     },
-    production: {
-      autoIncrement: true,
-    },
+    production: {},
   },
   submit: {
     production: {},
   },
 };
 
-async function createEasJsonAsync(projectDir: string, vcsClient: Client): Promise<void> {
+const EAS_JSON_BARE_DEFAULT: EasJson = {
+  cli: {
+    version: `>= ${easCliVersion}`,
+  },
+  build: {
+    development: {
+      distribution: 'internal',
+      android: {
+        gradleCommand: ':app:assembleDebug',
+      },
+      ios: {
+        buildConfiguration: 'Debug',
+      },
+    },
+    preview: {
+      distribution: 'internal',
+    },
+    production: {},
+  },
+  submit: {
+    production: {},
+  },
+};
+
+async function createEasJsonAsync(projectDir: string): Promise<void> {
   const easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
 
-  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/'
-    )}`
-  );
+  const hasAndroidNativeProject =
+    (await resolveWorkflowAsync(projectDir, Platform.ANDROID)) === Workflow.GENERIC;
+  const hasIosNativeProject =
+    (await resolveWorkflowAsync(projectDir, Platform.IOS)) === Workflow.GENERIC;
+  const easJson =
+    hasAndroidNativeProject || hasIosNativeProject
+      ? EAS_JSON_BARE_DEFAULT
+      : EAS_JSON_MANAGED_DEFAULT;
+
+  await fs.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+  await getVcsClient().trackFileAsync(easJsonPath);
+  Log.withTick(`Generated ${chalk.bold('eas.json')}`);
 }

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

@@ -1,20 +1,15 @@
 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 { LocalBuildOptions } from './local';
-import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { TrackingContext } from '../analytics/common';
 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 { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
+import { LocalBuildOptions } from './local';
 
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 
@@ -50,19 +45,9 @@ export interface BuildContext<T extends Platform> {
   projectId: string;
   projectName: string;
   message?: string;
-  analyticsEventProperties: AnalyticsEventProperties;
+  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;
-  isVerboseLoggingEnabled: boolean;
-  whatToTest?: string;
-  env: Record<string, string>;
 }

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

@@ -1,26 +1,22 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJson, ResourceClass } from '@expo/eas-json';
+import { BuildProfile, EasJson } 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 { TrackingContext } from '../analytics/common';
+import { Analytics, BuildEvent } from '../analytics/events';
 import { CredentialsContext } from '../credentials/context';
-import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
+import { BuildResourceClass } from '../graphql/generated';
+import { getExpoConfig } from '../project/expoConfig';
 import { getOwnerAccountForProjectIdAsync } from '../project/projectUtils';
 import { resolveWorkflowAsync } from '../project/workflow';
 import { Actor } from '../user/User';
-import { Client } from '../vcs/vcs';
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
 
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,
@@ -32,19 +28,10 @@ export async function createBuildContextAsync<T extends Platform>({
   noWait,
   platform,
   projectDir,
-  resourceClassFlag,
+  resourceClass,
   message,
   actor,
-  graphqlClient,
-  analytics,
-  vcsClient,
-  getDynamicPrivateProjectConfigAsync,
-  customBuildConfigMetadata,
-  buildLoggerLevel,
-  freezeCredentials,
-  isVerboseLoggingEnabled,
-  whatToTest,
-  env,
+  projectId,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
@@ -55,48 +42,26 @@ export async function createBuildContextAsync<T extends Platform>({
   noWait: boolean;
   platform: T;
   projectDir: string;
-  resourceClassFlag?: ResourceClass;
+  resourceClass: BuildResourceClass;
   message?: string;
   actor: Actor;
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
-  vcsClient: Client;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  isVerboseLoggingEnabled: boolean;
-  whatToTest?: string;
-  env: Record<string, string>;
+  projectId: string;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
-    env,
-  });
+  const exp = getExpoConfig(projectDir, { env: buildProfile.env });
+
   const projectName = exp.slug;
-  const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
+  const account = await getOwnerAccountForProjectIdAsync(projectId);
+  const workflow = await resolveWorkflowAsync(projectDir, platform);
   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,
+    env: buildProfile.env,
     easJsonCliConfig,
-    vcsClient,
-    freezeCredentials,
   });
 
   const devClientProperties = getDevClientEventProperties({
@@ -104,25 +69,17 @@ export async function createBuildContextAsync<T extends Platform>({
     projectDir,
     buildProfile,
   });
-  const analyticsEventProperties = {
+  const trackingCtx = {
     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
-  );
+  Analytics.logEvent(BuildEvent.BUILD_COMMAND, trackingCtx);
 
   const commonContext: CommonContext<T> = {
     accountName: account.name,
@@ -140,21 +97,11 @@ export async function createBuildContextAsync<T extends Platform>({
     projectDir,
     projectId,
     projectName,
-    analyticsEventProperties,
+    trackingCtx,
     user: actor,
-    graphqlClient,
-    analytics,
-    vcsClient,
     workflow,
     message,
     runFromCI,
-    customBuildConfigMetadata,
-    developmentClient,
-    requiredPackageManager,
-    loggerLevel: buildLoggerLevel,
-    isVerboseLoggingEnabled,
-    env,
-    whatToTest,
   };
   if (platform === Platform.ANDROID) {
     const common = commonContext as CommonContext<Platform.ANDROID>;
@@ -179,7 +126,7 @@ function getDevClientEventProperties({
   platform: Platform;
   projectDir: string;
   buildProfile: BuildProfile;
-}): Partial<AnalyticsEventProperties> {
+}): Partial<TrackingContext> {
   let includesDevClient;
   const version = tryGetDevClientVersion(projectDir);
   if (platform === Platform.ANDROID && 'gradleCommand' in buildProfile) {

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,147 +0,0 @@
-import { Env } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-
-import { isEnvironment } from './utils/environment';
-import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
-import { EnvironmentVariablesQuery } from '../graphql/queries/EnvironmentVariablesQuery';
-import Log, { learnMore } from '../log';
-
-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() ??
-    resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile);
-
-  if (!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>;
-
-    if (Object.keys(serverEnvVars).length > 0) {
-      Log.log(
-        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
-          serverEnvVars
-        ).join(', ')}.`
-      );
-    } else {
-      Log.log(
-        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
-      );
-    }
-
-    if (buildProfile.env && Object.keys(buildProfile.env).length > 0) {
-      Log.log(
-        `Environment variables loaded from the "${buildProfileName}" build profile "env" configuration: ${
-          buildProfile.env && Object.keys(buildProfile.env).join(', ')
-        }.`
-      );
-    }
-
-    if (
-      buildProfile.env &&
-      Object.keys(buildProfile.env).length > 0 &&
-      Object.keys(serverEnvVars).length > 0
-    ) {
-      const overlappingKeys = Object.keys(serverEnvVars).filter(
-        key => buildProfile.env && Object.keys(buildProfile.env).includes(key)
-      );
-      if (overlappingKeys.length > 0) {
-        Log.warn(
-          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS: ${overlappingKeys.join(
-            ', '
-          )}. The values from the build profile configuration will be used.`
-        );
-      }
-    }
-
-    Log.newLine();
-
-    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 };
-  }
-}
-
-function resolveSuggestedEnvironmentForBuildProfileConfiguration(
-  buildProfile: BuildProfile
-): EnvironmentVariableEnvironment {
-  const environment =
-    buildProfile.distribution === 'store'
-      ? EnvironmentVariableEnvironment.Production
-      : buildProfile.developmentClient
-        ? EnvironmentVariableEnvironment.Development
-        : EnvironmentVariableEnvironment.Preview;
-
-  Log.log(
-    `Resolved "${environment.toLowerCase()}" environment for the build. ${learnMore(
-      'https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds'
-    )}`
-  );
-
-  return environment;
-}

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

@@ -1,14 +1,4 @@
-import {
-  ArchiveSource,
-  ArchiveSourceType,
-  BuildMode,
-  BuildTrigger,
-  FingerprintSourceType,
-  Metadata,
-  Workflow,
-} from '@expo/eas-build-job';
-import { LoggerLevel } from '@expo/logger';
-import assert from 'assert';
+import { ArchiveSource, ArchiveSourceType, Metadata, Workflow } from '@expo/eas-build-job';
 
 import {
   BuildCredentialsSource,
@@ -16,21 +6,15 @@ import {
   BuildMetadataInput,
   BuildWorkflow,
   DistributionType,
-  FingerprintSourceInput,
-  BuildMode as GraphQLBuildMode,
-  BuildTrigger as GraphQLBuildTrigger,
-  FingerprintSourceType as GraphQLFingeprintSourceType,
   ProjectArchiveSourceInput,
   ProjectArchiveSourceType,
-  WorkerLoggerLevel,
 } from '../graphql/generated';
 
 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
-  if (archiveSource.type === ArchiveSourceType.GCS) {
+  if (archiveSource.type === ArchiveSourceType.S3) {
     return {
-      type: ProjectArchiveSourceType.Gcs,
+      type: ProjectArchiveSourceType.S3,
       bucketKey: archiveSource.bucketKey,
-      metadataLocation: archiveSource.metadataLocation,
     };
   } else if (archiveSource.type === ArchiveSourceType.URL) {
     return {
@@ -45,8 +29,6 @@ export function transformProjectArchive(archiveSource: ArchiveSource): ProjectAr
 export function transformMetadata(metadata: Metadata): BuildMetadataInput {
   return {
     ...metadata,
-    fingerprintSource:
-      metadata.fingerprintSource && transformFingerprintSource(metadata.fingerprintSource),
     credentialsSource:
       metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
     distribution: metadata.distribution && transformDistribution(metadata.distribution),
@@ -57,20 +39,6 @@ export function transformMetadata(metadata: Metadata): BuildMetadataInput {
   };
 }
 
-export function transformFingerprintSource(
-  fingerprintSource: NonNullable<Metadata['fingerprintSource']>
-): FingerprintSourceInput | null {
-  if (fingerprintSource.type !== FingerprintSourceType.GCS) {
-    return null;
-  }
-
-  return {
-    type: GraphQLFingeprintSourceType.Gcs,
-    bucketKey: fingerprintSource.bucketKey,
-    isDebugFingerprint: fingerprintSource.isDebugFingerprint,
-  };
-}
-
 function transformCredentialsSource(
   credentialsSource: Metadata['credentialsSource']
 ): BuildCredentialsSource {
@@ -108,34 +76,3 @@ export function transformIosEnterpriseProvisioning(
     return BuildIosEnterpriseProvisioning.Universal;
   }
 }
-
-const buildModeToGraphQLBuildMode: Record<BuildMode, GraphQLBuildMode> = {
-  [BuildMode.BUILD]: GraphQLBuildMode.Build,
-  [BuildMode.CUSTOM]: GraphQLBuildMode.Custom,
-  [BuildMode.RESIGN]: GraphQLBuildMode.Resign,
-  [BuildMode.REPACK]: GraphQLBuildMode.Repack,
-};
-
-export function transformBuildMode(buildMode: BuildMode): GraphQLBuildMode {
-  const graphQLBuildMode = buildModeToGraphQLBuildMode[buildMode];
-  assert(graphQLBuildMode, `Unsupported build mode: ${buildMode}`);
-  return graphQLBuildMode;
-}
-
-export function transformBuildTrigger(buildTrigger: BuildTrigger): GraphQLBuildTrigger {
-  if (buildTrigger === BuildTrigger.EAS_CLI) {
-    return GraphQLBuildTrigger.EasCli;
-  } else if (buildTrigger === BuildTrigger.GIT_BASED_INTEGRATION) {
-    return GraphQLBuildTrigger.GitBasedIntegration;
-  }
-  throw new Error('Unknown build trigger');
-}
-
-export const loggerLevelToGraphQLWorkerLoggerLevel: Record<LoggerLevel, WorkerLoggerLevel> = {
-  [LoggerLevel.TRACE]: WorkerLoggerLevel.Trace,
-  [LoggerLevel.DEBUG]: WorkerLoggerLevel.Debug,
-  [LoggerLevel.INFO]: WorkerLoggerLevel.Info,
-  [LoggerLevel.WARN]: WorkerLoggerLevel.Warn,
-  [LoggerLevel.ERROR]: WorkerLoggerLevel.Error,
-  [LoggerLevel.FATAL]: WorkerLoggerLevel.Fatal,
-};

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

@@ -1,19 +1,11 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
-import { IosBuildProfile } from '@expo/eas-json/build/build/types';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
-import { instance, mock } from 'ts-mockito';
 import type { XCBuildConfiguration } from 'xcode';
 
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { Target } from '../../../credentials/ios/types';
-import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { readPlistAsync } from '../../../utils/plist';
-import { resolveVcsClient } from '../../../vcs';
-import { Client } from '../../../vcs/vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -22,25 +14,9 @@ import {
   getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
-  resolveRemoteBuildNumberAsync,
 } from '../version';
 
 jest.mock('fs');
-jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
-jest.mock('../../../vcs/vcs');
-jest.mock('../../../graphql/queries/AppVersionQuery');
-jest.mock('../../../graphql/mutations/AppVersionMutation');
-jest.mock('../../../ora', () => ({
-  ora: jest.fn().mockImplementation(() => ({
-    start: jest.fn().mockImplementation(() => ({
-      succeed: jest.fn(),
-      stop: jest.fn(),
-      fail: jest.fn(),
-    })),
-  })),
-}));
-
-const vcsClient = resolveVcsClient();
 
 const getXCBuildConfigurationFromPbxproj = jest.spyOn(
   IOSConfig.Target,
@@ -83,7 +59,7 @@ describe(evaluateTemplateString, () => {
 // bare workflow
 describe(bumpVersionAsync, () => {
   beforeEach(() => {
-    getPbxproj.mockImplementation((): any => {});
+    getPbxproj.mockImplementation(() => ({} as any));
   });
   afterEach(() => {
     getXCBuildConfigurationFromPbxproj.mockReset();
@@ -97,11 +73,11 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
       targets: [
         {
@@ -112,9 +88,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info.plist'
+      '/repo/ios/myproject/Info.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -133,11 +109,11 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
       targets: [
         {
@@ -148,9 +124,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info2.plist'
+      '/repo/ios/myproject/Info2.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
@@ -168,11 +144,11 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
       targets: [
         {
@@ -183,9 +159,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info.plist'
+      '/repo/ios/myproject/Info.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.1');
     expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -203,11 +179,11 @@ describe(bumpVersionAsync, () => {
           buildSettings: {
             INFOPLIST_FILE: 'myproject/Info.plist',
           },
-        }) as XCBuildConfiguration
+        } as XCBuildConfiguration)
     );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
-      projectDir: '/app',
+      projectDir: '/repo',
       exp: fakeExp,
       targets: [
         {
@@ -218,9 +194,9 @@ describe(bumpVersionAsync, () => {
       ],
     });
 
-    const appJSON = await fs.readJSON('/app/app.json');
+    const appJSON = await fs.readJSON('/repo/app.json');
     const infoPlist = (await readPlistAsync(
-      '/app/ios/myproject/Info.plist'
+      '/repo/ios/myproject/Info.plist'
     )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('1');
@@ -238,11 +214,11 @@ describe(bumpVersionInAppJsonAsync, () => {
 
     await bumpVersionInAppJsonAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
-      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('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -254,11 +230,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('1.0.1');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.1');
@@ -270,11 +246,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('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -286,7 +262,7 @@ describe(readBuildNumberAsync, () => {
   describe('bare project', () => {
     it('reads the build number from native code', async () => {
       const exp = initBareWorkflowProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {}, vcsClient);
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -294,7 +270,7 @@ describe(readBuildNumberAsync, () => {
   describe('managed project', () => {
     it('reads the build number from expo config', async () => {
       const exp = initManagedProject();
-      const buildNumber = await readBuildNumberAsync('/app', exp, {}, vcsClient);
+      const buildNumber = await readBuildNumberAsync('/repo', exp, {});
       expect(buildNumber).toBe('1');
     });
   });
@@ -304,21 +280,16 @@ describe(readShortVersionAsync, () => {
   describe('bare project', () => {
     it('reads the short version from native code', async () => {
       const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {}, vcsClient);
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
     it('evaluates interpolated build number', async () => {
       const exp = initBareWorkflowProject({
         appVersion: '$(CURRENT_PROJECT_VERSION)',
       });
-      const buildNumber = await readShortVersionAsync(
-        '/app',
-        exp,
-        {
-          CURRENT_PROJECT_VERSION: '1.0.0',
-        },
-        vcsClient
-      );
+      const buildNumber = await readShortVersionAsync('/repo', exp, {
+        CURRENT_PROJECT_VERSION: '1.0.0',
+      });
       expect(buildNumber).toBe('1.0.0');
     });
   });
@@ -326,7 +297,7 @@ describe(readShortVersionAsync, () => {
   describe('managed project', () => {
     it('reads the version from app config', async () => {
       const exp = initBareWorkflowProject();
-      const appVersion = await readShortVersionAsync('/app', exp, {}, vcsClient);
+      const appVersion = await readShortVersionAsync('/repo', exp, {});
       expect(appVersion).toBe('1.0.0');
     });
   });
@@ -338,223 +309,66 @@ describe(getInfoPlistPath, () => {
       {
         './ios/testapp/Info.plist': '',
       },
-      '/app'
+      '/repo'
     );
-    const plistPath = getInfoPlistPath('/app', {});
-    expect(plistPath).toBe('/app/ios/testapp/Info.plist');
+    const plistPath = getInfoPlistPath('/repo', {});
+    expect(plistPath).toBe('/repo/ios/testapp/Info.plist');
   });
   it('returns INFOPLIST_FILE if specified', () => {
     vol.fromJSON(
       {
         './ios/testapp/Info.plist': '',
       },
-      '/app'
+      '/repo'
     );
-    const plistPath = getInfoPlistPath('/app', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
-    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
+    const plistPath = getInfoPlistPath('/repo', { INFOPLIST_FILE: './qwert/NotInfo.plist' });
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
   });
   it('evaluates SRCROOT in Info.plist', () => {
     vol.fromJSON(
       {
         './ios/testapp/Info.plist': '',
       },
-      '/app'
+      '/repo'
     );
-    const plistPath = getInfoPlistPath('/app', {
+    const plistPath = getInfoPlistPath('/repo', {
       INFOPLIST_FILE: '$(SRCROOT)/qwert/NotInfo.plist',
     });
-    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
   });
   it('evaluates BuildSettings in Info.plist', () => {
     vol.fromJSON(
       {
         './ios/testapp/Info.plist': '',
       },
-      '/app'
+      '/repo'
     );
-    const plistPath = getInfoPlistPath('/app', {
+    const plistPath = getInfoPlistPath('/repo', {
       INFOPLIST_FILE: '$(SRCROOT)/qwert/$(TARGET_NAME).plist',
       TARGET_NAME: 'NotInfo',
     });
-    expect(plistPath).toBe('/app/ios/qwert/NotInfo.plist');
-  });
-});
-
-describe(resolveRemoteBuildNumberAsync, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('uses current remote buildNumber when remote version set, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
-      buildVersion: '11',
-      storeVersion: '1.2.3',
-    });
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject();
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: {} as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('11');
-    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
-  });
-
-  it('initializes buildNumber from local files when remote version not set, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: {} as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('22');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
-  });
-
-  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: {} as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('1');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
-  });
-
-  it('increments current remote buildNumber when remote version set, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
-      buildVersion: '11',
-      storeVersion: '1.2.3',
-    });
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject();
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: { autoIncrement: true } as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('12');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
-  });
-
-  it('increments buildNumber from local files when remote version not set, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: { autoIncrement: true } as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('23');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
-  });
-
-  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: { autoIncrement: true } as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('1');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
+    expect(plistPath).toBe('/repo/ios/qwert/NotInfo.plist');
   });
 });
 
 function initBareWorkflowProject({
   appVersion = '1.0.0',
   buildNumber = '1',
-  expoConfig = {},
   infoPlistName = 'Info.plist',
-}: {
-  appVersion?: string;
-  buildNumber?: string;
-  infoPlistName?: string;
-  expoConfig?: { version?: string; ios?: object };
-} = {}): ExpoConfig {
+}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
     version: '1.0.0',
     ios: {
       buildNumber: '1',
-      ...expoConfig.ios,
     },
-    ...expoConfig,
   };
   vol.fromJSON(
     {
       './app.json': JSON.stringify({
         expo: fakeExp,
       }),
-      './ios/myproject.xcodeproj/project.pbxproj': '',
       [`./ios/myproject/${infoPlistName}`]: `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -566,7 +380,7 @@ function initBareWorkflowProject({
 </dict>
 </plist>`,
     },
-    '/app'
+    '/repo'
   );
 
   return fakeExp;
@@ -588,7 +402,7 @@ function initManagedProject(): ExpoConfig {
         expo: fakeExp,
       }),
     },
-    '/app'
+    '/repo'
   );
 
   return fakeExp;

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

@@ -1,47 +1,39 @@
-import { Ios, Metadata, Platform, Workflow } from '@expo/eas-build-job';
+import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 
-import { ensureIosCredentialsAsync } from './credentials';
-import { transformJob } from './graphql';
-import { prepareJobAsync } from './prepareJob';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
-import { resolveRemoteBuildNumberAsync } from './version';
 import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
-import { ensureNonExemptEncryptionIsDefinedForManagedProjectAsync } from '../../project/ios/exemptEncryption';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
 import { BuildContext, CommonContext, IosBuildContext } from '../context';
 import { transformMetadata } from '../graphql';
-import {
-  checkGoogleServicesFileAsync,
-  checkNodeEnvVariable,
-  validatePNGsForManagedProjectAsync,
-} from '../validate';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { ensureIosCredentialsAsync } from './credentials';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
+import { resolveRemoteBuildNumberAsync } from './version';
 
 export async function createIosContextAsync(
   ctx: CommonContext<Platform.IOS>
 ): Promise<IosBuildContext> {
-  const { buildProfile, env } = ctx;
+  const { buildProfile } = ctx;
 
   if (ctx.workflow === Workflow.MANAGED) {
-    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx);
-    await ensureNonExemptEncryptionIsDefinedForManagedProjectAsync(ctx);
+    await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, ctx.user);
   }
 
   checkNodeEnvVariable(ctx);
   await checkGoogleServicesFileAsync(ctx);
-  await validatePNGsForManagedProjectAsync(ctx);
 
   const xcodeBuildContext = await resolveXcodeBuildContextAsync(
     {
       projectDir: ctx.projectDir,
       nonInteractive: ctx.nonInteractive,
       exp: ctx.exp,
-      vcsClient: ctx.vcsClient,
     },
     buildProfile
   );
@@ -49,19 +41,17 @@ export async function createIosContextAsync(
     projectDir: ctx.projectDir,
     exp: ctx.exp,
     xcodeBuildContext,
-    env,
-    vcsClient: ctx.vcsClient,
+    env: buildProfile.env,
   });
   const applicationTarget = findApplicationTarget(targets);
   const buildNumberOverride =
     ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
-      ? await resolveRemoteBuildNumberAsync(ctx.graphqlClient, {
+      ? await resolveRemoteBuildNumberAsync({
           projectDir: ctx.projectDir,
           projectId: ctx.projectId,
           exp: ctx.exp,
           applicationTarget,
           buildProfile,
-          vcsClient: ctx.vcsClient,
         })
       : undefined;
   return {
@@ -79,7 +69,7 @@ export async function prepareIosBuildAsync(
   return await prepareBuildRequestForPlatformAsync({
     ctx,
     ensureCredentialsAsync: async (ctx: BuildContext<Platform.IOS>) => {
-      return await ensureIosCredentialsAsync(ctx, ctx.ios.targets);
+      return ensureIosCredentialsAsync(ctx, ctx.ios.targets);
     },
     syncProjectConfigurationAsync: async () => {
       await syncProjectConfigurationAsync({
@@ -90,14 +80,13 @@ export async function prepareIosBuildAsync(
           ctx.easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE
             ? false
             : ctx.buildProfile.autoIncrement,
-        vcsClient: ctx.vcsClient,
-        env: ctx.env,
+        projectId: ctx.projectId,
       });
     },
     prepareJobAsync: async (
       ctx: BuildContext<Platform.IOS>,
       jobData: JobData<IosCredentials>
-    ): Promise<Ios.Job> => {
+    ): Promise<Job> => {
       return await prepareJobAsync(ctx, {
         ...jobData,
         buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
@@ -111,7 +100,7 @@ export async function prepareIosBuildAsync(
     ): Promise<BuildResult> => {
       const graphqlMetadata = transformMetadata(metadata);
       const graphqlJob = transformJob(job);
-      return await BuildMutation.createIosBuildAsync(ctx.graphqlClient, {
+      return await BuildMutation.createIosBuildAsync({
         appId,
         job: graphqlJob,
         metadata: graphqlMetadata,

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

@@ -1,7 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
 
-import { CredentialsContext } from '../../credentials/context';
 import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
 import { getAppFromContextAsync } from '../../credentials/ios/actions/BuildCredentialsUtils';
 import { IosCredentials, Target } from '../../credentials/ios/types';
@@ -33,27 +31,6 @@ export async function ensureIosCredentialsAsync(
   };
 }
 
-export async function ensureIosCredentialsForBuildResignAsync(
-  credentialsCtx: CredentialsContext,
-  targets: Target[],
-  buildProfile: BuildProfile<Platform.IOS>
-): Promise<CredentialsResult<IosCredentials>> {
-  const provider = new IosCredentialsProvider(credentialsCtx, {
-    app: await getAppFromContextAsync(credentialsCtx),
-    targets,
-    distribution: 'internal',
-    enterpriseProvisioning: buildProfile.enterpriseProvisioning,
-  });
-
-  const { credentialsSource } = buildProfile;
-
-  logCredentialsSource(credentialsSource, Platform.IOS);
-  return {
-    credentials: await provider.getCredentialsAsync(credentialsSource),
-    source: credentialsSource,
-  };
-}
-
 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  return !buildCtx.buildProfile.simulator && !buildCtx.buildProfile.withoutCredentials;
+  return !buildCtx.buildProfile.simulator;
 }

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

@@ -2,23 +2,16 @@ import { Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';
 
 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
-import {
-  loggerLevelToGraphQLWorkerLoggerLevel,
-  transformBuildMode,
-  transformBuildTrigger,
-  transformProjectArchive,
-  transformWorkflow,
-} from '../graphql';
-import { buildProfileEnvironmentToEnvironment } from '../utils/environment';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {
     type: transformWorkflow(job.type),
-    triggeredBy: transformBuildTrigger(job.triggeredBy),
     projectArchive: transformProjectArchive(job.projectArchive),
-    projectRootDirectory: nullthrows(job.projectRootDirectory),
+    projectRootDirectory: job.projectRootDirectory,
+    releaseChannel: job.releaseChannel,
     updates: job.updates,
-    secrets: job.secrets ? transformIosSecrets(job.secrets) : undefined,
+    secrets: transformIosSecrets(job.secrets),
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
     version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
@@ -30,16 +23,10 @@ export function transformJob(job: Ios.Job): IosJobInput {
     developmentClient: job.developmentClient,
     simulator: job.simulator,
     experimental: job.experimental,
-    mode: transformBuildMode(job.mode),
-    customBuildConfig: job.customBuildConfig,
-    environment: buildProfileEnvironmentToEnvironment(job.environment),
-    loggerLevel: job.loggerLevel
-      ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
-      : undefined,
   };
 }
 
-export function transformIosSecrets(secrets: {
+function transformIosSecrets(secrets: {
   buildCredentials?: Ios.BuildCredentials;
 }): IosJobSecretsInput {
   const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];

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

@@ -1,20 +1,10 @@
-import {
-  ArchiveSource,
-  BuildMode,
-  BuildTrigger,
-  Ios,
-  Platform,
-  sanitizeBuildJob,
-} from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import nullthrows from 'nullthrows';
+import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-job';
 import path from 'path';
 import slash from 'slash';
 
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
-import { IosJobSecretsInput } from '../../graphql/generated';
-import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
-import { getUsernameForBuildMetadataAndBuildJob } from '../../project/projectUtils';
+import { getUsername } from '../../project/projectUtils';
+import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -25,18 +15,18 @@ interface JobData {
 
 const cacheDefaults = {
   disabled: false,
-  paths: [],
+  customPaths: [],
+  cacheDefaultPaths: true,
 };
 
 export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
-): Promise<Ios.Job> {
-  const username = getUsernameForBuildMetadataAndBuildJob(ctx.user);
-  const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
+): Promise<Job> {
   const projectRootDirectory =
-    slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
-  const buildCredentials: Ios.BuildSecrets['buildCredentials'] = {};
+    slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
+  const username = getUsername(ctx.exp, ctx.user);
+  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
   if (jobData.credentials) {
     const targetNames = Object.keys(jobData.credentials);
     for (const targetName of targetNames) {
@@ -44,53 +34,38 @@ export async function prepareJobAsync(
     }
   }
 
-  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
-    : undefined;
-
-  let buildMode;
-  if (buildProfile.config) {
-    buildMode = BuildMode.CUSTOM;
-  } else {
-    buildMode = BuildMode.BUILD;
-  }
-
   const job: Ios.Job = {
     type: ctx.workflow,
     platform: Platform.IOS,
     projectArchive: jobData.projectArchive,
     projectRootDirectory,
     builderEnvironment: {
-      image: buildProfile.image,
-      node: buildProfile.node,
-      corepack: buildProfile.corepack,
-      pnpm: buildProfile.pnpm,
-      bun: buildProfile.bun,
-      yarn: buildProfile.yarn,
-      bundler: buildProfile.bundler,
-      cocoapods: buildProfile.cocoapods,
-      fastlane: buildProfile.fastlane,
-      env: {
-        ...buildProfile.env,
-        ...(ctx.isVerboseLoggingEnabled ? { EAS_VERBOSE: '1' } : {}),
-      },
+      image: ctx.buildProfile.image,
+      node: ctx.buildProfile.node,
+      yarn: ctx.buildProfile.yarn,
+      bundler: ctx.buildProfile.bundler,
+      cocoapods: ctx.buildProfile.cocoapods,
+      fastlane: ctx.buildProfile.fastlane,
+      expoCli: ctx.buildProfile.expoCli,
+      env: ctx.buildProfile.env,
     },
     cache: {
       ...cacheDefaults,
-      ...buildProfile.cache,
+      ...ctx.buildProfile.cache,
       clear: ctx.clearCache,
     },
     secrets: {
       buildCredentials,
     },
-    updates: { channel: buildProfile.channel },
-    developmentClient: buildProfile.developmentClient,
-    simulator: buildProfile.simulator,
+    releaseChannel: ctx.buildProfile.releaseChannel,
+    updates: { channel: ctx.buildProfile.channel },
+    developmentClient: ctx.buildProfile.developmentClient,
+    simulator: ctx.buildProfile.simulator,
     scheme: jobData.buildScheme,
-    buildConfiguration: buildProfile.buildConfiguration,
-    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
-    buildArtifactPaths: buildProfile.buildArtifactPaths,
-    environment: ctx.buildProfile.environment,
+    buildConfiguration: ctx.buildProfile.buildConfiguration,
+    applicationArchivePath:
+      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
+    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
     username,
     ...(ctx.ios.buildNumberOverride && {
       version: {
@@ -98,38 +73,10 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
     },
-    mode: buildMode,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
-    loggerLevel: ctx.loggerLevel,
-    // Technically, these are unused, but let's include them here for type consistency.
-    // See: https://github.com/expo/eas-build/pull/454
-    appId: ctx.projectId,
-    initiatingUserId: ctx.user.id,
   };
-  return sanitizeBuildJob(job) as Ios.Job;
-}
-
-export function prepareCredentialsToResign(credentials: IosCredentials): IosJobSecretsInput {
-  const buildCredentials: IosJobSecretsInput['buildCredentials'] = [];
-  for (const targetName of Object.keys(credentials ?? {})) {
-    buildCredentials.push({
-      targetName,
-      provisioningProfileBase64: nullthrows(credentials?.[targetName].provisioningProfile),
-      distributionCertificate: {
-        dataBase64: nullthrows(credentials?.[targetName].distributionCertificate.certificateP12),
-        password: nullthrows(credentials?.[targetName].distributionCertificate.certificatePassword),
-      },
-    });
-  }
-
-  return { buildCredentials };
+  return sanitizeJob(job);
 }
 
 function prepareTargetCredentials(targetCredentials: TargetCredentials): Ios.TargetCredentials {

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

@@ -1,35 +1,32 @@
 import { ExpoConfig } from '@expo/config';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import { IosVersionAutoIncrement } from '@expo/eas-json';
 
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 import { Target } from '../../credentials/ios/types';
 import { isExpoUpdatesInstalled } from '../../project/projectUtils';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
-import { Client } from '../../vcs/vcs';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   targets,
   localAutoIncrement,
-  vcsClient,
-  env,
+  projectId,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   targets: Target[];
   localAutoIncrement?: IosVersionAutoIncrement;
-  vcsClient: Client;
-  env: Env | undefined;
+  projectId: string;
 }): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement ?? false);
 
   if (workflow === Workflow.GENERIC) {
     if (isExpoUpdatesInstalled(projectDir)) {
-      await syncUpdatesConfigurationAsync({ vcsClient, projectDir, exp, workflow, env });
+      await syncUpdatesConfigurationAsync(projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {