eas-cli 0.33.1 → 0.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.0/packages/eas-cli/src/commands/secret/create.js)_
 
 ## `eas secret:delete`
 
@@ -364,10 +364,10 @@ OPTIONS
   --id=id  ID of the secret to delete
 
 DESCRIPTION
-  Unsure where to find the secret's ID? Run eas secrets:list
+  Unsure where to find the secret's ID? Run eas secret: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.36.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.36.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.36.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.36.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.36.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.36.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.36.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.36.0/packages/eas-cli/src/commands/webhook/view.js)_
 <!-- commandsstop -->

package/build/analytics/common.d.ts

@@ -0,0 +1,8 @@
+import { Event } from './events';
+export declare type TrackingContext = Record<string, string | number | boolean>;
+export declare function withAnalyticsAsync<Result>(fn: () => Promise<Result>, analytics: {
+    attemptEvent: Event;
+    successEvent: Event;
+    failureEvent: Event;
+    trackingCtx: TrackingContext;
+}): Promise<Result>;

package/build/analytics/common.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.withAnalyticsAsync = void 0;
+const events_1 = require("./events");
+async function withAnalyticsAsync(fn, analytics) {
+    try {
+        const result = await fn();
+        events_1.Analytics.logEvent(analytics.successEvent, analytics.trackingCtx);
+        return result;
+    }
+    catch (error) {
+        events_1.Analytics.logEvent(analytics.failureEvent, {
+            ...analytics.trackingCtx,
+            reason: error.message,
+        });
+        throw error;
+    }
+}
+exports.withAnalyticsAsync = withAnalyticsAsync;

package/build/analytics/events.d.ts

@@ -0,0 +1,43 @@
+export declare type Event = BuildEvent | SubmissionEvent;
+export declare enum SubmissionEvent {
+    SUBMIT_COMMAND = "submit cli submit command",
+    SUBMIT_COMMAND_ATTEMPT = "submit cli attempt",
+    SUBMIT_COMMAND_SUCCESS = "submit cli success",
+    SUBMIT_COMMAND_FAIL = "submit cli fail",
+    GATHER_CREDENTIALS_ATTEMPT = "submit cli gather credentials attempt",
+    GATHER_CREDENTIALS_SUCCESS = "submit cli gather credentials success",
+    GATHER_CREDENTIALS_FAIL = "submit cli gather credentials fail",
+    GATHER_ARCHIVE_ATTEMPT = "submit cli gather archive attempt",
+    GATHER_ARCHIVE_SUCCESS = "submit cli gather archive success",
+    GATHER_ARCHIVE_FAIL = "submit cli gather archive fail",
+    SUBMIT_REQUEST_ATTEMPT = "submit cli request attempt",
+    SUBMIT_REQUEST_SUCCESS = "submit cli request success",
+    SUBMIT_REQUEST_FAIL = "submit cli request fail"
+}
+export declare enum BuildEvent {
+    BUILD_COMMAND = "build cli build command",
+    PROJECT_UPLOAD_ATTEMPT = "build cli project upload attempt",
+    PROJECT_UPLOAD_SUCCESS = "build cli project upload success",
+    PROJECT_UPLOAD_FAIL = "build cli project upload fail",
+    GATHER_CREDENTIALS_ATTEMPT = "build cli gather credentials attempt",
+    GATHER_CREDENTIALS_SUCCESS = "build cli gather credentials success",
+    GATHER_CREDENTIALS_FAIL = "build cli gather credentials fail",
+    CONFIGURE_PROJECT_ATTEMPT = "build cli configure project attempt",
+    CONFIGURE_PROJECT_SUCCESS = "build cli configure project success",
+    CONFIGURE_PROJECT_FAIL = "build cli configure project fail",
+    BUILD_REQUEST_ATTEMPT = "build cli build request attempt",
+    BUILD_REQUEST_SUCCESS = "build cli build request success",
+    BUILD_REQUEST_FAIL = "build cli build request fail",
+    BUILD_STATUS_COMMAND = "build cli build status",
+    CREDENTIALS_SYNC_COMMAND = "build cli credentials sync command",
+    CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT = "build cli credentials sync update local attempt",
+    CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS = "build cli credentials sync update local success",
+    CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL = "build cli credentials sync update local fail",
+    CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT = "build cli credentials sync update remote attempt",
+    CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS = "build cli credentials sync update remote success",
+    CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL = "build cli credentials sync update remote fail",
+    ANDROID_KEYSTORE_CREATE = "build cli credentials keystore create"
+}
+export declare class Analytics {
+    static logEvent(name: Event, properties: Record<string, any>): void;
+}

