eas-cli 12.4.0 → 12.5.0

package/build/commands/submit/internal.js

@@ -0,0 +1,168 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const eas_json_1 = require("@expo/eas-json");
+const core_1 = require("@oclif/core");
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const generated_1 = require("../../graphql/generated");
+const AppStoreConnectApiKeyQuery_1 = require("../../graphql/queries/AppStoreConnectApiKeyQuery");
+const GoogleServiceAccountKeyQuery_1 = require("../../graphql/queries/GoogleServiceAccountKeyQuery");
+const AndroidSubmitCommand_1 = tslib_1.__importDefault(require("../../submit/android/AndroidSubmitCommand"));
+const context_1 = require("../../submit/context");
+const IosSubmitCommand_1 = tslib_1.__importDefault(require("../../submit/ios/IosSubmitCommand"));
+const json_1 = require("../../utils/json");
+const gitNoCommit_1 = tslib_1.__importDefault(require("../../vcs/clients/gitNoCommit"));
+/**
+ * This command will be run on the EAS workers.
+ * This command resolves credentials and other
+ * configuration, that normally would be included in the
+ * job and metadata objects, and prints them to stdout.
+ */
+class SubmitInternal extends EasCommand_1.default {
+    async runAsync() {
+        const { flags } = await this.parse(_a);
+        // This command is always run with implicit --non-interactive and --json options
+        (0, json_1.enableJsonOutput)();
+        const { loggedIn: { actor, graphqlClient }, privateProjectConfig: { exp, projectId, projectDir }, analytics, vcsClient, } = await this.getContextAsync(_a, {
+            nonInteractive: true,
+            vcsClientOverride: new gitNoCommit_1.default(),
+        });
+        const submissionProfile = await eas_json_1.EasJsonUtils.getSubmitProfileAsync(eas_json_1.EasJsonAccessor.fromProjectPath(projectDir), flags.platform, flags.profile);
+        const ctx = await (0, context_1.createSubmissionContextAsync)({
+            platform: flags.platform,
+            projectDir,
+            profile: submissionProfile,
+            archiveFlags: {
+                id: flags.id,
+            },
+            nonInteractive: true,
+            isVerboseFastlaneEnabled: false,
+            actor,
+            graphqlClient,
+            analytics,
+            exp,
+            projectId,
+            vcsClient,
+            specifiedProfile: flags.profile,
+        });
+        let config;
+        if (ctx.platform === eas_build_job_1.Platform.IOS) {
+            const command = new IosSubmitCommand_1.default(ctx);
+            const submitter = await command.runAsync();
+            const mutationInput = await submitter.getSubmissionInputAsync();
+            const iosConfig = mutationInput.submissionConfig;
+            const ascApiKeyJson = await getAppStoreConnectApiKeyJsonAsync({
+                iosConfig,
+                graphqlClient,
+            });
+            const configInput = {
+                ascAppIdentifier: iosConfig.ascAppIdentifier,
+                isVerboseFastlaneEnabled: iosConfig.isVerboseFastlaneEnabled ?? undefined,
+                ...(ascApiKeyJson
+                    ? { ascApiJsonKey: ascApiKeyJson }
+                    : {
+                        appleIdUsername: (0, nullthrows_1.default)(iosConfig.appleIdUsername),
+                        appleAppSpecificPassword: (0, nullthrows_1.default)(iosConfig.appleAppSpecificPassword),
+                    }),
+            };
+            config = eas_build_job_1.SubmissionConfig.Ios.SchemaZ.parse(configInput);
+        }
+        else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
+            const command = new AndroidSubmitCommand_1.default(ctx);
+            const submitter = await command.runAsync();
+            const mutationInput = await submitter.getSubmissionInputAsync();
+            const androidConfig = mutationInput.submissionConfig;
+            const changesNotSentForReview = androidConfig.changesNotSentForReview ?? undefined;
+            const releaseStatus = androidConfig.releaseStatus
+                ? graphQlReleaseStatusToConfigReleaseStatus[androidConfig.releaseStatus]
+                : undefined;
+            const googleServiceAccountKeyJson = (0, nullthrows_1.default)(await getGoogleServiceAccountKeyJsonAsync({
+                androidConfig,
+                graphqlClient,
+            }));
+            const track = graphQlTrackToConfigTrack[androidConfig.track];
+            const configInput = {
+                changesNotSentForReview,
+                googleServiceAccountKeyJson,
+                track,
+                ...(releaseStatus === eas_build_job_1.SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS
+                    ? {
+                        releaseStatus: eas_build_job_1.SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS,
+                        rollout: androidConfig.rollout ?? undefined,
+                    }
+                    : { releaseStatus }),
+            };
+            config = eas_build_job_1.SubmissionConfig.Android.SchemaZ.parse(configInput);
+        }
+        else {
+            throw new Error(`Unsupported platform: ${ctx.platform}`);
+        }
+        (0, json_1.printJsonOnlyOutput)({ config });
+    }
+}
+_a = SubmitInternal;
+SubmitInternal.hidden = true;
+SubmitInternal.flags = {
+    platform: core_1.Flags.enum({
+        options: [eas_build_job_1.Platform.ANDROID, eas_build_job_1.Platform.IOS],
+        required: true,
+    }),
+    profile: core_1.Flags.string({
+        description: 'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
+    }),
+    id: core_1.Flags.string({
+        description: 'ID of the build to submit',
+        required: true,
+    }),
+};
+SubmitInternal.contextDefinition = {
+    ..._a.ContextOptions.LoggedIn,
+    ..._a.ContextOptions.ProjectConfig,
+    ..._a.ContextOptions.ProjectDir,
+    ..._a.ContextOptions.Analytics,
+    ..._a.ContextOptions.Vcs,
+};
+exports.default = SubmitInternal;
+async function getGoogleServiceAccountKeyJsonAsync({ androidConfig, graphqlClient, }) {
+    if (androidConfig.googleServiceAccountKeyJson) {
+        return androidConfig.googleServiceAccountKeyJson;
+    }
+    else if (androidConfig.googleServiceAccountKeyId) {
+        const key = await GoogleServiceAccountKeyQuery_1.GoogleServiceAccountKeyQuery.getByIdAsync(graphqlClient, androidConfig.googleServiceAccountKeyId);
+        return key.keyJson;
+    }
+    return null;
+}
+async function getAppStoreConnectApiKeyJsonAsync({ iosConfig, graphqlClient, }) {
+    if (iosConfig.ascApiKey) {
+        return JSON.stringify({
+            key_id: iosConfig.ascApiKey.keyIdentifier,
+            issuer_id: iosConfig.ascApiKey.issuerIdentifier,
+            key: iosConfig.ascApiKey.keyP8,
+        });
+    }
+    else if (iosConfig.ascApiKeyId) {
+        const key = await AppStoreConnectApiKeyQuery_1.AppStoreConnectApiKeyQuery.getByIdAsync(graphqlClient, iosConfig.ascApiKeyId);
+        return JSON.stringify({
+            key_id: key.keyIdentifier,
+            issuer_id: key.issuerIdentifier,
+            key: key.keyP8,
+        });
+    }
+    return null;
+}
+const graphQlReleaseStatusToConfigReleaseStatus = {
+    [generated_1.SubmissionAndroidReleaseStatus.Draft]: eas_build_job_1.SubmissionConfig.Android.ReleaseStatus.DRAFT,
+    [generated_1.SubmissionAndroidReleaseStatus.InProgress]: eas_build_job_1.SubmissionConfig.Android.ReleaseStatus.IN_PROGRESS,
+    [generated_1.SubmissionAndroidReleaseStatus.Completed]: eas_build_job_1.SubmissionConfig.Android.ReleaseStatus.COMPLETED,
+    [generated_1.SubmissionAndroidReleaseStatus.Halted]: eas_build_job_1.SubmissionConfig.Android.ReleaseStatus.HALTED,
+};
+const graphQlTrackToConfigTrack = {
+    [generated_1.SubmissionAndroidTrack.Production]: eas_build_job_1.SubmissionConfig.Android.ReleaseTrack.PRODUCTION,
+    [generated_1.SubmissionAndroidTrack.Beta]: eas_build_job_1.SubmissionConfig.Android.ReleaseTrack.BETA,
+    [generated_1.SubmissionAndroidTrack.Alpha]: eas_build_job_1.SubmissionConfig.Android.ReleaseTrack.ALPHA,
+    [generated_1.SubmissionAndroidTrack.Internal]: eas_build_job_1.SubmissionConfig.Android.ReleaseTrack.INTERNAL,
+};

