eas-cli 5.5.0 → 5.6.0

package/build/submit/android/AndroidSubmitCommand.js

@@ -1,12 +1,14 @@
 "use strict";
 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 results_1 = require("@expo/results");
 const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const applicationId_1 = require("../../project/android/applicationId");
 const capitalize_1 = tslib_1.__importDefault(require("../../utils/expodash/capitalize"));
+const ArchiveSource_1 = require("../ArchiveSource");
 const commons_1 = require("../commons");
 const AndroidSubmitter_1 = tslib_1.__importDefault(require("./AndroidSubmitter"));
 const ServiceAccountSource_1 = require("./ServiceAccountSource");
@@ -15,18 +17,34 @@ class AndroidSubmitCommand {
         this.ctx = ctx;
     }
     async runAsync() {
+        var _a;
         log_1.default.addNewLineIfNone();
-        const submissionOptions = await this.getAndroidSubmissionOptionsAsync();
-        const submitter = new AndroidSubmitter_1.default(this.ctx, submissionOptions);
+        const archiveSource = this.resolveArchiveSource();
+        if (!archiveSource.ok) {
+            log_1.default.error((_a = archiveSource.reason) === null || _a === void 0 ? void 0 : _a.message);
+            throw new Error('Submission failed');
+        }
+        const archiveSourceValue = archiveSource.enforceValue();
+        const archive = await (0, ArchiveSource_1.getArchiveAsync)({
+            graphqlClient: this.ctx.graphqlClient,
+            platform: eas_build_job_1.Platform.ANDROID,
+            projectId: this.ctx.projectId,
+            nonInteractive: this.ctx.nonInteractive,
+        }, archiveSourceValue);
+        const archiveProfile = archive.sourceType === ArchiveSource_1.ArchiveSourceType.build ? archive.build.buildProfile : undefined;
+        if (archiveProfile && !this.ctx.specifiedProfile) {
+            this.ctx = await (0, commons_1.refreshContextSubmitProfileAsync)(this.ctx, archiveProfile);
+        }
+        const submissionOptions = await this.getAndroidSubmissionOptionsAsync(archiveSourceValue);
+        const submitter = new AndroidSubmitter_1.default(this.ctx, submissionOptions, archive);
         return await submitter.submitAsync();
     }
