eas-cli 0.33.1 → 0.34.0

package/README.md

@@ -73,7 +73,7 @@ ALIASES
   $ eas login
 ```
 
-_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/account/login.js)_
+_See code: [src/commands/account/login.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/account/login.js)_
 
 ## `eas account:logout`
 
@@ -87,7 +87,7 @@ ALIASES
   $ eas logout
 ```
 
-_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/account/logout.js)_
+_See code: [src/commands/account/logout.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/account/logout.js)_
 
 ## `eas account:view`
 
@@ -101,7 +101,7 @@ ALIASES
   $ eas whoami
 ```
 
-_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/account/view.js)_
+_See code: [src/commands/account/view.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/account/view.js)_
 
 ## `eas analytics [STATUS]`
 
@@ -112,7 +112,7 @@ USAGE
   $ eas analytics [STATUS]
 ```
 
-_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/analytics.js)_
+_See code: [src/commands/analytics.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/analytics.js)_
 
 ## `eas build`
 
@@ -146,7 +146,7 @@ OPTIONS
   --[no-]wait                              Wait for build(s) to complete
 ```
 
-_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/build/index.js)_
+_See code: [src/commands/build/index.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/build/index.js)_
 
 ## `eas build:cancel [BUILD_ID]`
 
@@ -157,7 +157,7 @@ USAGE
   $ eas build:cancel [BUILD_ID]
 ```
 
-_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/build/cancel.js)_
+_See code: [src/commands/build/cancel.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/build/cancel.js)_
 
 ## `eas build:configure`
 
@@ -171,7 +171,7 @@ OPTIONS
   -p, --platform=(android|ios|all)  Platform to configure
 ```
 
-_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/build/configure.js)_
+_See code: [src/commands/build/configure.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/build/configure.js)_
 
 ## `eas build:list`
 
@@ -204,7 +204,7 @@ OPTIONS
   --status=(new|in-queue|in-progress|errored|finished|canceled)
 ```
 
-_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/build/list.js)_
+_See code: [src/commands/build/list.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/build/list.js)_
 
 ## `eas build:view [BUILD_ID]`
 
@@ -218,7 +218,7 @@ OPTIONS
   --json  Enable JSON output, non-JSON messages will be printed to stderr
 ```
 
-_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/build/view.js)_
+_See code: [src/commands/build/view.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/build/view.js)_
 
 ## `eas config`
 
@@ -233,7 +233,7 @@ OPTIONS
   --profile=profile
 ```
 
-_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/config.js)_
+_See code: [src/commands/config.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/config.js)_
 
 ## `eas credentials`
 
@@ -244,7 +244,7 @@ USAGE
   $ eas credentials
 ```
 
-_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/credentials.js)_
+_See code: [src/commands/credentials.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/credentials.js)_
 
 ## `eas device:create`
 
@@ -255,7 +255,7 @@ USAGE
   $ eas device:create
 ```
 
-_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/device/create.js)_
+_See code: [src/commands/device/create.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/device/create.js)_
 
 ## `eas device:list`
 
@@ -269,7 +269,7 @@ OPTIONS
   --apple-team-id=apple-team-id
 ```
 
-_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/device/list.js)_
+_See code: [src/commands/device/list.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/device/list.js)_
 
 ## `eas device:view [UDID]`
 
@@ -280,7 +280,7 @@ USAGE
   $ eas device:view [UDID]
 ```
 
-_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/device/view.js)_
+_See code: [src/commands/device/view.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/device/view.js)_
 
 ## `eas diagnostics`
 
@@ -291,7 +291,7 @@ USAGE
   $ eas diagnostics
 ```
 
-_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/diagnostics.js)_
+_See code: [src/commands/diagnostics.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/diagnostics.js)_
 
 ## `eas help [COMMAND]`
 
@@ -319,7 +319,7 @@ USAGE
   $ eas project:info
 ```
 
-_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/project/info.js)_
+_See code: [src/commands/project/info.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/project/info.js)_
 
 ## `eas project:init`
 
