eas-cli 3.18.3 → 4.0.0

package/build/rollout/actions/NonInteractiveRollout.d.ts

@@ -1,18 +1,20 @@
 import { EASUpdateAction, EASUpdateContext } from '../../eas-update/utils';
 import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
+import { CodeSigningInfo } from '../../utils/code-signing';
 import { NonInteractiveOptions as CreateRolloutNonInteractiveOptions } from './CreateRollout';
 import { NonInteractiveOptions as EditRolloutNonInteractiveOptions } from './EditRollout';
-import { NonInteractiveOptions as EndRolloutNonInteractiveOptions } from './EndRollout';
+import { GeneralOptions as EndRolloutGeneralOptions, NonInteractiveOptions as EndRolloutNonInteractiveOptions } from './EndRollout';
 import { RolloutActions } from './RolloutMainMenu';
 /**
  * Control a rollout in non interactive mode.
  */
 export declare class NonInteractiveRollout implements EASUpdateAction<void> {
     private options;
-    constructor(options?: {
+    constructor(options: {
         channelName?: string;
+        codeSigningInfo?: CodeSigningInfo;
         action?: RolloutActions;
-    } & Partial<EditRolloutNonInteractiveOptions> & Partial<EndRolloutNonInteractiveOptions> & Partial<CreateRolloutNonInteractiveOptions>);
+    } & Partial<EditRolloutNonInteractiveOptions> & Partial<EndRolloutNonInteractiveOptions> & EndRolloutGeneralOptions & Partial<CreateRolloutNonInteractiveOptions>);
     runAsync(ctx: EASUpdateContext): Promise<void>;
-    runActionAsync(ctx: EASUpdateContext, action: RolloutActions, channelInfo: UpdateChannelBasicInfoFragment, options: Partial<EditRolloutNonInteractiveOptions> & Partial<EndRolloutNonInteractiveOptions> & Partial<CreateRolloutNonInteractiveOptions>): Promise<UpdateChannelBasicInfoFragment>;
+    runActionAsync(ctx: EASUpdateContext, action: RolloutActions, channelInfo: UpdateChannelBasicInfoFragment, options: Partial<EditRolloutNonInteractiveOptions> & Partial<EndRolloutNonInteractiveOptions> & EndRolloutGeneralOptions & Partial<CreateRolloutNonInteractiveOptions>): Promise<UpdateChannelBasicInfoFragment>;
 }

package/build/rollout/actions/NonInteractiveRollout.js

