eas-cli 9.0.3 → 9.0.4

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

@@ -19,9 +19,8 @@ async function getAndroidAppCredentialsWithCommonFieldsAsync(graphqlClient, appL
 }
 exports.getAndroidAppCredentialsWithCommonFieldsAsync = getAndroidAppCredentialsWithCommonFieldsAsync;
 async function getAndroidAppBuildCredentialsListAsync(graphqlClient, appLookupParams) {
-    var _a;
     const appCredentials = await getAndroidAppCredentialsWithCommonFieldsAsync(graphqlClient, appLookupParams);
-    return (_a = appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.androidAppBuildCredentialsList) !== null && _a !== void 0 ? _a : [];
+    return appCredentials?.androidAppBuildCredentialsList ?? [];
 }
 exports.getAndroidAppBuildCredentialsListAsync = getAndroidAppBuildCredentialsListAsync;
 /* There is at most one set of legacy android app credentials associated with an Expo App */
@@ -34,9 +33,8 @@ async function getLegacyAndroidAppCredentialsWithCommonFieldsAsync(graphqlClient
 exports.getLegacyAndroidAppCredentialsWithCommonFieldsAsync = getLegacyAndroidAppCredentialsWithCommonFieldsAsync;
 /* There is at most one set of legacy android app build credentials associated with an Expo App */
 async function getLegacyAndroidAppBuildCredentialsAsync(graphqlClient, appLookupParams) {
-    var _a;
     const legacyAppCredentials = await getLegacyAndroidAppCredentialsWithCommonFieldsAsync(graphqlClient, appLookupParams);
-    return (_a = legacyAppCredentials === null || legacyAppCredentials === void 0 ? void 0 : legacyAppCredentials.androidAppBuildCredentialsList[0]) !== null && _a !== void 0 ? _a : null;
+    return legacyAppCredentials?.androidAppBuildCredentialsList[0] ?? null;
 }
 exports.getLegacyAndroidAppBuildCredentialsAsync = getLegacyAndroidAppBuildCredentialsAsync;
 async function createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(graphqlClient, appLookupParams) {
@@ -84,15 +82,13 @@ async function createAndroidAppBuildCredentialsAsync(graphqlClient, appLookupPar
 }
 exports.createAndroidAppBuildCredentialsAsync = createAndroidAppBuildCredentialsAsync;
 async function getDefaultAndroidAppBuildCredentialsAsync(graphqlClient, appLookupParams) {
-    var _a;
     const buildCredentialsList = await getAndroidAppBuildCredentialsListAsync(graphqlClient, appLookupParams);
-    return (_a = buildCredentialsList.find(buildCredentials => buildCredentials.isDefault)) !== null && _a !== void 0 ? _a : null;
+    return buildCredentialsList.find(buildCredentials => buildCredentials.isDefault) ?? null;
 }
 exports.getDefaultAndroidAppBuildCredentialsAsync = getDefaultAndroidAppBuildCredentialsAsync;
 async function getAndroidAppBuildCredentialsByNameAsync(graphqlClient, appLookupParams, name) {
-    var _a;
     const buildCredentialsList = await getAndroidAppBuildCredentialsListAsync(graphqlClient, appLookupParams);
-    return (_a = buildCredentialsList.find(buildCredentials => buildCredentials.name === name)) !== null && _a !== void 0 ? _a : null;
+    return buildCredentialsList.find(buildCredentials => buildCredentials.name === name) ?? null;
 }
 exports.getAndroidAppBuildCredentialsByNameAsync = getAndroidAppBuildCredentialsByNameAsync;
 async function createOrUpdateAndroidAppBuildCredentialsByNameAsync(graphqlClient, appLookupParams, name, { androidKeystoreId, }) {

package/build/credentials/android/api/graphql/queries/AndroidAppCredentialsQuery.js

@@ -9,7 +9,6 @@ const client_1 = require("../../../../../graphql/client");
 const AndroidAppCredentials_1 = require("../../../../../graphql/types/credentials/AndroidAppCredentials");
 exports.AndroidAppCredentialsQuery = {
     async withCommonFieldsByApplicationIdentifierAsync(graphqlClient, projectFullName, { androidApplicationIdentifier, legacyOnly, }) {
-        var _a;
         const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
             .query((0, graphql_tag_1.default) `
             query CommonAndroidAppCredentialsWithBuildCredentialsByApplicationIdentifierQuery(
@@ -47,6 +46,6 @@ exports.AndroidAppCredentialsQuery = {
         })
             .toPromise());
         (0, assert_1.default)(data.app, 'GraphQL: `app` not defined in server response');
-        return (_a = data.app.byFullName.androidAppCredentials[0]) !== null && _a !== void 0 ? _a : null;
+        return data.app.byFullName.androidAppCredentials[0] ?? null;
     },
 };

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

@@ -40,7 +40,7 @@ function displayAndroidFcmCredentials(appCredentials) {
         const { projectId, serviceAccountEmail, clientId, keyId } = snippet;
         fields.push({ label: 'Project ID', value: projectId });
         fields.push({ label: 'Client Email', value: serviceAccountEmail });
-        fields.push({ label: 'Client ID', value: clientId !== null && clientId !== void 0 ? clientId : 'Unknown' });
+        fields.push({ label: 'Client ID', value: clientId ?? 'Unknown' });
         fields.push({ label: 'Private Key ID', value: keyId });
     }
     fields.push({ label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` });
@@ -137,9 +137,9 @@ function displayAndroidKeystore(keystore) {
     const fields = [
         { label: 'Type', value: type },
         { label: 'Key Alias', value: keyAlias },
-        { label: 'MD5 Fingerprint', value: formatFingerprint(md5CertificateFingerprint !== null && md5CertificateFingerprint !== void 0 ? md5CertificateFingerprint : null) },
-        { label: 'SHA1 Fingerprint', value: formatFingerprint(sha1CertificateFingerprint !== null && sha1CertificateFingerprint !== void 0 ? sha1CertificateFingerprint : null) },
-        { label: 'SHA256 Fingerprint', value: formatFingerprint(sha256CertificateFingerprint !== null && sha256CertificateFingerprint !== void 0 ? sha256CertificateFingerprint : null) },
+        { label: 'MD5 Fingerprint', value: formatFingerprint(md5CertificateFingerprint ?? null) },
+        { label: 'SHA1 Fingerprint', value: formatFingerprint(sha1CertificateFingerprint ?? null) },
+        { label: 'SHA256 Fingerprint', value: formatFingerprint(sha256CertificateFingerprint ?? null) },
         { label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` },
     ];
     log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));

package/build/credentials/context.js

@@ -12,7 +12,6 @@ const expoConfig_1 = require("../project/expoConfig");
 const prompts_1 = require("../prompts");
 class CredentialsContext {
     constructor(options) {
-        var _a, _b;
         this.options = options;
         this.android = AndroidGraphqlClient;
         this.appStore = new AppStoreApi_1.default();
@@ -25,9 +24,9 @@ class CredentialsContext {
         this.graphqlClient = options.graphqlClient;
         this.analytics = options.analytics;
         this.vcsClient = options.vcsClient;
-        this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;
+        this.nonInteractive = options.nonInteractive ?? false;
         this.projectInfo = options.projectInfo;
-        this.freezeCredentials = (_b = options.freezeCredentials) !== null && _b !== void 0 ? _b : false;
+        this.freezeCredentials = options.freezeCredentials ?? false;
     }
     get hasProjectContext() {
         return !!this.projectInfo;

package/build/credentials/credentialsJson/update.js

@@ -16,13 +16,12 @@ const git_1 = tslib_1.__importDefault(require("../../vcs/clients/git"));
  * is not validated
  */
 async function updateAndroidCredentialsAsync(ctx, buildCredentials) {
-    var _a, _b, _c, _d, _e;
-    const rawCredentialsJson = (_a = (await (0, read_1.readRawAsync)(ctx.projectDir, { throwIfMissing: false }))) !== null && _a !== void 0 ? _a : {};
+    const rawCredentialsJson = (await (0, read_1.readRawAsync)(ctx.projectDir, { throwIfMissing: false })) ?? {};
     const keystore = buildCredentials.androidKeystore;
     if (!keystore) {
         throw new Error('There are no credentials configured for this project on EAS servers');
     }
-    const keystorePath = (_d = (_c = (_b = rawCredentialsJson === null || rawCredentialsJson === void 0 ? void 0 : rawCredentialsJson.android) === null || _b === void 0 ? void 0 : _b.keystore) === null || _c === void 0 ? void 0 : _c.keystorePath) !== null && _d !== void 0 ? _d : 'credentials/android/keystore.jks';
+    const keystorePath = rawCredentialsJson?.android?.keystore?.keystorePath ?? 'credentials/android/keystore.jks';
     log_1.default.log(`Writing Keystore to ${keystorePath}`);
     await updateFileAsync(ctx.projectDir, keystorePath, keystore.keystore);
     const shouldWarnKeystore = await isFileUntrackedAsync(keystorePath, ctx.vcsClient);
@@ -31,7 +30,7 @@ async function updateAndroidCredentialsAsync(ctx, buildCredentials) {
             keystorePath,
             keystorePassword: keystore.keystorePassword,
             keyAlias: keystore.keyAlias,
-            keyPassword: (_e = keystore.keyPassword) !== null && _e !== void 0 ? _e : undefined,
+            keyPassword: keystore.keyPassword ?? undefined,
         },
     };
     rawCredentialsJson.android = androidCredentials;
@@ -55,9 +54,8 @@ exports.updateAndroidCredentialsAsync = updateAndroidCredentialsAsync;
  * credentials.json will be updated partially
  */
 async function updateIosCredentialsAsync(ctx, app, targets, distributionType) {
-    var _a, _b;
-    const rawCredentialsJson = (_a = (await (0, read_1.readRawAsync)(ctx.projectDir, { throwIfMissing: false }))) !== null && _a !== void 0 ? _a : {};
-    if (typeof ((_b = rawCredentialsJson.ios) === null || _b === void 0 ? void 0 : _b.provisioningProfilePath) === 'string') {
+    const rawCredentialsJson = (await (0, read_1.readRawAsync)(ctx.projectDir, { throwIfMissing: false })) ?? {};
+    if (typeof rawCredentialsJson.ios?.provisioningProfilePath === 'string') {
         const applicationTarget = (0, target_1.findApplicationTarget)(targets);
         rawCredentialsJson.ios = {
             [applicationTarget.targetName]: rawCredentialsJson.ios,
@@ -114,16 +112,17 @@ async function updateIosCredentialsAsync(ctx, app, targets, distributionType) {
 }
 exports.updateIosCredentialsAsync = updateIosCredentialsAsync;
 function createTargetCredentialsPathsMap(targets, rawCredentialsJsonMap) {
-    var _a, _b, _c;
     const hasManyTargets = targets.length > 1;
     const paths = {};
     // 1. Create initial target credentials paths map
     for (const target of targets) {
-        const rawTargetCredentialsJson = rawCredentialsJsonMap === null || rawCredentialsJsonMap === void 0 ? void 0 : rawCredentialsJsonMap[target.targetName];
+        const rawTargetCredentialsJson = rawCredentialsJsonMap?.[target.targetName];
         const filePrefix = hasManyTargets ? `${target.targetName}-` : '';
         paths[target.targetName] = {
-            provisioningProfilePath: (_a = rawTargetCredentialsJson === null || rawTargetCredentialsJson === void 0 ? void 0 : rawTargetCredentialsJson.provisioningProfilePath) !== null && _a !== void 0 ? _a : `credentials/ios/${filePrefix}profile.mobileprovision`,
-            distCertPath: (_c = (_b = rawTargetCredentialsJson === null || rawTargetCredentialsJson === void 0 ? void 0 : rawTargetCredentialsJson.distributionCertificate) === null || _b === void 0 ? void 0 : _b.path) !== null && _c !== void 0 ? _c : `credentials/ios/${filePrefix}dist-cert.p12`,
+            provisioningProfilePath: rawTargetCredentialsJson?.provisioningProfilePath ??
+                `credentials/ios/${filePrefix}profile.mobileprovision`,
+            distCertPath: rawTargetCredentialsJson?.distributionCertificate?.path ??
+                `credentials/ios/${filePrefix}dist-cert.p12`,
         };
     }
     // 2. Look for duplicates and prefix them with target names
@@ -147,20 +146,19 @@ function createTargetCredentialsPathsMap(targets, rawCredentialsJsonMap) {
     return deduplicatedPaths;
 }
 async function getTargetBuildCredentialsAsync(ctx, app, target, iosDistributionType) {
-    var _a, _b, _c, _d;
     const appCredentials = await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, {
         account: app.account,
         projectName: app.projectName,
         bundleIdentifier: target.bundleIdentifier,
         parentBundleIdentifier: target.parentBundleIdentifier,
     });
-    const appBuildCredentials = (_a = appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.iosAppBuildCredentialsList.find(appBuildCredentials => appBuildCredentials.iosDistributionType === iosDistributionType)) !== null && _a !== void 0 ? _a : null;
+    const appBuildCredentials = appCredentials?.iosAppBuildCredentialsList.find(appBuildCredentials => appBuildCredentials.iosDistributionType === iosDistributionType) ?? null;
     if (appBuildCredentials === null) {
         return null;
     }
-    if (!(((_b = appBuildCredentials.provisioningProfile) === null || _b === void 0 ? void 0 : _b.provisioningProfile) !== undefined &&
-        ((_c = appBuildCredentials.distributionCertificate) === null || _c === void 0 ? void 0 : _c.certificateP12) !== undefined &&
-        ((_d = appBuildCredentials.distributionCertificate) === null || _d === void 0 ? void 0 : _d.certificatePassword) !== undefined)) {
+    if (!(appBuildCredentials.provisioningProfile?.provisioningProfile !== undefined &&
+        appBuildCredentials.distributionCertificate?.certificateP12 !== undefined &&
+        appBuildCredentials.distributionCertificate?.certificatePassword !== undefined)) {
         return null;
     }
     return {

package/build/credentials/errors.js

@@ -4,25 +4,27 @@ exports.AndroidPackageNotDefinedError = exports.UnsupportedCredentialsChoiceErro
 const log_1 = require("../log");
 class MissingCredentialsNonInteractiveError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Credentials are not set up. Run this command again in interactive mode.');
+        super(message ?? 'Credentials are not set up. Run this command again in interactive mode.');
     }
 }
 exports.MissingCredentialsNonInteractiveError = MissingCredentialsNonInteractiveError;
 class InsufficientAuthenticationNonInteractiveError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : `Authentication with an ASC API key is required in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team')}`);
+        super(message ??
+            `Authentication with an ASC API key is required in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/build/building-on-ci/#optional-provide-an-asc-api-token-for-your-apple-team')}`);
     }
 }
 exports.InsufficientAuthenticationNonInteractiveError = InsufficientAuthenticationNonInteractiveError;
 class ForbidCredentialModificationError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Credentials cannot be modified. Run this command again without the --freeze-credentials flag.');
+        super(message ??
+            'Credentials cannot be modified. Run this command again without the --freeze-credentials flag.');
     }
 }
 exports.ForbidCredentialModificationError = ForbidCredentialModificationError;
 class MissingCredentialsError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Credentials are not set up.');
+        super(message ?? 'Credentials are not set up.');
     }
 }
 exports.MissingCredentialsError = MissingCredentialsError;
@@ -35,7 +37,7 @@ class UnsupportedCredentialsChoiceError extends Error {
 exports.UnsupportedCredentialsChoiceError = UnsupportedCredentialsChoiceError;
 class AndroidPackageNotDefinedError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'android.package needs to be defined in your app.json/app.config.js file');
+        super(message ?? 'android.package needs to be defined in your app.json/app.config.js file');
     }
 }
 exports.AndroidPackageNotDefinedError = AndroidPackageNotDefinedError;

