eas-cli 16.26.0 → 16.28.0

package/build/branch/delete.d.ts

@@ -0,0 +1,5 @@
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
+import { BackgroundJobReceiptDataFragment } from '../graphql/generated';
+export declare function scheduleBranchDeletionAsync(graphqlClient: ExpoGraphqlClient, { branchId, }: {
+    branchId: string;
+}): Promise<BackgroundJobReceiptDataFragment>;

package/build/branch/delete.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.scheduleBranchDeletionAsync = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const client_1 = require("../graphql/client");
+const BackgroundJobReceipt_1 = require("../graphql/types/BackgroundJobReceipt");
+async function scheduleBranchDeletionAsync(graphqlClient, { branchId, }) {
+    const result = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+        .mutation((0, graphql_tag_1.default) `
+          mutation ScheduleBranchDeletion($branchId: ID!) {
+            updateBranch {
+              scheduleUpdateBranchDeletion(branchId: $branchId) {
+                id
+                ...BackgroundJobReceiptData
+              }
+            }
+          }
+          ${BackgroundJobReceipt_1.BackgroundJobReceiptNode}
+        `, { branchId })
+        .toPromise());
+    return result.updateBranch.scheduleUpdateBranchDeletion;
+}
+exports.scheduleBranchDeletionAsync = scheduleBranchDeletionAsync;

package/build/build/context.d.ts

