[eas-cli] fix env overriding in getExpoConfig

.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',
   },

.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: ['khamilowicz', '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

@@ -27,7 +27,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: yarn build
       - name: Build tarballs
@@ -36,10 +36,10 @@ jobs:
           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
@@ -68,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
@@ -94,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
@@ -111,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
@@ -120,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
@@ -153,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
@@ -162,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
@@ -196,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
@@ -220,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-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,19 @@ 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
+      - run: yarn lint-changelog
       - 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: 'radoslawkrzemien,sjchmiela,khamilowicz'
-          github_token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_PAT }}
-          script: |
-            github.issues.createComment({
-              issue_number: ${{ steps.open-pr.outputs.pr_number }},
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: "/changelog-entry chore Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies."
-            })

.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 @EvanBacon @byCedric @wschurman
+packages/eas-cli/src/commands/update @EvanBacon @byCedric @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. 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.

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

package.json

@@ -1,5 +1,4 @@
 {
-  "name": "eas-cli-root",
   "private": true,
   "workspaces": [
     "packages/*"
@@ -10,32 +9,31 @@
     "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",
     "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 release",
     "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": "29.2.0",
+    "@types/node": "18.11.5",
+    "eslint": "8.26.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": "7.4.2",
-    "oclif": "^3.9.0",
-    "prettier": "3.1.1",
-    "ts-jest": "29.1.1",
-    "typescript": "5.3.3"
+    "jest": "29.2.2",
+    "jest-watch-typeahead": "2.2.0",
+    "lerna": "6.0.1",
+    "oclif": "3.2.22",
+    "prettier": "2.7.1",
+    "ts-jest": "29.0.3",
+    "typescript": "4.8.4"
   },
   "volta": {
-    "node": "20.11.0",
-    "yarn": "1.22.21"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

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

@@ -7,7 +7,6 @@ documents:
   - 'src/commands/**/*.ts'
   - 'src/branch/**/*.ts'
   - 'src/channel/**/*.ts'
-  - 'src/worker/**/*.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,137 +1,123 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.3.3",
+  "version": "2.7.1",
   "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.3.3",
-    "@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.3",
+    "@expo/config": "7.0.1",
+    "@expo/config-plugins": "5.0.1",
+    "@expo/config-types": "46.0.2",
+    "@expo/eas-build-job": "0.2.97",
+    "@expo/eas-json": "2.7.1",
+    "@expo/json-file": "8.2.36",
+    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/osascript": "2.0.33",
+    "@expo/package-manager": "0.0.56",
+    "@expo/pkcs12": "0.0.8",
+    "@expo/plist": "0.0.18",
+    "@expo/plugin-help": "5.1.16",
+    "@expo/plugin-warn-if-update-available": "2.4.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",
+    "@oclif/core": "1.19.2",
+    "@oclif/plugin-autocomplete": "1.3.4",
     "@segment/ajv-human-errors": "^2.1.2",
-    "@urql/core": "4.0.11",
-    "@urql/exchange-retry": "1.2.0",
-    "ajv": "8.11.0",
+    "@urql/core": "3.0.5",
+    "@urql/exchange-retry": "1.0.0",
+    "ajv": "^8.11.0",
     "ajv-formats": "2.1.1",
     "better-opn": "3.0.2",
     "chalk": "4.1.2",
-    "cli-progress": "3.12.0",
+    "cli-progress": "3.11.2",
     "dateformat": "4.6.3",
-    "diff": "7.0.0",
-    "dotenv": "16.3.1",
+    "dotenv": "16.0.3",
     "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.12",
     "figures": "3.2.0",
     "form-data": "4.0.0",
-    "fs-extra": "11.2.0",
+    "fs-extra": "10.1.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
-    "graphql": "16.8.1",
+    "graphql": "16.6.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",
+    "joi": "17.6.4",
+    "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",
+    "pngjs": "6.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.8",
     "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": "9.0.0",
+    "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.13.7",
+    "@graphql-codegen/introspection": "2.2.1",
+    "@graphql-codegen/typescript": "2.8.0",
+    "@graphql-codegen/typescript-operations": "2.5.5",
+    "@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/express": "4.17.14",
+    "@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.2",
-    "@types/node-forge": "1.3.1",
-    "@types/pngjs": "6.0.4",
+    "@types/node-forge": "1.3.0",
+    "@types/pngjs": "6.0.1",
     "@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.4.1",
+    "@types/semver": "7.3.12",
+    "@types/tar": "6.1.3",
     "@types/tough-cookie": "4.0.2",
-    "@types/uuid": "9.0.7",
+    "@types/uuid": "8.3.4",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "0.28.1",
+    "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
-    "express": "4.20.0",
-    "memfs": "3.4.13",
+    "express": "4.18.2",
+    "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": "4.0.0",
     "ts-mockito": "2.6.1",
-    "ts-node": "10.9.2",
-    "typescript": "5.3.3"
+    "ts-node": "10.9.1",
+    "typescript": "4.8.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
@@ -182,22 +168,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": {
@@ -222,13 +202,10 @@
   "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",
@@ -236,7 +213,7 @@
     "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": {
+      "enum": [0],
+      "description": "The EAS metadata store configuration version"
+    },
+    "apple": {
+      "$ref": "#/definitions/AppleConfig"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "configVersion",
+    "apple"
+  ]
 }

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

@@ -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/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

@@ -6,7 +6,6 @@ export class ApiV2Error extends Error {
   readonly expoApiV2ErrorDetails?: JSONValue;
   readonly expoApiV2ErrorServerStack?: string;
   readonly expoApiV2ErrorMetadata?: object;
-  readonly expoApiV2ErrorRequestId?: string;
 
   constructor(response: {
     message: string;
@@ -14,13 +13,11 @@ export class ApiV2Error extends Error {
     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

@@ -16,7 +16,6 @@ describe(ApiV2Client, () => {
             stack: 'line 1: hello',
             details: { who: 'world' },
             metadata: { an: 'object' },
-            requestId: 'request-id',
           },
         ],
       });
@@ -38,7 +37,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 () => {

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

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

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

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

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

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

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

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

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

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

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

@@ -133,9 +133,7 @@ export async function createAnalyticsAsync(): Promise<AnalyticsWithOrchestration
     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));
+  const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true);
   if (!analyticsEnabled) {
     return new NoOpAnalytics();
   }

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,27 +1,24 @@
 import chalk from 'chalk';
-import { print } from 'graphql';
 import gql from 'graphql-tag';
 
-import { BranchNotFoundError } from './utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { withErrorHandlingAsync } from '../graphql/client';
 import {
   CreateUpdateBranchForAppMutation,
   CreateUpdateBranchForAppMutationVariables,
-  UpdateBranchBasicInfoFragment,
+  UpdateBranch,
   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 { printJsonOnlyOutput } from '../utils/json';
 import {
-  SelectPromptEntry,
   paginatedQueryWithConfirmPromptAsync,
   paginatedQueryWithSelectPromptAsync,
 } from '../utils/queries';
+import { BranchNotFoundError } from './utils';
 
 export const BRANCHES_LIMIT = 50;
 
@@ -34,7 +31,7 @@ export async function selectBranchOnAppAsync(
     paginatedQueryOptions,
   }: {
     projectId: string;
-    displayTextForListItem: (queryItem: UpdateBranchFragment) => SelectPromptEntry;
+    displayTextForListItem: (queryItem: UpdateBranchFragment) => string;
     promptTitle: string;
     paginatedQueryOptions: PaginatedQueryOptions;
   }
@@ -51,7 +48,7 @@ export async function selectBranchOnAppAsync(
     promptOptions: {
       title: promptTitle,
       getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
-      makePartialChoiceObject: displayTextForListItem,
+      createDisplayTextForSelectionPromptListItem: displayTextForListItem,
     },
   });
   if (!selectedBranch) {
@@ -86,9 +83,7 @@ export async function listAndRenderBranchesOnAppAsync(
         queryBranchesOnProjectAsync(graphqlClient, limit, offset, projectId),
       promptOptions: {
         title: 'Load more branches?',
-        renderListItems: branches => {
-          renderPageOfBranches(branches, paginatedQueryOptions);
-        },
+        renderListItems: branches => renderPageOfBranches(branches, paginatedQueryOptions),
       },
     });
   }
@@ -128,7 +123,7 @@ function renderPageOfBranches(
 export async function createUpdateBranchOnAppAsync(
   graphqlClient: ExpoGraphqlClient,
   { appId, name }: CreateUpdateBranchForAppMutationVariables
-): Promise<UpdateBranchBasicInfoFragment> {
+): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
   const result = await withErrorHandlingAsync(
     graphqlClient
       .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
@@ -137,17 +132,15 @@ export async function createUpdateBranchOnAppAsync(
             updateBranch {
               createUpdateBranchForApp(appId: $appId, name: $name) {
                 id
-                ...UpdateBranchBasicInfoFragment
+                name
               }
             }
           }
-          ${print(UpdateBranchBasicInfoFragmentNode)}
         `,
         {
           appId,
           name,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
+        }
       )
       .toPromise()
   );
@@ -167,21 +160,22 @@ export async function ensureBranchExistsAsync(
     appId: string;
     branchName: string;
   }
-): Promise<{ branch: UpdateBranchBasicInfoFragment; createdBranch: boolean }> {
+): Promise<{ branchId: string }> {
   try {
     const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
       appId,
       name: branchName,
     });
 
-    return { branch: updateBranch, createdBranch: false };
+    const { id } = updateBranch;
+    return { branchId: id };
   } catch (error) {
     if (error instanceof BranchNotFoundError) {
       const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
         appId,
         name: branchName,
       });
-      return { branch: newUpdateBranch, createdBranch: true };
+      return { branchId: newUpdateBranch.id };
     } else {
       throw error;
     }

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

@@ -47,14 +47,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(graphqlClient, projectId, 'blah')).resolves.toEqual(null);
   });
 
   it('returns build id when confirmation is confirmed', async () => {
     const graphqlClient = instance(mock<ExpoGraphqlClient>());
     jest.mocked(selectAsync).mockResolvedValueOnce(selectedBuildId);
     jest.mocked(confirmAsync).mockResolvedValueOnce(true);
-    await expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
+    expect(selectBuildToCancelAsync(graphqlClient, projectId, 'blah')).resolves.toEqual(
       selectedBuildId
     );
   });
@@ -85,6 +85,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/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,12 +1,8 @@
-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 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';
@@ -33,6 +29,10 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } 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>
@@ -59,22 +59,13 @@ This means that it will most likely produce an AAB and you will not be able to i
   await checkGoogleServicesFileAsync(ctx);
   await validatePNGsForManagedProjectAsync(ctx);
 
-  const gradleContext = await resolveGradleBuildContextAsync(
-    ctx.projectDir,
-    buildProfile,
-    ctx.vcsClient
-  );
+  const gradleContext = await resolveGradleBuildContextAsync(ctx.projectDir, buildProfile);
 
   if (ctx.workflow === Workflow.MANAGED) {
-    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
+    await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx.projectDir, ctx.exp, 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, {
@@ -83,7 +74,6 @@ This means that it will most likely produce an AAB and you will not be able to i
           exp: ctx.exp,
           applicationId,
           buildProfile,
-          vcsClient: ctx.vcsClient,
         })
       : undefined;
 
@@ -99,21 +89,20 @@ export async function prepareAndroidBuildAsync(
       return await ensureAndroidCredentialsAsync(ctx);
     },
     syncProjectConfigurationAsync: async () => {
-      await syncProjectConfigurationAsync({
+      await syncProjectConfigurationAsync(ctx.graphqlClient, {
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         localAutoIncrement:
           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 (
@@ -147,11 +136,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),

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 { 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> {
+): 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,24 +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 (ctx.repack) {
-    buildMode = BuildMode.REPACK;
-  } else if (buildProfile.config) {
-    buildMode = BuildMode.CUSTOM;
-  } else {
-    buildMode = BuildMode.BUILD;
-  }
-
   const job: Android.Job = {
     type: ctx.workflow,
     platform: Platform.ANDROID,
@@ -73,11 +54,9 @@ 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,
+      expoCli: buildProfile.expoCli,
       env: buildProfile.env,
     },
     cache: {
@@ -88,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 && {
@@ -102,26 +81,9 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
     },
-    mode: buildMode,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
-    ...(ctx.repack && {
-      customBuildConfig: {
-        path: '__eas/repack.yml',
-      },
-    }),
-    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,39 @@
 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 { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 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,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  localAutoIncrement?: AndroidVersionAutoIncrement;
-  vcsClient: Client;
-  env: Env | undefined;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
+export async function syncProjectConfigurationAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectDir,
+    exp,
+    localAutoIncrement,
+    projectId,
+  }: {
+    projectDir: string;
+    exp: ExpoConfig;
+    localAutoIncrement?: AndroidVersionAutoIncrement;
+    projectId: string;
+  }
+): Promise<void> {
+  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(graphqlClient, projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   } else {

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

@@ -18,7 +18,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 +43,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 +96,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 +111,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 {};
@@ -190,14 +183,12 @@ export async function resolveRemoteVersionCodeAsync(
     exp,
     applicationId,
     buildProfile,
-    vcsClient,
   }: {
     projectDir: string;
     projectId: string;
     exp: ExpoConfig;
     applicationId: string;
     buildProfile: BuildProfile<Platform.ANDROID>;
-    vcsClient: Client;
   }
 ): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
@@ -207,20 +198,16 @@ export async function resolveRemoteVersionCodeAsync(
     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,10 +217,7 @@ 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();
@@ -244,9 +228,7 @@ export async function resolveRemoteVersionCodeAsync(
         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) {
@@ -268,9 +250,7 @@ export async function resolveRemoteVersionCodeAsync(
         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,14 @@
-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 { 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 +17,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 { 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 { 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 +47,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,21 +65,16 @@ 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(
@@ -131,9 +90,7 @@ export async function prepareBuildRequestForPlatformAsync<
 
   await withAnalyticsAsync(
     ctx.analytics,
-    async () => {
-      await builder.syncProjectConfigurationAsync(ctx);
-    },
+    async () => await builder.syncProjectConfigurationAsync(ctx),
     {
       attemptEvent: BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
       successEvent: BuildEvent.CONFIGURE_PROJECT_SUCCESS,
@@ -142,117 +99,93 @@ export async function prepareBuildRequestForPlatformAsync<
     }
   );
 
-  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.GCS,
+        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(
+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 ${link(
         '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 and we are not accepting any new builds. Try again later. ${learnMore(
+        'https://expo.fyi/eas-build-queues'
+      )}`
+    );
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED_IOS'
+  ) {
+    Log.error(
+      `EAS Build free tier is temporarily disabled for iOS and we are not accepting any new builds. Try again later. ${learnMore(
+        'https://expo.fyi/eas-build-queues'
+      )}`
+    );
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID'
+  ) {
+    Log.error(
+      `EAS Build free tier is temporarily disabled for Android and we are not accepting any new builds. Try again later. ${learnMore(
+        'https://expo.fyi/eas-build-queues'
+      )}`
+    );
+    throw new Error('Build request failed.');
+  } else if (
+    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
+  ) {
+    Log.error(
       `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
     );
+    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,10 +193,7 @@ 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(
@@ -275,33 +205,34 @@ 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 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)}`,
+          })
+        );
+        return bucketKey;
       },
       {
         attemptEvent: BuildEvent.PROJECT_UPLOAD_ATTEMPT,
@@ -310,14 +241,6 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         properties: ctx.analyticsEventProperties,
       }
     );
