eas-cli 0.36.1 → 0.38.2

package/build/commands/build/index.js

@@ -13,7 +13,7 @@ const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
 const build_1 = require("../../build/android/build");
 const build_2 = require("../../build/build");
 const configure_1 = require("../../build/configure");
-const context_1 = require("../../build/context");
+const createContext_1 = require("../../build/createContext");
 const build_3 = require("../../build/ios/build");
 const devClient_1 = require("../../build/utils/devClient");
 const printBuildInfo_1 = require("../../build/utils/printBuildInfo");
@@ -23,11 +23,10 @@ const generated_1 = require("../../graphql/generated");
 const AppPlatform_1 = require("../../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const metroConfig_1 = require("../../project/metroConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const context_2 = require("../../submit/context");
+const context_1 = require("../../submit/context");
 const submit_1 = require("../../submit/submit");
 const urls_1 = require("../../submit/utils/urls");
 const easCli_1 = require("../../utils/easCli");
@@ -54,13 +53,11 @@ class Build extends EasCommand_1.default {
         await (0, repository_1.ensureRepoIsCleanAsync)(flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)(projectDir, requestedPlatform);
         const platforms = (0, platform_1.toPlatforms)(requestedPlatform);
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const buildProfiles = await (0, profiles_1.getProfilesAsync)({
+            type: 'build',
+            projectDir,
             platforms,
-            profileName: flags.profile,
-            async readProfileAsync(platform, profileName) {
-                return await easJsonReader.readBuildProfileAsync(platform, profileName);
-            },
+            profileName: (_a = flags.profile) !== null && _a !== void 0 ? _a : undefined,
         });
         await (0, devClient_1.ensureExpoDevClientInstalledForDevClientBuildsAsync)({
             projectDir,
@@ -89,14 +86,22 @@ class Build extends EasCommand_1.default {
         log_1.default.newLine();
         const submissions = [];
         if (flags.autoSubmit) {
+            const submitProfiles = await (0, profiles_1.getProfilesAsync)({
+                projectDir,
+                platforms,
+                profileName: flags.submitProfile,
+                type: 'submit',
+            });
             for (const startedBuild of startedBuilds) {
+                const submitProfile = (0, nullthrows_1.default)(submitProfiles.find(({ platform }) => (0, AppPlatform_1.toAppPlatform)(platform) === startedBuild.build.platform)).profile;
                 const submission = await this.prepareAndStartSubmissionAsync({
                     build: startedBuild.build,
-                    credentialsCtx: (0, nullthrows_1.default)((_a = buildCtxByPlatform[startedBuild.build.platform]) === null || _a === void 0 ? void 0 : _a.credentialsCtx),
-                    flags,
+                    buildCtx: (0, nullthrows_1.default)(buildCtxByPlatform[startedBuild.build.platform]),
                     moreBuilds: startedBuilds.length > 1,
                     projectDir,
-                    buildProfile: startedBuild.buildProfile,
+                    buildProfile: startedBuild.buildProfile.profile,
+                    submitProfile,
+                    nonInteractive: flags.nonInteractive,
                 });
                 submissions.push(submission);
             }
@@ -148,7 +153,7 @@ class Build extends EasCommand_1.default {
         return {
             requestedPlatform,
             skipProjectConfiguration: flags['skip-project-configuration'],
-            profile: profile !== null && profile !== void 0 ? profile : null,
+            profile,
             nonInteractive,
             local: flags['local'],
             wait: flags['wait'],
@@ -159,7 +164,7 @@ class Build extends EasCommand_1.default {
         };
     }
     async prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildProfile, }) {
-        const buildCtx = await (0, context_1.createBuildContextAsync)({
+        const buildCtx = await (0, createContext_1.createBuildContextAsync)({
             buildProfileName: buildProfile.profileName,
             clearCache: flags.clearCache,
             buildProfile: buildProfile.profile,
@@ -178,9 +183,6 @@ class Build extends EasCommand_1.default {
             await (0, metroConfig_1.validateMetroConfigForManagedWorkflowAsync)(buildCtx);
             this.metroConfigValidated = true;
         }
-        if (!buildCtx.local && !(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(buildCtx.projectId))) {
-            (0, errors_1.error)(isEasEnabledForProject_1.EAS_UNAVAILABLE_MESSAGE, { exit: 1 });
-        }
         const build = await this.startBuildAsync(buildCtx);
         return {
             build,
@@ -197,19 +199,19 @@ class Build extends EasCommand_1.default {
         }
         return await sendBuildRequestAsync();
     }
-    async prepareAndStartSubmissionAsync({ build, credentialsCtx, flags, moreBuilds, projectDir, buildProfile, }) {
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+    async prepareAndStartSubmissionAsync({ build, buildCtx, moreBuilds, projectDir, buildProfile, submitProfile, nonInteractive, }) {
+        var _a, _b, _c;
         const platform = (0, AppPlatform_1.toPlatform)(build.platform);
-        const submitProfile = await easJsonReader.readSubmitProfileAsync(platform, flags.submitProfile);
-        const submissionCtx = await (0, context_2.createSubmissionContextAsync)({
+        const submissionCtx = await (0, context_1.createSubmissionContextAsync)({
             platform,
             projectDir,
             projectId: build.project.id,
             profile: submitProfile,
             archiveFlags: { id: build.id },
-            nonInteractive: flags.nonInteractive,
-            env: buildProfile.profile.env,
-            credentialsCtx,
+            nonInteractive,
+            env: buildProfile.env,
+            credentialsCtx: buildCtx.credentialsCtx,
+            applicationIdentifier: (_b = (_a = buildCtx.android) === null || _a === void 0 ? void 0 : _a.applicationId) !== null && _b !== void 0 ? _b : (_c = buildCtx.ios) === null || _c === void 0 ? void 0 : _c.bundleIdentifier,
         });
         if (moreBuilds) {
             log_1.default.newLine();
@@ -281,7 +283,7 @@ async function handleDeprecatedEasJsonAsync(projectDir, nonInteractive) {
         return;
     }
     const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
-    const rawEasJson = await easJsonReader.readRawAsync();
+    const rawEasJson = await easJsonReader.readAsync();
     if (rawEasJson === null || rawEasJson === void 0 ? void 0 : rawEasJson.cli) {
         return;
     }

package/build/commands/channel/create.d.ts

@@ -1,4 +1,10 @@
 import EasCommand from '../../commandUtils/EasCommand';
+import { CreateUpdateChannelOnAppMutation } from '../../graphql/generated';
+export declare function createUpdateChannelOnAppAsync({ appId, channelName, branchId, }: {
+    appId: string;
+    channelName: string;
+    branchId: string;
+}): Promise<CreateUpdateChannelOnAppMutation>;
 export default class ChannelCreate extends EasCommand {
     static hidden: boolean;
     static description: string;

package/build/commands/channel/create.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUpdateChannelOnAppAsync = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const command_1 = require("@oclif/command");
@@ -36,6 +37,7 @@ async function createUpdateChannelOnAppAsync({ appId, channelName, branchId, })
     })
         .toPromise());
 }
+exports.createUpdateChannelOnAppAsync = createUpdateChannelOnAppAsync;
 class ChannelCreate extends EasCommand_1.default {
     async runAsync() {
         let { args: { name: channelName }, flags: { json: jsonFlag }, } = this.parse(ChannelCreate);

package/build/commands/config.js

@@ -36,7 +36,7 @@ class Config extends EasCommand_1.default {
                 value: eas_build_job_1.Platform.IOS,
             },
         ]));
-        const profile = await reader.readBuildProfileAsync(platform, profileName);
+        const profile = await reader.getBuildProfileAsync(platform, profileName);
         const config = (0, expoConfig_1.getExpoConfig)(projectDir, { env: profile.env, isPublicConfig: true });
         log_1.default.log((0, config_1.getProjectConfigDescription)(projectDir));
         log_1.default.newLine();

package/build/commands/secret/create.js

@@ -8,7 +8,6 @@ const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/Ea
 const EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const Account_1 = require("../../user/Account");
@@ -23,11 +22,6 @@ class EnvironmentSecretCreate extends EasCommand_1.default {
         const accountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
         const { slug } = exp;
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         if (!scope) {
             const validationMessage = 'Secret scope may not be empty.';
             ({ scope } = await (0, prompts_1.promptAsync)({

package/build/commands/secret/delete.js

@@ -8,7 +8,6 @@ const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/Ea
 const EnvironmentSecretMutation_1 = require("../../graphql/mutations/EnvironmentSecretMutation");
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 class EnvironmentSecretDelete extends EasCommand_1.default {
@@ -17,11 +16,6 @@ class EnvironmentSecretDelete extends EasCommand_1.default {
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         let { flags: { id }, } = this.parse(EnvironmentSecretDelete);
         let secret;
         if (!id) {

package/build/commands/secret/list.js

@@ -8,7 +8,6 @@ const dateformat_1 = (0, tslib_1.__importDefault)(require("dateformat"));
 const EasCommand_1 = (0, tslib_1.__importDefault)(require("../../commandUtils/EasCommand"));
 const EnvironmentSecretsQuery_1 = require("../../graphql/queries/EnvironmentSecretsQuery");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const isEasEnabledForProject_1 = require("../../project/isEasEnabledForProject");
 const projectUtils_1 = require("../../project/projectUtils");
 class EnvironmentSecretList extends EasCommand_1.default {
     async runAsync() {
@@ -16,11 +15,6 @@ class EnvironmentSecretList extends EasCommand_1.default {
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const projectAccountName = await (0, projectUtils_1.getProjectAccountNameAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         if (!projectDir) {
             throw new Error("Please run this command inside your project's directory");
         }

package/build/commands/submit.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
-const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const errors_1 = require("@oclif/errors");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
@@ -10,7 +9,6 @@ const EasCommand_1 = (0, tslib_1.__importDefault)(require("../commandUtils/EasCo
 const AppPlatform_1 = require("../graphql/types/AppPlatform");
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
 const platform_1 = require("../platform");
-const isEasEnabledForProject_1 = require("../project/isEasEnabledForProject");
 const projectUtils_1 = require("../project/projectUtils");
 const context_1 = require("../submit/context");
 const submit_1 = require("../submit/submit");
@@ -23,19 +21,12 @@ class Submit extends EasCommand_1.default {
         const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
         const { exp } = (0, config_1.getConfig)(projectDir, { skipSDKVersionRequirement: true });
         const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        if (!(await (0, isEasEnabledForProject_1.isEasEnabledForProjectAsync)(projectId))) {
-            (0, isEasEnabledForProject_1.warnEasUnavailable)();
-            process.exitCode = 1;
-            return;
-        }
         const platforms = (0, platform_1.toPlatforms)(flags.requestedPlatform);
-        const easJsonReader = new eas_json_1.EasJsonReader(projectDir);
         const submissionProfiles = await (0, profiles_1.getProfilesAsync)({
+            type: 'submit',
+            projectDir,
             platforms,
             profileName: flags.profile,
-            async readProfileAsync(platform, profileName) {
-                return await easJsonReader.readSubmitProfileAsync(platform, profileName);
-            },
         });
         const submissions = [];
         for (const submissionProfile of submissionProfiles) {

package/build/commands/webhook/create.js

@@ -32,8 +32,7 @@ WebhookCreate.description = 'Create a webhook on the current project.';
 WebhookCreate.flags = {
     event: command_1.flags.enum({
         description: 'Event type that triggers the webhook',
-        options: [generated_1.WebhookType.Build],
-        default: generated_1.WebhookType.Build,
+        options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
     url: command_1.flags.string({
         description: 'Webhook URL',

package/build/commands/webhook/list.js

@@ -43,6 +43,6 @@ WebhookList.description = 'List webhooks on the current project.';
 WebhookList.flags = {
     event: command_1.flags.enum({
         description: 'Event type that triggers the webhook',
-        options: [generated_1.WebhookType.Build],
+        options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
 };

package/build/commands/webhook/update.js

@@ -35,8 +35,7 @@ WebhookUpdate.flags = {
     }),
     event: command_1.flags.enum({
         description: 'Event type that triggers the webhook',
-        options: [generated_1.WebhookType.Build],
-        default: generated_1.WebhookType.Build,
+        options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
     url: command_1.flags.string({
         description: 'Webhook URL',

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.js

@@ -1,12 +1,10 @@
 "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"));
+const plist_1 = require("../../../utils/plist");
 async function getManagedEntitlementsJsonAsync(projectDir, env) {
     var _a;
     const originalProcessEnv = process.env;
@@ -15,7 +13,7 @@ async function getManagedEntitlementsJsonAsync(projectDir, env) {
             ...process.env,
             ...env,
         };
-        const { exp } = (0, prebuild_config_1.getPrebuildConfig)(projectDir, { platforms: ['ios'] });
+        const { exp } = await (0, prebuild_config_1.getPrebuildConfigAsync)(projectDir, { platforms: ['ios'] });
         const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
             projectRoot: projectDir,
             platforms: ['ios'],
@@ -41,13 +39,12 @@ async function resolveEntitlementsJsonAsync(projectDir, workflow, env) {
 }
 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/manager/SelectBuildProfileFromEasJson.js

@@ -12,7 +12,7 @@ class SelectBuildProfileFromEasJson {
     }
     async runAsync(ctx) {
         const profileName = await this.getProfileNameFromEasConfigAsync(ctx);
-        const easConfig = await this.easJsonReader.readBuildProfileAsync(this.platform, profileName);
+        const easConfig = await this.easJsonReader.getBuildProfileAsync(this.platform, profileName);
         log_1.default.succeed(`Using build profile: ${profileName}`);
         return easConfig;
     }

package/build/credentials/manager/SelectIosDistributionTypeGraphqlFromBuildProfile.d.ts

@@ -1,9 +1,10 @@
-import { IosBuildProfile } from '@expo/eas-json';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
 import { IosDistributionType as IosDistributionTypeGraphql } from '../../graphql/generated';
 import { CredentialsContext } from '../context';
 export declare class SelectIosDistributionTypeGraphqlFromBuildProfile {
     private buildProfile;
-    constructor(buildProfile: IosBuildProfile);
+    constructor(buildProfile: BuildProfile<Platform.IOS>);
     runAsync(ctx: CredentialsContext): Promise<IosDistributionTypeGraphql>;
     resolveInternalDistributionAsync(ctx: CredentialsContext): Promise<IosDistributionTypeGraphql>;
 }

package/build/graphql/generated.d.ts

@@ -1239,7 +1239,8 @@ export declare type WebhookFilter = {
     event?: Maybe<WebhookType>;
 };
 export declare enum WebhookType {
-    Build = "BUILD"
+    Build = "BUILD",
+    Submit = "SUBMIT"
 }
 export declare type Webhook = {
     __typename?: 'Webhook';

package/build/graphql/generated.js

@@ -176,6 +176,7 @@ var AndroidKeystoreType;
 var WebhookType;
 (function (WebhookType) {
     WebhookType["Build"] = "BUILD";
+    WebhookType["Submit"] = "SUBMIT";
 })(WebhookType = exports.WebhookType || (exports.WebhookType = {}));
 var AppsFilter;
 (function (AppsFilter) {

package/build/project/android/applicationId.d.ts

@@ -1,5 +1,11 @@
 import { ExpoConfig } from '@expo/config';
 import { GradleBuildContext } from './gradle';
+export declare const INVALID_APPLICATION_ID_MESSAGE = "Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.";
 export declare function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir: string, exp: ExpoConfig): Promise<string>;
+export declare class AmbiguousApplicationIdError extends Error {
+    constructor(message?: string);
+}
+export declare function getApplicationIdFromBareAsync(projectDir: string, gradleContext?: GradleBuildContext): Promise<string>;
 export declare function getApplicationIdAsync(projectDir: string, exp: ExpoConfig, gradleContext?: GradleBuildContext): Promise<string>;
+export declare function isApplicationIdValid(applicationId: string): boolean;
 export declare function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir: string, exp: ExpoConfig): void;

package/build/project/android/applicationId.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = exports.getApplicationIdAsync = exports.ensureApplicationIdIsDefinedForManagedProjectAsync = void 0;
+exports.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject = exports.isApplicationIdValid = exports.getApplicationIdAsync = exports.getApplicationIdFromBareAsync = exports.AmbiguousApplicationIdError = exports.ensureApplicationIdIsDefinedForManagedProjectAsync = exports.INVALID_APPLICATION_ID_MESSAGE = void 0;
 const tslib_1 = require("tslib");
 const config_1 = require("@expo/config");
 const config_plugins_1 = require("@expo/config-plugins");
@@ -16,7 +16,7 @@ const prompts_1 = require("../../prompts");
 const actions_1 = require("../../user/actions");
 const workflow_1 = require("../workflow");
 const gradleUtils = (0, tslib_1.__importStar)(require("./gradleUtils"));
-const INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
+exports.INVALID_APPLICATION_ID_MESSAGE = `Invalid format of Android applicationId. Only alphanumeric characters, '.' and '_' are allowed, and each '.' must be followed by a letter.`;
 async function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, exp) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     (0, assert_1.default)(workflow === eas_build_job_1.Workflow.MANAGED, 'This function should be called only for managed projects');
@@ -30,40 +30,49 @@ async function ensureApplicationIdIsDefinedForManagedProjectAsync(projectDir, ex
     }
 }
 exports.ensureApplicationIdIsDefinedForManagedProjectAsync = ensureApplicationIdIsDefinedForManagedProjectAsync;
+class AmbiguousApplicationIdError extends Error {
+    constructor(message) {
+        super(message !== null && message !== void 0 ? message : 'Could not resolve applicationId.');
+    }
+}
+exports.AmbiguousApplicationIdError = AmbiguousApplicationIdError;
+async function getApplicationIdFromBareAsync(projectDir, gradleContext) {
+    const errorMessage = 'Could not read applicationId from Android project.';
+    if (gradleContext) {
+        const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
+        const applicationIdSuffix = gradleUtils.resolveConfigValue(buildGradle, 'applicationIdSuffix', gradleContext.flavor);
+        if (applicationIdSuffix) {
+            throw new Error('"applicationIdSuffix" in app/build.gradle is not supported.');
+        }
+        const applicationId = gradleUtils.resolveConfigValue(buildGradle, 'applicationId', gradleContext.flavor);
+        return (0, nullthrows_1.default)(applicationId, errorMessage);
+    }
+    else {
+        // should return value only if productFlavors are not used
+        const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+        const buildGradle = await fs_extra_1.default.readFile(buildGradlePath, 'utf8');
+        const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
+        if (buildGradle.match(/applicationIdSuffix/)) {
+            throw new Error('"applicationIdSuffix" in app/build.gradle is not supported.');
+        }
+        if (buildGradle.match(/productFlavors/)) {
+            throw new AmbiguousApplicationIdError('Failed to autodetect applicationId in multi-flavor project.');
+        }
+        return (0, nullthrows_1.default)(matchResult === null || matchResult === void 0 ? void 0 : matchResult[1], errorMessage);
+    }
+}
+exports.getApplicationIdFromBareAsync = getApplicationIdFromBareAsync;
 async function getApplicationIdAsync(projectDir, exp, gradleContext) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp);
-        const errorMessage = 'Could not read application id from Android project.';
-        if (gradleContext) {
-            const buildGradle = await gradleUtils.getAppBuildGradleAsync(projectDir);
-            const applicationId = gradleUtils.resolveConfigValue(buildGradle, 'applicationId', gradleContext.flavor);
-            return (0, nullthrows_1.default)(applicationId, errorMessage);
-        }
-        else {
-            // fallback to best effort approach, this logic can be dropped when we start supporting
-            // modules different than 'app' and 'flavorDimensions'
-            let buildGradlePath = null;
-            try {
-                buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
-            }
-            catch { }
-            if (!buildGradlePath || !(await fs_extra_1.default.pathExists(buildGradlePath))) {
-                throw new Error(errorMessage);
-            }
-            const buildGradle = await fs_extra_1.default.readFile(buildGradlePath, 'utf8');
-            const matchResult = buildGradle.match(/applicationId ['"](.*)['"]/);
-            const applicationId = (0, nullthrows_1.default)(matchResult === null || matchResult === void 0 ? void 0 : matchResult[1], errorMessage);
-            log_1.default.warn(`Unable to detect applicationId`);
-            log_1.default.warn(`Falling back to best effort approach, using applicationId ${applicationId}`);
-            return applicationId;
-        }
+        return getApplicationIdFromBareAsync(projectDir, gradleContext);
     }
     else {
         const applicationId = config_plugins_1.AndroidConfig.Package.getPackage(exp);
         if (!applicationId || !isApplicationIdValid(applicationId)) {
             if (applicationId) {
-                log_1.default.warn(INVALID_APPLICATION_ID_MESSAGE);
+                log_1.default.warn(exports.INVALID_APPLICATION_ID_MESSAGE);
             }
             throw new Error(`Specify "android.package" in ${(0, projectUtils_1.getProjectConfigDescription)(projectDir)} and run this command again.`);
         }
@@ -78,7 +87,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
     // we can't automatically update app.config.js
     if (paths.dynamicConfigPath) {
-        throw new Error(`"android.package" is not defined in your app.config.js and we can't update this file programatically. Add the value on your own and run this command again.`);
+        throw new Error(`"android.package" is not defined in your app.config.js and we can't update this file programmatically. Add the value on your own and run this command again.`);
     }
     (0, assert_1.default)(paths.staticConfigPath, 'app.json must exist');
     log_1.default.addNewLineIfNone();
@@ -89,7 +98,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
         type: 'text',
         message: `What would you like your Android application id to be?`,
         initial: suggestedAndroidApplicationId,
-        validate: value => (isApplicationIdValid(value) ? true : INVALID_APPLICATION_ID_MESSAGE),
+        validate: value => (isApplicationIdValid(value) ? true : exports.INVALID_APPLICATION_ID_MESSAGE),
     });
     const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
@@ -103,6 +112,7 @@ async function configureApplicationIdAsync(projectDir, exp) {
 function isApplicationIdValid(applicationId) {
     return /^[a-zA-Z][a-zA-Z0-9_]*(\.[a-zA-Z][a-zA-Z0-9_]*)+$/.test(applicationId);
 }
+exports.isApplicationIdValid = isApplicationIdValid;
 let warnPrinted = false;
 function warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject(projectDir, exp) {
     if (config_plugins_1.AndroidConfig.Package.getPackage(exp) && !warnPrinted) {

package/build/project/android/gradle.js

@@ -18,7 +18,7 @@ async function resolveGradleBuildContextAsync(projectDir, buildProfile) {
                     : undefined;
                 if ((parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.moduleName) &&
                     parsedGradleCommand.moduleName !== gradleUtils.DEFAULT_MODULE_NAME) {
-                    log_1.default.warn(`Building modules different than "${gradleUtils.DEFAULT_MODULE_NAME}" might result in unexpected behavior`);
+                    log_1.default.warn(`Building modules different than "${gradleUtils.DEFAULT_MODULE_NAME}" might result in unexpected behavior.`);
                 }
                 return {
                     moduleName: (_a = parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.moduleName) !== null && _a !== void 0 ? _a : gradleUtils.DEFAULT_MODULE_NAME,
@@ -30,7 +30,8 @@ async function resolveGradleBuildContextAsync(projectDir, buildProfile) {
             }
         }
         catch (err) {
-            log_1.default.warn(`Unable to read project config from app/build.gradle: ${err.message}`);
+            log_1.default.warn(`Unable to read gradle project config: ${err.message}.`);
+            log_1.default.warn('Values from app/build.gradle might be resolved incorrectly.');
             return undefined;
         }
     }

package/build/project/android/gradleUtils.d.ts

@@ -5,6 +5,7 @@ interface GradleCommand {
 }
 interface Config {
     applicationId?: string;
+    applicationIdSuffix?: string;
     versionCode?: string;
     versionName?: string;
 }

package/build/project/ios/bundleIdentifier.d.ts

@@ -1,8 +1,13 @@
 import { ExpoConfig } from '@expo/config';
+export declare const INVALID_BUNDLE_IDENTIFIER_MESSAGE = "Invalid format of iOS bundle identifier. Only alphanumeric characters, '.' and '-' are allowed, and each '.' must be followed by a letter.";
 export declare function ensureBundleIdentifierIsDefinedForManagedProjectAsync(projectDir: string, exp: ExpoConfig): Promise<string>;
-export declare function getBundleIdentifierAsync(projectDir: string, exp: ExpoConfig, { targetName, buildConfiguration }?: {
+export declare class AmbiguousBundleIdentifierError extends Error {
+    constructor(message?: string);
+}
+export declare function getBundleIdentifierAsync(projectDir: string, exp: ExpoConfig, xcodeContext?: {
     targetName?: string;
     buildConfiguration?: string;
 }): Promise<string>;
+export declare function isBundleIdentifierValid(bundleIdentifier: string): boolean;
 export declare function warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject(projectDir: string, exp: ExpoConfig): void;
 export declare function isWildcardBundleIdentifier(bundleIdentifier: string): boolean;