eas-cli 3.3.1 → 3.4.0

package/build/commands/config.js

@@ -8,13 +8,18 @@ const eas_json_1 = require("@expo/eas-json");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand"));
+const flags_1 = require("../commandUtils/flags");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const platform_1 = require("../platform");
 const prompts_1 = require("../prompts");
+const json_1 = require("../utils/json");
 class Config extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(Config);
+        if (flags.json) {
+            (0, json_1.enableJsonOutput)();
+        }
         const { platform: maybePlatform, profile: maybeProfile } = flags;
         const { getDynamicProjectConfigAsync, projectDir } = await this.getContextAsync(Config, {
             nonInteractive: false,
@@ -35,21 +40,40 @@ class Config extends EasCommand_1.default {
             },
         ]));
         const profile = await eas_json_1.EasJsonUtils.getBuildProfileAsync(accessor, platform, profileName);
-        const { exp: config } = await getDynamicProjectConfigAsync({
-            env: profile.env,
-            isPublicConfig: true,
-        });
-        log_1.default.addNewLineIfNone();
-        log_1.default.log(chalk_1.default.bold((0, config_1.getProjectConfigDescription)(projectDir)));
-        log_1.default.newLine();
-        log_1.default.log(JSON.stringify(config, null, 2));
-        log_1.default.newLine();
-        log_1.default.newLine();
-        const appPlatform = (0, AppPlatform_1.toAppPlatform)(platform);
-        const platformEmoji = platform_1.appPlatformEmojis[appPlatform];
-        log_1.default.log(`${platformEmoji} ${chalk_1.default.bold(`Build profile "${profileName}"`)}`);
-        log_1.default.newLine();
-        log_1.default.log(JSON.stringify(profile, null, 2));
+        if (flags['eas-json-only']) {
+            if (flags.json) {
+                (0, json_1.printJsonOnlyOutput)({ buildProfile: profile });
+            }
+            else {
+                const appPlatform = (0, AppPlatform_1.toAppPlatform)(platform);
+                const platformEmoji = platform_1.appPlatformEmojis[appPlatform];
+                log_1.default.log(`${platformEmoji} ${chalk_1.default.bold(`Build profile "${profileName}"`)}`);
+                log_1.default.newLine();
+                log_1.default.log(JSON.stringify(profile, null, 2));
+            }
+        }
+        else {
+            const { exp: appConfig } = await getDynamicProjectConfigAsync({
+                env: profile.env,
+                isPublicConfig: true,
+            });
+            if (flags.json) {
+                (0, json_1.printJsonOnlyOutput)({ buildProfile: profile, appConfig });
+            }
+            else {
+                log_1.default.addNewLineIfNone();
+                log_1.default.log(chalk_1.default.bold((0, config_1.getProjectConfigDescription)(projectDir)));
+                log_1.default.newLine();
+                log_1.default.log(JSON.stringify(appConfig, null, 2));
+                log_1.default.newLine();
+                log_1.default.newLine();
+                const appPlatform = (0, AppPlatform_1.toAppPlatform)(platform);
+                const platformEmoji = platform_1.appPlatformEmojis[appPlatform];
+                log_1.default.log(`${platformEmoji} ${chalk_1.default.bold(`Build profile "${profileName}"`)}`);
+                log_1.default.newLine();
+                log_1.default.log(JSON.stringify(profile, null, 2));
+            }
+        }
     }
 }
 exports.default = Config;
@@ -62,6 +86,11 @@ Config.flags = {
         description: 'Name of the build profile from eas.json. Defaults to "production" if defined in eas.json.',
         helpValue: 'PROFILE_NAME',
     }),
