Fixup

.github/codemention.yml

@@ -3,18 +3,24 @@ commentConfiguration:
   epilogue: 'Generated by [CodeMention](https://github.com/expo/expo/actions/workflows/codemention.yaml)'
 rules:
   - patterns: ['**/*']
+    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
+  - patterns: ['packages/eas-cli/src/build/**']
+    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
+  - patterns: ['packages/eas-cli/src/commands/build/**']
+    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
+  - patterns: ['packages/eas-cli/src/submit/**']
+    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']
+  - patterns: ['packages/eas-cli/src/commands/submit.ts']
     mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela', 'radoslawkrzemien']
   - patterns: ['packages/eas-cli/src/update/**']
-    mentions: ['wschurman', 'quinlanj']
+    mentions: ['EvanBacon', 'byCedric', 'wschurman']
   - patterns: ['packages/eas-cli/src/commands/update/**']
-    mentions: ['wschurman', 'quinlanj']
-  - patterns: ['packages/eas-cli/src/channel/**']
-    mentions: ['wschurman', 'quinlanj']
-  - patterns: ['packages/eas-cli/src/commands/channel/**']
-    mentions: ['wschurman', 'quinlanj']
+    mentions: ['EvanBacon', 'byCedric', 'wschurman']
   - patterns: ['packages/eas-cli/schema/**']
     mentions: ['bycedric']
   - patterns: ['packages/eas-cli/src/metadata/**']
     mentions: ['bycedric']
   - patterns: ['packages/eas-cli/src/commands/metadata/**']
     mentions: ['bycedric']
+  - patterns: ['packages/eas-json/**']
+    mentions: ['szdziedzic', 'khamilowicz', 'sjchmiela']

.github/workflows/release.yml

@@ -226,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.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:

CHANGELOG.md

