eas-cli 12.4.1 → 12.5.0

package/build/project/expoConfig.js

@@ -3,14 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPublicExpoConfig = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfig = exports.createOrModifyExpoConfigAsync = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
-const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
-const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const path_1 = tslib_1.__importDefault(require("path"));
 async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
     ensureExpoConfigExists(projectDir);
-    await ensureStaticExpoConfigIsValidAsync(projectDir);
     if (readOptions) {
         return await (0, config_1.modifyConfigAsync)(projectDir, exp, readOptions);
     }
@@ -68,18 +65,6 @@ function ensureExpoConfigExists(projectDir) {
     }
 }
 exports.ensureExpoConfigExists = ensureExpoConfigExists;
-async function ensureStaticExpoConfigIsValidAsync(projectDir) {
-    if (isUsingStaticExpoConfig(projectDir)) {
-        const staticConfigPath = (0, nullthrows_1.default)((0, config_1.getConfigFilePaths)(projectDir).staticConfigPath);
-        const staticConfig = await json_file_1.default.readAsync(staticConfigPath);
-        // Add the "expo" key if it doesn't exist on app.json yet, such as in
-        // projects initialized with RNC CLI
-        if (!staticConfig?.expo) {
-            staticConfig.expo = {};
-            await json_file_1.default.writeAsync(staticConfigPath, staticConfig);
-        }
-    }
-}
 function isUsingStaticExpoConfig(projectDir) {
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     return !!(paths.staticConfigPath?.endsWith('app.json') && !paths.dynamicConfigPath);

package/build/project/ios/bundleIdentifier.js

@@ -39,12 +39,12 @@ class AmbiguousBundleIdentifierError extends Error {
 }
 exports.AmbiguousBundleIdentifierError = AmbiguousBundleIdentifierError;
 async function getBundleIdentifierAsync(projectDir, exp, vcsClient, xcodeContext) {
+    if (env_1.default.overrideIosBundleIdentifier) {
+        return env_1.default.overrideIosBundleIdentifier;
+    }
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
-        if (env_1.default.overrideIosBundleIdentifier) {
-            return env_1.default.overrideIosBundleIdentifier;
-        }
         const xcodeProject = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(projectDir);
         const isMultiScheme = config_plugins_1.IOSConfig.BuildScheme.getSchemesFromXcodeproj(projectDir).length > 1;
         const isMultiTarget = config_plugins_1.IOSConfig.Target.getNativeTargets(xcodeProject).filter(([, target]) => config_plugins_1.IOSConfig.Target.isTargetOfType(target, config_plugins_1.IOSConfig.Target.TargetType.APPLICATION)).length > 1;

package/build/submit/ArchiveSource.js

@@ -8,6 +8,7 @@ const url_1 = require("url");
 const uuid = tslib_1.__importStar(require("uuid"));
 const builds_1 = require("./utils/builds");
 const files_1 = require("./utils/files");
+const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importStar(require("../log"));
@@ -26,6 +27,15 @@ var ArchiveSourceType;
     ArchiveSourceType[ArchiveSourceType["prompt"] = 6] = "prompt";
     ArchiveSourceType[ArchiveSourceType["gcs"] = 7] = "gcs";
 })(ArchiveSourceType || (exports.ArchiveSourceType = ArchiveSourceType = {}));
