eas-cli 0.35.0 → 0.38.0

package/build/build/context.d.ts

@@ -1,10 +1,14 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import type { XCBuildConfiguration } from 'xcode';
+import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
+import { Target } from '../credentials/ios/types';
 import { RequestedPlatform } from '../platform';
+import { GradleBuildContext } from '../project/android/gradle';
+import { XcodeBuildContext } from '../project/ios/scheme';
 import { Actor } from '../user/User';
-import { TrackingContext } from './types';
 export interface ConfigureContext {
     user: Actor;
     projectDir: string;
@@ -15,6 +19,18 @@ export interface ConfigureContext {
     hasAndroidNativeProject: boolean;
     hasIosNativeProject: boolean;
 }
+export declare type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
+export interface AndroidBuildContext {
+    applicationId: string;
+    gradleContext?: GradleBuildContext;
+}
+export interface IosBuildContext {
+    bundleIdentifier: string;
+    applicationTargetBuildSettings: XCBuildConfiguration['buildSettings'];
+    applicationTarget: Target;
+    targets: Target[];
+    xcodeBuildContext: XcodeBuildContext;
+}
 export interface BuildContext<T extends Platform> {
     accountName: string;
     buildProfile: BuildProfile<T>;
@@ -32,14 +48,6 @@ export interface BuildContext<T extends Platform> {
     trackingCtx: TrackingContext;
     user: Actor;
     workflow: Workflow;
+    android: T extends Platform.ANDROID ? AndroidBuildContext : undefined;
+    ios: T extends Platform.IOS ? IosBuildContext : undefined;
 }
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, clearCache, local, nonInteractive, platform, projectDir, skipProjectConfiguration, }: {
-    buildProfileName: string;
-    buildProfile: BuildProfile<T>;
-    clearCache: boolean;
-    local: boolean;
-    nonInteractive: boolean;
-    platform: T;
-    projectDir: string;
-    skipProjectConfiguration: boolean;
-}): Promise<BuildContext<T>>;

package/build/build/context.js

@@ -1,98 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createBuildContextAsync = void 0;
-const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
-const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
-const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
-const uuid_1 = require("uuid");
-const context_1 = require("../credentials/context");
-const expoConfig_1 = require("../project/expoConfig");
-const projectUtils_1 = require("../project/projectUtils");
-const workflow_1 = require("../project/workflow");
-const Account_1 = require("../user/Account");
-const actions_1 = require("../user/actions");
-const analytics_1 = (0, tslib_1.__importStar)(require("./utils/analytics"));
-async function createBuildContextAsync({ buildProfileName, buildProfile, clearCache = false, local, nonInteractive = false, platform, projectDir, skipProjectConfiguration = false, }) {
-    var _a;
-    const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
-    const user = await (0, actions_1.ensureLoggedInAsync)();
-    const accountName = (0, projectUtils_1.getProjectAccountName)(exp, user);
-    const projectName = exp.slug;
-    const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp, { env: buildProfile.env });
-    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform);
-    const accountId = (_a = (0, Account_1.findAccountByName)(user.accounts, accountName)) === null || _a === void 0 ? void 0 : _a.id;
-    const credentialsCtx = new context_1.CredentialsContext({
-        exp,
-        nonInteractive,
-        projectDir,
-        user,
-    });
-    const devClientProperties = getDevClientEventProperties({
-        platform,
-        projectDir,
-        buildProfile,
-    });
-    const trackingCtx = {
-        tracking_id: (0, uuid_1.v4)(),
-        platform,
-        ...(accountId && { account_id: accountId }),
-        account_name: accountName,
-        project_id: projectId,
-        project_type: workflow,
-        ...devClientProperties,
-    };
-    analytics_1.default.logEvent(analytics_1.Event.BUILD_COMMAND, trackingCtx);
-    return {
-        accountName,
-        buildProfile,
-        buildProfileName,
-        clearCache,
-        credentialsCtx,
-        exp,
-        local,
-        nonInteractive,
-        platform,
-        projectDir,
-        projectId,
-        projectName,
-        skipProjectConfiguration,
-        trackingCtx,
-        user,
-        workflow,
-    };
-}
-exports.createBuildContextAsync = createBuildContextAsync;
-function getDevClientEventProperties({ platform, projectDir, buildProfile, }) {
-    var _a;
-    let includesDevClient;
-    const version = tryGetDevClientVersion(projectDir);
-    if (platform === eas_build_job_1.Platform.ANDROID && 'gradleCommand' in buildProfile) {
-        includesDevClient = Boolean(version && ((_a = buildProfile.gradleCommand) === null || _a === void 0 ? void 0 : _a.includes('Debug')));
-    }
-    else if (platform === eas_build_job_1.Platform.IOS && 'buildConfiguration' in buildProfile) {
-        includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
-    }
-    else if (buildProfile.developmentClient) {
-        includesDevClient = true;
-    }
-    else {
-        includesDevClient = false;
-    }
-    if (version) {
-        return { dev_client: includesDevClient, dev_client_version: version };
-    }
-    else {
-        return { dev_client: includesDevClient };
-    }
-}
-function tryGetDevClientVersion(projectDir) {
-    var _a, _b;
-    try {
-        const pkg = json_file_1.default.read((0, resolve_from_1.default)(projectDir, 'expo-dev-client/package.json'));
-        return (_b = (_a = pkg.version) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : null;
-    }
-    catch {
-        return null;
-    }
-}

package/build/build/createContext.d.ts

@@ -0,0 +1,13 @@
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import { BuildContext } from './context';
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, clearCache, local, nonInteractive, platform, projectDir, skipProjectConfiguration, }: {
+    buildProfileName: string;
+    buildProfile: BuildProfile<T>;
+    clearCache: boolean;
+    local: boolean;
+    nonInteractive: boolean;
+    platform: T;
+    projectDir: string;
+    skipProjectConfiguration: boolean;
+}): Promise<BuildContext<T>>;

