eas-cli 0.35.0 → 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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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`
 
@@ -367,7 +367,7 @@ DESCRIPTION
   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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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.35.0/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,8 +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"));
-const easCli_1 = require("./utils/easCli");
+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',

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"));
@@ -17,20 +19,21 @@ const promise_1 = require("../utils/promise");
 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,
         });
     }
@@ -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();

package/build/build/context.d.ts

@@ -1,10 +1,10 @@
 import { ExpoConfig } from '@expo/config';
 import { Platform, Workflow } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
+import { TrackingContext } from '../analytics/common';
 import { CredentialsContext } from '../credentials/context';
 import { RequestedPlatform } from '../platform';
 import { Actor } from '../user/User';
-import { TrackingContext } from './types';
 export interface ConfigureContext {
     user: Actor;
     projectDir: string;

package/build/build/context.js

@@ -6,13 +6,13 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const json_file_1 = (0, tslib_1.__importDefault)(require("@expo/json-file"));
 const resolve_from_1 = (0, tslib_1.__importDefault)(require("resolve-from"));
 const uuid_1 = require("uuid");
+const events_1 = require("../analytics/events");
 const context_1 = require("../credentials/context");
 const expoConfig_1 = require("../project/expoConfig");
 const projectUtils_1 = require("../project/projectUtils");
 const workflow_1 = require("../project/workflow");
 const Account_1 = require("../user/Account");
 const actions_1 = require("../user/actions");
-const analytics_1 = (0, tslib_1.__importStar)(require("./utils/analytics"));
 async function createBuildContextAsync({ buildProfileName, buildProfile, clearCache = false, local, nonInteractive = false, platform, projectDir, skipProjectConfiguration = false, }) {
     var _a;
     const exp = (0, expoConfig_1.getExpoConfig)(projectDir, { env: buildProfile.env });
@@ -42,7 +42,7 @@ async function createBuildContextAsync({ buildProfileName, buildProfile, clearCa
         project_type: workflow,
         ...devClientProperties,
     };
-    analytics_1.default.logEvent(analytics_1.Event.BUILD_COMMAND, trackingCtx);
+    events_1.Analytics.logEvent(events_1.BuildEvent.BUILD_COMMAND, trackingCtx);
     return {
         accountName,
         buildProfile,

package/build/build/ios/credentials.js

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

package/build/build/local.js

@@ -3,36 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.runLocalBuildAsync = void 0;
 const tslib_1 = require("tslib");
 const spawn_async_1 = (0, tslib_1.__importDefault)(require("@expo/spawn-async"));
-const chalk_1 = (0, tslib_1.__importDefault)(require("chalk"));
-const fs_extra_1 = (0, tslib_1.__importDefault)(require("fs-extra"));
-const path_1 = (0, tslib_1.__importDefault)(require("path"));
-const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const PLUGIN_PACKAGE_NAME = 'eas-cli-local-build-plugin';
+const PLUGIN_PACKAGE_VERSION = '0.0.47';
 async function runLocalBuildAsync(job) {
-    var _a, _b;
-    const execNameOrPath = (_b = (_a = process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) !== null && _a !== void 0 ? _a : (await findWithNodeResolutionAsync())) !== null && _b !== void 0 ? _b : PLUGIN_PACKAGE_NAME;
-    try {
-        const arg = Buffer.from(JSON.stringify({ job })).toString('base64');
-        await (0, spawn_async_1.default)(execNameOrPath, [arg], {
-            stdio: 'inherit',
-        });
-    }
-    catch (err) {
-        if (err.code === 'ENOENT') {
-            log_1.default.warn(`Could not resolve executable ${execNameOrPath}.`);
-            log_1.default.warn(`Install ${PLUGIN_PACKAGE_NAME} package from npm e.g. ${chalk_1.default.bold(`npm install -g ${PLUGIN_PACKAGE_NAME}`)} and make sure it's in PATH.`);
-            throw err;
-        }
-    }
+    const { command, args } = getCommandAndArgs(job);
+    await (0, spawn_async_1.default)(command, args, {
+        stdio: 'inherit',
+    });
 }
 exports.runLocalBuildAsync = runLocalBuildAsync;
-async function findWithNodeResolutionAsync() {
-    try {
-        const resolvedPath = path_1.default.resolve(path_1.default.dirname(require.resolve(PLUGIN_PACKAGE_NAME)), '../bin/run');
-        if (await fs_extra_1.default.pathExists(resolvedPath)) {
-            return resolvedPath;
-        }
+function getCommandAndArgs(job) {
+    const jobBase64 = Buffer.from(JSON.stringify({ job })).toString('base64');
+    if (process.env.EAS_LOCAL_BUILD_PLUGIN_PATH) {
+        return {
+            command: process.env.EAS_LOCAL_BUILD_PLUGIN_PATH,
+            args: [jobBase64],
+        };
+    }
+    else {
+        return {
+            command: 'npx',
+            args: ['-y', `${PLUGIN_PACKAGE_NAME}@${PLUGIN_PACKAGE_VERSION}`, jobBase64],
+        };
     }
-    catch { }
-    return undefined;
 }

package/build/build/types.d.ts

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

package/build/commandUtils/EasCommand.js

@@ -4,7 +4,7 @@ const tslib_1 = require("tslib");
 const eas_json_1 = require("@expo/eas-json");
 const command_1 = require("@oclif/command");
 const semver_1 = (0, tslib_1.__importDefault)(require("semver"));
-const analytics_1 = require("../analytics");
+const rudderstackClient_1 = require("../analytics/rudderstackClient");
 const log_1 = (0, tslib_1.__importDefault)(require("../log"));
 const projectUtils_1 = require("../project/projectUtils");
 const User_1 = require("../user/User");
@@ -25,7 +25,7 @@ class EasCommand extends command_1.Command {
     async run() {
         var _a;
         eas_json_1.EasJsonReader.setLog(log_1.default);
-        await (0, analytics_1.initAsync)();
+        await (0, rudderstackClient_1.initAsync)();
         await this.applyCliConfigAsync();
         if (this.requiresAuthentication) {
             const { flags } = this.parse();
@@ -35,7 +35,7 @@ class EasCommand extends command_1.Command {
         else {
             await (0, User_1.getUserAsync)();
         }
-        (0, analytics_1.logEvent)(analytics_1.AnalyticsEvent.ACTION, {
+        (0, rudderstackClient_1.logEvent)(rudderstackClient_1.AnalyticsEvent.ACTION, {
             // id is assigned by oclif in constructor based on the filepath:
             // commands/submit === submit, commands/build/list === build:list
             action: `eas ${this.id}`,
@@ -44,7 +44,7 @@ class EasCommand extends command_1.Command {
     }
     // eslint-disable-next-line async-protect/async-suffix
     async finally(err) {
-        await (0, analytics_1.flushAsync)();
+        await (0, rudderstackClient_1.flushAsync)();
         return super.finally(err);
     }
     async applyCliConfigAsync() {

package/build/commands/build/index.js

@@ -154,7 +154,7 @@ class Build extends EasCommand_1.default {
             wait: flags['wait'],
             clearCache: flags['clear-cache'],
             json: flags['json'],
-            autoSubmit: flags['auto-submit'],
+            autoSubmit: flags['auto-submit'] || flags['auto-submit-with-profile'] !== undefined,
             submitProfile: (_a = flags['auto-submit-with-profile']) !== null && _a !== void 0 ? _a : profile,
         };
     }