eas-cli 0.55.1 → 0.58.0

package/build/build/ios/version.js

@@ -1,15 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.evaluateTemplateString = exports.getInfoPlistPath = exports.maybeResolveVersionsAsync = exports.readBuildNumberAsync = exports.readShortVersionAsync = exports.bumpVersionInAppJsonAsync = exports.bumpVersionAsync = exports.BumpStrategy = void 0;
+exports.resolveRemoteBuildNumberAsync = exports.evaluateTemplateString = exports.updateNativeVersionsAsync = exports.getInfoPlistPath = exports.maybeResolveVersionsAsync = exports.readBuildNumberAsync = exports.readShortVersionAsync = exports.bumpVersionInAppJsonAsync = exports.bumpVersionAsync = exports.BumpStrategy = void 0;
 const tslib_1 = require("tslib");
-const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const generated_1 = require("../../graphql/generated");
+const AppVersionMutation_1 = require("../../graphql/mutations/AppVersionMutation");
+const AppVersionQuery_1 = require("../../graphql/queries/AppVersionQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const ora_1 = require("../../ora");
+const target_1 = require("../../project/ios/target");
+const versions_1 = require("../../project/ios/versions");
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
+const uniqBy_1 = tslib_1.__importDefault(require("../../utils/expodash/uniqBy"));
 const plist_1 = require("../../utils/plist");
 const appJson_1 = require("../utils/appJson");
 const version_1 = require("../utils/version");
@@ -19,15 +25,20 @@ var BumpStrategy;
     BumpStrategy[BumpStrategy["BUILD_NUMBER"] = 1] = "BUILD_NUMBER";
     BumpStrategy[BumpStrategy["NOOP"] = 2] = "NOOP";
 })(BumpStrategy = exports.BumpStrategy || (exports.BumpStrategy = {}));
-async function bumpVersionAsync({ bumpStrategy, projectDir, exp, buildSettings, }) {
+async function bumpVersionAsync({ bumpStrategy, projectDir, exp, targets, }) {
+    var _a;
     if (bumpStrategy === BumpStrategy.NOOP) {
         return;
     }
-    ensureStaticConfigExists(projectDir);
-    const infoPlist = await readInfoPlistAsync(projectDir, buildSettings);
+    (0, version_1.ensureStaticConfigExists)(projectDir);
     await bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp });
     log_1.default.log('Updated versions in app.json');
-    await writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings });
+    await updateNativeVersionsAsync({
+        projectDir,
+        version: exp.version,
+        buildNumber: (_a = exp.ios) === null || _a === void 0 ? void 0 : _a.buildNumber,
+        targets,
+    });
     log_1.default.log('Synchronized versions with Info.plist');
 }
 exports.bumpVersionAsync = bumpVersionAsync;