@@ -12,337 +12,6 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 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))
-
-## [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))
-
-### 🐛 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
-
-- Remove random branch name generation for --auto branch name non-vcs fallback. ([#2747](https://github.com/expo/eas-cli/pull/2747) by [@wschurman](https://github.com/wschurman))
-- Upgrade @expo/multipart-body-parser. ([#2751](https://github.com/expo/eas-cli/pull/2751) by [@wschurman](https://github.com/wschurman))
-- Pass env var flag to worker deployments. ([#2763](https://github.com/expo/eas-cli/pull/2763) by [@kadikraman](https://github.com/kadikraman))
-- Fix request for switching providers when doing Apple auth. ([#2769](https://github.com/expo/eas-cli/pull/2769) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Improve logging and validation in `eas env:exec` command. ([#2762](https://github.com/expo/eas-cli/pull/2762) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [14.1.0](https://github.com/expo/eas-cli/releases/tag/v14.1.0) - 2024-12-10
-
-### 🎉 New features
-
-- Add support for enabeling broadcast Push Notifications capability option, by setting `ios.usesBroadcastPushNotifications` to `true` in app config. ([#2748](https://github.com/expo/eas-cli/pull/2748) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Add link to FYI page mentioning the workaround for Apple SMS 2FA issue. ([#2752](https://github.com/expo/eas-cli/pull/2752) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [14.0.3](https://github.com/expo/eas-cli/releases/tag/v14.0.3) - 2024-12-09
-
-### 🐛 Bug fixes
-
-- Bump `@expo/apple-utils` to fix sending two-factor authentication codes via SMS. ([#2750](https://github.com/expo/eas-cli/pull/2750) by [@EvanBacon](https://github.com/EvanBacon))
-
-### 🧹 Chores
-
-- Change update message to allow faster copy and paste. ([#2661](https://github.com/expo/eas-cli/pull/2661) by [@jonluca](https://github.com/jonluca))
-- Allow using `$schema` field in `eas.json`. ([#2624](https://github.com/expo/eas-cli/pull/2624) by [@saiichihashimoto](https://github.com/saiichihashimoto))
-
-## [14.0.2](https://github.com/expo/eas-cli/releases/tag/v14.0.2) - 2024-12-06
-
-### 🧹 Chores
-
-- Print warning instead of throwing an error when validating `CFBundleShortVersionString` against App Store requirements. ([#2741](https://github.com/expo/eas-cli/pull/2741) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [14.0.1](https://github.com/expo/eas-cli/releases/tag/v14.0.1) - 2024-12-06
-
-### 🧹 Chores
-
-- Bump `@expo/apple-utils` to improve error handling and input validation and change auth headers. ([#2745](https://github.com/expo/eas-cli/pull/2745) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [14.0.0](https://github.com/expo/eas-cli/releases/tag/v14.0.0) - 2024-12-06
-
-### 🛠 Breaking changes
-
-- Change behavior of roll-back-to-embedded to not use current project state. ([#2722](https://github.com/expo/eas-cli/pull/2722) by [@wschurman](https://github.com/wschurman))
-
-### 🎉 New features
-
-- Add hidden fingerprint:compare feature. ([#2736](https://github.com/expo/eas-cli/pull/2736) by [@quinlanj](https://github.com/quinlanj))
-
-### 🐛 Bug fixes
-
-- Update `@expo/config` and `@expo/config-plugins` to fix `eas build` command for bare iOS projects on Windows. ([#2744](https://github.com/expo/eas-cli/pull/2744) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Fix outdated gitignored Google services file warning. ([#2730](https://github.com/expo/eas-cli/pull/2730) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [13.4.2](https://github.com/expo/eas-cli/releases/tag/v13.4.2) - 2024-11-25
-
-### 🧹 Chores
-
-- Upgrade `@expo` packages to SDK 52 versions. ([#2706](https://github.com/expo/eas-cli/pull/2706) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [13.4.1](https://github.com/expo/eas-cli/releases/tag/v13.4.1) - 2024-11-22
-
-### 🧹 Chores
-
-- Improve logging in `eas env:pull`. ([#2720](https://github.com/expo/eas-cli/pull/2720) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [13.4.0](https://github.com/expo/eas-cli/releases/tag/v13.4.0) - 2024-11-22
-
-### 🎉 New features
-
-- Calculate fingerprint on each update. ([#2687](https://github.com/expo/eas-cli/pull/2687) by [@quinlanj](https://github.com/quinlanj))
-- Calculate fingerprint on each update republish. ([#2708](https://github.com/expo/eas-cli/pull/2708) by [@quinlanj](https://github.com/quinlanj))
-- Add `eas env` commands. ([#2711](https://github.com/expo/eas-cli/pull/2711) by [@szdziedzic](https://github.com/szdziedzic))
-- Add `--environment` flag to `eas update` command. ([#2711](https://github.com/expo/eas-cli/pull/2711) by [@szdziedzic](https://github.com/szdziedzic))
-- Load readable environment variables from EAS servers on every build. ([#2644](https://github.com/expo/eas-cli/pull/2644) by [@szdziedzic](https://github.com/szdziedzic))
-- Add environment field to `eas.schema.json`. ([#2719](https://github.com/expo/eas-cli/pull/2719) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Deprecate `eas secret` commands. ([#2705](https://github.com/expo/eas-cli/pull/2705) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [13.3.0](https://github.com/expo/eas-cli/releases/tag/v13.3.0) - 2024-11-18
-
-### 🎉 New features
-
-- Added `eas workflow` commands. [#2650](https://github.com/expo/eas-cli/pull/2650), [#2669](https://github.com/expo/eas-cli/pull/2669), [#2678](https://github.com/expo/eas-cli/pull/2678) by [@jonsamp](https://github.com/jonsamp) and [@sjchmiela](https://github.com/sjchmiela) ([#2683](https://github.com/expo/eas-cli/pull/2683) by [@sjchmiela](https://github.com/sjchmiela))
-
-## [13.2.3](https://github.com/expo/eas-cli/releases/tag/v13.2.3) - 2024-11-15
-
-## [13.2.2](https://github.com/expo/eas-cli/releases/tag/v13.2.2) - 2024-11-15
-
-## [13.2.1](https://github.com/expo/eas-cli/releases/tag/v13.2.1) - 2024-11-14
-
-## [13.2.0](https://github.com/expo/eas-cli/releases/tag/v13.2.0) - 2024-11-13
-
-### 🎉 New features
-
-- Add EAS_SKIP_AUTO_FINGERPRINT to skip fingerprint computation on build ([#2675](https://github.com/expo/eas-cli/pull/2675) by [@quinlanj](https://github.com/quinlanj))
-- Default build-logger-level to debug when EXPO_DEBUG is set. ([#2676](https://github.com/expo/eas-cli/pull/2676) by [@wschurman](https://github.com/wschurman))
-
-## [13.1.1](https://github.com/expo/eas-cli/releases/tag/v13.1.1) - 2024-11-08
-
-## [13.1.0](https://github.com/expo/eas-cli/releases/tag/v13.1.0) - 2024-11-07
-
-### 🎉 New features
-
-- Compute fingerprint for builds with SDK 52 and higher ([#2663](https://github.com/expo/eas-cli/pull/2663) by [@quinlanj](https://github.com/quinlanj))
-
-## [13.0.1](https://github.com/expo/eas-cli/releases/tag/v13.0.1) - 2024-11-05
-
-### 🧹 Chores
-
-- Upgrade EAS Metadata with new properties from App Store. ([#2671](https://github.com/expo/eas-cli/pull/2671) by [@byCedric](https://github.com/byCedric))
-
-## [13.0.0](https://github.com/expo/eas-cli/releases/tag/v13.0.0) - 2024-11-05
-
-### 🛠 Breaking changes
-
-- Resolve versioned expo config using `npx expo config` command instead of using fixed `@expo/config` version shipped with EAS CLI, if available. ([#2529](https://github.com/expo/eas-cli/pull/2529) by [@szdziedzic](https://github.com/szdziedzic))
-
-### 🧹 Chores
-
-- Add `macos-sonoma-14.6-xcode-16.1` image and `sdk-52` image tag to `eas.schema.json`. ([#2666](https://github.com/expo/eas-cli/pull/2666) by [@szdziedzic](https://github.com/szdziedzic))
-- Update `@expo` packages versions. ([#2530](https://github.com/expo/eas-cli/pull/2530) by [@szdziedzic](https://github.com/szdziedzic))
-
-## [12.6.2](https://github.com/expo/eas-cli/releases/tag/v12.6.2) - 2024-10-29
-
-### 🐛 Bug fixes
-
-- Make email case insensitive during Apple authentication. ([#2659](https://github.com/expo/eas-cli/pull/2659) by [@byCedric](https://github.com/byCedric))
-
-## [12.6.1](https://github.com/expo/eas-cli/releases/tag/v12.6.1) - 2024-10-25
-
-### 🧹 Chores
-
 - Create dynamic logged in context field and clean up erroneous SessionManager context field uses. ([#2648](https://github.com/expo/eas-cli/pull/2648) by [@wschurman](https://github.com/wschurman))
 
 ## [12.6.0](https://github.com/expo/eas-cli/releases/tag/v12.6.0) - 2024-10-21

lerna.json

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

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/package.json

@@ -1,34 +1,34 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "15.0.12",
+  "version": "12.6.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
   },
   "bugs": "https://github.com/expo/eas-cli/issues",
   "dependencies": {
-    "@expo/apple-utils": "2.1.11",
+    "@expo/apple-utils": "2.0.2",
     "@expo/code-signing-certificates": "0.0.5",
-    "@expo/config": "10.0.6",
-    "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "1.0.165",
-    "@expo/eas-json": "15.0.0",
-    "@expo/env": "^1.0.0",
-    "@expo/json-file": "8.3.3",
+    "@expo/config": "8.5.4",
+    "@expo/config-plugins": "7.8.4",
+    "@expo/eas-build-job": "1.0.140",
+    "@expo/eas-json": "12.5.2",
+    "@expo/env": "^0.3.0",
+    "@expo/json-file": "8.2.37",
     "@expo/logger": "1.0.117",
-    "@expo/multipart-body-parser": "2.0.0",
-    "@expo/osascript": "2.1.4",
-    "@expo/package-manager": "1.7.0",
-    "@expo/pkcs12": "0.1.3",
-    "@expo/plist": "0.2.0",
+    "@expo/multipart-body-parser": "1.1.0",
+    "@expo/osascript": "2.0.33",
+    "@expo/package-manager": "1.1.2",
+    "@expo/pkcs12": "0.0.8",
+    "@expo/plist": "0.0.20",
     "@expo/plugin-help": "5.1.23",
     "@expo/plugin-warn-if-update-available": "2.5.1",
-    "@expo/prebuild-config": "8.0.17",
+    "@expo/prebuild-config": "6.7.3",
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
-    "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "1.0.166",
+    "@expo/spawn-async": "1.7.0",
+    "@expo/steps": "1.0.140",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -41,7 +41,6 @@
     "chalk": "4.1.2",
     "cli-progress": "3.12.0",
     "dateformat": "4.6.3",
-    "diff": "7.0.0",
     "dotenv": "16.3.1",
     "env-paths": "2.2.0",
     "envinfo": "7.11.0",
@@ -65,7 +64,7 @@
     "mime": "3.0.0",
     "minimatch": "5.1.2",
     "minizlib": "3.0.1",
-    "nanoid": "3.3.8",
+    "nanoid": "3.3.4",
     "node-fetch": "2.6.7",
     "node-forge": "1.3.1",
     "nullthrows": "1.1.1",
@@ -87,7 +86,6 @@
     "untildify": "4.0.0",
     "uuid": "9.0.1",
     "wrap-ansi": "7.0.0",
-    "yaml": "2.6.0",
     "zod": "^3.23.8"
   },
   "devDependencies": {
@@ -95,10 +93,8 @@
     "@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",
     "@types/envinfo": "7.8.3",
     "@types/express": "4.17.15",
     "@types/fs-extra": "11.0.4",
@@ -180,22 +176,16 @@
       "secret": {
         "description": "manage project and account secrets"
       },
-      "env": {
-        "description": "manage project and account environment variables"
-      },
       "update": {
         "description": "manage individual updates"
       },
       "webhook": {
         "description": "manage webhooks"
-      },
-      "workflow": {
-        "description": "manage workflows"
       }
     },
     "warn-if-update-available": {
       "timeoutInDays": 0.5,
-      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run:') %>\n<%= chalk.dim(chalk.bold('npm install -g eas-cli')) %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
+      "message": "<%= chalk('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available.') %>\n<%= chalk.dim('To upgrade, run ') %><%= chalk.dim(chalk.bold('npm install -g eas-cli')) %><%= chalk.dim('.') %>\n<%= chalk.dim('Proceeding with outdated version.') %>\n"
     },
     "update": {
       "node": {

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

@@ -1,20 +1,6 @@
 {
   "$schema": "http://json-schema.org/draft-06/schema",
   "type": "object",
-  "properties": {
-    "configVersion": {
-      "enum": [0],
-      "description": "The EAS metadata store configuration version"
-    },
-    "apple": {
-      "$ref": "#/definitions/AppleConfig"
-    }
-  },
-  "additionalProperties": false,
-  "required": [
-    "configVersion",
-    "apple"
-  ],
   "definitions": {
     "apple": {
       "AppleKidsAge": {
@@ -337,8 +323,7 @@
           "gambling",
           "unrestrictedWebAccess",
           "kidsAgeBand",
-          "ageRatingOverride",
-          "koreaAgeRatingOverride"
+          "seventeenPlus"
         ],
         "defaultSnippets": [
           {
@@ -360,9 +345,7 @@
               "gambling": false,
               "unrestrictedWebAccess": false,
               "kidsAgeBand": null,
-              "ageRatingOverride": "NONE",
-              "koreaAgeRatingOverride": "NONE",
-              "lootBox": false
+              "seventeenPlus": false
             }
           },
           {
@@ -384,9 +367,7 @@
               "unrestrictedWebAccess": false,
               "gambling": false,
               "kidsAgeBand": null,
-              "ageRatingOverride": "${13|NONE,SEVENTEEN_PLUS,UNRATED|}",
-              "koreaAgeRatingOverride": "${14|NONE,FIFTEEN_PLUS,NINETEEN_PLUS|}",
-              "lootBox": false
+              "seventeenPlus": false
             }
           }
         ],
@@ -461,24 +442,8 @@
           },
           "seventeenPlus": {
             "type": "boolean",
-            "deprecated": true,
-            "deprecationMessage": "This property is deprecated, use `ageRatingOverride` instead.",
             "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
             "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "ageRatingOverride": {
-            "$ref": "#/definitions/apple/AppleAgeRatingOverride",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
-            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 17, you can manually set the age rating to 17+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "koreaAgeRatingOverride": {
-            "$ref": "#/definitions/apple/AppleKoreaAgeRatingOverride",
-            "description": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n@see https://help.apple.com/app-store-connect/#/dev599d50efb",
-            "markdownDescription": "If your app rates 12+ or lower, and you believe its content may not be suitable for children under 15 or 19, you can manually set the age rating to 15+ or 19+.\n\nIf your app will be distributed through alternative app marketplaces or websites in the European Union and you believe your app is [Unrated](https://developer.apple.com/help/app-store-connect/reference/age-ratings), set this to `UNRATED`.\n\n[Learn more](https://help.apple.com/app-store-connect/#/dev599d50efb)"
-          },
-          "lootBox": {
-            "type": "boolean",
-            "description": "Does your app contain purchasable loot boxes? These virtual containers provide players with in-game items, including functional cards or cosmetic modifications, based on random chance."
           }
         }
       },
@@ -600,20 +565,6 @@
             "maxLength": 4000
           }
         }
-      },
-      "AppleAgeRatingOverride": {
-        "enum": [
-          "NONE",
-          "SEVENTEEN_PLUS",
-          "UNRATED"
-        ]
-      },
-      "AppleKoreaAgeRatingOverride": {
-        "enum": [
-          "NONE",
-          "FIFTEEN_PLUS",
-          "NINETEEN_PLUS"
-        ]
       }
     },
     "AppleConfig": {
@@ -824,5 +775,19 @@
         }
       }
     }
-  }
+  },
+  "properties": {
+    "configVersion": {
+      "enum": [0],
+      "description": "The EAS metadata store configuration version"
+    },
+    "apple": {
+      "$ref": "#/definitions/AppleConfig"
+    }
+  },
+  "additionalProperties": false,
+  "required": [
+    "configVersion",
+    "apple"
+  ]
 }

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

@@ -1,5 +1,4 @@
 import chalk from 'chalk';
-import { print } from 'graphql';
 import gql from 'graphql-tag';
 
 import { BranchNotFoundError } from './utils';
@@ -9,11 +8,10 @@ import { withErrorHandlingAsync } from '../graphql/client';
 import {
   CreateUpdateBranchForAppMutation,
   CreateUpdateBranchForAppMutationVariables,
-  UpdateBranchBasicInfoFragment,
+  UpdateBranch,
   UpdateBranchFragment,
 } from '../graphql/generated';
 import { BranchQuery } from '../graphql/queries/BranchQuery';
-import { UpdateBranchBasicInfoFragmentNode } from '../graphql/types/UpdateBranchBasicInfo';
 import Log from '../log';
 import { formatBranch, getBranchDescription } from '../update/utils';
 import { printJsonOnlyOutput } from '../utils/json';
@@ -128,7 +126,7 @@ function renderPageOfBranches(
 export async function createUpdateBranchOnAppAsync(
   graphqlClient: ExpoGraphqlClient,
   { appId, name }: CreateUpdateBranchForAppMutationVariables
-): Promise<UpdateBranchBasicInfoFragment> {
+): Promise<Pick<UpdateBranch, 'id' | 'name'>> {
   const result = await withErrorHandlingAsync(
     graphqlClient
       .mutation<CreateUpdateBranchForAppMutation, CreateUpdateBranchForAppMutationVariables>(
@@ -137,17 +135,15 @@ export async function createUpdateBranchOnAppAsync(
             updateBranch {
               createUpdateBranchForApp(appId: $appId, name: $name) {
                 id
-                ...UpdateBranchBasicInfoFragment
+                name
               }
             }
           }
-          ${print(UpdateBranchBasicInfoFragmentNode)}
         `,
         {
           appId,
           name,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
+        }
       )
       .toPromise()
   );
@@ -167,21 +163,22 @@ export async function ensureBranchExistsAsync(
     appId: string;
     branchName: string;
   }
-): Promise<{ branch: UpdateBranchBasicInfoFragment; createdBranch: boolean }> {
+): Promise<{ branchId: string; createdBranch: boolean }> {
   try {
     const updateBranch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
       appId,
       name: branchName,
     });
 
-    return { branch: updateBranch, createdBranch: false };
+    const { id } = updateBranch;
+    return { branchId: id, createdBranch: false };
   } catch (error) {
     if (error instanceof BranchNotFoundError) {
       const newUpdateBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
         appId,
         name: branchName,
       });
-      return { branch: newUpdateBranch, createdBranch: true };
+      return { branchId: newUpdateBranch.id, createdBranch: true };
     } else {
       throw error;
     }

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

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

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

@@ -151,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),

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

@@ -92,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 && {
@@ -116,10 +115,6 @@ export async function prepareJobAsync(
       },
     }),
     loggerLevel: ctx.loggerLevel,
-    // Technically, these are unused, but let's include them here for type consistency.
-    // See: https://github.com/expo/eas-build/pull/454
-    appId: ctx.projectId,
-    initiatingUserId: ctx.user.id,
   };
 
   return sanitizeBuildJob(job) as Android.Job;

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

@@ -99,7 +99,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,11 +113,6 @@ export async function maybeResolveVersionsAsync(
           resolveConfigValue(buildGradle, 'versionName', parsedGradleCommand?.flavor) ?? '1.0.0',
         appBuildVersion:
           resolveConfigValue(buildGradle, 'versionCode', parsedGradleCommand?.flavor) ?? '1',
-        isVersionInitialized: !resolveConfigValue(
-          buildGradle,
-          'versionCode',
-          parsedGradleCommand?.flavor
-        ),
       };
     } catch {
       return {};
@@ -209,18 +204,14 @@ export async function resolveRemoteVersionCodeAsync(
 
   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 +221,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();

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';
@@ -68,7 +66,6 @@ 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';
@@ -177,9 +174,8 @@ export async function prepareBuildRequestForPlatformAsync<
   }
   assert(projectArchive);
 
-  const runtimeAndFingerprintMetadata =
-    await computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync(ctx);
-  const metadata = await collectMetadataAsync(ctx, runtimeAndFingerprintMetadata);
+  const runtimeMetadata = await createAndMaybeUploadFingerprintAsync(ctx);
+  const metadata = await collectMetadataAsync(ctx, runtimeMetadata);
   const buildParams = resolveBuildParamsInput(ctx, metadata);
   const job = await builder.prepareJobAsync(ctx, {
     projectArchive,
@@ -277,8 +273,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([
@@ -653,35 +660,11 @@ function formatAccountBillingUrl(accountName: string): string {
   return new URL(`/accounts/${accountName}/settings/billing`, getExpoWebsiteBaseUrl()).toString();
 }
 
-async function computeAndMaybeUploadRuntimeAndFingerprintMetadataAsync<T extends Platform>(
-  ctx: BuildContext<T>
-): Promise<{
-  runtimeVersion?: string | undefined;
-  fingerprintHash?: string | undefined;
-  fingerprintSource?: FingerprintSource | undefined;
-}> {
-  const runtimeAndFingerprintMetadata =
-    await computeAndMaybeUploadFingerprintFromExpoUpdatesAsync(ctx);
-  if (!runtimeAndFingerprintMetadata?.fingerprintHash) {
-    const fingerprint = await computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync(ctx);
-    return {
-      ...runtimeAndFingerprintMetadata,
-      ...fingerprint,
-    };
-  } else {
-    return {
-      ...runtimeAndFingerprintMetadata,
-      fingerprintHash: runtimeAndFingerprintMetadata.runtimeVersion,
-    };
-  }
-}
-
-async function computeAndMaybeUploadFingerprintFromExpoUpdatesAsync<T extends Platform>(
+async function createAndMaybeUploadFingerprintAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<{
   runtimeVersion?: string;
   fingerprintSource?: FingerprintSource;
-  fingerprintHash?: string;
 }> {
   const resolvedRuntimeVersion = await resolveRuntimeVersionAsync({
     exp: ctx.exp,
@@ -700,54 +683,16 @@ 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,
     };
   }
 
-  const uploadedFingerprint = await maybeUploadFingerprintAsync({
-    hash: resolvedRuntimeVersion.runtimeVersion,
-    fingerprint: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprint,
+  return await maybeUploadFingerprintAsync({
+    runtimeVersion: resolvedRuntimeVersion.runtimeVersion,
+    fingerprint: resolvedRuntimeVersion.fingerprint,
     graphqlClient: ctx.graphqlClient,
     localBuildMode: ctx.localBuildOptions.localBuildMode,
   });
-  return {
-    runtimeVersion: uploadedFingerprint.hash,
-    fingerprintSource: uploadedFingerprint.fingerprintSource,
-    fingerprintHash: resolvedRuntimeVersion.expoUpdatesRuntimeFingerprintHash ?? undefined,
-  };
-}
-
-async function computeAndMaybeUploadFingerprintWithoutExpoUpdatesAsync<T extends Platform>(
-  ctx: BuildContext<T>,
-  { debug }: { debug?: boolean } = {}
-): Promise<{
-  fingerprintHash?: string;
-  fingerprintSource?: FingerprintSource;
-}> {
-  const fingerprint = await createFingerprintAsync(ctx.projectDir, {
-    workflow: ctx.workflow,
-    platforms: [ctx.platform],
-    env: ctx.env,
-  });
-  if (!fingerprint) {
-    return {};
-  }
-  const uploadedFingerprint = await maybeUploadFingerprintAsync({
-    hash: fingerprint.hash,
-    fingerprint: {
-      fingerprintSources: fingerprint.sources,
-      isDebugFingerprintSource: debug ?? false,
-    },
-    graphqlClient: ctx.graphqlClient,
-    localBuildMode: ctx.localBuildOptions.localBuildMode,
-  });
-  return {
-    fingerprintHash: uploadedFingerprint.hash,
-    fingerprintSource: uploadedFingerprint.fingerprintSource,
-  };
 }

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/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,
@@ -49,10 +54,9 @@ async function resolveEnvVarsAsync({
   projectId: string;
 }): Promise<Env> {
   const environment =
-    buildProfile.environment?.toUpperCase() ??
-    resolveSuggestedEnvironmentForBuildProfileConfiguration(buildProfile);
+    buildProfile.environment?.toUpperCase() ?? process.env.EAS_CURRENT_ENVIRONMENT;
 
-  if (!isEnvironment(environment)) {
+  if (!environment || !isEnvironment(environment)) {
     Log.log(
       `Loaded "env" configuration for the "${buildProfileName}" profile: ${
         buildProfile.env && Object.keys(buildProfile.env).length > 0
@@ -79,13 +83,24 @@ 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 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 found for the "${environment.toLowerCase()}" environment on EAS servers.`
+      );
+    }
+
+    const encryptedEnvVars = environmentVariables.filter(({ name, value }) => name && !value);
+    if (encryptedEnvVars.length > 0) {
+      Log.warn(
+        `Some environment variables defined in the "${environment.toLowerCase()}" environment on EAS servers are of "encrypted" type and cannot be read outside of the EAS servers (including EAS CLI): ${encryptedEnvVars
+          .map(({ name }) => name)
+          .join(
+            ', '
+          )}. However, they will be available during the build process happening on the EAS servers. This can lead to potential configuration mismatches between the local development environment and the build environment if the encrypted environment variables are used to resolve the app config.`
       );
     }
 
@@ -95,6 +110,10 @@ async function resolveEnvVarsAsync({
           buildProfile.env && Object.keys(buildProfile.env).join(', ')
         }.`
       );
+    } else {
+      Log.log(
+        `No environment variables specified in the "${buildProfileName}" build profile "env" configuration.`
+      );
     }
 
     if (
@@ -107,7 +126,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.`
         );
@@ -126,22 +145,3 @@ async function resolveEnvVarsAsync({
     return { ...buildProfile.env };
   }
 }
-
-function resolveSuggestedEnvironmentForBuildProfileConfiguration(
-  buildProfile: BuildProfile
-): EnvironmentVariableEnvironment {
-  const environment =
-    buildProfile.distribution === 'store'
-      ? EnvironmentVariableEnvironment.Production
-      : buildProfile.developmentClient
-        ? EnvironmentVariableEnvironment.Development
-        : EnvironmentVariableEnvironment.Preview;
-
-  Log.log(
-    `Resolved "${environment.toLowerCase()}" environment for the build. ${learnMore(
-      'https://docs.expo.dev/eas/environment-variables/#setting-the-environment-for-your-builds'
-    )}`
-  );
-
-  return environment;
-}

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

@@ -1,19 +1,13 @@
 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 { learnMore } from '../../../log';
 import { readPlistAsync } from '../../../utils/plist';
 import { resolveVcsClient } from '../../../vcs';
-import { Client } from '../../../vcs/vcs';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -22,23 +16,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();
 
@@ -321,6 +301,27 @@ describe(readShortVersionAsync, () => {
       );
       expect(buildNumber).toBe('1.0.0');
     });
+
+    it('fails when build number is invalid', async () => {
+      const exp = initBareWorkflowProject({
+        appVersion: '$(CURRENT_PROJECT_VERSION)',
+      });
+
+      await expect(
+        readShortVersionAsync(
+          '/app',
+          exp,
+          {
+            CURRENT_PROJECT_VERSION: '0.0.7.1.028',
+          },
+          vcsClient
+        )
+      ).rejects.toThrowError(
+        `The required format for "CFBundleShortVersionString" in Info.plist is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: 0.0.7.1.028. Edit the "CFBundleShortVersionString" in your Info.plist to match the required format. ${learnMore(
+          'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
+        )}`
+      );
+    });
   });
 
   describe('managed project', () => {
@@ -380,154 +381,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

@@ -88,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: {

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

@@ -109,14 +109,14 @@ function validateShortVersion({
 }): void {
   if (shortVersion && !SHORT_VERSION_REGEX.test(shortVersion)) {
     if (workflow === Workflow.MANAGED) {
-      Log.warn(
-        `The required format for "version" field from app.json/app.config.ts for App Store iOS builds is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "version" field in your app.json/app.config.ts to match the format required by Apple. ${learnMore(
+      throw new Error(
+        `The required format for "version" field from app.json/app.config.ts is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "version" field in your app.json/app.config.ts to match the required format. ${learnMore(
           'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
         )}`
       );
     } else {
-      Log.warn(
-        `The required format for "CFBundleShortVersionString" in Info.plist for App Store iOS builds is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "CFBundleShortVersionString" in your Info.plist to match the format required by Apple. ${learnMore(
+      throw new Error(
+        `The required format for "CFBundleShortVersionString" in Info.plist is one to three period-separated integers, such as 10.14.1. The string can only contain numeric characters (0-9) and periods. Current value: ${shortVersion}. Edit the "CFBundleShortVersionString" in your Info.plist to match the required format. ${learnMore(
           'https://developer.apple.com/documentation/bundleresources/information_property_list/cfbundleshortversionstring'
         )}`
       );
@@ -330,18 +330,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 +347,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.168';
+const PLUGIN_PACKAGE_VERSION = '1.0.135';
 
 export enum LocalBuildMode {
   /**

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

@@ -16,9 +16,8 @@ import { easCliVersion } from '../utils/easCli';
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>,
-  runtimeAndFingerprintMetadata: {
+  runtimeMetadata: {
     runtimeVersion?: string | undefined;
-    fingerprintHash?: string | undefined;
     fingerprintSource?: FingerprintSource | undefined;
   }
 ): Promise<Metadata> {
@@ -31,9 +30,8 @@ export async function collectMetadataAsync<T extends Platform>(
     workflow: ctx.workflow,
     credentialsSource: ctx.buildProfile.credentialsSource,
     sdkVersion: ctx.exp.sdkVersion,
-    runtimeVersion: runtimeAndFingerprintMetadata?.runtimeVersion,
-    fingerprintHash: runtimeAndFingerprintMetadata?.fingerprintHash,
-    fingerprintSource: runtimeAndFingerprintMetadata?.fingerprintSource,
+    runtimeVersion: runtimeMetadata?.runtimeVersion,
+    fingerprintSource: runtimeMetadata?.fingerprintSource,
     reactNativeVersion: await getReactNativeVersionAsync(ctx.projectDir),
     ...channelObject,
     distribution,
@@ -62,6 +60,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 {
@@ -100,27 +99,15 @@ export interface BuildFlags {
   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[];
 }> {
   await vcsClient.ensureRepoExistsAsync();
@@ -205,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,
@@ -323,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) {
@@ -396,7 +381,7 @@ async function prepareAndStartBuildAsync({
     vcsClient,
     getDynamicPrivateProjectConfigAsync,
     customBuildConfigMetadata,
-    buildLoggerLevel: flags.buildLoggerLevel ?? (Log.isDebug ? LoggerLevel.DEBUG : undefined),
+    buildLoggerLevel: flags.buildLoggerLevel,
     freezeCredentials: flags.freezeCredentials,
     repack: flags.repack,
     env,
@@ -546,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);
 
@@ -576,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);
         }

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

@@ -50,25 +50,3 @@ export function getUpdateGroupUrl(
     getExpoWebsiteBaseUrl()
   ).toString();
 }
-
-export function getWorkflowRunUrl(
-  accountName: string,
-  projectName: string,
-  workflowRunId: string
-): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/workflows/${workflowRunId}`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}
-
-export function getProjectGitHubSettingsUrl(accountName: string, projectName: string): string {
-  return new URL(
-    `/accounts/${encodeURIComponent(accountName)}/projects/${encodeURIComponent(
-      projectName
-    )}/github`,
-    getExpoWebsiteBaseUrl()
-  ).toString();
-}

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

@@ -27,28 +27,24 @@ export async function checkGoogleServicesFileAsync<T extends Platform>(
   if (!googleServicesFilePath) {
     return;
   }
-  const googleServicesEnvVar =
-    ctx.platform === Platform.ANDROID
-      ? ctx.env.GOOGLE_SERVICES_JSON
-      : ctx.env.GOOGLE_SERVICES_INFO_PLIST;
   const rootDir = path.normalize(await ctx.vcsClient.getRootPathAsync());
   const absGoogleServicesFilePath = path.resolve(ctx.projectDir, googleServicesFilePath);
   if (
     (await fs.pathExists(absGoogleServicesFilePath)) &&
     (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-      (await ctx.vcsClient.isFileIgnoredAsync(
-        path.relative(rootDir, absGoogleServicesFilePath)
-      ))) &&
-    !googleServicesEnvVar
+      (await ctx.vcsClient.isFileIgnoredAsync(path.relative(rootDir, absGoogleServicesFilePath))))
   ) {
     Log.warn(
       `File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`
     );
     Log.warn(
-      `Use EAS file environment variables with secret or sensitive visibility to pass all values that you don't want to include in your version control to build process. ${learnMore(
-        'https://docs.expo.dev/eas/environment-variables/#file-environment-variables'
+      `Use EAS Secret to pass all values that you don't want to include in your version control. ${learnMore(
+        'https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables'
       )}`
     );
+    Log.warn(
+      `If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`
+    );
     Log.newLine();
   }
 }

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

@@ -19,7 +19,7 @@ import {
 import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
 import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
 import { UpdateChannelBasicInfoFragmentNode } from '../graphql/types/UpdateChannelBasicInfo';
-import Log, { learnMore } from '../log';
+import Log from '../log';
 import { getDisplayNameForProjectIdAsync } from '../project/projectUtils';
 import formatFields from '../utils/formatFields';
 import { printJsonOnlyOutput } from '../utils/json';
@@ -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,
     });
@@ -303,6 +303,7 @@ export async function doesChannelExistAsync(
 }
 
 /**
+ *
  * Creates a channel and links it to a branch with the same name.
  *
  * @param appId the app ID, also known as the project ID
@@ -318,7 +319,7 @@ export async function createAndLinkChannelAsync(
   }: { appId: string; channelName: string; shouldPrintJson?: boolean }
 ): Promise<ChannelBasicInfo> {
   let branchId: string;
-  let hasCreatedBranch = false;
+  let branchMessage: string;
 
   try {
     const branch = await BranchQuery.getBranchByNameAsync(graphqlClient, {
@@ -326,6 +327,7 @@ export async function createAndLinkChannelAsync(
       name: channelName,
     });
     branchId = branch.id;
+    branchMessage = `We found a branch with the same name`;
   } catch (error) {
     if (error instanceof BranchNotFoundError) {
       const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, {
@@ -333,7 +335,7 @@ export async function createAndLinkChannelAsync(
         name: channelName,
       });
       branchId = newBranch.id;
-      hasCreatedBranch = true;
+      branchMessage = `We also went ahead and made a branch with the same name`;
     } else {
       throw error;
     }
@@ -356,25 +358,26 @@ export async function createAndLinkChannelAsync(
   if (shouldPrintJson) {
     printJsonOnlyOutput(newChannel);
   } else {
-    const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, appId);
-    const learnMoreLink = learnMore('https://docs.expo.dev/eas-update/eas-cli/');
-
     Log.addNewLineIfNone();
-    if (hasCreatedBranch) {
-      Log.withTick(
-        `Created update channel ${chalk.bold(`"${newChannel.name}"`)} and branch ${chalk.bold(
-          `"${newChannel.name}"`
-        )} on ${chalk.bold(projectDisplayName)} project. ${learnMoreLink}`
-      );
-    } else {
-      Log.withTick(
-        `Created update channel ${chalk.bold(`"${newChannel.name}"`)} on ${chalk.bold(
-          projectDisplayName
-        )} project and connected it with existing ${chalk.bold(
-          `"${newChannel.name}"`
-        )} branch. ${learnMoreLink}`
-      );
-    }
+    Log.withTick(
+      `Created a new channel on project ${chalk.bold(
+        await getDisplayNameForProjectIdAsync(graphqlClient, appId)
+      )}`
+    );
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: newChannel.id },
+      ])
+    );
+    Log.addNewLineIfNone();
+    Log.withTick(`${branchMessage} and have pointed the channel at it.`);
+    Log.log(
+      formatFields([
+        { label: 'Name', value: newChannel.name },
+        { label: 'ID', value: branchId },
+      ])
+    );
   }
   return newChannel;
 }

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

@@ -16,8 +16,6 @@ import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
 import { OptionalPrivateProjectConfigContextField } from './context/OptionalPrivateProjectConfigContextField';
 import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
-import { ProjectIdContextField } from './context/ProjectIdContextField';
-import { ServerSideEnvironmentVariablesContextField } from './context/ServerSideEnvironmentVariablesContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
 import VcsClientContextField from './context/VcsClientContextField';
 import { EasCommandError } from './errors';
@@ -26,7 +24,6 @@ import {
   CommandEvent,
   createAnalyticsAsync,
 } from '../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
 import Log from '../log';
 import SessionManager from '../user/SessionManager';
 import { Client } from '../vcs/vcs';
@@ -47,26 +44,8 @@ export type ContextOutput<
   [P in keyof T]: T[P];
 };
 
-type GetContextType<Type> = {
-  [Property in keyof Type]: any;
-};
-
 const BASE_GRAPHQL_ERROR_MESSAGE: string = 'GraphQL request failed.';
 
-interface BaseGetContextAsyncArgs {
-  nonInteractive: boolean;
-  vcsClientOverride?: Client;
-}
-
-interface GetContextAsyncArgsWithRequiredServerSideEnvironmentArgument
-  extends BaseGetContextAsyncArgs {
-  withServerSideEnvironment: EnvironmentVariableEnvironment | null;
-}
-
-interface GetContextAsyncArgsWithoutServerSideEnvironmentArgument extends BaseGetContextAsyncArgs {
-  withServerSideEnvironment?: never;
-}
-
 export default abstract class EasCommand extends Command {
   protected static readonly ContextOptions = {
     /**
@@ -102,7 +81,7 @@ export default abstract class EasCommand extends Command {
      * run within a project directory, null otherwise.
      */
     OptionalProjectConfig: {
-      optionalPrivateProjectConfig: new OptionalPrivateProjectConfigContextField(),
+      privateProjectConfig: new OptionalPrivateProjectConfigContextField(),
     },
     /**
      * Require this command to be run in a project directory. Return the project directory in the context.
@@ -137,16 +116,6 @@ export default abstract class EasCommand extends Command {
     Vcs: {
       vcsClient: new VcsClientContextField(),
     },
-    ServerSideEnvironmentVariables: {
-      // eslint-disable-next-line async-protect/async-suffix
-      getServerSideEnvironmentVariablesAsync: new ServerSideEnvironmentVariablesContextField(),
-    },
-    /**
-     * Require the project to be identified and registered on server. Returns the project ID evaluated from the app config.
-     */
-    ProjectId: {
-      projectId: new ProjectIdContextField(),
-    },
   };
 
   /**
@@ -181,19 +150,7 @@ export default abstract class EasCommand extends Command {
     } = object,
   >(
     commandClass: { contextDefinition: ContextInput<C> },
-    {
-      nonInteractive,
-      vcsClientOverride,
-      // if specified and not null, the env vars from the selected environment will be fetched from the server
-      // to resolve dynamic config (if dynamic config context is used) and enable getServerSideEnvironmentVariablesAsync function (if server side environment variables context is used)
-      withServerSideEnvironment,
-    }: C extends
-      | GetContextType<typeof EasCommand.ContextOptions.ProjectConfig>
-      | GetContextType<typeof EasCommand.ContextOptions.DynamicProjectConfig>
-      | GetContextType<typeof EasCommand.ContextOptions.OptionalProjectConfig>
-      | GetContextType<typeof EasCommand.ContextOptions.ServerSideEnvironmentVariables>
-      ? GetContextAsyncArgsWithRequiredServerSideEnvironmentArgument
-      : GetContextAsyncArgsWithoutServerSideEnvironmentArgument
+    { nonInteractive, vcsClientOverride }: { nonInteractive: boolean; vcsClientOverride?: Client }
   ): Promise<ContextOutput<C>> {
     const contextDefinition = commandClass.contextDefinition;
 
@@ -207,7 +164,6 @@ export default abstract class EasCommand extends Command {
           sessionManager: this.sessionManager,
           analytics: this.analytics,
           vcsClientOverride,
-          withServerSideEnvironment,
         }),
       ]);
     }

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

@@ -38,12 +38,7 @@ export async function fetchBuildsAsync({
 }: {
   graphqlClient: ExpoGraphqlClient;
   projectId: string;
-  filters?: {
-    statuses?: BuildStatus[];
-    platform?: RequestedPlatform;
-    profile?: string;
-    hasFingerprint?: boolean;
-  };
+  filters?: { statuses?: BuildStatus[]; platform?: RequestedPlatform; profile?: string };
 }): Promise<BuildFragment[]> {
   let builds: BuildFragment[];
   const queryFilters: InputMaybe<BuildFilter> = {};
@@ -53,9 +48,6 @@ export async function fetchBuildsAsync({
   if (filters?.profile) {
     queryFilters['buildProfile'] = filters.profile;
   }
-  if (filters?.hasFingerprint) {
-    queryFilters['hasFingerprint'] = filters.hasFingerprint;
-  }
   if (!filters?.statuses) {
     builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
       appId: projectId,

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

@@ -1,5 +1,4 @@
 import { Analytics } from '../../analytics/AnalyticsManager';
-import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import SessionManager from '../../user/SessionManager';
 import { Client } from '../../vcs/vcs';
 
@@ -8,10 +7,6 @@ export interface ContextOptions {
   analytics: Analytics;
   nonInteractive: boolean;
   vcsClientOverride?: Client;
-  /**
-   * If specified, env variables from the selected environment will be fetched from the server and used to evaluate the dynamic config.
-   */
-  withServerSideEnvironment?: EnvironmentVariableEnvironment | null;
 }
 
 export default abstract class ContextField<T> {

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

@@ -1,14 +1,12 @@
 import { ExpoConfig } from '@expo/config';
 
 import ContextField, { ContextOptions } from './ContextField';
-import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
 import {
   ExpoConfigOptions,
-  getPrivateExpoConfigAsync,
-  getPublicExpoConfigAsync,
+  getPrivateExpoConfig,
+  getPublicExpoConfig,
 } from '../../project/expoConfig';
 
 export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
@@ -21,34 +19,15 @@ export class DynamicPublicProjectConfigContextField extends ContextField<Dynamic
   async getValueAsync({
     nonInteractive,
     sessionManager,
-    withServerSideEnvironment,
   }: ContextOptions): Promise<DynamicConfigContextFn> {
     const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
     return async (options?: ExpoConfigOptions) => {
-      const expBefore = await getPublicExpoConfigAsync(projectDir, options);
+      const expBefore = getPublicExpoConfig(projectDir, options);
       const projectId = await getProjectIdAsync(sessionManager, expBefore, {
         nonInteractive,
         env: options?.env,
       });
-      if (withServerSideEnvironment) {
-        const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-          nonInteractive,
-        });
-        const graphqlClient = createGraphqlClient(authenticationInfo);
-        const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-          environment: withServerSideEnvironment,
-          projectId,
-          graphqlClient,
-        });
-        options = {
-          ...options,
-          env: {
-            ...options?.env,
-            ...serverSideEnvironmentVariables,
-          },
-        };
-      }
-      const exp = await getPublicExpoConfigAsync(projectDir, options);
+      const exp = getPublicExpoConfig(projectDir, options);
       return {
         exp,
         projectDir,
@@ -62,34 +41,15 @@ export class DynamicPrivateProjectConfigContextField extends ContextField<Dynami
   async getValueAsync({
     nonInteractive,
     sessionManager,
-    withServerSideEnvironment,
   }: ContextOptions): Promise<DynamicConfigContextFn> {
     const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
     return async (options?: ExpoConfigOptions) => {
-      const expBefore = await getPrivateExpoConfigAsync(projectDir, options);
+      const expBefore = getPrivateExpoConfig(projectDir, options);
       const projectId = await getProjectIdAsync(sessionManager, expBefore, {
         nonInteractive,
         env: options?.env,
       });
-      if (withServerSideEnvironment) {
-        const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-          nonInteractive,
-        });
-        const graphqlClient = createGraphqlClient(authenticationInfo);
-        const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-          environment: withServerSideEnvironment,
-          projectId,
-          graphqlClient,
-        });
-        options = {
-          ...options,
-          env: {
-            ...options?.env,
-            ...serverSideEnvironmentVariables,
-          },
-        };
-      }
-      const exp = await getPrivateExpoConfigAsync(projectDir, options);
+      const exp = getPrivateExpoConfig(projectDir, options);
       return {
         exp,
         projectDir,

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

@@ -2,11 +2,9 @@ import { ExpoConfig } from '@expo/config';
 import { InvalidEasJsonError } from '@expo/eas-json/build/errors';
 
 import ContextField, { ContextOptions } from './ContextField';
-import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPrivateExpoConfigAsync } from '../../project/expoConfig';
+import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class OptionalPrivateProjectConfigContextField extends ContextField<
   | {
@@ -16,11 +14,7 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
     }
   | undefined
 > {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-    withServerSideEnvironment,
-  }: ContextOptions): Promise<
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<
     | {
         projectId: string;
         exp: ExpoConfig;
@@ -41,24 +35,11 @@ export class OptionalPrivateProjectConfigContextField extends ContextField<
       return undefined;
     }
 
-    const expBefore = await getPrivateExpoConfigAsync(projectDir);
+    const expBefore = getPrivateExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(sessionManager, expBefore, {
       nonInteractive,
     });
-    let serverSideEnvVars: Record<string, string> | undefined;
-    if (withServerSideEnvironment) {
-      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-        environment: withServerSideEnvironment,
-        projectId,
-        graphqlClient,
-      });
-      serverSideEnvVars = serverSideEnvironmentVariables;
-    }
-    const exp = await getPrivateExpoConfigAsync(projectDir, { env: serverSideEnvVars });
+    const exp = getPrivateExpoConfig(projectDir);
     return {
       exp,
       projectDir,

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

@@ -1,45 +1,26 @@
 import { ExpoConfig } from '@expo/config';
 
 import ContextField, { ContextOptions } from './ContextField';
-import { createGraphqlClient } from './contextUtils/createGraphqlClient';
 import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPrivateExpoConfigAsync } from '../../project/expoConfig';
+import { getPrivateExpoConfig } from '../../project/expoConfig';
 
 export class PrivateProjectConfigContextField extends ContextField<{
   projectId: string;
   exp: ExpoConfig;
   projectDir: string;
 }> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-    withServerSideEnvironment,
-  }: ContextOptions): Promise<{
+  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
     projectId: string;
     exp: ExpoConfig;
     projectDir: string;
   }> {
     const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = await getPrivateExpoConfigAsync(projectDir);
+    const expBefore = getPrivateExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(sessionManager, expBefore, {
       nonInteractive,
     });
-    let serverSideEnvVars: Record<string, string> | undefined;
-    if (withServerSideEnvironment) {
-      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-        environment: withServerSideEnvironment,
-        projectId,
-        graphqlClient,
-      });
-      serverSideEnvVars = serverSideEnvironmentVariables;
-    }
-    const exp = await getPrivateExpoConfigAsync(projectDir, { env: serverSideEnvVars });
+    const exp = getPrivateExpoConfig(projectDir);
 
     return {
       projectId,

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

@@ -1,15 +0,0 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { getPrivateExpoConfigAsync } from '../../project/expoConfig';
-
-export class ProjectIdContextField extends ContextField<string> {
-  async getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<string> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    const expBefore = await getPrivateExpoConfigAsync(projectDir);
-    const projectId = await getProjectIdAsync(sessionManager, expBefore, {
-      nonInteractive,
-    });
-    return projectId;
-  }
-}

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

@@ -1,42 +0,0 @@
-import ContextField, { ContextOptions } from './ContextField';
-import { createGraphqlClient } from './contextUtils/createGraphqlClient';
-import { findProjectDirAndVerifyProjectSetupAsync } from './contextUtils/findProjectDirAndVerifyProjectSetupAsync';
-import { getProjectIdAsync } from './contextUtils/getProjectIdAsync';
-import { loadServerSideEnvironmentVariablesAsync } from './contextUtils/loadServerSideEnvironmentVariablesAsync';
-import { getPublicExpoConfigAsync } from '../../project/expoConfig';
-
-type GetServerSideEnvironmentVariablesFn = (
-  maybeEnv?: Record<string, string>
-) => Promise<Record<string, string>>;
-
-export class ServerSideEnvironmentVariablesContextField extends ContextField<GetServerSideEnvironmentVariablesFn> {
-  async getValueAsync({
-    nonInteractive,
-    sessionManager,
-    withServerSideEnvironment,
-  }: ContextOptions): Promise<GetServerSideEnvironmentVariablesFn> {
-    const projectDir = await findProjectDirAndVerifyProjectSetupAsync();
-    return async (maybeEnv?: Record<string, string>) => {
-      if (!withServerSideEnvironment) {
-        throw new Error(
-          'withServerSideEnvironment parameter is required to evaluate ServerSideEnvironmentVariablesContextField'
-        );
-      }
-      const exp = await getPublicExpoConfigAsync(projectDir, { env: maybeEnv });
-      const projectId = await getProjectIdAsync(sessionManager, exp, {
-        nonInteractive,
-        env: maybeEnv,
-      });
-      const { authenticationInfo } = await sessionManager.ensureLoggedInAsync({
-        nonInteractive,
-      });
-      const graphqlClient = createGraphqlClient(authenticationInfo);
-      const serverSideEnvironmentVariables = await loadServerSideEnvironmentVariablesAsync({
-        environment: withServerSideEnvironment,
-        projectId,
-        graphqlClient,
-      });
-      return serverSideEnvironmentVariables;
-    };
-  }
-}

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

@@ -6,7 +6,6 @@ import { Role } from '../../../../graphql/generated';
 import { AppQuery } from '../../../../graphql/queries/AppQuery';
 import { learnMore } from '../../../../log';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
-import { isExpoInstalled } from '../../../../project/projectUtils';
 import SessionManager from '../../../../user/SessionManager';
 import { findProjectRootAsync } from '../findProjectDirAndVerifyProjectSetupAsync';
 import { getProjectIdAsync } from '../getProjectIdAsync';
@@ -22,7 +21,6 @@ jest.mock('../../../../ora', () => ({
   }),
 }));
 jest.mock('../../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync');
-jest.mock('../../../../project/projectUtils');
 
 describe(getProjectIdAsync, () => {
   let sessionManager: SessionManager;
@@ -73,17 +71,11 @@ describe(getProjectIdAsync, () => {
     );
 
     jest.mocked(findProjectRootAsync).mockResolvedValue('/app');
-    jest.mocked(isExpoInstalled).mockReturnValue(true);
   });
 
   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 +88,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 +96,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 +109,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 +119,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 +208,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 +219,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: { expo: { name: 'test', slug: 'test', extra: { eas: { projectId: '2345' } } } },
     });
     jest
       .mocked(fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)
@@ -317,7 +230,7 @@ describe(getProjectIdAsync, () => {
 
     const projectId = await getProjectIdAsync(
       sessionManager,
-      { sdkVersion: '52.0.0', name: 'test', slug: 'test' },
+      { name: 'test', slug: 'test' },
       {
         nonInteractive: false,
       }
@@ -336,9 +249,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 +259,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 +278,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

@@ -42,7 +42,7 @@ async function ensureEasCliIsNotInDependenciesAsync(projectDir: string): Promise
     consoleWarn(`Found ${chalk.bold('eas-cli')} in your project dependencies.`);
   }
 
-  const maybeRepoRoot = PackageManagerUtils.resolveWorkspaceRoot(projectDir) ?? projectDir;
+  const maybeRepoRoot = PackageManagerUtils.findWorkspaceRoot(projectDir) ?? projectDir;
   if (maybeRepoRoot !== projectDir && (await isEasCliInDependenciesAsync(maybeRepoRoot))) {
     printCliVersionWarning = true;
     consoleWarn(`Found ${chalk.bold('eas-cli')} in your monorepo dependencies.`);
@@ -103,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.
@@ -115,9 +113,6 @@ let ranEnsureEasCliIsNotInDependencies = false;
 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,18 +1,15 @@
 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';
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import Log, { learnMore } from '../../../log';
 import { ora } from '../../../ora';
-import {
-  createOrModifyExpoConfigAsync,
-  getPrivateExpoConfigAsync,
-} from '../../../project/expoConfig';
+import { createOrModifyExpoConfigAsync, getPrivateExpoConfig } from '../../../project/expoConfig';
 import { fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync } from '../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync';
+import { toAppPrivacy } from '../../../project/projectUtils';
 import SessionManager from '../../../user/SessionManager';
 import { Actor, getActorUsername } from '../../../user/User';
 
@@ -28,7 +25,7 @@ export async function saveProjectIdToAppConfigAsync(
   options: { env?: Env } = {}
 ): Promise<void> {
   // NOTE(cedric): we disable plugins to avoid writing plugin-generated content to `expo.extra`
-  const exp = await getPrivateExpoConfigAsync(projectDir, { skipPlugins: true, ...options });
+  const exp = getPrivateExpoConfig(projectDir, { skipPlugins: true, ...options });
   const result = await createOrModifyExpoConfigAsync(
     projectDir,
     {
@@ -128,33 +125,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'
+          )}`
+        );
       }
     }
 
@@ -201,6 +194,7 @@ export async function validateOrSetProjectIdAsync({
     {
       accountName: getAccountNameForEASProjectSync(exp, actor),
       projectName: exp.slug,
+      privacy: toAppPrivacy(exp.privacy),
     },
     {
       nonInteractive: options.nonInteractive,

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

@@ -1,59 +0,0 @@
-import { ExpoGraphqlClient } from './createGraphqlClient';
-import { EnvironmentVariableEnvironment } from '../../../graphql/generated';
-import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
-import Log from '../../../log';
-
-const cachedServerSideEnvironmentVariables: Record<
-  EnvironmentVariableEnvironment,
-  Record<string, string> | null
-> = {
-  [EnvironmentVariableEnvironment.Development]: null,
-  [EnvironmentVariableEnvironment.Preview]: null,
-  [EnvironmentVariableEnvironment.Production]: null,
-};
-
-export async function loadServerSideEnvironmentVariablesAsync({
-  environment,
-  projectId,
-  graphqlClient,
-}: {
-  environment: EnvironmentVariableEnvironment;
-  projectId: string;
-  graphqlClient: ExpoGraphqlClient;
-}): Promise<Record<string, string>> {
-  // don't load environment variables if they were already loaded while executing a command
-  const cachedEnvVarsForEnvironment = cachedServerSideEnvironmentVariables[environment];
-  if (cachedEnvVarsForEnvironment) {
-    return cachedEnvVarsForEnvironment;
-  }
-
-  const environmentVariables = await EnvironmentVariablesQuery.byAppIdWithSensitiveAsync(
-    graphqlClient,
-    {
-      appId: projectId,
-      environment,
-    }
-  );
-  const serverEnvVars = Object.fromEntries(
-    environmentVariables
-      .filter(({ name, value }) => name && value)
-      .map(({ name, value }) => [name, value])
-  ) as Record<string, string>;
-
-  if (Object.keys(serverEnvVars).length > 0) {
-    Log.log(
-      `Environment variables with visibility "Plain text" and "Sensitive" loaded from the "${environment.toLowerCase()}" environment on EAS: ${Object.keys(
-        serverEnvVars
-      ).join(', ')}.`
-    );
-  } else {
-    Log.log(
-      `No environment variables with visibility "Plain text" and "Sensitive" found for the "${environment.toLowerCase()}" environment on EAS.`
-    );
-  }
-  Log.newLine();
-
-  cachedServerSideEnvironmentVariables[environment] = serverEnvVars;
-
-  return serverEnvVars;
-}

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

@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';
 
-import { EnvironmentVariableEnvironment } from '../graphql/generated';
+import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../graphql/generated';
 
 // NOTE: not exactly true, but, provided mapToLowercase and upperCaseAsync
 // are used in tandem, it saves on unnecessary typying in commands
@@ -52,19 +52,18 @@ export const EASVariableFormatFlag = {
 };
 
 export const EASVariableVisibilityFlag = {
-  visibility: Flags.enum<'plaintext' | 'sensitive' | 'secret'>({
+  visibility: Flags.enum<'plaintext' | 'sensitive' | 'encrypted'>({
     description: 'Visibility of the variable',
-    options: ['plaintext', 'sensitive', 'secret'],
+    options: ['plaintext', 'sensitive', 'encrypted'],
   }),
 };
 
-export type EASEnvironmentVariableScopeFlagValue = 'project' | 'account';
-
-export const EASEnvironmentVariableScopeFlag = {
-  scope: Flags.enum<EASEnvironmentVariableScopeFlagValue>({
+export const EASVariableScopeFlag = {
+  scope: Flags.enum<EnvironmentVariableScope>({
     description: 'Scope for the variable',
-    options: ['project', 'account'],
-    default: 'project',
+    options: mapToLowercase([EnvironmentVariableScope.Shared, EnvironmentVariableScope.Project]),
+    parse: upperCaseAsync,
+    default: EnvironmentVariableScope.Project,
   }),
 };
 
@@ -79,14 +78,3 @@ export const EasJsonOnlyFlag = {
     description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
   }),
 };
-
-export const EasUpdateEnvironmentFlag = {
-  environment: Flags.enum<EnvironmentVariableEnvironment | null>({
-    description:
-      'Environment to use for the server-side defined EAS environment variables during command execution.',
-    options: mapToLowercase(Object.values(EnvironmentVariableEnvironment)),
-    parse: upperCaseAsync,
-    required: false,
-    default: null,
-  }),
-};

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

@@ -25,7 +25,7 @@ export default class BranchCreate extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -36,7 +36,7 @@ export default class BranchCreate extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(BranchCreate);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
       vcsClient,
     } = await this.getContextAsync(BranchCreate, {
@@ -58,7 +58,7 @@ export default class BranchCreate extends EasCommand {
         type: 'text',
         name: 'name',
         message: 'Provide a branch name:',
-        initial: (await getDefaultBranchNameAsync(vcsClient)) ?? undefined,
+        initial: await getDefaultBranchNameAsync(vcsClient),
         validate: value => (value ? true : validationMessage),
       }));
     }

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

@@ -79,7 +79,7 @@ export default class BranchDelete extends EasCommand {
   static override description = 'delete a branch';
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -108,7 +108,7 @@ export default class BranchDelete extends EasCommand {
     }
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchDelete, { nonInteractive });
     const projectDisplayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

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

@@ -13,14 +13,14 @@ export default class BranchList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BranchList);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchList, {
       nonInteractive: flags['non-interactive'],

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

@@ -63,7 +63,7 @@ export default class BranchRename extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -72,7 +72,7 @@ export default class BranchRename extends EasCommand {
       flags: { json: jsonFlag, from: currentName, to: newName, 'non-interactive': nonInteractive },
     } = await this.parse(BranchRename);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchRename, {
       nonInteractive,

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

@@ -27,7 +27,7 @@ export default class BranchView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -38,7 +38,7 @@ export default class BranchView extends EasCommand {
     } = await this.parse(BranchView);
     const { 'non-interactive': nonInteractive } = flags;
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BranchView, {
       nonInteractive,

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

@@ -110,7 +110,7 @@ export default class BuildCancel extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -128,7 +128,7 @@ export default class BuildCancel extends EasCommand {
     }
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildCancel, {
       nonInteractive,

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

@@ -38,7 +38,6 @@ export default class BuildConfigure extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildConfigure, {
       nonInteractive: false,
-      withServerSideEnvironment: null,
     });
 
     Log.log(

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

@@ -94,7 +94,7 @@ export default class BuildDelete extends EasCommand {
     }),
   };
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -112,7 +112,7 @@ export default class BuildDelete extends EasCommand {
     }
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildDelete, { nonInteractive });
     const displayName = await getDisplayNameForProjectIdAsync(graphqlClient, projectId);

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

@@ -1,351 +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 { 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 { createFingerprintAsync } from '../../utils/fingerprintCli';
-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,
-    });
-    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,
-    });
-    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: {},
-        repack: false,
-        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,
-  }: {
-    graphqlClient: ExpoGraphqlClient;
-    projectId: string;
-    platform: Platform;
-    fingerprint?: { hash: 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,
-      },
-      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/index.ts

@@ -78,12 +78,10 @@ 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',
@@ -144,7 +142,6 @@ export default class Build extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(Build, {
       nonInteractive: flags.nonInteractive,
-      withServerSideEnvironment: null,
     });
 
     await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
@@ -160,15 +157,15 @@ export default class Build extends EasCommand {
 
     const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
 
-    await runBuildAndSubmitAsync({
+    await runBuildAndSubmitAsync(
       graphqlClient,
       analytics,
       vcsClient,
       projectDir,
-      flags: flagsWithPlatform,
+      flagsWithPlatform,
       actor,
-      getDynamicPrivateProjectConfigAsync,
-    });
+      getDynamicPrivateProjectConfigAsync
+    );
   }
 
   private sanitizeFlags(

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

@@ -79,7 +79,6 @@ export default class BuildInspect extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildInspect, {
       nonInteractive: false,
-      withServerSideEnvironment: null,
     });
 
     const outputDirectory = path.resolve(process.cwd(), flags.output);
@@ -99,12 +98,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,
@@ -124,8 +123,8 @@ export default class BuildInspect extends EasCommand {
             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,7 @@ 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';
 
 /**
  * This command will be run on the EAS Build workers, when building
@@ -63,24 +63,17 @@ export default class BuildInternal extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildInternal, {
       nonInteractive: true,
-      withServerSideEnvironment: null,
+      vcsClientOverride: new GitNoCommitClient(),
     });
 
-    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,
@@ -96,7 +89,7 @@ export default class BuildInternal extends EasCommand {
         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,
@@ -75,7 +72,7 @@ export default class BuildList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -102,7 +99,7 @@ export default class BuildList extends EasCommand {
       process.exit(1);
     }
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildList, {
       nonInteractive,
@@ -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/resign.ts

@@ -120,7 +120,6 @@ export default class BuildResign extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildResign, {
       nonInteractive: flags.nonInteractive,
-      withServerSideEnvironment: null,
     });
 
     const maybeBuild = flags.maybeBuildId

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;
@@ -77,7 +79,8 @@ export default class Run extends EasCommand {
 
   static override contextDefinition = {
     ...this.ContextOptions.LoggedIn,
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
+    ...this.ContextOptions.ProjectDir,
     ...this.ContextOptions.Vcs,
   };
 
@@ -87,7 +90,7 @@ export default class Run extends EasCommand {
     const queryOptions = getPaginatedQueryOptions(flags);
     const {
       loggedIn: { graphqlClient },
-      projectId,
+      privateProjectConfig: { projectId },
     } = await this.getContextAsync(Run, {
       nonInteractive: false,
     });
@@ -243,6 +246,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/get.ts

@@ -54,7 +54,6 @@ export default class BuildVersionGetView extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildVersionGetView, {
       nonInteractive: true,
-      withServerSideEnvironment: null,
     });
 
     if (!flags.platform && flags['non-interactive']) {

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

@@ -54,7 +54,6 @@ export default class BuildVersionSetView extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildVersionSetView, {
       nonInteractive: false,
-      withServerSideEnvironment: null,
     });
 
     const platform = await selectPlatformAsync(flags.platform);

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

@@ -73,7 +73,6 @@ export default class BuildVersionSyncView extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(BuildVersionSyncView, {
       nonInteractive: true,
-      withServerSideEnvironment: null,
     });
 
     const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
@@ -120,7 +119,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/build/view.ts

@@ -18,7 +18,7 @@ export default class BuildView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
     ...this.ContextOptions.Vcs,
   };
@@ -29,7 +29,7 @@ export default class BuildView extends EasCommand {
       flags,
     } = await this.parse(BuildView);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildView, {
       nonInteractive: true,

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

@@ -23,7 +23,7 @@ export default class ChannelCreate extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -33,7 +33,7 @@ export default class ChannelCreate extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelCreate);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelCreate, {
       nonInteractive,

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

@@ -31,7 +31,7 @@ export default class ChannelDelete extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -41,7 +41,7 @@ export default class ChannelDelete extends EasCommand {
       flags: { json: jsonFlag, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelDelete);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelDelete, {
       nonInteractive,
@@ -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

@@ -74,7 +74,7 @@ export default class ChannelEdit extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -84,7 +84,7 @@ export default class ChannelEdit extends EasCommand {
       flags: { branch: branchFlag, json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelEdit);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelEdit, {
       nonInteractive,
@@ -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/list.ts

@@ -18,7 +18,7 @@ export default class ChannelList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -27,7 +27,7 @@ export default class ChannelList extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelList, {
       nonInteractive,

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

@@ -66,7 +66,7 @@ export default class ChannelPause extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -76,7 +76,7 @@ export default class ChannelPause extends EasCommand {
       flags: { json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelPause);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelPause, {
       nonInteractive,
@@ -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

@@ -66,7 +66,7 @@ export default class ChannelResume extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -76,7 +76,7 @@ export default class ChannelResume extends EasCommand {
       flags: { json, 'non-interactive': nonInteractive },
     } = await this.parse(ChannelResume);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelResume, {
       nonInteractive,
@@ -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/channel/rollout.ts

@@ -138,7 +138,6 @@ export default class ChannelRollout extends EasCommand {
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelRollout, {
       nonInteractive: argsAndFlags.nonInteractive,
-      withServerSideEnvironment: null,
     });
     if (argsAndFlags.json) {
       enableJsonOutput();

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

@@ -26,7 +26,7 @@ export default class ChannelView extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -38,7 +38,7 @@ export default class ChannelView extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const { json: jsonFlag, 'non-interactive': nonInteractive } = flags;
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(ChannelView, {
       nonInteractive,

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

@@ -50,7 +50,6 @@ export default class Config extends EasCommand {
     const { getDynamicPublicProjectConfigAsync, projectDir, getDynamicLoggedInAsync } =
       await this.getContextAsync(Config, {
         nonInteractive,
-        withServerSideEnvironment: null,
       });
 
     const accessor = EasJsonAccessor.fromProjectPath(projectDir);

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

@@ -39,7 +39,6 @@ export default class InitializeBuildCredentials extends EasCommand {
       vcsClient,
     } = await this.getContextAsync(InitializeBuildCredentials, {
       nonInteractive: false,
-      withServerSideEnvironment: null,
     });
 
     const platform = await selectPlatformAsync(flags.platform);

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

@@ -22,13 +22,12 @@ export default class Credentials extends EasCommand {
     const { flags } = await this.parse(Credentials);
     const {
       loggedIn: { actor, graphqlClient },
-      optionalPrivateProjectConfig: privateProjectConfig,
+      privateProjectConfig,
       getDynamicPrivateProjectConfigAsync,
       analytics,
       vcsClient,
     } = await this.getContextAsync(Credentials, {
       nonInteractive: false,
-      withServerSideEnvironment: null,
     });
 
     await new SelectPlatform(

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

@@ -15,10 +15,9 @@ export default class DeviceCreate extends EasCommand {
     // this command is interactive by design
     const {
       loggedIn: { actor, graphqlClient },
-      optionalPrivateProjectConfig: privateProjectConfig,
+      privateProjectConfig,
     } = await this.getContextAsync(DeviceCreate, {
       nonInteractive: false,
-      withServerSideEnvironment: null,
     });
 
     const ctx = await createContextAsync({

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

@@ -34,7 +34,7 @@ export default class DeviceDelete extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -43,7 +43,7 @@ export default class DeviceDelete extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     let { 'apple-team-id': appleTeamIdentifier, udid } = flags;
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(DeviceDelete, {
       nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -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/list.ts

@@ -21,7 +21,7 @@ export default class BuildList extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -29,7 +29,7 @@ export default class BuildList extends EasCommand {
     const { flags } = await this.parse(BuildList);
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(BuildList, {
       nonInteractive: paginatedQueryOptions.nonInteractive,

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

@@ -35,7 +35,7 @@ export default class DeviceRename extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -44,7 +44,7 @@ export default class DeviceRename extends EasCommand {
     const paginatedQueryOptions = getPaginatedQueryOptions(flags);
     let { 'apple-team-id': appleTeamIdentifier, udid, name } = flags;
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(DeviceRename, {
       nonInteractive: paginatedQueryOptions.nonInteractive,
@@ -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/device/view.ts

@@ -11,7 +11,7 @@ export default class DeviceView extends EasCommand {
   static override args = [{ name: 'UDID' }];
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -32,7 +32,7 @@ If you are not sure what is the UDID of the device you are looking for, run:
       throw new Error('Device UDID is missing');
     }
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(DeviceView, {
       nonInteractive: true,

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

@@ -19,14 +19,14 @@ import {
   promptVariableTypeAsync,
   promptVariableValueAsync,
 } from '../../../utils/prompts';
-import EnvCreate from '../create';
+import EnvironmentVariableCreate from '../create';
 
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../utils/prompts');
 
-describe(EnvCreate, () => {
+describe(EnvironmentVariableCreate, () => {
   const graphqlClient = {} as any as ExpoGraphqlClient;
   const mockConfig = {} as unknown as Config;
   const variableId = 'testId';
@@ -74,7 +74,7 @@ describe(EnvCreate, () => {
 
   describe('in interactive mode', () => {
     it('creates a project variable', async () => {
-      const command = new EnvCreate(
+      const command = new EnvironmentVariableCreate(
         [
           '--name',
           'VarName',
@@ -83,7 +83,7 @@ describe(EnvCreate, () => {
           '--environment',
           'production',
           '--visibility',
-          'secret',
+          'encrypted',
         ],
         mockConfig
       );
@@ -91,7 +91,7 @@ describe(EnvCreate, () => {
       // @ts-expect-error
       jest.spyOn(command, 'getContextAsync').mockReturnValue({
         loggedIn: { graphqlClient },
-        projectId: testProjectId,
+        privateProjectConfig: { projectId: testProjectId },
       });
 
       await command.runAsync();
@@ -110,7 +110,7 @@ describe(EnvCreate, () => {
     });
 
     it('updates an existing variable in the same environment', async () => {
-      const command = new EnvCreate(
+      const command = new EnvironmentVariableCreate(
         [
           '--name',
           'VarName',
@@ -119,7 +119,7 @@ describe(EnvCreate, () => {
           '--environment',
           'production',
           '--visibility',
-          'secret',
+          'encrypted',
         ],
         mockConfig
       );
@@ -127,7 +127,7 @@ describe(EnvCreate, () => {
       // @ts-expect-error
       jest.spyOn(command, 'getContextAsync').mockReturnValue({
         loggedIn: { graphqlClient },
-        projectId: testProjectId,
+        privateProjectConfig: { projectId: testProjectId },
       });
 
       const otherVariableId = 'otherId';
@@ -171,8 +171,8 @@ describe(EnvCreate, () => {
       });
     });
 
-    it('creates an account-wide variable', async () => {
-      const command = new EnvCreate(
+    it('creates a shared variable', async () => {
+      const command = new EnvironmentVariableCreate(
         [
           '--name',
           'VarName',
@@ -181,7 +181,7 @@ describe(EnvCreate, () => {
           '--environment',
           'production',
           '--scope',
-          'account',
+          'shared',
         ],
         mockConfig
       );
@@ -199,7 +199,6 @@ describe(EnvCreate, () => {
         {
           name: 'VarName',
           value: 'VarValue',
-          isGlobal: true,
           environments: [EnvironmentVariableEnvironment.Production],
           visibility: EnvironmentVariableVisibility.Public,
           type: EnvironmentSecretType.String,
@@ -208,8 +207,8 @@ describe(EnvCreate, () => {
       );
     });
 
-    it('throws if an account-wide variable already exists', async () => {
-      const command = new EnvCreate(
+    it('throws if a shared variable already exists', async () => {
+      const command = new EnvironmentVariableCreate(
         [
           '--name',
           'VarName',
@@ -218,7 +217,7 @@ describe(EnvCreate, () => {
           '--environment',
           'production',
           '--scope',
-          'account',
+          'shared',
         ],
         mockConfig
       );
@@ -243,8 +242,8 @@ describe(EnvCreate, () => {
       await expect(command.runAsync()).rejects.toThrow();
     });
 
-    it('updates if an account-wide variable already exists and --force flag is set', async () => {
-      const command = new EnvCreate(
+    it('updates if a shared variable already exists and --force flag is set', async () => {
+      const command = new EnvironmentVariableCreate(
         [
           '--name',
           'VarName',
@@ -254,7 +253,7 @@ describe(EnvCreate, () => {
           'production',
           '--force',
           '--scope',
-          'account',
+          'shared',
         ],
         mockConfig
       );
@@ -289,8 +288,8 @@ describe(EnvCreate, () => {
       });
     });
 
-    it('creates an account-wide variable and links it', async () => {
-      const command = new EnvCreate(
+    it('creates a shared variable and links it', async () => {
+      const command = new EnvironmentVariableCreate(
         [
           '--name',
           'VarName',
@@ -301,7 +300,7 @@ describe(EnvCreate, () => {
           '--environment',
           'development',
           '--scope',
-          'account',
+          'shared',
           '--link',
         ],
         mockConfig
@@ -310,7 +309,7 @@ describe(EnvCreate, () => {
       // @ts-expect-error
       jest.spyOn(command, 'getContextAsync').mockReturnValue({
         loggedIn: { graphqlClient },
-        projectId: testProjectId,
+        privateProjectConfig: { projectId: testProjectId },
       });
 
       await command.runAsync();
@@ -325,7 +324,6 @@ describe(EnvCreate, () => {
             EnvironmentVariableEnvironment.Development,
           ],
           visibility: EnvironmentVariableVisibility.Public,
-          isGlobal: true,
           type: EnvironmentSecretType.String,
         },
         testAccountId
@@ -345,7 +343,7 @@ describe(EnvCreate, () => {
     });
 
     it('prompts for missing arguments', async () => {
-      const command = new EnvCreate([], mockConfig);
+      const command = new EnvironmentVariableCreate([], mockConfig);
 
       jest.mocked(promptVariableNameAsync).mockImplementation(async () => 'VarName');
       jest.mocked(promptVariableValueAsync).mockImplementation(async () => 'VarValue');
@@ -361,7 +359,7 @@ describe(EnvCreate, () => {
       // @ts-expect-error
       jest.spyOn(command, 'getContextAsync').mockReturnValue({
         loggedIn: { graphqlClient },
-        projectId: testProjectId,
+        privateProjectConfig: { projectId: testProjectId },
       });
 
       await command.runAsync();

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

@@ -8,14 +8,14 @@ import { EnvironmentVariableMutation } from '../../../graphql/mutations/Environm
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptAsync, toggleConfirmAsync } from '../../../prompts';
-import EnvDelete from '../delete';
+import EnvironmentVariableDelete from '../delete';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../prompts');
 jest.mock('../../../log');
 
-describe(EnvDelete, () => {
+describe(EnvironmentVariableDelete, () => {
   const projectId = 'test-project-id';
   const variableId = '1';
   const graphqlClient = {};
@@ -40,7 +40,7 @@ describe(EnvDelete, () => {
     ];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvDelete(
+    const command = new EnvironmentVariableDelete(
       [
         '--variable-name',
         'TEST_VARIABLE',
@@ -66,7 +66,7 @@ describe(EnvDelete, () => {
     (promptAsync as jest.Mock).mockResolvedValue({ variable: mockVariables[0] });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvDelete([], mockConfig);
+    const command = new EnvironmentVariableDelete([], mockConfig);
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
@@ -82,7 +82,10 @@ describe(EnvDelete, () => {
     ];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvDelete(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableDelete(
+      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
+      mockConfig
+    );
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
@@ -96,7 +99,7 @@ describe(EnvDelete, () => {
     ];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvDelete(['--variable-name', 'TEST_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableDelete(['--variable-name', 'TEST_VARIABLE'], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
@@ -113,7 +116,7 @@ describe(EnvDelete, () => {
     (promptAsync as jest.Mock).mockResolvedValue({ variable: mockVariables[0] });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(false);
 
-    const command = new EnvDelete(['--non-interactive'], mockConfig);
+    const command = new EnvironmentVariableDelete(['--non-interactive'], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);

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

@@ -12,14 +12,14 @@ import {
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../../utils/prompts';
-import EnvGet from '../get';
+import EnvironmentVariableGet from '../get';
 
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../utils/prompts');
 
-describe(EnvGet, () => {
+describe(EnvironmentVariableGet, () => {
   const graphqlClient = {} as any as ExpoGraphqlClient;
   const mockConfig = {} as unknown as Config;
   const mockVariables: EnvironmentVariableFragment[] = [
@@ -42,12 +42,12 @@ describe(EnvGet, () => {
       .mockResolvedValueOnce(mockVariables);
     jest.spyOn(Log, 'log').mockImplementation(() => {});
 
-    const command = new EnvGet(['--variable-name', 'TEST_VAR_1'], mockConfig);
+    const command = new EnvironmentVariableGet(['--variable-name', 'TEST_VAR_1'], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
       loggedIn: { graphqlClient },
-      projectId: testProjectId,
+      privateProjectConfig: { projectId: testProjectId },
     });
 
     await command.runAsync();
@@ -68,7 +68,7 @@ describe(EnvGet, () => {
     const errorMessage =
       "Variable name is required. Run the command with '--variable-name VARIABLE_NAME' flag";
 
-    const command = new EnvGet([], mockConfig);
+    const command = new EnvironmentVariableGet([], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
@@ -85,7 +85,7 @@ describe(EnvGet, () => {
       .mockResolvedValueOnce(EnvironmentVariableEnvironment.Production);
     jest.mocked(promptVariableNameAsync).mockResolvedValueOnce('TEST_VAR_1');
 
-    const command = new EnvGet([], mockConfig);
+    const command = new EnvironmentVariableGet([], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({

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

@@ -11,7 +11,7 @@ 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';
+import EnvironmentVariableLink from '../link';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
@@ -19,13 +19,13 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');
 
-describe(EnvLink, () => {
+describe(EnvironmentVariableLink, () => {
   const projectId = 'test-project-id';
   const variableId = '1';
   const graphqlClient = {};
   const mockConfig = {} as unknown as Config;
   const mockContext = {
-    projectId,
+    privateProjectConfig: { projectId },
     loggedIn: { graphqlClient },
   };
 
@@ -39,7 +39,7 @@ describe(EnvLink, () => {
     jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
   });
 
-  it('links an account-wide variable to the current project in non-interactive mode', async () => {
+  it('links a shared variable to the current project in non-interactive mode', async () => {
     const mockVariables = [
       {
         id: variableId,
@@ -53,7 +53,7 @@ describe(EnvLink, () => {
       mockVariables[0]
     );
 
-    const command = new EnvLink(
+    const command = new EnvironmentVariableLink(
       ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
       mockConfig
     );
@@ -75,7 +75,7 @@ describe(EnvLink, () => {
     );
   });
 
-  it('links an account-wide variable to the current project to a specified environment', async () => {
+  it('links a shared variable to the current project to a specified environment', async () => {
     const mockVariables = [
       {
         id: variableId,
@@ -89,7 +89,7 @@ describe(EnvLink, () => {
       mockVariables[0]
     );
 
-    const command = new EnvLink(
+    const command = new EnvironmentVariableLink(
       ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
       mockConfig
     );
@@ -137,7 +137,7 @@ describe(EnvLink, () => {
     );
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvLink(
+    const command = new EnvironmentVariableLink(
       [
         '--variable-name',
         'TEST_VARIABLE',
@@ -186,7 +186,7 @@ describe(EnvLink, () => {
     (promptAsync as jest.Mock).mockResolvedValue({ environments: mockVariables[0].environments });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvLink([], mockConfig);
+    const command = new EnvironmentVariableLink([], mockConfig);
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
@@ -207,12 +207,15 @@ describe(EnvLink, () => {
     const mockVariables: never[] = [];
     (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableLink(
+      ['--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"
+      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
     );
   });
 
@@ -236,7 +239,7 @@ describe(EnvLink, () => {
     });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvLink([], mockConfig);
+    const command = new EnvironmentVariableLink([], mockConfig);
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
@@ -260,12 +263,15 @@ describe(EnvLink, () => {
     const mockVariables: never[] = [];
     (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvLink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableLink(
+      ['--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"
+      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
     );
   });
 });

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

@@ -13,7 +13,7 @@ import {
 import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
-import EnvList from '../list';
+import EnvironmentVariableList from '../list';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/queries/AppQuery');
@@ -44,7 +44,7 @@ const mockVariables: EnvironmentVariableFragment[] = [
   },
 ];
 
-describe(EnvList, () => {
+describe(EnvironmentVariableList, () => {
   const graphqlClient = {} as any as ExpoGraphqlClient;
   const mockConfig = {} as unknown as Config;
 
@@ -56,12 +56,12 @@ describe(EnvList, () => {
   it('lists project environment variables successfully', async () => {
     jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);
 
-    const command = new EnvList([], mockConfig);
+    const command = new EnvironmentVariableList([], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
       loggedIn: { graphqlClient },
-      projectId: testProjectId,
+      privateProjectConfig: { projectId: testProjectId },
     });
     await command.runAsync();
 
@@ -77,12 +77,12 @@ describe(EnvList, () => {
   it('lists project environment variables in specified environments', async () => {
     jest.mocked(EnvironmentVariablesQuery.byAppIdAsync).mockResolvedValueOnce(mockVariables);
 
-    const command = new EnvList(['--environment', 'production'], mockConfig);
+    const command = new EnvironmentVariableList(['--environment', 'production'], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
       loggedIn: { graphqlClient },
-      projectId: testProjectId,
+      privateProjectConfig: { projectId: testProjectId },
     });
     await command.runAsync();
 
@@ -100,12 +100,12 @@ describe(EnvList, () => {
       .mocked(EnvironmentVariablesQuery.byAppIdWithSensitiveAsync)
       .mockResolvedValueOnce(mockVariables);
 
-    const command = new EnvList(['--include-sensitive'], mockConfig);
+    const command = new EnvironmentVariableList(['--include-sensitive'], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
       loggedIn: { graphqlClient },
-      projectId: testProjectId,
+      privateProjectConfig: { projectId: testProjectId },
     });
     await command.runAsync();
 
@@ -121,15 +121,15 @@ describe(EnvList, () => {
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
   });
 
-  it('lists account-wide environment variables successfully', async () => {
+  it('lists shared environment variables successfully', async () => {
     jest.mocked(EnvironmentVariablesQuery.sharedAsync).mockResolvedValueOnce(mockVariables);
 
-    const command = new EnvList(['--scope', 'account'], mockConfig);
+    const command = new EnvironmentVariableList(['--scope', 'shared'], mockConfig);
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
       loggedIn: { graphqlClient },
-      projectId: testProjectId,
+      privateProjectConfig: { projectId: testProjectId },
     });
     await command.runAsync();
 
@@ -142,17 +142,20 @@ describe(EnvList, () => {
     expect(Log.log).toHaveBeenCalledWith(expect.stringContaining('TEST_VAR_2'));
   });
 
-  it('lists account-wide environment variables including sensitive values', async () => {
+  it('lists shared environment variables including sensitive values', async () => {
     jest
       .mocked(EnvironmentVariablesQuery.sharedWithSensitiveAsync)
       .mockResolvedValueOnce(mockVariables);
 
-    const command = new EnvList(['--include-sensitive', '--scope', 'account'], mockConfig);
+    const command = new EnvironmentVariableList(
+      ['--include-sensitive', '--scope', 'shared'],
+      mockConfig
+    );
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue({
       loggedIn: { graphqlClient },
-      projectId: testProjectId,
+      privateProjectConfig: { projectId: testProjectId },
     });
     await command.runAsync();
 

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

@@ -11,7 +11,7 @@ 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';
+import EnvironmentVariableUnlink from '../unlink';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
@@ -19,13 +19,13 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');
 
-describe(EnvUnlink, () => {
+describe(EnvironmentVariableUnlink, () => {
   const projectId = 'test-project-id';
   const variableId = '1';
   const graphqlClient = {};
   const mockConfig = {} as unknown as Config;
   const mockContext = {
-    projectId,
+    privateProjectConfig: { projectId },
     loggedIn: { graphqlClient },
   };
 
@@ -39,7 +39,7 @@ describe(EnvUnlink, () => {
     jest.mocked(AppQuery.byIdAsync).mockImplementation(async () => getMockAppFragment());
   });
 
-  it('unlinks an account-wide variable from the current project in non-interactive mode', async () => {
+  it('unlinks a shared variable from the current project in non-interactive mode', async () => {
     const mockVariables = [
       {
         id: variableId,
@@ -54,7 +54,7 @@ describe(EnvUnlink, () => {
       EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
     ).mockResolvedValue(mockVariables[0]);
 
-    const command = new EnvUnlink(
+    const command = new EnvironmentVariableUnlink(
       ['--variable-name', 'TEST_VARIABLE', '--non-interactive'],
       mockConfig
     );
@@ -76,7 +76,7 @@ describe(EnvUnlink, () => {
     );
   });
 
-  it('unlinks an account-wide variable from the current project in a specified environment', async () => {
+  it('unlinks a shared variable from the current project in a specified environment', async () => {
     const mockVariables = [
       {
         id: variableId,
@@ -91,7 +91,7 @@ describe(EnvUnlink, () => {
       EnvironmentVariableMutation.unlinkSharedEnvironmentVariableAsync as jest.Mock
     ).mockResolvedValue(mockVariables[0]);
 
-    const command = new EnvUnlink(
+    const command = new EnvironmentVariableUnlink(
       ['--variable-name', 'TEST_VARIABLE', '--environment', 'production', '--non-interactive'],
       mockConfig
     );
@@ -141,7 +141,7 @@ describe(EnvUnlink, () => {
     });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvUnlink([], mockConfig);
+    const command = new EnvironmentVariableUnlink([], mockConfig);
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
@@ -162,12 +162,15 @@ describe(EnvUnlink, () => {
     const mockVariables: never[] = [];
     (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableUnlink(
+      ['--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"
+      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
     );
   });
 
@@ -191,7 +194,7 @@ describe(EnvUnlink, () => {
     });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvUnlink([], mockConfig);
+    const command = new EnvironmentVariableUnlink([], mockConfig);
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
@@ -215,12 +218,15 @@ describe(EnvUnlink, () => {
     const mockVariables: never[] = [];
     (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvUnlink(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableUnlink(
+      ['--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"
+      "Shared variable NON_EXISTENT_VARIABLE doesn't exist"
     );
   });
 });

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

@@ -12,7 +12,7 @@ import { AppQuery } from '../../../graphql/queries/AppQuery';
 import { EnvironmentVariablesQuery } from '../../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../../log';
 import { promptAsync, toggleConfirmAsync } from '../../../prompts';
-import EnvUpdate from '../update';
+import EnvironmentVariableUpdate from '../update';
 
 jest.mock('../../../graphql/queries/EnvironmentVariablesQuery');
 jest.mock('../../../graphql/mutations/EnvironmentVariableMutation');
@@ -20,7 +20,7 @@ jest.mock('../../../prompts');
 jest.mock('../../../graphql/queries/AppQuery');
 jest.mock('../../../log');
 
-describe(EnvUpdate, () => {
+describe(EnvironmentVariableUpdate, () => {
   const projectId = 'test-project-id';
   const variableId = '1';
   const graphqlClient = {};
@@ -47,7 +47,7 @@ describe(EnvUpdate, () => {
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
     (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
 
-    const command = new EnvUpdate(
+    const command = new EnvironmentVariableUpdate(
       [
         '--variable-name',
         'TEST_VARIABLE',
@@ -81,7 +81,7 @@ describe(EnvUpdate, () => {
     );
   });
 
-  it('updates an account-wide variable by selected name in non-interactive mode', async () => {
+  it('updates a shared variable by selected name in non-interactive mode', async () => {
     const mockVariables = [
       {
         id: variableId,
@@ -93,7 +93,7 @@ describe(EnvUpdate, () => {
     (EnvironmentVariablesQuery.sharedAsync as jest.Mock).mockResolvedValue(mockVariables);
     (EnvironmentVariableMutation.updateAsync as jest.Mock).mockResolvedValue(mockVariables[0]);
 
-    const command = new EnvUpdate(
+    const command = new EnvironmentVariableUpdate(
       [
         '--variable-name',
         'TEST_VARIABLE',
@@ -107,7 +107,7 @@ describe(EnvUpdate, () => {
         '--environment',
         'production',
         '--scope',
-        'account',
+        'shared',
       ],
       mockConfig
     );
@@ -135,7 +135,7 @@ describe(EnvUpdate, () => {
     (promptAsync as jest.Mock).mockResolvedValue({ name: mockVariables[0].name });
     (toggleConfirmAsync as jest.Mock).mockResolvedValue(true);
 
-    const command = new EnvUpdate([], mockConfig);
+    const command = new EnvironmentVariableUpdate([], mockConfig);
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);
     await command.runAsync();
@@ -154,7 +154,10 @@ describe(EnvUpdate, () => {
     const mockVariables: never[] = [];
     (EnvironmentVariablesQuery.byAppIdAsync as jest.Mock).mockResolvedValue(mockVariables);
 
-    const command = new EnvUpdate(['--variable-name', 'NON_EXISTENT_VARIABLE'], mockConfig);
+    const command = new EnvironmentVariableUpdate(
+      ['--variable-name', 'NON_EXISTENT_VARIABLE'],
+      mockConfig
+    );
 
     // @ts-expect-error
     jest.spyOn(command, 'getContextAsync').mockReturnValue(mockContext);

packages/eas-cli/src/commands/env/__tests__/__snapshots__/EnvDelete.test.ts.snap

@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`EnvDelete cancels deletion when user does not confirm 1`] = `"Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with --variable-name VARIABLE_NAME flag to fix the issue"`;

packages/eas-cli/src/commands/env/__tests__/__snapshots__/EnvironmentVariableDelete.test.ts.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EnvironmentVariableDelete cancels deletion when user does not confirm 1`] = `"Environment variable needs 'name' to be specified when running in non-interactive mode. Run the command with --variable-name VARIABLE_NAME flag to fix the issue"`;

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

@@ -5,10 +5,9 @@ import path from 'path';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import {
-  EASEnvironmentVariableScopeFlag,
-  EASEnvironmentVariableScopeFlagValue,
   EASMultiEnvironmentFlag,
   EASNonInteractiveFlag,
+  EASVariableScopeFlag,
   EASVariableVisibilityFlag,
 } from '../../commandUtils/flags';
 import {
@@ -33,43 +32,25 @@ import {
   promptVariableValueAsync,
   promptVariableVisibilityAsync,
 } from '../../utils/prompts';
-import { isEnvironment, performForEnvironmentsAsync } from '../../utils/variableUtils';
+import { performForEnvironmentsAsync } from '../../utils/variableUtils';
 
-interface RawCreateFlags {
+type CreateFlags = {
   name?: string;
   value?: string;
   link?: boolean;
   force?: boolean;
   type?: 'string' | 'file';
-  visibility?: 'plaintext' | 'sensitive' | 'secret';
-  scope: EASEnvironmentVariableScopeFlagValue;
+  visibility?: 'plaintext' | 'sensitive' | 'encrypted';
+  scope?: EnvironmentVariableScope;
   environment?: EnvironmentVariableEnvironment[];
   'non-interactive': boolean;
-}
+};
 
-interface CreateFlags {
-  name?: string;
-  value?: string;
-  link?: boolean;
-  force?: boolean;
-  type?: 'string' | 'file';
-  visibility?: 'plaintext' | 'sensitive' | 'secret';
-  scope: EnvironmentVariableScope;
-  environment?: EnvironmentVariableEnvironment[];
-  'non-interactive': boolean;
-}
+export default class EnvironmentVariableCreate extends EasCommand {
+  static override description =
+    'create an environment variable on the current project or owner account';
 
-export default class EnvCreate extends EasCommand {
-  static override description = 'create an environment variable for the current project or account';
-
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to create the variable in. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
+  static override hidden = true;
 
   static override flags = {
     name: Flags.string({
@@ -79,8 +60,7 @@ export default class EnvCreate extends EasCommand {
       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
+      description: 'Link shared variable to the current project',
     }),
     force: Flags.boolean({
       description: 'Overwrite existing variable',
@@ -91,21 +71,21 @@ export default class EnvCreate extends EasCommand {
       options: ['string', 'file'],
     }),
     ...EASVariableVisibilityFlag,
-    ...EASEnvironmentVariableScopeFlag,
+    ...EASVariableScopeFlag,
     ...EASMultiEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.Analytics,
     ...this.ContextOptions.LoggedIn,
   };
 
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvCreate);
+    const { flags } = await this.parse(EnvironmentVariableCreate);
 
-    const validatedFlags = this.sanitizeFlags(flags);
+    const validatedFlags = this.validateFlags(flags);
 
     const {
       name,
@@ -118,12 +98,12 @@ export default class EnvCreate extends EasCommand {
       force,
       type,
       fileName,
-    } = await this.promptForMissingFlagsAsync(validatedFlags, args);
+    } = await this.promptForMissingFlagsAsync(validatedFlags);
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvCreate, {
+    } = await this.getContextAsync(EnvironmentVariableCreate, {
       nonInteractive,
     });
 
@@ -158,12 +138,12 @@ export default class EnvCreate extends EasCommand {
           await this.promptForOverwriteAsync({
             nonInteractive,
             force,
-            message: `Account-wide variable with ${name} name already exists on this account.`,
+            message: `Shared 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(
+            `Unlinking shared variable ${chalk.bold(name)} on project ${chalk.bold(
               projectDisplayName
             )}.`
           );
@@ -227,8 +207,8 @@ export default class EnvCreate extends EasCommand {
           overwrite = true;
         } else {
           throw new Error(
-            `Account-wide variable with ${name} name already exists on this account.\n` +
-              `Use a different name or delete the existing variable on website or by using the "eas env:delete --name ${name} --scope account" command.`
+            `Shared variable with ${name} name already exists on this account.\n` +
+              `Use a different name or delete the existing variable on website or by using eas env:delete --name ${name} --scope shared command.`
           );
         }
       }
@@ -250,7 +230,6 @@ export default class EnvCreate extends EasCommand {
                 value,
                 visibility,
                 environments,
-                isGlobal: true, // TODO: every account-wide variable is global for now so it's not user facing
                 type: type ?? EnvironmentSecretType.String,
               },
               ownerAccount.id
@@ -268,7 +247,7 @@ export default class EnvCreate extends EasCommand {
 
       if (link) {
         Log.withTick(
-          `Linking account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
+          `Linking shared variable ${chalk.bold(name)} to project ${chalk.bold(
             projectDisplayName
           )}.`
         );
@@ -283,9 +262,7 @@ export default class EnvCreate extends EasCommand {
         });
 
         Log.withTick(
-          `Linked account-wide variable ${chalk.bold(name)} to project ${chalk.bold(
-            projectDisplayName
-          )}.`
+          `Linked shared variable ${chalk.bold(name)} to project ${chalk.bold(projectDisplayName)}.`
         );
       }
     }
@@ -316,18 +293,15 @@ export default class EnvCreate extends EasCommand {
     }
   }
 
-  private async promptForMissingFlagsAsync(
-    {
-      name,
-      value,
-      environment: environments,
-      visibility,
-      'non-interactive': nonInteractive,
-      type,
-      ...rest
-    }: CreateFlags,
-    { environment }: { environment?: string }
-  ): Promise<
+  private async promptForMissingFlagsAsync({
+    name,
+    value,
+    environment,
+    visibility,
+    'non-interactive': nonInteractive,
+    type,
+    ...rest
+  }: CreateFlags): Promise<
     Required<
       Omit<CreateFlags, 'type' | 'visibility'> & {
         type: EnvironmentSecretType | undefined;
@@ -377,20 +351,10 @@ export default class EnvCreate extends EasCommand {
 
     value = environmentFilePath ? await fs.readFile(environmentFilePath, 'base64') : value;
 
-    if (environment && !isEnvironment(environment.toUpperCase())) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
+    if (!environment) {
+      environment = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
 
-    let newEnvironments = environments
-      ? environments
-      : environment
-        ? [environment.toUpperCase() as EnvironmentVariableEnvironment]
-        : undefined;
-
-    if (!newEnvironments) {
-      newEnvironments = await promptVariableEnvironmentAsync({ nonInteractive, multiple: true });
-
-      if (!newEnvironments || newEnvironments.length === 0) {
+      if (!environment || environment.length === 0) {
         throw new Error('No environments selected');
       }
     }
@@ -400,10 +364,11 @@ export default class EnvCreate extends EasCommand {
     return {
       name,
       value,
-      environment: newEnvironments,
+      environment,
       visibility: newVisibility,
       link: rest.link ?? false,
       force: rest.force ?? false,
+      scope: rest.scope ?? EnvironmentVariableScope.Project,
       'non-interactive': nonInteractive,
       type: newType,
       fileName,
@@ -411,19 +376,24 @@ export default class EnvCreate extends EasCommand {
     };
   }
 
-  private sanitizeFlags(flags: RawCreateFlags): CreateFlags {
-    if (flags.scope !== 'account' && flags.link) {
+  private validateFlags(flags: CreateFlags & { type?: string; visibility?: string }): CreateFlags {
+    if (flags.scope !== EnvironmentVariableScope.Shared && flags.link) {
       throw new Error(
-        `Unexpected argument: --link can only be used when creating account-wide variables`
+        `Unexpected argument: --link can only be used when creating shared variables`
       );
     }
 
-    return {
-      ...flags,
-      scope:
-        flags.scope === 'account'
-          ? EnvironmentVariableScope.Shared
-          : EnvironmentVariableScope.Project,
-    };
+    if (
+      flags.scope === EnvironmentVariableScope.Shared &&
+      flags.environment &&
+      !flags.link &&
+      flags['non-interactive']
+    ) {
+      throw new Error(
+        'Unexpected argument: --environment in non-interactive mode can only be used with --link flag.'
+      );
+    }
+
+    return flags;
   }
 }

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

@@ -4,9 +4,8 @@ import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import {
-  EASEnvironmentVariableScopeFlag,
-  EASEnvironmentVariableScopeFlagValue,
   EASNonInteractiveFlag,
+  EASVariableScopeFlag,
   EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
@@ -14,24 +13,19 @@ import { EnvironmentVariableMutation } from '../../graphql/mutations/Environment
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptAsync, toggleConfirmAsync } from '../../prompts';
-import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+import { formatVariableName } from '../../utils/variableUtils';
 
-interface DeleteFlags {
+type DeleteFlags = {
   'variable-name'?: string;
   'variable-environment'?: EnvironmentVariableEnvironment;
   'non-interactive': boolean;
-  scope: EnvironmentVariableScope;
-}
+  scope?: EnvironmentVariableScope;
+};
 
-interface RawDeleteFlags {
-  'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
-  'non-interactive': boolean;
-  scope: EASEnvironmentVariableScopeFlagValue;
-}
+export default class EnvironmentVariableDelete extends EasCommand {
+  static override description = 'delete an environment variable by name';
 
-export default class EnvDelete extends EasCommand {
-  static override description = 'delete an environment variable for the current project or account';
+  static override hidden = true;
 
   static override flags = {
     'variable-name': Flags.string({
@@ -41,36 +35,27 @@ export default class EnvDelete extends EasCommand {
       ...EasEnvironmentFlagParameters,
       description: 'Current environment of the variable to delete',
     }),
-    ...EASEnvironmentVariableScopeFlag,
+    ...EASVariableScopeFlag,
     ...EASNonInteractiveFlag,
   };
 
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Current environment of the variable to delete. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvDelete);
+    const { flags } = await this.parse(EnvironmentVariableDelete);
     const {
       'variable-name': name,
       'variable-environment': environment,
       'non-interactive': nonInteractive,
       scope,
-    } = this.sanitizeInputs(flags, args);
+    } = this.validateFlags(flags);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvDelete, {
+    } = await this.getContextAsync(EnvironmentVariableDelete, {
       nonInteractive,
     });
 
@@ -145,10 +130,7 @@ export default class EnvDelete extends EasCommand {
     Log.withTick(`️Deleted variable ${selectedVariable.name}".`);
   }
 
-  private sanitizeInputs(
-    flags: RawDeleteFlags,
-    { environment }: { environment?: string }
-  ): DeleteFlags {
+  private validateFlags(flags: DeleteFlags): DeleteFlags {
     if (flags['non-interactive']) {
       if (!flags['variable-name']) {
         throw new Error(
@@ -159,22 +141,6 @@ export default class EnvDelete extends EasCommand {
       }
     }
 
-    const scope =
-      flags.scope === 'account'
-        ? EnvironmentVariableScope.Shared
-        : EnvironmentVariableScope.Project;
-
-    if (environment) {
-      environment = environment.toUpperCase();
-
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
-      return { ...flags, 'variable-environment': environment, scope };
-    }
-
-    return { ...flags, scope };
+    return flags;
   }
 }

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

@@ -3,71 +3,66 @@ import chalk from 'chalk';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-import { EASNonInteractiveFlag } from '../../commandUtils/flags';
+import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment } from '../../graphql/generated';
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
 
 type ParsedFlags =
   | {
       nonInteractive: true;
       environment: EnvironmentVariableEnvironment;
-      command: string;
     }
   | {
       nonInteractive: false;
       environment?: EnvironmentVariableEnvironment;
-      command: string;
     };
 
 interface RawFlags {
+  environment?: EnvironmentVariableEnvironment;
   'non-interactive': boolean;
 }
 
 export default class EnvExec extends EasCommand {
   static override description =
-    'execute a command with environment variables from the selected environment';
+    'execute a bash command with environment variables from the selected environment';
+
+  static override hidden = true;
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
   static override flags = {
+    ...EASEnvironmentFlag,
     ...EASNonInteractiveFlag,
   };
 
   static override args = [
     {
-      name: 'environment',
-      required: true,
-      description:
-        "Environment to execute the command in. One of 'production', 'preview', or 'development'.",
-    },
-    {
-      name: 'bash_command',
+      name: 'BASH_COMMAND',
       required: true,
       description: 'bash command to execute with the environment variables from the environment',
     },
   ];
 
-  private isNonInteractive: boolean = false;
-
   async runAsync(): Promise<void> {
-    const { flags, args } = await this.parse(EnvExec);
-    const parsedFlags = this.sanitizeFlagsAndArgs(flags, args);
+    const {
+      flags,
+      args: { BASH_COMMAND: command },
+    } = await this.parse(EnvExec);
+
+    const parsedFlags = this.sanitizeFlags(flags);
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
     } = await this.getContextAsync(EnvExec, {
       nonInteractive: parsedFlags.nonInteractive,
     });
 
-    this.isNonInteractive = parsedFlags.nonInteractive;
-
     const environment =
       parsedFlags.environment ??
       (await promptVariableEnvironmentAsync({ nonInteractive: parsedFlags.nonInteractive }));
@@ -75,80 +70,30 @@ 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, environmentVariables });
   }
 
-  private sanitizeFlagsAndArgs(
-    rawFlags: RawFlags,
-    { bash_command, environment }: Record<string, string>
-  ): ParsedFlags {
-    if (rawFlags['non-interactive'] && (!bash_command || !environment)) {
-      throw new Error(
-        "You must specify both environment and bash command when running in non-interactive mode. Run command as `eas env:exec ENVIRONMENT 'bash command'`."
-      );
+  private sanitizeFlags(rawFlags: RawFlags): ParsedFlags {
+    const environment = rawFlags.environment;
+    if (rawFlags['non-interactive']) {
+      if (!environment) {
+        throw new Error(
+          'You must specify an environment when running in non-interactive mode. Use the --environment flag.'
+        );
+      }
+      return {
+        nonInteractive: true,
+        environment,
+      };
     }
-
-    environment = environment?.toUpperCase();
-
-    if (!isEnvironment(environment)) {
-      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,
+      nonInteractive: false,
+      environment: rawFlags.environment,
     };
   }
 
-  // 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 +102,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 +138,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, {
@@ -207,24 +149,31 @@ export default class EnvExec extends EasCommand {
         environment,
       });
 
+    const secretEnvironmentVariables = environmentVariablesQueryResult.filter(
+      ({ value }) => !value
+    );
+    if (secretEnvironmentVariables.length > 0) {
+      Log.warn(`The following environment variables are secret and cannot be downloaded locally:`);
+      for (const { name } of secretEnvironmentVariables) {
+        Log.warn(`- ${name}`);
+      }
+      Log.warn('Proceeding with the rest of the environment variables.');
+      Log.newLine();
+    }
+
     const nonSecretEnvironmentVariables = environmentVariablesQueryResult.filter(
       ({ 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) {
+      throw new Error('No readable environment variables found for the selected environment.');
     }
+    Log.log(
+      `Loaded environment variables for the selected environment "${environment.toLowerCase()}":`
+    );
+    for (const { name } of nonSecretEnvironmentVariables) {
+      Log.log(`- ${name}`);
+    }
+    Log.newLine();
 
     const environmentVariables: Record<string, string> = {};
     for (const { name, value } of nonSecretEnvironmentVariables) {

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

@@ -4,10 +4,9 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
-  EASEnvironmentVariableScopeFlag,
-  EASEnvironmentVariableScopeFlagValue,
   EASNonInteractiveFlag,
   EASVariableFormatFlag,
+  EASVariableScopeFlag,
   EasEnvironmentFlagParameters,
 } from '../../commandUtils/flags';
 import {
@@ -19,41 +18,26 @@ import {
 import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVariablesQuery';
 import Log from '../../log';
 import { promptVariableEnvironmentAsync, promptVariableNameAsync } from '../../utils/prompts';
-import { formatVariable, formatVariableValue, isEnvironment } from '../../utils/variableUtils';
+import { formatVariable, formatVariableValue } from '../../utils/variableUtils';
 
-interface RawGetFlags {
-  'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
-  'non-interactive': boolean;
-  format?: string;
-  scope: EASEnvironmentVariableScopeFlagValue;
-}
-
-interface GetFlags {
+type GetFlags = {
   'variable-name'?: string;
   'variable-environment'?: EnvironmentVariableEnvironment;
   'non-interactive': boolean;
   format?: string;
   scope: EnvironmentVariableScope;
-}
+};
 
-export default class EnvGet extends EasCommand {
-  static override description = 'view an environment variable for the current project or account';
+export default class EnvironmentVariableGet extends EasCommand {
+  static override description = 'get environment variable';
+
+  static override hidden = true;
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Current environment of the variable. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
   static override flags = {
     'variable-name': Flags.string({
       description: 'Name of the variable',
@@ -63,12 +47,12 @@ export default class EnvGet extends EasCommand {
       description: 'Current environment of the variable',
     }),
     ...EASVariableFormatFlag,
-    ...EASEnvironmentVariableScopeFlag,
+    ...EASVariableScopeFlag,
     ...EASNonInteractiveFlag,
   };
 
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvGet);
+    const { flags } = await this.parse(EnvironmentVariableGet);
 
     let {
       'variable-environment': environment,
@@ -76,12 +60,12 @@ export default class EnvGet extends EasCommand {
       'non-interactive': nonInteractive,
       format,
       scope,
-    } = this.sanitizeInputs(flags, args);
+    } = this.validateFlags(flags);
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvGet, {
+    } = await this.getContextAsync(EnvironmentVariableGet, {
       nonInteractive,
     });
 
@@ -133,7 +117,7 @@ export default class EnvGet extends EasCommand {
     }
   }
 
-  private sanitizeInputs(flags: RawGetFlags, { environment }: { environment?: string }): GetFlags {
+  private validateFlags(flags: GetFlags): GetFlags {
     if (flags['non-interactive']) {
       if (!flags['variable-name']) {
         throw new Error('Variable name is required. Run the command with --variable-name flag.');
@@ -141,34 +125,11 @@ export default class EnvGet extends EasCommand {
       if (!flags.scope) {
         throw new Error('Scope is required. Run the command with --scope flag.');
       }
-      if (!(flags['variable-environment'] ?? environment)) {
+      if (!flags['variable-environment']) {
         throw new Error('Environment is required.');
       }
     }
-    if (environment && flags['variable-environment']) {
-      throw new Error(
-        "You can't use both --variable-environment flag when environment is passed as an argument. Run `eas env:get --help` for more information."
-      );
-    }
-
-    const scope =
-      flags.scope === 'account'
-        ? EnvironmentVariableScope.Shared
-        : EnvironmentVariableScope.Project;
-    if (environment) {
-      environment = environment.toUpperCase();
-      if (!isEnvironment(environment)) {
-        throw new Error(
-          "Invalid environment. Use one of 'production', 'preview', or 'development'."
-        );
-      }
-      return {
-        ...flags,
-        'variable-environment': environment,
-        scope,
-      };
-    }
-    return { ...flags, scope };
+    return flags;
   }
 }
 

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

@@ -14,19 +14,11 @@ import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+import { formatVariableName } from '../../utils/variableUtils';
 
-type LinkFlags = {
-  'variable-name'?: string;
-  'variable-environment'?: EnvironmentVariableEnvironment;
-  'non-interactive': boolean;
-  environment?: EnvironmentVariableEnvironment[];
-};
+export default class EnvironmentVariableLink extends EasCommand {
+  static override description = 'link a shared environment variable to the current project';
 
-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 = {
@@ -41,34 +33,24 @@ export default class EnvLink extends EasCommand {
     ...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.ProjectConfig,
     ...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);
-
+      flags: {
+        'variable-name': name,
+        'variable-environment': currentEnvironment,
+        'non-interactive': nonInteractive,
+        environment: environments,
+      },
+    } = await this.parse(EnvironmentVariableLink);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvLink, {
+    } = await this.getContextAsync(EnvironmentVariableLink, {
       nonInteractive,
     });
 
@@ -88,7 +70,7 @@ export default class EnvLink extends EasCommand {
         );
       }
       selectedVariable = await selectAsync(
-        'Select account-wide variable',
+        'Select shared variable',
         variables.map(variable => ({
           title: formatVariableName(variable),
           value: variable,
@@ -97,7 +79,7 @@ export default class EnvLink extends EasCommand {
     }
 
     if (!selectedVariable) {
-      throw new Error(`Account-wide variable ${name} doesn't exist`);
+      throw new Error(`Shared variable ${name} doesn't exist`);
     }
 
     let explicitSelect = false;
@@ -173,32 +155,4 @@ export default class EnvLink extends EasCommand {
       }
     }
   }
-  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/list.ts

@@ -4,10 +4,9 @@ import chalk from 'chalk';
 import EasCommand from '../../commandUtils/EasCommand';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import {
-  EASEnvironmentVariableScopeFlag,
-  EASEnvironmentVariableScopeFlagValue,
   EASMultiEnvironmentFlag,
   EASVariableFormatFlag,
+  EASVariableScopeFlag,
 } from '../../commandUtils/flags';
 import { EnvironmentVariableEnvironment, EnvironmentVariableScope } from '../../graphql/generated';
 import {
@@ -19,7 +18,6 @@ import { promptVariableEnvironmentAsync } from '../../utils/prompts';
 import {
   formatVariable,
   formatVariableValue,
-  isEnvironment,
   performForEnvironmentsAsync,
 } from '../../utils/variableUtils';
 
@@ -67,29 +65,13 @@ async function getVariablesForScopeAsync(
       });
 }
 
-interface RawListFlags {
-  scope: EASEnvironmentVariableScopeFlagValue;
-  format: string;
-  environment: EnvironmentVariableEnvironment[] | undefined;
-  'include-sensitive': boolean;
-  'include-file-content': boolean;
-  'non-interactive'?: boolean;
-}
+export default class EnvironmentValueList extends EasCommand {
+  static override description = 'list environment variables for the current project';
 
-interface ListFlags {
-  scope: EnvironmentVariableScope;
-  format: string;
-  environment: EnvironmentVariableEnvironment[] | undefined;
-  'include-sensitive': boolean;
-  'include-file-content': boolean;
-  'non-interactive': boolean;
-}
-
-export default class EnvList extends EasCommand {
-  static override description = 'list environment variables for the current project or account';
+  static override hidden = true;
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -102,36 +84,26 @@ export default class EnvList extends EasCommand {
       description: 'Display files content in the output',
       default: false,
     }),
-    ...EASMultiEnvironmentFlag,
     ...EASVariableFormatFlag,
-    ...EASEnvironmentVariableScopeFlag,
+    ...EASVariableScopeFlag,
+    ...EASMultiEnvironmentFlag,
   };
 
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to list the variables from. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvList);
-
     let {
-      format,
-      environment: environments,
-      scope,
-      'include-sensitive': includeSensitive,
-      'include-file-content': includeFileContent,
-      'non-interactive': nonInteractive,
-    } = this.sanitizeInputs(flags, args);
-
+      flags: {
+        environment: environments,
+        format,
+        scope,
+        'include-sensitive': includeSensitive,
+        'include-file-content': includeFileContent,
+        'non-interactive': nonInteractive,
+      },
+    } = await this.parse(EnvironmentValueList);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvList, {
+    } = await this.getContextAsync(EnvironmentValueList, {
       nonInteractive: true,
     });
 
@@ -164,7 +136,7 @@ export default class EnvList extends EasCommand {
         }
       } else {
         if (scope === EnvironmentVariableScope.Shared) {
-          Log.log(chalk.bold('Account-wide variables for this account:'));
+          Log.log(chalk.bold('Shared variables for this account:'));
         } else {
           Log.log(chalk.bold(`Variables for this project:`));
         }
@@ -174,29 +146,4 @@ export default class EnvList extends EasCommand {
       }
     });
   }
-
-  private sanitizeInputs(
-    flags: RawListFlags,
-    { environment }: { environment?: string }
-  ): ListFlags {
-    if (environment && !isEnvironment(environment.toUpperCase())) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    const environments = flags.environment
-      ? flags.environment
-      : environment
-        ? [environment.toUpperCase() as EnvironmentVariableEnvironment]
-        : undefined;
-
-    return {
-      ...flags,
-      'non-interactive': flags['non-interactive'] ?? false,
-      environment: environments,
-      scope:
-        flags.scope === 'account'
-          ? EnvironmentVariableScope.Shared
-          : EnvironmentVariableScope.Project,
-    };
-  }
 }

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

@@ -1,11 +1,14 @@
 import { Flags } from '@oclif/core';
-import dotenv from 'dotenv';
 import * as fs from 'fs-extra';
 import path from 'path';
 
 import EasCommand from '../../commandUtils/EasCommand';
 import { EASEnvironmentFlag, EASNonInteractiveFlag } from '../../commandUtils/flags';
-import { EnvironmentSecretType, EnvironmentVariableVisibility } from '../../graphql/generated';
+import {
+  EnvironmentSecretType,
+  EnvironmentVariableFragment,
+  EnvironmentVariableVisibility,
+} from '../../graphql/generated';
 import {
   EnvironmentVariableWithFileContent,
   EnvironmentVariablesQuery,
@@ -13,30 +16,21 @@ import {
 import Log from '../../log';
 import { confirmAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
 
-export default class EnvPull extends EasCommand {
-  static override description =
-    'pull environment variables for the selected environment to .env file';
+export default class EnvironmentVariablePull extends EasCommand {
+  static override description = 'pull env file';
+
+  static override hidden = true;
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
-    ...this.ContextOptions.LoggedIn,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.ProjectDir,
+    ...this.ContextOptions.LoggedIn,
   };
 
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to pull variables from. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
   static override flags = {
-    ...EASNonInteractiveFlag,
     ...EASEnvironmentFlag,
+    ...EASNonInteractiveFlag,
     path: Flags.string({
       description: 'Path to the result `.env` file',
       default: '.env.local',
@@ -45,25 +39,17 @@ export default class EnvPull extends EasCommand {
 
   async runAsync(): Promise<void> {
     let {
-      args: { environment: argEnvironment },
-      flags: { environment: flagEnvironment, path: targetPath, 'non-interactive': nonInteractive },
-    } = await this.parse(EnvPull);
-
-    let environment = flagEnvironment?.toUpperCase() ?? argEnvironment?.toUpperCase();
+      flags: { environment, path: targetPath, 'non-interactive': nonInteractive },
+    } = await this.parse(EnvironmentVariablePull);
 
     if (!environment) {
       environment = await promptVariableEnvironmentAsync({ nonInteractive });
     }
-
-    if (!isEnvironment(environment)) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
       projectDir,
-    } = await this.getContextAsync(EnvPull, {
+    } = await this.getContextAsync(EnvironmentVariablePull, {
       nonInteractive,
     });
 
@@ -88,12 +74,6 @@ export default class EnvPull extends EasCommand {
       }
     }
 
-    let currentEnvLocal: Record<string, string> = {};
-
-    if (await fs.exists(targetPath)) {
-      currentEnvLocal = dotenv.parse(await fs.readFile(targetPath, 'utf8'));
-    }
-
     const filePrefix = `# Environment: ${environment.toLocaleLowerCase()}\n\n`;
 
     const isFileVariablePresent = environmentVariables.some(v => {
@@ -105,18 +85,10 @@ export default class EnvPull extends EasCommand {
       await fs.mkdir(envDir, { recursive: true });
     }
 
-    const skippedSecretVariables: string[] = [];
-    const overridenSecretVariables: string[] = [];
-
     const envFileContentLines = await Promise.all(
       environmentVariables.map(async (variable: EnvironmentVariableWithFileContent) => {
         if (variable.visibility === EnvironmentVariableVisibility.Secret) {
-          if (currentEnvLocal[variable.name]) {
-            overridenSecretVariables.push(variable.name);
-            return `${variable.name}=${currentEnvLocal[variable.name]}`;
-          }
-          skippedSecretVariables.push(variable.name);
-          return `# ${variable.name}=***** (secret)`;
+          return `# ${variable.name}=***** (secret variables are not available for reading)`;
         }
         if (variable.type === EnvironmentSecretType.FileBase64 && variable.valueWithFileContent) {
           const filePath = path.join(envDir, variable.name);
@@ -129,22 +101,20 @@ export default class EnvPull extends EasCommand {
 
     await fs.writeFile(targetPath, filePrefix + envFileContentLines.join('\n'));
 
-    Log.log(
-      `Pulled plain text and sensitive environment variables from "${environment.toLowerCase()}" environment to ${targetPath}.`
+    const secretEnvVariables = environmentVariables.filter(
+      (variable: EnvironmentVariableFragment) => variable.value === null
     );
-
-    if (overridenSecretVariables.length > 0) {
-      Log.addNewLineIfNone();
-      Log.log(`Reused local values for following secrets: ${overridenSecretVariables.join('\n')}.`);
-    }
-
-    if (skippedSecretVariables.length > 0) {
-      Log.addNewLineIfNone();
-      Log.log(
-        `The following variables have the secret visibility and can't be read outside of EAS servers. Set their values manually in your .env file: ${skippedSecretVariables.join(
-          ', '
-        )}.`
+    if (secretEnvVariables.length > 0) {
+      Log.warn(
+        `The eas env:pull command tried to pull environment variables with "secret" visibility. The variables with "secret" visibility are not available for reading, therefore thet were marked as "*****" in the generated .env file. Provide values for these manually in ${targetPath} if needed. Skipped variables: ${secretEnvVariables
+          .map(v => v.name)
+          .join('\n')}`
       );
+      Log.warn();
     }
+
+    Log.log(
+      `Pulled environment variables from ${environment.toLowerCase()} environment to ${targetPath}.`
+    );
   }
 }

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

@@ -19,14 +19,14 @@ import { EnvironmentVariablesQuery } from '../../graphql/queries/EnvironmentVari
 import Log from '../../log';
 import { confirmAsync, promptAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { isEnvironment } from '../../utils/variableUtils';
 
-export default class EnvPush extends EasCommand {
-  static override description =
-    'push environment variables from .env file to the selected environment';
+export default class EnvironmentVariablePush extends EasCommand {
+  static override description = 'push env file';
+
+  static override hidden = true;
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...this.ContextOptions.LoggedIn,
   };
 
@@ -38,24 +38,15 @@ export default class EnvPush extends EasCommand {
     }),
   };
 
-  static override args = [
-    {
-      name: 'environment',
-      description:
-        "Environment to push variables to. One of 'production', 'preview', or 'development'.",
-      required: false,
-    },
-  ];
-
   async runAsync(): Promise<void> {
-    const { args, flags } = await this.parse(EnvPush);
-
-    let { environment: environments, path: envPath } = this.parseFlagsAndArgs(flags, args);
+    let {
+      flags: { environment: environments, path: envPath },
+    } = await this.parse(EnvironmentVariablePush);
 
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvPush, {
+    } = await this.getContextAsync(EnvironmentVariablePush, {
       nonInteractive: false,
     });
 
@@ -105,12 +96,12 @@ export default class EnvPush extends EasCommand {
         const existingDifferentSharedVariablesNames = existingDifferentSharedVariables.map(
           variable => variable.name
         );
-        Log.error('Account-wide variables cannot be overwritten by eas env:push command.');
+        Log.error('Shared variables cannot be overwritten by eas env:push command.');
         Log.error('Remove them from the env file or unlink them from the project to continue:');
         existingDifferentSharedVariablesNames.forEach(name => {
           Log.error(`- ${name}`);
         });
-        throw new Error('Account-wide variables cannot be overwritten by eas env:push command');
+        throw new Error('Shared variables cannot be overwritten by eas env:push command');
       }
 
       if (existingDifferentVariables.length > 0) {
@@ -198,24 +189,6 @@ export default class EnvPush extends EasCommand {
     Log.log(`Uploaded env file to ${environments.join(', ').toLocaleLowerCase()}.`);
   }
 
-  parseFlagsAndArgs(
-    flags: { path: string; environment: EnvironmentVariableEnvironment[] | undefined },
-    { environment }: Record<string, string>
-  ): { environment?: EnvironmentVariableEnvironment[]; path: string } {
-    if (environment && !isEnvironment(environment.toUpperCase())) {
-      throw new Error("Invalid environment. Use one of 'production', 'preview', or 'development'.");
-    }
-
-    const environments =
-      flags.environment ??
-      (environment ? [environment.toUpperCase() as EnvironmentVariableEnvironment] : undefined);
-
-    return {
-      ...flags,
-      environment: environments,
-    };
-  }
-
   private async parseEnvFileAsync(
     envPath: string,
     environments: EnvironmentVariableEnvironment[]

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

@@ -10,19 +10,11 @@ import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { selectAsync } from '../../prompts';
 import { promptVariableEnvironmentAsync } from '../../utils/prompts';
-import { formatVariableName, isEnvironment } from '../../utils/variableUtils';
+import { formatVariableName } from '../../utils/variableUtils';
 
-type UnlinkFlags = {
-  'variable-name'?: string;
-  'non-interactive': boolean;
-  environment?: EnvironmentVariableEnvironment[];
-};
+export default class EnvironmentVariableUnlink extends EasCommand {
+  static override description = 'unlink a shared environment variable to the current project';
 
-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 = {
@@ -34,32 +26,22 @@ export default class EnvUnlink extends EasCommand {
   };
 
   static override contextDefinition = {
-    ...this.ContextOptions.ProjectId,
+    ...this.ContextOptions.ProjectConfig,
     ...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);
-
+      flags: {
+        'variable-name': name,
+        'non-interactive': nonInteractive,
+        environment: unlinkEnvironments,
+      },
+    } = await this.parse(EnvironmentVariableUnlink);
     const {
-      projectId,
+      privateProjectConfig: { projectId },
       loggedIn: { graphqlClient },
-    } = await this.getContextAsync(EnvUnlink, {
+    } = await this.getContextAsync(EnvironmentVariableUnlink, {
       nonInteractive,
     });
 
@@ -76,7 +58,7 @@ export default class EnvUnlink extends EasCommand {
         throw new Error("Multiple variables found, please select one using '--variable-name'");
       }
       selectedVariable = await selectAsync(
-        'Select account-wide variable',
+        'Select shared variable',
         variables.map(variable => ({
           title: formatVariableName(variable),
           value: variable,
@@ -85,7 +67,7 @@ export default class EnvUnlink extends EasCommand {
     }
 
     if (!selectedVariable) {
-      throw new Error(`Account-wide variable ${name} doesn't exist`);
+      throw new Error(`Shared variable ${name} doesn't exist`);
     }
 
     let explicitSelect = false;
@@ -161,32 +143,4 @@ export default class EnvUnlink extends EasCommand {
       }
     }
   }
-
-  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;
-  }
 }