eas-cli 0.33.0 → 0.35.0

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/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/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 semver_1 = (0, tslib_1.__importDefault)(require("semver"));
 const analytics_1 = require("../analytics");
+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;
+        eas_json_1.EasJsonReader.setLog(log_1.default);
         await (0, analytics_1.initAsync)();
+        await this.applyCliConfigAsync();
         if (this.requiresAuthentication) {
             const { flags } = this.parse();
             const nonInteractive = (_a = flags['non-interactive']) !== null && _a !== void 0 ? _a : false;
@@ -37,5 +47,16 @@ class EasCommand extends command_1.Command {
         await (0, analytics_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 : [];
 }

package/build/commands/branch/publish.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultPublishPlatforms = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
-const sdk_runtime_versions_1 = require("@expo/sdk-runtime-versions");
+const config_plugins_1 = require("@expo/config-plugins");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const command_1 = require("@oclif/command");
 const assert_1 = (0, tslib_1.__importDefault)(require("assert"));
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
@@ -16,11 +17,12 @@ const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const ora_1 = require("../../ora");
 const projectUtils_1 = require("../../project/projectUtils");
 const publish_1 = require("../../project/publish");
+const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
 const utils_1 = require("../../update/utils");
 const uniqBy_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const create_1 = require("./create");
 const list_1 = require("./list");
 const view_1 = require("./view");
@@ -40,7 +42,7 @@ async function getUpdateGroupAsync({ group, }) {
           }
         `, {
         group,
-    })
+    }, { additionalTypenames: ['Update'] })
         .toPromise());
     return updatesByGroup;
 }
@@ -69,11 +71,12 @@ class BranchPublish extends EasCommand_1.default {
             skipSDKVersionRequirement: true,
             isPublicConfig: true,
         });
-        const runtimeVersions = getRuntimeVersionObject(exp, platformFlag, projectDir);
+        const runtimeVersions = await getRuntimeVersionObjectAsync(exp, platformFlag, projectDir);
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         if (!branchName && autoFlag) {
             branchName =
-                (await vcs_1.default.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`;
+                (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
+                    `branch-${Math.random().toString(36).substr(2, 4)}`;
         }
         if (!branchName) {
             const validationMessage = 'branch name may not be empty.';
@@ -170,7 +173,7 @@ class BranchPublish extends EasCommand_1.default {
             }
         }
         if (!message && autoFlag) {
-            message = (_b = (await vcs_1.default.getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim();
+            message = (_b = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim();
         }
         if (!message) {
             const validationMessage = 'publish message may not be empty.';
@@ -183,7 +186,7 @@ class BranchPublish extends EasCommand_1.default {
                 message: `Please enter a publication message.`,
                 initial: republish
                     ? `Republish "${oldMessage}" - group: ${group}`
-                    : (_c = (await vcs_1.default.getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
+                    : (_c = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
                 validate: value => (value ? true : validationMessage),
             }));
         }
@@ -295,50 +298,19 @@ BranchPublish.flags = {
         default: false,
     }),
 };
-function getRuntimeVersionObject(exp, platformFlag, projectDir) {
+async function getRuntimeVersionObjectAsync(exp, platformFlag, projectDir) {
     var _a, _b;
-    let { runtimeVersion: defaultRuntimeVersion, sdkVersion } = exp;
-    // When a SDK version is supplied instead of a runtime version and we're in the managed workflow
-    // construct the runtimeVersion with special meaning indicating that the runtime is an
-    // Expo SDK preset runtime that can be launched in Expo Go.
-    const isManagedProject = (0, config_1.getDefaultTarget)(projectDir) === 'managed';
-    if (!defaultRuntimeVersion && sdkVersion && isManagedProject) {
-        log_1.default.withTick('Generating runtime version from sdk version');
-        defaultRuntimeVersion = (0, sdk_runtime_versions_1.getRuntimeVersionForSDKVersion)(sdkVersion);
-    }
-    const iOSRuntimeVersion = (_a = exp.ios) === null || _a === void 0 ? void 0 : _a.runtimeVersion; // TODO-JJ remove cast to any
-    const androidRuntimeVersion = (_b = exp.android) === null || _b === void 0 ? void 0 : _b.runtimeVersion; // TODO-JJ remove cast to any
-    let runtimeVersions;
-    switch (platformFlag) {
-        case 'ios': {
-            runtimeVersions = {
-                ios: iOSRuntimeVersion !== null && iOSRuntimeVersion !== void 0 ? iOSRuntimeVersion : defaultRuntimeVersion,
-            };
-            break;
-        }
-        case 'android': {
-            runtimeVersions = {
-                android: androidRuntimeVersion !== null && androidRuntimeVersion !== void 0 ? androidRuntimeVersion : defaultRuntimeVersion,
-            };
-            break;
-        }
-        case 'all': {
-            runtimeVersions = {
-                ios: iOSRuntimeVersion !== null && iOSRuntimeVersion !== void 0 ? iOSRuntimeVersion : defaultRuntimeVersion,
-                android: androidRuntimeVersion !== null && androidRuntimeVersion !== void 0 ? androidRuntimeVersion : defaultRuntimeVersion,
-            };
-            break;
+    const platforms = (platformFlag === 'all' ? ['android', 'ios'] : [platformFlag]);
+    for (const platform of platforms) {
+        const isPolicy = typeof ((_b = (_a = exp[platform]) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : exp.runtimeVersion) === 'object';
+        if (isPolicy) {
+            const isManaged = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform)) === eas_build_job_1.Workflow.MANAGED;
+            if (!isManaged) {
+                throw new Error('Runtime version policies are only supported in the managed workflow.');
+            }
         }
-        default:
-            throw new Error('Platform flag must be "ios", "android", or "all"');
-    }
-    if (Object.values(runtimeVersions).some(runtime => !runtime)) {
-        throw new Error("Couldn't find a 'runtimeVersion' for every platform. Please specify it under the 'expo' key in 'app.json'");
-    }
-    if (Object.values(runtimeVersions).some(runtime => typeof runtime !== 'string')) {
-        throw new Error(`Please ensure that all of the runtime versions defined in the app.json are strings.`);
     }
-    return runtimeVersions;
+    return Object.fromEntries(platforms.map(platform => [platform, config_plugins_1.Updates.getRuntimeVersion(exp, platform)]));
 }
 function formatUpdateTitle(update) {
     const { message, createdAt, actor, runtimeVersion } = update;

package/build/commands/branch/view.js

@@ -52,7 +52,7 @@ async function viewUpdateBranchAsync({ appId, name, }) {
         appId,
         name,
         limit: PAGE_LIMIT,
-    })
+    }, { additionalTypenames: ['UpdateBranch', 'Update'] })
         .toPromise());
     return data;
 }

package/build/commands/build/index.js

@@ -7,6 +7,8 @@ const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const figures_1 = (0, tslib_1.__importDefault)(require("figures"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const build_1 = require("../../build/android/build");
 const build_2 = require("../../build/build");
@@ -19,7 +21,7 @@ const repository_1 = require("../../build/utils/repository");
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const generated_1 = require("../../graphql/generated");
 const AppPlatform_1 = require("../../graphql/types/AppPlatform");
-const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const metroConfig_1 = require("../../project/metroConfig");
@@ -28,9 +30,11 @@ const prompts_1 = require("../../prompts");
 const context_2 = require("../../submit/context");
 const submit_1 = require("../../submit/submit");
 const urls_1 = require("../../submit/utils/urls");
+const easCli_1 = require("../../utils/easCli");
 const json_1 = require("../../utils/json");
 const profiles_1 = require("../../utils/profiles");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 class Build extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -46,7 +50,7 @@ class Build extends EasCommand_1.default {
         const { requestedPlatform } = flags;
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-        await vcs_1.default.ensureRepoExistsAsync();
+        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)(projectDir, requestedPlatform);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
@@ -272,28 +276,43 @@ Build.flags = {
     }),
 };
 async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
-    if (await (0, eas_json_1.isUsingDeprecatedFormatAsync)(projectDir)) {
-        const hasMismatchedExtendsKeys = await (0, eas_json_1.hasMismatchedExtendsAsync)(projectDir);
-        if (nonInteractive) {
-            log_1.default.error('We detected that your eas.json is using a deprecated format.');
-            log_1.default.error('We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json');
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
-        const confirm = await (0, prompts_1.confirmAsync)({
-            message: 'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
+    const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(projectDir);
+    if (!(await fs_extra_1.default.pathExists(easJsonPath))) {
+        return;
+    }
+    const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    const rawEasJson = await easJsonReader.readRawAsync();
+    if (rawEasJson === null || rawEasJson === void 0 ? void 0 : rawEasJson.cli) {
+        return;
+    }
+    if (nonInteractive) {
+        log_1.default.warn(`${figures_1.default.warning} Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${(0, log_1.link)('https://expo.fyi/eas-vcs-workflow')} for more information.`);
+        log_1.default.warn('This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.');
+        (0, vcs_1.setVcsClient)(new git_1.default());
+        return;
+    }
+    log_1.default.log(`${chalk_1.default.bold('eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.')} ${(0, log_1.learnMore)('https://expo.fyi/eas-vcs-workflow')}`);
+    log_1.default.log(`If you want to continue using the Git integration, you can opt in with ${chalk_1.default.bold('cli.requireCommit')} in ${chalk_1.default.bold('eas.json')} or with the following prompt.`);
+    log_1.default.newLine();
+    const mode = await (0, prompts_1.selectAsync)('Select your preferred Git integration', [
+        { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+        { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
+    ]);
+    if (mode === 'requireCommit') {
+        (0, vcs_1.setVcsClient)(new git_1.default());
+        await (0, repository_1.ensureRepoIsCleanAsync)(nonInteractive);
+    }
+    rawEasJson.cli =
+        mode === 'requireCommit'
+            ? { version: `>= ${easCli_1.easCliVersion}`, requireCommit: true }
+            : { version: `>= ${easCli_1.easCliVersion}` };
+    await fs_extra_1.default.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
+    log_1.default.withTick('Updated eas.json');
+    if (mode === 'requireCommit') {
+        await (0, vcs_1.getVcsClient)().trackFileAsync(easJsonPath);
+        await (0, repository_1.reviewAndCommitChangesAsync)('Set cli.requireCommit to true in eas.json', {
+            nonInteractive,
         });
-        if (confirm) {
-            await (0, eas_json_1.migrateAsync)(projectDir);
-            if (hasMismatchedExtendsKeys) {
-                log_1.default.warn('"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms');
-                log_1.default.warn('Migration was successful, but you need to manually adjust the extend rules for your profiles');
-                (0, errors_1.error)('Fix eas.json manually', { exit: 1 });
-            }
-        }
-        else {
-            log_1.default.error("Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again");
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
     }
 }
 exports.handleDeprecatedEasJsonAsync = handleDeprecatedEasJsonAsync;

package/build/commands/channel/edit.js

@@ -30,7 +30,7 @@ async function getChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] })
         .toPromise());
     const updateChannelByNameResult = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName;
     if (!updateChannelByNameResult) {

package/build/commands/channel/list.js

@@ -47,7 +47,7 @@ async function getAllUpdateChannelForAppAsync({ appId, }) {
               }
             }
           }
-        `, { appId, offset: 0, limit: CHANNEL_LIMIT })
+        `, { appId, offset: 0, limit: CHANNEL_LIMIT }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 class ChannelList extends EasCommand_1.default {

package/build/commands/channel/view.js

@@ -101,7 +101,7 @@ async function getUpdateChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 exports.getUpdateChannelByNameForAppAsync = getUpdateChannelByNameForAppAsync;

package/build/commands/diagnostics.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const envinfo_1 = (0, tslib_1.__importDefault)(require("envinfo"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../commandUtils/EasCommand"));
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
-const packageJSON = require('../../package.json');
+const easCli_1 = require("../utils/easCli");
 class Diagnostics extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -28,7 +28,7 @@ class Diagnostics extends EasCommand_1.default {
             ],
             npmGlobalPackages: ['eas-cli', 'expo-cli'],
         }, {
-            title: `EAS CLI ${packageJSON.version} environment info`,
+            title: `EAS CLI ${easCli_1.easCliVersion} environment info`,
         });
         log_1.default.log(info);
     }

package/build/commands/project/info.js

@@ -19,7 +19,7 @@ async function projectInfoByIdAsync(appId) {
               }
             }
           }
-        `, { appId })
+        `, { appId }, { additionalTypenames: ['App'] })
         .toPromise());
     return data;
 }

package/build/commands/secret/delete.js

@@ -59,7 +59,7 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
 }
 exports.default = EnvironmentSecretDelete;
 EnvironmentSecretDelete.description = `Delete an environment secret by ID.
-Unsure where to find the secret's ID? Run ${chalk_1.default.bold('eas secrets:list')}`;
+Unsure where to find the secret's ID? Run ${chalk_1.default.bold('eas secret:list')}`;
 EnvironmentSecretDelete.flags = {
     id: command_1.flags.string({
         description: 'ID of the secret to delete',