package/build/commands/worker/alias.js

@@ -14,14 +14,12 @@ const deployment_1 = require("../../worker/deployment");
 const logs_1 = require("../../worker/utils/logs");
 class WorkerAlias extends EasCommand_1.default {
     async runAsync() {
-        // NOTE(cedric): `Log.warn` uses `console.log`, which is incorrect when running with `--json`
-        // eslint-disable-next-line no-console
-        console.warn(chalk_1.default.yellow('EAS Worker Deployments are in beta and subject to breaking changes.'));
         const { flags: rawFlags } = await this.parse(_a);
         const flags = this.sanitizeFlags(rawFlags);
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
+        log_1.default.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
         const { getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, } = await this.getContextAsync(_a, {
             nonInteractive: true,
         });
@@ -110,16 +108,16 @@ WorkerAlias.state = 'beta';
 WorkerAlias.flags = {
     prod: core_1.Flags.boolean({
         aliases: ['production'],
-        description: 'Promote an existing deployment to production',
+        description: 'Promote an existing deployment to production.',
         default: false,
     }),
     alias: core_1.Flags.string({
-        description: 'Custom alias to assign to the existing deployment',
+        description: 'Custom alias to assign to the existing deployment.',
         helpValue: 'name',
         required: false,
     }),
     id: core_1.Flags.string({
-        description: 'Unique identifier of an existing deployment',
+        description: 'Unique identifier of an existing deployment.',
         helpValue: 'xyz123',
         required: false,
     }),

package/build/commands/worker/deploy.d.ts

@@ -7,13 +7,63 @@ export default class WorkerDeploy extends EasCommand {
     static hidden: boolean;
     static state: string;
     static flags: {
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<EnvironmentVariableEnvironment | undefined>;
         json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         prod: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         alias: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         'export-dir': import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        environment: {
+            description: string;
+            name: string;
+            char?: import("@oclif/core/lib/interfaces").AlphabetUppercase | import("@oclif/core/lib/interfaces").AlphabetLowercase | undefined;
+            summary?: string | undefined;
+            helpLabel?: string | undefined;
+            helpGroup?: string | undefined;
+            env?: string | undefined;
+            hidden?: boolean | undefined;
+            required?: boolean | undefined;
+            dependsOn?: string[] | undefined;
+            exclusive?: string[] | undefined;
+            exactlyOne?: string[] | undefined;
+            relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[] | undefined;
+            deprecated?: true | import("@oclif/core/lib/interfaces/parser").Deprecation | undefined;
+            aliases?: string[] | undefined;
+            deprecateAliases?: boolean | undefined;
+            parse: import("@oclif/core/lib/interfaces/parser").FlagParser<EnvironmentVariableEnvironment | undefined, string, any>;
+            type: "option";
+            helpValue?: string | undefined;
+            options?: string[] | undefined;
+            multiple: false;
+            defaultHelp?: import("@oclif/core/lib/interfaces/parser").DefaultHelp<EnvironmentVariableEnvironment | undefined, Record<string, unknown>>;
+            input: string[];
+            default?: import("@oclif/core/lib/interfaces").Default<EnvironmentVariableEnvironment | undefined, Record<string, unknown>>;
+        } | {
+            description: string;
+            name: string;
+            char?: import("@oclif/core/lib/interfaces").AlphabetUppercase | import("@oclif/core/lib/interfaces").AlphabetLowercase | undefined;
+            summary?: string | undefined;
+            helpLabel?: string | undefined;
+            helpGroup?: string | undefined;
+            env?: string | undefined;
+            hidden?: boolean | undefined;
+            required?: boolean | undefined;
+            dependsOn?: string[] | undefined;
+            exclusive?: string[] | undefined;
+            exactlyOne?: string[] | undefined;
+            relationships?: import("@oclif/core/lib/interfaces/parser").Relationship[] | undefined;
+            deprecated?: true | import("@oclif/core/lib/interfaces/parser").Deprecation | undefined;
+            aliases?: string[] | undefined;
+            deprecateAliases?: boolean | undefined;
+            parse: import("@oclif/core/lib/interfaces/parser").FlagParser<EnvironmentVariableEnvironment | undefined, string, any>;
+            type: "option";
+            helpValue?: string | undefined;
+            options?: string[] | undefined;
+            multiple: true;
+            defaultHelp?: import("@oclif/core/lib/interfaces/parser").DefaultHelp<EnvironmentVariableEnvironment | undefined, Record<string, unknown>>;
+            input: string[];
+            default?: import("@oclif/core/lib/interfaces").Default<(EnvironmentVariableEnvironment | undefined)[] | undefined, Record<string, unknown>>;
+        };
     };
     static contextDefinition: {
         loggedIn: import("../../commandUtils/context/LoggedInContextField").default;

package/build/commands/worker/deploy.js

@@ -23,19 +23,15 @@ const isDirectory = (directoryPath) => node_fs_1.default.promises
     .catch(() => false);
 class WorkerDeploy extends EasCommand_1.default {
     async runAsync() {
-        // NOTE(cedric): `Log.warn` uses `console.log`, which is incorrect when running with `--json`
-        // eslint-disable-next-line no-console
-        console.warn(chalk_1.default.yellow('EAS Worker Deployments are in beta and subject to breaking changes.'));
         const { flags: rawFlags } = await this.parse(_a);
         const flags = this.sanitizeFlags(rawFlags);
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
+        log_1.default.warn('EAS Worker Deployments are in beta and subject to breaking changes.');
         const { getDynamicPrivateProjectConfigAsync, loggedIn: { graphqlClient }, projectDir, } = await this.getContextAsync(_a, flags);
-        const [{ projectId }, projectDist] = await Promise.all([
-            getDynamicPrivateProjectConfigAsync(),
-            resolveExportedProjectAsync(flags, projectDir),
-        ]);
+        const projectDist = await resolveExportedProjectAsync(flags, projectDir);
+        const { projectId } = await getDynamicPrivateProjectConfigAsync();
         logExportedProjectInfo(projectDist);
         async function* emitWorkerTarballAsync(params) {
             yield ['assets.json', JSON.stringify(params.assetMap)];
@@ -243,25 +239,27 @@ WorkerDeploy.state = 'beta';
 WorkerDeploy.flags = {
     prod: core_1.Flags.boolean({
         aliases: ['production'],
-        description: 'Create a new production deployment',
+        description: 'Create a new production deployment.',
         default: false,
     }),
     alias: core_1.Flags.string({
-        description: 'Custom alias to assign to the new deployment',
+        description: 'Custom alias to assign to the new deployment.',
         helpValue: 'name',
     }),
     id: core_1.Flags.string({
-        description: 'Custom unique identifier for the new deployment',
+        description: 'Custom unique identifier for the new deployment.',
         helpValue: 'xyz123',
     }),
     'export-dir': core_1.Flags.string({
-        description: 'Directory where the Expo project was exported',
+        description: 'Directory where the Expo project was exported.',
         helpValue: 'dir',
         default: 'dist',
     }),
-    // TODO(@kitten): Allow deployment identifier to be specified
+    environment: {
+        ...flags_1.EASEnvironmentFlag.environment,
+        description: 'Deploy with EAS Environment Variables matching the specified environment.',
+    },
     ...flags_1.EasNonInteractiveAndJsonFlags,
-    ...flags_1.EASEnvironmentFlag,
 };
 WorkerDeploy.contextDefinition = {
     ..._a.ContextOptions.DynamicProjectConfig,
@@ -273,17 +271,30 @@ async function resolveExportedProjectAsync(flags, projectDir) {
     const exportPath = path.join(projectDir, flags.exportDir);
     const serverPath = path.join(exportPath, 'server');
     const clientPath = path.join(exportPath, 'client');
-    const [hasServerPath, hasClientPath, modifiedAt] = await Promise.all([
+    const [hasServerPath, hasClientPath, exportStat] = await Promise.all([
         isDirectory(serverPath),
         isDirectory(clientPath),
-        node_fs_1.default.promises.stat(exportPath).then(stat => stat.mtime),
+        node_fs_1.default.promises.stat(exportPath).catch(() => null),
     ]);
+    if (!exportStat?.isDirectory()) {
+        throw new Error(`No "${flags.exportDir}/" folder found. Prepare your project for deployment with "npx expo export --platform web"`);
+    }
     if (hasServerPath && hasClientPath) {
-        return { type: 'server', path: exportPath, modifiedAt, serverPath, clientPath };
+        return {
+            type: 'server',
+            path: exportPath,
+            modifiedAt: exportStat.mtime,
+            serverPath,
+            clientPath,
+        };
     }
-    return { type: 'static', path: exportPath, modifiedAt };
+    return { type: 'static', path: exportPath, modifiedAt: exportStat.mtime };
 }
 function logExportedProjectInfo(project) {
-    const modifiedAgo = (0, timeago_js_1.format)(project.modifiedAt);
-    log_1.default.log((0, chalk_1.default) `{dim > Project export: ${project.type} - created ${modifiedAgo}}`);
+    let modifiedAgo = '';
+    // Only show the timestamp for exports older than 1 minute
+    if (project.modifiedAt && Date.now() - project.modifiedAt.getTime() > 60000) {
+        modifiedAgo = ` - exported ${(0, timeago_js_1.format)(project.modifiedAt)}`;
+    }
+    log_1.default.log((0, chalk_1.default) `{dim > Project export: ${project.type}${modifiedAgo}}`);
 }