eas-cli 1.1.1 → 2.1.0

package/build/credentials/ios/IosCredentialsProvider.d.ts

@@ -17,6 +17,7 @@ export default class IosCredentialsProvider {
     private getLocalAsync;
     private getRemoteAsync;
     private getPushKeyAsync;
+    private disablePushNotificationsSetupInEasJsonAsync;
     private assertProvisioningProfileType;
 }
 export {};

package/build/credentials/ios/IosCredentialsProvider.js

@@ -3,6 +3,7 @@ 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 fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const target_1 = require("../../project/ios/target");
 const prompts_1 = require("../../prompts");
@@ -12,6 +13,12 @@ const BuildCredentialsUtils_1 = require("./actions/BuildCredentialsUtils");
 const SetUpBuildCredentials_1 = require("./actions/SetUpBuildCredentials");
 const SetUpPushKey_1 = require("./actions/SetUpPushKey");
 const provisioningProfile_1 = require("./utils/provisioningProfile");
+var PushNotificationSetupOption;
+(function (PushNotificationSetupOption) {
+    PushNotificationSetupOption[PushNotificationSetupOption["YES"] = 0] = "YES";
+    PushNotificationSetupOption[PushNotificationSetupOption["NO"] = 1] = "NO";
+    PushNotificationSetupOption[PushNotificationSetupOption["NO_DONT_ASK_AGAIN"] = 2] = "NO_DONT_ASK_AGAIN";
+})(PushNotificationSetupOption || (PushNotificationSetupOption = {}));
 class IosCredentialsProvider {
     constructor(ctx, options) {
         this.ctx = ctx;
@@ -47,6 +54,7 @@ class IosCredentialsProvider {
         }).runAsync(this.ctx);
     }
     async getPushKeyAsync(ctx, targets) {
+        var _a;
         if (ctx.nonInteractive) {
             return null;
         }
@@ -63,13 +71,33 @@ class IosCredentialsProvider {
             log_1.default.succeed(`Push Notifications setup for ${app.projectName}: ${applicationTarget.bundleIdentifier}`);
             return null;
         }
-        const confirmSetup = await (0, prompts_1.confirmAsync)({
-            message: `Would you like to set up Push Notifications for your project?`,
-        });
-        if (!confirmSetup) {
+        if (((_a = ctx.easJsonCliConfig) === null || _a === void 0 ? void 0 : _a.promptToConfigurePushNotifications) === false) {
             return null;
         }
-        return await setupPushKeyAction.runAsync(ctx);
+        const setupOption = await (0, prompts_1.selectAsync)(`Would you like to set up Push Notifications for your project?`, [
+            { title: 'Yes', value: PushNotificationSetupOption.YES },
+            { title: 'No', value: PushNotificationSetupOption.NO },
+            {
+                title: `No, don't ask again (preference will be saved to eas.json)`,
+                value: PushNotificationSetupOption.NO_DONT_ASK_AGAIN,
+            },
+        ]);
+        if (setupOption === PushNotificationSetupOption.YES) {
+            return await setupPushKeyAction.runAsync(ctx);
+        }
+        else {
+            if (setupOption === PushNotificationSetupOption.NO_DONT_ASK_AGAIN) {
+                await this.disablePushNotificationsSetupInEasJsonAsync(ctx);
+            }
+            return null;
+        }
+    }
+    async disablePushNotificationsSetupInEasJsonAsync(ctx) {
+        const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(ctx.projectDir);
+        const easJson = await fs_extra_1.default.readJSON(easJsonPath);
+        easJson.cli = { ...easJson === null || easJson === void 0 ? void 0 : easJson.cli, promptToConfigurePushNotifications: false };
+        await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+        log_1.default.withTick('Updated eas.json');
     }
     assertProvisioningProfileType(provisioningProfile, targetName) {
         const isAdHoc = (0, provisioningProfile_1.isAdHocProfile)(provisioningProfile);

package/build/credentials/ios/actions/ConfigureProvisioningProfile.d.ts

@@ -2,11 +2,13 @@ import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
+import { Target } from '../types';
 export declare class ConfigureProvisioningProfile {
     private app;
+    private target;
     private distributionCertificate;
     private originalProvisioningProfile;
-    constructor(app: AppLookupParams, distributionCertificate: AppleDistributionCertificateFragment, originalProvisioningProfile: AppleProvisioningProfileFragment);
+    constructor(app: AppLookupParams, target: Target, distributionCertificate: AppleDistributionCertificateFragment, originalProvisioningProfile: AppleProvisioningProfileFragment);
     runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult | null>;
     private configureAndUpdateAsync;
 }

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

@@ -6,10 +6,12 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const ora_1 = require("../../../ora");
+const target_1 = require("../../../project/ios/target");
 const errors_1 = require("../../errors");
 class ConfigureProvisioningProfile {
-    constructor(app, distributionCertificate, originalProvisioningProfile) {
+    constructor(app, target, distributionCertificate, originalProvisioningProfile) {
         this.app = app;
+        this.target = target;
         this.distributionCertificate = distributionCertificate;
         this.originalProvisioningProfile = originalProvisioningProfile;
     }
@@ -27,7 +29,8 @@ class ConfigureProvisioningProfile {
             log_1.default.warn('Make sure to recreate the profile if you selected a new distribution certificate.');
             return null;
         }
-        const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier);
+        const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(this.target);
+        const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier, applePlatform);
         const [matchingProfile] = profilesFromApple.filter(appleInfo => developerPortalIdentifier
             ? appleInfo.provisioningProfileId === developerPortalIdentifier
             : appleInfo.provisioningProfile === provisioningProfile);

package/build/credentials/ios/actions/CreateProvisioningProfile.d.ts

@@ -2,10 +2,12 @@ import { AppleDistributionCertificateFragment } from '../../../graphql/generated
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
+import { Target } from '../types';
 export declare class CreateProvisioningProfile {
     private app;
+    private target;
     private distributionCertificate;
-    constructor(app: AppLookupParams, distributionCertificate: AppleDistributionCertificateFragment);
+    constructor(app: AppLookupParams, target: Target, distributionCertificate: AppleDistributionCertificateFragment);
     runAsync(ctx: CredentialsContext): Promise<AppleProvisioningProfileMutationResult>;
     private provideOrGenerateAsync;
 }

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

@@ -11,8 +11,9 @@ const credentials_1 = require("../credentials");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
 const ProvisioningProfileUtils_1 = require("./ProvisioningProfileUtils");
 class CreateProvisioningProfile {
-    constructor(app, distributionCertificate) {
+    constructor(app, target, distributionCertificate) {
         this.app = app;
+        this.target = target;
         this.distributionCertificate = distributionCertificate;
     }
     async runAsync(ctx) {
@@ -40,7 +41,7 @@ class CreateProvisioningProfile {
         }
         (0, assert_1.default)(this.distributionCertificate.certificateP12, 'Distribution Certificate must have p12 certificate');
         (0, assert_1.default)(this.distributionCertificate.certificatePassword, 'Distribution Certificate must have certificate password');
-        return await (0, ProvisioningProfileUtils_1.generateProvisioningProfileAsync)(ctx, this.app.bundleIdentifier, {
+        return await (0, ProvisioningProfileUtils_1.generateProvisioningProfileAsync)(ctx, this.target, this.app.bundleIdentifier, {
             certId: (_a = this.distributionCertificate.developerPortalIdentifier) !== null && _a !== void 0 ? _a : undefined,
             certP12: this.distributionCertificate.certificateP12,
             certPassword: this.distributionCertificate.certificatePassword,

package/build/credentials/ios/actions/ProvisioningProfileUtils.d.ts

@@ -1,4 +1,5 @@
 import { CredentialsContext } from '../../context';
 import { DistributionCertificate, ProvisioningProfile, ProvisioningProfileStoreInfo } from '../appstore/Credentials.types';
+import { Target } from '../types';
 export declare function formatProvisioningProfileFromApple(appleInfo: ProvisioningProfileStoreInfo): string;
-export declare function generateProvisioningProfileAsync(ctx: CredentialsContext, bundleIdentifier: string, distCert: DistributionCertificate): Promise<ProvisioningProfile>;
+export declare function generateProvisioningProfileAsync(ctx: CredentialsContext, target: Target, bundleIdentifier: string, distCert: DistributionCertificate): Promise<ProvisioningProfile>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateProvisioningProfileAsync = exports.formatProvisioningProfileFromApple = void 0;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const target_1 = require("../../../project/ios/target");
 function formatProvisioningProfileFromApple(appleInfo) {
     var _a;
     const { expires, provisioningProfileId } = appleInfo;
@@ -13,10 +14,11 @@ function formatProvisioningProfileFromApple(appleInfo) {
     return `Provisioning Profile - ID: ${id}${details}`;
 }
 exports.formatProvisioningProfileFromApple = formatProvisioningProfileFromApple;
-async function generateProvisioningProfileAsync(ctx, bundleIdentifier, distCert) {
+async function generateProvisioningProfileAsync(ctx, target, bundleIdentifier, distCert) {
     const appleAuthCtx = await ctx.appStore.ensureAuthenticatedAsync();
     const type = appleAuthCtx.team.inHouse ? 'Enterprise ' : 'AppStore';
     const profileName = `*[expo] ${bundleIdentifier} ${type} ${new Date().toISOString()}`; // Apple drops [ if its the first char (!!)
-    return await ctx.appStore.createProvisioningProfileAsync(bundleIdentifier, distCert, profileName);
+    const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(target);
+    return await ctx.appStore.createProvisioningProfileAsync(bundleIdentifier, distCert, profileName, applePlatform);
 }
 exports.generateProvisioningProfileAsync = generateProvisioningProfileAsync;

package/build/credentials/ios/actions/SetUpAdhocProvisioningProfile.d.ts

@@ -1,9 +1,14 @@
 import { AppleDistributionCertificateFragment, IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
+import { Target } from '../types';
+interface Options {
+    app: AppLookupParams;
+    target: Target;
+}
 export declare class SetUpAdhocProvisioningProfile {
-    private app;
-    constructor(app: AppLookupParams);
+    private options;
+    constructor(options: Options);
     runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
     runWithDistributionCertificateAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment): Promise<IosAppBuildCredentialsFragment>;
     private areBuildCredentialsSetupAsync;
@@ -12,3 +17,4 @@ export declare class SetUpAdhocProvisioningProfile {
     private registerDevicesAsync;
 }
 export declare function doUDIDsMatch(udidsA: string[], udidsB: string[]): boolean;
+export {};

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

@@ -2,15 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.doUDIDsMatch = exports.SetUpAdhocProvisioningProfile = void 0;
 const tslib_1 = require("tslib");
+const apple_utils_1 = require("@expo/apple-utils");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const action_1 = tslib_1.__importStar(require("../../../devices/actions/create/action"));
 const generated_1 = require("../../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
+const target_1 = require("../../../project/ios/target");
 const prompts_1 = require("../../../prompts");
 const differenceBy_1 = tslib_1.__importDefault(require("../../../utils/expodash/differenceBy"));
 const errors_1 = require("../../errors");
+const constants_1 = require("../appstore/constants");
 const validateProvisioningProfile_1 = require("../validators/validateProvisioningProfile");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
 const BuildCredentialsUtils_1 = require("./BuildCredentialsUtils");
@@ -23,21 +26,22 @@ var ReuseAction;
     ReuseAction[ReuseAction["No"] = 2] = "No";
 })(ReuseAction || (ReuseAction = {}));
 class SetUpAdhocProvisioningProfile {
-    constructor(app) {
-        this.app = app;
+    constructor(options) {
+        this.options = options;
     }
     async runAsync(ctx) {
-        const distCert = await new SetUpDistributionCertificate_1.SetUpDistributionCertificate(this.app, generated_1.IosDistributionType.AdHoc).runAsync(ctx);
+        const { app } = this.options;
+        const distCert = await new SetUpDistributionCertificate_1.SetUpDistributionCertificate(app, generated_1.IosDistributionType.AdHoc).runAsync(ctx);
         const areBuildCredentialsSetup = await this.areBuildCredentialsSetupAsync(ctx);
         if (ctx.nonInteractive) {
             if (areBuildCredentialsSetup) {
-                return (0, nullthrows_1.default)(await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc));
+                return (0, nullthrows_1.default)(await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, app, generated_1.IosDistributionType.AdHoc));
             }
             else {
                 throw new errors_1.MissingCredentialsNonInteractiveError('Provisioning profile is not configured correctly. Run this command again in interactive mode.');
             }
         }
-        const currentBuildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc);
+        const currentBuildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, app, generated_1.IosDistributionType.AdHoc);
         if (areBuildCredentialsSetup) {
             const buildCredentials = (0, nullthrows_1.default)(currentBuildCredentials);
             if (await this.shouldUseExistingProfileAsync(ctx, buildCredentials)) {
@@ -48,16 +52,17 @@ class SetUpAdhocProvisioningProfile {
     }
     async runWithDistributionCertificateAsync(ctx, distCert) {
         var _a, _b, _c, _d, _e;
-        const currentBuildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc);
+        const { app, target } = this.options;
+        const currentBuildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, app, generated_1.IosDistributionType.AdHoc);
         // 1. Resolve Apple Team
         let appleTeam = (_c = (_a = distCert.appleTeam) !== null && _a !== void 0 ? _a : (_b = currentBuildCredentials === null || currentBuildCredentials === void 0 ? void 0 : currentBuildCredentials.provisioningProfile) === null || _b === void 0 ? void 0 : _b.appleTeam) !== null && _c !== void 0 ? _c : null;
         if (!appleTeam) {
             await ctx.appStore.ensureAuthenticatedAsync();
-            appleTeam = await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, this.app);
+            appleTeam = await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, app);
         }
         (0, assert_1.default)(appleTeam, 'Apple Team must be defined here');
         // 2. Fetch devices registered on EAS servers
-        let registeredAppleDevices = await ctx.ios.getDevicesForAppleTeamAsync(this.app, appleTeam);
+        let registeredAppleDevices = await ctx.ios.getDevicesForAppleTeamAsync(app, appleTeam);
         if (registeredAppleDevices.length === 0) {
             const shouldRegisterDevices = await (0, prompts_1.confirmAsync)({
                 message: `You don't have any registered devices yet. Would you like to register them now?`,
@@ -74,9 +79,13 @@ class SetUpAdhocProvisioningProfile {
         const provisionedDeviceIdentifiers = ((_e = (_d = currentBuildCredentials === null || currentBuildCredentials === void 0 ? void 0 : currentBuildCredentials.provisioningProfile) === null || _d === void 0 ? void 0 : _d.appleDevices) !== null && _e !== void 0 ? _e : []).map(i => i.identifier);
         const chosenDevices = await (0, DeviceUtils_1.chooseDevicesAsync)(registeredAppleDevices, provisionedDeviceIdentifiers);
         // 4. Reuse or create the profile on Apple Developer Portal
-        const provisioningProfileStoreInfo = await ctx.appStore.createOrReuseAdhocProvisioningProfileAsync(chosenDevices.map(({ identifier }) => identifier), this.app.bundleIdentifier, distCert.serialNumber);
+        const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(target);
+        const profileType = applePlatform === constants_1.ApplePlatform.TV_OS
+            ? apple_utils_1.ProfileType.TVOS_APP_ADHOC
+            : apple_utils_1.ProfileType.IOS_APP_ADHOC;
+        const provisioningProfileStoreInfo = await ctx.appStore.createOrReuseAdhocProvisioningProfileAsync(chosenDevices.map(({ identifier }) => identifier), app.bundleIdentifier, distCert.serialNumber, profileType);
         // 5. Create or update the profile on servers
-        const appleAppIdentifier = await ctx.ios.createOrGetExistingAppleAppIdentifierAsync(this.app, appleTeam);
+        const appleAppIdentifier = await ctx.ios.createOrGetExistingAppleAppIdentifierAsync(app, appleTeam);
         let appleProvisioningProfile = null;
         if (currentBuildCredentials === null || currentBuildCredentials === void 0 ? void 0 : currentBuildCredentials.provisioningProfile) {
             if (currentBuildCredentials.provisioningProfile.developerPortalIdentifier !==
@@ -84,7 +93,7 @@ class SetUpAdhocProvisioningProfile {
                 await ctx.ios.deleteProvisioningProfilesAsync([
                     currentBuildCredentials.provisioningProfile.id,
                 ]);
-                appleProvisioningProfile = await ctx.ios.createProvisioningProfileAsync(this.app, appleAppIdentifier, {
+                appleProvisioningProfile = await ctx.ios.createProvisioningProfileAsync(app, appleAppIdentifier, {
                     appleProvisioningProfile: provisioningProfileStoreInfo.provisioningProfile,
                     developerPortalIdentifier: provisioningProfileStoreInfo.provisioningProfileId,
                 });
@@ -94,23 +103,25 @@ class SetUpAdhocProvisioningProfile {
             }
         }
         else {
-            appleProvisioningProfile = await ctx.ios.createProvisioningProfileAsync(this.app, appleAppIdentifier, {
+            appleProvisioningProfile = await ctx.ios.createProvisioningProfileAsync(app, appleAppIdentifier, {
                 appleProvisioningProfile: provisioningProfileStoreInfo.provisioningProfile,
                 developerPortalIdentifier: provisioningProfileStoreInfo.provisioningProfileId,
             });
         }
         // 6. Create (or update) app build credentials
         (0, assert_1.default)(appleProvisioningProfile);
-        return await (0, BuildCredentialsUtils_1.assignBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc, distCert, appleProvisioningProfile, appleTeam);
+        return await (0, BuildCredentialsUtils_1.assignBuildCredentialsAsync)(ctx, app, generated_1.IosDistributionType.AdHoc, distCert, appleProvisioningProfile, appleTeam);
     }
     async areBuildCredentialsSetupAsync(ctx) {
-        const buildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, generated_1.IosDistributionType.AdHoc);
-        return await (0, validateProvisioningProfile_1.validateProvisioningProfileAsync)(ctx, this.app, buildCredentials);
+        const { app, target } = this.options;
+        const buildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, app, generated_1.IosDistributionType.AdHoc);
+        return await (0, validateProvisioningProfile_1.validateProvisioningProfileAsync)(ctx, target, app, buildCredentials);
     }
     async shouldUseExistingProfileAsync(ctx, buildCredentials) {
+        const { app } = this.options;
         const provisioningProfile = (0, nullthrows_1.default)(buildCredentials.provisioningProfile);
         const appleTeam = (0, nullthrows_1.default)(provisioningProfile.appleTeam);
-        const registeredAppleDevices = await ctx.ios.getDevicesForAppleTeamAsync(this.app, appleTeam);
+        const registeredAppleDevices = await ctx.ios.getDevicesForAppleTeamAsync(app, appleTeam);
         const provisionedDevices = provisioningProfile.appleDevices;
         const allRegisteredDevicesAreProvisioned = doUDIDsMatch(registeredAppleDevices.map(({ identifier }) => identifier), provisionedDevices.map(({ identifier }) => identifier));
         if (allRegisteredDevicesAreProvisioned) {
@@ -170,7 +181,8 @@ class SetUpAdhocProvisioningProfile {
         return selected;
     }
     async registerDevicesAsync(ctx, appleTeam) {
-        const action = new action_1.default(ctx.appStore, this.app.account, appleTeam);
+        const { app } = this.options;
+        const action = new action_1.default(ctx.appStore, app.account, appleTeam);
         const method = await action.runAsync();
         while (true) {
             if (method === action_1.RegistrationMethod.WEBSITE) {
@@ -179,7 +191,7 @@ class SetUpAdhocProvisioningProfile {
                 await (0, prompts_1.pressAnyKeyToContinueAsync)();
             }
             log_1.default.newLine();
-            const devices = await ctx.ios.getDevicesForAppleTeamAsync(this.app, appleTeam, {
+            const devices = await ctx.ios.getDevicesForAppleTeamAsync(app, appleTeam, {
                 useCache: false,
             });
             if (devices.length === 0) {

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

@@ -39,6 +39,7 @@ class SetUpBuildCredentials {
                 enterpriseProvisioning: this.options.enterpriseProvisioning,
                 distribution: this.options.distribution,
                 entitlements: target.entitlements,
+                target,
                 app: {
                     ...this.options.app,
                     bundleIdentifier: target.bundleIdentifier,

package/build/credentials/ios/actions/SetUpInternalProvisioningProfile.d.ts

@@ -1,6 +1,7 @@
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
+import { Target } from '../types';
 /**
  * It's used when setting up credentials for internal distribution but `enterpriseProvisioning` is not set.
  *
@@ -8,11 +9,16 @@ import { AppLookupParams } from '../api/GraphqlClient';
  * to choose if they want to set up an adhoc or universal distribution provisioning profile. Otherwise, always
  * set up an adhoc provisioning profile.
  */
+interface Options {
+    app: AppLookupParams;
+    target: Target;
+}
 export declare class SetUpInternalProvisioningProfile {
-    private app;
-    constructor(app: AppLookupParams);
+    private options;
+    constructor(options: Options);
     runAsync(ctx: CredentialsContext): Promise<IosAppBuildCredentialsFragment>;
     private setupAdhocProvisioningProfileAsync;
     private setupUniversalProvisioningProfileAsync;
     private askForDistributionTypeAndSetupAsync;
 }
+export {};

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

@@ -8,19 +8,12 @@ const prompts_1 = require("../../../prompts");
 const BuildCredentialsUtils_1 = require("./BuildCredentialsUtils");
 const SetUpAdhocProvisioningProfile_1 = require("./SetUpAdhocProvisioningProfile");
 const SetUpProvisioningProfile_1 = require("./SetUpProvisioningProfile");
-/**
- * It's used when setting up credentials for internal distribution but `enterpriseProvisioning` is not set.
- *
- * TLDR: If the user authenticates with an account with Apple Developer Enterprise Program membership we ask them
- * to choose if they want to set up an adhoc or universal distribution provisioning profile. Otherwise, always
- * set up an adhoc provisioning profile.
- */
 class SetUpInternalProvisioningProfile {
-    constructor(app) {
-        this.app = app;
+    constructor(options) {
+        this.options = options;
     }
     async runAsync(ctx) {
-        const buildCredentials = await (0, BuildCredentialsUtils_1.getAllBuildCredentialsAsync)(ctx, this.app);
+        const buildCredentials = await (0, BuildCredentialsUtils_1.getAllBuildCredentialsAsync)(ctx, this.options.app);
         const adhocBuildCredentialsExist = buildCredentials.filter(({ iosDistributionType }) => iosDistributionType === generated_1.IosDistributionType.AdHoc).length > 0;
         const enterpriseBuildCredentialsExist = buildCredentials.filter(({ iosDistributionType }) => iosDistributionType === generated_1.IosDistributionType.Enterprise).length > 0;
         if (!ctx.nonInteractive) {
@@ -73,10 +66,11 @@ class SetUpInternalProvisioningProfile {
         }
     }
     async setupAdhocProvisioningProfileAsync(ctx) {
-        return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile(this.app).runAsync(ctx);
+        const { app, target } = this.options;
+        return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile({ app, target }).runAsync(ctx);
     }
     async setupUniversalProvisioningProfileAsync(ctx) {
-        return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(this.app, generated_1.IosDistributionType.Enterprise).runAsync(ctx);
+        return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(this.options.app, this.options.target, generated_1.IosDistributionType.Enterprise).runAsync(ctx);
     }
     async askForDistributionTypeAndSetupAsync(ctx, message) {
         const { distributionType } = await (0, prompts_1.promptAsync)({

package/build/credentials/ios/actions/SetUpProvisioningProfile.d.ts

@@ -1,13 +1,15 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams } from '../api/GraphqlClient';
+import { Target } from '../types';
 /**
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles
  */
 export declare class SetUpProvisioningProfile {
     private app;
+    private target;
     private distributionType;
-    constructor(app: AppLookupParams, distributionType: IosDistributionType);
+    constructor(app: AppLookupParams, target: Target, distributionType: IosDistributionType);
     areBuildCredentialsSetupAsync(ctx: CredentialsContext): Promise<boolean>;
     assignNewAndDeleteOldProfileAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment, currentProfile: AppleProvisioningProfileFragment): Promise<IosAppBuildCredentialsFragment>;
     createAndAssignProfileAsync(ctx: CredentialsContext, distCert: AppleDistributionCertificateFragment): Promise<IosAppBuildCredentialsFragment>;

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SetUpProvisioningProfile = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const target_1 = require("../../../project/ios/target");
 const prompts_1 = require("../../../prompts");
 const errors_1 = require("../../errors");
 const validateProvisioningProfile_1 = require("../validators/validateProvisioningProfile");
@@ -15,13 +16,14 @@ const SetUpDistributionCertificate_1 = require("./SetUpDistributionCertificate")
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles
  */
 class SetUpProvisioningProfile {
-    constructor(app, distributionType) {
+    constructor(app, target, distributionType) {
         this.app = app;
+        this.target = target;
         this.distributionType = distributionType;
     }
     async areBuildCredentialsSetupAsync(ctx) {
         const buildCredentials = await (0, BuildCredentialsUtils_1.getBuildCredentialsAsync)(ctx, this.app, this.distributionType);
-        return await (0, validateProvisioningProfile_1.validateProvisioningProfileAsync)(ctx, this.app, buildCredentials);
+        return await (0, validateProvisioningProfile_1.validateProvisioningProfileAsync)(ctx, this.target, this.app, buildCredentials);
     }
     async assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile) {
         const buildCredentials = await this.createAndAssignProfileAsync(ctx, distCert);
@@ -30,11 +32,11 @@ class SetUpProvisioningProfile {
         return buildCredentials;
     }
     async createAndAssignProfileAsync(ctx, distCert) {
-        const provisioningProfile = await new CreateProvisioningProfile_1.CreateProvisioningProfile(this.app, distCert).runAsync(ctx);
+        const provisioningProfile = await new CreateProvisioningProfile_1.CreateProvisioningProfile(this.app, this.target, distCert).runAsync(ctx);
         return await (0, BuildCredentialsUtils_1.assignBuildCredentialsAsync)(ctx, this.app, this.distributionType, distCert, provisioningProfile);
     }
     async configureAndAssignProfileAsync(ctx, distCert, originalProvisioningProfile) {
-        const profileConfigurator = new ConfigureProvisioningProfile_1.ConfigureProvisioningProfile(this.app, distCert, originalProvisioningProfile);
+        const profileConfigurator = new ConfigureProvisioningProfile_1.ConfigureProvisioningProfile(this.app, this.target, distCert, originalProvisioningProfile);
         const updatedProvisioningProfile = await profileConfigurator.runAsync(ctx);
         if (!updatedProvisioningProfile) {
             return null;
@@ -55,7 +57,8 @@ class SetUpProvisioningProfile {
             return await this.createAndAssignProfileAsync(ctx, distCert);
         }
         // See if the profile we have exists on the Apple Servers
-        const existingProfiles = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier);
+        const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(this.target);
+        const existingProfiles = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier, applePlatform);
         const currentProfileFromServer = this.getCurrentProfileStoreInfo(existingProfiles, currentProfile);
         if (!currentProfileFromServer) {
             return await this.assignNewAndDeleteOldProfileAsync(ctx, distCert, currentProfile);

package/build/credentials/ios/actions/SetUpTargetBuildCredentials.d.ts

@@ -3,11 +3,13 @@ import { JSONObject } from '@expo/json-file';
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AppLookupParams as GraphQLAppLookupParams } from '../api/GraphqlClient';
+import { Target } from '../types';
 interface Options {
     app: GraphQLAppLookupParams;
     distribution: DistributionType;
     enterpriseProvisioning?: IosEnterpriseProvisioning;
     entitlements: JSONObject;
+    target: Target;
 }
 export declare class SetUpTargetBuildCredentials {
     private options;

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

@@ -30,20 +30,20 @@ class SetUpTargetBuildCredentials {
         }
     }
     async setupBuildCredentialsAsync(ctx) {
-        const { app, distribution, enterpriseProvisioning } = this.options;
+        const { app, distribution, enterpriseProvisioning, target } = this.options;
         if (distribution === 'internal') {
             if (enterpriseProvisioning === 'adhoc') {
-                return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile(app).runAsync(ctx);
+                return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile({ app, target }).runAsync(ctx);
             }
             else if (enterpriseProvisioning === 'universal') {
-                return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(app, generated_1.IosDistributionType.Enterprise).runAsync(ctx);
+                return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(app, target, generated_1.IosDistributionType.Enterprise).runAsync(ctx);
             }
             else {
-                return await new SetUpInternalProvisioningProfile_1.SetUpInternalProvisioningProfile(app).runAsync(ctx);
+                return await new SetUpInternalProvisioningProfile_1.SetUpInternalProvisioningProfile({ app, target }).runAsync(ctx);
             }
         }
         else {
-            return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(app, generated_1.IosDistributionType.AppStore).runAsync(ctx);
+            return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(app, target, generated_1.IosDistributionType.AppStore).runAsync(ctx);
         }
     }
 }

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

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const apple_utils_1 = require("@expo/apple-utils");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const generated_1 = require("../../../graphql/generated");
+const AppQuery_1 = require("../../../graphql/queries/AppQuery");
 const bundleIdentifier_1 = require("../../../project/ios/bundleIdentifier");
 const errors_1 = require("../errors");
 const AppStoreConnectApiKeyMutation_1 = require("./graphql/mutations/AppStoreConnectApiKeyMutation");
@@ -15,7 +16,6 @@ const ApplePushKeyMutation_1 = require("./graphql/mutations/ApplePushKeyMutation
 const AppleTeamMutation_1 = require("./graphql/mutations/AppleTeamMutation");
 const IosAppBuildCredentialsMutation_1 = require("./graphql/mutations/IosAppBuildCredentialsMutation");
 const IosAppCredentialsMutation_1 = require("./graphql/mutations/IosAppCredentialsMutation");
-const AppQuery_1 = require("./graphql/queries/AppQuery");
 const AppStoreConnectApiKeyQuery_1 = require("./graphql/queries/AppStoreConnectApiKeyQuery");
 const AppleAppIdentifierQuery_1 = require("./graphql/queries/AppleAppIdentifierQuery");
 const AppleDeviceQuery_1 = require("./graphql/queries/AppleDeviceQuery");

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

@@ -1,6 +1,9 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { ProfileType } from '@expo/app-store';
 import { AscApiKey, AscApiKeyInfo, DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
 import { Options as AuthenticateOptions } from './authenticate';
 import { AuthCtx, AuthenticationMode, UserAuthCtx } from './authenticateTypes';
+import { ApplePlatform } from './constants';
 import { AppLookupParams, IosCapabilitiesOptions } from './ensureAppExists';
 import { ProfileClass } from './provisioningProfile';
 export default class AppStoreApi {
@@ -17,10 +20,10 @@ export default class AppStoreApi {
     createPushKeyAsync(name?: string): Promise<PushKey>;
     revokePushKeyAsync(ids: string[]): Promise<void>;
     useExistingProvisioningProfileAsync(bundleIdentifier: string, provisioningProfile: ProvisioningProfile, distCert: DistributionCertificate): Promise<ProvisioningProfile>;
-    listProvisioningProfilesAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<ProvisioningProfileStoreInfo[]>;
-    createProvisioningProfileAsync(bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
-    revokeProvisioningProfileAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<void>;
-    createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string): Promise<ProvisioningProfile>;
+    listProvisioningProfilesAsync(bundleIdentifier: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<ProvisioningProfileStoreInfo[]>;
+    createProvisioningProfileAsync(bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
+    revokeProvisioningProfileAsync(bundleIdentifier: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<void>;
+    createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string, profileType: ProfileType): Promise<ProvisioningProfile>;
     listAscApiKeysAsync(): Promise<AscApiKeyInfo[]>;
     getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo | null>;
     createAscApiKeyAsync({ nickname }: {

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

@@ -69,21 +69,21 @@ class AppStoreApi {
         const ctx = await this.ensureAuthenticatedAsync();
         return await (0, provisioningProfile_1.useExistingProvisioningProfileAsync)(ctx, bundleIdentifier, provisioningProfile, distCert);
     }
-    async listProvisioningProfilesAsync(bundleIdentifier, profileClass) {
+    async listProvisioningProfilesAsync(bundleIdentifier, applePlatform, profileClass) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfile_1.listProvisioningProfilesAsync)(ctx, bundleIdentifier, profileClass);
+        return await (0, provisioningProfile_1.listProvisioningProfilesAsync)(ctx, bundleIdentifier, applePlatform, profileClass);
     }
-    async createProvisioningProfileAsync(bundleIdentifier, distCert, profileName, profileClass) {
+    async createProvisioningProfileAsync(bundleIdentifier, distCert, profileName, applePlatform, profileClass) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfile_1.createProvisioningProfileAsync)(ctx, bundleIdentifier, distCert, profileName, profileClass);
+        return await (0, provisioningProfile_1.createProvisioningProfileAsync)(ctx, bundleIdentifier, distCert, profileName, applePlatform, profileClass);
     }
-    async revokeProvisioningProfileAsync(bundleIdentifier, profileClass) {
+    async revokeProvisioningProfileAsync(bundleIdentifier, applePlatform, profileClass) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfile_1.revokeProvisioningProfileAsync)(ctx, bundleIdentifier, profileClass);
+        return await (0, provisioningProfile_1.revokeProvisioningProfileAsync)(ctx, bundleIdentifier, applePlatform, profileClass);
     }
-    async createOrReuseAdhocProvisioningProfileAsync(udids, bundleIdentifier, distCertSerialNumber) {
+    async createOrReuseAdhocProvisioningProfileAsync(udids, bundleIdentifier, distCertSerialNumber, profileType) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfileAdhoc_1.createOrReuseAdhocProvisioningProfileAsync)(ctx, udids, bundleIdentifier, distCertSerialNumber);
+        return await (0, provisioningProfileAdhoc_1.createOrReuseAdhocProvisioningProfileAsync)(ctx, udids, bundleIdentifier, distCertSerialNumber, profileType);
     }
     async listAscApiKeysAsync() {
         const userCtx = await this.ensureUserAuthenticatedAsync();