+const buildStatusMapping = {
+    [generated_1.BuildStatus.New]: 'new',
+    [generated_1.BuildStatus.InQueue]: 'in queue',
+    [generated_1.BuildStatus.InProgress]: 'in progress',
+    [generated_1.BuildStatus.Finished]: 'finished',
+    [generated_1.BuildStatus.Errored]: 'errored',
+    [generated_1.BuildStatus.PendingCancel]: 'canceled',
+    [generated_1.BuildStatus.Canceled]: 'canceled',
+};
 async function getArchiveAsync(ctx, source) {
     switch (source.sourceType) {
         case ArchiveSourceType.prompt: {
@@ -200,7 +210,7 @@ async function handleBuildListSourceAsync(ctx) {
     }
 }
 function formatBuildChoice(build) {
-    const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel, message, } = build;
+    const { id, updatedAt, runtimeVersion, buildProfile, gitCommitHash, gitCommitMessage, channel, message, status, } = build;
     const buildDate = new Date(updatedAt);
     const splitCommitMessage = gitCommitMessage?.split('\n');
     const formattedCommitData = gitCommitHash && splitCommitMessage && splitCommitMessage.length > 0
@@ -218,6 +228,7 @@ function formatBuildChoice(build) {
                 ? chalk_1.default.bold(message.length > 200 ? `${message.slice(0, 200)}...` : message)
                 : null,
         },
+        { name: 'Status', value: buildStatusMapping[status] },
     ];
     const filteredDescriptionArray = descriptionItems
         .filter(item => item.value)
@@ -230,6 +241,9 @@ function formatBuildChoice(build) {
     };
 }
 async function handlePromptSourceAsync(ctx) {
+    if (ctx.nonInteractive) {
+        throw new Error('Please run this command with appropriate input.');
+    }
     const { sourceType: sourceTypeRaw } = await (0, prompts_1.promptAsync)({
         name: 'sourceType',
         type: 'select',

package/build/submit/BaseSubmitter.d.ts

@@ -25,6 +25,7 @@ export default abstract class BaseSubmitter<P extends Platform, ResolvedSourceOp
         [K in keyof ResolvedSourceOptions]: () => Promise<ResolvedSourceOptions[K]>;
     }, sourceOptionAnalytics: Record<keyof ResolvedSourceOptions, AnalyticEvents>);
     private getSourceOptionsAsync;
+    getSubmissionInputAsync(): Promise<SubmissionInput<P>>;
     submitAsync(): Promise<SubmissionFragment>;
     abstract createSubmissionInputAsync(resolvedOptions: ResolvedSourceOptions): Promise<SubmissionInput<P>>;
     formatArchive(archive: ResolvedArchiveSource): Pick<SubmissionInput<P>, 'archiveSource' | 'buildId'>;

package/build/submit/BaseSubmitter.js

@@ -32,9 +32,12 @@ class BaseSubmitter {
         }
         return resolvedSourceOptions;
     }
