Merge branch 'main' into 02-03-_eas-cli_change_url_in_fingerprint_com…

…pare

CHANGELOG.md

@@ -12,10 +12,33 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Popup website in fingerprint:compare. ([#2859](https://github.com/expo/eas-cli/pull/2859) by [@quinlanj](https://github.com/quinlanj))
+
+## [15.0.3](https://github.com/expo/eas-cli/releases/tag/v15.0.3) - 2025-02-04
+
+### 🐛 Bug fixes
+
+- Fixed EAS server environment variables does not pass to `npx expo-updates runtimeversion:resolve` call. ([#2867](https://github.com/expo/eas-cli/pull/2867) by [@kudo](https://github.com/kudo))
+
+## [15.0.2](https://github.com/expo/eas-cli/releases/tag/v15.0.2) - 2025-02-04
+
+## [15.0.1](https://github.com/expo/eas-cli/releases/tag/v15.0.1) - 2025-02-04
+
+## [15.0.0](https://github.com/expo/eas-cli/releases/tag/v15.0.0) - 2025-02-04
+
+### 🛠 Breaking changes
+
+- Use Git to archive projects containing a Git repository. (Previously, Git would only be used if `requireCommit` flag in `eas.json` was set to `true`.) ([#2841](https://github.com/expo/eas-cli/pull/2841) by [@sjchmiela](https://github.com/sjchmiela))
+
+### 🐛 Bug fixes
+
+- Print warning for `NoVcsClient` only once. ([#2863](https://github.com/expo/eas-cli/pull/2863) by [@szdziedzic](https://github.com/szdziedzic))
+
+### 🧹 Chores
+
 - Add update support for fingerprint:compare. ([#2850](https://github.com/expo/eas-cli/pull/2850) by [@quinlanj](https://github.com/quinlanj))
 - Add update group id support for fingerprint:compare. ([#2851](https://github.com/expo/eas-cli/pull/2851) by [@quinlanj](https://github.com/quinlanj))
 - Add better interactive support for fingerprint:compare. ([#2854](https://github.com/expo/eas-cli/pull/2854) by [@quinlanj](https://github.com/quinlanj))
-- Popup website in fingerprint:compare. ([#2859](https://github.com/expo/eas-cli/pull/2859) by [@quinlanj](https://github.com/quinlanj))
 - Fix fingerprint:compare URL. ([#2861](https://github.com/expo/eas-cli/pull/2861) by [@quinlanj](https://github.com/quinlanj))
 
 ## [14.7.1](https://github.com/expo/eas-cli/releases/tag/v14.7.1) - 2025-01-31

lerna.json

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

packages/eas-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "14.7.1",
+  "version": "15.0.3",
   "author": "Expo <[email protected]>",
   "bin": {
     "eas": "./bin/run"
@@ -13,7 +13,7 @@
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
     "@expo/eas-build-job": "1.0.165",
-    "@expo/eas-json": "14.5.0",
+    "@expo/eas-json": "15.0.0",
     "@expo/env": "^1.0.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.117",

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

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

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

@@ -11,6 +11,7 @@ import {
 import { LoggerLevel } from '@expo/logger';
 import assert from 'assert';
 import chalk from 'chalk';
+import { pathExists } from 'fs-extra';
 import nullthrows from 'nullthrows';
 
 import { prepareAndroidBuildAsync } from './android/build';
@@ -62,7 +63,7 @@ import {
   validateBuildProfileVersionSettingsAsync,
 } from '../project/remoteVersionSource';
 import { confirmAsync } from '../prompts';
-import { runAsync } from '../run/run';
+import { getEasBuildRunCachedAppPath, runAsync } from '../run/run';
 import { isRunnableOnSimulatorOrEmulator } from '../run/utils';
 import { createSubmissionContextAsync } from '../submit/context';
 import {
@@ -545,11 +546,21 @@ function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds: (BuildFragment | nul
   }
 }
 
-async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
+export async function downloadAndRunAsync(build: BuildFragment): Promise<void> {
   assert(build.artifacts?.applicationArchiveUrl);
+  const cachedAppPath = getEasBuildRunCachedAppPath(build.project.id, build.id, build.platform);
+
+  if (await pathExists(cachedAppPath)) {
+    Log.newLine();
+    Log.log(`Using cached app...`);
+    await runAsync(cachedAppPath, build.platform);
+    return;
+  }
+
   const buildPath = await downloadAndMaybeExtractAppAsync(
     build.artifacts.applicationArchiveUrl,
-    build.platform
+    build.platform,
+    cachedAppPath
   );
   await runAsync(buildPath, build.platform);
 }

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

@@ -1,25 +1,26 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile, EasJsonAccessor } from '@expo/eas-json';
 import { Errors, Flags } from '@oclif/core';
+import chalk from 'chalk';
 
 import {
   createBuildProfileAsync,
   doesBuildProfileExistAsync,
   ensureProjectConfiguredAsync,
 } from '../../build/configure';
 import { evaluateConfigWithEnvVarsAsync } from '../../build/evaluateConfigWithEnvVarsAsync';
-import { runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
+import { downloadAndRunAsync, runBuildAndSubmitAsync } from '../../build/runBuildAndSubmit';
 import { ensureRepoIsCleanAsync } from '../../build/utils/repository';
 import EasCommand from '../../commandUtils/EasCommand';
-import { BuildStatus, DistributionType } from '../../graphql/generated';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { BuildFragment, BuildStatus, DistributionType } from '../../graphql/generated';
 import { BuildQuery } from '../../graphql/queries/BuildQuery';
 import { toAppPlatform } from '../../graphql/types/AppPlatform';
 import Log from '../../log';
 import { RequestedPlatform } from '../../platform';
 import { resolveWorkflowAsync } from '../../project/workflow';
 import { confirmAsync, promptAsync } from '../../prompts';
-import { runAsync } from '../../run/run';
-import { downloadAndMaybeExtractAppAsync } from '../../utils/download';
+import { expoCommandAsync } from '../../utils/expoCli';
 import { createFingerprintAsync } from '../../utils/fingerprintCli';
 import { ProfileData, getProfilesAsync } from '../../utils/profiles';
 import { Client } from '../../vcs/vcs';
@@ -109,18 +110,11 @@ export default class BuildDev extends EasCommand {
     Log.log(`✨ Calculated fingerprint hash: ${fingerprint.hash}`);
     Log.newLine();
 
-    const builds = await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-      appId: projectId,
-      filter: {
-        platform: toAppPlatform(platform),
-        fingerprintHash: fingerprint.hash,
-        status: BuildStatus.Finished,
-        simulator: platform === Platform.IOS ? true : undefined,
-        distribution: platform === Platform.ANDROID ? DistributionType.Internal : undefined,
-        developmentClient: true,
-      },
-      offset: 0,
-      limit: 1,
+    const builds = await this.getBuildsAsync({
+      graphqlClient,
+      projectId,
+      platform,
+      fingerprint,
     });
     if (builds.length !== 0) {
       const build = builds[0];
@@ -129,11 +123,8 @@ export default class BuildDev extends EasCommand {
       );
 
       if (build.artifacts?.applicationArchiveUrl) {
-        const buildPath = await downloadAndMaybeExtractAppAsync(
-          build.artifacts.applicationArchiveUrl,
-          build.platform
-        );
-        await runAsync(buildPath, build.platform);
+        await downloadAndRunAsync(build);
+        await this.startDevServerAsync({ projectDir, platform });
         return;
       } else {
         Log.warn('Artifacts for this build expired. New build will be started.');
@@ -142,6 +133,22 @@ export default class BuildDev extends EasCommand {
 
     Log.log('🚀 No successful build with matching fingerprint found. Starting a new build...');
 
+    const previousBuildsForSelectedProfile = await this.getBuildsAsync({
+      graphqlClient,
+      projectId,
+      platform,
+    });
+    if (
+      previousBuildsForSelectedProfile.length > 0 &&
+      previousBuildsForSelectedProfile[0].metrics?.buildDuration
+    ) {
+      Log.log(
+        `🕒 Previous build for "${buildProfile.profileName}" profile completed in ${Math.floor(
+          previousBuildsForSelectedProfile[0].metrics.buildDuration / 60000
+        )} minutes.`
+      );
+    }
+
     await runBuildAndSubmitAsync({
       graphqlClient,
       analytics,
@@ -165,6 +172,7 @@ export default class BuildDev extends EasCommand {
       downloadSimBuildAutoConfirm: true,
       envOverride: env,
     });
+    await this.startDevServerAsync({ projectDir, platform });
   }
 
   private async selectPlatformAsync(platform?: Platform): Promise<Platform> {
@@ -294,4 +302,50 @@ export default class BuildDev extends EasCommand {
     });
     return buildProfile;
   }
+
+  private async getBuildsAsync({
+    graphqlClient,
+    projectId,
+    platform,
+    fingerprint,
+  }: {
+    graphqlClient: ExpoGraphqlClient;
+    projectId: string;
+    platform: Platform;
+    fingerprint?: { hash: string };
+  }): Promise<BuildFragment[]> {
+    return await BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+      appId: projectId,
+      filter: {
+        platform: toAppPlatform(platform),
+        fingerprintHash: fingerprint?.hash,
+        status: BuildStatus.Finished,
+        simulator: platform === Platform.IOS ? true : undefined,
+        distribution: platform === Platform.ANDROID ? DistributionType.Internal : undefined,
+        developmentClient: true,
+      },
+      offset: 0,
+      limit: 1,
+    });
+  }
+
+  private async startDevServerAsync({
+    projectDir,
+    platform,
+  }: {
+    projectDir: string;
+    platform: Platform;
+  }): Promise<void> {
+    Log.newLine();
+    Log.log(
+      `Starting development server: ${chalk.dim(
+        `npx expo start --dev-client ${platform === Platform.IOS ? '--ios' : '--android'}`
+      )}`
+    );
+    await expoCommandAsync(projectDir, [
+      'start',
+      '--dev-client',
+      platform === Platform.IOS ? '--ios' : '--android',
+    ]);
+  }
 }

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

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

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

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

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

@@ -162,7 +162,10 @@ export default class Onboarding extends EasCommand {
       cloneMethod,
     });
 
-    const vcsClient = new GitClient(finalTargetProjectDirectory);
+    const vcsClient = new GitClient({
+      maybeCwdOverride: finalTargetProjectDirectory,
+      requireCommit: false,
+    });
     if (!app.githubRepository) {
       await fs.remove(path.join(finalTargetProjectDirectory, '.git'));
       await runCommandAsync({

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

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