eas-cli 16.31.0 → 18.0.1

package/build/project/discourageExpoGoForProdAsync.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.discourageExpoGoForProdAsync = discourageExpoGoForProdAsync;
+exports.detectExpoGoProdBuildAsync = detectExpoGoProdBuildAsync;
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const getenv_1 = tslib_1.__importDefault(require("getenv"));
+const workflow_1 = require("./workflow");
+const devClient_1 = require("../build/utils/devClient");
+const log_1 = tslib_1.__importStar(require("../log"));
+const suppressionEnvVarName = 'EAS_BUILD_NO_EXPO_GO_WARNING';
+async function discourageExpoGoForProdAsync(buildProfiles, projectDir, vcsClient) {
+    try {
+        const isExpoGoProdBuild = await detectExpoGoProdBuildAsync(buildProfiles, projectDir, vcsClient);
+        if (!isExpoGoProdBuild) {
+            return;
+        }
+        log_1.default.newLine();
+        log_1.default.warn(`⚠️ Detected that your app uses Expo Go for development, this is not recommended when building production apps.`);
+        log_1.default.warn((0, log_1.learnMore)('https://expo.fyi/why-not-build-expo-go-for-production', {
+            dim: false,
+        }));
+        log_1.default.warn(chalk_1.default.dim(`To suppress this warning, set ${chalk_1.default.bold(`${suppressionEnvVarName}=true`)}.`));
+        log_1.default.newLine();
+    }
+    catch (err) {
+        log_1.default.isDebug && log_1.default.warn('Error detecting whether Expo Go is used:', err);
+    }
+}
+async function detectExpoGoProdBuildAsync(buildProfiles, projectDir, vcsClient) {
+    const shouldSuppressWarning = getenv_1.default.boolish(suppressionEnvVarName, false);
+    const isProductionBuild = buildProfiles?.map(it => it.profileName).includes('production');
+    if (shouldSuppressWarning || !isProductionBuild) {
+        return false;
+    }
+    const hasExpoDevClient = (0, devClient_1.isExpoDevClientInstalled)(projectDir);
+    if (hasExpoDevClient) {
+        return false;
+    }
+    return await checkIfManagedWorkflowAsync(projectDir, vcsClient);
+}
+async function checkIfManagedWorkflowAsync(projectDir, vcsClient) {
+    const workflows = await (0, workflow_1.resolveWorkflowPerPlatformAsync)(projectDir, vcsClient);
+    return workflows.android === eas_build_job_1.Workflow.MANAGED && workflows.ios === eas_build_job_1.Workflow.MANAGED;
+}

package/build/rollout/actions/ManageRollout.js

