fix lint errors

.github/codemention.yml

@@ -3,7 +3,7 @@ commentConfiguration:
   epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
 rules:
   - patterns: ['**/*']
-    mentions: ['sjchmiela']
+    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela', 'radoslawkrzemien']
   - patterns: ['packages/eas-cli/src/update/**']
     mentions: ['wschurman', 'quinlanj']
   - patterns: ['packages/eas-cli/src/commands/update/**']
@@ -18,7 +18,3 @@ rules:
     mentions: ['bycedric']
   - patterns: ['packages/eas-cli/src/commands/metadata/**']
     mentions: ['bycedric']
-  - patterns: ['packages/eas-cli/src/worker/**']
-    mentions: ['kitten', 'kadikraman']
-  - patterns: ['packages/eas-cli/src/commands/deploy/**']
-    mentions: ['kitten', 'kadikraman']

.github/workflows/changelog.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Check if CHANGELOG.md was updated
         id: changelog-updated
-        uses: tj-actions/changed-files@b1ba699b304f2083b602164e06a89b868c84f076
+        uses: tj-actions/changed-files@v41
         with:
           files: CHANGELOG.md
       - name: Fail if CHANGELOG.md was not updated and the "no changelog" label is absent

.github/workflows/release.yml

@@ -18,7 +18,6 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: ${{ github.ref }}
-          release_name: 'eas-cli@${{ env.EAS_CLI_VERSION }}'
           draft: true
   build-linux:
     name: Build for Linux
@@ -31,10 +30,6 @@ jobs:
           node-version: 20
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
-      - name: Ensure GraphQL schema and generated code is up-to-date
-        working-directory: ${{ github.workspace }}/packages/eas-cli
-        run: |
-          yarn verify-graphql-code
       - name: Build tarballs
         working-directory: ${{ github.workspace }}/packages/eas-cli
         run: |
@@ -231,3 +226,16 @@ jobs:
           SLACK_USERNAME: 'EAS CLI CI'
           SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
           SLACK_FOOTER: ''
+  open-pr-in-universe:
+    name: Open a PR with `@expo/eas-json` bump in universe
+    needs: publish-to-npm
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Open a PR with `@expo/eas-json` version bump in universe
+        uses: benc-uk/workflow-dispatch@v1
+        with:
+          repo: expo/universe
+          ref: main
+          workflow: update-eas-json.yml
+          token: ${{ secrets.EXPO_BOT_PAT }}

.github/workflows/test-graphql.yml

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

.github/workflows/test.yml

@@ -28,9 +28,6 @@ jobs:
           node-version: ${{ matrix.node }}
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn typecheck
-      - run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Test"
       - run: yarn test
         if: ${{ !matrix.coverage }}
         env:
@@ -52,7 +49,7 @@ jobs:
 
   notify-slack:
     runs-on: ubuntu-latest
-    needs: [test]
+    needs: test
     name: Notify Slack
     if: ${{ github.ref == 'refs/heads/main' && always() }}
     steps:

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

@@ -66,7 +66,7 @@ jobs:
           destination_branch: 'main'
           pr_title: 'Upgrade eas-build dependencies'
           pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
-          pr_reviewer: 'sjchmiela'
+          pr_reviewer: 'szdziedzic,radoslawkrzemien,sjchmiela,khamilowicz'
           github_token: ${{ secrets.EXPO_BOT_PAT }}
 
       - uses: actions/github-script@v3

CHANGELOG.md