+    // This option is used only on EAS Build worker to read build profile from eas.json.
+    'eas-json-only': core_1.Flags.boolean({
+        hidden: true,
+    }),
+    ...flags_1.EasNonInteractiveAndJsonFlags,
 };
 Config.contextDefinition = {
     ..._a.ContextOptions.DynamicProjectConfig,

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/republish.d.ts

@@ -1,6 +1,6 @@
 import { Platform } from '@expo/config';
 import EasCommand from '../../commandUtils/EasCommand';
-declare type UpdateRepublishRawFlags = {
+type UpdateRepublishRawFlags = {
     branch?: string;
     channel?: string;
     group?: string;
@@ -9,7 +9,7 @@ declare type UpdateRepublishRawFlags = {
     'non-interactive': boolean;
     json?: boolean;
 };
-declare type UpdateRepublishFlags = {
+type UpdateRepublishFlags = {
     branchName?: string;
     channelName?: string;
     groupId?: string;

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));
         }

package/build/credentials/android/api/graphql/mutations/AndroidAppBuildCredentialsMutation.d.ts

@@ -1,6 +1,6 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AndroidAppBuildCredentialsFragment, AndroidAppBuildCredentialsInput } from '../../../../../graphql/generated';
-export declare type AndroidAppBuildCredentialsMetadataInput = Omit<AndroidAppBuildCredentialsInput, 'keystoreId'>;
+export type AndroidAppBuildCredentialsMetadataInput = Omit<AndroidAppBuildCredentialsInput, 'keystoreId'>;
 export declare const AndroidAppBuildCredentialsMutation: {
     createAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, androidAppBuildCredentialsInput: AndroidAppBuildCredentialsInput, androidAppCredentialsId: string): Promise<AndroidAppBuildCredentialsFragment>;
     setKeystoreAsync(graphqlClient: ExpoGraphqlClient, androidAppBuildCredentialsId: string, keystoreId: string): Promise<AndroidAppBuildCredentialsFragment>;

package/build/credentials/android/credentials.d.ts

@@ -9,16 +9,16 @@ export interface Keystore {
     keyAlias: string;
     keyPassword?: string;
 }
-export declare type KeystoreWithType = Keystore & {
+export type KeystoreWithType = Keystore & {
     type: AndroidKeystoreType;
 };
-export declare type GoogleServiceAccountKey = {
+export type GoogleServiceAccountKey = {
     [key: string]: any;
     private_key: string;
     type: string;
     client_email: string;
 };
-export declare type AndroidCredentials = {
+export type AndroidCredentials = {
     experienceName: string;
     keystore: Keystore | null;
     pushCredentials: FcmCredentials | null;

package/build/credentials/context.d.ts

@@ -7,7 +7,7 @@ import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
-export declare type CredentialsContextProjectInfo = {
+export type CredentialsContextProjectInfo = {
     exp: ExpoConfig;
     projectId: string;
 };

package/build/credentials/credentialsJson/types.d.ts

@@ -19,7 +19,7 @@ export interface CredentialsJsonIosTargetCredentials {
         password: string;
     };
 }
-export declare type CredentialsJsonIosCredentials = Record<string, CredentialsJsonIosTargetCredentials>;
+export type CredentialsJsonIosCredentials = Record<string, CredentialsJsonIosTargetCredentials>;
 export interface AndroidCredentials {
     keystore: Keystore;
 }
@@ -30,5 +30,5 @@ export interface IosTargetCredentials {
         certificatePassword: string;
     };
 }
-export declare type IosCredentials = Record<string, IosTargetCredentials>;
+export type IosCredentials = Record<string, IosTargetCredentials>;
 export declare const CredentialsJsonSchema: Joi.ObjectSchema<any>;

package/build/credentials/ios/api/graphql/mutations/AppleDistributionCertificateMutation.d.ts

@@ -1,6 +1,6 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppleDistributionCertificateFragment, AppleDistributionCertificateInput, AppleTeamFragment } from '../../../../../graphql/generated';
-export declare type AppleDistributionCertificateMutationResult = AppleDistributionCertificateFragment & {
+export type AppleDistributionCertificateMutationResult = AppleDistributionCertificateFragment & {
     appleTeam?: AppleTeamFragment | null;
 };
 export declare const AppleDistributionCertificateMutation: {

package/build/credentials/ios/api/graphql/mutations/AppleProvisioningProfileMutation.d.ts

@@ -1,6 +1,6 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppleProvisioningProfileFragment, AppleProvisioningProfileInput, AppleTeamFragment } from '../../../../../graphql/generated';
-export declare type AppleProvisioningProfileMutationResult = AppleProvisioningProfileFragment & {
+export type AppleProvisioningProfileMutationResult = AppleProvisioningProfileFragment & {
     appleTeam?: AppleTeamFragment | null;
 };
 export declare const AppleProvisioningProfileMutation: {

package/build/credentials/ios/api/graphql/mutations/AppleTeamMutation.d.ts

@@ -1,6 +1,6 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AccountFragment, AppleTeamFragment, AppleTeamInput } from '../../../../../graphql/generated';
-export declare type AppleTeamMutationResult = AppleTeamFragment & {
+export type AppleTeamMutationResult = AppleTeamFragment & {
     account: AccountFragment;
 };
 export declare const AppleTeamMutation: {

package/build/credentials/ios/api/graphql/queries/AppleDeviceQuery.d.ts

@@ -1,13 +1,13 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppleDevice, AppleDeviceFragment, AppleDevicesByTeamIdentifierQueryVariables, AppleTeamFragment } from '../../../../../graphql/generated';
-export declare type AppleDeviceFragmentWithAppleTeam = AppleDeviceFragment & {
+export type AppleDeviceFragmentWithAppleTeam = AppleDeviceFragment & {
     appleTeam: AppleTeamFragment;
 };
-export declare type AppleDeviceQueryResult = Pick<AppleDevice, 'id' | 'identifier' | 'name' | 'deviceClass' | 'enabled'>;
-export declare type AppleDevicesByTeamIdentifierQueryResult = AppleTeamFragment & {
+export type AppleDeviceQueryResult = Pick<AppleDevice, 'id' | 'identifier' | 'name' | 'deviceClass' | 'enabled'>;
+export type AppleDevicesByTeamIdentifierQueryResult = AppleTeamFragment & {
     appleDevices: AppleDeviceQueryResult[];
 };
-export declare type AppleDevicesByIdentifierQueryResult = AppleDeviceQueryResult & {
+export type AppleDevicesByIdentifierQueryResult = AppleDeviceQueryResult & {
     appleTeam: AppleTeamFragment;
 };
 export declare const AppleDeviceQuery: {

package/build/credentials/ios/api/graphql/queries/AppleProvisioningProfileQuery.d.ts

@@ -1,6 +1,6 @@
 import { ExpoGraphqlClient } from '../../../../../commandUtils/context/contextUtils/createGraphqlClient';
 import { AppleAppIdentifierFragment, AppleDeviceFragment, AppleProvisioningProfileFragment, AppleTeamFragment, IosDistributionType } from '../../../../../graphql/generated';
-export declare type AppleProvisioningProfileQueryResult = AppleProvisioningProfileFragment & {
+export type AppleProvisioningProfileQueryResult = AppleProvisioningProfileFragment & {
     appleTeam?: AppleTeamFragment | null;
 } & {
     appleDevices: AppleDeviceFragment[];

package/build/credentials/ios/appstore/Credentials.types.d.ts

@@ -47,7 +47,7 @@ export interface PushKey {
     teamId: string;
     teamName?: string;
 }
-export declare type AscApiKeyInfo = {
+export type AscApiKeyInfo = {
     keyId: string;
     issuerId?: string;
     teamId: string;
@@ -56,6 +56,6 @@ export declare type AscApiKeyInfo = {
     roles: UserRole[];
     isRevoked: boolean;
 };
-export declare type AscApiKey = AscApiKeyInfo & {
+export type AscApiKey = AscApiKeyInfo & {
     keyP8: string;
 };

package/build/credentials/ios/appstore/authenticate.d.ts

@@ -2,7 +2,7 @@
 import { RequestContext, Session } from '@expo/apple-utils';
 import { MinimalAscApiKey } from '../credentials';
 import { AppleTeamType, AuthCtx, AuthenticationMode, UserAuthCtx } from './authenticateTypes';
-export declare type Options = {
+export type Options = {
     appleId?: string;
     teamId?: string;
     teamName?: string;

package/build/credentials/ios/appstore/authenticateTypes.d.ts

@@ -12,13 +12,13 @@ export declare enum AppleTeamType {
     COMPANY_OR_ORGANIZATION = "COMPANY_OR_ORGANIZATION",
     INDIVIDUAL = "INDIVIDUAL"
 }
-export declare type Team = {
+export type Team = {
     id: string;
     /** Name of the development team, this is undefined when ASC API keys are used instead of cookies for authentication. */
     name?: string;
     inHouse?: boolean;
 };
-export declare type UserAuthCtx = {
+export type UserAuthCtx = {
     appleId: string;
     appleIdPassword?: string;
     team: Team;
@@ -31,7 +31,7 @@ export declare type UserAuthCtx = {
      */
     authState?: Session.AuthState;
 };
-export declare type ApiKeyAuthCtx = {
+export type ApiKeyAuthCtx = {
     ascApiKey: MinimalAscApiKey;
     team: Team;
     /**
@@ -39,4 +39,4 @@ export declare type ApiKeyAuthCtx = {
      */
     authState?: Partial<Session.AuthState>;
 };
-export declare type AuthCtx = UserAuthCtx | ApiKeyAuthCtx;
+export type AuthCtx = UserAuthCtx | ApiKeyAuthCtx;

package/build/credentials/ios/appstore/bundleIdCapabilities.d.ts

@@ -2,7 +2,7 @@
 import { BundleId, CapabilityOptionMap, CapabilityType, MerchantId } from '@expo/apple-utils';
 import { JSONObject, JSONValue } from '@expo/json-file';
 export declare const EXPO_NO_CAPABILITY_SYNC: boolean;
-declare type GetOptionsMethod<T extends CapabilityType = any> = (entitlement: JSONValue, entitlementsJson: JSONObject) => CapabilityOptionMap[T];
+type GetOptionsMethod<T extends CapabilityType = any> = (entitlement: JSONValue, entitlementsJson: JSONObject) => CapabilityOptionMap[T];
 /**
  * Given an entitlements JSON object, synchronizes the remote capabilities for a bundle identifier.
  *
@@ -23,7 +23,7 @@ export declare function syncCapabilitiesForEntitlementsAsync(bundleId: BundleId,
     disabled: string[];
 }>;
 export declare function assertValidOptions(classifier: CapabilityClassifier, value: any): asserts value;
-declare type CapabilityClassifier = {
+type CapabilityClassifier = {
     name: string;
     entitlement: string;
     capability: CapabilityType;

package/build/credentials/ios/credentials.d.ts

@@ -38,7 +38,7 @@ export interface IosDistCredentials extends DistributionCertificate {
     type: 'dist-cert';
 }
 export declare const distributionCertificateSchema: CredentialSchema<DistributionCertificate>;
-export declare type MinimalAscApiKey = {
+export type MinimalAscApiKey = {
     keyP8: string;
     keyId: string;
     issuerId: string;

package/build/credentials/ios/types.d.ts

@@ -20,6 +20,6 @@ export interface TargetCredentials {
     };
     provisioningProfile: string;
 }
-export declare type IosCredentials = Record<string, TargetCredentials>;
-export declare type IosAppBuildCredentialsMap = Record<string, IosAppBuildCredentialsFragment>;
-export declare type IosAppCredentialsMap = Record<string, CommonIosAppCredentialsFragment | null>;
+export type IosCredentials = Record<string, TargetCredentials>;
+export type IosAppBuildCredentialsMap = Record<string, IosAppBuildCredentialsFragment>;
+export type IosAppCredentialsMap = Record<string, CommonIosAppCredentialsFragment | null>;

package/build/credentials/manager/Actions.d.ts

@@ -1,4 +1,4 @@
-export declare type ActionInfo = {
+export type ActionInfo = {
     value: AndroidActionType | IosActionType;
     title: string;
     scope: Scope;

package/build/credentials/utils/promptForCredentials.d.ts

@@ -1,10 +1,10 @@
-export declare type Question = {
+export type Question = {
     field: string;
     question: string;
     type: 'file' | 'string' | 'password';
     base64Encode?: boolean;
 };
-export declare type CredentialSchema<T> = {
+export type CredentialSchema<T> = {
     name: string;
     questions: Question[];
     provideMethodQuestion?: {

package/build/devices/utils/formatDevice.d.ts

@@ -1,7 +1,7 @@
 import { AppleDevice, AppleTeam } from '../../graphql/generated';
-declare type Device = Pick<AppleDevice, 'id' | 'identifier' | 'name' | 'deviceClass' | 'enabled' | 'model'>;
-declare type NewDevice = Pick<AppleDevice, 'identifier' | 'name' | 'deviceClass'>;
-export declare type AppleTeamIdAndName = Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName'>;
+type Device = Pick<AppleDevice, 'id' | 'identifier' | 'name' | 'deviceClass' | 'enabled' | 'model'>;
+type NewDevice = Pick<AppleDevice, 'identifier' | 'name' | 'deviceClass'>;
+export type AppleTeamIdAndName = Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName'>;
 export default function formatDevice(device: Device, team?: AppleTeamIdAndName): string;
 export declare function formatNewDevice(device: NewDevice, team?: AppleTeamIdAndName): string;
 export {};