eas-cli 18.2.0 → 18.4.0

package/build/build/build.js

@@ -281,6 +281,8 @@ async function getBuildsSafelyAsync(graphqlClient, buildIds) {
 }
 let queueProgressBarStarted = false;
 const queueProgressBar = new cli_progress_1.default.SingleBar({ format: '|{bar}| {estimatedWaitTime}' }, cli_progress_1.default.Presets.rect);
+let statusNewSetAt = null;
+const NEW_STATUS_GRACE_PERIOD_MS = 15_000;
 async function handleSingleBuildProgressAsync({ build, accountName, }, { spinner }) {
     if (build === null) {
         spinner.text = 'Could not fetch the build status. Check your network connection.';
@@ -301,9 +303,18 @@ async function handleSingleBuildProgressAsync({ build, accountName, }, { spinner
         case generated_1.BuildStatus.Finished:
             spinner.succeed('Build finished');
             return { refetch: false };
-        case generated_1.BuildStatus.New:
-            spinner.text = `Build concurrency limit reached for your account. Build will enter queue once a concurrency becomes available. Add additional concurrencies at ${(0, log_1.link)(formatAccountBillingUrl(accountName))}.`;
+        case generated_1.BuildStatus.New: {
+            const now = Date.now();
+            statusNewSetAt ??= now;
+            const newStatusDurationMs = now - statusNewSetAt;
+            if (newStatusDurationMs < NEW_STATUS_GRACE_PERIOD_MS) {
+                spinner.text = 'Waiting for build to get enqueued…';
+            }
+            else {
+                spinner.text = `Build concurrency limit reached for your account. Build will enter queue once a concurrency becomes available. Add additional concurrencies at ${(0, log_1.link)(formatAccountBillingUrl(accountName))}.`;
+            }
             break;
+        }
         case generated_1.BuildStatus.InQueue: {
             spinner.text = 'Build queued...';
             const progressBarPayload = typeof build.estimatedWaitTimeLeftSeconds === 'number'
@@ -356,7 +367,7 @@ const priorityToQueueDisplayName = {
     [generated_1.BuildPriority.High]: 'priority queue',
 };
 const statusToDisplayName = {
-    [generated_1.BuildStatus.New]: 'waiting to enter the queue (concurrency limit reached)',
+    [generated_1.BuildStatus.New]: 'waiting to enter the queue',
     [generated_1.BuildStatus.InQueue]: 'in queue',
     [generated_1.BuildStatus.InProgress]: 'in progress',
     [generated_1.BuildStatus.PendingCancel]: 'canceled',
@@ -368,6 +379,7 @@ const platforms = [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios]
 async function handleMultipleBuildsProgressAsync({ builds: maybeBuilds }, { spinner, originalSpinnerText }) {
     const buildCount = maybeBuilds.length;
     const builds = maybeBuilds.filter(isBuildFragment);
+    const someNew = builds.some(build => build.status === generated_1.BuildStatus.New);
     const allFinished = builds.filter(build => build.status === generated_1.BuildStatus.Finished).length === buildCount;
     const allSettled = builds.filter(build => [
         generated_1.BuildStatus.Finished,
@@ -375,6 +387,9 @@ async function handleMultipleBuildsProgressAsync({ builds: maybeBuilds }, { spin
         generated_1.BuildStatus.Canceled,
         generated_1.BuildStatus.PendingCancel,
     ].includes(build.status)).length === buildCount;
+    if (someNew && statusNewSetAt === null) {
+        statusNewSetAt = Date.now();
+    }
     if (allSettled) {
         if (allFinished) {
             spinner.succeed(formatSettledBuildsText(builds));
@@ -385,7 +400,10 @@ async function handleMultipleBuildsProgressAsync({ builds: maybeBuilds }, { spin
         return { refetch: false };
     }
     else {
-        spinner.text = formatPendingBuildsText(originalSpinnerText, builds);
+        const showConcurrencyWarning = someNew &&
+            statusNewSetAt !== null &&
+            Date.now() - statusNewSetAt >= NEW_STATUS_GRACE_PERIOD_MS;
+        spinner.text = formatPendingBuildsText(originalSpinnerText, builds, showConcurrencyWarning);
         return { refetch: true };
     }
 }
@@ -397,12 +415,15 @@ function formatSettledBuildsText(builds) {
     })
         .join('\n  ');
 }
-function formatPendingBuildsText(originalSpinnerText, builds) {
+function formatPendingBuildsText(originalSpinnerText, builds, showConcurrencyWarning) {
     return [
         originalSpinnerText,
         ...platforms.map(platform => {
             const build = builds.find(build => build.platform === platform);
             const status = build ? statusToDisplayName[build.status] : 'unknown';
+            const concurrencyWarning = showConcurrencyWarning && build?.status === generated_1.BuildStatus.New
+                ? ' (concurrency limit reached)'
+                : '';
             let extraInfo = '';
             if (build?.status === generated_1.BuildStatus.InQueue &&
                 typeof build.initialQueuePosition === 'number' &&
@@ -415,7 +436,7 @@ function formatPendingBuildsText(originalSpinnerText, builds) {
                     : '';
                 extraInfo = ` - queue progress: ${chalk_1.default.bold(`${percent}%`)}${estimatedWaitTime}`;
             }
-            return `${platform_1.appPlatformEmojis[platform]} ${platform_1.appPlatformDisplayNames[platform]} build - status: ${chalk_1.default.bold(status)}${extraInfo}`;
+            return `${platform_1.appPlatformEmojis[platform]} ${platform_1.appPlatformDisplayNames[platform]} build - status: ${chalk_1.default.bold(status)}${concurrencyWarning}${extraInfo}`;
         }),
     ].join('\n  ');
 }

package/build/commandUtils/flags.d.ts

@@ -1,3 +1,4 @@
+export declare function isNonInteractiveByDefault(): boolean;
 export declare const EasNonInteractiveAndJsonFlags: {
     json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/build/commandUtils/flags.js

@@ -1,14 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EasUpdateEnvironmentRequiredFlag = exports.EasUpdateEnvironmentFlag = exports.EasJsonOnlyFlag = exports.EASNonInteractiveFlag = exports.EASEnvironmentVariableScopeFlag = exports.EASVariableVisibilityFlag = exports.EASVariableFormatFlag = exports.EASMultiEnvironmentFlag = exports.EASEnvironmentFlag = exports.EasEnvironmentFlagParameters = exports.EasNonInteractiveAndJsonFlags = void 0;
+exports.isNonInteractiveByDefault = isNonInteractiveByDefault;
 exports.resolveNonInteractiveAndJsonFlags = resolveNonInteractiveAndJsonFlags;
 const core_1 = require("@oclif/core");
+const getenv_1 = require("getenv");
+function isNonInteractiveByDefault() {
+    return (0, getenv_1.boolish)('CI', false) || !process.stdin.isTTY;
+}
 exports.EasNonInteractiveAndJsonFlags = {
     json: core_1.Flags.boolean({
         description: 'Enable JSON output, non-JSON messages will be printed to stderr. Implies --non-interactive.',
     }),
     'non-interactive': core_1.Flags.boolean({
         description: 'Run the command in non-interactive mode.',
+        default: () => Promise.resolve(isNonInteractiveByDefault()),
+        noCacheDefault: true,
     }),
 };
 function resolveNonInteractiveAndJsonFlags(flags) {
@@ -53,6 +60,11 @@ exports.EASEnvironmentVariableScopeFlag = {
 exports.EASNonInteractiveFlag = {
     'non-interactive': core_1.Flags.boolean({
         description: 'Run the command in non-interactive mode.',
+        // eslint-disable-next-line async-protect/async-suffix
+        default: async () => {
+            return isNonInteractiveByDefault();
+        },
+        noCacheDefault: true,
     }),
 };
 exports.EasJsonOnlyFlag = {

package/build/commands/account/view.js

@@ -16,10 +16,14 @@ class AccountView extends EasCommand_1.default {
     async runAsync() {
         const { maybeLoggedIn: { actor, authenticationInfo }, } = await this.getContextAsync(AccountView, { nonInteractive: true });
         if (actor) {
+            const displayName = (0, User_1.getActorDisplayName)(actor);
             const loggedInAs = authenticationInfo.accessToken
-                ? `${(0, User_1.getActorDisplayName)(actor)} (authenticated using EXPO_TOKEN)`
-                : (0, User_1.getActorDisplayName)(actor);
+                ? `${displayName} (authenticated using EXPO_TOKEN)`
+                : displayName;
             log_1.default.log(chalk_1.default.green(loggedInAs));
+            if ('email' in actor) {
+                log_1.default.log(actor.email);
+            }
             // personal account is included, only show if more accounts that personal account
             // but do show personal account in list if there are more
             const accountExcludingPersonalAccount = actor.accounts.filter(account => !('username' in actor) || account.name !== actor.username);

package/build/commands/build/dev.d.ts

@@ -6,6 +6,7 @@ export default class BuildDev extends EasCommand {
     static flags: {
         platform: import("@oclif/core/lib/interfaces").OptionFlag<Platform | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'skip-build-if-not-found': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
         projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;

package/build/commands/build/dev.js

@@ -34,6 +34,10 @@ class BuildDev extends EasCommand_1.default {
             description: `Name of the build profile from eas.json. It must be a profile allowing to create emulator/simulator internal distribution dev client builds. The "${DEFAULT_EAS_BUILD_RUN_PROFILE_NAME}" build profile will be selected by default.`,
             helpValue: 'PROFILE_NAME',
         }),
+        'skip-build-if-not-found': core_1.Flags.boolean({
+            description: 'Skip build if no successful build with matching fingerprint is found.',
+            default: false,
+        }),
     };
     static contextDefinition = {
         ...this.ContextOptions.LoggedIn,
@@ -100,9 +104,13 @@ class BuildDev extends EasCommand_1.default {
                 return;
             }
             else {
-                log_1.default.warn('Artifacts for this build expired. New build will be started.');
+                log_1.default.warn('Artifacts for this build expired.');
             }
         }
+        if (flags['skip-build-if-not-found']) {
+            log_1.default.log('No successful build with matching fingerprint found. Skipping build.');
+            return;
+        }
         log_1.default.log('🚀 No successful build with matching fingerprint found. Starting a new build...');
         const previousBuildsForSelectedProfile = await this.getBuildsAsync({
             graphqlClient,

package/build/graphql/generated.d.ts

@@ -15915,6 +15915,7 @@ export type CurrentUserQuery = {
         }>;
     } | {
         __typename: 'User';
+        email: string;
         username: string;
         id: string;
         featureGates: any;

package/build/graphql/queries/UserQuery.js

@@ -14,6 +14,9 @@ exports.UserQuery = {
               meActor {
                 __typename
                 id
+                ... on User {
+                  email
+                }
                 ... on UserActor {
                   username
                   primaryAccount {