-    async getAndroidSubmissionOptionsAsync() {
+    async getAndroidSubmissionOptionsAsync(archiveSource) {
         const track = this.resolveTrack();
         const releaseStatus = this.resolveReleaseStatus();
-        const archiveSource = this.resolveArchiveSource();
         const rollout = this.resolveRollout();
         const serviceAccountSource = await this.resolveServiceAccountSourceAsync();
-        const errored = [track, releaseStatus, archiveSource, serviceAccountSource, rollout].filter(r => !r.ok);
+        const errored = [track, releaseStatus, serviceAccountSource, rollout].filter(r => !r.ok);
         if (errored.length > 0) {
             const message = errored.map(err => { var _a; return (_a = err.reason) === null || _a === void 0 ? void 0 : _a.message; }).join('\n');
             log_1.default.error(message);
@@ -37,7 +55,7 @@ class AndroidSubmitCommand {
             track: track.enforceValue(),
             releaseStatus: releaseStatus.enforceValue(),
             rollout: rollout.enforceValue(),
-            archiveSource: archiveSource.enforceValue(),
+            archiveSource,
             serviceAccountSource: serviceAccountSource.enforceValue(),
             changesNotSentForReview: this.ctx.profile.changesNotSentForReview,
         };

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

@@ -14,7 +14,7 @@ interface ResolvedSourceOptions {
     serviceAccountKeyResult: ServiceAccountKeyResult;
 }
 export default class AndroidSubmitter extends BaseSubmitter<Platform.ANDROID, ResolvedSourceOptions, AndroidSubmissionOptions> {
-    constructor(ctx: SubmissionContext<Platform.ANDROID>, options: AndroidSubmissionOptions);
+    constructor(ctx: SubmissionContext<Platform.ANDROID>, options: AndroidSubmissionOptions, archive: ResolvedArchiveSource);
     createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.ANDROID>>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }: SubmissionInput<Platform.ANDROID>): Promise<SubmissionFragment>;
     private formatSubmissionConfig;

package/build/submit/android/AndroidSubmitter.js

@@ -1,25 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
-const ArchiveSource_1 = require("../ArchiveSource");
 const BaseSubmitter_1 = tslib_1.__importDefault(require("../BaseSubmitter"));
 const summary_1 = require("../utils/summary");
 const ServiceAccountSource_1 = require("./ServiceAccountSource");
 class AndroidSubmitter extends BaseSubmitter_1.default {
-    constructor(ctx, options) {
+    constructor(ctx, options, archive) {
         const sourceOptionsResolver = {
             // eslint-disable-next-line async-protect/async-suffix
-            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)({
-                graphqlClient: ctx.graphqlClient,
-                platform: eas_build_job_1.Platform.ANDROID,
-                projectId: ctx.projectId,
-                nonInteractive: ctx.nonInteractive,
-            }, this.options.archiveSource),
+            archive: async () => archive,
             // eslint-disable-next-line async-protect/async-suffix
             serviceAccountKeyResult: async () => {
                 return await (0, ServiceAccountSource_1.getServiceAccountKeyResultAsync)(this.ctx, this.options.serviceAccountSource);

package/build/submit/commons.d.ts

@@ -2,3 +2,4 @@ import { Platform } from '@expo/eas-build-job';
 import { ArchiveSource } from './ArchiveSource';
 import { SubmissionContext } from './context';
 export declare function resolveArchiveSource<T extends Platform>(ctx: SubmissionContext<T>): ArchiveSource;
+export declare function refreshContextSubmitProfileAsync<T extends Platform>(ctx: SubmissionContext<T>, archiveProfile: string): Promise<SubmissionContext<T>>;

package/build/submit/commons.js

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveArchiveSource = void 0;
+exports.refreshContextSubmitProfileAsync = exports.resolveArchiveSource = void 0;
+const tslib_1 = require("tslib");
+const eas_json_1 = require("@expo/eas-json");
+const errors_1 = require("@expo/eas-json/build/errors");
+const log_1 = tslib_1.__importDefault(require("../log"));
 const ArchiveSource_1 = require("./ArchiveSource");
 function resolveArchiveSource(ctx) {
     const { url, path, id, latest } = ctx.archiveFlags;
@@ -44,3 +48,18 @@ function resolveArchiveSource(ctx) {
     }
 }
 exports.resolveArchiveSource = resolveArchiveSource;
+async function refreshContextSubmitProfileAsync(ctx, archiveProfile) {
+    try {
+        ctx.profile = (await eas_json_1.EasJsonUtils.getSubmitProfileAsync(eas_json_1.EasJsonAccessor.fromProjectPath(ctx.projectDir), ctx.platform, archiveProfile ? archiveProfile : 'production'));
+    }
+    catch (err) {
+        if (err instanceof errors_1.MissingProfileError) {
+            log_1.default.log(`Selected build uses "${archiveProfile}" build profile but a submit profile with the same name is missing in eas.json. Using default ("production") profile`);
+        }
+        else {
+            throw err;
+        }
+    }
+    return ctx;
+}
+exports.refreshContextSubmitProfileAsync = refreshContextSubmitProfileAsync;

package/build/submit/context.d.ts

@@ -23,6 +23,7 @@ export interface SubmissionContext<T extends Platform> {
     analytics: Analytics;
     vcsClient: Client;
     applicationIdentifierOverride?: string;
+    specifiedProfile?: string;
 }
 export interface SubmitArchiveFlags {
     latest?: boolean;
@@ -45,4 +46,5 @@ export declare function createSubmissionContextAsync<T extends Platform>(params:
     exp: ExpoConfig;
     projectId: string;
     vcsClient: Client;
+    specifiedProfile?: string;
 }): Promise<SubmissionContext<T>>;

package/build/submit/ios/IosSubmitCommand.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const getenv_1 = tslib_1.__importDefault(require("getenv"));
 const wrap_ansi_1 = tslib_1.__importDefault(require("wrap-ansi"));
 const errors_1 = require("../../credentials/errors");
 const log_1 = tslib_1.__importStar(require("../../log"));
+const ArchiveSource_1 = require("../ArchiveSource");
 const commons_1 = require("../commons");
 const AppProduce_1 = require("./AppProduce");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
@@ -17,13 +19,29 @@ class IosSubmitCommand {
         this.ctx = ctx;
     }
     async runAsync() {
+        var _a;
         log_1.default.addNewLineIfNone();
-        const options = await this.resolveSubmissionOptionsAsync();
-        const submitter = new IosSubmitter_1.default(this.ctx, options);
+        const archiveSource = this.resolveArchiveSource();
+        if (!archiveSource.ok) {
+            log_1.default.error((_a = archiveSource.reason) === null || _a === void 0 ? void 0 : _a.message);
+            throw new Error('Submission failed');
+        }
+        const archiveSourceValue = archiveSource.enforceValue();
+        const archive = await (0, ArchiveSource_1.getArchiveAsync)({
+            graphqlClient: this.ctx.graphqlClient,
+            platform: eas_build_job_1.Platform.IOS,
+            projectId: this.ctx.projectId,
+            nonInteractive: this.ctx.nonInteractive,
+        }, archiveSourceValue);
+        const archiveProfile = archive.sourceType === ArchiveSource_1.ArchiveSourceType.build ? archive.build.buildProfile : undefined;
+        if (archiveProfile && !this.ctx.specifiedProfile) {
+            this.ctx = await (0, commons_1.refreshContextSubmitProfileAsync)(this.ctx, archiveProfile);
+        }
+        const options = await this.resolveSubmissionOptionsAsync(archiveSourceValue);
+        const submitter = new IosSubmitter_1.default(this.ctx, options, archive);
         return await submitter.submitAsync();
     }
-    async resolveSubmissionOptionsAsync() {
-        const archiveSource = this.resolveArchiveSource();
+    async resolveSubmissionOptionsAsync(archiveSource) {
         const credentialsSource = await this.resolveCredentialSubmissionOptionsAsync();
         const maybeAppSpecificPasswordSource = 'appSpecificPasswordSource' in credentialsSource
             ? credentialsSource.appSpecificPasswordSource
@@ -31,7 +49,6 @@ class IosSubmitCommand {
         const maybeAscApiKeySource = 'ascApiKeySource' in credentialsSource ? credentialsSource.ascApiKeySource : null;
         const ascAppIdentifier = await this.resolveAscAppIdentifierAsync();
         const errored = [
-            archiveSource,
             ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
             ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
             ascAppIdentifier,
@@ -44,7 +61,7 @@ class IosSubmitCommand {
         return {
             projectId: this.ctx.projectId,
             ascAppIdentifier: ascAppIdentifier.enforceValue(),
-            archiveSource: archiveSource.enforceValue(),
+            archiveSource,
             ...(maybeAppSpecificPasswordSource
                 ? {
                     appSpecificPasswordSource: maybeAppSpecificPasswordSource.enforceValue(),

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

@@ -19,7 +19,7 @@ interface ResolvedSourceOptions {
     };
 }
 export default class IosSubmitter extends BaseSubmitter<Platform.IOS, ResolvedSourceOptions, IosSubmissionOptions> {
-    constructor(ctx: SubmissionContext<Platform.IOS>, options: IosSubmissionOptions);
+    constructor(ctx: SubmissionContext<Platform.IOS>, options: IosSubmissionOptions, archive: ResolvedArchiveSource);
     createSubmissionInputAsync(resolvedSourceOptions: ResolvedSourceOptions): Promise<SubmissionInput<Platform.IOS>>;
     protected createPlatformSubmissionAsync({ projectId, submissionConfig, buildId, archiveSource, }: SubmissionInput<Platform.IOS>): Promise<SubmissionFragment>;
     private formatSubmissionConfig;

package/build/submit/ios/IosSubmitter.js

@@ -1,26 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const AnalyticsManager_1 = require("../../analytics/AnalyticsManager");
 const SubmissionMutation_1 = require("../../graphql/mutations/SubmissionMutation");
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
-const ArchiveSource_1 = require("../ArchiveSource");
 const BaseSubmitter_1 = tslib_1.__importDefault(require("../BaseSubmitter"));
 const summary_1 = require("../utils/summary");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
 const AscApiKeySource_1 = require("./AscApiKeySource");
 class IosSubmitter extends BaseSubmitter_1.default {
-    constructor(ctx, options) {
+    constructor(ctx, options, archive) {
         const sourceOptionsResolver = {
             // eslint-disable-next-line async-protect/async-suffix
-            archive: async () => await (0, ArchiveSource_1.getArchiveAsync)({
-                graphqlClient: ctx.graphqlClient,
-                platform: eas_build_job_1.Platform.IOS,
-                projectId: ctx.projectId,
-                nonInteractive: ctx.nonInteractive,
-            }, this.options.archiveSource),
+            archive: async () => archive,
             // eslint-disable-next-line async-protect/async-suffix
             credentials: async () => {
                 const maybeAppSpecificPassword = this.options.appSpecificPasswordSource