eas-cli 16.24.0 → 16.25.0

package/build/commands/workflow/run.js

@@ -46,6 +46,7 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const core_1 = require("@oclif/core");
 const core_2 = require("@urql/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const getenv_1 = require("getenv");
 const path = tslib_1.__importStar(require("node:path"));
 const slash_1 = tslib_1.__importDefault(require("slash"));
 const url_1 = require("../../build/utils/url");
@@ -79,7 +80,7 @@ class WorkflowRun extends EasCommand_1.default {
             default: false,
             allowNo: true,
             description: 'Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.',
-            summary: 'Wait for workflow run to complete. Defaults to false. Cannot be used with the --json flag.',
+            summary: 'Wait for workflow run to complete. Defaults to false.',
         }),
         input: core_1.Flags.string({
             char: 'F',
@@ -103,9 +104,6 @@ class WorkflowRun extends EasCommand_1.default {
     async runAsync() {
         const { flags, args } = await this.parse(WorkflowRun);
         if (flags.json) {
-            if (flags.wait) {
-                throw new Error('Cannot use --json and --wait flags simultaneously.');
-            }
             (0, json_1.enableJsonOutput)();
         }
         const { getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, vcsClient, projectDir, } = await this.getContextAsync(WorkflowRun, {
@@ -295,9 +293,10 @@ class WorkflowRun extends EasCommand_1.default {
             }
             process.exit(0);
         }
-        log_1.default.newLine();
+        const spinnerUsesStdErr = (0, getenv_1.boolish)('CI', false) || flags.json;
         const { status } = await waitForWorkflowRunToEndAsync(graphqlClient, {
             workflowRunId,
+            spinnerUsesStdErr,
         });
         if (flags.json) {
             const workflowRun = await WorkflowRunQuery_1.WorkflowRunQuery.withJobsByIdAsync(graphqlClient, workflowRunId, {
@@ -317,9 +316,12 @@ class WorkflowRun extends EasCommand_1.default {
     }
 }
 exports.default = WorkflowRun;
-async function waitForWorkflowRunToEndAsync(graphqlClient, { workflowRunId }) {
+async function waitForWorkflowRunToEndAsync(graphqlClient, { workflowRunId, spinnerUsesStdErr }) {
     log_1.default.log('Waiting for workflow run to complete. You can press Ctrl+C to exit.');
-    const spinner = (0, ora_1.ora)('').start();
+    const spinner = (0, ora_1.ora)({
+        stream: spinnerUsesStdErr ? process.stderr : process.stdout,
+        text: '',
+    }).start();
     spinner.prefixText = (0, chalk_1.default) `{bold.yellow Workflow run is waiting to start:}`;
     let failedFetchesCount = 0;
     while (true) {
@@ -351,6 +353,7 @@ async function waitForWorkflowRunToEndAsync(graphqlClient, { workflowRunId }) {
                 }
                 case generated_1.WorkflowRunStatus.Success:
                     spinner.prefixText = (0, chalk_1.default) `{bold.green Workflow has completed successfully.}`;
+                    spinner.text = '';
                     spinner.succeed('');
                     return workflowRun;
             }

package/build/graphql/generated.d.ts

@@ -7637,6 +7637,7 @@ export type WorkflowRun = ActivityTimelineProjectActivity & {
     createdAt: Scalars['DateTime']['output'];
     durationSeconds?: Maybe<Scalars['Int']['output']>;
     errors: Array<WorkflowRunError>;
+    finalizedAt?: Maybe<Scalars['DateTime']['output']>;
     gitCommitHash?: Maybe<Scalars['String']['output']>;
     gitCommitMessage?: Maybe<Scalars['String']['output']>;
     githubRepository?: Maybe<GitHubRepository>;
@@ -12651,6 +12652,40 @@ export type CancelWorkflowRunMutation = {
         };
     };
 };
+export type AccountUsageForOverageWarningQueryVariables = Exact<{
+    accountId: Scalars['String']['input'];
+    currentDate: Scalars['DateTime']['input'];
+}>;
+export type AccountUsageForOverageWarningQuery = {
+    __typename?: 'RootQuery';
+    account: {
+        __typename?: 'AccountQuery';
+        byId: {
+            __typename?: 'Account';
+            id: string;
+            name: string;
+            subscription?: {
+                __typename?: 'SubscriptionDetails';
+                id: string;
+                name?: string | null;
+            } | null;
+            usageMetrics: {
+                __typename?: 'AccountUsageMetrics';
+                EAS_BUILD: {
+                    __typename?: 'UsageMetricTotal';
+                    id: string;
+                    planMetrics: Array<{
+                        __typename?: 'EstimatedUsage';
+                        id: string;
+                        serviceMetric: EasServiceMetric;
+                        value: number;
+                        limit: number;
+                    }>;
+                };
+            };
+        };
+    };
+};
 export type AppByIdQueryVariables = Exact<{
     appId: Scalars['String']['input'];
 }>;

package/build/graphql/queries/AccountUsageQuery.d.ts

@@ -0,0 +1,5 @@
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { AccountUsageForOverageWarningQuery } from '../generated';
+export declare const AccountUsageQuery: {
+    getUsageForOverageWarningAsync(graphqlClient: ExpoGraphqlClient, accountId: string, currentDate: Date): Promise<AccountUsageForOverageWarningQuery['account']['byId']>;
+};

package/build/graphql/queries/AccountUsageQuery.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AccountUsageQuery = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const client_1 = require("../client");
+exports.AccountUsageQuery = {
+    async getUsageForOverageWarningAsync(graphqlClient, accountId, currentDate) {
+        const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+            .query((0, graphql_tag_1.default) `
+            query AccountUsageForOverageWarning($accountId: String!, $currentDate: DateTime!) {
+              account {
+                byId(accountId: $accountId) {
+                  id
+                  name
+                  subscription {
+                    id
+                    name
+                  }
+                  usageMetrics {
+                    EAS_BUILD: byBillingPeriod(date: $currentDate, service: BUILDS) {
+                      id
+                      planMetrics {
+                        id
+                        serviceMetric
+                        value
+                        limit
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          `, { accountId, currentDate: currentDate.toISOString() }, {
+            additionalTypenames: ['Account', 'AccountUsageMetrics', 'UsageMetricTotal'],
+        })
+            .toPromise());
+        return data.account.byId;
+    },
+};

package/build/onboarding/git.d.ts

@@ -1,8 +1,9 @@
-export declare function runGitCloneAsync({ targetProjectDir, githubRepositoryName, githubUsername, cloneMethod, }: {
+export declare function runGitCloneAsync({ targetProjectDir, githubRepositoryName, githubUsername, cloneMethod, showOutput, }: {
     githubUsername: string;
     githubRepositoryName: string;
     targetProjectDir: string;
     cloneMethod: 'ssh' | 'https';
+    showOutput?: boolean;
 }): Promise<{
     targetProjectDir: string;
 }>;

package/build/onboarding/git.js

@@ -6,7 +6,7 @@ const spawn_async_1 = tslib_1.__importDefault(require("@expo/spawn-async"));
 const runCommand_1 = require("./runCommand");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const prompts_1 = require("../prompts");
-async function runGitCloneAsync({ targetProjectDir, githubRepositoryName, githubUsername, cloneMethod, }) {
+async function runGitCloneAsync({ targetProjectDir, githubRepositoryName, githubUsername, cloneMethod, showOutput = true, }) {
     const url = cloneMethod === 'ssh'
         ? `git@github.com:${githubUsername}/${githubRepositoryName}.git`
         : `https://github.com/${githubUsername}/${githubRepositoryName}.git`;
@@ -18,6 +18,7 @@ async function runGitCloneAsync({ targetProjectDir, githubRepositoryName, github
                 return line.includes('Cloning into');
             },
             showSpinner: false,
+            showOutput,
         });
         return { targetProjectDir };
     }

package/build/onboarding/installDependencies.js

@@ -21,6 +21,7 @@ async function installDependenciesAsync({ outputLevel = 'default', projectDir, p
                 !(line === packageManager));
         },
         showOutput: outputLevel !== 'none',
+        showSpinner: outputLevel !== 'none',
     });
 }
 exports.installDependenciesAsync = installDependenciesAsync;

package/build/onboarding/runCommand.js

@@ -7,7 +7,9 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_1 = tslib_1.__importDefault(require("../log"));
 const ora_1 = require("../ora");
 async function runCommandAsync({ cwd, args, command, shouldShowStderrLine, shouldPrintStderrLineAsStdout, showSpinner = true, showOutput = true, }) {
-    log_1.default.log(`🏗️  Running ${chalk_1.default.bold(`${command} ${args.join(' ')}`)}...`);
+    if (showOutput) {
+        log_1.default.log(`🏗️  Running ${chalk_1.default.bold(`${command} ${args.join(' ')}`)}...`);
+    }
     let spinner;
     if (showSpinner) {
         spinner = (0, ora_1.ora)(`${chalk_1.default.bold(`${command} ${args.join(' ')}`)}`).start();
@@ -53,6 +55,9 @@ async function runCommandAsync({ cwd, args, command, shouldShowStderrLine, shoul
         }
         throw error;
     }
+    if (!showOutput) {
+        return;
+    }
     if (showSpinner) {
         spinner?.succeed(`${chalk_1.default.bold(`${command} ${args.join(' ')}`)} succeeded`);
     }

package/build/utils/usage/checkForOverages.d.ts

@@ -0,0 +1,12 @@
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+export declare function maybeWarnAboutUsageOveragesAsync({ graphqlClient, accountId, }: {
+    graphqlClient: ExpoGraphqlClient;
+    accountId: string;
+}): Promise<void>;
+export declare function calculatePercentUsed(value: number, limit: number): number;
+export declare function createProgressBar(percentUsed: number, width?: number): string;
+export declare function displayOverageWarning({ percentUsed, hasFreePlan, name, }: {
+    percentUsed: number;
+    hasFreePlan: boolean;
+    name: string;
+}): void;

package/build/utils/usage/checkForOverages.js

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.displayOverageWarning = exports.createProgressBar = exports.calculatePercentUsed = exports.maybeWarnAboutUsageOveragesAsync = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const AccountUsageQuery_1 = require("../../graphql/queries/AccountUsageQuery");
+const log_1 = tslib_1.__importStar(require("../../log"));
+const THRESHOLD_PERCENT = 85;
+async function maybeWarnAboutUsageOveragesAsync({ graphqlClient, accountId, }) {
+    try {
+        const currentDate = new Date();
+        const { name, subscription, usageMetrics: { EAS_BUILD }, } = await AccountUsageQuery_1.AccountUsageQuery.getUsageForOverageWarningAsync(graphqlClient, accountId, currentDate);
+        const planMetric = EAS_BUILD?.planMetrics?.[0];
+        if (!planMetric || !subscription) {
+            return;
+        }
+        const percentUsed = calculatePercentUsed(planMetric.value, planMetric.limit);
+        if (percentUsed >= THRESHOLD_PERCENT) {
+            const hasFreePlan = subscription.name === 'Free';
+            displayOverageWarning({ percentUsed, hasFreePlan, name });
+        }
+    }
+    catch (error) {
+        // Silently fail if we can't fetch usage data - we don't want to block the user's workflow
+        log_1.default.debug(`Failed to fetch usage data: ${error}`);
+    }
+}
+exports.maybeWarnAboutUsageOveragesAsync = maybeWarnAboutUsageOveragesAsync;
+function calculatePercentUsed(value, limit) {
+    if (limit === 0) {
+        return 0;
+    }
+    return Math.min(Math.floor((value / limit) * 100), 100);
+}
+exports.calculatePercentUsed = calculatePercentUsed;
+function createProgressBar(percentUsed, width = 30) {
+    const filledWidth = Math.round((percentUsed / 100) * width);
+    const emptyWidth = width - filledWidth;
+    const filled = '█'.repeat(filledWidth);
+    const empty = '░'.repeat(emptyWidth);
+    return `${filled}${empty}`;
+}
+exports.createProgressBar = createProgressBar;
+function displayOverageWarning({ percentUsed, hasFreePlan, name, }) {
+    log_1.default.warn(chalk_1.default.bold(`You've used ${percentUsed}% of your included build credits for this month. `) +
+        createProgressBar(percentUsed));
+    const billingUrl = `https://expo.dev/accounts/${name}/settings/billing`;
+    const warning = hasFreePlan
+        ? "You won't be able to start new builds once you reach the limit. " +
+            (0, log_1.link)(billingUrl, { text: 'Upgrade your plan to continue service.', dim: false })
+        : 'Additional usage beyond your limit will be charged at pay-as-you-go rates. ' +
+            (0, log_1.link)(billingUrl, {
+                text: 'See usage in billing.',
+                dim: false,
+            });
+    log_1.default.warn(warning);
+    log_1.default.newLine();
+}
+exports.displayOverageWarning = displayOverageWarning;

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.24.0",
+  "version": "16.25.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -4198,7 +4198,7 @@
         "wait": {
           "name": "wait",
           "type": "boolean",
-          "summary": "Wait for workflow run to complete. Defaults to false. Cannot be used with the --json flag.",
+          "summary": "Wait for workflow run to complete. Defaults to false.",
           "description": "Exit codes: 0 = success, 11 = failure, 12 = canceled, 13 = wait aborted.",
           "allowNo": true
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "16.24.0",
+  "version": "16.25.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -12,8 +12,8 @@
     "@expo/code-signing-certificates": "0.0.5",
     "@expo/config": "10.0.6",
     "@expo/config-plugins": "9.0.12",
-    "@expo/eas-build-job": "1.0.239",
-    "@expo/eas-json": "16.23.0",
+    "@expo/eas-build-job": "1.0.243",
+    "@expo/eas-json": "16.25.0",
     "@expo/env": "^1.0.0",
     "@expo/json-file": "8.3.3",
     "@expo/logger": "1.0.221",
@@ -71,7 +71,7 @@
     "node-forge": "1.3.1",
     "node-stream-zip": "1.15.0",
     "nullthrows": "1.1.1",
-    "ora": "9.0.0",
+    "ora": "5.1.0",
     "pkg-dir": "4.2.0",
     "pngjs": "7.0.0",
     "promise-limit": "2.7.0",
@@ -242,5 +242,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "184616e874a6d91546c0874ce8319fdc6fdea4bf"
+  "gitHead": "45481f9758ef94818b46540c4ff3820e556bd3f8"
 }