-    async submitAsync() {
+    async getSubmissionInputAsync() {
         const resolvedSourceOptions = await this.getSourceOptionsAsync();
-        const input = await this.createSubmissionInputAsync(resolvedSourceOptions);
+        return await this.createSubmissionInputAsync(resolvedSourceOptions);
+    }
+    async submitAsync() {
+        const input = await this.getSubmissionInputAsync();
         return await this.createSubmissionWithAnalyticsAsync(input);
     }
     formatArchive(archive) {

package/build/submit/android/AndroidSubmitCommand.d.ts

@@ -1,10 +1,10 @@
 import { Platform } from '@expo/eas-build-job';
-import { SubmissionFragment } from '../../graphql/generated';
+import AndroidSubmitter from './AndroidSubmitter';
 import { SubmissionContext } from '../context';
 export default class AndroidSubmitCommand {
     private ctx;
     constructor(ctx: SubmissionContext<Platform.ANDROID>);
-    runAsync(): Promise<SubmissionFragment>;
+    runAsync(): Promise<AndroidSubmitter>;
     private getAndroidSubmissionOptionsAsync;
     private maybeGetAndroidPackageFromCurrentProjectAsync;
     private resolveTrack;

package/build/submit/android/AndroidSubmitCommand.js

@@ -36,7 +36,7 @@ class AndroidSubmitCommand {
         }
         const submissionOptions = await this.getAndroidSubmissionOptionsAsync(archiveSourceValue);
         const submitter = new AndroidSubmitter_1.default(this.ctx, submissionOptions, archive);
-        return await submitter.submitAsync();
+        return submitter;
     }
     async getAndroidSubmissionOptionsAsync(archiveSource) {
         const track = this.resolveTrack();

package/build/submit/ios/IosSubmitCommand.d.ts

@@ -1,10 +1,10 @@
 import { Platform } from '@expo/eas-build-job';
-import { SubmissionFragment } from '../../graphql/generated';
+import IosSubmitter from './IosSubmitter';
 import { SubmissionContext } from '../context';
 export default class IosSubmitCommand {
     private ctx;
     constructor(ctx: SubmissionContext<Platform.IOS>);
-    runAsync(): Promise<SubmissionFragment>;
+    runAsync(): Promise<IosSubmitter>;
     private resolveSubmissionOptionsAsync;
     private resolveCredentialSubmissionOptionsAsync;
     private resolveAppSpecificPasswordSource;

package/build/submit/ios/IosSubmitCommand.js

@@ -38,7 +38,7 @@ class IosSubmitCommand {
         }
         const options = await this.resolveSubmissionOptionsAsync(archiveSourceValue);
         const submitter = new IosSubmitter_1.default(this.ctx, options, archive);
-        return await submitter.submitAsync();
+        return submitter;
     }
     async resolveSubmissionOptionsAsync(archiveSource) {
         const credentialsSource = await this.resolveCredentialSubmissionOptionsAsync();

package/build/submit/submit.js

@@ -18,7 +18,8 @@ async function submitAsync(ctx) {
         const command = ctx.platform === eas_build_job_1.Platform.ANDROID
             ? new AndroidSubmitCommand_1.default(ctx)
             : new IosSubmitCommand_1.default(ctx);
-        return await command.runAsync();
+        const submitter = await command.runAsync();
+        return await submitter.submitAsync();
     }, {
         attemptEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_COMMAND_ATTEMPT,
         successEvent: AnalyticsManager_1.SubmissionEvent.SUBMIT_COMMAND_SUCCESS,

package/build/submit/utils/builds.js

@@ -4,15 +4,27 @@ exports.getRecentBuildsForSubmissionAsync = void 0;
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
 async function getRecentBuildsForSubmissionAsync(graphqlClient, platform, appId, { limit = 1 } = {}) {
-    return await BuildQuery_1.BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
-        appId,
-        limit,
-        offset: 0,
-        filter: {
-            platform,
-            distribution: generated_1.DistributionType.Store,
-            status: generated_1.BuildStatus.Finished,
-        },
-    });
+    const allowedStatuses = [
+        generated_1.BuildStatus.New,
+        generated_1.BuildStatus.InQueue,
+        generated_1.BuildStatus.InProgress,
+        generated_1.BuildStatus.Finished,
+    ];
+    const buildsPromises = [];
+    for (const buildStatus of allowedStatuses) {
+        buildsPromises.push(BuildQuery_1.BuildQuery.viewBuildsOnAppAsync(graphqlClient, {
+            appId,
+            limit,
+            offset: 0,
+            filter: {
+                platform,
+                distribution: generated_1.DistributionType.Store,
+                status: buildStatus,
+            },
+        }));
+    }
+    const builds = (await Promise.all(buildsPromises)).reduce((acc, value) => acc.concat(value), []);
+    builds.sort((buildA, buildB) => (buildA.createdAt > buildB.createdAt ? -1 : 1));
+    return builds.slice(0, limit);
 }
 exports.getRecentBuildsForSubmissionAsync = getRecentBuildsForSubmissionAsync;

package/build/worker/deployment.js

@@ -61,17 +61,17 @@ async function chooseDevDomainNameAsync({ graphqlClient, appId, initial, }) {
     const { name } = await (0, prompts_1.promptAsync)({
         type: 'text',
         name: 'name',
-        message: 'Choose a URL for your project:',
+        message: 'Choose a preview URL for your project:',
         initial,
         validate: (value) => {
             if (!value) {
-                return 'You have to choose a URL for your project';
+                return 'You have to choose a preview URL for your project';
             }
             if (value.length < 3) {
-                return 'Project URLs must be at least 3 characters long';
+                return 'Preview URLs must be at least 3 characters long';
             }
             if (value.endsWith('-')) {
-                return 'Project URLs cannot end with a hyphen (-)';
+                return 'Preview URLs cannot end with a hyphen (-)';
             }
             return true;
         },
@@ -96,7 +96,7 @@ async function chooseDevDomainNameAsync({ graphqlClient, appId, initial, }) {
         },
     });
     if (!name) {
-        throw new Error('No project URL provided, aborting deployment.');
+        throw new Error('No preview URL provided, aborting deployment.');
     }
     try {
         const success = await mutations_1.DeploymentsMutation.assignDevDomainNameAsync(graphqlClient, {
@@ -104,13 +104,13 @@ async function chooseDevDomainNameAsync({ graphqlClient, appId, initial, }) {
             name,
         });
         if (!success) {
-            throw new Error('Failed to assign project URL');
+            throw new Error('Failed to assign preview URL');
         }
     }
     catch (error) {
         const isChosenNameTaken = error?.graphQLErrors?.some(e => ['DEV_DOMAIN_NAME_TAKEN'].includes(e?.extensions?.errorCode));
         if (isChosenNameTaken) {
-            log_1.default.error(`The project URL "${name}" is already taken, choose a different name.`);
+            log_1.default.error(`The preview URL "${name}" is already taken, choose a different URL.`);
             await chooseDevDomainNameAsync({ graphqlClient, appId, initial });
         }
         if (!isChosenNameTaken) {

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "12.4.1",
+  "version": "12.5.0",
   "commands": {
     "analytics": {
       "id": "analytics",
@@ -2684,6 +2684,49 @@
         "privateProjectConfig": {}
       }
     },
+    "submit:internal": {
+      "id": "submit:internal",
+      "strict": true,
+      "pluginName": "eas-cli",
+      "pluginAlias": "eas-cli",
+      "pluginType": "core",
+      "hidden": true,
+      "aliases": [],
+      "flags": {
+        "platform": {
+          "name": "platform",
+          "type": "option",
+          "required": true,
+          "helpValue": "(android|ios)",
+          "multiple": false,
+          "options": [
+            "android",
+            "ios"
+          ]
+        },
+        "profile": {
+          "name": "profile",
+          "type": "option",
+          "description": "Name of the submit profile from eas.json. Defaults to \"production\" if defined in eas.json.",
+          "multiple": false
+        },
+        "id": {
+          "name": "id",
+          "type": "option",
+          "description": "ID of the build to submit",
+          "required": true,
+          "multiple": false
+        }
+      },
+      "args": {},
+      "contextDefinition": {
+        "loggedIn": {},
+        "privateProjectConfig": {},
+        "projectDir": {},
+        "analytics": {},
+        "vcsClient": {}
+      }
+    },
     "update:configure": {
       "id": "update:configure",
       "description": "configure the project to support EAS Update",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eas-cli",
   "description": "EAS command line tool",
-  "version": "12.4.1",
+  "version": "12.5.0",
   "author": "Expo <support@expo.dev>",
   "bin": {
     "eas": "./bin/run"
@@ -13,8 +13,8 @@
     "@expo/config": "8.5.4",
     "@expo/config-plugins": "7.8.4",
     "@expo/config-types": "50.0.0",
-    "@expo/eas-build-job": "1.0.133",
-    "@expo/eas-json": "12.0.0",
+    "@expo/eas-build-job": "1.0.136",
+    "@expo/eas-json": "12.5.0",
     "@expo/env": "^0.3.0",
     "@expo/json-file": "8.2.37",
     "@expo/logger": "1.0.117",
@@ -29,7 +29,7 @@
     "@expo/results": "1.0.0",
     "@expo/rudder-sdk-node": "1.1.1",
     "@expo/spawn-async": "1.7.0",
-    "@expo/steps": "1.0.134",
+    "@expo/steps": "1.0.136",
     "@expo/timeago.js": "1.0.0",
     "@oclif/core": "^1.26.2",
     "@oclif/plugin-autocomplete": "^2.3.10",
@@ -86,7 +86,8 @@
     "turndown": "7.1.2",
     "untildify": "4.0.0",
     "uuid": "9.0.1",
-    "wrap-ansi": "7.0.0"
+    "wrap-ansi": "7.0.0",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.0",
@@ -227,5 +228,5 @@
     "node": "20.11.0",
     "yarn": "1.22.21"
   },
-  "gitHead": "d2a89c1d77bf33dc28bd7bbd8896531cba29e60a"
+  "gitHead": "981f7c97279e9848f0b3dd6a82140db8f8d735fa"
 }