package/build/build/createContext.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createBuildContextAsync = void 0;
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
+const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
+const uuid_1 = require("uuid");
+const events_1 = require("../analytics/events");
+const context_1 = require("../credentials/context");
+const expoConfig_1 = require("../project/expoConfig");
+const projectUtils_1 = require("../project/projectUtils");
+const workflow_1 = require("../project/workflow");
+const Account_1 = require("../user/Account");
+const actions_1 = require("../user/actions");
+const build_1 = require("./android/build");
+const build_2 = require("./ios/build");
+async function createBuildContextAsync({ buildProfileName, buildProfile, clearCache = false, local, nonInteractive = false, platform, projectDir, skipProjectConfiguration = false, }) {
+    var _a;
+    const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
+    const user = await (0, actions_1.ensureLoggedInAsync)();
+    const accountName = (0, projectUtils_1.getProjectAccountName)(exp, user);
+    const projectName = exp.slug;
+    const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp, { env: buildProfile.env });
+    const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, platform);
+    const accountId = (_a = (0, Account_1.findAccountByName)(user.accounts, accountName)) === null || _a === void 0 ? void 0 : _a.id;
+    const credentialsCtx = new context_1.CredentialsContext({
+        exp,
+        nonInteractive,
+        projectDir,
+        user,
+    });
+    const devClientProperties = getDevClientEventProperties({
+        platform,
+        projectDir,
+        buildProfile,
+    });
+    const trackingCtx = {
+        tracking_id: (0, uuid_1.v4)(),
+        platform,
+        ...(accountId && { account_id: accountId }),
+        account_name: accountName,
+        project_id: projectId,
+        project_type: workflow,
+        ...devClientProperties,
+    };
+    events_1.Analytics.logEvent(events_1.BuildEvent.BUILD_COMMAND, trackingCtx);
+    const commonContext = {
+        accountName,
+        buildProfile,
+        buildProfileName,
+        clearCache,
+        credentialsCtx,
+        exp,
+        local,
+        nonInteractive,
+        platform,
+        projectDir,
+        projectId,
+        projectName,
+        skipProjectConfiguration,
+        trackingCtx,
+        user,
+        workflow,
+    };
+    if (platform === eas_build_job_1.Platform.ANDROID) {
+        const common = commonContext;
+        return {
+            ...common,
+            android: await (0, build_1.createAndroidContextAsync)(common),
+        };
+    }
+    else {
+        const common = commonContext;
+        return {
+            ...common,
+            ios: await (0, build_2.createIosContextAsync)(common),
+        };
+    }
+}
+exports.createBuildContextAsync = createBuildContextAsync;
+function getDevClientEventProperties({ platform, projectDir, buildProfile, }) {
+    var _a;
+    let includesDevClient;
+    const version = tryGetDevClientVersion(projectDir);
+    if (platform === eas_build_job_1.Platform.ANDROID && 'gradleCommand' in buildProfile) {
+        includesDevClient = Boolean(version && ((_a = buildProfile.gradleCommand) === null || _a === void 0 ? void 0 : _a.includes('Debug')));
+    }
+    else if (platform === eas_build_job_1.Platform.IOS && 'buildConfiguration' in buildProfile) {
+        includesDevClient = Boolean(version && buildProfile.buildConfiguration === 'Debug');
+    }
+    else if (buildProfile.developmentClient) {
+        includesDevClient = true;
+    }
+    else {
+        includesDevClient = false;
+    }
+    if (version) {
+        return { dev_client: includesDevClient, dev_client_version: version };
+    }
+    else {
+        return { dev_client: includesDevClient };
+    }
+}
+function tryGetDevClientVersion(projectDir) {
+    var _a, _b;
+    try {
+        const pkg = json_file_1.default.read((0, resolve_from_1.default)(projectDir, 'expo-dev-client/package.json'));
+        return (_b = (_a = pkg.version) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : null;
+    }
+    catch {
+        return null;
+    }
+}

package/build/build/ios/UpdatesModule.js

@@ -6,9 +6,9 @@ const config_plugins_1 = require("@expo/config-plugins");
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
+const plist_1 = require("../../utils/plist");
 const vcs_1 = require("../../vcs");
 const updates_1 = require("../utils/updates");
-const plist_1 = require("./plist");
 async function configureUpdatesAsync(projectDir, exp) {
     (0, updates_1.ensureValidVersions)(exp);
     const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
@@ -49,8 +49,9 @@ async function ensureUpdatesConfiguredAsync(projectDir) {
     }
 }
 async function readExpoPlistAsync(projectDir) {
+    var _a;
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);
-    return (await (0, plist_1.readPlistAsync)(expoPlistPath));
+    return ((_a = (await (0, plist_1.readPlistAsync)(expoPlistPath))) !== null && _a !== void 0 ? _a : {});
 }
 async function writeExpoPlistAsync(projectDir, expoPlist) {
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);

