eas-cli 5.3.1 → 5.5.0

package/build/project/workflow.js

@@ -6,8 +6,7 @@ const config_plugins_1 = require("@expo/config-plugins");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const vcs_1 = require("../vcs");
-async function resolveWorkflowAsync(projectDir, platform) {
+async function resolveWorkflowAsync(projectDir, platform, vcsClient) {
     let platformWorkflowMarkers;
     try {
         platformWorkflowMarkers =
@@ -21,7 +20,6 @@ async function resolveWorkflowAsync(projectDir, platform) {
     catch {
         return eas_build_job_1.Workflow.MANAGED;
     }
-    const vcsClient = (0, vcs_1.getVcsClient)();
     const vcsRootPath = path_1.default.normalize(await vcsClient.getRootPathAsync());
     for (const marker of platformWorkflowMarkers) {
         if ((await fs_extra_1.default.pathExists(marker)) &&
@@ -32,16 +30,15 @@ async function resolveWorkflowAsync(projectDir, platform) {
     return eas_build_job_1.Workflow.MANAGED;
 }
 exports.resolveWorkflowAsync = resolveWorkflowAsync;
-async function resolveWorkflowPerPlatformAsync(projectDir) {
+async function resolveWorkflowPerPlatformAsync(projectDir, vcsClient) {
     const [android, ios] = await Promise.all([
-        resolveWorkflowAsync(projectDir, eas_build_job_1.Platform.ANDROID),
-        resolveWorkflowAsync(projectDir, eas_build_job_1.Platform.IOS),
+        resolveWorkflowAsync(projectDir, eas_build_job_1.Platform.ANDROID, vcsClient),
+        resolveWorkflowAsync(projectDir, eas_build_job_1.Platform.IOS, vcsClient),
     ]);
     return { android, ios };
 }
 exports.resolveWorkflowPerPlatformAsync = resolveWorkflowPerPlatformAsync;
-async function hasIgnoredIosProjectAsync(projectDir) {
-    const vcsClient = (0, vcs_1.getVcsClient)();
+async function hasIgnoredIosProjectAsync(projectDir, vcsClient) {
     const vcsRootPath = path_1.default.normalize(await vcsClient.getRootPathAsync());
     try {
         const pbxProjectPath = config_plugins_1.IOSConfig.Paths.getPBXProjectPath(projectDir);

package/build/submit/android/AndroidSubmitCommand.js

@@ -44,7 +44,7 @@ class AndroidSubmitCommand {
     }
     async maybeGetAndroidPackageFromCurrentProjectAsync() {
         try {
-            return (0, results_1.result)(await (0, applicationId_1.getApplicationIdAsync)(this.ctx.projectDir, this.ctx.exp));
+            return (0, results_1.result)(await (0, applicationId_1.getApplicationIdAsync)(this.ctx.projectDir, this.ctx.exp, this.ctx.vcsClient));
         }
         catch (error) {
             if (error instanceof applicationId_1.AmbiguousApplicationIdError) {

package/build/submit/context.d.ts

@@ -5,6 +5,7 @@ import { Analytics, AnalyticsEventProperties } from '../analytics/AnalyticsManag
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
 import { Actor } from '../user/User';
+import { Client } from '../vcs/vcs';
 export interface SubmissionContext<T extends Platform> {
     accountName: string;
     archiveFlags: SubmitArchiveFlags;
@@ -20,6 +21,7 @@ export interface SubmissionContext<T extends Platform> {
     user: Actor;
     graphqlClient: ExpoGraphqlClient;
     analytics: Analytics;
+    vcsClient: Client;
     applicationIdentifierOverride?: string;
 }
 export interface SubmitArchiveFlags {
@@ -42,4 +44,5 @@ export declare function createSubmissionContextAsync<T extends Platform>(params:
     analytics: Analytics;
     exp: ExpoConfig;
     projectId: string;
+    vcsClient: Client;
 }): Promise<SubmissionContext<T>>;

package/build/submit/context.js

@@ -6,7 +6,7 @@ const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const context_1 = require("../credentials/context");
 const projectUtils_1 = require("../project/projectUtils");
 async function createSubmissionContextAsync(params) {
-    const { applicationIdentifier, projectDir, nonInteractive, actor, exp, projectId, graphqlClient, analytics, } = params;
+    const { applicationIdentifier, projectDir, nonInteractive, actor, exp, projectId, graphqlClient, analytics, vcsClient, } = params;
     const { env, ...rest } = params;
     const projectName = exp.slug;
     const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId);
@@ -20,6 +20,7 @@ async function createSubmissionContextAsync(params) {
             analytics,
             projectInfo: { exp, projectId },
             nonInteractive,
+            vcsClient,
         });
     }
     const analyticsEventProperties = {

package/build/submit/ios/AppProduce.js

@@ -16,7 +16,7 @@ async function ensureAppStoreConnectAppExistsAsync(ctx) {
     const { appName, language } = ctx.profile;
     const options = {
         ...ctx.profile,
-        bundleIdentifier: (_b = (_a = ctx.applicationIdentifierOverride) !== null && _a !== void 0 ? _a : ctx.profile.bundleIdentifier) !== null && _b !== void 0 ? _b : (await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, exp)),
+        bundleIdentifier: (_b = (_a = ctx.applicationIdentifierOverride) !== null && _a !== void 0 ? _a : ctx.profile.bundleIdentifier) !== null && _b !== void 0 ? _b : (await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, exp, ctx.vcsClient)),
         appName: (_c = appName !== null && appName !== void 0 ? appName : exp.name) !== null && _c !== void 0 ? _c : (await promptForAppNameAsync()),
         language: (0, language_1.sanitizeLanguage)(language),
     };

package/build/submit/ios/AscApiKeySource.js

@@ -27,7 +27,7 @@ async function getAscApiKeyResultAsync(ctx, source) {
 exports.getAscApiKeyResultAsync = getAscApiKeyResultAsync;
 async function maybeGetIosBundleIdentifierAsync(ctx) {
     try {
-        return await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, ctx.exp);
+        return await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, ctx.exp, ctx.vcsClient);
     }
     catch (error) {
         if (error instanceof bundleIdentifier_1.AmbiguousBundleIdentifierError) {

package/build/update/configure.d.ts

@@ -2,6 +2,7 @@ import { ExpoConfig } from '@expo/config-types';
 import { Workflow } from '@expo/eas-build-job';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { RequestedPlatform } from '../platform';
+import { Client } from '../vcs/vcs';
 export declare const DEFAULT_MANAGED_RUNTIME_VERSION_GTE_SDK_49: {
     readonly policy: "appVersion";
 };
@@ -24,10 +25,11 @@ export declare function ensureEASUpdateIsConfiguredInEasJsonAsync(projectDir: st
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any
  */
-export declare function ensureEASUpdateIsConfiguredAsync(graphqlClient: ExpoGraphqlClient, { exp: expMaybeWithoutUpdates, projectId, projectDir, platform, }: {
+export declare function ensureEASUpdateIsConfiguredAsync(graphqlClient: ExpoGraphqlClient, { exp: expMaybeWithoutUpdates, projectId, projectDir, vcsClient, platform, }: {
     exp: ExpoConfig;
     projectId: string;
     projectDir: string;
+    vcsClient: Client;
     platform: RequestedPlatform | null;
 }): Promise<void>;
 export declare function ensureUseClassicUpdatesIsRemovedAsync({ exp: expMaybeWithoutUpdates, projectDir, }: {

package/build/update/configure.js

@@ -172,13 +172,13 @@ function warnEASUpdatesManualConfig({ modifyConfig, workflows, }) {
 /**
  * Make sure that the current `app.json` configuration for EAS Updates is set natively.
  */
-async function ensureEASUpdateIsConfiguredNativelyAsync(graphqlClient, { exp, projectId, projectDir, platform, workflows, }) {
+async function ensureEASUpdateIsConfiguredNativelyAsync(graphqlClient, vcsClient, { exp, projectId, projectDir, platform, workflows, }) {
     if (['all', 'android'].includes(platform) && workflows.android === eas_build_job_1.Workflow.GENERIC) {
         await (0, UpdatesModule_1.syncUpdatesConfigurationAsync)(graphqlClient, projectDir, exp, projectId);
         log_1.default.withTick(`Configured ${chalk_1.default.bold('AndroidManifest.xml')} for EAS Update`);
     }
     if (['all', 'ios'].includes(platform) && workflows.ios === eas_build_job_1.Workflow.GENERIC) {
-        await (0, UpdatesModule_2.syncUpdatesConfigurationAsync)(graphqlClient, projectDir, exp, projectId);
+        await (0, UpdatesModule_2.syncUpdatesConfigurationAsync)(graphqlClient, vcsClient, projectDir, exp, projectId);
         log_1.default.withTick(`Configured ${chalk_1.default.bold('Expo.plist')} for EAS Update`);
     }
 }
@@ -237,7 +237,7 @@ exports.ensureEASUpdateIsConfiguredInEasJsonAsync = ensureEASUpdateIsConfiguredI
  *     - Sets `updates.url` if not set
  *   - Ensure latest changes are reflected in the native config, if any
  */
-async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expMaybeWithoutUpdates, projectId, projectDir, platform, }) {
+async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expMaybeWithoutUpdates, projectId, projectDir, vcsClient, platform, }) {
     var _a;
     // EAS Update and SDK 49's "useClassicUpdates" option are mutually exclusive
     if ((_a = expMaybeWithoutUpdates.updates) === null || _a === void 0 ? void 0 : _a.useClassicUpdates) {
@@ -260,7 +260,7 @@ async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expMaybeWi
     if (!platform) {
         return;
     }
-    const workflows = await (0, workflow_1.resolveWorkflowPerPlatformAsync)(projectDir);
+    const workflows = await (0, workflow_1.resolveWorkflowPerPlatformAsync)(projectDir, vcsClient);
     const { projectChanged, exp: expWithUpdates } = await ensureEASUpdatesIsConfiguredInExpoConfigAsync({
         exp: expMaybeWithoutUpdates,
         projectDir,
@@ -269,7 +269,7 @@ async function ensureEASUpdateIsConfiguredAsync(graphqlClient, { exp: expMaybeWi
         workflows,
     });
     if (projectChanged || !hasExpoUpdates) {
-        await ensureEASUpdateIsConfiguredNativelyAsync(graphqlClient, {
+        await ensureEASUpdateIsConfiguredNativelyAsync(graphqlClient, vcsClient, {
             exp: expWithUpdates,
             projectDir,
             projectId,

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

@@ -1,5 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
-export declare function syncUpdatesConfigurationAsync(graphqlClient: ExpoGraphqlClient, projectDir: string, exp: ExpoConfig, projectId: string): Promise<void>;
+import { Client } from '../../vcs/vcs';
+export declare function syncUpdatesConfigurationAsync(graphqlClient: ExpoGraphqlClient, vcsClient: Client, projectDir: string, exp: ExpoConfig, projectId: string): Promise<void>;
 export declare function readReleaseChannelSafelyAsync(projectDir: string): Promise<string | null>;
 export declare function readChannelSafelyAsync(projectDir: string): Promise<string | null>;

package/build/update/ios/UpdatesModule.js

@@ -5,14 +5,13 @@ const config_plugins_1 = require("@expo/config-plugins");
 const platform_1 = require("../../platform");
 const projectUtils_1 = require("../../project/projectUtils");
 const plist_1 = require("../../utils/plist");
-const vcs_1 = require("../../vcs");
 const utils_1 = require("../utils");
-async function syncUpdatesConfigurationAsync(graphqlClient, projectDir, exp, projectId) {
+async function syncUpdatesConfigurationAsync(graphqlClient, vcsClient, projectDir, exp, projectId) {
     (0, utils_1.ensureValidVersions)(exp, platform_1.RequestedPlatform.Ios);
     const accountName = (await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(graphqlClient, projectId)).name;
     const expoPlist = await readExpoPlistAsync(projectDir);
     const updatedExpoPlist = config_plugins_1.IOSConfig.Updates.setUpdatesConfig(projectDir, exp, expoPlist, accountName);
-    await writeExpoPlistAsync(projectDir, updatedExpoPlist);
+    await writeExpoPlistAsync(vcsClient, projectDir, updatedExpoPlist);
 }
 exports.syncUpdatesConfigurationAsync = syncUpdatesConfigurationAsync;
 async function readExpoPlistAsync(projectDir) {
@@ -20,10 +19,10 @@ async function readExpoPlistAsync(projectDir) {
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);
     return ((_a = (await (0, plist_1.readPlistAsync)(expoPlistPath))) !== null && _a !== void 0 ? _a : {});
 }
-async function writeExpoPlistAsync(projectDir, expoPlist) {
+async function writeExpoPlistAsync(vcsClient, projectDir, expoPlist) {
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);
     await (0, plist_1.writePlistAsync)(expoPlistPath, expoPlist);
-    await (0, vcs_1.getVcsClient)().trackFileAsync(expoPlistPath);
+    await vcsClient.trackFileAsync(expoPlistPath);
 }
 async function readReleaseChannelSafelyAsync(projectDir) {
     var _a;

package/build/uploads.d.ts

@@ -7,4 +7,4 @@ export interface PresignedPost {
     fields: Record<string, string>;
 }
 export declare function uploadFileAtPathToGCSAsync(graphqlClient: ExpoGraphqlClient, type: UploadSessionType, path: string, handleProgressEvent: ProgressHandler): Promise<string>;
-export declare function uploadWithPresignedPostWithRetryAsync(file: string, presignedPost: PresignedPost): Promise<Response>;
+export declare function uploadWithPresignedPostWithRetryAsync(file: string, presignedPost: PresignedPost, onAssetUploadBegin: () => void): Promise<Response>;

package/build/uploads.js

@@ -13,11 +13,12 @@ async function uploadFileAtPathToGCSAsync(graphqlClient, type, path, handleProgr
     return signedUrl.bucketKey;
 }
 exports.uploadFileAtPathToGCSAsync = uploadFileAtPathToGCSAsync;
-async function uploadWithPresignedPostWithRetryAsync(file, presignedPost) {
+async function uploadWithPresignedPostWithRetryAsync(file, presignedPost, onAssetUploadBegin) {
     return await (0, promise_retry_1.default)(async (retry) => {
         // retry fetch errors (usually connection or DNS errors)
         let response;
         try {
+            onAssetUploadBegin();
             response = await uploadWithPresignedPostAsync(file, presignedPost);
         }
         catch (e) {