eas-cli 0.35.0 → 0.38.0

package/build/credentials/ios/actions/RemoveAscApiKey.js

@@ -13,7 +13,7 @@ class SelectAndRemoveAscApiKey {
         const selected = await (0, AscApiKeyUtils_1.selectAscApiKeysFromAccountAsync)(ctx, this.account);
         if (selected) {
             await new RemoveAscApiKey(this.account, selected).runAsync(ctx);
-            log_1.default.succeed('Removed App Store Connect Api Key');
+            log_1.default.succeed('Removed App Store Connect API Key');
             log_1.default.newLine();
         }
     }
@@ -26,26 +26,26 @@ class RemoveAscApiKey {
     }
     async runAsync(ctx) {
         if (ctx.nonInteractive) {
-            throw new Error(`Cannot remove App Store Connect Api Keys in non-interactive mode.`);
+            throw new Error(`Cannot remove App Store Connect API Keys in non-interactive mode.`);
         }
         // TODO(quin): add an extra edge on AppStoreConnectApiKey to find the apps using it
         const confirm = await (0, prompts_1.confirmAsync)({
-            message: `Deleting this Api Key may affect your projects that rely on it. Do you want to continue?`,
+            message: `Deleting this API Key may affect your projects that rely on it. Do you want to continue?`,
         });
         if (!confirm) {
             log_1.default.log('Aborting');
             return;
         }
-        log_1.default.log('Removing Api Key');
+        log_1.default.log('Removing API Key');
         await ctx.ios.deleteAscApiKeyAsync(this.ascApiKey.id);
         let shouldRevoke = false;
         if (!ctx.nonInteractive) {
             shouldRevoke = await (0, prompts_1.confirmAsync)({
-                message: `Do you also want to revoke this Api Key on the Apple Developer Portal?`,
+                message: `Do you also want to revoke this API Key on the Apple Developer Portal?`,
             });
         }
         else if (ctx.nonInteractive) {
-            log_1.default.log('Skipping Api Key revocation on the Apple Developer Portal.');
+            log_1.default.log('Skipping API Key revocation on the Apple Developer Portal.');
         }
         if (shouldRevoke) {
             await ctx.appStore.revokeAscApiKeyAsync(this.ascApiKey.keyIdentifier);

package/build/credentials/ios/actions/SetUpAscApiKey.js

@@ -22,20 +22,20 @@ class SetUpAscApiKey {
         this.purpose = purpose;
         this.choices = [
             {
-                title: '[Choose an existing ASC Api Key]',
+                title: '[Choose an existing ASC API Key]',
                 value: SetupAscApiKeyChoice.USE_EXISTING,
             },
-            { title: '[Add a new ASC Api Key]', value: SetupAscApiKeyChoice.GENERATE },
+            { title: '[Add a new ASC API Key]', value: SetupAscApiKeyChoice.GENERATE },
         ];
     }
     async runAsync(ctx) {
         const isKeySetup = await this.isAscApiKeySetupAsync(ctx, this.purpose);
         if (isKeySetup) {
-            log_1.default.succeed('App Store Connect Api Key already set up.');
-            return (0, nullthrows_1.default)(await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app), 'iosAppCredentials cannot be null if App Store Connect Api Key is already set up');
+            log_1.default.succeed('App Store Connect API Key already set up.');
+            return (0, nullthrows_1.default)(await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app), 'iosAppCredentials cannot be null if App Store Connect API Key is already set up');
         }
         if (ctx.nonInteractive) {
-            throw new errors_1.MissingCredentialsNonInteractiveError('App Store Connect Api Keys cannot be set up in --non-interactive mode.');
+            throw new errors_1.MissingCredentialsNonInteractiveError('App Store Connect API Keys cannot be set up in --non-interactive mode.');
         }
         const keysForAccount = await (0, AscApiKeyUtils_1.getAscApiKeysFromAccountAsync)(ctx, this.app.account, {
             filterDifferentAppleTeam: true,
@@ -64,10 +64,10 @@ class SetUpAscApiKey {
         }
         const [autoselectedKey] = (0, AscApiKeyUtils_1.sortAscApiKeysByUpdatedAtDesc)(validKeys);
         const useAutoselected = await (0, prompts_1.confirmAsync)({
-            message: `Reuse this App Store Connect Api Key?\n${(0, AscApiKeyUtils_1.formatAscApiKey)(autoselectedKey)}`,
+            message: `Reuse this App Store Connect API Key?\n${(0, AscApiKeyUtils_1.formatAscApiKey)(autoselectedKey)}`,
         });
         if (useAutoselected) {
-            log_1.default.log(`Using App Store Connect Api Key with ID ${autoselectedKey.keyIdentifier}`);
+            log_1.default.log(`Using App Store Connect API Key with ID ${autoselectedKey.keyIdentifier}`);
             return autoselectedKey;
         }
         else {
@@ -77,7 +77,7 @@ class SetUpAscApiKey {
     async isAscApiKeySetupAsync(ctx, purpose) {
         const appCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(this.app);
         if (purpose !== AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
-            throw new Error(`App Store Connect Api Key setup is not yet supported for ${purpose}.`);
+            throw new Error(`App Store Connect API Key setup is not yet supported for ${purpose}.`);
         }
         return !!(appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.appStoreConnectApiKeyForSubmissions);
     }

package/build/credentials/ios/actions/SetUpSubmissionCredentials.js

@@ -14,7 +14,7 @@ exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD = 'PROMPT_FOR_APP_SPECIFIC_PASSWORD';
 class SetUpSubmissionCredentials {
     constructor(app) {
         this.setupAscApiKeyAction = new SetUpAscApiKey_1.SetUpAscApiKey(app, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
-        // Add this unrelated choice to ASC Api Key setup for legacy purposes -- we will deprecate it soon
+        // Add this unrelated choice to ASC API Key setup for legacy purposes -- we will deprecate it soon
         this.setupAscApiKeyAction.choices = this.setupAscApiKeyAction.choices.concat({
             title: '[Enter an App Specific Password]',
             value: exports.PROMPT_FOR_APP_SPECIFIC_PASSWORD,
@@ -23,8 +23,8 @@ class SetUpSubmissionCredentials {
     async runAsync(ctx) {
         try {
             const iosAppCredentials = await this.setupAscApiKeyAction.runAsync(ctx);
-            const { keyIdentifier, name } = (0, nullthrows_1.default)(iosAppCredentials.appStoreConnectApiKeyForSubmissions, 'ASC Api Key must be defined for EAS Submit');
-            log_1.default.log(`Using Api Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
+            const { keyIdentifier, name } = (0, nullthrows_1.default)(iosAppCredentials.appStoreConnectApiKeyForSubmissions, 'ASC API Key must be defined for EAS Submit');
+            log_1.default.log(`Using API Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
             return iosAppCredentials;
         }
         catch (e) {

package/build/credentials/ios/appstore/ascApiKey.js

@@ -7,26 +7,26 @@ const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 const ora_1 = require("../../../ora");
 const authenticate_1 = require("./authenticate");
 async function listAscApiKeysAsync(authCtx) {
-    const spinner = (0, ora_1.ora)(`Fetching App Store Connect Api Keys.`).start();
+    const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Keys.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const keys = await apple_utils_1.ApiKey.getAsync(context);
-        spinner.succeed(`Fetched App Store Connect Api Keys.`);
+        spinner.succeed(`Fetched App Store Connect API Keys.`);
         return keys.map(key => getAscApiKeyInfo(key, authCtx));
     }
     catch (error) {
-        spinner.fail(`Failed to fetch App Store Connect Api Keys.`);
+        spinner.fail(`Failed to fetch App Store Connect API Keys.`);
         throw error;
     }
 }
 exports.listAscApiKeysAsync = listAscApiKeysAsync;
 async function getAscApiKeyAsync(authCtx, keyId) {
     var _a;
-    const spinner = (0, ora_1.ora)(`Fetching App Store Connect Api Key.`).start();
+    const spinner = (0, ora_1.ora)(`Fetching App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const apiKey = await apple_utils_1.ApiKey.infoAsync(context, { id: keyId });
-        spinner.succeed(`Fetched App Store Connect Api Key (ID: ${keyId}).`);
+        spinner.succeed(`Fetched App Store Connect API Key (ID: ${keyId}).`);
         return getAscApiKeyInfo(apiKey, authCtx);
     }
     catch (error) {
@@ -36,13 +36,13 @@ async function getAscApiKeyAsync(authCtx, keyId) {
             return null;
         }
         log_1.default.error(error);
-        spinner.fail(`Failed to fetch App Store Connect Api Key.`);
+        spinner.fail(`Failed to fetch App Store Connect API Key.`);
         throw error;
     }
 }
 exports.getAscApiKeyAsync = getAscApiKeyAsync;
 async function createAscApiKeyAsync(authCtx, { nickname, allAppsVisible, roles, keyType, }) {
-    const spinner = (0, ora_1.ora)(`Creating App Store Connect Api Key.`).start();
+    const spinner = (0, ora_1.ora)(`Creating App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const key = await apple_utils_1.ApiKey.createAsync(context, {
@@ -66,30 +66,30 @@ async function createAscApiKeyAsync(authCtx, { nickname, allAppsVisible, roles,
         }
         // this object has more optional parameters populated
         const fullKey = await apple_utils_1.ApiKey.infoAsync(context, { id: key.id });
-        spinner.succeed(`Created App Store Connect Api Key.`);
+        spinner.succeed(`Created App Store Connect API Key.`);
         return {
             ...getAscApiKeyInfo(fullKey, authCtx),
             keyP8,
         };
     }
     catch (err) {
-        spinner.fail('Failed to create App Store Connect Api Key.');
+        spinner.fail('Failed to create App Store Connect API Key.');
         throw err;
     }
 }
 exports.createAscApiKeyAsync = createAscApiKeyAsync;
 async function revokeAscApiKeyAsync(authCtx, keyId) {
-    const spinner = (0, ora_1.ora)(`Revoking App Store Connect Api Key.`).start();
+    const spinner = (0, ora_1.ora)(`Revoking App Store Connect API Key.`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const apiKey = await apple_utils_1.ApiKey.infoAsync(context, { id: keyId });
         const revokedKey = await apiKey.revokeAsync();
-        spinner.succeed(`Revoked App Store Connect Api Key.`);
+        spinner.succeed(`Revoked App Store Connect API Key.`);
         return getAscApiKeyInfo(revokedKey, authCtx);
     }
     catch (error) {
         log_1.default.error(error);
-        spinner.fail(`Failed to revoke App Store Connect Api Key.`);
+        spinner.fail(`Failed to revoke App Store Connect API Key.`);
         throw error;
     }
 }

package/build/credentials/ios/appstore/bundleIdCapabilities.js

@@ -4,6 +4,7 @@ exports.CapabilityMapping = exports.assertValidOptions = exports.syncCapabilitie
 const tslib_1 = require("tslib");
 const apple_utils_1 = require("@expo/apple-utils");
 const getenv_1 = (0, tslib_1.__importDefault)(require("getenv"));
+const util_1 = require("util");
 const log_1 = (0, tslib_1.__importDefault)(require("../../../log"));
 exports.EXPO_NO_CAPABILITY_SYNC = getenv_1.default.boolish('EXPO_NO_CAPABILITY_SYNC', false);
 const validateBooleanOptions = (options) => {
@@ -56,7 +57,16 @@ async function syncCapabilitiesForEntitlementsAsync(bundleId, entitlements = {})
     const { enabledCapabilityNames, request, remainingCapabilities } = getCapabilitiesToEnable(currentCapabilities, entitlements);
     const { disabledCapabilityNames, request: modifiedRequest } = getCapabilitiesToDisable(bundleId, remainingCapabilities, request);
     if (modifiedRequest.length) {
-        await bundleId.updateBundleIdCapabilityAsync(modifiedRequest);
+        log_1.default.debug(`Patch Request:`, (0, util_1.inspect)(modifiedRequest, { depth: null, colors: true }));
+        try {
+            await bundleId.updateBundleIdCapabilityAsync(modifiedRequest);
+        }
+        catch (error) {
+            if (error.message.match(/bundle '[\w\d]+' cannot be deleted. Delete all the Apps/)) {
+                log_1.default.error('Failed to patch capabilities:', (0, util_1.inspect)(modifiedRequest, { depth: null, colors: true }));
+                throw new Error(`Unexpected error occurred while attempting to update capabilities for app "${bundleId.attributes.identifier}".\nCapabilities can be modified manually in the Apple developer console at https://developer.apple.com/account/resources/identifiers/bundleId/edit/${bundleId.id}.\nAuto capability syncing can be disabled with the environment variable \`EXPO_NO_CAPABILITY_SYNC=1\`.\n${error.message}`);
+            }
+        }
     }
     return { enabled: enabledCapabilityNames, disabled: disabledCapabilityNames };
 }

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

@@ -1,4 +1,4 @@
 import { Workflow } from '@expo/eas-build-job';
 import { JSONObject } from '@expo/json-file';
-export declare function getManagedEntitlementsJsonAsync(projectDir: string): Promise<JSONObject>;
-export declare function resolveEntitlementsJsonAsync(projectDir: string, workflow: Workflow): Promise<JSONObject>;
+export declare function getManagedEntitlementsJsonAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
+export declare function resolveEntitlementsJsonAsync(projectDir: string, workflow: Workflow, env: Record<string, string>): Promise<JSONObject>;

package/build/credentials/ios/appstore/entitlements.js

@@ -1,29 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveEntitlementsJsonAsync = exports.getManagedEntitlementsJsonAsync = void 0;
-const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
-const plist_1 = (0, tslib_1.__importDefault)(require("@expo/plist"));
 const prebuild_config_1 = require("@expo/prebuild-config");
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-async function getManagedEntitlementsJsonAsync(projectDir) {
+const plist_1 = require("../../../utils/plist");
+async function getManagedEntitlementsJsonAsync(projectDir, env) {
     var _a;
-    let { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
-    exp = await (0, config_plugins_1.compileModsAsync)(exp, {
-        projectRoot: projectDir,
-        platforms: ['ios'],
-        introspect: true,
-    });
-    return ((_a = exp.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+    const originalProcessEnv = process.env;
+    try {
+        process.env = {
+            ...process.env,
+            ...env,
+        };
+        const { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
+        const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
+            projectRoot: projectDir,
+            platforms: ['ios'],
+            introspect: true,
+        });
+        return ((_a = expWithMods.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+    }
+    finally {
+        process.env = originalProcessEnv;
+    }
 }
 exports.getManagedEntitlementsJsonAsync = getManagedEntitlementsJsonAsync;
-async function resolveEntitlementsJsonAsync(projectDir, workflow) {
+async function resolveEntitlementsJsonAsync(projectDir, workflow, env) {
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         return (await getEntitlementsJsonAsync(projectDir)) || {};
     }
     else if (workflow === eas_build_job_1.Workflow.MANAGED) {
-        return await getManagedEntitlementsJsonAsync(projectDir);
+        return await getManagedEntitlementsJsonAsync(projectDir, env);
     }
     else {
         throw new Error(`Unknown workflow: ${workflow}`);
@@ -31,13 +39,12 @@ async function resolveEntitlementsJsonAsync(projectDir, workflow) {
 }
 exports.resolveEntitlementsJsonAsync = resolveEntitlementsJsonAsync;
 async function getEntitlementsJsonAsync(projectDir) {
-    try {
-        const entitlementsPath = config_plugins_1.IOSConfig.Paths.getEntitlementsPath(projectDir);
-        if (entitlementsPath) {
-            const entitlementsContents = await fs_extra_1.default.readFile(entitlementsPath, 'utf8');
-            return plist_1.default.parse(entitlementsContents);
-        }
+    const entitlementsPath = config_plugins_1.IOSConfig.Paths.getEntitlementsPath(projectDir);
+    if (entitlementsPath) {
+        const plist = await (0, plist_1.readPlistAsync)(entitlementsPath);
+        return plist ? plist : null;
+    }
+    else {
+        return null;
     }
-    catch { }
-    return null;
 }

package/build/credentials/ios/credentials.js

@@ -51,7 +51,7 @@ exports.distributionCertificateSchema = {
     },
 };
 exports.ascApiKeyIdSchema = {
-    name: 'App Store Connect Api Key',
+    name: 'App Store Connect API Key',
     questions: [
         {
             field: 'keyId',
@@ -61,7 +61,7 @@ exports.ascApiKeyIdSchema = {
     ],
 };
 exports.ascApiKeyIssuerIdSchema = {
-    name: 'App Store Connect Api Key',
+    name: 'App Store Connect API Key',
     questions: [
         {
             field: 'issuerId',

package/build/credentials/ios/utils/printCredentials.js

@@ -198,7 +198,7 @@ function displayApplePushKey(maybePushKey, fields) {
     fields.push({ label: '', value: '' });
 }
 function displayAscApiKey(maybeAscApiKey, fields) {
-    fields.push({ label: 'App Store Connect Api Key', value: '' });
+    fields.push({ label: 'App Store Connect API Key', value: '' });
     if (maybeAscApiKey) {
         const { keyIdentifier, issuerIdentifier, appleTeam, name, roles, updatedAt } = maybeAscApiKey;
         fields.push({ label: 'Developer Portal ID', value: keyIdentifier });

package/build/credentials/manager/AndroidActions.js

@@ -10,7 +10,7 @@ exports.highLevelActions = [
     },
     {
         value: Actions_1.AndroidActionType.ManageFcm,
-        title: 'Push Notifications: Manage your FCM Api Key',
+        title: 'Push Notifications: Manage your FCM API Key',
         scope: Actions_1.Scope.Manager,
     },
     {
@@ -71,12 +71,12 @@ exports.buildCredentialsActions = [
 exports.fcmActions = [
     {
         value: Actions_1.AndroidActionType.CreateFcm,
-        title: 'Upload an FCM Api Key',
+        title: 'Upload an FCM API Key',
         scope: Actions_1.Scope.Project,
     },
     {
         value: Actions_1.AndroidActionType.RemoveFcm,
-        title: 'Delete your FCM Api Key',
+        title: 'Delete your FCM API Key',
         scope: Actions_1.Scope.Project,
     },
     {

package/build/credentials/manager/IosActions.js

@@ -15,7 +15,7 @@ exports.highLevelActions = [
     },
     {
         value: Actions_1.IosActionType.ManageAscApiKey,
-        title: 'App Store Connect: Manage your Api Key',
+        title: 'App Store Connect: Manage your API Key',
         scope: Actions_1.Scope.Manager,
     },
     {
@@ -80,22 +80,22 @@ function getAscApiKeyActions(ctx) {
     return [
         {
             value: Actions_1.IosActionType.SetUpAscApiKeyForSubmissions,
-            title: 'Set up your project to use an Api Key for EAS Submit',
+            title: 'Set up your project to use an API Key for EAS Submit',
             scope: Actions_1.Scope.Project,
         },
         {
             value: Actions_1.IosActionType.UseExistingAscApiKeyForSubmissions,
-            title: 'Use an existing Api Key for EAS Submit',
+            title: 'Use an existing API Key for EAS Submit',
             scope: Actions_1.Scope.Project,
         },
         {
             value: Actions_1.IosActionType.CreateAscApiKeyForSubmissions,
-            title: 'Add a new Api Key For EAS Submit',
+            title: 'Add a new API Key For EAS Submit',
             scope: ctx.hasProjectContext ? Actions_1.Scope.Project : Actions_1.Scope.Account,
         },
         {
             value: Actions_1.IosActionType.RemoveAscApiKey,
-            title: 'Delete an Api Key',
+            title: 'Delete an API Key',
             scope: Actions_1.Scope.Account,
         },
         {

package/build/credentials/manager/ManageIos.js

@@ -175,7 +175,7 @@ class ManageIos {
         }
     }
     async runProjectSpecificActionAsync(ctx, app, targets, buildProfile, action) {
-        var _a;
+        var _a, _b;
         if (action === Actions_1.IosActionType.SetUpBuildCredentials) {
             await new SetUpBuildCredentials_1.SetUpBuildCredentials({
                 app,
@@ -183,7 +183,7 @@ class ManageIos {
                 distribution: buildProfile.distribution,
                 enterpriseProvisioning: buildProfile.enterpriseProvisioning,
                 iosCapabilitiesOptions: {
-                    entitlements: await (0, entitlements_1.getManagedEntitlementsJsonAsync)(ctx.projectDir),
+                    entitlements: await (0, entitlements_1.getManagedEntitlementsJsonAsync)(ctx.projectDir, (_a = buildProfile.env) !== null && _a !== void 0 ? _a : {}),
                 },
             }).runAsync(ctx);
             return;
@@ -220,7 +220,7 @@ class ManageIos {
             }
             case Actions_1.IosActionType.RemoveProvisioningProfile: {
                 const iosAppCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(appLookupParams);
-                const provisioningProfile = (_a = iosAppCredentials === null || iosAppCredentials === void 0 ? void 0 : iosAppCredentials.iosAppBuildCredentialsList.find(buildCredentials => buildCredentials.iosDistributionType === distributionType)) === null || _a === void 0 ? void 0 : _a.provisioningProfile;
+                const provisioningProfile = (_b = iosAppCredentials === null || iosAppCredentials === void 0 ? void 0 : iosAppCredentials.iosAppBuildCredentialsList.find(buildCredentials => buildCredentials.iosDistributionType === distributionType)) === null || _b === void 0 ? void 0 : _b.provisioningProfile;
                 if (!provisioningProfile) {
                     log_1.default.log(`No provisioning profile associated with the ${distributionType} configuration of ${appLookupParams.projectName}`);
                     return;
@@ -277,7 +277,7 @@ class ManageIos {
             case Actions_1.IosActionType.CreateAscApiKeyForSubmissions: {
                 const ascApiKey = await new CreateAscApiKey_1.CreateAscApiKey(appLookupParams.account).runAsync(ctx, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
                 const confirm = await (0, prompts_1.confirmAsync)({
-                    message: `Do you want ${appLookupParams.projectName} to use the new Api Key?`,
+                    message: `Do you want ${appLookupParams.projectName} to use the new API Key?`,
                 });
                 if (confirm) {
                     await new AssignAscApiKey_1.AssignAscApiKey(appLookupParams).runAsync(ctx, ascApiKey, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);