eas-cli 3.6.0 → 3.7.0

package/build/build/ios/prepareJob.js

@@ -6,6 +6,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const slash_1 = tslib_1.__importDefault(require("slash"));
+const customBuildConfig_1 = require("../../project/customBuildConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const vcs_1 = require("../../vcs");
 const cacheDefaults = {
@@ -15,8 +16,9 @@ const cacheDefaults = {
 };
 async function prepareJobAsync(ctx, jobData) {
     var _a;
-    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await (0, vcs_1.getVcsClient)().getRootPathAsync(), ctx.projectDir)) || '.';
     const username = (0, projectUtils_1.getUsername)(ctx.exp, ctx.user);
+    const buildProfile = ctx.buildProfile;
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await (0, vcs_1.getVcsClient)().getRootPathAsync(), ctx.projectDir)) || '.';
     const buildCredentials = {};
     if (jobData.credentials) {
         const targetNames = Object.keys(jobData.credentials);
@@ -24,37 +26,40 @@ async function prepareJobAsync(ctx, jobData) {
             buildCredentials[targetName] = prepareTargetCredentials(jobData.credentials[targetName]);
         }
     }
+    const maybeCustomBuildConfigPath = buildProfile.config
+        ? (0, customBuildConfig_1.getCustomBuildConfigPath)(buildProfile.config)
+        : undefined;
     const job = {
         type: ctx.workflow,
         platform: eas_build_job_1.Platform.IOS,
         projectArchive: jobData.projectArchive,
         projectRootDirectory,
         builderEnvironment: {
-            image: ctx.buildProfile.image,
-            node: ctx.buildProfile.node,
-            yarn: ctx.buildProfile.yarn,
-            bundler: ctx.buildProfile.bundler,
-            cocoapods: ctx.buildProfile.cocoapods,
-            fastlane: ctx.buildProfile.fastlane,
-            expoCli: ctx.buildProfile.expoCli,
-            env: ctx.buildProfile.env,
+            image: buildProfile.image,
+            node: buildProfile.node,
+            yarn: buildProfile.yarn,
+            bundler: buildProfile.bundler,
+            cocoapods: buildProfile.cocoapods,
+            fastlane: buildProfile.fastlane,
+            expoCli: buildProfile.expoCli,
+            env: buildProfile.env,
         },
         cache: {
             ...cacheDefaults,
-            ...ctx.buildProfile.cache,
+            ...buildProfile.cache,
             clear: ctx.clearCache,
         },
         secrets: {
             buildCredentials,
         },
-        releaseChannel: ctx.buildProfile.releaseChannel,
-        updates: { channel: ctx.buildProfile.channel },
-        developmentClient: ctx.buildProfile.developmentClient,
-        simulator: ctx.buildProfile.simulator,
+        releaseChannel: buildProfile.releaseChannel,
+        updates: { channel: buildProfile.channel },
+        developmentClient: buildProfile.developmentClient,
+        simulator: buildProfile.simulator,
         scheme: jobData.buildScheme,
-        buildConfiguration: ctx.buildProfile.buildConfiguration,
-        applicationArchivePath: (_a = ctx.buildProfile.applicationArchivePath) !== null && _a !== void 0 ? _a : ctx.buildProfile.artifactPath,
-        buildArtifactPaths: ctx.buildProfile.buildArtifactPaths,
+        buildConfiguration: buildProfile.buildConfiguration,
+        applicationArchivePath: (_a = buildProfile.applicationArchivePath) !== null && _a !== void 0 ? _a : buildProfile.artifactPath,
+        buildArtifactPaths: buildProfile.buildArtifactPaths,
         username,
         ...(ctx.ios.buildNumberOverride && {
             version: {
@@ -62,10 +67,15 @@ async function prepareJobAsync(ctx, jobData) {
             },
         }),
         experimental: {
-            prebuildCommand: ctx.buildProfile.prebuildCommand,
+            prebuildCommand: buildProfile.prebuildCommand,
         },
-        mode: eas_build_job_1.BuildMode.BUILD,
+        mode: buildProfile.config ? eas_build_job_1.BuildMode.CUSTOM : eas_build_job_1.BuildMode.BUILD,
         triggeredBy: eas_build_job_1.BuildTrigger.EAS_CLI,
+        ...(maybeCustomBuildConfigPath && {
+            customBuildConfig: {
+                path: maybeCustomBuildConfigPath,
+            },
+        }),
     };
     return (0, eas_build_job_1.sanitizeJob)(job);
 }

