eas-cli 5.4.0 → 5.6.0

package/build/build/android/version.d.ts

@@ -2,6 +2,7 @@ import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { Client } from '../../vcs/vcs';
 export declare enum BumpStrategy {
     APP_VERSION = 0,
     VERSION_CODE = 1,
@@ -17,7 +18,7 @@ export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, ex
     projectDir: string;
     exp: ExpoConfig;
 }): Promise<void>;
-export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, buildProfile: BuildProfile<Platform.ANDROID>): Promise<{
+export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, buildProfile: BuildProfile<Platform.ANDROID>, vcsClient: Client): Promise<{
     appVersion?: string;
     appBuildVersion?: string;
 }>;
@@ -30,10 +31,11 @@ export declare function updateNativeVersionsAsync({ projectDir, version, version
  * Returns buildNumber that will be used for the next build. If current build profile
  * has an 'autoIncrement' option set, it increments the version on server.
  */
-export declare function resolveRemoteVersionCodeAsync(graphqlClient: ExpoGraphqlClient, { projectDir, projectId, exp, applicationId, buildProfile, }: {
+export declare function resolveRemoteVersionCodeAsync(graphqlClient: ExpoGraphqlClient, { projectDir, projectId, exp, applicationId, buildProfile, vcsClient, }: {
     projectDir: string;
     projectId: string;
     exp: ExpoConfig;
     applicationId: string;
     buildProfile: BuildProfile<Platform.ANDROID>;
+    vcsClient: Client;
 }): Promise<string>;

package/build/build/android/version.js

@@ -64,9 +64,9 @@ async function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }) {
     }
 }
 exports.bumpVersionInAppJsonAsync = bumpVersionInAppJsonAsync;
-async function maybeResolveVersionsAsync(projectDir, exp, buildProfile) {
+async function maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient) {
     var _a, _b;
-    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID, vcsClient);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         const buildGradle = await (0, gradleUtils_1.getAppBuildGradleAsync)(projectDir);
         try {
@@ -120,10 +120,10 @@ async function writeBuildGradleAsync({ projectDir, buildGradle, }) {
  * Returns buildNumber that will be used for the next build. If current build profile
  * has an 'autoIncrement' option set, it increments the version on server.
  */
-async function resolveRemoteVersionCodeAsync(graphqlClient, { projectDir, projectId, exp, applicationId, buildProfile, }) {
+async function resolveRemoteVersionCodeAsync(graphqlClient, { projectDir, projectId, exp, applicationId, buildProfile, vcsClient, }) {
     var _a, _b, _c, _d, _e, _f;
     const remoteVersions = await AppVersionQuery_1.AppVersionQuery.latestVersionAsync(graphqlClient, projectId, generated_1.AppPlatform.Android, applicationId);
-    const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile);
+    const localVersions = await maybeResolveVersionsAsync(projectDir, exp, buildProfile, vcsClient);
     let currentBuildVersion;
     if (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion) {
         currentBuildVersion = remoteVersions.buildVersion;

package/build/build/build.d.ts

@@ -23,11 +23,9 @@ export type BuildRequestSender = () => Promise<BuildFragment | undefined>;
 export declare function prepareBuildRequestForPlatformAsync<TPlatform extends Platform, Credentials, TJob extends Job>(builder: Builder<TPlatform, Credentials, TJob>): Promise<BuildRequestSender>;
 export declare function handleBuildRequestError(error: any, platform: Platform): never;
 export type MaybeBuildFragment = BuildFragment | null;
-export declare function waitForBuildEndAsync(graphqlClient: ExpoGraphqlClient, { buildIds, accountName, projectDir, nonInteractive, }: {
+export declare function waitForBuildEndAsync(graphqlClient: ExpoGraphqlClient, { buildIds, accountName }: {
     buildIds: string[];
     accountName: string;
-    projectDir: string;
-    nonInteractive: boolean;
 }, { intervalSec }?: {
     intervalSec?: number | undefined;
 }): Promise<MaybeBuildFragment[]>;

package/build/build/build.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForBuildEndAsync = exports.handleBuildRequestError = exports.prepareBuildRequestForPlatformAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
-const eas_json_1 = require("@expo/eas-json");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
@@ -18,13 +17,11 @@ const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
 const ora_1 = require("../ora");
 const platform_1 = require("../platform");
-const prompts_1 = require("../prompts");
 const uploads_1 = require("../uploads");
 const files_1 = require("../utils/files");
 const json_1 = require("../utils/json");
 const progress_1 = require("../utils/progress");
 const promise_1 = require("../utils/promise");
-const vcs_1 = require("../vcs");
 const errors_1 = require("./errors");
 const graphql_1 = require("./graphql");
 const local_1 = require("./local");
@@ -52,15 +49,15 @@ async function prepareBuildRequestForPlatformAsync(builder) {
         failureEvent: AnalyticsManager_1.BuildEvent.CONFIGURE_PROJECT_FAIL,
         properties: ctx.analyticsEventProperties,
     });
-    if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
+    if (await ctx.vcsClient.isCommitRequiredAsync()) {
         log_1.default.addNewLineIfNone();
-        await (0, repository_1.reviewAndCommitChangesAsync)(`[EAS Build] Run EAS Build for ${platform_1.requestedPlatformDisplayNames[ctx.platform]}`, { nonInteractive: ctx.nonInteractive });
+        await (0, repository_1.reviewAndCommitChangesAsync)(ctx.vcsClient, `[EAS Build] Run EAS Build for ${platform_1.requestedPlatformDisplayNames[ctx.platform]}`, { nonInteractive: ctx.nonInteractive });
     }
     let projectArchive;
     if (ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.LOCAL_BUILD_PLUGIN) {
         projectArchive = {
             type: eas_build_job_1.ArchiveSourceType.PATH,
-            path: (await (0, repository_1.makeProjectTarballAsync)()).path,
+            path: (await (0, repository_1.makeProjectTarballAsync)(ctx.vcsClient)).path,
         };
     }
     else if (ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.INTERNAL) {
@@ -158,7 +155,7 @@ async function uploadProjectAsync(ctx) {
         return await (0, common_1.withAnalyticsAsync)(ctx.analytics, async () => {
             log_1.default.newLine();
             log_1.default.log(`Compressing project files and uploading to EAS Build. ${(0, log_1.learnMore)('https://expo.fyi/eas-build-archive')}`);
-            const projectTarball = await (0, repository_1.makeProjectTarballAsync)();
+            const projectTarball = await (0, repository_1.makeProjectTarballAsync)(ctx.vcsClient);
             if (projectTarball.size > 1024 * 1024 * 100) {
                 log_1.default.warn(`Your project archive is ${(0, files_1.formatBytes)(projectTarball.size)}. You can reduce its size and the time it takes to upload by excluding files that are unnecessary for the build process in ${chalk_1.default.bold('.easignore')} file. ${(0, log_1.learnMore)('https://expo.fyi/eas-build-archive')}`);
             }
@@ -208,7 +205,7 @@ async function sendBuildRequestAsync(builder, job, metadata, buildParams) {
         properties: ctx.analyticsEventProperties,
     });
 }
-async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName, projectDir, nonInteractive, }, { intervalSec = 10 } = {}) {
+async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName }, { intervalSec = 10 } = {}) {
     let spinner;
     let originalSpinnerText;
     if (buildIds.length === 1) {
@@ -223,7 +220,7 @@ async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName, proj
     while (true) {
         const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
         const { refetch } = builds.length === 1
-            ? await handleSingleBuildProgressAsync({ build: builds[0], accountName, projectDir, nonInteractive }, { spinner })
+            ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
             : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
         if (!refetch) {
             return builds;
@@ -246,7 +243,7 @@ async function getBuildsSafelyAsync(graphqlClient, buildIds) {
 }
 let queueProgressBarStarted = false;
 const queueProgressBar = new cli_progress_1.default.SingleBar({ format: '|{bar}| {estimatedWaitTime}' }, cli_progress_1.default.Presets.rect);
-async function handleSingleBuildProgressAsync({ build, accountName, projectDir, nonInteractive, }, { spinner }) {
+async function handleSingleBuildProgressAsync({ build, accountName, }, { spinner }) {
     if (build === null) {
         spinner.text = 'Could not fetch the build status. Check your network connection.';
         return { refetch: true };
@@ -284,38 +281,6 @@ async function handleSingleBuildProgressAsync({ build, accountName, projectDir,
                     log_1.default.log('Start builds sooner in the priority queue.');
                     log_1.default.log(`Sign up for EAS Production or Enterprise at ${(0, log_1.link)(formatAccountSubscriptionsUrl(accountName))}`);
                 }
-                if (build.platform === generated_1.AppPlatform.Ios &&
-                    [generated_1.BuildResourceClass.IosIntelLarge, generated_1.BuildResourceClass.IosIntelMedium].includes(build.resourceClass)) {
-                    let askToSwitchToM1 = false;
-                    if (build.priority === generated_1.BuildPriority.High &&
-                        build.estimatedWaitTimeLeftSeconds >= /* 10 minutes */ 10 * 60) {
-                        log_1.default.newLine();
-                        log_1.default.warn(`Warning: Priority queue wait time for legacy iOS Intel workers is longer than usual (more than 10 minutes).`);
-                        log_1.default.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
-                        log_1.default.warn((0, log_1.learnMore)('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
-                            learnMoreMessage: 'Learn more on switching to M1 workers.',
-                        }));
-                        askToSwitchToM1 = true;
-                    }
-                    else if (build.priority !== generated_1.BuildPriority.High &&
-                        build.estimatedWaitTimeLeftSeconds >= /* 120 minutes */ 120 * 60) {
-                        log_1.default.newLine();
-                        log_1.default.warn(`Warning: Free tier queue wait time for legacy iOS Intel workers is longer than usual.`);
-                        log_1.default.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
-                        log_1.default.warn((0, log_1.learnMore)('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
-                            learnMoreMessage: 'Learn more on switching to M1 workers.',
-                        }));
-                        askToSwitchToM1 = true;
-                    }
-                    if (!nonInteractive && askToSwitchToM1) {
-                        const shouldSwitchToM1 = await (0, prompts_1.confirmAsync)({
-                            message: `Switch iOS builds to M1 workers (modifies build profiles in eas.json)?`,
-                        });
-                        if (shouldSwitchToM1) {
-                            await updateIosBuildProfilesToUseM1WorkersAsync(projectDir);
-                        }
-                    }
-                }
                 log_1.default.newLine();
                 log_1.default.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
                 queueProgressBar.start(build.initialQueuePosition + 1, build.initialQueuePosition - build.queuePosition + 1, progressBarPayload);
@@ -431,19 +396,3 @@ function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds) {
 function formatAccountSubscriptionsUrl(accountName) {
     return new URL(`/accounts/${accountName}/settings/subscriptions`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
-async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir) {
-    const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
-    await easJsonAccessor.readRawJsonAsync();
-    const profileNames = await eas_json_1.EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
-    easJsonAccessor.patch(easJsonRawObject => {
-        for (const profileName of profileNames) {
-            easJsonRawObject.build[profileName].ios = {
-                ...easJsonRawObject.build[profileName].ios,
-                resourceClass: eas_json_1.ResourceClass.M_MEDIUM,
-            };
-        }
-        return easJsonRawObject;
-    });
-    await easJsonAccessor.writeAsync();
-    log_1.default.withTick('Updated eas.json. Your next builds will run on M1 workers.');
-}

package/build/build/configure.d.ts

@@ -1,6 +1,8 @@
+import { Client } from '../vcs/vcs';
 interface ConfigureParams {
     projectDir: string;
     nonInteractive: boolean;
+    vcsClient: Client;
 }
 export declare function easJsonExistsAsync(projectDir: string): Promise<boolean>;
 /**

package/build/build/configure.js

@@ -9,7 +9,6 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const log_1 = tslib_1.__importStar(require("../log"));
 const workflow_1 = require("../project/workflow");
 const easCli_1 = require("../utils/easCli");
-const vcs_1 = require("../vcs");
 const repository_1 = require("./utils/repository");
 async function easJsonExistsAsync(projectDir) {
     return await fs_extra_1.default.pathExists(eas_json_1.EasJsonAccessor.formatEasJsonPath(projectDir));
@@ -30,12 +29,12 @@ async function ensureProjectConfiguredAsync(configureParams) {
     return true;
 }
 exports.ensureProjectConfiguredAsync = ensureProjectConfiguredAsync;
-async function configureAsync({ projectDir, nonInteractive }) {
-    await (0, repository_1.maybeBailOnRepoStatusAsync)();
-    await createEasJsonAsync(projectDir);
-    if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
+async function configureAsync({ projectDir, nonInteractive, vcsClient, }) {
+    await (0, repository_1.maybeBailOnRepoStatusAsync)(vcsClient);
+    await createEasJsonAsync(projectDir, vcsClient);
+    if (await vcsClient.isCommitRequiredAsync()) {
         log_1.default.newLine();
-        await (0, repository_1.reviewAndCommitChangesAsync)('Configure EAS Build', {
+        await (0, repository_1.reviewAndCommitChangesAsync)(vcsClient, 'Configure EAS Build', {
             nonInteractive,
         });
     }
@@ -81,14 +80,14 @@ const EAS_JSON_BARE_DEFAULT = {
         production: {},
     },
 };
-async function createEasJsonAsync(projectDir) {
+async function createEasJsonAsync(projectDir, vcsClient) {
     const easJsonPath = eas_json_1.EasJsonAccessor.formatEasJsonPath(projectDir);
-    const hasAndroidNativeProject = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID)) === eas_build_job_1.Workflow.GENERIC;
-    const hasIosNativeProject = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS)) === eas_build_job_1.Workflow.GENERIC;
+    const hasAndroidNativeProject = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID, vcsClient)) === eas_build_job_1.Workflow.GENERIC;
+    const hasIosNativeProject = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient)) === eas_build_job_1.Workflow.GENERIC;
     const easJson = hasAndroidNativeProject || hasIosNativeProject
         ? EAS_JSON_BARE_DEFAULT
         : EAS_JSON_MANAGED_DEFAULT;
     await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-    await (0, vcs_1.getVcsClient)().trackFileAsync(easJsonPath);
+    await vcsClient.trackFileAsync(easJsonPath);
     log_1.default.withTick(`Generated ${chalk_1.default.bold('eas.json')}. ${(0, log_1.learnMore)('https://docs.expo.dev/build-reference/eas-json/')}`);
 }

package/build/build/context.d.ts

@@ -1,6 +1,7 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile, EasJson } from '@expo/eas-json';
+import { NodePackageManager } from '@expo/package-manager';
 import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManager';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
@@ -10,6 +11,7 @@ import { GradleBuildContext } from '../project/android/gradle';
 import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
+import { Client } from '../vcs/vcs';
 import { LocalBuildOptions } from './local';
 export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 export interface AndroidBuildContext {
@@ -51,4 +53,6 @@ export interface BuildContext<T extends Platform> {
     android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
     ios: T extends Platform.IOS ? IosBuildContext : undefined;
     developmentClient: boolean;
+    requiredPackageManager: NodePackageManager['name'] | null;
+    vcsClient: Client;
 }

package/build/build/createContext.d.ts

@@ -5,9 +5,10 @@ import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectCo
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CustomBuildConfigMetadata } from '../project/customBuildConfig';
 import { Actor } from '../user/User';
+import { Client } from '../vcs/vcs';
 import { BuildContext } from './context';
 import { LocalBuildOptions } from './local';
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }: {
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }: {
     buildProfileName: string;
     buildProfile: BuildProfile<T>;
     easJsonCliConfig: EasJson['cli'];
@@ -22,6 +23,7 @@ export declare function createBuildContextAsync<T extends Platform>({ buildProfi
     actor: Actor;
     graphqlClient: ExpoGraphqlClient;
     analytics: Analytics;
+    vcsClient: Client;
     getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
     customBuildConfigMetadata?: CustomBuildConfigMetadata;
 }): Promise<BuildContext<T>>;

package/build/build/createContext.js

@@ -4,6 +4,7 @@ exports.createBuildContextAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
+const package_manager_1 = require("@expo/package-manager");
 const getenv_1 = tslib_1.__importDefault(require("getenv"));
 const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
 const uuid_1 = require("uuid");
@@ -14,17 +15,18 @@ const workflow_1 = require("../project/workflow");
 const build_1 = require("./android/build");
 const build_2 = require("./ios/build");
 const resourceClass_1 = require("./utils/resourceClass");
-async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }) {
+async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive, noWait, platform, projectDir, resourceClassFlag, message, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }) {
     var _a, _b;
     const { exp, projectId } = await getDynamicPrivateProjectConfigAsync({ env: buildProfile.env });
     const projectName = exp.slug;
     const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
-    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform);
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform, vcsClient);
     const accountId = account.id;
     const runFromCI = getenv_1.default.boolish('CI', false);
     const developmentClient = (_b = (_a = buildProfile.developmentClient) !== null && _a !== void 0 ? _a : (platform === eas_build_job_1.Platform.ANDROID
         ? (buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.gradleCommand) === ':app:assembleDebug'
         : (buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.buildConfiguration) === 'Debug')) !== null && _b !== void 0 ? _b : false;
+    const requiredPackageManager = (0, package_manager_1.resolvePackageManager)(projectDir);
     const credentialsCtx = new context_1.CredentialsContext({
         projectInfo: { exp, projectId },
         nonInteractive,
@@ -34,6 +36,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         analytics,
         env: buildProfile.env,
         easJsonCliConfig,
+        vcsClient,
     });
     const devClientProperties = getDevClientEventProperties({
         platform,
@@ -73,11 +76,13 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
         user: actor,
         graphqlClient,
         analytics,
+        vcsClient,
         workflow,
         message,
         runFromCI,
         customBuildConfigMetadata,
         developmentClient,
+        requiredPackageManager,
     };
     if (platform === eas_build_job_1.Platform.ANDROID) {
         const common = commonContext;

package/build/build/ios/build.js

@@ -28,12 +28,14 @@ async function createIosContextAsync(ctx) {
         projectDir: ctx.projectDir,
         nonInteractive: ctx.nonInteractive,
         exp: ctx.exp,
+        vcsClient: ctx.vcsClient,
     }, buildProfile);
     const targets = await (0, target_1.resolveTargetsAsync)({
         projectDir: ctx.projectDir,
         exp: ctx.exp,
         xcodeBuildContext,
         env: buildProfile.env,
+        vcsClient: ctx.vcsClient,
     });
     const applicationTarget = (0, target_1.findApplicationTarget)(targets);
     const buildNumberOverride = ((_a = ctx.easJsonCliConfig) === null || _a === void 0 ? void 0 : _a.appVersionSource) === eas_json_1.AppVersionSource.REMOTE
@@ -43,6 +45,7 @@ async function createIosContextAsync(ctx) {
             exp: ctx.exp,
             applicationTarget,
             buildProfile,
+            vcsClient: ctx.vcsClient,
         })
         : undefined;
     return {
@@ -70,6 +73,7 @@ async function prepareIosBuildAsync(ctx) {
                     ? false
                     : ctx.buildProfile.autoIncrement,
                 projectId: ctx.projectId,
+                vcsClient: ctx.vcsClient,
             });
         },
         prepareJobAsync: async (ctx, jobData) => {

package/build/build/ios/prepareJob.js

@@ -8,7 +8,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const slash_1 = tslib_1.__importDefault(require("slash"));
 const customBuildConfig_1 = require("../../project/customBuildConfig");
 const projectUtils_1 = require("../../project/projectUtils");
-const vcs_1 = require("../../vcs");
 const cacheDefaults = {
     disabled: false,
     paths: [],
@@ -17,7 +16,7 @@ async function prepareJobAsync(ctx, jobData) {
     var _a;
     const username = (0, projectUtils_1.getUsername)(ctx.exp, ctx.user);
     const buildProfile = ctx.buildProfile;
-    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await (0, vcs_1.getVcsClient)().getRootPathAsync(), ctx.projectDir)) || '.';
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
     const buildCredentials = {};
     if (jobData.credentials) {
         const targetNames = Object.keys(jobData.credentials);

package/build/build/ios/syncProjectConfiguration.d.ts

@@ -2,10 +2,12 @@ import { ExpoConfig } from '@expo/config';
 import { IosVersionAutoIncrement } from '@expo/eas-json';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Target } from '../../credentials/ios/types';
-export declare function syncProjectConfigurationAsync(graphqlClient: ExpoGraphqlClient, { projectDir, exp, targets, localAutoIncrement, projectId, }: {
+import { Client } from '../../vcs/vcs';
+export declare function syncProjectConfigurationAsync(graphqlClient: ExpoGraphqlClient, { projectDir, exp, targets, localAutoIncrement, projectId, vcsClient, }: {
     projectDir: string;
     exp: ExpoConfig;
     targets: Target[];
     localAutoIncrement?: IosVersionAutoIncrement;
     projectId: string;
+    vcsClient: Client;
 }): Promise<void>;

package/build/build/ios/syncProjectConfiguration.js

@@ -6,12 +6,12 @@ const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
 const UpdatesModule_1 = require("../../update/ios/UpdatesModule");
 const version_1 = require("./version");
-async function syncProjectConfigurationAsync(graphqlClient, { projectDir, exp, targets, localAutoIncrement, projectId, }) {
-    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
+async function syncProjectConfigurationAsync(graphqlClient, { projectDir, exp, targets, localAutoIncrement, projectId, vcsClient, }) {
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient);
     const versionBumpStrategy = resolveVersionBumpStrategy(localAutoIncrement !== null && localAutoIncrement !== void 0 ? localAutoIncrement : false);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         if ((0, projectUtils_1.isExpoUpdatesInstalled)(projectDir)) {
-            await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(graphqlClient, projectDir, exp, projectId);
+            await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(graphqlClient, vcsClient, projectDir, exp, projectId);
         }
         await (0, version_1.bumpVersionAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
     }

package/build/build/ios/version.d.ts

@@ -4,6 +4,7 @@ import { BuildProfile } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { Target } from '../../credentials/ios/types';
+import { Client } from '../../vcs/vcs';
 export declare enum BumpStrategy {
     APP_VERSION = 0,
     BUILD_NUMBER = 1,
@@ -20,9 +21,9 @@ export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, ex
     projectDir: string;
     exp: ExpoConfig;
 }): Promise<void>;
-export declare function readShortVersionAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<string | undefined>;
-export declare function readBuildNumberAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<string | undefined>;
-export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, targets: Target[]): Promise<{
+export declare function readShortVersionAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings'], vcsClient: Client): Promise<string | undefined>;
+export declare function readBuildNumberAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings'], vcsClient: Client): Promise<string | undefined>;
+export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, targets: Target[], vcsClient: Client): Promise<{
     appVersion?: string;
     appBuildVersion?: string;
 }>;
@@ -38,10 +39,11 @@ export declare function evaluateTemplateString(s: string, buildSettings: XCBuild
  * Returns buildNumber that will be used for the next build. If current build profile
  * has an 'autoIncrement' option set, it increments the version on server.
  */
-export declare function resolveRemoteBuildNumberAsync(graphqlClient: ExpoGraphqlClient, { projectDir, projectId, exp, applicationTarget, buildProfile, }: {
+export declare function resolveRemoteBuildNumberAsync(graphqlClient: ExpoGraphqlClient, { projectDir, projectId, exp, applicationTarget, buildProfile, vcsClient, }: {
     projectDir: string;
     projectId: string;
     exp: ExpoConfig;
     applicationTarget: Target;
     buildProfile: BuildProfile<Platform.IOS>;
+    vcsClient: Client;
 }): Promise<string>;

package/build/build/ios/version.js

@@ -81,8 +81,8 @@ function validateShortVersion(shortVersion) {
         throw new Error(`CFBundleShortVersionString (version field in app.json/app.config.js) must be a period-separated list of three non-negative integers. Current value: ${shortVersion}`);
     }
 }
-async function readShortVersionAsync(projectDir, exp, buildSettings) {
-    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
+async function readShortVersionAsync(projectDir, exp, buildSettings, vcsClient) {
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
         const shortVersion = infoPlist.CFBundleShortVersionString &&
@@ -96,8 +96,8 @@ async function readShortVersionAsync(projectDir, exp, buildSettings) {
     }
 }
 exports.readShortVersionAsync = readShortVersionAsync;
-async function readBuildNumberAsync(projectDir, exp, buildSettings) {
-    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
+async function readBuildNumberAsync(projectDir, exp, buildSettings, vcsClient) {
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
         return (infoPlist.CFBundleVersion && evaluateTemplateString(infoPlist.CFBundleVersion, buildSettings));
@@ -107,13 +107,13 @@ async function readBuildNumberAsync(projectDir, exp, buildSettings) {
     }
 }
 exports.readBuildNumberAsync = readBuildNumberAsync;
-async function maybeResolveVersionsAsync(projectDir, exp, targets) {
+async function maybeResolveVersionsAsync(projectDir, exp, targets, vcsClient) {
     var _a, _b;
     const applicationTarget = (0, target_1.findApplicationTarget)(targets);
     try {
         return {
-            appBuildVersion: await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {}),
-            appVersion: await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {}),
+            appBuildVersion: await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {}, vcsClient),
+            appVersion: await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {}, vcsClient),
         };
     }
     catch (err) {
@@ -203,11 +203,11 @@ exports.evaluateTemplateString = evaluateTemplateString;
  * Returns buildNumber that will be used for the next build. If current build profile
  * has an 'autoIncrement' option set, it increments the version on server.
  */
-async function resolveRemoteBuildNumberAsync(graphqlClient, { projectDir, projectId, exp, applicationTarget, buildProfile, }) {
+async function resolveRemoteBuildNumberAsync(graphqlClient, { projectDir, projectId, exp, applicationTarget, buildProfile, vcsClient, }) {
     var _a, _b, _c, _d;
     const remoteVersions = await AppVersionQuery_1.AppVersionQuery.latestVersionAsync(graphqlClient, projectId, generated_1.AppPlatform.Ios, applicationTarget.bundleIdentifier);
-    const localBuildNumber = await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {});
-    const localShortVersion = await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {});
+    const localBuildNumber = await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {}, vcsClient);
+    const localShortVersion = await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {}, vcsClient);
     let currentBuildVersion;
     if (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion) {
         currentBuildVersion = remoteVersions.buildVersion;

package/build/build/metadata.js

@@ -11,13 +11,11 @@ const projectUtils_1 = require("../project/projectUtils");
 const UpdatesModule_1 = require("../update/android/UpdatesModule");
 const UpdatesModule_2 = require("../update/ios/UpdatesModule");
 const easCli_1 = require("../utils/easCli");
-const vcs_1 = require("../vcs");
 const version_1 = require("./android/version");
 const version_2 = require("./ios/version");
 const local_1 = require("./local");
 async function collectMetadataAsync(ctx) {
-    var _a, _b, _c, _d;
-    const vcsClient = (0, vcs_1.getVcsClient)();
+    var _a, _b, _c, _d, _e;
     const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
     const distribution = (_a = ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
         ? 'simulator'
@@ -36,11 +34,11 @@ async function collectMetadataAsync(ctx) {
         appName: ctx.exp.name,
         appIdentifier: resolveAppIdentifier(ctx),
         buildProfile: ctx.buildProfileName,
-        gitCommitHash: await vcsClient.getCommitHashAsync(),
-        gitCommitMessage: truncateGitCommitMessage((_c = (await vcsClient.getLastCommitMessageAsync())) !== null && _c !== void 0 ? _c : undefined),
+        gitCommitHash: await ctx.vcsClient.getCommitHashAsync(),
+        gitCommitMessage: truncateGitCommitMessage((_c = (await ctx.vcsClient.getLastCommitMessageAsync())) !== null && _c !== void 0 ? _c : undefined),
         isGitWorkingTreeDirty: ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.INTERNAL
             ? false
-            : await vcsClient.hasUncommittedChangesAsync(),
+            : await ctx.vcsClient.hasUncommittedChangesAsync(),
         username: (0, projectUtils_1.getUsername)(ctx.exp, ctx.user),
         message: ctx.message,
         ...(ctx.platform === eas_build_job_1.Platform.IOS && {
@@ -51,6 +49,7 @@ async function collectMetadataAsync(ctx) {
         buildMode: ctx.buildProfile.config ? eas_build_job_1.BuildMode.CUSTOM : eas_build_job_1.BuildMode.BUILD,
         customWorkflowName: (_d = ctx.customBuildConfigMetadata) === null || _d === void 0 ? void 0 : _d.workflowName,
         developmentClient: ctx.developmentClient,
+        requiredPackageManager: (_e = ctx.requiredPackageManager) !== null && _e !== void 0 ? _e : undefined,
     };
     return (0, eas_build_job_1.sanitizeMetadata)(metadata);
 }
@@ -58,7 +57,7 @@ exports.collectMetadataAsync = collectMetadataAsync;
 async function maybeResolveVersionsAsync(ctx) {
     if (ctx.platform === eas_build_job_1.Platform.IOS) {
         const iosContext = ctx;
-        const resolvedVersion = await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.targets);
+        const resolvedVersion = await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.targets, ctx.vcsClient);
         if (iosContext.ios.buildNumberOverride) {
             return {
                 ...resolvedVersion,
@@ -69,7 +68,7 @@ async function maybeResolveVersionsAsync(ctx) {
     }
     else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
         const androidCtx = ctx;
-        const resolvedVersion = await (0, version_1.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+        const resolvedVersion = await (0, version_1.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, androidCtx.buildProfile, ctx.vcsClient);
         if (androidCtx.android.versionCodeOverride) {
             return {
                 ...resolvedVersion,

package/build/build/runBuildAndSubmit.d.ts

@@ -4,6 +4,7 @@ import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectCo
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { RequestedPlatform } from '../platform';
 import { Actor } from '../user/User';
+import { Client } from '../vcs/vcs';
 import { LocalBuildOptions } from './local';
 export interface BuildFlags {
     requestedPlatform: RequestedPlatform;
@@ -18,4 +19,4 @@ export interface BuildFlags {
     resourceClass?: ResourceClass;
     message?: string;
 }
-export declare function runBuildAndSubmitAsync(graphqlClient: ExpoGraphqlClient, analytics: Analytics, projectDir: string, flags: BuildFlags, actor: Actor, getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn): Promise<void>;
+export declare function runBuildAndSubmitAsync(graphqlClient: ExpoGraphqlClient, analytics: Analytics, vcsClient: Client, projectDir: string, flags: BuildFlags, actor: Actor, getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn): Promise<void>;