eas-cli 3.2.0 → 3.3.0

package/build/build/types.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UserInputResourceClass = exports.BuildDistributionType = exports.BuildStatus = void 0;
+exports.BuildDistributionType = exports.BuildStatus = void 0;
 var BuildStatus;
 (function (BuildStatus) {
     BuildStatus["NEW"] = "new";
@@ -16,13 +16,3 @@ var BuildDistributionType;
     BuildDistributionType["INTERNAL"] = "internal";
     BuildDistributionType["SIMULATOR"] = "simulator";
 })(BuildDistributionType = exports.BuildDistributionType || (exports.BuildDistributionType = {}));
-var UserInputResourceClass;
-(function (UserInputResourceClass) {
-    UserInputResourceClass["DEFAULT"] = "default";
-    UserInputResourceClass["LARGE"] = "large";
-    /**
-     * @experimental
-     * This resource class is not yet ready to be used in production. For testing purposes only. Might be deprecated / deleted at any time.
-     */
-    UserInputResourceClass["M1_EXPERIMENTAL"] = "m1-experimental";
-})(UserInputResourceClass = exports.UserInputResourceClass || (exports.UserInputResourceClass = {}));

package/build/commandUtils/context/contextUtils/getProjectIdAsync.js

@@ -89,6 +89,8 @@ async function getProjectIdAsync(sessionManager, exp, options) {
                 return user.username;
             case 'Robot':
                 throw new Error('The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner');
+            case 'SSOUser':
+                throw new Error('SSO users are not supported yet.');
         }
     };
     const projectId = await (0, fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1.fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)(graphqlClient, {

package/build/commands/build/index.d.ts

@@ -1,4 +1,4 @@
-import { UserInputResourceClass } from '../../build/types';
+import { ResourceClass } from '@expo/eas-json';
 import EasCommand from '../../commandUtils/EasCommand';
 export default class Build extends EasCommand {
     static description: string;
@@ -15,7 +15,7 @@ export default class Build extends EasCommand {
         'clear-cache': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'auto-submit': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'auto-submit-with-profile': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
-        'resource-class': import("@oclif/core/lib/interfaces").OptionFlag<UserInputResourceClass | undefined>;
+        'resource-class': import("@oclif/core/lib/interfaces").OptionFlag<ResourceClass | undefined>;
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     static contextDefinition: {

package/build/commands/build/index.js

@@ -11,7 +11,6 @@ const figures_1 = tslib_1.__importDefault(require("figures"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
-const types_1 = require("../../build/types");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const flags_1 = require("../../commandUtils/flags");
 const generated_1 = require("../../graphql/generated");
@@ -41,7 +40,7 @@ class Build extends EasCommand_1.default {
         await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, projectDir, flagsWithPlatform, actor, getDynamicProjectConfigAsync);
     }
     sanitizeFlags(flags) {
-        var _b, _c;
+        var _b;
         const nonInteractive = flags['non-interactive'];
         if (!flags.local && flags.output) {
             core_1.Errors.error('--output is allowed only for local builds', { exit: 1 });
@@ -52,12 +51,6 @@ class Build extends EasCommand_1.default {
         if (flags.json && !nonInteractive) {
             core_1.Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
         }
-        if (flags['resource-class'] === types_1.UserInputResourceClass.M1_EXPERIMENTAL &&
-            flags.platform !== eas_build_job_1.Platform.IOS) {
-            core_1.Errors.error(`Resource class ${types_1.UserInputResourceClass.M1_EXPERIMENTAL} is only available for iOS builds`, {
-                exit: 1,
-            });
-        }
         const requestedPlatform = flags.platform &&
             Object.values(platform_1.RequestedPlatform).includes(flags.platform.toLowerCase())
             ? flags.platform.toLowerCase()
@@ -93,7 +86,7 @@ class Build extends EasCommand_1.default {
             json: flags['json'],
             autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
             submitProfile: (_b = flags['auto-submit-with-profile']) !== null && _b !== void 0 ? _b : profile,
-            userInputResourceClass: (_c = flags['resource-class']) !== null && _c !== void 0 ? _c : types_1.UserInputResourceClass.DEFAULT,
+            resourceClass: flags['resource-class'],
             message,
         };
     }
@@ -167,8 +160,11 @@ Build.flags = {
         exclusive: ['auto-submit'],
     }),
     'resource-class': core_1.Flags.enum({
-        options: Object.values(types_1.UserInputResourceClass),
+        options: Object.values(eas_json_1.ResourceClass),
         hidden: true,
+        deprecated: {
+            message: chalk_1.default.yellow('The --resource-class flag has been deprecated. Define the resource class in eas.json.\nLearn more: https://docs.expo.dev/build-reference/eas-json/'),
+        },
         description: 'The instance type that will be used to run this build [experimental]',
     }),
     message: core_1.Flags.string({

package/build/commands/build/run.js

@@ -12,6 +12,7 @@ const pagination_1 = require("../../commandUtils/pagination");
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const run_1 = require("../../run/run");
@@ -103,10 +104,26 @@ async function resolvePlatformAsync(platform) {
     });
     return selectedPlatform;
 }
+function validateChosenBuild(maybeBuild, selectedPlatform) {
+    if (!maybeBuild) {
+        throw new Error('There are no simulator/emulator builds that can be run for this project.');
+    }
+    if (selectedPlatform !== maybeBuild.platform) {
+        throw new Error(`The selected build is for ${platform_1.appPlatformDisplayNames[maybeBuild.platform]}, but you selected ${platform_1.appPlatformDisplayNames[selectedPlatform]}`);
+    }
+    if (maybeBuild.status !== generated_1.BuildStatus.Finished) {
+        throw new Error('The selected build is not finished.');
+    }
+    if (!(0, utils_1.isRunnableOnSimulatorOrEmulator)(maybeBuild)) {
+        throw new Error('Artifacts for the latest build have expired and are no longer available, or this is not a simulator/emulator build.');
+    }
+    return maybeBuild;
+}
 async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQueryOptions) {
     const distributionType = flags.selectedPlatform === generated_1.AppPlatform.Ios ? generated_1.DistributionType.Simulator : undefined;
     if (flags.runArchiveFlags.id) {
-        return BuildQuery_1.BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
+        const build = await BuildQuery_1.BuildQuery.byIdAsync(graphqlClient, flags.runArchiveFlags.id);
+        return validateChosenBuild(build, flags.selectedPlatform);
     }
     else if (!flags.runArchiveFlags.id &&
         !flags.runArchiveFlags.path &&
@@ -114,7 +131,7 @@ async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQuer
         !flags.runArchiveFlags.latest) {
         const build = await (0, queries_1.listAndSelectBuildOnAppAsync)(graphqlClient, {
             projectId,
-            title: `Select ${flags.selectedPlatform === generated_1.AppPlatform.Ios ? 'iOS' : 'Android'} ${flags.selectedPlatform === generated_1.AppPlatform.Ios ? 'simulator' : 'emulator'} build to run for ${await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId)} app`,
+            title: `Select ${platform_1.appPlatformDisplayNames[flags.selectedPlatform]} ${flags.selectedPlatform === generated_1.AppPlatform.Ios ? 'simulator' : 'emulator'} build to run for ${await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId)} app`,
             filter: {
                 platform: flags.selectedPlatform,
                 distribution: distributionType,
@@ -124,10 +141,10 @@ async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQuer
             selectPromptDisabledFunction: build => !(0, utils_1.isRunnableOnSimulatorOrEmulator)(build),
             selectPromptWarningMessage: 'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
         });
-        return build !== null && build !== void 0 ? build : null;
+        return validateChosenBuild(build, flags.selectedPlatform);
     }
     else if (flags.runArchiveFlags.latest) {
-        return await (0, queries_1.getLatestBuildAsync)(graphqlClient, {
+        const latestBuild = await (0, queries_1.getLatestBuildAsync)(graphqlClient, {
             projectId,
             filter: {
                 platform: flags.selectedPlatform,
@@ -135,6 +152,7 @@ async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQuer
                 status: generated_1.BuildStatus.Finished,
             },
         });
+        return validateChosenBuild(latestBuild, flags.selectedPlatform);
     }
     else {
         return null;

package/build/commands/project/init.js

@@ -154,7 +154,7 @@ class ProjectInit extends EasCommand_1.default {
                 // if regular user, put primary account first
                 const sortedAccounts = actor.__typename === 'Robot'
                     ? allAccounts
-                    : [...allAccounts].sort((a, _b) => (a.name === actor.username ? -1 : 1));
+                    : [...allAccounts].sort((a, _b) => actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0);
                 const choices = sortedAccounts.map(account => ({
                     title: account.name,
                     value: account,

package/build/commands/update/index.js

@@ -256,7 +256,7 @@ class UpdatePublish extends EasCommand_1.default {
             throw e;
         }
         if (jsonFlag) {
-            (0, json_1.printJsonOnlyOutput)(newUpdates);
+            (0, json_1.printJsonOnlyOutput)((0, utils_2.getUpdateGroupJsonInfo)(newUpdates));
         }
         else {
             if (new Set(newUpdates.map(update => update.group)).size > 1) {

package/build/commands/update/view.js

@@ -17,11 +17,11 @@ class UpdateView extends EasCommand_1.default {
             (0, json_1.enableJsonOutput)();
         }
         const updatesByGroup = await UpdateQuery_1.UpdateQuery.viewUpdateGroupAsync(graphqlClient, { groupId });
-        const [updateGroupDescription] = (0, utils_1.getUpdateGroupDescriptions)([updatesByGroup]);
         if (jsonFlag) {
-            (0, json_1.printJsonOnlyOutput)(updateGroupDescription);
+            (0, json_1.printJsonOnlyOutput)((0, utils_1.getUpdateGroupJsonInfo)(updatesByGroup));
         }
         else {
+            const [updateGroupDescription] = (0, utils_1.getUpdateGroupDescriptions)([updatesByGroup]);
             log_1.default.log(chalk_1.default.bold('Update group:'));
             log_1.default.log((0, utils_1.formatUpdateGroup)(updateGroupDescription));
         }