eas-cli 0.43.0 → 0.44.0

package/build/build/android/UpdatesModule.d.ts

@@ -1,5 +1,4 @@
 import { ExpoConfig } from '@expo/config';
-export declare function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void>;
 export declare function syncUpdatesConfigurationAsync(projectDir: string, exp: ExpoConfig): Promise<void>;
 export declare function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null>;
 export declare function readChannelSafelyAsync(projectDir: string): Promise<string | null>;

package/build/build/android/UpdatesModule.js

@@ -1,52 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readChannelSafelyAsync = exports.readReleaseChannelSafelyAsync = exports.syncUpdatesConfigurationAsync = exports.configureUpdatesAsync = void 0;
-const tslib_1 = require("tslib");
+exports.readChannelSafelyAsync = exports.readReleaseChannelSafelyAsync = exports.syncUpdatesConfigurationAsync = void 0;
 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 updates_1 = require("../utils/updates");
-async function configureUpdatesAsync(projectDir, exp) {
-    (0, updates_1.ensureValidVersions)(exp);
-    const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
-    const androidManifestPath = await config_plugins_1.AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-    const androidManifest = await getAndroidManifestAsync(projectDir);
-    if (!config_plugins_1.AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
-        const result = config_plugins_1.AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
-        await config_plugins_1.AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, result);
-    }
-}
-exports.configureUpdatesAsync = configureUpdatesAsync;
 async function syncUpdatesConfigurationAsync(projectDir, exp) {
     (0, updates_1.ensureValidVersions)(exp);
     const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
-    try {
-        await ensureUpdatesConfiguredAsync(projectDir);
-    }
-    catch (error) {
-        log_1.default.error('expo-updates module is not configured. Please run "eas build:configure" first to configure the project');
-        throw error;
-    }
     const androidManifestPath = await config_plugins_1.AndroidConfig.Paths.getAndroidManifestAsync(projectDir);
-    let androidManifest = await getAndroidManifestAsync(projectDir);
-    if (!config_plugins_1.AndroidConfig.Updates.areVersionsSynced(exp, androidManifest)) {
-        androidManifest = config_plugins_1.AndroidConfig.Updates.setVersionsConfig(exp, androidManifest);
-        await config_plugins_1.AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, androidManifest);
-    }
-    if (!config_plugins_1.AndroidConfig.Updates.isMainApplicationMetaDataSynced(exp, androidManifest, accountName)) {
-        log_1.default.warn('Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project');
-    }
-}
-exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;
-// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
-// all that is needed on Expo SDK 43+ to configure expo-updates configuration in AndroidManifest.xml
-async function ensureUpdatesConfiguredAsync(projectDir) {
     const androidManifest = await getAndroidManifestAsync(projectDir);
-    if (!config_plugins_1.AndroidConfig.Updates.isMainApplicationMetaDataSet(androidManifest)) {
-        throw new Error('Missing values in AndroidManifest.xml');
-    }
+    const updatedAndroidManifest = config_plugins_1.AndroidConfig.Updates.setUpdatesConfig(exp, androidManifest, accountName);
+    await config_plugins_1.AndroidConfig.Manifest.writeAndroidManifestAsync(androidManifestPath, updatedAndroidManifest);
 }
+exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;
 async function readReleaseChannelSafelyAsync(projectDir) {
     try {
         const androidManifest = await getAndroidManifestAsync(projectDir);

package/build/build/android/build.js

@@ -16,9 +16,9 @@ const build_1 = require("../build");
 const graphql_1 = require("../graphql");
 const credentials_1 = require("../utils/credentials");
 const validate_1 = require("../validate");
-const configure_1 = require("./configure");
 const graphql_2 = require("./graphql");
 const prepareJob_1 = require("./prepareJob");
+const syncProjectConfiguration_1 = require("./syncProjectConfiguration");
 async function createAndroidContextAsync(ctx) {
     var _a;
     const { buildProfile } = ctx;
@@ -49,8 +49,8 @@ async function prepareAndroidBuildAsync(ctx) {
         ensureCredentialsAsync: async (ctx) => {
             return await ensureAndroidCredentialsAsync(ctx);
         },
-        ensureProjectConfiguredAsync: async () => {
-            await (0, configure_1.validateAndSyncProjectConfigurationAsync)({
+        syncProjectConfigurationAsync: async () => {
+            await (0, syncProjectConfiguration_1.syncProjectConfigurationAsync)({
                 projectDir: ctx.projectDir,
                 exp: ctx.exp,
                 buildProfile: ctx.buildProfile,

package/build/build/android/{configure.d.ts → syncProjectConfiguration.d.ts}

@@ -1,10 +1,9 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
-import { ConfigureContext } from '../context';
-export declare function configureAndroidAsync(ctx: ConfigureContext): Promise<void>;
-export declare function validateAndSyncProjectConfigurationAsync({ projectDir, exp, buildProfile, }: {
+export declare function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, }: {
     projectDir: string;
     exp: ExpoConfig;
     buildProfile: BuildProfile<Platform.ANDROID>;
 }): Promise<void>;
+export declare function cleanUpOldEasBuildGradleScriptAsync(projectDir: string): Promise<void>;

package/build/build/android/{configure.js → syncProjectConfiguration.js}

@@ -1,39 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAndSyncProjectConfigurationAsync = exports.configureAndroidAsync = void 0;
+exports.cleanUpOldEasBuildGradleScriptAsync = exports.syncProjectConfigurationAsync = 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 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 applicationId_1 = require("../../project/android/applicationId");
 const workflow_1 = require("../../project/workflow");
-const vcs_1 = require("../../vcs");
 const updates_1 = require("../utils/updates");
 const UpdatesModule_1 = require("./UpdatesModule");
 const version_1 = require("./version");
-async function configureAndroidAsync(ctx) {
-    if (!ctx.hasAndroidNativeProject) {
-        await (0, applicationId_1.ensureApplicationIdIsDefinedForManagedProjectAsync)(ctx.projectDir, ctx.exp);
-        return;
-    }
-    (0, applicationId_1.warnIfAndroidPackageDefinedInAppConfigForBareWorkflowProject)(ctx.projectDir, ctx.exp);
-    await config_plugins_1.AndroidConfig.EasBuild.configureEasBuildAsync(ctx.projectDir);
-    const easGradlePath = config_plugins_1.AndroidConfig.EasBuild.getEasBuildGradlePath(ctx.projectDir);
-    await (0, vcs_1.getVcsClient)().trackFileAsync(easGradlePath);
-    if ((0, updates_1.isExpoUpdatesInstalled)(ctx.projectDir)) {
-        await (0, UpdatesModule_1.configureUpdatesAsync)(ctx.projectDir, ctx.exp);
-    }
-    log_1.default.withTick('Android project configured');
-}
-exports.configureAndroidAsync = configureAndroidAsync;
-async function validateAndSyncProjectConfigurationAsync({ projectDir, exp, buildProfile, }) {
+async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, }) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID);
     const { autoIncrement } = buildProfile;
     const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
     if (workflow === eas_build_job_1.Workflow.GENERIC) {
-        if (!(await config_plugins_1.AndroidConfig.EasBuild.isEasBuildGradleConfiguredAsync(projectDir))) {
-            throw new Error('Project is not configured. Please run "eas build:configure" to configure the project.');
-        }
+        await cleanUpOldEasBuildGradleScriptAsync(projectDir);
         if ((0, updates_1.isExpoUpdatesInstalled)(projectDir)) {
             await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(projectDir, exp);
         }
@@ -43,7 +27,7 @@ async function validateAndSyncProjectConfigurationAsync({ projectDir, exp, build
         await (0, version_1.bumpVersionInAppJsonAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy });
     }
 }
-exports.validateAndSyncProjectConfigurationAsync = validateAndSyncProjectConfigurationAsync;
+exports.syncProjectConfigurationAsync = syncProjectConfigurationAsync;
 function resolveVersionBumpStrategy(autoIncrement) {
     if (autoIncrement === true) {
         return version_1.BumpStrategy.VERSION_CODE;
@@ -58,3 +42,18 @@ function resolveVersionBumpStrategy(autoIncrement) {
         return version_1.BumpStrategy.APP_VERSION;
     }
 }
+// TODO: remove this after a few months
+async function cleanUpOldEasBuildGradleScriptAsync(projectDir) {
+    const easBuildGradlePath = path_1.default.join(projectDir, 'android', 'app', 'eas-build.gradle');
+    if (await fs_extra_1.default.pathExists(easBuildGradlePath)) {
+        log_1.default.withTick(`Removing ${chalk_1.default.bold('eas-build.gradle')} as it's not longer necessary`);
+        await fs_extra_1.default.remove(easBuildGradlePath);
+        const buildGradlePath = config_plugins_1.AndroidConfig.Paths.getAppBuildGradleFilePath(projectDir);
+        const buildGradleContents = await fs_extra_1.default.readFile(buildGradlePath, 'utf-8');
+        const buildGradleContentsWithoutApply = buildGradleContents.replace(/apply from: ["'].\/eas-build.gradle["']\n/, '');
+        if (buildGradleContentsWithoutApply !== buildGradleContents) {
+            await fs_extra_1.default.writeFile(buildGradlePath, buildGradleContentsWithoutApply);
+        }
+    }
+}
+exports.cleanUpOldEasBuildGradleScriptAsync = cleanUpOldEasBuildGradleScriptAsync;

package/build/build/build.d.ts

@@ -14,7 +14,7 @@ export interface JobData<Credentials> {
 interface Builder<TPlatform extends Platform, Credentials, TJob extends Job> {
     ctx: BuildContext<TPlatform>;
     ensureCredentialsAsync(ctx: BuildContext<TPlatform>): Promise<CredentialsResult<Credentials> | undefined>;
-    ensureProjectConfiguredAsync(ctx: BuildContext<TPlatform>): Promise<void>;
+    syncProjectConfigurationAsync(ctx: BuildContext<TPlatform>): Promise<void>;
     prepareJobAsync(ctx: BuildContext<TPlatform>, jobData: JobData<Credentials>): Promise<Job>;
     sendBuildRequestAsync(appId: string, job: TJob, metadata: Metadata): Promise<BuildResult>;
 }

package/build/build/build.js

@@ -29,14 +29,12 @@ async function prepareBuildRequestForPlatformAsync(builder) {
         failureEvent: events_1.BuildEvent.GATHER_CREDENTIALS_FAIL,
         trackingCtx: ctx.trackingCtx,
     });
-    if (!ctx.skipProjectConfiguration) {
-        await (0, common_1.withAnalyticsAsync)(async () => await builder.ensureProjectConfiguredAsync(ctx), {
-            attemptEvent: events_1.BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
-            successEvent: events_1.BuildEvent.CONFIGURE_PROJECT_SUCCESS,
-            failureEvent: events_1.BuildEvent.CONFIGURE_PROJECT_FAIL,
-            trackingCtx: ctx.trackingCtx,
-        });
-    }
+    await (0, common_1.withAnalyticsAsync)(async () => await builder.syncProjectConfigurationAsync(ctx), {
+        attemptEvent: events_1.BuildEvent.CONFIGURE_PROJECT_ATTEMPT,
+        successEvent: events_1.BuildEvent.CONFIGURE_PROJECT_SUCCESS,
+        failureEvent: events_1.BuildEvent.CONFIGURE_PROJECT_FAIL,
+        trackingCtx: ctx.trackingCtx,
+    });
     if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
         log_1.default.addNewLineIfNone();
         await (0, repository_1.reviewAndCommitChangesAsync)(`[EAS Build] Run EAS Build for ${platform_1.requestedPlatformDisplayNames[ctx.platform]}`, { nonInteractive: ctx.nonInteractive });

package/build/build/configure.d.ts

@@ -1,8 +1,13 @@
-import { RequestedPlatform } from '../platform';
-import { ConfigureContext } from './context';
-export declare function ensureProjectConfiguredAsync(projectDir: string, requestedPlatform: RequestedPlatform): Promise<void>;
-export declare function configureAsync(options: {
-    platform: RequestedPlatform;
+interface ConfigureParams {
     projectDir: string;
-}): Promise<void>;
-export declare function ensureEasJsonExistsAsync(ctx: ConfigureContext): Promise<void>;
+    nonInteractive: boolean;
+}
+/**
+ * Creates eas.json if it does not exist.
+ *
+ * Returns:
+ * - false - if eas.json already exists
+ * - true - if eas.json was created by the function
+ */
+export declare function ensureProjectConfiguredAsync(configureParams: ConfigureParams): Promise<boolean>;
+export {};

package/build/build/configure.js

@@ -1,79 +1,41 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureEasJsonExistsAsync = exports.configureAsync = exports.ensureProjectConfiguredAsync = void 0;
+exports.ensureProjectConfiguredAsync = void 0;
 const tslib_1 = require("tslib");
-const config_1 = require("@expo/config");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const eas_json_1 = require("@expo/eas-json");
-const core_1 = require("@oclif/core");
 const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
 const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const log_1 = (0, tslib_1.__importStar)(require("../log"));
-const platform_1 = require("../platform");
+const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const workflow_1 = require("../project/workflow");
-const prompts_1 = require("../prompts");
-const actions_1 = require("../user/actions");
 const easCli_1 = require("../utils/easCli");
 const vcs_1 = require("../vcs");
-const configure_1 = require("./android/configure");
-const configure_2 = require("./ios/configure");
 const repository_1 = require("./utils/repository");
-const configureCommitMessage = {
-    [platform_1.RequestedPlatform.Android]: 'Configure EAS Build for Android',
-    [platform_1.RequestedPlatform.Ios]: 'Configure EAS Build for iOS',
-    [platform_1.RequestedPlatform.All]: 'Configure EAS Build',
-};
-async function ensureProjectConfiguredAsync(projectDir, requestedPlatform) {
-    if (await fs_extra_1.default.pathExists(eas_json_1.EasJsonReader.formatEasJsonPath(projectDir))) {
-        return;
-    }
-    const message = 'This project is not configured to build with EAS. Set it up now?';
-    const confirm = await (0, prompts_1.confirmAsync)({ message });
-    if (confirm) {
-        await configureAsync({
-            projectDir,
-            platform: requestedPlatform,
-        });
-        if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
-            core_1.Errors.error('Build process requires clean working tree, please commit all your changes and run `eas build` again', { exit: 1 });
-        }
-    }
-    else {
-        core_1.Errors.error(`Aborting, please run ${chalk_1.default.bold('eas build:configure')} or create eas.json (${(0, log_1.learnMore)('https://docs.expo.dev/build/eas-json')})`, { exit: 1 });
+/**
+ * Creates eas.json if it does not exist.
+ *
+ * Returns:
+ * - false - if eas.json already exists
+ * - true - if eas.json was created by the function
+ */
+async function ensureProjectConfiguredAsync(configureParams) {
+    if (await fs_extra_1.default.pathExists(eas_json_1.EasJsonReader.formatEasJsonPath(configureParams.projectDir))) {
+        return false;
     }
+    await configureAsync(configureParams);
+    return true;
 }
 exports.ensureProjectConfiguredAsync = ensureProjectConfiguredAsync;
-async function configureAsync(options) {
+async function configureAsync({ projectDir, nonInteractive }) {
     await (0, repository_1.maybeBailOnRepoStatusAsync)();
-    const { exp } = (0, config_1.getConfig)(options.projectDir, { skipSDKVersionRequirement: true });
-    const ctx = {
-        user: await (0, actions_1.ensureLoggedInAsync)(),
-        projectDir: options.projectDir,
-        exp,
-        requestedPlatform: options.platform,
-        shouldConfigureAndroid: [platform_1.RequestedPlatform.All, platform_1.RequestedPlatform.Android].includes(options.platform),
-        shouldConfigureIos: [platform_1.RequestedPlatform.All, platform_1.RequestedPlatform.Ios].includes(options.platform),
-        hasAndroidNativeProject: (await (0, workflow_1.resolveWorkflowAsync)(options.projectDir, eas_build_job_1.Platform.ANDROID)) === eas_build_job_1.Workflow.GENERIC,
-        hasIosNativeProject: (await (0, workflow_1.resolveWorkflowAsync)(options.projectDir, eas_build_job_1.Platform.IOS)) === eas_build_job_1.Workflow.GENERIC,
-    };
-    log_1.default.newLine();
-    await ensureEasJsonExistsAsync(ctx);
-    if (ctx.shouldConfigureAndroid) {
-        await (0, configure_1.configureAndroidAsync)(ctx);
-    }
-    if (ctx.shouldConfigureIos) {
-        await (0, configure_2.configureIosAsync)(ctx);
-    }
+    await createEasJsonAsync(projectDir);
     if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
         log_1.default.newLine();
-        await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
-    }
-    else if (!(await (0, vcs_1.getVcsClient)().hasUncommittedChangesAsync())) {
-        log_1.default.newLine();
-        log_1.default.withTick('No changes were necessary, the project is already configured correctly.');
+        await (0, repository_1.reviewAndCommitChangesAsync)('Configure EAS Build', {
+            nonInteractive,
+        });
     }
 }
-exports.configureAsync = configureAsync;
 const EAS_JSON_MANAGED_DEFAULT = {
     cli: {
         version: `>= ${easCli_1.easCliVersion}`,
@@ -115,50 +77,14 @@ const EAS_JSON_BARE_DEFAULT = {
         production: {},
     },
 };
-async function ensureEasJsonExistsAsync(ctx) {
-    const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(ctx.projectDir);
-    if (await fs_extra_1.default.pathExists(easJsonPath)) {
-        const reader = new eas_json_1.EasJsonReader(ctx.projectDir);
-        await reader.readAsync();
-        log_1.default.withTick('Validated eas.json');
-        return;
-    }
-    const easJson = ctx.hasAndroidNativeProject && ctx.hasIosNativeProject
+async function createEasJsonAsync(projectDir) {
+    const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(projectDir);
+    const hasAndroidNativeProject = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.ANDROID)) === eas_build_job_1.Workflow.GENERIC;
+    const hasIosNativeProject = (await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS)) === eas_build_job_1.Workflow.GENERIC;
+    const easJson = hasAndroidNativeProject || hasIosNativeProject
         ? EAS_JSON_BARE_DEFAULT
         : EAS_JSON_MANAGED_DEFAULT;
     await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
     await (0, vcs_1.getVcsClient)().trackFileAsync(easJsonPath);
-    log_1.default.withTick('Generated eas.json');
-}
-exports.ensureEasJsonExistsAsync = ensureEasJsonExistsAsync;
-var ShouldCommitChanges;
-(function (ShouldCommitChanges) {
-    ShouldCommitChanges[ShouldCommitChanges["Yes"] = 0] = "Yes";
-    ShouldCommitChanges[ShouldCommitChanges["ShowDiffFirst"] = 1] = "ShowDiffFirst";
-    ShouldCommitChanges[ShouldCommitChanges["Skip"] = 2] = "Skip";
-})(ShouldCommitChanges || (ShouldCommitChanges = {}));
-async function reviewAndCommitChangesAsync(initialCommitMessage, askedFirstTime = true) {
-    const { selected } = await (0, prompts_1.promptAsync)({
-        type: 'select',
-        name: 'selected',
-        message: 'Can we commit these changes to git for you?',
-        choices: [
-            { title: 'Yes', value: ShouldCommitChanges.Yes },
-            ...(askedFirstTime
-                ? [{ title: 'Show the diff and ask me again', value: ShouldCommitChanges.ShowDiffFirst }]
-                : []),
-            {
-                title: 'Skip committing changes, I will do it later on my own',
-                value: ShouldCommitChanges.Skip,
-            },
-        ],
-    });
-    if (selected === ShouldCommitChanges.Yes) {
-        await (0, repository_1.commitPromptAsync)({ initialCommitMessage });
-        log_1.default.withTick('Committed changes');
-    }
-    else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-        await (0, vcs_1.getVcsClient)().showDiffAsync();
-        await reviewAndCommitChangesAsync(initialCommitMessage, false);
-    }
+    log_1.default.withTick(`Generated ${chalk_1.default.bold('eas.json')}`);
 }

package/build/build/context.d.ts

@@ -5,21 +5,10 @@ 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 { LocalBuildOptions } from './local';
-export interface ConfigureContext {
-    user: Actor;
-    projectDir: string;
-    exp: ExpoConfig;
-    requestedPlatform: RequestedPlatform;
-    shouldConfigureAndroid: boolean;
-    shouldConfigureIos: boolean;
-    hasAndroidNativeProject: boolean;
-    hasIosNativeProject: boolean;
-}
 export declare type CommonContext<T extends Platform> = Omit<BuildContext<T>, 'android' | 'ios'>;
 export interface AndroidBuildContext {
     applicationId: string;
@@ -45,7 +34,6 @@ export interface BuildContext<T extends Platform> {
     projectDir: string;
     projectId: string;
     projectName: string;
-    skipProjectConfiguration: boolean;
     trackingCtx: TrackingContext;
     user: Actor;
     workflow: Workflow;

package/build/build/createContext.d.ts

@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import { BuildContext } from './context';
 import { LocalBuildOptions } from './local';
-export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, clearCache, localBuildOptions, nonInteractive, platform, projectDir, skipProjectConfiguration, }: {
+export declare function createBuildContextAsync<T extends Platform>({ buildProfileName, buildProfile, clearCache, localBuildOptions, nonInteractive, platform, projectDir, }: {
     buildProfileName: string;
     buildProfile: BuildProfile<T>;
     clearCache: boolean;
@@ -10,5 +10,4 @@ export declare function createBuildContextAsync<T extends Platform>({ buildProfi
     nonInteractive: boolean;
     platform: T;
     projectDir: string;
-    skipProjectConfiguration: boolean;
 }): Promise<BuildContext<T>>;

package/build/build/createContext.js

@@ -15,7 +15,7 @@ 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, localBuildOptions, nonInteractive = false, platform, projectDir, skipProjectConfiguration = false, }) {
+async function createBuildContextAsync({ buildProfileName, buildProfile, clearCache = false, localBuildOptions, nonInteractive = false, platform, projectDir, }) {
     var _a;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
     const user = await (0, actions_1.ensureLoggedInAsync)();
@@ -58,7 +58,6 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
         projectDir,
         projectId,
         projectName,
-        skipProjectConfiguration,
         trackingCtx,
         user,
         workflow,

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

@@ -1,5 +1,4 @@
 import { ExpoConfig } from '@expo/config';
-export declare function configureUpdatesAsync(projectDir: string, exp: ExpoConfig): Promise<void>;
 export declare function syncUpdatesConfigurationAsync(projectDir: string, exp: ExpoConfig): Promise<void>;
 export declare function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null>;
 export declare function readChannelSafelyAsync(projectDir: string): Promise<string | null>;

package/build/build/ios/UpdatesModule.js

@@ -1,53 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readChannelSafelyAsync = exports.readReleaseChannelSafelyAsync = exports.syncUpdatesConfigurationAsync = exports.configureUpdatesAsync = void 0;
-const tslib_1 = require("tslib");
+exports.readChannelSafelyAsync = exports.readReleaseChannelSafelyAsync = exports.syncUpdatesConfigurationAsync = void 0;
 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");
-async function configureUpdatesAsync(projectDir, exp) {
-    (0, updates_1.ensureValidVersions)(exp);
-    const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
-    let expoPlist = await readExpoPlistAsync(projectDir);
-    if (!config_plugins_1.IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-        expoPlist = config_plugins_1.IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
-        await writeExpoPlistAsync(projectDir, expoPlist);
-    }
-    // TODO: ensure ExpoPlist in pbxproj
-}
-exports.configureUpdatesAsync = configureUpdatesAsync;
 async function syncUpdatesConfigurationAsync(projectDir, exp) {
     (0, updates_1.ensureValidVersions)(exp);
     const accountName = (0, projectUtils_1.getProjectAccountName)(exp, await (0, actions_1.ensureLoggedInAsync)());
-    try {
-        await ensureUpdatesConfiguredAsync(projectDir);
-    }
-    catch (error) {
-        log_1.default.error('expo-updates module is not configured. Please run "eas build:configure" first to configure the project');
-        throw error;
-    }
-    let expoPlist = await readExpoPlistAsync(projectDir);
-    if (!config_plugins_1.IOSConfig.Updates.isPlistVersionConfigurationSynced(exp, expoPlist)) {
-        expoPlist = config_plugins_1.IOSConfig.Updates.setVersionsConfig(exp, expoPlist);
-        await writeExpoPlistAsync(projectDir, expoPlist);
-    }
-    if (!config_plugins_1.IOSConfig.Updates.isPlistConfigurationSynced(exp, expoPlist, accountName)) {
-        log_1.default.warn('Native project configuration is not synced with values present in your app.json, run "eas build:configure" to make sure all values are applied in the native project');
-    }
-}
-exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;
-// Note: we assume here that Expo modules are properly configured in the project. Aside from that,
-// all that is needed on Expo SDK 43+ to configure expo-updates configuration in Expo.plist
-async function ensureUpdatesConfiguredAsync(projectDir) {
     const expoPlist = await readExpoPlistAsync(projectDir);
-    if (!config_plugins_1.IOSConfig.Updates.isPlistConfigurationSet(expoPlist)) {
-        throw new Error('Missing values in Expo.plist');
-    }
+    const updatedExpoPlist = config_plugins_1.IOSConfig.Updates.setUpdatesConfig(exp, expoPlist, accountName);
+    await writeExpoPlistAsync(projectDir, updatedExpoPlist);
 }
+exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;
 async function readExpoPlistAsync(projectDir) {
     var _a;
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);
@@ -72,8 +39,10 @@ exports.readReleaseChannelSafelyAsync = readReleaseChannelSafelyAsync;
 async function readChannelSafelyAsync(projectDir) {
     var _a, _b;
     try {
-        const expoPlist = await readExpoPlistAsync(projectDir); // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
-        const updatesRequestHeaders = (_a = expoPlist['EXUpdatesRequestHeaders']) !== null && _a !== void 0 ? _a : {}; //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+        // TODO-JJ remove any once IOSConfig.ExpoPlist is updated to include `EXUpdatesRequestHeaders : Record<string,string>`
+        const expoPlist = await readExpoPlistAsync(projectDir);
+        //TODO-JJ 'EXUpdatesRequestHeaders' IosConfig.Updates.Config.UPDATES_CONFIGURATION_REQUEST_HEADERS_KEY once https://github.com/expo/expo-cli/pull/3571 is published
+        const updatesRequestHeaders = (_a = expoPlist['EXUpdatesRequestHeaders']) !== null && _a !== void 0 ? _a : {};
         return (_b = updatesRequestHeaders['expo-channel-name']) !== null && _b !== void 0 ? _b : null;
     }
     catch (err) {

package/build/build/ios/build.js

@@ -10,10 +10,10 @@ const target_1 = require("../../project/ios/target");
 const build_1 = require("../build");
 const graphql_1 = require("../graphql");
 const validate_1 = require("../validate");
-const configure_1 = require("./configure");
 const credentials_1 = require("./credentials");
 const graphql_2 = require("./graphql");
 const prepareJob_1 = require("./prepareJob");
+const syncProjectConfiguration_1 = require("./syncProjectConfiguration");
 async function createIosContextAsync(ctx) {
     const { buildProfile } = ctx;
     if (ctx.workflow === eas_build_job_1.Workflow.MANAGED) {
@@ -47,8 +47,8 @@ async function prepareIosBuildAsync(ctx) {
         ensureCredentialsAsync: async (ctx) => {
             return (0, credentials_1.ensureIosCredentialsAsync)(ctx, ctx.ios.targets);
         },
-        ensureProjectConfiguredAsync: async () => {
-            await (0, configure_1.validateAndSyncProjectConfigurationAsync)({
+        syncProjectConfigurationAsync: async () => {
+            await (0, syncProjectConfiguration_1.syncProjectConfigurationAsync)({
                 projectDir: ctx.projectDir,
                 exp: ctx.exp,
                 buildProfile: ctx.buildProfile,

package/build/build/ios/{configure.d.ts → syncProjectConfiguration.d.ts}

@@ -2,9 +2,7 @@ import { ExpoConfig } from '@expo/config';
 import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 import type { XCBuildConfiguration } from 'xcode';
-import { ConfigureContext } from '../context';
-export declare function configureIosAsync(ctx: ConfigureContext): Promise<void>;
-export declare function validateAndSyncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }: {
+export declare function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }: {
     projectDir: string;
     exp: ExpoConfig;
     buildProfile: BuildProfile<Platform.IOS>;

package/build/build/ios/{configure.js → syncProjectConfiguration.js}

@@ -1,27 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateAndSyncProjectConfigurationAsync = exports.configureIosAsync = void 0;
-const tslib_1 = require("tslib");
+exports.syncProjectConfigurationAsync = void 0;
 const eas_build_job_1 = require("@expo/eas-build-job");
-const log_1 = (0, tslib_1.__importDefault)(require("../../log"));
-const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
 const workflow_1 = require("../../project/workflow");
 const updates_1 = require("../utils/updates");
 const UpdatesModule_1 = require("./UpdatesModule");
 const version_1 = require("./version");
-async function configureIosAsync(ctx) {
-    if (!ctx.hasIosNativeProject) {
-        await (0, bundleIdentifier_1.ensureBundleIdentifierIsDefinedForManagedProjectAsync)(ctx.projectDir, ctx.exp);
-        return;
-    }
-    (0, bundleIdentifier_1.warnIfBundleIdentifierDefinedInAppConfigForBareWorkflowProject)(ctx.projectDir, ctx.exp);
-    if ((0, updates_1.isExpoUpdatesInstalled)(ctx.projectDir)) {
-        await (0, UpdatesModule_1.configureUpdatesAsync)(ctx.projectDir, ctx.exp);
-    }
-    log_1.default.withTick('iOS project configured');
-}
-exports.configureIosAsync = configureIosAsync;
-async function validateAndSyncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }) {
+async function syncProjectConfigurationAsync({ projectDir, exp, buildProfile, buildSettings, }) {
     const workflow = await (0, workflow_1.resolveWorkflowAsync)(projectDir, eas_build_job_1.Platform.IOS);
     const { autoIncrement } = buildProfile;
     const versionBumpStrategy = resolveVersionBumpStrategy(autoIncrement !== null && autoIncrement !== void 0 ? autoIncrement : false);
@@ -35,7 +20,7 @@ async function validateAndSyncProjectConfigurationAsync({ projectDir, exp, build
         await (0, version_1.bumpVersionInAppJsonAsync)({ projectDir, exp, bumpStrategy: versionBumpStrategy });
     }
 }
-exports.validateAndSyncProjectConfigurationAsync = validateAndSyncProjectConfigurationAsync;
+exports.syncProjectConfigurationAsync = syncProjectConfigurationAsync;
 function resolveVersionBumpStrategy(autoIncrement) {
     if (autoIncrement === true) {
         return version_1.BumpStrategy.BUILD_NUMBER;

package/build/build/local.d.ts

@@ -4,6 +4,7 @@ export interface LocalBuildOptions {
     skipCleanup?: boolean;
     skipNativeBuild?: boolean;
     artifactsDir?: string;
+    artifactPath?: string;
     workingdir?: string;
     verbose?: boolean;
 }

package/build/build/local.js

@@ -6,7 +6,7 @@ const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"))
 const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
 const ora_1 = require("../ora");
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
-const PLUGIN_PACKAGE_VERSION = '0.0.57';
+const PLUGIN_PACKAGE_VERSION = '0.0.58';
 async function runLocalBuildAsync(job, options) {
     var _a;
     const { command, args } = await getCommandAndArgsAsync(job);
@@ -32,6 +32,7 @@ async function runLocalBuildAsync(job, options) {
                     : {}),
                 ...(options.skipNativeBuild ? { EAS_LOCAL_BUILD_SKIP_NATIVE_BUILD: '1' } : {}),
                 ...(options.artifactsDir ? { EAS_LOCAL_BUILD_ARTIFACTS_DIR: options.artifactsDir } : {}),
+                ...(options.artifactPath ? { EAS_LOCAL_BUILD_ARTIFACT_PATH: options.artifactPath } : {}),
             },
         });
         childProcess = spawnPromise.child;