@@ -35,7 +46,7 @@ async function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }) {
     if (bumpStrategy === BumpStrategy.NOOP) {
         return;
     }
-    ensureStaticConfigExists(projectDir);
+    (0, version_1.ensureStaticConfigExists)(projectDir);
     log_1.default.addNewLineIfNone();
     if (bumpStrategy === BumpStrategy.APP_VERSION) {
         const appVersion = config_plugins_1.IOSConfig.Version.getVersion(exp);
@@ -43,10 +54,8 @@ async function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }) {
     }
     else {
         const buildNumber = config_plugins_1.IOSConfig.Version.getBuildNumber(exp);
-        if (buildNumber.match(/^\d+(\.\d+)*$/)) {
-            const comps = buildNumber.split('.');
-            comps[comps.length - 1] = String(Number(comps[comps.length - 1]) + 1);
-            const bumpedBuildNumber = comps.join('.');
+        if ((0, versions_1.isValidBuildNumber)(buildNumber)) {
+            const bumpedBuildNumber = (0, versions_1.getNextBuildNumber)(buildNumber);
             log_1.default.log(`Bumping ${chalk_1.default.bold('expo.ios.buildNumber')} from ${chalk_1.default.bold(buildNumber)} to ${chalk_1.default.bold(bumpedBuildNumber)}`);
             await (0, appJson_1.updateAppJsonConfigAsync)({ projectDir, exp }, config => {
                 config.ios = { ...config.ios, buildNumber: String(bumpedBuildNumber) };
@@ -89,11 +98,13 @@ async function readBuildNumberAsync(projectDir, exp, buildSettings) {
     }
 }
 exports.readBuildNumberAsync = readBuildNumberAsync;
-async function maybeResolveVersionsAsync(projectDir, exp, buildSettings) {
+async function maybeResolveVersionsAsync(projectDir, exp, targets) {
+    var _a, _b;
+    const applicationTarget = (0, target_1.findApplicationTarget)(targets);
     try {
         return {
-            appBuildVersion: await readBuildNumberAsync(projectDir, exp, buildSettings),
-            appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
+            appBuildVersion: await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {}),
+            appVersion: await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {}),
         };
     }
     catch (err) {
@@ -105,12 +116,6 @@ async function maybeResolveVersionsAsync(projectDir, exp, buildSettings) {
     }
 }
 exports.maybeResolveVersionsAsync = maybeResolveVersionsAsync;
-async function writeVersionsToInfoPlistAsync({ projectDir, exp, infoPlist, buildSettings, }) {
-    let updatedInfoPlist = config_plugins_1.IOSConfig.Version.setVersion(exp, infoPlist);
-    updatedInfoPlist = config_plugins_1.IOSConfig.Version.setBuildNumber(exp, updatedInfoPlist);
-    await writeInfoPlistAsync({ projectDir, infoPlist: updatedInfoPlist, buildSettings });
-    return updatedInfoPlist;
-}
 function getInfoPlistPath(projectDir, buildSettings) {
     if (buildSettings.INFOPLIST_FILE) {
         const infoPlistFile = buildSettings.INFOPLIST_FILE.startsWith('"')
@@ -133,15 +138,43 @@ async function readInfoPlistAsync(projectDir, buildSettings) {
     const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
     return ((_a = (await (0, plist_1.readPlistAsync)(infoPlistPath))) !== null && _a !== void 0 ? _a : {});
 }
-async function writeInfoPlistAsync({ projectDir, infoPlist, buildSettings, }) {
-    const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-    await (0, plist_1.writePlistAsync)(infoPlistPath, infoPlist);
-}
-function ensureStaticConfigExists(projectDir) {
-    const paths = (0, config_1.getConfigFilePaths)(projectDir);
-    if (!paths.staticConfigPath) {
-        throw new Error('autoIncrement option is not supported when using app.config.js');
+async function updateNativeVersionsAsync({ projectDir, version, buildNumber, targets, }) {
+    var _a;
+    const project = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(projectDir);
+    const iosDir = path_1.default.join(projectDir, 'ios');
+    const infoPlistFiles = [];
+    for (const target of targets) {
+        const { targetName, buildConfiguration } = target;
+        const xcBuildConfiguration = config_plugins_1.IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
+            targetName,
+            buildConfiguration,
+        });
+        const infoPlist = (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) === null || _a === void 0 ? void 0 : _a.INFOPLIST_FILE;
+        if (infoPlist) {
+            const evaluatedInfoPlistPath = trimQuotes(evaluateTemplateString(infoPlist, {
+                SRCROOT: iosDir,
+            }));
+            const absolutePath = path_1.default.isAbsolute(evaluatedInfoPlistPath)
+                ? evaluatedInfoPlistPath
+                : path_1.default.join(iosDir, evaluatedInfoPlistPath);
+            infoPlistFiles.push(path_1.default.normalize(absolutePath));
+        }
     }
+    const uniqueInfoPlistPaths = (0, uniqBy_1.default)(infoPlistFiles, i => i);
+    for (const infoPlistPath of uniqueInfoPlistPaths) {
+        const infoPlist = (await (0, plist_1.readPlistAsync)(infoPlistPath));
+        if (buildNumber) {
+            infoPlist.CFBundleVersion = buildNumber;
+        }
+        if (version) {
+            infoPlist.CFBundleShortVersionString = version;
+        }
+        await (0, plist_1.writePlistAsync)(infoPlistPath, infoPlist);
+    }
+}
+exports.updateNativeVersionsAsync = updateNativeVersionsAsync;
+function trimQuotes(s) {
+    return (s === null || s === void 0 ? void 0 : s.startsWith('"')) && s.endsWith('"') ? s.slice(1, -1) : s;
 }
 function evaluateTemplateString(s, buildSettings) {
     // necessary because XCBuildConfiguration['buildSettings'] is not a plain object
@@ -157,3 +190,70 @@ function evaluateTemplateString(s, buildSettings) {
     });
 }
 exports.evaluateTemplateString = evaluateTemplateString;
+/**
+ * Returns buildNumber that will be used for the next build. If current build profile
+ * has an 'autoIncrement' option set, it increments the version on server.
+ */
+async function resolveRemoteBuildNumberAsync({ projectDir, projectId, exp, applicationTarget, buildProfile, }) {
+    var _a, _b, _c, _d;
+    const remoteVersions = await AppVersionQuery_1.AppVersionQuery.latestVersionAsync(projectId, generated_1.AppPlatform.Ios, applicationTarget.bundleIdentifier);
+    const localBuildNumber = await readBuildNumberAsync(projectDir, exp, (_a = applicationTarget.buildSettings) !== null && _a !== void 0 ? _a : {});
+    const localShortVersion = await readShortVersionAsync(projectDir, exp, (_b = applicationTarget.buildSettings) !== null && _b !== void 0 ? _b : {});
+    let currentBuildVersion;
+    if (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion) {
+        currentBuildVersion = remoteVersions.buildVersion;
+    }
+    else {
+        if (localBuildNumber) {
+            log_1.default.warn('No remote versions are configured for this project, buildNumber will be initialized based on the value from the local project.');
+            currentBuildVersion = localBuildNumber;
+        }
+        else {
+            log_1.default.error(`Remote versions are not configured and EAS CLI was not able to read the current version from your project. Use "eas build:version:set" to initialize remote versions.`);
+            throw new Error('Remote versions are not configured.');
+        }
+    }
+    if (!buildProfile.autoIncrement && (remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)) {
+        return currentBuildVersion;
+    }
+    else if (!buildProfile.autoIncrement && !(remoteVersions === null || remoteVersions === void 0 ? void 0 : remoteVersions.buildVersion)) {
+        const spinner = (0, ora_1.ora)(`Initializing the buildNumber with ${currentBuildVersion}.`).start();
+        try {
+            await AppVersionMutation_1.AppVersionMutation.createAppVersionAsync({
+                appId: projectId,
+                platform: generated_1.AppPlatform.Ios,
+                applicationIdentifier: applicationTarget.bundleIdentifier,
+                storeVersion: localShortVersion !== null && localShortVersion !== void 0 ? localShortVersion : '1.0.0',
+                buildVersion: currentBuildVersion,
+                runtimeVersion: (_c = config_plugins_1.Updates.getRuntimeVersionNullable(exp, eas_build_job_1.Platform.IOS)) !== null && _c !== void 0 ? _c : undefined,
+            });
+            spinner.succeed(`Initialized the buildNumber with ${currentBuildVersion}.`);
+        }
+        catch (err) {
+            spinner.fail(`Failed to initialize the buildNumber with ${currentBuildVersion}.`);
+            throw err;
+        }
+        return currentBuildVersion;
+    }
+    else {
+        const nextBuildVersion = (0, versions_1.getNextBuildNumber)(currentBuildVersion);
+        const spinner = (0, ora_1.ora)(`Incrementing buildNumber ${currentBuildVersion} -> ${nextBuildVersion}.`).start();
+        try {
+            await AppVersionMutation_1.AppVersionMutation.createAppVersionAsync({
+                appId: projectId,
+                platform: generated_1.AppPlatform.Ios,
+                applicationIdentifier: applicationTarget.bundleIdentifier,
+                storeVersion: localShortVersion !== null && localShortVersion !== void 0 ? localShortVersion : '1.0.0',
+                buildVersion: nextBuildVersion,
+                runtimeVersion: (_d = config_plugins_1.Updates.getRuntimeVersionNullable(exp, eas_build_job_1.Platform.IOS)) !== null && _d !== void 0 ? _d : undefined,
+            });
+            spinner.succeed(`Incremented buildNumber ${currentBuildVersion} -> ${nextBuildVersion}.`);
+        }
+        catch (err) {
+            spinner.fail(`Failed to increment buildNumber ${currentBuildVersion} -> ${nextBuildVersion}.`);
+            throw err;
+        }
+        return nextBuildVersion;
+    }
+}
+exports.resolveRemoteBuildNumberAsync = resolveRemoteBuildNumberAsync;

package/build/build/local.d.ts

@@ -1,4 +1,4 @@
-import { Job } from '@expo/eas-build-job';
+import { Job, Metadata } from '@expo/eas-build-job';
 export interface LocalBuildOptions {
     enable: boolean;
     skipCleanup?: boolean;
@@ -8,4 +8,4 @@ export interface LocalBuildOptions {
     workingdir?: string;
     verbose?: boolean;
 }
-export declare function runLocalBuildAsync(job: Job, options: LocalBuildOptions): Promise<void>;
+export declare function runLocalBuildAsync(job: Job, metadata: Metadata, options: LocalBuildOptions): Promise<void>;

package/build/build/local.js

@@ -6,10 +6,10 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
 const ora_1 = require("../ora");
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.85';
-async function runLocalBuildAsync(job, options) {
+const PLUGIN_PACKAGE_VERSION = '0.0.98';
+async function runLocalBuildAsync(job, metadata, options) {
     var _a;
-    const { command, args } = await getCommandAndArgsAsync(job);
+    const { command, args } = await getCommandAndArgsAsync(job, metadata);
     let spinner;
     if (!options.verbose) {
         spinner = (0, ora_1.ora)().start(options.skipNativeBuild ? 'Preparing project' : 'Building project');
@@ -44,16 +44,16 @@ async function runLocalBuildAsync(job, options) {
     }
 }
 exports.runLocalBuildAsync = runLocalBuildAsync;
-async function getCommandAndArgsAsync(job) {
-    const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+async function getCommandAndArgsAsync(job, metadata) {
+    const jobAndMetadataBase64 = Buffer.from(JSON.stringify({ job, metadata })).toString('base64');
     if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
         return {
             command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
-            args: [jobBase64],
+            args: [jobAndMetadataBase64],
         };
     }
     else {
-        const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
+        const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobAndMetadataBase64];
         if (await isAtLeastNpm7Async()) {
             // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
             // prompting the user to install a package that is used for the first time

package/build/build/metadata.d.ts

@@ -1,3 +1,4 @@
 import { Metadata, Platform } from '@expo/eas-build-job';
 import { BuildContext } from './context';
 export declare function collectMetadataAsync<T extends Platform>(ctx: BuildContext<T>): Promise<Metadata>;
+export declare function truncateGitCommitMessage(msg: string | undefined, maxLength?: number): string | undefined;

package/build/build/metadata.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectMetadataAsync = void 0;
+exports.truncateGitCommitMessage = exports.collectMetadataAsync = void 0;
 const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
@@ -16,7 +16,8 @@ const vcs_1 = require("../vcs");
 const version_1 = require("./android/version");
 const version_2 = require("./ios/version");
 async function collectMetadataAsync(ctx) {
-    var _a, _b;
+    var _a, _b, _c;
+    const vcsClient = (0, vcs_1.getVcsClient)();
     const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
     const distribution = (_a = ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
         ? 'simulator'
@@ -35,12 +36,16 @@ async function collectMetadataAsync(ctx) {
         appName: ctx.exp.name,
         appIdentifier: resolveAppIdentifier(ctx),
         buildProfile: ctx.buildProfileName,
-        gitCommitHash: await (0, vcs_1.getVcsClient)().getCommitHashAsync(),
-        isGitWorkingTreeDirty: await (0, vcs_1.getVcsClient)().hasUncommittedChangesAsync(),
+        gitCommitHash: await vcsClient.getCommitHashAsync(),
+        gitCommitMessage: truncateGitCommitMessage((_c = (await vcsClient.getLastCommitMessageAsync())) !== null && _c !== void 0 ? _c : undefined),
+        isGitWorkingTreeDirty: await vcsClient.hasUncommittedChangesAsync(),
         username: (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)()),
+        message: ctx.message,
         ...(ctx.platform === eas_build_job_1.Platform.IOS && {
             iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(ctx),
         }),
+        runWithNoWaitFlag: ctx.noWait,
+        runFromCI: ctx.runFromCI,
     };
     return (0, eas_build_job_1.sanitizeMetadata)(metadata);
 }
@@ -48,11 +53,25 @@ exports.collectMetadataAsync = collectMetadataAsync;
 async function maybeResolveVersionsAsync(ctx) {
     if (ctx.platform === eas_build_job_1.Platform.IOS) {
         const iosContext = ctx;
-        return await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.applicationTargetBuildSettings);
+        const resolvedVersion = await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.targets);
+        if (iosContext.ios.buildNumberOverride) {
+            return {
+                ...resolvedVersion,
+                appBuildVersion: iosContext.ios.buildNumberOverride,
+            };
+        }
+        return resolvedVersion;
     }
     else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
         const androidCtx = ctx;
-        return await (0, version_1.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+        const resolvedVersion = await (0, version_1.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, androidCtx.buildProfile);
+        if (androidCtx.android.versionCodeOverride) {
+            return {
+                ...resolvedVersion,
+                appBuildVersion: androidCtx.android.versionCodeOverride,
+            };
+        }
+        return resolvedVersion;
     }
     else {
         throw new Error(`Unsupported platform ${ctx.platform}`);
@@ -122,3 +141,10 @@ async function getReactNativeVersionAsync(ctx) {
 function resolveIosEnterpriseProvisioning(ctx) {
     return ctx.buildProfile.enterpriseProvisioning;
 }
+function truncateGitCommitMessage(msg, maxLength = 4096) {
+    if (msg === undefined) {
+        return undefined;
+    }
+    return msg.length > maxLength ? `${msg.substring(0, maxLength - 3)}...` : msg;
+}
+exports.truncateGitCommitMessage = truncateGitCommitMessage;

package/build/build/runBuildAndSubmit.d.ts

@@ -12,5 +12,6 @@ export interface BuildFlags {
     submitProfile?: string;
     localBuildOptions: LocalBuildOptions;
     userInputResourceClass?: UserInputResourceClass;
+    message?: string;
 }
 export declare function runBuildAndSubmitAsync(projectDir: string, flags: BuildFlags): Promise<void>;

package/build/build/runBuildAndSubmit.js

@@ -7,11 +7,13 @@ const eas_json_1 = require("@expo/eas-json");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const generated_1 = require("../graphql/generated");
+const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const platform_1 = require("../platform");
 const expoSdk_1 = require("../project/expoSdk");
 const metroConfig_1 = require("../project/metroConfig");
+const remoteVersionSource_1 = require("../project/remoteVersionSource");
 const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
@@ -40,7 +42,7 @@ const platformToGraphQLResourceClassMapping = {
     },
 };
 async function runBuildAndSubmitAsync(projectDir, flags) {
-    var _a, _b;
+    var _a, _b, _c;
     await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
     await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
     await (0, configure_1.ensureProjectConfiguredAsync)({
@@ -48,18 +50,22 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         nonInteractive: flags.nonInteractive,
     });
     const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    const easJsonCliConfig = (_a = (await easJsonReader.getCliConfigAsync())) !== null && _a !== void 0 ? _a : {};
     const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
     const buildProfiles = await (0, profiles_1.getProfilesAsync)({
         type: 'build',
         easJsonReader,
         platforms,
-        profileName: (_a = flags.profile) !== null && _a !== void 0 ? _a : undefined,
+        profileName: (_b = flags.profile) !== null && _b !== void 0 ? _b : undefined,
     });
     await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
         projectDir,
         nonInteractive: flags.nonInteractive,
         buildProfiles,
     });
+    for (const buildProfile of buildProfiles) {
+        (0, remoteVersionSource_1.validateBuildProfileVersionSettings)(buildProfile, easJsonCliConfig);
+    }
     const startedBuilds = [];
     const buildCtxByPlatform = {};
     for (const buildProfile of buildProfiles) {
@@ -68,7 +74,8 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
             flags,
             moreBuilds: platforms.length > 1,
             buildProfile,
-            resourceClass: platformToGraphQLResourceClassMapping[buildProfile.platform][(_b = flags.userInputResourceClass) !== null && _b !== void 0 ? _b : types_1.UserInputResourceClass.DEFAULT],
+            resourceClass: platformToGraphQLResourceClassMapping[buildProfile.platform][(_c = flags.userInputResourceClass) !== null && _c !== void 0 ? _c : types_1.UserInputResourceClass.DEFAULT],
+            easJsonCliConfig,
         });
         if (maybeBuild) {
             startedBuilds.push({ build: maybeBuild, buildProfile });
@@ -100,6 +107,7 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
                 submitProfile,
                 nonInteractive: flags.nonInteractive,
             });
+            startedBuild.build = await BuildQuery_1.BuildQuery.withSubmissionsByIdAsync(startedBuild.build.id);
             submissions.push(submission);
         }
         log_1.default.newLine();
@@ -117,33 +125,47 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
         buildIds: startedBuilds.map(({ build }) => build.id),
         accountName,
     });
-    (0, printBuildInfo_1.printBuildResults)(builds, flags.json);
+    if (!flags.json) {
+        (0, printBuildInfo_1.printBuildResults)(builds);
+    }
     const haveAllBuildsFailedOrCanceled = builds.every(build => (build === null || build === void 0 ? void 0 : build.status) && [generated_1.BuildStatus.Errored, generated_1.BuildStatus.Canceled].includes(build === null || build === void 0 ? void 0 : build.status));
     if (haveAllBuildsFailedOrCanceled || !flags.autoSubmit) {
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)(builds);
+        }
         exitWithNonZeroCodeIfSomeBuildsFailed(builds);
     }
     else {
-        // the following function also exits with non zero code if any of the submissions failed
-        await (0, submit_1.waitToCompleteAsync)(submissions);
+        const completedSubmissions = await (0, submit_1.waitToCompleteAsync)(submissions);
+        if (flags.json) {
+            (0, json_1.printJsonOnlyOutput)(await Promise.all(builds
+                .filter((i) => !!i)
+                .map(build => BuildQuery_1.BuildQuery.withSubmissionsByIdAsync(build.id))));
+        }
+        (0, submit_1.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish)(completedSubmissions);
     }
 }
 exports.runBuildAndSubmitAsync = runBuildAndSubmitAsync;
-async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, resourceClass, }) {
+async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, resourceClass, easJsonCliConfig, }) {
     const buildCtx = await (0, createContext_1.createBuildContextAsync)({
         buildProfileName: buildProfile.profileName,
         resourceClass,
         clearCache: flags.clearCache,
         buildProfile: buildProfile.profile,
         nonInteractive: flags.nonInteractive,
+        noWait: !flags.wait,
         platform: buildProfile.platform,
         projectDir,
         localBuildOptions: flags.localBuildOptions,
+        easJsonCliConfig,
+        message: flags.message,
     });
     if (moreBuilds) {
         log_1.default.newLine();
         const appPlatform = (0, AppPlatform_1.toAppPlatform)(buildProfile.platform);
         log_1.default.log(`${platform_1.appPlatformEmojis[appPlatform]} ${chalk_1.default.bold(`${platform_1.appPlatformDisplayNames[appPlatform]} build`)}`);
     }
+    (0, remoteVersionSource_1.validateAppConfigForRemoteVersionSource)(buildCtx.exp, buildProfile.platform);
     if (buildCtx.workflow === eas_build_job_1.Workflow.MANAGED) {
         if (!sdkVersionChecked) {
             await (0, expoSdk_1.checkExpoSdkIsSupportedAsync)(buildCtx);

package/build/build/utils/printBuildInfo.d.ts

@@ -1,5 +1,5 @@
 import { BuildError, BuildFragment, EasBuildDeprecationInfo } from '../../graphql/generated';
 export declare function printLogsUrls(builds: BuildFragment[]): void;
-export declare function printBuildResults(builds: (BuildFragment | null)[], json: boolean): void;
+export declare function printBuildResults(builds: (BuildFragment | null)[]): void;
 export declare function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationInfo | null): void;
 export declare function printUserError(error: BuildError): void;

package/build/build/utils/printBuildInfo.js

@@ -9,7 +9,6 @@ const qrcode_terminal_1 = tslib_1.__importDefault(require("qrcode-terminal"));
 const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const platform_1 = require("../../platform");
-const json_1 = require("../../utils/json");
 const url_1 = require("./url");
 function printLogsUrls(builds) {
     if (builds.length === 1) {
@@ -23,20 +22,15 @@ function printLogsUrls(builds) {
     }
 }
 exports.printLogsUrls = printLogsUrls;
-function printBuildResults(builds, json) {
-    if (json) {
-        (0, json_1.printJsonOnlyOutput)(builds);
+function printBuildResults(builds) {
+    log_1.default.newLine();
+    if (builds.length === 1) {
+        const [build] = builds;
+        (0, assert_1.default)(build, 'Build should be defined');
+        printBuildResult(build);
     }
     else {
-        log_1.default.newLine();
-        if (builds.length === 1) {
-            const [build] = builds;
-            (0, assert_1.default)(build, 'Build should be defined');
-            printBuildResult(build);
-        }
-        else {
-            builds.filter(i => i).forEach(build => printBuildResult(build));
-        }
+        builds.filter(i => i).forEach(build => printBuildResult(build));
     }
 }
 exports.printBuildResults = printBuildResults;

package/build/commandUtils/pagination.d.ts

@@ -0,0 +1,13 @@
+export declare const getPaginatedQueryOptions: (flags: Record<keyof typeof EasPaginatedQueryFlags, any>) => PaginatedQueryOptions;
+export declare const EasPaginatedQueryFlags: {
+    offset: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+    limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+    json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+};
+export declare type PaginatedQueryOptions = {
+    nonInteractive: boolean;
+    json: boolean;
+    limit?: number;
+    offset: number;
+};

package/build/commandUtils/pagination.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EasPaginatedQueryFlags = exports.getPaginatedQueryOptions = void 0;
+const core_1 = require("@oclif/core");
+const getPaginatedQueryOptions = (flags) => {
+    var _a, _b, _c;
+    return {
+        json: (_a = flags.json) !== null && _a !== void 0 ? _a : false,
+        offset: (_b = flags.offset) !== null && _b !== void 0 ? _b : 0,
+        nonInteractive: (_c = flags['non-interactive']) !== null && _c !== void 0 ? _c : false,
+        ...('limit' in flags && { limit: flags.limit }),
+    };
+};
+exports.getPaginatedQueryOptions = getPaginatedQueryOptions;
+const parseFlagInputStringAsInteger = (input, flagName, lowerLimit, upperLimit) => {
+    const inputAsNumber = Number(input);
+    if (isNaN(inputAsNumber)) {
+        throw new Error(`Unable to parse ${input} as a number`);
+    }
+    if (inputAsNumber < lowerLimit || inputAsNumber > upperLimit) {
+        throw new Error(`--${flagName} must be between ${lowerLimit} and ${upperLimit}`);
+    }
+    return inputAsNumber;
+};
+exports.EasPaginatedQueryFlags = {
+    offset: core_1.Flags.integer({
+        description: 'Start queries from specified index. Use for paginating results. Defaults to 0.',
+        // eslint-disable-next-line async-protect/async-suffix
+        parse: async (input) => parseFlagInputStringAsInteger(input, 'offset', 0, Number.MAX_SAFE_INTEGER),
+    }),
+    limit: core_1.Flags.integer({
+        description: 'The number of query items to list at once. The default value is 50 (the maximum is 100). Using a lower value may help increase command speed.',
+        // eslint-disable-next-line async-protect/async-suffix
+        parse: async (input) => parseFlagInputStringAsInteger(input, 'limit', 1, 100),
+    }),
+    json: core_1.Flags.boolean({
+        description: 'Enable JSON output, non-JSON messages will be printed to stderr.',
+    }),
+    'non-interactive': core_1.Flags.boolean({
+        description: 'Run the command in non-interactive mode.',
+    }),
+};

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

@@ -1,12 +1,11 @@
 import EasCommand from '../../commandUtils/EasCommand';
-import { UpdateBranchFragment } from '../../graphql/generated';
-export declare function listBranchesAsync({ projectId, }: {
-    projectId: string;
-}): Promise<UpdateBranchFragment[]>;
 export default class BranchList extends EasCommand {
     static description: string;
     static flags: {
+        offset: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
 }