eas-cli 5.4.0 → 5.5.0

package/build/build/runBuildAndSubmit.js

@@ -30,7 +30,6 @@ const download_1 = require("../utils/download");
 const filter_1 = require("../utils/expodash/filter");
 const json_1 = require("../utils/json");
 const profiles_1 = require("../utils/profiles");
-const vcs_1 = require("../vcs");
 const build_1 = require("./android/build");
 const build_2 = require("./build");
 const configure_2 = require("./configure");
@@ -41,13 +40,14 @@ const printBuildInfo_1 = require("./utils/printBuildInfo");
 const repository_1 = require("./utils/repository");
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
-async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flags, actor, getDynamicPrivateProjectConfigAsync) {
+async function runBuildAndSubmitAsync(graphqlClient, analytics, vcsClient, projectDir, flags, actor, getDynamicPrivateProjectConfigAsync) {
     var _a, _b;
-    await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
-    await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
+    await vcsClient.ensureRepoExistsAsync();
+    await (0, repository_1.ensureRepoIsCleanAsync)(vcsClient, flags.nonInteractive);
     await (0, configure_2.ensureProjectConfiguredAsync)({
         projectDir,
         nonInteractive: flags.nonInteractive,
+        vcsClient,
     });
     const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
     const easJsonCliConfig = (_a = (await eas_json_1.EasJsonUtils.getCliConfigAsync(easJsonAccessor))) !== null && _a !== void 0 ? _a : {};
@@ -66,6 +66,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
         projectDir,
         nonInteractive: flags.nonInteractive,
         buildProfiles,
+        vcsClient,
     });
     const customBuildConfigMetadataByPlatform = {};
     for (const buildProfile of buildProfiles) {
@@ -88,6 +89,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
             actor,
             graphqlClient,
             analytics,
+            vcsClient,
             getDynamicPrivateProjectConfigAsync,
             customBuildConfigMetadata: customBuildConfigMetadataByPlatform[platform],
         });
@@ -139,8 +141,6 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
     const builds = await (0, build_2.waitForBuildEndAsync)(graphqlClient, {
         buildIds: startedBuilds.map(({ build }) => build.id),
         accountName,
-        projectDir,
-        nonInteractive: flags.nonInteractive,
     });
     if (!flags.json) {
         (0, printBuildInfo_1.printBuildResults)(builds);
@@ -165,7 +165,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
     }
 }
 exports.runBuildAndSubmitAsync = runBuildAndSubmitAsync;
-async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, easJsonCliConfig, actor, graphqlClient, analytics, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }) {
+async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, easJsonCliConfig, actor, graphqlClient, analytics, vcsClient, getDynamicPrivateProjectConfigAsync, customBuildConfigMetadata, }) {
     const buildCtx = await (0, createContext_1.createBuildContextAsync)({
         buildProfileName: buildProfile.profileName,
         resourceClassFlag: flags.resourceClass,
@@ -181,6 +181,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         actor,
         graphqlClient,
         analytics,
+        vcsClient,
         getDynamicPrivateProjectConfigAsync,
         customBuildConfigMetadata,
     });
@@ -196,6 +197,7 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
             exp: buildCtx.exp,
             projectId: buildCtx.projectId,
             projectDir,
+            vcsClient: buildCtx.vcsClient,
             sdkVersion: buildCtx.exp.sdkVersion,
             nonInteractive: flags.nonInteractive,
             buildProfile,
@@ -260,6 +262,7 @@ async function prepareAndStartSubmissionAsync({ build, buildCtx, moreBuilds, pro
         analytics: buildCtx.analytics,
         projectId: buildCtx.projectId,
         exp: buildCtx.exp,
+        vcsClient: buildCtx.vcsClient,
     });
     if (moreBuilds) {
         log_1.default.newLine();
@@ -295,7 +298,7 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(builds, flags) {
         }
     }
 }