package/build/build/metadata.js

@@ -45,6 +45,7 @@ async function collectMetadataAsync(ctx) {
         }),
         runWithNoWaitFlag: ctx.noWait,
         runFromCI: ctx.runFromCI,
+        buildMode: ctx.buildProfile.config ? eas_build_job_1.BuildMode.CUSTOM : eas_build_job_1.BuildMode.BUILD,
     };
     return (0, eas_build_job_1.sanitizeMetadata)(metadata);
 }

package/build/build/queries.js

@@ -66,23 +66,33 @@ async function listAndSelectBuildOnAppAsync(graphqlClient, { projectId, title, f
     }
 }
 exports.listAndSelectBuildOnAppAsync = listAndSelectBuildOnAppAsync;
-function formatBuildChoiceValue(value) {
-    return value ? chalk_1.default.bold(value) : 'Unknown';
-}
 function createBuildToPartialChoiceMaker(selectPromptDisabledFunction) {
     return (build) => {
         var _a;
         const splitCommitMessage = (_a = build.gitCommitMessage) === null || _a === void 0 ? void 0 : _a.split('\n');
         const formattedCommitData = build.gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
             ? `${build.gitCommitHash.slice(0, 7)} "${chalk_1.default.bold(splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : ''))}"`
-            : 'Unknown';
+            : null;
+        const descriptionItems = [
+            { name: 'Version', value: build.appVersion ? chalk_1.default.bold(build.appVersion) : null },
+            { name: 'Commit', value: formattedCommitData },
+            {
+                name: 'Message',
+                value: build.message
+                    ? chalk_1.default.bold(build.message.length > 200 ? `${build.message.slice(0, 200)}...` : build.message)
+                    : null,
+            },
+            {
+                name: build.platform === generated_1.AppPlatform.Ios ? 'Build number' : 'Version code',
+                value: build.appBuildVersion ? chalk_1.default.bold(build.appBuildVersion) : null,
+            },
+        ];
+        const filteredDescriptionArray = descriptionItems
+            .filter(item => item.value)
+            .map(item => `${chalk_1.default.bold(item.name)}: ${item.value}`);
         return {
             title: `${chalk_1.default.bold(`ID:`)} ${build.id} (${chalk_1.default.bold(`${(0, date_1.fromNow)(new Date(build.completedAt))} ago`)})`,
-            description: [
-                `\t${chalk_1.default.bold(`Version:`)} ${formatBuildChoiceValue(build.appVersion)}`,
-                `\t${chalk_1.default.bold(build.platform === generated_1.AppPlatform.Ios ? 'Build number:' : 'Version code:')} ${formatBuildChoiceValue(build.appBuildVersion)}`,
-                `\t${chalk_1.default.bold(`Commit:`)} ${formattedCommitData}`,
-            ].join('\n'),
+            description: filteredDescriptionArray.length > 0 ? filteredDescriptionArray.join('\n') : '',
             disabled: selectPromptDisabledFunction === null || selectPromptDisabledFunction === void 0 ? void 0 : selectPromptDisabledFunction(build),
         };
     };

package/build/build/runBuildAndSubmit.js

@@ -12,6 +12,7 @@ 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 customBuildConfig_1 = require("../project/customBuildConfig");
 const expoSdk_1 = require("../project/expoSdk");
 const metroConfig_1 = require("../project/metroConfig");
 const projectUtils_1 = require("../project/projectUtils");
@@ -62,6 +63,7 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
     });
     for (const buildProfile of buildProfiles) {
         (0, remoteVersionSource_1.validateBuildProfileVersionSettings)(buildProfile, easJsonCliConfig);
+        await (0, customBuildConfig_1.validateCustomBuildConfigAsync)(projectDir, buildProfile.profile);
     }
     const startedBuilds = [];
     const buildCtxByPlatform = {};

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