package/build/build/ios/build.d.ts

@@ -1,4 +1,5 @@
 import { Platform } from '@expo/eas-build-job';
 import { BuildRequestSender } from '../build';
-import { BuildContext } from '../context';
+import { BuildContext, CommonContext, IosBuildContext } from '../context';
+export declare function createIosContextAsync(ctx: CommonContext<Platform.IOS>): Promise<IosBuildContext>;
 export declare function prepareIosBuildAsync(ctx: BuildContext<Platform.IOS>): Promise<BuildRequestSender>;

package/build/build/ios/build.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.prepareIosBuildAsync = void 0;
+exports.prepareIosBuildAsync = exports.createIosContextAsync = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const BuildMutation_1 = require("../../graphql/mutations/BuildMutation");
@@ -14,7 +14,7 @@ const configure_1 = require("./configure");
 const credentials_1 = require("./credentials");
 const graphql_2 = require("./graphql");
 const prepareJob_1 = require("./prepareJob");
-async function prepareIosBuildAsync(ctx) {
+async function createIosContextAsync(ctx) {
     const { buildProfile } = ctx;
     if (ctx.workflow === eas_build_job_1.Workflow.MANAGED) {
         await (0, bundleIdentifier_1.ensureBundleIdentifierIsDefinedForManagedProjectAsync)(ctx.projectDir, ctx.exp);
@@ -30,25 +30,36 @@ async function prepareIosBuildAsync(ctx) {
         projectDir: ctx.projectDir,
         exp: ctx.exp,
     }, xcodeBuildContext);
-    const buildConfiguration = resolveBuildConfiguration(ctx, targets);
+    const applicationTarget = (0, target_1.findApplicationTarget)(targets);
+    const applicationTargetBuildSettings = resolveBuildSettings(ctx, applicationTarget);
+    return {
+        bundleIdentifier: applicationTarget.bundleIdentifier,
+        applicationTarget,
+        applicationTargetBuildSettings,
+        targets,
+        xcodeBuildContext,
+    };
+}
+exports.createIosContextAsync = createIosContextAsync;
+async function prepareIosBuildAsync(ctx) {
     return await (0, build_1.prepareBuildRequestForPlatformAsync)({
         ctx,
         ensureCredentialsAsync: async (ctx) => {
-            return (0, credentials_1.ensureIosCredentialsAsync)(ctx, targets);
+            return (0, credentials_1.ensureIosCredentialsAsync)(ctx, ctx.ios.targets);
         },
         ensureProjectConfiguredAsync: async () => {
             await (0, configure_1.validateAndSyncProjectConfigurationAsync)({
                 projectDir: ctx.projectDir,
                 exp: ctx.exp,
-                buildProfile,
-                buildSettings: buildConfiguration.buildSettings,
+                buildProfile: ctx.buildProfile,
+                buildSettings: ctx.ios.applicationTargetBuildSettings,
             });
         },
-        getMetadataContext: () => {
-            return buildConfiguration;
-        },
         prepareJobAsync: async (ctx, jobData) => {
-            return await (0, prepareJob_1.prepareJobAsync)(ctx, { ...jobData, buildScheme: xcodeBuildContext.buildScheme });
+            return await (0, prepareJob_1.prepareJobAsync)(ctx, {
+                ...jobData,
+                buildScheme: ctx.ios.xcodeBuildContext.buildScheme,
+            });
         },
         sendBuildRequestAsync: async (appId, job, metadata) => {
             const graphqlMetadata = (0, graphql_1.transformMetadata)(metadata);
@@ -62,21 +73,15 @@ async function prepareIosBuildAsync(ctx) {
     });
 }
 exports.prepareIosBuildAsync = prepareIosBuildAsync;
-function resolveBuildConfiguration(ctx, targets) {
+function resolveBuildSettings(ctx, applicationTarget) {
     var _a;
     if (ctx.workflow === eas_build_job_1.Workflow.MANAGED) {
-        return { buildSettings: {} };
+        return {};
     }
-    const applicationTarget = (0, target_1.findApplicationTarget)(targets);
     const project = config_plugins_1.IOSConfig.XcodeUtils.getPbxproj(ctx.projectDir);
     const xcBuildConfiguration = config_plugins_1.IOSConfig.Target.getXCBuildConfigurationFromPbxproj(project, {
         targetName: applicationTarget.targetName,
         buildConfiguration: applicationTarget.buildConfiguration,
     });
-    const buildSettings = (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) !== null && _a !== void 0 ? _a : {};
-    return {
-        buildSettings,
-        targetName: applicationTarget.targetName,
-        buildConfiguration: applicationTarget.buildConfiguration,
-    };
+    return (_a = xcBuildConfiguration === null || xcBuildConfiguration === void 0 ? void 0 : xcBuildConfiguration.buildSettings) !== null && _a !== void 0 ? _a : {};
 }

package/build/build/ios/credentials.js

@@ -8,7 +8,7 @@ const BuildCredentialsUtils_1 = require("../../credentials/ios/actions/BuildCred
 const entitlements_1 = require("../../credentials/ios/appstore/entitlements");
 const credentials_1 = require("../utils/credentials");
 async function ensureIosCredentialsAsync(buildCtx, targets) {
-    var _a;
+    var _a, _b;
     if (!shouldProvideCredentials(buildCtx)) {
         return;
     }
@@ -16,9 +16,9 @@ async function ensureIosCredentialsAsync(buildCtx, targets) {
         app: (0, BuildCredentialsUtils_1.getAppFromContext)(buildCtx.credentialsCtx),
         targets,
         iosCapabilitiesOptions: {
-            entitlements: await (0, entitlements_1.resolveEntitlementsJsonAsync)(buildCtx.projectDir, buildCtx.workflow),
+            entitlements: await (0, entitlements_1.resolveEntitlementsJsonAsync)(buildCtx.projectDir, buildCtx.workflow, (_a = buildCtx.buildProfile.env) !== null && _a !== void 0 ? _a : {}),
         },
-        distribution: (_a = buildCtx.buildProfile.distribution) !== null && _a !== void 0 ? _a : 'store',
+        distribution: (_b = buildCtx.buildProfile.distribution) !== null && _b !== void 0 ? _b : 'store',
         enterpriseProvisioning: buildCtx.buildProfile.enterpriseProvisioning,
     });
     const { credentialsSource } = buildCtx.buildProfile;

package/build/build/ios/version.js

@@ -10,9 +10,9 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
+const plist_1 = require("../../utils/plist");
 const appJson_1 = require("../utils/appJson");
 const version_1 = require("../utils/version");
-const plist_1 = require("./plist");
 var BumpStrategy;
 (function (BumpStrategy) {
     BumpStrategy[BumpStrategy["APP_VERSION"] = 0] = "APP_VERSION";
@@ -96,7 +96,10 @@ async function maybeResolveVersionsAsync(projectDir, exp, buildSettings) {
             appVersion: await readShortVersionAsync(projectDir, exp, buildSettings),
         };
     }
-    catch {
+    catch (err) {
+        log_1.default.warn('Failed to read app versions.');
+        log_1.default.warn(err.message);
+        log_1.default.warn('Proceeding anyway...');
         return {};
     }
 }
@@ -125,8 +128,9 @@ function getInfoPlistPath(projectDir, buildSettings) {
 }
 exports.getInfoPlistPath = getInfoPlistPath;
 async function readInfoPlistAsync(projectDir, buildSettings) {
+    var _a;
     const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);
-    return (await (0, plist_1.readPlistAsync)(infoPlistPath));
+    return ((_a = (await (0, plist_1.readPlistAsync)(infoPlistPath))) !== null && _a !== void 0 ? _a : {});
 }
 async function writeInfoPlistAsync({ projectDir, infoPlist, buildSettings, }) {
     const infoPlistPath = getInfoPlistPath(projectDir, buildSettings);

package/build/build/local.js

@@ -3,36 +3,38 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runLocalBuildAsync = void 0;
 const tslib_1 = require("tslib");
 const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
+const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
+const PLUGIN_PACKAGE_VERSION = '0.0.50';
 async function runLocalBuildAsync(job) {
-    var _a, _b;
-    const execNameOrPath = (_b = (_a = process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) !== null && _a !== void 0 ? _a : (await findWithNodeResolutionAsync())) !== null && _b !== void 0 ? _b : PLUGIN_PACKAGE_NAME;
-    try {
-        const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
-        await (0, spawn_async_1.default)(execNameOrPath, [arg], {
-            stdio: 'inherit',
-        });
-    }
-    catch (err) {
-        if (err.code === 'ENOENT') {
-            log_1.default.warn(`Could not resolve executable ${execNameOrPath}.`);
-            log_1.default.warn(`Install ${PLUGIN_PACKAGE_NAME} package from npm e.g. ${chalk_1.default.bold(`npm install -g ${PLUGIN_PACKAGE_NAME}`)} and make sure it's in PATH.`);
-            throw err;
-        }
-    }
+    const { command, args } = await getCommandAndArgsAsync(job);
+    await (0, spawn_async_1.default)(command, args, {
+        stdio: 'inherit',
+    });
 }
 exports.runLocalBuildAsync = runLocalBuildAsync;
-async function findWithNodeResolutionAsync() {
-    try {
-        const resolvedPath = path_1.default.resolve(path_1.default.dirname(require.resolve(PLUGIN_PACKAGE_NAME)), '../bin/run');
-        if (await fs_extra_1.default.pathExists(resolvedPath)) {
-            return resolvedPath;
+async function getCommandAndArgsAsync(job) {
+    const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+    if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
+        return {
+            command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
+            args: [jobBase64],
+        };
+    }
+    else {
+        const args = [`${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64];
+        if (await isAtLeastNpm7Async()) {
+            // npx shipped with npm >= 7.0.0 requires the "-y" flag to run commands without
+            // prompting the user to install a package that is used for the first time
+            args.unshift('-y');
         }
+        return {
+            command: 'npx',
+            args,
+        };
     }
-    catch { }
-    return undefined;
+}
+async function isAtLeastNpm7Async() {
+    const version = (await (0, spawn_async_1.default)('npm', ['--version'])).stdout.trim();
+    return semver_1.default.gte(version, '7.0.0');
 }

package/build/build/metadata.d.ts

@@ -1,14 +1,3 @@
 import { Metadata, Platform } from '@expo/eas-build-job';
-import type { XCBuildConfiguration } from 'xcode';
-import { GradleBuildContext } from '../project/android/gradle';
 import { BuildContext } from './context';
-export declare type MetadataContext<T extends Platform> = T extends Platform.ANDROID ? AndroidMetadataContext : IosMetadataContext;
-export interface AndroidMetadataContext {
-    gradleContext?: GradleBuildContext;
-}
-export interface IosMetadataContext {
-    buildSettings: XCBuildConfiguration['buildSettings'];
-    targetName?: string;
-    buildConfiguration?: string;
-}
-export declare function collectMetadataAsync<T extends Platform>(ctx: BuildContext<T>, platformContext: MetadataContext<T>): Promise<Metadata>;
+export declare function collectMetadataAsync<T extends Platform>(ctx: BuildContext<T>): Promise<Metadata>;

package/build/build/metadata.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectMetadataAsync = void 0;
+const tslib_1 = require("tslib");
+const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
-const applicationId_1 = require("../project/android/applicationId");
-const bundleIdentifier_1 = require("../project/ios/bundleIdentifier");
+const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const projectUtils_1 = require("../project/projectUtils");
 const actions_1 = require("../user/actions");
 const easCli_1 = require("../utils/easCli");
@@ -13,24 +14,34 @@ const version_1 = require("./android/version");
 const UpdatesModule_2 = require("./ios/UpdatesModule");
 const version_2 = require("./ios/version");
 const updates_1 = require("./utils/updates");
-async function collectMetadataAsync(ctx, platformContext) {
-    var _a;
+// TODO(JJ): Replace this with the getRuntimeVersionNullable function in @expo/config-plugins
+function getRuntimeVersionNullable(...[config, platform]) {
+    try {
+        return config_plugins_1.Updates.getRuntimeVersion(config, platform);
+    }
+    catch (e) {
+        log_1.default.debug(e);
+        return null;
+    }
+}
+async function collectMetadataAsync(ctx) {
+    var _a, _b;
     const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
     const distribution = (_a = ('simulator' in ctx.buildProfile && ctx.buildProfile.simulator
         ? 'simulator'
         : ctx.buildProfile.distribution)) !== null && _a !== void 0 ? _a : 'store';
     const metadata = {
         trackingContext: ctx.trackingCtx,
-        ...(await maybeResolveVersionsAsync(ctx, platformContext)),
+        ...(await maybeResolveVersionsAsync(ctx)),
         cliVersion: easCli_1.easCliVersion,
         workflow: ctx.workflow,
         credentialsSource: ctx.buildProfile.credentialsSource,
         sdkVersion: ctx.exp.sdkVersion,
-        runtimeVersion: ctx.exp.runtimeVersion,
+        runtimeVersion: (_b = getRuntimeVersionNullable(ctx.exp, ctx.platform)) !== null && _b !== void 0 ? _b : undefined,
         ...channelOrReleaseChannel,
         distribution,
         appName: ctx.exp.name,
-        appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
+        appIdentifier: resolveAppIdentifier(ctx),
         buildProfile: ctx.buildProfileName,
         gitCommitHash: await (0, vcs_1.getVcsClient)().getCommitHashAsync(),
         isGitWorkingTreeDirty: await (0, vcs_1.getVcsClient)().hasUncommittedChangesAsync(),
@@ -42,11 +53,10 @@ async function collectMetadataAsync(ctx, platformContext) {
     return (0, eas_build_job_1.sanitizeMetadata)(metadata);
 }
 exports.collectMetadataAsync = collectMetadataAsync;
-async function maybeResolveVersionsAsync(ctx, platformContext) {
-    var _a;
+async function maybeResolveVersionsAsync(ctx) {
     if (ctx.platform === eas_build_job_1.Platform.IOS) {
-        const iosContext = platformContext;
-        return await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, (_a = iosContext === null || iosContext === void 0 ? void 0 : iosContext.buildSettings) !== null && _a !== void 0 ? _a : {});
+        const iosContext = ctx;
+        return await (0, version_2.maybeResolveVersionsAsync)(ctx.projectDir, ctx.exp, iosContext.ios.applicationTargetBuildSettings);
     }
     else if (ctx.platform === eas_build_job_1.Platform.ANDROID) {
         const androidCtx = ctx;
@@ -56,17 +66,12 @@ async function maybeResolveVersionsAsync(ctx, platformContext) {
         throw new Error(`Unsupported platform ${ctx.platform}`);
     }
 }
-async function resolveAppIdentifierAsync(ctx, platformContext) {
+function resolveAppIdentifier(ctx) {
     if (ctx.platform === eas_build_job_1.Platform.IOS) {
-        const iosContext = platformContext;
-        return await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, ctx.exp, {
-            targetName: iosContext.targetName,
-            buildConfiguration: iosContext.buildConfiguration,
-        });
+        return ctx.ios.bundleIdentifier;
     }
     else {
-        const androidContext = platformContext;
-        return await (0, applicationId_1.getApplicationIdAsync)(ctx.projectDir, ctx.exp, androidContext.gradleContext);
+        return ctx.android.applicationId;
     }
 }
 async function resolveChannelOrReleaseChannelAsync(ctx) {

package/build/build/types.d.ts

@@ -11,4 +11,3 @@ export declare enum BuildDistributionType {
     INTERNAL = "internal",
     SIMULATOR = "simulator"
 }
-export declare type TrackingContext = Record<string, string | number | boolean>;

package/build/build/utils/devClient.d.ts

@@ -1,7 +1,6 @@
-import { BuildProfile } from '@expo/eas-json';
 import { ProfileData } from '../../utils/profiles';
 export declare function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, nonInteractive, buildProfiles, }: {
     projectDir: string;
     nonInteractive?: boolean;
-    buildProfiles?: ProfileData<BuildProfile>[];
+    buildProfiles?: ProfileData<'build'>[];
 }): Promise<void>;

package/build/build/utils/repository.js

@@ -113,6 +113,7 @@ async function reviewAndCommitChangesAsync(initialCommitMessage, { nonInteractiv
         await (0, vcs_1.getVcsClient)().commitAsync({
             commitMessage: initialCommitMessage,
             commitAllFiles: false,
+            nonInteractive,
         });
         log_1.default.withTick('Committed changes.');
         return;

package/build/build/validate.d.ts

@@ -1,4 +1,4 @@
 import { Platform } from '@expo/eas-build-job';
-import { BuildContext } from './context';
-export declare function checkNodeEnvVariable(ctx: BuildContext<Platform>): void;
-export declare function checkGoogleServicesFileAsync<T extends Platform>(ctx: BuildContext<T>): Promise<void>;
+import { CommonContext } from './context';
+export declare function checkNodeEnvVariable(ctx: CommonContext<Platform>): void;
+export declare function checkGoogleServicesFileAsync<T extends Platform>(ctx: CommonContext<T>): Promise<void>;