eas-cli 0.55.0 → 0.57.0

package/build/build/context.d.ts

@@ -1,7 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { Target } from '../credentials/ios/types';
@@ -17,13 +16,13 @@ export interface AndroidBuildContext {
 }
 export interface IosBuildContext {
     bundleIdentifier: string;
-    applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
     applicationTarget: Target;
     targets: Target[];
     xcodeBuildContext: XcodeBuildContext;
 }
 export interface BuildContext<T extends Platform> {
     accountName: string;
+    easJsonCliConfig: EasJson['cli'];
     buildProfile: BuildProfile<T>;
     buildProfileName: string;
     resourceClass: BuildResourceClass;
@@ -36,6 +35,7 @@ export interface BuildContext<T extends Platform> {
     projectDir: string;
     projectId: string;
     projectName: string;
+    message?: string;
     trackingCtx: TrackingContext;
     user: Actor;
     workflow: Workflow;

package/build/build/createContext.d.ts

@@ -1,15 +1,17 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildProfile } from '@expo/eas-json';
+import { BuildProfile, EasJson } from '@expo/eas-json';
 import { BuildResourceClass } from '../graphql/generated';
 import { BuildContext } from './context';
 import { LocalBuildOptions } from './local';
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, clearCache, localBuildOptions, nonInteractive, platform, projectDir, resourceClass, }: {
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, easJsonCliConfig, clearCache, localBuildOptions, nonInteractive, platform, projectDir, resourceClass, message, }: {
     buildProfileName: string;
     buildProfile: BuildProfile<T>;
+    easJsonCliConfig: EasJson['cli'];
     clearCache: boolean;
     localBuildOptions: LocalBuildOptions;
     nonInteractive: boolean;
     platform: T;
     projectDir: string;
     resourceClass: BuildResourceClass;
+    message?: string;
 }): Promise<BuildContext<T>>;

package/build/build/createContext.js

@@ -15,7 +15,7 @@ const Account_1 = require("../user/Account");
 const actions_1 = require("../user/actions");
 const build_1 = require("./android/build");
 const build_2 = require("./ios/build");
-async function createBuildContextAsync({ buildProfileName, buildProfile, clearCache = false, localBuildOptions, nonInteractive = false, platform, projectDir, resourceClass, }) {
+async function createBuildContextAsync({ buildProfileName, buildProfile, easJsonCliConfig, clearCache = false, localBuildOptions, nonInteractive = false, platform, projectDir, resourceClass, message, }) {
     var _a;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
     const user = await (0, actions_1.ensureLoggedInAsync)();
@@ -50,6 +50,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
         buildProfile,
         buildProfileName,
         resourceClass,
+        easJsonCliConfig,
         clearCache,
         credentialsCtx,
         exp,
@@ -62,6 +63,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
         trackingCtx,
         user,
         workflow,
+        message,
     };
     if (platform === eas_build_job_1.Platform.ANDROID) {
         const common = commonContext;

package/build/build/ios/build.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.prepareIosBuildAsync = exports.createIosContextAsync = void 0;
-const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const BuildMutation_1 = require("../../graphql/mutations/BuildMutation");
 const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
@@ -33,11 +32,9 @@ async function createIosContextAsync(ctx) {
         env: buildProfile.env,
     });
     const applicationTarget = (0, target_1.findApplicationTarget)(targets);
-    const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
     return {
         bundleIdentifier: applicationTarget.bundleIdentifier,
         applicationTarget,
-        applicationTargetBuildSettings,
         targets,
         xcodeBuildContext,
     };
@@ -54,7 +51,7 @@ async function prepareIosBuildAsync(ctx) {
                 projectDir: ctx.projectDir,
                 exp: ctx.exp,
                 buildProfile: ctx.buildProfile,
-                buildSettings: ctx.ios.applicationTargetBuildSettings,
+                targets: ctx.ios.targets,
             });
         },
         prepareJobAsync: async (ctx, jobData) => {
@@ -76,15 +73,3 @@ async function prepareIosBuildAsync(ctx) {
     });
 }
 exports.prepareIosBuildAsync = prepareIosBuildAsync;