-async function validateExpoUpdatesInstalledAsProjectDependencyAsync({ exp, graphqlClient, projectId, projectDir, buildProfile, nonInteractive, sdkVersion, }) {
+async function validateExpoUpdatesInstalledAsProjectDependencyAsync({ exp, graphqlClient, projectId, projectDir, vcsClient, buildProfile, nonInteractive, sdkVersion, }) {
     if ((0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, sdkVersion)) {
         return;
     }
@@ -316,6 +319,7 @@ async function validateExpoUpdatesInstalledAsProjectDependencyAsync({ exp, graph
                 projectId,
                 projectDir,
                 platform: platform_1.RequestedPlatform.All,
+                vcsClient,
             });
             log_1.default.withTick('Installed expo-updates and configured EAS Update.');
             throw new Error('Command must be re-run to pick up new updates configuration.');

package/build/build/utils/devClient.d.ts

@@ -1,6 +1,8 @@
 import { ProfileData } from '../../utils/profiles';
-export declare function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, nonInteractive, buildProfiles, }: {
+import { Client } from '../../vcs/vcs';
+export declare function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, vcsClient, nonInteractive, buildProfiles, }: {
     projectDir: string;
+    vcsClient: Client;
     nonInteractive?: boolean;
     buildProfiles?: ProfileData<'build'>[];
 }): Promise<void>;

package/build/build/utils/devClient.js

@@ -12,9 +12,8 @@ const platform_1 = require("../../platform");
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
 const expoCli_1 = require("../../utils/expoCli");
-const vcs_1 = require("../../vcs");
 const repository_1 = require("./repository");
-async function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, nonInteractive = false, buildProfiles = [], }) {
+async function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, vcsClient, nonInteractive = false, buildProfiles = [], }) {
     if (await isExpoDevClientInstalledAsync(projectDir)) {
         return;
     }
@@ -24,7 +23,7 @@ async function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir,
         return;
     }
     const platformsToCheck = buildProfilesWithDevelopmentClientRequired.map(({ platform }) => platform);
