eas-cli 3.14.0 → 3.15.1

package/build/build/runBuildAndSubmit.js

@@ -10,7 +10,7 @@ const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
-const log_1 = tslib_1.__importDefault(require("../log"));
+const log_1 = tslib_1.__importStar(require("../log"));
 const platform_1 = require("../platform");
 const customBuildConfig_1 = require("../project/customBuildConfig");
 const expoSdk_1 = require("../project/expoSdk");
@@ -56,6 +56,9 @@ async function runBuildAndSubmitAsync(graphqlClient, analytics, projectDir, flag
         platforms,
         profileName: (_b = flags.profile) !== null && _b !== void 0 ? _b : undefined,
     });
+    log_1.default.log(`Loaded "env" configuration for the "${buildProfiles[0].profileName}" profile: ${buildProfiles[0].profile.env
+        ? Object.keys(buildProfiles[0].profile.env).join(', ')
+        : 'no environment variables specified'}. ${(0, log_1.learnMore)('https://docs.expo.dev/build-reference/variables/')}`);
     await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
         projectDir,
         nonInteractive: flags.nonInteractive,

package/build/commandUtils/EasCommand.js

@@ -63,16 +63,19 @@ class EasCommand extends core_1.Command {
         return super.finally(err);
     }
     catch(err) {
-        var _a, _b, _c;
         let baseMessage = `${this.id} command failed.`;
         if (err instanceof errors_1.EasCommandError) {
             log_1.default.error(err.message);
         }
         else if (err instanceof core_2.CombinedError && (err === null || err === void 0 ? void 0 : err.graphQLErrors)) {
-            let cleanMessage = err.message.replace('[GraphQL] ', '');
-            cleanMessage += ((_c = (_b = (_a = err === null || err === void 0 ? void 0 : err.graphQLErrors) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.extensions) === null || _c === void 0 ? void 0 : _c.requestId)
-                ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
-                : '';
+            const cleanMessage = err === null || err === void 0 ? void 0 : err.graphQLErrors.map((graphQLError) => {
+                var _a;
+                const messageLine = graphQLError.message.replace('[GraphQL] ', '');
+                const requestIdLine = ((_a = graphQLError.extensions) === null || _a === void 0 ? void 0 : _a.requestId)
+                    ? `\nRequest ID: ${err.graphQLErrors[0].extensions.requestId}`
+                    : '';
+                return `${messageLine}${requestIdLine}`;
+            }).join('\n');
             log_1.default.error(cleanMessage);
             baseMessage = BASE_GRAPHQL_ERROR_MESSAGE;
         }

package/build/commands/build/configure.js

@@ -19,7 +19,7 @@ const UpdatesModule_2 = require("../../update/ios/UpdatesModule");
 const vcs_1 = require("../../vcs");
 class BuildConfigure extends EasCommand_1.default {
     async runAsync() {
-        var _b;
+        var _b, _c;
         const { flags } = await this.parse(BuildConfigure);
         const { privateProjectConfig: { exp, projectId, projectDir }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BuildConfigure, {
             nonInteractive: false,
@@ -39,6 +39,11 @@ class BuildConfigure extends EasCommand_1.default {
             nonInteractive: false,
         });
         if (didCreateEasJson && (0, projectUtils_1.isUsingEASUpdate)(exp, projectId)) {
+            if ((_c = exp.updates) === null || _c === void 0 ? void 0 : _c.useClassicUpdates) {
+                // NOTE: this method modifies the Expo config; be sure to use this function's return value
+                // if the config object is used later in the future
+                await (0, configure_2.ensureUseClassicUpdatesIsRemovedAsync)({ exp, projectDir });
+            }
             await (0, configure_2.ensureEASUpdateIsConfiguredInEasJsonAsync)(projectDir);
         }
         // configure expo-updates

package/build/commands/build/run.js

@@ -139,7 +139,7 @@ async function maybeGetBuildAsync(graphqlClient, flags, projectId, paginatedQuer
             },
             paginatedQueryOptions,
             selectPromptDisabledFunction: build => !(0, utils_1.isRunnableOnSimulatorOrEmulator)(build),
-            selectPromptWarningMessage: 'Artifacts for this build have expired and are no longer available, or this is not a simulator/emulator build.',
+            selectPromptWarningMessage: `Artifacts for this build have expired and are no longer available, or this is not ${flags.selectedPlatform === generated_1.AppPlatform.Ios ? 'a simulator' : 'an emulator'} build.`,
         });
         return validateChosenBuild(build, flags.selectedPlatform);
     }

package/build/commands/update/configure.js

@@ -17,7 +17,7 @@ class UpdateConfigure extends EasCommand_1.default {
         const { privateProjectConfig: { projectId, exp, projectDir }, loggedIn: { graphqlClient }, } = await this.getContextAsync(UpdateConfigure, {
             nonInteractive: flags['non-interactive'],
         });
-        log_1.default.log('💡 The following process will configure your project to run EAS Update. These changes only apply to your local project files and you can safely revert them at any time.');
+        log_1.default.log('💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.');
         await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
         await (0, configure_2.ensureEASUpdateIsConfiguredAsync)(graphqlClient, {
             exp,
@@ -27,7 +27,7 @@ class UpdateConfigure extends EasCommand_1.default {
         });
         await (0, configure_2.ensureEASUpdateIsConfiguredInEasJsonAsync)(projectDir);
         log_1.default.addNewLineIfNone();
-        log_1.default.log(`🎉 Your app is configured with EAS Update!`);
+        log_1.default.log(`🎉 Your app is configured to use EAS Update!`);
         log_1.default.newLine();
         const easJsonExists = await (0, configure_1.easJsonExistsAsync)(projectDir);
         if (!easJsonExists) {

package/build/commands/update/index.js

@@ -326,6 +326,7 @@ UpdatePublish.flags = {
         required: false,
     }),
     message: core_1.Flags.string({
+        char: 'm',
         description: 'A short message describing the update',
         required: false,
     }),

package/build/commands/update/republish.js

@@ -146,6 +146,7 @@ UpdateRepublish.flags = {
         exclusive: ['branch', 'channel'],
     }),
     message: core_1.Flags.string({
+        char: 'm',
         description: 'Short message describing the republished update',
         required: false,
     }),

package/build/graphql/client.js

@@ -8,7 +8,14 @@ const log_1 = tslib_1.__importDefault(require("../log"));
 async function withErrorHandlingAsync(promise) {
     const { data, error } = await promise;
     if (error) {
-        if (error.graphQLErrors.some(e => { var _a; return (_a = e === null || e === void 0 ? void 0 : e.extensions) === null || _a === void 0 ? void 0 : _a.isTransient; })) {
+        if (error.graphQLErrors.some(e => {
+            var _a, _b;
+            return ((_a = e === null || e === void 0 ? void 0 : e.extensions) === null || _a === void 0 ? void 0 : _a.isTransient) &&
+                ![
+                    'EAS_BUILD_FREE_TIER_LIMIT_EXCEEDED',
+                    'EAS_BUILD_FREE_TIER_IOS_LIMIT_EXCEEDED',
+                ].includes((_b = e === null || e === void 0 ? void 0 : e.extensions) === null || _b === void 0 ? void 0 : _b.errorCode);
+        })) {
             log_1.default.error(`We've encountered a transient error. Try again shortly.`);
         }
         throw error;

package/build/project/expoConfig.d.ts

@@ -14,4 +14,5 @@ export declare function createOrModifyExpoConfigAsync(projectDir: string, exp: P
 }): ReturnType<typeof modifyConfigAsync>;
 export declare function getPrivateExpoConfig(projectDir: string, opts?: ExpoConfigOptions): ExpoConfig;
 export declare function ensureExpoConfigExists(projectDir: string): void;
+export declare function isUsingStaticExpoConfig(projectDir: string): boolean;
 export declare function getPublicExpoConfig(projectDir: string, opts?: ExpoConfigOptions): PublicExpoConfig;

package/build/project/expoConfig.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPublicExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfig = exports.createOrModifyExpoConfigAsync = void 0;
+exports.getPublicExpoConfig = exports.isUsingStaticExpoConfig = exports.ensureExpoConfigExists = exports.getPrivateExpoConfig = exports.createOrModifyExpoConfigAsync = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const json_file_1 = tslib_1.__importDefault(require("@expo/json-file"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const joi_1 = tslib_1.__importDefault(require("joi"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const path_1 = tslib_1.__importDefault(require("path"));
 async function createOrModifyExpoConfigAsync(projectDir, exp, readOptions) {
     ensureExpoConfigExists(projectDir);
@@ -67,18 +68,23 @@ function ensureExpoConfigExists(projectDir) {
 }
 exports.ensureExpoConfigExists = ensureExpoConfigExists;
 async function ensureStaticExpoConfigIsValidAsync(projectDir) {
-    var _a;
-    const paths = (0, config_1.getConfigFilePaths)(projectDir);
-    if (((_a = paths === null || paths === void 0 ? void 0 : paths.staticConfigPath) === null || _a === void 0 ? void 0 : _a.endsWith('app.json')) && !(paths === null || paths === void 0 ? void 0 : paths.dynamicConfigPath)) {
-        const staticConfig = await json_file_1.default.readAsync(paths.staticConfigPath);
+    if (isUsingStaticExpoConfig(projectDir)) {
+        const staticConfigPath = (0, nullthrows_1.default)((0, config_1.getConfigFilePaths)(projectDir).staticConfigPath);
+        const staticConfig = await json_file_1.default.readAsync(staticConfigPath);
         // Add the "expo" key if it doesn't exist on app.json yet, such as in
         // projects initialized with RNC CLI
         if (!(staticConfig === null || staticConfig === void 0 ? void 0 : staticConfig.expo)) {
             staticConfig.expo = {};
-            await json_file_1.default.writeAsync(paths.staticConfigPath, staticConfig);
+            await json_file_1.default.writeAsync(staticConfigPath, staticConfig);
         }
     }
 }
+function isUsingStaticExpoConfig(projectDir) {
+    var _a;
+    const paths = (0, config_1.getConfigFilePaths)(projectDir);
+    return !!(((_a = paths.staticConfigPath) === null || _a === void 0 ? void 0 : _a.endsWith('app.json')) && !paths.dynamicConfigPath);
+}
+exports.isUsingStaticExpoConfig = isUsingStaticExpoConfig;
 function getPublicExpoConfig(projectDir, opts = {}) {
     ensureExpoConfigExists(projectDir);
     return getExpoConfigInternal(projectDir, { ...opts, isPublicConfig: true });

package/build/project/publish.js

@@ -452,7 +452,7 @@ async function getRuntimeVersionObjectAsync(exp, platforms, projectDir) {
             const isManaged = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform)) ===
                 eas_build_job_1.Workflow.MANAGED;
             if (!isManaged) {
-                throw new Error('Runtime version policies are only supported in the managed workflow. In the bare workflow, runtime version needs to be set manually.');
+                throw new Error(`You're currently using the bare workflow, where runtime version policies are not supported. You must set your runtime version manually. For example, define your runtime version as "1.0.0", not {"policy": "appVersion"} in your app config. ${(0, log_1.learnMore)('https://docs.expo.dev/eas-update/runtime-versions')}`);
             }
         }
     }

package/build/update/configure.d.ts

@@ -12,15 +12,20 @@ export declare function ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir: st
 /**
  * Make sure EAS Update is fully configured in the current project.
  * This goes over a checklist and performs the following checks or changes:
- *   - Enure the `expo-updates` package is currently installed.
+ *   - Ensure `updates.useClassicUpdates` (SDK 49) is not set in the app config
+ *   - Ensure the `expo-updates` package is currently installed.
  *   - Ensure `app.json` is configured for EAS Updates
  *     - Sets `runtimeVersion` if not set
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any
  */
-export declare function ensureEASUpdateIsConfiguredAsync(graphqlClient: ExpoGraphqlClient, { exp: expWithoutUpdates, projectId, projectDir, platform, }: {
+export declare function ensureEASUpdateIsConfiguredAsync(graphqlClient: ExpoGraphqlClient, { exp: expMaybeWithoutUpdates, projectId, projectDir, platform, }: {
     exp: ExpoConfig;
     projectId: string;
     projectDir: string;
     platform: RequestedPlatform | null;
 }): Promise<void>;
+export declare function ensureUseClassicUpdatesIsRemovedAsync({ exp: expMaybeWithoutUpdates, projectDir, }: {
+    exp: ExpoConfig;
+    projectDir: string;
+}): Promise<ExpoConfig>;

package/build/update/configure.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureEASUpdateIsConfiguredAsync = exports.ensureEASUpdateIsConfiguredInEasJsonAsync = exports.DEFAULT_BARE_RUNTIME_VERSION = exports.DEFAULT_MANAGED_RUNTIME_VERSION = void 0;
+exports.ensureUseClassicUpdatesIsRemovedAsync = exports.ensureEASUpdateIsConfiguredAsync = exports.ensureEASUpdateIsConfiguredInEasJsonAsync = exports.DEFAULT_BARE_RUNTIME_VERSION = exports.DEFAULT_MANAGED_RUNTIME_VERSION = void 0;
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const eas_json_1 = require("@expo/eas-json");
@@ -13,6 +13,7 @@ const platform_1 = require("../platform");
 const expoConfig_1 = require("../project/expoConfig");
 const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
+const prompts_1 = require("../prompts");
 const UpdatesModule_1 = require("./android/UpdatesModule");
 const UpdatesModule_2 = require("./ios/UpdatesModule");
 exports.DEFAULT_MANAGED_RUNTIME_VERSION = { policy: 'sdkVersion' };
@@ -118,18 +119,33 @@ async function ensureEASUpdatesIsConfiguredInExpoConfigAsync({ exp, projectId, p
             throw new Error(`Unexpected result type "${result.type}" received when modifying the project config.`);
     }
 }
+function serializeRuntimeVersionToString(runtimeVersion) {
+    if (typeof runtimeVersion === 'object') {
+        return JSON.stringify(runtimeVersion);
+    }
+    else {
+        return runtimeVersion;
+    }
+}
 function logEasUpdatesAutoConfig({ modifyConfig, exp, }) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f;
     if ((_a = modifyConfig.updates) === null || _a === void 0 ? void 0 : _a.url) {
         log_1.default.withTick(((_b = exp.updates) === null || _b === void 0 ? void 0 : _b.url)
             ? `Overwrote updates.url "${exp.updates.url}" with "${modifyConfig.updates.url}"`
             : `Configured updates.url to "${modifyConfig.updates.url}"`);
     }
-    if ((_d = (_c = modifyConfig.android) === null || _c === void 0 ? void 0 : _c.runtimeVersion) !== null && _d !== void 0 ? _d : modifyConfig.runtimeVersion) {
-        log_1.default.withTick(`Configured runtimeVersion for ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Android]} with "${JSON.stringify((_f = (_e = modifyConfig.android) === null || _e === void 0 ? void 0 : _e.runtimeVersion) !== null && _f !== void 0 ? _f : modifyConfig.runtimeVersion)}"`);
+    const androidRuntime = (_d = (_c = modifyConfig.android) === null || _c === void 0 ? void 0 : _c.runtimeVersion) !== null && _d !== void 0 ? _d : modifyConfig.runtimeVersion;
+    const iosRuntime = (_f = (_e = modifyConfig.ios) === null || _e === void 0 ? void 0 : _e.runtimeVersion) !== null && _f !== void 0 ? _f : modifyConfig.runtimeVersion;
+    if (androidRuntime && iosRuntime && androidRuntime === iosRuntime) {
+        log_1.default.withTick(`Configured runtimeVersion for ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Android]} and ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Ios]} with "${serializeRuntimeVersionToString(androidRuntime)}"`);
     }
-    if ((_h = (_g = modifyConfig.ios) === null || _g === void 0 ? void 0 : _g.runtimeVersion) !== null && _h !== void 0 ? _h : modifyConfig.runtimeVersion) {
-        log_1.default.withTick(`Configured runtimeVersion for ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Ios]} with "${JSON.stringify((_k = (_j = modifyConfig.ios) === null || _j === void 0 ? void 0 : _j.runtimeVersion) !== null && _k !== void 0 ? _k : modifyConfig.runtimeVersion)}"`);
+    else {
+        if (androidRuntime) {
+            log_1.default.withTick(`Configured runtimeVersion for ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Android]} with "${serializeRuntimeVersionToString(androidRuntime)}"`);
+        }
+        if (iosRuntime) {
+            log_1.default.withTick(`Configured runtimeVersion for ${platform_1.appPlatformDisplayNames[generated_1.AppPlatform.Ios]} with "${serializeRuntimeVersionToString(iosRuntime)}"`);
+        }
     }
 }
 function warnEASUpdatesManualConfig({ modifyConfig, workflows, }) {
@@ -204,14 +220,23 @@ exports.ensureEASUpdateIsConfiguredInEasJsonAsync = ensureEASUpdateIsConfiguredI
 /**
  * Make sure EAS Update is fully configured in the current project.
  * This goes over a checklist and performs the following checks or changes:
- *   - Enure the `expo-updates` package is currently installed.
+ *   - Ensure `updates.useClassicUpdates` (SDK 49) is not set in the app config
+ *   - Ensure the `expo-updates` package is currently installed.
  *   - Ensure `app.json` is configured for EAS Updates
  *     - Sets `runtimeVersion` if not set
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any
  */
-async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expWithoutUpdates, projectId, projectDir, platform, }) {
-    const hasExpoUpdates = (0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, expWithoutUpdates.sdkVersion);
+async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expMaybeWithoutUpdates, projectId, projectDir, platform, }) {
+    var _a;
+    // EAS Update and SDK 49's "useClassicUpdates" option are mutually exclusive
+    if ((_a = expMaybeWithoutUpdates.updates) === null || _a === void 0 ? void 0 : _a.useClassicUpdates) {
+        expMaybeWithoutUpdates = await ensureUseClassicUpdatesIsRemovedAsync({
+            exp: expMaybeWithoutUpdates,
+            projectDir,
+        });
+    }
+    const hasExpoUpdates = (0, projectUtils_1.isExpoUpdatesInstalledOrAvailable)(projectDir, expMaybeWithoutUpdates.sdkVersion);
     const hasExpoUpdatesInDevDependencies = (0, projectUtils_1.isExpoUpdatesInstalledAsDevDependency)(projectDir);
     if (!hasExpoUpdates && !hasExpoUpdatesInDevDependencies) {
         await (0, projectUtils_1.installExpoUpdatesAsync)(projectDir, { silent: false });
@@ -227,7 +252,7 @@ async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expWithout
     }
     const workflows = await (0, workflow_1.resolveWorkflowPerPlatformAsync)(projectDir);
     const { projectChanged, exp: expWithUpdates } = await ensureEASUpdatesIsConfiguredInExpoConfigAsync({
-        exp: expWithoutUpdates,
+        exp: expMaybeWithoutUpdates,
         projectDir,
         projectId,
         platform,
@@ -249,3 +274,31 @@ async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expWithout
     }
 }
 exports.ensureEASUpdateIsConfiguredAsync = ensureEASUpdateIsConfiguredAsync;
+async function ensureUseClassicUpdatesIsRemovedAsync({ exp: expMaybeWithoutUpdates, projectDir, }) {
+    if (!(0, expoConfig_1.isUsingStaticExpoConfig)(projectDir)) {
+        throw new Error(`Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "useClassicUpdates" from your app config and run this command again.`);
+    }
+    const shouldEditConfig = await (0, prompts_1.confirmAsync)({
+        message: `Your app config sets "updates.useClassicUpdates" but EAS Update does not support classic updates. Remove "updates.useClassicUpdates" from your app config?`,
+    });
+    if (!shouldEditConfig) {
+        throw new Error(`Manually remove "updates.useClassicUpdates" from your app config and run this command again.`);
+    }
+    const editedExpoConfig = mergeExpoConfig(expMaybeWithoutUpdates, {
+        updates: { useClassicUpdates: undefined },
+    });
+    const result = await (0, expoConfig_1.createOrModifyExpoConfigAsync)(projectDir, editedExpoConfig);
+    switch (result.type) {
+        case 'success':
+            log_1.default.withTick(`Removed "updates.useClassicUpdates"`);
+            expMaybeWithoutUpdates = editedExpoConfig;
+            break;
+        case 'warn':
+        case 'fail':
+            throw new Error(result.message);
+        default:
+            throw new Error(`Unexpected result type "${result.type}" received when modifying the project config.`);
+    }
+    return editedExpoConfig;
+}
+exports.ensureUseClassicUpdatesIsRemovedAsync = ensureUseClassicUpdatesIsRemovedAsync;