eas-cli 9.0.3 → 9.0.5

package/build/commands/project/init.js

@@ -106,9 +106,8 @@ class ProjectInit extends EasCommand_1.default {
         }
     }
     static async setExplicitIDAsync(projectId, projectDir, { force, nonInteractive }) {
-        var _c, _d;
         const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
-        const existingProjectId = (_d = (_c = exp.extra) === null || _c === void 0 ? void 0 : _c.eas) === null || _d === void 0 ? void 0 : _d.projectId;
+        const existingProjectId = exp.extra?.eas?.projectId;
         if (projectId === existingProjectId) {
             log_1.default.succeed(`Project already linked (ID: ${chalk_1.default.bold(existingProjectId)})`);
             return;
@@ -141,16 +140,15 @@ class ProjectInit extends EasCommand_1.default {
         });
     }
     static async initializeWithInteractiveSelectionAsync(graphqlClient, actor, projectDir) {
-        var _c, _d, _e;
         const exp = (0, expoConfig_1.getPrivateExpoConfig)(projectDir);
-        const existingProjectId = (_d = (_c = exp.extra) === null || _c === void 0 ? void 0 : _c.eas) === null || _d === void 0 ? void 0 : _d.projectId;
+        const existingProjectId = exp.extra?.eas?.projectId;
         if (existingProjectId) {
             log_1.default.succeed(`Project already linked (ID: ${chalk_1.default.bold(existingProjectId)}). To re-configure, remove the "extra.eas.projectId" field from your app config.`);
             return existingProjectId;
         }
         const allAccounts = actor.accounts;
         const accountNamesWhereUserHasSufficientPermissionsToCreateApp = new Set(allAccounts
-            .filter(a => { var _c; return ((_c = a.users.find(it => it.actor.id === actor.id)) === null || _c === void 0 ? void 0 : _c.role) !== generated_1.Role.ViewOnly; })
+            .filter(a => a.users.find(it => it.actor.id === actor.id)?.role !== generated_1.Role.ViewOnly)
             .map(it => it.name));
         // if no owner field, ask the user which account they want to use to create/link the project
         let accountName = exp.owner;
@@ -202,7 +200,7 @@ class ProjectInit extends EasCommand_1.default {
             createdProjectId = await AppMutation_1.AppMutation.createAppAsync(graphqlClient, {
                 accountId: account.id,
                 projectName,
-                privacy: (_e = (0, projectUtils_1.toAppPrivacy)(exp.privacy)) !== null && _e !== void 0 ? _e : generated_1.AppPrivacy.Public,
+                privacy: (0, projectUtils_1.toAppPrivacy)(exp.privacy) ?? generated_1.AppPrivacy.Public,
             });
             spinner.succeed(`Created ${chalk_1.default.bold(projectLink)}`);
         }
@@ -219,7 +217,7 @@ class ProjectInit extends EasCommand_1.default {
             ? allAccounts
             : [...allAccounts].sort((a, _b) => actor.__typename === 'User' ? (a.name === actor.username ? -1 : 1) : 0);
         if (actor.__typename !== 'Robot') {
-            const personalAccount = allAccounts === null || allAccounts === void 0 ? void 0 : allAccounts.find(account => { var _c; return ((_c = account === null || account === void 0 ? void 0 : account.ownerUserActor) === null || _c === void 0 ? void 0 : _c.id) === actor.id; });
+            const personalAccount = allAccounts?.find(account => account?.ownerUserActor?.id === actor.id);
             const personalAccountChoice = personalAccount
                 ? {
                     title: personalAccount.name,
@@ -229,14 +227,18 @@ class ProjectInit extends EasCommand_1.default {
                         : '(Personal)',
                 }
                 : undefined;
-            const userAccounts = allAccounts === null || allAccounts === void 0 ? void 0 : allAccounts.filter(account => account.ownerUserActor && account.name !== actor.username).map(account => ({
+            const userAccounts = allAccounts
+                ?.filter(account => account.ownerUserActor && account.name !== actor.username)
+                .map(account => ({
                 title: account.name,
                 value: account,
                 description: !namesWithSufficientPermissions.has(account.name)
                     ? '(Team) (Viewer Role)'
                     : '(Team)',
             }));
-            const organizationAccounts = allAccounts === null || allAccounts === void 0 ? void 0 : allAccounts.filter(account => account.name !== actor.username && !account.ownerUserActor).map(account => ({
+            const organizationAccounts = allAccounts
+                ?.filter(account => account.name !== actor.username && !account.ownerUserActor)
+                .map(account => ({
                 title: account.name,
                 value: account,
                 description: !namesWithSufficientPermissions.has(account.name)

package/build/commands/project/onboarding.js

@@ -3,8 +3,11 @@ var _a;
 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 fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const api_1 = require("../../api");
+const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
 const repository_1 = require("../../build/utils/repository");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const getProjectIdAsync_1 = require("../../commandUtils/context/contextUtils/getProjectIdAsync");
@@ -15,8 +18,11 @@ const AppQuery_1 = require("../../graphql/queries/AppQuery");
 const log_1 = tslib_1.__importStar(require("../../log"));
 const git_1 = require("../../onboarding/git");
 const installDependencies_1 = require("../../onboarding/installDependencies");
+const runCommand_1 = require("../../onboarding/runCommand");
+const platform_1 = require("../../platform");
 const expoConfig_1 = require("../../project/expoConfig");
 const prompts_1 = require("../../prompts");
+const easCli_1 = require("../../utils/easCli");
 const git_2 = tslib_1.__importDefault(require("../../vcs/clients/git"));
 class Onboarding extends EasCommand_1.default {
     async runAsync() {
@@ -52,7 +58,7 @@ class Onboarding extends EasCommand_1.default {
             : 'expo';
         const githubRepositoryName = app.githubRepository
             ? app.githubRepository.metadata.githubRepoName
-            : 'expo-default-template';
+            : 'expo-template-default';
         log_1.default.log(`👋 Welcome to Expo, ${actor.username}!`);
         log_1.default.log();
         log_1.default.log('✨ We will continue your onboarding process in EAS CLI');
@@ -70,8 +76,12 @@ class Onboarding extends EasCommand_1.default {
             const { selectedTargetProjectDirectory } = await (0, prompts_1.promptAsync)({
                 type: 'text',
                 name: 'selectedTargetProjectDirectory',
-                message: '📂 Where would you like to clone the project to?',
-                initial: path_1.default.join(process.cwd(), githubRepositoryName),
+                message: app.githubRepository
+                    ? '📂 Where would you like to clone the project to?'
+                    : '📂 Where would you like to create your new project directory?',
+                initial: app.githubRepository
+                    ? path_1.default.join(process.cwd(), githubRepositoryName)
+                    : path_1.default.join(process.cwd(), `${actor.username}-first-project`),
             });
             initialTargetProjectDirectory = selectedTargetProjectDirectory;
         }
@@ -82,25 +92,65 @@ class Onboarding extends EasCommand_1.default {
             targetProjectDir: initialTargetProjectDirectory,
         });
         const vcsClient = new git_2.default(finalTargetProjectDirectory);
+        if (!app.githubRepository) {
+            await fs_extra_1.default.remove(path_1.default.join(finalTargetProjectDirectory, '.git'));
+            await (0, runCommand_1.runCommandAsync)({
+                cwd: finalTargetProjectDirectory,
+                command: 'git',
+                args: ['init'],
+            });
+            log_1.default.log();
+            await configureProjectFromBareDefaultExpoTemplateAsync({
+                app,
+                vcsClient,
+                targetDir: finalTargetProjectDirectory,
+            });
+        }
         await (0, installDependencies_1.installDependenciesAsync)({
             projectDir: finalTargetProjectDirectory,
         });
+        const exp = await getPrivateExpoConfigWithProjectIdAsync({
+            projectDir: finalTargetProjectDirectory,
+            graphqlClient,
+            actor,
+        });
+        const getDynamicProjectConfigFn = getDynamicPrivateProjectConfigGetter({
+            projectDir: finalTargetProjectDirectory,
+            graphqlClient,
+            actor,
+        });
+        if (!app.githubRepository) {
+            await (0, runCommand_1.runCommandAsync)({
+                cwd: finalTargetProjectDirectory,
+                command: 'npx',
+                args: ['expo', 'install', 'expo-updates'],
+            });
+            log_1.default.log();
+            await (0, runCommand_1.runCommandAsync)({
+                cwd: finalTargetProjectDirectory,
+                command: 'npx',
+                args: ['expo', 'install', 'expo-insights'],
+            });
+            log_1.default.log();
+            await (0, runCommand_1.runCommandAsync)({
+                cwd: finalTargetProjectDirectory,
+                command: 'npx',
+                args: ['expo', 'install', 'expo-dev-client'],
+            });
+            log_1.default.log();
+        }
         await vcsClient.trackFileAsync('package-lock.json');
-        const shouldSetupCredentials = actor.preferences.onboarding.deviceType === generated_1.OnboardingDeviceType.Device &&
+        const shouldSetupCredentials = ((platform === eas_build_job_1.Platform.IOS &&
+            actor.preferences.onboarding.deviceType === generated_1.OnboardingDeviceType.Device) ||
+            platform === eas_build_job_1.Platform.ANDROID) &&
             actor.preferences.onboarding.environment === generated_1.OnboardingEnvironment.DevBuild;
         if (shouldSetupCredentials) {
             log_1.default.log('🔑 Now we need to set up build credentials for your project:');
-            await new SetUpBuildCredentialsCommandAction_1.SetUpBuildCredentialsCommandAction(actor, graphqlClient, vcsClient, analytics, await getPrivateExpoConfigWithProjectIdAsync({
-                projectDir: finalTargetProjectDirectory,
-                graphqlClient,
-                actor,
-            }), getDynamicPrivateProjectConfigGetter({
-                projectDir: finalTargetProjectDirectory,
-                graphqlClient,
-                actor,
-            }), platform, 'development', finalTargetProjectDirectory).runAsync();
+            await new SetUpBuildCredentialsCommandAction_1.SetUpBuildCredentialsCommandAction(actor, graphqlClient, vcsClient, analytics, exp, getDynamicProjectConfigFn, platform, actor.preferences.onboarding.deviceType === generated_1.OnboardingDeviceType.Simulator
+                ? 'development-simulator'
+                : 'development', finalTargetProjectDirectory).runAsync();
         }
-        if (await vcsClient.hasUncommittedChangesAsync()) {
+        if (app.githubRepository && (await vcsClient.hasUncommittedChangesAsync())) {
             log_1.default.log('📦 We will now commit the changes made by the configuration process and push them to GitHub:');
             log_1.default.log();
             log_1.default.log('🔍 Checking for changes in the repository...');
@@ -111,17 +161,56 @@ class Onboarding extends EasCommand_1.default {
                 targetProjectDir: finalTargetProjectDirectory,
             });
         }
+        else if (!app.githubRepository) {
+            await (0, runCommand_1.runCommandAsync)({
+                cwd: finalTargetProjectDirectory,
+                command: 'git',
+                args: ['add', '.'],
+            });
+            log_1.default.log();
+            await (0, runCommand_1.runCommandAsync)({
+                cwd: finalTargetProjectDirectory,
+                command: 'git',
+                args: ['commit', '-m', 'Initial commit'],
+            });
+            log_1.default.log();
+        }
+        log_1.default.log();
+        log_1.default.log('🎉 We finished configuring your project.');
+        log_1.default.log();
+        if (app.githubRepository ||
+            actor.preferences.onboarding.environment === generated_1.OnboardingEnvironment.ExpoGo) {
+            log_1.default.log('🚀 You can now go back to the website to continue:');
+            const url = new URL(`/onboarding/develop/set-up-project-on-your-machine?project=${app.slug}&accountId=${app.ownerAccount.id}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
+            log_1.default.log(`👉 ${(0, log_1.link)(url)}`);
+        }
+        else {
+            log_1.default.log('🚀 Now we are going to trigger your first build');
+            log_1.default.log();
+            const { buildIds } = await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(graphqlClient, analytics, vcsClient, finalTargetProjectDirectory, {
+                nonInteractive: true,
+                requestedPlatform: platform === eas_build_job_1.Platform.ANDROID ? platform_1.RequestedPlatform.Android : platform_1.RequestedPlatform.Ios,
+                profile: actor.preferences.onboarding.deviceType === generated_1.OnboardingDeviceType.Simulator
+                    ? 'development-simulator'
+                    : 'development',
+                wait: false,
+                clearCache: false,
+                json: false,
+                autoSubmit: false,
+                localBuildOptions: {},
+                freezeCredentials: false,
+            }, actor, getDynamicProjectConfigFn);
+            const buildId = buildIds[0];
+            log_1.default.log();
+            log_1.default.log('🚀 You can now go back to the website to continue:');
+            const url = new URL(`/onboarding/develop/set-up-project-on-your-machine?project=${app.slug}&accountId=${app.ownerAccount.id}&buildId=${buildId}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
+            log_1.default.log(`👉 ${(0, log_1.link)(url)}`);
+        }
         const { __typename, ...previousPreferences } = actor.preferences.onboarding;
         await UserPreferencesMutation_1.UserPreferencesMutation.markCliDoneInOnboardingUserPreferencesAsync(graphqlClient, {
             ...previousPreferences,
             appId: app.id,
         });
-        log_1.default.log();
-        log_1.default.log('🎉 We finished configuring your project.');
-        log_1.default.log();
-        log_1.default.log('🚀 You can now go back to the website to continue:');
-        const url = new URL(`/onboarding/develop/set-up-project-on-your-machine?project=${app.slug}&accountId=${app.ownerAccount.id}`, (0, api_1.getExpoWebsiteBaseUrl)()).toString();
-        log_1.default.log(`👉 ${(0, log_1.link)(url)}`);
     }
 }
 _a = Onboarding;
@@ -166,3 +255,86 @@ function getDynamicPrivateProjectConfigGetter({ projectDir, graphqlClient, actor
         };
     };
 }
+async function configureProjectFromBareDefaultExpoTemplateAsync({ app, vcsClient, targetDir, }) {
+    // Android package name requires each component to start with a lowercase letter.
+    const isUsernameValidSegment = /^[^a-z]/.test(app.ownerAccount.name);
+    const userPrefix = isUsernameValidSegment ? 'user' : '';
+    const isSlugValidSegment = /^[^a-z]/.test(app.slug);
+    const slugPrefix = isSlugValidSegment ? 'app' : '';
+    const bundleIdentifier = `com.${userPrefix}${stripInvalidCharactersForBundleIdentifier(app.ownerAccount.name)}.${slugPrefix}${stripInvalidCharactersForBundleIdentifier(app.slug)}`;
+    const updateUrl = (0, api_1.getEASUpdateURL)(app.id);
+    const easBuildGitHubConfig = {
+        android: {
+            image: 'latest',
+        },
+        ios: {
+            image: 'latest',
+        },
+    };
+    const easJson = {
+        cli: {
+            version: `>= ${easCli_1.easCliVersion}`,
+        },
+        build: {
+            development: {
+                developmentClient: true,
+                distribution: 'internal',
+                channel: 'development',
+                ...easBuildGitHubConfig,
+            },
+            'development-simulator': {
+                extends: 'development',
+                ios: {
+                    simulator: true,
+                },
+            },
+            preview: {
+                distribution: 'internal',
+                channel: 'preview',
+                ...easBuildGitHubConfig,
+            },
+            production: {
+                channel: 'production',
+                ...easBuildGitHubConfig,
+            },
+        },
+        submit: {
+            production: {},
+        },
+    };
+    const easJsonPath = path_1.default.join(targetDir, 'eas.json');
+    await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+    await vcsClient.trackFileAsync(easJsonPath);
+    log_1.default.log(`✅ Generated ${chalk_1.default.bold('eas.json')}. ${(0, log_1.learnMore)('https://docs.expo.dev/build-reference/eas-json/')}`);
+    log_1.default.log();
+    const expoConfig = {
+        name: app.name ?? app.slug,
+        slug: app.slug,
+        extra: {
+            eas: {
+                projectId: app.id,
+            },
+        },
+        owner: app.ownerAccount.name,
+        updates: {
+            url: updateUrl,
+        },
+        runtimeVersion: {
+            policy: 'appVersion',
+        },
+        ios: {
+            bundleIdentifier,
+        },
+        android: {
+            package: bundleIdentifier,
+        },
+    };
+    const appJsonPath = path_1.default.join(targetDir, 'app.json');
+    await fs_extra_1.default.writeFile(appJsonPath, `${JSON.stringify({ expo: expoConfig }, null, 2)}\n`);
+    await vcsClient.trackFileAsync(appJsonPath);
+    log_1.default.log(`✅ Generated ${chalk_1.default.bold('app.json')}. ${(0, log_1.learnMore)('https://docs.expo.dev/versions/latest/config/app/')}`);
+    log_1.default.log();
+}
+function stripInvalidCharactersForBundleIdentifier(string) {
+    return string.replaceAll(/[^A-Za-z0-9]/g, '');
+}

package/build/commands/secret/delete.js

@@ -31,27 +31,27 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
                     value: secret,
                 })),
             }));
-            id = secret === null || secret === void 0 ? void 0 : secret.id;
+            id = secret?.id;
             if (!id) {
                 throw new Error(validationMessage);
             }
         }
         if (!nonInteractive) {
             log_1.default.addNewLineIfNone();
-            log_1.default.warn(`You are about to permanently delete secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id: "${id}".\nThis action is irreversible.`);
+            log_1.default.warn(`You are about to permanently delete secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".\nThis action is irreversible.`);
             log_1.default.newLine();
             const confirmed = await (0, prompts_1.toggleConfirmAsync)({
-                message: `Are you sure you wish to proceed?${(secret === null || secret === void 0 ? void 0 : secret.scope) === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT
+                message: `Are you sure you wish to proceed?${secret?.scope === EnvironmentSecretsQuery_1.EnvironmentSecretScope.ACCOUNT
                     ? ' This secret is applied across your whole account and may affect multiple apps.'
                     : ''}`,
             });
             if (!confirmed) {
-                log_1.default.error(`Canceled deletion of secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id: "${id}".`);
+                log_1.default.error(`Canceled deletion of secret${secret?.name ? ` "${secret?.name}"` : ''} with id: "${id}".`);
                 process.exit(1);
             }
         }
         await EnvironmentSecretMutation_1.EnvironmentSecretMutation.deleteAsync(graphqlClient, id);
-        log_1.default.withTick(`️Deleted secret${(secret === null || secret === void 0 ? void 0 : secret.name) ? ` "${secret === null || secret === void 0 ? void 0 : secret.name}"` : ''} with id "${id}".`);
+        log_1.default.withTick(`️Deleted secret${secret?.name ? ` "${secret?.name}"` : ''} with id "${id}".`);
     }
 }
 _a = EnvironmentSecretDelete;

package/build/commands/update/index.js

@@ -133,7 +133,7 @@ class UpdatePublish extends EasCommand_1.default {
                     cancelationToken.isCanceledOrFinished = true;
                     const timedOutAssets = lastAssetUploadResults
                         .filter(r => !r.finished)
-                        .map(r => { var _b; return `\n- ${(_b = r.asset.originalPath) !== null && _b !== void 0 ? _b : r.asset.path}`; });
+                        .map(r => `\n- ${r.asset.originalPath ?? r.asset.path}`);
                     throw new Error(`Asset processing timed out for assets: ${timedOutAssets}`);
                 })(),
             ]);
@@ -277,7 +277,7 @@ class UpdatePublish extends EasCommand_1.default {
                         ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
                         : []),
                     ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-                    { label: 'Message', value: updateMessage !== null && updateMessage !== void 0 ? updateMessage : '' },
+                    { label: 'Message', value: updateMessage ?? '' },
                     ...(gitCommitHash
                         ? [
                             {
@@ -301,8 +301,7 @@ class UpdatePublish extends EasCommand_1.default {
         }
     }
     sanitizeFlags(flags) {
-        var _b, _c;
-        const nonInteractive = (_b = flags['non-interactive']) !== null && _b !== void 0 ? _b : false;
+        const nonInteractive = flags['non-interactive'] ?? false;
         const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
         if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
             core_1.Errors.error('--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified', { exit: 1 });
@@ -315,7 +314,7 @@ class UpdatePublish extends EasCommand_1.default {
             ].filter(([_, value]) => value)[0];
             log_1.default.newLine();
             log_1.default.warn('The --group and --republish flags are deprecated, use the republish command instead:');
-            log_1.default.warn(`  ${chalk_1.default.bold([`eas update:republish`, ...(args !== null && args !== void 0 ? args : [])].join(' '))}`);
+            log_1.default.warn(`  ${chalk_1.default.bold([`eas update:republish`, ...(args ?? [])].join(' '))}`);
             log_1.default.newLine();
             core_1.Errors.error('--group and --republish flags are deprecated', { exit: 1 });
         }
@@ -330,7 +329,7 @@ class UpdatePublish extends EasCommand_1.default {
             platform: flags.platform,
             privateKeyPath: flags['private-key-path'],
             nonInteractive,
-            json: (_c = flags.json) !== null && _c !== void 0 ? _c : false,
+            json: flags.json ?? false,
         };
     }
 }

package/build/commands/update/republish.js

@@ -60,7 +60,6 @@ class UpdateRepublish extends EasCommand_1.default {
         });
     }
     sanitizeFlags(rawFlags) {
-        var _b;
         const branchName = rawFlags.branch;
         const channelName = rawFlags.channel;
         const groupId = rawFlags.group;
@@ -77,7 +76,7 @@ class UpdateRepublish extends EasCommand_1.default {
             platform,
             updateMessage: rawFlags.message,
             privateKeyPath,
-            json: (_b = rawFlags.json) !== null && _b !== void 0 ? _b : false,
+            json: rawFlags.json ?? false,
             nonInteractive,
         };
     }

package/build/commands/update/roll-back-to-embedded.js

@@ -135,7 +135,7 @@ class UpdateRollBackToEmbedded extends EasCommand_1.default {
                         ? [{ label: 'Android update ID', value: newAndroidUpdate.id }]
                         : []),
                     ...(newIosUpdate ? [{ label: 'iOS update ID', value: newIosUpdate.id }] : []),
-                    { label: 'Message', value: updateMessage !== null && updateMessage !== void 0 ? updateMessage : '' },
+                    { label: 'Message', value: updateMessage ?? '' },
                     ...(gitCommitHash
                         ? [
                             {
@@ -197,8 +197,7 @@ class UpdateRollBackToEmbedded extends EasCommand_1.default {
         return newUpdates;
     }
     sanitizeFlags(flags) {
-        var _b, _c;
-        const nonInteractive = (_b = flags['non-interactive']) !== null && _b !== void 0 ? _b : false;
+        const nonInteractive = flags['non-interactive'] ?? false;
         const { auto, branch: branchName, channel: channelName, message: updateMessage } = flags;
         if (nonInteractive && !auto && !(updateMessage && (branchName || channelName))) {
             core_1.Errors.error('--branch and --message, or --channel and --message are required when updating in non-interactive mode unless --auto is specified', { exit: 1 });
@@ -211,7 +210,7 @@ class UpdateRollBackToEmbedded extends EasCommand_1.default {
             platform: flags.platform,
             privateKeyPath: flags['private-key-path'],
             nonInteractive,
-            json: (_c = flags.json) !== null && _c !== void 0 ? _c : false,
+            json: flags.json ?? false,
         };
     }
 }

package/build/credentials/android/AndroidCredentialsProvider.js

@@ -26,13 +26,12 @@ class AndroidCredentialsProvider {
         return this.toAndroidCredentials(buildCredentials);
     }
     toAndroidCredentials(androidBuildCredentials) {
-        var _a, _b, _c, _d, _e;
         return {
             keystore: {
-                keystore: (0, nullthrows_1.default)((_a = androidBuildCredentials.androidKeystore) === null || _a === void 0 ? void 0 : _a.keystore),
-                keystorePassword: (0, nullthrows_1.default)((_b = androidBuildCredentials.androidKeystore) === null || _b === void 0 ? void 0 : _b.keystorePassword),
-                keyAlias: (0, nullthrows_1.default)((_c = androidBuildCredentials.androidKeystore) === null || _c === void 0 ? void 0 : _c.keyAlias),
-                keyPassword: (_e = (_d = androidBuildCredentials.androidKeystore) === null || _d === void 0 ? void 0 : _d.keyPassword) !== null && _e !== void 0 ? _e : undefined,
+                keystore: (0, nullthrows_1.default)(androidBuildCredentials.androidKeystore?.keystore),
+                keystorePassword: (0, nullthrows_1.default)(androidBuildCredentials.androidKeystore?.keystorePassword),
+                keyAlias: (0, nullthrows_1.default)(androidBuildCredentials.androidKeystore?.keyAlias),
+                keyPassword: androidBuildCredentials.androidKeystore?.keyPassword ?? undefined,
             },
         };
     }

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

@@ -23,7 +23,6 @@ async function canCopyLegacyCredentialsAsync(ctx, app) {
 }
 exports.canCopyLegacyCredentialsAsync = canCopyLegacyCredentialsAsync;
 async function promptUserAndCopyLegacyCredentialsAsync(ctx, app) {
-    var _a, _b;
     (0, assert_1.default)(await canCopyLegacyCredentialsAsync(ctx, app), 'User not eligible to copy classic build credentials to EAS');
     const spinner = (0, ora_1.ora)('Classic credentials detected, copying to EAS...').start();
     try {
@@ -40,13 +39,13 @@ async function promptUserAndCopyLegacyCredentialsAsync(ctx, app) {
             });
         }
         const legacyBuildCredentials = await ctx.android.getLegacyAndroidAppBuildCredentialsAsync(ctx.graphqlClient, app);
-        const legacyKeystore = (_a = legacyBuildCredentials === null || legacyBuildCredentials === void 0 ? void 0 : legacyBuildCredentials.androidKeystore) !== null && _a !== void 0 ? _a : null;
+        const legacyKeystore = legacyBuildCredentials?.androidKeystore ?? null;
         if (legacyKeystore) {
             const clonedKeystore = await ctx.android.createKeystoreAsync(ctx.graphqlClient, app.account, {
                 keystore: legacyKeystore.keystore,
                 keystorePassword: legacyKeystore.keystorePassword,
                 keyAlias: legacyKeystore.keyAlias,
-                keyPassword: (_b = legacyKeystore.keyPassword) !== null && _b !== void 0 ? _b : undefined,
+                keyPassword: legacyKeystore.keyPassword ?? undefined,
                 type: legacyKeystore.type,
             });
             await createOrUpdateDefaultAndroidAppBuildCredentialsAsync(ctx, app, {

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

@@ -14,20 +14,19 @@ class DownloadKeystore {
         this.options = options;
     }
     async runAsync(ctx, buildCredentials) {
-        var _a, _b, _c;
         const keystore = buildCredentials.androidKeystore;
         if (!keystore) {
             log_1.default.warn(`There is no valid Keystore defined for build credentials: ${buildCredentials.name}`);
             return;
         }
-        let displaySensitiveInformation = (_a = this.options) === null || _a === void 0 ? void 0 : _a.displaySensitiveInformation;
+        let displaySensitiveInformation = this.options?.displaySensitiveInformation;
         if (displaySensitiveInformation === undefined && !ctx.nonInteractive) {
             displaySensitiveInformation = await (0, prompts_1.confirmAsync)({
                 message: 'Do you want to display the sensitive information of the Android Keystore?',
             });
         }
         const projectFullName = (0, GraphqlClient_1.formatProjectFullName)(this.options.app);
-        const keystorePath = (_c = (_b = this.options) === null || _b === void 0 ? void 0 : _b.outputPath) !== null && _c !== void 0 ? _c : `${projectFullName.replace('/', '__')}.jks`;
+        const keystorePath = this.options?.outputPath ?? `${projectFullName.replace('/', '__')}.jks`;
         await (0, files_1.maybeRenameExistingFileAsync)(ctx.projectDir, keystorePath);
         log_1.default.log(`Saving Keystore to ${keystorePath}`);
         await fs_extra_1.default.writeFile(keystorePath, keystore.keystore, 'base64');

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

@@ -14,7 +14,7 @@ class RemoveFcm {
             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(ctx.graphqlClient, this.app);
-        const fcm = appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.androidFcm;
+        const fcm = 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}`);
             return;

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

@@ -49,12 +49,11 @@ class SetUpBuildCredentials {
         });
     }
     async getFullySetupBuildCredentialsAsync({ ctx, app, name, }) {
-        var _a;
         if (name) {
             return await this.getFullySetupBuildCredentialsByNameAsync({ ctx, app, name });
         }
         const defaultBuildCredentials = await ctx.android.getDefaultAndroidAppBuildCredentialsAsync(ctx.graphqlClient, app);
-        const defaultKeystore = (_a = defaultBuildCredentials === null || defaultBuildCredentials === void 0 ? void 0 : defaultBuildCredentials.androidKeystore) !== null && _a !== void 0 ? _a : null;
+        const defaultKeystore = defaultBuildCredentials?.androidKeystore ?? null;
         if (defaultKeystore) {
             (0, ora_1.ora)(`Using Keystore from configuration: ${(0, nullthrows_1.default)(defaultBuildCredentials).name} (default)`).succeed();
             return defaultBuildCredentials;
@@ -62,15 +61,14 @@ class SetUpBuildCredentials {
         return null;
     }
     async getFullySetupBuildCredentialsByNameAsync({ ctx, app, name, }) {
-        var _a;
         const maybeBuildCredentials = await ctx.android.getAndroidAppBuildCredentialsByNameAsync(ctx.graphqlClient, app, name);
-        const keystore = (_a = maybeBuildCredentials === null || maybeBuildCredentials === void 0 ? void 0 : maybeBuildCredentials.androidKeystore) !== null && _a !== void 0 ? _a : null;
+        const keystore = maybeBuildCredentials?.androidKeystore ?? null;
         if (keystore) {
             const buildCredentials = (0, nullthrows_1.default)(maybeBuildCredentials);
             (0, ora_1.ora)(`Using Keystore from configuration: ${buildCredentials.name}${buildCredentials.isDefault ? ' (default)' : ''}`).succeed();
             return buildCredentials;
         }
-        log_1.default.log(`No Keystore found for configuration: ${name}${(maybeBuildCredentials === null || maybeBuildCredentials === void 0 ? void 0 : maybeBuildCredentials.isDefault) ? ' (default)' : ''}`);
+        log_1.default.log(`No Keystore found for configuration: ${name}${maybeBuildCredentials?.isDefault ? ' (default)' : ''}`);
         return null;
     }
 }

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

@@ -34,10 +34,9 @@ class SetUpGoogleServiceAccountKeyForFcmV1 {
     }
     async isGoogleServiceAccountKeySetupAsync(ctx) {
         const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app);
-        return !!(appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.googleServiceAccountKeyForFcmV1);
+        return !!appCredentials?.googleServiceAccountKeyForFcmV1;
     }
     async createOrUseExistingKeyAsync(ctx) {
-        var _a;
         const { action } = await (0, prompts_1.promptAsync)({
             type: 'select',
             name: 'action',
@@ -53,7 +52,8 @@ class SetUpGoogleServiceAccountKeyForFcmV1 {
         if (action === 'GENERATE') {
             return await new CreateGoogleServiceAccountKey_1.CreateGoogleServiceAccountKey(this.app.account).runAsync(ctx);
         }
-        return ((_a = (await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx))) !== null && _a !== void 0 ? _a : (await this.createOrUseExistingKeyAsync(ctx)));
+        return ((await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx)) ??
+            (await this.createOrUseExistingKeyAsync(ctx)));
     }
 }
 exports.SetUpGoogleServiceAccountKeyForFcmV1 = SetUpGoogleServiceAccountKeyForFcmV1;

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

@@ -34,10 +34,9 @@ class SetUpGoogleServiceAccountKeyForSubmissions {
     }
     async isGoogleServiceAccountKeySetupAsync(ctx) {
         const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app);
-        return !!(appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.googleServiceAccountKeyForSubmissions);
+        return !!appCredentials?.googleServiceAccountKeyForSubmissions;
     }
     async createOrUseExistingKeyAsync(ctx) {
-        var _a;
         const { action } = await (0, prompts_1.promptAsync)({
             type: 'select',
             name: 'action',
@@ -53,7 +52,8 @@ class SetUpGoogleServiceAccountKeyForSubmissions {
         if (action === 'GENERATE') {
             return await new CreateGoogleServiceAccountKey_1.CreateGoogleServiceAccountKey(this.app.account).runAsync(ctx);
         }
-        return ((_a = (await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx))) !== null && _a !== void 0 ? _a : (await this.createOrUseExistingKeyAsync(ctx)));
+        return ((await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx)) ??
+            (await this.createOrUseExistingKeyAsync(ctx)));
     }
 }
 exports.SetUpGoogleServiceAccountKeyForSubmissions = SetUpGoogleServiceAccountKeyForSubmissions;