@@ -8,519 +8,19 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-### 🐛 Bug fixes
-
-### 🧹 Chores
-
-## [16.17.1](https://github.com/expo/eas-cli/releases/tag/v16.17.1) - 2025-07-23
-
-## [16.17.0](https://github.com/expo/eas-cli/releases/tag/v16.17.0) - 2025-07-18
-
-### 🎉 New features
-
-- Add `deploy:delete` for deleting worker deployments ([#3106](https://github.com/expo/eas-cli/pull/3106) by [@kadikraman](https://github.com/kadikraman))
-- Add `deploy:alias:delete` for deleting worker deployment aliases ([#3107](https://github.com/expo/eas-cli/pull/3107) by [@kadikraman](https://github.com/kadikraman))
-
-## [16.16.0](https://github.com/expo/eas-cli/releases/tag/v16.16.0) - 2025-07-16
-
-### 🎉 New features
-
-- Add workflow:view and workflow:logs commands. ([#3090](https://github.com/expo/eas-cli/pull/3090) by [@douglowder](https://github.com/douglowder))
-- Add support for providing inputs to new workflow runs ([#3095](https://github.com/expo/eas-cli/pull/3095) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🐛 Bug fixes
-
-- Refactor capabilities syncing to avoid provisioning profiles becoming invalid. ([#3088](https://github.com/expo/eas-cli/pull/3088) by [@vonovak](https://github.com/vonovak))
-- Avoid corrupted EAS Hosting batch upload bodies and double-check length and checksums while uploading. ([#3103](https://github.com/expo/eas-cli/pull/3103) by [@kitten](https://github.com/kitten))
-
-## [16.15.0](https://github.com/expo/eas-cli/releases/tag/v16.15.0) - 2025-07-10
-
-### 🎉 New features
-
-- Implement new EAS Hosting asset upload protocol, which improves performance by grouping files into batched upload API calls ([#3085](https://github.com/expo/eas-cli/pull/3085) by [@kitten](https://github.com/kitten))
-
-### 🧹 Chores
-
-- Update the EAS Hosting worker deployment progress indicator to use a progress bar for asset uploads instead ([#3099](https://github.com/expo/eas-cli/pull/3099) by [@kitten](https://github.com/kitten))
-
-## [16.14.1](https://github.com/expo/eas-cli/releases/tag/v16.14.1) - 2025-07-08
-
-### 🧹 Chores
-
-- Update apple team info as needed. ([#3096](https://github.com/expo/eas-cli/pull/3096) by [@quinlanj](https://github.com/quinlanj))
-
-## [16.14.0](https://github.com/expo/eas-cli/releases/tag/v16.14.0) - 2025-07-07
-
-### 🎉 New features
-
-- Add update:revert-update-rollout command. ([#3068](https://github.com/expo/eas-cli/pull/3068) by [@wschurman](https://github.com/wschurman))
-
-### 🧹 Chores
-
-- Remove unreleased `link` and `unlink` commands from `eas env`. ([#3092](https://github.com/expo/eas-cli/pull/3092) by [@kadikraman](https://github.com/kadikraman))
-- Add new CI to verify GraphQL generation. ([#3093](https://github.com/expo/eas-cli/pull/3093) by [@douglowder](https://github.com/douglowder))
-- Update GraphQL generation to look in all src directories. ([#3097](https://github.com/expo/eas-cli/pull/3097) by [@wschurman](https://github.com/wschurman))
-
-## [16.13.4](https://github.com/expo/eas-cli/releases/tag/v16.13.4) - 2025-07-04
-
-### 🧹 Chores
-
-- Remove hidden flag from `eas upload`. ([#3014](https://github.com/expo/eas-cli/pull/3014) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## [16.13.3](https://github.com/expo/eas-cli/releases/tag/v16.13.3) - 2025-07-01
-
-### 🐛 Bug fixes
-
-- Fix suggested command to switch Xcode Developer Tools. ([#3079](https://github.com/expo/eas-cli/pull/3079) by [@rolfb](https://github.com/rolfb))
-- Skip configuring build profiles when running `eas update:configure` if no build profiles exist. ([#3084](https://github.com/expo/eas-cli/pull/3084) by [@brentvatne](https://github.com/brentvatne))
-
-### 🧹 Chores
-
-- Reword how paid plans are described ([#3082](https://github.com/expo/eas-cli/pull/3082) by [@ide](https://github.com/ide))
-
-## [16.13.2](https://github.com/expo/eas-cli/releases/tag/v16.13.2) - 2025-06-27
-
-### 🧹 Chores
-
-- Amend update override fields. ([#3080](https://github.com/expo/eas-cli/pull/3080) by [@quinlanj](https://github.com/quinlanj))
-
-## [16.13.1](https://github.com/expo/eas-cli/releases/tag/v16.13.1) - 2025-06-25
-
-### 🐛 Bug fixes
-
-- Fix bug in log during update:republish. ([#3067](https://github.com/expo/eas-cli/pull/3067) by [@wschurman](https://github.com/wschurman))
-- Fix update group deletion. ([#3069](https://github.com/expo/eas-cli/pull/3069) by [@wschurman](https://github.com/wschurman))
-
-## [16.13.0](https://github.com/expo/eas-cli/releases/tag/v16.13.0) - 2025-06-24
-
-### 🎉 New features
-
-- Add `--what-to-test` option to `build` command. ([#3065](https://github.com/expo/eas-cli/pull/3065) by [@vonovak](https://github.com/vonovak))
-
-### 🐛 Bug fixes
-
-- Hide `workflow:list`. ([#3060](https://github.com/expo/eas-cli/pull/3060) by [@douglowder](https://github.com/douglowder))
-- Align text of messages from `build` and `workflow:run`. ([#3061](https://github.com/expo/eas-cli/pull/3061) by [@douglowder](https://github.com/douglowder))
-
-## [16.12.0](https://github.com/expo/eas-cli/releases/tag/v16.12.0) - 2025-06-20
-
-### 🎉 New features
-
-- Add `--what-to-test` option to the `submit` command. ([#3023](https://github.com/expo/eas-cli/pull/3023) by [@vonovak](https://github.com/vonovak))
-
-### 🐛 Bug fixes
-
-- Fixed monorepo support in `workflow:run` if a project is not connected to a GitHub repository. ([#3058](https://github.com/expo/eas-cli/pull/3058) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [16.10.1](https://github.com/expo/eas-cli/releases/tag/v16.10.1) - 2025-06-13
-
-### 🐛 Bug fixes
-
-- Fixed `eas build:dev` command to correctly use passed build profile. ([#3053](https://github.com/expo/eas-cli/pull/3053) by [@sebryu](https://github.com/sebryu))
-
-### 🧹 Chores
-
-- Allow rolling out update on empty branch. ([#3050](https://github.com/expo/eas-cli/pull/3050) by [@wschurman](https://github.com/wschurman))
-
-## [16.10.0](https://github.com/expo/eas-cli/releases/tag/v16.10.0) - 2025-06-12
-
-### 🎉 New features
-
-- [eas-cli] Add workflow:cancel. ([#3048](https://github.com/expo/eas-cli/pull/3048) by [@douglowder](https://github.com/douglowder))
-
-### 🧹 Chores
-
-- Removed repack support. ([#3044](https://github.com/expo/eas-cli/pull/3044) by [@kudo](https://github.com/kudo))
-
-## [16.9.0](https://github.com/expo/eas-cli/releases/tag/v16.9.0) - 2025-06-06
-
-### 🎉 New features
-
-- Add `groups` option to the `submit` command. ([#2891](https://github.com/expo/eas-cli/pull/2891) by [@khamilowicz](https://github.com/khamilowicz))
-
-### 🐛 Bug fixes
-
-- [eas-cli] Ensure workflow:runs returns most recent runs. ([#3045](https://github.com/expo/eas-cli/pull/3045) by [@douglowder](https://github.com/douglowder))
-
-## [16.8.0](https://github.com/expo/eas-cli/releases/tag/v16.8.0) - 2025-06-04
-
-### 🎉 New features
-
-- [eas-cli] Add workflow:list and workflow:runs. ([#3030](https://github.com/expo/eas-cli/pull/3030) by [@douglowder](https://github.com/douglowder))
-
-### 🧹 Chores
-
-- Change location of EAS Update host override config. ([#3042](https://github.com/expo/eas-cli/pull/3042) by [@wschurman](https://github.com/wschurman))
-
-## [16.7.2](https://github.com/expo/eas-cli/releases/tag/v16.7.2) - 2025-06-03
-
-### 🐛 Bug fixes
-
-- Add support for array `flavorDimensions` (`flavorDimensions = ['version']`). ([#3043](https://github.com/expo/eas-cli/pull/3043) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [16.7.1](https://github.com/expo/eas-cli/releases/tag/v16.7.1) - 2025-06-03
-
-### 🐛 Bug fixes
-
-- Fix some unit tests by updating mocks. ([#3035](https://github.com/expo/eas-cli/pull/3035) by [@douglowder](https://github.com/douglowder))
-- Fix update republishing not including environment or git info. ([#3036](https://github.com/expo/eas-cli/pull/3036) by [@wschurman](https://github.com/wschurman))
-- Do not require `eas.json` or `package.json` files when creating new workflow runs. ([#3028](https://github.com/expo/eas-cli/pull/3028) by [@sjchmiela](https://github.com/sjchmiela))
-- Add `EAS_SKIP_CLI_VERSION_CHECK` allowing us to skip `eas-cli` version check (against `eas.json#version`). ([#3041](https://github.com/expo/eas-cli/pull/3041) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [16.7.0](https://github.com/expo/eas-cli/releases/tag/v16.7.0) - 2025-05-29
-
-### 🎉 New features
-
-- Add support for manifest host and asset host overriding for EAS Update. ([#3021](https://github.com/expo/eas-cli/pull/3021) by [@wschurman](https://github.com/wschurman))
-- Add rollout flag to update:republish. ([#3029](https://github.com/expo/eas-cli/pull/3029) by [@quinlanj](https://github.com/quinlanj))
-
-## [16.6.2](https://github.com/expo/eas-cli/releases/tag/v16.6.2) - 2025-05-23
-
-### 🧹 Chores
-
-- Further no longer require owner field for SDK >= 53 or canary. ([#3017](https://github.com/expo/eas-cli/pull/3017) by [@wschurman](https://github.com/wschurman))
-
-## [16.6.1](https://github.com/expo/eas-cli/releases/tag/v16.6.1) - 2025-05-14
-
-### 🐛 Bug fixes
-
-- Onboarding: add cwd to spawned git process. ([#3015](https://github.com/expo/eas-cli/pull/3015) by [@quinlanj](https://github.com/quinlanj))
-
-## [16.6.0](https://github.com/expo/eas-cli/releases/tag/v16.6.0) - 2025-05-14
-
-### 🎉 New features
-
-- Add support for uploading iOS internal distribution local builds. ([#3014](https://github.com/expo/eas-cli/pull/3014) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## [16.5.0](https://github.com/expo/eas-cli/releases/tag/v16.5.0) - 2025-05-13
-
-### 🎉 New features
-
-- Add `--wait`/`--no-wait` flag to `eas workflow:run`. ([#3012](https://github.com/expo/eas-cli/pull/3012) by [@sjchmiela](https://github.com/sjchmiela))
-- Add `--json` flag to `eas workflow:run`. ([#3013](https://github.com/expo/eas-cli/pull/3013) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [16.4.2](https://github.com/expo/eas-cli/releases/tag/v16.4.2) - 2025-05-10
-
-### 🧹 Chores
-
-- Update `eas-build-cache-provider` function names to use `buildCacheProvider` key. ([#3002](https://github.com/expo/eas-cli/pull/3002) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## [16.4.1](https://github.com/expo/eas-cli/releases/tag/v16.4.1) - 2025-05-07
-
-### 🧹 Chores
-
-- Allow non-standard build types in custom gradle command. ([#3003](https://github.com/expo/eas-cli/pull/3003) by [@khamilowicz](https://github.com/khamilowicz))
-
-## [16.4.0](https://github.com/expo/eas-cli/releases/tag/v16.4.0) - 2025-05-02
-
-### 🎉 New features
-
-- Add `--verbose-logs` flag for `build` command ([#3000](https://github.com/expo/eas-cli/pull/3000) by [@khamilowicz](https://github.com/khamilowicz))
-- Add `eas-build-cache-provider` package. ([#3002](https://github.com/expo/eas-cli/pull/3002) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-### 🧹 Chores
-
-- Read remote build cache provider types from `@expo/config`. ([#3005](https://github.com/expo/eas-cli/pull/3005) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## [16.3.3](https://github.com/expo/eas-cli/releases/tag/v16.3.3) - 2025-04-24
-
-### 🐛 Bug fixes
-
-- Add `sdk-52` alias to the list or supported android images. ([#2989](https://github.com/expo/eas-cli/pull/2989) by [@kadikraman](https://github.com/kadikraman))
-- Detect when expo metro config is used. ([#2996](https://github.com/expo/eas-cli/pull/2996) by [@kadikraman](https://github.com/kadikraman))
-
-### 🧹 Chores
-
-- upload assetmap.json when publishing update. ([#2994](https://github.com/expo/eas-cli/pull/2994) by [@quinlanj](https://github.com/quinlanj))
-- Add error messages for CDN-level upload errors. ([#2998](https://github.com/expo/eas-cli/pull/2998) by [@kitten](https://github.com/kitten))
-
-## [16.3.2](https://github.com/expo/eas-cli/releases/tag/v16.3.2) - 2025-04-17
-
-### 🧹 Chores
-
-- Update upload command to display build info. ([#2990](https://github.com/expo/eas-cli/pull/2990) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-- change launch asset file extension. ([#2991](https://github.com/expo/eas-cli/pull/2991) by [@quinlanj](https://github.com/quinlanj))
-
-## [16.3.1](https://github.com/expo/eas-cli/releases/tag/v16.3.1) - 2025-04-11
-
-### 🧹 Chores
-
-- Add `--no-dev-client` flag for `build:download` command. ([#2985](https://github.com/expo/eas-cli/pull/2985) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## [16.3.0](https://github.com/expo/eas-cli/releases/tag/v16.3.0) - 2025-04-09
-
-### 🎉 New features
-
-- Add `eas upload` command. ([#2932](https://github.com/expo/eas-cli/pull/2932), [#2981](https://github.com/expo/eas-cli/pull/2981), [#2983](https://github.com/expo/eas-cli/pull/2983) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-- Add `eas build:download` command. ([#2982](https://github.com/expo/eas-cli/pull/2982) by [@gabrieldonadel](https://github.com/gabrieldonadel))
-
-## [16.2.2](https://github.com/expo/eas-cli/releases/tag/v16.2.2) - 2025-04-08
-
-## [16.2.1](https://github.com/expo/eas-cli/releases/tag/v16.2.1) - 2025-04-04
-
-### 🧹 Chores
-
-- Bump `@expo/apple-utils` to use async JWT API. ([#2973](https://github.com/expo/eas-cli/pull/2973) by [@EvanBacon](https://github.com/EvanBacon))
-
-## [16.2.0](https://github.com/expo/eas-cli/releases/tag/v16.2.0) - 2025-04-03
-
-### 🎉 New features
-
-- Add environment flag to `eas fingerprint:compare`. ([#2954](https://github.com/expo/eas-cli/pull/2954) by [@quinlanj](https://github.com/quinlanj))
-- Add build-profile flag to `eas fingerprint:generate`. ([#2966](https://github.com/expo/eas-cli/pull/2966) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Remove hidden flag from `eas fingerprint:generate`. ([#2965](https://github.com/expo/eas-cli/pull/2965) by [@quinlanj](https://github.com/quinlanj))
-- Refactor `eas update` command to improve code readability. ([#2976](https://github.com/expo/eas-cli/pull/2976) by [@quinlanj](https://github.com/quinlanj))
-- `eas update`: add warning if no build exists with fingerprint. ([#2977](https://github.com/expo/eas-cli/pull/2977) by [@quinlanj](https://github.com/quinlanj))
-
-## [16.1.0](https://github.com/expo/eas-cli/releases/tag/v16.1.0) - 2025-03-26
-
-### 🎉 New features
-
-- Add environment flag to `eas fingerprint:generate`. ([#2951](https://github.com/expo/eas-cli/pull/2951) by [@quinlanj](https://github.com/quinlanj))
-- Add `corepack` field to `eas.json`. ([#2964](https://github.com/expo/eas-cli/pull/2964) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [16.0.1](https://github.com/expo/eas-cli/releases/tag/v16.0.1) - 2025-03-20
-
-### 🐛 Bug fixes
-
-- Make `eas update:configure` re-apply configuration from app.json /app.config.js when run multiple times. ([#2957](https://github.com/expo/eas-cli/pull/2957) by [@brentvatne](https://github.com/brentvatne))
-
-## [16.0.0](https://github.com/expo/eas-cli/releases/tag/v16.0.0) - 2025-03-19
-
-### 🛠 Breaking changes
-
-- Add support for `.easignore` when `requireCommit` is set to `true`. ([#2942](https://github.com/expo/eas-cli/pull/2942) by [@sjchmiela](https://github.com/sjchmiela))
-  - Up to 15.0.0, if `requireCommit` was `true`, `.easignore` was silently ignored.
-  - Versions 15.0.0-15.0.13 started using `.easignore` to skip files from being bundled into a tarball when `requireCommit` was `true`. This was an unexpected change in behavior.
-  - To clear this up, versions 15.0.13-15.0.15 were erroring if `.easignore` was present when `requireCommit` was `true`.
-  - `[email protected]` formalizes the 15.0.0-15.0.13 behavior by adhering to `.easignore` even when `requireCommit` is set to `true`.
-  - If you know what you're doing and you want to suppress a warning printed, you can do so by setting `EAS_SUPPRESS_REQUIRE_COMMIT_EASIGNORE_WARNING` environment variable to `true`.
-
-### 🎉 New features
-
-- Add requestId to ApiV2Error. ([#2941](https://github.com/expo/eas-cli/pull/2941) by [@wschurman](https://github.com/wschurman))
-- Release `eas fingerprint:generate` in hidden mode ([#2937](https://github.com/expo/eas-cli/pull/2937) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
-- Use correct logic to determine whether artifacts have expired in `eas build:run` command. ([#2931](https://github.com/expo/eas-cli/pull/2931) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [15.0.15](https://github.com/expo/eas-cli/releases/tag/v15.0.15) - 2025-03-12
-
-### 🐛 Bug fixes
-
-- Pass through the updates version to `setUpdatesConfigAsync`, which expects it in order to determine which field values to use. ([#2934](https://github.com/expo/eas-cli/pull/2934) by [@brentvatne](https://github.com/brentvatne)).
-
-## [15.0.14](https://github.com/expo/eas-cli/releases/tag/v15.0.14) - 2025-03-06
-
-### 🐛 Bug fixes
-
-- In `EAS_NO_VCS=1`, use Git for repository root when `EAS_PROJECT_ROOT` is not set. ([#2901](https://github.com/expo/eas-cli/pull/2901) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🧹 Chores
-
-- Suggest using `eas build:dev` for matching configurations. ([#2929](https://github.com/expo/eas-cli/pull/2929) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [15.0.13](https://github.com/expo/eas-cli/releases/tag/v15.0.13) - 2025-03-04
-
-### 🐛 Bug fixes
-
-- Fixed `.git` being always unexpectedly removed if you had `requireCommit: true` and `.easignore` present. ([#2925](https://github.com/expo/eas-cli/pull/2925) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🧹 Chores
-
-- Fix `eas fingerprint:compare` URL generation and pretty prints. ([#2909](https://github.com/expo/eas-cli/pull/2909) by [@quinlanj](https://github.com/quinlanj))
-- fix formatFields to handle empty array. ([#2914](https://github.com/expo/eas-cli/pull/2914) by [@quinlanj](https://github.com/quinlanj))
-- fix git diff header in `fingerprint:compare`. ([#2915](https://github.com/expo/eas-cli/pull/2915) by [@quinlanj](https://github.com/quinlanj))
-- amend fingerprint compare url. ([#2923](https://github.com/expo/eas-cli/pull/2923) by [@quinlanj](https://github.com/quinlanj))
-- improve error message for `applicationIdSuffix`. ([#2924](https://github.com/expo/eas-cli/pull/2924) by [@kadikraman](https://github.com/kadikraman))
-
-## [15.0.12](https://github.com/expo/eas-cli/releases/tag/v15.0.12) - 2025-02-22
-
-### 🐛 Bug fixes
-
-- Fix APNS key creation. ([#2916](https://github.com/expo/eas-cli/pull/2916) by [@EvanBacon](https://github.com/EvanBacon))
-
-## [15.0.11](https://github.com/expo/eas-cli/releases/tag/v15.0.11) - 2025-02-21
-
-### 🐛 Bug fixes
-
-- Fix internal TestFlight group creation. ([#2906](https://github.com/expo/eas-cli/pull/2906) by [@EvanBacon](https://github.com/EvanBacon))
-
-### 🧹 Chores
-
-- Narrow amount of data queried for basic update channel operations. ([#2901](https://github.com/expo/eas-cli/pull/2901) by [@wschurman](https://github.com/wschurman))
-- Fix `eas fingerprint:compare` description. ([#2908](https://github.com/expo/eas-cli/pull/2908) by [@quinlanj](https://github.com/quinlanj))
-- Skip auto-creation of TestFlight group when there are already exisitng TestFlight groups and allow to opt out of the behavior by setting `EAS_NO_AUTO_TESTFLIGHT_SETUP` env var. ([#2856](https://github.com/expo/eas-cli/pull/2856) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [15.0.10](https://github.com/expo/eas-cli/releases/tag/v15.0.10) - 2025-02-11
-
-### 🐛 Bug fixes
-
-- Fix files deleted in working directory not being removed from the project archive when `requireCommit` is false. ([#2900](https://github.com/expo/eas-cli/pull/2900) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [15.0.9](https://github.com/expo/eas-cli/releases/tag/v15.0.9) - 2025-02-09
-
-### 🐛 Bug fixes
-
-- Fix files not being ignored when creating a tarball on Windows in Git repository in no `requireCommit` mode. ([#2894](https://github.com/expo/eas-cli/pull/2894) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [15.0.8](https://github.com/expo/eas-cli/releases/tag/v15.0.8) - 2025-02-09
-
-## [15.0.7](https://github.com/expo/eas-cli/releases/tag/v15.0.7) - 2025-02-09
-
-## [15.0.6](https://github.com/expo/eas-cli/releases/tag/v15.0.6) - 2025-02-07
-
-## [15.0.5](https://github.com/expo/eas-cli/releases/tag/v15.0.5) - 2025-02-06
-
-### 🐛 Bug fixes
-
-- Do not copy files over onto a cloned Git repository when packing the project archive if `requireCommit` is true. ([#2885](https://github.com/expo/eas-cli/pull/2885) by [@sjchmiela](https://github.com/sjchmiela))
-- Fix `EISDIR` error when archiving project with submodules ignored. ([#2884](https://github.com/expo/eas-cli/pull/2884) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [15.0.4](https://github.com/expo/eas-cli/releases/tag/v15.0.4) - 2025-02-05
-
-### 🐛 Bug fixes
-
-- Fixed `GitClient` not respecting `.easignore` file. ([#2873](https://github.com/expo/eas-cli/pull/2873) by [@sjchmiela](https://github.com/sjchmiela))
-- Fix symlink support in `makeShallowCopyAsync`. ([#2874](https://github.com/expo/eas-cli/pull/2874) by [@sjchmiela](https://github.com/sjchmiela))
-- Allow excluding `.git` directory from project archive by adding it to `.easignore`. ([#2879](https://github.com/expo/eas-cli/pull/2879) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🧹 Chores
-
-- Popup website in fingerprint:compare. ([#2859](https://github.com/expo/eas-cli/pull/2859) by [@quinlanj](https://github.com/quinlanj))
-- Fix fingerprint:compare URL. ([#2861](https://github.com/expo/eas-cli/pull/2861) by [@quinlanj](https://github.com/quinlanj))
-- Make less gql calls in fingerprint:compare. ([#2860](https://github.com/expo/eas-cli/pull/2860) by [@quinlanj](https://github.com/quinlanj))
-- No longer require owner field for SDK >= 53 or canary. ([#2835](https://github.com/expo/eas-cli/pull/2835) by [@wschurman](https://github.com/wschurman))
-- Add --open flag to fingerprint:compare. ([#2872](https://github.com/expo/eas-cli/pull/2872) by [@quinlanj](https://github.com/quinlanj))
-
-## [15.0.3](https://github.com/expo/eas-cli/releases/tag/v15.0.3) - 2025-02-04
-
-### 🐛 Bug fixes
-
-- Fixed EAS server environment variables does not pass to `npx expo-updates runtimeversion:resolve` call. ([#2867](https://github.com/expo/eas-cli/pull/2867) by [@kudo](https://github.com/kudo))
-
-## [15.0.2](https://github.com/expo/eas-cli/releases/tag/v15.0.2) - 2025-02-04
-
-## [15.0.1](https://github.com/expo/eas-cli/releases/tag/v15.0.1) - 2025-02-04
-
-## [15.0.0](https://github.com/expo/eas-cli/releases/tag/v15.0.0) - 2025-02-04
-
-### 🛠 Breaking changes
-
-- Use Git to archive projects containing a Git repository. (Previously, Git would only be used if `requireCommit` flag in `eas.json` was set to `true`.) ([#2841](https://github.com/expo/eas-cli/pull/2841) by [@sjchmiela](https://github.com/sjchmiela))
-
-### 🐛 Bug fixes
-
-- Print warning for `NoVcsClient` only once. ([#2863](https://github.com/expo/eas-cli/pull/2863) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Add update support for fingerprint:compare. ([#2850](https://github.com/expo/eas-cli/pull/2850) by [@quinlanj](https://github.com/quinlanj))
-- Add update group id support for fingerprint:compare. ([#2851](https://github.com/expo/eas-cli/pull/2851) by [@quinlanj](https://github.com/quinlanj))
-- Add better interactive support for fingerprint:compare. ([#2854](https://github.com/expo/eas-cli/pull/2854) by [@quinlanj](https://github.com/quinlanj))
-
-## [14.7.1](https://github.com/expo/eas-cli/releases/tag/v14.7.1) - 2025-01-31
-
-### 🐛 Bug fixes
-
-- Account for `ios.config.usesNonExemptEncryption` in non-exempt encryption status prompt. ([#2852](https://github.com/expo/eas-cli/pull/2852) by [@EvanBacon](https://github.com/EvanBacon))
-
-## [14.7.0](https://github.com/expo/eas-cli/releases/tag/v14.7.0) - 2025-01-30
-
-### 🎉 New features
-
-- Add `--submit` and `-s` as aliases for `--auto-submit` flag. ([#2846](https://github.com/expo/eas-cli/pull/2846) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- Skip non-exempt check in non-interactive mode. ([#2849](https://github.com/expo/eas-cli/pull/2849) by [@EvanBacon](https://github.com/EvanBacon))
-
-## [14.6.0](https://github.com/expo/eas-cli/releases/tag/v14.6.0) - 2025-01-30
-
-### 🎉 New features
-
-- Prompt to set non-exempt encryption status for the iOS app to support faster store submissions. ([#2843](https://github.com/expo/eas-cli/pull/2843) by [@EvanBacon](https://github.com/EvanBacon))
-- Automatically create internal TestFlight group in EAS Submit command. ([#2839](https://github.com/expo/eas-cli/pull/2839) by [@evanbacon](https://github.com/evanbacon))
-- Sanitize and generate names for EAS Submit to prevent failures due to invalid characters or taken names. ([#2842](https://github.com/expo/eas-cli/pull/2842) by [@evanbacon](https://github.com/evanbacon))
-- Release `eas fingerprint:compare`. ([#2821](https://github.com/expo/eas-cli/pull/2821) by [@quinlanj](https://github.com/quinlanj))
-
-### 🧹 Chores
-
-- Make new autoIncremented builds start at nr 1 by default ([#2828](https://github.com/expo/eas-cli/pull/2828) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-## [14.5.0](https://github.com/expo/eas-cli/releases/tag/v14.5.0) - 2025-01-22
-
-### 🎉 New features
-
-- Allow filtering by `--fingerprint_hash` in `eas build:list` command. ([#2818](https://github.com/expo/eas-cli/pull/2818) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🐛 Bug fixes
-
-- Ensure that the AASA file is served with content type application/json ([#2829](https://github.com/expo/eas-cli/pull/2829) by [@kadikraman](https://github.com/kadikraman))
-- Ensure that the AppleID provided in prompt or saved to cache does not contain invalid unprintable characters ([#2830](https://github.com/expo/eas-cli/pull/2830) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-
-### 🧹 Chores
-
-- Fix logs typos in the `eas deploy` command. ([#2822](https://github.com/expo/eas-cli/pull/2822) by [@kadikraman](https://github.com/kadikraman))
-- Make `deploy` the top level command for hosting. ([#2824](https://github.com/expo/eas-cli/pull/2824) by [@kadikraman](https://github.com/kadikraman))
-- Allow longer submit profile extension chain (up to 5, same as build profile) ([#2831](https://github.com/expo/eas-cli/pull/2831) by [@radoslawkrzemien](https://github.com/radoslawkrzemien))
-- Make variable naming more explicit, remove deprecated runtimeFingerprintSource uses. ([#2816](https://github.com/expo/eas-cli/pull/2816) by [@wschurman](https://github.com/wschurman))
-
-## [14.4.1](https://github.com/expo/eas-cli/releases/tag/v14.4.1) - 2025-01-15
-
-### 🐛 Bug fixes
-
-- Enable shell execution for env:exec commands. ([#2788](https://github.com/expo/eas-cli/pull/2788) by [@tharakadesilva](https://github.com/tharakadesilva))
-
-### 🧹 Chores
-
-- Make automatic env resolution message shorter. ([#2806](https://github.com/expo/eas-cli/pull/2806) by [@szdziedzic](https://github.com/szdziedzic))
-- Make "No remote versions are configured" message green instead of yellow. ([#2805](https://github.com/expo/eas-cli/pull/2805) by [@szdziedzic](https://github.com/szdziedzic))
-- Upload local fingerprint on `eas fingerprint:compare`. ([#2808](https://github.com/expo/eas-cli/pull/2808) by [@quinlanj](https://github.com/quinlanj))
-- Upgrade `eas-cli-local-build-plugin` to `1.0.163` to support Bun's new text-based lock file in local builds. ([#2817](https://github.com/expo/eas-cli/pull/2817) by [@shiroyasha9](https://github.com/shiroyasha9))
-
-## [14.4.0](https://github.com/expo/eas-cli/releases/tag/v14.4.0) - 2025-01-09
-
-### 🎉 New features
-
-- Load `.env` variables even when `--environment` is specified for `deploy` command. Conflicts will be highlighted by a warning message. ([#2783](https://github.com/expo/eas-cli/pull/2783) by [@kitten](https://github.com/kitten))
-- Silence all non-command output in non-interactive mode of eas env:exec. ([#2800](https://github.com/expo/eas-cli/pull/2800) by [@wschurman](https://github.com/wschurman))
-- Unhide `deploy` and `deploy:alias` commands ([#2807](https://github.com/expo/eas-cli/pull/2807) by [@kitten](https://github.com/kitten))
-
-## [14.3.1](https://github.com/expo/eas-cli/releases/tag/v14.3.1) - 2025-01-08
-
-### 🧹 Chores
-
-- Bump `@expo/[email protected]` to support Bun text-based lock files. ([#2801](https://github.com/expo/eas-cli/pull/2801) by [@kudo](https://github.com/kudo))
-
-## [14.3.0](https://github.com/expo/eas-cli/releases/tag/v14.3.0) - 2025-01-07
-
-### 🎉 New features
-
-- Upload `package.json` when uploading workflow sources. ([#2786](https://github.com/expo/eas-cli/pull/2786) by [@sjchmiela](https://github.com/sjchmiela))
+- Added support to read platform version from `app.json`. ([#2778](https://github.com/expo/eas-cli/pull/2778) by [@kudo](https://github.com/kudo))
 
 ### 🐛 Bug fixes
 
 - Show `eas deploy` upload error messages. ([#2771](https://github.com/expo/eas-cli/pull/2771) by [@kadikraman](https://github.com/kadikraman))
-- Prevent EAS CLI dependencies check from running repeatedly. ([#2781](https://github.com/expo/eas-cli/pull/2781) by [@kitten](https://github.com/kitten))
-- Prevent optimistic request body parsing for `eas deploy`. ([#2784](https://github.com/expo/eas-cli/pull/2784) by [@kadikraman](https://github.com/kadikraman))
 
 ### 🧹 Chores
 
-- Update log output for `worker` deploy and alias commands. ([#2780](https://github.com/expo/eas-cli/pull/2780) by [@kitten](https://github.com/kitten))
-- Update various messages wording. ([#2790](https://github.com/expo/eas-cli/pull/2790) by [@simek](https://github.com/simek))
-- Use node18 as tsconfig base. ([#2739](https://github.com/expo/eas-cli/pull/2739) by [@quinlanj](https://github.com/quinlanj))
-
 ## [14.2.0](https://github.com/expo/eas-cli/releases/tag/v14.2.0) - 2024-12-13
 
 ### 🎉 New features
 
 - Add `eas deploy --dry-run` flag to output tarball. ([#2761](https://github.com/expo/eas-cli/pull/2761) by [@kitten](https://github.com/kitten))
-- Allow specifying credentials for android builds. ([#2775](https://github.com/expo/eas-cli/pull/2775) by [@khamilowicz](https://github.com/khamilowicz))
 
 ### 🐛 Bug fixes
 

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
-  "version": "16.17.2",
+  "version": "14.2.0",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json"
 }

package.json

@@ -28,7 +28,7 @@
     "eslint-plugin-node": "11.1.0",
     "jest": "29.7.0",
     "jest-watch-typeahead": "2.2.2",
-    "lerna": "8.2.3",
+    "lerna": "7.4.2",
     "oclif": "^3.9.0",
     "prettier": "3.1.1",
     "ts-jest": "29.1.1",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

packages/eas-cli/__mocks__/fs.ts

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

packages/eas-cli/graphql-codegen.yml

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

packages/eas-cli/package.json

@@ -1,25 +1,25 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.17.2",
+  "version": "14.2.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "2.1.12",
+    "@expo/apple-utils": "2.1.5",
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "1.0.173",
-    "@expo/eas-json": "16.13.2",
-    "@expo/env": "^1.0.0",
+    "@expo/eas-build-job": "1.0.156",
+    "@expo/eas-json": "14.2.0",
+    "@expo/env": "^0.4.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",
     "@expo/multipart-body-parser": "2.0.0",
     "@expo/osascript": "2.1.4",
-    "@expo/package-manager": "1.7.0",
+    "@expo/package-manager": "1.6.1",
     "@expo/pkcs12": "0.1.3",
     "@expo/plist": "0.2.0",
     "@expo/plugin-help": "5.1.23",
@@ -28,7 +28,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.173",
+    "@expo/steps": "1.0.156",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -38,7 +38,6 @@
     "ajv": "8.11.0",
     "ajv-formats": "2.1.1",
     "better-opn": "3.0.2",
-    "bplist-parser": "^0.3.0",
     "chalk": "4.1.2",
     "cli-progress": "3.12.0",
     "dateformat": "4.6.3",
@@ -49,7 +48,7 @@
     "fast-deep-equal": "3.1.3",
     "fast-glob": "3.3.2",
     "figures": "3.2.0",
-    "form-data": "^4.0.4",
+    "form-data": "4.0.0",
     "fs-extra": "11.2.0",
     "getenv": "1.0.0",
     "gradle-to-js": "2.0.1",
@@ -69,7 +68,6 @@
     "nanoid": "3.3.8",
     "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
-    "node-stream-zip": "1.15.0",
     "nullthrows": "1.1.1",
     "ora": "5.1.0",
     "pkg-dir": "4.2.0",
@@ -80,7 +78,6 @@
     "qrcode-terminal": "0.12.0",
     "resolve-from": "5.0.0",
     "semver": "7.5.4",
-    "set-interval-async": "3.0.3",
     "slash": "3.0.0",
     "tar": "6.2.1",
     "tar-stream": "3.1.7",
@@ -98,7 +95,6 @@
     "@graphql-codegen/introspection": "4.0.0",
     "@graphql-codegen/typescript": "4.0.1",
     "@graphql-codegen/typescript-operations": "4.0.1",
-    "@tsconfig/node18": "18.2.4",
     "@types/cli-progress": "3.11.5",
     "@types/dateformat": "3.0.1",
     "@types/diff": "6.0.0",
@@ -108,7 +104,7 @@
     "@types/getenv": "^1.0.0",
     "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
-    "@types/node-fetch": "2.6.12",
+    "@types/node-fetch": "2.6.2",
     "@types/node-forge": "1.3.1",
     "@types/pngjs": "6.0.4",
     "@types/promise-retry": "1.1.3",
@@ -119,7 +115,7 @@
     "@types/tough-cookie": "4.0.2",
     "@types/uuid": "9.0.7",
     "@types/wrap-ansi": "3.0.0",
-    "axios": "1.11.0",
+    "axios": "0.28.1",
     "eslint-plugin-graphql": "4.0.0",
     "express": "4.20.0",
     "memfs": "3.4.13",
@@ -234,7 +230,6 @@
     "test": "jest",
     "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "verify-graphql-code": "./scripts/verify-graphql.sh",
     "clean": "rimraf dist build tmp node_modules yarn-error.log"
   },
   "volta": {

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

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-function cleanup()
-{
-  echo 'Cleaning up...'
-  rm -f graphql.schema.json.bak src/graphql/generated.ts.bak
-}
-
-# Fail if anything errors
-set -eox pipefail
-# If this script exits, trap it first and clean up
-trap cleanup EXIT
-
-cp graphql.schema.json graphql.schema.json.bak
-cp src/graphql/generated.ts src/graphql/generated.ts.bak
-
-yarn generate-graphql-code
-if cmp -s graphql.schema.json graphql.schema.json.bak; then
-    echo "GraphQL schema is up-to-date"
-    if cmp -s src/graphql/generated.ts src/graphql/generated.ts.bak; then
-        echo "GraphQL generated code is up-to-date"
-        exit 0
-    else
-        echo "GraphQL code has changed but has not been regenerated. Run `yarn generate-graphql-code` and commit the changes."
-        exit 1
-    fi
-else
-    echo "GraphQL schema has changed on the server. Running `yarn tsc` to check for breaking changes..."
-    yarn tsc
-    # If there are no errors, then the schema is backwards compatible
-    exit 0
-fi

packages/eas-cli/src/ApiV2Error.ts

@@ -6,7 +6,6 @@ export class ApiV2Error extends Error {
   readonly expoApiV2ErrorDetails?: JSONValue;
   readonly expoApiV2ErrorServerStack?: string;
   readonly expoApiV2ErrorMetadata?: object;
-  readonly expoApiV2ErrorRequestId?: string;
 
   constructor(response: {
     message: string;
@@ -14,13 +13,11 @@ export class ApiV2Error extends Error {
     stack?: string;
     details?: JSONValue;
     metadata?: object;
-    requestId?: string;
   }) {
     super(response.message);
     this.expoApiV2ErrorCode = response.code;
     this.expoApiV2ErrorDetails = response.details;
     this.expoApiV2ErrorServerStack = response.stack;
     this.expoApiV2ErrorMetadata = response.metadata;
-    this.expoApiV2ErrorRequestId = response.requestId;
   }
 }

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

@@ -16,7 +16,6 @@ describe(ApiV2Client, () => {
             stack: 'line 1: hello',
             details: { who: 'world' },
             metadata: { an: 'object' },
-            requestId: 'request-id',
           },
         ],
       });
@@ -38,7 +37,6 @@ describe(ApiV2Client, () => {
     expect(error.expoApiV2ErrorDetails).toEqual({ who: 'world' });
     expect(error.expoApiV2ErrorMetadata).toEqual({ an: 'object' });
     expect(error.expoApiV2ErrorServerStack).toEqual('line 1: hello');
-    expect(error.expoApiV2ErrorRequestId).toEqual('request-id');
   });
 
   it('does not convert non-APIv2 error to ApiV2Error', async () => {

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

@@ -7,16 +7,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { ContextInput, ContextOutput } from '../../commandUtils/EasCommand';
 import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
-import {
-  AppFragment,
-  Role,
-  WorkflowJobStatus,
-  WorkflowJobType,
-  WorkflowRunByIdWithJobsQuery,
-  WorkflowRunFragment,
-  WorkflowRunStatus,
-  WorkflowRunTriggerEventType,
-} from '../../graphql/generated';
+import { AppFragment, Role } from '../../graphql/generated';
 
 export function getMockEasJson(): EasJson {
   return {
@@ -90,9 +81,7 @@ export function mockCommandContext<
     if (contextKey === 'loggedIn') {
       result.loggedIn = {};
     }
-    if (contextKey === 'projectId') {
-      result.projectId = overrides.projectId ?? mockProjectId;
-    }
+
     if (contextKey === 'projectDir') {
       result.projectDir = projectDir;
     }
@@ -179,129 +168,3 @@ export function withLocalVersionSource(easJson: EasJson): EasJson {
     },
   };
 }
-
-export function getMockEmptyWorkflowRunsFragment(): WorkflowRunFragment[] {
-  return getMockWorkflowRunsFragment();
-}
-
-export function getMockWorkflowRunsFragment(
-  params?:
-    | undefined
-    | {
-        successes?: number;
-        failures?: number;
-        pending?: number;
-        withJobs?: number;
-      }
-): WorkflowRunFragment[] {
-  const { successes = 0, failures = 0, pending = 0, withJobs = 0 } = params ?? {};
-  const runs: any[] = [];
-  for (let i = 0; i < successes; i++) {
-    runs.push({
-      id: `success-${i}`,
-      status: WorkflowRunStatus.Success,
-      errors: [],
-      createdAt: '2022-01-01T00:00:00.000Z',
-      updatedAt: '2022-01-01T00:00:00.000Z',
-      gitCommitHash: '1234567890',
-      gitCommitMessage: 'commit message',
-      workflow: {
-        name: 'build',
-        id: 'build',
-        fileName: 'build.yml',
-      },
-    });
-  }
-  for (let i = 0; i < failures; i++) {
-    runs.push({
-      id: `failure-${i}`,
-      errors: ['Failed'],
-      status: WorkflowRunStatus.Failure,
-      createdAt: '2022-01-01T00:00:00.000Z',
-      updatedAt: '2022-01-01T00:00:00.000Z',
-      gitCommitHash: '1234567890',
-      gitCommitMessage: 'commit message',
-      workflow: {
-        name: 'build',
-        id: 'build',
-        fileName: 'build.yml',
-      },
-    });
-  }
-  for (let i = 0; i < pending; i++) {
-    runs.push({
-      id: `pending-${i}`,
-      errors: [],
-      status: WorkflowRunStatus.InProgress,
-      createdAt: '2022-01-01T00:00:00.000Z',
-      updatedAt: '2022-01-01T00:00:00.000Z',
-      gitCommitHash: '1234567890',
-      gitCommitMessage: 'commit message',
-      workflow: {
-        name: 'build',
-        id: 'build',
-        fileName: 'build.yml',
-      },
-    });
-  }
-  for (let i = 0; i < withJobs; i++) {
-    runs.push(getMockWorkflowRunWithJobsFragment());
-  }
-  return runs;
-}
-
-export function getMockWorkflowJobFragment(
-  runId?: string
-): WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number] {
-  return {
-    id: 'job1',
-    key: 'job1',
-    name: 'job1',
-    status: WorkflowJobStatus.Success,
-    type: WorkflowJobType.Build,
-    createdAt: '2022-01-01T00:00:00.000Z',
-    updatedAt: '2022-01-01T00:00:00.000Z',
-    outputs: {},
-    errors: [],
-    workflowRun: {
-      id: runId ?? 'build1',
-    },
-    turtleJobRun: {
-      id: 'job1',
-      logFileUrls: ['https://example.com/log1'],
-      errors: [],
-    },
-  };
-}
-
-export function getMockWorkflowRunWithJobsFragment(
-  runID?: string
-): WorkflowRunByIdWithJobsQuery['workflowRuns']['byId'] {
-  const id = runID ?? 'build1';
-  return {
-    id,
-    status: WorkflowRunStatus.Failure,
-    triggerEventType: WorkflowRunTriggerEventType.Manual,
-    createdAt: '2022-01-01T00:00:00.000Z',
-    updatedAt: '2022-01-01T00:00:00.000Z',
-    gitCommitHash: '1234567890',
-    gitCommitMessage: 'commit message',
-    errors: [],
-    workflow: {
-      id: 'build',
-      name: 'build',
-      fileName: 'build.yml',
-      app: {
-        id: mockProjectId,
-        __typename: 'App',
-        name: 'App',
-        ownerAccount: {
-          id: 'account-id',
-          name: 'account-name',
-          __typename: 'Account',
-        },
-      },
-    },
-    jobs: [getMockWorkflowJobFragment(id)],
-  };
-}

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

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

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

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

packages/eas-cli/src/api.ts

@@ -95,11 +95,7 @@ export function getExpoWebsiteBaseUrl(): string {
   }
 }
 
-export function getEASUpdateURL(projectId: string, manifestHostOverride: string | null): string {
-  if (manifestHostOverride) {
-    return new URL(projectId, `https://${manifestHostOverride}`).href;
-  }
-
+export function getEASUpdateURL(projectId: string): string {
   if (process.env.EXPO_STAGING) {
     return new URL(projectId, `https://staging-u.expo.dev`).href;
   } else if (process.env.EXPO_LOCAL) {

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

@@ -38,7 +38,7 @@ describe(ensureProjectConfiguredAsync, () => {
       }),
     });
     await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeTruthy();
-    const vcsClientMock = jest.mocked(new GitClient({ requireCommit: false }));
+    const vcsClientMock = jest.mocked(new GitClient());
     vcsClientMock.showChangedFilesAsync.mockImplementation(async () => {});
     vcsClientMock.isCommitRequiredAsync.mockImplementation(async () => false);
     vcsClientMock.trackFileAsync.mockImplementation(async () => {});
@@ -60,7 +60,7 @@ describe(ensureProjectConfiguredAsync, () => {
       });
     });
     await expect(fs.pathExists(EasJsonAccessor.formatEasJsonPath('.'))).resolves.toBeFalsy();
-    const vcsClientMock = jest.mocked(new GitClient({ requireCommit: false }));
+    const vcsClientMock = jest.mocked(new GitClient());
     vcsClientMock.showChangedFilesAsync.mockImplementation(async () => {});
     vcsClientMock.isCommitRequiredAsync.mockImplementation(async () => false);
     vcsClientMock.trackFileAsync.mockImplementation(async () => {});

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

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

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

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

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

@@ -1,7 +1,6 @@
 import { Android, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import { AppVersionSource } from '@expo/eas-json';
 import chalk from 'chalk';
-import getenv from 'getenv';
 import nullthrows from 'nullthrows';
 
 import { transformJob } from './graphql';
@@ -13,7 +12,7 @@ import AndroidCredentialsProvider, {
 } from '../../credentials/android/AndroidCredentialsProvider';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
@@ -66,10 +65,6 @@ This means that it will most likely produce an AAB and you will not be able to i
     ctx.vcsClient
   );
 
-  if (gradleContext?.buildType) {
-    maybeWarnAboutNonStandardBuildType({ buildProfile, buildType: gradleContext.buildType });
-  }
-
   if (ctx.workflow === Workflow.MANAGED) {
     await ensureApplicationIdIsDefinedForManagedProjectAsync(ctx);
   }
@@ -156,7 +151,6 @@ async function ensureAndroidCredentialsAsync(
     ctx.android.gradleContext
   );
   const provider = new AndroidCredentialsProvider(ctx.credentialsCtx, {
-    name: ctx.buildProfile.keystoreName,
     app: {
       account: nullthrows(
         ctx.user.accounts.find(a => a.name === ctx.accountName),
@@ -173,38 +167,3 @@ async function ensureAndroidCredentialsAsync(
     source: credentialsSource,
   };
 }
-
-export function maybeWarnAboutNonStandardBuildType({
-  buildProfile,
-  buildType,
-}: {
-  buildProfile: Pick<CommonContext<Platform.ANDROID>['buildProfile'], 'gradleCommand'>;
-  buildType: string;
-}): void {
-  const shouldSuppressWarning = getenv.boolish('EAS_BUILD_NO_GRADLE_BUILD_TYPE_WARNING', false);
-
-  if (shouldSuppressWarning) {
-    return;
-  }
-
-  const knownValidBuildTypes = ['debug', 'release'];
-  if (!knownValidBuildTypes.includes(buildType)) {
-    Log.warn(
-      `Custom gradle command "${chalk.bold(
-        buildProfile.gradleCommand
-      )}" has non-standard build type: "${chalk.bold(
-        buildType
-      )}". Expected the command to end with "${chalk.bold('...Debug')}" or "${chalk.bold(
-        '...Release'
-      )}"`
-    );
-    Log.warn(
-      `Ensure the command is spelled correctly and ${chalk.bold(
-        'build.gradle'
-      )} is configured correctly. To suppress this warning, set ${chalk.bold(
-        'EAS_BUILD_NO_GRADLE_BUILD_TYPE_WARNING=true'
-      )}.`
-    );
-    Log.warn(learnMore('https://developer.android.com/build/build-variants#build-types'));
-  }
-}

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

@@ -8,7 +8,6 @@ import {
   transformProjectArchive,
   transformWorkflow,
 } from '../graphql';
-import { buildProfileEnvironmentToEnvironment } from '../utils/environment';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {
@@ -30,7 +29,6 @@ export function transformJob(job: Android.Job): AndroidJobInput {
     experimental: job.experimental,
     mode: transformBuildMode(job.mode),
     customBuildConfig: job.customBuildConfig,
-    environment: buildProfileEnvironmentToEnvironment(job.environment),
     loggerLevel: job.loggerLevel
       ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
       : undefined,

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

@@ -12,7 +12,7 @@ import slash from 'slash';
 
 import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
 import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
-import { getUsernameForBuildMetadataAndBuildJob } from '../../project/projectUtils';
+import { getUsername } from '../../project/projectUtils';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -29,7 +29,7 @@ export async function prepareJobAsync(
   ctx: BuildContext<Platform.ANDROID>,
   jobData: JobData
 ): Promise<Android.Job> {
-  const username = getUsernameForBuildMetadataAndBuildJob(ctx.user);
+  const username = getUsername(ctx.exp, ctx.user);
   const buildProfile: BuildProfile<Platform.ANDROID> = ctx.buildProfile;
   const projectRootDirectory =
     slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
@@ -57,7 +57,9 @@ export async function prepareJobAsync(
     : undefined;
 
   let buildMode;
-  if (buildProfile.config) {
+  if (ctx.repack) {
+    buildMode = BuildMode.REPACK;
+  } else if (buildProfile.config) {
     buildMode = BuildMode.CUSTOM;
   } else {
     buildMode = BuildMode.BUILD;
@@ -71,15 +73,11 @@ export async function prepareJobAsync(
     builderEnvironment: {
       image: buildProfile.image,
       node: buildProfile.node,
-      corepack: buildProfile.corepack,
       pnpm: buildProfile.pnpm,
       bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       ndk: buildProfile.ndk,
-      env: {
-        ...buildProfile.env,
-        ...(ctx.isVerboseLoggingEnabled ? { EAS_VERBOSE: '1' } : {}),
-      },
+      env: buildProfile.env,
     },
     cache: {
       ...cacheDefaults,
@@ -94,7 +92,6 @@ export async function prepareJobAsync(
     gradleCommand: buildProfile.gradleCommand,
     applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
     buildArtifactPaths: buildProfile.buildArtifactPaths,
-    environment: ctx.buildProfile.environment,
     buildType,
     username,
     ...(ctx.android.versionCodeOverride && {
@@ -112,6 +109,11 @@ export async function prepareJobAsync(
         path: maybeCustomBuildConfigPath,
       },
     }),
+    ...(ctx.repack && {
+      customBuildConfig: {
+        path: '__eas/repack.yml',
+      },
+    }),
     loggerLevel: ctx.loggerLevel,
     // Technically, these are unused, but let's include them here for type consistency.
     // See: https://github.com/expo/eas-build/pull/454

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

@@ -20,7 +20,11 @@ import { getNextVersionCode } from '../../project/android/versions';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
+import {
+  bumpAppVersionAsync,
+  ensureStaticConfigExists,
+  getVersionConfigTarget,
+} from '../utils/version';
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -53,9 +57,11 @@ export async function bumpVersionAsync({
 
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
+  const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.ANDROID });
+  const version = versionGetter(exp);
   await updateNativeVersionsAsync({
     projectDir,
-    version: exp.version,
+    version,
     versionCode: exp.android?.versionCode,
   });
   Log.log('Synchronized versions with build gradle');
@@ -79,7 +85,7 @@ export async function bumpVersionInAppJsonAsync({
 
   if (bumpStrategy === BumpStrategy.APP_VERSION) {
     const appVersion = AndroidConfig.Version.getVersionName(exp) ?? '1.0.0';
-    await bumpAppVersionAsync({ appVersion, projectDir, exp });
+    await bumpAppVersionAsync({ appVersion, projectDir, exp, platform: Platform.ANDROID });
   } else {
     const versionCode = AndroidConfig.Version.getVersionCode(exp);
     const bumpedVersionCode = getNextVersionCode(versionCode);
@@ -99,7 +105,7 @@ export async function maybeResolveVersionsAsync(
   exp: ExpoConfig,
   buildProfile: BuildProfile<Platform.ANDROID>,
   vcsClient: Client
-): Promise<{ appVersion?: string; appBuildVersion?: string; isVersionInitialized?: boolean }> {
+): Promise<{ appVersion?: string; appBuildVersion?: string }> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.ANDROID, vcsClient);
   if (workflow === Workflow.GENERIC) {
     const buildGradle = await getAppBuildGradleAsync(projectDir);
@@ -113,19 +119,16 @@ export async function maybeResolveVersionsAsync(
           resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
-        isVersionInitialized: !resolveConfigValue(
-          buildGradle,
-          'versionCode',
-          parsedGradleCommand?.flavor
-        ),
       };
     } catch {
       return {};
     }
   } else {
+    const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.ANDROID });
+    const appVersion = versionGetter(exp);
     return {
       appBuildVersion: String(AndroidConfig.Version.getVersionCode(exp)),
-      appVersion: exp.version,
+      appVersion,
     };
   }
 }
@@ -207,20 +210,17 @@ export async function resolveRemoteVersionCodeAsync(
     applicationId
   );
 
+  const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.ANDROID });
   const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
   let currentBuildVersion: string;
-  let shouldInitializeVersionCode = false;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
   } else {
     if (localVersions.appBuildVersion) {
-      Log.log(
-        chalk.green(
-          'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
-        )
+      Log.warn(
+        'No remote versions are configured for this project, versionCode will be initialized based on the value from the local project.'
       );
       currentBuildVersion = localVersions.appBuildVersion;
-      shouldInitializeVersionCode = localVersions.isVersionInitialized ?? false;
     } else {
       Log.error(
         `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
@@ -230,10 +230,7 @@ export async function resolveRemoteVersionCodeAsync(
   }
   if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
     return currentBuildVersion;
-  } else if (
-    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
-    shouldInitializeVersionCode
-  ) {
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
     const spinner = ora(
       `Initializing versionCode with ${chalk.bold(currentBuildVersion)}.`
     ).start();
@@ -242,7 +239,7 @@ export async function resolveRemoteVersionCodeAsync(
         appId: projectId,
         platform: AppPlatform.Android,
         applicationIdentifier: applicationId,
-        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
+        storeVersion: localVersions.appVersion ?? versionGetter(exp) ?? '1.0.0',
         buildVersion: currentBuildVersion,
         runtimeVersion:
           (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??
@@ -266,7 +263,7 @@ export async function resolveRemoteVersionCodeAsync(
         appId: projectId,
         platform: AppPlatform.Android,
         applicationIdentifier: applicationId,
-        storeVersion: localVersions.appVersion ?? exp.version ?? '1.0.0',
+        storeVersion: localVersions.appVersion ?? versionGetter(exp) ?? '1.0.0',
         buildVersion: String(nextBuildVersion),
         runtimeVersion:
           (await Updates.getRuntimeVersionNullableAsync(projectDir, exp, Platform.ANDROID)) ??

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

@@ -35,10 +35,8 @@ import { collectMetadataAsync } from './metadata';
 import { printDeprecationWarnings } from './utils/printBuildInfo';
 import {
   LocalFile,
-  assertProjectTarballSizeDoesNotExceedLimit,
   makeProjectMetadataFileAsync,
   makeProjectTarballAsync,
-  maybeWarnAboutProjectTarballSize,
   reviewAndCommitChangesAsync,
 } from './utils/repository';
 import { BuildEvent } from '../analytics/AnalyticsManager';
@@ -46,7 +44,6 @@ import { withAnalyticsAsync } from '../analytics/common';
 import { getExpoWebsiteBaseUrl } from '../api';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { EasCommandError } from '../commandUtils/errors';
-import { createFingerprintAsync } from '../fingerprint/cli';
 import {
   AppPlatform,
   BuildFragment,
@@ -69,6 +66,7 @@ import { maybeUploadFingerprintAsync } from '../project/maybeUploadFingerprintAs
 import { resolveRuntimeVersionAsync } from '../project/resolveRuntimeVersionAsync';
 import { uploadFileAtPathToGCSAsync } from '../uploads';
 import { formatBytes } from '../utils/files';
+import { createFingerprintAsync } from '../utils/fingerprintCli';
 import { printJsonOnlyOutput } from '../utils/json';
 import { createProgressTracker } from '../utils/progress';
 import { sleepAsync } from '../utils/promise';
@@ -277,8 +275,19 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         );
         const projectTarball = await makeProjectTarballAsync(ctx.vcsClient);
 
-        maybeWarnAboutProjectTarballSize(projectTarball.size);
-        assertProjectTarballSizeDoesNotExceedLimit(projectTarball.size);
+        if (projectTarball.size > 1024 * 1024 * 100) {
+          Log.warn(
+            `Your project archive is ${formatBytes(
+              projectTarball.size
+            )}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk.bold(
+              '.easignore'
+            )} file. ${learnMore('https://expo.fyi/eas-build-archive')}`
+          );
+        }
+
+        if (projectTarball.size > 2 * 1024 * 1024 * 1024) {
+          throw new Error('Project archive is too big. Maximum allowed size is 2GB.');
+        }
 
         projectTarballPath = projectTarball.path;
         const [bucketKey, { metadataLocation }] = await Promise.all([
@@ -500,7 +509,11 @@ async function handleSingleBuildProgressAsync(
         if (build.priority !== BuildPriority.High) {
           Log.newLine();
           Log.log('Start builds sooner in the priority queue.');
-          Log.log(`Sign up for a paid plan at ${link(formatAccountBillingUrl(accountName))}`);
+          Log.log(
+            `Sign up for EAS Production or Enterprise at ${link(
+              formatAccountBillingUrl(accountName)
+            )}`
+          );
         }
 
         Log.newLine();
@@ -696,10 +709,7 @@ async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Pl
    * It's ok for fingerprintSources or runtimeVersion to be empty
    * fingerprintSources only exist if the project is using runtimeVersion.policy: fingerprint
    */
-  if (
-    !resolvedRuntimeVersion.expoUpdatesRuntimeFingerprint ||
-    !resolvedRuntimeVersion.runtimeVersion
-  ) {
+  if (!resolvedRuntimeVersion.fingerprint || !resolvedRuntimeVersion.runtimeVersion) {
     return {
       runtimeVersion: resolvedRuntimeVersion.runtimeVersion ?? undefined,
     };
@@ -707,14 +717,14 @@ async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Pl
 
   const uploadedFingerprint = await maybeUploadFingerprintAsync({
     hash: resolvedRuntimeVersion.runtimeVersion,
-    fingerprint: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprint,
+    fingerprint: resolvedRuntimeVersion.fingerprint,
     graphqlClient: ctx.graphqlClient,
     localBuildMode: ctx.localBuildOptions.localBuildMode,
   });
   return {
     runtimeVersion: uploadedFingerprint.hash,
     fingerprintSource: uploadedFingerprint.fingerprintSource,
-    fingerprintHash: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprintHash ?? undefined,
+    fingerprintHash: resolvedRuntimeVersion.fingerprintHash ?? undefined,
   };
 }
 

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

@@ -4,7 +4,6 @@ import fs from 'fs-extra';
 
 import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 import Log, { learnMore } from '../log';
-import { ora } from '../ora';
 import { easCliVersion } from '../utils/easCli';
 import { Client } from '../vcs/vcs';
 
@@ -53,78 +52,6 @@ async function configureAsync({
   }
 }
 
-export async function doesBuildProfileExistAsync({
-  projectDir,
-  profileName,
-}: {
-  projectDir: string;
-  profileName: string;
-}): Promise<boolean> {
-  try {
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    const easJson = await easJsonAccessor.readRawJsonAsync();
-    if (!easJson.build?.[profileName]) {
-      return false;
-    }
-    return true;
-  } catch (error) {
-    Log.error(`We were unable to read ${chalk.bold('eas.json')} contents. Error: ${error}.`);
-    throw error;
-  }
-}
-
-export async function createBuildProfileAsync({
-  projectDir,
-  profileName,
-  profileContents,
-  vcsClient,
-  nonInteractive,
-}: {
-  projectDir: string;
-  profileName: string;
-  profileContents: Record<string, any>;
-  vcsClient: Client;
-  nonInteractive: boolean;
-}): Promise<void> {
-  const spinner = ora(`Adding "${profileName}" build profile to ${chalk.bold('eas.json')}`).start();
-  try {
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    await easJsonAccessor.readRawJsonAsync();
-
-    easJsonAccessor.patch(easJsonRawObject => {
-      return {
-        ...easJsonRawObject,
-        build: {
-          ...easJsonRawObject.build,
-          [profileName]: profileContents,
-        },
-      };
-    });
-    await easJsonAccessor.writeAsync();
-    spinner.succeed(
-      `Successfully added "${profileName}" build profile to ${chalk.bold('eas.json')}.`
-    );
-
-    if (await vcsClient.isCommitRequiredAsync()) {
-      Log.newLine();
-      await reviewAndCommitChangesAsync(
-        vcsClient,
-        `Add "${profileName}" build profile to eas.json`,
-        {
-          nonInteractive,
-        }
-      );
-    }
-  } catch (error) {
-    spinner.fail(
-      `We were not able to configure "${profileName}" build profile inside of ${chalk.bold(
-        'eas.json'
-      )}. Error: ${error}.`
-    );
-    throw error;
-  }
-}
-
 const EAS_JSON_DEFAULT: EasJson = {
   cli: {
     version: `>= ${easCliVersion}`,

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

@@ -62,7 +62,6 @@ export interface BuildContext<T extends Platform> {
   requiredPackageManager: NodePackageManager['name'] | null;
   vcsClient: Client;
   loggerLevel?: LoggerLevel;
-  isVerboseLoggingEnabled: boolean;
-  whatToTest?: string;
+  repack: boolean;
   env: Record<string, string>;
 }

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

@@ -42,8 +42,7 @@ export async function createBuildContextAsync<T extends Platform>({
   customBuildConfigMetadata,
   buildLoggerLevel,
   freezeCredentials,
-  isVerboseLoggingEnabled,
-  whatToTest,
+  repack,
   env,
 }: {
   buildProfileName: string;
@@ -65,8 +64,7 @@ export async function createBuildContextAsync<T extends Platform>({
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
   buildLoggerLevel?: LoggerLevel;
   freezeCredentials: boolean;
-  isVerboseLoggingEnabled: boolean;
-  whatToTest?: string;
+  repack: boolean;
   env: Record<string, string>;
 }): Promise<BuildContext<T>> {
   const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({
@@ -152,9 +150,8 @@ export async function createBuildContextAsync<T extends Platform>({
     developmentClient,
     requiredPackageManager,
     loggerLevel: buildLoggerLevel,
-    isVerboseLoggingEnabled,
+    repack,
     env,
-    whatToTest,
   };
   if (platform === Platform.ANDROID) {
     const common = commonContext as CommonContext<Platform.ANDROID>;

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

@@ -1,12 +1,17 @@
 import { Env } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 
-import { isEnvironment } from './utils/environment';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { EnvironmentVariableEnvironment } from '../graphql/generated';
 import { EnvironmentVariablesQuery } from '../graphql/queries/EnvironmentVariablesQuery';
 import Log, { learnMore } from '../log';
 
+function isEnvironment(env: string): env is EnvironmentVariableEnvironment {
+  return Object.values(EnvironmentVariableEnvironment).includes(
+    env as EnvironmentVariableEnvironment
+  );
+}
+
 export async function evaluateConfigWithEnvVarsAsync<Config extends { projectId: string }, Opts>({
   buildProfile,
   buildProfileName,
@@ -79,13 +84,13 @@ async function resolveEnvVarsAsync({
 
     if (Object.keys(serverEnvVars).length > 0) {
       Log.log(
-        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
+        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
           serverEnvVars
         ).join(', ')}.`
       );
     } else {
       Log.log(
-        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
+        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS servers.`
       );
     }
 
@@ -107,7 +112,7 @@ async function resolveEnvVarsAsync({
       );
       if (overlappingKeys.length > 0) {
         Log.warn(
-          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS: ${overlappingKeys.join(
+          `The following environment variables are defined in both the "${buildProfileName}" build profile "env" configuration and the "${environment.toLowerCase()}" environment on EAS servers: ${overlappingKeys.join(
             ', '
           )}. The values from the build profile configuration will be used.`
         );
@@ -130,18 +135,23 @@ async function resolveEnvVarsAsync({
 function resolveSuggestedEnvironmentForBuildProfileConfiguration(
   buildProfile: BuildProfile
 ): EnvironmentVariableEnvironment {
-  const environment =
-    buildProfile.distribution === 'store'
-      ? EnvironmentVariableEnvironment.Production
-      : buildProfile.developmentClient
-        ? EnvironmentVariableEnvironment.Development
-        : EnvironmentVariableEnvironment.Preview;
-
-  Log.log(
-    `Resolved "${environment.toLowerCase()}" environment for the build. ${learnMore(
-      'https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds'
-    )}`
-  );
-
-  return environment;
+  const setEnvironmentMessage =
+    'Set the "environment" field in the build profile if you want to specify the environment manually.';
+  if (buildProfile.distribution === 'store') {
+    Log.log(
+      `We detected that you are building for the "store" distribution. Resolving the environment for environment variables used during the build to "production". ${setEnvironmentMessage}`
+    );
+    return EnvironmentVariableEnvironment.Production;
+  } else {
+    if (buildProfile.developmentClient) {
+      Log.log(
+        `We detected that you are building the development client. Resolving the environment for environment variables used during the build to "development". ${setEnvironmentMessage}`
+      );
+      return EnvironmentVariableEnvironment.Development;
+    }
+    Log.log(
+      `We detected that you are building for the "internal" distribution. Resolving the environment for environment variables used during the build to "preview". ${setEnvironmentMessage}`
+    );
+    return EnvironmentVariableEnvironment.Preview;
+  }
 }

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

@@ -1,19 +1,12 @@
 import { ExpoConfig } from '@expo/config';
 import { IOSConfig } from '@expo/config-plugins';
-import { IosBuildProfile } from '@expo/eas-json/build/build/types';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
-import { instance, mock } from 'ts-mockito';
 import type { XCBuildConfiguration } from 'xcode';
 
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { Target } from '../../../credentials/ios/types';
-import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
-import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
 import { readPlistAsync } from '../../../utils/plist';
 import { resolveVcsClient } from '../../../vcs';
-import { Client } from '../../../vcs/vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -22,23 +15,9 @@ import {
   getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
-  resolveRemoteBuildNumberAsync,
 } from '../version';
 
 jest.mock('fs');
-jest.mock('../../../commandUtils/context/contextUtils/createGraphqlClient');
-jest.mock('../../../vcs/vcs');
-jest.mock('../../../graphql/queries/AppVersionQuery');
-jest.mock('../../../graphql/mutations/AppVersionMutation');
-jest.mock('../../../ora', () => ({
-  ora: jest.fn().mockImplementation(() => ({
-    start: jest.fn().mockImplementation(() => ({
-      succeed: jest.fn(),
-      stop: jest.fn(),
-      fail: jest.fn(),
-    })),
-  })),
-}));
 
 const vcsClient = resolveVcsClient();
 
@@ -380,154 +359,6 @@ describe(getInfoPlistPath, () => {
   });
 });
 
-describe(resolveRemoteBuildNumberAsync, () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('uses current remote buildNumber when remote version set, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
-      buildVersion: '11',
-      storeVersion: '1.2.3',
-    });
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject();
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: {} as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('11');
-    expect(createAppVersionAsyncSpy).not.toHaveBeenCalled();
-  });
-
-  it('initializes buildNumber from local files when remote version not set, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: {} as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('22');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('22');
-  });
-
-  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=false', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: {} as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('1');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
-  });
-
-  it('increments current remote buildNumber when remote version set, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue({
-      buildVersion: '11',
-      storeVersion: '1.2.3',
-    });
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject();
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: { autoIncrement: true } as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('12');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('12');
-  });
-
-  it('increments buildNumber from local files when remote version not set, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '22', appVersion: '2.3.4' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: { autoIncrement: true } as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('23');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('2.3.4');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('23');
-  });
-
-  it('initializes buildNumber starting with 1 when remote version not set and local version is 1, autoIncrement=true', async () => {
-    const graphQLClientMock = instance(mock<ExpoGraphqlClient>());
-    const vcsClientMock = instance(mock<Client>());
-    vcsClientMock.getRootPathAsync = async () => '/app';
-    jest.mocked(AppVersionQuery.latestVersionAsync).mockResolvedValue(null);
-    const createAppVersionAsyncSpy = jest.spyOn(AppVersionMutation, 'createAppVersionAsync');
-    const exp = initBareWorkflowProject({ buildNumber: '1', appVersion: '1.0.0' });
-
-    const result = await resolveRemoteBuildNumberAsync(graphQLClientMock, {
-      projectDir: '/app',
-      projectId: 'fakeProjectId',
-      exp,
-      applicationTarget: {} as Target,
-      buildProfile: { autoIncrement: true } as IosBuildProfile,
-      vcsClient: vcsClientMock,
-    });
-
-    expect(result).toBe('1');
-    expect(createAppVersionAsyncSpy).toHaveBeenCalled();
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].storeVersion).toBe('1.0.0');
-    expect(createAppVersionAsyncSpy.mock.calls[0][1].buildVersion).toBe('1');
-  });
-});
-
 function initBareWorkflowProject({
   appVersion = '1.0.0',
   buildNumber = '1',

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

@@ -10,7 +10,6 @@ import { IosCredentials } from '../../credentials/ios/types';
 import { BuildParamsInput } from '../../graphql/generated';
 import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
 import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier';
-import { ensureNonExemptEncryptionIsDefinedForManagedProjectAsync } from '../../project/ios/exemptEncryption';
 import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
 import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
 import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
@@ -29,7 +28,6 @@ export async function createIosContextAsync(
 
   if (ctx.workflow === Workflow.MANAGED) {
     await ensureBundleIdentifierIsDefinedForManagedProjectAsync(ctx);
-    await ensureNonExemptEncryptionIsDefinedForManagedProjectAsync(ctx);
   }
 
   checkNodeEnvVariable(ctx);

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

@@ -9,7 +9,6 @@ import {
   transformProjectArchive,
   transformWorkflow,
 } from '../graphql';
-import { buildProfileEnvironmentToEnvironment } from '../utils/environment';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {
@@ -32,7 +31,6 @@ export function transformJob(job: Ios.Job): IosJobInput {
     experimental: job.experimental,
     mode: transformBuildMode(job.mode),
     customBuildConfig: job.customBuildConfig,
-    environment: buildProfileEnvironmentToEnvironment(job.environment),
     loggerLevel: job.loggerLevel
       ? loggerLevelToGraphQLWorkerLoggerLevel[job.loggerLevel]
       : undefined,

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

@@ -14,7 +14,7 @@ import slash from 'slash';
 import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
 import { IosJobSecretsInput } from '../../graphql/generated';
 import { getCustomBuildConfigPathForJob } from '../../project/customBuildConfig';
-import { getUsernameForBuildMetadataAndBuildJob } from '../../project/projectUtils';
+import { getUsername } from '../../project/projectUtils';
 import { BuildContext } from '../context';
 
 interface JobData {
@@ -32,7 +32,7 @@ export async function prepareJobAsync(
   ctx: BuildContext<Platform.IOS>,
   jobData: JobData
 ): Promise<Ios.Job> {
-  const username = getUsernameForBuildMetadataAndBuildJob(ctx.user);
+  const username = getUsername(ctx.exp, ctx.user);
   const buildProfile: BuildProfile<Platform.IOS> = ctx.buildProfile;
   const projectRootDirectory =
     slash(path.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
@@ -49,7 +49,9 @@ export async function prepareJobAsync(
     : undefined;
 
   let buildMode;
-  if (buildProfile.config) {
+  if (ctx.repack) {
+    buildMode = BuildMode.REPACK;
+  } else if (buildProfile.config) {
     buildMode = BuildMode.CUSTOM;
   } else {
     buildMode = BuildMode.BUILD;
@@ -63,17 +65,13 @@ export async function prepareJobAsync(
     builderEnvironment: {
       image: buildProfile.image,
       node: buildProfile.node,
-      corepack: buildProfile.corepack,
       pnpm: buildProfile.pnpm,
       bun: buildProfile.bun,
       yarn: buildProfile.yarn,
       bundler: buildProfile.bundler,
       cocoapods: buildProfile.cocoapods,
       fastlane: buildProfile.fastlane,
-      env: {
-        ...buildProfile.env,
-        ...(ctx.isVerboseLoggingEnabled ? { EAS_VERBOSE: '1' } : {}),
-      },
+      env: buildProfile.env,
     },
     cache: {
       ...cacheDefaults,
@@ -90,7 +88,6 @@ export async function prepareJobAsync(
     buildConfiguration: buildProfile.buildConfiguration,
     applicationArchivePath: buildProfile.applicationArchivePath ?? buildProfile.artifactPath,
     buildArtifactPaths: buildProfile.buildArtifactPaths,
-    environment: ctx.buildProfile.environment,
     username,
     ...(ctx.ios.buildNumberOverride && {
       version: {
@@ -107,6 +104,11 @@ export async function prepareJobAsync(
         path: maybeCustomBuildConfigPath,
       },
     }),
+    ...(ctx.repack && {
+      customBuildConfig: {
+        path: '__eas/repack.yml',
+      },
+    }),
     loggerLevel: ctx.loggerLevel,
     // Technically, these are unused, but let's include them here for type consistency.
     // See: https://github.com/expo/eas-build/pull/454

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

@@ -21,7 +21,11 @@ import uniqBy from '../../utils/expodash/uniqBy';
 import { readPlistAsync, writePlistAsync } from '../../utils/plist';
 import { Client } from '../../vcs/vcs';
 import { updateAppJsonConfigAsync } from '../utils/appJson';
-import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
+import {
+  bumpAppVersionAsync,
+  ensureStaticConfigExists,
+  getVersionConfigTarget,
+} from '../utils/version';
 
 const SHORT_VERSION_REGEX = /^\d+(\.\d+){0,2}$/;
 
@@ -48,9 +52,11 @@ export async function bumpVersionAsync({
   ensureStaticConfigExists(projectDir);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
+  const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.IOS });
+  const version = versionGetter(exp);
   await updateNativeVersionsAsync({
     projectDir,
-    version: exp.version,
+    version,
     buildNumber: exp.ios?.buildNumber,
     targets,
   });
@@ -73,7 +79,7 @@ export async function bumpVersionInAppJsonAsync({
   Log.addNewLineIfNone();
   if (bumpStrategy === BumpStrategy.APP_VERSION) {
     const appVersion = IOSConfig.Version.getVersion(exp);
-    await bumpAppVersionAsync({ appVersion, projectDir, exp });
+    await bumpAppVersionAsync({ appVersion, projectDir, exp, platform: Platform.IOS });
   } else {
     const buildNumber = IOSConfig.Version.getBuildNumber(exp);
     if (isValidBuildNumber(buildNumber)) {
@@ -141,8 +147,10 @@ export async function readShortVersionAsync(
     validateShortVersion({ shortVersion, workflow });
     return shortVersion;
   } else {
-    validateShortVersion({ shortVersion: exp.version, workflow });
-    return exp.version;
+    const { versionGetter } = getVersionConfigTarget({ exp, platform: Platform.IOS });
+    const shortVersion = versionGetter(exp);
+    validateShortVersion({ shortVersion, workflow });
+    return shortVersion;
   }
 }
 
@@ -330,18 +338,14 @@ export async function resolveRemoteBuildNumberAsync(
     vcsClient
   );
   let currentBuildVersion: string;
-  let shouldInitializeBuildNumber = false;
   if (remoteVersions?.buildVersion) {
     currentBuildVersion = remoteVersions.buildVersion;
   } else {
     if (localBuildNumber) {
-      Log.log(
-        chalk.green(
-          'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
-        )
+      Log.warn(
+        'No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.'
       );
       currentBuildVersion = localBuildNumber;
-      shouldInitializeBuildNumber = localBuildNumber === '1';
     } else {
       Log.error(
         `Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`
@@ -351,10 +355,7 @@ export async function resolveRemoteBuildNumberAsync(
   }
   if (!buildProfile.autoIncrement && remoteVersions?.buildVersion) {
     return currentBuildVersion;
-  } else if (
-    (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) ||
-    shouldInitializeBuildNumber
-  ) {
+  } else if (!buildProfile.autoIncrement && !remoteVersions?.buildVersion) {
     const spinner = ora(
       `Initializing buildNumber with ${chalk.bold(currentBuildVersion)}.`
     ).start();

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

@@ -7,7 +7,7 @@ import Log from '../log';
 import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '1.0.171';
+const PLUGIN_PACKAGE_VERSION = '1.0.152';
 
 export enum LocalBuildMode {
   /**

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

@@ -9,10 +9,7 @@ import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios
 import { LocalBuildMode } from './local';
 import { BuildDistributionType } from './types';
 import Log from '../log';
-import {
-  getUsernameForBuildMetadataAndBuildJob,
-  isExpoUpdatesInstalled,
-} from '../project/projectUtils';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
 import { readChannelSafelyAsync as readAndroidChannelSafelyAsync } from '../update/android/UpdatesModule';
 import { readChannelSafelyAsync as readIosChannelSafelyAsync } from '../update/ios/UpdatesModule';
 import { easCliVersion } from '../utils/easCli';
@@ -51,7 +48,7 @@ export async function collectMetadataAsync<T extends Platform>(
       ctx.localBuildOptions.localBuildMode === LocalBuildMode.INTERNAL
         ? false
         : await ctx.vcsClient.hasUncommittedChangesAsync(),
-    username: getUsernameForBuildMetadataAndBuildJob(ctx.user),
+    username: getUsername(ctx.exp, ctx.user),
     message: ctx.message,
     ...(ctx.platform === Platform.IOS && {
       iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
@@ -65,6 +62,7 @@ export async function collectMetadataAsync<T extends Platform>(
     requiredPackageManager: ctx.requiredPackageManager ?? undefined,
     selectedImage: ctx.buildProfile.image,
     customNodeVersion: ctx.buildProfile.node,
+    environment: ctx.buildProfile.environment,
     simulator: 'simulator' in ctx.buildProfile && ctx.buildProfile.simulator,
   };
   return sanitizeMetadata(metadata);

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

@@ -11,7 +11,6 @@ import {
 import { LoggerLevel } from '@expo/logger';
 import assert from 'assert';
 import chalk from 'chalk';
-import { pathExists } from 'fs-extra';
 import nullthrows from 'nullthrows';
 
 import { prepareAndroidBuildAsync } from './android/build';
@@ -63,7 +62,7 @@ import {
   validateBuildProfileVersionSettingsAsync,
 } from '../project/remoteVersionSource';
 import { confirmAsync } from '../prompts';
-import { getEasBuildRunCachedAppPath, runAsync } from '../run/run';
+import { runAsync } from '../run/run';
 import { isRunnableOnSimulatorOrEmulator } from '../run/utils';
 import { createSubmissionContextAsync } from '../submit/context';
 import {
@@ -97,33 +96,19 @@ export interface BuildFlags {
   message?: string;
   buildLoggerLevel?: LoggerLevel;
   freezeCredentials: boolean;
-  isVerboseLoggingEnabled?: boolean;
-  whatToTest?: string;
+  repack: boolean;
 }
 
-export async function runBuildAndSubmitAsync({
-  graphqlClient,
-  analytics,
-  vcsClient,
-  projectDir,
-  flags,
-  actor,
-  getDynamicPrivateProjectConfigAsync,
-  downloadSimBuildAutoConfirm,
-  envOverride,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  analytics: Analytics;
-  vcsClient: Client;
-  projectDir: string;
-  flags: BuildFlags;
-  actor: Actor;
-  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
-  downloadSimBuildAutoConfirm?: boolean;
-  envOverride?: Env;
-}): Promise<{
+export async function runBuildAndSubmitAsync(
+  graphqlClient: ExpoGraphqlClient,
+  analytics: Analytics,
+  vcsClient: Client,
+  projectDir: string,
+  flags: BuildFlags,
+  actor: Actor,
+  getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn
+): Promise<{
   buildIds: string[];
-  buildProfiles?: ProfileData<'build'>[];
 }> {
   await vcsClient.ensureRepoExistsAsync();
   await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
@@ -207,15 +192,13 @@ export async function runBuildAndSubmitAsync({
   for (const buildProfile of buildProfiles) {
     const platform = toAppPlatform(buildProfile.platform);
 
-    const { env } = !envOverride
-      ? await evaluateConfigWithEnvVarsAsync({
-          buildProfile: buildProfile.profile,
-          buildProfileName: buildProfile.profileName,
-          graphqlClient,
-          getProjectConfig: getDynamicPrivateProjectConfigAsync,
-          opts: { env: buildProfile.profile.env },
-        })
-      : { env: envOverride };
+    const { env } = await evaluateConfigWithEnvVarsAsync({
+      buildProfile: buildProfile.profile,
+      buildProfileName: buildProfile.profileName,
+      graphqlClient,
+      getProjectConfig: getDynamicPrivateProjectConfigAsync,
+      opts: { env: buildProfile.profile.env },
+    });
 
     const { build: maybeBuild, buildCtx } = await prepareAndStartBuildAsync({
       projectDir,
@@ -230,7 +213,6 @@ export async function runBuildAndSubmitAsync({
       getDynamicPrivateProjectConfigAsync,
       customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
       env,
-      easJsonAccessor,
     });
     if (maybeBuild) {
       startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -273,7 +255,7 @@ export async function runBuildAndSubmitAsync({
           ({ platform }) => toAppPlatform(platform) === startedBuild.build.platform
         )
       ).profile;
-      const submission = await prepareAndStartAutoSubmissionAsync({
+      const submission = await prepareAndStartSubmissionAsync({
         build: startedBuild.build,
         buildCtx: nullthrows(buildCtxByPlatform[startedBuild.build.platform]),
         moreBuilds: startedBuilds.length > 1,
@@ -326,7 +308,7 @@ export async function runBuildAndSubmitAsync({
       [BuildStatus.Errored, BuildStatus.Canceled, BuildStatus.PendingCancel].includes(build?.status)
   );
 
-  await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags, downloadSimBuildAutoConfirm);
+  await maybeDownloadAndRunSimulatorBuildsAsync(builds, flags);
 
   if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
     if (flags.json) {
@@ -351,7 +333,6 @@ export async function runBuildAndSubmitAsync({
   }
   return {
     buildIds: startedBuilds.map(({ build }) => build.id),
-    buildProfiles,
   };
 }
 
@@ -368,7 +349,6 @@ async function prepareAndStartBuildAsync({
   getDynamicPrivateProjectConfigAsync,
   customBuildConfigMetadata,
   env,
-  easJsonAccessor,
 }: {
   projectDir: string;
   flags: BuildFlags;
@@ -381,7 +361,6 @@ async function prepareAndStartBuildAsync({
   vcsClient: Client;
   getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
   customBuildConfigMetadata?: CustomBuildConfigMetadata;
-  easJsonAccessor: EasJsonAccessor;
   env: Env;
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
@@ -404,8 +383,7 @@ async function prepareAndStartBuildAsync({
     customBuildConfigMetadata,
     buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
     freezeCredentials: flags.freezeCredentials,
-    isVerboseLoggingEnabled: flags.isVerboseLoggingEnabled ?? false,
-    whatToTest: flags.whatToTest,
+    repack: flags.repack,
     env,
   });
 
@@ -429,18 +407,8 @@ async function prepareAndStartBuildAsync({
       nonInteractive: flags.nonInteractive,
       buildProfile,
       env: buildProfile.profile.env,
-      easJsonAccessor,
     });
-    const easJsonCliConfig: EasJson['cli'] =
-      (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
-
-    if (
-      isUsingEASUpdate(
-        buildCtx.exp,
-        buildCtx.projectId,
-        easJsonCliConfig.updateManifestHostOverride ?? null
-      )
-    ) {
+    if (isUsingEASUpdate(buildCtx.exp, buildCtx.projectId)) {
       const doesChannelExist = await doesChannelExistAsync(graphqlClient, {
         appId: buildCtx.projectId,
         channelName: buildProfile.profile.channel,
@@ -505,7 +473,7 @@ async function startBuildAsync(ctx: BuildContext<Platform>): Promise<BuildFragme
   return await sendBuildRequestAsync();
 }
 
-async function prepareAndStartAutoSubmissionAsync({
+async function prepareAndStartSubmissionAsync({
   build,
   buildCtx,
   moreBuilds,
@@ -540,8 +508,6 @@ async function prepareAndStartAutoSubmissionAsync({
     vcsClient: buildCtx.vcsClient,
     isVerboseFastlaneEnabled: false,
     specifiedProfile: selectedSubmitProfileName,
-    groups: undefined, // use groups from submit profile
-    whatToTest: buildCtx.whatToTest,
   });
 
   if (moreBuilds) {
@@ -565,29 +531,18 @@ function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | nul
   }
 }
 
-export async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
+async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
   assert(build.artifacts?.applicationArchiveUrl);
-  const cachedAppPath = getEasBuildRunCachedAppPath(build.project.id, build.id, build.platform);
-
-  if (await pathExists(cachedAppPath)) {
-    Log.newLine();
-    Log.log(`Using cached app...`);
-    await runAsync(cachedAppPath, build.platform);
-    return;
-  }
-
   const buildPath = await downloadAndMaybeExtractAppAsync(
     build.artifacts.applicationArchiveUrl,
-    build.platform,
-    cachedAppPath
+    build.platform
   );
   await runAsync(buildPath, build.platform);
 }
 
 async function maybeDownloadAndRunSimulatorBuildsAsync(
   builds: MaybeBuildFragment[],
-  flags: BuildFlags,
-  autoConfirm?: boolean
+  flags: BuildFlags
 ): Promise<void> {
   const simBuilds = builds.filter(truthy).filter(isRunnableOnSimulatorOrEmulator);
 
@@ -595,15 +550,11 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(
     for (const simBuild of simBuilds) {
       if (simBuild.platform === AppPlatform.Android || process.platform === 'darwin') {
         Log.newLine();
-        const confirm =
-          autoConfirm ??
-          (await confirmAsync({
-            message: `Install and run the ${
-              simBuild.platform === AppPlatform.Android ? 'Android' : 'iOS'
-            } build on ${
-              simBuild.platform === AppPlatform.Android ? 'an emulator' : 'a simulator'
-            }?`,
-          }));
+        const confirm = await confirmAsync({
+          message: `Install and run the ${
+            simBuild.platform === AppPlatform.Android ? 'Android' : 'iOS'
+          } build on ${simBuild.platform === AppPlatform.Android ? 'an emulator' : 'a simulator'}?`,
+        });
         if (confirm) {
           await downloadAndRunAsync(simBuild);
         }
@@ -621,7 +572,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   nonInteractive,
   sdkVersion,
   env,
-  easJsonAccessor,
 }: {
   exp: ExpoConfig;
   projectId: string;
@@ -631,7 +581,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
   nonInteractive: boolean;
   sdkVersion?: string;
   env: Env | undefined;
-  easJsonAccessor: EasJsonAccessor;
 }): Promise<void> {
   if (isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion)) {
     return;
@@ -653,9 +602,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
       message: `Would you like to install the "expo-updates" package and configure EAS Update now?`,
     });
     if (installExpoUpdates) {
-      const easJsonCliConfig: EasJson['cli'] =
-        (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
-
       await ensureEASUpdateIsConfiguredAsync({
         exp,
         projectId,
@@ -663,7 +609,6 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({
         platform: RequestedPlatform.All,
         vcsClient,
         env,
-        manifestHostOverride: easJsonCliConfig.updateManifestHostOverride ?? null,
       });
       Log.withTick('Installed expo-updates and configured EAS Update.');
       throw new Error('Command must be re-run to pick up new updates configuration.');

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

@@ -35,4 +35,5 @@ export interface BuildFlags {
   message?: string;
   buildLoggerLevel?: LoggerLevel;
   freezeCredentials: boolean;
+  repack: boolean;
 }

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

@@ -0,0 +1,148 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
+
+import { updateAppJsonConfigAsync } from '../appJson';
+import { bumpAppVersionAsync, getVersionConfigTarget } from '../version';
+
+jest.mock('../appJson', () => ({
+  __esModule: true,
+  updateAppJsonConfigAsync: jest.fn().mockImplementation(
+    async (
+      {
+        exp,
+      }: {
+        projectDir: string;
+        exp: ExpoConfig;
+      },
+      modifyConfig: (config: any) => void
+    ) => {
+      // a mocked implementation that only mutates the config object without writing to disk
+      modifyConfig(exp);
+    }
+  ),
+}));
+
+describe(bumpAppVersionAsync, () => {
+  const name = 'test';
+  const slug = 'test';
+  const projectDir = '/app';
+  const mockUpdateAppJsonConfigAsync = updateAppJsonConfigAsync as jest.MockedFunction<
+    typeof updateAppJsonConfigAsync
+  >;
+
+  it('should bump expo.version for valid semver', async () => {
+    const appVersion = '1.0.0';
+    const exp: ExpoConfig = {
+      name,
+      slug,
+      version: appVersion,
+    };
+
+    await bumpAppVersionAsync({ appVersion, projectDir, exp, platform: Platform.IOS });
+    expect(mockUpdateAppJsonConfigAsync).toHaveBeenCalled();
+    expect(exp.version).toBe('1.0.1');
+  });
+
+  it('should bump expo.android.version if the expo.android.version exists', async () => {
+    const exp: ExpoConfig = {
+      name,
+      slug,
+      version: '0.0.0',
+      android: {
+        // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+        version: '1.0.0',
+      },
+      ios: {
+        // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+        version: '2.0.0',
+      },
+    };
+
+    await bumpAppVersionAsync({ appVersion: '1.0.0', projectDir, exp, platform: Platform.ANDROID });
+    expect(mockUpdateAppJsonConfigAsync).toHaveBeenCalled();
+    expect(exp.version).toBe('0.0.0');
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+    expect(exp.android.version).toBe('1.0.1');
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+    expect(exp.ios.version).toBe('2.0.0');
+  });
+
+  it('should bump expo.ios.version if the expo.ios.version exists', async () => {
+    const exp: ExpoConfig = {
+      name,
+      slug,
+      version: '0.0.0',
+      android: {
+        // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+        version: '1.0.0',
+      },
+      ios: {
+        // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+        version: '2.0.0',
+      },
+    };
+
+    await bumpAppVersionAsync({ appVersion: '2.0.0', projectDir, exp, platform: Platform.IOS });
+    expect(mockUpdateAppJsonConfigAsync).toHaveBeenCalled();
+    expect(exp.version).toBe('0.0.0');
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+    expect(exp.android.version).toBe('1.0.0');
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+    expect(exp.ios.version).toBe('2.0.1');
+  });
+});
+
+describe(getVersionConfigTarget, () => {
+  const exp: ExpoConfig = {
+    name: 'test',
+    slug: 'test',
+    version: '0.0.0',
+    android: {
+      // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+      version: '1.0.0',
+    },
+    ios: {
+      // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+      version: '2.0.0',
+    },
+  };
+
+  it('should return the correct config target for the android platform', () => {
+    const { fieldName, versionGetter, versionUpdater } = getVersionConfigTarget({
+      exp,
+      platform: Platform.ANDROID,
+    });
+    expect(fieldName).toBe('expo.android.version');
+    expect(versionGetter(exp)).toBe('1.0.0');
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+    expect(versionUpdater(exp, '3.3.3').android.version).toBe('3.3.3');
+    expect(versionUpdater(exp, '0.0.0').version).toBe('0.0.0');
+  });
+
+  it('should return the correct config target for the ios platform', () => {
+    const { fieldName, versionGetter, versionUpdater } = getVersionConfigTarget({
+      exp,
+      platform: Platform.IOS,
+    });
+    expect(fieldName).toBe('expo.ios.version');
+    expect(versionGetter(exp)).toBe('2.0.0');
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+    expect(versionUpdater(exp, '3.3.3').ios.version).toBe('3.3.3');
+    expect(versionUpdater(exp, '0.0.0').version).toBe('0.0.0');
+  });
+
+  it('should return the correct config target for common version', () => {
+    const exp: ExpoConfig = {
+      name: 'test',
+      slug: 'test',
+      version: '0.0.0',
+    };
+    const { fieldName, versionGetter, versionUpdater } = getVersionConfigTarget({
+      exp,
+      platform: Platform.IOS,
+    });
+    expect(fieldName).toBe('expo.version');
+    expect(versionGetter(exp)).toBe('0.0.0');
+    expect(versionUpdater(exp, '3.3.3').version).toBe('3.3.3');
+  });
+});

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

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

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

@@ -43,14 +43,14 @@ const errorCodeToErrorMessageOverride: Record<string, (build: BuildFragment) =>
 
 export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {
-    Log.log(`See logs: ${link(getBuildLogsUrl(builds[0]))}`);
+    Log.log(`Build details: ${link(getBuildLogsUrl(builds[0]))}`);
   } else {
     builds.forEach(build => {
       const logsUrl = getBuildLogsUrl(build);
       Log.log(
-        `See ${appPlatformEmojis[build.platform]} ${
+        `${appPlatformEmojis[build.platform]} ${
           appPlatformDisplayNames[build.platform]
-        } logs: ${link(logsUrl)}`
+        } build details: ${link(logsUrl)}`
       );
     });
   }

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

@@ -4,7 +4,7 @@ import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';
 
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import { ora } from '../../ora';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { formatBytes } from '../../utils/files';
@@ -169,34 +169,6 @@ export async function makeProjectTarballAsync(vcsClient: Client): Promise<LocalF
   return { size, path: tarPath };
 }
 
-export function maybeWarnAboutProjectTarballSize(size: number): void {
-  if (size <= 150 /* MiB */ * 1024 /* KiB */ * 1024 /* B */) {
-    return;
-  }
-
-  Log.warn(
-    `Your project archive is ${formatBytes(
-      size
-    )}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk.bold(
-      '.easignore'
-    )} file. ${learnMore('https://expo.fyi/eas-build-archive')}`
-  );
-}
-
-const MAX_ALLOWED_PROJECT_TARBALL_SIZE =
-  2 /* GiB */ * 1024 /* MiB */ * 1024 /* KiB */ * 1024; /* B */
-export function assertProjectTarballSizeDoesNotExceedLimit(size: number): void {
-  if (size <= MAX_ALLOWED_PROJECT_TARBALL_SIZE) {
-    return;
-  }
-
-  throw new Error(
-    `Project archive is too big. Maximum allowed size is ${formatBytes(
-      MAX_ALLOWED_PROJECT_TARBALL_SIZE
-    )}.`
-  );
-}
-
 enum ShouldCommitChanges {
   Yes,
   ShowDiffFirst,

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

@@ -72,12 +72,3 @@ export function getProjectGitHubSettingsUrl(accountName: string, projectName: st
     getExpoWebsiteBaseUrl()
   ).toString();
 }
-
-export function getHostingDeploymentsUrl(accountName: string, projectName: string): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/hosting/deployments`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}

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

@@ -1,4 +1,5 @@
 import { ExpoConfig, getConfigFilePaths } from '@expo/config';
+import { Platform } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 import semver from 'semver';
@@ -18,21 +19,25 @@ export async function bumpAppVersionAsync({
   appVersion,
   projectDir,
   exp,
+  platform,
 }: {
   appVersion: string;
   projectDir: string;
   exp: ExpoConfig;
+  platform: Platform;
 }): Promise<void> {
+  const { fieldName, versionUpdater } = getVersionConfigTarget({ exp, platform });
+
   let bumpedAppVersion: string;
   if (semver.valid(appVersion)) {
     bumpedAppVersion = nullthrows(semver.inc(appVersion, 'patch'));
     Log.log(
-      `Bumping ${chalk.bold('expo.version')} from ${chalk.bold(appVersion)} to ${chalk.bold(
+      `Bumping ${chalk.bold(fieldName)} from ${chalk.bold(appVersion)} to ${chalk.bold(
         bumpedAppVersion
       )}`
     );
   } else {
-    Log.log(`${chalk.bold('expo.version')} = ${chalk.bold(appVersion)} is not a valid semver`);
+    Log.log(`${chalk.bold(fieldName)} = ${chalk.bold(appVersion)} is not a valid semver`);
     bumpedAppVersion = (
       await promptAsync({
         type: 'text',
@@ -42,6 +47,56 @@ export async function bumpAppVersionAsync({
     ).bumpedAppVersion;
   }
   await updateAppJsonConfigAsync({ projectDir, exp }, config => {
-    config.version = bumpedAppVersion;
+    versionUpdater(config, bumpedAppVersion);
   });
 }
+
+/**
+ * Get the target version field from ExpoConfig based on the platform.
+ */
+export function getVersionConfigTarget({
+  exp,
+  platform,
+}: {
+  exp: ExpoConfig;
+  platform: Platform;
+}): {
+  fieldName: string;
+  versionGetter: (config: ExpoConfig) => string | undefined;
+  versionUpdater: (config: ExpoConfig, version: string) => ExpoConfig;
+} {
+  // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+  if (platform === Platform.ANDROID && typeof exp.android?.version === 'string') {
+    return {
+      fieldName: 'expo.android.version',
+      // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+      versionGetter: config => config.android?.version,
+      versionUpdater: (config, version) => {
+        // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+        config.android = { ...config.android, version };
+        return config;
+      },
+    };
+    // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+  } else if (platform === Platform.IOS && typeof exp.ios?.version === 'string') {
+    return {
+      fieldName: 'expo.ios.version',
+      // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+      versionGetter: config => config.ios?.version,
+      versionUpdater: (config, version) => {
+        // @ts-expect-error: Resolve type errors after upgrading `@expo/config`
+        config.ios = { ...config.ios, version };
+        return config;
+      },
+    };
+  }
+
+  return {
+    fieldName: 'expo.version',
+    versionGetter: config => config.version,
+    versionUpdater: (config, version) => {
+      config.version = version;
+      return config;
+    },
+  };
+}

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

@@ -18,7 +18,6 @@ export const testUpdateBranch1: UpdateBranchObject = {
         isRollBackToEmbedded: false,
         manifestPermalink: 'https://u.expo.dev/update/bbe3e63a-f620-4603-8c4d-258f3e51590d',
         gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        isGitWorkingTreeDirty: false,
         actor: {
           __typename: 'User',
           id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
@@ -44,7 +43,6 @@ export const testUpdateBranch1: UpdateBranchObject = {
         isRollBackToEmbedded: false,
         manifestPermalink: 'https://u.expo.dev/update/db22401b-d321-4629-a068-21d6d1f19c02',
         gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        isGitWorkingTreeDirty: false,
         actor: {
           __typename: 'User',
           id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
@@ -80,7 +78,6 @@ export const testUpdateBranch2: UpdateBranchObject = {
         isRollBackToEmbedded: false,
         manifestPermalink: 'https://u.expo.dev/update/f04aafc1-0bf5-4548-8c35-726b467e7c40',
         gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        isGitWorkingTreeDirty: false,
         actor: {
           __typename: 'User',
           id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',
@@ -106,7 +103,6 @@ export const testUpdateBranch2: UpdateBranchObject = {
         isRollBackToEmbedded: false,
         manifestPermalink: 'https://u.expo.dev/update/d8d15786-2727-407f-bf3e-f4bda7e397d9',
         gitCommitHash: 'e91c5bb733eff675dd8a3722ed5d4f885a4b10ce',
-        isGitWorkingTreeDirty: false,
         actor: {
           __typename: 'User',
           id: '026ace2b-c1f8-4a02-818d-6b52c100bdf2',

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

@@ -289,7 +289,7 @@ export async function doesChannelExistAsync(
   { appId, channelName }: { appId: string; channelName: string }
 ): Promise<boolean> {
   try {
-    await ChannelQuery.viewUpdateChannelBasicInfoAsync(graphqlClient, {
+    await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
       appId,
       channelName,
     });

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

@@ -27,7 +27,7 @@ import {
   createAnalyticsAsync,
 } from '../analytics/AnalyticsManager';
 import { EnvironmentVariableEnvironment } from '../graphql/generated';
-import Log, { link } from '../log';
+import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import { Client } from '../vcs/vcs';
 
@@ -264,16 +264,6 @@ export default abstract class EasCommand extends Command {
           const defaultMsg = `${messageLine}${requestIdLine}`;
 
           if (graphQLError.extensions?.errorCode === 'UNAUTHORIZED_ERROR') {
-            if (defaultMsg.includes('ScopedAccountActorViewerContext') && process.env.EAS_BUILD) {
-              // We're in EAS, authenticated with a scoped account actor access token.
-              // We may have not added the scoped actor privacy rule to the right place yet.
-              return `${chalk.bold(
-                `You don't have the required permissions to perform this operation.`
-              )}\n\nWe are in the process of migrating EAS to a more granular permissioning system. If you believe what you're doing is a legitimate operation you should be able to perform, report this to us at ${link(
-                'https://expo.dev/contact'
-              )}\n\nOriginal error message: ${defaultMsg}`;
-            }
-
             return `${chalk.bold(
               `You don't have the required permissions to perform this operation.`
             )}\n\nThis can sometimes happen if you are logged in as incorrect user.\nRun ${chalk.bold(

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

@@ -43,7 +43,6 @@ export async function fetchBuildsAsync({
     platform?: RequestedPlatform;
     profile?: string;
     hasFingerprint?: boolean;
-    fingerprintHash?: string;
   };
 }): Promise<BuildFragment[]> {
   let builds: BuildFragment[];
@@ -57,9 +56,6 @@ export async function fetchBuildsAsync({
   if (filters?.hasFingerprint) {
     queryFilters['hasFingerprint'] = filters.hasFingerprint;
   }
-  if (filters?.fingerprintHash) {
-    queryFilters['fingerprintHash'] = filters.fingerprintHash;
-  }
   if (!filters?.statuses) {
     builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
       appId: projectId,

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

@@ -5,7 +5,7 @@ import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
 import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
 import { getPublicExpoConfigAsync } from '../../project/expoConfig';
 
-export type GetServerSideEnvironmentVariablesFn = (
+type GetServerSideEnvironmentVariablesFn = (
   maybeEnv?: Record<string, string>
 ) => Promise<Record<string, string>>;
 

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

@@ -1,10 +1,6 @@
 import { vol } from 'memfs';
 
-import { easCliVersion } from '../../../../utils/easCli';
-import {
-  findProjectDirAndVerifyProjectSetupAsync,
-  findProjectRootAsync,
-} from '../findProjectDirAndVerifyProjectSetupAsync';
+import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
 
 jest.mock('@expo/config');
 jest.mock('fs');
@@ -64,54 +60,3 @@ describe(findProjectRootAsync, () => {
     expect(projectRoot).toBe('/app');
   });
 });
-
-describe(findProjectDirAndVerifyProjectSetupAsync, () => {
-  it('throws if the CLI version is not satisfied', async () => {
-    vol.fromJSON(
-      {
-        './eas.json': JSON.stringify({ cli: { version: '1.0.0' } }),
-        './package.json': JSON.stringify({}),
-      },
-      '/app'
-    );
-    await expect(findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' })).rejects.toThrow(
-      new RegExp(
-        `^You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint defined in eas.json \\(1.0.0\\)`,
-        's'
-      )
-    );
-
-    process.env.EAS_SKIP_CLI_VERSION_CHECK = 'true';
-    await expect(findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' })).resolves.not.toThrow();
-    delete process.env.EAS_SKIP_CLI_VERSION_CHECK;
-
-    await expect(findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' })).rejects.toThrow(
-      new RegExp(
-        `^You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint defined in eas.json \\(1.0.0\\)`,
-        's'
-      )
-    );
-  });
-
-  it('does not throw if the CLI version is satisfied', async () => {
-    vol.fromJSON(
-      {
-        './eas.json': JSON.stringify({ cli: { version: '>= 1.0.0' } }),
-        './package.json': JSON.stringify({}),
-      },
-      '/app'
-    );
-    await expect(findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' })).resolves.not.toThrow();
-  });
-
-  it('does not throw if there is no version', async () => {
-    vol.fromJSON(
-      {
-        './eas.json': JSON.stringify({}),
-        './package.json': JSON.stringify({}),
-      },
-      '/app'
-    );
-    await expect(findProjectDirAndVerifyProjectSetupAsync({ cwd: '/app' })).resolves.not.toThrow();
-  });
-});

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

@@ -78,12 +78,7 @@ describe(getProjectIdAsync, () => {
 
   it('gets the project ID from app config if exists', async () => {
     jest.mocked(getConfig).mockReturnValue({
-      exp: {
-        sdkVersion: '52.0.0',
-        name: 'test',
-        slug: 'test',
-        extra: { eas: { projectId: '1234' } },
-      },
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
     } as any);
     jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
       id: '1234',
@@ -96,7 +91,7 @@ describe(getProjectIdAsync, () => {
     await expect(
       getProjectIdAsync(
         sessionManager,
-        { sdkVersion: '52.0.0', name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
         { nonInteractive: false }
       )
     ).resolves.toEqual('1234');
@@ -104,13 +99,7 @@ describe(getProjectIdAsync, () => {
 
   it('throws when the owner is out of sync', async () => {
     jest.mocked(getConfig).mockReturnValue({
-      exp: {
-        sdkVersion: '54.0.0',
-        name: 'test',
-        slug: 'test',
-        owner: 'wat',
-        extra: { eas: { projectId: '1234' } },
-      },
+      exp: { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
     } as any);
     jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
       id: '1234',
@@ -123,13 +112,7 @@ describe(getProjectIdAsync, () => {
     await expect(
       getProjectIdAsync(
         sessionManager,
-        {
-          sdkVersion: '52.0.0',
-          name: 'test',
-          slug: 'test',
-          owner: 'wat',
-          extra: { eas: { projectId: '1234' } },
-        },
+        { name: 'test', slug: 'test', owner: 'wat', extra: { eas: { projectId: '1234' } } },
         { nonInteractive: false }
       )
     ).rejects.toThrow(
@@ -139,143 +122,83 @@ describe(getProjectIdAsync, () => {
     );
   });
 
-  describe('when sdkVersion is less than 53', () => {
-    it('throws when the owner is not specified and is different than logged in user', async () => {
-      jest.mocked(getConfig).mockReturnValue({
-        exp: {
-          sdkVersion: '52.0.0',
-          name: 'test',
-          slug: 'test',
-          extra: { eas: { projectId: '1234' } },
-        },
-      } as any);
-      jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-        id: '1234',
-        fullName: '@totallybrent/test',
-        name: 'test',
-        slug: 'test',
-        ownerAccount: { name: 'totallybrent' } as any,
-      });
-
-      await expect(
-        getProjectIdAsync(
-          sessionManager,
-          {
-            sdkVersion: '52.0.0',
-            name: 'test',
-            slug: 'test',
-            extra: { eas: { projectId: '1234' } },
-          },
-          { nonInteractive: false }
-        )
-      ).rejects.toThrow(
-        `Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) does not match the logged in user (notnotbrent) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-          'https://expo.fyi/eas-project-id'
-        )}`
-      );
+  it('throws when the owner is not specified and is different than logged in user', async () => {
+    jest.mocked(getConfig).mockReturnValue({
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+    } as any);
+    jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
+      id: '1234',
+      fullName: '@totallybrent/test',
+      name: 'test',
+      slug: 'test',
+      ownerAccount: { name: 'totallybrent' } as any,
     });
 
-    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: {
-          sdkVersion: '52.0.0',
-          name: 'test',
-          slug: 'test',
-          extra: { eas: { projectId: '1234' } },
-        },
-      } as any);
-      jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-        id: '1234',
-        fullName: '@totallybrent/test',
-        name: 'test',
-        slug: 'test',
-        ownerAccount: { name: 'totallybrent' } as any,
-      });
-
-      await expect(
-        getProjectIdAsync(
-          sessionManagerRobot,
-          {
-            sdkVersion: '52.0.0',
-            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'
-        )}`
-      );
-    });
+    await expect(
+      getProjectIdAsync(
+        sessionManager,
+        { name: 'test', slug: 'test', extra: { eas: { projectId: '1234' } } },
+        { nonInteractive: false }
+      )
+    ).rejects.toThrow(
+      `Project config: Owner of project identified by "extra.eas.projectId" (totallybrent) does not match the logged in user (notnotbrent) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "totallybrent" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
+        'https://expo.fyi/eas-project-id'
+      )}`
+    );
   });
 
-  describe('when sdkVersion is 53 or higher', () => {
-    it('does not throw when the owner is not specified', async () => {
-      jest.mocked(getConfig).mockReturnValue({
-        exp: {
-          sdkVersion: '53.0.0',
-          name: 'test',
-          slug: 'test',
-          extra: { eas: { projectId: '1234' } },
-        },
-      } as any);
-      jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
-        id: '1234',
-        fullName: '@totallybrent/test',
-        name: 'test',
-        slug: 'test',
-        ownerAccount: { name: 'totallybrent' } as any,
-      });
-
-      await expect(
-        getProjectIdAsync(
-          sessionManager,
+  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: [
           {
-            sdkVersion: '53.0.0',
-            name: 'test',
-            slug: 'test',
-            extra: { eas: { projectId: '1234' } },
+            id: 'account_id_1',
+            name: 'notnotbrent',
+            users: [{ role: Role.Admin, actor: { id: 'robot_id' } }],
           },
-          { nonInteractive: false }
-        )
-      ).resolves.not.toThrow();
+          {
+            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',
+      name: '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: {
-        sdkVersion: '52.0.0',
-        name: 'test',
-        slug: 'wat',
-        extra: { eas: { projectId: '1234' } },
-      },
+      exp: { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
     } as any);
     jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
       id: '1234',
@@ -288,7 +211,7 @@ describe(getProjectIdAsync, () => {
     await expect(
       getProjectIdAsync(
         sessionManager,
-        { sdkVersion: '52.0.0', name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
+        { name: 'test', slug: 'wat', extra: { eas: { projectId: '1234' } } },
         { nonInteractive: false }
       )
     ).rejects.toThrow(
@@ -299,17 +222,10 @@ describe(getProjectIdAsync, () => {
   });
 
   it('fetches the project ID when not in app config, and sets it in the config', async () => {
-    jest
-      .mocked(getConfig)
-      .mockReturnValue({ exp: { sdkVersion: '52.0.0', name: 'test', slug: 'test' } } as any);
+    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
     jest.mocked(modifyConfigAsync).mockResolvedValue({
       type: 'success',
-      config: {
-        sdkVersion: '52.0.0',
-        name: 'test',
-        slug: 'test',
-        extra: { eas: { projectId: '2345' } },
-      },
+      config: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } },
     });
     jest
       .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
@@ -317,7 +233,7 @@ describe(getProjectIdAsync, () => {
 
     const projectId = await getProjectIdAsync(
       sessionManager,
-      { sdkVersion: '52.0.0', name: 'test', slug: 'test' },
+      { name: 'test', slug: 'test' },
       {
         nonInteractive: false,
       }
@@ -336,9 +252,7 @@ describe(getProjectIdAsync, () => {
   });
 
   it('throws if writing the ID back to the config fails', async () => {
-    jest
-      .mocked(getConfig)
-      .mockReturnValue({ exp: { sdkVersion: '52.0.0', name: 'test', slug: 'test' } } as any);
+    jest.mocked(getConfig).mockReturnValue({ exp: { name: 'test', slug: 'test' } } as any);
     jest.mocked(modifyConfigAsync).mockResolvedValue({
       type: 'fail',
       config: null,
@@ -348,22 +262,13 @@ describe(getProjectIdAsync, () => {
       .mockImplementation(async () => '4567');
 
     await expect(
-      getProjectIdAsync(
-        sessionManager,
-        { sdkVersion: '52.0.0', name: 'test', slug: 'test' },
-        { nonInteractive: false }
-      )
+      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: {
-        sdkVersion: '52.0.0',
-        name: 'test',
-        slug: 'test',
-        extra: { eas: { projectId: 1234 } },
-      },
+      exp: { name: 'test', slug: 'test', extra: { eas: { projectId: 1234 } } },
     } as any);
     jest.mocked(AppQuery.byIdAsync).mockResolvedValue({
       id: '1234',
@@ -376,7 +281,7 @@ describe(getProjectIdAsync, () => {
     await expect(
       getProjectIdAsync(
         sessionManager,
-        { sdkVersion: '52.0.0', name: 'test', slug: 'wat', extra: { eas: { projectId: 1234 } } },
+        { name: 'test', slug: 'wat', extra: { eas: { projectId: 1234 } } },
         { nonInteractive: false }
       )
     ).rejects.toThrow(

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

@@ -2,7 +2,6 @@ import { EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import * as PackageManagerUtils from '@expo/package-manager';
 import chalk from 'chalk';
 import fs from 'fs-extra';
-import getenv from 'getenv';
 import path from 'path';
 import pkgDir from 'pkg-dir';
 import semver from 'semver';
@@ -14,14 +13,7 @@ import { resolveVcsClient } from '../../../vcs';
 async function applyCliConfigAsync(projectDir: string): Promise<void> {
   const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
   const config = await EasJsonUtils.getCliConfigAsync(easJsonAccessor);
-
-  const shouldSkipVersionCheck = getenv.boolish('EAS_SKIP_CLI_VERSION_CHECK', false);
-
-  if (
-    !shouldSkipVersionCheck &&
-    config?.version &&
-    !semver.satisfies(easCliVersion, config.version)
-  ) {
+  if (config?.version && !semver.satisfies(easCliVersion, config.version)) {
     throw new Error(
       `You are on eas-cli@${easCliVersion} which does not satisfy the CLI version constraint defined in eas.json (${
         config.version
@@ -111,8 +103,6 @@ export async function findProjectRootAsync({
   }
 }
 
-let ranEnsureEasCliIsNotInDependencies = false;
-
 /**
  * Determine the project root directory and ensure some constraints about the project setup
  * like CLI version and dependencies.
@@ -120,16 +110,9 @@ let ranEnsureEasCliIsNotInDependencies = false;
  *
  * @deprecated Should not be used outside of context functions.
  */
-export async function findProjectDirAndVerifyProjectSetupAsync({
-  cwd,
-}: {
-  cwd?: string;
-} = {}): Promise<string> {
-  const projectDir = await findProjectRootAsync({ cwd });
+export async function findProjectDirAndVerifyProjectSetupAsync(): Promise<string> {
+  const projectDir = await findProjectRootAsync();
   await applyCliConfigAsync(projectDir);
-  if (!ranEnsureEasCliIsNotInDependencies) {
-    ranEnsureEasCliIsNotInDependencies = true;
-    await ensureEasCliIsNotInDependenciesAsync(projectDir);
-  }
+  await ensureEasCliIsNotInDependenciesAsync(projectDir);
   return projectDir;
 }

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

@@ -1,7 +1,6 @@
 import { ExpoConfig, getProjectConfigDescription } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
 import chalk from 'chalk';
-import semver from 'semver';
 
 import { ExpoGraphqlClient, createGraphqlClient } from './createGraphqlClient';
 import { findProjectRootAsync } from './findProjectDirAndVerifyProjectSetupAsync';
@@ -128,33 +127,29 @@ export async function validateOrSetProjectIdAsync({
       );
     }
 
-    const sdkVersion = exp.sdkVersion;
-    // SDK 53 and above no longer require owner field in app config
-    if (sdkVersion && semver.satisfies(sdkVersion, '< 53.0.0')) {
-      const actorUsername = getActorUsername(actor);
-      if (!exp.owner && appForProjectId.ownerAccount.name !== actorUsername) {
-        if (actorUsername) {
-          throw new Error(
-            `Project config: Owner of project identified by "extra.eas.projectId" (${
-              appForProjectId.ownerAccount.name
-            }) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${
-              appForProjectId.ownerAccount.name
-            }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-              'https://expo.fyi/eas-project-id'
-            )}`
-          );
-        } else {
-          // robot caller
-          throw new Error(
-            `Project config: Owner of project identified by "extra.eas.projectId" (${
-              appForProjectId.ownerAccount.name
-            }) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "${
-              appForProjectId.ownerAccount.name
-            }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
-              'https://expo.fyi/eas-project-id'
-            )}`
-          );
-        }
+    const actorUsername = getActorUsername(actor);
+    if (!exp.owner && appForProjectId.ownerAccount.name !== actorUsername) {
+      if (actorUsername) {
+        throw new Error(
+          `Project config: Owner of project identified by "extra.eas.projectId" (${
+            appForProjectId.ownerAccount.name
+          }) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${
+            appForProjectId.ownerAccount.name
+          }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
+            'https://expo.fyi/eas-project-id'
+          )}`
+        );
+      } else {
+        // robot caller
+        throw new Error(
+          `Project config: Owner of project identified by "extra.eas.projectId" (${
+            appForProjectId.ownerAccount.name
+          }) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "${
+            appForProjectId.ownerAccount.name
+          }" should be added to the project config, which can be done automatically by re-running "eas init". ${learnMore(
+            'https://expo.fyi/eas-project-id'
+          )}`
+        );
       }
     }
 
@@ -180,7 +175,7 @@ export async function validateOrSetProjectIdAsync({
 
   Log.warn('EAS project not configured.');
 
-  const getDefaultAccountNameForEASProject = (exp: ExpoConfig, user: Actor): string => {
+  const getAccountNameForEASProjectSync = (exp: ExpoConfig, user: Actor): string => {
     if (exp.owner) {
       return exp.owner;
     }
@@ -191,7 +186,7 @@ export async function validateOrSetProjectIdAsync({
         return user.username;
       case 'Robot':
         throw new Error(
-          'Must configure EAS project by running "eas init" before using a robot user to manage the project.'
+          'The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner'
         );
     }
   };
@@ -199,7 +194,7 @@ export async function validateOrSetProjectIdAsync({
   const projectId = await fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(
     graphqlClient,
     {
-      accountName: getDefaultAccountNameForEASProject(exp, actor),
+      accountName: getAccountNameForEASProjectSync(exp, actor),
       projectName: exp.slug,
     },
     {

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

@@ -42,13 +42,13 @@ export async function loadServerSideEnvironmentVariablesAsync({
 
   if (Object.keys(serverEnvVars).length > 0) {
     Log.log(
-      `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
+      `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS servers: ${Object.keys(
         serverEnvVars
       ).join(', ')}.`
     );
   } else {
     Log.log(
-      `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
+      `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS servers.`
     );
   }
   Log.newLine();

packages/eas-cli/src/commandUtils/workflow/fetchLogs.ts

@@ -1,15 +0,0 @@
-import { WorkflowJobResult } from './types';
-
-// This function is in a separate module for testing purposes
-
-export async function fetchRawLogsForJobAsync(job: WorkflowJobResult): Promise<string | null> {
-  const firstLogFileUrl = job.turtleJobRun?.logFileUrls?.[0];
-  if (!firstLogFileUrl) {
-    return null;
-  }
-  const response = await fetch(firstLogFileUrl, {
-    method: 'GET',
-  });
-  const rawLogs = await response.text();
-  return rawLogs;
-}

packages/eas-cli/src/commandUtils/workflow/stateMachine.ts

@@ -1,324 +0,0 @@
-import { Choice } from 'prompts';
-
-import { WorkflowJobResult, WorkflowLogs } from './types';
-import {
-  choiceFromWorkflowJob,
-  choiceFromWorkflowRun,
-  choicesFromWorkflowLogs,
-  processLogsFromJobAsync,
-  processWorkflowRuns,
-} from './utils';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import { WorkflowJobQuery } from '../../graphql/queries/WorkflowJobQuery';
-import { WorkflowRunQuery } from '../../graphql/queries/WorkflowRunQuery';
-import Log from '../../log';
-import { promptAsync } from '../../prompts';
-import { ExpoGraphqlClient } from '../context/contextUtils/createGraphqlClient';
-
-/*
- * State machine types and functions for moving between different workflow command states
- */
-
-export enum WorkflowCommandSelectionStateValue {
-  WORKFLOW_RUN_SELECTION = 'WORKFLOW_RUN_SELECTION',
-  WORKFLOW_JOB_SELECTION = 'WORKFLOW_JOB_SELECTION',
-  WORKFLOW_STEP_SELECTION = 'WORKFLOW_STEP_SELECTION',
-  FINISH = 'FINISH',
-  ERROR = 'ERROR',
-}
-const workflowCommandSelectionAllowedStateTransitions: {
-  [key in WorkflowCommandSelectionStateValue]: WorkflowCommandSelectionStateValue[];
-} = {
-  WORKFLOW_JOB_SELECTION: [
-    WorkflowCommandSelectionStateValue.WORKFLOW_STEP_SELECTION,
-    WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION,
-    WorkflowCommandSelectionStateValue.ERROR,
-    WorkflowCommandSelectionStateValue.FINISH,
-  ],
-  WORKFLOW_RUN_SELECTION: [
-    WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
-    WorkflowCommandSelectionStateValue.ERROR,
-  ],
-  WORKFLOW_STEP_SELECTION: [
-    WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
-    WorkflowCommandSelectionStateValue.ERROR,
-    WorkflowCommandSelectionStateValue.FINISH,
-  ],
-  ERROR: [WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION],
-  FINISH: [],
-};
-
-export type WorkflowCommandSelectionState = {
-  graphqlClient: ExpoGraphqlClient;
-  projectId: string;
-  nonInteractive: boolean;
-  allSteps: boolean;
-  state: WorkflowCommandSelectionStateValue;
-  runId?: string;
-  jobId?: string;
-  step?: string;
-  job?: WorkflowJobResult;
-  logs?: WorkflowLogs | null;
-  message?: string;
-};
-
-export type WorkflowCommandSelectionStateParameters = Omit<
-  WorkflowCommandSelectionState,
-  'graphqlClient' | 'projectId' | 'state' | 'nonInteractive' | 'allSteps'
->;
-
-export type WorkflowCommandSelectionAction = (
-  prevState: WorkflowCommandSelectionState
-) => Promise<WorkflowCommandSelectionState>;
-
-export function moveToNewWorkflowCommandSelectionState(
-  previousState: WorkflowCommandSelectionState,
-  newStateValue: WorkflowCommandSelectionStateValue,
-  parameters: WorkflowCommandSelectionStateParameters
-): WorkflowCommandSelectionState {
-  if (
-    !workflowCommandSelectionAllowedStateTransitions[previousState.state].includes(newStateValue)
-  ) {
-    const errorMessage = `Invalid state transition from ${
-      previousState.state
-    } to ${newStateValue}. Allowed transitions from ${
-      previousState.state
-    }: ${workflowCommandSelectionAllowedStateTransitions[previousState.state].join(', ')}`;
-    throw new Error(errorMessage);
-  }
-  return {
-    ...previousState,
-    state: newStateValue,
-    ...parameters,
-  };
-}
-
-export function moveToWorkflowRunSelectionState(
-  previousState: WorkflowCommandSelectionState,
-  params?: {
-    runId?: string | undefined;
-  }
-): WorkflowCommandSelectionState {
-  return moveToNewWorkflowCommandSelectionState(
-    previousState,
-    WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION,
-    {
-      runId: params?.runId,
-      jobId: undefined,
-    }
-  );
-}
-
-export function moveToWorkflowJobSelectionState(
-  previousState: WorkflowCommandSelectionState,
-  params: {
-    jobId?: string | undefined;
-    runId?: string | undefined;
-  }
-): WorkflowCommandSelectionState {
-  return moveToNewWorkflowCommandSelectionState(
-    previousState,
-    WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION,
-    params
-  );
-}
-
-export function moveToWorkflowStepSelectionState(
-  previousState: WorkflowCommandSelectionState,
-  params: {
-    job: WorkflowJobResult;
-  }
-): WorkflowCommandSelectionState {
-  return moveToNewWorkflowCommandSelectionState(
-    previousState,
-    WorkflowCommandSelectionStateValue.WORKFLOW_STEP_SELECTION,
-    params
-  );
-}
-
-export function moveToWorkflowSelectionFinishedState(
-  previousState: WorkflowCommandSelectionState,
-  params: {
-    step: string;
-    logs: WorkflowLogs;
-  }
-): WorkflowCommandSelectionState {
-  return moveToNewWorkflowCommandSelectionState(
-    previousState,
-    WorkflowCommandSelectionStateValue.FINISH,
-    params
-  );
-}
-
-export function moveToWorkflowSelectionErrorState(
-  previousState: WorkflowCommandSelectionState,
-  message: string
-): WorkflowCommandSelectionState {
-  return moveToNewWorkflowCommandSelectionState(
-    previousState,
-    WorkflowCommandSelectionStateValue.ERROR,
-    {
-      message,
-    }
-  );
-}
-
-// eslint-disable-next-line async-protect/async-suffix
-export const workflowRunSelectionAction: WorkflowCommandSelectionAction = async prevState => {
-  const { graphqlClient, projectId, runId, jobId, allSteps } = prevState;
-  Log.debug(
-    `workflowRunSelectionAction: runId = ${runId}, jobId = ${jobId}, allSteps = ${allSteps}`
-  );
-
-  if (runId) {
-    return moveToWorkflowJobSelectionState(prevState, { runId });
-  }
-  const runs = await AppQuery.byIdWorkflowRunsFilteredByStatusAsync(
-    graphqlClient,
-    projectId,
-    undefined,
-    20
-  );
-  if (runs.length === 0) {
-    return moveToWorkflowSelectionErrorState(prevState, 'No workflow runs found');
-  }
-  const processedRuns = processWorkflowRuns(runs);
-  const choices = processedRuns.map(run => choiceFromWorkflowRun(run));
-  const selectedId = (
-    await promptAsync({
-      type: 'select',
-      name: 'selectedRun',
-      message: 'Select a workflow run:',
-      choices,
-    })
-  ).selectedRun;
-  return moveToWorkflowJobSelectionState(prevState, { runId: selectedId });
-};
-
-// eslint-disable-next-line async-protect/async-suffix
-export const workflowJobSelectionAction: WorkflowCommandSelectionAction = async prevState => {
-  const { graphqlClient, runId, jobId, nonInteractive, allSteps } = prevState;
-  Log.debug(
-    `workflowJobSelectionAction: runId = ${runId}, jobId = ${jobId}, allSteps = ${allSteps}`
-  );
-  if (jobId) {
-    let workflowJobResult = undefined;
-    try {
-      workflowJobResult = await WorkflowJobQuery.byIdAsync(graphqlClient, jobId, {
-        useCache: false,
-      });
-      return moveToWorkflowStepSelectionState(prevState, { job: workflowJobResult });
-    } catch {}
-    if (nonInteractive && !workflowJobResult) {
-      return moveToWorkflowSelectionErrorState(
-        prevState,
-        'No workflow job found that matched the provided ID'
-      );
-    } else {
-      // The passed in ID may be a run ID, pass it back to run selection action
-      return moveToWorkflowRunSelectionState(prevState, { runId: jobId });
-    }
-  } else {
-    // No job ID was passed in
-    if (nonInteractive) {
-      return moveToWorkflowSelectionErrorState(
-        prevState,
-        'No workflow job ID provided in non-interactive mode'
-      );
-    } else if (!runId) {
-      // If no jobId or runId, we should go back to run selection
-      return moveToWorkflowRunSelectionState(prevState);
-    }
-    const workflowRunResult = await WorkflowRunQuery.withJobsByIdAsync(graphqlClient, runId, {
-      useCache: false,
-    });
-    if (!workflowRunResult) {
-      return moveToWorkflowSelectionErrorState(
-        prevState,
-        'No workflow run found that matched the provided ID'
-      );
-    }
-    const choices: Choice[] = [
-      ...workflowRunResult.jobs.map((job, i) => choiceFromWorkflowJob(job, i)),
-      {
-        title: 'Go back and select a different workflow run',
-        value: -1,
-      },
-    ];
-    const selectedJobIndex = (
-      await promptAsync({
-        type: 'select',
-        name: 'selectedJob',
-        message: 'Select a job:',
-        choices,
-      })
-    ).selectedJob;
-    if (selectedJobIndex === -1) {
-      return moveToWorkflowRunSelectionState(prevState);
-    }
-    const selectedJob = workflowRunResult.jobs[selectedJobIndex] as WorkflowJobResult;
-    return moveToWorkflowStepSelectionState(prevState, { job: selectedJob });
-  }
-};
-
-// eslint-disable-next-line async-protect/async-suffix
-export const workflowStepSelectionAction: WorkflowCommandSelectionAction = async prevState => {
-  const { job, allSteps } = prevState;
-  Log.debug(`workflowStepSelectionAction: job = ${job?.id}, allSteps = ${allSteps}`);
-  if (!job) {
-    return moveToWorkflowSelectionErrorState(prevState, 'No job found');
-  }
-  const logs = await processLogsFromJobAsync(job);
-  if (!logs) {
-    return moveToWorkflowSelectionErrorState(prevState, 'No logs found');
-  }
-  if (allSteps) {
-    return moveToWorkflowSelectionFinishedState(prevState, { step: '', logs });
-  }
-  const choices: Choice[] = [
-    ...choicesFromWorkflowLogs(logs),
-    {
-      title: 'Go back and select a different workflow job',
-      value: 'go-back',
-    },
-  ];
-  const selectedStep: string =
-    (
-      await promptAsync({
-        type: 'select',
-        name: 'selectedStep',
-        message: 'Select a step:',
-        choices,
-      })
-    ).selectedStep ?? '';
-  if (selectedStep === 'go-back') {
-    return moveToWorkflowJobSelectionState(prevState, {
-      runId: job.workflowRun.id,
-      jobId: undefined,
-    });
-  }
-  return moveToWorkflowSelectionFinishedState(prevState, { step: selectedStep, logs });
-};
-
-export const executeWorkflowSelectionActionsAsync: WorkflowCommandSelectionAction =
-  async prevState => {
-    let currentState = prevState;
-    while (
-      currentState.state !== WorkflowCommandSelectionStateValue.FINISH &&
-      currentState.state !== WorkflowCommandSelectionStateValue.ERROR
-    ) {
-      Log.debug(`${currentState.state}`);
-      switch (currentState.state) {
-        case WorkflowCommandSelectionStateValue.WORKFLOW_JOB_SELECTION:
-          currentState = await workflowJobSelectionAction(currentState);
-          break;
-        case WorkflowCommandSelectionStateValue.WORKFLOW_RUN_SELECTION:
-          currentState = await workflowRunSelectionAction(currentState);
-          break;
-        case WorkflowCommandSelectionStateValue.WORKFLOW_STEP_SELECTION:
-          currentState = await workflowStepSelectionAction(currentState);
-          break;
-      }
-    }
-    return currentState;
-  };

packages/eas-cli/src/commandUtils/workflow/types.ts

@@ -1,46 +0,0 @@
-import { WorkflowJobByIdQuery, WorkflowRunByIdWithJobsQuery } from '../../graphql/generated';
-
-/*
- * Utility types for workflow commands
- */
-
-export enum WorkflowTriggerType {
-  MANUAL = 'Manual',
-  GITHUB = 'GitHub',
-  SCHEDULED = 'Scheduled',
-  OTHER = 'Other',
-}
-
-export type WorkflowRunResult = {
-  id: string;
-  status: string;
-  gitCommitMessage: string | null;
-  gitCommitHash: string | null;
-  triggerType: WorkflowTriggerType;
-  trigger: string | null;
-  startedAt: string;
-  finishedAt: string;
-  workflowId: string;
-  workflowName: string | null;
-  workflowFileName: string;
-};
-
-export type WorkflowResult = {
-  id: string;
-  name?: string | null | undefined;
-  fileName: string;
-  createdAt: string;
-  updatedAt: string;
-};
-
-export type WorkflowJobResult =
-  | WorkflowRunByIdWithJobsQuery['workflowRuns']['byId']['jobs'][number]
-  | WorkflowJobByIdQuery['workflowJobs']['byId'];
-
-export type WorkflowRunWithJobsResult = WorkflowRunResult & {
-  jobs: WorkflowJobResult[];
-  logs?: string;
-};
-
-export type WorkflowLogLine = { time: string; msg: string; result?: string; marker?: string };
-export type WorkflowLogs = Map<string, WorkflowLogLine[]>;

packages/eas-cli/src/commandUtils/workflow/utils.ts

@@ -1,128 +0,0 @@
-import { fetchRawLogsForJobAsync } from './fetchLogs';
-import {
-  WorkflowJobResult,
-  WorkflowLogLine,
-  WorkflowLogs,
-  WorkflowRunResult,
-  WorkflowTriggerType,
-} from './types';
-import {
-  WorkflowRunFragment,
-  WorkflowRunStatus,
-  WorkflowRunTriggerEventType,
-} from '../../graphql/generated';
-import { Choice } from '../../prompts';
-
-export function computeTriggerInfoForWorkflowRun(run: WorkflowRunFragment): {
-  triggerType: WorkflowTriggerType;
-  trigger: string | null;
-} {
-  let triggerType = WorkflowTriggerType.OTHER;
-  let trigger = '';
-  if (run.actor?.__typename === 'Robot') {
-    if (run.actor.firstName?.startsWith('GitHub App · ')) {
-      trigger = `${run.requestedGitRef ?? ''}@${run.gitCommitHash?.substring(0, 12) ?? ''}`;
-    }
-  } else if (run.actor?.__typename === 'User') {
-    trigger = run.actor.username;
-  }
-  switch (run.triggerEventType) {
-    case WorkflowRunTriggerEventType.Manual:
-      triggerType = WorkflowTriggerType.MANUAL;
-      break;
-    case WorkflowRunTriggerEventType.GithubPullRequestLabeled:
-    case WorkflowRunTriggerEventType.GithubPullRequestOpened:
-    case WorkflowRunTriggerEventType.GithubPullRequestReopened:
-    case WorkflowRunTriggerEventType.GithubPullRequestSynchronize:
-    case WorkflowRunTriggerEventType.GithubPush:
-      triggerType = WorkflowTriggerType.GITHUB;
-      break;
-    case WorkflowRunTriggerEventType.Schedule:
-      triggerType = WorkflowTriggerType.SCHEDULED;
-      trigger = run.triggeringSchedule ?? '';
-      break;
-  }
-  return { triggerType, trigger };
-}
-
-export function choiceFromWorkflowRun(run: WorkflowRunResult): Choice {
-  const titleArray = [
-    run.workflowFileName,
-    run.status,
-    run.startedAt,
-    run.triggerType,
-    run.trigger,
-  ];
-  return {
-    title: titleArray.join(' - '),
-    value: run.id,
-    description: `ID: ${run.id}, Message: ${run.gitCommitMessage?.split('\n')[0] ?? ''}`,
-  };
-}
-
-export function choiceFromWorkflowJob(job: WorkflowJobResult, index: number): Choice {
-  return {
-    title: `${job.name} - ${job.status}`,
-    value: index,
-    description: `ID: ${job.id}`,
-  };
-}
-
-export function choicesFromWorkflowLogs(logs: WorkflowLogs): Choice[] {
-  return Array.from(logs.keys()).map(step => {
-    const logLines = logs.get(step);
-    const stepStatus =
-      logLines?.filter((line: WorkflowLogLine) => line.marker === 'end-step')[0]?.result ?? '';
-    return {
-      title: `${step} - ${stepStatus}`,
-      value: step,
-    };
-  });
-}
-
-export function processWorkflowRuns(runs: WorkflowRunFragment[]): WorkflowRunResult[] {
-  return runs.map(run => {
-    const finishedAt = run.status === WorkflowRunStatus.InProgress ? null : run.updatedAt;
-    const { triggerType, trigger } = computeTriggerInfoForWorkflowRun(run);
-    return {
-      id: run.id,
-      status: run.status,
-      gitCommitMessage: run.gitCommitMessage?.split('\n')[0] ?? null,
-      gitCommitHash: run.gitCommitHash ?? null,
-      startedAt: run.createdAt,
-      finishedAt,
-      triggerType,
-      trigger,
-      workflowId: run.workflow.id,
-      workflowName: run.workflow.name ?? null,
-      workflowFileName: run.workflow.fileName,
-    };
-  });
-}
-
-export async function processLogsFromJobAsync(
-  job: WorkflowJobResult
-): Promise<WorkflowLogs | null> {
-  const rawLogs = await fetchRawLogsForJobAsync(job);
-  if (!rawLogs) {
-    return null;
-  }
-  const logs: WorkflowLogs = new Map();
-  const logKeys = new Set<string>();
-  rawLogs.split('\n').forEach(line => {
-    try {
-      const parsedLine = JSON.parse(line);
-      const { result, marker } = parsedLine;
-      const { buildStepDisplayName, buildStepInternalId, time, msg } = parsedLine;
-      const stepId = buildStepDisplayName ?? buildStepInternalId;
-      if (stepId) {
-        if (!logKeys.has(stepId)) {
-          logKeys.add(stepId);
-          logs.set(stepId, []);
-        }
-        logs.get(stepId)?.push({ time, msg, result, marker });
-      }
-    } catch {}
-  });
-  return logs;
-}

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

@@ -1,5 +1,4 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { EasJson, EasJsonAccessor, EasJsonUtils } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
@@ -67,13 +66,8 @@ export default class BuildConfigure extends EasCommand {
       nonInteractive: false,
       vcsClient,
     });
-    if (didCreateEasJson) {
-      const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-      const easJsonCliConfig: EasJson['cli'] =
-        (await EasJsonUtils.getCliConfigAsync(easJsonAccessor)) ?? {};
-      if (isUsingEASUpdate(exp, projectId, easJsonCliConfig.updateManifestHostOverride ?? null)) {
-        await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
-      }
+    if (didCreateEasJson && isUsingEASUpdate(exp, projectId)) {
+      await ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir);
     }
 
     // configure expo-updates

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

@@ -1,355 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonAccessor } from '@expo/eas-json';
-import { Errors, Flags } from '@oclif/core';
-import chalk from 'chalk';
-
-import {
-  createBuildProfileAsync,
-  doesBuildProfileExistAsync,
-  ensureProjectConfiguredAsync,
-} from '../../build/configure';
-import { evaluateConfigWithEnvVarsAsync } from '../../build/evaluateConfigWithEnvVarsAsync';
-import { downloadAndRunAsync, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
-import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { createFingerprintAsync } from '../../fingerprint/cli';
-import { BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { toAppPlatform } from '../../graphql/types/AppPlatform';
-import Log from '../../log';
-import { RequestedPlatform } from '../../platform';
-import { resolveWorkflowAsync } from '../../project/workflow';
-import { confirmAsync, promptAsync } from '../../prompts';
-import { expoCommandAsync } from '../../utils/expoCli';
-import { ProfileData, getProfilesAsync } from '../../utils/profiles';
-import { Client } from '../../vcs/vcs';
-
-const DEFAULT_EAS_BUILD_RUN_PROFILE_NAME = 'development-simulator';
-
-export default class BuildDev extends EasCommand {
-  static override hidden: true;
-
-  static override description =
-    'run dev client simulator/emulator build with matching fingerprint or create a new one';
-
-  static override flags = {
-    platform: Flags.enum<Platform.IOS | Platform.ANDROID>({
-      char: 'p',
-      options: [Platform.IOS, Platform.ANDROID],
-    }),
-    profile: Flags.string({
-      char: 'e',
-      description: `Name of the build profile from eas.json. It must be a profile allowing to create emulator/simulator internal distribution dev client builds. The "${DEFAULT_EAS_BUILD_RUN_PROFILE_NAME}" build profile will be selected by default.`,
-      helpValue: 'PROFILE_NAME',
-    }),
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.Vcs,
-    ...this.ContextOptions.Analytics,
-    ...this.ContextOptions.ProjectId,
-  };
-
-  protected override async runAsync(): Promise<any> {
-    const { flags } = await this.parse(BuildDev);
-
-    const {
-      loggedIn: { actor, graphqlClient },
-      getDynamicPrivateProjectConfigAsync,
-      projectDir,
-      analytics,
-      vcsClient,
-      projectId,
-    } = await this.getContextAsync(BuildDev, {
-      nonInteractive: false,
-      withServerSideEnvironment: null,
-    });
-
-    const platform = await this.selectPlatformAsync(flags.platform);
-    if (process.platform !== 'darwin' && platform === Platform.IOS) {
-      Errors.error('Running iOS builds in simulator is only supported on macOS.', { exit: 1 });
-    }
-
-    await vcsClient.ensureRepoExistsAsync();
-    await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
-    await ensureProjectConfiguredAsync({
-      projectDir,
-      nonInteractive: false,
-      vcsClient,
-    });
-
-    const buildProfile = await this.ensureValidBuildRunProfileExistsAsync({
-      projectDir,
-      platform,
-      selectedBuildProfileName: flags.profile,
-      vcsClient,
-    });
-
-    const workflow = await resolveWorkflowAsync(projectDir, platform, vcsClient);
-
-    const { env } = await evaluateConfigWithEnvVarsAsync({
-      buildProfile: buildProfile.profile,
-      buildProfileName: buildProfile.profileName,
-      graphqlClient,
-      getProjectConfig: getDynamicPrivateProjectConfigAsync,
-      opts: { env: buildProfile.profile.env },
-    });
-
-    const fingerprint = await createFingerprintAsync(projectDir, {
-      env,
-      workflow,
-      platforms: [platform],
-    });
-    if (!fingerprint) {
-      Errors.error('Failed to calculate fingerprint', { exit: 1 });
-    }
-    Log.log(`✨ Calculated fingerprint hash: ${fingerprint.hash}`);
-    Log.newLine();
-
-    const builds = await this.getBuildsAsync({
-      graphqlClient,
-      projectId,
-      platform,
-      fingerprint,
-      profile: buildProfile.profileName,
-    });
-    if (builds.length !== 0) {
-      const build = builds[0];
-      Log.succeed(
-        `🎯 Found successful build with matching fingerprint on EAS servers. Running it...`
-      );
-
-      if (build.artifacts?.applicationArchiveUrl) {
-        await downloadAndRunAsync(build);
-        await this.startDevServerAsync({ projectDir, platform });
-        return;
-      } else {
-        Log.warn('Artifacts for this build expired. New build will be started.');
-      }
-    }
-
-    Log.log('🚀 No successful build with matching fingerprint found. Starting a new build...');
-
-    const previousBuildsForSelectedProfile = await this.getBuildsAsync({
-      graphqlClient,
-      projectId,
-      platform,
-      profile: buildProfile.profileName,
-    });
-    if (
-      previousBuildsForSelectedProfile.length > 0 &&
-      previousBuildsForSelectedProfile[0].metrics?.buildDuration
-    ) {
-      Log.log(
-        `🕒 Previous build for "${buildProfile.profileName}" profile completed in ${Math.floor(
-          previousBuildsForSelectedProfile[0].metrics.buildDuration / 60000
-        )} minutes.`
-      );
-    }
-
-    await runBuildAndSubmitAsync({
-      graphqlClient,
-      analytics,
-      vcsClient,
-      projectDir,
-      flags: {
-        requestedPlatform:
-          platform === Platform.ANDROID ? RequestedPlatform.Android : RequestedPlatform.Ios,
-        nonInteractive: false,
-        freezeCredentials: false,
-        wait: true,
-        clearCache: false,
-        json: false,
-        autoSubmit: false,
-        localBuildOptions: {},
-        profile: flags.profile ?? DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-      },
-      actor,
-      getDynamicPrivateProjectConfigAsync,
-      downloadSimBuildAutoConfirm: true,
-      envOverride: env,
-    });
-    await this.startDevServerAsync({ projectDir, platform });
-  }
-
-  private async selectPlatformAsync(platform?: Platform): Promise<Platform> {
-    if (platform) {
-      return platform;
-    }
-    const { resolvedPlatform } = await promptAsync({
-      type: 'select',
-      message: 'Select platform',
-      name: 'resolvedPlatform',
-      choices: [
-        { title: 'Android', value: Platform.ANDROID },
-        { title: 'iOS', value: Platform.IOS },
-      ],
-    });
-    return resolvedPlatform;
-  }
-
-  private async validateBuildRunProfileAsync({
-    platform,
-    buildProfile,
-    buildProfileName,
-  }: {
-    platform: Platform;
-    buildProfile: BuildProfile;
-    buildProfileName: string;
-  }): Promise<void> {
-    if (buildProfile.developmentClient !== true) {
-      Errors.error(
-        `Profile "${buildProfileName}" must specify "developmentClient: true" to create a dev client build. Select a different profile or update the profile in eas.json.`,
-        { exit: 1 }
-      );
-    }
-    if (buildProfile.distribution !== 'internal') {
-      Errors.error(
-        `Profile "${buildProfileName}" must specify "distribution: internal" in order to work with eas build:dev command. Select a different profile or update the profile in eas.json.`,
-        { exit: 1 }
-      );
-    }
-
-    if (platform === Platform.IOS) {
-      const iosProfile = buildProfile as BuildProfile<Platform.IOS>;
-      if (iosProfile.simulator !== true && iosProfile.withoutCredentials !== true) {
-        Errors.error(
-          `Profile "${buildProfileName}" must specify "ios.simulator: true" or "withoutCredentials: true" to create an iOS simulator build. Select a different profile or update the profile in eas.json.`,
-          { exit: 1 }
-        );
-      }
-    } else {
-      const androidProfile = buildProfile as BuildProfile<Platform.ANDROID>;
-      if (
-        androidProfile.distribution !== 'internal' &&
-        androidProfile.withoutCredentials !== true
-      ) {
-        Errors.error(
-          `Profile "${buildProfileName}" must specify "distribution: internal" or "withoutCredentials: true" to create an Android emulator build. Select a different profile or update the profile in eas.json.`,
-          { exit: 1 }
-        );
-      }
-    }
-  }
-
-  private async ensureValidBuildRunProfileExistsAsync({
-    projectDir,
-    platform,
-    selectedBuildProfileName,
-    vcsClient,
-  }: {
-    projectDir: string;
-    platform: Platform;
-    selectedBuildProfileName?: string;
-    vcsClient: Client;
-  }): Promise<ProfileData<'build'>> {
-    if (
-      !!selectedBuildProfileName ||
-      (await doesBuildProfileExistAsync({
-        projectDir,
-        profileName: DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-      }))
-    ) {
-      const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-      const [buildProfile] = await getProfilesAsync({
-        type: 'build',
-        easJsonAccessor,
-        platforms: [platform],
-        profileName: selectedBuildProfileName ?? DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-        projectDir,
-      });
-      await this.validateBuildRunProfileAsync({
-        buildProfileName: selectedBuildProfileName ?? DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-        platform,
-        buildProfile: buildProfile.profile,
-      });
-    } else {
-      const createBuildProfile = await confirmAsync({
-        message: `We want to go ahead and generate "${DEFAULT_EAS_BUILD_RUN_PROFILE_NAME}" build profile for you, that matches eas build:dev criteria. Do you want to proceed?`,
-      });
-      if (!createBuildProfile) {
-        Errors.error(
-          'Come back later or specify different build compliant with eas build:dev requirements by using "--profile" flag.',
-          { exit: 1 }
-        );
-      }
-      await createBuildProfileAsync({
-        projectDir,
-        profileName: DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-        profileContents: {
-          developmentClient: true,
-          distribution: 'internal',
-          ios: {
-            simulator: true,
-          },
-          environment: 'development',
-        },
-        nonInteractive: false,
-        vcsClient,
-      });
-    }
-
-    const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-    const [buildProfile] = await getProfilesAsync({
-      type: 'build',
-      easJsonAccessor,
-      platforms: [platform],
-      profileName: selectedBuildProfileName ?? DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
-      projectDir,
-    });
-    return buildProfile;
-  }
-
-  private async getBuildsAsync({
-    graphqlClient,
-    projectId,
-    platform,
-    fingerprint,
-    profile,
-  }: {
-    graphqlClient: ExpoGraphqlClient;
-    projectId: string;
-    platform: Platform;
-    fingerprint?: { hash: string };
-    profile?: string;
-  }): Promise<BuildFragment[]> {
-    return await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-      appId: projectId,
-      filter: {
-        platform: toAppPlatform(platform),
-        fingerprintHash: fingerprint?.hash,
-        status: BuildStatus.Finished,
-        simulator: platform === Platform.IOS ? true : undefined,
-        distribution: platform === Platform.ANDROID ? DistributionType.Internal : undefined,
-        developmentClient: true,
-        buildProfile: profile,
-      },
-      offset: 0,
-      limit: 1,
-    });
-  }
-
-  private async startDevServerAsync({
-    projectDir,
-    platform,
-  }: {
-    projectDir: string;
-    platform: Platform;
-  }): Promise<void> {
-    Log.newLine();
-    Log.log(
-      `Starting development server: ${chalk.dim(
-        `npx expo start --dev-client ${platform === Platform.IOS ? '--ios' : '--android'}`
-      )}`
-    );
-    await expoCommandAsync(projectDir, [
-      'start',
-      '--dev-client',
-      platform === Platform.IOS ? '--ios' : '--android',
-    ]);
-  }
-}

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

@@ -1,166 +0,0 @@
-import { Platform } from '@expo/eas-build-job';
-import { Errors, Flags } from '@oclif/core';
-import chalk from 'chalk';
-import { pathExists } from 'fs-extra';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import { AppPlatform, BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
-import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { toAppPlatform } from '../../graphql/types/AppPlatform';
-import Log from '../../log';
-import { promptAsync } from '../../prompts';
-import { getEasBuildRunCachedAppPath } from '../../run/run';
-import { downloadAndMaybeExtractAppAsync } from '../../utils/download';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-
-export default class Download extends EasCommand {
-  static override description = 'download simulator/emulator builds for a given fingerprint hash';
-
-  static override flags = {
-    fingerprint: Flags.string({
-      description: 'Fingerprint hash of the build to download',
-      required: true,
-    }),
-    platform: Flags.enum<Platform.IOS | Platform.ANDROID>({
-      char: 'p',
-      options: [Platform.IOS, Platform.ANDROID],
-    }),
-    'dev-client': Flags.boolean({
-      description: 'Filter only dev-client builds.',
-      allowNo: true,
-    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectId,
-  };
-
-  async runAsync(): Promise<void> {
-    const {
-      flags: {
-        json: jsonFlag,
-        platform,
-        fingerprint,
-        'dev-client': developmentClient,
-        'non-interactive': nonInteractive,
-      },
-    } = await this.parse(Download);
-
-    const {
-      loggedIn: { graphqlClient },
-      projectId,
-    } = await this.getContextAsync(Download, {
-      nonInteractive,
-    });
-
-    if (jsonFlag) {
-      enableJsonOutput();
-    }
-
-    const selectedPlatform = await resolvePlatformAsync({ nonInteractive, platform });
-    const build = await this.getBuildAsync({
-      graphqlClient,
-      projectId,
-      platform: selectedPlatform,
-      fingerprintHash: fingerprint,
-      developmentClient,
-    });
-    const buildArtifactPath = await this.getPathToBuildArtifactAsync(build, selectedPlatform);
-    if (jsonFlag) {
-      const jsonResults = { path: buildArtifactPath };
-      printJsonOnlyOutput(jsonResults);
-    } else {
-      Log.log(`Build downloaded to ${chalk.bold(buildArtifactPath)}`);
-    }
-  }
-
-  private async getBuildAsync({
-    graphqlClient,
-    projectId,
-    platform,
-    fingerprintHash,
-    developmentClient,
-  }: {
-    graphqlClient: ExpoGraphqlClient;
-    projectId: string;
-    platform: AppPlatform;
-    fingerprintHash: string;
-    developmentClient: boolean;
-  }): Promise<BuildFragment> {
-    const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-      appId: projectId,
-      filter: {
-        platform,
-        fingerprintHash,
-        status: BuildStatus.Finished,
-        simulator: platform === AppPlatform.Ios ? true : undefined,
-        distribution: platform === AppPlatform.Android ? DistributionType.Internal : undefined,
-        developmentClient,
-      },
-      offset: 0,
-      limit: 1,
-    });
-    if (builds.length === 0) {
-      throw new Errors.CLIError(
-        `No builds available for ${platform} with fingerprint hash ${fingerprintHash}`
-      );
-    }
-
-    Log.succeed(`🎯 Found successful build with matching fingerprint on EAS servers.`);
-    return builds[0];
-  }
-
-  async getPathToBuildArtifactAsync(build: BuildFragment, platform: AppPlatform): Promise<string> {
-    const cachedBuildArtifactPath = getEasBuildRunCachedAppPath(
-      build.project.id,
-      build.id,
-      platform
-    );
-    if (await pathExists(cachedBuildArtifactPath)) {
-      Log.newLine();
-      Log.log(`Using cached build...`);
-      return cachedBuildArtifactPath;
-    }
-
-    if (!build.artifacts?.applicationArchiveUrl) {
-      throw new Error('Build does not have an application archive url');
-    }
-
-    return await downloadAndMaybeExtractAppAsync(
-      build.artifacts.applicationArchiveUrl,
-      platform,
-      cachedBuildArtifactPath
-    );
-  }
-}
-
-async function resolvePlatformAsync({
-  nonInteractive,
-  platform,
-}: {
-  nonInteractive: boolean;
-  platform?: Platform;
-}): Promise<AppPlatform> {
-  if (nonInteractive && !platform) {
-    throw new Error('Platform must be provided in non-interactive mode');
-  }
-
-  if (platform) {
-    return toAppPlatform(platform);
-  }
-
-  const { selectedPlatform } = await promptAsync({
-    type: 'select',
-    message: 'Select platform',
-    name: 'selectedPlatform',
-    choices: [
-      { title: 'Android', value: AppPlatform.Android },
-      { title: 'iOS', value: AppPlatform.Ios },
-    ],
-  });
-  return selectedPlatform;
-}

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

@@ -1,5 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
+import { EasJsonAccessor, EasJsonUtils, ResourceClass } from '@expo/eas-json';
 import { LoggerLevel } from '@expo/logger';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
@@ -17,7 +17,6 @@ import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform'
 import { selectAsync } from '../../prompts';
 import uniq from '../../utils/expodash/uniq';
 import { enableJsonOutput } from '../../utils/json';
-import { ProfileData } from '../../utils/profiles';
 import { maybeWarnAboutEasOutagesAsync } from '../../utils/statuspageService';
 
 interface RawBuildFlags {
@@ -37,8 +36,7 @@ interface RawBuildFlags {
   message?: string;
   'build-logger-level'?: LoggerLevel;
   'freeze-credentials': boolean;
-  'verbose-logs'?: boolean;
-  'what-to-test'?: string;
+  repack: boolean;
 }
 
 export default class Build extends EasCommand {
@@ -80,22 +78,16 @@ export default class Build extends EasCommand {
       description: 'Clear cache before the build',
     }),
     'auto-submit': Flags.boolean({
-      char: 's',
       default: false,
       description:
         'Submit on build complete using the submit profile with the same name as the build profile',
       exclusive: ['auto-submit-with-profile'],
-      aliases: ['submit'],
     }),
     'auto-submit-with-profile': Flags.string({
       description: 'Submit on build complete using the submit profile with provided name',
       helpValue: 'PROFILE_NAME',
       exclusive: ['auto-submit'],
     }),
-    'what-to-test': Flags.string({
-      description:
-        'Specify the "What to Test" information for the build in TestFlight (iOS-only). To be used with the `auto-submit` flag',
-    }),
     'resource-class': Flags.enum({
       options: Object.values(ResourceClass),
       hidden: true,
@@ -118,9 +110,10 @@ export default class Build extends EasCommand {
       default: false,
       description: 'Prevent the build from updating credentials in non-interactive mode',
     }),
-    'verbose-logs': Flags.boolean({
+    repack: Flags.boolean({
       default: false,
-      description: 'Use verbose logs for the build process',
+      hidden: true,
+      description: 'Use the golden dev client build repack flow as it works for onboarding',
     }),
     ...EasNonInteractiveAndJsonFlags,
   };
@@ -165,20 +158,15 @@ export default class Build extends EasCommand {
 
     const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
 
-    const { buildProfiles } = await runBuildAndSubmitAsync({
+    await runBuildAndSubmitAsync(
       graphqlClient,
       analytics,
       vcsClient,
       projectDir,
-      flags: flagsWithPlatform,
+      flagsWithPlatform,
       actor,
-      getDynamicPrivateProjectConfigAsync,
-    });
-
-    this.maybeSuggestUsingEasBuildDev({
-      buildProfiles,
-      nonInteractive: flags.nonInteractive,
-    });
+      getDynamicPrivateProjectConfigAsync
+    );
   }
 
   private sanitizeFlags(
@@ -194,13 +182,6 @@ export default class Build extends EasCommand {
     if (flags.json && !nonInteractive) {
       Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
     }
-    const autoSubmit = flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined;
-    if (flags['what-to-test'] && !autoSubmit) {
-      Errors.error(
-        'The --what-to-test flag can only be used with the --auto-submit or --auto-submit-with-profile flag.',
-        { exit: 1 }
-      );
-    }
 
     const requestedPlatform =
       flags.platform &&
@@ -243,14 +224,13 @@ export default class Build extends EasCommand {
       wait: flags['wait'],
       clearCache: flags['clear-cache'],
       json: flags['json'],
-      autoSubmit,
+      autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
       resourceClass: flags['resource-class'],
       message,
       buildLoggerLevel: flags['build-logger-level'],
       freezeCredentials: flags['freeze-credentials'],
-      isVerboseLoggingEnabled: flags['verbose-logs'],
-      whatToTest: flags['what-to-test'],
+      repack: flags.repack,
     };
   }
 
@@ -286,51 +266,6 @@ export default class Build extends EasCommand {
       requestedPlatform,
     };
   }
-
-  private maybeSuggestUsingEasBuildDev({
-    buildProfiles,
-    nonInteractive,
-  }: {
-    buildProfiles: ProfileData<'build'>[] | undefined;
-    nonInteractive: boolean;
-  }): void {
-    // suggest using eas build:dev if the build configuration results in simulator/emulator dev client build
-    if (
-      !nonInteractive &&
-      !process.env.CI &&
-      buildProfiles?.some(({ profile, platform }) => {
-        if (profile.developmentClient !== true) {
-          return false;
-        }
-        if (profile.distribution !== 'internal') {
-          return false;
-        }
-
-        if (platform === Platform.IOS) {
-          const iosProfile = profile as BuildProfile<Platform.IOS>;
-          if (iosProfile.simulator !== true && iosProfile.withoutCredentials !== true) {
-            return false;
-          }
-        } else {
-          const androidProfile = profile as BuildProfile<Platform.ANDROID>;
-          if (
-            androidProfile.distribution !== 'internal' &&
-            androidProfile.withoutCredentials !== true
-          ) {
-            return false;
-          }
-        }
-        return true;
-      })
-    ) {
-      Log.newLine();
-      Log.log(
-        `🔎 TIP: You are using a build configuration that could benefit from using ${chalk.bold(
-          'eas build:dev'
-        )} command. Run it to install and run cached development build, or create a new one if a compatible build doesn't exist yet.`
-      );
-    }
-  }
 }
 
 export async function handleDeprecatedEasJsonAsync(

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

@@ -99,12 +99,12 @@ export default class BuildInspect extends EasCommand {
       await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {
       try {
-        await runBuildAndSubmitAsync({
+        await runBuildAndSubmitAsync(
           graphqlClient,
           analytics,
           vcsClient,
           projectDir,
-          flags: {
+          {
             nonInteractive: false,
             freezeCredentials: false,
             wait: true,
@@ -121,10 +121,11 @@ export default class BuildInspect extends EasCommand {
               workingdir: tmpWorkingdir,
               artifactsDir: path.join(tmpWorkingdir, 'artifacts'),
             },
+            repack: false,
           },
           actor,
-          getDynamicPrivateProjectConfigAsync,
-        });
+          getDynamicPrivateProjectConfigAsync
+        );
         if (!flags.verbose) {
           Log.log(chalk.green('Build successful'));
         }

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

@@ -6,7 +6,8 @@ import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import EasCommand from '../../commandUtils/EasCommand';
 import { RequestedPlatform } from '../../platform';
 import { enableJsonOutput } from '../../utils/json';
-import GitClient from '../../vcs/clients/git';
+import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
+import NoVcsClient from '../../vcs/clients/noVcs';
 
 /**
  * This command will be run on the EAS Build workers, when building
@@ -63,24 +64,18 @@ export default class BuildInternal extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildInternal, {
       nonInteractive: true,
+      vcsClientOverride: process.env.EAS_NO_VCS ? new NoVcsClient() : new GitNoCommitClient(),
       withServerSideEnvironment: null,
     });
 
-    if (vcsClient instanceof GitClient) {
-      // `build:internal` is run on EAS workers and the repo may have been changed
-      // by pre-install hooks or other scripts. We don't want to require committing changes
-      // to continue the build.
-      vcsClient.requireCommit = false;
-    }
-
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
 
-    await runBuildAndSubmitAsync({
+    await runBuildAndSubmitAsync(
       graphqlClient,
       analytics,
       vcsClient,
       projectDir,
-      flags: {
+      {
         requestedPlatform: flags.platform as RequestedPlatform,
         profile: flags.profile,
         nonInteractive: true,
@@ -93,9 +88,10 @@ export default class BuildInternal extends EasCommand {
           localBuildMode: LocalBuildMode.INTERNAL,
         },
         submitProfile: flags['auto-submit-with-profile'] ?? flags.profile,
+        repack: false,
       },
       actor,
-      getDynamicPrivateProjectConfigAsync,
-    });
+      getDynamicPrivateProjectConfigAsync
+    );
   }
 }

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

@@ -62,9 +62,6 @@ export default class BuildList extends EasCommand {
       aliases: ['gitCommitHash'],
       description: 'Filter only builds created with the specified git commit hash',
     }),
-    'fingerprint-hash': Flags.string({
-      description: 'Filter only builds with the specified fingerprint hash',
-    }),
     ...EasPaginatedQueryFlags,
     limit: getLimitFlagWithCustomValues({ defaultTo: 10, limit: BUILDS_LIMIT }),
     ...EasNonInteractiveAndJsonFlags,
@@ -133,7 +130,6 @@ export default class BuildList extends EasCommand {
         buildProfile: flags['build-profile'],
         gitCommitHash: flags['git-commit-hash'],
         simulator: flags.simulator,
-        fingerprintHash: flags['fingerprint-hash'],
       },
       paginatedQueryOptions,
     });

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

@@ -1,6 +1,7 @@
 import { Errors, Flags } from '@oclif/core';
 import assert from 'assert';
 import { pathExists } from 'fs-extra';
+import path from 'path';
 
 import { getLatestBuildAsync, listAndSelectBuildOnAppAsync } from '../../build/queries';
 import EasCommand from '../../commandUtils/EasCommand';
@@ -16,12 +17,13 @@ import Log from '../../log';
 import { appPlatformDisplayNames } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync } from '../../prompts';
-import { RunArchiveFlags, getEasBuildRunCachedAppPath, runAsync } from '../../run/run';
+import { RunArchiveFlags, runAsync } from '../../run/run';
 import { isRunnableOnSimulatorOrEmulator } from '../../run/utils';
 import {
   downloadAndMaybeExtractAppAsync,
   extractAppFromLocalArchiveAsync,
 } from '../../utils/download';
+import { getEasBuildRunCacheDirectoryPath } from '../../utils/paths';
 
 interface RawRunFlags {
   latest?: boolean;
@@ -243,6 +245,17 @@ async function maybeGetBuildAsync(
   }
 }
 
+function getEasBuildRunCachedAppPath(
+  projectId: string,
+  buildId: string,
+  platform: AppPlatform
+): string {
+  return path.join(
+    getEasBuildRunCacheDirectoryPath(),
+    `${projectId}_${buildId}.${platform === AppPlatform.Ios ? 'app' : 'apk'}`
+  );
+}
+
 async function getPathToSimulatorBuildAppAsync(
   graphqlClient: ExpoGraphqlClient,
   projectId: string,

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

@@ -5,6 +5,7 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
 import { evaluateConfigWithEnvVarsAsync } from '../../../build/evaluateConfigWithEnvVarsAsync';
+import { getVersionConfigTarget } from '../../../build/utils/version';
 import EasCommand from '../../../commandUtils/EasCommand';
 import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
 import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
@@ -111,6 +112,7 @@ export default class BuildVersionSetView extends EasCommand {
       : `What version would you like to initialize it with?`;
     Log.log(currentStateMessage);
 
+    const { versionGetter } = getVersionConfigTarget({ exp, platform });
     const { version } = await promptAsync({
       type: platform === Platform.ANDROID ? 'number' : 'text',
       name: 'version',
@@ -124,7 +126,7 @@ export default class BuildVersionSetView extends EasCommand {
       appId: projectId,
       platform: toAppPlatform(platform),
       applicationIdentifier,
-      storeVersion: exp.version ?? '1.0.0',
+      storeVersion: versionGetter(exp) ?? '1.0.0',
       buildVersion: String(version),
       runtimeVersion:
         (await getRuntimeVersionNullableAsync(projectDir, exp, platform)) ?? undefined,

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

@@ -120,7 +120,7 @@ export default class BuildVersionSyncView extends EasCommand {
       const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform, vcsClient);
       if (!remoteVersions?.buildVersion) {
         Log.warn(
-          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on EAS, use "eas build:version:set" or run a build to initialize it.`
+          `Skipping versions sync for ${platformDisplayName}. There are no versions configured on Expo servers, use "eas build:version:set" or run a build to initialize it.`
         );
         continue;
       }

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

@@ -52,7 +52,7 @@ export default class ChannelDelete extends EasCommand {
 
     let channelId, channelName;
     if (nameArg) {
-      const { id, name } = await ChannelQuery.viewUpdateChannelBasicInfoAsync(graphqlClient, {
+      const { id, name } = await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
         appId: projectId,
         channelName: nameArg,
       });

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

@@ -94,7 +94,7 @@ export default class ChannelEdit extends EasCommand {
     }
 
     const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelBasicInfoAsync(graphqlClient, {
+      ? await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
           appId: projectId,
           channelName: args.name,
         })

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

@@ -86,7 +86,7 @@ export default class ChannelPause extends EasCommand {
     }
 
     const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelBasicInfoAsync(graphqlClient, {
+      ? await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
           appId: projectId,
           channelName: args.name,
         })

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

@@ -86,7 +86,7 @@ export default class ChannelResume extends EasCommand {
     }
 
     const existingChannel = args.name
-      ? await ChannelQuery.viewUpdateChannelBasicInfoAsync(graphqlClient, {
+      ? await ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
           appId: projectId,
           channelName: args.name,
         })

packages/eas-cli/src/commands/deploy/alias/delete.ts

@@ -1,142 +0,0 @@
-import chalk from 'chalk';
-
-import EasCommand from '../../../commandUtils/EasCommand';
-import { ExpoGraphqlClient } from '../../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EasNonInteractiveAndJsonFlags } from '../../../commandUtils/flags';
-import Log from '../../../log';
-import { Ora, ora } from '../../../ora';
-import { toggleConfirmAsync } from '../../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../../utils/json';
-import {
-  deleteWorkerDeploymentAliasAsync,
-  selectWorkerDeploymentAliasOnAppAsync,
-} from '../../../worker/deployment';
-
-interface DeployAliasDeleteFlags {
-  nonInteractive: boolean;
-  json: boolean;
-}
-
-export default class WorkerAliasDelete extends EasCommand {
-  static override description = 'Delete deployment aliases.';
-  static override aliases = ['worker:alias:delete'];
-  static override state = 'preview';
-
-  static override args = [{ name: 'ALIAS_NAME' }];
-  static override flags = {
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  override async runAsync(): Promise<void> {
-    const {
-      args: { ALIAS_NAME: aliasNameFromArg },
-      flags: rawFlags,
-    } = await this.parse(WorkerAliasDelete);
-    const flags = this.sanitizeFlags(rawFlags);
-
-    if (flags.json) {
-      enableJsonOutput();
-    }
-
-    Log.warn('EAS Hosting is still in preview and subject to changes.');
-
-    const {
-      getDynamicPrivateProjectConfigAsync,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(WorkerAliasDelete, {
-      nonInteractive: true,
-      withServerSideEnvironment: null,
-    });
-
-    const { projectId } = await getDynamicPrivateProjectConfigAsync();
-    const aliasName = await resolveDeploymentAliasAsync(
-      flags,
-      graphqlClient,
-      projectId,
-      aliasNameFromArg
-    );
-
-    const isProduction = !aliasName;
-
-    if (!flags.nonInteractive) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        isProduction
-          ? `You are about to delete your production alias`
-          : `You are about to delete alias: "${aliasName}"`
-      );
-      Log.newLine();
-      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
-
-      if (!confirmed) {
-        Log.log('Aborted.');
-        return;
-      }
-    }
-
-    let progress: null | Ora = null;
-    let deleteResult: null | Awaited<ReturnType<typeof deleteWorkerDeploymentAliasAsync>> = null;
-
-    try {
-      progress = ora(chalk`Deleting alias {bold ${aliasName ?? 'production'}}`).start();
-      deleteResult = await deleteWorkerDeploymentAliasAsync({
-        graphqlClient,
-        appId: projectId,
-        aliasName,
-      });
-      progress.text = chalk`Deleted alias {bold ${aliasName ?? 'production'}}`;
-    } catch (error: any) {
-      progress?.fail(chalk`Failed to delete alias {bold ${aliasName ?? 'production'}}`);
-      throw error;
-    }
-
-    progress?.succeed(chalk`Deleted alias {bold ${aliasName ?? 'production'}}`);
-
-    if (flags.json) {
-      printJsonOnlyOutput({
-        aliasName: deleteResult.aliasName,
-        id: deleteResult.id,
-      });
-    }
-  }
-
-  private sanitizeFlags(flags: any): DeployAliasDeleteFlags {
-    return {
-      nonInteractive: flags['non-interactive'],
-      json: flags['json'],
-    };
-  }
-}
-
-async function resolveDeploymentAliasAsync(
-  flags: DeployAliasDeleteFlags,
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  aliasNameFromArg?: string
-): Promise<string> {
-  if (aliasNameFromArg?.trim()) {
-    return aliasNameFromArg.trim().toLowerCase();
-  }
-
-  if (flags.nonInteractive) {
-    throw new Error('Alias name must be provided in non-interactive mode');
-  }
-
-  const alias = await selectWorkerDeploymentAliasOnAppAsync({
-    graphqlClient,
-    appId: projectId,
-    selectTitle: 'alias to delete',
-  });
-
-  if (!alias) {
-    throw new Error('No aliases found for this project, create aliases with "eas deploy:alias"');
-  }
-
-  return alias.aliasName;
-}

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

@@ -1,114 +0,0 @@
-import chalk from 'chalk';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
-import Log from '../../log';
-import { Ora, ora } from '../../ora';
-import { toggleConfirmAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { deleteWorkerDeploymentAsync } from '../../worker/deployment';
-
-interface DeployDeleteFlags {
-  nonInteractive: boolean;
-  json: boolean;
-}
-
-interface RawDeployDeleteFlags {
-  'non-interactive': boolean;
-  json: boolean;
-}
-
-export default class WorkerDelete extends EasCommand {
-  static override description = 'Delete a deployment.';
-  static override aliases = ['worker:delete'];
-  static override state = 'preview';
-
-  static override args = [{ name: 'DEPLOYMENT_ID' }];
-  static override flags = {
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.DynamicProjectConfig,
-    ...this.ContextOptions.ProjectDir,
-    ...this.ContextOptions.LoggedIn,
-  };
-
-  override async runAsync(): Promise<void> {
-    const {
-      args: { DEPLOYMENT_ID: deploymentIdFromArg },
-      flags: rawFlags,
-    } = await this.parse(WorkerDelete);
-    const flags = this.sanitizeFlags(rawFlags);
-
-    if (flags.json) {
-      enableJsonOutput();
-    }
-
-    Log.warn('EAS Hosting is still in preview and subject to changes.');
-
-    const {
-      getDynamicPrivateProjectConfigAsync,
-      loggedIn: { graphqlClient },
-    } = await this.getContextAsync(WorkerDelete, {
-      nonInteractive: true,
-      withServerSideEnvironment: null,
-    });
-
-    const { projectId } = await getDynamicPrivateProjectConfigAsync();
-
-    if (!deploymentIdFromArg) {
-      if (flags.nonInteractive) {
-        throw new Error('Deployment ID must be provided in non-interactive mode');
-      }
-      throw new Error('Deployment ID is required');
-    }
-
-    if (!flags.nonInteractive) {
-      Log.addNewLineIfNone();
-      Log.warn(
-        `You are about to permanently delete deployment with ID: "${deploymentIdFromArg}"` +
-          `\nThis action is irreversible.`
-      );
-      Log.newLine();
-      const confirmed = await toggleConfirmAsync({ message: 'Are you sure you wish to proceed?' });
-
-      if (!confirmed) {
-        Log.log('Aborted.');
-        return;
-      }
-    }
-
-    let progress: Ora | null = null;
-    let deleteResult: null | Awaited<ReturnType<typeof deleteWorkerDeploymentAsync>> = null;
-
-    try {
-      progress = ora(chalk`Deleting deployment {bold ${deploymentIdFromArg}}`).start();
-      deleteResult = await deleteWorkerDeploymentAsync({
-        graphqlClient,
-        appId: projectId,
-        deploymentIdentifier: deploymentIdFromArg,
-      });
-      progress.text = chalk`Deleted deployment {bold ${deploymentIdFromArg}}`;
-    } catch (error: any) {
-      progress?.fail(chalk`Failed to delete deployment {bold ${deploymentIdFromArg}}`);
-      throw error;
-    }
-
-    progress?.succeed(chalk`Deleted deployment {bold ${deploymentIdFromArg}}`);
-
-    if (flags.json) {
-      printJsonOnlyOutput({
-        deploymentId: deleteResult.deploymentIdentifier,
-        id: deleteResult.id,
-      });
-    }
-  }
-
-  private sanitizeFlags(flags: RawDeployDeleteFlags): DeployDeleteFlags {
-    return {
-      nonInteractive: flags['non-interactive'],
-      json: flags['json'],
-    };
-  }
-}

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

@@ -147,10 +147,10 @@ export default class DeviceDelete extends EasCommand {
     graphqlClient: ExpoGraphqlClient,
     chosenDevice: AppleDevice | AppleDeviceQueryResult
   ): Promise<void> {
-    const removalSpinner = ora(`Removing Apple device on EAS`).start();
+    const removalSpinner = ora(`Removing Apple device on Expo`).start();
     try {
       await AppleDeviceMutation.deleteAppleDeviceAsync(graphqlClient, chosenDevice.id);
-      removalSpinner.succeed('Removed Apple device from EAS');
+      removalSpinner.succeed('Removed Apple device from Expo');
     } catch (err) {
       removalSpinner.fail();
       throw err;

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

@@ -105,12 +105,12 @@ export default class DeviceRename extends EasCommand {
     chosenDevice: AppleDevice | AppleDeviceQueryResult,
     newDeviceName: string
   ): Promise<void> {
-    const removalSpinner = ora(`Renaming Apple device on EAS`).start();
+    const removalSpinner = ora(`Renaming Apple device on Expo`).start();
     try {
       await AppleDeviceMutation.updateAppleDeviceAsync(graphqlClient, chosenDevice.id, {
         name: newDeviceName,
       });
-      removalSpinner.succeed('Renamed Apple device on EAS');
+      removalSpinner.succeed('Renamed Apple device on Expo');
     } catch (err) {
       removalSpinner.fail();
       throw err;

packages/eas-cli/src/commands/env/__tests__/EnvCreate.test.ts

@@ -289,7 +289,7 @@ describe(EnvCreate, () => {
       });
     });
 
-    it('creates an account-wide variable', async () => {
+    it('creates an account-wide variable and links it', async () => {
       const command = new EnvCreate(
         [
           '--name',
@@ -302,6 +302,7 @@ describe(EnvCreate, () => {
           'development',
           '--scope',
           'account',
+          '--link',
         ],
         mockConfig
       );
@@ -329,6 +330,18 @@ describe(EnvCreate, () => {
         },
         testAccountId
       );
+      expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        'testId',
+        testProjectId,
+        EnvironmentVariableEnvironment.Production
+      );
+      expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+        graphqlClient,
+        'testId',
+        testProjectId,
+        EnvironmentVariableEnvironment.Development
+      );
     });
 
     it('prompts for missing arguments', async () => {

packages/eas-cli/src/commands/env/__tests__/EnvLink.test.ts

@@ -0,0 +1,271 @@
+import { Config } from '@oclif/core';
+import chalk from 'chalk';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import {
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import { promptAsync, selectAsync, toggleConfirmAsync } from '../../../prompts';
+import EnvLink from '../link';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../log');
+
+describe(EnvLink, () => {
+  const projectId = 'test-project-id';
+  const variableId = '1';
+  const graphqlClient = {};
+  const mockConfig = {} as unknown as Config;
+  const mockContext = {
+    projectId,
+    loggedIn: { graphqlClient },
+  };
+
+  const successMessage = (env: EnvironmentVariableEnvironment): string =>
+    `Linked variable ${chalk.bold('TEST_VARIABLE')} to project ${chalk.bold(
+      '@testuser/testpp'
+    )} in ${env.toLocaleLowerCase()}.`;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+  });
+
+  it('links an account-wide variable to the current project in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+
+    const command = new EnvLink(
+      ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Development)
+    );
+  });
+
+  it('links an account-wide variable to the current project to a specified environment', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+
+    const command = new EnvLink(
+      ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Production)
+    );
+  });
+
+  it('uses --variable-environment to select the variable with ambigous name', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+      },
+      {
+        id: 'other-id',
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockImplementation(
+      (_client, { environment }) => {
+        return mockVariables.filter(v => v.environments.includes(environment));
+      }
+    );
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvLink(
+      [
+        '--variable-name',
+        'TEST_VARIABLE',
+        '--variable-environment',
+        'development',
+        '--environment',
+        'production',
+      ],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      'other-id',
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Production)
+    );
+  });
+
+  it('prompts for variable selection when the name is ambigous', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+      },
+      {
+        id: 'other-id',
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({ environments: mockVariables[0].environments });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvLink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(selectAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Preview)
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow(
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
+    );
+  });
+
+  it('uses environments from prompt to both link and unlink environments', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Preview],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({
+      environments: [EnvironmentVariableEnvironment.Production],
+    });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvLink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(promptAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow(
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
+    );
+  });
+});

packages/eas-cli/src/commands/env/__tests__/EnvUnlink.test.ts

@@ -0,0 +1,226 @@
+import { Config } from '@oclif/core';
+import chalk from 'chalk';
+
+import { getMockAppFragment } from '../../../__tests__/commands/utils';
+import {
+  EnvironmentVariableEnvironment,
+  EnvironmentVariableScope,
+} from '../../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../../graphql/mutations/EnvironmentVariableMutation';
+import { AppQuery } from '../../../graphql/queries/AppQuery';
+import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../../log';
+import { promptAsync, selectAsync, toggleConfirmAsync } from '../../../prompts';
+import EnvUnlink from '../unlink';
+
+jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
+jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
+jest.mock('../../../prompts');
+jest.mock('../../../graphql/queries/AppQuery');
+jest.mock('../../../log');
+
+describe(EnvUnlink, () => {
+  const projectId = 'test-project-id';
+  const variableId = '1';
+  const graphqlClient = {};
+  const mockConfig = {} as unknown as Config;
+  const mockContext = {
+    projectId,
+    loggedIn: { graphqlClient },
+  };
+
+  const successMessage = (env: EnvironmentVariableEnvironment): string =>
+    `Unlinked variable ${chalk.bold('TEST_VARIABLE')} from project ${chalk.bold(
+      '@testuser/testpp'
+    )} in ${env.toLocaleLowerCase()}.`;
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
+  });
+
+  it('unlinks an account-wide variable from the current project in non-interactive mode', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (
+      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
+    ).mockResolvedValue(mockVariables[0]);
+
+    const command = new EnvUnlink(
+      ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Development)
+    );
+  });
+
+  it('unlinks an account-wide variable from the current project in a specified environment', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Production],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (
+      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
+    ).mockResolvedValue(mockVariables[0]);
+
+    const command = new EnvUnlink(
+      ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
+      mockConfig
+    );
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.run();
+
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Production)
+    );
+    expect(EnvironmentVariablesQuery.sharedAsync).toHaveBeenCalledWith(graphqlClient, {
+      appId: projectId,
+      filterNames: ['TEST_VARIABLE'],
+    });
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+  });
+
+  it('prompts for variable selection when the name is ambigous', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Preview],
+      },
+      {
+        id: 'other-id',
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Development],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Development],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (
+      EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
+    ).mockResolvedValue(mockVariables[0]);
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({
+      environments: [],
+    });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvUnlink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(selectAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+    expect(Log.withTick).toHaveBeenCalledWith(
+      successMessage(EnvironmentVariableEnvironment.Preview)
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow(
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
+    );
+  });
+
+  it('uses environments from prompt to both link and unlink environments', async () => {
+    const mockVariables = [
+      {
+        id: variableId,
+        name: 'TEST_VARIABLE',
+        scope: EnvironmentVariableScope.Shared,
+        environments: [EnvironmentVariableEnvironment.Preview],
+        linkedEnvironments: [EnvironmentVariableEnvironment.Preview],
+      },
+    ];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+    (EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync as jest.Mock).mockResolvedValue(
+      mockVariables[0]
+    );
+    (selectAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
+    (promptAsync as jest.Mock).mockResolvedValue({
+      environments: [EnvironmentVariableEnvironment.Production],
+    });
+    (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
+
+    const command = new EnvUnlink([], mockConfig);
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await command.runAsync();
+
+    expect(promptAsync).toHaveBeenCalled();
+    expect(EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Production
+    );
+    expect(EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync).toHaveBeenCalledWith(
+      graphqlClient,
+      variableId,
+      projectId,
+      EnvironmentVariableEnvironment.Preview
+    );
+  });
+
+  it('throws an error when variable name is not found', async () => {
+    const mockVariables: never[] = [];
+    (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
+
+    const command = new EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+
+    // @ts-expect-error
+    jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
+    await expect(command.runAsync()).rejects.toThrow(
+      "Account-wide variable NON_EXISTENT_VARIABLE doesn't exist"
+    );
+  });
+});

packages/eas-cli/src/commands/env/create.ts

@@ -33,11 +33,12 @@ import {
   promptVariableValueAsync,
   promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
+import { isEnvironment, performForEnvironmentsAsync } from '../../utils/variableUtils';
 
 interface RawCreateFlags {
   name?: string;
   value?: string;
+  link?: boolean;
   force?: boolean;
   type?: 'string' | 'file';
   visibility?: 'plaintext' | 'sensitive' | 'secret';
@@ -49,6 +50,7 @@ interface RawCreateFlags {
 interface CreateFlags {
   name?: string;
   value?: string;
+  link?: boolean;
   force?: boolean;
   type?: 'string' | 'file';
   visibility?: 'plaintext' | 'sensitive' | 'secret';
@@ -76,6 +78,10 @@ export default class EnvCreate extends EasCommand {
     value: Flags.string({
       description: 'Text value or the variable',
     }),
+    link: Flags.boolean({
+      description: 'Link account-wide variable to the current project',
+      hidden: true, // every account-wide variable is global for now so it's not user facing
+    }),
     force: Flags.boolean({
       description: 'Overwrite existing variable',
       default: false,
@@ -108,6 +114,7 @@ export default class EnvCreate extends EasCommand {
       'non-interactive': nonInteractive,
       environment: environments,
       visibility,
+      link,
       force,
       type,
       fileName,
@@ -147,6 +154,29 @@ export default class EnvCreate extends EasCommand {
           });
           overwrite = true;
         }
+        if (existingVariable.scope === EnvironmentVariableScope.Shared) {
+          await this.promptForOverwriteAsync({
+            nonInteractive,
+            force,
+            message: `Account-wide variable with ${name} name already exists on this account.`,
+            suggestion: 'Do you want to unlink it first?',
+          });
+
+          Log.withTick(
+            `Unlinking account-wide variable ${chalk.bold(name)} on project ${chalk.bold(
+              projectDisplayName
+            )}.`
+          );
+
+          await performForEnvironmentsAsync(environments, async environment => {
+            await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+              graphqlClient,
+              existingVariable.id,
+              projectId,
+              environment
+            );
+          });
+        }
       }
 
       const variable =
@@ -235,6 +265,29 @@ export default class EnvCreate extends EasCommand {
       Log.withTick(
         `Created a new variable ${chalk.bold(name)} on account ${chalk.bold(ownerAccount.name)}.`
       );
+
+      if (link) {
+        Log.withTick(
+          `Linking account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
+            projectDisplayName
+          )}.`
+        );
+
+        await performForEnvironmentsAsync(environments, async environment => {
+          await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+            graphqlClient,
+            variable.id,
+            projectId,
+            environment
+          );
+        });
+
+        Log.withTick(
+          `Linked account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
+            projectDisplayName
+          )}.`
+        );
+      }
     }
   }
 
@@ -349,6 +402,7 @@ export default class EnvCreate extends EasCommand {
       value,
       environment: newEnvironments,
       visibility: newVisibility,
+      link: rest.link ?? false,
       force: rest.force ?? false,
       'non-interactive': nonInteractive,
       type: newType,
@@ -358,6 +412,12 @@ export default class EnvCreate extends EasCommand {
   }
 
   private sanitizeFlags(flags: RawCreateFlags): CreateFlags {
+    if (flags.scope !== 'account' && flags.link) {
+      throw new Error(
+        `Unexpected argument: --link can only be used when creating account-wide variables`
+      );
+    }
+
     return {
       ...flags,
       scope:

packages/eas-cli/src/commands/env/exec.ts

@@ -53,10 +53,9 @@ export default class EnvExec extends EasCommand {
     },
   ];
 
-  private isNonInteractive: boolean = false;
-
   async runAsync(): Promise<void> {
     const { flags, args } = await this.parse(EnvExec);
+
     const parsedFlags = this.sanitizeFlagsAndArgs(flags, args);
 
     const {
@@ -66,8 +65,6 @@ export default class EnvExec extends EasCommand {
       nonInteractive: parsedFlags.nonInteractive,
     });
 
-    this.isNonInteractive = parsedFlags.nonInteractive;
-
     const environment =
       parsedFlags.environment ??
       (await promptVariableEnvironmentAsync({ nonInteractive: parsedFlags.nonInteractive }));
@@ -75,20 +72,12 @@ export default class EnvExec extends EasCommand {
       graphqlClient,
       projectId,
       environment,
-      nonInteractive: parsedFlags.nonInteractive,
     });
 
-    if (parsedFlags.nonInteractive) {
-      await this.runCommandNonInteractiveWithEnvVarsAsync({
-        command: parsedFlags.command,
-        environmentVariables,
-      });
-    } else {
-      await this.runCommandWithEnvVarsAsync({
-        command: parsedFlags.command,
-        environmentVariables,
-      });
-    }
+    await this.runCommandWithEnvVarsAsync({
+      command: parsedFlags.command,
+      environmentVariables,
+    });
   }
 
   private sanitizeFlagsAndArgs(
@@ -107,48 +96,13 @@ export default class EnvExec extends EasCommand {
       throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
     }
 
-    const firstChar = bash_command[0];
-    const lastChar = bash_command[bash_command.length - 1];
-    const cleanCommand =
-      (firstChar === '"' && lastChar === '"') || (firstChar === "'" && lastChar === "'")
-        ? bash_command.slice(1, -1)
-        : bash_command;
-
     return {
       nonInteractive: rawFlags['non-interactive'],
       environment,
-      command: cleanCommand,
+      command: bash_command,
     };
   }
 
-  // eslint-disable-next-line async-protect/async-suffix
-  protected override async catch(err: Error): Promise<any> {
-    // when in non-interactive, make the behavior of this command a pure passthrough, outputting only the subprocess' stdout and stderr and exiting with the
-    // sub-command's exit status
-    if (this.isNonInteractive) {
-      process.exitCode = process.exitCode ?? (err as any).status ?? 1;
-    } else {
-      await super.catch(err);
-    }
-  }
-
-  private async runCommandNonInteractiveWithEnvVarsAsync({
-    command,
-    environmentVariables,
-  }: {
-    command: string;
-    environmentVariables: Record<string, string>;
-  }): Promise<void> {
-    await spawnAsync(command, [], {
-      shell: true,
-      stdio: 'inherit',
-      env: {
-        ...process.env,
-        ...environmentVariables,
-      },
-    });
-  }
-
   private async runCommandWithEnvVarsAsync({
     command,
     environmentVariables,
@@ -157,8 +111,7 @@ export default class EnvExec extends EasCommand {
     environmentVariables: Record<string, string>;
   }): Promise<void> {
     Log.log(`Running command: ${chalk.bold(command)}`);
-    const spawnPromise = spawnAsync(command, [], {
-      shell: true,
+    const spawnPromise = spawnAsync('bash', ['-c', command], {
       stdio: ['inherit', 'pipe', 'pipe'],
       env: {
         ...process.env,
@@ -194,12 +147,10 @@ export default class EnvExec extends EasCommand {
     graphqlClient,
     projectId,
     environment,
-    nonInteractive,
   }: {
     graphqlClient: ExpoGraphqlClient;
     projectId: string;
     environment: EnvironmentVariableEnvironment;
-    nonInteractive: boolean;
   }): Promise<Record<string, string>> {
     const environmentVariablesQueryResult =
       await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(graphqlClient, {
@@ -211,20 +162,18 @@ export default class EnvExec extends EasCommand {
       ({ value }) => !!value
     );
 
-    if (!nonInteractive) {
-      if (nonSecretEnvironmentVariables.length > 0) {
-        Log.log(
-          `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${nonSecretEnvironmentVariables
-            .map(e => e.name)
-            .join(', ')}.`
-        );
-      } else {
-        Log.log(
-          `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
-        );
-      }
-      Log.newLine();
+    if (nonSecretEnvironmentVariables.length > 0) {
+      Log.log(
+        `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${nonSecretEnvironmentVariables
+          .map(e => e.name)
+          .join(', ')}.`
+      );
+    } else {
+      Log.log(
+        `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS servers.`
+      );
     }
+    Log.newLine();
 
     const environmentVariables: Record<string, string> = {};
     for (const { name, value } of nonSecretEnvironmentVariables) {

packages/eas-cli/src/commands/env/link.ts

@@ -0,0 +1,204 @@
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import {
+  EASMultiEnvironmentFlag,
+  EASNonInteractiveFlag,
+  EasEnvironmentFlagParameters,
+} from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
+import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../log';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { selectAsync } from '../../prompts';
+import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+
+type LinkFlags = {
+  'variable-name'?: string;
+  'variable-environment'?: EnvironmentVariableEnvironment;
+  'non-interactive': boolean;
+  environment?: EnvironmentVariableEnvironment[];
+};
+
+export default class EnvLink extends EasCommand {
+  static override description = 'link an account-wide environment variable to the current project';
+
+  // for now we only roll out global account-wide env variables so this should stay hidden
+  static override hidden = true;
+
+  static override flags = {
+    'variable-name': Flags.string({
+      description: 'Name of the variable',
+    }),
+    'variable-environment': Flags.enum<EnvironmentVariableEnvironment>({
+      ...EasEnvironmentFlagParameters,
+      description: 'Current environment of the variable to link',
+    }),
+    ...EASMultiEnvironmentFlag,
+    ...EASNonInteractiveFlag,
+  };
+
+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(EnvLink);
+
+    let {
+      'variable-name': name,
+      'variable-environment': currentEnvironment,
+      'non-interactive': nonInteractive,
+      environment: environments,
+    } = this.validateInputs(flags, args);
+
+    const {
+      projectId,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(EnvLink, {
+      nonInteractive,
+    });
+
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
+      appId: projectId,
+      environment: currentEnvironment,
+      filterNames: name ? [name] : undefined,
+    });
+
+    let selectedVariable = variables[0];
+
+    if (variables.length > 1) {
+      if (nonInteractive) {
+        throw new Error(
+          'Multiple variables found, run command with --variable-name and --variable-environment arguments.'
+        );
+      }
+      selectedVariable = await selectAsync(
+        'Select account-wide variable',
+        variables.map(variable => ({
+          title: formatVariableName(variable),
+          value: variable,
+        }))
+      );
+    }
+
+    if (!selectedVariable) {
+      throw new Error(`Account-wide variable ${name} doesn't exist`);
+    }
+
+    let explicitSelect = false;
+    if (!nonInteractive && !environments) {
+      const selectedEnvironments =
+        (selectedVariable.linkedEnvironments ?? []).length > 0
+          ? selectedVariable.linkedEnvironments
+          : selectedVariable.environments;
+      environments = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: true,
+        selectedEnvironments: selectedEnvironments ?? [],
+      });
+      explicitSelect = true;
+    }
+
+    if (!environments) {
+      await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+        graphqlClient,
+        selectedVariable.id,
+        projectId
+      );
+      Log.withTick(
+        `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
+          projectDisplayName
+        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
+      );
+      return;
+    }
+
+    for (const environment of Object.values(EnvironmentVariableEnvironment)) {
+      try {
+        if (
+          selectedVariable.linkedEnvironments?.includes(environment) ===
+          environments.includes(environment)
+        ) {
+          if (!explicitSelect && environments.includes(environment)) {
+            Log.withTick(
+              `Variable ${chalk.bold(
+                selectedVariable.name
+              )} is already linked to ${environment.toLocaleLowerCase()}.`
+            );
+          }
+          continue;
+        }
+        if (environments.includes(environment)) {
+          await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+            graphqlClient,
+            selectedVariable.id,
+            projectId,
+            environment
+          );
+          Log.withTick(
+            `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
+              projectDisplayName
+            )} in ${environment.toLocaleLowerCase()}.`
+          );
+        } else if (explicitSelect) {
+          await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+            graphqlClient,
+            selectedVariable.id,
+            projectId,
+            environment
+          );
+          Log.withTick(
+            `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
+              projectDisplayName
+            )} in ${environment.toLocaleLowerCase()}.`
+          );
+        }
+      } catch (err: any) {
+        Log.warn(err.message);
+      }
+    }
+  }
+  private validateInputs(flags: LinkFlags, { environment }: { environment?: string }): LinkFlags {
+    environment = environment?.toUpperCase();
+
+    if (environment && !isEnvironment(environment)) {
+      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
+    }
+
+    const environments = flags.environment
+      ? flags.environment
+      : environment
+        ? [environment as EnvironmentVariableEnvironment]
+        : undefined;
+
+    if (flags['non-interactive']) {
+      if (!flags['variable-name']) {
+        throw new Error(
+          `Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with ${chalk.bold(
+            '--variable-name VARIABLE_NAME'
+          )} flag to fix the issue`
+        );
+      }
+    }
+
+    return {
+      ...flags,
+      environment: environments,
+    };
+  }
+}

packages/eas-cli/src/commands/env/unlink.ts

@@ -0,0 +1,192 @@
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../commandUtils/EasCommand';
+import { EASMultiEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EnvironmentVariableEnvironment } from '../../graphql/generated';
+import { EnvironmentVariableMutation } from '../../graphql/mutations/EnvironmentVariableMutation';
+import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
+import Log from '../../log';
+import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
+import { selectAsync } from '../../prompts';
+import { promptVariableEnvironmentAsync } from '../../utils/prompts';
+import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+
+type UnlinkFlags = {
+  'variable-name'?: string;
+  'non-interactive': boolean;
+  environment?: EnvironmentVariableEnvironment[];
+};
+
+export default class EnvUnlink extends EasCommand {
+  static override description =
+    'unlink an account-wide environment variable from the current project';
+
+  // for now we only roll out global account-wide env variables so this should stay hidden
+  static override hidden = true;
+
+  static override flags = {
+    'variable-name': Flags.string({
+      description: 'Name of the variable',
+    }),
+    ...EASMultiEnvironmentFlag,
+    ...EASNonInteractiveFlag,
+  };
+
+  static override contextDefinition = {
+    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.LoggedIn,
+  };
+
+  static override args = [
+    {
+      name: 'environment',
+      description:
+        "Environment to unlink the variable from. One of 'production', 'preview', or 'development'.",
+      required: false,
+    },
+  ];
+
+  async runAsync(): Promise<void> {
+    const { args, flags } = await this.parse(EnvUnlink);
+
+    let {
+      'variable-name': name,
+      'non-interactive': nonInteractive,
+      environment: unlinkEnvironments,
+    } = this.validateInputs(flags, args);
+
+    const {
+      projectId,
+      loggedIn: { graphqlClient },
+    } = await this.getContextAsync(EnvUnlink, {
+      nonInteractive,
+    });
+
+    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    const variables = await EnvironmentVariablesQuery.sharedAsync(graphqlClient, {
+      appId: projectId,
+      filterNames: name ? [name] : undefined,
+    });
+
+    let selectedVariable = variables[0];
+
+    if (variables.length > 1) {
+      if (nonInteractive) {
+        throw new Error("Multiple variables found, please select one using '--variable-name'");
+      }
+      selectedVariable = await selectAsync(
+        'Select account-wide variable',
+        variables.map(variable => ({
+          title: formatVariableName(variable),
+          value: variable,
+        }))
+      );
+    }
+
+    if (!selectedVariable) {
+      throw new Error(`Account-wide variable ${name} doesn't exist`);
+    }
+
+    let explicitSelect = false;
+
+    if (!nonInteractive && !unlinkEnvironments) {
+      const selectedEnvironments =
+        (selectedVariable.linkedEnvironments ?? []).length > 0
+          ? selectedVariable.linkedEnvironments
+          : selectedVariable.environments;
+      const environments = await promptVariableEnvironmentAsync({
+        nonInteractive,
+        multiple: true,
+        selectedEnvironments: selectedEnvironments ?? [],
+      });
+      explicitSelect = true;
+      unlinkEnvironments = Object.values(EnvironmentVariableEnvironment).filter(
+        env => !environments.includes(env)
+      );
+    }
+
+    if (!unlinkEnvironments) {
+      await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+        graphqlClient,
+        selectedVariable.id,
+        projectId
+      );
+      Log.withTick(
+        `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
+          projectDisplayName
+        )} in ${selectedVariable.environments?.join(', ').toLocaleLowerCase()}.`
+      );
+      return;
+    }
+
+    for (const environment of Object.values(EnvironmentVariableEnvironment)) {
+      if (
+        selectedVariable.linkedEnvironments?.includes(environment) !==
+        unlinkEnvironments.includes(environment)
+      ) {
+        if (!explicitSelect && unlinkEnvironments.includes(environment)) {
+          Log.withTick(
+            `Variable ${chalk.bold(
+              selectedVariable.name
+            )} is already unlinked from ${environment.toLocaleLowerCase()}.`
+          );
+        }
+        continue;
+      }
+      if (unlinkEnvironments.includes(environment)) {
+        await EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync(
+          graphqlClient,
+          selectedVariable.id,
+          projectId,
+          environment
+        );
+        Log.withTick(
+          `Unlinked variable ${chalk.bold(selectedVariable.name)} from project ${chalk.bold(
+            projectDisplayName
+          )} in ${environment.toLocaleLowerCase()}.`
+        );
+      } else if (explicitSelect) {
+        await EnvironmentVariableMutation.linkSharedEnvironmentVariableAsync(
+          graphqlClient,
+          selectedVariable.id,
+          projectId,
+          environment
+        );
+        Log.withTick(
+          `Linked variable ${chalk.bold(selectedVariable.name)} to project ${chalk.bold(
+            projectDisplayName
+          )} in ${environment.toLocaleLowerCase()}.`
+        );
+      }
+    }
+  }
+
+  private validateInputs(
+    flags: UnlinkFlags,
+    { environment }: { environment?: string }
+  ): UnlinkFlags {
+    if (flags['non-interactive']) {
+      if (!flags['variable-name']) {
+        throw new Error(
+          'Current name is required in non-interactive mode. Run the command with --variable-name flag.'
+        );
+      }
+    }
+
+    if (environment) {
+      environment = environment.toUpperCase();
+      if (!isEnvironment(environment)) {
+        throw new Error(
+          "Invalid environment. Use one of 'production', 'preview', or 'development'."
+        );
+      }
+      return {
+        environment: [environment],
+        ...flags,
+      };
+    }
+
+    return flags;
+  }
+}

packages/eas-cli/src/commands/fingerprint/compare.ts

@@ -1,106 +1,33 @@
+import { Platform } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
-import openBrowserAsync from 'better-opn';
 import chalk from 'chalk';
 
-import { getExpoWebsiteBaseUrl } from '../../api';
-import { selectBranchOnAppAsync } from '../../branch/queries';
 import EasCommand from '../../commandUtils/EasCommand';
 import { fetchBuildsAsync, formatBuild } from '../../commandUtils/builds';
-import { GetServerSideEnvironmentVariablesFn } from '../../commandUtils/context/ServerSideEnvironmentVariablesContextField';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import {
-  EasEnvironmentFlagParameters,
-  EasNonInteractiveAndJsonFlags,
-} from '../../commandUtils/flags';
-import { diffFingerprint } from '../../fingerprint/cli';
-import { abridgedDiff } from '../../fingerprint/diff';
-import { Fingerprint, FingerprintDiffItem } from '../../fingerprint/types';
-import {
-  getFingerprintInfoFromLocalProjectForPlatformsAsync,
-  stringToAppPlatform,
-} from '../../fingerprint/utils';
-import {
-  AppPlatform,
-  BuildFragment,
-  BuildStatus,
-  EnvironmentVariableEnvironment,
-  FingerprintFragment,
-  UpdateFragment,
-} from '../../graphql/generated';
-import { AppQuery } from '../../graphql/queries/AppQuery';
+import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
+import { AppPlatform, BuildStatus } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
-import { FingerprintQuery } from '../../graphql/queries/FingerprintQuery';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery';
-import Log, { learnMore } from '../../log';
+import Log from '../../log';
 import { ora } from '../../ora';
 import { RequestedPlatform } from '../../platform';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
-import { promptAsync, selectAsync } from '../../prompts';
-import { selectUpdateGroupOnBranchAsync } from '../../update/queries';
+import { resolveWorkflowPerPlatformAsync } from '../../project/workflow';
+import { selectAsync } from '../../prompts';
+import { Fingerprint, FingerprintDiffItem } from '../../utils/fingerprint';
+import { createFingerprintAsync, diffFingerprint } from '../../utils/fingerprintCli';
+import { abridgedDiff } from '../../utils/fingerprintDiff';
 import formatFields, { FormatFieldsItem } from '../../utils/formatFields';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { Client } from '../../vcs/vcs';
-
-enum FingerprintOriginType {
-  Build = 'build',
-  Update = 'update',
-  Hash = 'hash',
-  Project = 'project',
-}
-
-type FingerprintOrigin = {
-  type: FingerprintOriginType;
-  build?: BuildFragment;
-  update?: UpdateFragment;
-};
+import { enableJsonOutput } from '../../utils/json';
 
 export default class FingerprintCompare extends EasCommand {
-  static override description = 'compare fingerprints of the current project, builds, and updates';
-  static override strict = false;
-
-  static override examples = [
-    '$ eas fingerprint:compare \t # Compare fingerprints in interactive mode',
-    '$ eas fingerprint:compare <FINGERPRINT-HASH> \t # Compare fingerprint against local directory',
-    '$ eas fingerprint:compare <FINGERPRINT-HASH-1> <FINGERPRINT-HASH-2> \t # Compare provided fingerprints',
-    '$ eas fingerprint:compare --build-id <BUILD-ID> \t # Compare fingerprint from build against local directory',
-    '$ eas fingerprint:compare --build-id <BUILD-ID> --environment production \t # Compare fingerprint from build against local directory with the "production" environment',
-    '$ eas fingerprint:compare --build-id <BUILD-ID-1> --build-id <BUILD-ID-2>\t # Compare fingerprint from a build against another build',
-    '$ eas fingerprint:compare --build-id <BUILD-ID> --update-id <UPDATE-ID>\t # Compare fingerprint from build against fingerprint from update',
-    '$ eas fingerprint:compare <FINGERPRINT-HASH> --update-id <UPDATE-ID> \t # Compare fingerprint from update against provided fingerprint',
-  ];
-
-  static override args = [
-    {
-      name: 'hash1',
-      description:
-        "If provided alone, HASH1 is compared against the current project's fingerprint.",
-      required: false,
-    },
-    {
-      name: 'hash2',
-      description: 'If two hashes are provided, HASH1 is compared against HASH2.',
-      required: false,
-    },
-  ];
+  static override description = 'compare fingerprints of the current project, builds and updates';
+  static override hidden = true;
 
   static override flags = {
     'build-id': Flags.string({
       aliases: ['buildId'],
       description: 'Compare the fingerprint with the build with the specified ID',
-      multiple: true,
-    }),
-    'update-id': Flags.string({
-      aliases: ['updateId'],
-      description: 'Compare the fingerprint with the update with the specified ID',
-      multiple: true,
-    }),
-    open: Flags.boolean({
-      description: 'Open the fingerprint comparison in the browser',
-    }),
-    environment: Flags.enum<EnvironmentVariableEnvironment>({
-      ...EasEnvironmentFlagParameters,
-      description:
-        'If generating a fingerprint from the local directory, use the specified environment.',
     }),
     ...EasNonInteractiveAndJsonFlags,
   };
@@ -110,95 +37,71 @@ export default class FingerprintCompare extends EasCommand {
     ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
-    ...this.ContextOptions.ServerSideEnvironmentVariables,
   };
 
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(FingerprintCompare);
-    const { hash1, hash2 } = args;
-    const {
-      json,
-      'non-interactive': nonInteractive,
-      'build-id': buildIds,
-      'update-id': updateIds,
-      open,
-      environment,
-    } = flags;
-    const [buildId1, buildId2] = buildIds ?? [];
-    const [updateId1, updateId2] = updateIds ?? [];
+    const { flags } = await this.parse(FingerprintCompare);
+    const { json: jsonFlag, 'non-interactive': nonInteractive, buildId: buildIdFromArg } = flags;
 
     const {
       projectId,
       privateProjectConfig: { projectDir },
       loggedIn: { graphqlClient },
       vcsClient,
-      getServerSideEnvironmentVariablesAsync,
     } = await this.getContextAsync(FingerprintCompare, {
       nonInteractive,
-      withServerSideEnvironment: environment ?? null,
+      withServerSideEnvironment: null,
     });
-    if (json) {
+    if (jsonFlag) {
       enableJsonOutput();
     }
 
-    const firstFingerprintInfo = await getFingerprintInfoAsync(
-      graphqlClient,
-      projectDir,
-      projectId,
-      vcsClient,
-      getServerSideEnvironmentVariablesAsync,
-      {
-        nonInteractive,
-        buildId: buildId1,
-        updateId: updateId1,
-        hash: hash1,
+    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
+    let buildId: string | null = buildIdFromArg;
+    if (!buildId) {
+      if (nonInteractive) {
+        throw new Error('Build ID must be provided in non-interactive mode');
       }
-    );
-    const { fingerprint: firstFingerprint, origin: firstFingerprintOrigin } = firstFingerprintInfo;
 
-    const isFirstFingerprintSpecifiedByFlagOrArg = hash1 || buildId1 || updateId1;
-    const isSecondFingerprintSpecifiedByFlagOrArg = hash2 || buildId2 || updateId2;
-    const secondFingerprintInfo = await getFingerprintInfoAsync(
-      graphqlClient,
-      projectDir,
-      projectId,
-      vcsClient,
-      getServerSideEnvironmentVariablesAsync,
-      {
-        nonInteractive,
-        buildId: buildId2,
-        updateId: updateId2,
-        hash: hash2,
-        useProjectFingerprint:
-          isFirstFingerprintSpecifiedByFlagOrArg && !isSecondFingerprintSpecifiedByFlagOrArg,
-        environmentForProjectFingerprint: environment,
-      },
-      firstFingerprintInfo
-    );
-    const { fingerprint: secondFingerprint, origin: secondFingerprintOrigin } =
-      secondFingerprintInfo;
-
-    if (json) {
-      printJsonOnlyOutput({ fingerprint1: firstFingerprint, fingerprint2: secondFingerprint });
-      return;
+      buildId = await selectBuildToCompareAsync(graphqlClient, projectId, displayName, {
+        filters: { hasFingerprint: true },
+      });
+      if (!buildId) {
+        return;
+      }
     }
 
-    if (firstFingerprint.hash === secondFingerprint.hash) {
-      Log.log(
-        `✅ ${capitalizeFirstLetter(
-          prettyPrintFingerprint(firstFingerprint, firstFingerprintOrigin)
-        )} matches ${prettyPrintFingerprint(secondFingerprint, secondFingerprintOrigin)}`
-      );
+    Log.log(`Comparing fingerprints of the current project and build ${buildId}…`);
+    const buildWithFingerprint = await BuildQuery.withFingerprintByIdAsync(graphqlClient, buildId);
+    const fingerprintDebugUrl = buildWithFingerprint.fingerprint?.debugInfoUrl;
+    if (!fingerprintDebugUrl) {
+      Log.error('A fingerprint for the build could not be found.');
+      return;
+    }
+    const fingerprintResponse = await fetch(fingerprintDebugUrl);
+    const fingerprint = (await fingerprintResponse.json()) as Fingerprint;
+    const workflows = await resolveWorkflowPerPlatformAsync(projectDir, vcsClient);
+    const buildPlatform = buildWithFingerprint.platform;
+    const workflow = workflows[appPlatformToPlatform(buildPlatform)];
+
+    const projectFingerprint = await createFingerprintAsync(projectDir, {
+      workflow,
+      platforms: [appPlatformToString(buildPlatform)],
+      debug: true,
+      env: undefined,
+    });
+    if (!projectFingerprint) {
+      Log.error('Project fingerprints can only be computed for projects with SDK 52 or higher');
+      return;
+    }
+    if (fingerprint.hash === projectFingerprint.hash) {
+      Log.log(`✅ Project fingerprint matches build`);
       return;
     } else {
-      Log.log(
-        `🔄 ${capitalizeFirstLetter(
-          prettyPrintFingerprint(firstFingerprint, firstFingerprintOrigin)
-        )} differs from ${prettyPrintFingerprint(secondFingerprint, secondFingerprintOrigin)}`
-      );
+      Log.log(`🔄 Project fingerprint differs from build`);
     }
 
-    const fingerprintDiffs = diffFingerprint(projectDir, firstFingerprint, secondFingerprint);
+    const fingerprintDiffs = diffFingerprint(projectDir, fingerprint, projectFingerprint);
     if (!fingerprintDiffs) {
       Log.error('Fingerprint diffs can only be computed for projects with SDK 52 or higher');
       return;
@@ -248,390 +151,9 @@ export default class FingerprintCompare extends EasCommand {
     for (const diff of contentDiffs) {
       printContentDiff(diff);
     }
-
-    if (nonInteractive) {
-      return;
-    }
-
-    const project = await AppQuery.byIdAsync(graphqlClient, projectId);
-    const fingerprintCompareUrl = new URL(
-      `/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/compare/${firstFingerprintInfo.fingerprint.hash}/${secondFingerprintInfo.fingerprint.hash}`,
-      getExpoWebsiteBaseUrl()
-    );
-
-    if (!open) {
-      Log.newLine();
-      Log.withInfo(
-        `💡 Use the --open flag to view the comparison in the browser. ${learnMore(
-          fingerprintCompareUrl.toString()
-        )}`
-      );
-      return;
-    }
-    await openBrowserAsync(fingerprintCompareUrl.toString());
   }
 }
 
-async function getFingerprintInfoAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectDir: string,
-  projectId: string,
-  vcsClient: Client,
-  getServerSideEnvironmentVariablesAsync: GetServerSideEnvironmentVariablesFn,
-  {
-    buildId,
-    updateId,
-    hash,
-    useProjectFingerprint,
-    environmentForProjectFingerprint,
-    nonInteractive,
-  }: {
-    buildId?: string;
-    updateId?: string;
-    hash: string;
-    useProjectFingerprint?: boolean;
-    environmentForProjectFingerprint?: string;
-    nonInteractive: boolean;
-  },
-  firstFingerprintInfo?: {
-    fingerprint: Fingerprint;
-    platforms?: AppPlatform[];
-    origin: FingerprintOrigin;
-  }
-): Promise<{ fingerprint: Fingerprint; origin: FingerprintOrigin }> {
-  if (hash) {
-    return await getFingerprintInfoFromHashAsync(graphqlClient, projectId, hash);
-  } else if (updateId) {
-    return await getFingerprintInfoFromUpdateGroupIdOrUpdateIdAsync(
-      graphqlClient,
-      projectId,
-      nonInteractive,
-      updateId
-    );
-  } else if (buildId) {
-    return await getFingerprintInfoFromBuildIdAsync(graphqlClient, buildId);
-  } else if (useProjectFingerprint) {
-    if (!firstFingerprintInfo) {
-      throw new Error(
-        'First fingerprint must be provided in order to compare against the project.'
-      );
-    }
-    return await getFingerprintInfoFromLocalProjectAsync({
-      graphqlClient,
-      projectDir,
-      projectId,
-      vcsClient,
-      getServerSideEnvironmentVariablesAsync,
-      firstFingerprintInfo,
-      environment: environmentForProjectFingerprint,
-    });
-  }
-
-  if (nonInteractive) {
-    throw new Error(
-      'Insufficent arguments provided for fingerprint comparison in non-interactive mode'
-    );
-  }
-  return await getFingerprintInfoInteractiveAsync({
-    graphqlClient,
-    projectDir,
-    projectId,
-    vcsClient,
-    getServerSideEnvironmentVariablesAsync,
-    firstFingerprintInfo,
-    environmentForProjectFingerprint,
-  });
-}
-
-async function getFingerprintInfoInteractiveAsync({
-  graphqlClient,
-  projectDir,
-  projectId,
-  vcsClient,
-  getServerSideEnvironmentVariablesAsync,
-  firstFingerprintInfo,
-  environmentForProjectFingerprint,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  projectDir: string;
-  projectId: string;
-  vcsClient: Client;
-  getServerSideEnvironmentVariablesAsync: GetServerSideEnvironmentVariablesFn;
-  firstFingerprintInfo?: {
-    fingerprint: Fingerprint;
-    platforms?: AppPlatform[];
-    origin: FingerprintOrigin;
-  };
-  environmentForProjectFingerprint?: string;
-}): Promise<{ fingerprint: Fingerprint; platforms?: AppPlatform[]; origin: FingerprintOrigin }> {
-  const prompt = firstFingerprintInfo
-    ? 'Select the second fingerprint to compare against'
-    : 'Select a reference fingerprint for comparison';
-  const originType = await selectAsync<FingerprintOriginType>(prompt, [
-    ...(firstFingerprintInfo
-      ? [{ title: 'Current project fingerprint', value: FingerprintOriginType.Project }]
-      : []),
-    { title: 'Build fingerprint', value: FingerprintOriginType.Build },
-    { title: 'Update fingerprint', value: FingerprintOriginType.Update },
-    { title: 'Enter a fingerprint hash manually', value: FingerprintOriginType.Hash },
-  ]);
-  if (originType === FingerprintOriginType.Project) {
-    if (!firstFingerprintInfo) {
-      throw new Error(
-        'First fingerprint must be provided in order to compare against the project.'
-      );
-    }
-    return await getFingerprintInfoFromLocalProjectAsync({
-      graphqlClient,
-      projectDir,
-      projectId,
-      vcsClient,
-      getServerSideEnvironmentVariablesAsync,
-      firstFingerprintInfo,
-      environment: environmentForProjectFingerprint,
-    });
-  } else if (originType === FingerprintOriginType.Build) {
-    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-    const buildId = await selectBuildToCompareAsync(graphqlClient, projectId, displayName, {
-      filters: { hasFingerprint: true },
-    });
-    if (!buildId) {
-      throw new Error('Must select build with fingerprint for comparison.');
-    }
-    return await getFingerprintInfoFromBuildIdAsync(graphqlClient, buildId);
-  } else if (originType === FingerprintOriginType.Update) {
-    const selectedBranch = await selectBranchOnAppAsync(graphqlClient, {
-      projectId,
-      promptTitle: 'On which branch would you like search for an update?',
-      displayTextForListItem: updateBranch => ({
-        title: updateBranch.name,
-      }),
-      paginatedQueryOptions: {
-        json: false,
-        nonInteractive: false,
-        offset: 0,
-      },
-    });
-
-    const selectedUpdateGroup = await selectUpdateGroupOnBranchAsync(graphqlClient, {
-      projectId,
-      branchName: selectedBranch.name,
-      paginatedQueryOptions: {
-        json: false,
-        nonInteractive: false,
-        offset: 0,
-      },
-    });
-    const updateGroupId = selectedUpdateGroup[0].group;
-    return await getFingerprintInfoFromUpdateGroupIdOrUpdateIdAsync(
-      graphqlClient,
-      projectId,
-      false,
-      updateGroupId
-    );
-  } else if (originType === FingerprintOriginType.Hash) {
-    const { hash } = await promptAsync({
-      type: 'text',
-      name: 'hash',
-      message: 'Provide the fingerprint hash',
-      validate: (value: string) => !!value.trim(),
-      hint: '0000000000000000000000000000000000000000',
-    });
-    return await getFingerprintInfoFromHashAsync(graphqlClient, projectId, hash);
-  } else {
-    throw new Error(`Unsupported fingerprint origin type: ${originType}`);
-  }
-}
-
-async function getFingerprintInfoFromLocalProjectAsync({
-  graphqlClient,
-  projectDir,
-  projectId,
-  vcsClient,
-  getServerSideEnvironmentVariablesAsync,
-  firstFingerprintInfo,
-  environment,
-}: {
-  graphqlClient: ExpoGraphqlClient;
-  projectDir: string;
-  projectId: string;
-  vcsClient: Client;
-  getServerSideEnvironmentVariablesAsync: GetServerSideEnvironmentVariablesFn;
-  firstFingerprintInfo: {
-    fingerprint: Fingerprint;
-    platforms?: AppPlatform[];
-    origin: FingerprintOrigin;
-  };
-  environment?: string;
-}): Promise<{ fingerprint: Fingerprint; platforms?: AppPlatform[]; origin: FingerprintOrigin }> {
-  const firstFingerprintPlatforms = firstFingerprintInfo.platforms;
-  if (!firstFingerprintPlatforms || firstFingerprintPlatforms.length === 0) {
-    throw new Error(
-      `Cannot compare the local directory against the provided fingerprint hash "${firstFingerprintInfo.fingerprint.hash}" because the associated platform could not be determined. Ensure the fingerprint is linked to a build or update to identify the platform.`
-    );
-  }
-
-  if (environment) {
-    Log.log(`🔧 Using environment: ${environment}`);
-  }
-  const env = environment
-    ? { ...(await getServerSideEnvironmentVariablesAsync()), EXPO_NO_DOTENV: '1' }
-    : undefined;
-  const fingerprint = await getFingerprintInfoFromLocalProjectForPlatformsAsync(
-    graphqlClient,
-    projectDir,
-    projectId,
-    vcsClient,
-    firstFingerprintPlatforms,
-    { env }
-  );
-  return { fingerprint, origin: { type: FingerprintOriginType.Project } };
-}
-
-async function getFingerprintFromUpdateFragmentAsync(
-  updateWithFingerprint: UpdateFragment
-): Promise<{ fingerprint: Fingerprint; platforms?: AppPlatform[]; origin: FingerprintOrigin }> {
-  if (!updateWithFingerprint.fingerprint) {
-    throw new Error(`Fingerprint for update ${updateWithFingerprint.id} was not computed.`);
-  } else if (!updateWithFingerprint.fingerprint.debugInfoUrl) {
-    throw new Error(`Fingerprint source for update ${updateWithFingerprint.id} was not computed.`);
-  }
-
-  return {
-    fingerprint: await getFingerprintFromFingerprintFragmentAsync(
-      updateWithFingerprint.fingerprint
-    ),
-    platforms: [stringToAppPlatform(updateWithFingerprint.platform)],
-    origin: {
-      type: FingerprintOriginType.Update,
-      update: updateWithFingerprint,
-    },
-  };
-}
-
-async function getFingerprintInfoFromHashAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  hash: string
-): Promise<{ fingerprint: Fingerprint; platforms?: AppPlatform[]; origin: FingerprintOrigin }> {
-  const fingerprintFragment = await getFingerprintFragmentFromHashAsync(
-    graphqlClient,
-    projectId,
-    hash
-  );
-  const fingerprint = await getFingerprintFromFingerprintFragmentAsync(fingerprintFragment);
-  let platforms;
-  const fingerprintBuilds = fingerprintFragment.builds?.edges.map(edge => edge.node) ?? [];
-  const fingerprintUpdates = fingerprintFragment.updates?.edges.map(edge => edge.node) ?? [];
-  if (fingerprintBuilds.length > 0) {
-    platforms = [fingerprintBuilds[0].platform];
-  } else if (fingerprintUpdates.length > 0) {
-    platforms = [stringToAppPlatform(fingerprintUpdates[0].platform)];
-  }
-  return {
-    fingerprint,
-    platforms,
-    origin: {
-      type: FingerprintOriginType.Hash,
-    },
-  };
-}
-
-async function getFingerprintInfoFromUpdateGroupIdOrUpdateIdAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  nonInteractive: boolean,
-  updateGroupIdOrUpdateId: string
-): Promise<{ fingerprint: Fingerprint; platforms?: AppPlatform[]; origin: FingerprintOrigin }> {
-  // Some people may pass in update group id instead of update id, so add interactive support for that
-  try {
-    const maybeUpdateGroupId = updateGroupIdOrUpdateId;
-    const updateGroup = await UpdateQuery.viewUpdateGroupAsync(graphqlClient, {
-      groupId: maybeUpdateGroupId,
-    });
-    if (updateGroup.length === 1) {
-      const update = updateGroup[0];
-      return await getFingerprintFromUpdateFragmentAsync(update);
-    }
-    if (nonInteractive) {
-      const project = await AppQuery.byIdAsync(graphqlClient, projectId);
-      const updateUrl =
-        getExpoWebsiteBaseUrl() +
-        `/accounts/${project.ownerAccount.name}/projects/${project.slug}/updates/${maybeUpdateGroupId}`;
-      throw new Error(
-        `Please pass in your update ID from ${updateUrl} or use interactive mode to select the update ID.`
-      );
-    }
-    const update = await selectAsync<UpdateFragment>(
-      'Select a platform to compute the fingerprint from',
-      updateGroup.map(update => ({
-        title: update.platform,
-        value: update,
-      }))
-    );
-    return await getFingerprintFromUpdateFragmentAsync(update);
-  } catch (error: any) {
-    if (!error?.message.includes('Could not find any updates with group ID')) {
-      throw error;
-    }
-  }
-
-  const updateId = updateGroupIdOrUpdateId;
-  const updateWithFingerprint = await UpdateQuery.viewByUpdateAsync(graphqlClient, {
-    updateId,
-  });
-  return await getFingerprintFromUpdateFragmentAsync(updateWithFingerprint);
-}
-
-async function getFingerprintInfoFromBuildIdAsync(
-  graphqlClient: ExpoGraphqlClient,
-  buildId: string
-): Promise<{ fingerprint: Fingerprint; platforms?: AppPlatform[]; origin: FingerprintOrigin }> {
-  const buildWithFingerprint = await BuildQuery.withFingerprintByIdAsync(graphqlClient, buildId);
-  if (!buildWithFingerprint.fingerprint) {
-    throw new Error(`Fingerprint for build ${buildId} was not computed.`);
-  } else if (!buildWithFingerprint.fingerprint.debugInfoUrl) {
-    throw new Error(`Fingerprint source for build ${buildId} was not computed.`);
-  }
-  return {
-    fingerprint: await getFingerprintFromFingerprintFragmentAsync(buildWithFingerprint.fingerprint),
-    platforms: [buildWithFingerprint.platform],
-    origin: {
-      type: FingerprintOriginType.Build,
-      build: buildWithFingerprint,
-    },
-  };
-}
-
-async function getFingerprintFragmentFromHashAsync(
-  graphqlClient: ExpoGraphqlClient,
-  projectId: string,
-  hash: string
-): Promise<FingerprintFragment> {
-  const fingerprint = await FingerprintQuery.byHashAsync(graphqlClient, {
-    appId: projectId,
-    hash,
-  });
-  if (!fingerprint) {
-    const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);
-    throw new Error(`Fingerprint with hash ${hash} was not uploaded for ${displayName}.`);
-  }
-  return fingerprint;
-}
-
-async function getFingerprintFromFingerprintFragmentAsync(
-  fingerprintFragment: Pick<FingerprintFragment, 'debugInfoUrl' | 'hash'>
-): Promise<Fingerprint> {
-  const fingerprintDebugUrl = fingerprintFragment.debugInfoUrl;
-  if (!fingerprintDebugUrl) {
-    throw new Error(
-      `The source for fingerprint hash ${fingerprintFragment.hash} was not computed.`
-    );
-  }
-  const fingerprintResponse = await fetch(fingerprintDebugUrl);
-  return (await fingerprintResponse.json()) as Fingerprint;
-}
-
 function printContentDiff(diff: FingerprintDiffItem): void {
   if (diff.op === 'added') {
     const sourceType = diff.addedSource.type;
@@ -737,10 +259,7 @@ const PRETTY_CONTENT_ID: Record<string, string> = {
   'expoAutolinkingConfig:ios': 'Expo autolinking config (iOS)',
   'expoAutolinkingConfig:android': 'Expo autolinking config (Android)',
   'packageJson:scripts': 'package.json scripts',
-  expoConfig: 'Expo app config',
-  'package:react-native': 'React Native package.json',
-  'rncoreAutolinkingConfig:ios': 'React Native Community autolinking config (iOS)',
-  'rncoreAutolinkingConfig:android': 'React Native Community autolinking config (Android)',
+  expoConfig: 'Expo config',
 };
 
 function printContentSource({
@@ -784,23 +303,6 @@ function printContentsDiff(contents1: string | Buffer, contents2: string | Buffe
   abridgedDiff(prettifiedContents1, prettifiedContents2, 0);
 }
 
-function prettyPrintFingerprint(fingerprint: Fingerprint, origin: FingerprintOrigin): string {
-  if (origin.type === FingerprintOriginType.Project) {
-    return `fingerprint ${fingerprint.hash} from local directory`;
-  } else if (origin.type === FingerprintOriginType.Update) {
-    return `fingerprint ${fingerprint.hash} from ${
-      origin.update?.platform ? stringToAppPlatform(origin.update?.platform) : ''
-    } ${origin.type}`;
-  } else if (origin.type === FingerprintOriginType.Build) {
-    return `fingerprint ${fingerprint.hash} from ${origin.build?.platform} ${origin.type}`;
-  }
-  return `fingerprint ${fingerprint.hash}`;
-}
-
-function capitalizeFirstLetter(string: string): string {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
-
 function isJSON(str: string): boolean {
   try {
     JSON.parse(str);
@@ -810,7 +312,29 @@ function isJSON(str: string): boolean {
   }
 }
 
-async function selectBuildToCompareAsync(
+function appPlatformToPlatform(platform: AppPlatform): Platform {
+  switch (platform) {
+    case AppPlatform.Android:
+      return Platform.ANDROID;
+    case AppPlatform.Ios:
+      return Platform.IOS;
+    default:
+      throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+function appPlatformToString(platform: AppPlatform): string {
+  switch (platform) {
+    case AppPlatform.Android:
+      return 'android';
+    case AppPlatform.Ios:
+      return 'ios';
+    default:
+      throw new Error(`Unsupported platform: ${platform}`);
+  }
+}
+
+export async function selectBuildToCompareAsync(
   graphqlClient: ExpoGraphqlClient,
   projectId: string,
   projectDisplayName: string,

packages/eas-cli/src/commands/fingerprint/generate.ts

@@ -1,164 +0,0 @@
-import { Env } from '@expo/eas-build-job';
-import { EasJsonAccessor } from '@expo/eas-json';
-import { Flags } from '@oclif/core';
-
-import { getExpoWebsiteBaseUrl } from '../../api';
-import { evaluateConfigWithEnvVarsAsync } from '../../build/evaluateConfigWithEnvVarsAsync';
-import EasCommand from '../../commandUtils/EasCommand';
-import {
-  EASEnvironmentFlag,
-  EasEnvironmentFlagParameters,
-  EasNonInteractiveAndJsonFlags,
-} from '../../commandUtils/flags';
-import {
-  appPlatformToPlatform,
-  getFingerprintInfoFromLocalProjectForPlatformsAsync,
-  stringToAppPlatform,
-} from '../../fingerprint/utils';
-import { AppPlatform, EnvironmentVariableEnvironment } from '../../graphql/generated';
-import { AppQuery } from '../../graphql/queries/AppQuery';
-import Log, { link } from '../../log';
-import { promptAsync } from '../../prompts';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import { getProfilesAsync } from '../../utils/profiles';
-
-export default class FingerprintGenerate extends EasCommand {
-  static override description = 'generate fingerprints from the current project';
-  static override strict = false;
-
-  static override examples = [
-    '$ eas fingerprint:generate  \t # Generate fingerprint in interactive mode',
-    '$ eas fingerprint:generate --build-profile preview  \t # Generate a fingerprint using the "preview" build profile',
-    '$ eas fingerprint:generate --environment preview  \t # Generate a fingerprint using the "preview" environment',
-    '$ eas fingerprint:generate --json --non-interactive --platform android  \t # Output fingerprint json to stdout',
-  ];
-
-  static override flags = {
-    platform: Flags.enum({
-      char: 'p',
-      options: ['android', 'ios'],
-    }),
-    ...EASEnvironmentFlag,
-    environment: Flags.enum<EnvironmentVariableEnvironment>({
-      ...EasEnvironmentFlagParameters,
-      exclusive: ['build-profile'],
-    }),
-    'build-profile': Flags.string({
-      char: 'e',
-      description: 'Name of the build profile from eas.json.',
-      exclusive: ['environment'],
-    }),
-    ...EasNonInteractiveAndJsonFlags,
-  };
-
-  static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.ProjectConfig,
-    ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.Vcs,
-    ...this.ContextOptions.ServerSideEnvironmentVariables,
-    ...this.ContextOptions.DynamicProjectConfig,
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(FingerprintGenerate);
-    const {
-      json,
-      'non-interactive': nonInteractive,
-      platform: platformStringFlag,
-      environment,
-      'build-profile': buildProfileName,
-    } = flags;
-
-    const {
-      projectId,
-      privateProjectConfig: { projectDir },
-      loggedIn: { graphqlClient },
-      vcsClient,
-      getServerSideEnvironmentVariablesAsync,
-      getDynamicPrivateProjectConfigAsync,
-    } = await this.getContextAsync(FingerprintGenerate, {
-      nonInteractive,
-      withServerSideEnvironment: environment ?? null,
-    });
-    if (json) {
-      enableJsonOutput();
-    }
-
-    let platform: AppPlatform;
-    if (platformStringFlag) {
-      platform = stringToAppPlatform(platformStringFlag);
-    } else {
-      if (nonInteractive) {
-        throw new Error('Platform must be specified in non-interactive mode with the --p flag');
-      }
-      platform = await selectRequestedPlatformAsync();
-    }
-
-    let env: Env | undefined = undefined;
-    if (environment) {
-      Log.log(`🔧 Using environment: ${environment}`);
-      env = { ...(await getServerSideEnvironmentVariablesAsync()), EXPO_NO_DOTENV: '1' };
-    } else if (buildProfileName) {
-      Log.log(`🔧 Using build profile: ${buildProfileName}`);
-      const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
-      const buildProfile = (
-        await getProfilesAsync({
-          type: 'build',
-          easJsonAccessor,
-          platforms: [appPlatformToPlatform(platform)],
-          profileName: buildProfileName ?? undefined,
-          projectDir,
-        })
-      )[0];
-      if (!buildProfile) {
-        throw new Error(`Build profile ${buildProfile} not found for platform: ${platform}`);
-      }
-      const configResult = await evaluateConfigWithEnvVarsAsync({
-        buildProfile: buildProfile.profile,
-        buildProfileName: buildProfile.profileName,
-        graphqlClient,
-        getProjectConfig: getDynamicPrivateProjectConfigAsync,
-        opts: { env: buildProfile.profile.env },
-      });
-      env = configResult.env;
-    }
-
-    const fingerprint = await getFingerprintInfoFromLocalProjectForPlatformsAsync(
-      graphqlClient,
-      projectDir,
-      projectId,
-      vcsClient,
-      [platform],
-      { env }
-    );
-
-    if (json) {
-      printJsonOnlyOutput(fingerprint);
-      return;
-    }
-
-    Log.log(`✅ Fingerprint generated: ${fingerprint.hash}`);
-
-    const project = await AppQuery.byIdAsync(graphqlClient, projectId);
-    const fingerprintUrl = new URL(
-      `/accounts/${project.ownerAccount.name}/projects/${project.slug}/fingerprints/${fingerprint.hash}`,
-      getExpoWebsiteBaseUrl()
-    );
-    Log.log(`🔍 View the fingerprint at ${link(fingerprintUrl.toString())}`);
-    Log.log(`💡 If you want to see the entire fingerprint output, pass in the --json flag.`);
-  }
-}
-
-async function selectRequestedPlatformAsync(): Promise<AppPlatform> {
-  const { requestedPlatform } = await promptAsync({
-    type: 'select',
-    message: 'Select platform',
-    name: 'requestedPlatform',
-    choices: [
-      { title: 'Android', value: AppPlatform.Android },
-      { title: 'iOS', value: AppPlatform.Ios },
-    ],
-  });
-  return requestedPlatform;
-}

packages/eas-cli/src/commands/project/onboarding.ts

@@ -162,10 +162,7 @@ export default class Onboarding extends EasCommand {
       cloneMethod,
     });
 
-    const vcsClient = new GitClient({
-      maybeCwdOverride: finalTargetProjectDirectory,
-      requireCommit: false,
-    });
+    const vcsClient = new GitClient(finalTargetProjectDirectory);
     if (!app.githubRepository) {
       await fs.remove(path.join(finalTargetProjectDirectory, '.git'));
       await runCommandAsync({
@@ -288,12 +285,12 @@ export default class Onboarding extends EasCommand {
     } else {
       Log.log('🚀 Now we are going to trigger your first build');
       Log.log();
-      const { buildIds } = await runBuildAndSubmitAsync({
+      const { buildIds } = await runBuildAndSubmitAsync(
         graphqlClient,
         analytics,
         vcsClient,
-        projectDir: finalTargetProjectDirectory,
-        flags: {
+        finalTargetProjectDirectory,
+        {
           nonInteractive: true,
           requestedPlatform:
             platform === Platform.ANDROID ? RequestedPlatform.Android : RequestedPlatform.Ios,
@@ -307,11 +304,11 @@ export default class Onboarding extends EasCommand {
           autoSubmit: false,
           localBuildOptions: {},
           freezeCredentials: false,
+          repack: true,
         },
         actor,
-        // eslint-disable-next-line async-protect/async-suffix
-        getDynamicPrivateProjectConfigAsync: getDynamicProjectConfigFn,
-      });
+        getDynamicProjectConfigFn
+      );
       const buildId = buildIds[0];
       Log.log();
       Log.log('🚀 You can now go back to the website to continue:');
@@ -400,7 +397,7 @@ async function configureProjectFromBareDefaultExpoTemplateAsync({
   const bundleIdentifier = `com.${userPrefix}${stripInvalidCharactersForBundleIdentifier(
     app.ownerAccount.name
   )}.${slugPrefix}${stripInvalidCharactersForBundleIdentifier(app.slug)}`;
-  const updateUrl = getEASUpdateURL(app.id, /* manifestHostOverride */ null);
+  const updateUrl = getEASUpdateURL(app.id);
 
   const easBuildGitHubConfig = {
     android: {

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

@@ -26,7 +26,6 @@ import { maybeWarnAboutEasOutagesAsync } from '../utils/statuspageService';
 interface RawCommandFlags {
   platform?: string;
   profile?: string;
-  'what-to-test'?: string;
   latest?: boolean;
   id?: string;
   path?: string;
@@ -35,19 +34,16 @@ interface RawCommandFlags {
   wait: boolean;
   'non-interactive': boolean;
   'verbose-fastlane': boolean;
-  groups?: string[];
 }
 
 interface CommandFlags {
   requestedPlatform: RequestedPlatform;
   profile?: string;
-  whatToTest?: string;
   archiveFlags: SubmitArchiveFlags;
   verbose: boolean;
   wait: boolean;
   nonInteractive: boolean;
   isVerboseFastlaneEnabled: boolean;
-  groups?: string[];
 }
 
 export default class Submit extends EasCommand {
@@ -80,9 +76,6 @@ export default class Submit extends EasCommand {
       description: 'App archive url',
       exclusive: ['latest', 'id', 'path'],
     }),
-    'what-to-test': Flags.string({
-      description: `Sets the "What to test" information in TestFlight (iOS only).`,
-    }),
     verbose: Flags.boolean({
       description: 'Always print logs from EAS Submit',
       default: false,
@@ -96,12 +89,6 @@ export default class Submit extends EasCommand {
       default: false,
       description: 'Enable verbose logging for the submission process',
     }),
-    groups: Flags.string({
-      description:
-        'Internal TestFlight testing groups to add the build to (iOS only). Learn more: https://developer.apple.com/help/app-store-connect/test-a-beta-version/add-internal-testers',
-      multiple: true,
-      char: 'g',
-    }),
     'non-interactive': Flags.boolean({
       default: false,
       description: 'Run command in non-interactive mode',
@@ -153,14 +140,12 @@ export default class Submit extends EasCommand {
         archiveFlags: flagsWithPlatform.archiveFlags,
         nonInteractive: flagsWithPlatform.nonInteractive,
         isVerboseFastlaneEnabled: flagsWithPlatform.isVerboseFastlaneEnabled,
-        groups: flagsWithPlatform.groups,
         actor,
         graphqlClient,
         analytics,
         exp,
         projectId,
         vcsClient,
-        whatToTest: flagsWithPlatform.whatToTest,
         specifiedProfile: flagsWithPlatform.profile,
       });
 
@@ -199,8 +184,6 @@ export default class Submit extends EasCommand {
       profile,
       'non-interactive': nonInteractive,
       'verbose-fastlane': isVerboseFastlaneEnabled,
-      groups,
-      'what-to-test': whatToTest,
       ...archiveFlags
     } = flags;
 
@@ -221,9 +204,7 @@ export default class Submit extends EasCommand {
       wait,
       profile,
       nonInteractive,
-      whatToTest,
       isVerboseFastlaneEnabled,
-      groups,
     };
   }
 

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

@@ -18,7 +18,8 @@ import AndroidSubmitCommand from '../../submit/android/AndroidSubmitCommand';
 import { SubmissionContext, createSubmissionContextAsync } from '../../submit/context';
 import IosSubmitCommand from '../../submit/ios/IosSubmitCommand';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
-import GitClient from '../../vcs/clients/git';
+import GitNoCommitClient from '../../vcs/clients/gitNoCommit';
+import NoVcsClient from '../../vcs/clients/noVcs';
 
 /**
  * This command will be run on the EAS workers.
@@ -64,16 +65,10 @@ export default class SubmitInternal extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(SubmitInternal, {
       nonInteractive: true,
+      vcsClientOverride: process.env.EAS_NO_VCS ? new NoVcsClient() : new GitNoCommitClient(),
       withServerSideEnvironment: null,
     });
 
-    if (vcsClient instanceof GitClient) {
-      // `build:internal` is run on EAS workers and the repo may have been changed
-      // by pre-install hooks or other scripts. We don't want to require committing changes
-      // to continue the build.
-      vcsClient.requireCommit = false;
-    }
-
     const submissionProfile = await EasJsonUtils.getSubmitProfileAsync(
       EasJsonAccessor.fromProjectPath(projectDir),
       flags.platform,
@@ -96,7 +91,6 @@ export default class SubmitInternal extends EasCommand {
       projectId,
       vcsClient,
       specifiedProfile: flags.profile,
-      groups: undefined, // use groups from submit profile
     });
 
     let config;
@@ -115,7 +109,6 @@ export default class SubmitInternal extends EasCommand {
       const configInput: z.input<typeof SubmissionConfig.Ios.SchemaZ> = {
         ascAppIdentifier: iosConfig.ascAppIdentifier,
         isVerboseFastlaneEnabled: iosConfig.isVerboseFastlaneEnabled ?? undefined,
-        groups: iosConfig.groups ?? undefined,
         ...(ascApiKeyJson
           ? { ascApiJsonKey: ascApiKeyJson }
           : {