eas-cli 18.4.0 → 18.5.0

package/build/build/android/prepareJob.js

@@ -6,13 +6,13 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const path_1 = tslib_1.__importDefault(require("path"));
 const slash_1 = tslib_1.__importDefault(require("slash"));
 const customBuildConfig_1 = require("../../project/customBuildConfig");
-const projectUtils_1 = require("../../project/projectUtils");
+const User_1 = require("../../user/User");
 const cacheDefaults = {
     disabled: false,
     paths: [],
 };
 async function prepareJobAsync(ctx, jobData) {
-    const username = (0, projectUtils_1.getUsernameForBuildMetadataAndBuildJob)(ctx.user);
+    const username = (0, User_1.getActorUsername)(ctx.user) ?? undefined;
     const buildProfile = ctx.buildProfile;
     const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
     const { credentials } = jobData;

package/build/build/ios/prepareJob.js

@@ -8,13 +8,13 @@ const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const slash_1 = tslib_1.__importDefault(require("slash"));
 const customBuildConfig_1 = require("../../project/customBuildConfig");
-const projectUtils_1 = require("../../project/projectUtils");
+const User_1 = require("../../user/User");
 const cacheDefaults = {
     disabled: false,
     paths: [],
 };
 async function prepareJobAsync(ctx, jobData) {
-    const username = (0, projectUtils_1.getUsernameForBuildMetadataAndBuildJob)(ctx.user);
+    const username = (0, User_1.getActorUsername)(ctx.user) ?? undefined;
     const buildProfile = ctx.buildProfile;
     const projectRootDirectory = (0, slash_1.default)(path_1.default.relative(await ctx.vcsClient.getRootPathAsync(), ctx.projectDir)) || '.';
     const buildCredentials = {};

package/build/build/metadata.js

@@ -16,6 +16,7 @@ const projectUtils_1 = require("../project/projectUtils");
 const UpdatesModule_1 = require("../update/android/UpdatesModule");
 const UpdatesModule_2 = require("../update/ios/UpdatesModule");
 const easCli_1 = require("../utils/easCli");
+const User_1 = require("../user/User");
 async function collectMetadataAsync(ctx, runtimeAndFingerprintMetadata) {
     const channelObject = await resolveChannelAsync(ctx);
     const distribution = ctx.buildProfile.distribution ?? types_1.BuildDistributionType.STORE;
@@ -39,7 +40,7 @@ async function collectMetadataAsync(ctx, runtimeAndFingerprintMetadata) {
         isGitWorkingTreeDirty: ctx.localBuildOptions.localBuildMode === local_1.LocalBuildMode.INTERNAL
             ? false
             : await ctx.vcsClient.hasUncommittedChangesAsync(),
-        username: (0, projectUtils_1.getUsernameForBuildMetadataAndBuildJob)(ctx.user),
+        username: (0, User_1.getActorUsername)(ctx.user) ?? undefined,
         message: ctx.message,
         ...(ctx.platform === eas_build_job_1.Platform.IOS && {
             iosEnterpriseProvisioning: resolveIosEnterpriseProvisioning(ctx),

package/build/commandUtils/EasCommand.js

@@ -20,7 +20,9 @@ const VcsClientContextField_1 = tslib_1.__importDefault(require("./context/VcsCl
 const errors_1 = require("./errors");
 const AnalyticsManager_1 = require("../analytics/AnalyticsManager");
 const log_1 = tslib_1.__importStar(require("../log"));
+const sentry_1 = tslib_1.__importDefault(require("../sentry"));
 const SessionManager_1 = tslib_1.__importDefault(require("../user/SessionManager"));
+const User_1 = require("../user/User");
 const BASE_GRAPHQL_ERROR_MESSAGE = 'GraphQL request failed.';
 class EasCommand extends core_1.Command {
     static ContextOptions = {
@@ -159,7 +161,13 @@ class EasCommand extends core_1.Command {
         this.sessionManagerInternal = new SessionManager_1.default(this.analytics);
         // this is needed for logEvent call below as it identifies the user in the analytics system
         // if possible
-        await this.sessionManager.getUserAsync();
+        const actor = await this.sessionManager.getUserAsync();
+        if (actor) {
+            sentry_1.default.setUser({
+                id: actor.id,
+                username: (0, User_1.getActorDisplayName)(actor),
+            });
+        }
         this.analytics.logEvent(AnalyticsManager_1.CommandEvent.ACTION, {
             // id is assigned by oclif in constructor based on the filepath:
             // commands/submit === submit, commands/build/list === build:list
@@ -170,10 +178,12 @@ class EasCommand extends core_1.Command {
     // eslint-disable-next-line async-protect/async-suffix
     async finally(err) {
         await this.analytics.flushAsync();
+        await sentry_1.default.flush(2000);
         return await super.finally(err);
     }
     catch(err) {
-        let baseMessage = `${this.id} command failed.`;
+        const commandId = this.id ?? 'unknown';
+        let baseMessage = `${commandId} command failed.`;
         if (err instanceof errors_1.EasCommandError) {
             log_1.default.error(err.message);
         }
@@ -206,6 +216,17 @@ class EasCommand extends core_1.Command {
             log_1.default.error(err.message);
         }
         log_1.default.debug(err);
+        sentry_1.default.withScope(scope => {
+            scope.setTag('command', commandId);
+            scope.setTag('error_name', err.name);
+            scope.setExtra('commandId', commandId);
+            scope.setExtra('commandMessage', baseMessage);
+            scope.setExtra('originalMessage', err.message);
+            if (err instanceof core_2.CombinedError) {
+                scope.setExtra('graphQLErrorCount', err.graphQLErrors.length);
+            }
+            sentry_1.default.captureException(err);
+        });
         const sanitizedError = new Error(baseMessage);
         sanitizedError.stack = err.stack;
         throw sanitizedError;

package/build/commandUtils/context/contextUtils/getProjectIdAsync.js

@@ -114,6 +114,8 @@ async function validateOrSetProjectIdAsync({ exp, graphqlClient, actor, options,
                 return user.username;
             case 'SSOUser':
                 return user.username;
+            case 'PartnerActor':
+                return user.username;
             case 'Robot':
                 throw new Error('Must configure EAS project by running "eas init" before using a robot user to manage the project.');
         }

package/build/commandUtils/workflow/fetchLogs.js

@@ -16,6 +16,16 @@ async function fetchRawLogsForCustomJobAsync(job) {
     return rawLogs;
 }
 async function fetchRawLogsForBuildJobAsync(state, job) {
+    // Prefer turtleJobRun logs, which contain JSONL-formatted step logs
+    // for both built-in and custom build steps
+    const turtleLogFileUrl = job.turtleJobRun?.logFileUrls?.[0];
+    if (turtleLogFileUrl) {
+        const response = await fetch(turtleLogFileUrl, {
+            method: 'GET',
+        });
+        return await response.text();
+    }
+    // Fall back to build logFiles
     const buildId = job.outputs?.build_id;
     if (!buildId) {
         return null;
@@ -30,6 +40,5 @@ async function fetchRawLogsForBuildJobAsync(state, job) {
     const response = await fetch(firstLogFileUrl, {
         method: 'GET',
     });
-    const rawLogs = await response.text();
-    return rawLogs;
+    return await response.text();
 }

package/build/commandUtils/workflow/types.d.ts

@@ -37,4 +37,8 @@ export type WorkflowLogLine = {
     marker?: string;
     err?: any;
 };
-export type WorkflowLogs = Map<string, WorkflowLogLine[]>;
+export type WorkflowLogs = Map<string, {
+    key: string;
+    label: string;
+    logLines: WorkflowLogLine[];
+}>;

package/build/commandUtils/workflow/utils.js

@@ -74,15 +74,14 @@ function choiceFromWorkflowJob(job, index) {
     };
 }
 function choicesFromWorkflowLogs(logs) {
-    return Array.from(logs.keys())
-        .map(step => {
-        const logLines = logs.get(step);
-        const stepStatus = logLines?.filter((line) => line.marker === 'end-step')[0]?.result ?? '';
+    return Array.from(logs.values())
+        .map(({ key, label, logLines }) => {
+        const stepStatus = logLines?.filter((line) => line.marker === 'end-step' || line.marker === 'END_PHASE')[0]?.result ?? '';
         return {
-            title: `${step} - ${stepStatus}`,
-            name: step,
+            title: `${label} - ${stepStatus}`,
+            name: label,
             status: stepStatus,
-            value: step,
+            value: key,
             logLines,
         };
     })
@@ -123,19 +122,26 @@ async function fetchAndProcessLogsFromJobAsync(state, job) {
     }
     log_1.default.debug(`rawLogs = ${JSON.stringify(rawLogs, null, 2)}`);
     const logs = new Map();
-    const logKeys = new Set();
     rawLogs.split('\n').forEach((line, index) => {
         log_1.default.debug(`line ${index} = ${JSON.stringify(line, null, 2)}`);
         try {
             const parsedLine = JSON.parse(line);
-            const { buildStepDisplayName, buildStepInternalId, time, msg, result, marker, err } = parsedLine;
-            const stepId = buildStepDisplayName ?? buildStepInternalId;
-            if (stepId) {
-                if (!logKeys.has(stepId)) {
-                    logKeys.add(stepId);
-                    logs.set(stepId, []);
+            const { buildStepDisplayName, buildStepId, phase, time, msg, result, marker, err } = parsedLine;
+            const stepKey = buildStepId ?? buildStepDisplayName ?? phase;
+            const stepLabel = buildStepDisplayName ?? buildStepId ?? phase;
+            if (stepKey && stepLabel) {
+                if (!logs.has(stepKey)) {
+                    logs.set(stepKey, {
+                        key: stepKey,
+                        label: stepLabel,
+                        logLines: [],
+                    });
                 }
-                logs.get(stepId)?.push({ time, msg, result, marker, err });
+                const logGroup = logs.get(stepKey);
+                if (buildStepDisplayName) {
+                    logGroup.label = buildStepDisplayName;
+                }
+                logGroup.logLines.push({ time, msg, result, marker, err });
             }
         }
         catch { }
@@ -212,7 +218,7 @@ async function infoForFailedWorkflowRunAsync(graphqlClient, workflowRun, maxLogL
         statusValues.push({ label: '', value: '' });
         statusValues.push({ label: '  Failed job', value: job.name });
         if (steps.length > 0) {
-            const failedStep = steps.find(step => step.status === 'fail');
+            const failedStep = steps.find(step => step.status === 'fail' || step.status === 'failed');
             if (failedStep) {
                 const logs = failedStep.logLines?.map(line => line.msg).slice(-logLinesToKeep) ?? [];
                 statusValues.push({ label: '  Failed step', value: failedStep.name });

package/build/commands/metadata/pull.d.ts

@@ -3,6 +3,7 @@ export default class MetadataPull extends EasCommand {
     static description: string;
     static flags: {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
         vcsClient: import("../../commandUtils/context/VcsClientContextField").default;

package/build/commands/metadata/pull.js

@@ -20,6 +20,10 @@ class MetadataPull extends EasCommand_1.default {
             char: 'e',
             description: 'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
         }),
+        'non-interactive': core_1.Flags.boolean({
+            default: false,
+            description: 'Run the command in non-interactive mode.',
+        }),
     };
     static contextDefinition = {
         ...this.ContextOptions.ProjectConfig,
@@ -30,12 +34,12 @@ class MetadataPull extends EasCommand_1.default {
     async runAsync() {
         log_1.default.warn('EAS Metadata is in beta and subject to breaking changes.');
         const { flags } = await this.parse(MetadataPull);
+        const nonInteractive = flags['non-interactive'];
         const { loggedIn: { actor, graphqlClient }, privateProjectConfig: { exp, projectId, projectDir }, analytics, vcsClient, } = await this.getContextAsync(MetadataPull, {
-            nonInteractive: false,
+            nonInteractive,
             withServerSideEnvironment: null,
         });
-        // this command is interactive (all nonInteractive flags passed to utility functions are false)
-        await (0, configure_1.ensureProjectConfiguredAsync)({ projectDir, nonInteractive: false, vcsClient });
+        await (0, configure_1.ensureProjectConfiguredAsync)({ projectDir, nonInteractive, vcsClient });
         const submitProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
             easJsonAccessor: eas_json_1.EasJsonAccessor.fromProjectPath(projectDir),
@@ -53,7 +57,7 @@ class MetadataPull extends EasCommand_1.default {
             user: actor,
             graphqlClient,
             analytics,
-            nonInteractive: false,
+            nonInteractive,
             vcsClient,
         });
         try {
@@ -63,6 +67,9 @@ class MetadataPull extends EasCommand_1.default {
                 credentialsCtx,
                 projectDir,
                 profile: submitProfile,
+                nonInteractive,
+                graphqlClient,
+                projectId,
             });
             const relativePath = path_1.default.relative(process.cwd(), filePath);
             log_1.default.addNewLineIfNone();

package/build/commands/metadata/push.d.ts

@@ -3,6 +3,7 @@ export default class MetadataPush extends EasCommand {
     static description: string;
     static flags: {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
         vcsClient: import("../../commandUtils/context/VcsClientContextField").default;

package/build/commands/metadata/push.js

@@ -18,6 +18,10 @@ class MetadataPush extends EasCommand_1.default {
             char: 'e',
             description: 'Name of the submit profile from eas.json. Defaults to "production" if defined in eas.json.',
         }),
+        'non-interactive': core_1.Flags.boolean({
+            default: false,
+            description: 'Run the command in non-interactive mode.',
+        }),
     };
     static contextDefinition = {
         ...this.ContextOptions.ProjectConfig,
@@ -28,12 +32,12 @@ class MetadataPush extends EasCommand_1.default {
     async runAsync() {
         log_1.default.warn('EAS Metadata is in beta and subject to breaking changes.');
         const { flags } = await this.parse(MetadataPush);
+        const nonInteractive = flags['non-interactive'];
         const { loggedIn: { actor, graphqlClient }, privateProjectConfig: { exp, projectId, projectDir }, analytics, vcsClient, } = await this.getContextAsync(MetadataPush, {
-            nonInteractive: false,
+            nonInteractive,
             withServerSideEnvironment: null,
         });
-        // this command is interactive (all nonInteractive flags passed to utility functions are false)
-        await (0, configure_1.ensureProjectConfiguredAsync)({ projectDir, nonInteractive: false, vcsClient });
+        await (0, configure_1.ensureProjectConfiguredAsync)({ projectDir, nonInteractive, vcsClient });
         const submitProfiles = await (0, profiles_1.getProfilesAsync)({
             type: 'submit',
             easJsonAccessor: eas_json_1.EasJsonAccessor.fromProjectPath(projectDir),
@@ -51,7 +55,7 @@ class MetadataPush extends EasCommand_1.default {
             user: actor,
             graphqlClient,
             analytics,
-            nonInteractive: false,
+            nonInteractive,
             vcsClient,
         });
         try {
@@ -61,6 +65,9 @@ class MetadataPush extends EasCommand_1.default {
                 credentialsCtx,
                 projectDir,
                 profile: submitProfile,
+                nonInteractive,
+                graphqlClient,
+                projectId,
             });
             log_1.default.addNewLineIfNone();
             log_1.default.log(`🎉 Store configuration is synced with the app stores.

package/build/commands/project/onboarding.js

@@ -44,6 +44,9 @@ class Onboarding extends EasCommand_1.default {
         if (actor.__typename === 'Robot') {
             throw new Error('This command is not available for robot users. Make sure you are not using a robot token and try again.');
         }
+        if (actor.__typename === 'PartnerActor') {
+            throw new Error('This command is not available for partner actors. Make sure you are using a user token and try again.');
+        }
         if (!actor.preferences.onboarding) {
             throw new Error('This command can only be run as part of the onboarding process started on the Expo website. Visit https://expo.new to start a new project.');
         }

package/build/commands/workflow/logs.js

@@ -8,14 +8,14 @@ const stateMachine_1 = require("../../commandUtils/workflow/stateMachine");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const json_1 = require("../../utils/json");
 function printLogsForAllSteps(logs) {
-    [...logs.keys()].forEach(step => {
-        const logLines = logs.get(step);
-        if (logLines) {
-            log_1.default.log(`Step: ${step}`);
-            logLines.forEach(line => {
-                log_1.default.log(`  ${line.time} ${line.msg}`);
-            });
+    [...logs.values()].forEach(({ label, logLines }) => {
+        if (logLines.length === 0) {
+            return;
         }
+        log_1.default.log(`Step: ${label}`);
+        logLines.forEach(line => {
+            log_1.default.log(`  ${line.time} ${line.msg}`);
+        });
         log_1.default.addNewLineIfNone();
     });
 }
@@ -68,7 +68,7 @@ class WorkflowLogView extends EasCommand_1.default {
         if (allSteps) {
             if (logs) {
                 if (flags.json) {
-                    (0, json_1.printJsonOnlyOutput)(Object.fromEntries(logs));
+                    (0, json_1.printJsonOnlyOutput)(Object.fromEntries(Array.from(logs.entries()).map(([key, value]) => [key, value.logLines])));
                 }
                 else {
                     printLogsForAllSteps(logs);
@@ -77,15 +77,15 @@ class WorkflowLogView extends EasCommand_1.default {
         }
         else {
             const selectedStep = finalSelectionState?.step;
-            const logLines = logs?.get(selectedStep);
-            if (logLines) {
+            const logGroup = logs?.get(selectedStep);
+            if (logGroup) {
                 if (flags.json) {
                     const output = {};
-                    output[selectedStep] = logLines ?? null;
+                    output[selectedStep] = logGroup.logLines;
                     (0, json_1.printJsonOnlyOutput)(output);
                 }
                 else {
-                    logLines.forEach(line => {
+                    logGroup.logLines.forEach(line => {
                         log_1.default.log(`  ${line.time} ${line.msg}`);
                     });
                 }