-function resolveBuildSettings(ctx, applicationTarget) {
-    var _a;
-    if (ctx.workflow === eas_build_job_1.Workflow.MANAGED) {
-        return {};
-    }
-    const project = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
-    const xcBuildConfiguration = config_plugins_1.IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
-        targetName: applicationTarget.targetName,
-        buildConfiguration: applicationTarget.buildConfiguration,
-    });
-    return (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) !== null && _a !== void 0 ? _a : {};
-}

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

@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
-import type { XCBuildConfiguration } from 'xcode';
-export declare function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }: {
+import { Target } from '../../credentials/ios/types';
+export declare function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, targets, }: {
     projectDir: string;
     exp: ExpoConfig;
     buildProfile: BuildProfile<Platform.IOS>;
-    buildSettings: XCBuildConfiguration['buildSettings'];
+    targets: Target[];
 }): Promise<void>;

package/build/build/ios/syncProjectConfiguration.js

@@ -6,7 +6,7 @@ const projectUtils_1 = require("../../project/projectUtils");
 const workflow_1 = require("../../project/workflow");
 const UpdatesModule_1 = require("../../update/ios/UpdatesModule");
 const version_1 = require("./version");
-async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }) {
+async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, targets, }) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
     const { autoIncrement } = buildProfile;
     const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
@@ -14,7 +14,7 @@ async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, bu
         if ((0, projectUtils_1.isExpoUpdatesInstalled)(projectDir)) {
             await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);
         }
-        await (0, version_1.bumpVersionAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy, buildSettings });
+        await (0, version_1.bumpVersionAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy, targets });
     }
     else {
         await (0, version_1.bumpVersionInAppJsonAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy });

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

@@ -1,15 +1,16 @@
 import { ExpoConfig } from '@expo/config';
 import type { XCBuildConfiguration } from 'xcode';
+import { Target } from '../../credentials/ios/types';
 export declare enum BumpStrategy {
     APP_VERSION = 0,
     BUILD_NUMBER = 1,
     NOOP = 2
 }
-export declare function bumpVersionAsync({ bumpStrategy, projectDir, exp, buildSettings, }: {
+export declare function bumpVersionAsync({ bumpStrategy, projectDir, exp, targets, }: {
     projectDir: string;
     exp: ExpoConfig;
     bumpStrategy: BumpStrategy;
-    buildSettings: XCBuildConfiguration['buildSettings'];
+    targets: Target[];
 }): Promise<void>;
 export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, exp, }: {
     bumpStrategy: BumpStrategy;
@@ -18,9 +19,15 @@ export declare function bumpVersionInAppJsonAsync({ bumpStrategy, projectDir, ex
 }): Promise<void>;
 export declare function readShortVersionAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<string | undefined>;
 export declare function readBuildNumberAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<string | undefined>;
-export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, buildSettings: XCBuildConfiguration['buildSettings']): Promise<{
+export declare function maybeResolveVersionsAsync(projectDir: string, exp: ExpoConfig, targets: Target[]): Promise<{
     appVersion?: string;
     appBuildVersion?: string;
 }>;
 export declare function getInfoPlistPath(projectDir: string, buildSettings: XCBuildConfiguration['buildSettings']): string;
+export declare function updateNativeVersionsAsync({ projectDir, version, buildNumber, targets, }: {
+    projectDir: string;
+    version?: string;
+    buildNumber?: string;
+    targets: Target[];
+}): Promise<void>;
 export declare function evaluateTemplateString(s: string, buildSettings: XCBuildConfiguration['buildSettings']): string;

package/build/build/ios/version.js

@@ -1,15 +1,17 @@
 "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.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 log_1 = tslib_1.__importDefault(require("../../log"));
+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 +21,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 +42,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 +50,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 +94,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 +112,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,16 +134,44 @@ 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
     const vars = { ...buildSettings };

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,9 +36,11 @@ 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),
         }),