@@ -333,7 +333,7 @@ ALIASES
   $ eas init
 ```
 
-_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/project/init.js)_
+_See code: [src/commands/project/init.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/project/init.js)_
 
 ## `eas secret:create`
 
@@ -350,7 +350,7 @@ OPTIONS
   --value=value              Value of the secret
 ```
 
-_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/secret/create.js)_
+_See code: [src/commands/secret/create.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/secret/create.js)_
 
 ## `eas secret:delete`
 
@@ -367,7 +367,7 @@ DESCRIPTION
   Unsure where to find the secret's ID? Run eas secrets:list
 ```
 
-_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/secret/delete.js)_
+_See code: [src/commands/secret/delete.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/secret/delete.js)_
 
 ## `eas secret:list`
 
@@ -378,7 +378,7 @@ USAGE
   $ eas secret:list
 ```
 
-_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/secret/list.js)_
+_See code: [src/commands/secret/list.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/secret/list.js)_
 
 ## `eas submit`
 
@@ -411,7 +411,7 @@ ALIASES
   $ eas build:submit
 ```
 
-_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/submit.js)_
+_See code: [src/commands/submit.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/submit.js)_
 
 ## `eas webhook:create`
 
@@ -430,7 +430,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/webhook/create.js)_
+_See code: [src/commands/webhook/create.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/webhook/create.js)_
 
 ## `eas webhook:delete [ID]`
 
@@ -444,7 +444,7 @@ ARGUMENTS
   ID  ID of the webhook to delete
 ```
 
-_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/webhook/delete.js)_
+_See code: [src/commands/webhook/delete.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/webhook/delete.js)_
 
 ## `eas webhook:list`
 
@@ -458,7 +458,7 @@ OPTIONS
   --event=(BUILD)  Event type that triggers the webhook
 ```
 
-_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/webhook/list.js)_
+_See code: [src/commands/webhook/list.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/webhook/list.js)_
 
 ## `eas webhook:update`
 
@@ -478,7 +478,7 @@ OPTIONS
   --url=url        Webhook URL
 ```
 
-_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/webhook/update.js)_
+_See code: [src/commands/webhook/update.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/webhook/update.js)_
 
 ## `eas webhook:view ID`
 
