v0.57.0

* generate graphql code

* upgrade @expo/eas-build-job

* add git commit message to build metadata

.github/workflows/test.yml

@@ -27,6 +27,10 @@ jobs:
         if: ${{ !matrix.coverage }}
       - run: yarn test --coverage
         if: ${{ matrix.coverage }}
+        env:
+          # Oclif seems to cause OOM errors when testing with coverage enabled.
+          # Remove this whenever we solved those OOM errors.
+          NODE_OPTIONS: --max-old-space-size=4096
       - run: yarn lint --max-warnings=0
       - run: shellcheck bin/*.sh
       - uses: codecov/codecov-action@v1

.gitignore

@@ -19,6 +19,3 @@ node_modules
 
 # Tests
 coverage
-
-# Copies of script for testing ESM imports
-packages/*/scripts/testESMImports.ts

CHANGELOG.md

@@ -8,11 +8,49 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Add new option to `eas device:create` - allow importing devices from Apple Developer Portal. ([#1236](https://github.com/expo/eas-cli/pull/1236) by [@dsokal](https://github.com/dsokal))
+- Add support for attaching messages to builds. ([#1237](https://github.com/expo/eas-cli/pull/1237) by [@dsokal](https://github.com/dsokal))
+- Introduce interactive pagination for `branch` commands. ([#1213](https://github.com/expo/eas-cli/pull/1213) by [@kgc00](https://github.com/kgc00))
+
+### 🐛 Bug fixes
+
+### 🧹 Chores
+
+## [0.56.0](https://github.com/expo/eas-cli/releases/tag/v0.56.0) - 2022-07-28
+
+### 🎉 New features
+
+- Display build queue type when waiting. ([#1217](https://github.com/expo/eas-cli/pull/1217) by [@dsokal](https://github.com/dsokal))
+- Add better message on how to upgrade EAS CLI. ([#1222](https://github.com/expo/eas-cli/pull/1222) by [@jeremybarbet](https://github.com/jeremybarbet), [#1231](https://github.com/expo/eas-cli/pull/1231) by [@wkozyra95](https://github.com/wkozyra95))
+- Invoke export with sourcemaps on update. ([#1228](https://github.com/expo/eas-cli/pull/1228) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+### 🐛 Bug fixes
+
+- Show spinner instead of silently timing out during asset upload. ([#1206](https://github.com/expo/eas-cli/pull/1206) by [@wschurman](https://github.com/wschurman))
+- Fix build archive S3 URLs. ([#1207](https://github.com/expo/eas-cli/pull/1207) by [@dsokal](https://github.com/dsokal))
+- `autoIncrement` option on iOS will update versions of all targets that depend on an application target. ([#1219](https://github.com/expo/eas-cli/pull/1219) by [@wkozyra95](https://github.com/wkozyra95))
+
+### 🧹 Chores
+
+- Increase max number of chained "extends" in build profiles. ([#1208](https://github.com/expo/eas-cli/pull/1208) by [@wkozyra95](https://github.com/wkozyra95))
+- Change wording on build warning for bundle id/package name. ([#1211](https://github.com/expo/eas-cli/pull/1211) by [@kbrandwijk](https://github.com/kbrandwijk))
+
+## [0.55.1](https://github.com/expo/eas-cli/releases/tag/v0.55.1) - 2022-07-12
+
+### 🐛 Bug fixes
+
+- Fix asset upload crash. ([#1205](https://github.com/expo/eas-cli/pull/1205) by [@wschurman](https://github.com/wschurman))
+
+## [0.55.0](https://github.com/expo/eas-cli/releases/tag/v0.55.0) - 2022-07-11
+
+### 🎉 New features
+
 - Show bundler output by default for eas update command. ([#1171](https://github.com/expo/eas-cli/pull/1171) by [@kgc00](https://github.com/kgc00/))
 - Allow users to skip metadata validation. ([#1175](https://github.com/expo/eas-cli/pull/1175) by [@byCedric](https://github.com/byCedric))
 - Add experimental `--resource-class` flag for Build commands. ([#1138](https://github.com/expo/eas-cli/pull/1138) by [@christopherwalter](https://github.com/christopherwalter))
 - Truncate long messages for `eas update` command, rather than failing. ([#1178](https://github.com/expo/eas-cli/pull/1178) by [@kgc00](https://github.com/kgc00))
 - Add review details to metadata store configuration. ([#1184](https://github.com/expo/eas-cli/pull/1184) by [@byCedric](https://github.com/byCedric))
+- Override applicationId via env. ([#1203](https://github.com/expo/eas-cli/pull/1203) by [@wkozyra95](https://github.com/wkozyra95))
 
 ### 🐛 Bug fixes
 

CODEOWNERS

@@ -6,6 +6,9 @@ packages/eas-cli/src/commands/build @dsokal @wkozyra95
 packages/eas-cli/src/submit @barthap @dsokal
 packages/eas-cli/src/commands/submit.ts @barthap @dsokal
 
+packages/eas-cli/src/update @kgc00 @wschurman
+packages/eas-cli/src/commands/update @kgc00 @wschurman
+
 packages/eas-cli/schema @bycedric
 packages/eas-cli/src/metadata @bycedric
 packages/eas-cli/src/commands/metadata @bycedric

jest.config.cjs

@@ -1,7 +0,0 @@
-module.exports = {
-  projects: [
-    require('./packages/eas-cli/jest.config.cjs'),
-    require('./packages/eas-json/jest.config.cjs'),
-  ],
-  testPathIgnorePatterns: ['.*'],
-};

jest.config.js

@@ -0,0 +1,7 @@
+module.exports = {
+  projects: [
+    require('./packages/eas-cli/jest.config.js'),
+    require('./packages/eas-json/jest.config.js'),
+  ],
+  testPathIgnorePatterns: ['.*'],
+};

jest/jest.config.js

@@ -1,15 +1,7 @@
 module.exports = {
-  preset: 'ts-jest/presets/default-esm',
+  preset: 'ts-jest',
   testEnvironment: 'node',
   testRegex: '/__tests__/.*(test|spec)\\.[jt]sx?$',
   watchPlugins: ['jest-watch-typeahead/filename', 'jest-watch-typeahead/testname'],
   collectCoverageFrom: ['<rootDir>/src/**/*.{ts,tsx,js,jsx}'],
-  globals: {
-    'ts-jest': {
-      useESM: true,
-    },
-  },
-  moduleNameMapper: {
-    '^(\\.{1,2}/.*)\\.js$': '$1',
-  },
 };

lerna.json

@@ -1,5 +1,5 @@
 {
   "npmClient": "yarn",
   "useWorkspaces": true,
-  "version": "0.54.1"
+  "version": "0.57.0"
 }

package.json

@@ -1,6 +1,5 @@
 {
   "private": true,
-  "type": "module",
   "workspaces": [
     "packages/*"
   ],
@@ -14,9 +13,8 @@
     "eas": "packages/eas-cli/bin/run",
     "lint": "eslint .",
     "release": "./scripts/bin/run update-local-plugin && lerna version --exact",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "clean": "lerna run clean && rm -rf node_modules coverage",
-    "test-esm-imports": "lerna run test-esm-imports"
+    "test": "jest",
+    "clean": "lerna run clean && rm -rf node_modules coverage"
   },
   "devDependencies": {
     "@types/jest": "27.5.0",
@@ -34,7 +32,7 @@
     "typescript": "4.7.4"
   },
   "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

packages/eas-cli/.eslintrc.js

@@ -1,7 +1,25 @@
-const rootEslintrc = require('../../.eslintrc.cjs');
+const rootEslintrc = require('../../.eslintrc.js');
 
 module.exports = {
   rules: {
+    'no-restricted-properties': [
+      'warn',
+      {
+        object: 'it',
+        property: 'only',
+        message: 'it.only should not be committed to main.',
+      },
+      {
+        object: 'test',
+        property: 'only',
+        message: 'test.only should not be committed to main.',
+      },
+      {
+        object: 'describe',
+        property: 'only',
+        message: 'describe.only should not be committed to main.',
+      },
+    ],
     'no-restricted-imports': [
       'error',
       {

packages/eas-cli/README.md

@@ -100,7 +100,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/login.ts)_
+_See code: [src/commands/account/login.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/account/login.ts)_
 
 ## `eas account:logout`
 
@@ -117,7 +117,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/logout.ts)_
+_See code: [src/commands/account/logout.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/account/logout.ts)_
 
 ## `eas account:view`
 
@@ -134,7 +134,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/account/view.ts)_
+_See code: [src/commands/account/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/account/view.ts)_
 
 ## `eas analytics [STATUS]`
 
@@ -148,7 +148,7 @@ DESCRIPTION
   display or change analytics settings
 ```
 
-_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/analytics.ts)_
+_See code: [src/commands/analytics.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/analytics.ts)_
 
 ## `eas autocomplete [SHELL]`
 
@@ -197,7 +197,7 @@ DESCRIPTION
   create a branch
 ```
 
-_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/create.ts)_
+_See code: [src/commands/branch/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/create.ts)_
 
 ## `eas branch:delete [NAME]`
 
@@ -217,7 +217,7 @@ DESCRIPTION
   delete a branch
 ```
 
-_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/delete.ts)_
+_See code: [src/commands/branch/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/delete.ts)_
 
 ## `eas branch:list`
 
@@ -225,16 +225,20 @@ list all branches
 
 ```
 USAGE
-  $ eas branch:list [--json]
+  $ eas branch:list [--offset <value>] [--limit <value>] [--json] [--non-interactive]
 
 FLAGS
-  --json  return output as JSON
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
+                     lower value may help increase command speed.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
 
 DESCRIPTION
   list all branches
 ```
 
-_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/list.ts)_
+_See code: [src/commands/branch/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/list.ts)_
 
 ## `eas branch:rename`
 
@@ -253,7 +257,7 @@ DESCRIPTION
   rename a branch
 ```
 
-_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/rename.ts)_
+_See code: [src/commands/branch/rename.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/rename.ts)_
 
 ## `eas branch:view [NAME]`
 
@@ -261,19 +265,23 @@ view a branch
 
 ```
 USAGE
-  $ eas branch:view [NAME] [--json]
+  $ eas branch:view [NAME] [--offset <value>] [--limit <value>] [--json] [--non-interactive]
 
 ARGUMENTS
   NAME  Name of the branch to view
 
 FLAGS
-  --json  return a json with the branch's ID name and recent update groups.
+  --json             Enable JSON output, non-JSON messages will be printed to stderr.
+  --limit=<value>    The number of query items to list at once. The default value is 50 (the maximum is 100). Using a
+                     lower value may help increase command speed.
+  --non-interactive  Run the command in non-interactive mode.
+  --offset=<value>   Start queries from specified index. Use for paginating results. Defaults to 0.
 
 DESCRIPTION
   view a branch
 ```
 
-_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/branch/view.ts)_
+_See code: [src/commands/branch/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/branch/view.ts)_
 
 ## `eas build`
 
@@ -282,9 +290,10 @@ start a build
 ```
 USAGE
   $ eas build [-p android|ios|all] [--json] [--profile <value>] [--non-interactive] [--local] [--output
-    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>]
+    <value>] [--wait] [--clear-cache] [--auto-submit | --auto-submit-with-profile <value>] [-m <value>]
 
 FLAGS
+  -m, --message=<value>                    A short message describing the build
   -p, --platform=(android|ios|all)
   --auto-submit                            Submit on build complete using the submit profile with the same name as the
                                            build profile
@@ -302,7 +311,7 @@ DESCRIPTION
   start a build
 ```
 
-_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/index.ts)_
+_See code: [src/commands/build/index.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/index.ts)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -316,7 +325,7 @@ DESCRIPTION
   cancel a build
 ```
 
-_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/cancel.ts)_
+_See code: [src/commands/build/cancel.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/cancel.ts)_
 
 ## `eas build:configure`
 
@@ -333,7 +342,7 @@ DESCRIPTION
   configure the project to support EAS Build
 ```
 
-_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/configure.ts)_
+_See code: [src/commands/build/configure.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/configure.ts)_
 
 ## `eas build:inspect`
 
@@ -368,7 +377,7 @@ DESCRIPTION
   inspect the state of the project at specific build stages, useful for troubleshooting
 ```
 
-_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/inspect.ts)_
+_See code: [src/commands/build/inspect.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/inspect.ts)_
 
 ## `eas build:list`
 
@@ -401,7 +410,7 @@ DESCRIPTION
   list all builds for your project
 ```
 
-_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/list.ts)_
+_See code: [src/commands/build/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/list.ts)_
 
 ## `eas build:submit`
 
@@ -446,7 +455,7 @@ DESCRIPTION
   view a build for your project
 ```
 
-_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/build/view.ts)_
+_See code: [src/commands/build/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/build/view.ts)_
 
 ## `eas channel:create [NAME]`
 
@@ -466,7 +475,7 @@ DESCRIPTION
   create a channel
 ```
 
-_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/create.ts)_
+_See code: [src/commands/channel/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/create.ts)_
 
 ## `eas channel:edit [NAME]`
 
@@ -487,7 +496,7 @@ DESCRIPTION
   point a channel at a new branch
 ```
 
-_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/edit.ts)_
+_See code: [src/commands/channel/edit.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/edit.ts)_
 
 ## `eas channel:list`
 
@@ -504,7 +513,7 @@ DESCRIPTION
   list all channels
 ```
 
-_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/list.ts)_
+_See code: [src/commands/channel/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/list.ts)_
 
 ## `eas channel:view [NAME]`
 
@@ -524,7 +533,7 @@ DESCRIPTION
   view a channel
 ```
 
-_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/channel/view.ts)_
+_See code: [src/commands/channel/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/channel/view.ts)_
 
 ## `eas config`
 
@@ -542,7 +551,7 @@ DESCRIPTION
   display project configuration (app.json + eas.json)
 ```
 
-_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/config.ts)_
+_See code: [src/commands/config.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/config.ts)_
 
 ## `eas credentials`
 
@@ -556,7 +565,7 @@ DESCRIPTION
   manage credentials
 ```
 
-_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/credentials.ts)_
+_See code: [src/commands/credentials.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/credentials.ts)_
 
 ## `eas device:create`
 
@@ -570,7 +579,7 @@ DESCRIPTION
   register new Apple Devices to use for internal distribution
 ```
 
-_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/create.ts)_
+_See code: [src/commands/device/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/create.ts)_
 
 ## `eas device:delete`
 
@@ -588,7 +597,7 @@ DESCRIPTION
   remove a registered device from your account
 ```
 
-_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/delete.ts)_
+_See code: [src/commands/device/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/delete.ts)_
 
 ## `eas device:list`
 
@@ -605,7 +614,7 @@ DESCRIPTION
   list all registered devices for your account
 ```
 
-_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/list.ts)_
+_See code: [src/commands/device/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/list.ts)_
 
 ## `eas device:view [UDID]`
 
@@ -619,7 +628,7 @@ DESCRIPTION
   view a device for your project
 ```
 
-_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/device/view.ts)_
+_See code: [src/commands/device/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/device/view.ts)_
 
 ## `eas diagnostics`
 
@@ -633,7 +642,7 @@ DESCRIPTION
   display environment info
 ```
 
-_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/diagnostics.ts)_
+_See code: [src/commands/diagnostics.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/diagnostics.ts)_
 
 ## `eas help [COMMAND]`
 
@@ -715,7 +724,7 @@ DESCRIPTION
   generate the local store configuration from the app stores
 ```
 
-_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/metadata/pull.ts)_
+_See code: [src/commands/metadata/pull.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/metadata/pull.ts)_
 
 ## `eas metadata:push`
 
@@ -732,7 +741,7 @@ DESCRIPTION
   sync the local store configuration to the app stores
 ```
 
-_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/metadata/push.ts)_
+_See code: [src/commands/metadata/push.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/metadata/push.ts)_
 
 ## `eas project:info`
 
@@ -746,7 +755,7 @@ DESCRIPTION
   information about the current project
 ```
 
-_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/info.ts)_
+_See code: [src/commands/project/info.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/project/info.ts)_
 
 ## `eas project:init`
 
@@ -763,7 +772,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/project/init.ts)_
+_See code: [src/commands/project/init.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/project/init.ts)_
 
 ## `eas secret:create`
 
@@ -783,7 +792,7 @@ DESCRIPTION
   create an environment secret on the current project or owner account
 ```
 
-_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/create.ts)_
+_See code: [src/commands/secret/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/secret/create.ts)_
 
 ## `eas secret:delete`
 
@@ -800,7 +809,7 @@ DESCRIPTION
   delete an environment secret by ID
 ```
 
-_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/delete.ts)_
+_See code: [src/commands/secret/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/secret/delete.ts)_
 
 ## `eas secret:list`
 
@@ -814,7 +823,7 @@ DESCRIPTION
   list environment secrets available for your current app
 ```
 
-_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/secret/list.ts)_
+_See code: [src/commands/secret/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/secret/list.ts)_
 
 ## `eas submit`
 
@@ -844,7 +853,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/submit.ts)_
+_See code: [src/commands/submit.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/submit.ts)_
 
 ## `eas update`
 
@@ -874,7 +883,7 @@ DESCRIPTION
   publish an update group
 ```
 
-_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/index.ts)_
+_See code: [src/commands/update/index.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/index.ts)_
 
 ## `eas update:configure`
 
@@ -891,7 +900,7 @@ DESCRIPTION
   configure the project to support EAS Update
 ```
 
-_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/configure.ts)_
+_See code: [src/commands/update/configure.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/configure.ts)_
 
 ## `eas update:delete GROUPID`
 
@@ -911,7 +920,7 @@ DESCRIPTION
   delete all the updates in an update group
 ```
 
-_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/delete.ts)_
+_See code: [src/commands/update/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/delete.ts)_
 
 ## `eas update:list`
 
@@ -930,7 +939,7 @@ DESCRIPTION
   view the recent updates for a branch
 ```
 
-_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/list.ts)_
+_See code: [src/commands/update/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/list.ts)_
 
 ## `eas update:view GROUPID`
 
@@ -950,7 +959,7 @@ DESCRIPTION
   update group details
 ```
 
-_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/update/view.ts)_
+_See code: [src/commands/update/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/update/view.ts)_
 
 ## `eas webhook:create`
 
@@ -970,7 +979,7 @@ DESCRIPTION
   create a webhook
 ```
 
-_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/create.ts)_
+_See code: [src/commands/webhook/create.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/create.ts)_
 
 ## `eas webhook:delete [ID]`
 
@@ -987,7 +996,7 @@ DESCRIPTION
   delete a webhook
 ```
 
-_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/delete.ts)_
+_See code: [src/commands/webhook/delete.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/delete.ts)_
 
 ## `eas webhook:list`
 
@@ -1004,7 +1013,7 @@ DESCRIPTION
   list webhooks
 ```
 
-_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/list.ts)_
+_See code: [src/commands/webhook/list.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/list.ts)_
 
 ## `eas webhook:update`
 
@@ -1025,7 +1034,7 @@ DESCRIPTION
   update a webhook
 ```
 
-_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/update.ts)_
+_See code: [src/commands/webhook/update.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/update.ts)_
 
 ## `eas webhook:view ID`
 
@@ -1042,7 +1051,7 @@ DESCRIPTION
   view a webhook
 ```
 
-_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.54.1/packages/eas-cli/src/commands/webhook/view.ts)_
+_See code: [src/commands/webhook/view.ts](https://github.com/expo/eas-cli/blob/v0.57.0/packages/eas-cli/src/commands/webhook/view.ts)_
 
 ## `eas whoami`
 

packages/eas-cli/bin/run

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+
+require('@oclif/core')
+  .run()
+  .then(require('@oclif/core/flush'))
+  .catch(require('@oclif/core/handle'));

packages/eas-cli/bin/run.js

@@ -1,7 +0,0 @@
-#!/usr/bin/env node
-
-import { Errors, flush, run } from '@oclif/core';
-
-run(undefined, import.meta.url)
-  .then(flush)
-  .catch(Errors.handle);

packages/eas-cli/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  ...require('../../jest/jest.config.cjs'),
+  ...require('../../jest/jest.config.js'),
   rootDir: __dirname,
   roots: ['src', '__mocks__'],
   globalSetup: './jest/global-setup.ts',

packages/eas-cli/jest/setup-after-env.ts

@@ -1,5 +1,3 @@
-import { jest } from '@jest/globals';
-
 /* eslint-disable no-console */
 beforeAll(() => {
   console.log = jest.fn();

packages/eas-cli/package.json

@@ -1,8 +1,7 @@
 {
   "name": "eas-cli",
-  "type": "module",
   "description": "EAS command line tool",
-  "version": "0.54.1",
+  "version": "0.57.0",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -14,8 +13,8 @@
     "@expo/config": "6.0.23",
     "@expo/config-plugins": "4.1.4",
     "@expo/config-types": "45.0.0",
-    "@expo/eas-build-job": "0.2.77",
-    "@expo/eas-json": "0.54.0",
+    "@expo/eas-build-job": "0.2.84",
+    "@expo/eas-json": "0.57.0",
     "@expo/json-file": "8.2.36",
     "@expo/multipart-body-parser": "1.1.0",
     "@expo/pkcs12": "0.0.8",
@@ -28,7 +27,7 @@
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.6.0",
     "@expo/timeago.js": "1.0.0",
-    "@oclif/core": "1.9.5",
+    "@oclif/core": "1.9.0",
     "@urql/core": "2.4.4",
     "@urql/exchange-retry": "0.3.3",
     "ajv": "^6.12.6",
@@ -82,7 +81,6 @@
     "@graphql-codegen/introspection": "2.1.1",
     "@graphql-codegen/typescript": "2.4.11",
     "@graphql-codegen/typescript-operations": "2.4.0",
-    "@jest/globals": "28.1.2",
     "@types/cli-progress": "3.9.2",
     "@types/dateformat": "3.0.1",
     "@types/envinfo": "7.8.1",
@@ -100,17 +98,16 @@
     "axios": "0.27.2",
     "eslint-plugin-graphql": "4.0.0",
     "form-data": "4.0.0",
-    "globby": "13.1.2",
     "memfs": "3.4.3",
     "mockdate": "3.0.5",
     "nock": "13.2.4",
     "tempy": "0.7.0",
     "ts-deepmerge": "2.0.1",
-    "ts-node": "10.8.2",
+    "ts-mockito": "2.6.1",
     "typescript": "4.7.4"
   },
   "engines": {
-    "node": ">=14.16"
+    "node": ">=14.0.0"
   },
   "files": [
     "/bin",
@@ -170,7 +167,7 @@
     },
     "warn-if-update-available": {
       "timeoutInDays": 0.5,
-      "message": "<%= chalk.bold('★') %> <%= chalk.bold(config.name + '@' + latest) %> <%= chalk.bold('is now available, please upgrade.') %>\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": {
@@ -200,14 +197,13 @@
     "build": "tsc --project tsconfig.build.json",
     "watch": "yarn build --watch --preserveWatchOutput",
     "typecheck": "tsc",
-    "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "version": "yarn oclif readme && node scripts/patch-readme.cjs && git add README.md",
+    "test": "jest",
+    "version": "yarn oclif readme && node scripts/patch-readme && git add README.md",
     "generate-graphql-code": "graphql-codegen --config graphql-codegen.yml",
-    "clean": "rm -rf dist build tmp node_modules yarn-error.log",
-    "test-esm-imports": "cp ../../scripts/src/testESMImports.ts scripts/ && ts-node-esm ./scripts/testESMImports.ts 'build/**/*.js'"
+    "clean": "rm -rf dist build tmp node_modules yarn-error.log"
   },
   "volta": {
-    "node": "18.2.0",
-    "yarn": "1.22.18"
+    "node": "18.6.0",
+    "yarn": "1.22.19"
   }
 }

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

@@ -1,7 +1,7 @@
 import assert from 'assert';
 import nock from 'nock';
 
-import { ApiV2Error, api, getExpoApiBaseUrl } from '../api.js';
+import { ApiV2Error, api, getExpoApiBaseUrl } from '../api';
 
 describe('apiClient', () => {
   it('converts Expo APIv2 error to ApiV2Error', async () => {

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

@@ -1,4 +1,4 @@
-import { Actor } from '../user/User.js';
+import { Actor } from '../user/User';
 
 interface MockProject {
   projectRoot: string;

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

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

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

@@ -1,4 +1,4 @@
-import { Analytics, Event } from './events.js';
+import { Analytics, Event } from './events';
 
 export type TrackingContext = Record<string, string | number | boolean>;
 

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

@@ -1,4 +1,4 @@
-import { logEvent } from './rudderstackClient.js';
+import { logEvent } from './rudderstackClient';
 export type Event = BuildEvent | SubmissionEvent | MetadataEvent;
 
 export enum SubmissionEvent {

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

@@ -1,12 +1,10 @@
-import RudderAnalyticsModule from '@expo/rudder-sdk-node';
+import RudderAnalytics from '@expo/rudder-sdk-node';
 import os from 'os';
 import { URL } from 'url';
 import { v4 as uuidv4 } from 'uuid';
 
-import UserSettings from '../user/UserSettings.js';
-import { easCliVersion } from '../utils/easCli.js';
-
-const RudderAnalytics = RudderAnalyticsModule.default;
+import UserSettings from '../user/UserSettings';
+import { easCliVersion } from '../utils/easCli';
 
 const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   darwin: 'Mac',
@@ -14,7 +12,7 @@ const PLATFORM_TO_ANALYTICS_PLATFORM: { [platform: string]: string } = {
   linux: 'Linux',
 };
 
-let rudderstackClient: RudderAnalyticsModule.default | null = null;
+let rudderstackClient: RudderAnalytics | null = null;
 let userIdentified = false;
 let identifyData: {
   userId: string;

packages/eas-cli/src/api.ts

@@ -1,7 +1,7 @@
 import { JSONValue } from '@expo/json-file';
 
-import fetch, { RequestError, RequestInit } from './fetch.js';
-import { getAccessToken, getSessionSecret } from './user/sessionStorage.js';
+import fetch, { RequestError, RequestInit } from './fetch';
+import { getAccessToken, getSessionSecret } from './user/sessionStorage';
 
 export class ApiV2Error extends Error {
   readonly name = 'ApiV2Error';

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

@@ -0,0 +1,109 @@
+import chalk from 'chalk';
+import CliTable from 'cli-table3';
+
+import { PaginatedQueryOptions } from '../commandUtils/pagination';
+import { UpdateBranchFragment } from '../graphql/generated';
+import { BranchQuery } from '../graphql/queries/BranchQuery';
+import Log from '../log';
+import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../update/utils';
+import { printJsonOnlyOutput } from '../utils/json';
+import {
+  paginatedQueryWithConfirmPromptAsync,
+  paginatedQueryWithSelectPromptAsync,
+} from '../utils/queries';
+
+export const BRANCHES_LIMIT = 50;
+
+export async function selectBranchFromPaginatedQueryAsync(
+  projectId: string,
+  promptTitle: string,
+  options: PaginatedQueryOptions
+): Promise<UpdateBranchFragment> {
+  if (options.nonInteractive) {
+    throw new Error('Unable to select a branch in non-interactive mode.');
+  }
+
+  const selectedBranch = await paginatedQueryWithSelectPromptAsync({
+    limit: options.limit ?? BRANCHES_LIMIT,
+    offset: options.offset,
+    queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
+    promptOptions: {
+      title: promptTitle,
+      getIdentifierForQueryItem: updateBranchFragment => updateBranchFragment.id,
+      createDisplayTextForSelectionPromptListItem: updateBranchFragment =>
+        updateBranchFragment.name,
+    },
+  });
+  if (!selectedBranch) {
+    throw new Error(`Could not find any branches for project "${projectId}"`);
+  }
+  return selectedBranch;
+}
+
+export async function listAndRenderPaginatedBranchesAsync(
+  projectId: string,
+  options: PaginatedQueryOptions
+): Promise<void> {
+  if (options.nonInteractive) {
+    const branches = await queryBranchesForProjectAsync(
+      options.limit ?? BRANCHES_LIMIT,
+      options.offset,
+      projectId
+    );
+    renderPageOfBranches(branches, options);
+  } else {
+    await paginatedQueryWithConfirmPromptAsync({
+      limit: options.limit ?? BRANCHES_LIMIT,
+      offset: options.offset,
+      queryToPerform: (limit, offset) => queryBranchesForProjectAsync(limit, offset, projectId),
+      promptOptions: {
+        title: 'Load more branches?',
+        renderListItems: branches => renderPageOfBranches(branches, options),
+      },
+    });
+  }
+}
+
+async function queryBranchesForProjectAsync(
+  limit: number,
+  offset: number,
+  projectId: string
+): Promise<UpdateBranchFragment[]> {
+  return await BranchQuery.listBranchesAsync({
+    appId: projectId,
+    limit,
+    offset,
+  });
+}
+
+function renderPageOfBranches(
+  currentPage: UpdateBranchFragment[],
+  { json }: PaginatedQueryOptions
+): void {
+  if (json) {
+    printJsonOnlyOutput(currentPage);
+  } else {
+    const table = new CliTable({
+      head: ['Branch', ...UPDATE_COLUMNS],
+      wordWrap: true,
+    });
+
+    table.push(
+      ...currentPage.map(branch => [
+        branch.name,
+        formatUpdate(branch.updates[0]),
+        branch.updates[0]?.runtimeVersion ?? 'N/A',
+        branch.updates[0]?.group ?? 'N/A',
+        getPlatformsForGroup({
+          updates: branch.updates,
+          group: branch.updates[0]?.group,
+        }),
+      ])
+    );
+
+    Log.addNewLineIfNone();
+    Log.log(chalk.bold('Branches:'));
+    Log.addNewLineIfNone();
+    Log.log(table.toString());
+  }
+}

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

@@ -0,0 +1,14 @@
+import { truncateGitCommitMessage } from '../metadata';
+
+describe(truncateGitCommitMessage, () => {
+  it('returns undefined if no message was passed', () => {
+    expect(truncateGitCommitMessage(undefined)).toBeUndefined();
+  });
+  it('returns commit message', () => {
+    expect(truncateGitCommitMessage('a'.repeat(10))).toBe('a'.repeat(10));
+  });
+
+  it('truncates long commit messages', () => {
+    expect(truncateGitCommitMessage('a'.repeat(5000))).toBe(`${'a'.repeat(4093)}...`);
+  });
+});

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

@@ -7,16 +7,13 @@ import { vol } from 'memfs';
 import os from 'os';
 import path from 'path';
 
-import {
-  getAppBuildGradleAsync,
-  resolveConfigValue,
-} from '../../../project/android/gradleUtils.js';
+import { getAppBuildGradleAsync, resolveConfigValue } from '../../../project/android/gradleUtils';
 import {
   BumpStrategy,
   bumpVersionAsync,
   bumpVersionInAppJsonAsync,
   maybeResolveVersionsAsync,
-} from '../version.js';
+} from '../version';
 
 const fsReal = jest.requireActual('fs').promises as typeof fs;
 jest.mock('fs');
@@ -92,7 +89,7 @@ describe(bumpVersionAsync, () => {
     expect(resolveConfigValue(buildGradle, 'versionName')).toBe('3.0.0');
   });
 
-  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and gradle versionCode when strategy = BumpStrategy.APP_VERSION', async () => {
     const nativeVersionName = '1.0.0'; // this should be overwritten by bumpVersionAsync
     const fakeExp = initBareWorkflowProject({ versionName: nativeVersionName });
 

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

@@ -1,33 +1,33 @@
 import { Android, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 
 import AndroidCredentialsProvider, {
   AndroidCredentials,
-} from '../../credentials/android/AndroidCredentialsProvider.js';
-import { BuildParamsInput } from '../../graphql/generated.js';
-import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation.js';
-import Log from '../../log.js';
+} from '../../credentials/android/AndroidCredentialsProvider';
+import { BuildParamsInput } from '../../graphql/generated';
+import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation';
+import Log from '../../log';
 import {
   ensureApplicationIdIsDefinedForManagedProjectAsync,
   getApplicationIdAsync,
-} from '../../project/android/applicationId.js';
-import { resolveGradleBuildContextAsync } from '../../project/android/gradle.js';
-import { toggleConfirmAsync } from '../../prompts.js';
-import { findAccountByName } from '../../user/Account.js';
-import { nullthrows } from '../../utils/nullthrows.js';
+} from '../../project/android/applicationId';
+import { resolveGradleBuildContextAsync } from '../../project/android/gradle';
+import { toggleConfirmAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
 import {
   BuildRequestSender,
   CredentialsResult,
   JobData,
   prepareBuildRequestForPlatformAsync,
-} from '../build.js';
-import { AndroidBuildContext, BuildContext, CommonContext } from '../context.js';
-import { transformMetadata } from '../graphql.js';
-import { logCredentialsSource } from '../utils/credentials.js';
-import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate.js';
-import { transformJob } from './graphql.js';
-import { prepareJobAsync } from './prepareJob.js';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration.js';
+} from '../build';
+import { AndroidBuildContext, BuildContext, CommonContext } from '../context';
+import { transformMetadata } from '../graphql';
+import { logCredentialsSource } from '../utils/credentials';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 
 export async function createAndroidContextAsync(
   ctx: CommonContext<Platform.ANDROID>

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

@@ -1,7 +1,7 @@
 import { Android } from '@expo/eas-build-job';
 
-import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated.js';
-import { transformProjectArchive, transformWorkflow } from '../graphql.js';
+import { AndroidBuildType, AndroidJobInput } from '../../graphql/generated';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Android.Job): AndroidJobInput {
   return {

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

@@ -3,11 +3,11 @@ import { BuildProfile } from '@expo/eas-json';
 import path from 'path';
 import slash from 'slash';
 
-import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider.js';
-import { getUsername } from '../../project/projectUtils.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
-import { getVcsClient } from '../../vcs/index.js';
-import { BuildContext } from '../context.js';
+import { AndroidCredentials } from '../../credentials/android/AndroidCredentialsProvider';
+import { getUsername } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { getVcsClient } from '../../vcs';
+import { BuildContext } from '../context';
 
 interface JobData {
   projectArchive: ArchiveSource;

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

@@ -1,18 +1,16 @@
 import { ExpoConfig } from '@expo/config';
-import ConfigPlugins from '@expo/config-plugins';
+import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { AndroidVersionAutoIncrement, BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 import path from 'path';
 
-import Log from '../../log.js';
-import { isExpoUpdatesInstalled } from '../../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule.js';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version.js';
-
-const { AndroidConfig } = ConfigPlugins;
+import Log from '../../log';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { syncUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function syncProjectConfigurationAsync({
   projectDir,

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

@@ -1,21 +1,20 @@
 import { ExpoConfig } from '@expo/config';
-import ConfigPlugins from '@expo/config-plugins';
+import { AndroidConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import Log from '../../log.js';
+import Log from '../../log';
 import {
   getAppBuildGradleAsync,
   parseGradleCommand,
   resolveConfigValue,
-} from '../../project/android/gradleUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { updateAppJsonConfigAsync } from '../utils/appJson.js';
-import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version.js';
-
-const { AndroidConfig } = ConfigPlugins;
+} from '../../project/android/gradleUtils';
+import { getNextVersionCode } from '../../project/android/versions';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -48,9 +47,10 @@ export async function bumpVersionAsync({
 
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToBuildGradleAsync({
+  await updateNativeVersionsAsync({
     projectDir,
-    exp,
+    version: exp.version,
+    versionCode: exp.android?.versionCode,
   });
   Log.log('Synchronized versions with build gradle');
 }
@@ -76,7 +76,7 @@ export async function bumpVersionInAppJsonAsync({
     await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const versionCode = AndroidConfig.Version.getVersionCode(exp);
-    const bumpedVersionCode = versionCode + 1;
+    const bumpedVersionCode = getNextVersionCode(versionCode);
     Log.log(
       `Bumping ${chalk.bold('expo.android.versionCode')} from ${chalk.bold(
         versionCode
@@ -118,21 +118,33 @@ export async function maybeResolveVersionsAsync(
   }
 }
 
-async function writeVersionsToBuildGradleAsync({
+export async function updateNativeVersionsAsync({
   projectDir,
-  exp,
+  version,
+  versionCode,
 }: {
   projectDir: string;
-  exp: ExpoConfig;
-}): Promise<string> {
+  version?: string;
+  versionCode?: number;
+}): Promise<void> {
   const buildGradle = await readBuildGradleAsync(projectDir);
   if (!buildGradle) {
     throw new Error('This project is missing a build.gradle file.');
   }
-  let updatedBuildGradle = AndroidConfig.Version.setVersionName(exp, buildGradle);
-  updatedBuildGradle = AndroidConfig.Version.setVersionCode(exp, updatedBuildGradle);
+  let updatedBuildGradle = buildGradle;
+  if (version !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionName ".*"`),
+      `versionName "${version}"`
+    );
+  }
+  if (versionCode !== undefined) {
+    updatedBuildGradle = updatedBuildGradle.replace(
+      new RegExp(`versionCode.*`),
+      `versionCode ${versionCode}`
+    );
+  }
   await writeBuildGradleAsync({ projectDir, buildGradle: updatedBuildGradle });
-  return updatedBuildGradle;
 }
 
 async function readBuildGradleAsync(projectDir: string): Promise<string | undefined> {

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

@@ -3,10 +3,11 @@ import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 import cliProgress from 'cli-progress';
 import fs from 'fs-extra';
+import nullthrows from 'nullthrows';
 
-import { withAnalyticsAsync } from '../analytics/common.js';
-import { BuildEvent } from '../analytics/events.js';
-import { getExpoWebsiteBaseUrl } from '../api.js';
+import { withAnalyticsAsync } from '../analytics/common';
+import { BuildEvent } from '../analytics/events';
+import { getExpoWebsiteBaseUrl } from '../api';
 import {
   AppPlatform,
   BuildFragment,
@@ -14,27 +15,26 @@ import {
   BuildPriority,
   BuildStatus,
   UploadSessionType,
-} from '../graphql/generated.js';
-import { BuildResult } from '../graphql/mutations/BuildMutation.js';
-import { BuildQuery } from '../graphql/queries/BuildQuery.js';
-import Log, { learnMore } from '../log.js';
-import { Ora, ora } from '../ora.js';
+} from '../graphql/generated';
+import { BuildResult } from '../graphql/mutations/BuildMutation';
+import { BuildQuery } from '../graphql/queries/BuildQuery';
+import Log, { learnMore } from '../log';
+import { Ora, ora } from '../ora';
 import {
   appPlatformDisplayNames,
   appPlatformEmojis,
   requestedPlatformDisplayNames,
-} from '../platform.js';
-import { uploadAsync } from '../uploads.js';
-import { formatBytes } from '../utils/files.js';
-import { nullthrows } from '../utils/nullthrows.js';
-import { createProgressTracker } from '../utils/progress.js';
-import { sleepAsync } from '../utils/promise.js';
-import { getVcsClient } from '../vcs/index.js';
-import { BuildContext } from './context.js';
-import { runLocalBuildAsync } from './local.js';
-import { collectMetadataAsync } from './metadata.js';
-import { printDeprecationWarnings } from './utils/printBuildInfo.js';
-import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository.js';
+} from '../platform';
+import { uploadFileAtPathToS3Async } from '../uploads';
+import { formatBytes } from '../utils/files';
+import { createProgressTracker } from '../utils/progress';
+import { sleepAsync } from '../utils/promise';
+import { getVcsClient } from '../vcs';
+import { BuildContext } from './context';
+import { runLocalBuildAsync } from './local';
+import { collectMetadataAsync } from './metadata';
+import { printDeprecationWarnings } from './utils/printBuildInfo';
+import { makeProjectTarballAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 export interface CredentialsResult<Credentials> {
   source: CredentialsSource.LOCAL | CredentialsSource.REMOTE;
@@ -179,7 +179,7 @@ async function uploadProjectAsync<TPlatform extends Platform>(
         const projectTarball = await makeProjectTarballAsync();
         projectTarballPath = projectTarball.path;
 
-        const { bucketKey } = await uploadAsync(
+        const { bucketKey } = await uploadFileAtPathToS3Async(
           UploadSessionType.EasBuildProjectSources,
           projectTarball.path,
           createProgressTracker({
@@ -352,7 +352,7 @@ async function handleSingleBuildProgressAsync(
           );
         }
         Log.newLine();
-        Log.log('Waiting in queue');
+        Log.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
         queueProgressBar.start(
           build.initialQueuePosition + 1,
           build.initialQueuePosition - build.queuePosition + 1,
@@ -385,6 +385,12 @@ async function handleSingleBuildProgressAsync(
   return { refetch: true };
 }
 
+const priorityToQueueDisplayName: Record<BuildPriority, string> = {
+  [BuildPriority.Normal]: 'queue',
+  [BuildPriority.NormalPlus]: 'queue',
+  [BuildPriority.High]: 'priority queue',
+};
+
 const statusToDisplayName: Record<BuildStatus, string> = {
   [BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
   [BuildStatus.InQueue]: 'in queue',

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

@@ -3,11 +3,11 @@ import { EasJson, EasJsonReader } from '@expo/eas-json';
 import chalk from 'chalk';
 import fs from 'fs-extra';
 
-import Log from '../log.js';
-import { resolveWorkflowAsync } from '../project/workflow.js';
-import { easCliVersion } from '../utils/easCli.js';
-import { getVcsClient } from '../vcs/index.js';
-import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository.js';
+import Log from '../log';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
+import { maybeBailOnRepoStatusAsync, reviewAndCommitChangesAsync } from './utils/repository';
 
 interface ConfigureParams {
   projectDir: string;

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

@@ -1,16 +1,15 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 
-import { TrackingContext } from '../analytics/common.js';
-import { CredentialsContext } from '../credentials/context.js';
-import { Target } from '../credentials/ios/types.js';
-import { BuildResourceClass } from '../graphql/generated.js';
-import { GradleBuildContext } from '../project/android/gradle.js';
-import { XcodeBuildContext } from '../project/ios/scheme.js';
-import { Actor } from '../user/User.js';
-import { LocalBuildOptions } from './local.js';
+import { TrackingContext } from '../analytics/common';
+import { CredentialsContext } from '../credentials/context';
+import { Target } from '../credentials/ios/types';
+import { BuildResourceClass } from '../graphql/generated';
+import { GradleBuildContext } from '../project/android/gradle';
+import { XcodeBuildContext } from '../project/ios/scheme';
+import { Actor } from '../user/User';
+import { LocalBuildOptions } from './local';
 
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 
@@ -21,7 +20,6 @@ export interface AndroidBuildContext {
 
 export interface IosBuildContext {
   bundleIdentifier: string;
-  applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
   applicationTarget: Target;
   targets: Target[];
   xcodeBuildContext: XcodeBuildContext;
@@ -29,6 +27,7 @@ export interface IosBuildContext {
 
 export interface BuildContext<T extends Platform> {
   accountName: string;
+  easJsonCliConfig: EasJson['cli'];
   buildProfile: BuildProfile<T>;
   buildProfileName: string;
   resourceClass: BuildResourceClass;
@@ -41,6 +40,7 @@ export interface BuildContext<T extends Platform> {
   projectDir: string;
   projectId: string;
   projectName: string;
+  message?: string;
   trackingCtx: TrackingContext;
   user: Actor;
   workflow: Workflow;

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

@@ -1,43 +1,45 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import JsonFileModule from '@expo/json-file';
+import { BuildProfile, EasJson } from '@expo/eas-json';
+import JsonFile from '@expo/json-file';
 import resolveFrom from 'resolve-from';
 import { v4 as uuidv4 } from 'uuid';
 
-import { TrackingContext } from '../analytics/common.js';
-import { Analytics, BuildEvent } from '../analytics/events.js';
-import { CredentialsContext } from '../credentials/context.js';
-import { BuildResourceClass } from '../graphql/generated.js';
-import { getExpoConfig } from '../project/expoConfig.js';
-import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../project/workflow.js';
-import { findAccountByName } from '../user/Account.js';
-import { ensureLoggedInAsync } from '../user/actions.js';
-import { createAndroidContextAsync } from './android/build.js';
-import { BuildContext, CommonContext } from './context.js';
-import { createIosContextAsync } from './ios/build.js';
-import { LocalBuildOptions } from './local.js';
-
-const JsonFile = JsonFileModule.default;
+import { TrackingContext } from '../analytics/common';
+import { Analytics, BuildEvent } from '../analytics/events';
+import { CredentialsContext } from '../credentials/context';
+import { BuildResourceClass } from '../graphql/generated';
+import { getExpoConfig } from '../project/expoConfig';
+import { getProjectAccountName, getProjectIdAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { findAccountByName } from '../user/Account';
+import { ensureLoggedInAsync } from '../user/actions';
+import { createAndroidContextAsync } from './android/build';
+import { BuildContext, CommonContext } from './context';
+import { createIosContextAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
 
 export async function createBuildContextAsync<T extends Platform>({
   buildProfileName,
   buildProfile,
+  easJsonCliConfig,
   clearCache = false,
   localBuildOptions,
   nonInteractive = false,
   platform,
   projectDir,
   resourceClass,
+  message,
 }: {
   buildProfileName: string;
   buildProfile: BuildProfile<T>;
+  easJsonCliConfig: EasJson['cli'];
   clearCache: boolean;
   localBuildOptions: LocalBuildOptions;
   nonInteractive: boolean;
   platform: T;
   projectDir: string;
   resourceClass: BuildResourceClass;
+  message?: string;
 }): Promise<BuildContext<T>> {
   const exp = getExpoConfig(projectDir, { env: buildProfile.env });
 
@@ -76,6 +78,7 @@ export async function createBuildContextAsync<T extends Platform>({
     buildProfile,
     buildProfileName,
     resourceClass,
+    easJsonCliConfig,
     clearCache,
     credentialsCtx,
     exp,
@@ -88,6 +91,7 @@ export async function createBuildContextAsync<T extends Platform>({
     trackingCtx,
     user,
     workflow,
+    message,
   };
   if (platform === Platform.ANDROID) {
     const common = commonContext as CommonContext<Platform.ANDROID>;

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

@@ -8,7 +8,7 @@ import {
   DistributionType,
   ProjectArchiveSourceInput,
   ProjectArchiveSourceType,
-} from '../graphql/generated.js';
+} from '../graphql/generated';
 
 export function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput {
   if (archiveSource.type === ArchiveSourceType.S3) {

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

@@ -1,10 +1,11 @@
 import { ExpoConfig } from '@expo/config';
-import { InfoPlist } from '@expo/config-plugins';
+import { IOSConfig } from '@expo/config-plugins';
 import fs from 'fs-extra';
 import { vol } from 'memfs';
 import os from 'os';
+import type { XCBuildConfiguration } from 'xcode';
 
-import { readPlistAsync } from '../../../utils/plist.js';
+import { readPlistAsync } from '../../../utils/plist';
 import {
   BumpStrategy,
   bumpVersionAsync,
@@ -13,10 +14,16 @@ import {
   getInfoPlistPath,
   readBuildNumberAsync,
   readShortVersionAsync,
-} from '../version.js';
+} from '../version';
 
 jest.mock('fs');
 
+const getXCBuildConfigurationFromPbxproj = jest.spyOn(
+  IOSConfig.Target,
+  'getXCBuildConfigurationFromPbxproj'
+);
+const getPbxproj = jest.spyOn(IOSConfig.XcodeUtils, 'getPbxproj');
+
 afterAll(async () => {
   // do not remove the following line
   // this fixes a weird error with tempy in @expo/image-utils
@@ -51,18 +58,40 @@ describe(evaluateTemplateString, () => {
 
 // bare workflow
 describe(bumpVersionAsync, () => {
+  beforeEach(() => {
+    getPbxproj.mockImplementation(() => ({} as any));
+  });
+  afterEach(() => {
+    getXCBuildConfigurationFromPbxproj.mockReset();
+    getPbxproj.mockReset();
+  });
   it('bumps expo.ios.buildNumber and CFBundleVersion when strategy = BumpStrategy.BUILD_NUMBER', async () => {
     const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -74,17 +103,31 @@ describe(bumpVersionAsync, () => {
   it('bumps expo.ios.buildNumber and CFBundleVersion for non default Info.plist location', async () => {
     const fakeExp = initBareWorkflowProject({ infoPlistName: 'Info2.plist' });
 
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.BUILD_NUMBER,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {
-        INFOPLIST_FILE: '$(SRCROOT)/myproject/Info2.plist',
-      },
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info2.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info2.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('2');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -93,18 +136,33 @@ describe(bumpVersionAsync, () => {
     expect(infoPlist['CFBundleVersion']).toBe('2');
   });
 
-  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.SHORT_VERSION', async () => {
+  it('bumps expo.version and CFBundleShortVersionString when strategy = BumpStrategy.APP_VERSION', async () => {
     const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.APP_VERSION,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.1');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.1');
@@ -115,16 +173,31 @@ describe(bumpVersionAsync, () => {
 
   it('does not bump any version when strategy = BumpStrategy.NOOP', async () => {
     const fakeExp = initBareWorkflowProject();
-
+    getXCBuildConfigurationFromPbxproj.mockImplementation(
+      () =>
+        ({
+          buildSettings: {
+            INFOPLIST_FILE: 'myproject/Info.plist',
+          },
+        } as XCBuildConfiguration)
+    );
     await bumpVersionAsync({
       bumpStrategy: BumpStrategy.NOOP,
       projectDir: '/repo',
       exp: fakeExp,
-      buildSettings: {},
+      targets: [
+        {
+          targetName: 'example',
+          bundleIdentifier: 'example.com',
+          entitlements: {},
+        },
+      ],
     });
 
     const appJSON = await fs.readJSON('/repo/app.json');
-    const infoPlist = (await readPlistAsync('/repo/ios/myproject/Info.plist')) as InfoPlist;
+    const infoPlist = (await readPlistAsync(
+      '/repo/ios/myproject/Info.plist'
+    )) as IOSConfig.InfoPlist;
     expect(fakeExp.version).toBe('1.0.0');
     expect(fakeExp.ios?.buildNumber).toBe('1');
     expect(appJSON.expo.version).toBe('1.0.0');
@@ -280,9 +353,9 @@ describe(getInfoPlistPath, () => {
 
 function initBareWorkflowProject({
   appVersion = '1.0.0',
-  version = '1',
+  buildNumber = '1',
   infoPlistName = 'Info.plist',
-}: { appVersion?: string; version?: string; infoPlistName?: string } = {}): ExpoConfig {
+}: { appVersion?: string; buildNumber?: string; infoPlistName?: string } = {}): ExpoConfig {
   const fakeExp: ExpoConfig = {
     name: 'myproject',
     slug: 'myproject',
@@ -303,7 +376,7 @@ function initBareWorkflowProject({
   <key>CFBundleShortVersionString</key>
   <string>${appVersion}</string>
   <key>CFBundleVersion</key>
-  <string>${version}</string>
+  <string>${buildNumber}</string>
 </dict>
 </plist>`,
     },

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

@@ -1,23 +1,19 @@
-import ConfigPlugins from '@expo/config-plugins';
 import { Ios, Job, Metadata, Platform, Workflow } from '@expo/eas-build-job';
-import type { XCBuildConfiguration } from 'xcode';
 
-import { IosCredentials, Target } from '../../credentials/ios/types.js';
-import { BuildParamsInput } from '../../graphql/generated.js';
-import { BuildMutation, BuildResult } from '../../graphql/mutations/BuildMutation.js';
-import { ensureBundleIdentifierIsDefinedForManagedProjectAsync } from '../../project/ios/bundleIdentifier.js';
-import { resolveXcodeBuildContextAsync } from '../../project/ios/scheme.js';
-import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target.js';
-import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build.js';
-import { BuildContext, CommonContext, IosBuildContext } from '../context.js';
-import { transformMetadata } from '../graphql.js';
-import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate.js';
-import { ensureIosCredentialsAsync } from './credentials.js';
-import { transformJob } from './graphql.js';
-import { prepareJobAsync } from './prepareJob.js';
-import { syncProjectConfigurationAsync } from './syncProjectConfiguration.js';
-
-const { IOSConfig } = ConfigPlugins;
+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 { resolveXcodeBuildContextAsync } from '../../project/ios/scheme';
+import { findApplicationTarget, resolveTargetsAsync } from '../../project/ios/target';
+import { BuildRequestSender, JobData, prepareBuildRequestForPlatformAsync } from '../build';
+import { BuildContext, CommonContext, IosBuildContext } from '../context';
+import { transformMetadata } from '../graphql';
+import { checkGoogleServicesFileAsync, checkNodeEnvVariable } from '../validate';
+import { ensureIosCredentialsAsync } from './credentials';
+import { transformJob } from './graphql';
+import { prepareJobAsync } from './prepareJob';
+import { syncProjectConfigurationAsync } from './syncProjectConfiguration';
 
 export async function createIosContextAsync(
   ctx: CommonContext<Platform.IOS>
@@ -46,12 +42,10 @@ export async function createIosContextAsync(
     env: buildProfile.env,
   });
   const applicationTarget = findApplicationTarget(targets);
-  const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
 
   return {
     bundleIdentifier: applicationTarget.bundleIdentifier,
     applicationTarget,
-    applicationTargetBuildSettings,
     targets,
     xcodeBuildContext,
   };
@@ -70,7 +64,7 @@ export async function prepareIosBuildAsync(
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         buildProfile: ctx.buildProfile,
-        buildSettings: ctx.ios.applicationTargetBuildSettings,
+        targets: ctx.ios.targets,
       });
     },
     prepareJobAsync: async (
@@ -99,18 +93,3 @@ export async function prepareIosBuildAsync(
     },
   });
 }
-
-function resolveBuildSettings(
-  ctx: CommonContext<Platform.IOS>,
-  applicationTarget: Target
-): XCBuildConfiguration['buildSettings'] {
-  if (ctx.workflow === Workflow.MANAGED) {
-    return {};
-  }
-  const project = IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
-  const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
-    targetName: applicationTarget.targetName,
-    buildConfiguration: applicationTarget.buildConfiguration,
-  });
-  return xcBuildConfiguration?.buildSettings ?? {};
-}

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

@@ -1,11 +1,11 @@
 import { Platform } from '@expo/eas-build-job';
 
-import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider.js';
-import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils.js';
-import { IosCredentials, Target } from '../../credentials/ios/types.js';
-import { CredentialsResult } from '../build.js';
-import { BuildContext } from '../context.js';
-import { logCredentialsSource } from '../utils/credentials.js';
+import IosCredentialsProvider from '../../credentials/ios/IosCredentialsProvider';
+import { getAppFromContext } from '../../credentials/ios/actions/BuildCredentialsUtils';
+import { IosCredentials, Target } from '../../credentials/ios/types';
+import { CredentialsResult } from '../build';
+import { BuildContext } from '../context';
+import { logCredentialsSource } from '../utils/credentials';
 
 export async function ensureIosCredentialsAsync(
   buildCtx: BuildContext<Platform.IOS>,

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

@@ -1,8 +1,8 @@
 import { Env, Ios } from '@expo/eas-build-job';
+import nullthrows from 'nullthrows';
 
-import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated.js';
-import { nullthrows } from '../../utils/nullthrows.js';
-import { transformProjectArchive, transformWorkflow } from '../graphql.js';
+import { IosJobInput, IosJobSecretsInput } from '../../graphql/generated';
+import { transformProjectArchive, transformWorkflow } from '../graphql';
 
 export function transformJob(job: Ios.Job): IosJobInput {
   return {

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

@@ -2,11 +2,11 @@ import { ArchiveSource, Ios, Job, Platform, sanitizeJob } from '@expo/eas-build-
 import path from 'path';
 import slash from 'slash';
 
-import { IosCredentials, TargetCredentials } from '../../credentials/ios/types.js';
-import { getUsername } from '../../project/projectUtils.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
-import { getVcsClient } from '../../vcs/index.js';
-import { BuildContext } from '../context.js';
+import { IosCredentials, TargetCredentials } from '../../credentials/ios/types';
+import { getUsername } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
+import { getVcsClient } from '../../vcs';
+import { BuildContext } from '../context';
 
 interface JobData {
   projectArchive: ArchiveSource;

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

@@ -1,23 +1,23 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, IosVersionAutoIncrement } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
 
-import { isExpoUpdatesInstalled } from '../../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule.js';
-import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version.js';
+import { Target } from '../../credentials/ios/types';
+import { isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { syncUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { BumpStrategy, bumpVersionAsync, bumpVersionInAppJsonAsync } from './version';
 
 export async function syncProjectConfigurationAsync({
   projectDir,
   exp,
   buildProfile,
-  buildSettings,
+  targets,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   buildProfile: BuildProfile<Platform.IOS>;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  targets: Target[];
 }): Promise<void> {
   const workflow = await resolveWorkflowAsync(projectDir, Platform.IOS);
   const { autoIncrement } = buildProfile;
@@ -27,7 +27,7 @@ export async function syncProjectConfigurationAsync({
     if (isExpoUpdatesInstalled(projectDir)) {
       await syncUpdatesConfigurationAsync(projectDir, exp);
     }
-    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
+    await bumpVersionAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
   } else {
     await bumpVersionInAppJsonAsync({ projectDir, exp, bumpStrategy: versionBumpStrategy });
   }

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

@@ -1,18 +1,20 @@
-import { ExpoConfig, getConfigFilePaths } from '@expo/config';
-import ConfigPlugins, { InfoPlist } from '@expo/config-plugins';
+import { ExpoConfig } from '@expo/config';
+import { IOSConfig } from '@expo/config-plugins';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import chalk from 'chalk';
 import path from 'path';
 import type { XCBuildConfiguration } from 'xcode';
 
-import Log from '../../log.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { promptAsync } from '../../prompts.js';
-import { readPlistAsync, writePlistAsync } from '../../utils/plist.js';
-import { updateAppJsonConfigAsync } from '../utils/appJson.js';
-import { bumpAppVersionAsync } from '../utils/version.js';
-
-const { IOSConfig } = ConfigPlugins;
+import { Target } from '../../credentials/ios/types';
+import Log from '../../log';
+import { findApplicationTarget } from '../../project/ios/target';
+import { getNextBuildNumber, isValidBuildNumber } from '../../project/ios/versions';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { promptAsync } from '../../prompts';
+import uniqBy from '../../utils/expodash/uniqBy';
+import { readPlistAsync, writePlistAsync } from '../../utils/plist';
+import { updateAppJsonConfigAsync } from '../utils/appJson';
+import { bumpAppVersionAsync, ensureStaticConfigExists } from '../utils/version';
 
 export enum BumpStrategy {
   APP_VERSION,
@@ -24,21 +26,25 @@ export async function bumpVersionAsync({
   bumpStrategy,
   projectDir,
   exp,
-  buildSettings,
+  targets,
 }: {
   projectDir: string;
   exp: ExpoConfig;
   bumpStrategy: BumpStrategy;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  targets: Target[];
 }): Promise<void> {
   if (bumpStrategy === BumpStrategy.NOOP) {
     return;
   }
   ensureStaticConfigExists(projectDir);
-  const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
   await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
   Log.log('Updated versions in app.json');
-  await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
+  await updateNativeVersionsAsync({
+    projectDir,
+    version: exp.version,
+    buildNumber: exp.ios?.buildNumber,
+    targets,
+  });
   Log.log('Synchronized versions with Info.plist');
 }
 
@@ -61,10 +67,8 @@ export async function bumpVersionInAppJsonAsync({
     await bumpAppVersionAsync({ appVersion, projectDir, exp });
   } else {
     const buildNumber = IOSConfig.Version.getBuildNumber(exp);
-    if (buildNumber.match(/^\d+(\.\d+)*$/)) {
-      const comps = buildNumber.split('.');
-      comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
-      const bumpedBuildNumber = comps.join('.');
+    if (isValidBuildNumber(buildNumber)) {
+      const bumpedBuildNumber = getNextBuildNumber(buildNumber);
       Log.log(
         `Bumping ${chalk.bold('expo.ios.buildNumber')} from ${chalk.bold(
           buildNumber
@@ -123,12 +127,21 @@ export async function readBuildNumberAsync(
 export async function maybeResolveVersionsAsync(
   projectDir: string,
   exp: ExpoConfig,
-  buildSettings: XCBuildConfiguration['buildSettings']
+  targets: Target[]
 ): Promise<{ appVersion?: string; appBuildVersion?: string }> {
+  const applicationTarget = findApplicationTarget(targets);
   try {
     return {
-      appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
-      appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+      appBuildVersion: await readBuildNumberAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
+      appVersion: await readShortVersionAsync(
+        projectDir,
+        exp,
+        applicationTarget.buildSettings ?? {}
+      ),
     };
   } catch (err: any) {
     Log.warn('Failed to read app versions.');
@@ -139,23 +152,6 @@ export async function maybeResolveVersionsAsync(
   }
 }
 
-async function writeVersionsToInfoPlistAsync({
-  projectDir,
-  exp,
-  infoPlist,
-  buildSettings,
-}: {
-  projectDir: string;
-  exp: ExpoConfig;
-  infoPlist: InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
-}): Promise<InfoPlist> {
-  let updatedInfoPlist = IOSConfig.Version.setVersion(exp, infoPlist);
-  updatedInfoPlist = IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-  await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
-  return updatedInfoPlist;
-}
-
 export function getInfoPlistPath(
   projectDir: string,
   buildSettings: XCBuildConfiguration['buildSettings']
@@ -178,29 +174,60 @@ export function getInfoPlistPath(
 async function readInfoPlistAsync(
   projectDir: string,
   buildSettings: XCBuildConfiguration['buildSettings']
-): Promise<InfoPlist> {
+): Promise<IOSConfig.InfoPlist> {
   const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  return ((await readPlistAsync(infoPlistPath)) ?? {}) as InfoPlist;
+  return ((await readPlistAsync(infoPlistPath)) ?? {}) as IOSConfig.InfoPlist;
 }
 
-async function writeInfoPlistAsync({
+export async function updateNativeVersionsAsync({
   projectDir,
-  infoPlist,
-  buildSettings,
+  version,
+  buildNumber,
+  targets,
 }: {
   projectDir: string;
-  infoPlist: InfoPlist;
-  buildSettings: XCBuildConfiguration['buildSettings'];
+  version?: string;
+  buildNumber?: string;
+  targets: Target[];
 }): Promise<void> {
-  const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-  await writePlistAsync(infoPlistPath, infoPlist);
+  const project = IOSConfig.XcodeUtils.getPbxproj(projectDir);
+  const iosDir = path.join(projectDir, 'ios');
+
+  const infoPlistFiles: string[] = [];
+  for (const target of targets) {
+    const { targetName, buildConfiguration } = target;
+    const xcBuildConfiguration = IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+      targetName,
+      buildConfiguration,
+    });
+    const infoPlist = xcBuildConfiguration?.buildSettings?.INFOPLIST_FILE;
+    if (infoPlist) {
+      const evaluatedInfoPlistPath = trimQuotes(
+        evaluateTemplateString(infoPlist, {
+          SRCROOT: iosDir,
+        })
+      );
+      const absolutePath = path.isAbsolute(evaluatedInfoPlistPath)
+        ? evaluatedInfoPlistPath
+        : path.join(iosDir, evaluatedInfoPlistPath);
+      infoPlistFiles.push(path.normalize(absolutePath));
+    }
+  }
+  const uniqueInfoPlistPaths = uniqBy(infoPlistFiles, i => i);
+  for (const infoPlistPath of uniqueInfoPlistPaths) {
+    const infoPlist = (await readPlistAsync(infoPlistPath)) as IOSConfig.InfoPlist;
+    if (buildNumber) {
+      infoPlist.CFBundleVersion = buildNumber;
+    }
+    if (version) {
+      infoPlist.CFBundleShortVersionString = version;
+    }
+    await writePlistAsync(infoPlistPath, infoPlist);
+  }
 }
 
-function ensureStaticConfigExists(projectDir: string): void {
-  const paths = getConfigFilePaths(projectDir);
-  if (!paths.staticConfigPath) {
-    throw new Error('autoIncrement option is not supported when using app.config.js');
-  }
+function trimQuotes(s: string): string {
+  return s?.startsWith('"') && s.endsWith('"') ? s.slice(1, -1) : s;
 }
 
 export function evaluateTemplateString(

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

@@ -1,9 +1,9 @@
 import { Job } from '@expo/eas-build-job';
-import { default as spawnAsync } from '@expo/spawn-async';
+import spawnAsync from '@expo/spawn-async';
 import { ChildProcess } from 'child_process';
 import semver from 'semver';
 
-import { ora } from '../ora.js';
+import { ora } from '../ora';
 
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
 const PLUGIN_PACKAGE_VERSION = '0.0.85';

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

@@ -1,37 +1,36 @@
-import ConfigPlugins from '@expo/config-plugins';
+import { Updates } from '@expo/config-plugins';
 import { Metadata, Platform, sanitizeMetadata } from '@expo/eas-build-job';
 import { IosEnterpriseProvisioning } from '@expo/eas-json';
 import fs from 'fs-extra';
 import resolveFrom from 'resolve-from';
 
-import Log from '../log.js';
-import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils.js';
+import Log from '../log';
+import { getUsername, isExpoUpdatesInstalled } from '../project/projectUtils';
 import {
   readChannelSafelyAsync as readAndroidChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readAndroidReleaseChannelSafelyAsync,
-} from '../update/android/UpdatesModule.js';
+} from '../update/android/UpdatesModule';
 import {
   readChannelSafelyAsync as readIosChannelSafelyAsync,
   readReleaseChannelSafelyAsync as readIosReleaseChannelSafelyAsync,
-} from '../update/ios/UpdatesModule.js';
-import { ensureLoggedInAsync } from '../user/actions.js';
-import { easCliVersion } from '../utils/easCli.js';
-import { getVcsClient } from '../vcs/index.js';
-import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version.js';
-import { BuildContext } from './context.js';
-import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version.js';
-
-const { Updates } = ConfigPlugins;
+} from '../update/ios/UpdatesModule';
+import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { getVcsClient } from '../vcs';
+import { maybeResolveVersionsAsync as maybeResolveAndroidVersionsAsync } from './android/version';
+import { BuildContext } from './context';
+import { maybeResolveVersionsAsync as maybeResolveIosVersionsAsync } from './ios/version';
 
 export async function collectMetadataAsync<T extends Platform>(
   ctx: BuildContext<T>
 ): Promise<Metadata> {
+  const vcsClient = getVcsClient();
   const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
   const distribution =
     ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
       ? 'simulator'
       : ctx.buildProfile.distribution) ?? 'store';
-  const metadata = {
+  const metadata: Metadata = {
     trackingContext: ctx.trackingCtx,
     ...(await maybeResolveVersionsAsync(ctx)),
     cliVersion: easCliVersion,
@@ -45,9 +44,13 @@ export async function collectMetadataAsync<T extends Platform>(
     appName: ctx.exp.name,
     appIdentifier: resolveAppIdentifier(ctx),
     buildProfile: ctx.buildProfileName,
-    gitCommitHash: await getVcsClient().getCommitHashAsync(),
-    isGitWorkingTreeDirty: await getVcsClient().hasUncommittedChangesAsync(),
+    gitCommitHash: await vcsClient.getCommitHashAsync(),
+    gitCommitMessage: truncateGitCommitMessage(
+      (await vcsClient.getLastCommitMessageAsync()) ?? undefined
+    ),
+    isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
     username: getUsername(ctx.exp, await ensureLoggedInAsync()),
+    message: ctx.message,
     ...(ctx.platform === Platform.IOS && {
       iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(
         ctx as BuildContext<Platform.IOS>
@@ -62,11 +65,7 @@ async function maybeResolveVersionsAsync<T extends Platform>(
 ): Promise<{ appBuildVersion?: string; appVersion?: string }> {
   if (ctx.platform === Platform.IOS) {
     const iosContext = ctx as BuildContext<Platform.IOS>;
-    return await maybeResolveIosVersionsAsync(
-      ctx.projectDir,
-      ctx.exp,
-      iosContext.ios.applicationTargetBuildSettings
-    );
+    return await maybeResolveIosVersionsAsync(ctx.projectDir, ctx.exp, iosContext.ios.targets);
   } else if (ctx.platform === Platform.ANDROID) {
     const androidCtx = ctx as BuildContext<Platform.ANDROID>;
     return await maybeResolveAndroidVersionsAsync(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
@@ -151,3 +150,13 @@ function resolveIosEnterpriseProvisioning(
 ): IosEnterpriseProvisioning | undefined {
   return ctx.buildProfile.enterpriseProvisioning;
 }
+
+export function truncateGitCommitMessage(
+  msg: string | undefined,
+  maxLength: number = 4096
+): string | undefined {
+  if (msg === undefined) {
+    return undefined;
+  }
+  return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
+}

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

@@ -1,6 +1,7 @@
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile, EasJsonReader, SubmitProfile } from '@expo/eas-json';
+import { BuildProfile, EasJson, EasJsonReader, SubmitProfile } from '@expo/eas-json';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 
 import {
   AppPlatform,
@@ -8,38 +9,37 @@ import {
   BuildResourceClass,
   BuildStatus,
   SubmissionFragment,
-} from '../graphql/generated.js';
-import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform.js';
-import Log from '../log.js';
+} from '../graphql/generated';
+import { toAppPlatform, toPlatform } from '../graphql/types/AppPlatform';
+import Log from '../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
   appPlatformEmojis,
   toPlatforms,
-} from '../platform.js';
-import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk.js';
-import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig.js';
-import { createSubmissionContextAsync } from '../submit/context.js';
+} from '../platform';
+import { checkExpoSdkIsSupportedAsync } from '../project/expoSdk';
+import { validateMetroConfigForManagedWorkflowAsync } from '../project/metroConfig';
+import { createSubmissionContextAsync } from '../submit/context';
 import {
   submitAsync,
   waitToCompleteAsync as waitForSubmissionsToCompleteAsync,
-} from '../submit/submit.js';
-import { printSubmissionDetailsUrls } from '../submit/utils/urls.js';
-import { printJsonOnlyOutput } from '../utils/json.js';
-import { nullthrows } from '../utils/nullthrows.js';
-import { ProfileData, getProfilesAsync } from '../utils/profiles.js';
-import { getVcsClient } from '../vcs/index.js';
-import { prepareAndroidBuildAsync } from './android/build.js';
-import { BuildRequestSender, waitForBuildEndAsync } from './build.js';
-import { ensureProjectConfiguredAsync } from './configure.js';
-import { BuildContext } from './context.js';
-import { createBuildContextAsync } from './createContext.js';
-import { prepareIosBuildAsync } from './ios/build.js';
-import { LocalBuildOptions } from './local.js';
-import { UserInputResourceClass } from './types.js';
-import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient.js';
-import { printBuildResults, printLogsUrls } from './utils/printBuildInfo.js';
-import { ensureRepoIsCleanAsync } from './utils/repository.js';
+} from '../submit/submit';
+import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { printJsonOnlyOutput } from '../utils/json';
+import { ProfileData, getProfilesAsync } from '../utils/profiles';
+import { getVcsClient } from '../vcs';
+import { prepareAndroidBuildAsync } from './android/build';
+import { BuildRequestSender, waitForBuildEndAsync } from './build';
+import { ensureProjectConfiguredAsync } from './configure';
+import { BuildContext } from './context';
+import { createBuildContextAsync } from './createContext';
+import { prepareIosBuildAsync } from './ios/build';
+import { LocalBuildOptions } from './local';
+import { UserInputResourceClass } from './types';
+import { ensureExpoDevClientInstalledForDevClientBuildsAsync } from './utils/devClient';
+import { printBuildResults, printLogsUrls } from './utils/printBuildInfo';
+import { ensureRepoIsCleanAsync } from './utils/repository';
 
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
@@ -55,6 +55,7 @@ export interface BuildFlags {
   submitProfile?: string;
   localBuildOptions: LocalBuildOptions;
   userInputResourceClass?: UserInputResourceClass;
+  message?: string;
 }
 
 const platformToGraphQLResourceClassMapping: Record<
@@ -80,6 +81,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
     nonInteractive: flags.nonInteractive,
   });
   const easJsonReader = new EasJsonReader(projectDir);
+  const easJsonCliConfig: EasJson['cli'] = (await easJsonReader.getCliConfigAsync()) ?? {};
 
   const platforms = toPlatforms(flags.requestedPlatform);
   const buildProfiles = await getProfilesAsync({
@@ -111,6 +113,7 @@ export async function runBuildAndSubmitAsync(projectDir: string, flags: BuildFla
         platformToGraphQLResourceClassMapping[buildProfile.platform][
           flags.userInputResourceClass ?? UserInputResourceClass.DEFAULT
         ],
+      easJsonCliConfig,
     });
     if (maybeBuild) {
       startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -188,12 +191,14 @@ async function prepareAndStartBuildAsync({
   moreBuilds,
   buildProfile,
   resourceClass,
+  easJsonCliConfig,
 }: {
   projectDir: string;
   flags: BuildFlags;
   moreBuilds: boolean;
   buildProfile: ProfileData<'build'>;
   resourceClass: BuildResourceClass;
+  easJsonCliConfig: EasJson['cli'];
 }): Promise<{ build: BuildFragment | undefined; buildCtx: BuildContext<Platform> }> {
   const buildCtx = await createBuildContextAsync({
     buildProfileName: buildProfile.profileName,
@@ -204,6 +209,8 @@ async function prepareAndStartBuildAsync({
     platform: buildProfile.platform,
     projectDir,
     localBuildOptions: flags.localBuildOptions,
+    easJsonCliConfig,
+    message: flags.message,
   });
 
   if (moreBuilds) {

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

@@ -1,9 +1,7 @@
 import * as ExpoConfig from '@expo/config';
-import JsonFileModule from '@expo/json-file';
+import JsonFile from '@expo/json-file';
 import assert from 'assert';
 
-const JsonFile = JsonFileModule.default;
-
 export async function updateAppJsonConfigAsync(
   {
     projectDir,

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

@@ -2,8 +2,8 @@ import { Platform } from '@expo/eas-build-job';
 import { CredentialsSource } from '@expo/eas-json';
 import chalk from 'chalk';
 
-import Log from '../../log.js';
-import { requestedPlatformDisplayNames } from '../../platform.js';
+import Log from '../../log';
+import { requestedPlatformDisplayNames } from '../../platform';
 
 export function logCredentialsSource(
   credentialsSource: CredentialsSource,

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

@@ -3,15 +3,15 @@ import { Errors } from '@oclif/core';
 import chalk from 'chalk';
 import resolveFrom from 'resolve-from';
 
-import { toAppPlatform } from '../../graphql/types/AppPlatform.js';
-import Log, { learnMore } from '../../log.js';
-import { appPlatformDisplayNames } from '../../platform.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { confirmAsync } from '../../prompts.js';
-import { expoCommandAsync } from '../../utils/expoCli.js';
-import { ProfileData } from '../../utils/profiles.js';
-import { getVcsClient } from '../../vcs/index.js';
-import { reviewAndCommitChangesAsync } from './repository.js';
+import { toAppPlatform } from '../../graphql/types/AppPlatform';
+import Log, { learnMore } from '../../log';
+import { appPlatformDisplayNames } from '../../platform';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { confirmAsync } from '../../prompts';
+import { expoCommandAsync } from '../../utils/expoCli';
+import { ProfileData } from '../../utils/profiles';
+import { getVcsClient } from '../../vcs';
+import { reviewAndCommitChangesAsync } from './repository';
 
 export async function ensureExpoDevClientInstalledForDevClientBuildsAsync({
   projectDir,

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

@@ -4,10 +4,10 @@ import {
   AppPlatform,
   BuildFragment,
   BuildStatus as GraphQLBuildStatus,
-} from '../../graphql/generated.js';
-import { appPlatformDisplayNames } from '../../platform.js';
-import formatFields from '../../utils/formatFields.js';
-import { getBuildLogsUrl } from './url.js';
+} from '../../graphql/generated';
+import { appPlatformDisplayNames } from '../../platform';
+import formatFields from '../../utils/formatFields';
+import { getBuildLogsUrl } from './url';
 
 export function formatGraphQLBuild(build: BuildFragment): string {
   const actor = getActorName(build);

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

@@ -11,11 +11,11 @@ import {
   DistributionType,
   EasBuildDeprecationInfo,
   EasBuildDeprecationInfoType,
-} from '../../graphql/generated.js';
-import Log, { learnMore } from '../../log.js';
-import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform.js';
-import { printJsonOnlyOutput } from '../../utils/json.js';
-import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url.js';
+} from '../../graphql/generated';
+import Log, { learnMore } from '../../log';
+import { appPlatformDisplayNames, appPlatformEmojis } from '../../platform';
+import { printJsonOnlyOutput } from '../../utils/json';
+import { getBuildLogsUrl, getInternalDistributionInstallUrl } from './url';
 
 export function printLogsUrls(builds: BuildFragment[]): void {
   if (builds.length === 1) {

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

@@ -4,13 +4,13 @@ import path from 'path';
 import tar from 'tar';
 import { v4 as uuidv4 } from 'uuid';
 
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { confirmAsync, promptAsync } from '../../prompts.js';
-import { formatBytes } from '../../utils/files.js';
-import { getTmpDirectory } from '../../utils/paths.js';
-import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer.js';
-import { getVcsClient } from '../../vcs/index.js';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { confirmAsync, promptAsync } from '../../prompts';
+import { formatBytes } from '../../utils/files';
+import { getTmpDirectory } from '../../utils/paths';
+import { endTimer, formatMilliseconds, startTimer } from '../../utils/timer';
+import { getVcsClient } from '../../vcs';
 
 export async function maybeBailOnRepoStatusAsync(): Promise<void> {
   if (!(await getVcsClient().isCommitRequiredAsync())) {

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

@@ -1,7 +1,7 @@
 import assert from 'assert';
 
-import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api.js';
-import { AppPlatform, BuildFragment } from '../../graphql/generated.js';
+import { getExpoApiBaseUrl, getExpoWebsiteBaseUrl } from '../../api';
+import { AppPlatform, BuildFragment } from '../../graphql/generated';
 
 export function getProjectDashboardUrl(accountName: string, projectName: string): string {
   return new URL(

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

@@ -1,11 +1,11 @@
 import { ExpoConfig, getConfigFilePaths } from '@expo/config';
 import chalk from 'chalk';
+import nullthrows from 'nullthrows';
 import semver from 'semver';
 
-import Log from '../../log.js';
-import { promptAsync } from '../../prompts.js';
-import { nullthrows } from '../../utils/nullthrows.js';
-import { updateAppJsonConfigAsync } from './appJson.js';
+import Log from '../../log';
+import { promptAsync } from '../../prompts';
+import { updateAppJsonConfigAsync } from './appJson';
 
 export function ensureStaticConfigExists(projectDir: string): void {
   const paths = getConfigFilePaths(projectDir);

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

@@ -2,9 +2,9 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import fs from 'fs-extra';
 import path from 'path';
 
-import Log, { learnMore } from '../log.js';
-import { getVcsClient } from '../vcs/index.js';
-import { CommonContext } from './context.js';
+import Log, { learnMore } from '../log';
+import { getVcsClient } from '../vcs';
+import { CommonContext } from './context';
 
 export function checkNodeEnvVariable(ctx: CommonContext<Platform>): void {
   if (ctx.buildProfile.env?.NODE_ENV === 'production') {

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

@@ -7,13 +7,13 @@ import {
   flushAsync as flushAnalyticsAsync,
   initAsync as initAnalyticsAsync,
   logEvent,
-} from '../analytics/rudderstackClient.js';
-import { findProjectRootAsync } from '../project/projectUtils.js';
-import { getUserAsync } from '../user/User.js';
-import { ensureLoggedInAsync } from '../user/actions.js';
-import { easCliVersion } from '../utils/easCli.js';
-import GitClient from '../vcs/clients/git.js';
-import { setVcsClient } from '../vcs/index.js';
+} from '../analytics/rudderstackClient';
+import { findProjectRootAsync } from '../project/projectUtils';
+import { getUserAsync } from '../user/User';
+import { ensureLoggedInAsync } from '../user/actions';
+import { easCliVersion } from '../utils/easCli';
+import { setVcsClient } from '../vcs';
+import GitClient from '../vcs/clients/git';
 
 export default abstract class EasCommand extends Command {
   /**

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

@@ -1,8 +1,8 @@
-import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient.js';
-import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants.js';
-import { getUserAsync } from '../../user/User.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
-import EasCommand from '../EasCommand.js';
+import { flushAsync, initAsync, logEvent } from '../../analytics/rudderstackClient';
+import { jester as mockJester } from '../../credentials/__tests__/fixtures-constants';
+import { getUserAsync } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';
+import EasCommand from '../EasCommand';
 
 jest.mock('../../user/User');
 jest.mock('../../user/actions', () => ({ ensureLoggedInAsync: jest.fn() }));

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

@@ -0,0 +1,58 @@
+import { Flags } from '@oclif/core';
+
+export const getPaginatedQueryOptions = (
+  flags: Record<keyof typeof EasPaginatedQueryFlags, any>
+): PaginatedQueryOptions => {
+  return {
+    json: flags.json ?? false,
+    offset: flags.offset ?? 0,
+    nonInteractive: flags['non-interactive'] ?? false,
+    ...('limit' in flags && { limit: flags.limit }),
+  };
+};
+
+const parseFlagInputStringAsInteger = (
+  input: string,
+  flagName: string,
+  lowerLimit: number,
+  upperLimit: number
+): number => {
+  const inputAsNumber = Number(input);
+  if (isNaN(inputAsNumber)) {
+    throw new Error(`Unable to parse ${input} as a number`);
+  }
+  if (inputAsNumber < lowerLimit || inputAsNumber > upperLimit) {
+    throw new Error(`--${flagName} must be between ${lowerLimit} and ${upperLimit}`);
+  }
+  return inputAsNumber;
+};
+
+export const EasPaginatedQueryFlags = {
+  offset: Flags.integer({
+    description: 'Start queries from specified index. Use for paginating results. Defaults to 0.',
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input =>
+      parseFlagInputStringAsInteger(input, 'offset', 0, Number.MAX_SAFE_INTEGER),
+  }),
+  limit: Flags.integer({
+    description:
+      'The number of query items to list at once. The default value is 50 (the maximum is 100). Using a lower value may help increase command speed.',
+    // eslint-disable-next-line async-protect/async-suffix
+    parse: async input => parseFlagInputStringAsInteger(input, 'limit', 1, 100),
+  }),
+  json: Flags.boolean({
+    description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+  }),
+  'non-interactive': Flags.boolean({
+    description: 'Run the command in non-interactive mode.',
+  }),
+};
+
+// options required to control a paginated query
+// from user input
+export type PaginatedQueryOptions = {
+  nonInteractive: boolean;
+  json: boolean;
+  limit?: number;
+  offset: number;
+};

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

@@ -1,6 +1,6 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { showLoginPromptAsync } from '../../user/actions.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { showLoginPromptAsync } from '../../user/actions';
 
 export default class AccountLogin extends EasCommand {
   static description = 'log in with your Expo account';

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

@@ -1,6 +1,6 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { logoutAsync } from '../../user/User.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { logoutAsync } from '../../user/User';
 
 export default class AccountLogout extends EasCommand {
   static description = 'log out';

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

@@ -1,8 +1,8 @@
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { getActorDisplayName, getUserAsync } from '../../user/User.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { getActorDisplayName, getUserAsync } from '../../user/User';
 
 export default class AccountView extends EasCommand {
   static description = 'show the username you are logged in as';

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

@@ -1,6 +1,6 @@
-import EasCommand from '../commandUtils/EasCommand.js';
-import Log from '../log.js';
-import UserSettings from '../user/UserSettings.js';
+import EasCommand from '../commandUtils/EasCommand';
+import Log from '../log';
+import UserSettings from '../user/UserSettings';
 
 export default class AnalyticsView extends EasCommand {
   static description = 'display or change analytics settings';

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

@@ -1,24 +1,24 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   CreateUpdateBranchForAppMutation,
   CreateUpdateBranchForAppMutationVariables,
   UpdateBranch,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-import { getVcsClient } from '../../vcs/index.js';
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { getVcsClient } from '../../vcs';
 
 export async function createUpdateBranchOnAppAsync({
   appId,

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

@@ -1,25 +1,25 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   DeleteUpdateBranchMutation,
   DeleteUpdateBranchMutationVariables,
   DeleteUpdateBranchResult,
   GetBranchInfoQuery,
   GetBranchInfoQueryVariables,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync, toggleConfirmAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 async function getBranchInfoAsync({
   appId,

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

@@ -1,106 +1,28 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import CliTable from 'cli-table3';
-import { print } from 'graphql';
-import { gql } from 'graphql-tag';
-
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
-import {
-  BranchesByAppQuery,
-  BranchesByAppQueryVariables,
-  UpdateBranchFragment,
-} from '../../graphql/generated.js';
-import { UpdateBranchFragmentNode } from '../../graphql/types/UpdateBranch.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-
-const BRANCHES_LIMIT = 10_000;
-
-export async function listBranchesAsync({
-  projectId,
-}: {
-  projectId: string;
-}): Promise<UpdateBranchFragment[]> {
-  const data = await withErrorHandlingAsync(
-    graphqlClient
-      .query<BranchesByAppQuery, BranchesByAppQueryVariables>(
-        gql`
-          query BranchesByAppQuery($appId: String!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateBranches(offset: 0, limit: $limit) {
-                  id
-                  ...UpdateBranchFragment
-                }
-              }
-            }
-          }
-          ${print(UpdateBranchFragmentNode)}
-        `,
-        {
-          appId: projectId,
-          limit: BRANCHES_LIMIT,
-        },
-        { additionalTypenames: ['UpdateBranch'] }
-      )
-      .toPromise()
-  );
-
-  return data?.app?.byId.updateBranches ?? [];
-}
+import { listAndRenderPaginatedBranchesAsync } from '../../branch/queries';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { enableJsonOutput } from '../../utils/json';
 
 export default class BranchList extends EasCommand {
   static description = 'list all branches';
 
   static flags = {
-    json: Flags.boolean({
-      description: 'return output as JSON',
-      default: false,
-    }),
+    ...EasPaginatedQueryFlags,
   };
 
   async runAsync(): Promise<void> {
     const { flags } = await this.parse(BranchList);
-    if (flags.json) {
+    const options = getPaginatedQueryOptions(flags);
+
+    if (options.json) {
       enableJsonOutput();
     }
 
     const projectDir = await findProjectRootAsync();
     const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
-    const branches = await listBranchesAsync({ projectId });
-    if (flags.json) {
-      printJsonOnlyOutput(branches);
-    } else {
-      const table = new CliTable({
-        head: ['Branch', ...UPDATE_COLUMNS],
-        wordWrap: true,
-      });
-
-      table.push(
-        ...branches.map(branch => [
-          branch.name,
-          formatUpdate(branch.updates[0]),
-          branch.updates[0]?.runtimeVersion ?? 'N/A',
-          branch.updates[0]?.group ?? 'N/A',
-          getPlatformsForGroup({
-            updates: branch.updates,
-            group: branch.updates[0]?.group,
-          }),
-        ])
-      );
-
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branches with their most recent update group:'));
-      Log.log(table.toString());
-      if (branches.length >= BRANCHES_LIMIT) {
-        Log.warn(`Showing first ${BRANCHES_LIMIT} branches, some results might be omitted.`);
-      }
-    }
+    await listAndRenderPaginatedBranchesAsync(projectId, options);
   }
 }

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

@@ -1,4 +1,4 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
+import EasCommand from '../../commandUtils/EasCommand';
 
 export default class BranchPublish extends EasCommand {
   static description = 'deprecated, use "eas update"';

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

@@ -1,24 +1,24 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   EditUpdateBranchInput,
   EditUpdateBranchMutation,
   EditUpdateBranchMutationVariables,
   UpdateBranch,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 async function renameUpdateBranchOnAppAsync({
   appId,

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

@@ -1,17 +1,10 @@
-import { Flags } from '@oclif/core';
-import chalk from 'chalk';
-import Table from 'cli-table3';
-
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { UpdateQuery } from '../../graphql/queries/UpdateQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { UPDATE_COLUMNS, formatUpdate, getPlatformsForGroup } from '../../update/utils.js';
-import groupBy from '../../utils/expodash/groupBy.js';
-import formatFields from '../../utils/formatFields.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+import { selectBranchFromPaginatedQueryAsync } from '../../branch/queries';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EasPaginatedQueryFlags, getPaginatedQueryOptions } from '../../commandUtils/pagination';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { listAndRenderUpdatesOnBranchByNameAsync } from '../../update/queries';
+import { enableJsonOutput } from '../../utils/json';
 
 export default class BranchView extends EasCommand {
   static description = 'view a branch';
@@ -25,18 +18,17 @@ export default class BranchView extends EasCommand {
   ];
 
   static flags = {
-    json: Flags.boolean({
-      description: `return a json with the branch's ID name and recent update groups.`,
-      default: false,
-    }),
+    ...EasPaginatedQueryFlags,
   };
 
   async runAsync(): Promise<void> {
     let {
-      args: { name },
-      flags: { json: jsonFlag },
+      args: { name: branchName },
+      flags,
     } = await this.parse(BranchView);
-    if (jsonFlag) {
+    const options = getPaginatedQueryOptions(flags);
+
+    if (options.json) {
       enableJsonOutput();
     }
 
@@ -44,63 +36,20 @@ export default class BranchView extends EasCommand {
     const exp = getExpoConfig(projectDir);
     const projectId = await getProjectIdAsync(exp);
 
-    if (!name) {
-      const validationMessage = 'Branch name may not be empty.';
-      if (jsonFlag) {
-        throw new Error(validationMessage);
-      }
-      ({ name } = await promptAsync({
-        type: 'text',
-        name: 'name',
-        message: 'Please enter the name of the branch to view:',
-        validate: value => (value ? true : validationMessage),
-      }));
-    }
-
-    const { app } = await UpdateQuery.viewBranchAsync({
-      appId: projectId,
-      name,
-    });
-    const UpdateBranch = app?.byId.updateBranchByName;
-    if (!UpdateBranch) {
-      throw new Error(`Could not find branch "${name}"`);
-    }
-
-    const updates = Object.values(groupBy(UpdateBranch.updates, u => u.group)).map(
-      group => group[0]
-    );
-
-    if (jsonFlag) {
-      printJsonOnlyOutput({ ...UpdateBranch, updates });
-    } else {
-      const groupTable = new Table({
-        head: UPDATE_COLUMNS,
-        wordWrap: true,
-      });
-
-      for (const update of updates) {
-        groupTable.push([
-          formatUpdate(update),
-          update.runtimeVersion,
-          update.group,
-          getPlatformsForGroup({
-            updates: UpdateBranch.updates,
-            group: update.group,
-          }),
-        ]);
+    // provide help to a user if they ran the command with missing args
+    if (!branchName) {
+      if (options.nonInteractive) {
+        throw new Error('Branch name may not be empty.');
       }
 
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Branch:'));
-      Log.log(
-        formatFields([
-          { label: 'Name', value: UpdateBranch.name },
-          { label: 'ID', value: UpdateBranch.id },
-        ])
-      );
-      Log.addNewLineIfNone();
-      Log.log(chalk.bold('Recently published update groups:'));
-      Log.log(groupTable.toString());
+      ({ name: branchName } = await selectBranchFromPaginatedQueryAsync(
+        projectId,
+        'Which branch would you like to view?',
+        // discard limit and offset because this query is not those flag's intended target
+        { json: options.json, nonInteractive: options.nonInteractive, offset: 0 }
+      ));
     }
+
+    await listAndRenderUpdatesOnBranchByNameAsync(projectId, branchName, options);
   }
 }

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

@@ -1,25 +1,25 @@
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   Build,
   BuildStatus,
   CancelBuildMutation,
   CancelBuildMutationVariables,
-} from '../../graphql/generated.js';
-import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { appPlatformEmojis } from '../../platform.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { appPlatformEmojis } from '../../platform';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { confirmAsync, selectAsync } from '../../prompts.js';
+} from '../../project/projectUtils';
+import { confirmAsync, selectAsync } from '../../prompts';
 
 async function cancelBuildAsync(buildId: string): Promise<Pick<Build, 'id' | 'status'>> {
   const data = await withErrorHandlingAsync(

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

@@ -2,18 +2,18 @@ import { Platform, Workflow } from '@expo/eas-build-job';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration.js';
-import { ensureProjectConfiguredAsync } from '../../build/configure.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log, { learnMore } from '../../log.js';
-import { RequestedPlatform } from '../../platform.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../../project/workflow.js';
-import { promptAsync } from '../../prompts.js';
-import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule.js';
-import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule.js';
-import { getVcsClient } from '../../vcs/index.js';
+import { cleanUpOldEasBuildGradleScriptAsync } from '../../build/android/syncProjectConfiguration';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log, { learnMore } from '../../log';
+import { RequestedPlatform } from '../../platform';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, isExpoUpdatesInstalled } from '../../project/projectUtils';
+import { resolveWorkflowAsync } from '../../project/workflow';
+import { promptAsync } from '../../prompts';
+import { syncUpdatesConfigurationAsync as syncAndroidUpdatesConfigurationAsync } from '../../update/android/UpdatesModule';
+import { syncUpdatesConfigurationAsync as syncIosUpdatesConfigurationAsync } from '../../update/ios/UpdatesModule';
+import { getVcsClient } from '../../vcs';
 
 export default class BuildConfigure extends EasCommand {
   static description = 'configure the project to support EAS Build';

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

@@ -1,13 +1,13 @@
 import { Errors, Flags } from '@oclif/core';
 import path from 'path';
 
-import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit.js';
-import { UserInputResourceClass } from '../../build/types.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform.js';
-import { findProjectRootAsync } from '../../project/projectUtils.js';
-import { enableJsonOutput } from '../../utils/json.js';
+import { BuildFlags, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
+import { UserInputResourceClass } from '../../build/types';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { RequestedPlatform, selectRequestedPlatformAsync } from '../../platform';
+import { findProjectRootAsync } from '../../project/projectUtils';
+import { enableJsonOutput } from '../../utils/json';
 
 interface RawBuildFlags {
   platform?: string;
@@ -23,6 +23,7 @@ interface RawBuildFlags {
   'auto-submit': boolean;
   'auto-submit-with-profile'?: string;
   'resource-class'?: UserInputResourceClass;
+  message?: string;
 }
 
 export default class Build extends EasCommand {
@@ -86,6 +87,10 @@ export default class Build extends EasCommand {
       hidden: true,
       description: 'The instance type that will be used to run this build [experimental]',
     }),
+    message: Flags.string({
+      char: 'm',
+      description: 'A short message describing the build',
+    }),
   };
 
   async runAsync(): Promise<void> {
@@ -143,6 +148,11 @@ export default class Build extends EasCommand {
       Log.newLine();
     }
 
+    const message = flags['message'];
+    if (message && message.length > 1024) {
+      Errors.error('Message cannot be longer than 1024 characters.', { exit: 1 });
+    }
+
     const profile = flags['profile'];
     return {
       requestedPlatform,
@@ -163,6 +173,7 @@ export default class Build extends EasCommand {
       autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
       submitProfile: flags['auto-submit-with-profile'] ?? profile,
       userInputResourceClass: flags['resource-class'] ?? UserInputResourceClass.DEFAULT,
+      message,
     };
   }
 }

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

@@ -4,14 +4,14 @@ import fs from 'fs-extra';
 import path from 'path';
 import { v4 as uuidv4 } from 'uuid';
 
-import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { RequestedPlatform } from '../../platform.js';
-import { findProjectRootAsync } from '../../project/projectUtils.js';
-import { getTmpDirectory } from '../../utils/paths.js';
-import { getVcsClient } from '../../vcs/index.js';
+import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
+import { findProjectRootAsync } from '../../project/projectUtils';
+import { getTmpDirectory } from '../../utils/paths';
+import { getVcsClient } from '../../vcs';
 
 enum InspectStage {
   ARCHIVE = 'archive',

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

@@ -1,25 +1,25 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import { BuildDistributionType, BuildStatus } from '../../build/types.js';
-import { formatGraphQLBuild } from '../../build/utils/formatBuild.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
+import { BuildDistributionType, BuildStatus } from '../../build/types';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import EasCommand from '../../commandUtils/EasCommand';
 import {
   AppPlatform,
   DistributionType,
   BuildStatus as GraphQLBuildStatus,
-} from '../../graphql/generated.js';
-import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { RequestedPlatform } from '../../platform.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { RequestedPlatform } from '../../platform';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export default class BuildList extends EasCommand {
   static description = 'list all builds for your project';

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

@@ -0,0 +1,114 @@
+import { getRuntimeVersionNullable } from '@expo/config-plugins/build/utils/Updates';
+import { Platform } from '@expo/eas-build-job';
+import { EasJsonReader } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import EasCommand from '../../../commandUtils/EasCommand';
+import { AppVersionMutation } from '../../../graphql/mutations/AppVersionMutation';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
+import { toAppPlatform } from '../../../graphql/types/AppPlatform';
+import Log from '../../../log';
+import { selectPlatformAsync } from '../../../platform';
+import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
+import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import { getExpoConfig } from '../../../project/expoConfig';
+import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
+import {
+  findProjectRootAsync,
+  getProjectFullNameAsync,
+  getProjectIdAsync,
+} from '../../../project/projectUtils';
+import {
+  ensureRemoteVersionPolicyAsync,
+  getBuildVersionName,
+  validateAppConfigForRemoteVersionPolicyAsync,
+} from '../../../project/remoteVersionSource';
+import { promptAsync } from '../../../prompts';
+
+export default class BuildVersionSetView extends EasCommand {
+  static description = 'Update version of an app.';
+  static hidden = true;
+
+  static flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios'],
+    }),
+    profile: Flags.string({
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+      helpValue: 'PROFILE_NAME',
+    }),
+  };
+
+  public async runAsync(): Promise<void> {
+    const { flags } = await this.parse(BuildVersionSetView);
+
+    const projectDir = await findProjectRootAsync();
+
+    const platform = await selectPlatformAsync(flags.platform);
+    const easJsonReader = new EasJsonReader(projectDir);
+    await ensureRemoteVersionPolicyAsync(projectDir, easJsonReader);
+    const profile = await easJsonReader.getBuildProfileAsync(platform, flags.profile ?? undefined);
+
+    const exp = getExpoConfig(projectDir, { env: profile.env });
+    const projectId = await getProjectIdAsync(exp);
+    const projectFullName = await getProjectFullNameAsync(exp);
+    await validateAppConfigForRemoteVersionPolicyAsync(exp);
+
+    const applicationIdentifier = await getApplicationIdentifierAsync(
+      projectDir,
+      exp,
+      profile,
+      platform
+    );
+    const remoteVersions = await AppVersionQuery.latestVersionAsync(
+      projectId,
+      toAppPlatform(platform),
+      applicationIdentifier
+    );
+    const currentStateMessage = remoteVersions?.buildVersion
+      ? `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
+          platform
+        )} "${applicationIdentifier}" is configured with ${getBuildVersionName(platform)} ${
+          remoteVersions.buildVersion
+        }.`
+      : `Project ${chalk.bold(projectFullName)} with ${getApplicationIdentifierName(
+          platform
+        )} "${applicationIdentifier}" does not have any ${getBuildVersionName(
+          platform
+        )} configured.`;
+
+    const versionPromptMessage = remoteVersions?.buildVersion
+      ? `What version would you like to set?`
+      : `What version would you like to initialize it with?`;
+    Log.log(currentStateMessage);
+
+    const { version } = await promptAsync({
+      type: platform === Platform.ANDROID ? 'number' : 'text',
+      name: 'version',
+      message: versionPromptMessage,
+      validate:
+        platform === Platform.ANDROID
+          ? value => isValidVersionCode(value) || `Invalid value: ${VERSION_CODE_REQUIREMENTS}.`
+          : value => isValidBuildNumber(value) || `Invalid value: ${BUILD_NUMBER_REQUIREMENTS}.`,
+    });
+    await AppVersionMutation.createAppVersionAsync({
+      appId: projectId,
+      platform: toAppPlatform(platform),
+      applicationIdentifier,
+      storeVersion: exp.version ?? '1.0.0',
+      buildVersion: String(version),
+      runtimeVersion: getRuntimeVersionNullable(exp, platform) ?? undefined,
+    });
+  }
+}
+
+function getApplicationIdentifierName(platform: Platform): string {
+  if (platform === Platform.ANDROID) {
+    return 'application ID';
+  } else {
+    return 'bundle identifier';
+  }
+}

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

@@ -0,0 +1,184 @@
+import { ExpoConfig } from '@expo/config';
+import { Platform, Workflow } from '@expo/eas-build-job';
+import { BuildProfile, EasJsonReader } from '@expo/eas-json';
+import { Flags } from '@oclif/core';
+import chalk from 'chalk';
+
+import { updateNativeVersionsAsync as updateAndroidNativeVersionsAsync } from '../../../build/android/version';
+import { updateNativeVersionsAsync as updateIosNativeVersionsAsync } from '../../../build/ios/version';
+import EasCommand from '../../../commandUtils/EasCommand';
+import { AppVersionQuery } from '../../../graphql/queries/AppVersionQuery';
+import { toAppPlatform } from '../../../graphql/types/AppPlatform';
+import Log from '../../../log';
+import {
+  appPlatformDisplayNames,
+  selectRequestedPlatformAsync,
+  toPlatforms,
+} from '../../../platform';
+import { getAppBuildGradleAsync } from '../../../project/android/gradleUtils';
+import { VERSION_CODE_REQUIREMENTS, isValidVersionCode } from '../../../project/android/versions';
+import { getApplicationIdentifierAsync } from '../../../project/applicationIdentifier';
+import { getExpoConfig } from '../../../project/expoConfig';
+import { resolveXcodeBuildContextAsync } from '../../../project/ios/scheme';
+import { resolveTargetsAsync } from '../../../project/ios/target';
+import { BUILD_NUMBER_REQUIREMENTS, isValidBuildNumber } from '../../../project/ios/versions';
+import { findProjectRootAsync, getProjectIdAsync } from '../../../project/projectUtils';
+import {
+  ensureRemoteVersionPolicyAsync,
+  getBuildVersionName,
+  validateAppConfigForRemoteVersionPolicyAsync,
+} from '../../../project/remoteVersionSource';
+import { resolveWorkflowAsync } from '../../../project/workflow';
+import { getProfilesAsync } from '../../../utils/profiles';
+
+interface SyncContext<T extends Platform> {
+  projectDir: string;
+  exp: ExpoConfig;
+  workflow: Workflow;
+  profile: BuildProfile<T>;
+  buildVersion: string;
+}
+
+export default class BuildVersionSyncView extends EasCommand {
+  public static description = 'Update a version in native code with a value stored on EAS servers';
+  static hidden = true;
+
+  public static flags = {
+    platform: Flags.enum({
+      char: 'p',
+      options: ['android', 'ios', 'all'],
+    }),
+    profile: Flags.string({
+      description:
+        'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+      helpValue: 'PROFILE_NAME',
+    }),
+  };
+
+  public async runAsync(): Promise<void> {
+    const { flags } = await this.parse(BuildVersionSyncView);
+    const projectDir = await findProjectRootAsync();
+
+    const requestedPlatform = await selectRequestedPlatformAsync(flags.platform);
+    const easJsonReader = new EasJsonReader(projectDir);
+    await ensureRemoteVersionPolicyAsync(projectDir, easJsonReader);
+
+    const platforms = toPlatforms(requestedPlatform);
+    const buildProfiles = await getProfilesAsync({
+      type: 'build',
+      easJsonReader,
+      platforms,
+      profileName: flags.profile ?? undefined,
+    });
+    for (const profileInfo of buildProfiles) {
+      const exp = getExpoConfig(projectDir, { env: profileInfo.profile.env });
+      const projectId = await getProjectIdAsync(exp);
+      await validateAppConfigForRemoteVersionPolicyAsync(exp);
+      const platformDisplayName = appPlatformDisplayNames[toAppPlatform(profileInfo.platform)];
+
+      const applicationIdentifier = await getApplicationIdentifierAsync(
+        projectDir,
+        exp,
+        profileInfo.profile,
+        profileInfo.platform
+      );
+      const remoteVersions = await AppVersionQuery.latestVersionAsync(
+        projectId,
+        toAppPlatform(profileInfo.platform),
+        applicationIdentifier
+      );
+      const workflow = await resolveWorkflowAsync(projectDir, profileInfo.platform);
+      if (!remoteVersions?.buildVersion) {
+        Log.warn(
+          `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;
+      }
+      if (workflow === Workflow.MANAGED) {
+        Log.warn(
+          `The remote value for the ${platformDisplayName} ${getBuildVersionName(
+            profileInfo.platform
+          )} is ${chalk.bold(
+            remoteVersions?.buildVersion
+          )}, but it was not synced to the local project. This command has no effect on projects using managed workflow.`
+        );
+        continue;
+      }
+      if (profileInfo.platform === Platform.ANDROID) {
+        this.syncAndroidAsync({
+          projectDir,
+          exp,
+          profile: profileInfo.profile as BuildProfile<Platform.ANDROID>,
+          workflow,
+          buildVersion: remoteVersions.buildVersion,
+        });
+      } else {
+        this.syncIosAsync({
+          projectDir,
+          exp,
+          profile: profileInfo.profile as BuildProfile<Platform.IOS>,
+          workflow,
+          buildVersion: remoteVersions.buildVersion,
+        });
+      }
+      Log.withTick(
+        `Successfully updated the ${platformDisplayName} ${getBuildVersionName(
+          profileInfo.platform
+        )} in native code to ${chalk.bold(remoteVersions?.buildVersion)}.`
+      );
+    }
+  }
+
+  private async syncIosAsync({
+    workflow,
+    projectDir,
+    exp,
+    profile,
+    buildVersion,
+  }: SyncContext<Platform.IOS>): Promise<void> {
+    const xcodeBuildContext = await resolveXcodeBuildContextAsync(
+      { exp, projectDir, nonInteractive: false },
+      profile
+    );
+    const targets = await resolveTargetsAsync({
+      projectDir,
+      exp,
+      xcodeBuildContext,
+      env: profile.env,
+    });
+
+    if (!isValidBuildNumber(buildVersion)) {
+      throw new Error(`Invalid buildNumber (${buildVersion}), ${BUILD_NUMBER_REQUIREMENTS}.`);
+    }
+
+    if (workflow === Workflow.GENERIC) {
+      await updateIosNativeVersionsAsync({
+        projectDir,
+        buildNumber: buildVersion,
+        targets,
+      });
+    }
+  }
+
+  private async syncAndroidAsync({
+    projectDir,
+    workflow,
+    buildVersion,
+  }: SyncContext<Platform.ANDROID>): Promise<void> {
+    if (!isValidVersionCode(buildVersion)) {
+      throw new Error(`Invalid versionCode (${buildVersion}), ${VERSION_CODE_REQUIREMENTS}.`);
+    }
+
+    if (workflow === Workflow.GENERIC) {
+      const buildGradle = await getAppBuildGradleAsync(projectDir);
+      const isMultiFlavor =
+        buildGradle.android?.productFlavors || buildGradle.android?.flavorDimensions;
+      if (isMultiFlavor) {
+        throw new Error(
+          "Versions in native code can't be automatically synced in multi-flavor Android projects. If you are using EAS Build with app version source set to remote, the correct values will be injected at the build time."
+        );
+      }
+      await updateAndroidNativeVersionsAsync({ projectDir, versionCode: Number(buildVersion) });
+    }
+  }
+}

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

@@ -1,18 +1,18 @@
 import { Flags } from '@oclif/core';
 
-import { formatGraphQLBuild } from '../../build/utils/formatBuild.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { BuildFragment } from '../../graphql/generated.js';
-import { BuildQuery } from '../../graphql/queries/BuildQuery.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+import { formatGraphQLBuild } from '../../build/utils/formatBuild';
+import EasCommand from '../../commandUtils/EasCommand';
+import { BuildFragment } from '../../graphql/generated';
+import { BuildQuery } from '../../graphql/queries/BuildQuery';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../project/projectUtils';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export default class BuildView extends EasCommand {
   static description = 'view a build for your project';

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

@@ -1,25 +1,25 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   CreateUpdateChannelOnAppMutation,
   CreateUpdateChannelOnAppMutationVariables,
-} from '../../graphql/generated.js';
-import { BranchQuery } from '../../graphql/queries/BranchQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import formatFields from '../../utils/formatFields.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-import { createUpdateBranchOnAppAsync } from '../branch/create.js';
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { createUpdateBranchOnAppAsync } from '../branch/create';
 
 export async function createUpdateChannelOnAppAsync({
   appId,

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

@@ -1,24 +1,24 @@
 import { Flags } from '@oclif/core';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   DeleteUpdateChannelMutation,
   DeleteUpdateChannelMutationVariables,
   DeleteUpdateChannelResult,
   GetChannelInfoQuery,
   GetChannelInfoQueryVariables,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync, toggleConfirmAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export default class ChannelDelete extends EasCommand {
   static hidden = true;

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

@@ -1,9 +1,9 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetChannelByNameToEditQuery,
   GetChannelByNameToEditQueryVariables,
@@ -11,13 +11,13 @@ import {
   UpdateChannel,
   UpdateChannelBranchMappingMutation,
   UpdateChannelBranchMappingMutationVariables,
-} from '../../graphql/generated.js';
-import { BranchQuery } from '../../graphql/queries/BranchQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 async function getChannelByNameForAppAsync({
   appId,

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

@@ -1,18 +1,18 @@
 import { Flags } from '@oclif/core';
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
 import {
   GetAllChannelsForAppQuery,
   GetAllChannelsForAppQueryVariables,
-} from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import formatFields from '../../utils/formatFields.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-import { logChannelDetails } from './view.js';
+} from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { logChannelDetails } from './view';
 
 const CHANNEL_LIMIT = 10_000;
 

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

@@ -1,21 +1,21 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated.js';
-import { BranchQuery } from '../../graphql/queries/BranchQuery.js';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { GetChannelByNameForAppQuery, UpdateBranch } from '../../graphql/generated';
+import { BranchQuery } from '../../graphql/queries/BranchQuery';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectFullNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync, selectAsync } from '../../prompts.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
-import { updateChannelBranchMappingAsync } from './edit.js';
-import { BranchMapping, getBranchMapping } from './view.js';
+} from '../../project/projectUtils';
+import { promptAsync, selectAsync } from '../../prompts';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
+import { updateChannelBranchMappingAsync } from './edit';
+import { BranchMapping, getBranchMapping } from './view';
 
 async function promptForRolloutPercentAsync({
   promptMessage,

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

@@ -3,20 +3,20 @@ import assert from 'assert';
 import chalk from 'chalk';
 import Table from 'cli-table3';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { ChannelQuery } from '../../graphql/queries/ChannelQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
 import {
   FormatUpdateParameter,
   UPDATE_COLUMNS,
   formatUpdate,
   getPlatformsForGroup,
-} from '../../update/utils.js';
-import formatFields from '../../utils/formatFields.js';
-import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json.js';
+} from '../../update/utils';
+import formatFields from '../../utils/formatFields';
+import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';
 
 export type BranchMapping = {
   version: number;

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

@@ -4,13 +4,13 @@ import { EasJsonReader } from '@expo/eas-json';
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import EasCommand from '../commandUtils/EasCommand.js';
-import { toAppPlatform } from '../graphql/types/AppPlatform.js';
-import Log from '../log.js';
-import { appPlatformEmojis } from '../platform.js';
-import { getExpoConfig } from '../project/expoConfig.js';
-import { findProjectRootAsync } from '../project/projectUtils.js';
-import { selectAsync } from '../prompts.js';
+import EasCommand from '../commandUtils/EasCommand';
+import { toAppPlatform } from '../graphql/types/AppPlatform';
+import Log from '../log';
+import { appPlatformEmojis } from '../platform';
+import { getExpoConfig } from '../project/expoConfig';
+import { findProjectRootAsync } from '../project/projectUtils';
+import { selectAsync } from '../prompts';
 
 export default class Config extends EasCommand {
   static description = 'display project configuration (app.json + eas.json)';

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

@@ -1,5 +1,5 @@
-import EasCommand from '../commandUtils/EasCommand.js';
-import { SelectPlatform } from '../credentials/manager/SelectPlatform.js';
+import EasCommand from '../commandUtils/EasCommand';
+import { SelectPlatform } from '../credentials/manager/SelectPlatform';
 
 export default class Credentials extends EasCommand {
   static description = 'manage credentials';

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

@@ -1,8 +1,8 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
-import AppStoreApi from '../../credentials/ios/appstore/AppStoreApi.js';
-import { createContextAsync } from '../../devices/context.js';
-import DeviceManager from '../../devices/manager.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import AppStoreApi from '../../credentials/ios/appstore/AppStoreApi';
+import { createContextAsync } from '../../devices/context';
+import DeviceManager from '../../devices/manager';
+import { ensureLoggedInAsync } from '../../user/actions';
 
 export default class DeviceCreate extends EasCommand {
   static description = 'register new Apple Devices to use for internal distribution';

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

@@ -1,29 +1,24 @@
-import AppleUtils from '@expo/apple-utils';
+import { Device, DeviceStatus } from '@expo/apple-utils';
 import { Flags } from '@oclif/core';
 import assert from 'assert';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { chooseDevicesToDeleteAsync } from '../../credentials/ios/actions/DeviceUtils.js';
-import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { chooseDevicesToDeleteAsync } from '../../credentials/ios/actions/DeviceUtils';
+import { AppleDeviceMutation } from '../../credentials/ios/api/graphql/mutations/AppleDeviceMutation';
 import {
   AppleDeviceQuery,
   AppleDeviceQueryResult,
   AppleDevicesByTeamIdentifierQueryResult,
-} from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery.js';
-import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery.js';
-import {
-  authenticateAsync,
-  getRequestContext,
-} from '../../credentials/ios/appstore/authenticate.js';
-import formatDevice from '../../devices/utils/formatDevice.js';
-import { AppleDevice, Maybe } from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils.js';
-import { promptAsync, toggleConfirmAsync } from '../../prompts.js';
-
-const { Device, DeviceStatus } = AppleUtils;
+} from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery';
+import { authenticateAsync, getRequestContext } from '../../credentials/ios/appstore/authenticate';
+import formatDevice from '../../devices/utils/formatDevice';
+import { AppleDevice, Maybe } from '../../graphql/generated';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
 
 export default class DeviceDelete extends EasCommand {
   static description = 'remove a registered device from your account';

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

@@ -2,15 +2,15 @@ import { Flags } from '@oclif/core';
 import assert from 'assert';
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery.js';
-import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery.js';
-import formatDevice from '../../devices/utils/formatDevice.js';
-import Log from '../../log.js';
-import { Ora, ora } from '../../ora.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import { AppleTeamQuery } from '../../credentials/ios/api/graphql/queries/AppleTeamQuery';
+import formatDevice from '../../devices/utils/formatDevice';
+import Log from '../../log';
+import { Ora, ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
 
 export default class BuildList extends EasCommand {
   static description = 'list all registered devices for your account';

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

@@ -1,10 +1,10 @@
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery.js';
-import formatDevice from '../../devices/utils/formatDevice.js';
-import Log from '../../log.js';
-import { ora } from '../../ora.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { AppleDeviceQuery } from '../../credentials/ios/api/graphql/queries/AppleDeviceQuery';
+import formatDevice from '../../devices/utils/formatDevice';
+import Log from '../../log';
+import { ora } from '../../ora';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectAccountNameAsync } from '../../project/projectUtils';
 
 export default class DeviceView extends EasCommand {
   static description = 'view a device for your project';

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

@@ -1,11 +1,11 @@
 import { Platform } from '@expo/eas-build-job';
 import envinfo from 'envinfo';
 
-import EasCommand from '../commandUtils/EasCommand.js';
-import Log from '../log.js';
-import { findProjectRootAsync } from '../project/projectUtils.js';
-import { resolveWorkflowAsync } from '../project/workflow.js';
-import { easCliVersion } from '../utils/easCli.js';
+import EasCommand from '../commandUtils/EasCommand';
+import Log from '../log';
+import { findProjectRootAsync } from '../project/projectUtils';
+import { resolveWorkflowAsync } from '../project/workflow';
+import { easCliVersion } from '../utils/easCli';
 
 export default class Diagnostics extends EasCommand {
   static description = 'display environment info';

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

@@ -3,15 +3,15 @@ import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 import path from 'path';
 
-import { ensureProjectConfiguredAsync } from '../../build/configure.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { CredentialsContext } from '../../credentials/context.js';
-import Log, { learnMore } from '../../log.js';
-import { createMetadataContextAsync } from '../../metadata/context.js';
-import { downloadMetadataAsync } from '../../metadata/download.js';
-import { handleMetadataError } from '../../metadata/errors.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import EasCommand from '../../commandUtils/EasCommand';
+import { CredentialsContext } from '../../credentials/context';
+import Log, { learnMore } from '../../log';
+import { createMetadataContextAsync } from '../../metadata/context';
+import { downloadMetadataAsync } from '../../metadata/download';
+import { handleMetadataError } from '../../metadata/errors';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
 
 export default class MetadataPull extends EasCommand {
   static description = 'generate the local store configuration from the app stores';

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

@@ -1,15 +1,15 @@
 import { getConfig } from '@expo/config';
 import { Flags } from '@oclif/core';
 
-import { ensureProjectConfiguredAsync } from '../../build/configure.js';
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { CredentialsContext } from '../../credentials/context.js';
-import Log, { learnMore } from '../../log.js';
-import { createMetadataContextAsync } from '../../metadata/context.js';
-import { handleMetadataError } from '../../metadata/errors.js';
-import { uploadMetadataAsync } from '../../metadata/upload.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
+import { ensureProjectConfiguredAsync } from '../../build/configure';
+import EasCommand from '../../commandUtils/EasCommand';
+import { CredentialsContext } from '../../credentials/context';
+import Log, { learnMore } from '../../log';
+import { createMetadataContextAsync } from '../../metadata/context';
+import { handleMetadataError } from '../../metadata/errors';
+import { uploadMetadataAsync } from '../../metadata/upload';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import { ensureLoggedInAsync } from '../../user/actions';
 
 export default class MetadataPush extends EasCommand {
   static description = 'sync the local store configuration to the app stores';

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

@@ -1,12 +1,12 @@
-import { gql } from 'graphql-tag';
+import gql from 'graphql-tag';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client.js';
-import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils.js';
-import formatFields from '../../utils/formatFields.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { graphqlClient, withErrorHandlingAsync } from '../../graphql/client';
+import { AppInfoQuery, AppInfoQueryVariables } from '../../graphql/generated';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../../project/projectUtils';
+import formatFields from '../../utils/formatFields';
 
 async function projectInfoByIdAsync(appId: string): Promise<AppInfoQuery> {
   const data = await withErrorHandlingAsync(

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

@@ -1,9 +1,9 @@
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
-import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
+import { findProjectRootAsync, setProjectIdAsync } from '../../project/projectUtils';
 
 export default class ProjectInit extends EasCommand {
   static description = 'create or link an EAS project';

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

@@ -1,23 +1,23 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
   EnvironmentSecretScope,
   EnvironmentSecretsQuery,
-} from '../../graphql/queries/EnvironmentSecretsQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/queries/EnvironmentSecretsQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync } from '../../prompts.js';
-import { findAccountByName } from '../../user/Account.js';
-import { getActorDisplayName } from '../../user/User.js';
-import { ensureLoggedInAsync } from '../../user/actions.js';
+} from '../../project/projectUtils';
+import { promptAsync } from '../../prompts';
+import { findAccountByName } from '../../user/Account';
+import { getActorDisplayName } from '../../user/User';
+import { ensureLoggedInAsync } from '../../user/actions';
 
 export default class EnvironmentSecretCreate extends EasCommand {
   static description = 'create an environment secret on the current project or owner account';

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

@@ -1,20 +1,20 @@
 import { Flags } from '@oclif/core';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EnvironmentSecretMutation } from '../../graphql/mutations/EnvironmentSecretMutation';
 import {
   EnvironmentSecretScope,
   EnvironmentSecretWithScope,
   EnvironmentSecretsQuery,
-} from '../../graphql/queries/EnvironmentSecretsQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+} from '../../graphql/queries/EnvironmentSecretsQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
-import { promptAsync, toggleConfirmAsync } from '../../prompts.js';
+} from '../../project/projectUtils';
+import { promptAsync, toggleConfirmAsync } from '../../prompts';
 
 export default class EnvironmentSecretDelete extends EasCommand {
   static description = 'delete an environment secret by ID';

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

@@ -2,15 +2,15 @@ import chalk from 'chalk';
 import Table from 'cli-table3';
 import dateFormat from 'dateformat';
 
-import EasCommand from '../../commandUtils/EasCommand.js';
-import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery.js';
-import Log from '../../log.js';
-import { getExpoConfig } from '../../project/expoConfig.js';
+import EasCommand from '../../commandUtils/EasCommand';
+import { EnvironmentSecretsQuery } from '../../graphql/queries/EnvironmentSecretsQuery';
+import Log from '../../log';
+import { getExpoConfig } from '../../project/expoConfig';
 import {
   findProjectRootAsync,
   getProjectAccountNameAsync,
   getProjectIdAsync,
-} from '../../project/projectUtils.js';
+} from '../../project/projectUtils';
 
 export default class EnvironmentSecretList extends EasCommand {
   static description = 'list environment secrets available for your current app';

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

@@ -2,23 +2,23 @@ import { EasJsonReader } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
 import chalk from 'chalk';
 
-import EasCommand from '../commandUtils/EasCommand.js';
-import { SubmissionFragment } from '../graphql/generated.js';
-import { toAppPlatform } from '../graphql/types/AppPlatform.js';
-import Log from '../log.js';
+import EasCommand from '../commandUtils/EasCommand';
+import { SubmissionFragment } from '../graphql/generated';
+import { toAppPlatform } from '../graphql/types/AppPlatform';
+import Log from '../log';
 import {
   RequestedPlatform,
   appPlatformDisplayNames,
   appPlatformEmojis,
   selectRequestedPlatformAsync,
   toPlatforms,
-} from '../platform.js';
-import { getExpoConfig } from '../project/expoConfig.js';
-import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils.js';
-import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context.js';
-import { submitAsync, waitToCompleteAsync } from '../submit/submit.js';
-import { printSubmissionDetailsUrls } from '../submit/utils/urls.js';
-import { getProfilesAsync } from '../utils/profiles.js';
+} from '../platform';
+import { getExpoConfig } from '../project/expoConfig';
+import { findProjectRootAsync, getProjectIdAsync } from '../project/projectUtils';
+import { SubmitArchiveFlags, createSubmissionContextAsync } from '../submit/context';
+import { submitAsync, waitToCompleteAsync } from '../submit/submit';
+import { printSubmissionDetailsUrls } from '../submit/utils/urls';
+import { getProfilesAsync } from '../utils/profiles';
 
 interface RawCommandFlags {
   platform?: string;