@@ -28,6 +28,7 @@ export interface IosBuildContext {
     buildNumberOverride?: string;
 }
 export interface BuildContext<T extends Platform> {
+    accountId: string;
     accountName: string;
     easJsonCliConfig: EasJson['cli'];
     buildProfile: BuildProfile<T>;

package/build/build/createContext.js

@@ -63,6 +63,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, easJson
     analytics.logEvent(AnalyticsManager_1.BuildEvent.BUILD_COMMAND, analyticsEventProperties);
     const resourceClass = await (0, resourceClass_1.resolveBuildResourceClassAsync)(buildProfile, platform, resourceClassFlag);
     const commonContext = {
+        accountId,
         accountName: account.name,
         buildProfile,
         buildProfileName,

package/build/build/runBuildAndSubmit.js

@@ -41,8 +41,10 @@ const download_1 = require("../utils/download");
 const filter_1 = require("../utils/expodash/filter");
 const json_1 = require("../utils/json");
 const profiles_1 = require("../utils/profiles");
+const checkForOverages_1 = require("../utils/usage/checkForOverages");
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
+let hasWarnedAboutUsageOverages = false;
 async function runBuildAndSubmitAsync({ graphqlClient, analytics, vcsClient, projectDir, flags, actor, getDynamicPrivateProjectConfigAsync, downloadSimBuildAutoConfirm, envOverride, }) {
     await vcsClient.ensureRepoExistsAsync();
     await (0, repository_1.ensureRepoIsCleanAsync)(vcsClient, flags.nonInteractive);
@@ -241,6 +243,14 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         whatToTest: flags.whatToTest,
         env,
     });
+    if (!hasWarnedAboutUsageOverages && !flags.localBuildOptions.localBuildMode) {
+        hasWarnedAboutUsageOverages = true;
+        log_1.default.newLine();
+        await (0, checkForOverages_1.maybeWarnAboutUsageOveragesAsync)({ graphqlClient, accountId: buildCtx.accountId });
+        if (!moreBuilds) {
+            log_1.default.newLine();
+        }
+    }
     if (moreBuilds) {
         log_1.default.newLine();
         const appPlatform = (0, AppPlatform_1.toAppPlatform)(buildProfile.platform);

package/build/commandUtils/new/configs.js

@@ -79,12 +79,15 @@ async function promptForProjectAccountAsync(actor) {
 exports.promptForProjectAccountAsync = promptForProjectAccountAsync;
 function getAccountChoices(actor, permissionsMap) {
     const permissions = permissionsMap ?? getAccountPermissionsMap(actor);
-    const sortedAccounts = [...actor.accounts].sort((a, _b) => actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0);
+    const sortedAccounts = [...actor.accounts].sort((a, _b) => (a.ownerUserActor ? 1 : -1));
     return sortedAccounts.map(account => {
-        const isPersonalAccount = actor.__typename === 'User' && account.name === actor.username;
+        const isPersonalAccount = !!account.ownerUserActor && account.ownerUserActor.id === actor.id;
+        const isTeamAccount = !!account.ownerUserActor && account.ownerUserActor.id !== actor.id;
         const accountDisplayName = isPersonalAccount
-            ? `${account.name} (personal account)`
-            : account.name;
+            ? `${account.name} (Limited - Personal Account)`
+            : isTeamAccount
+                ? `${account.name} (Limited - Team Account)`
+                : account.name;
         const disabled = !permissions.get(account.name);
         return {
             title: accountDisplayName,

package/build/commands/branch/delete.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const delete_1 = require("../../branch/delete");
 const queries_1 = require("../../branch/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
@@ -12,6 +13,7 @@ const log_1 = tslib_1.__importDefault(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
+const pollForBackgroundJobReceiptAsync_1 = require("../../utils/pollForBackgroundJobReceiptAsync");
 async function getBranchInfoAsync(graphqlClient, { appId, name }) {
     const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
         .query((0, graphql_tag_1.default) `
@@ -33,22 +35,6 @@ async function getBranchInfoAsync(graphqlClient, { appId, name }) {
         .toPromise());
     return data;
 }
-async function deleteBranchOnAppAsync(graphqlClient, { branchId }) {
-    const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
-        .mutation((0, graphql_tag_1.default) `
-          mutation DeleteUpdateBranch($branchId: ID!) {
-            updateBranch {
-              deleteUpdateBranch(branchId: $branchId) {
-                id
-              }
-            }
-          }
-        `, {
-        branchId,
-    })
-        .toPromise());
-    return data.updateBranch.deleteUpdateBranch;
-}
 class BranchDelete extends EasCommand_1.default {
     static description = 'delete a branch';
     static contextDefinition = {
@@ -102,11 +88,11 @@ class BranchDelete extends EasCommand_1.default {
                 process.exit(1);
             }
         }
-        const deletionResult = await deleteBranchOnAppAsync(graphqlClient, {
-            branchId,
-        });
+        const receipt = await (0, delete_1.scheduleBranchDeletionAsync)(graphqlClient, { branchId });
+        const successfulReceipt = await (0, pollForBackgroundJobReceiptAsync_1.pollForBackgroundJobReceiptAsync)(graphqlClient, receipt);
+        log_1.default.debug('Deletion result', { successfulReceipt });
         if (jsonFlag) {
-            (0, json_1.printJsonOnlyOutput)(deletionResult);
+            (0, json_1.printJsonOnlyOutput)({ id: branchId });
         }
         else {
             log_1.default.withTick(`️Deleted branch "${branchName}" and all of its updates on project ${chalk_1.default.bold(projectDisplayName)}.`);

package/build/commands/build/index.js

@@ -17,12 +17,10 @@ const flags_1 = require("../../commandUtils/flags");
 const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const platform_1 = require("../../platform");
-const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const uniq_1 = tslib_1.__importDefault(require("../../utils/expodash/uniq"));
 const json_1 = require("../../utils/json");
 const statuspageService_1 = require("../../utils/statuspageService");
-const checkForOverages_1 = require("../../utils/usage/checkForOverages");
 class Build extends EasCommand_1.default {
     static description = 'start a build';
     static flags = {
@@ -122,12 +120,6 @@ class Build extends EasCommand_1.default {
             await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)(graphqlClient, flags.autoSubmit
                 ? [generated_1.StatuspageServiceName.EasBuild, generated_1.StatuspageServiceName.EasSubmit]
                 : [generated_1.StatuspageServiceName.EasBuild]);
-            const { projectId } = await getDynamicPrivateProjectConfigAsync();
-            const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
-            await (0, checkForOverages_1.maybeWarnAboutUsageOveragesAsync)({
-                graphqlClient,
-                accountId: account.id,
-            });
         }
         const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
         const { buildProfiles } = await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)({

package/build/commands/env/update.js

@@ -173,15 +173,6 @@ class EnvUpdate extends EasCommand_1.default {
                     newType = undefined;
                 }
             }
-            let environmentFilePath;
-            if ((newType ?? selectedVariable.type) === generated_1.EnvironmentSecretType.FileBase64 && value) {
-                environmentFilePath = path_1.default.resolve(value);
-                if (!(await fs_extra_1.default.pathExists(environmentFilePath))) {
-                    throw new Error(`File "${value}" does not exist`);
-                }
-                fileName = path_1.default.basename(environmentFilePath);
-            }
-            value = environmentFilePath ? await fs_extra_1.default.readFile(environmentFilePath, 'base64') : value;
             if (!environments || environments.length === 0) {
                 environments = await (0, prompts_2.promptVariableEnvironmentAsync)({
                     nonInteractive,
@@ -204,6 +195,23 @@ class EnvUpdate extends EasCommand_1.default {
                 }
             }
         }
+        // If value is provided but type is not explicitly set, preserve the existing type
+        if (value && !newType) {
+            newType = selectedVariable.type;
+        }
+        if (newType === generated_1.EnvironmentSecretType.FileBase64 && value) {
+            const environmentFilePath = path_1.default.resolve(value);
+            if (!(await fs_extra_1.default.pathExists(environmentFilePath))) {
+                if (type === 'file') {
+                    throw new Error(`File "${value}" does not exist`);
+                }
+                else {
+                    throw new Error(`Variable "${selectedVariable.name}" is a file type, but "${value}" does not exist as a file. If you want to convert it to a string, pass --type string.`);
+                }
+            }
+            fileName = path_1.default.basename(environmentFilePath);
+            value = await fs_extra_1.default.readFile(environmentFilePath, 'base64');
+        }
         if (visibility) {
             newVisibility = (0, prompts_2.parseVisibility)(visibility);
         }

package/build/commands/update/index.js

@@ -382,6 +382,9 @@ class UpdatePublish extends EasCommand_1.default {
             publishSpinner.fail('Failed to publish updates');
             throw e;
         }
+        if ((0, utils_1.isBundleDiffingEnabled)(exp)) {
+            await (0, utils_1.prewarmDiffingAsync)(graphqlClient, projectId, newUpdates);
+        }
         if (!skipBundler && emitMetadata) {
             log_1.default.log('Generating eas-update-metadata.json');
             await (0, publish_1.generateEasMetadataAsync)(distRoot, (0, utils_1.getUpdateJsonInfosForUpdates)(newUpdates));

package/build/commands/workflow/run.js

@@ -103,7 +103,9 @@ class WorkflowRun extends EasCommand_1.default {
             nonInteractive: flags['non-interactive'],
             withServerSideEnvironment: null,
         });
-        const { projectId, exp: { slug: projectName }, } = await getDynamicPrivateProjectConfigAsync();
+        const { projectId, exp: { slug: projectName }, } = await getDynamicPrivateProjectConfigAsync({
+            skipPlugins: true,
+        });
         const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
         let yamlConfig;
         let workflowRunId;

package/build/commands/workflow/status.js

@@ -60,7 +60,7 @@ class WorkflowStatus extends EasCommand_1.default {
         });
         const { projectId, exp: { slug: projectName }, } = await getDynamicPrivateProjectConfigAsync();
         const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
-        let workflowRunId = args.workflowRunId;
+        let workflowRunId = args.WORKFLOW_RUN_ID;
         if (!workflowRunId && flags['non-interactive']) {
             throw new Error('Workflow run ID is required in non-interactive mode');
         }