@@ -492,5 +492,5 @@ ARGUMENTS
   ID  ID of the webhook to view
 ```
 
-_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.33.1/packages/eas-cli/src/commands/webhook/view.js)_
+_See code: [src/commands/webhook/view.js](https://github.com/expo/eas-cli/blob/v0.34.0/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->

package/build/analytics.js

@@ -7,12 +7,7 @@ const os_1 = (0, tslib_1.__importDefault)(require("os"));
 const url_1 = require("url");
 const uuid_1 = require("uuid");
 const UserSettings_1 = (0, tslib_1.__importDefault)(require("./user/UserSettings"));
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../package.json');
+const easCli_1 = require("./utils/easCli");
 const PLATFORM_TO_ANALYTICS_PLATFORM = {
     darwin: 'Mac',
     win32: 'Windows',
@@ -82,7 +77,7 @@ function logEvent(name, properties = {}) {
     }
     ensureUserIdentified();
     const { userId, deviceId } = identifyData !== null && identifyData !== void 0 ? identifyData : {};
-    const commonEventProperties = { source_version: packageJSON === null || packageJSON === void 0 ? void 0 : packageJSON.version, source: 'eas cli' };
+    const commonEventProperties = { source_version: easCli_1.easCliVersion, source: 'eas cli' };
     const identity = { userId: userId !== null && userId !== void 0 ? userId : undefined, anonymousId: deviceId !== null && deviceId !== void 0 ? deviceId : (0, uuid_1.v4)() };
     rudderstackClient.track({
         event: name,
@@ -104,12 +99,11 @@ function ensureUserIdentified() {
     userIdentified = true;
 }
 function getRudderStackContext() {
-    var _a;
     const platform = PLATFORM_TO_ANALYTICS_PLATFORM[os_1.default.platform()] || os_1.default.platform();
     return {
         os: { name: platform, version: os_1.default.release() },
         device: { type: platform, model: platform },
-        app: { name: 'eas cli', version: (_a = packageJSON === null || packageJSON === void 0 ? void 0 : packageJSON.version) !== null && _a !== void 0 ? _a : undefined },
+        app: { name: 'eas cli', version: easCli_1.easCliVersion !== null && easCli_1.easCliVersion !== void 0 ? easCli_1.easCliVersion : undefined },
     };
 }
 var AnalyticsEvent;

package/build/build/android/configure.js

@@ -7,7 +7,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 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 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const updates_1 = require("../utils/updates");
 const UpdatesModule_1 = require("./UpdatesModule");
 const version_1 = require("./version");
@@ -19,7 +19,7 @@ async function configureAndroidAsync(ctx) {
     (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 vcs_1.default.trackFileAsync(easGradlePath);
+    await (0, vcs_1.getVcsClient)().trackFileAsync(easGradlePath);
     if ((0, updates_1.isExpoUpdatesInstalled)(ctx.projectDir)) {
         await (0, UpdatesModule_1.configureUpdatesAsync)(ctx.projectDir, ctx.exp);
     }

package/build/build/android/graphql.js

@@ -18,6 +18,7 @@ function transformJob(job) {
         artifactPath: job.artifactPath,
         username: job.username,
         buildType: job.buildType && transformBuildType(job.buildType),
+        developmentClient: job.developmentClient,
     };
 }
 exports.transformJob = transformJob;
@@ -25,10 +26,7 @@ function transformBuildType(buildType) {
     if (buildType === eas_build_job_1.Android.BuildType.APK) {
         return generated_1.AndroidBuildType.Apk;
     }
-    else if (buildType === eas_build_job_1.Android.BuildType.APP_BUNDLE) {
-        return generated_1.AndroidBuildType.AppBundle;
-    }
     else {
-        return generated_1.AndroidBuildType.DevelopmentClient;
+        return generated_1.AndroidBuildType.AppBundle;
     }
 }

package/build/build/android/prepareJob.js

@@ -7,7 +7,7 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const slash_1 = (0, tslib_1.__importDefault)(require("slash"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const cacheDefaults = {
     disabled: false,
     customPaths: [],
@@ -16,7 +16,7 @@ const cacheDefaults = {
 async function prepareJobAsync(ctx, jobData) {
     const username = (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)());
     const buildProfile = ctx.buildProfile;
-    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir)) || '.';
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await (0, vcs_1.getVcsClient)().getRootPathAsync(), ctx.projectDir)) || '.';
     const { credentials } = jobData;
     const buildCredentials = credentials
         ? {
@@ -57,10 +57,11 @@ async function prepareJobAsync(ctx, jobData) {
         },
         releaseChannel: ctx.buildProfile.releaseChannel,
         updates: { channel: ctx.buildProfile.channel },
+        developmentClient: buildProfile.developmentClient,
         gradleCommand: buildProfile.gradleCommand,
         artifactPath: buildProfile.artifactPath,
+        buildType,
         username,
-        buildType: buildProfile.developmentClient ? eas_build_job_1.Android.BuildType.DEVELOPMENT_CLIENT : buildType,
     };
     return (0, eas_build_job_1.sanitizeJob)(job);
 }

package/build/build/build.js

@@ -14,7 +14,7 @@ const uploads_1 = require("../uploads");
 const files_1 = require("../utils/files");
 const progress_1 = require("../utils/progress");
 const promise_1 = require("../utils/promise");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const vcs_1 = require("../vcs");
 const local_1 = require("./local");
 const metadata_1 = require("./metadata");
 const analytics_1 = (0, tslib_1.__importStar)(require("./utils/analytics"));
@@ -34,7 +34,7 @@ async function prepareBuildRequestForPlatformAsync(builder) {
             trackingCtx: ctx.trackingCtx,
         });
     }
-    if (await vcs_1.default.hasUncommittedChangesAsync()) {
+    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.js

@@ -13,7 +13,8 @@ const platform_1 = require("../platform");
 const workflow_1 = require("../project/workflow");
 const prompts_1 = require("../prompts");
 const actions_1 = require("../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+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");
@@ -33,7 +34,7 @@ async function ensureProjectConfiguredAsync(projectDir, requestedPlatform) {
             projectDir,
             platform: requestedPlatform,
         });
-        if (await vcs_1.default.hasUncommittedChangesAsync()) {
+        if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
             (0, errors_1.error)('Build process requires clean working tree, please commit all your changes and run `eas build` again', { exit: 1 });
         }
     }
@@ -43,7 +44,7 @@ async function ensureProjectConfiguredAsync(projectDir, requestedPlatform) {
 }
 exports.ensureProjectConfiguredAsync = ensureProjectConfiguredAsync;
 async function configureAsync(options) {
-    await vcs_1.default.ensureRepoExistsAsync();
+    await (0, vcs_1.getVcsClient)().ensureRepoExistsAsync();
     await (0, repository_1.maybeBailOnRepoStatusAsync)();
     const { exp } = (0, config_1.getConfig)(options.projectDir, { skipSDKVersionRequirement: true });
     const ctx = {
@@ -64,17 +65,20 @@ async function configureAsync(options) {
     if (ctx.shouldConfigureIos) {
         await (0, configure_2.configureIosAsync)(ctx);
     }
-    if (await vcs_1.default.hasUncommittedChangesAsync()) {
+    if (await (0, vcs_1.getVcsClient)().isCommitRequiredAsync()) {
         log_1.default.newLine();
         await reviewAndCommitChangesAsync(configureCommitMessage[options.platform]);
     }
-    else {
+    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.');
     }
 }
 exports.configureAsync = configureAsync;
 const EAS_JSON_MANAGED_DEFAULT = {
+    cli: {
+        version: `>= ${easCli_1.easCliVersion}`,
+    },
     build: {
         development: {
             developmentClient: true,
@@ -90,6 +94,9 @@ const EAS_JSON_MANAGED_DEFAULT = {
     },
 };
 const EAS_JSON_BARE_DEFAULT = {
+    cli: {
+        version: `>= ${easCli_1.easCliVersion}`,
+    },
     build: {
         development: {
             distribution: 'internal',
@@ -121,7 +128,7 @@ async function ensureEasJsonExistsAsync(ctx) {
         ? EAS_JSON_BARE_DEFAULT
         : EAS_JSON_MANAGED_DEFAULT;
     await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
-    await vcs_1.default.trackFileAsync(easJsonPath);
+    await (0, vcs_1.getVcsClient)().trackFileAsync(easJsonPath);
     log_1.default.withTick('Generated eas.json');
 }
 exports.ensureEasJsonExistsAsync = ensureEasJsonExistsAsync;
@@ -152,7 +159,7 @@ async function reviewAndCommitChangesAsync(initialCommitMessage, askedFirstTime
         log_1.default.withTick('Committed changes');
     }
     else if (selected === ShouldCommitChanges.ShowDiffFirst) {
-        await vcs_1.default.showDiffAsync();
+        await (0, vcs_1.getVcsClient)().showDiffAsync();
         await reviewAndCommitChangesAsync(initialCommitMessage, false);
     }
 }

package/build/build/ios/UpdatesModule.js

@@ -6,7 +6,7 @@ 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 vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const updates_1 = require("../utils/updates");
 const plist_1 = require("./plist");
 async function configureUpdatesAsync(projectDir, exp) {
@@ -55,7 +55,7 @@ async function readExpoPlistAsync(projectDir) {
 async function writeExpoPlistAsync(projectDir, expoPlist) {
     const expoPlistPath = config_plugins_1.IOSConfig.Paths.getExpoPlistPath(projectDir);
     await (0, plist_1.writePlistAsync)(expoPlistPath, expoPlist);
-    await vcs_1.default.trackFileAsync(expoPlistPath);
+    await (0, vcs_1.getVcsClient)().trackFileAsync(expoPlistPath);
 }
 async function readReleaseChannelSafelyAsync(projectDir) {
     var _a;

package/build/build/ios/graphql.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformJob = void 0;
 const tslib_1 = require("tslib");
-const eas_build_job_1 = require("@expo/eas-build-job");
 const nullthrows_1 = (0, tslib_1.__importDefault)(require("nullthrows"));
-const generated_1 = require("../../graphql/generated");
 const graphql_1 = require("../graphql");
 function transformJob(job) {
     return {
@@ -13,29 +11,18 @@ function transformJob(job) {
         projectRootDirectory: job.projectRootDirectory,
         releaseChannel: job.releaseChannel,
         updates: job.updates,
-        distribution: job.distribution && transformDistributionType(job.distribution),
         secrets: transformIosSecrets(job.secrets),
         builderEnvironment: job.builderEnvironment,
         cache: job.cache,
         scheme: job.scheme,
         buildConfiguration: job.buildConfiguration,
         artifactPath: job.artifactPath,
-        buildType: job.buildType && transformBuildType(job.buildType),
         username: job.username,
+        developmentClient: job.developmentClient,
+        simulator: job.simulator,
     };
 }
 exports.transformJob = transformJob;
-function transformDistributionType(distributionType) {
-    if (distributionType === 'store') {
-        return generated_1.DistributionType.Store;
-    }
-    else if (distributionType === 'internal') {
-        return generated_1.DistributionType.Internal;
-    }
-    else {
-        return generated_1.DistributionType.Simulator;
-    }
-}
 function transformIosSecrets(secrets) {
     var _a, _b, _c;
     const buildCredentials = [];
@@ -53,11 +40,3 @@ function transformIosSecrets(secrets) {
         environmentSecrets: secrets.env,
     };
 }
-function transformBuildType(buildType) {
-    if (buildType === eas_build_job_1.Ios.BuildType.DEVELOPMENT_CLIENT) {
-        return generated_1.IosBuildType.DevelopmentClient;
-    }
-    else {
-        return generated_1.IosBuildType.Release;
-    }
-}

package/build/build/ios/prepareJob.js

@@ -7,14 +7,14 @@ const path_1 = (0, tslib_1.__importDefault)(require("path"));
 const slash_1 = (0, tslib_1.__importDefault)(require("slash"));
 const projectUtils_1 = require("../../project/projectUtils");
 const actions_1 = require("../../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../../vcs"));
+const vcs_1 = require("../../vcs");
 const cacheDefaults = {
     disabled: false,
     customPaths: [],
     cacheDefaultPaths: true,
 };
 async function prepareJobAsync(ctx, jobData) {
-    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await vcs_1.default.getRootPathAsync(), ctx.projectDir)) || '.';
+    const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await (0, vcs_1.getVcsClient)().getRootPathAsync(), ctx.projectDir)) || '.';
     const username = (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)());
     const buildCredentials = {};
     if (jobData.credentials) {
@@ -28,7 +28,6 @@ async function prepareJobAsync(ctx, jobData) {
         platform: eas_build_job_1.Platform.IOS,
         projectArchive: jobData.projectArchive,
         projectRootDirectory,
-        distribution: ctx.buildProfile.simulator ? 'simulator' : ctx.buildProfile.distribution,
         builderEnvironment: {
             image: ctx.buildProfile.image,
             node: ctx.buildProfile.node,
@@ -49,12 +48,11 @@ async function prepareJobAsync(ctx, jobData) {
         },
         releaseChannel: ctx.buildProfile.releaseChannel,
         updates: { channel: ctx.buildProfile.channel },
+        developmentClient: ctx.buildProfile.developmentClient,
+        simulator: ctx.buildProfile.simulator,
         scheme: jobData.buildScheme,
         buildConfiguration: ctx.buildProfile.buildConfiguration,
         artifactPath: ctx.buildProfile.artifactPath,
-        buildType: ctx.buildProfile.developmentClient
-            ? eas_build_job_1.Ios.BuildType.DEVELOPMENT_CLIENT
-            : eas_build_job_1.Ios.BuildType.RELEASE,
         username,
     };
     return (0, eas_build_job_1.sanitizeJob)(job);

package/build/build/metadata.js

@@ -1,24 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectMetadataAsync = void 0;
-const tslib_1 = require("tslib");
 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 projectUtils_1 = require("../project/projectUtils");
 const actions_1 = require("../user/actions");
-const vcs_1 = (0, tslib_1.__importDefault)(require("../vcs"));
+const easCli_1 = require("../utils/easCli");
+const vcs_1 = require("../vcs");
 const UpdatesModule_1 = require("./android/UpdatesModule");
 const version_1 = require("./android/version");
 const UpdatesModule_2 = require("./ios/UpdatesModule");
 const version_2 = require("./ios/version");
 const updates_1 = require("./utils/updates");
-/**
- * We use require() to exclude package.json from TypeScript's analysis since it lives outside
- * the src directory and would change the directory structure of the emitted files
- * under the build directory
- */
-const packageJSON = require('../../package.json');
 async function collectMetadataAsync(ctx, platformContext) {
     var _a;
     const channelOrReleaseChannel = await resolveChannelOrReleaseChannelAsync(ctx);
@@ -28,7 +22,7 @@ async function collectMetadataAsync(ctx, platformContext) {
     const metadata = {
         trackingContext: ctx.trackingCtx,
         ...(await maybeResolveVersionsAsync(ctx, platformContext)),
-        cliVersion: packageJSON.version,
+        cliVersion: easCli_1.easCliVersion,
         workflow: ctx.workflow,
         credentialsSource: ctx.buildProfile.credentialsSource,
         sdkVersion: ctx.exp.sdkVersion,
@@ -38,7 +32,8 @@ async function collectMetadataAsync(ctx, platformContext) {
         appName: ctx.exp.name,
         appIdentifier: await resolveAppIdentifierAsync(ctx, platformContext),
         buildProfile: ctx.buildProfileName,
-        gitCommitHash: await vcs_1.default.getCommitHashAsync(),
+        gitCommitHash: await (0, vcs_1.getVcsClient)().getCommitHashAsync(),
+        isGitWorkingTreeDirty: await (0, vcs_1.getVcsClient)().hasUncommittedChangesAsync(),
         username: (0, projectUtils_1.getUsername)(ctx.exp, await (0, actions_1.ensureLoggedInAsync)()),
         ...(ctx.platform === eas_build_job_1.Platform.IOS && {
             iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(ctx),

package/build/build/utils/devClient.js

@@ -11,7 +11,7 @@ const log_1 = (0, tslib_1.__importStar)(require("../../log"));
 const platform_1 = require("../../platform");
 const workflow_1 = require("../../project/workflow");
 const prompts_1 = require("../../prompts");
-const expoCommand_1 = require("../../utils/expoCommand");
+const expoCli_1 = require("../../utils/expoCli");
 const repository_1 = require("./repository");
 async function ensureExpoDevClientInstalledForDevClientBuildsAsync({ projectDir, nonInteractive = false, buildProfiles = [], }) {
     if (await isExpoDevClientInstalledAsync(projectDir)) {
@@ -76,7 +76,7 @@ async function installExpoDevClientAsync(projectDir, { nonInteractive }) {
     log_1.default.newLine();
     log_1.default.log(`Running ${chalk_1.default.bold('expo install expo-dev-client')}`);
     log_1.default.newLine();
-    await (0, expoCommand_1.expoCommandAsync)(projectDir, ['install', 'expo-dev-client']);
+    await (0, expoCli_1.expoCommandAsync)(projectDir, ['install', 'expo-dev-client']);
     log_1.default.newLine();
     await (0, repository_1.reviewAndCommitChangesAsync)('Install expo-dev-client', {
         nonInteractive,