-    const workflowPerPlatformList = await Promise.all(platformsToCheck.map(platform => (0, workflow_1.resolveWorkflowAsync)(projectDir, platform)));
+    const workflowPerPlatformList = await Promise.all(platformsToCheck.map(platform => (0, workflow_1.resolveWorkflowAsync)(projectDir, platform, vcsClient)));
     log_1.default.newLine();
     log_1.default.error(`You want to build a development client build for platforms: ${platformsToCheck
         .map(i => chalk_1.default.bold(platform_1.appPlatformDisplayNames[(0, AppPlatform_1.toAppPlatform)(i)]))
@@ -37,7 +36,7 @@ async function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir,
             instructions: 'The command will abort unless you agree.',
         });
         if (install) {
-            await installExpoDevClientAsync(projectDir, { nonInteractive });
+            await installExpoDevClientAsync(projectDir, vcsClient, { nonInteractive });
         }
         else {
             core_1.Errors.error(`Install ${chalk_1.default.bold('expo-dev-client')} manually and come back later.`, {
@@ -73,14 +72,14 @@ async function isExpoDevClientInstalledAsync(projectDir) {
         return false;
     }
 }
-async function installExpoDevClientAsync(projectDir, { nonInteractive }) {
+async function installExpoDevClientAsync(projectDir, vcsClient, { nonInteractive }) {
     log_1.default.newLine();
     log_1.default.log(`Running ${chalk_1.default.bold('expo install expo-dev-client')}`);
     log_1.default.newLine();
     await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', 'expo-dev-client']);
     log_1.default.newLine();
-    if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
-        await (0, repository_1.reviewAndCommitChangesAsync)('Install expo-dev-client', {
+    if (await vcsClient.isCommitRequiredAsync()) {
+        await (0, repository_1.reviewAndCommitChangesAsync)(vcsClient, 'Install expo-dev-client', {
             nonInteractive,
         });
     }

package/build/build/utils/repository.d.ts

@@ -1,14 +1,15 @@
-export declare function maybeBailOnRepoStatusAsync(): Promise<void>;
-export declare function ensureRepoIsCleanAsync(nonInteractive?: boolean): Promise<void>;
-export declare function commitPromptAsync({ initialCommitMessage, commitAllFiles, }?: {
+import { Client } from '../../vcs/vcs';
+export declare function maybeBailOnRepoStatusAsync(vcsClient: Client): Promise<void>;
+export declare function ensureRepoIsCleanAsync(vcsClient: Client, nonInteractive?: boolean): Promise<void>;
+export declare function commitPromptAsync(vcsClient: Client, { initialCommitMessage, commitAllFiles, }?: {
     initialCommitMessage?: string;
     commitAllFiles?: boolean;
 }): Promise<void>;
-export declare function makeProjectTarballAsync(): Promise<{
+export declare function makeProjectTarballAsync(vcsClient: Client): Promise<{
     path: string;
     size: number;
 }>;
-export declare function reviewAndCommitChangesAsync(initialCommitMessage: string, { nonInteractive, askedFirstTime }: {
+export declare function reviewAndCommitChangesAsync(vcsClient: Client, initialCommitMessage: string, { nonInteractive, askedFirstTime }: {
     nonInteractive: boolean;
     askedFirstTime?: boolean;
 }): Promise<void>;

package/build/build/utils/repository.js

@@ -13,9 +13,8 @@ const prompts_1 = require("../../prompts");
 const files_1 = require("../../utils/files");
 const paths_1 = require("../../utils/paths");
 const timer_1 = require("../../utils/timer");
-const vcs_1 = require("../../vcs");
-async function maybeBailOnRepoStatusAsync() {
-    if (!(await (0, vcs_1.getVcsClient)().isCommitRequiredAsync())) {
+async function maybeBailOnRepoStatusAsync(vcsClient) {
+    if (!(await vcsClient.isCommitRequiredAsync())) {
         return;
     }
     log_1.default.addNewLineIfNone();
@@ -29,8 +28,8 @@ async function maybeBailOnRepoStatusAsync() {
     }
 }
 exports.maybeBailOnRepoStatusAsync = maybeBailOnRepoStatusAsync;
-async function ensureRepoIsCleanAsync(nonInteractive = false) {
-    if (!(await (0, vcs_1.getVcsClient)().isCommitRequiredAsync())) {
+async function ensureRepoIsCleanAsync(vcsClient, nonInteractive = false) {
+    if (!(await vcsClient.isCommitRequiredAsync())) {
         return;
     }
     log_1.default.addNewLineIfNone();
@@ -43,14 +42,14 @@ async function ensureRepoIsCleanAsync(nonInteractive = false) {
         message: `Commit changes to git?`,
     });
     if (answer) {
-        await commitPromptAsync({ commitAllFiles: true });
+        await commitPromptAsync(vcsClient, { commitAllFiles: true });
     }
     else {
         throw new Error('Commit all changes. Aborting...');
     }
 }
 exports.ensureRepoIsCleanAsync = ensureRepoIsCleanAsync;
-async function commitPromptAsync({ initialCommitMessage, commitAllFiles, } = {}) {
+async function commitPromptAsync(vcsClient, { initialCommitMessage, commitAllFiles, } = {}) {
     const { message } = await (0, prompts_1.promptAsync)({
         type: 'text',
         name: 'message',
@@ -58,14 +57,14 @@ async function commitPromptAsync({ initialCommitMessage, commitAllFiles, } = {})
         initial: initialCommitMessage,
         validate: (input) => input !== '',
     });
-    await (0, vcs_1.getVcsClient)().commitAsync({
+    await vcsClient.commitAsync({
         commitAllFiles,
         commitMessage: message,
         nonInteractive: false,
     });
 }
 exports.commitPromptAsync = commitPromptAsync;
-async function makeProjectTarballAsync() {
+async function makeProjectTarballAsync(vcsClient) {
     const spinner = (0, ora_1.ora)('Compressing project files');
     await fs_extra_1.default.mkdirp((0, paths_1.getTmpDirectory)());
     const shallowClonePath = path_1.default.join((0, paths_1.getTmpDirectory)(), `${(0, uuid_1.v4)()}-shallow-clone`);
@@ -81,7 +80,7 @@ async function makeProjectTarballAsync() {
     const compressTimerLabel = 'makeProjectTarballAsync';
     (0, timer_1.startTimer)(compressTimerLabel);
     try {
-        await (0, vcs_1.getVcsClient)().makeShallowCopyAsync(shallowClonePath);
+        await vcsClient.makeShallowCopyAsync(shallowClonePath);
         await tar_1.default.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
             '.',
         ]);
@@ -112,9 +111,9 @@ var ShouldCommitChanges;
     ShouldCommitChanges[ShouldCommitChanges["ShowDiffFirst"] = 1] = "ShowDiffFirst";
     ShouldCommitChanges[ShouldCommitChanges["Abort"] = 2] = "Abort";
 })(ShouldCommitChanges || (ShouldCommitChanges = {}));
-async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractive, askedFirstTime = true }) {
+async function reviewAndCommitChangesAsync(vcsClient, initialCommitMessage, { nonInteractive, askedFirstTime = true }) {
     if (process.env.EAS_BUILD_AUTOCOMMIT) {
-        await (0, vcs_1.getVcsClient)().commitAsync({
+        await vcsClient.commitAsync({
             commitMessage: initialCommitMessage,
             commitAllFiles: false,
             nonInteractive,
@@ -144,12 +143,12 @@ async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractiv
         throw new Error("Aborting, run the command again once you're ready. Make sure to commit any changes you've made.");
     }
     else if (selected === ShouldCommitChanges.Yes) {
-        await commitPromptAsync({ initialCommitMessage });
+        await commitPromptAsync(vcsClient, { initialCommitMessage });
         log_1.default.withTick('Committed changes.');
     }
     else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-        await (0, vcs_1.getVcsClient)().showDiffAsync();
-        await reviewAndCommitChangesAsync(initialCommitMessage, {
+        await vcsClient.showDiffAsync();
+        await reviewAndCommitChangesAsync(vcsClient, initialCommitMessage, {
             nonInteractive,
             askedFirstTime: false,
         });

package/build/build/utils/resourceClass.js

@@ -10,10 +10,7 @@ const log_1 = tslib_1.__importStar(require("../../log"));
 const iosResourceClassToBuildResourceClassMapping = {
     [eas_json_1.ResourceClass.DEFAULT]: generated_1.BuildResourceClass.IosDefault,
     [eas_json_1.ResourceClass.LARGE]: generated_1.BuildResourceClass.IosLarge,
-    [eas_json_1.ResourceClass.M1_EXPERIMENTAL]: generated_1.BuildResourceClass.IosMMedium,
     [eas_json_1.ResourceClass.M1_MEDIUM]: generated_1.BuildResourceClass.IosMMedium,
-    [eas_json_1.ResourceClass.M1_LARGE]: generated_1.BuildResourceClass.IosMLarge,
-    [eas_json_1.ResourceClass.INTEL_MEDIUM]: generated_1.BuildResourceClass.IosIntelMedium,
     [eas_json_1.ResourceClass.MEDIUM]: generated_1.BuildResourceClass.IosMedium,
     [eas_json_1.ResourceClass.M_MEDIUM]: generated_1.BuildResourceClass.IosMMedium,
     [eas_json_1.ResourceClass.M_LARGE]: generated_1.BuildResourceClass.IosMLarge,
@@ -35,13 +32,7 @@ async function resolveBuildResourceClassAsync(profile, platform, resourceClassFl
 }
 exports.resolveBuildResourceClassAsync = resolveBuildResourceClassAsync;
 function resolveAndroidResourceClass(selectedResourceClass) {
-    if (selectedResourceClass &&
-        [
-            eas_json_1.ResourceClass.M1_EXPERIMENTAL,
-            eas_json_1.ResourceClass.M1_MEDIUM,
-            eas_json_1.ResourceClass.M1_LARGE,
-            eas_json_1.ResourceClass.INTEL_MEDIUM,
-        ].includes(selectedResourceClass)) {
+    if (selectedResourceClass && eas_json_1.ResourceClass.M1_MEDIUM === selectedResourceClass) {
         throw new Error(`Resource class ${selectedResourceClass} is only available for iOS builds`);
     }
     const resourceClass = selectedResourceClass !== null && selectedResourceClass !== void 0 ? selectedResourceClass : eas_json_1.ResourceClass.DEFAULT;
@@ -53,10 +44,10 @@ function resolveIosResourceClass(resourceClassFlag, profileResourceClass) {
     if (resourceClassFlag === eas_json_1.ResourceClass.LARGE) {
         throw new Error(`Experimental "large" resource class for Intel iOS workers is no longer available. Remove the specified resource class to use the default, or learn more about all available resource classes: ${(0, log_1.link)('https://docs.expo.dev/build-reference/eas-json/')}`);
     }
-    if ([eas_json_1.ResourceClass.M1_EXPERIMENTAL, eas_json_1.ResourceClass.M1_MEDIUM].includes(resourceClass)) {
+    if (eas_json_1.ResourceClass.M1_MEDIUM === resourceClass) {
         log_1.default.warn(`Resource class ${chalk_1.default.bold(resourceClass)} is deprecated. Use ${chalk_1.default.bold('m-medium')} instead.`);
     }
-    if ([eas_json_1.ResourceClass.M_LARGE, eas_json_1.ResourceClass.M1_LARGE].includes(resourceClass)) {
+    if (eas_json_1.ResourceClass.M_LARGE === resourceClass) {
         log_1.default.warn(`Resource class ${chalk_1.default.bold(resourceClass)} is deprecated. Use ${chalk_1.default.bold('large')} instead.`);
     }
     return iosResourceClassToBuildResourceClassMapping[resourceClass];

package/build/build/validate.js

@@ -9,7 +9,6 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const log_1 = tslib_1.__importStar(require("../log"));
 const image_1 = require("../utils/image");
-const vcs_1 = require("../vcs");
 function checkNodeEnvVariable(ctx) {
     var _a;
     if (((_a = ctx.buildProfile.env) === null || _a === void 0 ? void 0 : _a.NODE_ENV) === 'production') {
@@ -27,11 +26,11 @@ async function checkGoogleServicesFileAsync(ctx) {
     if (!googleServicesFilePath) {
         return;
     }
-    const rootDir = path_1.default.normalize(await (0, vcs_1.getVcsClient)().getRootPathAsync());
+    const rootDir = path_1.default.normalize(await ctx.vcsClient.getRootPathAsync());
     const absGoogleServicesFilePath = path_1.default.resolve(ctx.projectDir, googleServicesFilePath);
     if ((await fs_extra_1.default.pathExists(absGoogleServicesFilePath)) &&
         (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-            (await (0, vcs_1.getVcsClient)().isFileIgnoredAsync(path_1.default.relative(rootDir, absGoogleServicesFilePath))))) {
+            (await ctx.vcsClient.isFileIgnoredAsync(path_1.default.relative(rootDir, absGoogleServicesFilePath))))) {
         log_1.default.warn(`File specified via "${ctx.platform}.googleServicesFile" field in your app.json is not checked in to your repository and won't be uploaded to the builder.`);
         log_1.default.warn(`Use EAS Secret to pass all values that you don't want to include in your version control. ${(0, log_1.learnMore)('https://docs.expo.dev/build-reference/variables/#using-secrets-in-environment-variables')}`);
         log_1.default.warn(`If you are using that file for compatibility with the classic build service (expo build) you can silence this warning by setting your build profile's env.GOOGLE_SERVICES_FILE in eas.json to any non-empty string.`);

package/build/commandUtils/EasCommand.d.ts

@@ -8,6 +8,7 @@ import { OptionalPrivateProjectConfigContextField } from './context/OptionalPriv
 import { PrivateProjectConfigContextField } from './context/PrivateProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
+import VcsClientContextField from './context/VcsClientContextField';
 export type ContextInput<T extends {
     [name: string]: any;
 } = object> = {
@@ -75,6 +76,9 @@ export default abstract class EasCommand extends Command {
         Analytics: {
             analytics: AnalyticsContextField;
         };
+        Vcs: {
+            vcsClient: VcsClientContextField;
+        };
     };
     /**
      * Context allows for subclasses (commands) to declare their prerequisites in a type-safe manner.

package/build/commandUtils/EasCommand.js

@@ -15,6 +15,7 @@ const OptionalPrivateProjectConfigContextField_1 = require("./context/OptionalPr
 const PrivateProjectConfigContextField_1 = require("./context/PrivateProjectConfigContextField");
 const ProjectDirContextField_1 = tslib_1.__importDefault(require("./context/ProjectDirContextField"));
 const SessionManagementContextField_1 = tslib_1.__importDefault(require("./context/SessionManagementContextField"));
+const VcsClientContextField_1 = tslib_1.__importDefault(require("./context/VcsClientContextField"));
 const errors_1 = require("./errors");
 const BASE_GRAPHQL_ERROR_MESSAGE = 'GraphQL request failed.';
 class EasCommand extends core_1.Command {
@@ -151,6 +152,9 @@ EasCommand.ContextOptions = {
     Analytics: {
         analytics: new AnalyticsContextField_1.default(),
     },
+    Vcs: {
+        vcsClient: new VcsClientContextField_1.default(),
+    },
 };
 /**
  * Context allows for subclasses (commands) to declare their prerequisites in a type-safe manner.

package/build/commandUtils/context/VcsClientContextField.d.ts

@@ -0,0 +1,5 @@
+import { Client } from '../../vcs/vcs';
+import ContextField from './ContextField';
+export default class VcsClientContextField extends ContextField<Client> {
+    getValueAsync(): Promise<Client>;
+}

package/build/commandUtils/context/VcsClientContextField.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const vcs_1 = require("../../vcs");
+const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
+class VcsClientContextField extends ContextField_1.default {
+    async getValueAsync() {
+        return (0, vcs_1.getVcsClient)();
+    }
+}
+exports.default = VcsClientContextField;

package/build/commands/branch/create.d.ts

@@ -11,6 +11,7 @@ export default class BranchCreate extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };

package/build/commands/branch/create.js

@@ -14,7 +14,7 @@ const json_1 = require("../../utils/json");
 class BranchCreate extends EasCommand_1.default {
     async runAsync() {
         let { args: { name }, flags: { json: jsonFlag, 'non-interactive': nonInteractive }, } = await this.parse(BranchCreate);
-        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchCreate, {
+        const { privateProjectConfig: { projectId }, loggedIn: { graphqlClient }, vcsClient, } = await this.getContextAsync(BranchCreate, {
             nonInteractive,
         });
         if (jsonFlag) {
@@ -30,7 +30,7 @@ class BranchCreate extends EasCommand_1.default {
                 type: 'text',
                 name: 'name',
                 message: 'Provide a branch name:',
-                initial: await (0, utils_1.getDefaultBranchNameAsync)(),
+                initial: await (0, utils_1.getDefaultBranchNameAsync)(vcsClient),
                 validate: value => (value ? true : validationMessage),
             }));
         }
@@ -59,4 +59,5 @@ BranchCreate.flags = {
 BranchCreate.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.Vcs,
 };

package/build/commands/build/cancel.d.ts

@@ -10,6 +10,7 @@ export default class BuildCancel extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };

package/build/commands/build/cancel.js

@@ -149,4 +149,5 @@ BuildCancel.flags = {
 BuildCancel.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.Vcs,
 };

package/build/commands/build/configure.d.ts

@@ -5,6 +5,7 @@ export default class BuildConfigure extends EasCommand {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };

package/build/commands/build/configure.js

@@ -16,16 +16,16 @@ const prompts_1 = require("../../prompts");
 const UpdatesModule_1 = require("../../update/android/UpdatesModule");
 const configure_2 = require("../../update/configure");
 const UpdatesModule_2 = require("../../update/ios/UpdatesModule");
-const vcs_1 = require("../../vcs");
 class BuildConfigure extends EasCommand_1.default {
     async runAsync() {
         var _b, _c;
         const { flags } = await this.parse(BuildConfigure);
-        const { privateProjectConfig: { exp, projectId, projectDir }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildConfigure, {
+        const { privateProjectConfig: { exp, projectId, projectDir }, loggedIn: { graphqlClient }, vcsClient, } = await this.getContextAsync(BuildConfigure, {
             nonInteractive: false,
         });
         log_1.default.log('💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.');
-        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
+        // BuildConfigure.ContextOptions.Vcs.client.getValueAsync()
+        await vcsClient.ensureRepoExistsAsync();
         const expoUpdatesIsInstalled = (0, projectUtils_1.isExpoUpdatesInstalled)(projectDir);
         const platform = (_b = flags.platform) !== null && _b !== void 0 ? _b : (await promptForPlatformAsync());
         // clean up old Android configuration
@@ -37,6 +37,7 @@ class BuildConfigure extends EasCommand_1.default {
         const didCreateEasJson = await (0, configure_1.ensureProjectConfiguredAsync)({
             projectDir,
             nonInteractive: false,
+            vcsClient,
         });
         if (didCreateEasJson && (0, projectUtils_1.isUsingEASUpdate)(exp, projectId)) {
             if ((_c = exp.updates) === null || _c === void 0 ? void 0 : _c.useClassicUpdates) {
@@ -49,15 +50,15 @@ class BuildConfigure extends EasCommand_1.default {
         // configure expo-updates
         if (expoUpdatesIsInstalled) {
             if ([platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform)) {
-                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) {
                     await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(graphqlClient, projectDir, exp, projectId);
                 }
             }
             if ([platform_1.RequestedPlatform.Ios, platform_1.RequestedPlatform.All].includes(platform)) {
-                const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
+                const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient);
                 if (workflow === eas_build_job_1.Workflow.GENERIC) {
-                    await (0, UpdatesModule_2.syncUpdatesConfigurationAsync)(graphqlClient, projectDir, exp, projectId);
+                    await (0, UpdatesModule_2.syncUpdatesConfigurationAsync)(graphqlClient, vcsClient, projectDir, exp, projectId);
                 }
             }
         }
@@ -84,6 +85,7 @@ BuildConfigure.flags = {
 BuildConfigure.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.Vcs,
 };
 async function promptForPlatformAsync() {
     log_1.default.addNewLineIfNone();

package/build/commands/build/index.d.ts

@@ -19,6 +19,7 @@ export default class Build extends EasCommand {
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
         getDynamicPublicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPublicProjectConfigContextField;

package/build/commands/build/index.js

@@ -28,7 +28,7 @@ class Build extends EasCommand_1.default {
             (0, json_1.enableJsonOutput)();
         }
         const flags = this.sanitizeFlags(rawFlags);
-        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(Build, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, vcsClient, } = await this.getContextAsync(Build, {
             nonInteractive: flags.nonInteractive,
         });
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
@@ -38,7 +38,7 @@ class Build extends EasCommand_1.default {
                 : [generated_1.StatuspageServiceName.EasBuild]);
         }
         const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
-        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, flagsWithPlatform, actor, getDynamicPrivateProjectConfigAsync);
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, vcsClient, projectDir, flagsWithPlatform, actor, getDynamicPrivateProjectConfigAsync);
     }
     sanitizeFlags(flags) {
         var _b;
@@ -183,6 +183,7 @@ Build.contextDefinition = {
     ..._a.ContextOptions.DynamicProjectConfig,
     ..._a.ContextOptions.ProjectDir,
     ..._a.ContextOptions.Analytics,
+    ..._a.ContextOptions.Vcs,
 };
 async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
     if (!(await fs_extra_1.default.pathExists(eas_json_1.EasJsonAccessor.formatEasJsonPath(projectDir)))) {

package/build/commands/build/inspect.d.ts

@@ -16,6 +16,7 @@ export default class BuildInspect extends EasCommand {
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
         getDynamicPublicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPublicProjectConfigContextField;

package/build/commands/build/inspect.js

@@ -14,7 +14,6 @@ const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
 const platform_1 = require("../../platform");
 const paths_1 = require("../../utils/paths");
-const vcs_1 = require("../../vcs");
 var InspectStage;
 (function (InspectStage) {
     InspectStage["ARCHIVE"] = "archive";
@@ -28,7 +27,7 @@ const STAGE_DESCRIPTION = `Stage of the build you want to inspect.
 class BuildInspect extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(BuildInspect);
-        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInspect, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, vcsClient, } = await this.getContextAsync(BuildInspect, {
             nonInteractive: false,
         });
         const outputDirectory = path_1.default.resolve(process.cwd(), flags.output);
@@ -38,14 +37,13 @@ class BuildInspect extends EasCommand_1.default {
         }
         await this.prepareOutputDirAsync(outputDirectory, flags.force);
         if (flags.stage === InspectStage.ARCHIVE) {
-            const vcs = (0, vcs_1.getVcsClient)();
-            await vcs.ensureRepoExistsAsync();
-            await vcs.makeShallowCopyAsync(tmpWorkingdir);
+            await vcsClient.ensureRepoExistsAsync();
+            await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
             await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
         }
         else {
             try {
-                await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, {
+                await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, vcsClient, projectDir, {
                     nonInteractive: false,
                     wait: true,
                     clearCache: false,
@@ -143,4 +141,5 @@ BuildInspect.contextDefinition = {
     ..._a.ContextOptions.DynamicProjectConfig,
     ..._a.ContextOptions.ProjectDir,
     ..._a.ContextOptions.Analytics,
+    ..._a.ContextOptions.Vcs,
 };

package/build/commands/build/internal.d.ts

@@ -12,6 +12,7 @@ export default class BuildInternal extends EasCommand {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         analytics: import("../../commandUtils/context/AnalyticsContextField").default;
         projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
         getDynamicPublicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicPublicProjectConfigContextField;

package/build/commands/build/internal.js

@@ -21,12 +21,12 @@ class BuildInternal extends EasCommand_1.default {
         const { flags } = await this.parse(BuildInternal);
         // This command is always run with implicit --non-interactive and --json options
         (0, json_1.enableJsonOutput)();
-        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInternal, {
+        const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, vcsClient, } = await this.getContextAsync(BuildInternal, {
             nonInteractive: true,
         });
         (0, vcs_1.setVcsClient)(new gitNoCommit_1.default());
         await (0, _1.handleDeprecatedEasJsonAsync)(projectDir, flags.nonInteractive);
-        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, {
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, vcsClient, projectDir, {
             requestedPlatform: flags.platform,
             profile: flags.profile,
             nonInteractive: true,
@@ -60,4 +60,5 @@ BuildInternal.contextDefinition = {
     ..._a.ContextOptions.DynamicProjectConfig,
     ..._a.ContextOptions.ProjectDir,
     ..._a.ContextOptions.Analytics,
+    ..._a.ContextOptions.Vcs,
 };

package/build/commands/build/list.d.ts

@@ -21,6 +21,7 @@ export default class BuildList extends EasCommand {
         gitCommitHash: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {
+        vcsClient: import("../../commandUtils/context/VcsClientContextField").default;
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         privateProjectConfig: import("../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
     };