@@ -11,7 +11,7 @@ const RolloutMainMenu_1 = require("./RolloutMainMenu");
  * Control a rollout in non interactive mode.
  */
 class NonInteractiveRollout {
-    constructor(options = {}) {
+    constructor(options) {
         this.options = options;
     }
     async runAsync(ctx) {

package/build/rollout/actions/RolloutMainMenu.d.ts

@@ -2,7 +2,7 @@ import { EASUpdateAction, EASUpdateContext } from '../../eas-update/utils';
 import { UpdateChannelBasicInfoFragment } from '../../graphql/generated';
 import { NonInteractiveOptions as CreateRolloutNonInteractiveOptions } from './CreateRollout';
 import { NonInteractiveOptions as EditRolloutNonInteractiveOptions } from './EditRollout';
-import { NonInteractiveOptions as EndRolloutNonInteractiveOptions } from './EndRollout';
+import { GeneralOptions as EndRolloutGeneralOptions, NonInteractiveOptions as EndRolloutNonInteractiveOptions } from './EndRollout';
 import { ManageRolloutActions } from './ManageRollout';
 export declare enum MainMenuActions {
     CREATE_NEW = "Create a new rollout",
@@ -14,14 +14,14 @@ export type RolloutActions = MainMenuActions.CREATE_NEW | ManageRolloutActions.E
  */
 export declare class RolloutMainMenu implements EASUpdateAction<void> {
     private options;
-    constructor(options?: {
+    constructor(options: {
         channelName?: string;
         action?: RolloutActions;
-    } & Partial<EditRolloutNonInteractiveOptions> & Partial<EndRolloutNonInteractiveOptions> & Partial<CreateRolloutNonInteractiveOptions>);
+    } & Partial<EditRolloutNonInteractiveOptions> & Partial<EndRolloutNonInteractiveOptions> & EndRolloutGeneralOptions & Partial<CreateRolloutNonInteractiveOptions>);
     runAsync(ctx: EASUpdateContext): Promise<void>;
     runActionAsync(ctx: EASUpdateContext, menuAction: MainMenuActions): Promise<null>;
     selectRolloutAsync(ctx: EASUpdateContext): Promise<UpdateChannelBasicInfoFragment | null>;
-    selectChannelAsync(ctx: EASUpdateContext, filterPredicate?: (channelInfo: UpdateChannelBasicInfoFragment) => boolean): Promise<UpdateChannelBasicInfoFragment>;
+    selectChannelToRolloutAsync(ctx: EASUpdateContext): Promise<UpdateChannelBasicInfoFragment>;
     resolveChannelNameAsync(ctx: EASUpdateContext, channelName: string): Promise<UpdateChannelBasicInfoFragment>;
     toMainMenuAction(action: RolloutActions): MainMenuActions;
     promptMenuActionAsync(): Promise<MainMenuActions>;

package/build/rollout/actions/RolloutMainMenu.js

@@ -20,7 +20,7 @@ var MainMenuActions;
  * Manage a rollout for the project.
  */
 class RolloutMainMenu {
-    constructor(options = {}) {
+    constructor(options) {
         this.options = options;
     }
     async runAsync(ctx) {
@@ -38,7 +38,7 @@ class RolloutMainMenu {
             case MainMenuActions.CREATE_NEW: {
                 const channelInfo = channelName
                     ? await this.resolveChannelNameAsync(ctx, channelName)
-                    : await this.selectChannelAsync(ctx, channelInfo => !(0, branch_mapping_1.isRollout)(channelInfo));
+                    : await this.selectChannelToRolloutAsync(ctx);
                 await new CreateRollout_1.CreateRollout(channelInfo, this.options).runAsync(ctx);
                 return null;
             }
@@ -67,11 +67,20 @@ class RolloutMainMenu {
         const channelInfo = await selectRollout.runAsync(ctx);
         return channelInfo;
     }
-    async selectChannelAsync(ctx, filterPredicate) {
-        const selectChannelAction = new SelectChannel_1.SelectChannel({ filterPredicate });
+    async selectChannelToRolloutAsync(ctx) {
+        let hasSomeChannel = false;
+        const selectChannelAction = new SelectChannel_1.SelectChannel({
+            filterPredicate: (channelInfo) => {
+                hasSomeChannel = true;
+                return !(0, branch_mapping_1.isRollout)(channelInfo);
+            },
+        });
         const channelInfo = await selectChannelAction.runAsync(ctx);
         if (!channelInfo) {
-            throw new Error(`You dont have any channels. Create one with <TODO>`);
+            const error = hasSomeChannel
+                ? new Error('All your channels are already part of a rollout.')
+                : new Error(`You dont have any channels. Create one with \`eas channel:create\``);
+            throw error;
         }
         return channelInfo;
     }

package/build/rollout/actions/SelectRuntime.d.ts

@@ -5,7 +5,7 @@ import { Connection } from '../../utils/relay';
 /**
  * Select a runtime from a branch
  */
-export declare class SelectRuntime implements EASUpdateAction<string> {
+export declare class SelectRuntime implements EASUpdateAction<string | null> {
     private branchInfo;
     private options;
     private printedType;
@@ -14,23 +14,20 @@ export declare class SelectRuntime implements EASUpdateAction<string> {
     });
     warnNoRuntime(): void;
     formatCantFindRuntime(): string;
-    runAsync(ctx: EASUpdateContext): Promise<string>;
+    runAsync(ctx: EASUpdateContext): Promise<string | null>;
     getNewestRuntimeAsync(graphqlClient: ExpoGraphqlClient, { appId, branchName, anotherBranchIdToIntersectRuntimesBy, }: {
         appId: string;
         branchName: string;
         anotherBranchIdToIntersectRuntimesBy?: string;
-    }): Promise<Connection<RuntimeFragment> | null>;
+    }): Promise<Connection<RuntimeFragment>>;
     displayLatestUpdateGroupAsync({ graphqlClient, appId, branchName, runtime, }: {
         graphqlClient: ExpoGraphqlClient;
         appId: string;
         branchName: string;
         runtime: RuntimeFragment;
     }): Promise<string>;
-    selectRuntimesAsync(graphqlClient: ExpoGraphqlClient, { appId, branchName, anotherBranchIdToIntersectRuntimesBy, batchSize, }: {
+    selectRuntimesAsync(graphqlClient: ExpoGraphqlClient, { appId, batchSize, }: {
         appId: string;
-        branchName: string;
-        anotherBranchIdToIntersectRuntimesBy?: string;
         batchSize?: number;
     }): Promise<RuntimeFragment | null>;
-    promptForRuntimeAsync(): Promise<string>;
 }

package/build/rollout/actions/SelectRuntime.js

@@ -11,12 +11,6 @@ const log_1 = tslib_1.__importStar(require("../../log"));
 const prompts_1 = require("../../prompts");
 const relay_1 = require("../../utils/relay");
 const utils_2 = require("../utils");
-function beginSentence(phrase) {
-    if (typeof phrase !== 'string' || phrase.length === 0) {
-        return phrase; // Return the input without any modification if it's not a string or empty
-    }
-    return phrase.charAt(0).toUpperCase() + phrase.slice(1);
-}
 /**
  * Select a runtime from a branch
  */
@@ -32,8 +26,7 @@ class SelectRuntime {
         if (this.options.anotherBranchToIntersectRuntimesBy) {
             const intersectBranchName = this.options.anotherBranchToIntersectRuntimesBy.name;
             log_1.default.warn(`⚠️  Branches ${this.branchInfo.name} and ${intersectBranchName} dont have any updates with the same runtime.`);
-            // TODO(quin): write a learn more
-            log_1.default.warn(`Your updates could be misconfigured. ${(0, log_1.learnMore)('https://expo.fyi/todo')}`);
+            log_1.default.warn(`Your updates could be misconfigured. ${(0, log_1.learnMore)('https://expo.fyi/eas-update-rollouts')}`);
         }
         else {
             // no runtime on branch means no updates published on branch
@@ -41,10 +34,10 @@ class SelectRuntime {
         }
     }
     formatCantFindRuntime() {
-        return `🕵️ Not finding the update you were looking for? ${(0, log_1.learnMore)('https://expo.fyi/todo')}`;
+        return `🕵️ Not finding the update you were looking for? ${(0, log_1.learnMore)('https://expo.fyi/eas-update-rollouts')}`;
     }
     async runAsync(ctx) {
-        var _a, _b;
+        var _a;
         const { nonInteractive, graphqlClient, app } = ctx;
         const { projectId } = app;
         if (nonInteractive) {
@@ -55,14 +48,14 @@ class SelectRuntime {
             branchName: this.branchInfo.name,
             anotherBranchIdToIntersectRuntimesBy: (_a = this.options.anotherBranchToIntersectRuntimesBy) === null || _a === void 0 ? void 0 : _a.id,
         });
-        if (!newestRuntimeConnection) {
+        if (newestRuntimeConnection.edges.length === 0) {
             log_1.default.addNewLineIfNone();
             this.warnNoRuntime();
-            return await this.promptForRuntimeAsync();
+            return null;
         }
-        const moreThanOneRuntime = newestRuntimeConnection.edges.length > 1;
-        log_1.default.log(`✅ ${beginSentence(this.printedType)}${moreThanOneRuntime ? 's' : ''} detected`);
-        if (!moreThanOneRuntime) {
+        const onlyOneRuntime = newestRuntimeConnection.edges.length === 1 && !newestRuntimeConnection.pageInfo.hasNextPage;
+        log_1.default.log(`✅ ${beginSentence(this.printedType)}${onlyOneRuntime ? '' : 's'} detected`);
+        if (onlyOneRuntime) {
             const runtime = newestRuntimeConnection.edges[0].node;
             const formattedRuntimeWithGroup = await this.displayLatestUpdateGroupAsync({
                 graphqlClient,
@@ -82,14 +75,12 @@ class SelectRuntime {
             else {
                 log_1.default.newLine();
                 log_1.default.warn(this.formatCantFindRuntime());
-                return await this.promptForRuntimeAsync();
+                return null;
             }
         }
         log_1.default.log(this.formatCantFindRuntime());
         const selectedRuntime = await this.selectRuntimesAsync(graphqlClient, {
             appId: projectId,
-            branchName: this.branchInfo.name,
-            anotherBranchIdToIntersectRuntimesBy: (_b = this.options.anotherBranchToIntersectRuntimesBy) === null || _b === void 0 ? void 0 : _b.id,
         });
         if (!selectedRuntime) {
             throw new Error(`No ${this.printedType} selected`);
@@ -97,7 +88,7 @@ class SelectRuntime {
         return selectedRuntime.version;
     }
     async getNewestRuntimeAsync(graphqlClient, { appId, branchName, anotherBranchIdToIntersectRuntimesBy, }) {
-        const connection = await RuntimeQuery_1.RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
+        return await RuntimeQuery_1.RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
             appId,
             name: branchName,
             first: 1,
@@ -105,11 +96,6 @@ class SelectRuntime {
                 branchId: anotherBranchIdToIntersectRuntimesBy,
             },
         });
-        const { edges } = connection;
-        if (edges.length === 0) {
-            return null;
-        }
-        return connection;
     }
     async displayLatestUpdateGroupAsync({ graphqlClient, appId, branchName, runtime, }) {
         const updateGroups = await UpdateQuery_1.UpdateQuery.viewUpdateGroupsOnBranchAsync(graphqlClient, {
@@ -122,19 +108,20 @@ class SelectRuntime {
             },
         });
         (0, assert_1.default)(updateGroups.length < 2, `Expected at most one update group. Received: ${JSON.stringify(updateGroups)}`);
-        return (0, utils_2.formatRuntimeWithUpdateGroup)(updateGroups[0], runtime);
+        return (0, utils_2.formatRuntimeWithUpdateGroup)(updateGroups[0], runtime, branchName);
     }
-    async selectRuntimesAsync(graphqlClient, { appId, branchName, anotherBranchIdToIntersectRuntimesBy, batchSize = 5, }) {
+    async selectRuntimesAsync(graphqlClient, { appId, batchSize = 5, }) {
         const queryAsync = async (queryParams) => {
+            var _a;
             return await RuntimeQuery_1.RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
                 appId,
-                name: branchName,
+                name: this.branchInfo.name,
                 first: queryParams.first,
                 after: queryParams.after,
                 last: queryParams.last,
                 before: queryParams.before,
                 filter: {
-                    branchId: anotherBranchIdToIntersectRuntimesBy,
+                    branchId: (_a = this.options.anotherBranchToIntersectRuntimesBy) === null || _a === void 0 ? void 0 : _a.id,
                 },
             });
         };
@@ -142,7 +129,7 @@ class SelectRuntime {
             return await this.displayLatestUpdateGroupAsync({
                 graphqlClient,
                 appId,
-                branchName,
+                branchName: this.branchInfo.name,
                 runtime,
             });
         };
@@ -153,15 +140,11 @@ class SelectRuntime {
             pageSize: batchSize,
         });
     }
-    async promptForRuntimeAsync() {
-        log_1.default.log(`You can input a runtime manually then publish an update later.`);
-        const { runtimeVersion } = await (0, prompts_1.promptAsync)({
-            type: 'text',
-            name: 'runtimeVersion',
-            message: 'Input a runtime version:',
-            initial: '1.0.0',
-        });
-        return runtimeVersion;
-    }
 }
 exports.SelectRuntime = SelectRuntime;
+function beginSentence(phrase) {
+    if (typeof phrase !== 'string' || phrase.length === 0) {
+        return phrase; // Return the input without any modification if it's not a string or empty
+    }
+    return phrase.charAt(0).toUpperCase() + phrase.slice(1);
+}

package/build/rollout/branch-mapping.js

@@ -41,7 +41,7 @@ function getRolloutInfoFromBranchMapping(branchMapping) {
         (0, branch_mapping_1.assertNumber)(operand);
         return {
             rolledOutBranchId,
-            percentRolledOut: operand * 100,
+            percentRolledOut: Math.round(operand * 100),
             runtimeVersion,
             defaultBranchId,
         };
@@ -53,7 +53,7 @@ function getRolloutInfoFromBranchMapping(branchMapping) {
         (0, branch_mapping_1.assertNumber)(operand);
         return {
             rolledOutBranchId,
-            percentRolledOut: operand * 100,
+            percentRolledOut: Math.round(operand * 100),
             defaultBranchId,
         };
     }

package/build/rollout/utils.d.ts

@@ -4,7 +4,7 @@ import { Rollout } from './branch-mapping';
 export declare function printRollout(channel: UpdateChannelObject): void;
 export declare function displayRolloutDetails(channelName: string, rollout: Rollout): void;
 export declare function formatBranchWithUpdateGroup(maybeUpdateGroup: UpdateFragment[] | undefined | null, branch: UpdateBranchObject, percentRolledOut: number): string;
-export declare function formatRuntimeWithUpdateGroup(maybeUpdateGroup: UpdateFragment[] | undefined | null, runtime: RuntimeFragment): string;
+export declare function formatRuntimeWithUpdateGroup(maybeUpdateGroup: UpdateFragment[] | undefined | null, runtime: RuntimeFragment, branchName: string): string;
 export declare function promptForRolloutPercentAsync({ promptMessage, }: {
     promptMessage: string;
 }): Promise<number>;

package/build/rollout/utils.js

@@ -20,7 +20,7 @@ function displayRolloutDetails(channelName, rollout) {
     log_1.default.log((0, formatFields_1.default)([
         { label: 'Channel', value: channelName },
         ...((0, branch_mapping_1.isConstrainedRollout)(rollout)
-            ? [{ label: 'Runtime Version', value: rollout.runtimeVersion }]
+            ? [{ label: 'Runtime version', value: rollout.runtimeVersion }]
             : []),
         {
             label: 'Branches',
@@ -32,7 +32,7 @@ function displayRolloutDetails(channelName, rollout) {
 exports.displayRolloutDetails = displayRolloutDetails;
 function formatBranchWithUpdateGroup(maybeUpdateGroup, branch, percentRolledOut) {
     const lines = [];
-    lines.push(chalk_1.default.bold(`🍽️  Served by branch ${chalk_1.default.bold(branch.name)} (${percentRolledOut}%)`));
+    lines.push(chalk_1.default.bold(`➡️ 📱 Latest update on the ${chalk_1.default.bold(branch.name)} branch (${percentRolledOut}%)`));
     if (!maybeUpdateGroup) {
         lines.push(`No updates for target runtime`);
     }
@@ -43,9 +43,9 @@ function formatBranchWithUpdateGroup(maybeUpdateGroup, branch, percentRolledOut)
     return lines.join('\n    ');
 }
 exports.formatBranchWithUpdateGroup = formatBranchWithUpdateGroup;
-function formatRuntimeWithUpdateGroup(maybeUpdateGroup, runtime) {
+function formatRuntimeWithUpdateGroup(maybeUpdateGroup, runtime, branchName) {
     const lines = [];
-    lines.push(chalk_1.default.bold(`🍽️  Served by runtime ${chalk_1.default.bold(runtime.version)}:`));
+    lines.push(chalk_1.default.bold(`➡️ 📱 Latest update on the ${chalk_1.default.bold(branchName)} branch served to runtime ${chalk_1.default.bold(runtime.version)}:`));
     if (!maybeUpdateGroup) {
         lines.push(`No updates published for this runtime`);
     }
@@ -61,7 +61,7 @@ function formatUpdateGroup(updateGroup) {
     const lines = [];
     const formattedLines = (0, formatFields_1.default)([
         { label: 'Message', value: (_a = updateGroup.message) !== null && _a !== void 0 ? _a : 'N/A' },
-        { label: 'Runtime Version', value: (_b = updateGroup.runtimeVersion) !== null && _b !== void 0 ? _b : 'N/A' },
+        { label: 'Runtime version', value: (_b = updateGroup.runtimeVersion) !== null && _b !== void 0 ? _b : 'N/A' },
         { label: 'Platforms', value: (_c = updateGroup.platforms) !== null && _c !== void 0 ? _c : 'N/A' },
         { label: 'Group ID', value: (_d = updateGroup.group) !== null && _d !== void 0 ? _d : 'N/A' },
     ]).split('\n');

package/build/update/republish.js

@@ -34,7 +34,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
     const shouldRepublishWithCodesigning = updatesToPublish.some(update => update.codeSigningInfo);
     if (shouldRepublishWithCodesigning) {
         if (!codeSigningInfo) {
-            throw new Error('Must specify --private-key-path argument to sign republished update for code signing');
+            throw new Error('Must specify --private-key-path argument to sign republished update group for code signing');
         }
         for (const update of updatesToPublish) {
             if ((0, nullthrows_1.default)(update.codeSigningInfo).alg !== codeSigningInfo.codeSigningMetadata.alg ||
@@ -42,7 +42,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
                 throw new Error('Republished updates must use the same code signing key and algorithm as original update');
             }
         }
-        log_1.default.withTick(`The republished update will be signed`);
+        log_1.default.withTick(`The republished update group will be signed`);
     }
     const publishIndicator = (0, ora_1.ora)('Republishing...').start();
     let updatesRepublished;
@@ -59,7 +59,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
             },
         ]);
         if (codeSigningInfo) {
-            log_1.default.log('🔒 Signing republished update');
+            log_1.default.log('🔒 Signing republished update group');
             await Promise.all(updatesRepublished.map(async (newUpdate) => {
                 const response = await (0, fetch_1.default)(newUpdate.manifestPermalink, {
                     method: 'GET',
@@ -75,10 +75,10 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
                 });
             }));
         }
-        publishIndicator.succeed('Republished update');
+        publishIndicator.succeed('Republished update group');
     }
     catch (error) {
-        publishIndicator.fail('Failed to republish update');
+        publishIndicator.fail('Failed to republish update group');
         throw error;
     }
     if (json) {
@@ -92,7 +92,7 @@ async function republishAsync({ graphqlClient, app, updatesToPublish, targetBran
         { label: 'Branch', value: targetBranchName },
         { label: 'Runtime version', value: arbitraryRepublishedUpdate.runtimeVersion },
         { label: 'Platform', value: updatesRepublished.map(update => update.platform).join(', ') },
-        { label: 'Update Group ID', value: arbitraryRepublishedUpdate.group },
+        { label: 'Update group ID', value: arbitraryRepublishedUpdate.group },
         ...(updatesRepublishedByPlatform.android
             ? [{ label: 'Android update ID', value: updatesRepublishedByPlatform.android.id }]
             : []),

package/build/utils/relay.js

@@ -137,15 +137,6 @@ class FilterPagination {
 }
 exports.FilterPagination = FilterPagination;
 async function selectPaginatedAsync({ queryAsync, getTitleAsync, printedType, pageSize, }) {
-    // Dont bother prompting if there are 0 or 1 items
-    const connectionPreflight = await queryAsync({ first: pageSize });
-    const { edges } = connectionPreflight;
-    if (edges.length === 0) {
-        return null;
-    }
-    else if (edges.length === 1) {
-        return edges[0].node;
-    }
     return await selectPaginatedInternalAsync({
         queryAsync,
         getTitleAsync,
@@ -168,6 +159,9 @@ async function selectPaginatedInternalAsync({ queryAsync, getTitleAsync, printed
     (0, assert_1.default)(limit, 'queryParams must have either first or last');
     const connection = await queryAsync(queryParams);
     const { edges, pageInfo } = connection;
+    if (edges.length === 0) {
+        return null;
+    }
     /*
      * The Relay spec has a weird definition on hasNextPage and hasPreviousPage:
      * 'If the client is paginating with last/before, then the server must return true if prior edges