eas-cli 3.1.1 → 3.2.1

package/build/build/queries.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLatestBuildAsync = exports.listAndSelectBuildsOnAppAsync = exports.listAndSelectBuildOnAppAsync = exports.listAndRenderBuildsOnAppAsync = exports.BUILDS_LIMIT = void 0;
+exports.getLatestBuildAsync = exports.listAndSelectBuildOnAppAsync = exports.listAndRenderBuildsOnAppAsync = exports.BUILDS_LIMIT = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importDefault(require("../log"));
-const prompts_1 = require("../prompts");
 const date_1 = require("../utils/date");
 const json_1 = require("../utils/json");
 const queries_1 = require("../utils/queries");
@@ -41,13 +40,13 @@ async function listAndRenderBuildsOnAppAsync(graphqlClient, { projectId, project
     }
 }
 exports.listAndRenderBuildsOnAppAsync = listAndRenderBuildsOnAppAsync;
-async function listAndSelectBuildOnAppAsync(graphqlClient, { projectId, title, filter, paginatedQueryOptions, }) {
+async function listAndSelectBuildOnAppAsync(graphqlClient, { projectId, title, filter, paginatedQueryOptions, selectPromptDisabledFunction, selectPromptWarningMessage, }) {
     var _a;
     if (paginatedQueryOptions.nonInteractive) {
         throw new Error('Unable to select a build in non-interactive mode.');
     }
     else {
-        return await (0, queries_1.paginatedQueryWithSelectPromptAsync)({
+        const selectedBuild = await (0, queries_1.paginatedQueryWithSelectPromptAsync)({
             limit: (_a = paginatedQueryOptions.limit) !== null && _a !== void 0 ? _a : exports.BUILDS_LIMIT,
             offset: paginatedQueryOptions.offset,
             queryToPerform: (limit, offset) => BuildQuery_1.BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
@@ -59,59 +58,35 @@ async function listAndSelectBuildOnAppAsync(graphqlClient, { projectId, title, f
             promptOptions: {
                 title,
                 getIdentifierForQueryItem: build => build.id,
-                createDisplayTextForSelectionPromptListItem: formatBuildChoiceTitleAndDescription,
+                makePartialChoiceObject: createBuildToPartialChoiceMaker(selectPromptDisabledFunction),
+                selectPromptWarningMessage,
             },
         });
+        return selectedBuild !== null && selectedBuild !== void 0 ? selectedBuild : null;
     }
 }
 exports.listAndSelectBuildOnAppAsync = listAndSelectBuildOnAppAsync;
 function formatBuildChoiceValue(value) {
-    return value ? chalk_1.default.bold(value) : chalk_1.default.dim('Unknown');
+    return value ? chalk_1.default.bold(value) : 'Unknown';
 }
-function formatBuildChoiceTitleAndDescription(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
-        ? `${chalk_1.default.dim(build.gitCommitHash.slice(0, 7))} "${chalk_1.default.bold(splitCommitMessage[0] + (splitCommitMessage.length > 1 ? '…' : ''))}"`
-        : 'Unknown';
-    return {
-        title: `ID: ${chalk_1.default.dim(build.id)} (${chalk_1.default.dim(`${(0, date_1.fromNow)(new Date(build.updatedAt))} ago`)})`,
-        description: [
-            `\tVersion: ${formatBuildChoiceValue(build.appVersion)}`,
-            `\t${build.platform === generated_1.AppPlatform.Ios ? 'Build number' : 'Version code'}: ${formatBuildChoiceValue(build.appBuildVersion)}`,
-            `\tCommit: ${formattedCommitData}`,
-        ].join('\n'),
+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';
+        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'),
+            disabled: selectPromptDisabledFunction === null || selectPromptDisabledFunction === void 0 ? void 0 : selectPromptDisabledFunction(build),
+        };
     };
 }
-async function listAndSelectBuildsOnAppAsync(graphqlClient, selectedPlatform, { projectId, projectDisplayName, filter, queryOptions, selectPromptDisabledFunction, warningMessage, }) {
-    var _a;
-    const builds = await BuildQuery_1.BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId: projectId,
-        limit: (_a = queryOptions.limit) !== null && _a !== void 0 ? _a : exports.BUILDS_LIMIT,
-        offset: queryOptions.offset,
-        filter,
-    });
-    if (builds.length === 0) {
-        throw new Error('Found no builds matching the provided criteria.');
-    }
-    const { selectedSimulatorBuild } = await (0, prompts_1.promptAsync)({
-        type: 'select',
-        message: `Select ${selectedPlatform === generated_1.AppPlatform.Ios ? 'iOS' : 'Android'} ${selectedPlatform === generated_1.AppPlatform.Ios ? 'simulator' : 'emulator'} build to run for ${projectDisplayName} app`,
-        name: 'selectedSimulatorBuild',
-        choices: builds.map(build => {
-            const buildChoice = formatBuildChoiceTitleAndDescription(build);
-            return {
-                title: buildChoice.title,
-                description: buildChoice.description,
-                value: build,
-                disabled: selectPromptDisabledFunction === null || selectPromptDisabledFunction === void 0 ? void 0 : selectPromptDisabledFunction(build),
-            };
-        }),
-        warn: warningMessage,
-    });
-    return selectedSimulatorBuild;
-}
-exports.listAndSelectBuildsOnAppAsync = listAndSelectBuildsOnAppAsync;
 async function getLatestBuildAsync(graphqlClient, { projectId, filter, }) {
     const builds = await BuildQuery_1.BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
         appId: projectId,
@@ -120,7 +95,7 @@ async function getLatestBuildAsync(graphqlClient, { projectId, filter, }) {
         filter,
     });
     if (builds.length === 0) {
-        throw new Error('Found no build matching the provided criteria.');
+        return null;
     }
     return builds[0];
 }

package/build/build/utils/printBuildInfo.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.printUserError = exports.printDeprecationWarnings = exports.printBuildResults = exports.printLogsUrls = void 0;
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const indent_string_1 = tslib_1.__importDefault(require("indent-string"));
 const qrcode_terminal_1 = tslib_1.__importDefault(require("qrcode-terminal"));
 const generated_1 = require("../../graphql/generated");
@@ -12,12 +11,12 @@ const platform_1 = require("../../platform");
 const url_1 = require("./url");
 function printLogsUrls(builds) {
     if (builds.length === 1) {
-        log_1.default.log(`Build details: ${chalk_1.default.underline((0, url_1.getBuildLogsUrl)(builds[0]))}`);
+        log_1.default.log(`Build details: ${(0, log_1.link)((0, url_1.getBuildLogsUrl)(builds[0]))}`);
     }
     else {
         builds.forEach(build => {
             const logsUrl = (0, url_1.getBuildLogsUrl)(build);
-            log_1.default.log(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} build details: ${chalk_1.default.underline(logsUrl)}`);
+            log_1.default.log(`${platform_1.appPlatformEmojis[build.platform]} ${platform_1.appPlatformDisplayNames[build.platform]} build details: ${(0, log_1.link)(logsUrl)}`);
         });
     }
 }
@@ -56,14 +55,14 @@ function printBuildResult(build) {
         const qrcodeUrl = build.platform === generated_1.AppPlatform.Ios ? (0, url_1.getInternalDistributionInstallUrl)(build) : logsUrl;
         qrcode_terminal_1.default.generate(qrcodeUrl, { small: true }, code => log_1.default.log(`${(0, indent_string_1.default)(code, 2)}\n`));
         log_1.default.log(`${platform_1.appPlatformEmojis[build.platform]} Open this link on your ${platform_1.appPlatformDisplayNames[build.platform]} devices (or scan the QR code) to install the app:`);
-        log_1.default.log(`${chalk_1.default.underline(logsUrl)}`);
+        log_1.default.log(`${(0, log_1.link)(logsUrl)}`);
     }
     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(`${chalk_1.default.underline(url)}`);
+        log_1.default.log(`${(0, log_1.link)(url)}`);
     }
 }
 function printDeprecationWarnings(deprecationInfo) {

package/build/channel/queries.js

@@ -24,7 +24,7 @@ async function selectChannelOnAppAsync(graphqlClient, { projectId, selectionProm
         queryToPerform: (limit, offset) => queryChannelsOnAppAsync(graphqlClient, { appId: projectId, limit, offset }),
         promptOptions: {
             title: selectionPromptTitle,
-            createDisplayTextForSelectionPromptListItem: updateChannel => ({ title: updateChannel.name }),
+            makePartialChoiceObject: updateChannel => ({ title: updateChannel.name }),
             getIdentifierForQueryItem: updateChannel => updateChannel.id,
         },
     });

package/build/commands/build/run.js

@@ -12,6 +12,7 @@ const pagination_1 = require("../../commandUtils/pagination");
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const run_1 = require("../../run/run");
@@ -103,30 +104,47 @@ async function resolvePlatformAsync(platform) {
     });
     return selectedPlatform;
 }
+function validateChosenBuild(maybeBuild, selectedPlatform) {
+    if (!maybeBuild) {
+        throw new Error('There are no simulator/emulator builds that can be run for this project.');
+    }
+    if (selectedPlatform !== maybeBuild.platform) {
+        throw new Error(`The selected build is for ${platform_1.appPlatformDisplayNames[maybeBuild.platform]}, but you selected ${platform_1.appPlatformDisplayNames[selectedPlatform]}`);
+    }
+    if (maybeBuild.status !== generated_1.BuildStatus.Finished) {
+        throw new Error('The selected build is not finished.');
+    }
+    if (!(0, utils_1.isRunnableOnSimulatorOrEmulator)(maybeBuild)) {
+        throw new Error('Artifacts for the latest build have expired and are no longer available, or this is not a simulator/emulator build.');
+    }
+    return maybeBuild;
+}
 async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQueryOptions) {
     const distributionType = flags.selectedPlatform === generated_1.AppPlatform.Ios ? generated_1.DistributionType.Simulator : undefined;
     if (flags.runArchiveFlags.id) {
-        return BuildQuery_1.BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
+        const build = await BuildQuery_1.BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
+        return validateChosenBuild(build, flags.selectedPlatform);
     }
     else if (!flags.runArchiveFlags.id &&
         !flags.runArchiveFlags.path &&
         !flags.runArchiveFlags.url &&
         !flags.runArchiveFlags.latest) {
-        return await (0, queries_1.listAndSelectBuildsOnAppAsync)(graphqlClient, flags.selectedPlatform, {
+        const build = await (0, queries_1.listAndSelectBuildOnAppAsync)(graphqlClient, {
             projectId,
-            projectDisplayName: await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId),
+            title: `Select ${platform_1.appPlatformDisplayNames[flags.selectedPlatform]} ${flags.selectedPlatform === generated_1.AppPlatform.Ios ? 'simulator' : 'emulator'} build to run for ${await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId)} app`,
             filter: {
                 platform: flags.selectedPlatform,
                 distribution: distributionType,
                 status: generated_1.BuildStatus.Finished,
             },
-            queryOptions: paginatedQueryOptions,
+            paginatedQueryOptions,
             selectPromptDisabledFunction: build => !(0, utils_1.isRunnableOnSimulatorOrEmulator)(build),
-            warningMessage: 'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
+            selectPromptWarningMessage: 'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
         });
+        return validateChosenBuild(build, flags.selectedPlatform);
     }
     else if (flags.runArchiveFlags.latest) {
-        return await (0, queries_1.getLatestBuildAsync)(graphqlClient, {
+        const latestBuild = await (0, queries_1.getLatestBuildAsync)(graphqlClient, {
             projectId,
             filter: {
                 platform: flags.selectedPlatform,
@@ -134,6 +152,7 @@ async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQuer
                 status: generated_1.BuildStatus.Finished,
             },
         });
+        return validateChosenBuild(latestBuild, flags.selectedPlatform);
     }
     else {
         return null;

package/build/commands/project/init.js

@@ -6,14 +6,13 @@ const config_1 = require("@expo/config");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
-const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
 const url_1 = require("../../build/utils/url");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const getProjectIdAsync_1 = require("../../commandUtils/context/contextUtils/getProjectIdAsync");
 const generated_1 = require("../../graphql/generated");
 const AppMutation_1 = require("../../graphql/mutations/AppMutation");
 const AppQuery_1 = require("../../graphql/queries/AppQuery");
-const log_1 = tslib_1.__importDefault(require("../../log"));
+const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const expoConfig_1 = require("../../project/expoConfig");
 const fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1 = require("../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync");
@@ -197,10 +196,7 @@ class ProjectInit extends EasCommand_1.default {
             throw new Error(`Project ID configuration canceled for ${projectFullName}.`);
         }
         const projectDashboardUrl = (0, url_1.getProjectDashboardUrl)(accountName, projectName);
-        const projectLink = (0, terminal_link_1.default)(projectFullName, projectDashboardUrl, {
-            // https://github.com/sindresorhus/terminal-link/issues/18#issuecomment-1068020361
-            fallback: () => `${projectFullName} (${projectDashboardUrl})`,
-        });
+        const projectLink = (0, log_1.link)(projectDashboardUrl, { text: projectFullName });
         const account = (0, nullthrows_1.default)(allAccounts.find(a => a.name === accountName));
         const spinner = (0, ora_1.ora)(`Creating ${chalk_1.default.bold(projectFullName)}`).start();
         let createdProjectId;

package/build/commands/update/configure.js

@@ -22,6 +22,7 @@ class UpdateConfigure extends EasCommand_1.default {
             projectDir,
             platform,
         });
+        await (0, configure_1.ensureEASUpdateIsConfiguredInEasJsonAsync)(projectDir);
         log_1.default.addNewLineIfNone();
         log_1.default.log(`🎉 Your app is configured with EAS Update!`);
         log_1.default.newLine();

package/build/commands/update/republish.d.ts

@@ -2,6 +2,7 @@ import { Platform } from '@expo/config';
 import EasCommand from '../../commandUtils/EasCommand';
 declare type UpdateRepublishRawFlags = {
     branch?: string;
+    channel?: string;
     group?: string;
     message?: string;
     platform: string;
@@ -10,6 +11,7 @@ declare type UpdateRepublishRawFlags = {
 };
 declare type UpdateRepublishFlags = {
     branchName?: string;
+    channelName?: string;
     groupId?: string;
     updateMessage?: string;
     platform: Platform[];
@@ -21,6 +23,7 @@ export default class UpdateRepublish extends EasCommand {
     static flags: {
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        channel: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         branch: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         group: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;

package/build/commands/update/republish.js

@@ -13,6 +13,7 @@ const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
+const getBranchNameFromChannelNameAsync_1 = require("../../update/getBranchNameFromChannelNameAsync");
 const queries_1 = require("../../update/queries");
 const utils_1 = require("../../update/utils");
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
@@ -107,18 +108,24 @@ class UpdateRepublish extends EasCommand_1.default {
     sanitizeFlags(rawFlags) {
         var _b;
         const branchName = rawFlags.branch;
+        const channelName = rawFlags.channel;
         const groupId = rawFlags.group;
-        if (!branchName && !groupId) {
-            throw new Error('Either --branch or --group must be specified');
+        const nonInteractive = rawFlags['non-interactive'];
+        if (nonInteractive && !groupId) {
+            throw new Error('Only --group can be used in non-interactive mode');
+        }
+        if (!groupId && !(branchName || channelName)) {
+            throw new Error(`--channel, --branch, or --group must be specified`);
         }
         const platform = rawFlags.platform === 'all' ? defaultRepublishPlatforms : [rawFlags.platform];
         return {
             branchName,
+            channelName,
             groupId,
             platform,
             updateMessage: rawFlags.message,
             json: (_b = rawFlags.json) !== null && _b !== void 0 ? _b : false,
-            nonInteractive: rawFlags['non-interactive'],
+            nonInteractive,
         };
     }
 }
@@ -126,13 +133,17 @@ exports.default = UpdateRepublish;
 _a = UpdateRepublish;
 UpdateRepublish.description = 'rollback to an existing update';
 UpdateRepublish.flags = {
+    channel: core_1.Flags.string({
+        description: 'Channel name to select an update to republish from',
+        exclusive: ['branch', 'group'],
+    }),
     branch: core_1.Flags.string({
         description: 'Branch name to select an update to republish from',
-        exclusive: ['group'],
+        exclusive: ['channel', 'group'],
     }),
     group: core_1.Flags.string({
         description: 'Update group ID to republish',
-        exclusive: ['branch'],
+        exclusive: ['branch', 'channel'],
     }),
     message: core_1.Flags.string({
         description: 'Short message describing the republished update',
@@ -170,7 +181,14 @@ async function getOrAskUpdatesAsync(graphqlClient, projectId, flags) {
             projectId,
         });
     }
-    throw new Error('Must supply --group or --branch');
+    if (flags.channelName) {
+        return await askUpdatesFromChannelNameAsync(graphqlClient, {
+            ...flags,
+            channelName: flags.channelName,
+            projectId,
+        });
+    }
+    throw new Error('--channel, --branch, or --group is required');
 }
 /** Ask the user which update needs to be republished by branch name, this requires interactive mode */
 async function askUpdatesFromBranchNameAsync(graphqlClient, { projectId, branchName, json, nonInteractive, }) {
@@ -189,6 +207,19 @@ async function askUpdatesFromBranchNameAsync(graphqlClient, { projectId, branchN
         branchName: group.branch.name,
     }));
 }
+/** Ask the user which update needs to be republished by channel name, this requires interactive mode */
+async function askUpdatesFromChannelNameAsync(graphqlClient, { projectId, channelName, json, nonInteractive, }) {
+    if (nonInteractive) {
+        throw new Error('Must supply --group when in non-interactive mode');
+    }
+    const branchName = await (0, getBranchNameFromChannelNameAsync_1.getBranchNameFromChannelNameAsync)(graphqlClient, projectId, channelName);
+    return await askUpdatesFromBranchNameAsync(graphqlClient, {
+        projectId,
+        branchName,
+        json,
+        nonInteractive,
+    });
+}
 /** Get or ask the user for the update (group) message for the republish */
 async function getOrAskUpdateMessageAsync(updates, flags) {
     if (flags.updateMessage) {

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

@@ -3,6 +3,7 @@ import { WebhookType } from '../../graphql/generated';
 export default class WebhookList extends EasCommand {
     static description: string;
     static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         event: import("@oclif/core/lib/interfaces").OptionFlag<WebhookType | undefined>;
     };
     static contextDefinition: {

package/build/commands/webhook/list.js

@@ -5,15 +5,20 @@ const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const generated_1 = require("../../graphql/generated");
 const WebhookQuery_1 = require("../../graphql/queries/WebhookQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
 const projectUtils_1 = require("../../project/projectUtils");
+const json_1 = require("../../utils/json");
 const formatWebhook_1 = require("../../webhooks/formatWebhook");
 class WebhookList extends EasCommand_1.default {
     async runAsync() {
-        const { flags: { event }, } = await this.parse(WebhookList);
+        const { flags: { event, json }, } = await this.parse(WebhookList);
+        if (json) {
+            (0, json_1.enableJsonOutput)();
+        }
         const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(WebhookList, {
             nonInteractive: true,
         });
@@ -26,10 +31,15 @@ class WebhookList extends EasCommand_1.default {
             }
             else {
                 spinner.succeed(`Found ${webhooks.length} webhooks on project ${projectDisplayName}`);
-                const list = webhooks
-                    .map(webhook => (0, formatWebhook_1.formatWebhook)(webhook))
-                    .join(`\n\n${chalk_1.default.dim('———')}\n\n`);
-                log_1.default.log(`\n${list}`);
+                if (json) {
+                    (0, json_1.printJsonOnlyOutput)(webhooks);
+                }
+                else {
+                    const list = webhooks
+                        .map(webhook => (0, formatWebhook_1.formatWebhook)(webhook))
+                        .join(`\n\n${chalk_1.default.dim('———')}\n\n`);
+                    log_1.default.log(`\n${list}`);
+                }
             }
         }
         catch (err) {
@@ -46,6 +56,7 @@ WebhookList.flags = {
         description: 'Event type that triggers the webhook',
         options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
+    ...flags_1.EasJsonOnlyFlag,
 };
 WebhookList.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,

package/build/credentials/ios/utils/convertHTMLToASCII.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertHTMLToASCII = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
 // @ts-ignore
 const turndown_1 = tslib_1.__importDefault(require("turndown"));
 const wrap_ansi_1 = tslib_1.__importDefault(require("wrap-ansi"));
+const log_1 = require("../../../log");
 const turndownServices = {};
 function getService(rootUrl) {
     if (turndownServices[rootUrl]) {
@@ -46,10 +46,7 @@ function getService(rootUrl) {
             if (href.startsWith('/')) {
                 href = `${rootUrl}${href}`;
             }
-            if (terminal_link_1.default.isSupported) {
-                return chalk_1.default.cyan((0, terminal_link_1.default)(content, href));
-            }
-            return `${chalk_1.default.cyan(content)} (${chalk_1.default.underline(href)})`;
+            return chalk_1.default.cyan((0, log_1.link)(href, { text: content }));
         },
     });
     turndownServices[rootUrl] = turndownService;

package/build/devices/queries.js

@@ -29,7 +29,7 @@ async function selectAppleTeamOnAccountAsync(graphqlClient, { accountName, selec
             }),
             promptOptions: {
                 title: selectionPromptTitle,
-                createDisplayTextForSelectionPromptListItem: appleTeam => ({
+                makePartialChoiceObject: appleTeam => ({
                     title: appleTeam.appleTeamName
                         ? `${appleTeam.appleTeamName} (ID: ${appleTeam.appleTeamIdentifier})`
                         : appleTeam.appleTeamIdentifier,
@@ -61,7 +61,7 @@ async function selectAppleDeviceOnAppleTeamAsync(graphqlClient, { accountName, a
             }),
             promptOptions: {
                 title: selectionPromptTitle,
-                createDisplayTextForSelectionPromptListItem: appleDevice => ({
+                makePartialChoiceObject: appleDevice => ({
                     title: (0, DeviceUtils_1.formatDeviceLabel)(appleDevice),
                 }),
                 getIdentifierForQueryItem: appleTeam => appleTeam.id,

package/build/graphql/generated.d.ts

@@ -3693,11 +3693,15 @@ export declare type UserDataInput = {
 export declare type UserInvitation = {
     __typename?: 'UserInvitation';
     accountName: Scalars['String'];
+    /** If the invite is for a personal team, the profile photo of account owner */
+    accountProfilePhoto?: Maybe<Scalars['String']>;
     created: Scalars['DateTime'];
     /** Email to which this invitation was sent */
     email: Scalars['String'];
     expires: Scalars['DateTime'];
     id: Scalars['ID'];
+    /** If the invite is for an organization or a personal team */
+    isForOrganization: Scalars['Boolean'];
     /** Account permissions to be granted upon acceptance of this invitation */
     permissions: Array<Permission>;
     /** Role to be granted upon acceptance of this invitation */
@@ -3752,11 +3756,13 @@ export declare type UserInvitationMutationResendUserInvitationArgs = {
 export declare type UserInvitationPublicData = {
     __typename?: 'UserInvitationPublicData';
     accountName: Scalars['String'];
+    accountProfilePhoto?: Maybe<Scalars['String']>;
     created: Scalars['DateTime'];
     email: Scalars['String'];
     expires: Scalars['DateTime'];
     /** Email to which this invitation was sent */
     id: Scalars['ID'];
+    isForOrganization: Scalars['Boolean'];
 };
 export declare type UserInvitationPublicDataQuery = {
     __typename?: 'UserInvitationPublicDataQuery';
@@ -6770,6 +6776,7 @@ export declare type CreateAndroidBuildMutation = {
                 priority: BuildPriority;
                 createdAt: any;
                 updatedAt: any;
+                completedAt?: any | null;
                 error?: {
                     __typename?: 'BuildError';
                     errorCode: string;
@@ -6850,6 +6857,7 @@ export declare type CreateIosBuildMutation = {
                 priority: BuildPriority;
                 createdAt: any;
                 updatedAt: any;
+                completedAt?: any | null;
                 error?: {
                     __typename?: 'BuildError';
                     errorCode: string;
@@ -6926,6 +6934,7 @@ export declare type RetryIosBuildMutation = {
             priority: BuildPriority;
             createdAt: any;
             updatedAt: any;
+            completedAt?: any | null;
             error?: {
                 __typename?: 'BuildError';
                 errorCode: string;
@@ -7474,6 +7483,7 @@ export declare type BuildsByIdQuery = {
             priority: BuildPriority;
             createdAt: any;
             updatedAt: any;
+            completedAt?: any | null;
             error?: {
                 __typename?: 'BuildError';
                 errorCode: string;
@@ -7543,6 +7553,7 @@ export declare type BuildsWithSubmissionsByIdQuery = {
             priority: BuildPriority;
             createdAt: any;
             updatedAt: any;
+            completedAt?: any | null;
             submissions: Array<{
                 __typename?: 'Submission';
                 id: string;
@@ -7652,6 +7663,7 @@ export declare type ViewBuildsOnAppQuery = {
                 priority: BuildPriority;
                 createdAt: any;
                 updatedAt: any;
+                completedAt?: any | null;
                 error?: {
                     __typename?: 'BuildError';
                     errorCode: string;
@@ -8285,6 +8297,7 @@ export declare type BuildFragment = {
     priority: BuildPriority;
     createdAt: any;
     updatedAt: any;
+    completedAt?: any | null;
     error?: {
         __typename?: 'BuildError';
         errorCode: string;
@@ -8345,6 +8358,7 @@ export declare type BuildWithSubmissionsFragment = {
     priority: BuildPriority;
     createdAt: any;
     updatedAt: any;
+    completedAt?: any | null;
     submissions: Array<{
         __typename?: 'Submission';
         id: string;

package/build/graphql/types/Build.js

@@ -54,6 +54,7 @@ exports.BuildFragmentNode = (0, graphql_tag_1.default) `
     priority
     createdAt
     updatedAt
+    completedAt
   }
 `;
 exports.BuildFragmentWithSubmissionsNode = (0, graphql_tag_1.default) `

package/build/log.js

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

package/build/project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findProjectIdByAccountNameAndSlugNullableAsync = exports.fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const terminal_link_1 = tslib_1.__importDefault(require("terminal-link"));
 const url_1 = require("../build/utils/url");
 const generated_1 = require("../graphql/generated");
 const AppMutation_1 = require("../graphql/mutations/AppMutation");
 const AppQuery_1 = require("../graphql/queries/AppQuery");
+const log_1 = require("../log");
 const ora_1 = require("../ora");
 const prompts_1 = require("../prompts");
 /**
@@ -51,10 +51,7 @@ async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(graph
         throw new Error(`EAS project ID configuration canceled for ${projectFullName}. Run 'eas init' to configure.`);
     }
     const projectDashboardUrl = (0, url_1.getProjectDashboardUrl)(accountName, projectName);
-    const projectLink = (0, terminal_link_1.default)(projectFullName, projectDashboardUrl, {
-        // https://github.com/sindresorhus/terminal-link/issues/18#issuecomment-1068020361
-        fallback: () => `${projectFullName} (${projectDashboardUrl})`,
-    });
+    const projectLink = (0, log_1.link)(projectDashboardUrl, { text: projectFullName });
     const spinner = (0, ora_1.ora)(`Creating ${chalk_1.default.bold(projectFullName)} on Expo`).start();
     try {
         const id = await AppMutation_1.AppMutation.createAppAsync(graphqlClient, {