eas-cli 3.3.1 → 3.4.0

package/build/build/build.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.waitForBuildEndAsync = exports.prepareBuildRequestForPlatformAsync = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
+const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const cli_progress_1 = tslib_1.__importDefault(require("cli-progress"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -15,8 +17,10 @@ const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
 const ora_1 = require("../ora");
 const platform_1 = require("../platform");
+const prompts_1 = require("../prompts");
 const uploads_1 = require("../uploads");
 const files_1 = require("../utils/files");
+const json_1 = require("../utils/json");
 const progress_1 = require("../utils/progress");
 const promise_1 = require("../utils/promise");
 const vcs_1 = require("../vcs");
@@ -47,15 +51,26 @@ async function prepareBuildRequestForPlatformAsync(builder) {
         log_1.default.addNewLineIfNone();
         await (0, repository_1.reviewAndCommitChangesAsync)(`[EAS Build] Run EAS Build for ${platform_1.requestedPlatformDisplayNames[ctx.platform]}`, { nonInteractive: ctx.nonInteractive });
     }
-    const projectArchive = ctx.localBuildOptions.enable
-        ? {
+    let projectArchive;
+    if (ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.LOCAL_BUILD_PLUGIN) {
+        projectArchive = {
             type: eas_build_job_1.ArchiveSourceType.PATH,
             path: (await (0, repository_1.makeProjectTarballAsync)()).path,
-        }
-        : {
+        };
+    }
+    else if (ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.INTERNAL) {
+        projectArchive = {
+            type: eas_build_job_1.ArchiveSourceType.PATH,
+            path: process.cwd(),
+        };
+    }
+    else if (!ctx.localBuildOptions.localBuildMode) {
+        projectArchive = {
             type: eas_build_job_1.ArchiveSourceType.GCS,
             bucketKey: await uploadProjectAsync(ctx),
         };
+    }
+    (0, assert_1.default)(projectArchive);
     const metadata = await (0, metadata_1.collectMetadataAsync)(ctx);
     const buildParams = resolveBuildParamsInput(ctx);
     const job = await builder.prepareJobAsync(ctx, {
@@ -63,11 +78,15 @@ async function prepareBuildRequestForPlatformAsync(builder) {
         credentials: credentialsResult === null || credentialsResult === void 0 ? void 0 : credentialsResult.credentials,
     });
     return async () => {
-        if (ctx.localBuildOptions.enable) {
+        if (ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.LOCAL_BUILD_PLUGIN) {
             await (0, local_1.runLocalBuildAsync)(job, metadata, ctx.localBuildOptions);
             return undefined;
         }
-        else {
+        else if (ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.INTERNAL) {
+            (0, json_1.printJsonOnlyOutput)({ job, metadata });
+            return undefined;
+        }
+        else if (!ctx.localBuildOptions.localBuildMode) {
             try {
                 return await sendBuildRequestAsync(builder, job, metadata, buildParams);
             }
@@ -75,32 +94,30 @@ async function prepareBuildRequestForPlatformAsync(builder) {
                 handleBuildRequestError(error, job.platform);
             }
         }
+        else {
+            throw new Error('Unknown localBuildMode.');
+        }
     };
 }
 exports.prepareBuildRequestForPlatformAsync = prepareBuildRequestForPlatformAsync;
+const SERVER_SIDE_DEFINED_ERRORS = [
+    'TURTLE_DEPRECATED_JOB_FORMAT',
+    'EAS_BUILD_FREE_TIER_DISABLED',
+    'EAS_BUILD_FREE_TIER_DISABLED_IOS',
+    'EAS_BUILD_FREE_TIER_DISABLED_ANDROID',
+];
 function handleBuildRequestError(error, platform) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
-    if (((_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.errorCode) === 'TURTLE_DEPRECATED_JOB_FORMAT') {
-        log_1.default.error('EAS Build API has changed. Upgrade to the latest eas-cli version.');
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+    log_1.default.debug(JSON.stringify(error.graphQLErrors, null, 2));
+    if (SERVER_SIDE_DEFINED_ERRORS.includes((_c = (_b = (_a = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.errorCode)) {
+        log_1.default.error((_e = (_d = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.message);
         throw new Error('Build request failed.');
     }
-    else if (((_f = (_e = (_d = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.extensions) === null || _f === void 0 ? void 0 : _f.errorCode) === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
+    else if (((_h = (_g = (_f = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.extensions) === null || _h === void 0 ? void 0 : _h.errorCode) === 'EAS_BUILD_DOWN_FOR_MAINTENANCE') {
         log_1.default.error(`EAS Build is down for maintenance. Try again later. Check ${(0, log_1.link)('https://status.expo.dev/')} for updates.`);
         throw new Error('Build request failed.');
     }
-    else if (((_j = (_h = (_g = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _g === void 0 ? void 0 : _g[0]) === null || _h === void 0 ? void 0 : _h.extensions) === null || _j === void 0 ? void 0 : _j.errorCode) === 'EAS_BUILD_FREE_TIER_DISABLED') {
-        log_1.default.error(`EAS Build free tier is temporarily disabled and we are not accepting any new builds. Try again later. ${(0, log_1.learnMore)('https://expo.fyi/eas-build-queues')}`);
-        throw new Error('Build request failed.');
-    }
-    else if (((_m = (_l = (_k = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _k === void 0 ? void 0 : _k[0]) === null || _l === void 0 ? void 0 : _l.extensions) === null || _m === void 0 ? void 0 : _m.errorCode) === 'EAS_BUILD_FREE_TIER_DISABLED_IOS') {
-        log_1.default.error(`EAS Build free tier is temporarily disabled for iOS and we are not accepting any new builds. Try again later. ${(0, log_1.learnMore)('https://expo.fyi/eas-build-queues')}`);
-        throw new Error('Build request failed.');
-    }
-    else if (((_q = (_p = (_o = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _o === void 0 ? void 0 : _o[0]) === null || _p === void 0 ? void 0 : _p.extensions) === null || _q === void 0 ? void 0 : _q.errorCode) === 'EAS_BUILD_FREE_TIER_DISABLED_ANDROID') {
-        log_1.default.error(`EAS Build free tier is temporarily disabled for Android and we are not accepting any new builds. Try again later. ${(0, log_1.learnMore)('https://expo.fyi/eas-build-queues')}`);
-        throw new Error('Build request failed.');
-    }
-    else if (((_t = (_s = (_r = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _r === void 0 ? void 0 : _r[0]) === null || _s === void 0 ? void 0 : _s.extensions) === null || _t === void 0 ? void 0 : _t.errorCode) === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
+    else if (((_l = (_k = (_j = error === null || error === void 0 ? void 0 : error.graphQLErrors) === null || _j === void 0 ? void 0 : _j[0]) === null || _k === void 0 ? void 0 : _k.extensions) === null || _l === void 0 ? void 0 : _l.errorCode) === 'EAS_BUILD_TOO_MANY_PENDING_BUILDS') {
         log_1.default.error(`You have already reached the maximum number of pending ${platform_1.requestedPlatformDisplayNames[platform]} builds for your account. Try again later.`);
         throw new Error('Build request failed.');
     }
@@ -155,7 +172,7 @@ async function sendBuildRequestAsync(builder, job, metadata, buildParams) {
         properties: ctx.analyticsEventProperties,
     });
 }
-async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName }, { intervalSec = 10 } = {}) {
+async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName, projectDir, nonInteractive, }, { intervalSec = 10 } = {}) {
     let spinner;
     let originalSpinnerText;
     if (buildIds.length === 1) {
@@ -170,7 +187,7 @@ async function waitForBuildEndAsync(graphqlClient, { buildIds, accountName }, {
     while (true) {
         const builds = await getBuildsSafelyAsync(graphqlClient, buildIds);
         const { refetch } = builds.length === 1
-            ? await handleSingleBuildProgressAsync({ build: builds[0], accountName }, { spinner })
+            ? await handleSingleBuildProgressAsync({ build: builds[0], accountName, projectDir, nonInteractive }, { spinner })
             : await handleMultipleBuildsProgressAsync({ builds }, { spinner, originalSpinnerText });
         if (!refetch) {
             return builds;
@@ -193,7 +210,7 @@ async function getBuildsSafelyAsync(graphqlClient, buildIds) {
 }
 let queueProgressBarStarted = false;
 const queueProgressBar = new cli_progress_1.default.SingleBar({ format: '|{bar}| {estimatedWaitTime}' }, cli_progress_1.default.Presets.rect);
-async function handleSingleBuildProgressAsync({ build, accountName }, { spinner }) {
+async function handleSingleBuildProgressAsync({ build, accountName, projectDir, nonInteractive, }, { spinner }) {
     if (build === null) {
         spinner.text = 'Could not fetch the build status. Check your network connection.';
         return { refetch: true };
@@ -223,13 +240,46 @@ async function handleSingleBuildProgressAsync({ build, accountName }, { spinner
                 : { estimatedWaitTime: '' };
             if (!queueProgressBarStarted &&
                 typeof build.initialQueuePosition === 'number' &&
-                typeof build.queuePosition === 'number') {
+                typeof build.queuePosition === 'number' &&
+                typeof build.estimatedWaitTimeLeftSeconds === 'number') {
                 spinner.stopAndPersist();
                 if (build.priority !== generated_1.BuildPriority.High) {
                     log_1.default.newLine();
                     log_1.default.log('Start builds sooner in the priority queue.');
                     log_1.default.log(`Sign up for EAS Production or Enterprise at ${(0, log_1.link)(formatAccountSubscriptionsUrl(accountName))}`);
                 }
+                if (build.platform === generated_1.AppPlatform.Ios &&
+                    [generated_1.BuildResourceClass.IosIntelLarge, generated_1.BuildResourceClass.IosIntelMedium].includes(build.resourceClass)) {
+                    let askToSwitchToM1 = false;
+                    if (build.priority === generated_1.BuildPriority.High &&
+                        build.estimatedWaitTimeLeftSeconds >= /* 10 minutes */ 10 * 60) {
+                        log_1.default.newLine();
+                        log_1.default.warn(`Warning: Priority queue wait time for legacy iOS Intel workers is longer than usual (more than 10 minutes).`);
+                        log_1.default.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
+                        log_1.default.warn((0, log_1.learnMore)('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
+                            learnMoreMessage: 'Learn more on switching to M1 workers.',
+                        }));
+                        askToSwitchToM1 = true;
+                    }
+                    else if (build.priority !== generated_1.BuildPriority.High &&
+                        build.estimatedWaitTimeLeftSeconds >= /* 120 minutes */ 120 * 60) {
+                        log_1.default.newLine();
+                        log_1.default.warn(`Warning: Free tier queue wait time for legacy iOS Intel workers is longer than usual.`);
+                        log_1.default.warn(`We recommend switching to the new, faster M1 workers for iOS builds.`);
+                        log_1.default.warn((0, log_1.learnMore)('https://blog.expo.dev/m1-workers-on-eas-build-dcaa2c1333ad', {
+                            learnMoreMessage: 'Learn more on switching to M1 workers.',
+                        }));
+                        askToSwitchToM1 = true;
+                    }
+                    if (!nonInteractive && askToSwitchToM1) {
+                        const shouldSwitchToM1 = await (0, prompts_1.confirmAsync)({
+                            message: `Switch iOS builds to M1 workers (modifies build profiles in eas.json)?`,
+                        });
+                        if (shouldSwitchToM1) {
+                            await updateIosBuildProfilesToUseM1WorkersAsync(projectDir);
+                        }
+                    }
+                }
                 log_1.default.newLine();
                 log_1.default.log(`Waiting in ${priorityToQueueDisplayName[build.priority]}`);
                 queueProgressBar.start(build.initialQueuePosition + 1, build.initialQueuePosition - build.queuePosition + 1, progressBarPayload);
@@ -338,3 +388,19 @@ function formatEstimatedWaitTime(estimatedWaitTimeLeftSeconds) {
 function formatAccountSubscriptionsUrl(accountName) {
     return new URL(`/accounts/${accountName}/settings/subscriptions`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
+async function updateIosBuildProfilesToUseM1WorkersAsync(projectDir) {
+    const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+    await easJsonAccessor.readRawJsonAsync();
+    const profileNames = await eas_json_1.EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
+    easJsonAccessor.patch(easJsonRawObject => {
+        for (const profileName of profileNames) {
+            easJsonRawObject.build[profileName].ios = {
+                ...easJsonRawObject.build[profileName].ios,
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
+            };
+        }
+        return easJsonRawObject;
+    });
+    await easJsonAccessor.writeAsync();
+    log_1.default.withTick('Updated eas.json. Your next builds will run on M1 workers.');
+}

package/build/build/configure.js

@@ -44,11 +44,21 @@ const EAS_JSON_MANAGED_DEFAULT = {
         development: {
             developmentClient: true,
             distribution: 'internal',
+            ios: {
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
+            },
         },
         preview: {
             distribution: 'internal',
+            ios: {
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
+            },
+        },
+        production: {
+            ios: {
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
+            },
         },
-        production: {},
     },
     submit: {
         production: {},
@@ -66,12 +76,20 @@ const EAS_JSON_BARE_DEFAULT = {
             },
             ios: {
                 buildConfiguration: 'Debug',
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
             },
         },
         preview: {
             distribution: 'internal',
+            ios: {
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
+            },
+        },
+        production: {
+            ios: {
+                resourceClass: eas_json_1.ResourceClass.M1_MEDIUM,
+            },
         },
-        production: {},
     },
     submit: {
         production: {},

package/build/build/context.d.ts

@@ -10,7 +10,7 @@ import { GradleBuildContext } from '../project/android/gradle';
 import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
 import { LocalBuildOptions } from './local';
-export declare type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
+export type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 export interface AndroidBuildContext {
     applicationId: string;
     gradleContext?: GradleBuildContext;

package/build/build/graphql.d.ts

@@ -1,6 +1,7 @@
 import { ArchiveSource, Metadata, Workflow } from '@expo/eas-build-job';
-import { BuildIosEnterpriseProvisioning, BuildMetadataInput, BuildWorkflow, ProjectArchiveSourceInput } from '../graphql/generated';
+import { BuildIosEnterpriseProvisioning, BuildMetadataInput, BuildMode, BuildWorkflow, ProjectArchiveSourceInput } from '../graphql/generated';
 export declare function transformProjectArchive(archiveSource: ArchiveSource): ProjectArchiveSourceInput;
 export declare function transformMetadata(metadata: Metadata): BuildMetadataInput;
 export declare function transformWorkflow(workflow: Workflow): BuildWorkflow;
 export declare function transformIosEnterpriseProvisioning(enterpriseProvisioning: Metadata['iosEnterpriseProvisioning']): BuildIosEnterpriseProvisioning;
+export declare function transformBuildMode(buildMode: Metadata['buildMode']): BuildMode;

package/build/build/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformIosEnterpriseProvisioning = exports.transformWorkflow = exports.transformMetadata = exports.transformProjectArchive = void 0;
+exports.transformBuildMode = exports.transformIosEnterpriseProvisioning = exports.transformWorkflow = exports.transformMetadata = exports.transformProjectArchive = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
 const generated_1 = require("../graphql/generated");
 function transformProjectArchive(archiveSource) {
@@ -30,6 +30,7 @@ exports.transformProjectArchive = transformProjectArchive;
 function transformMetadata(metadata) {
     return {
         ...metadata,
+        buildMode: metadata.buildMode && transformBuildMode(metadata.buildMode),
         credentialsSource: metadata.credentialsSource && transformCredentialsSource(metadata.credentialsSource),
         distribution: metadata.distribution && transformDistribution(metadata.distribution),
         workflow: metadata.workflow && transformWorkflow(metadata.workflow),
@@ -75,3 +76,12 @@ function transformIosEnterpriseProvisioning(enterpriseProvisioning) {
     }
 }
 exports.transformIosEnterpriseProvisioning = transformIosEnterpriseProvisioning;
+function transformBuildMode(buildMode) {
+    if (buildMode === 'build') {
+        return generated_1.BuildMode.Build;
+    }
+    else {
+        return generated_1.BuildMode.Resign;
+    }
+}
+exports.transformBuildMode = transformBuildMode;

package/build/build/ios/graphql.js

@@ -9,7 +9,7 @@ function transformJob(job) {
     return {
         type: (0, graphql_1.transformWorkflow)(job.type),
         projectArchive: (0, graphql_1.transformProjectArchive)(job.projectArchive),
-        projectRootDirectory: job.projectRootDirectory,
+        projectRootDirectory: (0, nullthrows_1.default)(job.projectRootDirectory),
         releaseChannel: job.releaseChannel,
         updates: job.updates,
         secrets: transformIosSecrets(job.secrets),

package/build/build/ios/prepareJob.js

@@ -64,6 +64,8 @@ async function prepareJobAsync(ctx, jobData) {
         experimental: {
             prebuildCommand: ctx.buildProfile.prebuildCommand,
         },
+        mode: eas_build_job_1.BuildMode.BUILD,
+        triggeredBy: eas_build_job_1.BuildTrigger.EAS_CLI,
     };
     return (0, eas_build_job_1.sanitizeJob)(job);
 }

package/build/build/local.d.ts

@@ -1,6 +1,23 @@
 import { Job, Metadata } from '@expo/eas-build-job';
+export declare enum LocalBuildMode {
+    /**
+     * Local build that users can run on their own machines. Instead
+     * of sending build request to EAS Servers it's passing it as an argument
+     * to local-build-plugin, that will run the build locally.
+     *
+     * Triggered when running `eas build --local`.
+     */
+    LOCAL_BUILD_PLUGIN = 0,
+    /**
+     * Type of local build that is not accessible to users directly. When
+     * cloud build is triggered by git based integration, we are running
+     * in this mode. Instead of sending build request to EAS Servers it's
+     * printing it to the stdout as JSON, so EAS Build worker can read it.
+     */
+    INTERNAL = 1
+}
 export interface LocalBuildOptions {
-    enable: boolean;
+    localBuildMode?: LocalBuildMode;
     skipCleanup?: boolean;
     skipNativeBuild?: boolean;
     artifactsDir?: string;

package/build/build/local.js

@@ -1,12 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runLocalBuildAsync = void 0;
+exports.runLocalBuildAsync = exports.LocalBuildMode = void 0;
 const tslib_1 = require("tslib");
 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.120';
+var LocalBuildMode;
+(function (LocalBuildMode) {
+    /**
+     * Local build that users can run on their own machines. Instead
+     * of sending build request to EAS Servers it's passing it as an argument
+     * to local-build-plugin, that will run the build locally.
+     *
+     * Triggered when running `eas build --local`.
+     */
+    LocalBuildMode[LocalBuildMode["LOCAL_BUILD_PLUGIN"] = 0] = "LOCAL_BUILD_PLUGIN";
+    /**
+     * Type of local build that is not accessible to users directly. When
+     * cloud build is triggered by git based integration, we are running
+     * in this mode. Instead of sending build request to EAS Servers it's
+     * printing it to the stdout as JSON, so EAS Build worker can read it.
+     */
+    LocalBuildMode[LocalBuildMode["INTERNAL"] = 1] = "INTERNAL";
+})(LocalBuildMode = exports.LocalBuildMode || (exports.LocalBuildMode = {}));
 async function runLocalBuildAsync(job, metadata, options) {
     var _a;
     const { command, args } = await getCommandAndArgsAsync(job, metadata);

package/build/build/runBuildAndSubmit.js

@@ -125,7 +125,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
         }
         buildCtxByPlatform[(0, AppPlatform_1.toAppPlatform)(buildProfile.platform)] = buildCtx;
     }
-    if (flags.localBuildOptions.enable) {
+    if (flags.localBuildOptions.localBuildMode) {
         return;
     }
     log_1.default.newLine();
@@ -167,6 +167,8 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
     const builds = await (0, build_2.waitForBuildEndAsync)(graphqlClient, {
         buildIds: startedBuilds.map(({ build }) => build.id),
         accountName,
+        projectDir,
+        nonInteractive: flags.nonInteractive,
     });
     if (!flags.json) {
         (0, printBuildInfo_1.printBuildResults)(builds);

package/build/channel/utils.d.ts

@@ -1,5 +1,5 @@
 import { UpdateChannelObject } from '../graphql/queries/ChannelQuery';
-export declare type BranchMapping = {
+export type BranchMapping = {
     version: number;
     data: {
         branchId: string;

package/build/commandUtils/EasCommand.d.ts

@@ -8,12 +8,12 @@ import { OptionalProjectConfigContextField } from './context/OptionalProjectConf
 import ProjectConfigContextField from './context/ProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
 import SessionManagementContextField from './context/SessionManagementContextField';
-declare type ContextInput<T extends {
+type ContextInput<T extends {
     [name: string]: any;
 } = object> = {
     [P in keyof T]: ContextField<T[P]>;
 };
-declare type ContextOutput<T extends {
+type ContextOutput<T extends {
     [name: string]: any;
 } = object> = {
     [P in keyof T]: T[P];

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

@@ -1,7 +1,7 @@
 import { ExpoConfig } from '@expo/config-types';
 import { ExpoConfigOptions } from '../../project/expoConfig';
 import ContextField, { ContextOptions } from './ContextField';
-export declare type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
+export type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Promise<{
     projectId: string;
     exp: ExpoConfig;
     projectDir: string;

package/build/commandUtils/pagination.d.ts

@@ -9,7 +9,7 @@ export declare const EasPaginatedQueryFlags: {
     offset: OptionFlag<number | undefined>;
     limit: OptionFlag<number | undefined>;
 };
-export declare type PaginatedQueryOptions = {
+export type PaginatedQueryOptions = {
     nonInteractive: boolean;
     json: boolean;
     limit?: number;

package/build/commands/build/index.js

@@ -10,6 +10,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const figures_1 = tslib_1.__importDefault(require("figures"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const local_1 = require("../../build/local");
 const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
@@ -31,7 +32,7 @@ class Build extends EasCommand_1.default {
             nonInteractive: flags.nonInteractive,
         });
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-        if (!flags.localBuildOptions.enable) {
+        if (!flags.localBuildOptions.localBuildMode) {
             await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)(graphqlClient, flags.autoSubmit
                 ? [generated_1.StatuspageServiceName.EasBuild, generated_1.StatuspageServiceName.EasSubmit]
                 : [generated_1.StatuspageServiceName.EasBuild]);
@@ -74,13 +75,11 @@ class Build extends EasCommand_1.default {
             nonInteractive,
             localBuildOptions: flags['local']
                 ? {
-                    enable: true,
+                    localBuildMode: local_1.LocalBuildMode.LOCAL_BUILD_PLUGIN,
                     verbose: true,
                     artifactPath: flags.output && path_1.default.resolve(process.cwd(), flags.output),
                 }
-                : {
-                    enable: false,
-                },
+                : {},
             wait: flags['wait'],
             clearCache: flags['clear-cache'],
             json: flags['json'],
@@ -92,7 +91,7 @@ class Build extends EasCommand_1.default {
     }
     async ensurePlatformSelectedAsync(flags) {
         const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.requestedPlatform);
-        if (flags.localBuildOptions.enable) {
+        if (flags.localBuildOptions.localBuildMode) {
             if (flags.autoSubmit) {
                 // TODO: implement this
                 core_1.Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });

package/build/commands/build/inspect.js

@@ -7,6 +7,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const uuid_1 = require("uuid");
+const local_1 = require("../../build/local");
 const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
@@ -53,7 +54,7 @@ class BuildInspect extends EasCommand_1.default {
                     requestedPlatform: flags.platform,
                     profile: flags.profile,
                     localBuildOptions: {
-                        enable: true,
+                        localBuildMode: local_1.LocalBuildMode.LOCAL_BUILD_PLUGIN,
                         ...(flags.stage === InspectStage.PRE_BUILD ? { skipNativeBuild: true } : {}),
                         ...(flags.stage === InspectStage.POST_BUILD ? { skipCleanup: true } : {}),
                         verbose: flags.verbose,

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

@@ -0,0 +1,21 @@
+import EasCommand from '../../commandUtils/EasCommand';
+/**
+ * This command will be run on the EAS Build workers, when building
+ * directly from git. This command resolves credentials and other
+ * build configuration, that normally would be included in the
+ * job and metadata objects, and prints them to stdout.
+ */
+export default class BuildInternal extends EasCommand {
+    static hidden: boolean;
+    static flags: {
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+    };
+    static contextDefinition: {
+        analytics: import("../../commandUtils/context/AnalyticsContextField").default;
+        projectDir: import("../../commandUtils/context/ProjectDirContextField").default;
+        getDynamicProjectConfigAsync: import("../../commandUtils/context/DynamicProjectConfigContextField").DynamicProjectConfigContextField;
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+    };
+    runAsync(): Promise<void>;
+}

package/build/commands/build/internal.js

@@ -0,0 +1,60 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const core_1 = require("@oclif/core");
+const _1 = require(".");
+const local_1 = require("../../build/local");
+const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const json_1 = require("../../utils/json");
+/**
+ * This command will be run on the EAS Build workers, when building
+ * directly from git. This command resolves credentials and other
+ * build configuration, that normally would be included in the
+ * job and metadata objects, and prints them to stdout.
+ */
+class BuildInternal extends EasCommand_1.default {
+    async runAsync() {
+        const { flags } = await this.parse(BuildInternal);
+        // This command is always run with implicit --non-interactive and --json options
+        (0, json_1.enableJsonOutput)();
+        const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInternal, {
+            nonInteractive: true,
+        });
+        await (0, _1.handleDeprecatedEasJsonAsync)(projectDir, flags.nonInteractive);
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, {
+            requestedPlatform: flags.platform,
+            profile: flags.profile,
+            nonInteractive: true,
+            wait: false,
+            clearCache: false,
+            json: true,
+            autoSubmit: false,
+            localBuildOptions: {
+                localBuildMode: local_1.LocalBuildMode.INTERNAL,
+            },
+        }, actor, getDynamicProjectConfigAsync);
+    }
+}
+exports.default = BuildInternal;
+_a = BuildInternal;
+BuildInternal.hidden = true;
+BuildInternal.flags = {
+    platform: core_1.Flags.enum({
+        char: 'p',
+        options: ['android', 'ios'],
+        required: true,
+    }),
+    profile: core_1.Flags.string({
+        char: 'e',
+        description: 'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
+        helpValue: 'PROFILE_NAME',
+    }),
+};
+BuildInternal.contextDefinition = {
+    ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.DynamicProjectConfig,
+    ..._a.ContextOptions.ProjectDir,
+    ..._a.ContextOptions.Analytics,
+};

package/build/commands/build/resign.js

@@ -109,6 +109,8 @@ class BuildResign extends EasCommand_1.default {
         const buildResult = await (0, build_1.waitForBuildEndAsync)(graphqlClient, {
             buildIds: [newBuild.id],
             accountName: account.name,
+            nonInteractive,
+            projectDir,
         });
         if (!flags.json) {
             (0, printBuildInfo_1.printBuildResults)(buildResult);

package/build/commands/config.d.ts

@@ -3,8 +3,11 @@ import EasCommand from '../commandUtils/EasCommand';
 export default class Config extends EasCommand {
     static description: string;
     static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         platform: import("@oclif/core/lib/interfaces").OptionFlag<Platform | undefined>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
+        'eas-json-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
         projectDir: import("../commandUtils/context/ProjectDirContextField").default;