v3.12.0

* [eas-cli] upgrade @expo/steps

* update CHANGELOG.md

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -37,7 +37,7 @@ body:
       required: true
     attributes:
       label: Environment
-      description: Run `npx expo-env-info` and `expo doctor`, and paste the output here.
+      description: Run `npx expo-env-info` and `npx expo-doctor`, and paste the output here.
   - type: textarea
     validations:
       required: false

.github/PULL_REQUEST_TEMPLATE

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

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

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

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

@@ -0,0 +1,53 @@
+name: notify-slack-on-fail-or-recover
+
+inputs:
+  channel:
+    required: true
+    type: string
+  slack_webhook:
+    required: true
+    type: string
+
+runs:
+  using: 'composite'
+  steps:
+    - name: Get previous workflow run status
+      uses: actions/github-script@v6
+      id: run-status
+      with:
+        script: |
+          const script = require('.github/internal-actions/notify-slack-on-fail-or-recover/main.js');
+          return await script({github, context, core});
+
+    - name: Commit subject
+      shell: bash
+      run: |
+        subject="$(git show --format=%s --quiet | sed 's/"/\\"/g')"
+        echo "${{ fromJSON(steps.run-status.outputs.result).previous }}"
+        echo "SUBJECT=$subject" >> "$GITHUB_ENV"
+
+    - name: Send Slack Success Notification
+      if: fromJSON(steps.run-status.outputs.result).previous == 'failure' && fromJSON(steps.run-status.outputs.result).current == 'success'
+      uses: rtCamp/action-slack-notify@v2
+      env:
+        SLACK_CHANNEL: ${{ inputs.channel }}
+        SLACK_COLOR: good
+        SLACK_ICON: https://github.com/expo-bot.png?size=48
+        SLACK_TITLE: 'Fixed, was failing'
+        SLACK_MESSAGE: ${{ env.SUBJECT }}
+        SLACK_USERNAME: 'EAS CLI CI'
+        SLACK_WEBHOOK: ${{ inputs.slack_webhook }}
+        SLACK_FOOTER: ''
+
+    - name: Send Slack Failure Notification
+      if: fromJSON(steps.run-status.outputs.result).current == 'failure'
+      uses: rtCamp/action-slack-notify@v2
+      env:
+        SLACK_CHANNEL: ${{ inputs.channel }}
+        SLACK_COLOR: danger
+        SLACK_ICON: https://github.com/expo-bot.png?size=48
+        SLACK_TITLE: 'Failed'
+        SLACK_MESSAGE: ${{ env.SUBJECT }}
+        SLACK_USERNAME: 'EAS CLI CI'
+        SLACK_WEBHOOK: ${{ inputs.slack_webhook }}
+        SLACK_FOOTER: ''

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

@@ -0,0 +1,155 @@
+function updateOctokitInstance(github) {
+  updateGithubRestActions(github);
+  addConvenienceMethods(github);
+}
+
+function addConvenienceMethods(github) {
+  Object.assign(github, {
+    // checks if a run is a failure from the perspective of sending Slack
+    // notifications. Works for both runs and run attempts, which should be the
+    // same object shapes.
+    // When a run has not been completed, it fetches the jobs for the workflow
+    // to check if the job is "failing" instead of "failed".
+    async isFailedRun(run) {
+      console.log(`checking run: ${run.id}`);
+      console.log(`status: ${run.status}`);
+      console.log(`conclusion: ${run.conclusion}`);
+      console.log(`run_attempt: ${run.run_attempt}`);
+
+      if (run.status === 'completed') {
+        console.log('completed -- checking conclusion');
+        return run.conclusion === 'failure' || run.conclusion === 'timed_out';
+      }
+
+      const owner = run.repository.owner.login;
+      const repo = run.repository.name;
+      const jobsResp = await github.rest.actions.listJobsForWorkflowRun({
+        owner,
+        repo,
+        run_id: run.id,
+      });
+
+      console.log('checking jobs');
+      const jobs = jobsResp.data;
+      for (const job of jobs.jobs) {
+        if (job.conclusion === 'failure' || job.conclusion === 'timed_out') {
+          console.log('job failed');
+          return true;
+        } else if (job.status === 'completed') {
+          continue;
+        }
+
+        for (const step of job.steps) {
+          if (step.conclusion === 'failure') {
+            console.log('job step failed');
+            return true;
+          }
+        }
+      }
+
+      return false;
+    },
+  });
+}
+
+// github-script's Octokit/REST plugins are out of date, so we have to
+// add our own custom endpoint method
+// see https://octokit.github.io/rest.js/v18#custom-endpoint-methods for
+// documentation
+function updateGithubRestActions(github) {
+  Object.assign(github.rest.actions, {
+    getWorkflowRunAttempt: github.request.defaults({
+      method: 'GET',
+      url: '/repos/{owner}/{repo}/actions/runs/{run_id}/attempts/{attempt_number}',
+      params: {
+        owner: {
+          required: true,
+          type: 'string',
+        },
+        repo: {
+          required: true,
+          type: 'string',
+        },
+        run_id: {
+          required: true,
+          type: 'number',
+        },
+        attempt_number: {
+          required: true,
+          type: 'number',
+        },
+      },
+    }),
+  });
+}
+
+// Returns  { current: 'failure' } | { current: 'success', previous: 'success' | 'failure' } to indicate the failure status
+// of the current and previous runs
+module.exports = async ({ github }) => {
+  const { GITHUB_REPOSITORY, GITHUB_RUN_ID, GITHUB_REF_NAME } = process.env;
+  const [owner, repo] = GITHUB_REPOSITORY.split('/');
+  updateOctokitInstance(github);
+
+  const workflowRunResp = await github.rest.actions.getWorkflowRun({
+    owner,
+    repo,
+    run_id: GITHUB_RUN_ID,
+  });
+
+  const currentRun = workflowRunResp.data;
+  const listWorkflowRunsResp = await github.rest.actions.listWorkflowRuns({
+    owner,
+    repo,
+    workflow_id: currentRun.workflow_id,
+    branch: GITHUB_REF_NAME,
+  });
+  const { workflow_runs } = listWorkflowRunsResp.data;
+
+  if (workflow_runs.length === 1 && workflow_runs[0].run_attempt === 1) {
+    return false;
+  }
+
+  const previousRuns = workflow_runs.filter(
+    (run) => run.status === 'completed' && run.conclusion !== 'cancelled'
+  );
+
+  if (await github.isFailedRun(currentRun)) {
+    return { current: 'failure', previous: null };
+  }
+
+  if (currentRun.run_attempt === 1 && previousRuns.length > 0) {
+    return {
+      current: 'success',
+      previous: (await github.isFailedRun(previousRuns[0])) ? 'failure' : 'success',
+    };
+  }
+
+  for (let i = currentRun.run_attempt - 1; i > 0; i--) {
+    const previousAttemptResp = await github.rest.actions.getWorkflowRunAttempt({
+      owner,
+      repo,
+      run_id: currentRun.id,
+      attempt_number: i,
+    });
+    const previousAttempt = previousAttemptResp.data;
+    if (
+      previousAttempt.conclusion === 'success' ||
+      previousAttempt.conclusion === 'failure' ||
+      previousAttempt.conclusion === 'timed_out'
+    ) {
+      return {
+        current: 'success',
+        previous: (await github.isFailedRun(previousAttempt)) ? 'failure' : 'success',
+      };
+    }
+  }
+
+  if (previousRuns.length > 0) {
+    return {
+      current: 'success',
+      previous: (await github.isFailedRun(previousRuns[0])) ? 'failure' : 'success',
+    };
+  }
+
+  return { current: 'success', previous: 'success' };
+};

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

@@ -0,0 +1,12 @@
+{
+  "name": "notify-slack-on-fail-or-recover",
+  "version": "1.0.0",
+  "description": "A GitHub Action to notify Expo Slack of build failures and recovery.",
+  "main": "main.js",
+  "author": "Expo",
+  "license": "UNLICENSED",
+  "private": true,
+  "devDependencies": {
+    "prettier": "^2.5.1"
+  }
+}

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

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+[email protected]:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.5.1.tgz#fff75fa9d519c54cf0fce328c1017d94546bc56a"
+  integrity sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==

.github/workflows/changelog-bot.yml

@@ -0,0 +1,48 @@
+name: Changelog bot
+
+on:
+  issue_comment:
+    types: [created]
+
+jobs:
+  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
+        with:
+          token: ${{ secrets.EXPO_BOT_PAT }}
+      - uses: actions/setup-node@v2
+        with:
+          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/changelog.yml

@@ -1,48 +1,37 @@
-on:
-  issue_comment:
-    types: [created]
+name: CHANGELOG.md PR check
 
-name: Changelog
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - labeled
+      - unlabeled
 
 jobs:
-  pr-commented:
+  pr-changelog-entry:
+    name: Check CHANGELOG.md updated
     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@v35
         with:
-          token: ${{ secrets.EXPO_BOT_PAT }}
-      - uses: actions/setup-node@v2
+          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:
-          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
+          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. You have two options: you can add it manually, or you can use the changelog bot to do it for you.
+            🤖 To use the bot, simply comment on this PR with the command `/changelog-entry [breaking-change|new-feature|bug-fix|chore] [message]`.
+            ⏩ 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.

.github/workflows/release.yml

@@ -161,6 +161,8 @@ jobs:
     needs: publish-to-npm
     steps:
       - uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.EXPO_BOT_PAT }}
       - uses: actions/setup-node@v2
         with:
           node-version: 18
@@ -197,9 +199,9 @@ jobs:
         env:
           SLACK_CHANNEL: eas-cli
           SLACK_COLOR: ${{ job.status }}
-          SLACK_ICON: https://github.com/expo-ci.png?size=48
+          SLACK_ICON: https://github.com/expo-bot.png?size=48
           SLACK_TITLE: 'Released eas-cli@${{ env.EAS_CLI_VERSION }}'
           SLACK_MESSAGE: ${{ env.SLACK_CHANGELOG }}
-          SLACK_USERNAME: 'Expo CI'
+          SLACK_USERNAME: 'EAS CLI CI'
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_FOOTER: ''

.github/workflows/test.yml

@@ -1,4 +1,5 @@
 name: Run tests
+
 on:
   push:
     branches: [main]
@@ -34,8 +35,21 @@ jobs:
       - 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 }}

CHANGELOG.md

