eas-cli 1.1.1 → 2.1.0

package/build/commandUtils/EasCommand.js

@@ -2,9 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const eas_json_1 = require("@expo/eas-json");
+const PackageManagerUtils = tslib_1.__importStar(require("@expo/package-manager"));
 const core_1 = require("@oclif/core");
+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 semver_1 = tslib_1.__importDefault(require("semver"));
 const rudderstackClient_1 = require("../analytics/rudderstackClient");
+const log_1 = require("../log");
 const projectUtils_1 = require("../project/projectUtils");
 const User_1 = require("../user/User");
 const actions_1 = require("../user/actions");
@@ -26,7 +31,9 @@ class EasCommand extends core_1.Command {
         var _a;
         await (0, rudderstackClient_1.initAsync)();
         if (this.mustBeRunInsideProject) {
-            await this.applyCliConfigAsync();
+            const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+            await this.applyCliConfigAsync(projectDir);
+            await this.ensureEasCliIsNotInDependenciesAsync(projectDir);
         }
         if (this.requiresAuthentication) {
             const { flags } = await this.parse();
@@ -48,8 +55,7 @@ class EasCommand extends core_1.Command {
         await (0, rudderstackClient_1.flushAsync)();
         return super.finally(err);
     }
-    async applyCliConfigAsync() {
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+    async applyCliConfigAsync(projectDir) {
         const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const config = await easJsonReader.getCliConfigAsync();
         if ((config === null || config === void 0 ? void 0 : config.version) && !semver_1.default.satisfies(easCli_1.easCliVersion, config.version)) {
@@ -59,5 +65,40 @@ class EasCommand extends core_1.Command {
             (0, vcs_1.setVcsClient)(new git_1.default());
         }
     }
+    async ensureEasCliIsNotInDependenciesAsync(projectDir) {
+        var _a;
+        let printCliVersionWarning = false;
+        const consoleWarn = (msg) => {
+            if (msg) {
+                // eslint-disable-next-line no-console
+                console.warn(chalk_1.default.yellow(msg));
+            }
+            else {
+                // eslint-disable-next-line no-console
+                console.warn();
+            }
+        };
+        if (await this.isEasCliInDependenciesAsync(projectDir)) {
+            printCliVersionWarning = true;
+            consoleWarn(`Found ${chalk_1.default.bold('eas-cli')} in your project dependencies.`);
+        }
+        const maybeRepoRoot = (_a = PackageManagerUtils.findWorkspaceRoot(projectDir)) !== null && _a !== void 0 ? _a : projectDir;
+        if (maybeRepoRoot !== projectDir && (await this.isEasCliInDependenciesAsync(maybeRepoRoot))) {
+            printCliVersionWarning = true;
+            consoleWarn(`Found ${chalk_1.default.bold('eas-cli')} in your monorepo dependencies.`);
+        }
+        if (printCliVersionWarning) {
+            consoleWarn(`It's recommended to use the ${chalk_1.default.bold('"cli.version"')} field in eas.json to enforce the ${chalk_1.default.bold('eas-cli')} version for your project.`);
+            consoleWarn((0, log_1.learnMore)('https://github.com/expo/eas-cli#enforcing-eas-cli-version-for-your-project'));
+            consoleWarn();
+        }
+    }
+    async isEasCliInDependenciesAsync(dir) {
+        var _a, _b;
+        const packageJsonPath = path_1.default.join(dir, 'package.json');
+        const packageJson = JSON.parse(await fs_extra_1.default.readFile(packageJsonPath, 'utf8'));
+        return (((_a = packageJson === null || packageJson === void 0 ? void 0 : packageJson.dependencies) === null || _a === void 0 ? void 0 : _a['eas-cli']) !== undefined ||
+            ((_b = packageJson === null || packageJson === void 0 ? void 0 : packageJson.devDependencies) === null || _b === void 0 ? void 0 : _b['eas-cli']) !== undefined);
+    }
 }
 exports.default = EasCommand;

package/build/commands/branch/delete.js

@@ -78,7 +78,7 @@ class BranchDelete extends EasCommand_1.default {
         }
         if (!jsonFlag) {
             log_1.default.addNewLineIfNone();
-            log_1.default.warn(`You are about to permamently delete branch: "${name}" and all of the updates published on it.` +
+            log_1.default.warn(`You are about to permanently delete branch: "${name}" and all of the updates published on it.` +
                 `\nThis action is irreversible.`);
             log_1.default.newLine();
             const confirmed = await (0, prompts_1.toggleConfirmAsync)({ message: 'Are you sure you wish to proceed?' });

package/build/commands/build/index.d.ts

@@ -19,5 +19,6 @@ export default class Build extends EasCommand {
         message: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
     runAsync(): Promise<void>;
-    private sanitizeFlagsAsync;
+    private sanitizeFlags;
+    private ensurePlatformSelectedAsync;
 }

package/build/commands/build/index.js

@@ -1,26 +1,42 @@
 "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 core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const figures_1 = tslib_1.__importDefault(require("figures"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
 const types_1 = require("../../build/types");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const log_1 = tslib_1.__importDefault(require("../../log"));
+const generated_1 = require("../../graphql/generated");
+const log_1 = tslib_1.__importStar(require("../../log"));
 const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
+const prompts_1 = require("../../prompts");
+const uniq_1 = tslib_1.__importDefault(require("../../utils/expodash/uniq"));
 const json_1 = require("../../utils/json");
+const statuspageService_1 = require("../../utils/statuspageService");
 class Build extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = await this.parse(Build);
         if (rawFlags.json) {
             (0, json_1.enableJsonOutput)();
         }
-        const flags = await this.sanitizeFlagsAsync(rawFlags);
+        const flags = this.sanitizeFlags(rawFlags);
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(projectDir, flags);
+        await handleDeprecatedEasJsonAsync(projectDir, flags.nonInteractive);
+        if (!flags.localBuildOptions.enable) {
+            await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)(flags.autoSubmit
+                ? [generated_1.StatuspageServiceName.EasBuild, generated_1.StatuspageServiceName.EasSubmit]
+                : [generated_1.StatuspageServiceName.EasBuild]);
+        }
+        const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
+        await (0, runBuildAndSubmit_1.runBuildAndSubmitAsync)(projectDir, flagsWithPlatform);
     }
-    async sanitizeFlagsAsync(flags) {
+    sanitizeFlags(flags) {
         var _a, _b;
         const nonInteractive = flags['non-interactive'];
         if (!flags.local && flags.output) {
@@ -32,21 +48,10 @@ class Build extends EasCommand_1.default {
         if (flags.json && !nonInteractive) {
             core_1.Errors.error('--json is allowed only when building in non-interactive mode', { exit: 1 });
         }
-        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.platform);
-        if (flags.local) {
-            if (flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined) {
-                // TODO: implement this
-                core_1.Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
-            }
-            if (requestedPlatform === platform_1.RequestedPlatform.All) {
-                core_1.Errors.error('Builds for multiple platforms are not supported with flag --local', {
-                    exit: 1,
-                });
-            }
-            else if (process.platform !== 'darwin' && requestedPlatform === platform_1.RequestedPlatform.Ios) {
-                core_1.Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
-            }
-        }
+        const requestedPlatform = flags.platform &&
+            Object.values(platform_1.RequestedPlatform).includes(flags.platform.toLowerCase())
+            ? flags.platform.toLowerCase()
+            : undefined;
         if (flags['skip-credentials-check']) {
             log_1.default.warnDeprecatedFlag('skip-credentials-check', 'Build credentials validation is always skipped with the --non-interactive flag. You can also skip interactively.');
             log_1.default.newLine();
@@ -82,6 +87,27 @@ class Build extends EasCommand_1.default {
             message,
         };
     }
+    async ensurePlatformSelectedAsync(flags) {
+        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.requestedPlatform);
+        if (flags.localBuildOptions.enable) {
+            if (flags.autoSubmit) {
+                // TODO: implement this
+                core_1.Errors.error('Auto-submits are not yet supported when building locally', { exit: 1 });
+            }
+            if (requestedPlatform === platform_1.RequestedPlatform.All) {
+                core_1.Errors.error('Builds for multiple platforms are not supported with flag --local', {
+                    exit: 1,
+                });
+            }
+            else if (process.platform !== 'darwin' && requestedPlatform === platform_1.RequestedPlatform.Ios) {
+                core_1.Errors.error('Unsupported platform, macOS is required to build apps for iOS', { exit: 1 });
+            }
+        }
+        return {
+            ...flags,
+            requestedPlatform,
+        };
+    }
 }
 exports.default = Build;
 Build.description = 'start a build';
@@ -146,3 +172,49 @@ Build.flags = {
         description: 'A short message describing the build',
     }),
 };
+async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
+    const reader = new eas_json_1.EasJsonReader(projectDir);
+    const profileNames = await reader.getBuildProfileNamesAsync();
+    const platformAndProfileNames = profileNames.flatMap(profileName => [
+        [eas_build_job_1.Platform.ANDROID, profileName],
+        [eas_build_job_1.Platform.IOS, profileName],
+    ]);
+    const deprecatedProfiles = [];
+    for (const [platform, profileName] of platformAndProfileNames) {
+        const buildProfile = await reader.getBuildProfileAsync(platform, profileName);
+        if (buildProfile.artifactPath) {
+            deprecatedProfiles.push([platform, profileName]);
+        }
+    }
+    if (deprecatedProfiles.length === 0) {
+        return;
+    }
+    const deprecatedProfileNames = (0, uniq_1.default)(deprecatedProfiles.map(([, profileName]) => profileName));
+    log_1.default.warn(`Some of your build profiles use deprecated field ${chalk_1.default.bold('artifactPath')}:`);
+    for (const profileName of deprecatedProfileNames) {
+        log_1.default.warn(`- ${profileName}`);
+    }
+    log_1.default.newLine();
+    if (nonInteractive) {
+        log_1.default.warn(`${figures_1.default.warning} Action required: rename ${chalk_1.default.bold('artifactPath')} to ${chalk_1.default.bold('applicationArchivePath')} in all of the build profiles listed above.`);
+        log_1.default.warn(`See ${(0, log_1.link)('https://docs.expo.dev/build-reference/eas-json/')} for more information.`);
+        log_1.default.warn(`This warning will become an error in a future EAS CLI release. This build will continue to use the ${chalk_1.default.bold('artifactPath')} setting.`);
+        return;
+    }
+    const rename = await (0, prompts_1.selectAsync)('Do you want us to handle renaming the field for you?', [
+        { title: 'Yes', value: true },
+        { title: 'No, I will edit eas.json manually (EAS CLI exits)', value: false },
+    ]);
+    if (!rename) {
+        core_1.Errors.exit(1);
+    }
+    const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(projectDir);
+    const easJson = await fs_extra_1.default.readJSON(easJsonPath);
+    for (const [platform, profileName] of deprecatedProfiles) {
+        easJson.build[profileName][platform].applicationArchivePath =
+            easJson.build[profileName][platform].artifactPath;
+        delete easJson.build[profileName][platform].artifactPath;
+    }
+    await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+    log_1.default.withTick('Updated eas.json');
+}

package/build/commands/channel/delete.js

@@ -46,7 +46,7 @@ class ChannelDelete extends EasCommand_1.default {
         }
         if (!nonInteractiveFlag) {
             log_1.default.addNewLineIfNone();
-            log_1.default.warn(`You are about to permamently delete channel: "${name}".\nThis action is irreversible.`);
+            log_1.default.warn(`You are about to permanently delete channel: "${name}".\nThis action is irreversible.`);
             log_1.default.newLine();
             const confirmed = await (0, prompts_1.toggleConfirmAsync)({ message: 'Are you sure you wish to proceed?' });
             if (!confirmed) {

package/build/commands/device/delete.js

@@ -57,8 +57,9 @@ class DeviceDelete extends EasCommand_1.default {
         log_1.default.addNewLineIfNone();
         const removeAppleSpinner = (0, ora_1.ora)('Disabling devices on Apple').start();
         try {
-            let realDevices = await apple_utils_1.Device.getAllIOSProfileDevicesAsync(context);
-            realDevices = realDevices.filter(d => chosenDevices.map(cd => cd.identifier).includes(d.attributes.udid));
+            const chosenDeviceIdentifiers = chosenDevices.map(cd => cd.identifier);
+            const allDevices = await apple_utils_1.Device.getAsync(context);
+            const realDevices = allDevices.filter(d => chosenDeviceIdentifiers.includes(d.attributes.udid));
             for (const device of realDevices) {
                 await device.updateAsync({ status: apple_utils_1.DeviceStatus.DISABLED });
             }

package/build/commands/open.d.ts

@@ -0,0 +1,5 @@
+import EasCommand from '../commandUtils/EasCommand';
+export default class Open extends EasCommand {
+    static description: string;
+    runAsync(): Promise<void>;
+}

package/build/commands/open.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const better_opn_1 = tslib_1.__importDefault(require("better-opn"));
+const url_1 = require("../build/utils/url");
+const EasCommand_1 = tslib_1.__importDefault(require("../commandUtils/EasCommand"));
+const ora_1 = require("../ora");
+const expoConfig_1 = require("../project/expoConfig");
+const projectUtils_1 = require("../project/projectUtils");
+const actions_1 = require("../user/actions");
+class Open extends EasCommand_1.default {
+    async runAsync() {
+        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
+        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
+        // this ensures the project exists
+        await (0, projectUtils_1.fetchProjectIdFromServerAsync)(exp);
+        const user = await (0, actions_1.ensureLoggedInAsync)();
+        const accountName = (0, projectUtils_1.getProjectAccountName)(exp, user);
+        const projectName = exp.slug;
+        const projectDashboardUrl = (0, url_1.getProjectDashboardUrl)(accountName, projectName);
+        const failedMessage = `Unable to open a web browser. Project page is available at: ${projectDashboardUrl}`;
+        const spinner = (0, ora_1.ora)(`Opening ${projectDashboardUrl}`).start();
+        try {
+            const opened = await (0, better_opn_1.default)(projectDashboardUrl);
+            if (opened) {
+                spinner.succeed(`Opened ${projectDashboardUrl}`);
+            }
+            else {
+                spinner.fail(failedMessage);
+            }
+            return;
+        }
+        catch (error) {
+            spinner.fail(failedMessage);
+            throw error;
+        }
+    }
+}
+exports.default = Open;
+Open.description = 'open the project page in a web browser';

package/build/commands/secret/delete.js

@@ -35,7 +35,7 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
             }
         }
         log_1.default.addNewLineIfNone();
-        log_1.default.warn(`You are about to permamently 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 === 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.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

package/build/commands/submit.d.ts

@@ -14,5 +14,6 @@ export default class Submit extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
-    private sanitizeFlagsAsync;
+    private sanitizeFlags;
+    private ensurePlatformSelectedAsync;
 }

package/build/commands/submit.js

@@ -5,6 +5,7 @@ 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 generated_1 = require("../graphql/generated");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = tslib_1.__importDefault(require("../log"));
 const platform_1 = require("../platform");
@@ -14,19 +15,22 @@ const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
 const urls_1 = require("../submit/utils/urls");
 const profiles_1 = require("../utils/profiles");
+const statuspageService_1 = require("../utils/statuspageService");
 class Submit extends EasCommand_1.default {
     async runAsync() {
         const { flags: rawFlags } = await this.parse(Submit);
-        const flags = await this.sanitizeFlagsAsync(rawFlags);
+        const flags = this.sanitizeFlags(rawFlags);
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
+        await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)([generated_1.StatuspageServiceName.EasSubmit]);
+        const flagsWithPlatform = await this.ensurePlatformSelectedAsync(flags);
+        const platforms = (0, platform_1.toPlatforms)(flagsWithPlatform.requestedPlatform);
         const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
             easJsonReader: new eas_json_1.EasJsonReader(projectDir),
             platforms,
-            profileName: flags.profile,
+            profileName: flagsWithPlatform.profile,
         });
         const submissions = [];
         for (const submissionProfile of submissionProfiles) {
@@ -35,8 +39,8 @@ class Submit extends EasCommand_1.default {
                 projectDir,
                 projectId,
                 profile: submissionProfile.profile,
-                archiveFlags: flags.archiveFlags,
-                nonInteractive: flags.nonInteractive,
+                archiveFlags: flagsWithPlatform.archiveFlags,
+                nonInteractive: flagsWithPlatform.nonInteractive,
             });
             if (submissionProfiles.length > 1) {
                 log_1.default.newLine();
@@ -48,24 +52,22 @@ class Submit extends EasCommand_1.default {
         }
         log_1.default.newLine();
         (0, urls_1.printSubmissionDetailsUrls)(submissions);
-        if (flags.wait) {
+        if (flagsWithPlatform.wait) {
             const completedSubmissions = await (0, submit_1.waitToCompleteAsync)(submissions, {
-                verbose: flags.verbose,
+                verbose: flagsWithPlatform.verbose,
             });
             (0, submit_1.exitWithNonZeroCodeIfSomeSubmissionsDidntFinish)(completedSubmissions);
         }
     }
-    async sanitizeFlagsAsync(flags) {
+    sanitizeFlags(flags) {
         const { platform, verbose, wait, profile, 'non-interactive': nonInteractive, ...archiveFlags } = flags;
         if (!flags.platform && nonInteractive) {
             core_1.Errors.error('--platform is required when building in non-interactive mode', { exit: 1 });
         }
-        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.platform);
-        if (requestedPlatform === platform_1.RequestedPlatform.All) {
-            if (archiveFlags.id || archiveFlags.path || archiveFlags.url) {
-                core_1.Errors.error('--id, --path, and --url params are only supported when performing a single-platform submit', { exit: 1 });
-            }
-        }
+        const requestedPlatform = flags.platform &&
+            Object.values(platform_1.RequestedPlatform).includes(flags.platform.toLowerCase())
+            ? flags.platform.toLowerCase()
+            : undefined;
         return {
             archiveFlags,
             requestedPlatform,
@@ -75,6 +77,18 @@ class Submit extends EasCommand_1.default {
             nonInteractive,
         };
     }
+    async ensurePlatformSelectedAsync(flags) {
+        const requestedPlatform = await (0, platform_1.selectRequestedPlatformAsync)(flags.requestedPlatform);
+        if (requestedPlatform === platform_1.RequestedPlatform.All) {
+            if (flags.archiveFlags.id || flags.archiveFlags.path || flags.archiveFlags.url) {
+                core_1.Errors.error('--id, --path, and --url params are only supported when performing a single-platform submit', { exit: 1 });
+            }
+        }
+        return {
+            ...flags,
+            requestedPlatform,
+        };
+    }
 }
 exports.default = Submit;
 Submit.description = 'submit app binary to App Store and/or Play Store';

package/build/commands/update/configure.js

@@ -81,6 +81,7 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
     const newAndroidRuntimeVersion = (_c = (_b = (_a = exp.android) === null || _a === void 0 ? void 0 : _a.runtimeVersion) !== null && _b !== void 0 ? _b : exp.runtimeVersion) !== null && _c !== void 0 ? _c : androidDefaultRuntimeVersion;
     const newIosRuntimeVersion = (_f = (_e = (_d = exp.ios) === null || _d === void 0 ? void 0 : _d.runtimeVersion) !== null && _e !== void 0 ? _e : exp.runtimeVersion) !== null && _f !== void 0 ? _f : iosDefaultRuntimeVersion;
     let newConfig;
+    let newConfigOnlyAddedValues;
     switch (platform) {
         case platform_1.RequestedPlatform.All: {
             if (isRuntimeEqual(newAndroidRuntimeVersion, newIosRuntimeVersion)) {
@@ -93,6 +94,26 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
                     ios: { ...exp.ios, runtimeVersion: undefined },
                     updates,
                 };
+                newConfigOnlyAddedValues = {
+                    runtimeVersion: newAndroidRuntimeVersion,
+                    ...(exp.android && 'runtimeVersion' in exp.android
+                        ? {
+                            android: {
+                                runtimeVersion: '<remove this key>',
+                            },
+                        }
+                        : {}),
+                    ...(exp.ios && 'runtimeVersion' in exp.ios
+                        ? {
+                            ios: {
+                                runtimeVersion: '<remove this key>',
+                            },
+                        }
+                        : {}),
+                    updates: {
+                        url: easUpdateURL,
+                    },
+                };
             }
             else {
                 newConfig = {
@@ -107,6 +128,22 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
                     },
                     updates,
                 };
+                newConfigOnlyAddedValues = {
+                    ...('runtimeVersion' in exp
+                        ? {
+                            runtimeVersion: '<remove this key>', // top level runtime is redundant if it is specified in both android and ios
+                        }
+                        : {}),
+                    android: {
+                        runtimeVersion: newAndroidRuntimeVersion,
+                    },
+                    ios: {
+                        runtimeVersion: newIosRuntimeVersion,
+                    },
+                    updates: {
+                        url: easUpdateURL,
+                    },
+                };
             }
             break;
         }
@@ -118,6 +155,14 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
                 },
                 updates,
             };
+            newConfigOnlyAddedValues = {
+                android: {
+                    runtimeVersion: newAndroidRuntimeVersion,
+                },
+                updates: {
+                    url: easUpdateURL,
+                },
+            };
             break;
         }
         case platform_1.RequestedPlatform.Ios: {
@@ -128,6 +173,14 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
                 },
                 updates,
             };
+            newConfigOnlyAddedValues = {
+                ios: {
+                    runtimeVersion: newIosRuntimeVersion,
+                },
+                updates: {
+                    url: easUpdateURL,
+                },
+            };
             break;
         }
         default: {
@@ -135,8 +188,8 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
         }
     }
     const result = await (0, config_1.modifyConfigAsync)(projectDir, newConfig);
-    const prexistingAndroidRuntimeVersion = (_h = (_g = exp.android) === null || _g === void 0 ? void 0 : _g.runtimeVersion) !== null && _h !== void 0 ? _h : exp.runtimeVersion;
-    const prexistingIosRuntimeVersion = (_k = (_j = exp.ios) === null || _j === void 0 ? void 0 : _j.runtimeVersion) !== null && _k !== void 0 ? _k : exp.runtimeVersion;
+    const preexistingAndroidRuntimeVersion = (_h = (_g = exp.android) === null || _g === void 0 ? void 0 : _g.runtimeVersion) !== null && _h !== void 0 ? _h : exp.runtimeVersion;
+    const preexistingIosRuntimeVersion = (_k = (_j = exp.ios) === null || _j === void 0 ? void 0 : _j.runtimeVersion) !== null && _k !== void 0 ? _k : exp.runtimeVersion;
     switch (result.type) {
         case 'success':
             if ((_l = exp.updates) === null || _l === void 0 ? void 0 : _l.url) {
@@ -147,11 +200,11 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
             else {
                 log_1.default.withTick(`Set updates.url value, to "${easUpdateURL}" in app.json`);
             }
-            if (!prexistingAndroidRuntimeVersion &&
+            if (!preexistingAndroidRuntimeVersion &&
                 [platform_1.RequestedPlatform.Android, platform_1.RequestedPlatform.All].includes(platform)) {
                 log_1.default.withTick(`Set ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Android]} runtimeVersion to "${JSON.stringify((_p = (_o = newConfig.android) === null || _o === void 0 ? void 0 : _o.runtimeVersion) !== null && _p !== void 0 ? _p : newConfig.runtimeVersion)}" in app.json`);
             }
-            if (!prexistingIosRuntimeVersion &&
+            if (!preexistingIosRuntimeVersion &&
                 [platform_1.RequestedPlatform.Ios, platform_1.RequestedPlatform.All].includes(platform)) {
                 log_1.default.withTick(`Set ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Ios]} runtimeVersion to "${JSON.stringify((_r = (_q = newConfig.ios) === null || _q === void 0 ? void 0 : _q.runtimeVersion) !== null && _r !== void 0 ? _r : newConfig.runtimeVersion)}" in app.json`);
             }
@@ -160,7 +213,7 @@ async function configureAppJSONForEASUpdateAsync({ projectDir, exp, platform, wo
             log_1.default.addNewLineIfNone();
             log_1.default.warn(`It looks like you are using a dynamic configuration! ${(0, log_1.learnMore)('https://docs.expo.dev/workflow/configuration/#dynamic-configuration-with-appconfigjs)')}`);
             log_1.default.warn(`In order to finish configuring your project for EAS Update, you are going to need manually add the following to your app.config.js:\n${(0, log_1.learnMore)('https://expo.fyi/eas-update-config.md')}\n`);
-            log_1.default.log(chalk_1.default.bold(JSON.stringify(newConfig, null, 2)));
+            log_1.default.log(chalk_1.default.bold(JSON.stringify(newConfigOnlyAddedValues, null, 2)));
             log_1.default.addNewLineIfNone();
             if (workflows['android'] === eas_build_job_1.Workflow.GENERIC || workflows['ios'] === eas_build_job_1.Workflow.GENERIC) {
                 log_1.default.warn(`You will also have to manually edit the projects ${chalk_1.default.bold('Expo.plist/AndroidManifest.xml')}. ${(0, log_1.learnMore)('https://expo.fyi/eas-update-config.md#native-configuration')}`);

package/build/commands/update/delete.js

@@ -33,7 +33,7 @@ class UpdateDelete extends EasCommand_1.default {
                 message: `🚨${chalk_1.default.red('CAUTION')}🚨\n\n` +
                     `${chalk_1.default.yellow(`This will delete all of the updates in group "${group}".`)} ${chalk_1.default.red('This is a permanent operation.')}\n\n` +
                     `If you want to revert to a previous publish, you should use 'update --republish' targeted at the last working update group instead.\n\n` +
-                    `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'update --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent cacheing behavior by clients.\n\n` +
+                    `An update group should only be deleted in an emergency like an accidental publish of a secret. In this case user 'update --republish' to revert to the last working update group first and then proceed with the deletion. Deleting an update group when it is the latest publish can lead to inconsistent caching behavior by clients.\n\n` +
                     `Would you like to abort?`,
             });
             if (shouldAbort) {

package/build/commands/update/index.js

@@ -16,6 +16,7 @@ const url_1 = require("../../build/utils/url");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const fetch_1 = tslib_1.__importDefault(require("../../fetch"));
 const client_1 = require("../../graphql/client");
+const generated_1 = require("../../graphql/generated");
 const PublishMutation_1 = require("../../graphql/mutations/PublishMutation");
 const BranchQuery_1 = require("../../graphql/queries/BranchQuery");
 const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
@@ -32,6 +33,7 @@ const code_signing_1 = require("../../utils/code-signing");
 const uniqBy_1 = tslib_1.__importDefault(require("../../utils/expodash/uniqBy"));
 const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const json_1 = require("../../utils/json");
+const statuspageService_1 = require("../../utils/statuspageService");
 const vcs_1 = require("../../vcs");
 const create_1 = require("../branch/create");
 const create_2 = require("../channel/create");
@@ -109,6 +111,7 @@ class UpdatePublish extends EasCommand_1.default {
         const expPrivate = (0, expoConfig_1.getExpoConfig)(projectDir, {
             isPublicConfig: false,
         });
+        await (0, statuspageService_1.maybeWarnAboutEasOutagesAsync)([generated_1.StatuspageServiceName.EasUpdate]);
         const codeSigningInfo = await (0, code_signing_1.getCodeSigningInfoAsync)(expPrivate, privateKeyPath);
         const hasExpoUpdates = (0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, exp.sdkVersion);
         if (!hasExpoUpdates && nonInteractive) {

package/build/commands/webhook/delete.js

@@ -40,7 +40,7 @@ class WebhookDelete extends EasCommand_1.default {
         log_1.default.addNewLineIfNone();
         log_1.default.log((0, formatWebhook_1.formatWebhook)(webhook));
         log_1.default.newLine();
-        log_1.default.warn(`You are about to permamently delete this webhook.\nThis action is irreversible.`);
+        log_1.default.warn(`You are about to permanently delete this webhook.\nThis action is irreversible.`);
         log_1.default.newLine();
         const confirmed = await (0, prompts_1.toggleConfirmAsync)({
             message: 'Are you sure you wish to proceed?',

package/build/credentials/android/api/GraphqlClient.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatProjectFullName = exports.getGoogleServiceAccountKeysForAccountAsync = exports.deleteGoogleServiceAccountKeyAsync = exports.createGoogleServiceAccountKeyAsync = exports.deleteFcmAsync = exports.createFcmAsync = exports.deleteKeystoreAsync = exports.createKeystoreAsync = exports.createOrUpdateDefaultIosAppBuildCredentialsAsync = exports.createOrUpdateAndroidAppBuildCredentialsByNameAsync = exports.getAndroidAppBuildCredentialsByNameAsync = exports.getDefaultAndroidAppBuildCredentialsAsync = exports.createAndroidAppBuildCredentialsAsync = exports.updateAndroidAppBuildCredentialsAsync = exports.updateAndroidAppCredentialsAsync = exports.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync = exports.getLegacyAndroidAppBuildCredentialsAsync = exports.getLegacyAndroidAppCredentialsWithCommonFieldsAsync = exports.getAndroidAppBuildCredentialsListAsync = exports.getAndroidAppCredentialsWithCommonFieldsAsync = void 0;
-const AppQuery_1 = require("../../ios/api/graphql/queries/AppQuery");
+const AppQuery_1 = require("../../../graphql/queries/AppQuery");
 const AndroidAppBuildCredentialsMutation_1 = require("./graphql/mutations/AndroidAppBuildCredentialsMutation");
 const AndroidAppCredentialsMutation_1 = require("./graphql/mutations/AndroidAppCredentialsMutation");
 const AndroidFcmMutation_1 = require("./graphql/mutations/AndroidFcmMutation");

package/build/credentials/context.d.ts

@@ -1,5 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { Env } from '@expo/eas-build-job';
+import { EasJson } from '@expo/eas-json';
 import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
@@ -12,10 +13,12 @@ export declare class CredentialsContext {
     readonly nonInteractive: boolean;
     readonly projectDir: string;
     readonly user: Actor;
+    readonly easJsonCliConfig?: EasJson['cli'];
     private shouldAskAuthenticateAppStore;
     private resolvedExp?;
     constructor(options: {
         exp?: ExpoConfig;
+        easJsonCliConfig?: EasJson['cli'];
         nonInteractive?: boolean;
         projectDir: string;
         user: Actor;

package/build/credentials/context.js

@@ -20,6 +20,7 @@ class CredentialsContext {
         this.appStore = new AppStoreApi_1.default();
         this.ios = IosGraphqlClient;
         this.shouldAskAuthenticateAppStore = true;
+        this.easJsonCliConfig = options.easJsonCliConfig;
         this.projectDir = options.projectDir;
         this.user = options.user;
         this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;