eas-cli 3.8.0 → 3.9.0

package/build/commandUtils/EasCommand.d.ts

@@ -85,6 +85,16 @@ export default abstract class EasCommand extends Command {
      * it requires the `ProjectConfig` context, and then call `getContextAsync` to get the project ID.
      */
     static contextDefinition: ContextInput;
+    /**
+     * The user session manager. Responsible for coordinating all user session related state.
+     * If needed in a subclass, use the SessionManager ContextOption.
+     */
+    private sessionManagerInternal?;
+    /**
+     * The analytics manager. Used for logging analytics.
+     * It is set up here to ensure a consistent setup.
+     */
+    private analyticsInternal?;
     /**
      * Execute the context in the contextDefinition to satisfy command prerequisites.
      */
@@ -95,20 +105,11 @@ export default abstract class EasCommand extends Command {
     }, { nonInteractive }: {
         nonInteractive: boolean;
     }): Promise<ContextOutput<C>>;
-    /**
-     * The user session manager. Responsible for coordinating all user session related state.
-     * If needed in a subclass, use the SessionManager ContextOption.
-     */
-    private sessionManagerInternal?;
     private get sessionManager();
-    /**
-     * The analytics manager. Used for logging analytics.
-     * It is set up here to ensure a consistent set up.
-     */
-    private analyticsInternal?;
     private get analytics();
     protected abstract runAsync(): Promise<any>;
     run(): Promise<any>;
     finally(err: Error): Promise<any>;
+    protected catch(err: Error): Promise<any>;
 }
 export {};

package/build/commandUtils/EasCommand.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
+const core_2 = require("@urql/core");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
+const log_1 = tslib_1.__importDefault(require("../log"));
 const SessionManager_1 = tslib_1.__importDefault(require("../user/SessionManager"));
 const AnalyticsContextField_1 = tslib_1.__importDefault(require("./context/AnalyticsContextField"));
 const DynamicProjectConfigContextField_1 = require("./context/DynamicProjectConfigContextField");