package/build/analytics/events.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Analytics = exports.BuildEvent = exports.SubmissionEvent = void 0;
+const rudderstackClient_1 = require("./rudderstackClient");
+var SubmissionEvent;
+(function (SubmissionEvent) {
+    SubmissionEvent["SUBMIT_COMMAND"] = "submit cli submit command";
+    SubmissionEvent["SUBMIT_COMMAND_ATTEMPT"] = "submit cli attempt";
+    SubmissionEvent["SUBMIT_COMMAND_SUCCESS"] = "submit cli success";
+    SubmissionEvent["SUBMIT_COMMAND_FAIL"] = "submit cli fail";
+    SubmissionEvent["GATHER_CREDENTIALS_ATTEMPT"] = "submit cli gather credentials attempt";
+    SubmissionEvent["GATHER_CREDENTIALS_SUCCESS"] = "submit cli gather credentials success";
+    SubmissionEvent["GATHER_CREDENTIALS_FAIL"] = "submit cli gather credentials fail";
+    SubmissionEvent["GATHER_ARCHIVE_ATTEMPT"] = "submit cli gather archive attempt";
+    SubmissionEvent["GATHER_ARCHIVE_SUCCESS"] = "submit cli gather archive success";
+    SubmissionEvent["GATHER_ARCHIVE_FAIL"] = "submit cli gather archive fail";
+    SubmissionEvent["SUBMIT_REQUEST_ATTEMPT"] = "submit cli request attempt";
+    SubmissionEvent["SUBMIT_REQUEST_SUCCESS"] = "submit cli request success";
+    SubmissionEvent["SUBMIT_REQUEST_FAIL"] = "submit cli request fail";
+})(SubmissionEvent = exports.SubmissionEvent || (exports.SubmissionEvent = {}));
+var BuildEvent;
+(function (BuildEvent) {
+    BuildEvent["BUILD_COMMAND"] = "build cli build command";
+    BuildEvent["PROJECT_UPLOAD_ATTEMPT"] = "build cli project upload attempt";
+    BuildEvent["PROJECT_UPLOAD_SUCCESS"] = "build cli project upload success";
+    BuildEvent["PROJECT_UPLOAD_FAIL"] = "build cli project upload fail";
+    BuildEvent["GATHER_CREDENTIALS_ATTEMPT"] = "build cli gather credentials attempt";
+    BuildEvent["GATHER_CREDENTIALS_SUCCESS"] = "build cli gather credentials success";
+    BuildEvent["GATHER_CREDENTIALS_FAIL"] = "build cli gather credentials fail";
+    BuildEvent["CONFIGURE_PROJECT_ATTEMPT"] = "build cli configure project attempt";
+    BuildEvent["CONFIGURE_PROJECT_SUCCESS"] = "build cli configure project success";
+    BuildEvent["CONFIGURE_PROJECT_FAIL"] = "build cli configure project fail";
+    BuildEvent["BUILD_REQUEST_ATTEMPT"] = "build cli build request attempt";
+    BuildEvent["BUILD_REQUEST_SUCCESS"] = "build cli build request success";
+    BuildEvent["BUILD_REQUEST_FAIL"] = "build cli build request fail";
+    BuildEvent["BUILD_STATUS_COMMAND"] = "build cli build status";
+    BuildEvent["CREDENTIALS_SYNC_COMMAND"] = "build cli credentials sync command";
+    BuildEvent["CREDENTIALS_SYNC_UPDATE_LOCAL_ATTEMPT"] = "build cli credentials sync update local attempt";
+    BuildEvent["CREDENTIALS_SYNC_UPDATE_LOCAL_SUCCESS"] = "build cli credentials sync update local success";
+    BuildEvent["CREDENTIALS_SYNC_UPDATE_LOCAL_FAIL"] = "build cli credentials sync update local fail";
+    BuildEvent["CREDENTIALS_SYNC_UPDATE_REMOTE_ATTEMPT"] = "build cli credentials sync update remote attempt";
+    BuildEvent["CREDENTIALS_SYNC_UPDATE_REMOTE_SUCCESS"] = "build cli credentials sync update remote success";
+    BuildEvent["CREDENTIALS_SYNC_UPDATE_REMOTE_FAIL"] = "build cli credentials sync update remote fail";
+    BuildEvent["ANDROID_KEYSTORE_CREATE"] = "build cli credentials keystore create";
+})(BuildEvent = exports.BuildEvent || (exports.BuildEvent = {}));
+class Analytics {
+    static logEvent(name, properties) {
+        (0, rudderstackClient_1.logEvent)(name, properties);
+    }
+}
+exports.Analytics = Analytics;

