eas-cli 0.33.1 → 0.36.0

package/build/commands/branch/publish.js

@@ -22,7 +22,7 @@ const prompts_1 = require("../../prompts");
 const utils_1 = require("../../update/utils");
 const uniqBy_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = (0, tslib_1.__importDefault)(require("../../utils/formatFields"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const create_1 = require("./create");
 const list_1 = require("./list");
 const view_1 = require("./view");
@@ -42,7 +42,7 @@ async function getUpdateGroupAsync({ group, }) {
           }
         `, {
         group,
-    })
+    }, { additionalTypenames: ['Update'] })
         .toPromise());
     return updatesByGroup;
 }
@@ -75,7 +75,8 @@ class BranchPublish extends EasCommand_1.default {
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         if (!branchName && autoFlag) {
             branchName =
-                (await vcs_1.default.getBranchNameAsync()) || `branch-${Math.random().toString(36).substr(2, 4)}`;
+                (await (0, vcs_1.getVcsClient)().getBranchNameAsync()) ||
+                    `branch-${Math.random().toString(36).substr(2, 4)}`;
         }
         if (!branchName) {
             const validationMessage = 'branch name may not be empty.';
@@ -172,7 +173,7 @@ class BranchPublish extends EasCommand_1.default {
             }
         }
         if (!message && autoFlag) {
-            message = (_b = (await vcs_1.default.getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim();
+            message = (_b = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _b === void 0 ? void 0 : _b.trim();
         }
         if (!message) {
             const validationMessage = 'publish message may not be empty.';
@@ -185,7 +186,7 @@ class BranchPublish extends EasCommand_1.default {
                 message: `Please enter a publication message.`,
                 initial: republish
                     ? `Republish "${oldMessage}" - group: ${group}`
-                    : (_c = (await vcs_1.default.getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
+                    : (_c = (await (0, vcs_1.getVcsClient)().getLastCommitMessageAsync())) === null || _c === void 0 ? void 0 : _c.trim(),
                 validate: value => (value ? true : validationMessage),
             }));
         }

package/build/commands/branch/view.js

@@ -52,7 +52,7 @@ async function viewUpdateBranchAsync({ appId, name, }) {
         appId,
         name,
         limit: PAGE_LIMIT,
-    })
+    }, { additionalTypenames: ['UpdateBranch', 'Update'] })
         .toPromise());
     return data;
 }

package/build/commands/build/index.js

@@ -7,6 +7,8 @@ const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
+const figures_1 = (0, tslib_1.__importDefault)(require("figures"));
+const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const build_1 = require("../../build/android/build");
 const build_2 = require("../../build/build");
@@ -19,7 +21,7 @@ const repository_1 = require("../../build/utils/repository");
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const generated_1 = require("../../graphql/generated");
 const AppPlatform_1 = require("../../graphql/types/AppPlatform");
-const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
+const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const metroConfig_1 = require("../../project/metroConfig");
@@ -28,9 +30,11 @@ const prompts_1 = require("../../prompts");
 const context_2 = require("../../submit/context");
 const submit_1 = require("../../submit/submit");
 const urls_1 = require("../../submit/utils/urls");
+const easCli_1 = require("../../utils/easCli");
 const json_1 = require("../../utils/json");
 const profiles_1 = require("../../utils/profiles");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 class Build extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -46,7 +50,7 @@ class Build extends EasCommand_1.default {
         const { requestedPlatform } = flags;
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
-        await vcs_1.default.ensureRepoExistsAsync();
+        await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)(projectDir, requestedPlatform);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
@@ -150,7 +154,7 @@ class Build extends EasCommand_1.default {
             wait: flags['wait'],
             clearCache: flags['clear-cache'],
             json: flags['json'],
-            autoSubmit: flags['auto-submit'],
+            autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
             submitProfile: (_a = flags['auto-submit-with-profile']) !== null && _a !== void 0 ? _a : profile,
         };
     }
@@ -272,28 +276,43 @@ Build.flags = {
     }),
 };
 async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
-    if (await (0, eas_json_1.isUsingDeprecatedFormatAsync)(projectDir)) {
-        const hasMismatchedExtendsKeys = await (0, eas_json_1.hasMismatchedExtendsAsync)(projectDir);
-        if (nonInteractive) {
-            log_1.default.error('We detected that your eas.json is using a deprecated format.');
-            log_1.default.error('We will convert it automatically if run this command without --non-interactive flag. Alternatively, you can update eas.json manually according to https://docs.expo.dev/build/eas-json');
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
-        const confirm = await (0, prompts_1.confirmAsync)({
-            message: 'We detected that your eas.json is using a deprecated format, do you want to migrate to the new format?',
+    const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(projectDir);
+    if (!(await fs_extra_1.default.pathExists(easJsonPath))) {
+        return;
+    }
+    const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    const rawEasJson = await easJsonReader.readRawAsync();
+    if (rawEasJson === null || rawEasJson === void 0 ? void 0 : rawEasJson.cli) {
+        return;
+    }
+    if (nonInteractive) {
+        log_1.default.warn(`${figures_1.default.warning} Action required: the default behavior of EAS CLI has changed and your eas.json must be updated to remove ambiguity around which Git integration workflow to use. Refer to ${(0, log_1.link)('https://expo.fyi/eas-vcs-workflow')} for more information.`);
+        log_1.default.warn('This warning will become an error in an upcoming EAS CLI release. For now, we will proceed with the old default behavior to avoid disruption of your builds.');
+        (0, vcs_1.setVcsClient)(new git_1.default());
+        return;
+    }
+    log_1.default.log(`${chalk_1.default.bold('eas-cli@>=0.34.0 no longer requires that you commit changes to Git before starting a build.')} ${(0, log_1.learnMore)('https://expo.fyi/eas-vcs-workflow')}`);
+    log_1.default.log(`If you want to continue using the Git integration, you can opt in with ${chalk_1.default.bold('cli.requireCommit')} in ${chalk_1.default.bold('eas.json')} or with the following prompt.`);
+    log_1.default.newLine();
+    const mode = await (0, prompts_1.selectAsync)('Select your preferred Git integration', [
+        { title: 'Require changes to be committed in Git (old default)', value: 'requireCommit' },
+        { title: 'Allow builds with dirty Git working tree (new default)', value: 'noCommit' },
+    ]);
+    if (mode === 'requireCommit') {
+        (0, vcs_1.setVcsClient)(new git_1.default());
+        await (0, repository_1.ensureRepoIsCleanAsync)(nonInteractive);
+    }
+    rawEasJson.cli =
+        mode === 'requireCommit'
+            ? { version: `>= ${easCli_1.easCliVersion}`, requireCommit: true }
+            : { version: `>= ${easCli_1.easCliVersion}` };
+    await fs_extra_1.default.writeJSON(easJsonPath, rawEasJson, { spaces: 2 });
+    log_1.default.withTick('Updated eas.json');
+    if (mode === 'requireCommit') {
+        await (0, vcs_1.getVcsClient)().trackFileAsync(easJsonPath);
+        await (0, repository_1.reviewAndCommitChangesAsync)('Set cli.requireCommit to true in eas.json', {
+            nonInteractive,
         });
-        if (confirm) {
-            await (0, eas_json_1.migrateAsync)(projectDir);
-            if (hasMismatchedExtendsKeys) {
-                log_1.default.warn('"extends" keyword can only be migrated automatically to the new format if both Android and iOS profiles extend base profiles with the same names for both platforms');
-                log_1.default.warn('Migration was successful, but you need to manually adjust the extend rules for your profiles');
-                (0, errors_1.error)('Fix eas.json manually', { exit: 1 });
-            }
-        }
-        else {
-            log_1.default.error("Aborting, update your eas.json according to https://docs.expo.dev/build/eas-json and run 'eas build' again");
-            (0, errors_1.error)('Unsupported eas.json format', { exit: 1 });
-        }
     }
 }
 exports.handleDeprecatedEasJsonAsync = handleDeprecatedEasJsonAsync;

package/build/commands/channel/edit.js

@@ -30,7 +30,7 @@ async function getChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch'] })
         .toPromise());
     const updateChannelByNameResult = (_a = data.app) === null || _a === void 0 ? void 0 : _a.byId.updateChannelByName;
     if (!updateChannelByNameResult) {

package/build/commands/channel/list.js

@@ -47,7 +47,7 @@ async function getAllUpdateChannelForAppAsync({ appId, }) {
               }
             }
           }
-        `, { appId, offset: 0, limit: CHANNEL_LIMIT })
+        `, { appId, offset: 0, limit: CHANNEL_LIMIT }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 class ChannelList extends EasCommand_1.default {

package/build/commands/channel/view.js

@@ -101,7 +101,7 @@ async function getUpdateChannelByNameForAppAsync({ appId, channelName, }) {
               }
             }
           }
-        `, { appId, channelName })
+        `, { appId, channelName }, { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] })
         .toPromise());
 }
 exports.getUpdateChannelByNameForAppAsync = getUpdateChannelByNameForAppAsync;

package/build/commands/diagnostics.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const envinfo_1 = (0, tslib_1.__importDefault)(require("envinfo"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../commandUtils/EasCommand"));
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
-const packageJSON = require('../../package.json');
+const easCli_1 = require("../utils/easCli");
 class Diagnostics extends EasCommand_1.default {
     constructor() {
         super(...arguments);
@@ -28,7 +28,7 @@ class Diagnostics extends EasCommand_1.default {
             ],
             npmGlobalPackages: ['eas-cli', 'expo-cli'],
         }, {
-            title: `EAS CLI ${packageJSON.version} environment info`,
+            title: `EAS CLI ${easCli_1.easCliVersion} environment info`,
         });
         log_1.default.log(info);
     }

package/build/commands/project/info.js

@@ -19,7 +19,7 @@ async function projectInfoByIdAsync(appId) {
               }
             }
           }
-        `, { appId })
+        `, { appId }, { additionalTypenames: ['App'] })
         .toPromise());
     return data;
 }

package/build/commands/secret/delete.js

@@ -59,7 +59,7 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
 }
 exports.default = EnvironmentSecretDelete;
 EnvironmentSecretDelete.description = `Delete an environment secret by ID.
