eas-cli 9.0.2 → 9.0.4

package/build/metadata/config/validate.js

@@ -7,13 +7,11 @@ const ajv_1 = require("../utils/ajv");
 const metadataSchema = require('../../../schema/metadata-0.json');
 /** Validate the user-provided validation for issues */
 function validateConfig(config) {
-    var _a;
     const validator = (0, ajv_1.createValidator)().compile(metadataSchema);
     validator(config);
-    const issues = (0, ajv_1.getReadableErrors)((_a = validator.errors) !== null && _a !== void 0 ? _a : []).map(error => {
-        var _a, _b;
+    const issues = (0, ajv_1.getReadableErrors)(validator.errors ?? []).map(error => {
         const path = error.path === '$' ? [] : error.path.substring(2).split('.');
-        const id = (_b = (_a = error.original) === null || _a === void 0 ? void 0 : _a.keyword) !== null && _b !== void 0 ? _b : 'unknown';
+        const id = error.original?.keyword ?? 'unknown';
         return {
             id: `json-schema.${id}`,
             path,

package/build/metadata/errors.js

@@ -11,7 +11,7 @@ const log_1 = tslib_1.__importStar(require("../log"));
  */
 class MetadataValidationError extends Error {
     constructor(message, errors = []) {
-        super(message !== null && message !== void 0 ? message : 'Store configuration validation failed');
+        super(message ?? 'Store configuration validation failed');
         this.errors = errors;
     }
 }
@@ -49,10 +49,9 @@ exports.MetadataDownloadError = MetadataDownloadError;
  * This should help communicate any possible configuration error and help the user resolve it.
  */
 function logMetadataValidationError(error) {
-    var _a;
     log_1.default.newLine();
     log_1.default.error(chalk_1.default.bold(error.message));
-    if (((_a = error.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+    if (error.errors?.length > 0) {
         // TODO(cedric): group errors by property to make multiple errors for same property more readable
         for (const err of error.errors) {
             log_1.default.log(`  - ${chalk_1.default.bold(`$.${err.path.join('.')}`)} ${err.message}`);
@@ -65,14 +64,13 @@ exports.logMetadataValidationError = logMetadataValidationError;
  * If a normal error is thrown, this method will re-throw that error to avoid consuming it.
  */
 function handleMetadataError(error) {
-    var _a;
     if (error instanceof MetadataValidationError) {
         return logMetadataValidationError(error);
     }
     if (error instanceof MetadataDownloadError || error instanceof MetadataUploadError) {
         log_1.default.newLine();
         log_1.default.error(chalk_1.default.bold(error.message));
-        if (((_a = error.errors) === null || _a === void 0 ? void 0 : _a.length) > 0) {
+        if (error.errors?.length > 0) {
             log_1.default.newLine();
             log_1.default.error(error.errors.map(err => err.message).join('\n\n'));
         }

package/build/metadata/upload.js

@@ -15,7 +15,6 @@ const prompts_1 = require("../prompts");
  * Note, only App Store is supported at this time.
  */
 async function uploadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, }) {
-    var _a;
     const storeConfig = await loadConfigWithValidationPromptAsync(projectDir, profile);
     const { app, auth } = await (0, auth_1.getAppStoreAuthAsync)({
         exp,
@@ -31,7 +30,7 @@ async function uploadMetadataAsync({ projectDir, profile, exp, analytics, creden
     const tasks = (0, tasks_1.createAppleTasks)({
         // We need to resolve a different version as soon as possible.
         // This version is the parent model of all changes we are going to push.
-        version: (_a = config.getVersion()) === null || _a === void 0 ? void 0 : _a.versionString,
+        version: config.getVersion()?.versionString,
     });
     const taskCtx = { app };
     for (const task of tasks) {

package/build/metadata/utils/retry.js

@@ -6,7 +6,6 @@ async function waitAsync(duration) {
 }
 exports.waitAsync = waitAsync;
 async function retryIfNullAsync(method, options = {}) {
-    var _a;
     let { tries = 5, delay = 1000 } = options;
     while (tries > 0) {
         const value = await method();
@@ -14,7 +13,7 @@ async function retryIfNullAsync(method, options = {}) {
             return value;
         }
         tries--;
-        (_a = options.onRetry) === null || _a === void 0 ? void 0 : _a.call(options, tries);
+        options.onRetry?.(tries);
         await waitAsync(delay);
     }
     return null;

package/build/metadata/utils/telemetry.js

@@ -24,18 +24,17 @@ function subscribeTelemetry(analytics, event, options) {
         });
         return response;
     }, (error) => {
-        var _a, _b, _c, _d, _e;
         analytics.logEvent(event, {
             executionId,
             type: 'response',
             phase: 'rejected',
             method: error.request.method.toUpperCase(),
-            url: scrubber((_a = error.config) === null || _a === void 0 ? void 0 : _a.url),
+            url: scrubber(error.config?.url),
             error: scrubber(error.message),
-            status: String((_b = error.response) === null || _b === void 0 ? void 0 : _b.status),
-            statusText: scrubber((_c = error.response) === null || _c === void 0 ? void 0 : _c.statusText),
-            input: scrubber((_d = error.config) === null || _d === void 0 ? void 0 : _d.data),
-            output: scrubber((_e = error.response) === null || _e === void 0 ? void 0 : _e.data),
+            status: String(error.response?.status),
+            statusText: scrubber(error.response?.statusText),
+            input: scrubber(error.config?.data),
+            output: scrubber(error.response?.data),
         });
         throw error;
     });
@@ -47,15 +46,14 @@ function subscribeTelemetry(analytics, event, options) {
 exports.subscribeTelemetry = subscribeTelemetry;
 /** Exposed for testing */
 function makeDataScrubber({ app, auth }) {
-    var _a, _b;
     const token = getAuthTokenString(auth);
     const patterns = {
         APPLE_APP_ID: new RegExp(app.id, 'gi'),
         APPLE_USERNAME: auth.username ? new RegExp(auth.username, 'gi') : null,
         APPLE_PASSWORD: auth.password ? new RegExp(auth.password, 'gi') : null,
         APPLE_TOKEN: token ? new RegExp(token, 'gi') : null,
-        APPLE_TEAM_ID: ((_a = auth.context) === null || _a === void 0 ? void 0 : _a.teamId) ? new RegExp(auth.context.teamId, 'gi') : null,
-        APPLE_PROVIDER_ID: ((_b = auth.context) === null || _b === void 0 ? void 0 : _b.providerId)
+        APPLE_TEAM_ID: auth.context?.teamId ? new RegExp(auth.context.teamId, 'gi') : null,
+        APPLE_PROVIDER_ID: auth.context?.providerId
             ? new RegExp(String(auth.context.providerId), 'gi')
             : null,
     };
@@ -75,8 +73,7 @@ function makeDataScrubber({ app, auth }) {
 }
 exports.makeDataScrubber = makeDataScrubber;
 function getAuthTokenString(auth) {
-    var _a;
-    if (!((_a = auth.context) === null || _a === void 0 ? void 0 : _a.token)) {
+    if (!auth.context?.token) {
         return null;
     }
     if (typeof auth.context.token === 'object') {

package/build/onboarding/runCommand.js

@@ -44,7 +44,7 @@ async function runCommandAsync({ cwd, args, command, shouldShowStderrLine, shoul
     }
     catch (error) {
         if (showSpinner) {
-            spinner === null || spinner === void 0 ? void 0 : spinner.fail(`${chalk_1.default.bold(`${command} ${args.join(' ')}`)} failed`);
+            spinner?.fail(`${chalk_1.default.bold(`${command} ${args.join(' ')}`)} failed`);
         }
         else {
             log_1.default.error(`❌ ${chalk_1.default.bold(`${command} ${args.join(' ')}`)} failed`);
@@ -52,7 +52,7 @@ async function runCommandAsync({ cwd, args, command, shouldShowStderrLine, shoul
         throw error;
     }
     if (showSpinner) {
-        spinner === null || spinner === void 0 ? void 0 : spinner.succeed(`✅ ${chalk_1.default.bold(`${command} ${args.join(' ')}`)} succeeded`);
+        spinner?.succeed(`${chalk_1.default.bold(`${command} ${args.join(' ')}`)} succeeded`);
     }
     else {
         log_1.default.log(`✅ ${chalk_1.default.bold(`${command} ${args.join(' ')}`)} succeeded`);

package/build/ora.js

@@ -22,7 +22,7 @@ const isCi = (0, getenv_1.boolish)('CI', false);
  * @returns
  */
 function ora(options) {
-    const inputOptions = typeof options === 'string' ? { text: options } : options !== null && options !== void 0 ? options : {};
+    const inputOptions = typeof options === 'string' ? { text: options } : options ?? {};
     const disabled = log_1.default.isDebug || !process.stdin.isTTY || isCi;
     const spinner = (0, ora_1.default)({
         // Ensure our non-interactive mode emulates CI mode.
@@ -60,7 +60,23 @@ function ora(options) {
         console.error = errorReal;
     };
     spinner.start = (text) => {
-        wrapNativeLogs();
+        // wrapNativeLogs wraps calls to console so they always:
+        // 1. stop the spinner
+        // 2. log the message
+        // 3. start the spinner again
+        // Every restart of the spinner causes the spinner message to be logged again
+        // which makes logs look like
+        //
+        // - Exporting...
+        // [expo-cli] Starting Metro Bundler
+        // - Exporting...
+        // [expo-cli] Android Bundling complete 3492ms
+        // - Exporting...
+        //
+        // Skipping wrapping native logs removes the repeated interleaved "Exporting..." messages.
+        if (!disabled) {
+            wrapNativeLogs();
+        }
         return oraStart(text);
     };
     spinner.stopAndPersist = (options) => {

package/build/project/android/applicationId.js

@@ -38,7 +38,7 @@ async function ensureApplicationIdIsDefinedForManagedProjectAsync({ graphqlClien
 exports.ensureApplicationIdIsDefinedForManagedProjectAsync = ensureApplicationIdIsDefinedForManagedProjectAsync;
 class AmbiguousApplicationIdError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Could not resolve applicationId.');
+        super(message ?? 'Could not resolve applicationId.');
     }
 }
 exports.AmbiguousApplicationIdError = AmbiguousApplicationIdError;
@@ -67,7 +67,7 @@ async function getApplicationIdFromBareAsync(projectDir, gradleContext) {
         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);
+        return (0, nullthrows_1.default)(matchResult?.[1], errorMessage);
     }
 }
 exports.getApplicationIdFromBareAsync = getApplicationIdFromBareAsync;
@@ -92,7 +92,6 @@ async function getApplicationIdAsync(projectDir, exp, vcsClient, gradleContext)
 }
 exports.getApplicationIdAsync = getApplicationIdAsync;
 async function configureApplicationIdAsync({ graphqlClient, projectDir, projectId, exp, nonInteractive, }) {
-    var _a;
     if (nonInteractive) {
         throw new Error(`The "android.package" is required to be set in app config when running in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/versions/latest/config/app/#package')}`);
     }
@@ -115,7 +114,7 @@ async function configureApplicationIdAsync({ graphqlClient, projectDir, projectI
     const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
         ...rawStaticConfig.expo,
-        android: { ...(_a = rawStaticConfig.expo) === null || _a === void 0 ? void 0 : _a.android, package: packageName },
+        android: { ...rawStaticConfig.expo?.android, package: packageName },
     };
     await fs_extra_1.default.writeJson(paths.staticConfigPath, rawStaticConfig, { spaces: 2 });
     exp.android = { ...exp.android, package: packageName };

package/build/project/android/gradle.js

@@ -7,7 +7,6 @@ const gradleUtils = tslib_1.__importStar(require("./gradleUtils"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const workflow_1 = require("../../project/workflow");
 async function resolveGradleBuildContextAsync(projectDir, buildProfile, vcsClient) {
-    var _a;
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID, vcsClient);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
         try {
@@ -16,13 +15,13 @@ async function resolveGradleBuildContextAsync(projectDir, buildProfile, vcsClien
                 const parsedGradleCommand = buildProfile.gradleCommand
                     ? gradleUtils.parseGradleCommand(buildProfile.gradleCommand, buildGradle)
                     : undefined;
-                if ((parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.moduleName) &&
+                if (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.`);
                 }
                 return {
-                    moduleName: (_a = parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.moduleName) !== null && _a !== void 0 ? _a : gradleUtils.DEFAULT_MODULE_NAME,
-                    flavor: parsedGradleCommand === null || parsedGradleCommand === void 0 ? void 0 : parsedGradleCommand.flavor,
+                    moduleName: parsedGradleCommand?.moduleName ?? gradleUtils.DEFAULT_MODULE_NAME,
+                    flavor: parsedGradleCommand?.flavor,
                 };
             }
             else {

package/build/project/android/gradleUtils.js

@@ -13,8 +13,8 @@ async function getAppBuildGradleAsync(projectDir) {
 }
 exports.getAppBuildGradleAsync = getAppBuildGradleAsync;
 function resolveConfigValue(buildGradle, field, flavor) {
-    var _a, _b, _c, _d, _e, _f;
-    return ((_d = (flavor && ((_c = (_b = (_a = buildGradle === null || buildGradle === void 0 ? void 0 : buildGradle.android) === null || _a === void 0 ? void 0 : _a.productFlavors) === null || _b === void 0 ? void 0 : _b[flavor]) === null || _c === void 0 ? void 0 : _c[field]))) !== null && _d !== void 0 ? _d : (_f = (_e = buildGradle === null || buildGradle === void 0 ? void 0 : buildGradle.android) === null || _e === void 0 ? void 0 : _e.defaultConfig) === null || _f === void 0 ? void 0 : _f[field]);
+    return ((flavor && buildGradle?.android?.productFlavors?.[flavor]?.[field]) ??
+        buildGradle?.android?.defaultConfig?.[field]);
 }
 exports.resolveConfigValue = resolveConfigValue;
 /**
@@ -30,12 +30,11 @@ exports.resolveConfigValue = resolveConfigValue;
  * the flavor name
  **/
 function parseGradleCommand(cmd, buildGradle) {
-    var _a, _b, _c, _d;
-    const hasFlavorDimensions = ((_b = (_a = buildGradle.android) === null || _a === void 0 ? void 0 : _a.flavorDimensions) !== null && _b !== void 0 ? _b : '').split(',').length > 1;
+    const hasFlavorDimensions = (buildGradle.android?.flavorDimensions ?? '').split(',').length > 1;
     if (hasFlavorDimensions) {
         throw new Error('flavorDimensions in build.gradle are not supported yet');
     }
-    const flavors = new Set(Object.keys((_d = (_c = buildGradle === null || buildGradle === void 0 ? void 0 : buildGradle.android) === null || _c === void 0 ? void 0 : _c.productFlavors) !== null && _d !== void 0 ? _d : {}));
+    const flavors = new Set(Object.keys(buildGradle?.android?.productFlavors ?? {}));
     // remove any params specified after command name
     const [withoutParams] = cmd.split(' ');
     // remove leading :

package/build/project/expoConfig.js

@@ -61,7 +61,7 @@ function getPrivateExpoConfig(projectDir, opts = {}) {
 exports.getPrivateExpoConfig = getPrivateExpoConfig;
 function ensureExpoConfigExists(projectDir) {
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
-    if (!(paths === null || paths === void 0 ? void 0 : paths.staticConfigPath) && !(paths === null || paths === void 0 ? void 0 : paths.dynamicConfigPath)) {
+    if (!paths?.staticConfigPath && !paths?.dynamicConfigPath) {
         // eslint-disable-next-line node/no-sync
         fs_extra_1.default.writeFileSync(path_1.default.join(projectDir, 'app.json'), JSON.stringify({ expo: {} }, null, 2));
     }
@@ -73,16 +73,15 @@ async function ensureStaticExpoConfigIsValidAsync(projectDir) {
         const staticConfig = await json_file_1.default.readAsync(staticConfigPath);
         // Add the "expo" key if it doesn't exist on app.json yet, such as in
         // projects initialized with RNC CLI
-        if (!(staticConfig === null || staticConfig === void 0 ? void 0 : staticConfig.expo)) {
+        if (!staticConfig?.expo) {
             staticConfig.expo = {};
             await json_file_1.default.writeAsync(staticConfigPath, staticConfig);
         }
     }
 }
 function isUsingStaticExpoConfig(projectDir) {
-    var _a;
     const paths = (0, config_1.getConfigFilePaths)(projectDir);
-    return !!(((_a = paths.staticConfigPath) === null || _a === void 0 ? void 0 : _a.endsWith('app.json')) && !paths.dynamicConfigPath);
+    return !!(paths.staticConfigPath?.endsWith('app.json') && !paths.dynamicConfigPath);
 }
 exports.isUsingStaticExpoConfig = isUsingStaticExpoConfig;
 function getPublicExpoConfig(projectDir, opts = {}) {

package/build/project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync.js

@@ -17,7 +17,6 @@ const prompts_1 = require("../prompts");
  *    If yes, register and return that. If not, throw.
  */
 async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(graphqlClient, projectInfo, options, actor) {
-    var _a;
     const { accountName, projectName } = projectInfo;
     const projectFullName = `@${accountName}/${projectName}`;
     if (options.nonInteractive) {
@@ -25,7 +24,7 @@ async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(graph
     }
     const allAccounts = actor.accounts;
     const accountNamesWhereUserHasSufficientPublishPermissions = new Set(allAccounts
-        .filter(a => { var _a; return ((_a = a.users.find(it => it.actor.id === actor.id)) === null || _a === void 0 ? void 0 : _a.role) !== generated_1.Role.ViewOnly; })
+        .filter(a => a.users.find(it => it.actor.id === actor.id)?.role !== generated_1.Role.ViewOnly)
         .map(it => it.name));
     const account = allAccounts.find(a => a.name === accountName);
     if (!account) {
@@ -57,7 +56,7 @@ async function fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync(graph
         const id = await AppMutation_1.AppMutation.createAppAsync(graphqlClient, {
             accountId: account.id,
             projectName,
-            privacy: (_a = projectInfo.privacy) !== null && _a !== void 0 ? _a : generated_1.AppPrivacy.Public,
+            privacy: projectInfo.privacy ?? generated_1.AppPrivacy.Public,
         });
         spinner.succeed(`Created ${chalk_1.default.bold(projectLink)} on Expo`);
         return id;
@@ -75,13 +74,12 @@ exports.fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync = fetchOrCre
  * @returns A promise resolving to Project ID, null if it doesn't exist
  */
 async function findProjectIdByAccountNameAndSlugNullableAsync(graphqlClient, accountName, slug) {
-    var _a;
     try {
         const { id } = await AppQuery_1.AppQuery.byFullNameAsync(graphqlClient, `@${accountName}/${slug}`);
         return id;
     }
     catch (err) {
-        if ((_a = err.graphQLErrors) === null || _a === void 0 ? void 0 : _a.some((it) => { var _a; return ((_a = it.extensions) === null || _a === void 0 ? void 0 : _a.errorCode) !== 'EXPERIENCE_NOT_FOUND'; })) {
+        if (err.graphQLErrors?.some((it) => it.extensions?.errorCode !== 'EXPERIENCE_NOT_FOUND')) {
             throw err;
         }
         return null;

package/build/project/ios/bundleIdentifier.js

@@ -33,7 +33,7 @@ async function ensureBundleIdentifierIsDefinedForManagedProjectAsync({ graphqlCl
 exports.ensureBundleIdentifierIsDefinedForManagedProjectAsync = ensureBundleIdentifierIsDefinedForManagedProjectAsync;
 class AmbiguousBundleIdentifierError extends Error {
     constructor(message) {
-        super(message !== null && message !== void 0 ? message : 'Could not resolve bundle identifier.');
+        super(message ?? 'Could not resolve bundle identifier.');
     }
 }
 exports.AmbiguousBundleIdentifierError = AmbiguousBundleIdentifierError;
@@ -47,8 +47,8 @@ async function getBundleIdentifierAsync(projectDir, exp, vcsClient, xcodeContext
         if (!xcodeContext && isMultiScheme && isMultiTarget) {
             throw new AmbiguousBundleIdentifierError("Multiple schemes and targets found in Xcode project, bundle identifier couldn't be resolved.");
         }
-        const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(projectDir, xcodeContext !== null && xcodeContext !== void 0 ? xcodeContext : {});
-        const buildConfigurationDesc = (xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.targetName) && (xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.buildConfiguration)
+        const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifierFromPbxproj(projectDir, xcodeContext ?? {});
+        const buildConfigurationDesc = xcodeContext?.targetName && xcodeContext?.buildConfiguration
             ? ` (target = ${xcodeContext.targetName}, build configuration = ${xcodeContext.buildConfiguration})`
             : '';
         (0, assert_1.default)(bundleIdentifier, `Could not read bundle identifier from Xcode project${buildConfigurationDesc}.`);
@@ -59,9 +59,9 @@ async function getBundleIdentifierAsync(projectDir, exp, vcsClient, xcodeContext
     }
     else {
         // TODO: the following asserts are only temporary until we support app extensions in managed projects
-        (0, assert_1.default)(!(xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.targetName) ||
-            (xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.targetName) === config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(exp.name), 'targetName cannot be set to an arbitrary value for managed projects.');
-        (0, assert_1.default)(!(xcodeContext === null || xcodeContext === void 0 ? void 0 : xcodeContext.buildConfiguration), 'buildConfiguration cannot be passed for managed projects.');
+        (0, assert_1.default)(!xcodeContext?.targetName ||
+            xcodeContext?.targetName === config_plugins_1.IOSConfig.XcodeUtils.sanitizedName(exp.name), 'targetName cannot be set to an arbitrary value for managed projects.');
+        (0, assert_1.default)(!xcodeContext?.buildConfiguration, 'buildConfiguration cannot be passed for managed projects.');
         const bundleIdentifier = config_plugins_1.IOSConfig.BundleIdentifier.getBundleIdentifier(exp);
         if (!bundleIdentifier || !isBundleIdentifierValid(bundleIdentifier)) {
             if (bundleIdentifier) {
@@ -76,7 +76,6 @@ async function getBundleIdentifierAsync(projectDir, exp, vcsClient, xcodeContext
 }
 exports.getBundleIdentifierAsync = getBundleIdentifierAsync;
 async function configureBundleIdentifierAsync({ graphqlClient, projectDir, projectId, exp, nonInteractive, }) {
-    var _a;
     if (nonInteractive) {
         throw new Error(`The "ios.bundleIdentifier" is required to be set in app config when running in non-interactive mode. ${(0, log_1.learnMore)('https://docs.expo.dev/versions/latest/config/app/#bundleidentifier')}`);
     }
@@ -99,7 +98,7 @@ async function configureBundleIdentifierAsync({ graphqlClient, projectDir, proje
     const rawStaticConfig = (0, appJson_1.readAppJson)(paths.staticConfigPath);
     rawStaticConfig.expo = {
         ...rawStaticConfig.expo,
-        ios: { ...(_a = rawStaticConfig.expo) === null || _a === void 0 ? void 0 : _a.ios, bundleIdentifier },
+        ios: { ...rawStaticConfig.expo?.ios, bundleIdentifier },
     };
     await fs_extra_1.default.writeJson(paths.staticConfigPath, rawStaticConfig, { spaces: 2 });
     exp.ios = { ...exp.ios, bundleIdentifier };

package/build/project/ios/entitlements.js

@@ -6,7 +6,6 @@ const prebuild_config_1 = require("@expo/prebuild-config");
 const plist_1 = require("../../utils/plist");
 const workflow_1 = require("../workflow");
 async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcsClient) {
-    var _a;
     const originalProcessEnv = process.env;
     try {
         process.env = {
@@ -20,7 +19,7 @@ async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcs
             introspect: true,
             ignoreExistingNativeFiles: await (0, workflow_1.hasIgnoredIosProjectAsync)(projectDir, vcsClient),
         });
-        return ((_a = expWithMods.ios) === null || _a === void 0 ? void 0 : _a.entitlements) || {};
+        return expWithMods.ios?.entitlements || {};
     }
     finally {
         process.env = originalProcessEnv;

package/build/project/ios/scheme.js

@@ -10,16 +10,17 @@ const prompts_1 = require("../../prompts");
 const sortBy_1 = tslib_1.__importDefault(require("../../utils/expodash/sortBy"));
 const workflow_1 = require("../workflow");
 async function resolveXcodeBuildContextAsync({ exp, projectDir, nonInteractive, vcsClient, }, buildProfile) {
-    var _a, _b;
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS, vcsClient);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
-        const buildScheme = (_a = buildProfile.scheme) !== null && _a !== void 0 ? _a : (await selectSchemeAsync({
-            projectDir,
-            nonInteractive,
-        }));
+        const buildScheme = buildProfile.scheme ??
+            (await selectSchemeAsync({
+                projectDir,
+                nonInteractive,
+            }));
         return {
             buildScheme,
-            buildConfiguration: (_b = buildProfile.buildConfiguration) !== null && _b !== void 0 ? _b : (await config_plugins_1.IOSConfig.BuildScheme.getArchiveBuildConfigurationForSchemeAsync(projectDir, buildScheme)),
+            buildConfiguration: buildProfile.buildConfiguration ??
+                (await config_plugins_1.IOSConfig.BuildScheme.getArchiveBuildConfigurationForSchemeAsync(projectDir, buildScheme)),
         };
     }
     else {

package/build/project/ios/target.js

@@ -16,15 +16,14 @@ const AppExtensionsConfigSchema = joi_1.default.array().items(joi_1.default.obje
     entitlements: joi_1.default.object(),
 }));
 async function resolveManagedProjectTargetsAsync({ exp, projectDir, xcodeBuildContext, env, vcsClient, }) {
-    var _a, _b, _c, _d, _e, _f;
     const { buildScheme, buildConfiguration } = xcodeBuildContext;
     const applicationTargetName = buildScheme;
     const applicationTargetBundleIdentifier = await (0, bundleIdentifier_1.getBundleIdentifierAsync)(projectDir, exp, vcsClient, {
         targetName: applicationTargetName,
         buildConfiguration,
     });
-    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env !== null && env !== void 0 ? env : {}, vcsClient);
-    const appExtensions = (_f = (_e = (_d = (_c = (_b = (_a = exp.extra) === null || _a === void 0 ? void 0 : _a.eas) === null || _b === void 0 ? void 0 : _b.build) === null || _c === void 0 ? void 0 : _c.experimental) === null || _d === void 0 ? void 0 : _d.ios) === null || _e === void 0 ? void 0 : _e.appExtensions) !== null && _f !== void 0 ? _f : [];
+    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {}, vcsClient);
+    const appExtensions = exp.extra?.eas?.build?.experimental?.ios?.appExtensions ?? [];
     const { error } = AppExtensionsConfigSchema.validate(appExtensions, {
         allowUnknown: false,
         abortEarly: false,
@@ -32,16 +31,13 @@ async function resolveManagedProjectTargetsAsync({ exp, projectDir, xcodeBuildCo
     if (error) {
         throw new Error(`Failed to validate "extra.eas.build.experimental.ios.appExtensions" in you app config.\n${error.message}`);
     }
-    const extensionsTargets = appExtensions.map(extension => {
-        var _a, _b;
-        return ({
-            targetName: extension.targetName,
-            buildConfiguration,
-            bundleIdentifier: extension.bundleIdentifier,
-            parentBundleIdentifier: (_a = extension.parentBundleIdentifier) !== null && _a !== void 0 ? _a : applicationTargetBundleIdentifier,
-            entitlements: (_b = extension.entitlements) !== null && _b !== void 0 ? _b : {},
-        });
-    });
+    const extensionsTargets = appExtensions.map(extension => ({
+        targetName: extension.targetName,
+        buildConfiguration,
+        bundleIdentifier: extension.bundleIdentifier,
+        parentBundleIdentifier: extension.parentBundleIdentifier ?? applicationTargetBundleIdentifier,
+        entitlements: extension.entitlements ?? {},
+    }));
     return [
         {
             targetName: applicationTargetName,
@@ -70,7 +66,7 @@ async function resolveBareProjectTargetsAsync({ exp, projectDir, xcodeBuildConte
         targetName: applicationTarget.name,
         bundleIdentifier,
         buildConfiguration,
-        entitlements: entitlements !== null && entitlements !== void 0 ? entitlements : {},
+        entitlements: entitlements ?? {},
         buildSettings: resolveBareProjectBuildSettings(pbxProject, applicationTarget.name, buildConfiguration),
     });
     const dependencies = await resolveBareProjectDependenciesAsync({
@@ -121,7 +117,7 @@ async function resolveBareProjectDependenciesAsync({ exp, projectDir, buildConfi
                 buildConfiguration,
                 bundleIdentifier: dependencyBundleIdentifier,
                 parentBundleIdentifier: bundleIdentifier,
-                entitlements: entitlements !== null && entitlements !== void 0 ? entitlements : {},
+                entitlements: entitlements ?? {},
                 buildSettings: resolveBareProjectBuildSettings(pbxProject, dependency.name, buildConfiguration),
             });
             const dependencyDependencies = await resolveBareProjectDependenciesAsync({
@@ -157,20 +153,20 @@ function findTargetByName(targets, name) {
 }
 exports.findTargetByName = findTargetByName;
 function resolveBareProjectBuildSettings(project, targetName, buildConfiguration) {
-    var _a;
     const xcBuildConfiguration = config_plugins_1.IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
         targetName,
         buildConfiguration,
     });
-    return (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) !== null && _a !== void 0 ? _a : {};
+    return xcBuildConfiguration?.buildSettings ?? {};
 }
 /**
  * Get Apple Platform from the Xcode Target where possible.
  * @returns - Apple Platform when known, defaults to IOS when unknown
  */
 function getApplePlatformFromTarget(target) {
-    var _a, _b;
-    return ((_b = (_a = getApplePlatformFromSdkRoot(target)) !== null && _a !== void 0 ? _a : getApplePlatformFromDeviceFamily(target)) !== null && _b !== void 0 ? _b : constants_1.ApplePlatform.IOS);
+    return (getApplePlatformFromSdkRoot(target) ??
+        getApplePlatformFromDeviceFamily(target) ??
+        constants_1.ApplePlatform.IOS);
 }
 exports.getApplePlatformFromTarget = getApplePlatformFromTarget;
 /**
@@ -178,8 +174,7 @@ exports.getApplePlatformFromTarget = getApplePlatformFromTarget;
  * @returns - Apple Platform when known, defaults to null when unknown
  */
 function getApplePlatformFromSdkRoot(target) {
-    var _a;
-    const sdkRoot = (_a = target.buildSettings) === null || _a === void 0 ? void 0 : _a.SDKROOT;
+    const sdkRoot = target.buildSettings?.SDKROOT;
     if (!sdkRoot) {
         return null;
     }
@@ -207,8 +202,7 @@ exports.getApplePlatformFromSdkRoot = getApplePlatformFromSdkRoot;
  * @returns - Apple Platform when known, defaults to null when unknown
  */
 function getApplePlatformFromDeviceFamily(target) {
-    var _a;
-    const deviceFamily = (_a = target.buildSettings) === null || _a === void 0 ? void 0 : _a.TARGETED_DEVICE_FAMILY;
+    const deviceFamily = target.buildSettings?.TARGETED_DEVICE_FAMILY;
     if (!deviceFamily) {
         return null;
     }

package/build/project/metroConfig.js

@@ -8,12 +8,11 @@ const resolve_from_1 = tslib_1.__importDefault(require("resolve-from"));
 const log_1 = tslib_1.__importStar(require("../log"));
 const prompts_1 = require("../prompts");
 async function validateMetroConfigForManagedWorkflowAsync(ctx) {
-    var _a, _b;
     if (!(await configExistsAsync(ctx.projectDir))) {
         return;
     }
     const metroConfig = await loadConfigAsync(ctx.projectDir);
-    const hasHashAssetFilesPlugin = (_b = (_a = metroConfig.transformer) === null || _a === void 0 ? void 0 : _a.assetPlugins) === null || _b === void 0 ? void 0 : _b.find((plugin) => plugin.match(/expo-asset[/|\\]tools[/|\\]hashAssetFiles/));
+    const hasHashAssetFilesPlugin = metroConfig.transformer?.assetPlugins?.find((plugin) => plugin.match(/expo-asset[/|\\]tools[/|\\]hashAssetFiles/));
     if (!hasHashAssetFilesPlugin) {
         log_1.default.warn(`It looks like that you are using a custom ${chalk_1.default.bold('metro.config.js')} that does not extend ${chalk_1.default.bold('@expo/metro-config')}.`);
         log_1.default.warn('This can result in unexpected and hard to debug issues, like missing assets in the production bundle.');

package/build/project/projectUtils.js

@@ -87,8 +87,7 @@ function isExpoUpdatesInstalledOrAvailable(projectDir, sdkVersion) {
 }
 exports.isExpoUpdatesInstalledOrAvailable = isExpoUpdatesInstalledOrAvailable;
 function isUsingEASUpdate(exp, projectId) {
-    var _a;
-    return ((_a = exp.updates) === null || _a === void 0 ? void 0 : _a.url) === (0, api_1.getEASUpdateURL)(projectId);
+    return exp.updates?.url === (0, api_1.getEASUpdateURL)(projectId);
 }
 exports.isUsingEASUpdate = isUsingEASUpdate;
 async function getExpoUpdatesPackageVersionIfInstalledAsync(projectDir) {
@@ -97,11 +96,10 @@ async function getExpoUpdatesPackageVersionIfInstalledAsync(projectDir) {
         return null;
     }
     const { version } = await fs_extra_1.default.readJson(maybePackageJson);
-    return version !== null && version !== void 0 ? version : null;
+    return version ?? null;
 }
 async function validateAppVersionRuntimePolicySupportAsync(projectDir, exp) {
-    var _a;
-    if (typeof exp.runtimeVersion !== 'object' || ((_a = exp.runtimeVersion) === null || _a === void 0 ? void 0 : _a.policy) !== 'appVersion') {
+    if (typeof exp.runtimeVersion !== 'object' || exp.runtimeVersion?.policy !== 'appVersion') {
         return;
     }
     const expoUpdatesPackageVersion = await getExpoUpdatesPackageVersionIfInstalledAsync(projectDir);
@@ -138,10 +136,10 @@ exports.isModernExpoUpdatesCLIWithRuntimeVersionCommandSupportedAsync = isModern
 async function installExpoUpdatesAsync(projectDir, options) {
     log_1.default.log(chalk_1.default.gray `> npx expo install expo-updates`);
     try {
-        await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', 'expo-updates'], { silent: options === null || options === void 0 ? void 0 : options.silent });
+        await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', 'expo-updates'], { silent: options?.silent });
     }
     catch (error) {
-        if (options === null || options === void 0 ? void 0 : options.silent) {
+        if (options?.silent) {
             log_1.default.error('stdout' in error ? error.stdout : error.message);
         }
         throw error;