@@ -8,8 +8,153 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Add `build:version:get` command. ([#1815](https://github.com/expo/eas-cli/pull/1815) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+- Upgrade dependencies. ([#1824](https://github.com/expo/eas-cli/pull/1824) by [@dsokal](https://github.com/dsokal))
+
+## [3.11.0](https://github.com/expo/eas-cli/releases/tag/v3.11.0) - 2023-05-05
+
+### 🎉 New features
+
+- Add account list to `eas whoami`/`eas account:view`. ([#1814](https://github.com/expo/eas-cli/pull/1814) by [@wschurman](https://github.com/wschurman))
+- Add `large` resource class for iOS as allowed value in `eas.json`. ([#1817](https://github.com/expo/eas-cli/pull/1817) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
+- Print request ID on unforeseen GraphQL error for easier tracking and follow up. ([#1813](https://github.com/expo/eas-cli/pull/1813) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [3.10.2](https://github.com/expo/eas-cli/releases/tag/v3.10.2) - 2023-04-25
+
+### 🧹 Chores
+
+- Add info about Xcode 14.3 image to `eas.schema.json`. ([#1808](https://github.com/expo/eas-cli/pull/1808) by [@szdziedzic](https://github.com/szdziedzic))
+- Allow users to select an app to run using the `build:run` command if multiple apps are found in the tarball. ([#1807](https://github.com/expo/eas-cli/pull/1807) by [@szdziedzic](https://github.com/szdziedzic))
+- Don't resolve `default` resource class for iOS in CLI. ([#1734](https://github.com/expo/eas-cli/pull/1734) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.10.1](https://github.com/expo/eas-cli/releases/tag/v3.10.1) - 2023-04-25
+
+### 🧹 Chores
+
+- Add `cache.paths` field and deprecate `cache.customPaths`. ([#1794](https://github.com/expo/eas-cli/pull/1794) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [3.10.0](https://github.com/expo/eas-cli/releases/tag/v3.10.0) - 2023-04-21
+
+### 🎉 New features
+
+- Added eas device:rename command. ([#1787](https://github.com/expo/eas-cli/pull/1787) by [@keith-kurak](https://github.com/keith-kurak))
+
+### 🐛 Bug fixes
+
+- Fix `device:delete` not disabling on Apple. ([#1803](https://github.com/expo/eas-cli/pull/1803) by [@keith-kurak](https://github.com/keith-kurak))
+- Fix message truncation for updates. ([#1801](https://github.com/expo/eas-cli/pull/1801) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Throw an error if somebody tries to start iOS build with the `large` resource class selected using the deprecated `--resource-class` flag. ([#1795](https://github.com/expo/eas-cli/pull/1795) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.9.3](https://github.com/expo/eas-cli/releases/tag/v3.9.3) - 2023-04-18
+
+### 🐛 Bug fixes
+
+- Fix prompts in `eas update`. ([#1797](https://github.com/expo/eas-cli/pull/1797) by [@wschurman](https://github.com/wschurman))
+
+## [3.9.2](https://github.com/expo/eas-cli/releases/tag/v3.9.2) - 2023-04-13
+
+### 🐛 Bug fixes
+
+- Fixes the rollout percentages when ending a rollout. ([#1781](https://github.com/expo/eas-cli/pull/1781) by [@jonsamp](https://github.com/jonsamp))
+- Print meaningful error message if `extra.eas.projectId` is not a string. ([#1788](https://github.com/expo/eas-cli/pull/1788) by [@dsokal](https://github.com/dsokal))
+
+### 🧹 Chores
+
+- Show output of `expo install expo-updates`. ([#1782](https://github.com/expo/eas-cli/pull/1782) by [@wkozyra95](https://github.com/wkozyra95))
+- Print deprecation warnings for deprecated `eas.json` fields. ([#1768](https://github.com/expo/eas-cli/pull/1768) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.9.1](https://github.com/expo/eas-cli/releases/tag/v3.9.1) - 2023-04-10
+
+### 🐛 Bug fixes
+
+- Update apple utilities to work around the maintenance error. ([#1780](https://github.com/expo/eas-cli/pull/1780) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Don't use defaults for the `cache.cacheDefaultPaths` build profile field. ([#1769](https://github.com/expo/eas-cli/pull/1769) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.9.0](https://github.com/expo/eas-cli/releases/tag/v3.9.0) - 2023-04-06
+
+### 🎉 New features
+
+- Add support for roll back to embedded updates. ([#1754](https://github.com/expo/eas-cli/pull/1754), [#1755](https://github.com/expo/eas-cli/pull/1755) by [@wschurman](https://github.com/wschurman))
+
+### 🐛 Bug fixes
+
+- Update `expoCommandAsync` to support the new Expo CLI bin path. ([#1772](https://github.com/expo/eas-cli/pull/1772) by [@gabrieldonadel](https://github.com/gabrieldonadel))
+
+### 🧹 Chores
+
+- Use the `eas-cli` npm tag for checking for the local build plugin updates. ([#1759](https://github.com/expo/eas-cli/pull/1759) by [@dsokal](https://github.com/dsokal))
+- Ignore `requireCommit` option in `eas build:internal`. ([#1760](https://github.com/expo/eas-cli/pull/1760) by [@wkozyra95](https://github.com/wkozyra95))
+- Support parsing eas.json from a string. ([#1766](https://github.com/expo/eas-cli/pull/1766) by [@wkozyra95](https://github.com/wkozyra95))
+
+## [3.8.1](https://github.com/expo/eas-cli/releases/tag/v3.8.1) - 2023-03-16
+
+### 🐛 Bug fixes
+
+- Ensure public config is used as update. ([#1745](https://github.com/expo/eas-cli/pull/1745) by [@byCedric](https://github.com/byCedric))
+
+### 🧹 Chores
+
+- Unify how the command errors are displayed. ([#1738](https://github.com/expo/eas-cli/pull/1738) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+- Unify the case of base error messages for command failures. ([#1744](https://github.com/expo/eas-cli/pull/1744) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
+
+## [3.8.0](https://github.com/expo/eas-cli/releases/tag/v3.8.0) - 2023-03-13
+
+### 🎉 New features
+
+- Add new `m-medium` and `m-large` resource classes. ([#1739](https://github.com/expo/eas-cli/pull/1739) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.7.2](https://github.com/expo/eas-cli/releases/tag/v3.7.2) - 2023-02-24
+
+### 🐛 Bug fixes
+
+- Implement Apple's proprietary Hashcash algorithm for signing authentication requests. ([#1719](https://github.com/expo/eas-cli/pull/1719) by [@EvanBacon](https://github.com/EvanBacon))
+
+## [3.7.1](https://github.com/expo/eas-cli/releases/tag/v3.7.1) - 2023-02-23
+
+### 🐛 Bug fixes
+
+- Bump `@expo/apple-utils` to fix Apple developer auth. ([03c76c1](https://github.com/expo/eas-cli/commit/03c76c1e0efb9ec55e40b45e33c80b3479f920c3) by [@brentvatne](https://github.com/brentvatne))
+
+## [3.7.0](https://github.com/expo/eas-cli/releases/tag/v3.7.0) - 2023-02-23
+
+### 🎉 New features
+
+- Support variant detection for package*UniversalApk Gradle Commands. ([#1708](https://github.com/expo/eas-cli/pull/1708) by [@frw](https://github.com/frw))
+
+## [3.6.1](https://github.com/expo/eas-cli/releases/tag/v3.6.1) - 2023-02-20
+
+### 🐛 Bug fixes
+
+- Disable analytics when running behind a proxy. ([#1696](https://github.com/expo/eas-cli/pull/1696) by [@wkozyra95](https://github.com/wkozyra95))
+- Clarify missing owner field error message for Robot users. ([#1702](https://github.com/expo/eas-cli/pull/1702) by [@wschurman](https://github.com/wschurman))
+
+### 🧹 Chores
+
+- Validate the platform for local builds earlier. ([#1698](https://github.com/expo/eas-cli/pull/1698) by [@wkozyra95](https://github.com/wkozyra95))
+- Display build message when picking build in `eas submit`, `eas build:resign`, and `eas build:run` commands. ([#1700](https://github.com/expo/eas-cli/pull/1700) by [@szdziedzic](https://github.com/szdziedzic))
+- Add a link directly to a build phase logs in the EAS CLI build error message. ([#1699](https://github.com/expo/eas-cli/pull/1699) by [@szdziedzic](https://github.com/szdziedzic))
+
+## [3.6.0](https://github.com/expo/eas-cli/releases/tag/v3.6.0) - 2023-02-14
+
+### 🎉 New features
+
 - Use `sdkVersion` as default runtime version policy when running `eas update:configure`. ([#1669](https://github.com/expo/eas-cli/pull/1669) by [@jonsamp](https://github.com/jonsamp))
 - Warn when project ID but no owner specified and mismatch logged in user. ([#1667](https://github.com/expo/eas-cli/pull/1667) by [@wschurman](https://github.com/wschurman))
+- Return the build `message` if one is available. ([#1691](https://github.com/expo/eas-cli/pull/1691) by [@raulriera](https://github.com/raulriera))
 
 ### 🐛 Bug fixes
 
@@ -17,6 +162,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Add Xcode 14.2 image to the VSCode schema. ([#1693](https://github.com/expo/eas-cli/pull/1693) by [@szdziedzic](https://github.com/szdziedzic))
+
 ## [3.5.2](https://github.com/expo/eas-cli/releases/tag/v3.5.2) - 2023-02-05
 
 ### 🐛 Bug fixes

lerna.json

@@ -1,6 +1,6 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "3.5.2",
+  "version": "3.12.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -14,7 +14,7 @@
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint .",
     "lint-changelog": "./scripts/bin/run lint-changelog",
-    "release": "./scripts/bin/run release",
+    "release": "lerna run rebuild && ./scripts/bin/run release",
     "test": "jest",
     "clean": "lerna run clean && rm -rf node_modules coverage"
   },

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

@@ -2,4 +2,5 @@ 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,20 +1,20 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "3.5.2",
+  "version": "3.12.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "0.0.0-alpha.37",
+    "@expo/apple-utils": "1.2.0",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "7.0.3",
     "@expo/config-plugins": "5.0.4",
     "@expo/config-types": "47.0.0",
-    "@expo/eas-build-job": "0.2.103",
-    "@expo/eas-json": "3.5.0",
+    "@expo/eas-build-job": "1.0.10",
+    "@expo/eas-json": "3.11.0",
     "@expo/json-file": "8.2.37",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/osascript": "2.0.33",
@@ -27,6 +27,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
+    "@expo/steps": "1.0.11",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "1.23.2",
     "@oclif/plugin-autocomplete": "1.3.10",
@@ -202,7 +203,8 @@
   "repository": "expo/eas-cli",
   "scripts": {
     "postpack": "rimraf oclif.manifest.json",
-    "prepack": "rimraf build && yarn build && node ./scripts/prepack.js",
+    "prepack": "yarn rebuild && node ./scripts/prepack.js",
+    "rebuild": "rimraf build && yarn build",
     "pretarball-ci": "./scripts/pretarball-ci.sh",
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",

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

@@ -133,7 +133,9 @@ export async function createAnalyticsAsync(): Promise<AnalyticsWithOrchestration
     await UserSettings.setAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, false);
   }
 
-  const analyticsEnabled = await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true);
+  const analyticsEnabled =
+    !process.env.https_proxy && // disable analytics if running behind proxy
+    (await UserSettings.getAsync(USER_SETTINGS_KEY_ANALYTICS_ENABLED, true));
   if (!analyticsEnabled) {
     return new NoOpAnalytics();
   }

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

@@ -0,0 +1,416 @@
+import { Platform } from '@expo/eas-build-job';
+import { CombinedError } from '@urql/core';
+import { GraphQLError } from 'graphql/error';
+import { v4 as uuidv4 } from 'uuid';
+
+import { EasCommandError } from '../../commandUtils/errors';
+import Build from '../../commands/build';
+import Log, { link } from '../../log';
+import { handleBuildRequestError } from '../build';
+import {
+  EasBuildDownForMaintenanceError,
+  EasBuildFreeTierDisabledAndroidError,
+  EasBuildFreeTierDisabledError,
+  EasBuildFreeTierDisabledIOSError,
+  EasBuildTooManyPendingBuildsError,
+  RequestValidationError,
+  TurtleDeprecatedJobFormatError,
+} from '../errors';
+
+beforeEach(() => {
+  jest.resetAllMocks();
+});
+
+const EXPECTED_STRINGIFIED_GRAPHQL_ERROR_JSON = `[
+  {
+    "message": "Error 1"
+  },
+  {
+    "message": "Error 2"
+  },
+  {
+    "message": "Error 3"
+  }
+]`;
+
+const EXPECTED_EAS_BUILD_DOWN_MESSAGE = `EAS Build is down for maintenance. Try again later. Check ${link(
+  'https://status.expo.dev/'
+)} for updates.`;
+
+const EXPECTED_MAX_BUILD_COUNT_MESSAGE_ANDROID = `You have already reached the maximum number of pending Android builds for your account. Try again later.`;
+const EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS = `You have already reached the maximum number of pending iOS builds for your account. Try again later.`;
+
+const EXPECTED_GENERIC_MESSAGE =
+  'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.';
+
+const 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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError, '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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, TurtleDeprecatedJobFormatError, '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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, 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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, 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 });
+
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            assertReThrownError(
+              caughtError as Error,
+              EasBuildFreeTierDisabledAndroidError,
+              '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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, 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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, 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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(
+                caughtError as Error,
+                EasBuildTooManyPendingBuildsError,
+                EXPECTED_MAX_BUILD_COUNT_MESSAGE_IOS
+              );
+            }
+          });
+        });
+      });
+    });
+
+    describe('error is unexpected graphQL-related error', () => {
+      describe('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}`;
+
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, 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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
+            }
+          });
+        });
+      });
+      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}`;
+
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            assertReThrownError(caughtError as Error, 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 });
+
+            try {
+              handleBuildRequestError(error, platform);
+            } catch (caughtError) {
+              assertReThrownError(caughtError as Error, Error, EXPECTED_GENERIC_MESSAGE);
+            }
+          });
+        });
+      });
+    });
+
+    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');
+
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            expect(caughtError).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');
+
+          try {
+            handleBuildRequestError(error, platform);
+          } catch (caughtError) {
+            expect(caughtError).toStrictEqual(error);
+          }
+        });
+      });
+    });
+  });
+});

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

@@ -124,7 +124,8 @@ export async function prepareAndroidBuildAsync(
 }
 
 function shouldProvideCredentials(ctx: BuildContext<Platform.ANDROID>): boolean {
-  return !ctx.buildProfile.withoutCredentials;
+  const isCustomBuild = ctx.buildProfile.config !== undefined;
+  return !ctx.buildProfile.withoutCredentials && !isCustomBuild;
 }
 
 async function ensureAndroidCredentialsAsync(

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

@@ -1,7 +1,12 @@
 import { Android } from '@expo/eas-build-job';
 
 import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
-import { transformBuildTrigger, transformProjectArchive, transformWorkflow } from '../graphql';
+import {
+  transformBuildMode,
+  transformBuildTrigger,
+  transformProjectArchive,
+  transformWorkflow,
+} from '../graphql';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {
@@ -22,6 +27,8 @@ 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,
   };
 }
 

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

@@ -12,6 +12,7 @@ import path from 'path';
 import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
+import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
@@ -23,8 +24,7 @@ interface JobData {
 
 const cacheDefaults = {
   disabled: false,
-  customPaths: [],
-  cacheDefaultPaths: true,
+  paths: [],
 };
 
 export async function prepareJobAsync(
@@ -49,11 +49,15 @@ export async function prepareJobAsync(
       }
     : {};
 
-  let buildType = ctx.buildProfile.buildType;
-  if (!buildType && !buildProfile.gradleCommand && ctx.buildProfile.distribution === 'internal') {
+  let buildType = buildProfile.buildType;
+  if (!buildType && !buildProfile.gradleCommand && buildProfile.distribution === 'internal') {
     buildType = Android.BuildType.APK;
   }
 
+  const maybeCustomBuildConfigPath = buildProfile.config
+    ? getCustomBuildConfigPath(buildProfile.config)
+    : undefined;
+
   const job: Android.Job = {
     type: ctx.workflow,
     platform: Platform.ANDROID,
@@ -75,8 +79,8 @@ export async function prepareJobAsync(
     secrets: {
       ...buildCredentials,
     },
-    releaseChannel: ctx.buildProfile.releaseChannel,
-    updates: { channel: ctx.buildProfile.channel },
+    releaseChannel: buildProfile.releaseChannel,
+    updates: { channel: buildProfile.channel },
     developmentClient: buildProfile.developmentClient,
     gradleCommand: buildProfile.gradleCommand,
     applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
@@ -89,10 +93,15 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: ctx.buildProfile.prebuildCommand,
+      prebuildCommand: buildProfile.prebuildCommand,
     },
-    mode: BuildMode.BUILD,
+    mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
     triggeredBy: BuildTrigger.EAS_CLI,
+    ...(maybeCustomBuildConfigPath && {
+      customBuildConfig: {
+        path: maybeCustomBuildConfigPath,
+      },
+    }),
   };
 
   return sanitizeJob(job);

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

@@ -10,6 +10,7 @@ import { BuildEvent } from '../analytics/AnalyticsManager';
 import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasCommandError } from '../commandUtils/errors';
 import {
   AppPlatform,
   BuildFragment,
@@ -36,6 +37,15 @@ import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
 import { getVcsClient } from '../vcs';
 import { BuildContext } from './context';
+import {
+  EasBuildDownForMaintenanceError,
+  EasBuildFreeTierDisabledAndroidError,
+  EasBuildFreeTierDisabledError,
+  EasBuildFreeTierDisabledIOSError,
+  EasBuildTooManyPendingBuildsError,
+  RequestValidationError,
+  TurtleDeprecatedJobFormatError,
+} from './errors';
 import { transformMetadata } from './graphql';
 import { LocalBuildMode, runLocalBuildAsync } from './local';
 import { collectMetadataAsync } from './metadata';
@@ -70,9 +80,14 @@ interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
 
 export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
 
-function resolveBuildParamsInput<T extends Platform>(ctx: BuildContext<T>): BuildParamsInput {
+function resolveBuildParamsInput<T extends Platform>(
+  ctx: BuildContext<T>,
+  metadata: Metadata
+): BuildParamsInput {
   return {
     resourceClass: ctx.resourceClass,
+    sdkVersion: metadata.sdkVersion,
+    reactNativeVersion: metadata.reactNativeVersion,
   };
 }
 
@@ -132,7 +147,7 @@ export async function prepareBuildRequestForPlatformAsync<
   assert(projectArchive);
 
   const metadata = await collectMetadataAsync(ctx);
-  const buildParams = resolveBuildParamsInput(ctx);
+  const buildParams = resolveBuildParamsInput(ctx, metadata);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
     credentials: credentialsResult?.credentials,
@@ -161,39 +176,38 @@ export async function prepareBuildRequestForPlatformAsync<
   };
 }
 
-const SERVER_SIDE_DEFINED_ERRORS = [
-  'TURTLE_DEPRECATED_JOB_FORMAT',
-  'EAS_BUILD_FREE_TIER_DISABLED',
-  'EAS_BUILD_FREE_TIER_DISABLED_IOS',
-  'EAS_BUILD_FREE_TIER_DISABLED_ANDROID',
-  'VALIDATION_ERROR',
-];
+const SERVER_SIDE_DEFINED_ERRORS: Record<string, typeof EasCommandError> = {
+  TURTLE_DEPRECATED_JOB_FORMAT: TurtleDeprecatedJobFormatError,
+  EAS_BUILD_FREE_TIER_DISABLED: EasBuildFreeTierDisabledError,
+  EAS_BUILD_FREE_TIER_DISABLED_IOS: EasBuildFreeTierDisabledIOSError,
+  EAS_BUILD_FREE_TIER_DISABLED_ANDROID: EasBuildFreeTierDisabledAndroidError,
+  VALIDATION_ERROR: RequestValidationError,
+};
 
-function handleBuildRequestError(error: any, platform: Platform): never {
+export function handleBuildRequestError(error: any, platform: Platform): never {
   Log.debug(JSON.stringify(error.graphQLErrors, null, 2));
 
-  if (SERVER_SIDE_DEFINED_ERRORS.includes(error?.graphQLErrors?.[0]?.extensions?.errorCode)) {
-    Log.error(error?.graphQLErrors?.[0]?.message);
-    throw new Error('Build request failed.');
-  } else if (
-    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE'
-  ) {
-    Log.error(
+  const graphQLErrorCode: string = error?.graphQLErrors?.[0]?.extensions?.errorCode;
+  if (graphQLErrorCode in SERVER_SIDE_DEFINED_ERRORS) {
+    const ErrorClass: typeof EasCommandError = SERVER_SIDE_DEFINED_ERRORS[graphQLErrorCode];
+    throw new ErrorClass(error?.graphQLErrors?.[0]?.message);
+  } else if (graphQLErrorCode === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
+    throw new EasBuildDownForMaintenanceError(
       `EAS Build is down for maintenance. Try again later. Check ${link(
         'https://status.expo.dev/'
       )} for updates.`
     );
-    throw new Error('Build request failed.');
-  } else if (
-    error?.graphQLErrors?.[0]?.extensions?.errorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS'
-  ) {
-    Log.error(
+  } else if (graphQLErrorCode === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
+    throw new EasBuildTooManyPendingBuildsError(
       `You have already reached the maximum number of pending ${requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`
     );
-    throw new Error('Build request failed.');
   } else if (error?.graphQLErrors) {
-    Log.error(
-      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.'
+    const requestIdLine = error?.graphQLErrors?.[0]?.extensions?.requestId
+      ? `\nRequest ID: ${error.graphQLErrors[0].extensions.requestId}`
+      : '';
+    throw new Error(
+      'Build request failed. Make sure you are using the latest eas-cli version. If the problem persists, report the issue.' +
+        requestIdLine
     );
   }
   throw error;
@@ -607,7 +621,7 @@ function formatAccountSubscriptionsUrl(accountName: string): string {
 }
 
 async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir: string): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   await easJsonAccessor.readRawJsonAsync();
 
   const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
@@ -615,7 +629,7 @@ async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir: string): Pr
     for (const profileName of profileNames) {
       easJsonRawObject.build[profileName].ios = {
         ...easJsonRawObject.build[profileName].ios,
-        resourceClass: ResourceClass.M1_MEDIUM,
+        resourceClass: ResourceClass.M_MEDIUM,
       };
     }
     return easJsonRawObject;

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

@@ -1,5 +1,5 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor, ResourceClass } from '@expo/eas-json';
+import { EasJson, EasJsonAccessor } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
@@ -53,21 +53,11 @@ const EAS_JSON_MANAGED_DEFAULT: EasJson = {
     development: {
       developmentClient: true,
       distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
     },
     preview: {
       distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
-    },
-    production: {
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
     },
+    production: {},
   },
   submit: {
     production: {},
@@ -86,20 +76,12 @@ const EAS_JSON_BARE_DEFAULT: EasJson = {
       },
       ios: {
         buildConfiguration: 'Debug',
-        resourceClass: ResourceClass.M1_MEDIUM,
       },
     },
     preview: {
       distribution: 'internal',
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
-    },
-    production: {
-      ios: {
-        resourceClass: ResourceClass.M1_MEDIUM,
-      },
     },
+    production: {},
   },
   submit: {
     production: {},

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

@@ -90,8 +90,6 @@ export async function createBuildContextAsync<T extends Platform>({
   const resourceClass = await resolveBuildResourceClassAsync(
     buildProfile,
     platform,
-    projectDir,
-    exp,
     resourceClassFlag
   );
 

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

@@ -0,0 +1,15 @@
+import { EasCommandError } from '../commandUtils/errors';
+
+export class TurtleDeprecatedJobFormatError extends EasCommandError {}
+
+export class EasBuildFreeTierDisabledError extends EasCommandError {}
+
+export class EasBuildFreeTierDisabledIOSError extends EasCommandError {}
+
+export class EasBuildFreeTierDisabledAndroidError extends EasCommandError {}
+
+export class RequestValidationError extends EasCommandError {}
+
+export class EasBuildDownForMaintenanceError extends EasCommandError {}
+
+export class EasBuildTooManyPendingBuildsError extends EasCommandError {}

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

@@ -91,11 +91,16 @@ export function transformIosEnterpriseProvisioning(
   }
 }
 
-export function transformBuildMode(buildMode: Metadata['buildMode']): BuildMode {
+// TODO: check what in metadata
+export function transformBuildMode(buildMode: string): BuildMode {
   if (buildMode === 'build') {
     return BuildMode.Build;
-  } else {
+  } else if (buildMode === 'resign') {
     return BuildMode.Resign;
+  } else if (buildMode === 'custom') {
+    return BuildMode.Custom;
+  } else {
+    throw new Error(`Unsupported build mode: ${buildMode}`);
   }
 }
 

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

@@ -55,5 +55,6 @@ export async function ensureIosCredentialsForBuildResignAsync(
 }
 
 function shouldProvideCredentials(buildCtx: BuildContext<Platform.IOS>): boolean {
-  return !buildCtx.buildProfile.simulator;
+  const isCustomBuild = buildCtx.buildProfile.config !== undefined;
+  return !buildCtx.buildProfile.simulator && !isCustomBuild;
 }

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

@@ -2,7 +2,12 @@ import { Ios } from '@expo/eas-build-job';
 import nullthrows from 'nullthrows';
 
 import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
-import { transformBuildTrigger, transformProjectArchive, transformWorkflow } from '../graphql';
+import {
+  transformBuildMode,
+  transformBuildTrigger,
+  transformProjectArchive,
+  transformWorkflow,
+} from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {
@@ -12,7 +17,7 @@ export function transformJob(job: Ios.Job): IosJobInput {
     projectRootDirectory: nullthrows(job.projectRootDirectory),
     releaseChannel: job.releaseChannel,
     updates: job.updates,
-    secrets: transformIosSecrets(job.secrets),
+    secrets: job.secrets ? transformIosSecrets(job.secrets) : undefined,
     builderEnvironment: job.builderEnvironment,
     cache: job.cache,
     version: job.version?.buildNumber ? { buildNumber: job.version.buildNumber } : undefined,
@@ -24,6 +29,8 @@ export function transformJob(job: Ios.Job): IosJobInput {
     developmentClient: job.developmentClient,
     simulator: job.simulator,
     experimental: job.experimental,
+    mode: transformBuildMode(job.mode),
+    customBuildConfig: job.customBuildConfig,
   };
 }
 

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

@@ -7,12 +7,14 @@ import {
   Platform,
   sanitizeJob,
 } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import nullthrows from 'nullthrows';
 import path from 'path';
 import slash from 'slash';
 
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { IosJobSecretsInput } from '../../graphql/generated';
+import { getCustomBuildConfigPath } from '../../project/customBuildConfig';
 import { getUsername } from '../../project/projectUtils';
 import { getVcsClient } from '../../vcs';
 import { BuildContext } from '../context';
@@ -25,18 +27,18 @@ interface JobData {
 
 const cacheDefaults = {
   disabled: false,
-  customPaths: [],
-  cacheDefaultPaths: true,
+  paths: [],
 };
 
 export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Job> {
+  const username = getUsername(ctx.exp, ctx.user);
+  const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
   const projectRootDirectory =
     slash(path.relative(await getVcsClient().getRootPathAsync(), ctx.projectDir)) || '.';
-  const username = getUsername(ctx.exp, ctx.user);
-  const buildCredentials: Ios.Job['secrets']['buildCredentials'] = {};
+  const buildCredentials: Ios.BuildSecrets['buildCredentials'] = {};
   if (jobData.credentials) {
     const targetNames = Object.keys(jobData.credentials);
     for (const targetName of targetNames) {
@@ -44,38 +46,41 @@ export async function prepareJobAsync(
     }
   }
 
+  const maybeCustomBuildConfigPath = buildProfile.config
+    ? getCustomBuildConfigPath(buildProfile.config)
+    : undefined;
+
   const job: Ios.Job = {
     type: ctx.workflow,
     platform: Platform.IOS,
     projectArchive: jobData.projectArchive,
     projectRootDirectory,
     builderEnvironment: {
-      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,
+      image: buildProfile.image,
+      node: buildProfile.node,
+      yarn: buildProfile.yarn,
+      bundler: buildProfile.bundler,
+      cocoapods: buildProfile.cocoapods,
+      fastlane: buildProfile.fastlane,
+      expoCli: buildProfile.expoCli,
+      env: buildProfile.env,
     },
     cache: {
       ...cacheDefaults,
-      ...ctx.buildProfile.cache,
+      ...buildProfile.cache,
       clear: ctx.clearCache,
     },
     secrets: {
       buildCredentials,
     },
-    releaseChannel: ctx.buildProfile.releaseChannel,
-    updates: { channel: ctx.buildProfile.channel },
-    developmentClient: ctx.buildProfile.developmentClient,
-    simulator: ctx.buildProfile.simulator,
+    releaseChannel: buildProfile.releaseChannel,
+    updates: { channel: buildProfile.channel },
+    developmentClient: buildProfile.developmentClient,
+    simulator: buildProfile.simulator,
     scheme: jobData.buildScheme,
-    buildConfiguration: ctx.buildProfile.buildConfiguration,
-    applicationArchivePath:
-      ctx.buildProfile.applicationArchivePath ?? ctx.buildProfile.artifactPath,
-    buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
+    buildConfiguration: buildProfile.buildConfiguration,
+    applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
+    buildArtifactPaths: buildProfile.buildArtifactPaths,
     username,
     ...(ctx.ios.buildNumberOverride && {
       version: {
@@ -83,10 +88,15 @@ export async function prepareJobAsync(
       },
     }),
     experimental: {
-      prebuildCommand: ctx.buildProfile.prebuildCommand,
+      prebuildCommand: buildProfile.prebuildCommand,
     },
-    mode: BuildMode.BUILD,
+    mode: buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
     triggeredBy: BuildTrigger.EAS_CLI,
+    ...(maybeCustomBuildConfigPath && {
+      customBuildConfig: {
+        path: maybeCustomBuildConfigPath,
+      },
+    }),
   };
   return sanitizeJob(job);
 }

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

@@ -1,5 +1,5 @@
 import { Updates } from '@expo/config-plugins';
-import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
+import { BuildMode, Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
@@ -57,6 +57,7 @@ export async function collectMetadataAsync<T extends Platform>(
     }),
     runWithNoWaitFlag: ctx.noWait,
     runFromCI: ctx.runFromCI,
+    buildMode: ctx.buildProfile.config ? BuildMode.CUSTOM : BuildMode.BUILD,
   };
   return sanitizeMetadata(metadata);
 }

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

@@ -99,10 +99,6 @@ export async function listAndSelectBuildOnAppAsync(
   }
 }
 
-function formatBuildChoiceValue(value: string | undefined | null): string {
-  return value ? chalk.bold(value) : 'Unknown';
-}
-
 function createBuildToPartialChoiceMaker(
   selectPromptDisabledFunction?: (build: BuildFragment) => boolean
 ) {
@@ -119,19 +115,34 @@ function createBuildToPartialChoiceMaker(
         ? `${build.gitCommitHash.slice(0, 7)} "${chalk.bold(
             splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
           )}"`
-        : 'Unknown';
+        : null;
+
+    const descriptionItems: { name: string; value: string | null }[] = [
+      { name: 'Version', value: build.appVersion ? chalk.bold(build.appVersion) : null },
+      { name: 'Commit', value: formattedCommitData },
+      {
+        name: 'Message',
+        value: build.message
+          ? chalk.bold(
+              build.message.length > 200 ? `${build.message.slice(0, 200)}...` : build.message
+            )
+          : null,
+      },
+      {
+        name: build.platform === AppPlatform.Ios ? 'Build number' : 'Version code',
+        value: build.appBuildVersion ? chalk.bold(build.appBuildVersion) : null,
+      },
+    ];
+
+    const filteredDescriptionArray: string[] = descriptionItems
+      .filter(item => item.value)
+      .map(item => `${chalk.bold(item.name)}: ${item.value}`);
 
     return {
       title: `${chalk.bold(`ID:`)} ${build.id} (${chalk.bold(
         `${fromNow(new Date(build.completedAt))} ago`
       )})`,
-      description: [
-        `\t${chalk.bold(`Version:`)} ${formatBuildChoiceValue(build.appVersion)}`,
-        `\t${chalk.bold(
-          build.platform === AppPlatform.Ios ? 'Build number:' : 'Version code:'
-        )} ${formatBuildChoiceValue(build.appBuildVersion)}`,
-        `\t${chalk.bold(`Commit:`)} ${formattedCommitData}`,
-      ].join('\n'),
+      description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
       disabled: selectPromptDisabledFunction?.(build),
     };
   };

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

@@ -31,6 +31,7 @@ import {
   appPlatformEmojis,
   toPlatforms,
 } from '../platform';
+import { validateCustomBuildConfigAsync } from '../project/customBuildConfig';
 import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
 import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
 import { validateAppVersionRuntimePolicySupportAsync } from '../project/projectUtils';
@@ -98,7 +99,7 @@ export async function runBuildAndSubmitAsync(
     projectDir,
     nonInteractive: flags.nonInteractive,
   });
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   const easJsonCliConfig: EasJson['cli'] =
     (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
 
@@ -118,6 +119,7 @@ export async function runBuildAndSubmitAsync(
 
   for (const buildProfile of buildProfiles) {
     validateBuildProfileVersionSettings(buildProfile, easJsonCliConfig);
+    await validateCustomBuildConfigAsync(projectDir, buildProfile.profile);
   }
 
   const startedBuilds: {

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

@@ -38,6 +38,10 @@ export function formatGraphQLBuild(build: BuildFragment): string {
         }
       },
     },
+    {
+      label: 'Message',
+      value: build.message,
+    },
     {
       label: 'Distribution',
       value: build.distribution?.toLowerCase(),

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

@@ -15,6 +15,32 @@ import Log, { learnMore, link } from '../../log';
 import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
 import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
+function terminalLinkFallback(url: string, text: string): string {
+  return `${text} (${url})`;
+}
+
+const errorCodeToErrorMessageOverride: Record<string, (build: BuildFragment) => string> = {
+  EAS_BUILD_UNKNOWN_FASTLANE_ERROR: build =>
+    `The ${link(getBuildLogsUrl(build, 'run-fastlane'), {
+      text: '"Run fastlane"',
+      fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-fastlane'), '"Run fastlane"'),
+    })} step failed with an unknown error. Refer to the ${link(
+      getBuildLogsUrl(build, 'xcode-logs'),
+      {
+        text: '"Xcode logs"',
+        fallback: terminalLinkFallback(getBuildLogsUrl(build, 'xcode-logs'), '"Xcode logs"'),
+      }
+    )} phase for additional, more detailed logs`,
+  EAS_BUILD_UNKNOWN_GRADLE_ERROR: build =>
+    `Gradle build failed with unknown error. See logs for the ${link(
+      getBuildLogsUrl(build, 'run-gradlew'),
+      {
+        text: '"Run gradlew"',
+        fallback: terminalLinkFallback(getBuildLogsUrl(build, 'run-gradlew'), '"Run gradlew"'),
+      }
+    )} phase for more information.`,
+};
+
 export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {
     Log.log(`Build details: ${link(getBuildLogsUrl(builds[0]))}`);
@@ -31,7 +57,6 @@ export function printLogsUrls(builds: BuildFragment[]): void {
 }
 
 export function printBuildResults(builds: (BuildFragment | null)[]): void {
-  Log.newLine();
   if (builds.length === 1) {
     const [build] = builds;
     assert(build, 'Build should be defined');
@@ -42,8 +67,8 @@ export function printBuildResults(builds: (BuildFragment | null)[]): void {
 }
 
 function printBuildResult(build: BuildFragment): void {
-  Log.addNewLineIfNone();
   if (build.status === BuildStatus.Errored) {
+    Log.addNewLineIfNone();
     const userError = build.error;
     Log.error(
       `${appPlatformEmojis[build.platform]} ${
@@ -51,11 +76,12 @@ function printBuildResult(build: BuildFragment): void {
       } build failed${userError ? ':' : ''}`
     );
     if (userError) {
-      printUserError(userError);
+      printUserError(userError, build);
     }
     return;
   }
   if (build.status === BuildStatus.Canceled) {
+    Log.addNewLineIfNone();
     Log.error(
       `${appPlatformEmojis[build.platform]} ${
         appPlatformDisplayNames[build.platform]
@@ -65,6 +91,7 @@ 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
@@ -82,9 +109,14 @@ function printBuildResult(build: BuildFragment): void {
   } 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 ?? '';
-    Log.log(`${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`);
-    Log.log(`${link(url)}`);
+    const url = build.artifacts?.buildUrl;
+    if (url) {
+      Log.addNewLineIfNone();
+      Log.log(
+        `${appPlatformEmojis[build.platform]} ${appPlatformDisplayNames[build.platform]} app:`
+      );
+      Log.log(link(url));
+    }
   }
 }
 
@@ -105,9 +137,22 @@ export function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationIn
   }
 }
 
-export function printUserError(error: BuildError): void {
-  Log.error(error.message);
-  if (error.docsUrl) {
-    Log.error(learnMore(error.docsUrl, { dim: false }));
+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 }));
+    }
   }
 }
+
+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/resourceClass.ts

@@ -1,31 +1,34 @@
-import { ExpoConfig } from '@expo/config-types';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, ResourceClass } from '@expo/eas-json';
 import chalk from 'chalk';
-import semver from 'semver';
 
 import { BuildResourceClass } from '../../graphql/generated';
-import Log from '../../log';
-import { getReactNativeVersionAsync } from '../metadata';
+import Log, { link } from '../../log';
+
+type AndroidResourceClass = Exclude<
+  ResourceClass,
+  | ResourceClass.M1_EXPERIMENTAL
+  | ResourceClass.M1_MEDIUM
+  | ResourceClass.M1_LARGE
+  | ResourceClass.INTEL_MEDIUM
+  | ResourceClass.M_MEDIUM
+  | ResourceClass.M_LARGE
+>;
 
 const iosResourceClassToBuildResourceClassMapping: Record<ResourceClass, BuildResourceClass> = {
   [ResourceClass.DEFAULT]: BuildResourceClass.IosDefault,
   [ResourceClass.LARGE]: BuildResourceClass.IosLarge,
-  [ResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosM1Large,
-  [ResourceClass.M1_MEDIUM]: BuildResourceClass.IosM1Medium,
-  [ResourceClass.M1_LARGE]: BuildResourceClass.IosM1Large,
+  [ResourceClass.M1_EXPERIMENTAL]: BuildResourceClass.IosMMedium,
+  [ResourceClass.M1_MEDIUM]: BuildResourceClass.IosMMedium,
+  [ResourceClass.M1_LARGE]: BuildResourceClass.IosMLarge,
   [ResourceClass.INTEL_MEDIUM]: BuildResourceClass.IosIntelMedium,
   [ResourceClass.MEDIUM]: BuildResourceClass.IosMedium,
+  [ResourceClass.M_MEDIUM]: BuildResourceClass.IosMMedium,
+  [ResourceClass.M_LARGE]: BuildResourceClass.IosMLarge,
 };
 
 const androidResourceClassToBuildResourceClassMapping: Record<
-  Exclude<
-    ResourceClass,
-    | ResourceClass.M1_EXPERIMENTAL
-    | ResourceClass.M1_MEDIUM
-    | ResourceClass.M1_LARGE
-    | ResourceClass.INTEL_MEDIUM
-  >,
+  AndroidResourceClass,
   BuildResourceClass
 > = {
   [ResourceClass.DEFAULT]: BuildResourceClass.AndroidDefault,
@@ -36,22 +39,20 @@ const androidResourceClassToBuildResourceClassMapping: Record<
 export async function resolveBuildResourceClassAsync<T extends Platform>(
   profile: BuildProfile<T>,
   platform: Platform,
-  projectDir: string,
-  exp: ExpoConfig,
   resourceClassFlag?: ResourceClass
 ): Promise<BuildResourceClass> {
   const profileResourceClass = profile.resourceClass;
 
   if (profileResourceClass && resourceClassFlag && resourceClassFlag !== profileResourceClass) {
     Log.warn(
-      `Build profile specifies the "${profileResourceClass}" resource class but you passed "${resourceClassFlag}" to --resource-class.\nUsing the  "${resourceClassFlag}" as the override.`
+      `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
-    ? await resolveIosResourceClassAsync(exp, projectDir, resourceClassFlag ?? profileResourceClass)
+    ? resolveIosResourceClass(resourceClassFlag, profileResourceClass)
     : resolveAndroidResourceClass(selectedResourceClass);
 }
 
@@ -70,44 +71,38 @@ function resolveAndroidResourceClass(selectedResourceClass?: ResourceClass): Bui
 
   const resourceClass = selectedResourceClass ?? ResourceClass.DEFAULT;
 
-  return androidResourceClassToBuildResourceClassMapping[
-    resourceClass as Exclude<
-      ResourceClass,
-      | ResourceClass.M1_EXPERIMENTAL
-      | ResourceClass.M1_MEDIUM
-      | ResourceClass.M1_LARGE
-      | ResourceClass.INTEL_MEDIUM
-    >
-  ];
+  return androidResourceClassToBuildResourceClassMapping[resourceClass as AndroidResourceClass];
 }
 
-async function resolveIosResourceClassAsync(
-  exp: ExpoConfig,
-  projectDir: string,
-  selectedResourceClass?: ResourceClass
-): Promise<BuildResourceClass> {
-  const resourceClass =
-    selectedResourceClass ?? (await resolveIosDefaultRequestedResourceClassAsync(exp, projectDir));
+function resolveIosResourceClass(
+  resourceClassFlag?: ResourceClass,
+  profileResourceClass?: ResourceClass
+): BuildResourceClass {
+  const resourceClass = resourceClassFlag ?? profileResourceClass ?? ResourceClass.DEFAULT;
 
-  if (resourceClass === ResourceClass.M1_EXPERIMENTAL) {
-    Log.warn(`Resource class ${chalk.bold('m1-experimental')} is deprecated.`);
+  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_EXPERIMENTAL, ResourceClass.M1_MEDIUM].includes(resourceClass)) {
+    Log.warn(
+      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
+        'm-medium'
+      )} instead.`
+    );
+  }
+
+  if ([ResourceClass.M_LARGE, ResourceClass.M1_LARGE].includes(resourceClass)) {
+    Log.warn(
+      `Resource class ${chalk.bold(resourceClass)} is deprecated. Use ${chalk.bold(
+        'large'
+      )} instead.`
+    );
   }
 
   return iosResourceClassToBuildResourceClassMapping[resourceClass];
 }
-
-async function resolveIosDefaultRequestedResourceClassAsync(
-  exp: ExpoConfig,
-  projectDir: string
-): Promise<ResourceClass> {
-  const { sdkVersion } = exp;
-  const reactNativeVersion = await getReactNativeVersionAsync(projectDir);
-  if (
-    (sdkVersion && semver.satisfies(sdkVersion, '>=48')) ||
-    (reactNativeVersion && semver.satisfies(reactNativeVersion, '>=0.71.0'))
-  ) {
-    return ResourceClass.M1_MEDIUM;
-  } else {
-    return ResourceClass.DEFAULT;
-  }
-}

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

@@ -10,12 +10,14 @@ export function getProjectDashboardUrl(accountName: string, projectName: string)
   ).toString();
 }
 
-export function getBuildLogsUrl(build: BuildFragment): string {
+export function getBuildLogsUrl(build: BuildFragment, hash?: string): string {
   const { project } = build;
   const url =
     project.__typename !== 'App'
       ? `/builds/${build.id}`
-      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
+      : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}${
+          hash ? `#${hash}` : ''
+        }`;
 
   return new URL(url, getExpoWebsiteBaseUrl()).toString();
 }

packages/eas-cli/src/commandUtils/EasCommand.ts

@@ -1,4 +1,5 @@
 import { Command } from '@oclif/core';
+import { CombinedError } from '@urql/core';
 import nullthrows from 'nullthrows';
 
 import {
@@ -6,6 +7,7 @@ import {
   CommandEvent,
   createAnalyticsAsync,
 } from '../analytics/AnalyticsManager';
+import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import AnalyticsContextField from './context/AnalyticsContextField';
 import ContextField from './context/ContextField';
@@ -16,6 +18,7 @@ import { OptionalProjectConfigContextField } from './context/OptionalProjectConf
 import ProjectConfigContextField from './context/ProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
+import { EasCommandError } from './errors';
 
 type ContextInput<
   T extends {
@@ -33,6 +36,8 @@ type ContextOutput<
   [P in keyof T]: T[P];
 };
 
+const BASE_GRAPHQL_ERROR_MESSAGE: string = 'GraphQL request failed.';
+
 export default abstract class EasCommand extends Command {
   protected static readonly ContextOptions = {
     /**
@@ -103,6 +108,18 @@ export default abstract class EasCommand extends Command {
    */
   static contextDefinition: ContextInput = {};
 
+  /**
+   * The user session manager. Responsible for coordinating all user session related state.
+   * If needed in a subclass, use the SessionManager ContextOption.
+   */
+  private sessionManagerInternal?: SessionManager;
+
+  /**
+   * The analytics manager. Used for logging analytics.
+   * It is set up here to ensure a consistent setup.
+   */
+  private analyticsInternal?: AnalyticsWithOrchestration;
+
   /**
    * Execute the context in the contextDefinition to satisfy command prerequisites.
    */
@@ -132,20 +149,10 @@ export default abstract class EasCommand extends Command {
     return Object.fromEntries(contextValuePairs);
   }
 
-  /**
-   * The user session manager. Responsible for coordinating all user session related state.
-   * If needed in a subclass, use the SessionManager ContextOption.
-   */
-  private sessionManagerInternal?: SessionManager;
   private get sessionManager(): SessionManager {
     return nullthrows(this.sessionManagerInternal);
   }
 
-  /**
-   * The analytics manager. Used for logging analytics.
-   * It is set up here to ensure a consistent set up.
-   */
-  private analyticsInternal?: AnalyticsWithOrchestration;
   private get analytics(): AnalyticsWithOrchestration {
     return nullthrows(this.analyticsInternal);
   }
@@ -175,4 +182,22 @@ export default abstract class EasCommand extends Command {
     await this.analytics.flushAsync();
     return super.finally(err);
   }
+
+  protected override catch(err: Error): Promise<any> {
+    let baseMessage = `${this.id} command failed.`;
+    if (err instanceof EasCommandError) {
+      Log.error(err.message);
+    } else if (err instanceof CombinedError && err?.graphQLErrors) {
+      let cleanMessage = err.message.replace('[GraphQL] ', '');
+      cleanMessage += err?.graphQLErrors?.[0]?.extensions?.requestId
+        ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
+        : '';
+      Log.error(cleanMessage);
+      baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
+    } else {
+      Log.error(err.message);
+    }
+    Log.debug(err);
+    throw new Error(baseMessage);
+  }
 }

packages/eas-cli/src/commandUtils/__tests__/EasCommand-test.ts

@@ -1,4 +1,9 @@
+import { CombinedError } from '@urql/core';
+import { GraphQLError } from 'graphql/error';
+import { v4 as uuidv4 } from 'uuid';
+
 import { AnalyticsWithOrchestration, createAnalyticsAsync } from '../../analytics/AnalyticsManager';
+import Log from '../../log';
 import SessionManager from '../../user/SessionManager';
 import EasCommand from '../EasCommand';
 
@@ -11,8 +16,10 @@ jest.mock('../../analytics/AnalyticsManager', () => {
     createAnalyticsAsync: jest.fn(),
   };
 });
+jest.mock('../../log');
 
 let originalProcessArgv: string[];
+const mockRequestId = uuidv4();
 
 beforeAll(() => {
   originalProcessArgv = process.argv;
@@ -40,7 +47,7 @@ const createTestEasCommand = (): typeof EasCommand => {
     async runAsync(): Promise<void> {}
   }
 
-  TestEasCommand.id = 'TestEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
+  TestEasCommand.id = 'testEasCommand'; // normally oclif will assign ids, but b/c this is located outside the commands folder it will not
   return TestEasCommand;
 };
 
@@ -96,5 +103,103 @@ describe(EasCommand.name, () => {
 
       expect(analytics.flushAsync).toHaveBeenCalled();
     });
+
+    describe('catch', () => {
+      it('logs the message', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const logErrorSpy = jest.spyOn(Log, 'error');
+        const logDebugSpy = jest.spyOn(Log, 'debug');
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        const error = new Error('Unexpected, internal error message');
+        runAsyncMock.mockImplementation(() => {
+          throw error;
+        });
+        try {
+          await TestEasCommand.run();
+        } catch {}
+
+        expect(logErrorSpy).toBeCalledWith('Unexpected, internal error message');
+        expect(logDebugSpy).toBeCalledWith(error);
+      });
+
+      it('logs the cleaned message if needed', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const logErrorSpy = jest.spyOn(Log, 'error');
+        const logDebugSpy = jest.spyOn(Log, 'debug');
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        const graphQLErrors = ['Unexpected GraphQL error message'];
+        const error = new CombinedError({ graphQLErrors });
+        runAsyncMock.mockImplementation(() => {
+          throw error;
+        });
+        try {
+          await TestEasCommand.run();
+        } catch {}
+
+        expect(logErrorSpy).toBeCalledWith('Unexpected GraphQL error message');
+        expect(logDebugSpy).toBeCalledWith(error);
+      });
+
+      it('logs the cleaned message with request ID if present', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const logErrorSpy = jest.spyOn(Log, 'error');
+        const logDebugSpy = jest.spyOn(Log, 'debug');
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        const graphQLError = new GraphQLError(
+          'Unexpected GraphQL error message',
+          null,
+          null,
+          null,
+          null,
+          null,
+          {
+            errorCode: 'UNKNOWN_GRAPHQL_ERROR',
+            requestId: mockRequestId,
+          }
+        );
+        const graphQLErrors = [graphQLError];
+        const error = new CombinedError({ graphQLErrors });
+        runAsyncMock.mockImplementation(() => {
+          throw error;
+        });
+        try {
+          await TestEasCommand.run();
+        } catch {}
+
+        expect(logErrorSpy).toBeCalledWith(
+          `Unexpected GraphQL error message\nRequest ID: ${mockRequestId}`
+        );
+        expect(logDebugSpy).toBeCalledWith(error);
+      });
+
+      it('re-throws the error with default base message', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        runAsyncMock.mockImplementation(() => {
+          throw new Error('Error message');
+        });
+        try {
+          await TestEasCommand.run();
+        } catch (caughtError) {
+          expect(caughtError).toBeInstanceOf(Error);
+          expect((caughtError as Error).message).toEqual('testEasCommand command failed.');
+        }
+      });
+
+      it('re-throws the error with a different default base message in case of graphQLError', async () => {
+        const TestEasCommand = createTestEasCommand();
+        const runAsyncMock = jest.spyOn(TestEasCommand.prototype as any, 'runAsync');
+        runAsyncMock.mockImplementation(() => {
+          const graphQLErrors = ['Unexpected GraphQL error message'];
+          throw new CombinedError({ graphQLErrors });
+        });
+        try {
+          await TestEasCommand.run();
+        } catch (caughtError) {
+          expect(caughtError).toBeInstanceOf(Error);
+          expect((caughtError as Error).message).toEqual('GraphQL request failed.');
+        }
+      });
+    });
   });
 });

packages/eas-cli/src/commandUtils/context/DynamicProjectConfigContextField.ts

@@ -16,8 +16,8 @@ export class DynamicProjectConfigContextField extends ContextField<DynamicConfig
     nonInteractive,
     sessionManager,
   }: ContextOptions): Promise<DynamicConfigContextFn> {
+    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
     return async (options?: ExpoConfigOptions) => {
-      const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
       const expBefore = getExpoConfig(projectDir, options);
       const projectId = await getProjectIdAsync(sessionManager, expBefore, {
         nonInteractive,

packages/eas-cli/src/commandUtils/context/contextUtils/__tests__/getProjectIdAsync-test.ts

@@ -136,6 +136,54 @@ describe(getProjectIdAsync, () => {
     );
   });
 
+  it('throws when the owner is not specified and is different than logged in user which is a robot', async () => {
+    const sessionManagerMock = mock<SessionManager>();
+    when(sessionManagerMock.ensureLoggedInAsync(anything())).thenResolve({
+      actor: {
+        __typename: 'Robot',
+        id: 'robot_id',
+        accounts: [
+          {
+            id: 'account_id_1',
+            name: 'notnotbrent',
+            users: [{ role: Role.Admin, actor: { id: 'robot_id' } }],
+          },
+          {
+            id: 'account_id_2',
+            name: 'dominik',
+            users: [{ role: Role.ViewOnly, actor: { id: 'robot_id' } }],
+          },
+        ],
+        isExpoAdmin: false,
+        featureGates: {},
+      },
+      authenticationInfo: { accessToken: 'fake', sessionSecret: null },
+    });
+    const sessionManagerRobot = instance(sessionManagerMock);
+
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@totallybrent/test',
+      slug: 'test',
+      ownerAccount: { name: 'totallybrent' } as any,
+    });
+
+    await expect(
+      getProjectIdAsync(
+        sessionManagerRobot,
+        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+        { nonInteractive: false }
+      )
+    ).rejects.toThrow(
+      `Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
+        'https://expo.fyi/eas-project-id'
+      )}`
+    );
+  });
+
   it('throws when the slug is out of sync', async () => {
     jest.mocked(getConfig).mockReturnValue({
       exp: { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
@@ -204,4 +252,26 @@ describe(getProjectIdAsync, () => {
       getProjectIdAsync(sessionManager, { name: 'test', slug: 'test' }, { nonInteractive: false })
     ).rejects.toThrow();
   });
+
+  it('throws if extra.eas.projectId is not a string', async () => {
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: 1234 } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@notnotbrent/test',
+      slug: 'test',
+      ownerAccount: { name: 'notnotbrent' } as any,
+    });
+
+    await expect(
+      getProjectIdAsync(
+        sessionManager,
+        { name: 'test', slug: 'wat', extra: { eas: { projectId: 1234 } } },
+        { nonInteractive: false }
+      )
+    ).rejects.toThrow(
+      `Project config: "extra.eas.projectId" must be a string, found number. If you're not sure how to set it up on your own, remove the property entirely and it will be automatically configured on the next EAS CLI run.`
+    );
+  });
 });

packages/eas-cli/src/commandUtils/context/contextUtils/findProjectDirAndVerifyProjectSetupAsync.ts

@@ -12,7 +12,7 @@ import { getVcsClient, setVcsClient } from '../../../vcs';
 import GitClient from '../../../vcs/clients/git';
 
 async function applyCliConfigAsync(projectDir: string): Promise<void> {
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
   if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
     throw new Error(

packages/eas-cli/src/commandUtils/context/contextUtils/getProjectIdAsync.ts

@@ -89,6 +89,12 @@ export async function getProjectIdAsync(
 
   const localProjectId = exp.extra?.eas?.projectId;
   if (localProjectId) {
+    if (typeof localProjectId !== 'string') {
+      throw new Error(
+        `Project config: "extra.eas.projectId" must be a string, found ${typeof localProjectId}. If you're not sure how to set it up on your own, remove the property entirely and it will be automatically configured on the next EAS CLI run.`
+      );
+    }
+
     // check that the local project ID matches account and slug
     const appForProjectId = await AppQuery.byIdAsync(graphqlClient, localProjectId);
     if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
@@ -103,15 +109,28 @@ export async function getProjectIdAsync(
 
     const actorUsername = getActorUsername(actor);
     if (!exp.owner && appForProjectId.ownerAccount.name !== actorUsername) {
-      throw new Error(
-        `Project config: Owner of project identified by "extra.eas.projectId" (${
-          appForProjectId.ownerAccount.name
-        }) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${
-          appForProjectId.ownerAccount.name
-        }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-          'https://expo.fyi/eas-project-id'
-        )}`
-      );
+      if (actorUsername) {
+        throw new Error(
+          `Project config: Owner of project identified by "extra.eas.projectId" (${
+            appForProjectId.ownerAccount.name
+          }) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${
+            appForProjectId.ownerAccount.name
+          }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
+            'https://expo.fyi/eas-project-id'
+          )}`
+        );
+      } else {
+        // robot caller
+        throw new Error(
+          `Project config: Owner of project identified by "extra.eas.projectId" (${
+            appForProjectId.ownerAccount.name
+          }) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "${
+            appForProjectId.ownerAccount.name
+          }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
+            'https://expo.fyi/eas-project-id'
+          )}`
+        );
+      }
     }
 
     if (exp.slug && exp.slug !== appForProjectId.slug) {

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

@@ -0,0 +1,7 @@
+export class EasCommandError extends Error {
+  // constructor is not useless, since the constructor for Error allows for optional `message`
+  // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+  constructor(message: string) {
+    super(message);
+  }
+}

packages/eas-cli/src/commands/account/view.ts

@@ -1,8 +1,10 @@
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 
 import EasCommand from '../../commandUtils/EasCommand';
+import { Role } from '../../graphql/generated';
 import Log from '../../log';
-import { getActorDisplayName } from '../../user/User';
+import { Actor, getActorDisplayName } from '../../user/User';
 
 export default class AccountView extends EasCommand {
   static override description = 'show the username you are logged in as';
@@ -18,9 +20,48 @@ export default class AccountView extends EasCommand {
     } = await this.getContextAsync(AccountView, { nonInteractive: true });
     if (actor) {
       Log.log(chalk.green(getActorDisplayName(actor)));
+
+      // personal account is included, only show if more accounts that personal account
+      // but do show personal account in list if there are more
+      const accountExcludingPersonalAccount = actor.accounts.filter(
+        account => !('username' in actor) || account.name !== actor.username
+      );
+      if (accountExcludingPersonalAccount.length > 0) {
+        Log.newLine();
+        Log.log('Accounts:');
+        actor.accounts.forEach(account => {
+          const roleOnAccount = AccountView.getRoleOnAccount(actor, account);
+          Log.log(`• ${account.name} (Role: ${AccountView.getLabelForRole(roleOnAccount)})`);
+        });
+      }
     } else {
       Log.warn('Not logged in');
       process.exit(1);
     }
   }
+
+  private static getRoleOnAccount(actor: Actor, account: Actor['accounts'][0]): Role {
+    if ('username' in actor && account.name === actor.username) {
+      return Role.Owner;
+    }
+
+    return nullthrows(account.users.find(user => user.actor.id === actor.id)?.role);
+  }
+
+  private static getLabelForRole(role: Role): string {
+    switch (role) {
+      case Role.Owner:
+        return 'Owner';
+      case Role.Admin:
+        return 'Admin';
+      case Role.Developer:
+        return 'Developer';
+      case Role.ViewOnly:
+        return 'Viewer';
+      case Role.Custom:
+      case Role.HasAdmin:
+      case Role.NotAdmin:
+        return 'Custom';
+    }
+  }
 }

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

@@ -227,6 +227,13 @@ export default class Build extends EasCommand {
         });
       } else if (process.platform !== 'darwin' && requestedPlatform === RequestedPlatform.Ios) {
         Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+      } else if (
+        !['linux', 'darwin'].includes(process.platform) &&
+        requestedPlatform === RequestedPlatform.Android
+      ) {
+        Errors.error('Unsupported platform, macOS or Linux is required to build apps for Android', {
+          exit: 1,
+        });
       }
     }
 
@@ -244,7 +251,7 @@ export async function handleDeprecatedEasJsonAsync(
   if (!(await fs.pathExists(EasJsonAccessor.formatEasJsonPath(projectDir)))) {
     return;
   }
-  const easJsonAccessor = new EasJsonAccessor(projectDir);
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   const profileNames = await EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
   const platformAndProfileNames: [Platform, string][] = profileNames.flatMap(profileName => [
     [Platform.ANDROID, profileName],

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

@@ -6,6 +6,8 @@ import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 import { enableJsonOutput } from '../../utils/json';
+import { setVcsClient } from '../../vcs';
+import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
 
 /**
  * This command will be run on the EAS Build workers, when building
@@ -51,6 +53,8 @@ export default class BuildInternal extends EasCommand {
       nonInteractive: true,
     });
 
+    setVcsClient(new GitNoCommitClient());
+
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
     await runBuildAndSubmitAsync(

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

@@ -121,7 +121,7 @@ export default class BuildResign extends EasCommand {
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasBuild]);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
     const easJsonCliConfig: EasJson['cli'] =
       (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
 

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

@@ -0,0 +1,120 @@
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonAccessor } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../../commandUtils/EasCommand';
+import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
+import { toAppPlatform } from '../../../graphql/types/AppPlatform';
+import Log from '../../../log';
+import { selectRequestedPlatformAsync, toPlatforms } from '../../../platform';
+import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import {
+  ensureVersionSourceIsRemoteAsync,
+  validateAppConfigForRemoteVersionSource,
+} from '../../../project/remoteVersionSource';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
+import { getProfilesAsync } from '../../../utils/profiles';
+
+export default class BuildVersionGetView extends EasCommand {
+  public static override description = 'get the latest version from EAS servers';
+
+  public static override flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+    }),
+    profile: Flags.string({
+      char: 'e',
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+      helpValue: 'PROFILE_NAME',
+    }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.ProjectDir,
+  };
+
+  public async runAsync(): Promise<void> {
+    const { flags } = await this.parse(BuildVersionGetView);
+    if (flags.json) {
+      enableJsonOutput();
+    }
+    const {
+      loggedIn: { graphqlClient },
+      getDynamicProjectConfigAsync,
+      projectDir,
+    } = await this.getContextAsync(BuildVersionGetView, {
+      nonInteractive: true,
+    });
+
+    if (!flags.platform && flags['non-interactive']) {
+      throw new Error('"--platform" flag is required in non-interactive mode.');
+    }
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, {
+      nonInteractive: flags['non-interactive'],
+    });
+
+    const platforms = toPlatforms(requestedPlatform);
+    const buildProfiles = await getProfilesAsync({
+      type: 'build',
+      easJsonAccessor,
+      platforms,
+      profileName: flags.profile ?? undefined,
+    });
+    const results: { [key in Platform]?: string } = {};
+    for (const { profile, platform } of buildProfiles) {
+      const { exp, projectId } = await getDynamicProjectConfigAsync({
+        env: profile.env,
+      });
+
+      validateAppConfigForRemoteVersionSource(exp, platform);
+
+      const applicationIdentifier = await getApplicationIdentifierAsync({
+        graphqlClient,
+        projectDir,
+        projectId,
+        exp,
+        buildProfile: profile,
+        platform,
+      });
+      const remoteVersions = await AppVersionQuery.latestVersionAsync(
+        graphqlClient,
+        projectId,
+        toAppPlatform(platform),
+        applicationIdentifier
+      );
+      if (remoteVersions?.buildVersion) {
+        results[platform] = remoteVersions?.buildVersion;
+      }
+    }
+    if (flags.json) {
+      const jsonResults: { versionCode?: string; buildNumber?: string } = {};
+      if (results.android) {
+        jsonResults.versionCode = results.android;
+      }
+      if (results.ios) {
+        jsonResults.buildNumber = results.ios;
+      }
+      printJsonOnlyOutput(jsonResults);
+    } else {
+      if (Object.keys(results).length === 0) {
+        Log.log('No remote versions are configured for this project.');
+        return;
+      }
+      if (results.android) {
+        Log.log(`Android versionCode - ${chalk.bold(results.android)}`);
+      }
+      if (results.ios) {
+        Log.log(`iOS buildNumber - ${chalk.bold(results.ios)}`);
+      }
+    }
+  }
+}

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

@@ -22,7 +22,7 @@ import {
 import { promptAsync } from '../../../prompts';
 
 export default class BuildVersionSetView extends EasCommand {
-  static override description = 'Update version of an app.';
+  static override description = 'update version of an app';
 
   static override flags = {
     platform: Flags.enum({
@@ -54,8 +54,8 @@ export default class BuildVersionSetView extends EasCommand {
     });
 
     const platform = await selectPlatformAsync(flags.platform);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, { nonInteractive: false });
     const profile = await EasJsonUtils.getBuildProfileAsync(
       easJsonAccessor,
       platform,

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

@@ -39,7 +39,7 @@ interface SyncContext<T extends Platform> {
 
 export default class BuildVersionSyncView extends EasCommand {
   public static override description =
-    'Update a version in native code with a value stored on EAS servers';
+    'update a version in native code with a value stored on EAS servers';
 
   public static override flags = {
     platform: Flags.enum({
@@ -71,8 +71,8 @@ export default class BuildVersionSyncView extends EasCommand {
     });
 
     const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
-    await ensureVersionSourceIsRemoteAsync(easJsonAccessor);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
+    await ensureVersionSourceIsRemoteAsync(easJsonAccessor, { nonInteractive: false });
 
     const platforms = toPlatforms(requestedPlatform);
     const buildProfiles = await getProfilesAsync({

packages/eas-cli/src/commands/channel/rollout.ts

@@ -1,6 +1,8 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
+import { selectBranchOnAppAsync } from '../../branch/queries';
+import { selectChannelOnAppAsync } from '../../channel/queries';
 import { BranchMapping, getBranchMapping } from '../../channel/utils';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
@@ -132,13 +134,11 @@ async function startRolloutAsync(
     );
   }
 
-  const logMessage = `️Started a rollout of branch ${chalk.bold(
+  const logMessage = `Started a rollout of branch ${chalk.bold(branchName)} on channel ${chalk.bold(
+    channelName!
+  )}! ${chalk.bold(percent)}% of users will be directed to branch ${chalk.bold(
     branchName
-  )} onto channel ${chalk.bold(channelName!)}! ${chalk.bold(
-    percent
-  )}% of users will be directed to branch ${chalk.bold(branchName)}, ${chalk.bold(
-    100 - percent
-  )}% to branch ${chalk.bold(oldBranch.name)}.`;
+  )}, ${chalk.bold(100 - percent)}% to branch ${chalk.bold(oldBranch.name)}.`;
 
   return { newChannelInfo, logMessage };
 }
@@ -190,7 +190,7 @@ async function editRolloutAsync(
     branchMapping: JSON.stringify(newBranchMapping),
   });
 
-  const logMessage = `️Rollout of branch ${chalk.bold(newBranch.name)} onto channel ${chalk.bold(
+  const logMessage = `Rollout of branch ${chalk.bold(newBranch.name)} on channel ${chalk.bold(
     channelName!
   )} updated from ${chalk.bold(currentPercent)}% to ${chalk.bold(percent)}%. ${chalk.bold(
     percent
@@ -256,11 +256,11 @@ async function endRolloutAsync(
       'Ending the rollout will send all traffic to a single branch. Which one should that be?',
       [
         {
-          title: `${newBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
+          title: `${newBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
           value: true,
         },
         {
-          title: `${oldBranch.name} ${chalk.grey(`- current percent: ${currentPercent}%`)}`,
+          title: `${oldBranch.name} ${chalk.grey(`- current percent: ${100 - currentPercent}%`)}`,
           value: false,
         },
       ]
@@ -284,7 +284,7 @@ async function endRolloutAsync(
     channelId: channel.id,
     branchMapping: JSON.stringify(newBranchMapping),
   });
-  const logMessage = `️Rollout on channel ${chalk.bold(
+  const logMessage = `Rollout on channel ${chalk.bold(
     channelName
   )} ended. All traffic is now sent to branch ${chalk.bold(
     endOnNewBranch ? newBranch.name : oldBranch.name
@@ -294,14 +294,12 @@ async function endRolloutAsync(
 }
 
 export default class ChannelRollout extends EasCommand {
-  static override hidden = true;
-  static override description = 'Rollout a new branch out to a channel incrementally.';
+  static override description = 'Roll a new branch out on a channel incrementally.';
 
   static override args = [
     {
       name: 'channel',
-      required: true,
-      description: 'rollout that the channel is on',
+      description: 'channel on which the rollout should be done',
     },
   ];
 
@@ -311,7 +309,7 @@ export default class ChannelRollout extends EasCommand {
       required: false,
     }),
     percent: Flags.integer({
-      description: 'percent of traffic to redirect to the new branch',
+      description: 'percent of users to send to the new branch',
       required: false,
     }),
     end: Flags.boolean({
@@ -328,7 +326,7 @@ export default class ChannelRollout extends EasCommand {
 
   async runAsync(): Promise<void> {
     const {
-      args: { channel: channelName },
+      args: { channel: channelNameArg },
       flags: {
         json: jsonFlag,
         end: endFlag,
@@ -349,9 +347,23 @@ export default class ChannelRollout extends EasCommand {
 
     const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
 
+    let channelName: string = channelNameArg;
+    if (!channelName) {
+      const { name } = await selectChannelOnAppAsync(graphqlClient, {
+        projectId,
+        selectionPromptTitle: 'Select a channel on which to perform a rollout',
+        paginatedQueryOptions: {
+          json: jsonFlag,
+          nonInteractive,
+          offset: 0,
+        },
+      });
+      channelName = name;
+    }
+
     const channel = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
       appId: projectId,
-      channelName: channelName!,
+      channelName,
     });
     if (!channel) {
       throw new Error(
@@ -396,7 +408,15 @@ export default class ChannelRollout extends EasCommand {
     if (!isRollout) {
       rolloutMutationResult = await startRolloutAsync(graphqlClient, {
         channelName,
-        branchName: branchName ?? (await promptForBranchNameAsync(channelName, nonInteractive)),
+        branchName:
+          branchName ??
+          (await promptForBranchNameAsync({
+            graphqlClient,
+            projectId,
+            channelName,
+            nonInteractive,
+            json: jsonFlag,
+          })),
         percent,
         nonInteractive,
         projectId,
@@ -433,18 +453,36 @@ export default class ChannelRollout extends EasCommand {
   }
 }
 
-async function promptForBranchNameAsync(
-  channelName: string,
-  nonInteractive: boolean
-): Promise<string> {
+async function promptForBranchNameAsync({
+  graphqlClient,
+  projectId,
+  channelName,
+  nonInteractive,
+  json,
+}: {
+  graphqlClient: ExpoGraphqlClient;
+  projectId: string;
+  channelName: string;
+  nonInteractive: boolean;
+  json: boolean;
+}): Promise<string> {
   if (nonInteractive) {
     throw new Error('Must supply branch flag in non-interactive mode');
   }
-  const { name } = await promptAsync({
-    type: 'text',
-    name: 'name',
-    message: `Select a branch to rollout onto ${channelName}`,
-    validate: value => (value ? true : 'A branch must be specified.'),
+
+  const { name: branchName } = await selectBranchOnAppAsync(graphqlClient, {
+    projectId,
+    promptTitle: `Which branch would you like roll out on ${channelName}?`,
+    displayTextForListItem: updateBranch => ({
+      title: updateBranch.name,
+    }),
+    // discard limit and offset because this query is not their intended target
+    paginatedQueryOptions: {
+      json,
+      nonInteractive,
+      offset: 0,
+    },
   });
-  return name;
+
+  return branchName;
 }

packages/eas-cli/src/commands/config.ts

@@ -45,7 +45,7 @@ export default class Config extends EasCommand {
       nonInteractive: false,
     });
 
-    const accessor = new EasJsonAccessor(projectDir);
+    const accessor = EasJsonAccessor.fromProjectPath(projectDir);
     const profileName =
       maybeProfile ??
       (await selectAsync(

packages/eas-cli/src/commands/device/delete.ts

@@ -112,11 +112,17 @@ export default class DeviceDelete extends EasCommand {
     const removeAppleSpinner = ora('Disabling device on Apple').start();
     try {
       const appleValidatedDevices = await Device.getAsync(context);
-      const appleValidatedDevice = appleValidatedDevices.find(d => d.id === device.id);
+      const appleValidatedDevice = appleValidatedDevices.find(
+        d => d.attributes.udid === device.identifier
+      );
       if (appleValidatedDevice) {
         await appleValidatedDevice.updateAsync({ status: DeviceStatus.DISABLED });
+        removeAppleSpinner.succeed('Disabled device on Apple');
+      } else {
+        removeAppleSpinner.warn(
+          'Device not found on Apple Developer Portal. Expo-registered devices will not appear there until they are chosen for an internal distribution build.'
+        );
       }
-      removeAppleSpinner.succeed('Disabled device on Apple');
     } catch (err) {
       removeAppleSpinner.fail();
       throw err;

packages/eas-cli/src/commands/device/rename.ts

@@ -0,0 +1,168 @@
+import { Device } from '@expo/apple-utils';
+import { Flags } from '@oclif/core';
+import assert from 'assert';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { PaginatedQueryOptions, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
+import {
+  AppleDeviceQuery,
+  AppleDeviceQueryResult,
+} from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import { authenticateAsync, getRequestContext } from '../../credentials/ios/appstore/authenticate';
+import {
+  selectAppleDeviceOnAppleTeamAsync,
+  selectAppleTeamOnAccountAsync,
+} from '../../devices/queries';
+import formatDevice from '../../devices/utils/formatDevice';
+import { AppleDevice, AppleTeamFragment, Maybe } from '../../graphql/generated';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+
+export default class DeviceRename extends EasCommand {
+  static override description = 'rename a registered device';
+
+  static override flags = {
+    'apple-team-id': Flags.string({ description: 'The Apple team ID on which to find the device' }),
+    udid: Flags.string({ description: 'The Apple device ID to rename' }),
+    name: Flags.string({ description: 'The new name for the device' }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags } = await this.parse(DeviceRename);
+    const paginatedQueryOptions = getPaginatedQueryOptions(flags);
+    let { 'apple-team-id': appleTeamIdentifier, udid, name } = flags;
+    const {
+      projectConfig: { projectId },
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(DeviceRename, {
+      nonInteractive: paginatedQueryOptions.nonInteractive,
+    });
+    const account = await getOwnerAccountForProjectIdAsync(graphqlClient, projectId);
+    let appleTeamName;
+
+    if (paginatedQueryOptions.json) {
+      enableJsonOutput();
+    }
+
+    let appleTeam: AppleTeamFragment;
+
+    if (!appleTeamIdentifier) {
+      appleTeam = await selectAppleTeamOnAccountAsync(graphqlClient, {
+        accountName: account.name,
+        selectionPromptTitle: `What Apple team would you like to list devices for?`,
+        paginatedQueryOptions,
+      });
+      appleTeamIdentifier = appleTeam.appleTeamIdentifier;
+      appleTeamName = appleTeam.appleTeamName;
+    }
+
+    assert(appleTeamIdentifier, 'No team identifier is specified');
+
+    const chosenDevice = udid
+      ? await AppleDeviceQuery.getByDeviceIdentifierAsync(graphqlClient, account.name, udid)
+      : await selectAppleDeviceOnAppleTeamAsync(graphqlClient, {
+          accountName: account.name,
+          appleTeamIdentifier,
+          selectionPromptTitle: `Which device would you like to rename?`,
+          paginatedQueryOptions,
+        });
+
+    const newDeviceName = name ? name : await this.promptForNewDeviceNameAsync(chosenDevice.name);
+
+    this.logChosenDevice(chosenDevice, appleTeamName, appleTeamIdentifier, paginatedQueryOptions);
+
+    await this.renameDeviceOnExpoAsync(graphqlClient, chosenDevice, newDeviceName!);
+
+    await this.renameDeviceOnAppleAsync(chosenDevice, appleTeamIdentifier, newDeviceName!);
+  }
+
+  async promptForNewDeviceNameAsync(
+    initial: Maybe<string> | undefined
+  ): Promise<string | undefined> {
+    const { name } = await promptAsync({
+      type: 'text',
+      name: 'name',
+      message: 'New device name:',
+      initial: initial ?? undefined,
+    });
+    return name;
+  }
+
+  async renameDeviceOnExpoAsync(
+    graphqlClient: ExpoGraphqlClient,
+    chosenDevice: AppleDevice | AppleDeviceQueryResult,
+    newDeviceName: string
+  ): Promise<void> {
+    const removalSpinner = ora(`Renaming Apple device on Expo`).start();
+    try {
+      await AppleDeviceMutation.updateAppleDeviceAsync(graphqlClient, chosenDevice.id, {
+        name: newDeviceName,
+      });
+      removalSpinner.succeed('Renamed Apple device on Expo');
+    } catch (err) {
+      removalSpinner.fail();
+      throw err;
+    }
+  }
+
+  async renameDeviceOnAppleAsync(
+    device: AppleDevice | AppleDeviceQueryResult,
+    appleTeamIdentifier: string,
+    newDeviceName: string
+  ): Promise<void> {
+    const ctx = await authenticateAsync({ teamId: appleTeamIdentifier });
+    const context = getRequestContext(ctx);
+
+    Log.addNewLineIfNone();
+    const removeAppleSpinner = ora('Renaming device on Apple').start();
+    try {
+      const appleValidatedDevices = await Device.getAsync(context);
+      const appleValidatedDevice = appleValidatedDevices.find(
+        d => d.attributes.udid === device.identifier
+      );
+      if (appleValidatedDevice) {
+        await appleValidatedDevice.updateAsync({ name: newDeviceName });
+        removeAppleSpinner.succeed('Renamed device on Apple');
+      } else {
+        removeAppleSpinner.warn(
+          'Device not found on Apple Developer Portal. Expo-registered devices will not appear there until they are chosen for an internal distribution build.'
+        );
+      }
+    } catch (err) {
+      removeAppleSpinner.fail();
+      throw err;
+    }
+  }
+
+  logChosenDevice(
+    device: AppleDevice | AppleDeviceQueryResult,
+    appleTeamName: Maybe<string> | undefined,
+    appleTeamIdentifier: string,
+    { json }: PaginatedQueryOptions
+  ): void {
+    if (json) {
+      printJsonOnlyOutput(device);
+    } else {
+      Log.addNewLineIfNone();
+      Log.log(
+        formatDevice(device, {
+          appleTeamName,
+          appleTeamIdentifier: appleTeamIdentifier!,
+        })
+      );
+      Log.newLine();
+    }
+  }
+}

packages/eas-cli/src/commands/metadata/lint.ts

@@ -44,7 +44,7 @@ export default class MetadataLint extends EasCommand {
 
     const submitProfiles = await getProfilesAsync({
       type: 'submit',
-      easJsonAccessor: new EasJsonAccessor(projectDir),
+      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
       platforms: [Platform.IOS],
       profileName: flags.profile,
     });

packages/eas-cli/src/commands/metadata/pull.ts

@@ -46,7 +46,7 @@ export default class MetadataPull extends EasCommand {
 
     const submitProfiles = await getProfilesAsync({
       type: 'submit',
-      easJsonAccessor: new EasJsonAccessor(projectDir),
+      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
       platforms: [Platform.IOS],
       profileName: flags.profile,
     });

packages/eas-cli/src/commands/metadata/push.ts

@@ -44,7 +44,7 @@ export default class MetadataPush extends EasCommand {
 
     const submitProfiles = await getProfilesAsync({
       type: 'submit',
-      easJsonAccessor: new EasJsonAccessor(projectDir),
+      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
       platforms: [Platform.IOS],
       profileName: flags.profile,
     });

packages/eas-cli/src/commands/submit.ts

@@ -115,7 +115,7 @@ export default class Submit extends EasCommand {
     const platforms = toPlatforms(flagsWithPlatform.requestedPlatform);
     const submissionProfiles = await getProfilesAsync({
       type: 'submit',
-      easJsonAccessor: new EasJsonAccessor(projectDir),
+      easJsonAccessor: EasJsonAccessor.fromProjectPath(projectDir),
       platforms,
       profileName: flagsWithPlatform.profile,
     });

packages/eas-cli/src/commands/update/__tests__/index.test.ts

@@ -1,6 +1,14 @@
-import { AppJSONConfig, PackageJSONConfig, Platform, getConfig } from '@expo/config';
+import {
+  AppJSONConfig,
+  ExpoConfig,
+  GetConfigOptions,
+  PackageJSONConfig,
+  Platform,
+  getConfig,
+} from '@expo/config';
 import { Updates } from '@expo/config-plugins';
 import { vol } from 'memfs';
+import nullthrows from 'nullthrows';
 import path from 'path';
 import { instance, mock } from 'ts-mockito';
 
@@ -29,6 +37,7 @@ const updateStub: UpdateFragment = {
   platform: 'ios',
   gitCommitHash: 'commit',
   manifestFragment: JSON.stringify({ fake: 'manifest' }),
+  isRollBackToEmbedded: false,
   manifestPermalink: 'https://expo.dev/fake/manifest/link',
   codeSigningInfo: null,
   createdAt: '2022-01-01T12:00:00Z',
@@ -46,7 +55,7 @@ jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/UpdateQuery');
 jest.mock('../../../ora', () => ({
   ora: () => ({
-    start: () => ({ succeed: () => {}, fail: () => {} }),
+    start: () => ({ succeed: () => {}, fail: () => {}, stop: () => {} }),
   }),
 }));
 jest.mock('../../../project/publish', () => ({
@@ -58,7 +67,10 @@ jest.mock('../../../project/publish', () => ({
 }));
 
 describe(UpdatePublish.name, () => {
-  afterEach(() => vol.reset());
+  afterEach(() => {
+    vol.reset();
+    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockClear();
+  });
 
   // Deprecated and split to a new command: update:republish
   it('errors with --republish', async () => {
@@ -80,7 +92,7 @@ describe(UpdatePublish.name, () => {
     mockTestProject();
 
     await expect(new UpdatePublish(flags, commandOptions).run()).rejects.toThrow(
-      'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto'
+      'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.'
     );
   });
 
@@ -136,14 +148,59 @@ describe(UpdatePublish.name, () => {
 
     expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
   });
+
+  it('creates a new update with the public expo config', async () => {
+    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
+
+    // Add configuration to the project that should not be included in the update
+    const { appJson } = mockTestProject({
+      expoConfig: {
+        hooks: {
+          postPublish: [
+            {
+              file: 'custom-hook.js',
+              config: { some: 'config' },
+            },
+          ],
+        },
+      },
+    });
+
+    const { platforms, runtimeVersion } = mockTestExport({ platforms: ['ios'] });
+
+    // Mock an existing branch, so we don't create a new one
+    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
+      branchId: 'branch123',
+      createdBranch: false,
+    });
+
+    jest
+      .mocked(PublishMutation.publishUpdateGroupAsync)
+      .mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
+
+    await new UpdatePublish(flags, commandOptions).run();
+
+    // Pull the publish data from the mocked publish function
+    const publishData = jest.mocked(PublishMutation.publishUpdateGroupAsync).mock.calls[0][1][0];
+    // Pull the Expo config from the publish data
+    const expoConfig = nullthrows(publishData.updateInfoGroup).ios!.extra.expoClient;
+
+    // Ensure the basic properties are present
+    expect(expoConfig).toHaveProperty('name', appJson.expo.name);
+    expect(expoConfig).toHaveProperty('slug', appJson.expo.slug);
+    // Ensure non-public config is not present
+    expect(expoConfig).not.toHaveProperty('hooks');
+  });
 });
 
 /** Create a new in-memory project, copied from src/commands/update/__tests__/republish.test.ts */
 function mockTestProject({
   configuredProjectId = '1234',
+  expoConfig = {},
 }: {
   configuredProjectId?: string;
-} = {}): { projectId: string } {
+  expoConfig?: Partial<ExpoConfig>;
+} = {}): { projectId: string; appJson: AppJSONConfig } {
   const packageJSON: PackageJSONConfig = {
     name: 'testing123',
     version: '0.1.0',
@@ -163,6 +220,7 @@ function mockTestProject({
           projectId: configuredProjectId,
         },
       },
+      ...expoConfig,
     },
   };
 
@@ -180,11 +238,27 @@ function mockTestProject({
   jest.mocked(getConfig).mockReturnValue(mockManifest as any);
   jest
     .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
-    .mockResolvedValue(async () => ({
-      exp: mockManifest.exp,
-      projectDir: projectRoot,
-      projectId: configuredProjectId,
-    }));
+    .mockResolvedValue(async (options?: GetConfigOptions) => {
+      let exp = { ...mockManifest.exp };
+
+      // Fake a limited public config
+      if (options?.isPublicConfig) {
+        exp = {
+          name: mockManifest.exp.name,
+          version: mockManifest.exp.version,
+          slug: mockManifest.exp.slug,
+          sdkVersion: mockManifest.exp.sdkVersion,
+          owner: mockManifest.exp.owner,
+          extra: mockManifest.exp.extra,
+        };
+      }
+
+      return {
+        exp,
+        projectDir: projectRoot,
+        projectId: configuredProjectId,
+      };
+    });
 
   jest.spyOn(LoggedInContextField.prototype, 'getValueAsync').mockResolvedValue({
     actor: jester,
@@ -199,7 +273,7 @@ function mockTestProject({
     ownerAccount: jester.accounts[0],
   });
 
-  return { projectId: configuredProjectId };
+  return { projectId: configuredProjectId, appJson: appJSON };
 }
 
 /** Create a new in-memory export of the project */
@@ -246,6 +320,8 @@ function mockTestExport({
     uniqueAssetCount: platforms.length,
     uniqueUploadedAssetCount: platforms.length,
     assetLimitPerUpdateGroup: 9001,
+    launchAssetCount: 2,
+    uniqueUploadedAssetPaths: [],
   });
 
   jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);

packages/eas-cli/src/commands/update/__tests__/republish.test.ts

@@ -27,6 +27,7 @@ const updateStub: UpdateFragment = {
   platform: 'ios',
   gitCommitHash: 'commit',
   manifestFragment: JSON.stringify({ fake: 'manifest' }),
+  isRollBackToEmbedded: false,
   manifestPermalink: 'https://expo.dev/fake/manifest/link',
   codeSigningInfo: null,
   createdAt: '2022-01-01T12:00:00Z',

packages/eas-cli/src/commands/update/__tests__/roll-back-to-embedded.test.ts

@@ -0,0 +1,257 @@
+import {
+  AppJSONConfig,
+  ExpoConfig,
+  GetConfigOptions,
+  PackageJSONConfig,
+  getConfig,
+} from '@expo/config';
+import { Updates } from '@expo/config-plugins';
+import { vol } from 'memfs';
+import nullthrows from 'nullthrows';
+import path from 'path';
+import { instance, mock } from 'ts-mockito';
+
+import { ensureBranchExistsAsync } from '../../../branch/queries';
+import { DynamicProjectConfigContextField } from '../../../commandUtils/context/DynamicProjectConfigContextField';
+import LoggedInContextField from '../../../commandUtils/context/LoggedInContextField';
+import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
+import FeatureGateEnvOverrides from '../../../commandUtils/gating/FeatureGateEnvOverrides';
+import FeatureGating from '../../../commandUtils/gating/FeatureGating';
+import { jester } from '../../../credentials/__tests__/fixtures-constants';
+import { UpdateFragment } from '../../../graphql/generated';
+import { PublishMutation } from '../../../graphql/mutations/PublishMutation';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { getBranchNameFromChannelNameAsync } from '../../../update/getBranchNameFromChannelNameAsync';
+import UpdateRollBackToEmbedded from '../roll-back-to-embedded';
+
+const projectRoot = '/test-project';
+const commandOptions = { root: projectRoot } as any;
+const updateStub: UpdateFragment = {
+  id: 'update-1234',
+  group: 'group-1234',
+  branch: { id: 'branch-1234', name: 'main' },
+  message: 'test message',
+  runtimeVersion: 'exposdk:47.0.0',
+  platform: 'ios',
+  gitCommitHash: 'commit',
+  manifestFragment: JSON.stringify({ fake: 'manifest' }),
+  isRollBackToEmbedded: false,
+  manifestPermalink: 'https://expo.dev/fake/manifest/link',
+  codeSigningInfo: null,
+  createdAt: '2022-01-01T12:00:00Z',
+};
+
+jest.mock('fs');
+jest.mock('@expo/config');
+jest.mock('@expo/config-plugins');
+jest.mock('../../../branch/queries');
+jest.mock('../../../commandUtils/context/contextUtils/getProjectIdAsync');
+jest.mock('../../../update/configure');
+jest.mock('../../../update/getBranchNameFromChannelNameAsync');
+jest.mock('../../../graphql/mutations/PublishMutation');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../graphql/queries/UpdateQuery');
+jest.mock('../../../ora', () => ({
+  ora: () => ({
+    start: () => ({ succeed: () => {}, fail: () => {}, stop: () => {} }),
+  }),
+}));
+jest.mock('../../../project/publish', () => ({
+  ...jest.requireActual('../../../project/publish'),
+  buildBundlesAsync: jest.fn(),
+  collectAssetsAsync: jest.fn(),
+  resolveInputDirectoryAsync: jest.fn((inputDir = 'dist') => path.join(projectRoot, inputDir)),
+  uploadAssetsAsync: jest.fn(),
+}));
+
+describe(UpdateRollBackToEmbedded.name, () => {
+  afterEach(() => vol.reset());
+
+  it('errors with both --channel and --branch', async () => {
+    const flags = ['--channel=channel123', '--branch=branch123'];
+
+    mockTestProject();
+
+    await expect(new UpdateRollBackToEmbedded(flags, commandOptions).run()).rejects.toThrow(
+      'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.'
+    );
+  });
+
+  it('creates a roll back to embedded with --non-interactive, --branch, and --message', async () => {
+    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
+
+    mockTestProject();
+    const platforms = ['android', 'ios'];
+    const runtimeVersion = 'exposdk:47.0.0';
+    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+
+    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
+      branchId: 'branch123',
+      createdBranch: false,
+    });
+
+    jest
+      .mocked(PublishMutation.publishUpdateGroupAsync)
+      .mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
+
+    await new UpdateRollBackToEmbedded(flags, commandOptions).run();
+
+    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
+  });
+
+  it('creates a roll back to embedded with --non-interactive, --channel, and --message', async () => {
+    const flags = ['--non-interactive', '--channel=channel123', '--message=abc'];
+
+    const { projectId } = mockTestProject();
+    const platforms = ['android', 'ios'];
+    const runtimeVersion = 'exposdk:47.0.0';
+    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+
+    jest.mocked(getBranchNameFromChannelNameAsync).mockResolvedValue('branchFromChannel');
+    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
+      branchId: 'branch123',
+      createdBranch: false,
+    });
+
+    jest.mocked(PublishMutation.publishUpdateGroupAsync).mockResolvedValue(
+      platforms.map(platform => ({
+        ...updateStub,
+        runtimeVersion,
+        platform,
+      }))
+    );
+
+    await new UpdateRollBackToEmbedded(flags, commandOptions).run();
+
+    expect(ensureBranchExistsAsync).toHaveBeenCalledWith(
+      expect.any(Object), // graphql client
+      {
+        appId: projectId,
+        branchName: 'branchFromChannel',
+      }
+    );
+
+    expect(PublishMutation.publishUpdateGroupAsync).toHaveBeenCalled();
+  });
+
+  it('creates a roll back to embedded with the public expo config', async () => {
+    const flags = ['--non-interactive', '--branch=branch123', '--message=abc'];
+
+    // Add configuration to the project that should not be included in the update
+    mockTestProject({
+      expoConfig: {
+        hooks: {
+          postPublish: [
+            {
+              file: 'custom-hook.js',
+              config: { some: 'config' },
+            },
+          ],
+        },
+      },
+    });
+
+    const platforms = ['ios'];
+    const runtimeVersion = 'exposdk:47.0.0';
+    jest.mocked(Updates.getRuntimeVersion).mockReturnValue(runtimeVersion);
+
+    // Mock an existing branch, so we don't create a new one
+    jest.mocked(ensureBranchExistsAsync).mockResolvedValue({
+      branchId: 'branch123',
+      createdBranch: false,
+    });
+
+    jest
+      .mocked(PublishMutation.publishUpdateGroupAsync)
+      .mockResolvedValue(platforms.map(platform => ({ ...updateStub, platform, runtimeVersion })));
+
+    await new UpdateRollBackToEmbedded(flags, commandOptions).run();
+
+    // Pull the publish data from the mocked publish function
+    const publishData = jest.mocked(PublishMutation.publishUpdateGroupAsync).mock.calls[0][1][0];
+    expect(nullthrows(publishData.rollBackToEmbeddedInfoGroup).ios).toBe(true);
+  });
+});
+
+/** Create a new in-memory project, based on src/commands/project/__tests__/init.test.ts */
+function mockTestProject({
+  configuredProjectId = '1234',
+  expoConfig = {},
+}: {
+  configuredProjectId?: string;
+  expoConfig?: Partial<ExpoConfig>;
+} = {}): { projectId: string; appJson: AppJSONConfig } {
+  const packageJSON: PackageJSONConfig = {
+    name: 'testing123',
+    version: '0.1.0',
+    description: 'fake description',
+    main: 'index.js',
+  };
+
+  const appJSON: AppJSONConfig = {
+    expo: {
+      name: 'testing 123',
+      version: '0.1.0',
+      slug: 'testing-123',
+      sdkVersion: '33.0.0',
+      owner: jester.accounts[0].name,
+      extra: {
+        eas: {
+          projectId: configuredProjectId,
+        },
+      },
+      ...expoConfig,
+    },
+  };
+
+  vol.fromJSON(
+    {
+      'package.json': JSON.stringify(packageJSON),
+      'app.json': JSON.stringify(appJSON),
+    },
+    projectRoot
+  );
+
+  const mockManifest = { exp: appJSON.expo };
+  const graphqlClient = instance(mock<ExpoGraphqlClient>({}));
+
+  jest.mocked(getConfig).mockReturnValue(mockManifest as any);
+  jest
+    .spyOn(DynamicProjectConfigContextField.prototype, 'getValueAsync')
+    .mockResolvedValue(async (options?: GetConfigOptions) => {
+      let exp = { ...mockManifest.exp };
+
+      // Fake a limited public config
+      if (options?.isPublicConfig) {
+        exp = {
+          name: mockManifest.exp.name,
+          version: mockManifest.exp.version,
+          slug: mockManifest.exp.slug,
+          sdkVersion: mockManifest.exp.sdkVersion,
+          owner: mockManifest.exp.owner,
+          extra: mockManifest.exp.extra,
+        };
+      }
+
+      return {
+        exp,
+        projectDir: projectRoot,
+        projectId: configuredProjectId,
+      };
+    });
+
+  jest.spyOn(LoggedInContextField.prototype, 'getValueAsync').mockResolvedValue({
+    actor: jester,
+    featureGating: new FeatureGating({}, new FeatureGateEnvOverrides()),
+    graphqlClient,
+  });
+
+  jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+    id: '1234',
+    slug: 'testing-123',
+    fullName: '@jester/testing-123',
+    ownerAccount: jester.accounts[0],
+  });
+
+  return { projectId: configuredProjectId, appJson: appJSON };
+}

packages/eas-cli/src/commands/update/index.ts

@@ -1,13 +1,9 @@
-import { ExpoConfig, Platform as PublishPlatform } from '@expo/config';
-import { Updates } from '@expo/config-plugins';
-import { Platform, Workflow } from '@expo/eas-build-job';
+import { Platform as PublishPlatform } from '@expo/config';
 import { Errors, Flags } from '@oclif/core';
-import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { ensureBranchExistsAsync, selectBranchOnAppAsync } from '../../branch/queries';
-import { getDefaultBranchNameAsync } from '../../branch/utils';
+import { ensureBranchExistsAsync } from '../../branch/queries';
 import { getUpdateGroupUrl } from '../../build/utils/url';
 import { ensureChannelExistsAsync } from '../../channel/queries';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -23,32 +19,31 @@ import {
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import Log, { learnMore, link } from '../../log';
 import { ora } from '../../ora';
-import { RequestedPlatform, requestedPlatformDisplayNames } from '../../platform';
+import { RequestedPlatform } from '../../platform';
 import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
 import {
   ExpoCLIExportPlatformFlag,
   buildBundlesAsync,
   buildUnsortedUpdateInfoGroupAsync,
   collectAssetsAsync,
+  defaultPublishPlatforms,
   filterExportedPlatformsByFlag,
+  getBranchNameForCommandAsync,
+  getRequestedPlatform,
+  getRuntimeToPlatformMappingFromRuntimeVersions,
+  getRuntimeVersionObjectAsync,
+  getUpdateMessageForCommandAsync,
   isUploadedAssetCountAboveWarningThreshold,
   resolveInputDirectoryAsync,
   uploadAssetsAsync,
 } from '../../project/publish';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { promptAsync } from '../../prompts';
 import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
-import { getBranchNameFromChannelNameAsync } from '../../update/getBranchNameFromChannelNameAsync';
-import {
-  formatUpdateMessage,
-  getUpdateGroupJsonInfo,
-  truncateString as truncateUpdateMessage,
-} from '../../update/utils';
+import { getUpdateGroupJsonInfo } from '../../update/utils';
 import {
   checkManifestBodyAgainstUpdateInfoGroup,
   getCodeSigningInfoAsync,
   getManifestBodyAsync,
-  signManifestBody,
+  signBody,
 } from '../../utils/code-signing';
 import uniqBy from '../../utils/expodash/uniqBy';
 import formatFields from '../../utils/formatFields';
@@ -56,8 +51,6 @@ import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
 import { getVcsClient } from '../../vcs';
 
-export const defaultPublishPlatforms: Partial<PublishPlatform>[] = ['android', 'ios'];
-
 type RawUpdateFlags = {
   auto: boolean;
   branch?: string;
@@ -88,21 +81,6 @@ type UpdateFlags = {
   nonInteractive: boolean;
 };
 
-function getRequestedPlatform(platform: ExpoCLIExportPlatformFlag): RequestedPlatform | null {
-  switch (platform) {
-    case 'android':
-      return RequestedPlatform.Android;
-    case 'ios':
-      return RequestedPlatform.Ios;
-    case 'web':
-      return null;
-    case 'all':
-      return RequestedPlatform.All;
-    default:
-      throw new Error(`Unsupported platform: ${platform}`);
-  }
-}
-
 export default class UpdatePublish extends EasCommand {
   static override description = 'publish an update group';
 
@@ -166,18 +144,18 @@ export default class UpdatePublish extends EasCommand {
   async runAsync(): Promise<void> {
     const { flags: rawFlags } = await this.parse(UpdatePublish);
     const paginatedQueryOptions = getPaginatedQueryOptions(rawFlags);
-    let {
+    const {
       auto: autoFlag,
       platform: platformFlag,
-      channelName,
-      updateMessage,
+      channelName: channelNameArg,
+      updateMessage: updateMessageArg,
       inputDir,
       skipBundler,
       privateKeyPath,
       json: jsonFlag,
       nonInteractive,
+      branchName: branchNameArg,
     } = this.sanitizeFlags(rawFlags);
-    let branchName = this.sanitizeFlags(rawFlags).branchName;
 
     const {
       getDynamicProjectConfigAsync,
@@ -198,10 +176,6 @@ export default class UpdatePublish extends EasCommand {
       isPublicConfig: true,
     });
 
-    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
-      isPublicConfig: false,
-    });
-
     await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
 
     await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
@@ -211,75 +185,28 @@ export default class UpdatePublish extends EasCommand {
       projectId,
     });
 
-    const { exp } = await getDynamicProjectConfigAsync({});
+    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
+    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
+      isPublicConfig: false,
+    });
     const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
 
-    let realizedPlatforms: PublishPlatform[] = [];
+    const branchName = await getBranchNameForCommandAsync({
+      graphqlClient,
+      projectId,
+      channelNameArg,
+      branchNameArg,
+      autoFlag,
+      nonInteractive,
+      paginatedQueryOptions,
+    });
 
-    if (channelName && branchName) {
-      throw new Error(
-        'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto'
-      );
-    }
-
-    if (channelName) {
-      branchName = await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelName);
-    }
-
-    if (!branchName) {
-      if (autoFlag) {
-        branchName = await getDefaultBranchNameAsync();
-      } else if (nonInteractive) {
-        throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode');
-      } else {
-        try {
-          const branch = await selectBranchOnAppAsync(graphqlClient, {
-            projectId,
-            promptTitle: `Which branch would you like to publish on?`,
-            displayTextForListItem: updateBranch => ({
-              title: `${updateBranch.name} ${chalk.grey(
-                `- current update: ${formatUpdateMessage(updateBranch.updates[0])}`
-              )}`,
-            }),
-            paginatedQueryOptions,
-          });
-          branchName = branch.name;
-        } catch {
-          // unable to select a branch (network error or no branches for project)
-          ({ name: branchName } = await promptAsync({
-            type: 'text',
-            name: 'name',
-            message: 'No branches found. Provide a branch name:',
-            initial: await getDefaultBranchNameAsync(),
-            validate: value => (value ? true : 'Branch name may not be empty.'),
-          }));
-        }
-
-        assert(branchName, 'Branch name must be specified.');
-      }
-    }
-
-    if (!updateMessage && autoFlag) {
-      updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
-    }
-
-    if (!updateMessage) {
-      if (nonInteractive) {
-        throw new Error('Must supply --message or use --auto when in non-interactive mode');
-      }
-
-      const validationMessage = 'publish message may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ updateMessage } = await promptAsync({
-        type: 'text',
-        name: 'updateMessage',
-        message: `Provide an update message.`,
-        initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
-        validate: (value: any) => (value ? true : validationMessage),
-      }));
-    }
+    const updateMessage = await getUpdateMessageForCommandAsync({
+      updateMessageArg,
+      autoFlag,
+      nonInteractive,
+      jsonFlag,
+    });
 
     // build bundle and upload assets for a new publish
     if (!skipBundler) {
@@ -300,6 +227,7 @@ export default class UpdatePublish extends EasCommand {
     let unsortedUpdateInfoGroups: UpdateInfoGroup = {};
     let uploadedAssetCount = 0;
     let assetLimitPerUpdateGroup = 0;
+    let realizedPlatforms: PublishPlatform[] = [];
 
     try {
       const collectedAssets = await collectAssetsAsync(distRoot);
@@ -318,31 +246,42 @@ export default class UpdatePublish extends EasCommand {
       uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
       assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
       unsortedUpdateInfoGroups = await buildUnsortedUpdateInfoGroupAsync(assets, exp);
-      const uploadAssetSuccessMessage = uploadedAssetCount
-        ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'platform' : 'platforms'}`
-        : `Uploaded: No changes detected`;
-      assetSpinner.succeed(uploadAssetSuccessMessage);
+
+      // NOTE(cedric): we assume that bundles are always uploaded, and always are part of
+      // `uploadedAssetCount`, perferably we don't assume. For that, we need to refactor the
+      // `uploadAssetsAsync` and be able to determine asset type from the uploaded assets.
+      const uploadedBundleCount = uploadResults.launchAssetCount;
+      const uploadedNormalAssetCount = Math.max(0, uploadedAssetCount - uploadedBundleCount);
+      const reusedNormalAssetCount = uploadResults.uniqueAssetCount - uploadedNormalAssetCount;
+
+      assetSpinner.stop();
+      Log.withTick(
+        `Uploaded ${uploadedBundleCount} app ${uploadedBundleCount === 1 ? 'bundle' : 'bundles'}`
+      );
+      if (uploadedNormalAssetCount === 0) {
+        Log.withTick(`Uploading assets skipped - no new assets found`);
+      } else {
+        let message = `Uploaded ${uploadedNormalAssetCount} ${
+          uploadedNormalAssetCount === 1 ? 'asset' : 'assets'
+        }`;
+        if (reusedNormalAssetCount > 0) {
+          message += ` (reused ${reusedNormalAssetCount} ${
+            reusedNormalAssetCount === 1 ? 'asset' : 'assets'
+          })`;
+        }
+        Log.withTick(message);
+      }
+      for (const uploadedAssetPath of uploadResults.uniqueUploadedAssetPaths) {
+        Log.debug(chalk.dim(`- ${uploadedAssetPath}`));
+      }
     } catch (e) {
       assetSpinner.fail('Failed to upload');
       throw e;
     }
 
-    const truncatedMessage = truncateUpdateMessage(updateMessage!, 1024);
-    if (truncatedMessage !== updateMessage) {
-      Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
-    }
-
     const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
-
-    const runtimeToPlatformMapping: { runtimeVersion: string; platforms: string[] }[] = [];
-    for (const runtime of runtimeVersions) {
-      const platforms = runtimeVersions
-        .filter(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)
-        .map(({ platform }) => platform);
-      if (!runtimeToPlatformMapping.find(item => item.runtimeVersion === runtime.runtimeVersion)) {
-        runtimeToPlatformMapping.push({ runtimeVersion: runtime.runtimeVersion, platforms });
-      }
-    }
+    const runtimeToPlatformMapping =
+      getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
 
     const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
       appId: projectId,
@@ -377,7 +316,7 @@ export default class UpdatePublish extends EasCommand {
           branchId,
           updateInfoGroup: localUpdateInfoGroup,
           runtimeVersion,
-          message: truncatedMessage,
+          message: updateMessage,
           gitCommitHash,
           isGitWorkingTreeDirty,
           awaitingCodeSigningInfo: !!codeSigningInfo,
@@ -394,7 +333,10 @@ export default class UpdatePublish extends EasCommand {
 
         const updatesTemp = [...newUpdates];
         const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
-          const newUpdates = updatesTemp.splice(0, Object.keys(updateGroup.updateInfoGroup).length);
+          const newUpdates = updatesTemp.splice(
+            0,
+            Object.keys(nullthrows(updateGroup.updateInfoGroup)).length
+          );
           return {
             updateGroup,
             newUpdates,
@@ -414,11 +356,13 @@ export default class UpdatePublish extends EasCommand {
                 checkManifestBodyAgainstUpdateInfoGroup(
                   manifestBody,
                   nullthrows(
-                    updateGroup.updateInfoGroup[newUpdate.platform as keyof UpdateInfoGroup]
+                    nullthrows(updateGroup.updateInfoGroup)[
+                      newUpdate.platform as keyof UpdateInfoGroup
+                    ]
                   )
                 );
 
-                const manifestSignature = signManifestBody(manifestBody, codeSigningInfo);
+                const manifestSignature = signBody(manifestBody, codeSigningInfo);
 
                 await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
                   alg: codeSigningInfo.codeSigningMetadata.alg,
@@ -480,7 +424,7 @@ export default class UpdatePublish extends EasCommand {
               ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
               : []),
             ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-            { label: 'Message', value: truncatedMessage },
+            { label: 'Message', value: updateMessage },
             ...(gitCommitHash
               ? [
                   {
@@ -551,41 +495,3 @@ export default class UpdatePublish extends EasCommand {
     };
   }
 }
-
-/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
-async function getRuntimeVersionObjectAsync(
-  exp: ExpoConfig,
-  platforms: PublishPlatform[],
-  projectDir: string
-): Promise<{ platform: string; runtimeVersion: string }[]> {
-  for (const platform of platforms) {
-    if (platform === 'web') {
-      continue;
-    }
-    const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
-    if (isPolicy) {
-      const isManaged =
-        (await resolveWorkflowAsync(projectDir, platform as Platform)) === Workflow.MANAGED;
-      if (!isManaged) {
-        throw new Error(
-          'Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.'
-        );
-      }
-    }
-  }
-
-  return [...new Set(platforms)].map(platform => {
-    if (platform === 'web') {
-      return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
-    }
-    return {
-      platform,
-      runtimeVersion: nullthrows(
-        Updates.getRuntimeVersion(exp, platform),
-        `Unable to determine runtime version for ${
-          requestedPlatformDisplayNames[platform]
-        }. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
-      ),
-    };
-  });
-}

packages/eas-cli/src/commands/update/republish.ts

@@ -56,7 +56,7 @@ type UpdateToRepublish = {
 >;
 
 export default class UpdateRepublish extends EasCommand {
-  static override description = 'rollback to an existing update';
+  static override description = 'roll back to an existing update';
 
   static override flags = {
     channel: Flags.string({

packages/eas-cli/src/commands/update/roll-back-to-embedded.ts

@@ -0,0 +1,389 @@
+import { Platform as PublishPlatform } from '@expo/config';
+import { Errors, Flags } from '@oclif/core';
+import chalk from 'chalk';
+import nullthrows from 'nullthrows';
+
+import { ensureBranchExistsAsync } from '../../branch/queries';
+import { getUpdateGroupUrl } from '../../build/utils/url';
+import { ensureChannelExistsAsync } from '../../channel/queries';
+import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import fetch from '../../fetch';
+import {
+  PublishUpdateGroupInput,
+  StatuspageServiceName,
+  UpdatePublishMutation,
+} from '../../graphql/generated';
+import { PublishMutation } from '../../graphql/mutations/PublishMutation';
+import Log, { link } from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
+import { getOwnerAccountForProjectIdAsync } from '../../project/projectUtils';
+import {
+  ExpoCLIExportPlatformFlag,
+  defaultPublishPlatforms,
+  getBranchNameForCommandAsync,
+  getRequestedPlatform,
+  getRuntimeToPlatformMappingFromRuntimeVersions,
+  getRuntimeVersionObjectAsync,
+  getUpdateMessageForCommandAsync,
+} from '../../project/publish';
+import { ensureEASUpdateIsConfiguredAsync } from '../../update/configure';
+import { getUpdateGroupJsonInfo } from '../../update/utils';
+import {
+  CodeSigningInfo,
+  checkDirectiveBodyAgainstUpdateInfoGroup,
+  getCodeSigningInfoAsync,
+  getDirectiveBodyAsync,
+  signBody,
+} from '../../utils/code-signing';
+import uniqBy from '../../utils/expodash/uniqBy';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
+import { getVcsClient } from '../../vcs';
+
+type RawUpdateFlags = {
+  auto: boolean;
+  branch?: string;
+  channel?: string;
+  message?: string;
+  platform: string;
+  'private-key-path'?: string;
+  'non-interactive': boolean;
+  json: boolean;
+};
+
+type UpdateFlags = {
+  auto: boolean;
+  platform: ExpoCLIExportPlatformFlag;
+  branchName?: string;
+  channelName?: string;
+  updateMessage?: string;
+  privateKeyPath?: string;
+  json: boolean;
+  nonInteractive: boolean;
+};
+
+export default class UpdateRollBackToEmbedded extends EasCommand {
+  static override hidden = true; // until we launch
+  static override description = 'roll back to the embedded update';
+
+  static override flags = {
+    branch: Flags.string({
+      description: 'Branch to publish the rollback to embedded update group on',
+      required: false,
+    }),
+    channel: Flags.string({
+      description: 'Channel that the published rollback to embedded update should affect',
+      required: false,
+    }),
+    message: Flags.string({
+      description: 'A short message describing the rollback to embedded update',
+      required: false,
+    }),
+    platform: Flags.enum({
+      char: 'p',
+      options: [...defaultPublishPlatforms, 'all'],
+      default: 'all',
+      required: false,
+    }),
+    auto: Flags.boolean({
+      description:
+        'Use the current git branch and commit message for the EAS branch and update message',
+      default: false,
+    }),
+    'private-key-path': Flags.string({
+      description: `File containing the PEM-encoded private key corresponding to the certificate in expo-updates' configuration. Defaults to a file named "private-key.pem" in the certificate's directory.`,
+      required: false,
+    }),
+    ...EasNonInteractiveAndJsonFlags,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.DynamicProjectConfig,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { flags: rawFlags } = await this.parse(UpdateRollBackToEmbedded);
+    const paginatedQueryOptions = getPaginatedQueryOptions(rawFlags);
+    const {
+      auto: autoFlag,
+      platform: platformFlag,
+      channelName: channelNameArg,
+      updateMessage: updateMessageArg,
+      privateKeyPath,
+      json: jsonFlag,
+      nonInteractive,
+      branchName: branchNameArg,
+    } = this.sanitizeFlags(rawFlags);
+
+    const {
+      getDynamicProjectConfigAsync,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(UpdateRollBackToEmbedded, {
+      nonInteractive,
+    });
+
+    if (jsonFlag) {
+      enableJsonOutput();
+    }
+
+    const {
+      exp: expPossiblyWithoutEasUpdateConfigured,
+      projectId,
+      projectDir,
+    } = await getDynamicProjectConfigAsync({
+      isPublicConfig: true,
+    });
+
+    await maybeWarnAboutEasOutagesAsync(graphqlClient, [StatuspageServiceName.EasUpdate]);
+
+    await ensureEASUpdateIsConfiguredAsync(graphqlClient, {
+      exp: expPossiblyWithoutEasUpdateConfigured,
+      platform: getRequestedPlatform(platformFlag),
+      projectDir,
+      projectId,
+    });
+
+    const { exp } = await getDynamicProjectConfigAsync({ isPublicConfig: true });
+    const { exp: expPrivate } = await getDynamicProjectConfigAsync({
+      isPublicConfig: false,
+    });
+    const codeSigningInfo = await getCodeSigningInfoAsync(expPrivate, privateKeyPath);
+
+    const branchName = await getBranchNameForCommandAsync({
+      graphqlClient,
+      projectId,
+      channelNameArg,
+      branchNameArg,
+      autoFlag,
+      nonInteractive,
+      paginatedQueryOptions,
+    });
+
+    const updateMessage = await getUpdateMessageForCommandAsync({
+      updateMessageArg,
+      autoFlag,
+      nonInteractive,
+      jsonFlag,
+    });
+
+    const realizedPlatforms: PublishPlatform[] =
+      platformFlag === 'all' ? defaultPublishPlatforms : [platformFlag];
+
+    const { branchId, createdBranch } = await ensureBranchExistsAsync(graphqlClient, {
+      appId: projectId,
+      branchName,
+    });
+    if (createdBranch) {
+      await ensureChannelExistsAsync(graphqlClient, {
+        appId: projectId,
+        branchId,
+        channelName: branchName,
+      });
+    }
+
+    Log.withTick(`Channel: ${chalk.bold(branchName)} pointed at branch: ${chalk.bold(branchName)}`);
+
+    const vcsClient = getVcsClient();
+
+    const gitCommitHash = await vcsClient.getCommitHashAsync();
+    const isGitWorkingTreeDirty = await vcsClient.hasUncommittedChangesAsync();
+
+    const runtimeVersions = await getRuntimeVersionObjectAsync(exp, realizedPlatforms, projectDir);
+
+    let newUpdates: UpdatePublishMutation['updateBranch']['publishUpdateGroups'];
+    const publishSpinner = ora('Publishing...').start();
+    try {
+      newUpdates = await this.publishRollbacksAsync({
+        graphqlClient,
+        isGitWorkingTreeDirty,
+        gitCommitHash,
+        updateMessage,
+        branchId,
+        codeSigningInfo,
+        runtimeVersions,
+        realizedPlatforms,
+      });
+      publishSpinner.succeed('Published!');
+    } catch (e) {
+      publishSpinner.fail('Failed to publish updates');
+      throw e;
+    }
+
+    if (jsonFlag) {
+      printJsonOnlyOutput(getUpdateGroupJsonInfo(newUpdates));
+    } else {
+      if (new Set(newUpdates.map(update => update.group)).size > 1) {
+        Log.addNewLineIfNone();
+        Log.log(
+          '👉 Since multiple runtime versions are defined, multiple update groups have been published.'
+        );
+      }
+
+      Log.addNewLineIfNone();
+
+      for (const runtime of uniqBy(runtimeVersions, version => version.runtimeVersion)) {
+        const newUpdatesForRuntimeVersion = newUpdates.filter(
+          update => update.runtimeVersion === runtime.runtimeVersion
+        );
+        if (newUpdatesForRuntimeVersion.length === 0) {
+          throw new Error(
+            `Publish response is missing updates with runtime ${runtime.runtimeVersion}.`
+          );
+        }
+        const platforms = newUpdatesForRuntimeVersion.map(update => update.platform);
+        const newAndroidUpdate = newUpdatesForRuntimeVersion.find(
+          update => update.platform === 'android'
+        );
+        const newIosUpdate = newUpdatesForRuntimeVersion.find(update => update.platform === 'ios');
+        const updateGroupId = newUpdatesForRuntimeVersion[0].group;
+
+        const projectName = exp.slug;
+        const accountName = (await getOwnerAccountForProjectIdAsync(graphqlClient, projectId)).name;
+        const updateGroupUrl = getUpdateGroupUrl(accountName, projectName, updateGroupId);
+        const updateGroupLink = link(updateGroupUrl, { dim: false });
+
+        Log.log(
+          formatFields([
+            { label: 'Branch', value: branchName },
+            { label: 'Runtime version', value: runtime.runtimeVersion },
+            { label: 'Platform', value: platforms.join(', ') },
+            { label: 'Update group ID', value: updateGroupId },
+            ...(newAndroidUpdate
+              ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
+              : []),
+            ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
+            { label: 'Message', value: updateMessage },
+            ...(gitCommitHash
+              ? [
+                  {
+                    label: 'Commit',
+                    value: `${gitCommitHash}${isGitWorkingTreeDirty ? '*' : ''}`,
+                  },
+                ]
+              : []),
+            { label: 'Website link', value: updateGroupLink },
+          ])
+        );
+        Log.addNewLineIfNone();
+      }
+    }
+  }
+
+  private async publishRollbacksAsync({
+    graphqlClient,
+    isGitWorkingTreeDirty,
+    gitCommitHash,
+    updateMessage,
+    branchId,
+    codeSigningInfo,
+    runtimeVersions,
+    realizedPlatforms,
+  }: {
+    graphqlClient: ExpoGraphqlClient;
+    isGitWorkingTreeDirty: boolean | undefined;
+    gitCommitHash: string | undefined;
+    updateMessage: string;
+    branchId: string;
+    codeSigningInfo: CodeSigningInfo | undefined;
+    runtimeVersions: { platform: string; runtimeVersion: string }[];
+    realizedPlatforms: PublishPlatform[];
+  }): Promise<UpdatePublishMutation['updateBranch']['publishUpdateGroups']> {
+    const runtimeToPlatformMapping =
+      getRuntimeToPlatformMappingFromRuntimeVersions(runtimeVersions);
+    const rollbackInfoGroups = Object.fromEntries(
+      realizedPlatforms.map(platform => [platform, true])
+    );
+
+    // Sort the updates into different groups based on their platform specific runtime versions
+    const updateGroups: PublishUpdateGroupInput[] = runtimeToPlatformMapping.map(
+      ({ runtimeVersion, platforms }) => {
+        const localRollbackInfoGroup = Object.fromEntries(
+          platforms.map(platform => [platform, rollbackInfoGroups[platform]])
+        );
+
+        return {
+          branchId,
+          rollBackToEmbeddedInfoGroup: localRollbackInfoGroup,
+          runtimeVersion,
+          message: updateMessage,
+          gitCommitHash,
+          isGitWorkingTreeDirty,
+          awaitingCodeSigningInfo: !!codeSigningInfo,
+        };
+      }
+    );
+
+    const newUpdates = await PublishMutation.publishUpdateGroupAsync(graphqlClient, updateGroups);
+
+    if (codeSigningInfo) {
+      Log.log('🔒 Signing roll back');
+
+      const updatesTemp = [...newUpdates];
+      const updateGroupsAndTheirUpdates = updateGroups.map(updateGroup => {
+        const newUpdates = updatesTemp.splice(
+          0,
+          Object.keys(nullthrows(updateGroup.rollBackToEmbeddedInfoGroup)).length
+        );
+        return {
+          updateGroup,
+          newUpdates,
+        };
+      });
+
+      await Promise.all(
+        updateGroupsAndTheirUpdates.map(async ({ newUpdates }) => {
+          await Promise.all(
+            newUpdates.map(async newUpdate => {
+              const response = await fetch(newUpdate.manifestPermalink, {
+                method: 'GET',
+                headers: { accept: 'multipart/mixed' },
+              });
+              const directiveBody = nullthrows(await getDirectiveBodyAsync(response));
+
+              checkDirectiveBodyAgainstUpdateInfoGroup(directiveBody);
+
+              const directiveSignature = signBody(directiveBody, codeSigningInfo);
+
+              await PublishMutation.setCodeSigningInfoAsync(graphqlClient, newUpdate.id, {
+                alg: codeSigningInfo.codeSigningMetadata.alg,
+                keyid: codeSigningInfo.codeSigningMetadata.keyid,
+                sig: directiveSignature,
+              });
+            })
+          );
+        })
+      );
+    }
+
+    return newUpdates;
+  }
+
+  private sanitizeFlags(flags: RawUpdateFlags): UpdateFlags {
+    const nonInteractive = flags['non-interactive'] ?? false;
+
+    const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
+    if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
+      Errors.error(
+        '--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified',
+        { exit: 1 }
+      );
+    }
+
+    return {
+      auto,
+      branchName,
+      channelName,
+      updateMessage,
+      platform: flags.platform as RequestedPlatform,
+      privateKeyPath: flags['private-key-path'],
+      nonInteractive,
+      json: flags.json ?? false,
+    };
+  }
+}

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

@@ -128,7 +128,7 @@ export default class IosCredentialsProvider {
   private async disablePushNotificationsSetupInEasJsonAsync(
     ctx: CredentialsContext
   ): Promise<void> {
-    const easJsonAccessor = new EasJsonAccessor(ctx.projectDir);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(ctx.projectDir);
     await easJsonAccessor.readRawJsonAsync();
     easJsonAccessor.patch(easJsonRawObject => {
       easJsonRawObject.cli = {

packages/eas-cli/src/credentials/ios/api/graphql/mutations/AppleDeviceMutation.ts

@@ -6,8 +6,10 @@ import { withErrorHandlingAsync } from '../../../../../graphql/client';
 import {
   AppleDeviceFragment,
   AppleDeviceInput,
+  AppleDeviceUpdateInput,
   CreateAppleDeviceMutation,
   DeleteAppleDeviceResult,
+  UpdateAppleDeviceMutation,
 } from '../../../../../graphql/generated';
 import { AppleDeviceFragmentNode } from '../../../../../graphql/types/credentials/AppleDevice';
 
@@ -67,4 +69,35 @@ export const AppleDeviceMutation = {
     );
     return data.id;
   },
+  async updateAppleDeviceAsync(
+    graphqlClient: ExpoGraphqlClient,
+    id: string,
+    appleDeviceUpdateInput: AppleDeviceUpdateInput
+  ): Promise<AppleDeviceFragment> {
+    const data = await withErrorHandlingAsync(
+      graphqlClient
+        .mutation<UpdateAppleDeviceMutation>(
+          gql`
+            mutation UpdateAppleDeviceMutation(
+              $id: ID!
+              $appleDeviceUpdateInput: AppleDeviceUpdateInput!
+            ) {
+              appleDevice {
+                updateAppleDevice(id: $id, appleDeviceUpdateInput: $appleDeviceUpdateInput) {
+                  id
+                  ...AppleDeviceFragment
+                }
+              }
+            }
+            ${print(AppleDeviceFragmentNode)}
+          `,
+          {
+            id,
+            appleDeviceUpdateInput,
+          }
+        )
+        .toPromise()
+    );
+    return data.appleDevice.updateAppleDevice;
+  },
 };

packages/eas-cli/src/credentials/manager/SelectBuildProfileFromEasJson.ts

@@ -8,7 +8,7 @@ export class SelectBuildProfileFromEasJson<T extends Platform> {
   private easJsonAccessor: EasJsonAccessor;
 
   constructor(projectDir: string, private platform: T) {
-    this.easJsonAccessor = new EasJsonAccessor(projectDir);
+    this.easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   }
 
   async runAsync(): Promise<BuildProfile<T>> {

packages/eas-cli/src/devices/actions/create/inputMethod.ts

@@ -81,7 +81,9 @@ async function collectDeviceDataAsync(
   Log.newLine();
   Log.log(
     `We are going to register the following device in our database.
-This will ${chalk.bold('not')} register the device on the Apple Developer Portal yet.`
+This device will ${chalk.bold(
+      'not'
+    )} be registered on the Apple Developer Portal until it is chosen for an internal distribution build.`
   );
   Log.newLine();
   Log.log(formatNewDevice({ ...deviceData, identifier: deviceData.udid }, appleTeam));

packages/eas-cli/src/graphql/types/Build.ts

@@ -52,6 +52,7 @@ export const BuildFragmentNode = gql`
     priority
     createdAt
     updatedAt
+    message
     completedAt
     resourceClass
   }

packages/eas-cli/src/graphql/types/Update.ts

@@ -9,6 +9,7 @@ export const UpdateFragmentNode = gql`
     runtimeVersion
     platform
     manifestFragment
+    isRollBackToEmbedded
     manifestPermalink
     gitCommitHash
     actor {

packages/eas-cli/src/log.ts

@@ -90,11 +90,12 @@ export default class Log {
  */
 export function link(
   url: string,
-  { text = url, dim = true }: { text?: string; dim?: boolean } = {}
+  { text = url, fallback, dim = true }: { text?: string; dim?: boolean; fallback?: string } = {}
 ): string {
   // Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
   const output = terminalLink(text, url, {
-    fallback: () => (text === url ? chalk.underline(url) : `${text}: ${chalk.underline(url)}`),
+    fallback: () =>
+      fallback ?? (text === url ? chalk.underline(url) : `${text}: ${chalk.underline(url)}`),
   });
   return dim ? chalk.dim(output) : output;
 }

packages/eas-cli/src/ora.ts

@@ -1,3 +1,4 @@
+import { boolish } from 'getenv';
 // eslint-disable-next-line
 import oraReal, { Options, Ora } from 'ora';
 
@@ -14,6 +15,8 @@ const warnReal = console.warn;
 // eslint-disable-next-line no-console
 const errorReal = console.error;
 
+const isCi = boolish('CI', false);
+
 /**
  * A custom ora spinner that sends the stream to stdout in CI, or non-TTY, instead of stderr (the default).
  *
@@ -22,7 +25,7 @@ const errorReal = console.error;
  */
 export function ora(options?: Options | string): Ora {
   const inputOptions = typeof options === 'string' ? { text: options } : options ?? {};
-  const disabled = Log.isDebug || !process.stdin.isTTY;
+  const disabled = Log.isDebug || !process.stdin.isTTY || isCi;
   const spinner = oraReal({
     // Ensure our non-interactive mode emulates CI mode.
     isEnabled: !disabled,

packages/eas-cli/src/project/__tests__/publish-test.ts

@@ -5,7 +5,6 @@ import { instance, mock } from 'ts-mockito';
 import { v4 as uuidv4 } from 'uuid';
 
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { defaultPublishPlatforms } from '../../commands/update';
 import { AssetMetadataStatus } from '../../graphql/generated';
 import { PublishMutation } from '../../graphql/mutations/PublishMutation';
 import { PublishQuery } from '../../graphql/queries/PublishQuery';
@@ -14,9 +13,12 @@ import {
   buildUnsortedUpdateInfoGroupAsync,
   collectAssetsAsync,
   convertAssetToUpdateInfoGroupFormatAsync,
+  defaultPublishPlatforms,
   filterExportedPlatformsByFlag,
   filterOutAssetsThatAlreadyExistAsync,
+  getAssetHashFromPath,
   getBase64URLEncoding,
+  getOriginalPathFromAssetMap,
   getStorageKey,
   getStorageKeyForAssetAsync,
   guessContentTypeFromExtension,
@@ -279,9 +281,55 @@ describe(resolveInputDirectoryAsync, () => {
   });
 });
 
+describe(getAssetHashFromPath, () => {
+  it('returns asset hash from path', () => {
+    expect(getAssetHashFromPath('assets/5b2a819c71d035ca45d223e4c47ed4f9')).toBe(
+      '5b2a819c71d035ca45d223e4c47ed4f9'
+    );
+  });
+  it('returns null for incorrect path', () => {
+    expect(getAssetHashFromPath('assets/this/is/not/a/hash.jpg')).toBeNull();
+  });
+});
+
+describe(getOriginalPathFromAssetMap, () => {
+  // Partial assetmap.json, with only fields we need
+  const fakeAssetMap = {
+    '5b2a819c71d035ca45d223e4c47ed4f9': {
+      httpServerLocation: '/assets/src/assets',
+      name: 'asset-420',
+      type: 'jpg',
+    },
+  };
+  it('returns null path when asset map is null', () => {
+    expect(
+      getOriginalPathFromAssetMap(null, {
+        path: 'assets/5b2a819c71d035ca45d223e4c47ed4f9',
+        ext: 'jpg',
+      })
+    ).toBeNull();
+  });
+  it('returns null when asset is not found in asset map', () => {
+    expect(
+      getOriginalPathFromAssetMap(fakeAssetMap, {
+        path: 'assets/fb64d3b2fb71b3d739ad5c13a93e12c5',
+        ext: 'jpg',
+      })
+    ).toBeNull();
+  });
+  it('returns reconstructed original path from existing asset in asset map', () => {
+    expect(
+      getOriginalPathFromAssetMap(fakeAssetMap, {
+        path: 'assets/5b2a819c71d035ca45d223e4c47ed4f9',
+        ext: 'jpg',
+      })
+    ).toBe('/src/assets/asset-420.jpg');
+  });
+});
+
 describe(collectAssetsAsync, () => {
   it('builds an update info group', async () => {
-    const fakeHash = 'md5-hash-of-jpg';
+    const fakeHash = 'hdahukw8adhawi8fawhfa8';
     const bundles = {
       android: 'android-bundle-code',
       ios: 'ios-bundle-code',
@@ -294,6 +342,7 @@ describe(collectAssetsAsync, () => {
         fileExtension: '.jpg',
         contentType: 'image/jpeg',
         path: `${inputDir}/assets/${fakeHash}`,
+        originalPath: `assets/wat.jpg`,
       },
     ];
 
@@ -326,6 +375,24 @@ describe(collectAssetsAsync, () => {
         },
       })
     );
+    await fs.writeFile(
+      path.resolve(inputDir, 'assetmap.json'),
+      JSON.stringify({
+        [fakeHash]: {
+          __packager_asset: true,
+          fileSystemLocation: '/Users/blah/temp/assets',
+          httpServerLocation: 'assets/assets',
+          width: 2339,
+          height: 1560,
+          scales: [1],
+          files: ['/Users/blah/temp/assets/wat.jpg'],
+          hash: fakeHash,
+          name: 'wat',
+          type: 'jpg',
+          fileHashes: [fakeHash],
+        },
+      })
+    );
 
     expect(await collectAssetsAsync(inputDir)).toEqual({
       android: {
@@ -410,6 +477,7 @@ describe(uploadAssetsAsync, () => {
   const androidBundlePath = uuidv4();
   const iosBundlePath = uuidv4();
   const dummyFilePath = uuidv4();
+  const dummyOriginalFilePath = uuidv4();
   const userDefinedPath = uuidv4();
   const testProjectId = uuidv4();
   const expectedAssetLimit = 1400;
@@ -427,7 +495,15 @@ describe(uploadAssetsAsync, () => {
         contentType: 'application/javascript',
         path: androidBundlePath,
       },
-      assets: [userDefinedAsset, { type: 'jpg', contentType: 'image/jpeg', path: dummyFilePath }],
+      assets: [
+        userDefinedAsset,
+        {
+          type: 'jpg',
+          contentType: 'image/jpeg',
+          path: dummyFilePath,
+          originalPath: dummyOriginalFilePath,
+        },
+      ],
     },
     ios: {
       launchAsset: {
@@ -435,7 +511,15 @@ describe(uploadAssetsAsync, () => {
         contentType: 'application/javascript',
         path: androidBundlePath,
       },
-      assets: [userDefinedAsset, { type: 'jpg', contentType: 'image/jpeg', path: dummyFilePath }],
+      assets: [
+        userDefinedAsset,
+        {
+          type: 'jpg',
+          contentType: 'image/jpeg',
+          path: dummyFilePath,
+          originalPath: dummyOriginalFilePath,
+        },
+      ],
     },
   };
 
@@ -490,8 +574,10 @@ describe(uploadAssetsAsync, () => {
       uploadAssetsAsync(graphqlClient, assetsForUpdateInfoGroup, testProjectId)
     ).resolves.toEqual({
       assetCount: 6,
+      launchAssetCount: 2,
       uniqueAssetCount: 3,
       uniqueUploadedAssetCount: 0,
+      uniqueUploadedAssetPaths: [],
       assetLimitPerUpdateGroup: expectedAssetLimit,
     });
   });
@@ -526,8 +612,10 @@ describe(uploadAssetsAsync, () => {
       uploadAssetsAsync(graphqlClient, assetsForUpdateInfoGroup, testProjectId)
     ).resolves.toEqual({
       assetCount: 6,
+      launchAssetCount: 2,
       uniqueAssetCount: 3,
       uniqueUploadedAssetCount: 2,
+      uniqueUploadedAssetPaths: [],
       assetLimitPerUpdateGroup: expectedAssetLimit,
     });
   });

packages/eas-cli/src/project/android/gradleUtils.ts

@@ -74,7 +74,7 @@ export function parseGradleCommand(cmd: string, buildGradle: AppBuildGradle): Gr
   const [moduleName, taskName] =
     splitCmd.length > 1 ? [splitCmd[0], splitCmd[1]] : [undefined, splitCmd[0]];
 
-  const matchResult = taskName.match(/(build|bundle|assemble)(.*)(Release|Debug)/);
+  const matchResult = taskName.match(/(build|bundle|assemble|package)(.*)(Release|Debug)/);
   if (!matchResult) {
     throw new Error(`Failed to parse gradle command: ${cmd}`);
   }

packages/eas-cli/src/project/customBuildConfig.ts

@@ -0,0 +1,47 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import { errors, readAndValidateBuildConfigAsync } from '@expo/steps';
+import chalk from 'chalk';
+import fs from 'fs-extra';
+import path from 'path';
+
+export async function validateCustomBuildConfigAsync(
+  projectDir: string,
+  profile: BuildProfile<Platform>
+): Promise<void> {
+  if (!profile.config) {
+    return;
+  }
+
+  const relativeConfigPath = getCustomBuildConfigPath(profile.config);
+  const configPath = path.join(projectDir, relativeConfigPath);
+  if (!(await fs.pathExists(configPath))) {
+    throw new Error(
+      `Custom build configuration file ${chalk.bold(relativeConfigPath)} does not exist.`
+    );
+  }
+
+  try {
+    await readAndValidateBuildConfigAsync(configPath, { skipNamespacedFunctionsCheck: true });
+  } catch (err) {
+    if (err instanceof errors.BuildConfigYAMLError) {
+      throw new Error(
+        `Custom build configuration file ${chalk.bold(
+          relativeConfigPath
+        )} contains invalid YAML.\n\n${err.message}`
+      );
+    } else if (err instanceof errors.BuildConfigError) {
+      throw new Error(
+        `Custom build configuration file ${chalk.bold(
+          relativeConfigPath
+        )} contains invalid configuration. Please check the docs!\n${err.message}`
+      );
+    } else {
+      throw err;
+    }
+  }
+}
+
+export function getCustomBuildConfigPath(configFilename: string): string {
+  return path.join('.eas/build', configFilename);
+}

packages/eas-cli/src/project/publish.ts

@@ -1,21 +1,36 @@
 import { ExpoConfig, Platform } from '@expo/config';
+import { Updates } from '@expo/config-plugins';
+import { Platform as EASBuildJobPlatform, Workflow } from '@expo/eas-build-job';
 import JsonFile from '@expo/json-file';
+import assert from 'assert';
+import chalk from 'chalk';
 import crypto from 'crypto';
 import fs from 'fs-extra';
 import Joi from 'joi';
 import mime from 'mime';
+import nullthrows from 'nullthrows';
 import path from 'path';
 import promiseLimit from 'promise-limit';
 
+import { selectBranchOnAppAsync } from '../branch/queries';
+import { getDefaultBranchNameAsync } from '../branch/utils';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
 import { AssetMetadataStatus, PartialManifestAsset } from '../graphql/generated';
 import { PublishMutation } from '../graphql/mutations/PublishMutation';
 import { PublishQuery } from '../graphql/queries/PublishQuery';
-import Log from '../log';
+import Log, { learnMore } from '../log';
+import { RequestedPlatform, requestedPlatformDisplayNames } from '../platform';
+import { promptAsync } from '../prompts';
+import { getBranchNameFromChannelNameAsync } from '../update/getBranchNameFromChannelNameAsync';
+import { formatUpdateMessage, truncateString as truncateUpdateMessage } from '../update/utils';
 import { PresignedPost, uploadWithPresignedPostWithRetryAsync } from '../uploads';
 import { expoCommandAsync, shouldUseVersionedExpoCLI } from '../utils/expoCli';
 import chunk from '../utils/expodash/chunk';
+import { truthy } from '../utils/expodash/filter';
 import uniqBy from '../utils/expodash/uniqBy';
+import { getVcsClient } from '../vcs';
+import { resolveWorkflowAsync } from './workflow';
 
 export type ExpoCLIExportPlatformFlag = Platform | 'all';
 
@@ -30,6 +45,8 @@ export type RawAsset = {
   fileExtension?: string;
   contentType: string;
   path: string;
+  /** Original asset path derrived from asset map, or exported folder */
+  originalPath?: string;
 };
 
 type CollectedAssets = {
@@ -52,6 +69,16 @@ type UpdateInfoGroup = {
   [key in Platform]: ManifestFragment;
 };
 
+// Partial copy of `@expo/dev-server` `BundleAssetWithFileHashes`
+type AssetMap = Record<
+  string,
+  {
+    httpServerLocation: string;
+    name: string;
+    type: string;
+  }
+>;
+
 const fileMetadataJoi = Joi.object({
   assets: Joi.array()
     .required()
@@ -170,6 +197,7 @@ export async function buildBundlesAsync({
       '--output-dir',
       inputDir,
       '--dump-sourcemap',
+      '--dump-assetmap',
       '--platform',
       platformFlag,
     ]);
@@ -182,6 +210,7 @@ export async function buildBundlesAsync({
       '--experimental-bundle',
       '--non-interactive',
       '--dump-sourcemap',
+      '--dump-assetmap',
       '--platform',
       platformFlag,
     ]);
@@ -246,9 +275,48 @@ export function filterExportedPlatformsByFlag<T extends Partial<Record<Platform,
   return { [platform]: record[platform] } as T;
 }
 
+/** Try to load the asset map for logging the names of assets published */
+export async function loadAssetMapAsync(distRoot: string): Promise<AssetMap | null> {
+  const assetMapPath = path.join(distRoot, 'assetmap.json');
+
+  if (!(await fs.pathExists(assetMapPath))) {
+    return null;
+  }
+
+  const assetMap: AssetMap = JsonFile.read(path.join(distRoot, 'assetmap.json'));
+  // TODO: basic validation?
+  return assetMap;
+}
+
+// exposed for testing
+export function getAssetHashFromPath(assetPath: string): string | null {
+  const [, hash] = assetPath.match(new RegExp(/assets\/([a-z0-9]+)$/, 'i')) ?? [];
+  return hash ?? null;
+}
+
+// exposed for testing
+export function getOriginalPathFromAssetMap(
+  assetMap: AssetMap | null,
+  asset: { path: string; ext: string }
+): string | null {
+  if (!assetMap) {
+    return null;
+  }
+  const assetHash = getAssetHashFromPath(asset.path);
+  const assetMapEntry = assetHash && assetMap[assetHash];
+
+  if (!assetMapEntry) {
+    return null;
+  }
+
+  const pathPrefix = assetMapEntry.httpServerLocation.substring('/assets'.length);
+  return `${pathPrefix}/${assetMapEntry.name}.${assetMapEntry.type}`;
+}
+
 /** Given a directory, load the metadata.json and collect the assets for each platform. */
 export async function collectAssetsAsync(dir: string): Promise<CollectedAssets> {
   const metadata = loadMetadata(dir);
+  const assetmap = await loadAssetMapAsync(dir);
 
   const collectedAssets: CollectedAssets = {};
 
@@ -261,6 +329,7 @@ export async function collectAssetsAsync(dir: string): Promise<CollectedAssets>
       },
       assets: metadata.fileMetadata[platform].assets.map(asset => ({
         fileExtension: asset.ext ? ensureLeadingPeriod(asset.ext) : undefined,
+        originalPath: getOriginalPathFromAssetMap(assetmap, asset) ?? undefined,
         contentType: guessContentTypeFromExtension(asset.ext),
         path: path.join(dir, asset.path),
       })),
@@ -294,9 +363,17 @@ export async function filterOutAssetsThatAlreadyExistAsync(
 }
 
 type AssetUploadResult = {
+  /** All found assets within the exported folder per platform */
   assetCount: number;
+  /** The uploaded JS bundles, per platform */
+  launchAssetCount: number;
+  /** All unique assets within the exported folder with platforms combined */
   uniqueAssetCount: number;
+  /** All unique assets uploaded  */
   uniqueUploadedAssetCount: number;
+  /** All (non-launch) asset original paths, used for logging */
+  uniqueUploadedAssetPaths: string[];
+  /** The asset limit received from the server */
   assetLimitPerUpdateGroup: number;
 };
 
@@ -308,7 +385,9 @@ export async function uploadAssetsAsync(
 ): Promise<AssetUploadResult> {
   let assets: RawAsset[] = [];
   let platform: keyof CollectedAssets;
+  const launchAssets: RawAsset[] = [];
   for (platform in assetsForUpdateInfoGroup) {
+    launchAssets.push(assetsForUpdateInfoGroup[platform]!.launchAsset);
     assets = [
       ...assets,
       assetsForUpdateInfoGroup[platform]!.launchAsset,
@@ -335,6 +414,7 @@ export async function uploadAssetsAsync(
   updateSpinnerText?.(totalAssets, totalAssets);
   let missingAssets = await filterOutAssetsThatAlreadyExistAsync(graphqlClient, uniqueAssets);
   const uniqueUploadedAssetCount = missingAssets.length;
+  const uniqueUploadedAssetPaths = missingAssets.map(asset => asset.originalPath).filter(truthy);
 
   const missingAssetChunks = chunk(missingAssets, 100);
   const specifications: string[] = [];
@@ -372,8 +452,10 @@ export async function uploadAssetsAsync(
   }
   return {
     assetCount: assets.length,
+    launchAssetCount: launchAssets.length,
     uniqueAssetCount: uniqueAssets.length,
     uniqueUploadedAssetCount,
+    uniqueUploadedAssetPaths,
     assetLimitPerUpdateGroup,
   };
 }
@@ -385,3 +467,188 @@ export function isUploadedAssetCountAboveWarningThreshold(
   const warningThreshold = Math.floor(assetLimitPerUpdateGroup * 0.75);
   return uploadedAssetCount > warningThreshold;
 }
+
+export async function getBranchNameForCommandAsync({
+  graphqlClient,
+  projectId,
+  channelNameArg,
+  branchNameArg,
+  autoFlag,
+  nonInteractive,
+  paginatedQueryOptions,
+}: {
+  graphqlClient: ExpoGraphqlClient;
+  projectId: string;
+  channelNameArg: string | undefined;
+  branchNameArg: string | undefined;
+  autoFlag: boolean;
+  nonInteractive: boolean;
+  paginatedQueryOptions: PaginatedQueryOptions;
+}): Promise<string> {
+  if (channelNameArg && branchNameArg) {
+    throw new Error(
+      'Cannot specify both --channel and --branch. Specify either --channel, --branch, or --auto.'
+    );
+  }
+
+  if (channelNameArg) {
+    return await getBranchNameFromChannelNameAsync(graphqlClient, projectId, channelNameArg);
+  }
+
+  if (branchNameArg) {
+    return branchNameArg;
+  }
+
+  if (autoFlag) {
+    return await getDefaultBranchNameAsync();
+  } else if (nonInteractive) {
+    throw new Error('Must supply --channel, --branch or --auto when in non-interactive mode.');
+  } else {
+    let branchName: string;
+
+    try {
+      const branch = await selectBranchOnAppAsync(graphqlClient, {
+        projectId,
+        promptTitle: `Which branch would you like to use?`,
+        displayTextForListItem: updateBranch => ({
+          title: `${updateBranch.name} ${chalk.grey(
+            `- current update: ${formatUpdateMessage(updateBranch.updates[0])}`
+          )}`,
+        }),
+        paginatedQueryOptions,
+      });
+      branchName = branch.name;
+    } catch {
+      // unable to select a branch (network error or no branches for project)
+      const { name } = await promptAsync({
+        type: 'text',
+        name: 'name',
+        message: 'No branches found. Provide a branch name:',
+        initial: await getDefaultBranchNameAsync(),
+        validate: value => (value ? true : 'Branch name may not be empty.'),
+      });
+      branchName = name;
+    }
+
+    assert(branchName, 'Branch name must be specified.');
+    return branchName;
+  }
+}
+
+export async function getUpdateMessageForCommandAsync({
+  updateMessageArg,
+  autoFlag,
+  nonInteractive,
+  jsonFlag,
+}: {
+  updateMessageArg: string | undefined;
+  autoFlag: boolean;
+  nonInteractive: boolean;
+  jsonFlag: boolean;
+}): Promise<string> {
+  let updateMessage = updateMessageArg;
+  if (!updateMessageArg && autoFlag) {
+    updateMessage = (await getVcsClient().getLastCommitMessageAsync())?.trim();
+  }
+
+  if (!updateMessage) {
+    if (nonInteractive) {
+      throw new Error('Must supply --message or use --auto when in non-interactive mode');
+    }
+
+    const validationMessage = 'publish message may not be empty.';
+    if (jsonFlag) {
+      throw new Error(validationMessage);
+    }
+    const { updateMessageLocal } = await promptAsync({
+      type: 'text',
+      name: 'updateMessageLocal',
+      message: `Provide an update message:`,
+      initial: (await getVcsClient().getLastCommitMessageAsync())?.trim(),
+      validate: (value: any) => (value ? true : validationMessage),
+    });
+    updateMessage = updateMessageLocal;
+  }
+
+  assert(updateMessage, 'Update message must be specified.');
+
+  const truncatedMessage = truncateUpdateMessage(updateMessage, 1024);
+  if (truncatedMessage !== updateMessage) {
+    Log.warn('Update message exceeds the allowed 1024 character limit. Truncating message...');
+  }
+
+  return truncatedMessage;
+}
+
+export const defaultPublishPlatforms: Platform[] = ['android', 'ios'];
+
+export function getRequestedPlatform(
+  platform: ExpoCLIExportPlatformFlag
+): RequestedPlatform | null {
+  switch (platform) {
+    case 'android':
+      return RequestedPlatform.Android;
+    case 'ios':
+      return RequestedPlatform.Ios;
+    case 'web':
+      return null;
+    case 'all':
+      return RequestedPlatform.All;
+    default:
+      throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+/** Get runtime versions grouped by platform. Runtime version is always `null` on web where the platform is always backwards compatible. */
+export async function getRuntimeVersionObjectAsync(
+  exp: ExpoConfig,
+  platforms: Platform[],
+  projectDir: string
+): Promise<{ platform: string; runtimeVersion: string }[]> {
+  for (const platform of platforms) {
+    if (platform === 'web') {
+      continue;
+    }
+    const isPolicy = typeof (exp[platform]?.runtimeVersion ?? exp.runtimeVersion) === 'object';
+    if (isPolicy) {
+      const isManaged =
+        (await resolveWorkflowAsync(projectDir, platform as EASBuildJobPlatform)) ===
+        Workflow.MANAGED;
+      if (!isManaged) {
+        throw new Error(
+          'Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.'
+        );
+      }
+    }
+  }
+
+  return [...new Set(platforms)].map(platform => {
+    if (platform === 'web') {
+      return { platform: 'web', runtimeVersion: 'UNVERSIONED' };
+    }
+    return {
+      platform,
+      runtimeVersion: nullthrows(
+        Updates.getRuntimeVersion(exp, platform),
+        `Unable to determine runtime version for ${
+          requestedPlatformDisplayNames[platform]
+        }. ${learnMore('https://docs.expo.dev/eas-update/runtime-versions/')}`
+      ),
+    };
+  });
+}
+
+export function getRuntimeToPlatformMappingFromRuntimeVersions(
+  runtimeVersions: { platform: string; runtimeVersion: string }[]
+): { runtimeVersion: string; platforms: string[] }[] {
+  const runtimeToPlatformMapping: { runtimeVersion: string; platforms: string[] }[] = [];
+  for (const runtime of runtimeVersions) {
+    const platforms = runtimeVersions
+      .filter(({ runtimeVersion }) => runtimeVersion === runtime.runtimeVersion)
+      .map(({ platform }) => platform);
+    if (!runtimeToPlatformMapping.find(item => item.runtimeVersion === runtime.runtimeVersion)) {
+      runtimeToPlatformMapping.push({ runtimeVersion: runtime.runtimeVersion, platforms });
+    }
+  }
+  return runtimeToPlatformMapping;
+}

packages/eas-cli/src/project/remoteVersionSource.ts

@@ -8,12 +8,20 @@ import { confirmAsync } from '../prompts';
 import { ProfileData } from '../utils/profiles';
 
 export async function ensureVersionSourceIsRemoteAsync(
-  easJsonAccessor: EasJsonAccessor
+  easJsonAccessor: EasJsonAccessor,
+  { nonInteractive }: { nonInteractive: boolean }
 ): Promise<void> {
   const easJsonCliConfig = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
   if (easJsonCliConfig?.appVersionSource === AppVersionSource.REMOTE) {
     return;
   }
+  if (nonInteractive) {
+    throw new Error(
+      `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.`
+    );
+  }
 
   Log.log(
     `The app version source defines whether the app version is stored locally in your project source (e.g. in app.json, Info.plist, or build.gradle) or remotely on EAS servers and only applied to the project at build time. To use this command, you will need to enable the remote version policy by adding  ${chalk.bold(

packages/eas-cli/src/submit/ArchiveSource.ts

@@ -317,30 +317,48 @@ async function handleBuildListSourceAsync(
 }
 
 function formatBuildChoice(build: BuildFragment, expiryDate: Date): prompts.Choice {
-  const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel } =
-    build;
-
-  const formatValue = (field?: string | null): string => (field ? chalk.bold(field) : 'Unknown');
-
+  const {
+    id,
+    updatedAt,
+    runtimeVersion,
+    buildProfile,
+    gitCommitHash,
+    gitCommitMessage,
+    channel,
+    message,
+  } = build;
   const buildDate = new Date(updatedAt);
 
+  const splitCommitMessage = gitCommitMessage?.split('\n');
   const formattedCommitData =
-    gitCommitHash && gitCommitMessage
-      ? `${gitCommitHash.slice(0, 7)} "${chalk.bold(gitCommitMessage)}"`
-      : 'Unknown';
+    gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
+      ? `${gitCommitHash.slice(0, 7)} "${chalk.bold(
+          splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : '')
+        )}"`
+      : null;
 
   const title = `${chalk.bold(`ID:`)} ${id} (${chalk.bold(`${fromNow(buildDate)} ago`)})`;
 
-  const description = [
-    `\t${chalk.bold(`Profile:`)} ${formatValue(buildProfile)}`,
-    `\t${chalk.bold(`Channel:`)} ${formatValue(channel)}`,
-    `\t${chalk.bold(`Runtime version:`)} ${formatValue(runtimeVersion)}`,
-    `\t${chalk.bold(`Commit:`)} ${formattedCommitData}`,
-  ].join('\n');
+  const descriptionItems: { name: string; value: string | null }[] = [
+    { name: 'Profile', value: buildProfile ? chalk.bold(buildProfile) : null },
+    { name: 'Channel', value: channel ? chalk.bold(channel) : null },
+    { name: 'Runtime version', value: runtimeVersion ? chalk.bold(runtimeVersion) : null },
+    { name: 'Commit', value: formattedCommitData },
+    {
+      name: 'Message',
+      value: message
+        ? chalk.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
+        : null,
+    },
+  ];
+
+  const filteredDescriptionArray: string[] = descriptionItems
+    .filter(item => item.value)
+    .map(item => `${chalk.bold(item.name)}: ${item.value}`);
 
   return {
     title,
-    description,
+    description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
     value: build,
     disabled: buildDate < expiryDate,
   };

packages/eas-cli/src/update/__tests__/getBranchNameFromChannelNameAsync-test.ts

@@ -124,6 +124,7 @@ function mockUpdateBranches(branchNames: string[]): UpdateBranch[] {
           runtime: {} as Runtime, // Temporary fix to resolve type errors
           platform: 'ios',
           manifestFragment: '...',
+          isRollBackToEmbedded: false,
           activityTimestamp: '2022-12-07T02:24:43.487Z',
           branchId: '',
           awaitingCodeSigningInfo: false,

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

@@ -273,7 +273,7 @@ export async function ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir: stri
   }
 
   try {
-    const easJsonAccessor = new EasJsonAccessor(projectDir);
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
     await easJsonAccessor.readRawJsonAsync();
 
     easJsonAccessor.patch(easJsonRawObject => {
@@ -343,7 +343,7 @@ export async function ensureEASUpdateIsConfiguredAsync(
     expWithoutUpdates.sdkVersion
   );
   if (!hasExpoUpdates) {
-    await installExpoUpdatesAsync(projectDir, { silent: !Log.isDebug });
+    await installExpoUpdatesAsync(projectDir, { silent: false });
     Log.withTick('Installed expo updates');
   }
 

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

@@ -48,6 +48,8 @@ export type FormattedUpdateGroupDescription = {
   group: string;
   platforms: string;
   runtimeVersion: string;
+  codeSigningKey: string | undefined;
+  isRollBackToEmbedded: boolean;
 };
 
 export type FormattedBranchDescription = {
@@ -74,6 +76,8 @@ export function formatUpdateGroup(update: FormattedUpdateGroupDescription): stri
     { label: 'Platforms', value: update.platforms },
     { label: 'Runtime Version', value: update.runtimeVersion },
     { label: 'Message', value: update.message },
+    { label: 'Code Signing Key', value: update.codeSigningKey ?? 'N/A' },
+    { label: 'Is Roll Back to Embedded', value: update.isRollBackToEmbedded ? 'Yes' : 'No' },
     { label: 'Group ID', value: update.group },
   ]);
 }
@@ -203,6 +207,7 @@ export function getUpdateGroupJsonInfo(updateGroups: UpdateFragment[]): UpdateJs
     runtimeVersion: update.runtimeVersion,
     platform: update.platform,
     manifestPermalink: update.manifestPermalink,
+    isRollBackToEmbedded: update.isRollBackToEmbedded,
     gitCommitHash: update.gitCommitHash,
   }));
 }
@@ -213,6 +218,8 @@ export function getUpdateGroupDescriptions(
   return updateGroups.map(updateGroup => ({
     message: formatUpdateMessage(updateGroup[0]),
     runtimeVersion: updateGroup[0].runtimeVersion,
+    isRollBackToEmbedded: updateGroup[0].isRollBackToEmbedded,
+    codeSigningKey: updateGroup[0].codeSigningInfo?.keyid,
     group: updateGroup[0].group,
     platforms: formatPlatformForUpdateGroup(updateGroup),
   }));
@@ -225,6 +232,8 @@ export function getUpdateGroupDescriptionsWithBranch(
     branch: updateGroup[0].branch.name,
     message: formatUpdateMessage(updateGroup[0]),
     runtimeVersion: updateGroup[0].runtimeVersion,
+    isRollBackToEmbedded: updateGroup[0].isRollBackToEmbedded,
+    codeSigningKey: updateGroup[0].codeSigningInfo?.keyid,
     group: updateGroup[0].group,
     platforms: formatPlatformForUpdateGroup(updateGroup),
   }));
@@ -241,6 +250,8 @@ export function getBranchDescription(branch: UpdateBranchFragment): FormattedBra
     update: {
       message: formatUpdateMessage(latestUpdate),
       runtimeVersion: latestUpdate.runtimeVersion,
+      isRollBackToEmbedded: latestUpdate.isRollBackToEmbedded,
+      codeSigningKey: latestUpdate.codeSigningInfo?.keyid,
       group: latestUpdate.group,
       platforms: getPlatformsForGroup({
         group: latestUpdate.group,

packages/eas-cli/src/utils/__tests__/__snapshots__/profiles-test.ts.snap

@@ -0,0 +1,38 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`maybePrintBuildProfileDeprecationWarningsAsync multiple deprecation warnings prints the warnings 1`] = `
+[
+  [
+    "Detected deprecated fields in eas.json:",
+  ],
+  [
+    "	The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.",
+  ],
+  [
+    "	Learn more: https://docs.expo.dev/build-reference/eas-json/#cache",
+  ],
+  [
+    "	The "build.production.cache.cacheDefaultPaths" field in eas.json is deprecated and will be removed in the future.",
+  ],
+  [
+    "	Learn more: https://docs.expo.dev/build-reference/caching/#ios-dependencies",
+  ],
+  [
+    "	Other message",
+  ],
+]
+`;
+
+exports[`maybePrintBuildProfileDeprecationWarningsAsync one deprecation warning prints the warning 1`] = `
+[
+  [
+    "Detected deprecated fields in eas.json:",
+  ],
+  [
+    "	The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.",
+  ],
+  [
+    "	Learn more: https://docs.expo.dev/build-reference/eas-json/#cache",
+  ],
+]
+`;

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

@@ -1,8 +1,13 @@
 import { Platform } from '@expo/eas-build-job';
-import { EasJsonAccessor, EasJsonUtils, errors } from '@expo/eas-json';
+import { BuildProfile, EasJsonAccessor, EasJsonUtils, errors } from '@expo/eas-json';
 
+import Log from '../../log';
 import { selectAsync } from '../../prompts';
-import { getProfilesAsync } from '../profiles';
+import {
+  clearHasPrintedDeprecationWarnings,
+  getProfilesAsync,
+  maybePrintBuildProfileDeprecationWarningsAsync,
+} from '../profiles';
 
 jest.mock('../../prompts');
 jest.mock('@expo/eas-json', () => {
@@ -11,6 +16,7 @@ jest.mock('@expo/eas-json', () => {
   const EasJsonUtilsMock = {
     getBuildProfileAsync: jest.fn(),
     getBuildProfileNamesAsync: jest.fn(),
+    getBuildProfileDeprecationWarningsAsync: jest.fn(() => []),
   };
   return {
     ...actual,
@@ -20,6 +26,12 @@ jest.mock('@expo/eas-json', () => {
 
 const getBuildProfileAsync = jest.spyOn(EasJsonUtils, 'getBuildProfileAsync');
 const getBuildProfileNamesAsync = jest.spyOn(EasJsonUtils, 'getBuildProfileNamesAsync');
+const getBuildProfileDeprecationWarningsAsync = jest.spyOn(
+  EasJsonUtils,
+  'getBuildProfileDeprecationWarningsAsync'
+);
+const newLineSpy = jest.spyOn(Log, 'newLine');
+const warnSpy = jest.spyOn(Log, 'warn');
 
 describe(getProfilesAsync, () => {
   afterEach(() => {
@@ -29,7 +41,11 @@ describe(getProfilesAsync, () => {
   });
 
   it('defaults to production profile', async () => {
-    const easJsonAccessor = new EasJsonAccessor('/fake');
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath('/fake');
+    const readRawEasJsonMock = jest.spyOn(easJsonAccessor, 'readRawJsonAsync');
+    readRawEasJsonMock.mockImplementation(async () => {
+      return {};
+    });
     const result = await getProfilesAsync({
       easJsonAccessor,
       platforms: [Platform.ANDROID, Platform.IOS],
@@ -51,7 +67,7 @@ describe(getProfilesAsync, () => {
 
     await expect(
       getProfilesAsync({
-        easJsonAccessor: new EasJsonAccessor('/fake'),
+        easJsonAccessor: EasJsonAccessor.fromProjectPath('/fake'),
         platforms: [Platform.ANDROID],
         profileName: undefined,
         type: 'build',
@@ -60,7 +76,11 @@ describe(getProfilesAsync, () => {
   });
 
   it('gets a specific profile', async () => {
-    const easJsonAccessor = new EasJsonAccessor('/fake');
+    const easJsonAccessor = EasJsonAccessor.fromProjectPath('/fake');
+    const readRawEasJsonMock = jest.spyOn(easJsonAccessor, 'readRawJsonAsync');
+    readRawEasJsonMock.mockImplementation(async () => {
+      return {};
+    });
     const result = await getProfilesAsync({
       easJsonAccessor,
       platforms: [Platform.ANDROID, Platform.IOS],
@@ -85,7 +105,7 @@ describe(getProfilesAsync, () => {
 
     await expect(
       getProfilesAsync({
-        easJsonAccessor: new EasJsonAccessor('/fake'),
+        easJsonAccessor: EasJsonAccessor.fromProjectPath('/fake'),
         platforms: [Platform.ANDROID, Platform.IOS],
         profileName: undefined,
         type: 'build',
@@ -93,3 +113,82 @@ describe(getProfilesAsync, () => {
     ).rejects.toThrowError(/eas.json is not valid/);
   });
 });
+describe(maybePrintBuildProfileDeprecationWarningsAsync, () => {
+  afterEach(() => {
+    clearHasPrintedDeprecationWarnings();
+    newLineSpy.mockClear();
+    warnSpy.mockClear();
+  });
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath('/fake');
+  const readRawEasJsonMock = jest.spyOn(easJsonAccessor, 'readRawJsonAsync');
+  readRawEasJsonMock.mockImplementation(async () => {
+    return {};
+  });
+  getBuildProfileAsync.mockImplementation(async () => {
+    return {} as BuildProfile<Platform.ANDROID>;
+  });
+
+  describe('no deprecation warnings', () => {
+    it('does not print any warnings', async () => {
+      getBuildProfileDeprecationWarningsAsync.mockImplementation(async () => []);
+      await maybePrintBuildProfileDeprecationWarningsAsync(
+        easJsonAccessor,
+        Platform.ANDROID,
+        'production'
+      );
+      expect(newLineSpy).not.toHaveBeenCalled();
+      expect(warnSpy).not.toHaveBeenCalled();
+    });
+  });
+  describe('one deprecation warning', () => {
+    it('prints the warning', async () => {
+      getBuildProfileDeprecationWarningsAsync.mockImplementation(async () => [
+        {
+          message: [
+            'The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.',
+          ],
+          docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+        },
+      ]);
+      await maybePrintBuildProfileDeprecationWarningsAsync(
+        easJsonAccessor,
+        Platform.ANDROID,
+        'production'
+      );
+      expect(newLineSpy).toHaveBeenCalledTimes(2);
+      expect(warnSpy).toHaveBeenCalledTimes(3);
+      const warnCalls = warnSpy.mock.calls;
+      expect(warnCalls).toMatchSnapshot();
+    });
+  });
+  describe('multiple deprecation warnings', () => {
+    it('prints the warnings', async () => {
+      getBuildProfileDeprecationWarningsAsync.mockImplementation(async () => [
+        {
+          message: [
+            'The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.',
+          ],
+          docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+        },
+        {
+          message: [
+            'The "build.production.cache.cacheDefaultPaths" field in eas.json is deprecated and will be removed in the future.',
+          ],
+          docsUrl: 'https://docs.expo.dev/build-reference/caching/#ios-dependencies',
+        },
+        {
+          message: ['Other message'],
+        },
+      ]);
+      await maybePrintBuildProfileDeprecationWarningsAsync(
+        easJsonAccessor,
+        Platform.ANDROID,
+        'production'
+      );
+      expect(newLineSpy).toHaveBeenCalledTimes(4);
+      expect(warnSpy).toHaveBeenCalledTimes(6);
+      const warnCalls = warnSpy.mock.calls;
+      expect(warnCalls).toMatchSnapshot();
+    });
+  });
+});

packages/eas-cli/src/utils/code-signing.ts

@@ -16,8 +16,9 @@ import nullthrows from 'nullthrows';
 
 import { Response } from '../fetch';
 import { PartialManifest, PartialManifestAsset } from '../graphql/generated';
+import areSetsEqual from './expodash/areSetsEqual';
 
-type CodeSigningInfo = {
+export type CodeSigningInfo = {
   privateKey: PKI.rsa.PrivateKey;
   certificate: PKI.Certificate;
   codeSigningMetadata: { alg: string; keyid: string };
@@ -101,7 +102,7 @@ export async function getKeyAndCertificateFromPathsAsync({
   };
 }
 
-export async function getManifestBodyAsync(res: Response): Promise<string | null> {
+async function getMultipartBodyPartAsync(res: Response, partName: string): Promise<string | null> {
   const contentType = res.headers.get('content-type');
   if (!contentType) {
     throw new Error('The multipart manifest response is missing the content-type header');
@@ -111,11 +112,19 @@ export async function getManifestBodyAsync(res: Response): Promise<string | null
     contentType,
     Buffer.from(bodyBuffer)
   );
-  const manifestPart = multipartParts.find(part => isMultipartPartWithName(part, 'manifest'));
+  const manifestPart = multipartParts.find(part => isMultipartPartWithName(part, partName));
   return manifestPart?.body ?? null;
 }
 
-export function signManifestBody(body: string, codeSigningInfo: CodeSigningInfo): string {
+export async function getManifestBodyAsync(res: Response): Promise<string | null> {
+  return await getMultipartBodyPartAsync(res, 'manifest');
+}
+
+export async function getDirectiveBodyAsync(res: Response): Promise<string | null> {
+  return await getMultipartBodyPartAsync(res, 'directive');
+}
+
+export function signBody(body: string, codeSigningInfo: CodeSigningInfo): string {
   return signBufferRSASHA256AndVerify(
     codeSigningInfo.privateKey,
     codeSigningInfo.certificate,
@@ -181,3 +190,20 @@ export function checkManifestBodyAgainstUpdateInfoGroup(
     assertAssetParity(correspondingManifestResponseBodyAssetJSON, nullthrows(partialManifestAsset));
   }
 }
+
+export function checkDirectiveBodyAgainstUpdateInfoGroup(directiveResponseBody: string): void {
+  const directiveResponseBodyJSON = JSON.parse(directiveResponseBody);
+
+  if (
+    !areSetsEqual(
+      new Set(Object.keys(directiveResponseBodyJSON)),
+      new Set(['extra', 'type', 'parameters'])
+    )
+  ) {
+    throw new Error('Code signing directive integrity error: Unexpected keys');
+  }
+
+  if (directiveResponseBodyJSON.type !== 'rollBackToEmbedded') {
+    throw new Error('Code signing directive integrity error: Incorrect directive type');
+  }
+}

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

@@ -10,6 +10,7 @@ import { v4 as uuidv4 } from 'uuid';
 import fetch, { RequestInit, Response } from '../fetch';
 import { AppPlatform } from '../graphql/generated';
 import Log from '../log';
+import { promptAsync } from '../prompts';
 import { formatBytes } from './files';
 import { getTmpDirectory } from './paths';
 import { ProgressHandler, createProgressTracker } from './progress';
@@ -162,16 +163,35 @@ export async function extractAppFromLocalArchiveAsync(
 }
 
 async function getAppPathAsync(outputDir: string, applicationExtension: string): Promise<string> {
-  const appFileName = await glob(`*.${applicationExtension}`, {
+  const appFilePaths = await glob(`./**/*.${applicationExtension}`, {
     cwd: outputDir,
     onlyFiles: false,
   });
 
-  if (appFileName.length === 0) {
-    throw Error('Something went wrong while extracting the app from app archive');
+  if (appFilePaths.length === 0) {
+    throw Error('Did not find any installable apps inside tarball.');
   }
 
-  return path.join(outputDir, appFileName[0]);
+  if (appFilePaths.length === 1) {
+    return path.join(outputDir, appFilePaths[0]);
+  }
+
+  Log.newLine();
+  Log.log('Detected multiple apps in the tarball:');
+  Log.newLine();
+  const { selectedFile } = await promptAsync({
+    type: 'select',
+    message: 'Select the app to run:',
+    name: 'selectedFile',
+    choices: [
+      ...appFilePaths.map(filePath => ({
+        title: filePath,
+        value: filePath,
+      })),
+    ],
+  });
+
+  return path.join(outputDir, selectedFile);
 }
 
 async function tarExtractAsync(input: string, output: string): Promise<void> {

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

@@ -2,7 +2,7 @@ import { ExpoConfig } from '@expo/config-types';
 import spawnAsync from '@expo/spawn-async';
 import chalk from 'chalk';
 import { boolish } from 'getenv';
-import resolveFrom from 'resolve-from';
+import resolveFrom, { silent as silentResolveFrom } from 'resolve-from';
 import semver from 'semver';
 
 import Log from '../log';
@@ -63,7 +63,8 @@ export async function expoCommandAsync(
   args: string[],
   { silent = false }: { silent?: boolean } = {}
 ): Promise<void> {
-  const expoCliPath = resolveFrom(projectDir, 'expo/bin/cli.js');
+  const expoCliPath =
+    silentResolveFrom(projectDir, 'expo/bin/cli') ?? resolveFrom(projectDir, 'expo/bin/cli.js');
   const spawnPromise = spawnAsync(expoCliPath, args, {
     stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
   });

packages/eas-cli/src/utils/expodash/__tests__/areSetsEqual-test.ts

@@ -0,0 +1,17 @@
+import areSetsEqual from '../areSetsEqual';
+
+describe(areSetsEqual, () => {
+  it.each([
+    [new Set([1, 2]), new Set([1, 2])],
+    [new Set([1, 2]), new Set([2, 1])],
+  ])('equal cases: %p', (a, b) => {
+    expect(areSetsEqual(a, b)).toBe(true);
+  });
+
+  it.each([
+    [new Set([1, 2, 3]), new Set([1, 2])],
+    [new Set([1, 2]), new Set([1, 2, 3])],
+  ])('non-equal cases: %p', (a, b) => {
+    expect(areSetsEqual(a, b)).toBe(false);
+  });
+});

packages/eas-cli/src/utils/expodash/areSetsEqual.ts

@@ -0,0 +1,3 @@
+export default function areSetsEqual<T>(a: Set<T>, b: Set<T>): boolean {
+  return a.size === b.size && [...a].every(value => b.has(value));
+}

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

@@ -7,6 +7,8 @@ import {
   SubmitProfile,
 } from '@expo/eas-json';
 
+import Log, { learnMore } from '../log';
+
 type EasProfile<T extends ProfileType> = T extends 'build'
   ? BuildProfile<Platform>
   : SubmitProfile<Platform>;
@@ -57,11 +59,15 @@ async function readProfileAsync<T extends ProfileType>({
   profileName?: string;
 }): Promise<EasProfile<T>> {
   if (type === 'build') {
-    return (await EasJsonUtils.getBuildProfileAsync(
+    const buildProfile = await EasJsonUtils.getBuildProfileAsync(
       easJsonAccessor,
       platform,
       profileName
-    )) as EasProfile<T>;
+    );
+
+    await maybePrintBuildProfileDeprecationWarningsAsync(easJsonAccessor, platform, profileName);
+
+    return buildProfile as EasProfile<T>;
   } else {
     return (await EasJsonUtils.getSubmitProfileAsync(
       easJsonAccessor,
@@ -70,3 +76,41 @@ async function readProfileAsync<T extends ProfileType>({
     )) as EasProfile<T>;
   }
 }
+
+let hasPrintedDeprecationWarnings = false;
+
+/**
+ * Only for testing purposes
+ */
+export function clearHasPrintedDeprecationWarnings(): void {
+  hasPrintedDeprecationWarnings = false;
+}
+
+export async function maybePrintBuildProfileDeprecationWarningsAsync(
+  easJsonAccessor: EasJsonAccessor,
+  platform: Platform,
+  profileName?: string
+): Promise<void> {
+  if (hasPrintedDeprecationWarnings) {
+    return;
+  }
+  const deprecationWarnings = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+    easJsonAccessor,
+    platform,
+    profileName ?? 'production'
+  );
+  if (deprecationWarnings.length === 0) {
+    return;
+  }
+  Log.newLine();
+  Log.warn('Detected deprecated fields in eas.json:');
+  for (const warning of deprecationWarnings) {
+    const warnlog: string = warning.message.map(line => `\t${line}`).join('\n');
+    Log.warn(warnlog);
+    if (warning.docsUrl) {
+      Log.warn(`\t${learnMore(warning.docsUrl)}`);
+    }
+    Log.newLine();
+  }
+  hasPrintedDeprecationWarnings = true;
+}

packages/eas-json/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@expo/eas-json",
   "description": "A library for interacting with eas.json",
-  "version": "3.5.0",
+  "version": "3.11.0",
   "author": "Expo <[email protected]>",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
     "@babel/code-frame": "7.18.6",
-    "@expo/eas-build-job": "0.2.102",
+    "@expo/eas-build-job": "1.0.10",
     "chalk": "4.1.2",
     "env-string": "1.0.1",
     "fs-extra": "10.1.0",
@@ -36,7 +36,8 @@
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",
     "typecheck": "tsc",
-    "prepack": "rimraf build && yarn build",
+    "prepack": "yarn rebuild",
+    "rebuild": "rimraf build && yarn build",
     "test": "jest",
     "clean": "rimraf build node_modules yarn-error.log"
   },

packages/eas-json/schema/eas.schema.json

@@ -67,6 +67,16 @@
           "description": "Cache key. You can invalidate the cache by changing this value."
         },
         "customPaths": {
+          "type": "array",
+          "description": "[DEPRECATED] Use `paths` instead. List of the paths that will be saved after a successful build and restored at the beginning of the next one.",
+          "markdownDescription": "[DEPRECATED] Use `paths` instead. List of the paths that will be saved after a successful build and restored at the beginning of the next one. Both absolute and relative paths are supported, where relative paths are resolved from the directory with `eas.json`.",
+          "uniqueItems": true,
+          "items": {
+            "type": "string"
+          },
+          "deprecated": true
+        },
+        "paths": {
           "type": "array",
           "description": "List of the paths that will be saved after a successful build and restored at the beginning of the next one.",
           "markdownDescription": "List of the paths that will be saved after a successful build and restored at the beginning of the next one. Both absolute and relative paths are supported, where relative paths are resolved from the directory with `eas.json`.",
@@ -74,11 +84,6 @@
           "items": {
             "type": "string"
           }
-        },
-        "cacheDefaultPaths": {
-          "type": "boolean",
-          "description": "Specifies whether to cache the recommended set of files, currently only Podfile.lock is cached by default for iOS build and nothing is cached for Android.",
-          "default": true
         }
       }
     },
@@ -182,7 +187,7 @@
           "default": "default",
           "anyOf": [
             {
-              "enum": ["default", "medium"]
+              "enum": ["default", "medium", "large"]
             },
             {
               "type": "string"
@@ -329,6 +334,8 @@
               "enum": [
                 "default",
                 "latest",
+                "macos-ventura-13.3-xcode-14.3",
+                "macos-monterey-12.6-xcode-14.2",
                 "macos-monterey-12.6-xcode-14.1",
                 "macos-monterey-12.6-xcode-14.0",
                 "macos-monterey-12.4-xcode-13.4",
@@ -338,8 +345,9 @@
                 "macos-big-sur-11.4-xcode-12.5"
               ],
               "markdownEnumDescriptions": [
-                "`macos-monterey-12.6-xcode-14.0`",
-                "`macos-monterey-12.6-xcode-14.1`"
+                "`macos-monterey-12.6-xcode-14.2` for Apple silicon builders, `macos-monterey-12.6-xcode-14.1` for Intel builders",
+                "`macos-ventura-13.3-xcode-14.3` for Apple silicon builders, `macos-monterey-12.6-xcode-14.2` for Intel builders",
+                "only available for Apple silicon builders"
               ]
             },
             {
@@ -353,7 +361,7 @@
           "default": "default",
           "anyOf": [
             {
-              "enum": ["default", "medium", "m1-medium", "intel-medium"]
+              "enum": ["default", "medium", "large", "intel-medium", "m-medium"]
             },
             {
               "type": "string"

packages/eas-json/src/__tests__/__snapshots__/accessor-test.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`EasJsonAccessor patching JSON file 1`] = `
+exports[`fromProjectPath patching JSON file 1`] = `
 "{
   "build": {
     "production": {
@@ -14,7 +14,7 @@ exports[`EasJsonAccessor patching JSON file 1`] = `
 "
 `;
 
-exports[`EasJsonAccessor patching JSON5 file (preserves comments) 1`] = `
+exports[`fromProjectPath patching JSON5 file (preserves comments) 1`] = `
 "{
   "build": {
     "production": {

packages/eas-json/src/__tests__/accessor-test.ts

@@ -15,7 +15,7 @@ beforeEach(async () => {
   vol.reset();
 });
 
-describe(EasJsonAccessor, () => {
+describe(EasJsonAccessor.fromProjectPath, () => {
   test('patching JSON file', async () => {
     vol.fromJSON(
       {
@@ -24,7 +24,7 @@ describe(EasJsonAccessor, () => {
       fakeAppPath
     );
 
-    const accessor = new EasJsonAccessor(fakeAppPath);
+    const accessor = EasJsonAccessor.fromProjectPath(fakeAppPath);
     await accessor.readAsync();
     accessor.patch(o => {
       o.build.production.env.ABC = '456';
@@ -44,7 +44,7 @@ describe(EasJsonAccessor, () => {
       fakeAppPath
     );
 
-    const accessor = new EasJsonAccessor(fakeAppPath);
+    const accessor = EasJsonAccessor.fromProjectPath(fakeAppPath);
     await accessor.readAsync();
     accessor.patch(o => {
       o.build.production.env.ABC = '456';
@@ -67,7 +67,7 @@ describe(EasJsonAccessor, () => {
       fakeAppPath
     );
 
-    const accessor = new EasJsonAccessor(fakeAppPath);
+    const accessor = EasJsonAccessor.fromProjectPath(fakeAppPath);
     await expect(accessor.readAsync()).rejects.toThrowError(InvalidEasJsonError);
     await expect(accessor.readAsync()).rejects.toThrowError(
       /^Found invalid character in .*eas\.json.+/
@@ -82,7 +82,57 @@ describe(EasJsonAccessor, () => {
       fakeAppPath
     );
 
-    const accessor = new EasJsonAccessor(fakeAppPath);
+    const accessor = EasJsonAccessor.fromProjectPath(fakeAppPath);
+    await expect(accessor.readAsync()).rejects.toThrowError(InvalidEasJsonError);
+    await expect(accessor.readAsync()).rejects.toThrowError(/^.*eas\.json.* is empty\.$/g);
+  });
+});
+
+describe(EasJsonAccessor.fromRawString, () => {
+  test('patching JSON file', async () => {
+    const accessor = EasJsonAccessor.fromRawString(
+      await fsReal.readFile(path.join(fixturesDir, 'eas-json.json'), 'utf-8')
+    );
+    await accessor.readAsync();
+    expect(() =>
+      accessor.patch(o => {
+        o.build.production.env.ABC = '456';
+        return o;
+      })
+    ).toThrowError();
+  });
+
+  test('reading invalid JSON5 object', async () => {
+    vol.fromJSON(
+      {
+        './eas.json': await fsReal.readFile(
+          path.join(fixturesDir, 'eas-invalid-json5.json'),
+          'utf-8'
+        ),
+      },
+      fakeAppPath
+    );
+
+    const accessor = EasJsonAccessor.fromRawString(
+      await fsReal.readFile(path.join(fixturesDir, 'eas-invalid-json5.json'), 'utf-8')
+    );
+    await expect(accessor.readAsync()).rejects.toThrowError(InvalidEasJsonError);
+    await expect(accessor.readAsync()).rejects.toThrowError(
+      /^Found invalid character in .*eas\.json.+/
+    );
+  });
+
+  test('reading empty JSON file', async () => {
+    vol.fromJSON(
+      {
+        './eas.json': await fsReal.readFile(path.join(fixturesDir, 'eas-empty.json'), 'utf-8'),
+      },
+      fakeAppPath
+    );
+
+    const accessor = EasJsonAccessor.fromRawString(
+      await fsReal.readFile(path.join(fixturesDir, 'eas-empty.json'), 'utf-8')
+    );
     await expect(accessor.readAsync()).rejects.toThrowError(InvalidEasJsonError);
     await expect(accessor.readAsync()).rejects.toThrowError(/^.*eas\.json.* is empty\.$/g);
   });

packages/eas-json/src/__tests__/buildProfiles-test.ts

@@ -1,4 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
+import chalk from 'chalk';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 
@@ -20,7 +21,33 @@ test('minimal valid eas.json for both platforms', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  const androidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'production'
+  );
+
+  expect(androidProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+  });
+
+  expect(iosProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+  });
+});
+
+test('minimal valid eas.json for both platforms when reading eas.json from string', async () => {
+  const accessor = EasJsonAccessor.fromRawString(
+    JSON.stringify({
+      build: {
+        production: {},
+      },
+    })
+  );
   const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
   const androidProfile = await EasJsonUtils.getBuildProfileAsync(
     accessor,
@@ -52,7 +79,7 @@ test('valid eas.json for development client builds', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'debug');
   const androidProfile = await EasJsonUtils.getBuildProfileAsync(
     accessor,
@@ -82,7 +109,7 @@ test(`valid eas.json with autoIncrement flag at build profile root`, async () =>
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
   const androidProfile = await EasJsonUtils.getBuildProfileAsync(
     accessor,
@@ -111,7 +138,7 @@ test('valid profile for internal distribution on Android', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const profile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'internal');
   expect(profile).toEqual({
     distribution: 'internal',
@@ -133,7 +160,7 @@ test('valid profile extending other profile', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const baseProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'base');
   const extendedProfile = await EasJsonUtils.getBuildProfileAsync(
     accessor,
@@ -176,7 +203,7 @@ test('valid profile extending other profile with platform specific envs', async
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const baseProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'base');
   const extendedAndroidProfile = await EasJsonUtils.getBuildProfileAsync(
     accessor,
@@ -230,15 +257,14 @@ test('valid profile extending other profile with platform specific caching', asy
         },
         android: {
           cache: {
-            cacheDefaultPaths: false,
-            customPaths: ['somefakepath'],
+            paths: ['somefakepath'],
           },
         },
       },
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const baseProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'base');
   const extendedAndroidProfile = await EasJsonUtils.getBuildProfileAsync(
     accessor,
@@ -261,8 +287,66 @@ test('valid profile extending other profile with platform specific caching', asy
     distribution: 'internal',
     credentialsSource: 'remote',
     cache: {
-      cacheDefaultPaths: false,
-      customPaths: ['somefakepath'],
+      paths: ['somefakepath'],
+    },
+  });
+  expect(extendedIosProfile).toEqual({
+    distribution: 'internal',
+    credentialsSource: 'remote',
+
+    cache: {
+      key: 'extend-key',
+    },
+  });
+});
+
+test('valid profile extending other profile with platform specific caching - backwards compatible with customPaths', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      base: {
+        cache: {
+          disabled: true,
+        },
+      },
+      extension: {
+        extends: 'base',
+        distribution: 'internal',
+        cache: {
+          key: 'extend-key',
+        },
+        android: {
+          cache: {
+            customPaths: ['somefakepath'],
+          },
+        },
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const baseProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'base');
+  const extendedAndroidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'extension'
+  );
+  const extendedIosProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.IOS,
+    'extension'
+  );
+  expect(baseProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: true,
+    },
+  });
+  expect(extendedAndroidProfile).toEqual({
+    distribution: 'internal',
+    credentialsSource: 'remote',
+    cache: {
+      paths: ['somefakepath'],
     },
   });
   expect(extendedIosProfile).toEqual({
@@ -282,7 +366,7 @@ test('valid eas.json with missing profile', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const promise = EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'debug');
   await expect(promise).rejects.toThrowError('Missing build profile in eas.json: debug');
 });
@@ -294,7 +378,7 @@ test('invalid eas.json when using wrong buildType', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const promise = EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError(InvalidEasJsonError);
   await expect(promise).rejects.toThrowError(
@@ -305,7 +389,7 @@ test('invalid eas.json when using wrong buildType', async () => {
 test('empty json', async () => {
   await fs.writeJson('/project/eas.json', {});
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const promise = EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError('Missing build profile in eas.json: production');
 });
@@ -317,7 +401,7 @@ test('invalid semver value', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const promise = EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError(InvalidEasJsonError);
   await expect(promise).rejects.toThrowError(
@@ -332,7 +416,7 @@ test('invalid release channel', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const promise = EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'production');
   await expect(promise).rejects.toThrowError(/fails to match the required pattern/);
 });
@@ -345,7 +429,7 @@ test('get profile names', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const allProfileNames = await EasJsonUtils.getBuildProfileNamesAsync(accessor);
   expect(allProfileNames.sort()).toEqual(['blah', 'production'].sort());
 });
@@ -359,7 +443,7 @@ test('invalid resourceClass at build profile root', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
 
   await expect(
     EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production')
@@ -377,7 +461,39 @@ test('iOS-specific resourceClass', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  await expect(
+    EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production')
+  ).resolves.not.toThrow();
+});
+
+test('iOS-specific `large` resourceClass', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        ios: {
+          resourceClass: 'large',
+        },
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  await expect(
+    EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production')
+  ).resolves.not.toThrow();
+});
+
+test('`large` resourceClass in build profile root', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        resourceClass: 'large',
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   await expect(
     EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production')
   ).resolves.not.toThrow();
@@ -394,8 +510,211 @@ test('Android-specific resourceClass', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   await expect(
     EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'production')
   ).resolves.not.toThrow();
 });
+
+test('build profile with platform-specific custom build config', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        android: {
+          config: 'production.android.yml',
+        },
+        ios: {
+          config: 'production.ios.yml',
+        },
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const androidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'production'
+  );
+  const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  expect(androidProfile).toEqual({
+    config: 'production.android.yml',
+    distribution: 'store',
+    credentialsSource: 'remote',
+  });
+  expect(iosProfile).toEqual({
+    config: 'production.ios.yml',
+    distribution: 'store',
+    credentialsSource: 'remote',
+  });
+});
+
+test('build profiles with both platform build config', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        config: 'production.yml',
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const androidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'production'
+  );
+  const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  expect(androidProfile).toEqual({
+    config: 'production.yml',
+    distribution: 'store',
+    credentialsSource: 'remote',
+  });
+  expect(iosProfile).toEqual({
+    config: 'production.yml',
+    distribution: 'store',
+    credentialsSource: 'remote',
+  });
+});
+
+test('valid build profile with caching without paths', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        cache: {
+          disabled: false,
+        },
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  const androidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'production'
+  );
+
+  expect(androidProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: false,
+    },
+  });
+
+  expect(iosProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: false,
+    },
+  });
+});
+
+test('valid build profile with caching with paths', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        cache: {
+          disabled: false,
+          paths: ['index.ts'],
+        },
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  const androidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'production'
+  );
+
+  expect(androidProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: false,
+      paths: ['index.ts'],
+    },
+  });
+
+  expect(iosProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: false,
+      paths: ['index.ts'],
+    },
+  });
+});
+
+test('valid build profile with caching with customPaths - moved into paths and customPaths removed', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        cache: {
+          disabled: false,
+          customPaths: ['index.ts'],
+        },
+      },
+    },
+  });
+
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+  const iosProfile = await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  const androidProfile = await EasJsonUtils.getBuildProfileAsync(
+    accessor,
+    Platform.ANDROID,
+    'production'
+  );
+
+  expect(androidProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: false,
+      paths: ['index.ts'],
+    },
+  });
+
+  expect(iosProfile).toEqual({
+    distribution: 'store',
+    credentialsSource: 'remote',
+    cache: {
+      disabled: false,
+      paths: ['index.ts'],
+    },
+  });
+});
+
+test('invalid build profile with caching with both paths and customPaths - error thrown', async () => {
+  await fs.writeJson('/project/eas.json', {
+    build: {
+      production: {
+        cache: {
+          disabled: false,
+          customPaths: ['index.ts'],
+          paths: ['index2.ts'],
+        },
+      },
+    },
+  });
+  const expectedError = new InvalidEasJsonError(
+    `${chalk.bold(
+      'eas.json'
+    )} is not valid.\n- Cannot provide both "cache.customPaths" and "cache.paths" - use "cache.paths"`
+  );
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
+
+  await expect(async () => {
+    await EasJsonUtils.getBuildProfileAsync(accessor, Platform.IOS, 'production');
+  }).rejects.toThrow(expectedError);
+
+  await expect(async () => {
+    await EasJsonUtils.getBuildProfileAsync(accessor, Platform.ANDROID, 'production');
+  }).rejects.toThrow(expectedError);
+});

packages/eas-json/src/__tests__/submitProfiles-test.ts

@@ -19,7 +19,7 @@ test('minimal allowed eas.json for both platforms', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const iosProfile = await EasJsonUtils.getSubmitProfileAsync(accessor, Platform.IOS, 'production');
   const androidProfile = await EasJsonUtils.getSubmitProfileAsync(
     accessor,
@@ -50,7 +50,7 @@ test('android config with all required values', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const androidProfile = await EasJsonUtils.getSubmitProfileAsync(
     accessor,
     Platform.ANDROID,
@@ -80,7 +80,7 @@ test('android config with serviceAccountKeyPath set to env var', async () => {
 
   try {
     process.env.GOOGLE_SERVICE_ACCOUNT = './path.json';
-    const accessor = new EasJsonAccessor('/project');
+    const accessor = EasJsonAccessor.fromProjectPath('/project');
     const androidProfile = await EasJsonUtils.getSubmitProfileAsync(
       accessor,
       Platform.ANDROID,
@@ -114,7 +114,7 @@ test('ios config with all required values', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const iosProfile = await EasJsonUtils.getSubmitProfileAsync(accessor, Platform.IOS, 'production');
 
   expect(iosProfile).toEqual({
@@ -148,7 +148,7 @@ test('ios config with ascApiKey fields set to env var', async () => {
     process.env.ASC_API_KEY_PATH = './path-ABCD.p8';
     process.env.ASC_API_KEY_ISSUER_ID = 'abc-123-def-456';
     process.env.ASC_API_KEY_ID = 'ABCD';
-    const accessor = new EasJsonAccessor('/project');
+    const accessor = EasJsonAccessor.fromProjectPath('/project');
     const iosProfile = await EasJsonUtils.getSubmitProfileAsync(accessor, Platform.IOS, 'release');
 
     expect(iosProfile).toEqual({
@@ -189,7 +189,7 @@ test('valid profile extending other profile', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const baseProfile = await EasJsonUtils.getSubmitProfileAsync(accessor, Platform.IOS, 'base');
   const extendedProfile = await EasJsonUtils.getSubmitProfileAsync(
     accessor,
@@ -233,7 +233,7 @@ test('get profile names', async () => {
     },
   });
 
-  const accessor = new EasJsonAccessor('/project');
+  const accessor = EasJsonAccessor.fromProjectPath('/project');
   const allProfileNames = await EasJsonUtils.getSubmitProfileNamesAsync(accessor);
   expect(allProfileNames.sort()).toEqual(['production', 'blah'].sort());
 });

packages/eas-json/src/__tests__/utils-test.ts

@@ -0,0 +1,261 @@
+import { Platform } from '@expo/eas-build-job';
+
+import { EasJsonAccessor } from '../accessor';
+import { AndroidBuildProfile, IosBuildProfile } from '../build/types';
+import { EasJsonUtils } from '../utils';
+
+jest.mock('@expo/eas-json', () => {
+  const actual = jest.requireActual('@expo/eas-json');
+
+  const EasJsonUtilsMock = {
+    getBuildProfileAsync: jest.fn(),
+  };
+  return {
+    ...actual,
+    EasJsonUtils: EasJsonUtilsMock,
+  };
+});
+const getBuildProfileAsync = jest.spyOn(EasJsonUtils, 'getBuildProfileAsync');
+
+describe('getBuildProfileDeprecationWarningsAsync', () => {
+  const easJsonAccessor = EasJsonAccessor.fromProjectPath('/fake');
+  const readRawEasJsonMock = jest.spyOn(easJsonAccessor, 'readRawJsonAsync');
+  describe('android', () => {
+    type BuildProfileType = AndroidBuildProfile;
+    describe('no cache settings', () => {
+      it('does not return deprecation warnings', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {} as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {};
+        });
+        const result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.ANDROID,
+          'production'
+        );
+        expect(result).toEqual([]);
+      });
+    });
+    describe('cache settings with paths', () => {
+      it('does not return deprecation warnings', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {
+            cache: {
+              paths: ['path1', 'path2'],
+            },
+          } as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {
+            build: {
+              production: {
+                cache: {
+                  paths: ['path1', 'path2'],
+                },
+              },
+            },
+          };
+        });
+        const result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.ANDROID,
+          'production'
+        );
+        expect(result).toEqual([]);
+      });
+    });
+    describe('cache settings with customPaths', () => {
+      it('returns deprecation warning', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {
+            cache: {
+              paths: ['path1', 'path2'],
+            },
+          } as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {
+            build: {
+              production: {
+                cache: {
+                  customPaths: ['path1', 'path2'],
+                },
+              },
+              dummy_profile_name: {
+                cache: {
+                  customPaths: ['path1', 'path2'],
+                },
+              },
+            },
+          };
+        });
+        let result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.ANDROID,
+          'production'
+        );
+        expect(result).toEqual([
+          {
+            message: [
+              `The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.`,
+            ],
+            docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+          },
+        ]);
+        result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.ANDROID,
+          'dummy_profile_name'
+        );
+        expect(result).toEqual([
+          {
+            message: [
+              `The "build.dummy_profile_name.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.dummy_profile_name.cache.paths" instead.`,
+            ],
+            docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+          },
+        ]);
+      });
+    });
+  });
+  describe('ios', () => {
+    type BuildProfileType = IosBuildProfile;
+    describe('no cache settings', () => {
+      it('does not return deprecation warnings', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {} as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {};
+        });
+        const result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.IOS,
+          'production'
+        );
+        expect(result).toEqual([]);
+      });
+    });
+    describe('cache settings with paths', () => {
+      it('does not return deprecation warnings', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {
+            cache: {
+              paths: ['path1', 'path2'],
+            },
+          } as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {
+            build: {
+              production: {
+                cache: {
+                  paths: ['path1', 'path2'],
+                },
+              },
+            },
+          };
+        });
+        const result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.IOS,
+          'production'
+        );
+        expect(result).toEqual([]);
+      });
+    });
+    describe('cache settings with customPaths', () => {
+      it('returns deprecation warning', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {
+            cache: {
+              paths: ['path1', 'path2'],
+            },
+          } as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {
+            build: {
+              production: {
+                cache: {
+                  customPaths: ['path1', 'path2'],
+                },
+              },
+              dummy_profile_name: {
+                cache: {
+                  customPaths: ['path1', 'path2'],
+                },
+              },
+            },
+          };
+        });
+        let result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.IOS,
+          'production'
+        );
+        expect(result).toEqual([
+          {
+            message: [
+              `The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.`,
+            ],
+            docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+          },
+        ]);
+        result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.IOS,
+          'dummy_profile_name'
+        );
+        expect(result).toEqual([
+          {
+            message: [
+              `The "build.dummy_profile_name.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.dummy_profile_name.cache.paths" instead.`,
+            ],
+            docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+          },
+        ]);
+      });
+    });
+    describe('cache settings with customPaths in extended profile', () => {
+      it('returns deprecation warning', async () => {
+        getBuildProfileAsync.mockImplementation(async () => {
+          return {
+            cache: {
+              paths: ['path1', 'path2'],
+            },
+          } as BuildProfileType;
+        });
+        readRawEasJsonMock.mockImplementation(async () => {
+          return {
+            build: {
+              production: {
+                cache: {
+                  customPaths: ['path1', 'path2'],
+                },
+              },
+              dummy_profile_name: {
+                extends: 'production',
+              },
+            },
+          };
+        });
+        const result = await EasJsonUtils.getBuildProfileDeprecationWarningsAsync(
+          easJsonAccessor,
+          Platform.IOS,
+          'dummy_profile_name'
+        );
+        expect(result).toEqual([
+          {
+            message: [
+              `The "build.production.cache.customPaths" field in eas.json is deprecated and will be removed in the future. Please use "build.production.cache.paths" instead.`,
+            ],
+            docsUrl: 'https://docs.expo.dev/build-reference/eas-json/#cache',
+          },
+        ]);
+      });
+    });
+  });
+});

packages/eas-json/src/accessor.ts

@@ -38,7 +38,7 @@ const customErrorMessageHandlers: ((err: ValidationError) => void)[] = [
 ];
 
 export class EasJsonAccessor {
-  private easJsonPath: string;
+  private easJsonPath: string | undefined;
 
   private isJson5 = false;
   private easJson: EasJson | undefined;
@@ -46,8 +46,25 @@ export class EasJsonAccessor {
   private easJsonRawObject: any | undefined;
   private easJsonPatched: boolean = false;
 
-  constructor(projectDir: string) {
-    this.easJsonPath = EasJsonAccessor.formatEasJsonPath(projectDir);
+  private constructor({ projectDir }: { projectDir: string });
+  private constructor({ easJsonRawContents }: { easJsonRawContents: string });
+  private constructor({
+    projectDir,
+    easJsonRawContents,
+  }: {
+    projectDir?: string;
+    easJsonRawContents?: string;
+  }) {
+    this.easJsonPath = projectDir && EasJsonAccessor.formatEasJsonPath(projectDir);
+    this.easJsonRawContents = easJsonRawContents;
+  }
+
+  public static fromProjectPath(projectDir: string): EasJsonAccessor {
+    return new EasJsonAccessor({ projectDir });
+  }
+
+  public static fromRawString(easJsonRawContents: string): EasJsonAccessor {
+    return new EasJsonAccessor({ easJsonRawContents });
   }
 
   public static formatEasJsonPath(projectDir: string): string {
@@ -81,6 +98,9 @@ export class EasJsonAccessor {
   }
 
   public async writeAsync(): Promise<void> {
+    if (!this.easJsonPath) {
+      throw new Error('Updates are not supported for EasJsonAccessor created from string.');
+    }
     if (!this.easJsonPatched) {
       return;
     }
@@ -89,6 +109,9 @@ export class EasJsonAccessor {
   }
 
   public patch(fn: (easJsonRawObject: any) => any): void {
+    if (!this.easJsonPath) {
+      throw new Error('Updates are not supported for EasJsonAccessor created from string.');
+    }
     assert(
       this.easJsonRawContents && this.easJsonRawObject,
       'call readAsync/readRawJsonAsync first'
@@ -104,16 +127,24 @@ export class EasJsonAccessor {
   }
 
   public async readRawJsonAsync(): Promise<any> {
-    if (!(await fs.pathExists(this.easJsonPath))) {
-      throw new MissingEasJsonError(
-        `${chalk.bold('eas.json')} could not be found at ${
-          this.easJsonPath
-        }. Learn more at https://expo.fyi/eas-json`
-      );
+    if (this.easJsonPath) {
+      if (!(await fs.pathExists(this.easJsonPath))) {
+        throw new MissingEasJsonError(
+          `${chalk.bold('eas.json')} could not be found at ${
+            this.easJsonPath
+          }. Learn more at https://expo.fyi/eas-json`
+        );
+      }
+      this.easJsonRawContents = await fs.readFile(this.easJsonPath, 'utf-8');
     }
+    return this.parseRawJson();
+  }
 
-    this.easJsonRawContents = await fs.readFile(this.easJsonPath, 'utf-8');
-
+  private parseRawJson(): any {
+    assert(
+      this.easJsonRawContents !== undefined,
+      'easJsonRawContents needs to be set before calling parseRawJson'
+    );
     if (this.easJsonRawContents.trim().length === 0) {
       throw new InvalidEasJsonError(`${chalk.bold('eas.json')} is empty.`);
     }