@@ -2,4 +2,4 @@ import { BuildError, BuildFragment, EasBuildDeprecationInfo } from '../../graphq
 export declare function printLogsUrls(builds: BuildFragment[]): void;
 export declare function printBuildResults(builds: (BuildFragment | null)[]): void;
 export declare function printDeprecationWarnings(deprecationInfo?: EasBuildDeprecationInfo | null): void;
-export declare function printUserError(error: BuildError): void;
+export declare function printUserError(error: BuildError, build: BuildFragment): void;

package/build/build/utils/printBuildInfo.js

@@ -9,6 +9,22 @@ const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const platform_1 = require("../../platform");
 const url_1 = require("./url");
+function terminalLinkFallback(url, text) {
+    return `${text} (${url})`;
+}
+const errorCodeToErrorMessageOverride = {
+    EAS_BUILD_UNKNOWN_FASTLANE_ERROR: build => `The ${(0, log_1.link)((0, url_1.getBuildLogsUrl)(build, 'run-fastlane'), {
+        text: '"Run fastlane"',
+        fallback: terminalLinkFallback((0, url_1.getBuildLogsUrl)(build, 'run-fastlane'), '"Run fastlane"'),
+    })} step failed with an unknown error. Refer to the ${(0, log_1.link)((0, url_1.getBuildLogsUrl)(build, 'xcode-logs'), {
+        text: '"Xcode logs"',
+        fallback: terminalLinkFallback((0, url_1.getBuildLogsUrl)(build, 'xcode-logs'), '"Xcode logs"'),
+    })} phase for additional, more detailed logs`,
+    EAS_BUILD_UNKNOWN_GRADLE_ERROR: build => `Gradle build failed with unknown error. See logs for the ${(0, log_1.link)((0, url_1.getBuildLogsUrl)(build, 'run-gradlew'), {
+        text: '"Run gradlew"',
+        fallback: terminalLinkFallback((0, url_1.getBuildLogsUrl)(build, 'run-gradlew'), '"Run gradlew"'),
+    })} phase for more information.`,
+};
 function printLogsUrls(builds) {
     if (builds.length === 1) {
         log_1.default.log(`Build details: ${(0, log_1.link)((0, url_1.getBuildLogsUrl)(builds[0]))}`);
@@ -22,7 +38,6 @@ function printLogsUrls(builds) {
 }
 exports.printLogsUrls = printLogsUrls;
 function printBuildResults(builds) {
-    log_1.default.newLine();
     if (builds.length === 1) {
         const [build] = builds;
         (0, assert_1.default)(build, 'Build should be defined');
@@ -34,21 +49,23 @@ function printBuildResults(builds) {
 }
 exports.printBuildResults = printBuildResults;
 function printBuildResult(build) {
-    var _a, _b;
-    log_1.default.addNewLineIfNone();
+    var _a;
     if (build.status === generated_1.BuildStatus.Errored) {
+        log_1.default.addNewLineIfNone();
         const userError = build.error;
         log_1.default.error(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} build failed${userError ? ':' : ''}`);
         if (userError) {
-            printUserError(userError);
+            printUserError(userError, build);
         }
         return;
     }
     if (build.status === generated_1.BuildStatus.Canceled) {
+        log_1.default.addNewLineIfNone();
         log_1.default.error(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} build was canceled`);
         return;
     }
     if (build.distribution === generated_1.DistributionType.Internal) {
+        log_1.default.addNewLineIfNone();
         const logsUrl = (0, url_1.getBuildLogsUrl)(build);
         // It's tricky to install the .apk file directly on Android so let's fallback
         // to the build details page and let people press the button to download there
@@ -60,9 +77,12 @@ function printBuildResult(build) {
     else {
         // TODO: it looks like buildUrl could possibly be undefined, based on the code below.
         // we should account for this case better if it is possible
-        const url = (_b = (_a = build.artifacts) === null || _a === void 0 ? void 0 : _a.buildUrl) !== null && _b !== void 0 ? _b : '';
-        log_1.default.log(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} app:`);
-        log_1.default.log(`${(0, log_1.link)(url)}`);
+        const url = (_a = build.artifacts) === null || _a === void 0 ? void 0 : _a.buildUrl;
+        if (url) {
+            log_1.default.addNewLineIfNone();
+            log_1.default.log(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} app:`);
+            log_1.default.log((0, log_1.link)(url));
+        }
     }
 }
 function printDeprecationWarnings(deprecationInfo) {
@@ -84,10 +104,22 @@ function printDeprecationWarnings(deprecationInfo) {
     }
 }
 exports.printDeprecationWarnings = printDeprecationWarnings;
-function printUserError(error) {
-    log_1.default.error(error.message);
-    if (error.docsUrl) {
-        log_1.default.error((0, log_1.learnMore)(error.docsUrl, { dim: false }));
+function printUserError(error, build) {
+    const maybeErrorMessageOverride = maybeGetErrorMessageOverride(error, build);
+    if (maybeErrorMessageOverride) {
+        log_1.default.error(maybeErrorMessageOverride);
+    }
+    else {
+        log_1.default.error(error.message);
+        if (error.docsUrl) {
+            log_1.default.error((0, log_1.learnMore)(error.docsUrl, { dim: false }));
+        }
     }
 }
 exports.printUserError = printUserError;
+function maybeGetErrorMessageOverride(error, build) {
+    if (!(error.errorCode in errorCodeToErrorMessageOverride)) {
+        return null;
+    }
+    return errorCodeToErrorMessageOverride[error.errorCode](build);
+}

package/build/build/utils/url.d.ts

@@ -1,6 +1,6 @@
 import { BuildFragment } from '../../graphql/generated';
 export declare function getProjectDashboardUrl(accountName: string, projectName: string): string;
-export declare function getBuildLogsUrl(build: BuildFragment): string;
+export declare function getBuildLogsUrl(build: BuildFragment, hash?: string): string;
 export declare function getArtifactUrl(artifactId: string): string;
 export declare function getInternalDistributionInstallUrl(build: BuildFragment): string;
 export declare function getUpdateGroupUrl(accountName: string, projectName: string, updateGroupId: string): string;

package/build/build/utils/url.js

@@ -9,11 +9,11 @@ function getProjectDashboardUrl(accountName, projectName) {
     return new URL(`/accounts/${accountName}/projects/${projectName}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
 exports.getProjectDashboardUrl = getProjectDashboardUrl;
-function getBuildLogsUrl(build) {
+function getBuildLogsUrl(build, hash) {
     const { project } = build;
     const url = project.__typename !== 'App'
         ? `/builds/${build.id}`
-        : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}`;
+        : `/accounts/${project.ownerAccount.name}/projects/${project.slug}/builds/${build.id}${hash ? `#${hash}` : ''}`;
     return new URL(url, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
 }
 exports.getBuildLogsUrl = getBuildLogsUrl;

package/build/commandUtils/context/contextUtils/getProjectIdAsync.js

@@ -73,7 +73,13 @@ async function getProjectIdAsync(sessionManager, exp, options) {
         }
         const actorUsername = (0, User_1.getActorUsername)(actor);
         if (!exp.owner && appForProjectId.ownerAccount.name !== actorUsername) {
-            throw new Error(`Project config: Owner of project identified by "extra.eas.projectId" (${appForProjectId.ownerAccount.name}) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${appForProjectId.ownerAccount.name}" should be added to the project config, which can be done automatically by re-running "eas init". ${(0, log_1.learnMore)('https://expo.fyi/eas-project-id')}`);
+            if (actorUsername) {
+                throw new Error(`Project config: Owner of project identified by "extra.eas.projectId" (${appForProjectId.ownerAccount.name}) does not match the logged in user (${actorUsername}) and the "owner" field is not specified. To ensure all libraries work correctly, "owner": "${appForProjectId.ownerAccount.name}" should be added to the project config, which can be done automatically by re-running "eas init". ${(0, log_1.learnMore)('https://expo.fyi/eas-project-id')}`);
+            }
+            else {
+                // robot caller
+                throw new Error(`Project config: Owner of project identified by "extra.eas.projectId" (${appForProjectId.ownerAccount.name}) must be specified in "owner" field when using a robot access token. To ensure all libraries work correctly, "owner": "${appForProjectId.ownerAccount.name}" should be added to the project config, which can be done automatically by re-running "eas init". ${(0, log_1.learnMore)('https://expo.fyi/eas-project-id')}`);
+            }
         }
         if (exp.slug && exp.slug !== appForProjectId.slug) {
             throw new Error(`Project config: Slug for project identified by "extra.eas.projectId" (${appForProjectId.slug}) does not match the "slug" field (${exp.slug}). ${(0, log_1.learnMore)('https://expo.fyi/eas-project-id')}`);

package/build/commands/build/index.js

@@ -104,6 +104,12 @@ class Build extends EasCommand_1.default {
             else if (process.platform !== 'darwin' && requestedPlatform === platform_1.RequestedPlatform.Ios) {
                 core_1.Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
             }
+            else if (!['linux', 'darwin'].includes(process.platform) &&
+                requestedPlatform === platform_1.RequestedPlatform.Android) {
+                core_1.Errors.error('Unsupported platform, macOS or Linux is required to build apps for Android', {
+                    exit: 1,
+                });
+            }
         }
         return {
             ...flags,

package/build/commands/update/index.js

@@ -164,10 +164,27 @@ class UpdatePublish extends EasCommand_1.default {
             uploadedAssetCount = uploadResults.uniqueUploadedAssetCount;
             assetLimitPerUpdateGroup = uploadResults.assetLimitPerUpdateGroup;
             unsortedUpdateInfoGroups = await (0, publish_1.buildUnsortedUpdateInfoGroupAsync)(assets, exp);
-            const uploadAssetSuccessMessage = uploadedAssetCount
-                ? `Uploaded ${uploadedAssetCount} ${uploadedAssetCount === 1 ? 'platform' : 'platforms'}`
-                : `Uploaded: No changes detected`;
-            assetSpinner.succeed(uploadAssetSuccessMessage);
+            // NOTE(cedric): we assume that bundles are always uploaded, and always are part of
+            // `uploadedAssetCount`, perferably we don't assume. For that, we need to refactor the
+            // `uploadAssetsAsync` and be able to determine asset type from the uploaded assets.
+            const uploadedBundleCount = uploadResults.launchAssetCount;
+            const uploadedNormalAssetCount = Math.max(0, uploadedAssetCount - uploadedBundleCount);
+            const reusedNormalAssetCount = uploadResults.uniqueAssetCount - uploadedNormalAssetCount;
+            assetSpinner.stop();
+            log_1.default.withTick(`Uploaded ${uploadedBundleCount} app ${uploadedBundleCount === 1 ? 'bundle' : 'bundles'}`);
+            if (uploadedNormalAssetCount === 0) {
+                log_1.default.withTick(`Uploading assets skipped - no new assets found`);
+            }
+            else {
+                let message = `Uploaded ${uploadedNormalAssetCount} ${uploadedNormalAssetCount === 1 ? 'asset' : 'assets'}`;
+                if (reusedNormalAssetCount > 0) {
+                    message += ` (reused ${reusedNormalAssetCount} ${reusedNormalAssetCount === 1 ? 'asset' : 'assets'})`;
+                }
+                log_1.default.withTick(message);
+            }
+            for (const uploadedAssetPath of uploadResults.uniqueUploadedAssetPaths) {
+                log_1.default.debug(chalk_1.default.dim(`- ${uploadedAssetPath}`));
+            }
         }
         catch (e) {
             assetSpinner.fail('Failed to upload');

package/build/graphql/generated.d.ts

@@ -123,11 +123,15 @@ export type Account = {
     subscription?: Maybe<SubscriptionDetails>;
     /** @deprecated No longer needed */
     subscriptionChangesPending?: Maybe<Scalars['Boolean']>;
+    /** Coalesced project activity for an app using pagination */
+    timelineActivity: TimelineActivityConnection;
     /** @deprecated See isCurrent */
     unlimitedBuilds: Scalars['Boolean'];
     updatedAt: Scalars['DateTime'];
     /** Account query object for querying EAS usage metrics */
     usageMetrics: AccountUsageMetrics;
+    /** Owning UserActor of this account if personal account */
+    userActorOwner?: Maybe<UserActor>;
     /** Pending user invitations for this account */
     userInvitations: Array<UserInvitation>;
     /** Actors associated with this account and permissions they hold */
@@ -234,6 +238,17 @@ export type AccountSnacksArgs = {
     limit: Scalars['Int'];
     offset: Scalars['Int'];
 };
+/**
+ * An account is a container owning projects, credentials, billing and other organization
+ * data and settings. Actors may own and be members of accounts.
+ */
+export type AccountTimelineActivityArgs = {
+    after?: InputMaybe<Scalars['String']>;
+    before?: InputMaybe<Scalars['String']>;
+    filter?: InputMaybe<TimelineActivityFilterInput>;
+    first?: InputMaybe<Scalars['Int']>;
+    last?: InputMaybe<Scalars['Int']>;
+};
 export type AccountDataInput = {
     name: Scalars['String'];
 };
@@ -666,6 +681,7 @@ export type AndroidJobInput = {
     buildType?: InputMaybe<AndroidBuildType>;
     builderEnvironment?: InputMaybe<AndroidBuilderEnvironmentInput>;
     cache?: InputMaybe<BuildCacheInput>;
+    customBuildConfig?: InputMaybe<CustomBuildConfigInput>;
     developmentClient?: InputMaybe<Scalars['Boolean']>;
     experimental?: InputMaybe<Scalars['JSONObject']>;
     gradleCommand?: InputMaybe<Scalars['String']>;
@@ -794,10 +810,8 @@ export type App = Project & {
     /** Classic update release channel names that have at least one build */
     buildsReleaseChannels: Array<Scalars['String']>;
     deployment?: Maybe<Deployment>;
-    deploymentNew?: Maybe<DeploymentNew>;
     /** Deployments associated with this app */
-    deployments: Array<Deployment>;
-    deploymentsNew: DeploymentsConnection;
+    deployments: DeploymentsConnection;
     description: Scalars['String'];
     /** Environment secrets for an app */
     environmentSecrets: Array<EnvironmentSecret>;
@@ -909,23 +923,11 @@ export type AppBuildsArgs = {
 };
 /** Represents an Exponent App (or Experience in legacy terms) */
 export type AppDeploymentArgs = {
-    channel: Scalars['String'];
-    options?: InputMaybe<DeploymentOptions>;
-    runtimeVersion: Scalars['String'];
-};
-/** Represents an Exponent App (or Experience in legacy terms) */
-export type AppDeploymentNewArgs = {
     channel: Scalars['String'];
     runtimeVersion: Scalars['String'];
 };
 /** Represents an Exponent App (or Experience in legacy terms) */
 export type AppDeploymentsArgs = {
-    limit: Scalars['Int'];
-    mostRecentlyUpdatedAt?: InputMaybe<Scalars['DateTime']>;
-    options?: InputMaybe<DeploymentOptions>;
-};
-/** Represents an Exponent App (or Experience in legacy terms) */
-export type AppDeploymentsNewArgs = {
     after?: InputMaybe<Scalars['String']>;
     before?: InputMaybe<Scalars['String']>;
     first?: InputMaybe<Scalars['Int']>;
@@ -1606,6 +1608,7 @@ export declare enum BuildIosEnterpriseProvisioning {
 /** Represents an Standalone App build job */
 export type BuildJob = ActivityTimelineProjectActivity & BuildOrBuildJob & {
     __typename?: 'BuildJob';
+    accountUserActor?: Maybe<UserActor>;
     activityTimestamp: Scalars['DateTime'];
     actor?: Maybe<Actor>;
     app?: Maybe<App>;
@@ -1701,6 +1704,7 @@ export type BuildMetrics = {
 };
 export declare enum BuildMode {
     Build = "BUILD",
+    Custom = "CUSTOM",
     Resign = "RESIGN"
 }
 export type BuildMutation = {
@@ -1846,6 +1850,8 @@ export declare enum BuildResourceClass {
     IosLarge = "IOS_LARGE",
     IosM1Large = "IOS_M1_LARGE",
     IosM1Medium = "IOS_M1_MEDIUM",
+    IosM2Medium = "IOS_M2_MEDIUM",
+    IosM2ProMedium = "IOS_M2_PRO_MEDIUM",
     IosMedium = "IOS_MEDIUM",
     Legacy = "LEGACY"
 }
@@ -1981,6 +1987,9 @@ export type CreateSubmissionResult = {
     /** Created submission */
     submission: Submission;
 };
+export type CustomBuildConfigInput = {
+    path: Scalars['String'];
+};
 export type DeleteAccessTokenResult = {
     __typename?: 'DeleteAccessTokenResult';
     id: Scalars['ID'];
@@ -2052,16 +2061,17 @@ export type DeployServerlessFunctionResult = {
 /** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
 export type Deployment = {
     __typename?: 'Deployment';
-    channel?: Maybe<UpdateChannel>;
-    /**
-     * The name of this deployment's associated channel. It is specified separately from the `channel`
-     * field to allow specifying a deployment before an EAS Update channel has been created.
-     */
-    channelName: Scalars['String'];
+    builds: DeploymentBuildsConnection;
+    channel: UpdateChannel;
     id: Scalars['ID'];
-    mostRecentlyUpdatedAt: Scalars['DateTime'];
-    recentBuilds: Array<Build>;
-    runtimeVersion: Scalars['String'];
+    runtime: Runtime;
+};
+/** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
+export type DeploymentBuildsArgs = {
+    after?: InputMaybe<Scalars['String']>;
+    before?: InputMaybe<Scalars['String']>;
+    first?: InputMaybe<Scalars['Int']>;
+    last?: InputMaybe<Scalars['Int']>;
 };
 export type DeploymentBuildEdge = {
     __typename?: 'DeploymentBuildEdge';
@@ -2077,28 +2087,9 @@ export type DeploymentBuildsConnection = {
 export type DeploymentEdge = {
     __typename?: 'DeploymentEdge';
     cursor: Scalars['String'];
-    node: DeploymentNew;
-};
-/** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
-export type DeploymentNew = {
-    __typename?: 'DeploymentNew';
-    builds: DeploymentBuildsConnection;
-    channel: UpdateChannel;
-    id: Scalars['ID'];
-    runtime: Runtime;
-};
-/** Represents a Deployment - a set of Builds with the same Runtime Version and Channel */
-export type DeploymentNewBuildsArgs = {
-    after?: InputMaybe<Scalars['String']>;
-    before?: InputMaybe<Scalars['String']>;
-    first?: InputMaybe<Scalars['Int']>;
-    last?: InputMaybe<Scalars['Int']>;
-};
-export type DeploymentOptions = {
-    /** Max number of associated builds to return */
-    buildListMaxSize?: InputMaybe<Scalars['Int']>;
+    node: Deployment;
 };
-/** Represents the connection over the deploymentsNew edge of an App */
+/** Represents the connection over the deployments edge of an App */
 export type DeploymentsConnection = {
     __typename?: 'DeploymentsConnection';
     edges: Array<DeploymentEdge>;
@@ -2604,6 +2595,7 @@ export type IosJobInput = {
     buildType?: InputMaybe<IosBuildType>;
     builderEnvironment?: InputMaybe<IosBuilderEnvironmentInput>;
     cache?: InputMaybe<BuildCacheInput>;
+    customBuildConfig?: InputMaybe<CustomBuildConfigInput>;
     developmentClient?: InputMaybe<Scalars['Boolean']>;
     /** @deprecated */
     distribution?: InputMaybe<DistributionType>;

package/build/graphql/generated.js

@@ -118,6 +118,7 @@ var BuildJobStatus;
 var BuildMode;
 (function (BuildMode) {
     BuildMode["Build"] = "BUILD";
+    BuildMode["Custom"] = "CUSTOM";
     BuildMode["Resign"] = "RESIGN";
 })(BuildMode = exports.BuildMode || (exports.BuildMode = {}));
 var BuildPriority;
@@ -137,6 +138,8 @@ var BuildResourceClass;
     BuildResourceClass["IosLarge"] = "IOS_LARGE";
     BuildResourceClass["IosM1Large"] = "IOS_M1_LARGE";
     BuildResourceClass["IosM1Medium"] = "IOS_M1_MEDIUM";
+    BuildResourceClass["IosM2Medium"] = "IOS_M2_MEDIUM";
+    BuildResourceClass["IosM2ProMedium"] = "IOS_M2_PRO_MEDIUM";
     BuildResourceClass["IosMedium"] = "IOS_MEDIUM";
     BuildResourceClass["Legacy"] = "LEGACY";
 })(BuildResourceClass = exports.BuildResourceClass || (exports.BuildResourceClass = {}));

package/build/log.d.ts

@@ -22,9 +22,10 @@ export default class Log {
  *
  * @example https://expo.dev
  */
-export declare function link(url: string, { text, dim }?: {
+export declare function link(url: string, { text, fallback, dim }?: {
     text?: string;
     dim?: boolean;
+    fallback?: string;
 }): string;
 /**
  * Provide a consistent "Learn more" link experience.

package/build/log.js

@@ -77,10 +77,10 @@ Log.isLastLineNewLine = false;
  *
  * @example https://expo.dev
  */
-function link(url, { text = url, dim = true } = {}) {
+function link(url, { text = url, fallback, dim = true } = {}) {
     // Links can be disabled via env variables https://github.com/jamestalmage/supports-hyperlinks/blob/master/index.js
     const output = (0, terminal_link_1.default)(text, url, {
-        fallback: () => (text === url ? chalk_1.default.underline(url) : `${text}: ${chalk_1.default.underline(url)}`),
+        fallback: () => fallback !== null && fallback !== void 0 ? fallback : (text === url ? chalk_1.default.underline(url) : `${text}: ${chalk_1.default.underline(url)}`),
     });
     return dim ? chalk_1.default.dim(output) : output;
 }

package/build/project/android/gradleUtils.js

@@ -43,7 +43,7 @@ function parseGradleCommand(cmd, buildGradle) {
     // separate moduleName and rest of the definition
     const splitCmd = rawCmd.split(':');
     const [moduleName, taskName] = splitCmd.length > 1 ? [splitCmd[0], splitCmd[1]] : [undefined, splitCmd[0]];
-    const matchResult = taskName.match(/(build|bundle|assemble)(.*)(Release|Debug)/);
+    const matchResult = taskName.match(/(build|bundle|assemble|package)(.*)(Release|Debug)/);
     if (!matchResult) {
         throw new Error(`Failed to parse gradle command: ${cmd}`);
     }

package/build/project/customBuildConfig.d.ts

@@ -0,0 +1,4 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+export declare function validateCustomBuildConfigAsync(projectDir: string, profile: BuildProfile<Platform>): Promise<void>;
+export declare function getCustomBuildConfigPath(configFilename: string): string;

package/build/project/customBuildConfig.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCustomBuildConfigPath = exports.validateCustomBuildConfigAsync = void 0;
+const tslib_1 = require("tslib");
+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"));
+async function validateCustomBuildConfigAsync(projectDir, profile) {
+    if (!profile.config) {
+        return;
+    }
+    const relativeBuildConfigPath = getCustomBuildConfigPath(profile.config);
+    const buildConfigPath = path_1.default.join(projectDir, relativeBuildConfigPath);
+    if (!(await fs_extra_1.default.pathExists(buildConfigPath))) {
+        throw new Error(`Custom build configuration file ${chalk_1.default.bold(relativeBuildConfigPath)} does not exist.`);
+    }
+}
+exports.validateCustomBuildConfigAsync = validateCustomBuildConfigAsync;
+function getCustomBuildConfigPath(configFilename) {
+    return path_1.default.join('.eas/build', configFilename);
+}
+exports.getCustomBuildConfigPath = getCustomBuildConfigPath;