package/build/{analytics.js → analytics/rudderstackClient.js}

@@ -6,13 +6,8 @@ const rudder_sdk_node_1 = (0, tslib_1.__importDefault)(require("@expo/rudder-sdk
 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 UserSettings_1 = (0, tslib_1.__importDefault)(require("../user/UserSettings"));
+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/api.js

@@ -6,7 +6,7 @@ const got_1 = (0, tslib_1.__importStar)(require("got"));
 const ApiV2Error_1 = (0, tslib_1.__importDefault)(require("./ApiV2Error"));
 const sessionStorage_1 = require("./user/sessionStorage");
 exports.apiClient = got_1.default.extend({
-    prefixUrl: getExpoApiBaseUrl() + '/--/api/v2/',
+    prefixUrl: getExpoApiBaseUrl() + '/v2/',
     hooks: {
         beforeRequest: [
             (options) => {
@@ -43,13 +43,13 @@ exports.apiClient = got_1.default.extend({
 });
 function getExpoApiBaseUrl() {
     if (process.env.EXPO_STAGING) {
-        return `https://staging.exp.host`;
+        return `https://staging-api.expo.dev`;
     }
     else if (process.env.EXPO_LOCAL) {
         return `http://127.0.0.1:3000`;
     }
     else {
-        return `https://exp.host`;
+        return `https://api.expo.dev`;
     }
 }
 exports.getExpoApiBaseUrl = getExpoApiBaseUrl;

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

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 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 common_1 = require("../analytics/common");
+const events_1 = require("../analytics/events");
 const generated_1 = require("../graphql/generated");
 const BuildQuery_1 = require("../graphql/queries/BuildQuery");
 const log_1 = (0, tslib_1.__importStar)(require("../log"));
@@ -14,27 +16,28 @@ 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"));
 const printBuildInfo_1 = require("./utils/printBuildInfo");
 const repository_1 = require("./utils/repository");
 async function prepareBuildRequestForPlatformAsync(builder) {
     const { ctx } = builder;
-    const credentialsResult = await withAnalyticsAsync(async () => await builder.ensureCredentialsAsync(ctx), {
-        successEvent: analytics_1.Event.GATHER_CREDENTIALS_SUCCESS,
-        failureEvent: analytics_1.Event.GATHER_CREDENTIALS_FAIL,
+    const credentialsResult = await (0, common_1.withAnalyticsAsync)(async () => await builder.ensureCredentialsAsync(ctx), {
+        attemptEvent: events_1.BuildEvent.GATHER_CREDENTIALS_ATTEMPT,
+        successEvent: events_1.BuildEvent.GATHER_CREDENTIALS_SUCCESS,
+        failureEvent: events_1.BuildEvent.GATHER_CREDENTIALS_FAIL,
         trackingCtx: ctx.trackingCtx,
     });
     if (!ctx.skipProjectConfiguration) {
-        await withAnalyticsAsync(async () => await builder.ensureProjectConfiguredAsync(ctx), {
-            successEvent: analytics_1.Event.CONFIGURE_PROJECT_SUCCESS,
-            failureEvent: analytics_1.Event.CONFIGURE_PROJECT_FAIL,
+        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,
         });
     }
-    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 });
     }
@@ -92,7 +95,7 @@ exports.prepareBuildRequestForPlatformAsync = prepareBuildRequestForPlatformAsyn
 async function uploadProjectAsync(ctx) {
     let projectTarballPath;
     try {
-        return await withAnalyticsAsync(async () => {
+        return await (0, common_1.withAnalyticsAsync)(async () => {
             const projectTarball = await (0, repository_1.makeProjectTarballAsync)();
             projectTarballPath = projectTarball.path;
             const { bucketKey } = await (0, uploads_1.uploadAsync)(generated_1.UploadSessionType.EasBuildProjectSources, projectTarball.path, (0, progress_1.createProgressTracker)({
@@ -102,8 +105,9 @@ async function uploadProjectAsync(ctx) {
             }));
             return bucketKey;
         }, {
-            successEvent: analytics_1.Event.PROJECT_UPLOAD_SUCCESS,
-            failureEvent: analytics_1.Event.PROJECT_UPLOAD_FAIL,
+            attemptEvent: events_1.BuildEvent.PROJECT_UPLOAD_ATTEMPT,
+            successEvent: events_1.BuildEvent.PROJECT_UPLOAD_SUCCESS,
+            failureEvent: events_1.BuildEvent.PROJECT_UPLOAD_FAIL,
             trackingCtx: ctx.trackingCtx,
         });
     }
@@ -115,7 +119,7 @@ async function uploadProjectAsync(ctx) {
 }
 async function sendBuildRequestAsync(builder, job, metadata) {
     const { ctx } = builder;
-    return await withAnalyticsAsync(async () => {
+    return await (0, common_1.withAnalyticsAsync)(async () => {
         if (log_1.default.isDebug) {
             log_1.default.log(`Starting ${platform_1.requestedPlatformDisplayNames[job.platform]} build`);
         }
@@ -123,25 +127,12 @@ async function sendBuildRequestAsync(builder, job, metadata) {
         (0, printBuildInfo_1.printDeprecationWarnings)(deprecationInfo);
         return build;
     }, {
-        successEvent: analytics_1.Event.BUILD_REQUEST_SUCCESS,
-        failureEvent: analytics_1.Event.BUILD_REQUEST_FAIL,
+        attemptEvent: events_1.BuildEvent.BUILD_REQUEST_ATTEMPT,
+        successEvent: events_1.BuildEvent.BUILD_REQUEST_SUCCESS,
+        failureEvent: events_1.BuildEvent.BUILD_REQUEST_FAIL,
         trackingCtx: ctx.trackingCtx,
     });
 }
-async function withAnalyticsAsync(fn, analytics) {
-    try {
-        const result = await fn();
-        analytics_1.default.logEvent(analytics.successEvent, analytics.trackingCtx);
-        return result;
-    }
-    catch (error) {
-        analytics_1.default.logEvent(analytics.failureEvent, {
-            ...analytics.trackingCtx,
-            reason: error.message,
-        });
-        throw error;
-    }
-}
 async function waitForBuildEndAsync(buildIds, { timeoutSec = 3600, intervalSec = 30 } = {}) {
     log_1.default.log(`Waiting for build${buildIds.length > 1 ? 's' : ''} to complete. You can press Ctrl+C to exit.`);
     const spinner = (0, ora_1.ora)().start();