@@ -48,7 +51,7 @@ 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);
+        return await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.targets);
     }
     else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
         const androidCtx = ctx;
@@ -122,3 +125,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

@@ -40,7 +40,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,12 +48,13 @@ 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,
@@ -68,7 +69,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 });
@@ -128,7 +130,7 @@ async function runBuildAndSubmitAsync(projectDir, flags) {
     }
 }
 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,
@@ -138,6 +140,8 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         platform: buildProfile.platform,
         projectDir,
         localBuildOptions: flags.localBuildOptions,
+        easJsonCliConfig,
+        message: flags.message,
     });
     if (moreBuilds) {
         log_1.default.newLine();

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>;
 }

package/build/commands/branch/list.js

@@ -1,90 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.listBranchesAsync = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
-const graphql_1 = require("graphql");
-const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const queries_1 = require("../../branch/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const client_1 = require("../../graphql/client");
-const UpdateBranch_1 = require("../../graphql/types/UpdateBranch");
-const log_1 = tslib_1.__importDefault(require("../../log"));
+const pagination_1 = require("../../commandUtils/pagination");
 const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
-const utils_1 = require("../../update/utils");
 const json_1 = require("../../utils/json");
-const BRANCHES_LIMIT = 10000;
-async function listBranchesAsync({ projectId, }) {
-    var _a, _b;
-    const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
-        .query((0, graphql_tag_1.default) `
-          query BranchesByAppQuery($appId: String!, $limit: Int!) {
-            app {
-              byId(appId: $appId) {
-                id
-                updateBranches(offset: 0, limit: $limit) {
-                  id
-                  ...UpdateBranchFragment
-                }
-              }
-            }
-          }
-          ${(0, graphql_1.print)(UpdateBranch_1.UpdateBranchFragmentNode)}
-        `, {
-        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 : [];
-}
-exports.listBranchesAsync = listBranchesAsync;
 class BranchList extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(BranchList);
-        if (flags.json) {
+        const options = (0, pagination_1.getPaginatedQueryOptions)(flags);
+        if (options.json) {
             (0, json_1.enableJsonOutput)();
         }
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const branches = await listBranchesAsync({ projectId });
-        if (flags.json) {
-            (0, json_1.printJsonOnlyOutput)(branches);
-        }
-        else {
-            const table = new cli_table3_1.default({
-                head: ['Branch', ...utils_1.UPDATE_COLUMNS],
-                wordWrap: true,
-            });
-            table.push(...branches.map(branch => {
-                var _a, _b, _c, _d, _e;
-                return [
-                    branch.name,
-                    (0, utils_1.formatUpdate)(branch.updates[0]),
-                    (_b = (_a = branch.updates[0]) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : 'N/A',
-                    (_d = (_c = branch.updates[0]) === null || _c === void 0 ? void 0 : _c.group) !== null && _d !== void 0 ? _d : 'N/A',
-                    (0, utils_1.getPlatformsForGroup)({
-                        updates: branch.updates,
-                        group: (_e = branch.updates[0]) === null || _e === void 0 ? void 0 : _e.group,
-                    }),
-                ];
-            }));
-            log_1.default.addNewLineIfNone();
-            log_1.default.log(chalk_1.default.bold('Branches with their most recent update group:'));
-            log_1.default.log(table.toString());
-            if (branches.length >= BRANCHES_LIMIT) {
-                log_1.default.warn(`Showing first ${BRANCHES_LIMIT} branches, some results might be omitted.`);
-            }
-        }
+        await (0, queries_1.listAndRenderPaginatedBranchesAsync)(projectId, options);
     }
 }
 exports.default = BranchList;
 BranchList.description = 'list all branches';
 BranchList.flags = {
-    json: core_1.Flags.boolean({
-        description: 'return output as JSON',
-        default: false,
-    }),
+    ...pagination_1.EasPaginatedQueryFlags,
 };

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

@@ -7,7 +7,10 @@ export default class BranchView extends EasCommand {
         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>;
 }