-Unsure where to find the secret's ID? Run ${chalk_1.default.bold('eas secrets:list')}`;
+Unsure where to find the secret's ID? Run ${chalk_1.default.bold('eas secret:list')}`;
 EnvironmentSecretDelete.flags = {
     id: command_1.flags.string({
         description: 'ID of the secret to delete',

package/build/commands/update/view.js

@@ -33,7 +33,7 @@ async function viewUpdateAsync({ groupId, }) {
           }
         `, {
         groupId,
-    })
+    }, { additionalTypenames: ['Update'] })
         .toPromise());
     if (data.updatesByGroup.length === 0) {
         throw new Error(`Could not find any updates with group ID: "${groupId}"`);

package/build/credentials/android/AndroidCredentialsProvider.js

@@ -5,7 +5,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const eas_json_1 = require("@expo/eas-json");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const credentialsJsonReader = (0, tslib_1.__importStar)(require("../credentialsJson/read"));
-const SetupBuildCredentials_1 = require("./actions/SetupBuildCredentials");
+const SetUpBuildCredentials_1 = require("./actions/SetUpBuildCredentials");
 class AndroidCredentialsProvider {
     constructor(ctx, options) {
         this.ctx = ctx;
@@ -21,7 +21,7 @@ class AndroidCredentialsProvider {
         }
     }
     async getRemoteAsync() {
-        const setupBuildCredentialsAction = new SetupBuildCredentials_1.SetupBuildCredentials({ app: this.options.app });
+        const setupBuildCredentialsAction = new SetUpBuildCredentials_1.SetUpBuildCredentials({ app: this.options.app });
         const buildCredentials = await setupBuildCredentialsAction.runAsync(this.ctx);
         return this.toAndroidCredentials(buildCredentials);
     }

package/build/credentials/android/actions/RemoveFcm.js

@@ -11,23 +11,23 @@ class RemoveFcm {
     }
     async runAsync(ctx) {
         if (ctx.nonInteractive) {
-            throw new Error("Deleting an FCM Api Key is a destructive operation. Start the CLI without the '--non-interactive' flag to delete the credentials.");
+            throw new Error("Deleting an FCM API Key is a destructive operation. Start the CLI without the '--non-interactive' flag to delete the credentials.");
         }
         const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(this.app);
         const fcm = appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.androidFcm;
         if (!fcm) {
-            log_1.default.warn(`There is no valid FCM Api Key defined for ${(0, GraphqlClient_1.formatProjectFullName)(this.app)}, ${this.app.androidApplicationIdentifier}`);
+            log_1.default.warn(`There is no valid FCM API Key defined for ${(0, GraphqlClient_1.formatProjectFullName)(this.app)}, ${this.app.androidApplicationIdentifier}`);
             return;
         }
         const confirm = await (0, prompts_1.confirmAsync)({
-            message: 'Permanently delete the FCM Api Key from Expo servers?',
+            message: 'Permanently delete the FCM API Key from Expo servers?',
             initial: false,
         });
         if (!confirm) {
             return;
         }
         await ctx.android.deleteFcmAsync(fcm);
-        log_1.default.succeed('FCM Api Key removed');
+        log_1.default.succeed('FCM API Key removed');
     }
 }
 exports.RemoveFcm = RemoveFcm;

package/build/credentials/android/actions/{SetupBuildCredentials.d.ts → SetUpBuildCredentials.d.ts}

@@ -9,7 +9,7 @@ interface Options {
  * Sets up Build Credentials for Android
  * @name: sets up build credentials for the specified configuration. If no name is specified, the default configuration is setup
  */
-export declare class SetupBuildCredentials {
+export declare class SetUpBuildCredentials {
     private options;
     constructor(options: Options);
     runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment>;

package/build/credentials/android/actions/{SetupBuildCredentials.js → SetUpBuildCredentials.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupBuildCredentials = void 0;
+exports.SetUpBuildCredentials = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
@@ -12,7 +12,7 @@ const CreateKeystore_1 = require("./CreateKeystore");
  * Sets up Build Credentials for Android
  * @name: sets up build credentials for the specified configuration. If no name is specified, the default configuration is setup
  */
-class SetupBuildCredentials {
+class SetUpBuildCredentials {
     constructor(options) {
         this.options = options;
     }
@@ -74,4 +74,4 @@ class SetupBuildCredentials {
         return null;
     }
 }
-exports.SetupBuildCredentials = SetupBuildCredentials;
+exports.SetUpBuildCredentials = SetUpBuildCredentials;

package/build/credentials/android/actions/{SetupBuildCredentialsFromCredentialsJson.d.ts → SetUpBuildCredentialsFromCredentialsJson.d.ts}

@@ -1,7 +1,7 @@
 import { AndroidAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare class SetupBuildCredentialsFromCredentialsJson {
+export declare class SetUpBuildCredentialsFromCredentialsJson {
     private app;
     constructor(app: AppLookupParams);
     runAsync(ctx: CredentialsContext): Promise<AndroidAppBuildCredentialsFragment | null>;

package/build/credentials/android/actions/{SetupBuildCredentialsFromCredentialsJson.js → SetUpBuildCredentialsFromCredentialsJson.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupBuildCredentialsFromCredentialsJson = void 0;
+exports.SetUpBuildCredentialsFromCredentialsJson = void 0;
 const tslib_1 = require("tslib");
 const generated_1 = require("../../../graphql/generated");
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
@@ -9,7 +9,7 @@ const read_1 = require("../../credentialsJson/read");
 const SelectAndroidBuildCredentials_1 = require("../../manager/SelectAndroidBuildCredentials");
 const keystoreNew_1 = require("../utils/keystoreNew");
 const DownloadKeystore_1 = require("./DownloadKeystore");
-class SetupBuildCredentialsFromCredentialsJson {
+class SetUpBuildCredentialsFromCredentialsJson {
     constructor(app) {
         this.app = app;
     }
@@ -65,4 +65,4 @@ class SetupBuildCredentialsFromCredentialsJson {
         return buildCredentials;
     }
 }
-exports.SetupBuildCredentialsFromCredentialsJson = SetupBuildCredentialsFromCredentialsJson;
+exports.SetUpBuildCredentialsFromCredentialsJson = SetUpBuildCredentialsFromCredentialsJson;

package/build/credentials/android/actions/{SetupGoogleServiceAccountKey.d.ts → SetUpGoogleServiceAccountKey.d.ts}

@@ -1,7 +1,7 @@
 import { CommonAndroidAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
-export declare class SetupGoogleServiceAccountKey {
+export declare class SetUpGoogleServiceAccountKey {
     private app;
     constructor(app: AppLookupParams);
     runAsync(ctx: CredentialsContext): Promise<CommonAndroidAppCredentialsFragment>;

package/build/credentials/android/actions/{SetupGoogleServiceAccountKey.js → SetUpGoogleServiceAccountKey.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetupGoogleServiceAccountKey = void 0;
+exports.SetUpGoogleServiceAccountKey = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
@@ -9,7 +9,7 @@ const errors_1 = require("../../errors");
 const AssignGoogleServiceAccountKey_1 = require("./AssignGoogleServiceAccountKey");
 const CreateGoogleServiceAccountKey_1 = require("./CreateGoogleServiceAccountKey");
 const UseExistingGoogleServiceAccountKey_1 = require("./UseExistingGoogleServiceAccountKey");
-class SetupGoogleServiceAccountKey {
+class SetUpGoogleServiceAccountKey {
     constructor(app) {
         this.app = app;
     }
@@ -56,4 +56,4 @@ class SetupGoogleServiceAccountKey {
         return ((_a = (await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx))) !== null && _a !== void 0 ? _a : (await this.createOrUseExistingKeyAsync(ctx)));
     }
 }
-exports.SetupGoogleServiceAccountKey = SetupGoogleServiceAccountKey;
+exports.SetUpGoogleServiceAccountKey = SetUpGoogleServiceAccountKey;

package/build/credentials/android/api/graphql/queries/GoogleServiceAccountKeyQuery.js

@@ -24,6 +24,8 @@ exports.GoogleServiceAccountKeyQuery = {
             ${(0, graphql_1.print)(GoogleServiceAccountKey_1.GoogleServiceAccountKeyFragmentNode)}
           `, {
             accountName,
+        }, {
+            additionalTypenames: ['GoogleServiceAccountKey'],
         })
             .toPromise());
         return data.account.byName.googleServiceAccountKeys;

package/build/credentials/android/utils/keystore.js

@@ -3,32 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateRandomKeystoreAsync = exports.keytoolCommandExistsAsync = void 0;
 const tslib_1 = require("tslib");
 const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
+const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const crypto_1 = (0, tslib_1.__importDefault)(require("crypto"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
+// (dsokal) We actually want to use node-fetch but the change is in progress.
+// See https://github.com/expo/eas-cli/issues/32 for context.
+// eslint-disable-next-line no-restricted-imports
+const node_fetch_1 = (0, tslib_1.__importDefault)(require("node-fetch"));
 const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const uuid_1 = require("uuid");
-const analytics_1 = (0, tslib_1.__importStar)(require("../../../build/utils/analytics"));
+const events_1 = require("../../../analytics/events");
 const generated_1 = require("../../../graphql/generated");
+const KeystoreGenerationUrlMutation_1 = require("../../../graphql/mutations/KeystoreGenerationUrlMutation");
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
+const ora_1 = require("../../../ora");
 const paths_1 = require("../../../utils/paths");
 async function keytoolCommandExistsAsync() {
     try {
         await (0, spawn_async_1.default)('keytool');
+        return true;
     }
     catch (error) {
         return false;
     }
-    return true;
 }
 exports.keytoolCommandExistsAsync = keytoolCommandExistsAsync;
-async function ensureKeytoolCommandExistsAsync() {
-    if (!(await keytoolCommandExistsAsync())) {
-        log_1.default.error('keytool is required to run this command, make sure you have it installed?');
-        log_1.default.warn('keytool is a part of OpenJDK: https://openjdk.java.net/');
-        log_1.default.warn('Also make sure that keytool is in your PATH after installation.');
-        throw new Error('keytool not found');
-    }
-}
 var KeystoreCreateStep;
 (function (KeystoreCreateStep) {
     KeystoreCreateStep["Attempt"] = "attempt";
@@ -44,17 +43,38 @@ async function generateRandomKeystoreAsync(projectId) {
     return await createKeystoreAsync(keystoreData, projectId);
 }
 exports.generateRandomKeystoreAsync = generateRandomKeystoreAsync;
-async function createKeystoreAsync(credentials, projectId) {
-    analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
+async function createKeystoreAsync(keystoreParams, projectId) {
+    events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
         project_id: projectId,
         step: KeystoreCreateStep.Attempt,
         type: generated_1.AndroidKeystoreType.Jks,
     });
     try {
-        await ensureKeytoolCommandExistsAsync();
+        let keystore;
+        let localAttempt = false;
+        if (await keytoolCommandExistsAsync()) {
+            try {
+                localAttempt = true;
+                keystore = await createKeystoreLocallyAsync(keystoreParams);
+            }
+            catch {
+                log_1.default.error('Failed to generate keystore locally. Falling back to cloud generation.');
+            }
+        }
+        if (!keystore) {
+            keystore = await createKeystoreInCloudAsync(keystoreParams, {
+                showKeytoolDetectionMsg: !localAttempt,
+            });
+        }
+        events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
+            project_id: projectId,
+            step: KeystoreCreateStep.Success,
+            type: generated_1.AndroidKeystoreType.Jks,
+        });
+        return keystore;
     }
     catch (error) {
-        analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
+        events_1.Analytics.logEvent(events_1.BuildEvent.ANDROID_KEYSTORE_CREATE, {
             project_id: projectId,
             step: KeystoreCreateStep.Fail,
             reason: error.message,
@@ -62,6 +82,8 @@ async function createKeystoreAsync(credentials, projectId) {
         });
         throw error;
     }
+}
+async function createKeystoreLocallyAsync(keystoreParams) {
     await fs_extra_1.default.mkdirp((0, paths_1.getTmpDirectory)());
     const keystorePath = path_1.default.join((0, paths_1.getTmpDirectory)(), `${(0, uuid_1.v4)()}-keystore.jks`);
     try {
@@ -71,13 +93,13 @@ async function createKeystoreAsync(credentials, projectId) {
             '-storetype',
             'JKS',
             '-storepass',
-            credentials.keystorePassword,
+            keystoreParams.keystorePassword,
             '-keypass',
-            credentials.keyPassword,
+            keystoreParams.keyPassword,
             '-keystore',
             keystorePath,
             '-alias',
-            credentials.keyAlias,
+            keystoreParams.keyAlias,
             '-keyalg',
             'RSA',
             '-keysize',
@@ -87,27 +109,40 @@ async function createKeystoreAsync(credentials, projectId) {
             '-dname',
             `CN=,OU=,O=,L=,S=,C=US`,
         ]);
-        analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
-            project_id: projectId,
-            step: KeystoreCreateStep.Success,
-            type: generated_1.AndroidKeystoreType.Jks,
-        });
         return {
-            ...credentials,
+            ...keystoreParams,
             keystore: await fs_extra_1.default.readFile(keystorePath, 'base64'),
             type: generated_1.AndroidKeystoreType.Jks,
         };
     }
-    catch (error) {
-        analytics_1.default.logEvent(analytics_1.Event.ANDROID_KEYSTORE_CREATE, {
-            project_id: projectId,
-            step: KeystoreCreateStep.Fail,
-            reason: error.message,
-            type: generated_1.AndroidKeystoreType.Jks,
-        });
-        throw error;
-    }
     finally {
         await fs_extra_1.default.remove(keystorePath);
     }
 }
+async function createKeystoreInCloudAsync(keystoreParams, { showKeytoolDetectionMsg = true } = {}) {
+    if (showKeytoolDetectionMsg) {
+        log_1.default.log(`Detected that you do not have ${chalk_1.default.bold('keytool')} installed locally.`);
+    }
+    const spinner = (0, ora_1.ora)('Generating keystore in the cloud...').start();
+    try {
+        const url = await KeystoreGenerationUrlMutation_1.KeystoreGenerationUrlMutation.createKeystoreGenerationUrlAsync();
+        const response = await (0, node_fetch_1.default)(url, {
+            method: 'POST',
+            body: JSON.stringify(keystoreParams),
+            headers: { 'Content-Type': 'application/json' },
+        });
+        const result = await response.json();
+        spinner.succeed();
+        return {
+            type: generated_1.AndroidKeystoreType.Jks,
+            keystore: result.keystoreBase64,
+            keystorePassword: result.keystorePassword,
+            keyAlias: result.keyAlias,
+            keyPassword: result.keyPassword,
+        };
+    }
+    catch (err) {
+        spinner.fail();
+        throw err;
+    }
+}

package/build/credentials/credentialsJson/update.js

@@ -8,8 +8,8 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const target_1 = require("../../project/ios/target");
 const zipObject_1 = (0, tslib_1.__importDefault)(require("../../utils/expodash/zipObject"));
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
-const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/git"));
+const vcs_1 = require("../../vcs");
+const git_1 = (0, tslib_1.__importDefault)(require("../../vcs/clients/git"));
 const read_1 = require("./read");
 const utils_1 = require("./utils");
 /**
@@ -197,8 +197,9 @@ async function updateFileAsync(projectDir, filePath, base64Data) {
     }
 }
 async function isFileUntrackedAsync(path) {
-    if (vcs_1.default instanceof git_1.default) {
-        return await vcs_1.default.isFileUntrackedAsync(path);
+    const vcsClient = (0, vcs_1.getVcsClient)();
+    if (vcsClient instanceof git_1.default) {
+        return await vcsClient.isFileUntrackedAsync(path);
     }
     return false;
 }

package/build/credentials/errors.d.ts

@@ -4,3 +4,7 @@ export declare class MissingCredentialsNonInteractiveError extends Error {
 export declare class MissingCredentialsError extends Error {
     constructor(message?: string);
 }
+export declare class UnsupportedCredentialsChoiceError extends Error {
+    choice: string;
+    constructor(message: string, choice: string);
+}

package/build/credentials/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MissingCredentialsError = exports.MissingCredentialsNonInteractiveError = void 0;
+exports.UnsupportedCredentialsChoiceError = exports.MissingCredentialsError = exports.MissingCredentialsNonInteractiveError = void 0;
 class MissingCredentialsNonInteractiveError extends Error {
     constructor(message) {
         super(message !== null && message !== void 0 ? message : 'Credentials are not set up. Please run this command again in interactive mode.');
@@ -13,3 +13,10 @@ class MissingCredentialsError extends Error {
     }
 }
 exports.MissingCredentialsError = MissingCredentialsError;
+class UnsupportedCredentialsChoiceError extends Error {
+    constructor(message, choice) {
+        super(message);
+        this.choice = choice;
+    }
+}
+exports.UnsupportedCredentialsChoiceError = UnsupportedCredentialsChoiceError;