@@ -30,7 +30,11 @@ class ManageRollout {
     async runAsync(ctx) {
         const { nonInteractive } = ctx;
         if (nonInteractive) {
-            throw new Error(`rollout selection cannot be run in non-interactive mode.`);
+            throw new Error(`Rollout selection cannot be run in non-interactive mode. Available actions: ${[
+                ManageRolloutActions.EDIT,
+                ManageRolloutActions.END,
+                ManageRolloutActions.VIEW,
+            ].join(', ')}.`);
         }
         const channelObject = await this.getChannelObjectAsync(ctx);
         (0, utils_1.printRollout)(channelObject);

package/build/rollout/actions/SelectRuntime.js

@@ -43,7 +43,16 @@ class SelectRuntime {
         const { nonInteractive, graphqlClient, app } = ctx;
         const { projectId } = app;
         if (nonInteractive) {
-            throw new utils_1.NonInteractiveError(`runtime selection cannot be run in non-interactive mode.`);
+            const runtimes = await this.getNewestRuntimeAsync(graphqlClient, {
+                appId: projectId,
+                branchName: this.branchInfo.name,
+                anotherBranchIdToIntersectRuntimesBy: this.options.anotherBranchToIntersectRuntimesBy?.id,
+            });
+            if (runtimes.edges.length === 0) {
+                throw new utils_1.NonInteractiveError(`No ${this.printedType} versions found on branch "${this.branchInfo.name}".`);
+            }
+            const runtimeList = runtimes.edges.map(e => e.node.version).join('\n  ');
+            throw new utils_1.NonInteractiveError(`Runtime selection cannot be run in non-interactive mode. Available ${this.printedType} versions on branch "${this.branchInfo.name}":\n  ${runtimeList}`);
         }
         const newestRuntimeConnection = await this.getNewestRuntimeAsync(graphqlClient, {
             appId: projectId,

package/build/update/queries.js

@@ -78,7 +78,16 @@ async function listAndRenderUpdateGroupsOnBranchAsync(graphqlClient, { projectId
 }
 async function selectRuntimeAndGetLatestUpdateGroupForEachPublishPlatformOnBranchAsync(graphqlClient, { projectId, branchName, paginatedQueryOptions, }) {
     if (paginatedQueryOptions.nonInteractive) {
-        throw new Error('Unable to select an update in non-interactive mode.');
+        const runtimes = await RuntimeQuery_1.RuntimeQuery.getRuntimesOnBranchAsync(graphqlClient, {
+            appId: projectId,
+            name: branchName,
+            first: exports.RUNTIME_VERSIONS_LIMIT,
+        });
+        if (runtimes.edges.length === 0) {
+            throw new Error(`No runtime versions found on branch "${branchName}".`);
+        }
+        const runtimeList = runtimes.edges.map(e => e.node.version).join('\n  ');
+        throw new Error(`Unable to select a runtime in non-interactive mode. Available runtime versions on branch "${branchName}":\n  ${runtimeList}`);
     }
     const runtimeVersion = await selectRuntimeOnBranchAsync(graphqlClient, {
         appId: projectId,
@@ -112,7 +121,24 @@ async function selectRuntimeAndGetLatestUpdateGroupForEachPublishPlatformOnBranc
 }
 async function selectUpdateGroupOnBranchAsync(graphqlClient, { projectId, branchName, paginatedQueryOptions, }) {
     if (paginatedQueryOptions.nonInteractive) {
-        throw new Error('Unable to select an update in non-interactive mode.');
+        const updateGroups = await queryUpdateGroupsOnBranchAsync(graphqlClient, {
+            appId: projectId,
+            branchName,
+            limit: paginatedQueryOptions.limit ?? exports.UPDATE_GROUPS_LIMIT,
+            offset: paginatedQueryOptions.offset,
+        });
+        if (updateGroups.length === 0) {
+            throw new Error(`No update groups found on branch "${branchName}".`);
+        }
+        const updateList = updateGroups
+            .map(group => {
+            const first = group[0];
+            return first
+                ? `${first.group} (runtime: ${first.runtimeVersion}, message: ${first.message ?? 'N/A'})`
+                : 'unknown';
+        })
+            .join('\n  ');
+        throw new Error(`Unable to select an update in non-interactive mode. Use the --group flag to specify the update group. Available update groups on branch "${branchName}":\n  ${updateList}`);
     }
     const updateGroup = await (0, queries_1.paginatedQueryWithSelectPromptAsync)({
         limit: paginatedQueryOptions.limit ?? exports.UPDATE_GROUPS_LIMIT,

package/build/user/SessionManager.d.ts

@@ -39,12 +39,13 @@ export default class SessionManager {
      *
      * @deprecated Should not be used outside of context functions, except in the AccountLogin command.
      */
-    showLoginPromptAsync({ nonInteractive, printNewLine, sso, }?: {
+    showLoginPromptAsync({ nonInteractive, printNewLine, sso, browser, }?: {
         nonInteractive?: boolean | undefined;
         printNewLine?: boolean | undefined;
         sso?: boolean | undefined;
+        browser?: boolean | undefined;
     }): Promise<void>;
-    private ssoLoginAsync;
+    private browserLoginAsync;
     private loginAsync;
     /**
      * Prompt for an OTP with the option to cancel the question by answering empty (pressing return key).

package/build/user/SessionManager.js

@@ -7,8 +7,8 @@ const core_1 = require("@oclif/core");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
-const fetchSessionSecretAndSsoUser_1 = require("./fetchSessionSecretAndSsoUser");
 const fetchSessionSecretAndUser_1 = require("./fetchSessionSecretAndUser");
+const fetchSessionSecretAndUserFromBrowserAuthFlow_1 = require("./fetchSessionSecretAndUserFromBrowserAuthFlow");
 const ApiV2Error_1 = require("../ApiV2Error");
 const api_1 = require("../api");
 const createGraphqlClient_1 = require("../commandUtils/context/contextUtils/createGraphqlClient");
@@ -102,15 +102,15 @@ class SessionManager {
      *
      * @deprecated Should not be used outside of context functions, except in the AccountLogin command.
      */
-    async showLoginPromptAsync({ nonInteractive = false, printNewLine = false, sso = false, } = {}) {
+    async showLoginPromptAsync({ nonInteractive = false, printNewLine = false, sso = false, browser = false, } = {}) {
         if (nonInteractive) {
             core_1.Errors.error(`Either log in with ${chalk_1.default.bold('eas login')} or set the ${chalk_1.default.bold('EXPO_TOKEN')} environment variable if you're using EAS CLI on CI (${(0, log_1.learnMore)('https://docs.expo.dev/accounts/programmatic-access/', { dim: false })})`);
         }
         if (printNewLine) {
             log_1.default.newLine();
         }
-        if (sso) {
-            await this.ssoLoginAsync();
+        if (sso || browser) {
+            await this.browserLoginAsync({ sso });
             return;
         }
         log_1.default.log(`Log in to EAS with email or username (exit and run ${chalk_1.default.bold('eas login --help')} to see other login options)`);
@@ -141,8 +141,8 @@ class SessionManager {
             }
         }
     }
-    async ssoLoginAsync() {
-        const { sessionSecret, id, username } = await (0, fetchSessionSecretAndSsoUser_1.fetchSessionSecretAndSsoUserAsync)();
+    async browserLoginAsync({ sso = false }) {
+        const { sessionSecret, id, username } = await (0, fetchSessionSecretAndUserFromBrowserAuthFlow_1.fetchSessionSecretAndUserFromBrowserAuthFlowAsync)({ sso });
         await this.setSessionAsync({
             sessionSecret,
             userId: id,

package/build/user/expoBrowserAuthFlowLauncher.d.ts

@@ -0,0 +1,3 @@
+export declare function getSessionUsingBrowserAuthFlowAsync({ sso }: {
+    sso?: boolean | undefined;
+}): Promise<string>;

package/build/user/{expoSsoLauncher.js → expoBrowserAuthFlowLauncher.js}

@@ -6,55 +6,37 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const better_opn_1 = tslib_1.__importDefault(require("better-opn"));
 const http_1 = tslib_1.__importDefault(require("http"));
 const querystring_1 = tslib_1.__importDefault(require("querystring"));
+const api_1 = require("../api");
 const log_1 = tslib_1.__importDefault(require("../log"));
-const successBody = `
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Expo SSO Login</title>
-  <meta charset="utf-8">
-  <style type="text/css">
-    html {
-      margin: 0;
-      padding: 0
-    }
-
-    body {
-      background-color: #fff;
-      font-family: Tahoma,Verdana;
-      font-size: 16px;
-      color: #000;
-      max-width: 100%;
-      box-sizing: border-box;
-      padding: .5rem;
-      margin: 1em;
-      overflow-wrap: break-word
-    }
-  </style>
-</head>
-<body>
-  SSO login complete. You may now close this tab and return to the command prompt.
-</body>
-</html>`;
-async function getSessionUsingBrowserAuthFlowAsync({ expoWebsiteUrl, }) {
+async function getSessionUsingBrowserAuthFlowAsync({ sso = false }) {
     const scheme = 'http';
     const hostname = 'localhost';
     const path = '/auth/callback';
-    const buildExpoSsoLoginUrl = (port) => {
-        const data = {
+    const expoWebsiteUrl = (0, api_1.getExpoWebsiteBaseUrl)();
+    const buildExpoLoginUrl = (port, sso) => {
+        const params = querystring_1.default.stringify({
+            confirm_account: true,
             app_redirect_uri: `${scheme}://${hostname}:${port}${path}`,
-        };
-        const params = querystring_1.default.stringify(data);
-        return `${expoWebsiteUrl}/sso-login?${params}`;
+        });
+        return `${expoWebsiteUrl}${sso ? '/sso-login' : '/login'}?${params}`;
     };
     // Start server and begin auth flow
     const executeAuthFlow = () => {
         return new Promise(async (resolve, reject) => {
             const connections = new Set();
             const server = http_1.default.createServer((request, response) => {
+                const redirectAndCleanup = (result) => {
+                    const redirectUrl = `${expoWebsiteUrl}/oauth/expo-cli?result=${result}`;
+                    response.writeHead(302, { Location: redirectUrl });
+                    response.end();
+                    server.close();
+                    for (const connection of connections) {
+                        connection.destroy();
+                    }
+                };
                 try {
                     if (!(request.method === 'GET' && request.url?.includes('/auth/callback'))) {
-                        throw new Error('Unexpected SSO login response.');
+                        throw new Error('Unexpected login response.');
                     }
                     const url = new URL(request.url, `http:${request.headers.host}`);
                     const sessionSecret = url.searchParams.get('session_secret');
@@ -62,27 +44,19 @@ async function getSessionUsingBrowserAuthFlowAsync({ expoWebsiteUrl, }) {
                         throw new Error('Request missing session_secret search parameter.');
                     }
                     resolve(sessionSecret);
-                    response.writeHead(200, { 'Content-Type': 'text/html' });
-                    response.write(successBody);
-                    response.end();
+                    redirectAndCleanup('success');
                 }
                 catch (error) {
+                    redirectAndCleanup('error');
                     reject(error);
                 }
-                finally {
-                    server.close();
-                    // Ensure that the server shuts down
-                    for (const connection of connections) {
-                        connection.destroy();
-                    }
-                }
             });
             server.listen(0, hostname, () => {
                 log_1.default.log('Waiting for browser login...');
                 const address = server.address();
                 (0, assert_1.default)(address !== null && typeof address === 'object', 'Server address and port should be set after listening has begun');
                 const port = address.port;
-                const authorizeUrl = buildExpoSsoLoginUrl(port);
+                const authorizeUrl = buildExpoLoginUrl(port, sso);
                 log_1.default.log(`If your browser doesn't automatically open, visit this link to log in: ${authorizeUrl}`);
                 void (0, better_opn_1.default)(authorizeUrl);
             });

package/build/user/fetchSessionSecretAndUserFromBrowserAuthFlow.d.ts

@@ -0,0 +1,7 @@
+export declare function fetchSessionSecretAndUserFromBrowserAuthFlowAsync({ sso }: {
+    sso?: boolean | undefined;
+}): Promise<{
+    sessionSecret: string;
+    id: string;
+    username: string;
+}>;

package/build/user/fetchSessionSecretAndUserFromBrowserAuthFlow.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSessionSecretAndUserFromBrowserAuthFlowAsync = fetchSessionSecretAndUserFromBrowserAuthFlowAsync;
+const expoBrowserAuthFlowLauncher_1 = require("./expoBrowserAuthFlowLauncher");
+const fetchUser_1 = require("./fetchUser");
+async function fetchSessionSecretAndUserFromBrowserAuthFlowAsync({ sso = false }) {
+    const sessionSecret = await (0, expoBrowserAuthFlowLauncher_1.getSessionUsingBrowserAuthFlowAsync)({ sso });
+    const userData = await (0, fetchUser_1.fetchUserAsync)({ sessionSecret });
+    return {
+        sessionSecret,
+        id: userData.id,
+        username: userData.username,
+    };
+}

package/build/utils/prompts.js

@@ -28,7 +28,7 @@ async function getProjectEnvironmentVariableEnvironmentsAsync(graphqlClient, pro
 const CUSTOM_ENVIRONMENT_VALUE = '~~CUSTOM~~';
 async function promptVariableTypeAsync(nonInteractive, initialType) {
     if (nonInteractive) {
-        throw new Error('The `--type` flag must be set when running in `--non-interactive` mode.');
+        throw new Error('The `--type` flag must be set when running in `--non-interactive` mode. Valid values: string, file.');
     }
     const options = [
         {
@@ -75,7 +75,7 @@ async function promptCustomEnvironmentAsync() {
 }
 async function promptVariableVisibilityAsync(nonInteractive, selectedVisibility) {
     if (nonInteractive) {
-        throw new Error('The `--visibility` flag must be set when running in `--non-interactive` mode.');
+        throw new Error('The `--visibility` flag must be set when running in `--non-interactive` mode. Valid values: plaintext, sensitive, secret.');
     }
     return await (0, prompts_1.selectAsync)('Select visibility:', [
         {
@@ -97,7 +97,7 @@ async function promptVariableVisibilityAsync(nonInteractive, selectedVisibility)
 }
 async function promptVariableEnvironmentAsync({ nonInteractive, selectedEnvironments, multiple = false, canEnterCustomEnvironment = false, graphqlClient, projectId, }) {
     if (nonInteractive) {
-        throw new Error('The `--environment` flag must be set when running in `--non-interactive` mode.');
+        throw new Error(`The \`--environment\` flag must be set when running in \`--non-interactive\` mode. Default environments: ${DEFAULT_ENVIRONMENTS.join(', ')}.`);
     }
     let allEnvironments = DEFAULT_ENVIRONMENTS;
     if (graphqlClient && projectId) {

package/build/utils/usage/checkForOverages.js

@@ -6,13 +6,13 @@ exports.createProgressBar = createProgressBar;
 exports.displayOverageWarning = displayOverageWarning;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
-const AccountUsageQuery_1 = require("../../graphql/queries/AccountUsageQuery");
+const AccountQuery_1 = require("../../graphql/queries/AccountQuery");
 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 { name, subscription, usageMetrics: { EAS_BUILD }, } = await AccountQuery_1.AccountQuery.getUsageForOverageWarningAsync(graphqlClient, accountId, currentDate);
         const planMetric = EAS_BUILD?.planMetrics?.[0];
         if (!planMetric || !subscription) {
             return;
@@ -42,8 +42,10 @@ function createProgressBar(percentUsed, width = 30) {
     return `${filled}${empty}`;
 }
 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 message = chalk_1.default.bold(`You've used ${percentUsed}% of your included build credits for this month.`);
+    // Don't show progress bar at 100% - it's redundant when the limit is reached
+    const progressBar = percentUsed < 100 ? ' ' + createProgressBar(percentUsed) : '';
+    log_1.default.warn(message + progressBar);
     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. " +

package/build/worker/mutations.js

@@ -14,10 +14,7 @@ exports.DeploymentsMutation = {
             .mutation((0, graphql_tag_1.default) `
             mutation createDeploymentUrlMutation($appId: ID!, $deploymentIdentifier: ID) {
               deployments {
-                createSignedDeploymentUrl(
-                  appId: $appId
-                  deploymentIdentifier: $deploymentIdentifier
-                ) {
+                createSignedDeploymentUrl(appId: $appId, deploymentIdentifier: $deploymentIdentifier) {
                   pendingWorkerDeploymentId
                   deploymentIdentifier
                   url
@@ -95,10 +92,7 @@ exports.DeploymentsMutation = {
             .mutation((0, graphql_tag_1.default) `
             mutation DeleteDeployment($appId: ID!, $deploymentIdentifier: ID!) {
               deployments {
-                deleteWorkerDeploymentByIdentifier(
-                  appId: $appId
-                  deploymentIdentifier: $deploymentIdentifier
-                ) {
+                deleteWorkerDeploymentByIdentifier(appId: $appId, deploymentIdentifier: $deploymentIdentifier) {
                   id
                   deploymentIdentifier
                 }

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.31.0",
+  "version": "18.0.1",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -298,6 +298,13 @@
           "char": "s",
           "description": "Login with SSO",
           "allowNo": false
+        },
+        "browser": {
+          "name": "browser",
+          "type": "boolean",
+          "char": "b",
+          "description": "Login with your browser",
+          "allowNo": false
         }
       },
       "args": {},
@@ -322,6 +329,38 @@
         "sessionManager": {}
       }
     },
+    "account:usage": {
+      "id": "account:usage",
+      "description": "view account usage and billing for the current cycle",
+      "strict": true,
+      "pluginName": "eas-cli",
+      "pluginAlias": "eas-cli",
+      "pluginType": "core",
+      "aliases": [],
+      "flags": {
+        "json": {
+          "name": "json",
+          "type": "boolean",
+          "description": "Enable JSON output, non-JSON messages will be printed to stderr.",
+          "allowNo": false
+        },
+        "non-interactive": {
+          "name": "non-interactive",
+          "type": "boolean",
+          "description": "Run the command in non-interactive mode.",
+          "allowNo": false
+        }
+      },
+      "args": {
+        "ACCOUNT_NAME": {
+          "name": "ACCOUNT_NAME",
+          "description": "Account name to view usage for. If not provided, the account will be selected interactively (or defaults to the only account if there is just one)"
+        }
+      },
+      "contextDefinition": {
+        "loggedIn": {}
+      }
+    },
     "account:view": {
       "id": "account:view",
       "description": "show the username you are logged in as",