@@ -13,6 +15,8 @@ const OptionalProjectConfigContextField_1 = require("./context/OptionalProjectCo
 const ProjectConfigContextField_1 = tslib_1.__importDefault(require("./context/ProjectConfigContextField"));
 const ProjectDirContextField_1 = tslib_1.__importDefault(require("./context/ProjectDirContextField"));
 const SessionManagementContextField_1 = tslib_1.__importDefault(require("./context/SessionManagementContextField"));
+const errors_1 = require("./errors");
+const BASE_GRAPHQL_ERROR_MESSAGE = 'GraphQL request failed.';
 class EasCommand extends core_1.Command {
     /**
      * Execute the context in the contextDefinition to satisfy command prerequisites.
@@ -58,6 +62,22 @@ class EasCommand extends core_1.Command {
         await this.analytics.flushAsync();
         return super.finally(err);
     }
+    catch(err) {
+        let baseMessage = `${this.id} command failed.`;
+        if (err instanceof errors_1.EasCommandError) {
+            log_1.default.error(err.message);
+        }
+        else if (err instanceof core_2.CombinedError && (err === null || err === void 0 ? void 0 : err.graphQLErrors)) {
+            const cleanMessage = err.message.replace('[GraphQL] ', '');
+            log_1.default.error(cleanMessage);
+            baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
+        }
+        else {
+            log_1.default.error(err.message);
+        }
+        log_1.default.debug(err);
+        throw new Error(baseMessage);
+    }
 }
 exports.default = EasCommand;
 EasCommand.ContextOptions = {

package/build/commandUtils/context/DynamicProjectConfigContextField.js

@@ -8,8 +8,8 @@ const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findP
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
 class DynamicProjectConfigContextField extends ContextField_1.default {
     async getValueAsync({ nonInteractive, sessionManager, }) {
+        const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
         return async (options) => {
-            const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
             const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir, options);
             const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
                 nonInteractive,

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

@@ -14,7 +14,7 @@ const easCli_1 = require("../../../utils/easCli");
 const vcs_1 = require("../../../vcs");
 const git_1 = tslib_1.__importDefault(require("../../../vcs/clients/git"));
 async function applyCliConfigAsync(projectDir) {
-    const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+    const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
     const config = await eas_json_1.EasJsonUtils.getCliConfigAsync(easJsonAccessor);
     if ((config === null || config === void 0 ? void 0 : config.version) && !semver_1.default.satisfies(easCli_1.easCliVersion, config.version)) {
         throw new Error(`You are on eas-cli@${easCli_1.easCliVersion} which does not satisfy the CLI version constraint in eas.json (${config.version})`);

package/build/commandUtils/errors.d.ts

@@ -0,0 +1,3 @@
+export declare class EasCommandError extends Error {
+    constructor(message: string);
+}

package/build/commandUtils/errors.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EasCommandError = void 0;
+class EasCommandError extends Error {
+    // constructor is not useless, since the constructor for Error allows for optional `message`
+    // eslint-disable-next-line @typescript-eslint/no-useless-constructor
+    constructor(message) {
+        super(message);
+    }
+}
+exports.EasCommandError = EasCommandError;

package/build/commands/build/index.js

@@ -188,7 +188,7 @@ async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
     if (!(await fs_extra_1.default.pathExists(eas_json_1.EasJsonAccessor.formatEasJsonPath(projectDir)))) {
         return;
     }
-    const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+    const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
     const profileNames = await eas_json_1.EasJsonUtils.getBuildProfileNamesAsync(easJsonAccessor);
     const platformAndProfileNames = profileNames.flatMap(profileName => [
         [eas_build_job_1.Platform.ANDROID, profileName],

package/build/commands/build/internal.js

@@ -8,6 +8,8 @@ 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");
+const vcs_1 = require("../../vcs");
+const gitNoCommit_1 = tslib_1.__importDefault(require("../../vcs/clients/gitNoCommit"));
 /**
  * This command will be run on the EAS Build workers, when building
  * directly from git. This command resolves credentials and other
@@ -22,6 +24,7 @@ class BuildInternal extends EasCommand_1.default {
         const { loggedIn: { actor, graphqlClient }, getDynamicProjectConfigAsync, projectDir, analytics, } = await this.getContextAsync(BuildInternal, {
             nonInteractive: true,
         });
+        (0, vcs_1.setVcsClient)(new gitNoCommit_1.default());
         await (0, _1.handleDeprecatedEasJsonAsync)(projectDir, flags.nonInteractive);
         await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, {
             requestedPlatform: flags.platform,

package/build/commands/build/resign.js

@@ -49,7 +49,7 @@ class BuildResign extends EasCommand_1.default {
         }
         await (0, _1.handleDeprecatedEasJsonAsync)(projectDir, flags.nonInteractive);
         await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)(graphqlClient, [generated_1.StatuspageServiceName.EasBuild]);
-        const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+        const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
         const easJsonCliConfig = (_c = (await eas_json_1.EasJsonUtils.getCliConfigAsync(easJsonAccessor))) !== null && _c !== void 0 ? _c : {};
         const buildProfile = await eas_json_1.EasJsonUtils.getBuildProfileAsync(easJsonAccessor, platform, (_d = flags.profile) !== null && _d !== void 0 ? _d : 'production');
         const { exp, projectId } = await getDynamicProjectConfigAsync({ env: buildProfile.env });

package/build/commands/build/version/set.js

@@ -27,7 +27,7 @@ class BuildVersionSetView extends EasCommand_1.default {
             nonInteractive: false,
         });
         const platform = await (0, platform_1.selectPlatformAsync)(flags.platform);
-        const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+        const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
         await (0, remoteVersionSource_1.ensureVersionSourceIsRemoteAsync)(easJsonAccessor);
         const profile = await eas_json_1.EasJsonUtils.getBuildProfileAsync(easJsonAccessor, platform, (_b = flags.profile) !== null && _b !== void 0 ? _b : undefined);
         const { exp, projectId } = await getDynamicProjectConfigAsync({ env: profile.env });

package/build/commands/build/version/sync.js

@@ -30,7 +30,7 @@ class BuildVersionSyncView extends EasCommand_1.default {
             nonInteractive: true,
         });
         const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.platform);
-        const easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
+        const easJsonAccessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
         await (0, remoteVersionSource_1.ensureVersionSourceIsRemoteAsync)(easJsonAccessor);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
         const buildProfiles = await (0, profiles_1.getProfilesAsync)({

package/build/commands/channel/rollout.d.ts

@@ -1,10 +1,8 @@
 import EasCommand from '../../commandUtils/EasCommand';
 export default class ChannelRollout extends EasCommand {
-    static hidden: boolean;
     static description: string;
     static args: {
         name: string;
-        required: boolean;
         description: string;
     }[];
     static flags: {

package/build/commands/channel/rollout.js

@@ -4,6 +4,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const queries_1 = require("../../branch/queries");
+const queries_2 = require("../../channel/queries");
 const utils_1 = require("../../channel/utils");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
@@ -81,7 +83,7 @@ async function startRolloutAsync(graphqlClient, { channelName, branchName, perce
     if (!oldBranch) {
         throw new Error(`Branch mapping is missing its only branch for channel "${channelName}" on app "${displayName}"`);
     }
-    const logMessage = `️Started a rollout of branch ${chalk_1.default.bold(branchName)} onto channel ${chalk_1.default.bold(channelName)}! ${chalk_1.default.bold(percent)}% of users will be directed to branch ${chalk_1.default.bold(branchName)}, ${chalk_1.default.bold(100 - percent)}% to branch ${chalk_1.default.bold(oldBranch.name)}.`;
+    const logMessage = `Started a rollout of branch ${chalk_1.default.bold(branchName)} on channel ${chalk_1.default.bold(channelName)}! ${chalk_1.default.bold(percent)}% of users will be directed to branch ${chalk_1.default.bold(branchName)}, ${chalk_1.default.bold(100 - percent)}% to branch ${chalk_1.default.bold(oldBranch.name)}.`;
     return { newChannelInfo, logMessage };
 }
 async function editRolloutAsync(graphqlClient, { channelName, percent, nonInteractive, currentBranchMapping, channel, }) {
@@ -99,7 +101,7 @@ async function editRolloutAsync(graphqlClient, { channelName, percent, nonIntera
         channelId: channel.id,
         branchMapping: JSON.stringify(newBranchMapping),
     });
-    const logMessage = `️Rollout of branch ${chalk_1.default.bold(newBranch.name)} onto channel ${chalk_1.default.bold(channelName)} updated from ${chalk_1.default.bold(currentPercent)}% to ${chalk_1.default.bold(percent)}%. ${chalk_1.default.bold(percent)}% of users will be directed to branch ${chalk_1.default.bold(newBranch.name)}, ${chalk_1.default.bold(100 - percent)}% to branch ${chalk_1.default.bold(oldBranch.name)}.`;
+    const logMessage = `Rollout of branch ${chalk_1.default.bold(newBranch.name)} on channel ${chalk_1.default.bold(channelName)} updated from ${chalk_1.default.bold(currentPercent)}% to ${chalk_1.default.bold(percent)}%. ${chalk_1.default.bold(percent)}% of users will be directed to branch ${chalk_1.default.bold(newBranch.name)}, ${chalk_1.default.bold(100 - percent)}% to branch ${chalk_1.default.bold(oldBranch.name)}.`;
     return { newChannelInfo, logMessage };
 }
 async function endRolloutAsync(graphqlClient, { channelName, branchName, nonInteractive, projectId, channel, }) {
@@ -153,12 +155,12 @@ async function endRolloutAsync(graphqlClient, { channelName, branchName, nonInte
         channelId: channel.id,
         branchMapping: JSON.stringify(newBranchMapping),
     });
-    const logMessage = `️Rollout on channel ${chalk_1.default.bold(channelName)} ended. All traffic is now sent to branch ${chalk_1.default.bold(endOnNewBranch ? newBranch.name : oldBranch.name)}`;
+    const logMessage = `Rollout on channel ${chalk_1.default.bold(channelName)} ended. All traffic is now sent to branch ${chalk_1.default.bold(endOnNewBranch ? newBranch.name : oldBranch.name)}`;
     return { newChannelInfo, logMessage };
 }
 class ChannelRollout extends EasCommand_1.default {
     async runAsync() {
-        const { args: { channel: channelName }, flags: { json: jsonFlag, end: endFlag, branch: branchName, percent, 'non-interactive': nonInteractive, }, } = await this.parse(ChannelRollout);
+        const { args: { channel: channelNameArg }, flags: { json: jsonFlag, end: endFlag, branch: branchName, percent, 'non-interactive': nonInteractive, }, } = await this.parse(ChannelRollout);
         const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(ChannelRollout, {
             nonInteractive,
         });
@@ -166,9 +168,22 @@ class ChannelRollout extends EasCommand_1.default {
             (0, json_1.enableJsonOutput)();
         }
         const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId);
+        let channelName = channelNameArg;
+        if (!channelName) {
+            const { name } = await (0, queries_2.selectChannelOnAppAsync)(graphqlClient, {
+                projectId,
+                selectionPromptTitle: 'Select a channel on which to perform a rollout',
+                paginatedQueryOptions: {
+                    json: jsonFlag,
+                    nonInteractive,
+                    offset: 0,
+                },
+            });
+            channelName = name;
+        }
         const channel = await ChannelQuery_1.ChannelQuery.viewUpdateChannelAsync(graphqlClient, {
             appId: projectId,
-            channelName: channelName,
+            channelName,
         });
         if (!channel) {
             throw new Error(`Could not find a channel named "${channelName}". Check which channels exist on this project with ${chalk_1.default.bold('eas channel:list')}.`);
@@ -195,7 +210,13 @@ class ChannelRollout extends EasCommand_1.default {
         if (!isRollout) {
             rolloutMutationResult = await startRolloutAsync(graphqlClient, {
                 channelName,
-                branchName: branchName !== null && branchName !== void 0 ? branchName : (await promptForBranchNameAsync(channelName, nonInteractive)),
+                branchName: branchName !== null && branchName !== void 0 ? branchName : (await promptForBranchNameAsync({
+                    graphqlClient,
+                    projectId,
+                    channelName,
+                    nonInteractive,
+                    json: jsonFlag,
+                })),
                 percent,
                 nonInteractive,
                 projectId,
@@ -236,13 +257,11 @@ class ChannelRollout extends EasCommand_1.default {
 }
 exports.default = ChannelRollout;
 _a = ChannelRollout;
-ChannelRollout.hidden = true;
-ChannelRollout.description = 'Rollout a new branch out to a channel incrementally.';
+ChannelRollout.description = 'Roll a new branch out on a channel incrementally.';
 ChannelRollout.args = [
     {
         name: 'channel',
-        required: true,
-        description: 'rollout that the channel is on',
+        description: 'channel on which the rollout should be done',
     },
 ];
 ChannelRollout.flags = {
@@ -251,7 +270,7 @@ ChannelRollout.flags = {
         required: false,
     }),
     percent: core_1.Flags.integer({
-        description: 'percent of traffic to redirect to the new branch',
+        description: 'percent of users to send to the new branch',
         required: false,
     }),
     end: core_1.Flags.boolean({
@@ -264,15 +283,22 @@ ChannelRollout.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
     ..._a.ContextOptions.LoggedIn,
 };
-async function promptForBranchNameAsync(channelName, nonInteractive) {
+async function promptForBranchNameAsync({ graphqlClient, projectId, channelName, nonInteractive, json, }) {
     if (nonInteractive) {
         throw new Error('Must supply branch flag in non-interactive mode');
     }
-    const { name } = await (0, prompts_1.promptAsync)({
-        type: 'text',
-        name: 'name',
-        message: `Select a branch to rollout onto ${channelName}`,
-        validate: value => (value ? true : 'A branch must be specified.'),
+    const { name: branchName } = await (0, queries_1.selectBranchOnAppAsync)(graphqlClient, {
+        projectId,
+        promptTitle: `Which branch would you like roll out on ${channelName}?`,
+        displayTextForListItem: updateBranch => ({
+            title: updateBranch.name,
+        }),
+        // discard limit and offset because this query is not their intended target
+        paginatedQueryOptions: {
+            json,
+            nonInteractive,
+            offset: 0,
+        },
     });
-    return name;
+    return branchName;
 }

package/build/commands/config.js

@@ -24,7 +24,7 @@ class Config extends EasCommand_1.default {
         const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
             nonInteractive: false,
         });
-        const accessor = new eas_json_1.EasJsonAccessor(projectDir);
+        const accessor = eas_json_1.EasJsonAccessor.fromProjectPath(projectDir);
         const profileName = maybeProfile !== null && maybeProfile !== void 0 ? maybeProfile : (await (0, prompts_1.selectAsync)('Select build profile', (await eas_json_1.EasJsonUtils.getBuildProfileNamesAsync(accessor)).map(profileName => ({
             title: profileName,
             value: profileName,

package/build/commands/metadata/lint.js

@@ -25,7 +25,7 @@ class MetadataLint extends EasCommand_1.default {
         }
         const submitProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
-            easJsonAccessor: new eas_json_1.EasJsonAccessor(projectDir),
+            easJsonAccessor: eas_json_1.EasJsonAccessor.fromProjectPath(projectDir),
             platforms: [eas_build_job_1.Platform.IOS],
             profileName: flags.profile,
         });

package/build/commands/metadata/pull.js

@@ -25,7 +25,7 @@ class MetadataPull extends EasCommand_1.default {
         await (0, configure_1.ensureProjectConfiguredAsync)({ projectDir, nonInteractive: false });
         const submitProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
-            easJsonAccessor: new eas_json_1.EasJsonAccessor(projectDir),
+            easJsonAccessor: eas_json_1.EasJsonAccessor.fromProjectPath(projectDir),
             platforms: [eas_build_job_1.Platform.IOS],
             profileName: flags.profile,
         });

package/build/commands/metadata/push.js

@@ -23,7 +23,7 @@ class MetadataPush extends EasCommand_1.default {
         await (0, configure_1.ensureProjectConfiguredAsync)({ projectDir, nonInteractive: false });
         const submitProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
-            easJsonAccessor: new eas_json_1.EasJsonAccessor(projectDir),
+            easJsonAccessor: eas_json_1.EasJsonAccessor.fromProjectPath(projectDir),
             platforms: [eas_build_job_1.Platform.IOS],
             profileName: flags.profile,
         });

package/build/commands/submit.js

@@ -27,7 +27,7 @@ class Submit extends EasCommand_1.default {
         const platforms = (0, platform_1.toPlatforms)(flagsWithPlatform.requestedPlatform);
         const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
-            easJsonAccessor: new eas_json_1.EasJsonAccessor(projectDir),
+            easJsonAccessor: eas_json_1.EasJsonAccessor.fromProjectPath(projectDir),
             platforms,
             profileName: flagsWithPlatform.profile,
         });

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

@@ -1,6 +1,4 @@
-import { Platform as PublishPlatform } from '@expo/config';
 import EasCommand from '../../commandUtils/EasCommand';
-export declare const defaultPublishPlatforms: Partial<PublishPlatform>[];
 export default class UpdatePublish extends EasCommand {
     static description: string;
     static flags: {