package/build/credentials/ios/IosCredentialsProvider.js

@@ -54,7 +54,6 @@ class IosCredentialsProvider {
         }).runAsync(this.ctx);
     }
     async getPushKeyAsync(ctx, targets) {
-        var _a, _b;
         if (ctx.nonInteractive) {
             return null;
         }
@@ -71,10 +70,10 @@ class IosCredentialsProvider {
             log_1.default.succeed(`Push Notifications setup for ${app.projectName}: ${applicationTarget.bundleIdentifier}`);
             return null;
         }
-        if (((_a = ctx.easJsonCliConfig) === null || _a === void 0 ? void 0 : _a.promptToConfigurePushNotifications) === false) {
+        if (ctx.easJsonCliConfig?.promptToConfigurePushNotifications === false) {
             return null;
         }
-        else if (((_b = ctx.easJsonCliConfig) === null || _b === void 0 ? void 0 : _b.promptToConfigurePushNotifications) === undefined &&
+        else if (ctx.easJsonCliConfig?.promptToConfigurePushNotifications === undefined &&
             !(await (0, projectUtils_1.isExpoNotificationsInstalled)(ctx.projectDir))) {
             return null;
         }
@@ -101,7 +100,7 @@ class IosCredentialsProvider {
         await easJsonAccessor.readRawJsonAsync();
         easJsonAccessor.patch(easJsonRawObject => {
             easJsonRawObject.cli = {
-                ...easJsonRawObject === null || easJsonRawObject === void 0 ? void 0 : easJsonRawObject.cli,
+                ...easJsonRawObject?.cli,
                 promptToConfigurePushNotifications: false,
             };
             return easJsonRawObject;

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

@@ -37,10 +37,9 @@ async function promptForIssuerIdAsync() {
 }
 exports.promptForIssuerIdAsync = promptForIssuerIdAsync;
 async function getMinimalAscApiKeyAsync(ascApiKey) {
-    var _a;
     return {
         ...ascApiKey,
-        issuerId: (_a = ascApiKey.issuerId) !== null && _a !== void 0 ? _a : (await promptForIssuerIdAsync()),
+        issuerId: ascApiKey.issuerId ?? (await promptForIssuerIdAsync()),
     };
 }
 exports.getMinimalAscApiKeyAsync = getMinimalAscApiKeyAsync;
@@ -91,7 +90,6 @@ async function promptForAscApiKeyAsync(ctx) {
     return { keyP8: await fs_extra_1.default.readFile(keyP8Path, 'utf-8'), keyId, issuerId };
 }
 async function promptForKeyP8AndIdAsync() {
-    var _a, _b;
     log_1.default.log(chalk_1.default.bold('An App Store Connect Api key is required to upload your app to the Apple App Store Connect'));
     log_1.default.log(`If you're not sure what this is or how to create one, ${(0, log_1.learnMore)('https://expo.fyi/creating-asc-api-key')}`);
     const { keyP8Path } = await (0, prompts_1.promptAsync)({
@@ -114,19 +112,18 @@ async function promptForKeyP8AndIdAsync() {
         },
     });
     const regex = /^AuthKey_(?<keyId>\w+)\.p8$/; // Common ASC Api file name downloaded from Apple
-    const bestEffortKeyId = (_b = (_a = path_1.default.basename(keyP8Path).match(regex)) === null || _a === void 0 ? void 0 : _a.groups) === null || _b === void 0 ? void 0 : _b.keyId;
+    const bestEffortKeyId = path_1.default.basename(keyP8Path).match(regex)?.groups?.keyId;
     const { keyId } = await (0, promptForCredentials_1.getCredentialsFromUserAsync)(credentials_1.ascApiKeyIdSchema, {
         keyId: bestEffortKeyId,
     });
     return { keyId, keyP8Path };
 }
 async function getBestEffortIssuerIdAsync(ctx, ascApiKeyId) {
-    var _a;
     if (!ctx.appStore.authCtx) {
         return null;
     }
     const ascApiKeyInfo = await ctx.appStore.getAscApiKeyAsync(ascApiKeyId);
-    return (_a = ascApiKeyInfo === null || ascApiKeyInfo === void 0 ? void 0 : ascApiKeyInfo.issuerId) !== null && _a !== void 0 ? _a : null;
+    return ascApiKeyInfo?.issuerId ?? null;
 }
 async function getAscApiKeysFromAccountAsync(ctx, account, { filterDifferentAppleTeam } = {}) {
     const ascApiKeysForAccount = await ctx.ios.getAscApiKeysForAccountAsync(ctx.graphqlClient, account);
@@ -139,13 +136,12 @@ async function getAscApiKeysFromAccountAsync(ctx, account, { filterDifferentAppl
 }
 exports.getAscApiKeysFromAccountAsync = getAscApiKeysFromAccountAsync;
 async function selectAscApiKeysFromAccountAsync(ctx, account, { filterDifferentAppleTeam } = {}) {
-    var _a;
     const ascApiKeysForAccount = await getAscApiKeysFromAccountAsync(ctx, account, {
         filterDifferentAppleTeam,
     });
     if (ascApiKeysForAccount.length === 0) {
         if (filterDifferentAppleTeam) {
-            const maybeAppleTeamId = (_a = ctx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.team.id;
+            const maybeAppleTeamId = ctx.appStore.authCtx?.team.id;
             log_1.default.warn(`There are no App Store Connect API Keys in your EAS account${maybeAppleTeamId ? ` matching Apple Team ID: ${maybeAppleTeamId}.` : '.'}`);
         }
         else {
@@ -174,7 +170,7 @@ function filterKeysFromDifferentAppleTeam(ctx, keys) {
         return keys;
     }
     const teamId = ctx.appStore.authCtx.team.id;
-    return keys.filter(key => { var _a; return !key.appleTeam || ((_a = key.appleTeam) === null || _a === void 0 ? void 0 : _a.appleTeamIdentifier) === teamId; });
+    return keys.filter(key => !key.appleTeam || key.appleTeam?.appleTeamIdentifier === teamId);
 }
 function sortAscApiKeysByUpdatedAtDesc(keys) {
     return keys.sort((keyA, keyB) => new Date(keyB.updatedAt).getTime() - new Date(keyA.updatedAt).getTime());

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

@@ -10,9 +10,8 @@ class AssignAscApiKey {
         this.app = app;
     }
     async runAsync(ctx, ascApiKey, purpose) {
-        var _a, _b;
-        const appleTeam = (_b = (_a = (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, this.app))) !== null && _a !== void 0 ? _a : ascApiKey.appleTeam) !== null && _b !== void 0 ? _b : null;
-        const appCredentials = await ctx.ios.createOrGetIosAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app, { appleTeam: appleTeam !== null && appleTeam !== void 0 ? appleTeam : undefined });
+        const appleTeam = (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, this.app)) ?? ascApiKey.appleTeam ?? null;
+        const appCredentials = await ctx.ios.createOrGetIosAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app, { appleTeam: appleTeam ?? undefined });
         let updatedAppCredentials;
         if (purpose === AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
             updatedAppCredentials = await ctx.ios.updateIosAppCredentialsAsync(ctx.graphqlClient, appCredentials, {

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

@@ -9,9 +9,8 @@ class AssignPushKey {
         this.app = app;
     }
     async runAsync(ctx, pushKey) {
-        var _a, _b;
-        const appleTeam = (_b = (_a = (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, this.app))) !== null && _a !== void 0 ? _a : pushKey.appleTeam) !== null && _b !== void 0 ? _b : null;
-        const appCredentials = await ctx.ios.createOrGetIosAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app, { appleTeam: appleTeam !== null && appleTeam !== void 0 ? appleTeam : undefined });
+        const appleTeam = (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, this.app)) ?? pushKey.appleTeam ?? null;
+        const appCredentials = await ctx.ios.createOrGetIosAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app, { appleTeam: appleTeam ?? undefined });
         const updatedAppCredentials = await ctx.ios.updateIosAppCredentialsAsync(ctx.graphqlClient, appCredentials, {
             applePushKeyId: pushKey.id,
         });

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

@@ -25,19 +25,17 @@ async function getBuildCredentialsAsync(ctx, app, iosDistributionType) {
 }
 exports.getBuildCredentialsAsync = getBuildCredentialsAsync;
 async function getProvisioningProfileAsync(ctx, app, iosDistributionType) {
-    var _a;
     const buildCredentials = await getBuildCredentialsAsync(ctx, app, iosDistributionType);
-    return (_a = buildCredentials === null || buildCredentials === void 0 ? void 0 : buildCredentials.provisioningProfile) !== null && _a !== void 0 ? _a : null;
+    return buildCredentials?.provisioningProfile ?? null;
 }
 exports.getProvisioningProfileAsync = getProvisioningProfileAsync;
 async function getDistributionCertificateAsync(ctx, app, iosDistributionType) {
-    var _a;
     const buildCredentials = await getBuildCredentialsAsync(ctx, app, iosDistributionType);
-    return (_a = buildCredentials === null || buildCredentials === void 0 ? void 0 : buildCredentials.distributionCertificate) !== null && _a !== void 0 ? _a : null;
+    return buildCredentials?.distributionCertificate ?? null;
 }
 exports.getDistributionCertificateAsync = getDistributionCertificateAsync;
 async function assignBuildCredentialsAsync(ctx, app, iosDistributionType, distCert, provisioningProfile, appleTeam) {
-    const resolvedAppleTeam = (0, nullthrows_1.default)(appleTeam !== null && appleTeam !== void 0 ? appleTeam : (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, app)));
+    const resolvedAppleTeam = (0, nullthrows_1.default)(appleTeam ?? (await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, app)));
     const appleAppIdentifier = await ctx.ios.createOrGetExistingAppleAppIdentifierAsync(ctx.graphqlClient, app, resolvedAppleTeam);
     return await ctx.ios.createOrUpdateIosAppBuildCredentialsAsync(ctx.graphqlClient, app, {
         appleTeam: resolvedAppleTeam,

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

@@ -50,7 +50,7 @@ class ConfigureProvisioningProfile {
         (0, assert_1.default)(certificateP12 && certificatePassword, 'Distribution Certificate P12 and Password is required');
         // configure profile on Apple's Server to use our distCert
         const updatedProfile = await ctx.appStore.useExistingProvisioningProfileAsync(app.bundleIdentifier, profileFromApple, {
-            certId: developerPortalIdentifier !== null && developerPortalIdentifier !== void 0 ? developerPortalIdentifier : undefined,
+            certId: developerPortalIdentifier ?? undefined,
             certP12: certificateP12,
             certPassword: certificatePassword,
             distCertSerialNumber: serialNumber,

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

@@ -49,7 +49,6 @@ class CreateProvisioningProfile {
         return null;
     }
     async provideOrGenerateAsync(ctx, appleAuthCtx) {
-        var _a, _b, _c;
         const maybeUserProvided = await this.maybeGetUserProvidedAsync(ctx);
         if (maybeUserProvided) {
             // userProvided profiles don't come with ProvisioningProfileId's (only accessible from Apple Portal API)
@@ -59,11 +58,11 @@ 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.target, this.app.bundleIdentifier, {
-            certId: (_a = this.distributionCertificate.developerPortalIdentifier) !== null && _a !== void 0 ? _a : undefined,
+            certId: this.distributionCertificate.developerPortalIdentifier ?? undefined,
             certP12: this.distributionCertificate.certificateP12,
             certPassword: this.distributionCertificate.certificatePassword,
             distCertSerialNumber: this.distributionCertificate.serialNumber,
-            teamId: (_c = (_b = this.distributionCertificate.appleTeam) === null || _b === void 0 ? void 0 : _b.appleTeamIdentifier) !== null && _c !== void 0 ? _c : appleAuthCtx.team.id,
+            teamId: this.distributionCertificate.appleTeam?.appleTeamIdentifier ?? appleAuthCtx.team.id,
         });
     }
 }

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

@@ -33,7 +33,7 @@ function formatDistributionCertificate(distributionCertificate, validSerialNumbe
         const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
         line += chalk_1.default.gray(`\n    📲 Used by: ${appFullNames}${andMaybeMore}`);
     }
-    if (validSerialNumbers === null || validSerialNumbers === void 0 ? void 0 : validSerialNumbers.includes(serialNumber)) {
+    if (validSerialNumbers?.includes(serialNumber)) {
         line += chalk_1.default.gray("\n    ✅ Currently valid on Apple's servers.");
     }
     else {
@@ -43,7 +43,7 @@ function formatDistributionCertificate(distributionCertificate, validSerialNumbe
 }
 exports.formatDistributionCertificate = formatDistributionCertificate;
 async function selectDistributionCertificateAsync(distCerts, validDistributionCertificates) {
-    const validDistCertSerialNumbers = validDistributionCertificates === null || validDistributionCertificates === void 0 ? void 0 : validDistributionCertificates.map(distCert => distCert.serialNumber);
+    const validDistCertSerialNumbers = validDistributionCertificates?.map(distCert => distCert.serialNumber);
     const { chosenDistCert } = await (0, prompts_1.promptAsync)({
         type: 'select',
         name: 'chosenDistCert',
@@ -77,7 +77,6 @@ exports.selectDistributionCertificateWithDependenciesAsync = selectDistributionC
  * select a distribution certificate from a valid set (curated on a best effort basis)
  * */
 async function selectValidDistributionCertificateAsync(ctx, appLookupParams) {
-    var _a;
     const distCertsForAccount = await ctx.ios.getDistributionCertificatesForAccountAsync(ctx.graphqlClient, appLookupParams.account);
     if (distCertsForAccount.length === 0) {
         log_1.default.warn(`There are no Distribution Certificates available in your EAS account.`);
@@ -95,7 +94,7 @@ async function selectValidDistributionCertificateAsync(ctx, appLookupParams) {
     // filter by valid certs on the developer portal
     const certInfoFromApple = await ctx.appStore.listDistributionCertificatesAsync();
     const validDistCerts = (0, CredentialsUtils_1.filterRevokedDistributionCertsFromEasServers)(distCertsForAppleTeam, certInfoFromApple);
-    log_1.default.log(`${validDistCerts.length}/${distCertsForAccount.length} Distribution Certificates are currently valid for Apple Team ${(_a = ctx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.team.id}.`);
+    log_1.default.log(`${validDistCerts.length}/${distCertsForAccount.length} Distribution Certificates are currently valid for Apple Team ${ctx.appStore.authCtx?.team.id}.`);
     return selectDistributionCertificateAsync(validDistCerts);
 }
 exports.selectValidDistributionCertificateAsync = selectValidDistributionCertificateAsync;

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

@@ -5,10 +5,9 @@ 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;
-    const id = provisioningProfileId !== null && provisioningProfileId !== void 0 ? provisioningProfileId : '-----';
-    const name = (_a = appleInfo.name) !== null && _a !== void 0 ? _a : '-----';
+    const id = provisioningProfileId ?? '-----';
+    const name = appleInfo.name ?? '-----';
     const expiryString = expires ? new Date(expires * 1000).toDateString() : 'unknown';
     const details = chalk_1.default.green(`\n    Name: ${name}\n    Expiry: ${expiryString}`);
     return `Provisioning Profile - ID: ${id}${details}`;

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

@@ -123,7 +123,7 @@ async function getValidAndTrackedPushKeysOnEasServersAsync(ctx, pushKeysForAccou
 }
 exports.getValidAndTrackedPushKeysOnEasServersAsync = getValidAndTrackedPushKeysOnEasServersAsync;
 async function selectPushKeysAsync(pushKeys, validPushKeys) {
-    const validPushKeyIdentifiers = validPushKeys === null || validPushKeys === void 0 ? void 0 : validPushKeys.map(pushKey => pushKey.keyIdentifier);
+    const validPushKeyIdentifiers = validPushKeys?.map(pushKey => pushKey.keyIdentifier);
     const sortedPushKeys = sortPushKeys(pushKeys, validPushKeys);
     const { chosenPushKey } = await (0, prompts_1.promptAsync)({
         type: 'select',
@@ -137,12 +137,12 @@ async function selectPushKeysAsync(pushKeys, validPushKeys) {
     return chosenPushKey;
 }
 function sortPushKeys(pushKeys, validPushKeys) {
-    const validPushKeyIdentifiers = validPushKeys === null || validPushKeys === void 0 ? void 0 : validPushKeys.map(pushKey => pushKey.keyIdentifier);
+    const validPushKeyIdentifiers = validPushKeys?.map(pushKey => pushKey.keyIdentifier);
     return pushKeys.sort((pushKeyA, pushKeyB) => {
-        if (validPushKeyIdentifiers === null || validPushKeyIdentifiers === void 0 ? void 0 : validPushKeyIdentifiers.includes(pushKeyA.keyIdentifier)) {
+        if (validPushKeyIdentifiers?.includes(pushKeyA.keyIdentifier)) {
             return -1;
         }
-        else if (validPushKeyIdentifiers === null || validPushKeyIdentifiers === void 0 ? void 0 : validPushKeyIdentifiers.includes(pushKeyB.keyIdentifier)) {
+        else if (validPushKeyIdentifiers?.includes(pushKeyB.keyIdentifier)) {
             return 1;
         }
         return 0;
@@ -165,7 +165,7 @@ function formatPushKey(pushKey, validPushKeyIdentifiers) {
         const andMaybeMore = apps.length > 19 ? ' (and more)' : '';
         line += chalk_1.default.gray(`\n    📲 Used by: ${appFullNames}${andMaybeMore}`);
     }
-    if (validPushKeyIdentifiers === null || validPushKeyIdentifiers === void 0 ? void 0 : validPushKeyIdentifiers.includes(keyIdentifier)) {
+    if (validPushKeyIdentifiers?.includes(keyIdentifier)) {
         line += chalk_1.default.gray("\n    ✅ Currently valid on Apple's servers.");
     }
     else {

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

@@ -52,11 +52,10 @@ class SetUpAdhocProvisioningProfile {
         return await this.runWithDistributionCertificateAsync(ctx, distCert);
     }
     async runWithDistributionCertificateAsync(ctx, distCert) {
-        var _a, _b, _c, _d, _e;
         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;
+        let appleTeam = distCert.appleTeam ?? currentBuildCredentials?.provisioningProfile?.appleTeam ?? null;
         if (!appleTeam) {
             await ctx.appStore.ensureAuthenticatedAsync();
             appleTeam = await (0, AppleTeamUtils_1.resolveAppleTeamIfAuthenticatedAsync)(ctx, app);
@@ -77,7 +76,7 @@ class SetUpAdhocProvisioningProfile {
             }
         }
         // 3. Choose devices for internal distribution
-        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 provisionedDeviceIdentifiers = (currentBuildCredentials?.provisioningProfile?.appleDevices ?? []).map(i => i.identifier);
         const chosenDevices = await (0, DeviceUtils_1.chooseDevicesAsync)(registeredAppleDevices, provisionedDeviceIdentifiers);
         // 4. Reuse or create the profile on Apple Developer Portal
         const applePlatform = await (0, target_1.getApplePlatformFromTarget)(target);
@@ -88,7 +87,7 @@ class SetUpAdhocProvisioningProfile {
         // 5. Create or update the profile on servers
         const appleAppIdentifier = await ctx.ios.createOrGetExistingAppleAppIdentifierAsync(ctx.graphqlClient, app, appleTeam);
         let appleProvisioningProfile;
-        if (currentBuildCredentials === null || currentBuildCredentials === void 0 ? void 0 : currentBuildCredentials.provisioningProfile) {
+        if (currentBuildCredentials?.provisioningProfile) {
             appleProvisioningProfile = await this.reuseCurrentProvisioningProfileAsync(currentBuildCredentials.provisioningProfile, provisioningProfileStoreInfo, ctx, app, appleAppIdentifier);
         }
         else {

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

@@ -79,7 +79,7 @@ class SetUpAscApiKey {
         if (purpose !== AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE) {
             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);
+        return !!appCredentials?.appStoreConnectApiKeyForSubmissions;
     }
     async processChoicesAsync(ctx, purpose, choices) {
         (0, assert_1.default)(choices.length > 0, 'SetupAscApiKey: There must be at least one choice');

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

@@ -59,13 +59,12 @@ class SetUpBuildCredentials {
 exports.SetUpBuildCredentials = SetUpBuildCredentials;
 function toIosCredentials(appBuildCredentialsMap) {
     return Object.entries(appBuildCredentialsMap).reduce((acc, [targetName, appBuildCredentials]) => {
-        var _a, _b, _c;
         acc[targetName] = {
             distributionCertificate: {
-                certificateP12: (0, nullthrows_1.default)((_a = appBuildCredentials.distributionCertificate) === null || _a === void 0 ? void 0 : _a.certificateP12),
-                certificatePassword: (0, nullthrows_1.default)((_b = appBuildCredentials.distributionCertificate) === null || _b === void 0 ? void 0 : _b.certificatePassword),
+                certificateP12: (0, nullthrows_1.default)(appBuildCredentials.distributionCertificate?.certificateP12),
+                certificatePassword: (0, nullthrows_1.default)(appBuildCredentials.distributionCertificate?.certificatePassword),
             },
-            provisioningProfile: (0, nullthrows_1.default)((_c = appBuildCredentials.provisioningProfile) === null || _c === void 0 ? void 0 : _c.provisioningProfile),
+            provisioningProfile: (0, nullthrows_1.default)(appBuildCredentials.provisioningProfile?.provisioningProfile),
         };
         return acc;
     }, {});

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

@@ -127,9 +127,8 @@ class SetUpDistributionCertificate {
         const validDistCertSerialNumberSet = new Set(validDistCertSerialNumbers);
         const distCertsForAccount = await ctx.ios.getDistributionCertificatesForAccountAsync(ctx.graphqlClient, this.app.account);
         const distCertsForAppleTeam = distCertsForAccount.filter(distCert => {
-            var _a;
             return (!distCert.appleTeam ||
-                distCert.appleTeam.appleTeamIdentifier === ((_a = ctx.appStore.authCtx) === null || _a === void 0 ? void 0 : _a.team.id));
+                distCert.appleTeam.appleTeamIdentifier === ctx.appStore.authCtx?.team.id);
         });
         const validDistCerts = distCertsForAppleTeam.filter(distCert => {
             return validDistCertSerialNumberSet.has(distCert.serialNumber);

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

@@ -91,10 +91,9 @@ class SetUpProvisioningProfile {
         return updatedProfile;
     }
     getCurrentProfileStoreInfo(profiles, currentProfile) {
-        var _a;
-        return ((_a = profiles.find(profile => currentProfile.developerPortalIdentifier
+        return (profiles.find(profile => currentProfile.developerPortalIdentifier
             ? currentProfile.developerPortalIdentifier === profile.provisioningProfileId
-            : currentProfile.provisioningProfile === profile.provisioningProfile)) !== null && _a !== void 0 ? _a : null);
+            : currentProfile.provisioningProfile === profile.provisioningProfile) ?? null);
     }
 }
 exports.SetUpProvisioningProfile = SetUpProvisioningProfile;

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

@@ -59,14 +59,13 @@ class SetUpTargetBuildCredentialsFromCredentialsJson {
         return newBuildCredentials;
     }
     async getDistributionCertificateToAssignAsync(ctx, appleTeam, currentDistributionCertificate) {
-        var _a, _b;
         const { certificateP12, certificatePassword } = this.targetCredentials.distributionCertificate;
         if (!currentDistributionCertificate) {
             return await ctx.ios.createDistributionCertificateAsync(ctx.graphqlClient, this.app.account, {
                 certP12: certificateP12,
                 certPassword: certificatePassword,
                 teamId: appleTeam.appleTeamIdentifier,
-                teamName: (_a = appleTeam.appleTeamName) !== null && _a !== void 0 ? _a : undefined,
+                teamName: appleTeam.appleTeamName ?? undefined,
             });
         }
         const isSameCertificate = currentDistributionCertificate.certificateP12 === certificateP12;
@@ -75,7 +74,7 @@ class SetUpTargetBuildCredentialsFromCredentialsJson {
                 certP12: certificateP12,
                 certPassword: certificatePassword,
                 teamId: appleTeam.appleTeamIdentifier,
-                teamName: (_b = appleTeam.appleTeamName) !== null && _b !== void 0 ? _b : undefined,
+                teamName: appleTeam.appleTeamName ?? undefined,
             });
         }
         // If the configured Distribution Certificate is the same as the new one, just use the currently configured certificate