-  } 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 +248,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,
@@ -392,7 +281,7 @@ async function sendBuildRequestAsync<
   );
 }
 
-export type MaybeBuildFragment = BuildFragment | null;
+type MaybeBuildFragment = BuildFragment | null;
 
 export async function waitForBuildEndAsync(
   graphqlClient: ExpoGraphqlClient,
@@ -448,13 +337,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 +362,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,20 +376,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 EAS Production or Enterprise at ${link(
-              formatAccountBillingUrl(accountName)
+            `Sign up for EAS Production or Enterprise at ${chalk.underline(
+              formatAccountSubscriptionsUrl(accountName)
             )}`
           );
         }
-
         Log.newLine();
         Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
         queueProgressBar.start(
@@ -521,7 +402,6 @@ async function handleSingleBuildProgressAsync(
       }
       break;
     }
-    case BuildStatus.PendingCancel:
     case BuildStatus.Canceled:
       spinner.fail('Build canceled');
       return { refetch: false };
@@ -543,8 +423,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',
 };
 
@@ -552,7 +432,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',
@@ -571,12 +450,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) {
@@ -649,105 +523,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,16 @@
 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 { 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'>;
 
@@ -55,13 +51,6 @@ export interface BuildContext<T extends Platform> {
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
   workflow: Workflow;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
   android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
   ios: T extends Platform.IOS ? IosBuildContext : undefined;
-  developmentClient: boolean;
-  requiredPackageManager: NodePackageManager['name'] | null;
-  vcsClient: Client;
-  loggerLevel?: LoggerLevel;
-  repack: boolean;
-  env: Record<string, string>;
 }

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 { CredentialsContext } from '../credentials/context';
-import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
+import { BuildResourceClass } from '../graphql/generated';
 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,18 +28,12 @@ export async function createBuildContextAsync<T extends Platform>({
   noWait,
   platform,
   projectDir,
-  resourceClassFlag,
+  resourceClass,
   message,
   actor,
   graphqlClient,
   analytics,
-  vcsClient,
-  getDynamicPrivateProjectConfigAsync,
-  customBuildConfigMetadata,
-  buildLoggerLevel,
-  freezeCredentials,
-  repack,
-  env,
+  getDynamicProjectConfigAsync,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
@@ -54,35 +44,20 @@ 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;
-  repack: boolean;
-  env: Record<string, string>;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<BuildContext<T>> {
-  const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
-    env,
-  });
+  const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });
+
   const projectName = exp.slug;
   const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
-  const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
+  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 },
@@ -91,10 +66,8 @@ export async function createBuildContextAsync<T extends Platform>({
     user: actor,
     graphqlClient,
     analytics,
-    env,
+    env: buildProfile.env,
     easJsonCliConfig,
-    vcsClient,
-    freezeCredentials,
   });
 
   const devClientProperties = getDevClientEventProperties({
@@ -112,16 +85,9 @@ export async function createBuildContextAsync<T extends Platform>({
     ...devClientProperties,
     no_wait: noWait,
     run_from_ci: runFromCI,
-    local: localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN,
   };
   analytics.logEvent(BuildEvent.BUILD_COMMAND, analyticsEventProperties);
 
-  const resourceClass = await resolveBuildResourceClassAsync(
-    buildProfile,
-    platform,
-    resourceClassFlag
-  );
-
   const commonContext: CommonContext<T> = {
     accountName: account.name,
     buildProfile,
@@ -142,16 +108,9 @@ export async function createBuildContextAsync<T extends Platform>({
     user: actor,
     graphqlClient,
     analytics,
-    vcsClient,
     workflow,
     message,
     runFromCI,
-    customBuildConfigMetadata,
-    developmentClient,
-    requiredPackageManager,
-    loggerLevel: buildLoggerLevel,
-    repack,
-    env,
   };
   if (platform === Platform.ANDROID) {
     const common = commonContext as CommonContext<Platform.ANDROID>;

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,20 @@ 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.S3,
+      bucketKey: archiveSource.bucketKey,
+    };
+  } else if (archiveSource.type === ArchiveSourceType.GCS) {
     return {
       type: ProjectArchiveSourceType.Gcs,
       bucketKey: archiveSource.bucketKey,
-      metadataLocation: archiveSource.metadataLocation,
     };
   } else if (archiveSource.type === ArchiveSourceType.URL) {
     return {
@@ -45,8 +34,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 +44,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 +81,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,16 +1,10 @@
-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';
@@ -21,15 +15,19 @@ import {
   checkNodeEnvVariable,
   validatePNGsForManagedProjectAsync,
 } 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);
@@ -41,7 +39,6 @@ export async function createIosContextAsync(
       projectDir: ctx.projectDir,
       nonInteractive: ctx.nonInteractive,
       exp: ctx.exp,
-      vcsClient: ctx.vcsClient,
     },
     buildProfile
   );
@@ -49,8 +46,7 @@ export async function createIosContextAsync(
     projectDir: ctx.projectDir,
     exp: ctx.exp,
     xcodeBuildContext,
-    env,
-    vcsClient: ctx.vcsClient,
+    env: buildProfile.env,
   });
   const applicationTarget = findApplicationTarget(targets);
   const buildNumberOverride =
@@ -61,7 +57,6 @@ export async function createIosContextAsync(
           exp: ctx.exp,
           applicationTarget,
           buildProfile,
-          vcsClient: ctx.vcsClient,
         })
       : undefined;
   return {
@@ -79,10 +74,10 @@ 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({
+      await syncProjectConfigurationAsync(ctx.graphqlClient, {
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         targets: ctx.ios.targets,
@@ -90,14 +85,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,

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 { 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 = getUsername(ctx.exp, 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,52 +34,38 @@ export async function prepareJobAsync(
     }
   }
 
-  const maybeCustomBuildConfigPath = buildProfile.config
-    ? getCustomBuildConfigPathForJob(buildProfile.config)
-    : undefined;
-
-  let buildMode;
-  if (ctx.repack) {
-    buildMode = BuildMode.REPACK;
-  } else if (buildProfile.config) {
-    buildMode = BuildMode.CUSTOM;
-  } else {
-    buildMode = BuildMode.BUILD;
-  }
-
   const job: 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,
+      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: {
@@ -97,43 +73,10 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: buildProfile.prebuildCommand,
+      prebuildCommand: ctx.buildProfile.prebuildCommand,
     },
-    mode: buildMode,
-    triggeredBy: BuildTrigger.EAS_CLI,
-    ...(maybeCustomBuildConfigPath && {
-      customBuildConfig: {
-        path: maybeCustomBuildConfigPath,
-      },
-    }),
-    ...(ctx.repack && {
-      customBuildConfig: {
-        path: '__eas/repack.yml',
-      },
-    }),
-    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,36 @@
 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 { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 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,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  targets: Target[];
-  localAutoIncrement?: IosVersionAutoIncrement;
-  vcsClient: Client;
-  env: Env | undefined;
-}): Promise<void> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+export async function syncProjectConfigurationAsync(
+  graphqlClient: ExpoGraphqlClient,
+  {
+    projectDir,
+    exp,
+    targets,
+    localAutoIncrement,
+    projectId,
+  }: {
+    projectDir: string;
+    exp: ExpoConfig;
+    targets: Target[];
+    localAutoIncrement?: IosVersionAutoIncrement;
+    projectId: string;
+  }
+): Promise<void> {
+  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(graphqlClient, projectDir, exp, projectId);
     }
     await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {

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

@@ -11,7 +11,7 @@ import { Target } from '../../credentials/ios/types';
 import { AppPlatform } from '../../graphql/generated';
 import { AppVersionMutation } from '../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../graphql/queries/AppVersionQuery';
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import { ora } from '../../ora';
 import { findApplicationTarget } from '../../project/ios/target';
 import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
@@ -19,12 +19,9 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { promptAsync } from '../../prompts';
 import uniqBy from '../../utils/expodash/uniqBy';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
-import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
 import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
-const SHORT_VERSION_REGEX = /^\d+(\.\d+){0,2}$/;
-
 export enum BumpStrategy {
   APP_VERSION,
   BUILD_NUMBER,
@@ -100,48 +97,19 @@ export async function bumpVersionInAppJsonAsync({
   }
 }
 
-function validateShortVersion({
-  shortVersion,
-  workflow,
-}: {
-  shortVersion: string | undefined;
-  workflow: Workflow;
-}): void {
-  if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
-    if (workflow === Workflow.MANAGED) {
-      Log.warn(
-        `The required format for "version" field from app.json/app.config.ts for App Store iOS builds is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "version" field in your app.json/app.config.ts to match the format required by Apple. ${learnMore(
-          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
-        )}`
-      );
-    } else {
-      Log.warn(
-        `The required format for "CFBundleShortVersionString" in Info.plist for App Store iOS builds is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "CFBundleShortVersionString" in your Info.plist to match the format required by Apple. ${learnMore(
-          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
-        )}`
-      );
-    }
-  }
-}
-
 export async function readShortVersionAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings'],
-  vcsClient: Client
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
-
-    const shortVersion =
+    return (
       infoPlist.CFBundleShortVersionString &&
-      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings);
-
-    validateShortVersion({ shortVersion, workflow });
-    return shortVersion;
+      evaluateTemplateString(infoPlist.CFBundleShortVersionString, buildSettings)
+    );
   } else {
-    validateShortVersion({ shortVersion: exp.version, workflow });
     return exp.version;
   }
 }
@@ -149,10 +117,9 @@ export async function readShortVersionAsync(
 export async function readBuildNumberAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings'],
-  vcsClient: Client
+  buildSettings: XCBuildConfiguration['buildSettings']
 ): Promise<string | undefined> {
-  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS, vcsClient);
+  const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   if (workflow === Workflow.GENERIC) {
     const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
     return (
@@ -166,8 +133,7 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  targets: Target[],
-  vcsClient: Client
+  targets: Target[]
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
   const applicationTarget = findApplicationTarget(targets);
   try {
@@ -175,14 +141,12 @@ export async function maybeResolveVersionsAsync(
       appBuildVersion: await readBuildNumberAsync(
         projectDir,
         exp,
-        applicationTarget.buildSettings ?? {},
-        vcsClient
+        applicationTarget.buildSettings ?? {}
       ),
       appVersion: await readShortVersionAsync(
         projectDir,
         exp,
-        applicationTarget.buildSettings ?? {},
-        vcsClient
+        applicationTarget.buildSettings ?? {}
       ),
     };
   } catch (err: any) {
@@ -300,14 +264,12 @@ export async function resolveRemoteBuildNumberAsync(
     exp,
     applicationTarget,
     buildProfile,
-    vcsClient,
   }: {
     projectDir: string;
     projectId: string;
     exp: ExpoConfig;
     applicationTarget: Target;
     buildProfile: BuildProfile<Platform.IOS>;
-    vcsClient: Client;
   }
 ): Promise<string> {
   const remoteVersions = await AppVersionQuery.latestVersionAsync(
@@ -320,28 +282,22 @@ export async function resolveRemoteBuildNumberAsync(
   const localBuildNumber = await readBuildNumberAsync(
     projectDir,
     exp,
-    applicationTarget.buildSettings ?? {},
-    vcsClient
+    applicationTarget.buildSettings ?? {}
   );
   const localShortVersion = await readShortVersionAsync(
     projectDir,
     exp,
-    applicationTarget.buildSettings ?? {},
-    vcsClient
+    applicationTarget.buildSettings ?? {}
   );
   let currentBuildVersion: string;
-  let shouldInitializeBuildNumber = false;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
   } else {
     if (localBuildNumber) {
-      Log.log(
-        chalk.green(
-          'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
-        )
+      Log.warn(
+        'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
       );
       currentBuildVersion = localBuildNumber;
-      shouldInitializeBuildNumber = localBuildNumber === '1';
     } 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.`
@@ -351,10 +307,7 @@ export async function resolveRemoteBuildNumberAsync(
   }
   if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
     return currentBuildVersion;
-  } else if (
-    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
-    shouldInitializeBuildNumber
-  ) {
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
     const spinner = ora(
       `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
     ).start();
@@ -365,9 +318,7 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: currentBuildVersion,
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
-          undefined,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
       });
       spinner.succeed(`Initialized buildNumber with ${chalk.bold(currentBuildVersion)}.`);
     } catch (err) {
@@ -389,9 +340,7 @@ export async function resolveRemoteBuildNumberAsync(
         applicationIdentifier: applicationTarget.bundleIdentifier,
         storeVersion: localShortVersion ?? '1.0.0',
         buildVersion: nextBuildVersion,
-        runtimeVersion:
-          (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.IOS)) ??
-          undefined,
+        runtimeVersion: Updates.getRuntimeVersionNullable(exp, Platform.IOS) ?? undefined,
       });
       spinner.succeed(
         `Incremented buildNumber from ${chalk.bold(currentBuildVersion)} to ${chalk.bold(

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

@@ -3,32 +3,13 @@ import spawnAsync from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';
 
-import Log from '../log';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.171';
-
-export enum LocalBuildMode {
-  /**
-   * Local build that users can run on their own machines. Instead
-   * of sending build request to EAS Servers it's passing it as an argument
-   * to local-build-plugin, that will run the build locally.
-   *
-   * Triggered when running `eas build --local`.
-   */
-  LOCAL_BUILD_PLUGIN = 'local-build-plugin',
-  /**
-   * Type of local build that is not accessible to users directly. When
-   * cloud build is triggered by git based integration, we are running
-   * in this mode. Instead of sending build request to EAS Servers it's
-   * printing it to the stdout as JSON, so EAS Build worker can read it.
-   */
-  INTERNAL = 'internal',
-}
+const PLUGIN_PACKAGE_VERSION = '0.0.119';
 
 export interface LocalBuildOptions {
-  localBuildMode?: LocalBuildMode;
+  enable: boolean;
   skipCleanup?: boolean;
   skipNativeBuild?: boolean;
   artifactsDir?: string;
@@ -40,8 +21,7 @@ export interface LocalBuildOptions {
 export async function runLocalBuildAsync(
   job: Job,
   metadata: Metadata,
-  options: LocalBuildOptions,
-  env: Record<string, string>
+  options: LocalBuildOptions
 ): Promise<void> {
   const { command, args } = await getCommandAndArgsAsync(job, metadata);
   let spinner;
@@ -56,26 +36,18 @@ export async function runLocalBuildAsync(
   };
   process.on('SIGINT', interruptHandler);
   try {
-    const mergedEnv = {
-      ...env,
-      ...process.env,
-      EAS_LOCAL_BUILD_WORKINGDIR: options.workingdir ?? process.env.EAS_LOCAL_BUILD_WORKINGDIR,
-      ...(options.skipCleanup || options.skipNativeBuild
-        ? { EAS_LOCAL_BUILD_SKIP_CLEANUP: '1' }
-        : {}),
-      ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
-      ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
-      ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
-    };
-    // log command execution to assist in debugging local builds
-    Log.debug('Running local build, using local-build-plugin', {
-      command,
-      args,
-      env: mergedEnv,
-    });
     const spawnPromise = spawnAsync(command, args, {
       stdio: options.verbose ? 'inherit' : 'pipe',
-      env: mergedEnv,
+      env: {
+        ...process.env,
+        EAS_LOCAL_BUILD_WORKINGDIR: options.workingdir ?? process.env.EAS_LOCAL_BUILD_WORKINGDIR,
+        ...(options.skipCleanup || options.skipNativeBuild
+          ? { EAS_LOCAL_BUILD_SKIP_CLEANUP: '1' }
+          : {}),
+        ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
+        ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
+        ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
+      },
     });
     childProcess = spawnPromise.child;
     await spawnPromise;

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

@@ -1,29 +1,34 @@
-import { FingerprintSource, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { Updates } from '@expo/config-plugins';
+import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
+import Log from '../log';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
+import {
+  readChannelSafelyAsync as readAndroidChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
+} from '../update/android/UpdatesModule';
+import {
+  readChannelSafelyAsync as readIosChannelSafelyAsync,
+  readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
+} from '../update/ios/UpdatesModule';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
 import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
 import { BuildContext } from './context';
 import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
-import { LocalBuildMode } from './local';
-import { BuildDistributionType } from './types';
-import Log from '../log';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
-import { readChannelSafelyAsync as readAndroidChannelSafelyAsync } from '../update/android/UpdatesModule';
-import { readChannelSafelyAsync as readIosChannelSafelyAsync } from '../update/ios/UpdatesModule';
-import { easCliVersion } from '../utils/easCli';
 
 export async function collectMetadataAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  runtimeAndFingerprintMetadata: {
-    runtimeVersion?: string | undefined;
-    fingerprintHash?: string | undefined;
-    fingerprintSource?: FingerprintSource | undefined;
-  }
+  ctx: BuildContext<T>
 ): Promise<Metadata> {
-  const channelObject = await resolveChannelAsync(ctx);
-  const distribution = ctx.buildProfile.distribution ?? BuildDistributionType.STORE;
+  const vcsClient = getVcsClient();
+  const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
+  const distribution =
+    ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
+      ? 'simulator'
+      : ctx.buildProfile.distribution) ?? 'store';
   const metadata: Metadata = {
     trackingContext: ctx.analyticsEventProperties,
     ...(await maybeResolveVersionsAsync(ctx)),
@@ -31,23 +36,18 @@ export async function collectMetadataAsync<T extends Platform>(
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: runtimeAndFingerprintMetadata?.runtimeVersion,
-    fingerprintHash: runtimeAndFingerprintMetadata?.fingerprintHash,
-    fingerprintSource: runtimeAndFingerprintMetadata?.fingerprintSource,
-    reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
-    ...channelObject,
+    runtimeVersion: Updates.getRuntimeVersionNullable(ctx.exp, ctx.platform) ?? undefined,
+    reactNativeVersion: await getReactNativeVersionAsync(ctx),
+    ...channelOrReleaseChannel,
     distribution,
     appName: ctx.exp.name,
     appIdentifier: resolveAppIdentifier(ctx),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await ctx.vcsClient.getCommitHashAsync(),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
     gitCommitMessage: truncateGitCommitMessage(
-      (await ctx.vcsClient.getLastCommitMessageAsync()) ?? undefined
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
     ),
-    isGitWorkingTreeDirty:
-      ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL
-        ? false
-        : await ctx.vcsClient.hasUncommittedChangesAsync(),
+    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
     username: getUsername(ctx.exp, ctx.user),
     message: ctx.message,
     ...(ctx.platform === Platform.IOS && {
@@ -57,12 +57,6 @@ export async function collectMetadataAsync<T extends Platform>(
     }),
     runWithNoWaitFlag: ctx.noWait,
     runFromCI: ctx.runFromCI,
-    customWorkflowName: ctx.customBuildConfigMetadata?.workflowName,
-    developmentClient: ctx.developmentClient,
-    requiredPackageManager: ctx.requiredPackageManager ?? undefined,
-    selectedImage: ctx.buildProfile.image,
-    customNodeVersion: ctx.buildProfile.node,
-    simulator: 'simulator' in ctx.buildProfile && ctx.buildProfile.simulator,
   };
   return sanitizeMetadata(metadata);
 }
@@ -75,8 +69,7 @@ async function maybeResolveVersionsAsync<T extends Platform>(
     const resolvedVersion = await maybeResolveIosVersionsAsync(
       ctx.projectDir,
       ctx.exp,
-      iosContext.ios.targets,
-      ctx.vcsClient
+      iosContext.ios.targets
     );
     if (iosContext.ios.buildNumberOverride) {
       return {
@@ -90,8 +83,7 @@ async function maybeResolveVersionsAsync<T extends Platform>(
     const resolvedVersion = await maybeResolveAndroidVersionsAsync(
       ctx.projectDir,
       ctx.exp,
-      androidCtx.buildProfile,
-      ctx.vcsClient
+      androidCtx.buildProfile
     );
     if (androidCtx.android.versionCodeOverride) {
       return {
@@ -113,21 +105,39 @@ function resolveAppIdentifier<T extends Platform>(ctx: BuildContext<T>): string
   }
 }
 
-async function resolveChannelAsync<T extends Platform>(
+async function resolveChannelOrReleaseChannelAsync<T extends Platform>(
   ctx: BuildContext<T>
-): Promise<{ channel: string } | null> {
+): Promise<{ channel: string } | { releaseChannel: string } | null> {
   if (!isExpoUpdatesInstalled(ctx.projectDir)) {
     return null;
   }
   if (ctx.buildProfile.channel) {
     return { channel: ctx.buildProfile.channel };
   }
+  if (ctx.buildProfile.releaseChannel) {
+    return { releaseChannel: ctx.buildProfile.releaseChannel };
+  }
   const channel = await getNativeChannelAsync(ctx);
   if (channel) {
     return { channel };
   }
+  const releaseChannel = await getNativeReleaseChannelAsync(ctx);
+  return { releaseChannel };
+}
 
-  return null;
+async function getNativeReleaseChannelAsync<T extends Platform>(
+  ctx: BuildContext<T>
+): Promise<string> {
+  switch (ctx.platform) {
+    case Platform.ANDROID: {
+      return (await readAndroidReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
+    }
+    case Platform.IOS: {
+      return (await readIosReleaseChannelSafelyAsync(ctx.projectDir)) ?? 'default';
+    }
+    default:
+      return 'default';
+  }
 }
 
 async function getNativeChannelAsync<T extends Platform>(
@@ -145,9 +155,11 @@ async function getNativeChannelAsync<T extends Platform>(
   return undefined;
 }
 
-export async function getReactNativeVersionAsync(projectDir: string): Promise<string | undefined> {
+async function getReactNativeVersionAsync(
+  ctx: BuildContext<Platform>
+): Promise<string | undefined> {
   try {
-    const reactNativePackageJsonPath = resolveFrom(projectDir, 'react-native/package.json');
+    const reactNativePackageJsonPath = resolveFrom(ctx.projectDir, 'react-native/package.json');
     return (await fs.readJson(reactNativePackageJsonPath)).version;
   } catch (err) {
     Log.debug('Failed to resolve react-native version:');

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

@@ -1,17 +1,15 @@
 import chalk from 'chalk';
 
-import { formatGraphQLBuild } from './utils/formatBuild';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { PaginatedQueryOptions } from '../commandUtils/pagination';
-import { AppPlatform, BuildFilter, BuildFragment } from '../graphql/generated';
+import { BuildFilter, BuildFragment } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import Log from '../log';
-import { fromNow } from '../utils/date';
+import { appPlatformDisplayNames } from '../platform';
+import { promptAsync } from '../prompts';
 import { printJsonOnlyOutput } from '../utils/json';
-import {
-  paginatedQueryWithConfirmPromptAsync,
-  paginatedQueryWithSelectPromptAsync,
-} from '../utils/queries';
+import { paginatedQueryWithConfirmPromptAsync } from '../utils/queries';
+import { formatGraphQLBuild } from './utils/formatBuild';
 
 export const BUILDS_LIMIT = 50;
 
@@ -50,104 +48,50 @@ export async function listAndRenderBuildsOnAppAsync(
         }),
       promptOptions: {
         title: 'Load more builds?',
-        renderListItems: builds => {
-          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions });
-        },
+        renderListItems: builds =>
+          renderPageOfBuilds({ builds, projectDisplayName, paginatedQueryOptions }),
       },
     });
   }
 }
 
-export async function listAndSelectBuildOnAppAsync(
+export async function listAndSelectBuildsOnAppAsync(
   graphqlClient: ExpoGraphqlClient,
   {
     projectId,
-    title,
+    projectDisplayName,
     filter,
-    paginatedQueryOptions,
-    selectPromptDisabledFunction,
-    selectPromptWarningMessage,
+    queryOptions,
   }: {
     projectId: string;
-    title: string;
+    projectDisplayName: string;
     filter?: BuildFilter;
-    paginatedQueryOptions: PaginatedQueryOptions;
-    selectPromptDisabledFunction?: (build: BuildFragment) => boolean;
-    selectPromptWarningMessage?: string;
+    queryOptions: PaginatedQueryOptions;
   }
-): Promise<BuildFragment | null> {
-  if (paginatedQueryOptions.nonInteractive) {
-    throw new Error('Unable to select a build in non-interactive mode.');
-  } else {
-    const selectedBuild = await paginatedQueryWithSelectPromptAsync({
-      limit: paginatedQueryOptions.limit ?? BUILDS_LIMIT,
-      offset: paginatedQueryOptions.offset,
-      queryToPerform: (limit, offset) =>
-        BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-          appId: projectId,
-          limit,
-          offset,
-          filter,
-        }),
-      promptOptions: {
-        title,
-        getIdentifierForQueryItem: build => build.id,
-        makePartialChoiceObject: createBuildToPartialChoiceMaker(selectPromptDisabledFunction),
-        selectPromptWarningMessage,
-      },
-    });
-    return selectedBuild ?? null;
+): Promise<BuildFragment> {
+  const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+    appId: projectId,
+    limit: queryOptions.limit ?? BUILDS_LIMIT,
+    offset: queryOptions.offset,
+    filter,
+  });
+
+  if (builds.length === 0) {
+    throw new Error('Found no builds matching the provided criteria.');
   }
-}
 
-function createBuildToPartialChoiceMaker(
-  selectPromptDisabledFunction?: (build: BuildFragment) => boolean
-) {
-  return (
-    build: BuildFragment
-  ): {
-    title: string;
-    description: string;
-    disabled?: boolean;
-  } => {
-    const splitCommitMessage = build.gitCommitMessage?.split('\n');
-    const formattedCommitData =
-      build.gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
-        ? `${build.gitCommitHash.slice(0, 7)} "${chalk.bold(
-            splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
-          )}"`
-        : null;
-
-    const descriptionItems: { name: string; value: string | null }[] = [
-      { name: 'Version', value: build.appVersion ? chalk.bold(build.appVersion) : null },
-      { name: 'Commit', value: formattedCommitData },
-      {
-        name: 'Message',
-        value: build.message
-          ? chalk.bold(
-              build.message.length > 200 ? `${build.message.slice(0, 200)}...` : build.message
-            )
-          : null,
-      },
-      {
-        name: build.platform === AppPlatform.Ios ? 'Build number' : 'Version code',
-        value: build.appBuildVersion ? chalk.bold(build.appBuildVersion) : null,
-      },
-      { name: 'Profile', value: build.buildProfile ? chalk.bold(build.buildProfile) : null },
-    ];
-
-    const filteredDescriptionArray: string[] = descriptionItems
-      .filter(item => item.value)
-      .map(item => `${chalk.bold(item.name)}: ${item.value}`);
-
-    return {
-      title: `${chalk.bold(`ID:`)} ${build.id} (${chalk.bold(
-        `${fromNow(new Date(build.completedAt))} ago`
-      )})`,
-      description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
-      disabled: selectPromptDisabledFunction?.(build),
-    };
-  };
+  const { selectedSimulatorBuild } = await promptAsync({
+    type: 'select',
+    message: `Select simulator build to run for ${projectDisplayName} app`,
+    name: 'selectedSimulatorBuild',
+    choices: builds.map(build => ({
+      title: `id: ${build.id}, platform: ${appPlatformDisplayNames[build.platform]}, version: ${
+        build.appVersion
+      }, build number: ${build.appBuildVersion}`,
+      value: build,
+    })),
+  });
+  return selectedSimulatorBuild;
 }
 
 export async function getLatestBuildAsync(
@@ -159,7 +103,7 @@ export async function getLatestBuildAsync(
     projectId: string;
     filter?: BuildFilter;
   }
-): Promise<BuildFragment | null> {
+): Promise<BuildFragment> {
   const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
     appId: projectId,
     limit: 1,
@@ -168,7 +112,7 @@ export async function getLatestBuildAsync(
   });
 
   if (builds.length === 0) {
-    return null;
+    throw new Error('Found no build matching the provided criteria.');
   }
 
   return builds[0];

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

@@ -1,70 +1,42 @@
-import { ExpoConfig } from '@expo/config';
-import { Env, Platform, Workflow } from '@expo/eas-build-job';
+import { Platform, Workflow } from '@expo/eas-build-job';
 import {
   AppVersionSource,
+  BuildProfile,
   EasJson,
   EasJsonAccessor,
   EasJsonUtils,
-  ResourceClass,
   SubmitProfile,
 } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
-import assert from 'assert';
 import chalk from 'chalk';
-import { pathExists } from 'fs-extra';
 import nullthrows from 'nullthrows';
 
-import { prepareAndroidBuildAsync } from './android/build';
-import { BuildRequestSender, MaybeBuildFragment, waitForBuildEndAsync } from './build';
-import { ensureProjectConfiguredAsync } from './configure';
-import { BuildContext } from './context';
-import { createBuildContextAsync } from './createContext';
-import { evaluateConfigWithEnvVarsAsync } from './evaluateConfigWithEnvVarsAsync';
-import { prepareIosBuildAsync } from './ios/build';
-import { LocalBuildMode, LocalBuildOptions } from './local';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
-import { ensureRepoIsCleanAsync } from './utils/repository';
 import { Analytics } from '../analytics/AnalyticsManager';
-import { createAndLinkChannelAsync, doesChannelExistAsync } from '../channel/queries';
 import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectConfigContextField';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import {
   AppPlatform,
   BuildFragment,
+  BuildResourceClass,
   BuildStatus,
   BuildWithSubmissionsFragment,
   SubmissionFragment,
 } from '../graphql/generated';
 import { BuildQuery } from '../graphql/queries/BuildQuery';
 import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
-import Log, { learnMore } from '../log';
+import Log from '../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
   appPlatformEmojis,
   toPlatforms,
 } from '../platform';
-import {
-  CustomBuildConfigMetadata,
-  validateCustomBuildConfigAsync,
-} from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
+import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
 import {
-  isExpoUpdatesInstalledAsDevDependency,
-  isExpoUpdatesInstalledOrAvailable,
-  isUsingEASUpdate,
-  validateAppVersionRuntimePolicySupportAsync,
-} from '../project/projectUtils';
-import {
-  ensureAppVersionSourceIsSetAsync,
   validateAppConfigForRemoteVersionSource,
-  validateBuildProfileVersionSettingsAsync,
+  validateBuildProfileVersionSettings,
 } from '../project/remoteVersionSource';
-import { confirmAsync } from '../prompts';
-import { getEasBuildRunCachedAppPath, runAsync } from '../run/run';
-import { isRunnableOnSimulatorOrEmulator } from '../run/utils';
 import { createSubmissionContextAsync } from '../submit/context';
 import {
   exitWithNonZeroCodeIfSomeSubmissionsDidntFinish,
@@ -72,13 +44,22 @@ import {
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
 } from '../submit/submit';
 import { printSubmissionDetailsUrls } from '../submit/utils/urls';
-import { ensureEASUpdateIsConfiguredAsync } from '../update/configure';
+import { validateBuildProfileConfigMatchesProjectConfigAsync } from '../update/utils';
 import { Actor } from '../user/User';
-import { downloadAndMaybeExtractAppAsync } from '../utils/download';
-import { truthy } from '../utils/expodash/filter';
 import { printJsonOnlyOutput } from '../utils/json';
 import { ProfileData, getProfilesAsync } from '../utils/profiles';
-import { Client } from '../vcs/vcs';
+import { getVcsClient } from '../vcs';
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { UserInputResourceClass } from './types';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -93,46 +74,63 @@ export interface BuildFlags {
   autoSubmit: boolean;
   submitProfile?: string;
   localBuildOptions: LocalBuildOptions;
-  resourceClass?: ResourceClass;
+  userInputResourceClass?: UserInputResourceClass;
   message?: string;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  repack: boolean;
 }
 
-export async function runBuildAndSubmitAsync({
-  graphqlClient,
-  analytics,
-  vcsClient,
-  projectDir,
-  flags,
-  actor,
-  getDynamicPrivateProjectConfigAsync,
-  downloadSimBuildAutoConfirm,
-  envOverride,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
-  vcsClient: Client;
-  projectDir: string;
-  flags: BuildFlags;
-  actor: Actor;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  downloadSimBuildAutoConfirm?: boolean;
-  envOverride?: Env;
-}): Promise<{
-  buildIds: string[];
-  buildProfiles?: ProfileData<'build'>[];
-}> {
-  await vcsClient.ensureRepoExistsAsync();
-  await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
+const iosUserInputResourceClassToBuildResourceClassMapping: Record<
+  UserInputResourceClass,
+  BuildResourceClass
+> = {
+  [UserInputResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
+  [UserInputResourceClass.LARGE]: BuildResourceClass.IosLarge,
+  [UserInputResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosM1Large,
+};
+
+const androidUserInputResourceClassToBuildResourceClassMapping: Record<
+  Exclude<UserInputResourceClass, UserInputResourceClass.M1_EXPERIMENTAL>,
+  BuildResourceClass
+> = {
+  [UserInputResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
+  [UserInputResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
+};
+
+function resolveResourceClass(
+  platform: Platform,
+  resourceClassInput: UserInputResourceClass
+): BuildResourceClass {
+  if (platform !== Platform.IOS && resourceClassInput === UserInputResourceClass.M1_EXPERIMENTAL) {
+    throw new Error(
+      `Resource class ${UserInputResourceClass.M1_EXPERIMENTAL} is only available for iOS builds`
+    );
+  }
+
+  return platform === Platform.ANDROID
+    ? androidUserInputResourceClassToBuildResourceClassMapping[
+        resourceClassInput as Exclude<
+          UserInputResourceClass,
+          UserInputResourceClass.M1_EXPERIMENTAL
+        >
+      ]
+    : iosUserInputResourceClassToBuildResourceClassMapping[resourceClassInput];
+}
+
+export async function runBuildAndSubmitAsync(
+  graphqlClient: ExpoGraphqlClient,
+  analytics: Analytics,
+  projectDir: string,
+  flags: BuildFlags,
+  actor: Actor,
+  getDynamicProjectConfigAsync: DynamicConfigContextFn
+): Promise<void> {
+  await getVcsClient().ensureRepoExistsAsync();
+  await ensureRepoIsCleanAsync(flags.nonInteractive);
 
   await ensureProjectConfiguredAsync({
     projectDir,
     nonInteractive: flags.nonInteractive,
-    vcsClient,
   });
-  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+  const easJsonAccessor = new EasJsonAccessor(projectDir);
   const easJsonCliConfig: EasJson['cli'] =
     (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
 
@@ -142,59 +140,16 @@ export async function runBuildAndSubmitAsync({
     easJsonAccessor,
     platforms,
     profileName: flags.profile ?? undefined,
-    projectDir,
   });
 
-  for (const buildProfile of buildProfiles) {
-    if (buildProfile.profile.image && ['default', 'stable'].includes(buildProfile.profile.image)) {
-      Log.warn(
-        `The "image" field in the build profile "${buildProfile.profileName}" is set to "${buildProfile.profile.image}". This tag is deprecated and will be removed in the future. Use other images or tags listed here: https://docs.expo.dev/build-reference/infrastructure/`
-      );
-    } else if (
-      buildProfile.profile.image &&
-      [
-        'ubuntu-20.04-jdk-11-ndk-r19c',
-        'ubuntu-20.04-jdk-8-ndk-r19c',
-        'ubuntu-20.04-jdk-11-ndk-r21e',
-        'ubuntu-20.04-jdk-8-ndk-r21e',
-        'ubuntu-22.04-jdk-8-ndk-r21e',
-        'ubuntu-20.04-jdk-11-ndk-r23b',
-      ].includes(buildProfile.profile.image)
-    ) {
-      Log.warn(
-        `The "image" field in the build profile "${buildProfile.profileName}" is set to "${
-          buildProfile.profile.image
-        }". This image is deprecated and will be removed on September 1st, 2024. ${learnMore(
-          'https://expo.dev/changelog/2024/07-12-eas-build-upcoming-android-images-updates'
-        )}`
-      );
-    }
-  }
-
   await ensureExpoDevClientInstalledForDevClientBuildsAsync({
     projectDir,
     nonInteractive: flags.nonInteractive,
     buildProfiles,
-    vcsClient,
   });
 
-  const customBuildConfigMetadataByPlatform: { [p in AppPlatform]?: CustomBuildConfigMetadata } =
-    {};
   for (const buildProfile of buildProfiles) {
-    await validateBuildProfileVersionSettingsAsync(
-      buildProfile,
-      easJsonCliConfig,
-      projectDir,
-      flags
-    );
-    const maybeMetadata = await validateCustomBuildConfigAsync({
-      projectDir,
-      profile: buildProfile.profile,
-      vcsClient,
-    });
-    if (maybeMetadata) {
-      customBuildConfigMetadataByPlatform[toAppPlatform(buildProfile.platform)] = maybeMetadata;
-    }
+    validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
   }
 
   const startedBuilds: {
@@ -204,57 +159,34 @@ export async function runBuildAndSubmitAsync({
   const buildCtxByPlatform: { [p in AppPlatform]?: BuildContext<Platform> } = {};
 
   for (const buildProfile of buildProfiles) {
-    const platform = toAppPlatform(buildProfile.platform);
-
-    const { env } = !envOverride
-      ? await evaluateConfigWithEnvVarsAsync({
-          buildProfile: buildProfile.profile,
-          buildProfileName: buildProfile.profileName,
-          graphqlClient,
-          getProjectConfig: getDynamicPrivateProjectConfigAsync,
-          opts: { env: buildProfile.profile.env },
-        })
-      : { env: envOverride };
-
     const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
       projectDir,
       flags,
       moreBuilds: platforms.length > 1,
       buildProfile,
+      resourceClass: resolveResourceClass(
+        buildProfile.platform,
+        flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
+      ),
       easJsonCliConfig,
       actor,
       graphqlClient,
       analytics,
-      vcsClient,
-      getDynamicPrivateProjectConfigAsync,
-      customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
-      env,
+      getDynamicProjectConfigAsync,
     });
     if (maybeBuild) {
       startedBuilds.push({ build: maybeBuild, buildProfile });
     }
-    buildCtxByPlatform[platform] = buildCtx;
+    buildCtxByPlatform[toAppPlatform(buildProfile.platform)] = buildCtx;
   }
 
-  if (flags.localBuildOptions.localBuildMode === LocalBuildMode.LOCAL_BUILD_PLUGIN) {
-    return {
-      buildIds: startedBuilds.map(({ build }) => build.id),
-    };
+  if (flags.localBuildOptions.enable) {
+    return;
   }
 
-  if (flags.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL) {
-    const startedBuild = await BuildQuery.byIdAsync(
-      graphqlClient,
-      nullthrows(process.env.EAS_BUILD_ID, 'EAS_BUILD_ID is not defined')
-    );
-    startedBuilds.push({ build: startedBuild, buildProfile: buildProfiles[0] });
-  }
-
-  if (!flags.localBuildOptions.localBuildMode) {
-    Log.newLine();
-    printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
-    Log.newLine();
-  }
+  Log.newLine();
+  printLogsUrls(startedBuilds.map(startedBuild => startedBuild.build));
+  Log.newLine();
 
   const submissions: SubmissionFragment[] = [];
   if (flags.autoSubmit) {
@@ -263,7 +195,6 @@ export async function runBuildAndSubmitAsync({
       platforms,
       profileName: flags.submitProfile,
       type: 'submit',
-      projectDir,
     });
     for (const startedBuild of startedBuilds) {
       const submitProfile = nullthrows(
@@ -276,9 +207,9 @@ export async function runBuildAndSubmitAsync({
         buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
         moreBuilds: startedBuilds.length > 1,
         projectDir,
+        buildProfile: startedBuild.buildProfile.profile,
         submitProfile,
         nonInteractive: flags.nonInteractive,
-        selectedSubmitProfileName: flags.submitProfile,
       });
       startedBuild.build = await BuildQuery.withSubmissionsByIdAsync(
         graphqlClient,
@@ -287,26 +218,16 @@ export async function runBuildAndSubmitAsync({
       submissions.push(submission);
     }
 
-    if (!flags.localBuildOptions.localBuildMode) {
-      Log.newLine();
-      printSubmissionDetailsUrls(submissions);
-      Log.newLine();
-    }
-  }
-
-  if (flags.localBuildOptions.localBuildMode) {
-    return {
-      buildIds: startedBuilds.map(({ build }) => build.id),
-    };
+    Log.newLine();
+    printSubmissionDetailsUrls(submissions);
+    Log.newLine();
   }
 
   if (!flags.wait) {
     if (flags.json) {
       printJsonOnlyOutput(startedBuilds.map(buildInfo => buildInfo.build));
     }
-    return {
-      buildIds: startedBuilds.map(({ build }) => build.id),
-    };
+    return;
   }
 
   const { accountName } = Object.values(buildCtxByPlatform)[0];
@@ -319,13 +240,8 @@ export async function runBuildAndSubmitAsync({
   }
 
   const haveAllBuildsFailedOrCanceled = builds.every(
-    build =>
-      build?.status &&
-      [BuildStatus.Errored, BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build?.status)
+    build => build?.status && [BuildStatus.Errored, BuildStatus.Canceled].includes(build?.status)
   );
-
-  await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags, downloadSimBuildAutoConfirm);
-
   if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
     if (flags.json) {
       printJsonOnlyOutput(builds);
@@ -347,10 +263,6 @@ export async function runBuildAndSubmitAsync({
     }
     exitWithNonZeroCodeIfSomeSubmissionsDidntFinish(completedSubmissions);
   }
-  return {
-    buildIds: startedBuilds.map(({ build }) => build.id),
-    buildProfiles,
-  };
 }
 
 async function prepareAndStartBuildAsync({
@@ -358,31 +270,27 @@ async function prepareAndStartBuildAsync({
   flags,
   moreBuilds,
   buildProfile,
+  resourceClass,
   easJsonCliConfig,
   actor,
   graphqlClient,
   analytics,
-  vcsClient,
-  getDynamicPrivateProjectConfigAsync,
-  customBuildConfigMetadata,
-  env,
+  getDynamicProjectConfigAsync,
 }: {
   projectDir: string;
   flags: BuildFlags;
   moreBuilds: boolean;
   buildProfile: ProfileData<'build'>;
+  resourceClass: BuildResourceClass;
   easJsonCliConfig: EasJson['cli'];
   actor: Actor;
   graphqlClient: ExpoGraphqlClient;
   analytics: Analytics;
-  vcsClient: Client;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  env: Env;
+  getDynamicProjectConfigAsync: DynamicConfigContextFn;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
     buildProfileName: buildProfile.profileName,
-    resourceClassFlag: flags.resourceClass,
+    resourceClass,
     clearCache: flags.clearCache,
     buildProfile: buildProfile.profile,
     nonInteractive: flags.nonInteractive,
@@ -395,13 +303,7 @@ async function prepareAndStartBuildAsync({
     actor,
     graphqlClient,
     analytics,
-    vcsClient,
-    getDynamicPrivateProjectConfigAsync,
-    customBuildConfigMetadata,
-    buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
-    freezeCredentials: flags.freezeCredentials,
-    repack: flags.repack,
-    env,
+    getDynamicProjectConfigAsync,
   });
 
   if (moreBuilds) {
@@ -414,51 +316,14 @@ async function prepareAndStartBuildAsync({
     );
   }
 
-  if (buildProfile.profile.channel) {
-    await validateExpoUpdatesInstalledAsProjectDependencyAsync({
-      exp: buildCtx.exp,
-      projectId: buildCtx.projectId,
-      projectDir,
-      vcsClient: buildCtx.vcsClient,
-      sdkVersion: buildCtx.exp.sdkVersion,
-      nonInteractive: flags.nonInteractive,
-      buildProfile,
-      env: buildProfile.profile.env,
-    });
-    if (isUsingEASUpdate(buildCtx.exp, buildCtx.projectId)) {
-      const doesChannelExist = await doesChannelExistAsync(graphqlClient, {
-        appId: buildCtx.projectId,
-        channelName: buildProfile.profile.channel,
-      });
-      if (!doesChannelExist) {
-        await createAndLinkChannelAsync(graphqlClient, {
-          appId: buildCtx.projectId,
-          channelName: buildProfile.profile.channel,
-        });
-      }
-    }
-  }
+  await validateBuildProfileConfigMatchesProjectConfigAsync(
+    buildCtx.exp,
+    buildProfile,
+    buildCtx.projectId,
+    flags.nonInteractive
+  );
 
   await validateAppVersionRuntimePolicySupportAsync(buildCtx.projectDir, buildCtx.exp);
-  if (
-    easJsonCliConfig?.appVersionSource === undefined &&
-    buildProfile.profile.autoIncrement !== 'version'
-  ) {
-    if (buildProfile.profile.autoIncrement !== true) {
-      Log.warn(
-        `The field "cli.appVersionSource" is not set, but it will be required in the future. ${learnMore(
-          'https://docs.expo.dev/build-reference/app-versions/'
-        )}`
-      );
-    } else {
-      const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-      easJsonCliConfig = await ensureAppVersionSourceIsSetAsync(
-        easJsonAccessor,
-        easJsonCliConfig,
-        flags.nonInteractive
-      );
-    }
-  }
   if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
     validateAppConfigForRemoteVersionSource(buildCtx.exp, buildProfile.platform);
   }
@@ -495,16 +360,16 @@ async function prepareAndStartSubmissionAsync({
   buildCtx,
   moreBuilds,
   projectDir,
+  buildProfile,
   submitProfile,
-  selectedSubmitProfileName,
   nonInteractive,
 }: {
   build: BuildFragment;
   buildCtx: BuildContext<Platform>;
   moreBuilds: boolean;
   projectDir: string;
+  buildProfile: BuildProfile;
   submitProfile: SubmitProfile;
-  selectedSubmitProfileName?: string;
   nonInteractive: boolean;
 }): Promise<SubmissionFragment> {
   const platform = toPlatform(build.platform);
@@ -514,7 +379,7 @@ async function prepareAndStartSubmissionAsync({
     profile: submitProfile,
     archiveFlags: { id: build.id },
     nonInteractive,
-    env: buildCtx.env,
+    env: buildProfile.env,
     credentialsCtx: buildCtx.credentialsCtx,
     applicationIdentifier: buildCtx.android?.applicationId ?? buildCtx.ios?.bundleIdentifier,
     actor: buildCtx.user,
@@ -522,9 +387,6 @@ async function prepareAndStartSubmissionAsync({
     analytics: buildCtx.analytics,
     projectId: buildCtx.projectId,
     exp: buildCtx.exp,
-    vcsClient: buildCtx.vcsClient,
-    isVerboseFastlaneEnabled: false,
-    specifiedProfile: selectedSubmitProfileName,
   });
 
   if (moreBuilds) {
@@ -547,103 +409,3 @@ function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | nul
     process.exit(1);
   }
 }
-
-export async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
-  assert(build.artifacts?.applicationArchiveUrl);
-  const cachedAppPath = getEasBuildRunCachedAppPath(build.project.id, build.id, build.platform);
-
-  if (await pathExists(cachedAppPath)) {
-    Log.newLine();
-    Log.log(`Using cached app...`);
-    await runAsync(cachedAppPath, build.platform);
-    return;
-  }
-
-  const buildPath = await downloadAndMaybeExtractAppAsync(
-    build.artifacts.applicationArchiveUrl,
-    build.platform,
-    cachedAppPath
-  );
-  await runAsync(buildPath, build.platform);
-}
-
-async function maybeDownloadAndRunSimulatorBuildsAsync(
-  builds: MaybeBuildFragment[],
-  flags: BuildFlags,
-  autoConfirm?: boolean
-): Promise<void> {
-  const simBuilds = builds.filter(truthy).filter(isRunnableOnSimulatorOrEmulator);
-
-  if (simBuilds.length > 0 && !flags.autoSubmit && !flags.nonInteractive) {
-    for (const simBuild of simBuilds) {
-      if (simBuild.platform === AppPlatform.Android || process.platform === 'darwin') {
-        Log.newLine();
-        const confirm =
-          autoConfirm ??
-          (await confirmAsync({
-            message: `Install and run the ${
-              simBuild.platform === AppPlatform.Android ? 'Android' : 'iOS'
-            } build on ${
-              simBuild.platform === AppPlatform.Android ? 'an emulator' : 'a simulator'
-            }?`,
-          }));
-        if (confirm) {
-          await downloadAndRunAsync(simBuild);
-        }
-      }
-    }
-  }
-}
-
-async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
-  exp,
-  projectId,
-  projectDir,
-  vcsClient,
-  buildProfile,
-  nonInteractive,
-  sdkVersion,
-  env,
-}: {
-  exp: ExpoConfig;
-  projectId: string;
-  projectDir: string;
-  vcsClient: Client;
-  buildProfile: ProfileData<'build'>;
-  nonInteractive: boolean;
-  sdkVersion?: string;
-  env: Env | undefined;
-}): Promise<void> {
-  if (isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion)) {
-    return;
-  }
-
-  if (isExpoUpdatesInstalledAsDevDependency(projectDir)) {
-    Log.warn(
-      `The build profile "${buildProfile.profileName}" uses the channel "${buildProfile.profile.channel}", but you've added "expo-updates" as a dev dependency. To make channels work for your builds, move "expo-updates" from dev dependencies to the main dependencies in your project.`
-    );
-  } else if (nonInteractive) {
-    Log.warn(
-      `The build profile "${buildProfile.profileName}" has specified the channel "${buildProfile.profile.channel}", but the "expo-updates" package hasn't been installed. To use channels for your builds, install the "expo-updates" package by running "npx expo install expo-updates" followed by "eas update:configure".`
-    );
-  } else {
-    Log.warn(
-      `The build profile "${buildProfile.profileName}" specifies the channel "${buildProfile.profile.channel}", but the "expo-updates" package is missing. To use channels in your builds, install the "expo-updates" package and run "eas update:configure".`
-    );
-    const installExpoUpdates = await confirmAsync({
-      message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
-    });
-    if (installExpoUpdates) {
-      await ensureEASUpdateIsConfiguredAsync({
-        exp,
-        projectId,
-        projectDir,
-        platform: RequestedPlatform.All,
-        vcsClient,
-        env,
-      });
-      Log.withTick('Installed expo-updates and configured EAS Update.');
-      throw new Error('Command must be re-run to pick up new updates configuration.');
-    }
-  }
-}

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

@@ -1,14 +1,7 @@
-import { ResourceClass } from '@expo/eas-json';
-import { LoggerLevel } from '@expo/logger';
-
-import { LocalBuildOptions } from './local';
-import { RequestedPlatform } from '../platform';
-
 export enum BuildStatus {
   NEW = 'new',
   IN_QUEUE = 'in-queue',
   IN_PROGRESS = 'in-progress',
-  PENDING_CANCEL = 'pending-cancel',
   ERRORED = 'errored',
   FINISHED = 'finished',
   CANCELED = 'canceled',
@@ -17,23 +10,15 @@ export enum BuildStatus {
 export enum BuildDistributionType {
   STORE = 'store',
   INTERNAL = 'internal',
-  /** @deprecated Use simulator flag instead */
   SIMULATOR = 'simulator',
 }
 
-export interface BuildFlags {
-  requestedPlatform: RequestedPlatform;
-  profile?: string;
-  nonInteractive: boolean;
-  wait: boolean;
-  clearCache: boolean;
-  json: boolean;
-  autoSubmit: boolean;
-  submitProfile?: string;
-  localBuildOptions: LocalBuildOptions;
-  resourceClass?: ResourceClass;
-  message?: string;
-  buildLoggerLevel?: LoggerLevel;
-  freezeCredentials: boolean;
-  repack: boolean;
+export enum UserInputResourceClass {
+  DEFAULT = 'default',
+  LARGE = 'large',
+  /**
+   * @experimental
+   * This resource class is not yet ready to be used in production. For testing purposes only. Might be deprecated / deleted at any time.
+   */
+  M1_EXPERIMENTAL = 'm1-experimental',
 }

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

@@ -3,7 +3,6 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
-import { reviewAndCommitChangesAsync } from './repository';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
@@ -11,16 +10,15 @@ import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync } from '../../prompts';
 import { expoCommandAsync } from '../../utils/expoCli';
 import { ProfileData } from '../../utils/profiles';
-import { Client } from '../../vcs/vcs';
+import { getVcsClient } from '../../vcs';
+import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,
-  vcsClient,
   nonInteractive = false,
   buildProfiles = [],
 }: {
   projectDir: string;
-  vcsClient: Client;
   nonInteractive?: boolean;
   buildProfiles?: ProfileData<'build'>[];
 }): Promise<void> {
@@ -43,7 +41,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   );
 
   const workflowPerPlatformList = await Promise.all(
-    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform, vcsClient))
+    platformsToCheck.map(platform => resolveWorkflowAsync(projectDir, platform))
   );
 
   Log.newLine();
@@ -57,19 +55,6 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
       'expo-dev-client'
     )} installed for your project.`
   );
-  if (nonInteractive) {
-    Log.error(`You'll need to install ${chalk.bold('expo-dev-client')} manually.`);
-    Log.error(
-      learnMore('https://docs.expo.dev/clients/installation/', {
-        learnMoreMessage: 'See installation instructions on how to do it.',
-        dim: false,
-      })
-    );
-    Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and try again later.`, {
-      exit: 1,
-    });
-  }
-
   const areAllManaged = workflowPerPlatformList.every(i => i === Workflow.MANAGED);
   if (areAllManaged) {
     const install = await confirmAsync({
@@ -77,7 +62,7 @@ export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
       instructions: 'The command will abort unless you agree.',
     });
     if (install) {
-      await installExpoDevClientAsync(projectDir, vcsClient, { nonInteractive });
+      await installExpoDevClientAsync(projectDir, { nonInteractive });
     } else {
       Errors.error(`Install ${chalk.bold('expo-dev-client')} manually and come back later.`, {
         exit: 1,
@@ -115,7 +100,6 @@ async function isExpoDevClientInstalledAsync(projectDir: string): Promise<boolea
 
 async function installExpoDevClientAsync(
   projectDir: string,
-  vcsClient: Client,
   { nonInteractive }: { nonInteractive: boolean }
 ): Promise<void> {
   Log.newLine();
@@ -123,8 +107,8 @@ async function installExpoDevClientAsync(
   Log.newLine();
   await expoCommandAsync(projectDir, ['install', 'expo-dev-client']);
   Log.newLine();
-  if (await vcsClient.isCommitRequiredAsync()) {
-    await reviewAndCommitChangesAsync(vcsClient, 'Install expo-dev-client', {
+  if (await getVcsClient().isCommitRequiredAsync()) {
+    await reviewAndCommitChangesAsync('Install expo-dev-client', {
       nonInteractive,
     });
   }

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

@@ -1,26 +0,0 @@
-import { BuildProfile } from '@expo/eas-json';
-
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
-
-type Environment = NonNullable<BuildProfile['environment']>;
-
-const BuildProfileEnvironmentToEnvironment: Record<Environment, EnvironmentVariableEnvironment> = {
-  production: EnvironmentVariableEnvironment.Production,
-  preview: EnvironmentVariableEnvironment.Preview,
-  development: EnvironmentVariableEnvironment.Development,
-};
-
-export function isEnvironment(env: string): env is EnvironmentVariableEnvironment {
-  return Object.values(EnvironmentVariableEnvironment).includes(
-    env as EnvironmentVariableEnvironment
-  );
-}
-
-export function buildProfileEnvironmentToEnvironment(
-  environment: BuildProfile['environment']
-): EnvironmentVariableEnvironment | null {
-  if (!environment) {
-    return null;
-  }
-  return BuildProfileEnvironmentToEnvironment[environment];
-}

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

@@ -1,6 +1,5 @@
 import chalk from 'chalk';
 
-import { getBuildLogsUrl } from './url';
 import {
   AppPlatform,
   BuildFragment,
@@ -8,6 +7,7 @@ import {
 } from '../../graphql/generated';
 import { appPlatformDisplayNames } from '../../platform';
 import formatFields from '../../utils/formatFields';
+import { getBuildLogsUrl } from './url';
 
 export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);
@@ -27,7 +27,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
             return chalk.blue('in queue');
           case GraphQLBuildStatus.InProgress:
             return chalk.blue('in progress');
-          case GraphQLBuildStatus.PendingCancel:
           case GraphQLBuildStatus.Canceled:
             return chalk.gray('canceled');
           case GraphQLBuildStatus.Finished:
@@ -39,14 +38,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
         }
       },
     },
-    {
-      label: 'Profile',
-      value: build.buildProfile,
-    },
-    {
-      label: 'Message',
-      value: build.message,
-    },
     {
       label: 'Distribution',
       value: build.distribution?.toLowerCase(),
@@ -55,6 +46,10 @@ export function formatGraphQLBuild(build: BuildFragment): string {
       label: 'Enterprise Provisioning',
       value: build.iosEnterpriseProvisioning?.toLowerCase(),
     },
+    {
+      label: 'Release Channel',
+      value: build.releaseChannel,
+    },
     {
       label: 'Channel',
       value: build.channel,
@@ -91,7 +86,6 @@ export function formatGraphQLBuild(build: BuildFragment): string {
           case GraphQLBuildStatus.InQueue:
           case GraphQLBuildStatus.InProgress:
             return '<in progress>';
-          case GraphQLBuildStatus.PendingCancel:
           case GraphQLBuildStatus.Canceled:
           case GraphQLBuildStatus.Errored:
             return null;

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

@@ -1,8 +1,8 @@
 import assert from 'assert';
+import chalk from 'chalk';
 import indentString from 'indent-string';
 import qrcodeTerminal from 'qrcode-terminal';
 
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 import {
   AppPlatform,
   BuildError,
@@ -12,65 +12,39 @@ import {
   EasBuildDeprecationInfo,
   EasBuildDeprecationInfoType,
 } from '../../graphql/generated';
-import Log, { learnMore, link } from '../../log';
+import Log, { learnMore } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
-
-function terminalLinkFallback(url: string, text: string): string {
-  return `${text} (${url})`;
-}
-
-const errorCodeToErrorMessageOverride: Record<string, (build: BuildFragment) => string> = {
-  EAS_BUILD_UNKNOWN_FASTLANE_ERROR: build =>
-    `The ${link(getBuildLogsUrl(build, 'run-fastlane'), {
-      text: '"Run fastlane"',
-      fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-fastlane'), '"Run fastlane"'),
-    })} step failed with an unknown error. Refer to the ${link(
-      getBuildLogsUrl(build, 'xcode-logs'),
-      {
-        text: '"Xcode logs"',
-        fallback: terminalLinkFallback(getBuildLogsUrl(build, 'xcode-logs'), '"Xcode logs"'),
-      }
-    )} phase for additional, more detailed logs`,
-  EAS_BUILD_UNKNOWN_GRADLE_ERROR: build =>
-    `Gradle build failed with unknown error. See logs for the ${link(
-      getBuildLogsUrl(build, 'run-gradlew'),
-      {
-        text: '"Run gradlew"',
-        fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-gradlew'), '"Run gradlew"'),
-      }
-    )} phase for more information.`,
-};
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
 export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {
-    Log.log(`Build details: ${link(getBuildLogsUrl(builds[0]))}`);
+    Log.log(`Build details: ${chalk.underline(getBuildLogsUrl(builds[0]))}`);
   } else {
     builds.forEach(build => {
       const logsUrl = getBuildLogsUrl(build);
       Log.log(
         `${appPlatformEmojis[build.platform]} ${
           appPlatformDisplayNames[build.platform]
-        } build details: ${link(logsUrl)}`
+        } build details: ${chalk.underline(logsUrl)}`
       );
     });
   }
 }
 
 export function printBuildResults(builds: (BuildFragment | null)[]): void {
+  Log.newLine();
   if (builds.length === 1) {
     const [build] = builds;
     assert(build, 'Build should be defined');
     printBuildResult(build);
   } else {
-    (builds.filter(i => i) as BuildFragment[]).forEach(build => {
-      printBuildResult(build);
-    });
+    (builds.filter(i => i) as BuildFragment[]).forEach(build => printBuildResult(build));
   }
 }
 
 function printBuildResult(build: BuildFragment): void {
+  Log.addNewLineIfNone();
   if (build.status === BuildStatus.Errored) {
-    Log.addNewLineIfNone();
     const userError = build.error;
     Log.error(
       `${appPlatformEmojis[build.platform]} ${
@@ -78,12 +52,11 @@ function printBuildResult(build: BuildFragment): void {
       } build failed${userError ? ':' : ''}`
     );
     if (userError) {
-      printUserError(userError, build);
+      printUserError(userError);
     }
     return;
   }
-  if ([BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build.status)) {
-    Log.addNewLineIfNone();
+  if (build.status === BuildStatus.Canceled) {
     Log.error(
       `${appPlatformEmojis[build.platform]} ${
         appPlatformDisplayNames[build.platform]
@@ -93,32 +66,26 @@ function printBuildResult(build: BuildFragment): void {
   }
 
   if (build.distribution === DistributionType.Internal) {
-    Log.addNewLineIfNone();
     const logsUrl = getBuildLogsUrl(build);
     // It's tricky to install the .apk file directly on Android so let's fallback
     // to the build details page and let people press the button to download there
     const qrcodeUrl =
       build.platform === AppPlatform.Ios ? getInternalDistributionInstallUrl(build) : logsUrl;
-    qrcodeTerminal.generate(qrcodeUrl, { small: true }, code => {
-      Log.log(`${indentString(code, 2)}\n`);
-    });
+    qrcodeTerminal.generate(qrcodeUrl, { small: true }, code =>
+      Log.log(`${indentString(code, 2)}\n`)
+    );
     Log.log(
       `${appPlatformEmojis[build.platform]} Open this link on your ${
         appPlatformDisplayNames[build.platform]
       } devices (or scan the QR code) to install the app:`
     );
-    Log.log(`${link(logsUrl)}`);
+    Log.log(`${chalk.underline(logsUrl)}`);
   } else {
     // TODO: it looks like buildUrl could possibly be undefined, based on the code below.
     // we should account for this case better if it is possible
-    const url = build.artifacts?.buildUrl;
-    if (url) {
-      Log.addNewLineIfNone();
-      Log.log(
-        `${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`
-      );
-      Log.log(link(url));
-    }
+    const url = build.artifacts?.buildUrl ?? '';
+    Log.log(`${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`);
+    Log.log(`${chalk.underline(url)}`);
   }
 }
 
@@ -139,22 +106,9 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
   }
 }
 
-export function printUserError(error: BuildError, build: BuildFragment): void {
-  const maybeErrorMessageOverride = maybeGetErrorMessageOverride(error, build);
-  if (maybeErrorMessageOverride) {
-    Log.error(maybeErrorMessageOverride);
-  } else {
-    Log.error(error.message);
-    if (error.docsUrl) {
-      Log.error(learnMore(error.docsUrl, { dim: false }));
-    }
+export function printUserError(error: BuildError): void {
+  Log.error(error.message);
+  if (error.docsUrl) {
+    Log.error(learnMore(error.docsUrl, { dim: false }));
   }
 }
-
-function maybeGetErrorMessageOverride(error: BuildError, build: BuildFragment): string | null {
-  if (!(error.errorCode in errorCodeToErrorMessageOverride)) {
-    return null;
-  }
-
-  return errorCodeToErrorMessageOverride[error.errorCode](build);
-}

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

@@ -4,19 +4,16 @@ import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';
 
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import { ora } from '../../ora';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
 import { getTmpDirectory } from '../../utils/paths';
 import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
-import { Client } from '../../vcs/vcs';
+import { getVcsClient } from '../../vcs';
 
-export async function maybeBailOnRepoStatusAsync(
-  vcsClient: Client,
-  nonInteractive: boolean
-): Promise<void> {
-  if (!(await vcsClient.isCommitRequiredAsync())) {
+export async function maybeBailOnRepoStatusAsync(): Promise<void> {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -31,20 +28,12 @@ export async function maybeBailOnRepoStatusAsync(
   });
 
   if (!answer) {
-    if (nonInteractive) {
-      Log.log('The following files need to be committed:');
-      await vcsClient.showChangedFilesAsync();
-    }
-
     throw new Error('Commit all changes. Aborting...');
   }
 }
 
-export async function ensureRepoIsCleanAsync(
-  vcsClient: Client,
-  nonInteractive = false
-): Promise<void> {
-  if (!(await vcsClient.isCommitRequiredAsync())) {
+export async function ensureRepoIsCleanAsync(nonInteractive = false): Promise<void> {
+  if (!(await getVcsClient().isCommitRequiredAsync())) {
     return;
   }
   Log.addNewLineIfNone();
@@ -55,31 +44,25 @@ export async function ensureRepoIsCleanAsync(
     )}.`
   );
   if (nonInteractive) {
-    Log.log('The following files need to be committed:');
-    await vcsClient.showChangedFilesAsync();
-
     throw new Error('Commit all changes. Aborting...');
   }
   const answer = await confirmAsync({
     message: `Commit changes to git?`,
   });
   if (answer) {
-    await commitPromptAsync(vcsClient, { commitAllFiles: true });
+    await commitPromptAsync({ commitAllFiles: true });
   } else {
     throw new Error('Commit all changes. Aborting...');
   }
 }
 
-export async function commitPromptAsync(
-  vcsClient: Client,
-  {
-    initialCommitMessage,
-    commitAllFiles,
-  }: {
-    initialCommitMessage?: string;
-    commitAllFiles?: boolean;
-  } = {}
-): Promise<void> {
+export async function commitPromptAsync({
+  initialCommitMessage,
+  commitAllFiles,
+}: {
+  initialCommitMessage?: string;
+  commitAllFiles?: boolean;
+} = {}): Promise<void> {
   const { message } = await promptAsync({
     type: 'text',
     name: 'message',
@@ -87,40 +70,14 @@ export async function commitPromptAsync(
     initial: initialCommitMessage,
     validate: (input: string) => input !== '',
   });
-  await vcsClient.commitAsync({
+  await getVcsClient().commitAsync({
     commitAllFiles,
     commitMessage: message,
     nonInteractive: false,
   });
 }
 
-export type LocalFile = {
-  path: string;
-  size: number;
-};
-
-export async function makeProjectMetadataFileAsync(archivePath: string): Promise<LocalFile> {
-  await fs.mkdirp(getTmpDirectory());
-  const metadataLocation = path.join(getTmpDirectory(), `${uuidv4()}-eas-build-metadata.json`);
-  const archiveContent: string[] = [];
-
-  await tar.list({
-    file: archivePath,
-    onentry: (entry: tar.ReadEntry) => {
-      if (entry.type === 'File' && !entry.path.includes('.git/')) {
-        archiveContent.push(entry.path);
-      }
-    },
-  });
-
-  await fs.writeJSON(metadataLocation, {
-    archiveContent,
-  });
-
-  return { path: metadataLocation, size: await fs.stat(metadataLocation).then(stat => stat.size) };
-}
-
-export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalFile> {
+export async function makeProjectTarballAsync(): Promise<{ path: string; size: number }> {
   const spinner = ora('Compressing project files');
 
   await fs.mkdirp(getTmpDirectory());
@@ -142,7 +99,7 @@ export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalF
   startTimer(compressTimerLabel);
 
   try {
-    await vcsClient.makeShallowCopyAsync(shallowClonePath);
+    await getVcsClient().makeShallowCopyAsync(shallowClonePath);
     await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
       '.',
     ]);
@@ -169,34 +126,6 @@ export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalF
   return { size, path: tarPath };
 }
 
-export function maybeWarnAboutProjectTarballSize(size: number): void {
-  if (size <= 150 /* MiB */ * 1024 /* KiB */ * 1024 /* B */) {
-    return;
-  }
-
-  Log.warn(
-    `Your project archive is ${formatBytes(
-      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')}`
-  );
-}
-
-const MAX_ALLOWED_PROJECT_TARBALL_SIZE =
-  2 /* GiB */ * 1024 /* MiB */ * 1024 /* KiB */ * 1024; /* B */
-export function assertProjectTarballSizeDoesNotExceedLimit(size: number): void {
-  if (size <= MAX_ALLOWED_PROJECT_TARBALL_SIZE) {
-    return;
-  }
-
-  throw new Error(
-    `Project archive is too big. Maximum allowed size is ${formatBytes(
-      MAX_ALLOWED_PROJECT_TARBALL_SIZE
-    )}.`
-  );
-}
-
 enum ShouldCommitChanges {
   Yes,
   ShowDiffFirst,
@@ -204,12 +133,11 @@ enum ShouldCommitChanges {
 }
 
 export async function reviewAndCommitChangesAsync(
-  vcsClient: Client,
   initialCommitMessage: string,
   { nonInteractive, askedFirstTime = true }: { nonInteractive: boolean; askedFirstTime?: boolean }
 ): Promise<void> {
   if (process.env.EAS_BUILD_AUTOCOMMIT) {
-    await vcsClient.commitAsync({
+    await getVcsClient().commitAsync({
       commitMessage: initialCommitMessage,
       commitAllFiles: false,
       nonInteractive,
@@ -243,11 +171,11 @@ export async function reviewAndCommitChangesAsync(
       "Aborting, run the command again once you're ready. Make sure to commit any changes you've made."
     );
   } else if (selected === ShouldCommitChanges.Yes) {
-    await commitPromptAsync(vcsClient, { initialCommitMessage });
+    await commitPromptAsync({ initialCommitMessage });
     Log.withTick('Committed changes.');
   } else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-    await vcsClient.showDiffAsync();
-    await reviewAndCommitChangesAsync(vcsClient, initialCommitMessage, {
+    await getVcsClient().showDiffAsync();
+    await reviewAndCommitChangesAsync(initialCommitMessage, {
       nonInteractive,
       askedFirstTime: false,
     });

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

@@ -1,92 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, ResourceClass } from '@expo/eas-json';
-import chalk from 'chalk';
-
-import { BuildResourceClass } from '../../graphql/generated';
-import Log, { link } from '../../log';
-
-type AndroidResourceClass = Exclude<
-  ResourceClass,
-  ResourceClass.M1_MEDIUM | ResourceClass.M_MEDIUM | ResourceClass.M_LARGE
->;
-
-const iosResourceClassToBuildResourceClassMapping: Record<ResourceClass, BuildResourceClass> = {
-  [ResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
-  [ResourceClass.LARGE]: BuildResourceClass.IosLarge,
-  [ResourceClass.M1_MEDIUM]: BuildResourceClass.IosMMedium,
-  [ResourceClass.MEDIUM]: BuildResourceClass.IosMedium,
-  [ResourceClass.M_MEDIUM]: BuildResourceClass.IosMMedium,
-  [ResourceClass.M_LARGE]: BuildResourceClass.IosMLarge,
-};
-
-const androidResourceClassToBuildResourceClassMapping: Record<
-  AndroidResourceClass,
-  BuildResourceClass
-> = {
-  [ResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
-  [ResourceClass.LARGE]: BuildResourceClass.AndroidLarge,
-  [ResourceClass.MEDIUM]: BuildResourceClass.AndroidMedium,
-};
-
-export async function resolveBuildResourceClassAsync<T extends Platform>(
-  profile: BuildProfile<T>,
-  platform: Platform,
-  resourceClassFlag?: ResourceClass
-): Promise<BuildResourceClass> {
-  const profileResourceClass = profile.resourceClass;
-
-  if (profileResourceClass && resourceClassFlag && resourceClassFlag !== profileResourceClass) {
-    Log.warn(
-      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing "${resourceClassFlag}" as the override.`
-    );
-  }
-
-  const selectedResourceClass = resourceClassFlag ?? profileResourceClass;
-
-  return platform === Platform.IOS
-    ? resolveIosResourceClass(resourceClassFlag, profileResourceClass)
-    : resolveAndroidResourceClass(selectedResourceClass);
-}
-
-function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): BuildResourceClass {
-  if (selectedResourceClass && ResourceClass.M1_MEDIUM === selectedResourceClass) {
-    throw new Error(`Resource class ${selectedResourceClass} is only available for iOS builds`);
-  }
-
-  const resourceClass = selectedResourceClass ?? ResourceClass.DEFAULT;
-
-  return androidResourceClassToBuildResourceClassMapping[resourceClass as AndroidResourceClass];
-}
-
-function resolveIosResourceClass(
-  resourceClassFlag?: ResourceClass,
-  profileResourceClass?: ResourceClass
-): BuildResourceClass {
-  const resourceClass = resourceClassFlag ?? profileResourceClass ?? ResourceClass.DEFAULT;
-
-  if (resourceClassFlag === ResourceClass.LARGE) {
-    throw new Error(
-      `Experimental "large" resource class for Intel iOS workers is no longer available. Remove the specified resource class to use the default, or learn more about all available resource classes: ${link(
-        'https://docs.expo.dev/build-reference/eas-json/'
-      )}`
-    );
-  }
-
-  if (ResourceClass.M1_MEDIUM === resourceClass) {
-    Log.warn(
-      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
-        'm-medium'
-      )} instead.`
-    );
-  }
-
-  if (ResourceClass.M_LARGE === resourceClass) {
-    Log.warn(
-      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
-        'large'
-      )} instead.`
-    );
-  }
-
-  return iosResourceClassToBuildResourceClassMapping[resourceClass];
-}

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

@@ -10,14 +10,12 @@ export function getProjectDashboardUrl(accountName: string, projectName: string)
   ).toString();
 }
 
-export function getBuildLogsUrl(build: BuildFragment, hash?: string): string {
+export function getBuildLogsUrl(build: BuildFragment): string {
   const { project } = build;
   const url =
     project.__typename !== 'App'
       ? `/builds/${build.id}`
-      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}${
-          hash ? `#${hash}` : ''
-        }`;
+      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
 
   return new URL(url, getExpoWebsiteBaseUrl()).toString();
 }
@@ -50,34 +48,3 @@ export function getUpdateGroupUrl(
     getExpoWebsiteBaseUrl()
   ).toString();
 }
-
-export function getWorkflowRunUrl(
-  accountName: string,
-  projectName: string,
-  workflowRunId: string
-): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/workflows/${workflowRunId}`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}
-
-export function getProjectGitHubSettingsUrl(accountName: string, projectName: string): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/github`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}
-
-export function getHostingDeploymentsUrl(accountName: string, projectName: string): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/hosting/deployments`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}

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

@@ -3,9 +3,9 @@ import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
 
-import { updateAppJsonConfigAsync } from './appJson';
 import Log from '../../log';
 import { promptAsync } from '../../prompts';
+import { updateAppJsonConfigAsync } from './appJson';
 
 export function ensureStaticConfigExists(projectDir: string): void {
   const paths = getConfigFilePaths(projectDir);

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

@@ -4,14 +4,15 @@ import fs from 'fs-extra';
 import path from 'path';
 import semver from 'semver';
 
-import { CommonContext } from './context';
 import Log, { learnMore } from '../log';
 import { isPNGAsync } from '../utils/image';
+import { getVcsClient } from '../vcs';
+import { CommonContext } from './context';
 
 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
-  if (ctx.env?.NODE_ENV === 'production') {
+  if (ctx.buildProfile.env?.NODE_ENV === 'production') {
     Log.warn(
-      'You set NODE_ENV=production in the build profile or environment variables. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
+      'You set NODE_ENV=production in the build profile. Remember that it will be available during the entire build process. In particular, it will make yarn/npm install only production packages.'
     );
     Log.newLine();
   }
@@ -27,28 +28,24 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const googleServicesEnvVar =
-    ctx.platform === Platform.ANDROID
-      ? ctx.env.GOOGLE_SERVICES_JSON
-      : ctx.env.GOOGLE_SERVICES_INFO_PLIST;
-  const rootDir = path.normalize(await ctx.vcsClient.getRootPathAsync());
+  const rootDir = path.normalize(await getVcsClient().getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&
     (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(
-        path.relative(rootDir, absGoogleServicesFilePath)
-      ))) &&
-    !googleServicesEnvVar
+      (await getVcsClient().isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
   ) {
     Log.warn(
       `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
     );
     Log.warn(
-      `Use EAS file environment variables with secret or sensitive visibility to pass all values that you don't want to include in your version control to build process. ${learnMore(
-        'https://docs.expo.dev/eas/environment-variables/#file-environment-variables'
+      `Use EAS Secret to pass all values that you don't want to include in your version control. ${learnMore(
+        'https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables'
       )}`
     );
+    Log.warn(
+      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
+    );
     Log.newLine();
   }
 }

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

@@ -1,22 +0,0 @@
-import { BranchBasicInfo, ChannelBasicInfo, UpdateChannelInfoWithBranches } from '../utils';
-
-export const testChannelBasicInfo: ChannelBasicInfo = {
-  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
-  name: 'production',
-  branchMapping:
-    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
-};
-
-export const testBasicBranchInfo1: BranchBasicInfo = {
-  id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-  name: 'wrong-channel',
-};
-
-export const testBasicBranchInfo2: BranchBasicInfo = {
-  id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-  name: 'production',
-};
-export const channelInfoWithBranches: UpdateChannelInfoWithBranches<BranchBasicInfo> = {
-  ...testChannelBasicInfo,
-  updateBranches: [testBasicBranchInfo1, testBasicBranchInfo2],
-};

packages/eas-cli/src/channel/__tests__/branch-mapping-test.ts

@@ -1,72 +0,0 @@
-import { testChannelBasicInfo } from './branch-mapping-fixtures';
-import {
-  emptyBranchMapping,
-  rolloutBranchMapping,
-  standardBranchMapping,
-} from '../../rollout/__tests__/fixtures';
-import {
-  BranchMappingValidationError,
-  assertVersion,
-  getAlwaysTrueBranchMapping,
-  getBranchMapping,
-  getEmptyBranchMapping,
-  getStandardBranchId,
-  isAlwaysTrueBranchMapping,
-  isEmptyBranchMapping,
-} from '../branch-mapping';
-
-describe(assertVersion, () => {
-  it('throws if the branch mapping is not the correct version', () => {
-    expect(() => {
-      assertVersion(testChannelBasicInfo, 5);
-    }).toThrowError(BranchMappingValidationError);
-  });
-  it('asserts the correct version', () => {
-    assertVersion(testChannelBasicInfo, 0);
-    expect(getBranchMapping(testChannelBasicInfo.branchMapping).version).toBe(0);
-  });
-});
-
-describe(getEmptyBranchMapping, () => {
-  it('gets an empty branch mapping', () => {
-    expect(isEmptyBranchMapping(getEmptyBranchMapping())).toBe(true);
-  });
-});
-
-describe(isEmptyBranchMapping, () => {
-  it('detects empty branch mappings', () => {
-    expect(isEmptyBranchMapping(emptyBranchMapping)).toBe(true);
-    expect(isEmptyBranchMapping(standardBranchMapping)).toBe(false);
-    expect(isEmptyBranchMapping(rolloutBranchMapping)).toBe(false);
-  });
-});
-
-describe(isAlwaysTrueBranchMapping, () => {
-  it('detects always true branch mappings', () => {
-    expect(isAlwaysTrueBranchMapping(standardBranchMapping)).toBe(true);
-    expect(isAlwaysTrueBranchMapping(rolloutBranchMapping)).toBe(false);
-    expect(isAlwaysTrueBranchMapping(emptyBranchMapping)).toBe(false);
-  });
-});
-
-describe(getAlwaysTrueBranchMapping, () => {
-  it('gets an always true branch mapping', () => {
-    const alwaysTrueBranchMapping = getAlwaysTrueBranchMapping('test-id');
-    expect(isAlwaysTrueBranchMapping(alwaysTrueBranchMapping)).toBe(true);
-  });
-});
-
-describe(getStandardBranchId, () => {
-  it('throws if the branch mapping is not a standard mapping', () => {
-    expect(() => getStandardBranchId(testChannelBasicInfo)).toThrowError(
-      BranchMappingValidationError
-    );
-  });
-  it('gets a standard branch id', () => {
-    const channelObjectWithStandardMapping = { ...testChannelBasicInfo };
-    channelObjectWithStandardMapping.branchMapping = JSON.stringify(standardBranchMapping);
-    expect(getStandardBranchId(channelObjectWithStandardMapping)).toBe(
-      standardBranchMapping.data[0].branchId
-    );
-  });
-});

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

@@ -1,149 +0,0 @@
-import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
-import { UpdateBranchObject, UpdateChannelObject } from '../../graphql/queries/ChannelQuery';
-
-export const testUpdateBranch1: UpdateBranchObject = {
-  id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-  name: 'wrong-channel',
-  updateGroups: [
-    [
-      {
-        id: 'bbe3e63a-f620-4603-8c4d-258f3e51590d',
-        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
-        message: 'fix bug',
-        createdAt: '2023-07-17T22:48:59.278Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'ios',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"7d40544b395c5949f4646f5e150fe020","fileSHA256":"LN_rjlzN55dvcBL7jM5zryIpAp7iHU8VCf7RFIccbNg","storageKey":"Pi65ns2w9xLI5G_m9aGrJ5wK5FpWcGcInSSFwnA_0aA","contentType":"image/png","fileExtension":".png"},{"bundleKey":"cdd04e13d4ec83ff0cd13ec8dabdc341","fileSHA256":"irHji01LPI9giDYxtJo9bTPHaEHzuUcCMTlb4xn90Ks","storageKey":"oJZ9JX1m8IKNDgnIqcKOo5KUFOoa_NCaxruigZu65E0","contentType":"image/png","fileExtension":".png"},{"bundleKey":"a132ecc4ba5c1517ff83c0fb321bc7fc","fileSHA256":"K3RDqaWOksoRpXW9wRWYYVpX3eMFzYznDWAmBrMCzZg","storageKey":"X3OAkUu5P_LqyKFx1bNkA_qDQFLlSjCYNAlVEaOamHE","contentType":"image/png","fileExtension":".png"},{"bundleKey":"0ea69b5077e7c4696db85dbcba75b0e1","fileSHA256":"Pd0Hc-0n4j0leJ8wFzGzrEVa2L5aonoKG4OPicbSciU","storageKey":"FwJkAbrRNahBGX1KXnTAgiiwyzENu3D7DeEzCwmInyo","contentType":"image/png","fileExtension":".png"},{"bundleKey":"f5b790e2ac193b3d41015edb3551f9b8","fileSHA256":"vCfIss7SLYKt1AAi0hxjsgOMEDceLJB6ZWjQf6gTU4k","storageKey":"GQtYm7r0G9N3WJyrymjZ26p8eNMIb7rzqwSVgGco5EU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"3d0ac172fe41ab941a8c68cd7e3a17ee","fileSHA256":"jjnar-ZPrb_g0Bx5tcFfjJrP3v8HdeAlXMk__xN7I1U","storageKey":"bimf-UXq5IFH5nNHCIHdcQ2MyJwTnwDVBb-P8hr2CZw","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/bbe3e63a-f620-4603-8c4d-258f3e51590d',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-          name: 'wrong-channel',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-      {
-        id: 'db22401b-d321-4629-a068-21d6d1f19c02',
-        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
-        message: 'fix bug',
-        createdAt: '2023-07-17T22:48:59.278Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'android',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"778ffc9fe8773a878e9c30a6304784de","fileSHA256":"i2Gkx-9w3JJ1PwSUl2SC9m_UFQ7CPfx3KrZeEDc6-lU","storageKey":"idnX8z03q4vGLzhYMPaQGBADjhqvWe67_afPqJ1vGzM","contentType":"image/png","fileExtension":".png"},{"bundleKey":"376d6a4c7f622917c39feb23671ef71d","fileSHA256":"QJsG0VpGM-5viirUgoKq0M4zQ_TYyPfLhAhN5mrM54I","storageKey":"46DQ95-UdSKiRkQgt5FyXkE1FrKOT9tBZP3nS7auKlg","contentType":"image/png","fileExtension":".png"},{"bundleKey":"c79c3606a1cf168006ad3979763c7e0c","fileSHA256":"kGZm3WiTRq2iMs42ia3vkHtCV_obWT8DY40rlJf2SIQ","storageKey":"k-3xHp3vP8mR36WdccUZVPTRJKpP-zlyboWdkXCIQpQ","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02bc1fa7c0313217bde2d65ccbff40c9","fileSHA256":"_6fuRbdkBbpzkhSVAI99aMneY5X0tpQdsGNGX244IyA","storageKey":"lfqeUjiWFXwowhxVDBEzxsbTOEzYxMLebljy5Bh1mpU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"35ba0eaec5a4f5ed12ca16fabeae451d","fileSHA256":"hM9es7ICUPaeDkczvrTaX0F_BoKJKlrRteYlcHU8IbE","storageKey":"fMoMrsUeB5xWw_Ugn8FqGJf-M2pld2hkXKR704z0MM8","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"4cc2ee49988e438ac066827b809721de","fileSHA256":"ctfK72f8EdS1IQmDvJLya38RMSma16beJcMoQToZIe0","storageKey":"QdEoKuCQPvVPA71gY52wqJ9vmtV4ObnCcPE2FP4SIdo","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/db22401b-d321-4629-a068-21d6d1f19c02',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '754bf17f-efc0-46ab-8a59-a03f20e53e9b',
-          name: 'wrong-channel',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-    ],
-  ],
-  __typename: 'UpdateBranch',
-};
-
-export const testUpdateBranch2: UpdateBranchObject = {
-  id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-  name: 'production',
-  updateGroups: [
-    [
-      {
-        id: 'f04aafc1-0bf5-4548-8c35-726b467e7c40',
-        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
-        message: 'fix bug',
-        createdAt: '2023-06-23T23:37:10.004Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'ios',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"7d40544b395c5949f4646f5e150fe020","fileSHA256":"LN_rjlzN55dvcBL7jM5zryIpAp7iHU8VCf7RFIccbNg","storageKey":"Pi65ns2w9xLI5G_m9aGrJ5wK5FpWcGcInSSFwnA_0aA","contentType":"image/png","fileExtension":".png"},{"bundleKey":"cdd04e13d4ec83ff0cd13ec8dabdc341","fileSHA256":"irHji01LPI9giDYxtJo9bTPHaEHzuUcCMTlb4xn90Ks","storageKey":"oJZ9JX1m8IKNDgnIqcKOo5KUFOoa_NCaxruigZu65E0","contentType":"image/png","fileExtension":".png"},{"bundleKey":"a132ecc4ba5c1517ff83c0fb321bc7fc","fileSHA256":"K3RDqaWOksoRpXW9wRWYYVpX3eMFzYznDWAmBrMCzZg","storageKey":"X3OAkUu5P_LqyKFx1bNkA_qDQFLlSjCYNAlVEaOamHE","contentType":"image/png","fileExtension":".png"},{"bundleKey":"0ea69b5077e7c4696db85dbcba75b0e1","fileSHA256":"Pd0Hc-0n4j0leJ8wFzGzrEVa2L5aonoKG4OPicbSciU","storageKey":"FwJkAbrRNahBGX1KXnTAgiiwyzENu3D7DeEzCwmInyo","contentType":"image/png","fileExtension":".png"},{"bundleKey":"f5b790e2ac193b3d41015edb3551f9b8","fileSHA256":"vCfIss7SLYKt1AAi0hxjsgOMEDceLJB6ZWjQf6gTU4k","storageKey":"GQtYm7r0G9N3WJyrymjZ26p8eNMIb7rzqwSVgGco5EU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"76ec49faddaef30ba78fe50edc5ab3d6","fileSHA256":"OLUdgP-fZI2shwGS5qlIk7nWnybL_13RJl5xR85CDBU","storageKey":"OCvI0-34zApbdo3eSGfIaQUbWdZeLeKH-nJSeedKTFs","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/f04aafc1-0bf5-4548-8c35-726b467e7c40',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-          name: 'production',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-      {
-        id: 'd8d15786-2727-407f-bf3e-f4bda7e397d9',
-        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
-        message: 'fix bug',
-        createdAt: '2023-06-23T23:37:10.004Z',
-        runtimeVersion: 'exposdk:48.0.0',
-        platform: 'android',
-        manifestFragment:
-          '{"extra":{"expoClient":{"ios":{"supportsTablet":true,"bundleIdentifier":"com.quintest113.updatestest4"},"web":{"favicon":"./assets/favicon.png"},"icon":"./assets/icon.png","name":"updates-test-4","slug":"updates-test-4","extra":{"eas":{"projectId":"789a8784-0186-4f41-8bd2-7f219291a2b8"}},"splash":{"image":"./assets/splash.png","resizeMode":"contain","backgroundColor":"#ffffff"},"android":{"package":"com.quintest113.updatestest4","adaptiveIcon":{"backgroundColor":"#ffffff","foregroundImage":"./assets/adaptive-icon.png"}},"updates":{"url":"https://u.expo.dev/789a8784-0186-4f41-8bd2-7f219291a2b8"},"version":"1.0.0","platforms":["ios","android"],"sdkVersion":"48.0.0","orientation":"portrait","runtimeVersion":{"policy":"sdkVersion"},"currentFullName":"@quintest113/updates-test-4","originalFullName":"@quintest113/updates-test-4","userInterfaceStyle":"light","assetBundlePatterns":["**/*"]}},"assets":[{"bundleKey":"778ffc9fe8773a878e9c30a6304784de","fileSHA256":"i2Gkx-9w3JJ1PwSUl2SC9m_UFQ7CPfx3KrZeEDc6-lU","storageKey":"idnX8z03q4vGLzhYMPaQGBADjhqvWe67_afPqJ1vGzM","contentType":"image/png","fileExtension":".png"},{"bundleKey":"376d6a4c7f622917c39feb23671ef71d","fileSHA256":"QJsG0VpGM-5viirUgoKq0M4zQ_TYyPfLhAhN5mrM54I","storageKey":"46DQ95-UdSKiRkQgt5FyXkE1FrKOT9tBZP3nS7auKlg","contentType":"image/png","fileExtension":".png"},{"bundleKey":"c79c3606a1cf168006ad3979763c7e0c","fileSHA256":"kGZm3WiTRq2iMs42ia3vkHtCV_obWT8DY40rlJf2SIQ","storageKey":"k-3xHp3vP8mR36WdccUZVPTRJKpP-zlyboWdkXCIQpQ","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02bc1fa7c0313217bde2d65ccbff40c9","fileSHA256":"_6fuRbdkBbpzkhSVAI99aMneY5X0tpQdsGNGX244IyA","storageKey":"lfqeUjiWFXwowhxVDBEzxsbTOEzYxMLebljy5Bh1mpU","contentType":"image/png","fileExtension":".png"},{"bundleKey":"35ba0eaec5a4f5ed12ca16fabeae451d","fileSHA256":"hM9es7ICUPaeDkczvrTaX0F_BoKJKlrRteYlcHU8IbE","storageKey":"fMoMrsUeB5xWw_Ugn8FqGJf-M2pld2hkXKR704z0MM8","contentType":"image/png","fileExtension":".png"},{"bundleKey":"5223c8d9b0d08b82a5670fb5f71faf78","fileSHA256":"LJXowmdeeZM1_QBGuwfb2gbLfs_1HtN5IsYwnWGcxNM","storageKey":"jeqOrdQBNY4hgl04B3wtGs8QNWMDmjvbjIMUXPtOBpw","contentType":"image/png","fileExtension":".png"},{"bundleKey":"02d5848f62ade9617cf96894727d32e7","fileSHA256":"u1-8zHOj9oxS8maH-7JbShJIq1-KEV7FXnrGpEUcR-4","storageKey":"LMUvUZZpdGFb7KqaB_l9N4TXTkFn1Pw92ws9fWDNZPw","contentType":"model/gltf-binary","fileExtension":".glb"},{"bundleKey":"6013c27e421ab23c826713af3ebec891","fileSHA256":"dutQNnvzTCS4NgwvbeMbvhro5QnW0GJUeY_4rrvlcLY","storageKey":"85KB9Jr7eqz1Jwt1mYQGRzTy6ZXyO0j7ZcaLImCbzkU","contentType":"image/jpeg","fileExtension":".jpg"}],"launchAsset":{"bundleKey":"f4c6981626dbabcf51078d07a1611f4e","fileSHA256":"q-k1hSWl49aXpSg4jOSaVVnYFSFL6xf7HVl_TQE-ObM","storageKey":"FwK1PaZqtpL0QZIgaHsxU1AV93JhMdu9K1wZizXROAc","contentType":"application/javascript","fileExtension":".bundle"}}',
-        isRollBackToEmbedded: false,
-        manifestPermalink: 'https://u.expo.dev/update/d8d15786-2727-407f-bf3e-f4bda7e397d9',
-        gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        actor: {
-          __typename: 'User',
-          id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
-          username: 'quintest113',
-        },
-        branch: {
-          id: '6941a8dd-5c0a-48bc-8876-f49c88ed419f',
-          name: 'production',
-          __typename: 'UpdateBranch',
-        },
-        codeSigningInfo: null,
-        __typename: 'Update',
-      },
-    ],
-  ],
-  __typename: 'UpdateBranch',
-};
-export const testChannelObject: UpdateChannelObject = {
-  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
-  name: 'production',
-  createdAt: '2023-05-16T21:26:16.946Z',
-  updatedAt: '2023-05-16T21:26:16.946Z',
-  branchMapping:
-    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.15,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
-  updateBranches: [testUpdateBranch1, testUpdateBranch2],
-  isPaused: false,
-  __typename: 'UpdateChannel',
-};
-
-export const testBasicChannelInfo: UpdateChannelBasicInfoFragment = {
-  id: '9309afc2-9752-40db-8ef7-4abc10744c61',
-  name: 'production',
-  branchMapping:
-    '{"data":[{"branchId":"754bf17f-efc0-46ab-8a59-a03f20e53e9b","branchMappingLogic":{"operand":0.1,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"6941a8dd-5c0a-48bc-8876-f49c88ed419f","branchMappingLogic":"true"}],"version":0}',
-  __typename: 'UpdateChannel',
-};
-
-export const testBasicChannelInfo2: UpdateChannelBasicInfoFragment = {
-  id: '9d5c7bf0-d52d-474c-9140-c1bad7f0de9d',
-  name: 'staging',
-  branchMapping:
-    '{"data":[{"branchId":"d7d68e32-d9c9-4a8d-8d1b-21e53100a5e8","branchMappingLogic":{"operand":0.1,"clientKey":"rolloutToken","branchMappingOperator":"hash_lt"}},{"branchId":"f9f708c2-0c91-4360-b2a4-0b61834aef4a","branchMappingLogic":"true"}],"version":0}',
-  __typename: 'UpdateChannel',
-};

packages/eas-cli/src/channel/__tests__/print-utils-test.ts

@@ -1,57 +0,0 @@
-import { format } from '@expo/timeago.js';
-
-import { testChannelObject, testUpdateBranch1, testUpdateBranch2 } from './fixtures';
-import { getAlwaysTrueBranchMapping, getEmptyBranchMapping } from '../branch-mapping';
-import { getDescriptionByBranchId } from '../print-utils';
-
-describe(getDescriptionByBranchId, () => {
-  it('should get descriptions for multiple branches with multiple update groups', () => {
-    const descriptionByBranchId = getDescriptionByBranchId(testChannelObject);
-    expect(Object.values(descriptionByBranchId)).toHaveLength(2);
-    expect(descriptionByBranchId[testUpdateBranch1.id]).toEqual({
-      branch: 'wrong-channel',
-      branchRolloutPercentage: 15,
-      update: {
-        codeSigningKey: undefined,
-        group: '16ca6dba-e63b-48b0-baa3-15a894ee9434',
-        isRollBackToEmbedded: false,
-        message: `"fix bug" (${format('2023-07-17T22:48:59.278Z', 'en_US')} by quintest113)`,
-        platforms: 'android, ios',
-        runtimeVersion: 'exposdk:48.0.0',
-      },
-    });
-
-    expect(descriptionByBranchId[testUpdateBranch2.id]).toEqual({
-      branch: 'production',
-      branchRolloutPercentage: 85,
-      update: {
-        codeSigningKey: undefined,
-        group: 'e40ad156-e9af-4cc2-8e9d-c7b5c328db48',
-        isRollBackToEmbedded: false,
-        message: `"fix bug" (${format('2023-06-23T23:37:10.004Z', 'en_US')} by quintest113)`,
-        platforms: 'android, ios',
-        runtimeVersion: 'exposdk:48.0.0',
-      },
-    });
-  });
-  it('should get descriptions for branches with no updates', () => {
-    const noUpdatesBranch = { ...testUpdateBranch1, updateGroups: [] };
-    const oneBranchChannel = {
-      ...testChannelObject,
-      updateBranches: [noUpdatesBranch],
-      branchMapping: JSON.stringify(getAlwaysTrueBranchMapping(noUpdatesBranch.id)),
-    };
-    const descriptionByBranchId = getDescriptionByBranchId(oneBranchChannel);
-    expect(Object.values(descriptionByBranchId)).toHaveLength(1);
-    expect(descriptionByBranchId[testUpdateBranch1.id]).toEqual({ branch: 'wrong-channel' });
-  });
-  it('should get descriptions for no branches', () => {
-    const noBranchChannel = {
-      ...testChannelObject,
-      updateBranches: [],
-      branchMapping: JSON.stringify(getEmptyBranchMapping()),
-    };
-    const descriptionByBranchId = getDescriptionByBranchId(noBranchChannel);
-    expect(Object.values(descriptionByBranchId)).toHaveLength(0);
-  });
-});

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

@@ -1,11 +0,0 @@
-import { channelInfoWithBranches, testBasicBranchInfo1 } from './branch-mapping-fixtures';
-import { getUpdateBranch } from '../utils';
-
-describe(getUpdateBranch, () => {
-  it('gets the update branch', () => {
-    expect(getUpdateBranch(channelInfoWithBranches, '754bf17f-efc0-46ab-8a59-a03f20e53e9b')).toBe(
-      testBasicBranchInfo1
-    );
-    expect(() => getUpdateBranch(channelInfoWithBranches, 'not-a-branch-ID')).toThrow();
-  });
-});

packages/eas-cli/src/channel/actions/SelectChannel.ts

@@ -1,107 +0,0 @@
-import { EASUpdateAction, EASUpdateContext, NonInteractiveError } from '../../eas-update/utils';
-import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
-import {
-  Connection,
-  Edge,
-  FilterPagination,
-  QueryParams,
-  selectPaginatedAsync,
-} from '../../utils/relay';
-
-/**
- * Select a channel for the project.
- *
- * @constructor
- * @param {function} options.filterPredicate - A predicate to filter the channels that are shown to the user. It takes a channelInfo object as a parameter and returns a boolean.
- * @param {string} options.printedType - The type of channel printed to the user. Defaults to 'channel'.
- * @param {number} options.pageSize - The number of channels 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 SelectChannel implements EASUpdateAction<UpdateChannelBasicInfoFragment | null> {
-  constructor(
-    private readonly options: {
-      filterPredicate?: (channelInfo: UpdateChannelBasicInfoFragment) => boolean;
-      printedType?: string;
-      pageSize?: number;
-      beforeEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateChannelBasicInfoFragment>[]
-      ) => void;
-      afterEachFilterQuery?: (
-        externalQueryParams: QueryParams,
-        totalNodesFetched: number,
-        dataset: Edge<UpdateChannelBasicInfoFragment>[],
-        willFetchAgain: boolean
-      ) => void;
-    } = {}
-  ) {}
-
-  async queryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams
-  ): Promise<Connection<UpdateChannelBasicInfoFragment>> {
-    const { graphqlClient, app } = ctx;
-    const { projectId } = app;
-    return await ChannelQuery.viewUpdateChannelsBasicInfoPaginatedOnAppAsync(graphqlClient, {
-      appId: projectId,
-      ...queryParams,
-    });
-  }
-
-  async filterQueryAsync(
-    ctx: EASUpdateContext,
-    queryParams: QueryParams,
-    filterPredicate: (channelInfo: UpdateChannelBasicInfoFragment) => boolean
-  ): Promise<Connection<UpdateChannelBasicInfoFragment>> {
-    const queryAsync = async (
-      queryParams: QueryParams
-    ): Promise<Connection<UpdateChannelBasicInfoFragment>> =>
-      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<UpdateChannelBasicInfoFragment | null> {
-    const { nonInteractive } = ctx;
-    const { filterPredicate } = this.options;
-    const printedType = this.options.printedType ?? 'channel';
-    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<UpdateChannelBasicInfoFragment>> =>
-      filterPredicate
-        ? await this.filterQueryAsync(ctx, queryParams, filterPredicate)
-        : await this.queryAsync(ctx, queryParams);
-
-    const getTitleAsync = async (channelInfo: UpdateChannelBasicInfoFragment): Promise<string> =>
-      channelInfo.name;
-
-    return await selectPaginatedAsync({
-      queryAsync,
-      getTitleAsync,
-      printedType,
-      pageSize,
-    });
-  }
-}

packages/eas-cli/src/channel/actions/__tests__/SelectChannel-test.ts

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

packages/eas-cli/src/channel/branch-mapping.ts

@@ -1,214 +0,0 @@
-import { ChannelBasicInfo } from './utils';
-
-// TODO(quin): move this into a common package with www
-export type BranchMappingOperator =
-  | '=='
-  | '!='
-  | '<'
-  | '>'
-  | '<='
-  | '>='
-  | 'in'
-  | 'regex'
-  | 'hash_lt'
-  | 'hash_lte'
-  | 'hash_gt'
-  | 'hash_gte';
-export type BranchMappingObject = {
-  clientKey: string;
-  branchMappingOperator: BranchMappingOperator;
-  operand: number | string | string[];
-};
-export type BranchMappingAlwaysTrue = 'true';
-export type BranchMappingStatement =
-  | ['and' | 'or', ...BranchMappingNode[]]
-  | ['not', BranchMappingNode];
-export type BranchMappingNode =
-  | BranchMappingAlwaysTrue
-  | BranchMappingObject
-  | BranchMappingStatement;
-export type BranchMapping = {
-  version: number;
-  data: {
-    branchId: string;
-    branchMappingLogic: BranchMappingNode;
-  }[];
-};
-
-export type AlwaysTrueBranchMapping = {
-  version: number;
-  data: [
-    {
-      branchId: string;
-      branchMappingLogic: BranchMappingAlwaysTrue;
-    },
-  ];
-};
-
-export type EmptyBranchMapping = {
-  version: number;
-  data: [];
-};
-
-export function getEmptyBranchMapping(): EmptyBranchMapping {
-  return {
-    version: 0,
-    data: [],
-  };
-}
-
-export function getAlwaysTrueBranchMapping(branchId: string): AlwaysTrueBranchMapping {
-  return {
-    version: 0,
-    data: [
-      {
-        branchId,
-        branchMappingLogic: 'true',
-      },
-    ],
-  };
-}
-
-export function hasEmptyBranchMap(channelInfo: ChannelBasicInfo): boolean {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  return isEmptyBranchMapping(branchMapping);
-}
-
-export function hasStandardBranchMap(channelInfo: ChannelBasicInfo): boolean {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  return isAlwaysTrueBranchMapping(branchMapping);
-}
-
-export function getStandardBranchId(channelInfo: ChannelBasicInfo): string {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  assertAlwaysTrueBranchMapping(branchMapping);
-  return getBranchIdFromStandardMapping(branchMapping);
-}
-
-export function isEmptyBranchMapping(
-  branchMapping: BranchMapping
-): branchMapping is EmptyBranchMapping {
-  return branchMapping.data.length === 0;
-}
-
-export function isAlwaysTrueBranchMapping(
-  branchMapping: BranchMapping
-): branchMapping is AlwaysTrueBranchMapping {
-  const numBranches = branchMapping.data.length;
-  if (numBranches !== 1) {
-    return false;
-  }
-  const branchMappingLogic = branchMapping.data[0].branchMappingLogic;
-  return isAlwaysTrue(branchMappingLogic);
-}
-
-function getBranchIdFromStandardMapping(branchMapping: AlwaysTrueBranchMapping): string {
-  return branchMapping.data[0].branchId;
-}
-
-export function getBranchIds(branchMapping: BranchMapping): string[] {
-  return branchMapping.data.map(data => data.branchId);
-}
-
-export function getBranchMapping(branchMappingString: string): BranchMapping {
-  try {
-    return JSON.parse(branchMappingString);
-  } catch {
-    throw new Error(`Could not parse branchMapping string into a JSON: "${branchMappingString}"`);
-  }
-}
-
-export function getNodesFromStatement(statement: BranchMappingStatement): BranchMappingNode[] {
-  return statement.slice(1) as BranchMappingNode[];
-}
-
-export function isAndStatement(
-  statement: BranchMappingStatement
-): statement is BranchMappingStatement {
-  return statement[0] === 'and';
-}
-
-export function isStatement(node: BranchMappingNode): node is BranchMappingStatement {
-  return Array.isArray(node);
-}
-
-export function isNodeObject(node: BranchMappingNode): node is BranchMappingObject {
-  return typeof node === 'object' && !isStatement(node);
-}
-
-export function andStatement(nodes: BranchMappingNode[]): ['and', ...BranchMappingNode[]] {
-  return ['and', ...nodes];
-}
-
-export function isAlwaysTrue(node: BranchMappingNode): boolean {
-  return node === 'true';
-}
-
-export function alwaysTrue(): BranchMappingAlwaysTrue {
-  return 'true';
-}
-
-export function equalsOperator(): BranchMappingOperator {
-  return '==';
-}
-
-export function hashLtOperator(): BranchMappingOperator {
-  return 'hash_lt';
-}
-
-function isVersion(branchMapping: BranchMapping, version: number): boolean {
-  return branchMapping.version === version;
-}
-
-export function assertVersion(channelInfo: ChannelBasicInfo, version: number): void {
-  const branchMapping = getBranchMapping(channelInfo.branchMapping);
-  if (!isVersion(branchMapping, version)) {
-    throw new BranchMappingValidationError(
-      `Expected branch mapping version ${version}. Received: ${JSON.stringify(branchMapping)}`
-    );
-  }
-}
-
-export function assertStatement(node: BranchMappingNode): asserts node is BranchMappingStatement {
-  if (!isStatement(node)) {
-    throw new BranchMappingValidationError(
-      'Branch mapping node must be a statement. Received: ' + JSON.stringify(node)
-    );
-  }
-}
-
-export function assertNodeObject(node: BranchMappingNode): asserts node is BranchMappingObject {
-  if (!isNodeObject(node)) {
-    throw new BranchMappingValidationError(
-      'Branch mapping node must be an object. Received: ' + JSON.stringify(node)
-    );
-  }
-}
-
-export function assertNumber(operand: string | number | string[]): asserts operand is number {
-  if (typeof operand !== 'number') {
-    throw new BranchMappingValidationError(
-      'Expected a number. Received: ' + JSON.stringify(operand)
-    );
-  }
-}
-
-export function assertString(operand: string | number | string[]): asserts operand is string {
-  if (typeof operand !== 'string') {
-    throw new BranchMappingValidationError(
-      'Expected a string. Received: ' + JSON.stringify(operand)
-    );
-  }
-}
-
-function assertAlwaysTrueBranchMapping(
-  branchMapping: BranchMapping
-): asserts branchMapping is AlwaysTrueBranchMapping {
-  if (!isAlwaysTrueBranchMapping(branchMapping)) {
-    throw new BranchMappingValidationError(
-      'Expected standard branch mapping. Received: ' + JSON.stringify(branchMapping)
-    );
-  }
-}
-
-export class BranchMappingValidationError extends Error {}