eas-cli 0.33.1 → 0.36.0

package/build/build/configure.js

@@ -13,7 +13,8 @@ const platform_1 = require("../platform");
 const workflow_1 = require("../project/workflow");
 const prompts_1 = require("../prompts");
 const actions_1 = require("../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const easCli_1 = require("../utils/easCli");
+const vcs_1 = require("../vcs");
 const configure_1 = require("./android/configure");
 const configure_2 = require("./ios/configure");
 const repository_1 = require("./utils/repository");
@@ -33,7 +34,7 @@ async function ensureProjectConfiguredAsync(projectDir, requestedPlatform) {
             projectDir,
             platform: requestedPlatform,
         });
-        if (await vcs_1.default.hasUncommittedChangesAsync()) {
+        if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
             (0, errors_1.error)('Build process requires clean working tree, please commit all your changes and run `eas build` again', { exit: 1 });
         }
     }
@@ -43,7 +44,7 @@ async function ensureProjectConfiguredAsync(projectDir, requestedPlatform) {
 }
 exports.ensureProjectConfiguredAsync = ensureProjectConfiguredAsync;
 async function configureAsync(options) {
-    await vcs_1.default.ensureRepoExistsAsync();
+    await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
     await (0, repository_1.maybeBailOnRepoStatusAsync)();
     const { exp } = (0, config_1.getConfig)(options.projectDir, { skipSDKVersionRequirement: true });
     const ctx = {
@@ -64,17 +65,20 @@ async function configureAsync(options) {
     if (ctx.shouldConfigureIos) {
         await (0, configure_2.configureIosAsync)(ctx);
     }
-    if (await vcs_1.default.hasUncommittedChangesAsync()) {
+    if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
         log_1.default.newLine();
         await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
     }
-    else {
+    else if (!(await (0, vcs_1.getVcsClient)().hasUncommittedChangesAsync())) {
         log_1.default.newLine();
         log_1.default.withTick('No changes were necessary, the project is already configured correctly.');
     }
 }
 exports.configureAsync = configureAsync;
 const EAS_JSON_MANAGED_DEFAULT = {
+    cli: {
+        version: `>= ${easCli_1.easCliVersion}`,
+    },
     build: {
         development: {
             developmentClient: true,
@@ -90,6 +94,9 @@ const EAS_JSON_MANAGED_DEFAULT = {
     },
 };
 const EAS_JSON_BARE_DEFAULT = {
+    cli: {
+        version: `>= ${easCli_1.easCliVersion}`,
+    },
     build: {
         development: {
             distribution: 'internal',
@@ -121,7 +128,7 @@ async function ensureEasJsonExistsAsync(ctx) {
         ? EAS_JSON_BARE_DEFAULT
         : EAS_JSON_MANAGED_DEFAULT;
     await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-    await vcs_1.default.trackFileAsync(easJsonPath);
+    await (0, vcs_1.getVcsClient)().trackFileAsync(easJsonPath);
     log_1.default.withTick('Generated eas.json');
 }
 exports.ensureEasJsonExistsAsync = ensureEasJsonExistsAsync;
@@ -152,7 +159,7 @@ async function reviewAndCommitChangesAsync(initialCommitMessage, askedFirstTime
         log_1.default.withTick('Committed changes');
     }
     else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-        await vcs_1.default.showDiffAsync();
+        await (0, vcs_1.getVcsClient)().showDiffAsync();
         await reviewAndCommitChangesAsync(initialCommitMessage, false);
     }
 }

package/build/build/context.d.ts

@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { RequestedPlatform } from '../platform';
 import { Actor } from '../user/User';
-import { TrackingContext } from './types';
 export interface ConfigureContext {
     user: Actor;
     projectDir: string;

package/build/build/context.js

@@ -6,13 +6,13 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
 const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
 const uuid_1 = require("uuid");
+const events_1 = require("../analytics/events");
 const context_1 = require("../credentials/context");
 const expoConfig_1 = require("../project/expoConfig");
 const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
 const Account_1 = require("../user/Account");
 const actions_1 = require("../user/actions");
-const analytics_1 = (0, tslib_1.__importStar)(require("./utils/analytics"));
 async function createBuildContextAsync({ buildProfileName, buildProfile, clearCache = false, local, nonInteractive = false, platform, projectDir, skipProjectConfiguration = false, }) {
     var _a;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
@@ -42,7 +42,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
         project_type: workflow,
         ...devClientProperties,
     };
-    analytics_1.default.logEvent(analytics_1.Event.BUILD_COMMAND, trackingCtx);
+    events_1.Analytics.logEvent(events_1.BuildEvent.BUILD_COMMAND, trackingCtx);
     return {
         accountName,
         buildProfile,

package/build/build/ios/UpdatesModule.js

@@ -6,7 +6,7 @@ const config_plugins_1 = require("@expo/config-plugins");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const updates_1 = require("../utils/updates");
 const plist_1 = require("./plist");
 async function configureUpdatesAsync(projectDir, exp) {
@@ -55,7 +55,7 @@ async function readExpoPlistAsync(projectDir) {
 async function writeExpoPlistAsync(projectDir, expoPlist) {
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);
     await (0, plist_1.writePlistAsync)(expoPlistPath, expoPlist);
-    await vcs_1.default.trackFileAsync(expoPlistPath);
+    await (0, vcs_1.getVcsClient)().trackFileAsync(expoPlistPath);
 }
 async function readReleaseChannelSafelyAsync(projectDir) {
     var _a;

package/build/build/ios/credentials.js

@@ -8,7 +8,7 @@ const BuildCredentialsUtils_1 = require("../../credentials/ios/actions/BuildCred
 const entitlements_1 = require("../../credentials/ios/appstore/entitlements");
 const credentials_1 = require("../utils/credentials");
 async function ensureIosCredentialsAsync(buildCtx, targets) {
-    var _a;
+    var _a, _b;
     if (!shouldProvideCredentials(buildCtx)) {
         return;
     }
@@ -16,9 +16,9 @@ async function ensureIosCredentialsAsync(buildCtx, targets) {
         app: (0, BuildCredentialsUtils_1.getAppFromContext)(buildCtx.credentialsCtx),
         targets,
         iosCapabilitiesOptions: {
-            entitlements: await (0, entitlements_1.resolveEntitlementsJsonAsync)(buildCtx.projectDir, buildCtx.workflow),
+            entitlements: await (0, entitlements_1.resolveEntitlementsJsonAsync)(buildCtx.projectDir, buildCtx.workflow, (_a = buildCtx.buildProfile.env) !== null && _a !== void 0 ? _a : {}),
         },
-        distribution: (_a = buildCtx.buildProfile.distribution) !== null && _a !== void 0 ? _a : 'store',
+        distribution: (_b = buildCtx.buildProfile.distribution) !== null && _b !== void 0 ? _b : 'store',
         enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
     });
     const { credentialsSource } = buildCtx.buildProfile;

package/build/build/ios/graphql.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformJob = void 0;
 const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
-const generated_1 = require("../../graphql/generated");
 const graphql_1 = require("../graphql");
 function transformJob(job) {
     return {
@@ -13,29 +11,18 @@ function transformJob(job) {
         projectRootDirectory: job.projectRootDirectory,
         releaseChannel: job.releaseChannel,
         updates: job.updates,
-        distribution: job.distribution && transformDistributionType(job.distribution),
         secrets: transformIosSecrets(job.secrets),
         builderEnvironment: job.builderEnvironment,
         cache: job.cache,
         scheme: job.scheme,
         buildConfiguration: job.buildConfiguration,
         artifactPath: job.artifactPath,
-        buildType: job.buildType && transformBuildType(job.buildType),
         username: job.username,
+        developmentClient: job.developmentClient,
+        simulator: job.simulator,
     };
 }
 exports.transformJob = transformJob;
-function transformDistributionType(distributionType) {
-    if (distributionType === 'store') {
-        return generated_1.DistributionType.Store;
-    }
-    else if (distributionType === 'internal') {
-        return generated_1.DistributionType.Internal;
-    }
-    else {
-        return generated_1.DistributionType.Simulator;
-    }
-}
 function transformIosSecrets(secrets) {
     var _a, _b, _c;
     const buildCredentials = [];
@@ -53,11 +40,3 @@ function transformIosSecrets(secrets) {
         environmentSecrets: secrets.env,
     };
 }
-function transformBuildType(buildType) {
-    if (buildType === eas_build_job_1.Ios.BuildType.DEVELOPMENT_CLIENT) {
-        return generated_1.IosBuildType.DevelopmentClient;
-    }
-    else {
-        return generated_1.IosBuildType.Release;
-    }
-}

package/build/build/ios/prepareJob.js

@@ -7,14 +7,14 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const slash_1 = (0, tslib_1.__importDefault)(require("slash"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const cacheDefaults = {
     disabled: false,
     customPaths: [],
     cacheDefaultPaths: true,
 };
 async function prepareJobAsync(ctx, jobData) {
-    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir)) || '.';
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await (0, vcs_1.getVcsClient)().getRootPathAsync(), ctx.projectDir)) || '.';
     const username = (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)());
     const buildCredentials = {};
     if (jobData.credentials) {
@@ -28,7 +28,6 @@ async function prepareJobAsync(ctx, jobData) {
         platform: eas_build_job_1.Platform.IOS,
         projectArchive: jobData.projectArchive,
         projectRootDirectory,
-        distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
         builderEnvironment: {
             image: ctx.buildProfile.image,
             node: ctx.buildProfile.node,
@@ -49,12 +48,11 @@ async function prepareJobAsync(ctx, jobData) {
         },
         releaseChannel: ctx.buildProfile.releaseChannel,
         updates: { channel: ctx.buildProfile.channel },
+        developmentClient: ctx.buildProfile.developmentClient,
+        simulator: ctx.buildProfile.simulator,
         scheme: jobData.buildScheme,
         buildConfiguration: ctx.buildProfile.buildConfiguration,
         artifactPath: ctx.buildProfile.artifactPath,
-        buildType: ctx.buildProfile.developmentClient
-            ? eas_build_job_1.Ios.BuildType.DEVELOPMENT_CLIENT
-            : eas_build_job_1.Ios.BuildType.RELEASE,
         username,
     };
     return (0, eas_build_job_1.sanitizeJob)(job);

package/build/build/local.js

@@ -3,36 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runLocalBuildAsync = void 0;
 const tslib_1 = require("tslib");
 const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
+const PLUGIN_PACKAGE_VERSION = '0.0.47';
 async function runLocalBuildAsync(job) {
-    var _a, _b;
-    const execNameOrPath = (_b = (_a = process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) !== null && _a !== void 0 ? _a : (await findWithNodeResolutionAsync())) !== null && _b !== void 0 ? _b : PLUGIN_PACKAGE_NAME;
-    try {
-        const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
-        await (0, spawn_async_1.default)(execNameOrPath, [arg], {
-            stdio: 'inherit',
-        });
-    }
-    catch (err) {
-        if (err.code === 'ENOENT') {
-            log_1.default.warn(`Could not resolve executable ${execNameOrPath}.`);
-            log_1.default.warn(`Install ${PLUGIN_PACKAGE_NAME} package from npm e.g. ${chalk_1.default.bold(`npm install -g ${PLUGIN_PACKAGE_NAME}`)} and make sure it's in PATH.`);
-            throw err;
-        }
-    }
+    const { command, args } = getCommandAndArgs(job);
+    await (0, spawn_async_1.default)(command, args, {
+        stdio: 'inherit',
+    });
 }
 exports.runLocalBuildAsync = runLocalBuildAsync;
-async function findWithNodeResolutionAsync() {
-    try {
-        const resolvedPath = path_1.default.resolve(path_1.default.dirname(require.resolve(PLUGIN_PACKAGE_NAME)), '../bin/run');
-        if (await fs_extra_1.default.pathExists(resolvedPath)) {
-            return resolvedPath;
-        }
+function getCommandAndArgs(job) {
+    const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+    if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
+        return {
+            command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
+            args: [jobBase64],
+        };
+    }
+    else {
+        return {
+            command: 'npx',
+            args: ['-y', `${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64],
+        };
     }
-    catch { }
-    return undefined;
 }

package/build/build/metadata.js

@@ -1,24 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectMetadataAsync = void 0;
-const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const applicationId_1 = require("../project/android/applicationId");
 const bundleIdentifier_1 = require("../project/ios/bundleIdentifier");
 const projectUtils_1 = require("../project/projectUtils");
 const actions_1 = require("../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const easCli_1 = require("../utils/easCli");
+const vcs_1 = require("../vcs");
 const UpdatesModule_1 = require("./android/UpdatesModule");
 const version_1 = require("./android/version");
 const UpdatesModule_2 = require("./ios/UpdatesModule");
 const version_2 = require("./ios/version");
 const updates_1 = require("./utils/updates");
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../../package.json');
 async function collectMetadataAsync(ctx, platformContext) {
     var _a;
     const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
@@ -28,7 +22,7 @@ async function collectMetadataAsync(ctx, platformContext) {
     const metadata = {
         trackingContext: ctx.trackingCtx,
         ...(await maybeResolveVersionsAsync(ctx, platformContext)),
-        cliVersion: packageJSON.version,
+        cliVersion: easCli_1.easCliVersion,
         workflow: ctx.workflow,
         credentialsSource: ctx.buildProfile.credentialsSource,
         sdkVersion: ctx.exp.sdkVersion,
@@ -38,7 +32,8 @@ async function collectMetadataAsync(ctx, platformContext) {
         appName: ctx.exp.name,
         appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
         buildProfile: ctx.buildProfileName,
-        gitCommitHash: await vcs_1.default.getCommitHashAsync(),
+        gitCommitHash: await (0, vcs_1.getVcsClient)().getCommitHashAsync(),
+        isGitWorkingTreeDirty: await (0, vcs_1.getVcsClient)().hasUncommittedChangesAsync(),
         username: (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)()),
         ...(ctx.platform === eas_build_job_1.Platform.IOS && {
             iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(ctx),

package/build/build/types.d.ts

@@ -11,4 +11,3 @@ export declare enum BuildDistributionType {
     INTERNAL = "internal",
     SIMULATOR = "simulator"
 }
-export declare type TrackingContext = Record<string, string | number | boolean>;

package/build/build/utils/devClient.js

@@ -11,7 +11,8 @@ const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
-const expoCommand_1 = require("../../utils/expoCommand");
+const expoCli_1 = require("../../utils/expoCli");
+const vcs_1 = require("../../vcs");
 const repository_1 = require("./repository");
 async function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, nonInteractive = false, buildProfiles = [], }) {
     if (await isExpoDevClientInstalledAsync(projectDir)) {
@@ -76,9 +77,11 @@ async function installExpoDevClientAsync(projectDir, { 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, expoCommand_1.expoCommandAsync)(projectDir, ['install', 'expo-dev-client']);
+    await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', 'expo-dev-client']);
     log_1.default.newLine();
-    await (0, repository_1.reviewAndCommitChangesAsync)('Install expo-dev-client', {
-        nonInteractive,
-    });
+    if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
+        await (0, repository_1.reviewAndCommitChangesAsync)('Install expo-dev-client', {
+            nonInteractive,
+        });
+    }
 }

package/build/build/utils/formatBuild.js

@@ -117,13 +117,5 @@ function formatGraphQLBuild(build) {
 exports.formatGraphQLBuild = formatGraphQLBuild;
 const getActorName = (build) => {
     var _a;
-    if (!build.initiatingActor) {
-        return 'unknown';
-    }
-    else if (build.initiatingActor.__typename === 'User') {
-        return build.initiatingActor.username;
-    }
-    else {
-        return (_a = build.initiatingActor.firstName) !== null && _a !== void 0 ? _a : 'unknown';
-    }
+    return ((_a = build.initiatingActor) === null || _a === void 0 ? void 0 : _a.displayName) || 'unknown';
 };

package/build/build/utils/repository.js

@@ -13,9 +13,9 @@ 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 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 async function maybeBailOnRepoStatusAsync() {
-    if (!(await vcs_1.default.hasUncommittedChangesAsync())) {
+    if (!(await (0, vcs_1.getVcsClient)().isCommitRequiredAsync())) {
         return;
     }
     log_1.default.addNewLineIfNone();
@@ -30,7 +30,7 @@ async function maybeBailOnRepoStatusAsync() {
 }
 exports.maybeBailOnRepoStatusAsync = maybeBailOnRepoStatusAsync;
 async function ensureRepoIsCleanAsync(nonInteractive = false) {
-    if (!(await vcs_1.default.hasUncommittedChangesAsync())) {
+    if (!(await (0, vcs_1.getVcsClient)().isCommitRequiredAsync())) {
         return;
     }
     log_1.default.addNewLineIfNone();
@@ -58,7 +58,7 @@ async function commitPromptAsync({ initialCommitMessage, commitAllFiles, } = {})
         initial: initialCommitMessage,
         validate: (input) => input !== '',
     });
-    await vcs_1.default.commitAsync({ commitAllFiles, commitMessage: message });
+    await (0, vcs_1.getVcsClient)().commitAsync({ commitAllFiles, commitMessage: message });
 }
 exports.commitPromptAsync = commitPromptAsync;
 async function makeProjectTarballAsync() {
@@ -77,7 +77,7 @@ async function makeProjectTarballAsync() {
     const compressTimerLabel = 'makeProjectTarballAsync';
     (0, timer_1.startTimer)(compressTimerLabel);
     try {
-        await vcs_1.default.makeShallowCopyAsync(shallowClonePath);
+        await (0, vcs_1.getVcsClient)().makeShallowCopyAsync(shallowClonePath);
         await tar_1.default.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
             '.',
         ]);
@@ -110,7 +110,10 @@ var ShouldCommitChanges;
 })(ShouldCommitChanges || (ShouldCommitChanges = {}));
 async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractive, askedFirstTime = true }) {
     if (process.env.EAS_BUILD_AUTOCOMMIT) {
-        await vcs_1.default.commitAsync({ commitMessage: initialCommitMessage, commitAllFiles: false });
+        await (0, vcs_1.getVcsClient)().commitAsync({
+            commitMessage: initialCommitMessage,
+            commitAllFiles: false,
+        });
         log_1.default.withTick('Committed changes.');
         return;
     }
@@ -140,7 +143,7 @@ async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractiv
         log_1.default.withTick('Committed changes.');
     }
     else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-        await vcs_1.default.showDiffAsync();
+        await (0, vcs_1.getVcsClient)().showDiffAsync();
         await reviewAndCommitChangesAsync(initialCommitMessage, {
             nonInteractive,
             askedFirstTime: false,

package/build/build/utils/url.js

@@ -26,7 +26,7 @@ exports.getArtifactUrl = getArtifactUrl;
 function getInternalDistributionInstallUrl(build) {
     var _a;
     if (build.platform === generated_1.AppPlatform.Ios) {
-        return `itms-services://?action=download-manifest;url=${(0, api_1.getExpoApiBaseUrl)()}/--/api/v2/projects/${build.project.id}/builds/${build.id}/manifest.plist`;
+        return `itms-services://?action=download-manifest;url=${(0, api_1.getExpoApiBaseUrl)()}/v2/projects/${build.project.id}/builds/${build.id}/manifest.plist`;
     }
     (0, assert_1.default)((_a = build.artifacts) === null || _a === void 0 ? void 0 : _a.buildUrl, 'buildUrl is missing');
     return build.artifacts.buildUrl;

package/build/build/validate.js

@@ -6,7 +6,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+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') {
@@ -24,14 +24,14 @@ async function checkGoogleServicesFileAsync(ctx) {
     if (!googleServicesFilePath) {
         return;
     }
-    const rootDir = path_1.default.normalize(await vcs_1.default.getRootPathAsync());
+    const rootDir = path_1.default.normalize(await (0, vcs_1.getVcsClient)().getRootPathAsync());
     const absGoogleServicesFilePath = path_1.default.resolve(ctx.projectDir, googleServicesFilePath);
     if ((await fs_extra_1.default.pathExists(absGoogleServicesFilePath)) &&
         (!isInsideDirectory(absGoogleServicesFilePath, rootDir) ||
-            (await vcs_1.default.isFileIgnoredAsync(path_1.default.relative(rootDir, absGoogleServicesFilePath))))) {
+            (await (0, vcs_1.getVcsClient)().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 GOOGLE_SERVICES_FILE in your build profile in eas.json to any non-falsy value.');
+        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.`);
         log_1.default.newLine();
     }
 }

package/build/commandUtils/EasCommand.d.ts

@@ -8,4 +8,5 @@ export default abstract class EasCommand extends Command {
     protected abstract runAsync(): Promise<any>;
     run(): Promise<any>;
     finally(err: Error): Promise<any>;
+    private applyCliConfigAsync;
 }

package/build/commandUtils/EasCommand.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
-const analytics_1 = require("../analytics");
+const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
+const rudderstackClient_1 = require("../analytics/rudderstackClient");
+const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const projectUtils_1 = require("../project/projectUtils");
 const User_1 = require("../user/User");
 const actions_1 = require("../user/actions");
+const easCli_1 = require("../utils/easCli");
+const vcs_1 = require("../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../vcs/clients/git"));
 class EasCommand extends command_1.Command {
     constructor() {
         super(...arguments);
@@ -16,7 +24,9 @@ class EasCommand extends command_1.Command {
     // eslint-disable-next-line async-protect/async-suffix
     async run() {
         var _a;
-        await (0, analytics_1.initAsync)();
+        eas_json_1.EasJsonReader.setLog(log_1.default);
+        await (0, rudderstackClient_1.initAsync)();
+        await this.applyCliConfigAsync();
         if (this.requiresAuthentication) {
             const { flags } = this.parse();
             const nonInteractive = (_a = flags['non-interactive']) !== null && _a !== void 0 ? _a : false;
@@ -25,7 +35,7 @@ class EasCommand extends command_1.Command {
         else {
             await (0, User_1.getUserAsync)();
         }
-        (0, analytics_1.logEvent)(analytics_1.AnalyticsEvent.ACTION, {
+        (0, rudderstackClient_1.logEvent)(rudderstackClient_1.AnalyticsEvent.ACTION, {
             // id is assigned by oclif in constructor based on the filepath:
             // commands/submit === submit, commands/build/list === build:list
             action: `eas ${this.id}`,
@@ -34,8 +44,19 @@ class EasCommand extends command_1.Command {
     }
     // eslint-disable-next-line async-protect/async-suffix
     async finally(err) {
-        await (0, analytics_1.flushAsync)();
+        await (0, rudderstackClient_1.flushAsync)();
         return super.finally(err);
     }
+    async applyCliConfigAsync() {
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        const config = await easJsonReader.getCliConfigAsync();
+        if ((config === null || config === void 0 ? void 0 : config.version) && !semver_1.default.satisfies(easCli_1.easCliVersion, config.version)) {
+            throw new Error(`You are on eas-cli@${easCli_1.easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`);
+        }
+        if (config === null || config === void 0 ? void 0 : config.requireCommit) {
+            (0, vcs_1.setVcsClient)(new git_1.default());
+        }
+    }
 }
 exports.default = EasCommand;

package/build/commands/branch/create.js

@@ -11,7 +11,7 @@ const client_1 = require("../../graphql/client");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 async function createUpdateBranchOnAppAsync({ appId, name, }) {
     const result = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
         .mutation((0, graphql_tag_1.default) `
@@ -51,7 +51,8 @@ class BranchCreate extends EasCommand_1.default {
                 type: 'text',
                 name: 'name',
                 message: 'Please name the branch:',
-                initial: (await vcs_1.default.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`,
+                initial: (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
+                    `branch-${Math.random().toString(36).substr(2, 4)}`,
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/branch/delete.js

@@ -27,7 +27,7 @@ async function getBranchInfoAsync({ appId, name, }) {
         `, {
         appId,
         name,
-    })
+    }, { additionalTypenames: ['UpdateBranch'] })
         .toPromise());
     return data;
 }

package/build/commands/branch/list.js

@@ -34,7 +34,7 @@ async function listBranchesAsync({ projectId, }) {
         `, {
         appId: projectId,
         limit: BRANCHES_LIMIT,
-    })
+    }, { additionalTypenames: ['UpdateBranch'] })
         .toPromise());
     return (_b = (_a = data === null || data === void 0 ? void 0 : data.app) === null || _a === void 0 ? void 0 : _a.byId.updateBranches) !== null && _b !== void 0 ? _b : [];
 }