eas-cli 18.10.0 → 18.12.0

package/build/build/runBuildAndSubmit.d.ts

@@ -7,6 +7,7 @@ import { DynamicConfigContextFn } from '../commandUtils/context/DynamicProjectCo
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { BuildFragment } from '../graphql/generated';
 import { RequestedPlatform } from '../platform';
+import { SimulatorRunTarget } from '../run/ios/run';
 import { Actor } from '../user/User';
 import { ProfileData } from '../utils/profiles';
 import { Client } from '../vcs/vcs';
@@ -26,6 +27,7 @@ export interface BuildFlags {
     freezeCredentials: boolean;
     isVerboseLoggingEnabled?: boolean;
     whatToTest?: string;
+    simulator?: SimulatorRunTarget;
 }
 export declare function runBuildAndSubmitAsync({ graphqlClient, analytics, vcsClient, projectDir, flags, actor, getDynamicPrivateProjectConfigAsync, downloadSimBuildAutoConfirm, envOverride, }: {
     graphqlClient: ExpoGraphqlClient;
@@ -41,4 +43,4 @@ export declare function runBuildAndSubmitAsync({ graphqlClient, analytics, vcsCl
     buildIds: string[];
     buildProfiles?: ProfileData<'build'>[];
 }>;
-export declare function downloadAndRunAsync(build: BuildFragment): Promise<void>;
+export declare function downloadAndRunAsync(build: BuildFragment, simulator?: SimulatorRunTarget): Promise<void>;

package/build/build/runBuildAndSubmit.js

@@ -17,6 +17,7 @@ const createContext_1 = require("./createContext");
 const evaluateConfigWithEnvVarsAsync_1 = require("./evaluateConfigWithEnvVarsAsync");
 const build_3 = require("./ios/build");
 const local_1 = require("./local");
+const validateLockfile_1 = require("./validateLockfile");
 const devClient_1 = require("./utils/devClient");
 const printBuildInfo_1 = require("./utils/printBuildInfo");
 const repository_1 = require("./utils/repository");
@@ -46,6 +47,7 @@ const profiles_1 = require("../utils/profiles");
 const checkForOverages_1 = require("../utils/usage/checkForOverages");
 let metroConfigValidated = false;
 let sdkVersionChecked = false;
+let lockfileChecked = false;
 let hasWarnedAboutUsageOverages = false;
 async function runBuildAndSubmitAsync({ graphqlClient, analytics, vcsClient, projectDir, flags, actor, getDynamicPrivateProjectConfigAsync, downloadSimBuildAutoConfirm, envOverride, }) {
     await vcsClient.ensureRepoExistsAsync();
@@ -245,6 +247,12 @@ async function prepareAndStartBuildAsync({ projectDir, flags, moreBuilds, buildP
         whatToTest: flags.whatToTest,
         env,
     });
+    if (!lockfileChecked && !flags.localBuildOptions.localBuildMode) {
+        if (!process.env.EAS_BUILD_SKIP_LOCKFILE_CHECK) {
+            await (0, validateLockfile_1.ensureLockfileExistsAsync)(projectDir);
+        }
+        lockfileChecked = true;
+    }
     if (!hasWarnedAboutUsageOverages && !flags.localBuildOptions.localBuildMode) {
         hasWarnedAboutUsageOverages = true;
         log_1.default.newLine();
@@ -358,17 +366,17 @@ function exitWithNonZeroCodeIfSomeBuildsFailed(maybeBuilds) {
         process.exit(1);
     }
 }
-async function downloadAndRunAsync(build) {
+async function downloadAndRunAsync(build, simulator) {
     (0, assert_1.default)(build.artifacts?.applicationArchiveUrl);
     const cachedAppPath = (0, run_1.getEasBuildRunCachedAppPath)(build.project.id, build.id, build.platform);
     if (await (0, fs_extra_1.pathExists)(cachedAppPath)) {
         log_1.default.newLine();
         log_1.default.log(`Using cached app...`);
-        await (0, run_1.runAsync)(cachedAppPath, build.platform);
+        await (0, run_1.runAsync)(cachedAppPath, build.platform, simulator);
         return;
     }
     const buildPath = await (0, download_1.downloadAndMaybeExtractAppAsync)(build.artifacts.applicationArchiveUrl, build.platform, cachedAppPath);
-    await (0, run_1.runAsync)(buildPath, build.platform);
+    await (0, run_1.runAsync)(buildPath, build.platform, simulator);
 }
 async function maybeDownloadAndRunSimulatorBuildsAsync(builds, flags, autoConfirm) {
     const simBuilds = builds.filter(filter_1.truthy).filter(utils_1.isRunnableOnSimulatorOrEmulator);
@@ -381,7 +389,7 @@ async function maybeDownloadAndRunSimulatorBuildsAsync(builds, flags, autoConfir
                         message: `Install and run the ${simBuild.platform === generated_1.AppPlatform.Android ? 'Android' : 'iOS'} build on ${simBuild.platform === generated_1.AppPlatform.Android ? 'an emulator' : 'a simulator'}?`,
                     }));
                 if (confirm) {
-                    await downloadAndRunAsync(simBuild);
+                    await downloadAndRunAsync(simBuild, flags.simulator);
                 }
             }
         }

package/build/build/utils/repository.js

@@ -114,6 +114,14 @@ async function makeProjectTarballAsync(vcsClient) {
             prefix: 'project',
             gzip: true,
             portable: true,
+            onWriteEntry(entry) {
+                // Read-only directories may have files inside them. This causes trouble on tar extraction.
+                // Hence, we're forcing the owner write bit on directories in Windows
+                // to avoid this issue.
+                if (entry.type === 'Directory' && entry.stat) {
+                    entry.stat.mode |= 0o200;
+                }
+            },
         }, ['.']);
     }
     catch (err) {

package/build/build/validateLockfile.d.ts

@@ -0,0 +1 @@
+export declare function ensureLockfileExistsAsync(projectDir: string): Promise<void>;

package/build/build/validateLockfile.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureLockfileExistsAsync = ensureLockfileExistsAsync;
+const tslib_1 = require("tslib");
+const package_manager_1 = require("@expo/package-manager");
+const fs_extra_1 = require("fs-extra");
+const path_1 = tslib_1.__importDefault(require("path"));
+const LOCKFILE_NAMES = [
+    package_manager_1.NPM_LOCK_FILE,
+    package_manager_1.YARN_LOCK_FILE,
+    package_manager_1.PNPM_LOCK_FILE,
+    package_manager_1.BUN_LOCK_FILE,
+    package_manager_1.BUN_TEXT_LOCK_FILE,
+];
+async function hasLockfileAsync(dir) {
+    for (const lockfile of LOCKFILE_NAMES) {
+        if (await (0, fs_extra_1.pathExists)(path_1.default.join(dir, lockfile))) {
+            return true;
+        }
+    }
+    return false;
+}
+async function ensureLockfileExistsAsync(projectDir) {
+    if (await hasLockfileAsync(projectDir)) {
+        return;
+    }
+    const workspaceRoot = (0, package_manager_1.resolveWorkspaceRoot)(projectDir);
+    if (workspaceRoot && workspaceRoot !== projectDir) {
+        if (await hasLockfileAsync(workspaceRoot)) {
+            return;
+        }
+    }
+    throw new Error(`No lockfile found in the project directory.\n` +
+        `A lockfile is required to ensure deterministic dependency installation in EAS.\n` +
+        `Run your package manager's install command (e.g. "npm install") to generate one.\n` +
+        `To skip this check, run this command with EAS_BUILD_SKIP_LOCKFILE_CHECK=1.`);
+}

package/build/commandUtils/buildFlags.d.ts

@@ -0,0 +1 @@
+export declare function preprocessBuildCommandArgs(argv: string[]): string[];

package/build/commandUtils/buildFlags.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.preprocessBuildCommandArgs = preprocessBuildCommandArgs;
+function preprocessBuildCommandArgs(argv) {
+    return withOptionalSimulatorValue(argv);
+}
+// oclif does not support string flags with optional values. We want "--simulator"
+// to prompt for a simulator, while still supporting "--simulator <name-or-udid>".
+// Insert an empty string value for the bare flag before oclif parses argv.
+function withOptionalSimulatorValue(argv) {
+    const simulatorFlagIndex = argv.indexOf('--simulator');
+    const simulatorValue = argv[simulatorFlagIndex + 1];
+    if (simulatorFlagIndex === -1 ||
+        (simulatorValue !== undefined && !simulatorValue.startsWith('-'))) {
+        return argv;
+    }
+    return [...argv.slice(0, simulatorFlagIndex + 1), '', ...argv.slice(simulatorFlagIndex + 1)];
+}

package/build/commandUtils/convex.d.ts

@@ -1,4 +1,5 @@
 import { ConvexProjectData, ConvexTeamConnectionData } from '../graphql/types/ConvexTeamConnection';
+export declare function formatConvexInviteTimestamp(timestamp: string): string;
 export declare function getConvexTeamDashboardUrl(connection: ConvexTeamConnectionData): string;
 export declare function getConvexProjectDashboardUrl(project: ConvexProjectData): string;
 export declare function formatConvexTeam(connection: ConvexTeamConnectionData): string;

package/build/commandUtils/convex.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatConvexInviteTimestamp = formatConvexInviteTimestamp;
 exports.getConvexTeamDashboardUrl = getConvexTeamDashboardUrl;
 exports.getConvexProjectDashboardUrl = getConvexProjectDashboardUrl;
 exports.formatConvexTeam = formatConvexTeam;
@@ -10,10 +11,14 @@ exports.logNoConvexProject = logNoConvexProject;
 exports.confirmRecentConvexInviteAsync = confirmRecentConvexInviteAsync;
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const dateformat_1 = tslib_1.__importDefault(require("dateformat"));
 const log_1 = tslib_1.__importStar(require("../log"));
 const prompts_1 = require("../prompts");
 const CONVEX_DASHBOARD_HOST = 'https://dashboard.convex.dev';
 const RECENT_INVITE_THRESHOLD_MS = 60 * 60 * 1000;
+function formatConvexInviteTimestamp(timestamp) {
+    return (0, dateformat_1.default)(timestamp, 'mmm dd HH:MM:ss');
+}
 function getConvexTeamDashboardUrl(connection) {
     return `${CONVEX_DASHBOARD_HOST}/t/${encodeURIComponent(connection.convexTeamSlug)}`;
 }
@@ -27,12 +32,13 @@ function formatConvexTeamConnection(connection) {
     const lines = [
         `${chalk_1.default.bold('Team')}: ${formatConvexTeam(connection)}`,
         `${chalk_1.default.bold('Dashboard')}: ${(0, log_1.link)(getConvexTeamDashboardUrl(connection), { dim: false })}`,
+        `${chalk_1.default.bold('Claimed')}: ${connection.hasBeenClaimed ? 'Yes' : 'No'}`,
     ];
     if (connection.invitedEmail) {
         lines.push(`${chalk_1.default.bold('Invited email')}: ${connection.invitedEmail}`);
     }
     if (connection.invitedAt) {
-        lines.push(`${chalk_1.default.bold('Invited at')}: ${connection.invitedAt}`);
+        lines.push(`${chalk_1.default.bold('Invited at')}: ${formatConvexInviteTimestamp(connection.invitedAt)}`);
     }
     return lines.join('\n');
 }
@@ -60,7 +66,7 @@ async function confirmRecentConvexInviteAsync(connection, { nonInteractive }) {
     if (timeSinceInviteMs >= RECENT_INVITE_THRESHOLD_MS) {
         return true;
     }
-    const previousInvite = `A Convex team invite was already sent${connection.invitedEmail ? ` to ${connection.invitedEmail}` : ''} at ${connection.invitedAt}.`;
+    const previousInvite = `A Convex team invite was already sent${connection.invitedEmail ? ` to ${connection.invitedEmail}` : ''} at ${formatConvexInviteTimestamp(connection.invitedAt)}.`;
     if (nonInteractive) {
         log_1.default.warn(`${previousInvite} Sending another invite because this command is running in non-interactive mode.`);
         return true;

package/build/commands/build/dev.d.ts

@@ -8,6 +8,7 @@ export default class BuildDev extends EasCommand {
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'skip-build-if-not-found': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'skip-bundler': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        simulator: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     static contextDefinition: {
         projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;

package/build/commands/build/dev.js

@@ -10,6 +10,7 @@ const evaluateConfigWithEnvVarsAsync_1 = require("../../build/evaluateConfigWith
 const runBuildAndSubmit_1 = require("../../build/runBuildAndSubmit");
 const repository_1 = require("../../build/utils/repository");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const buildFlags_1 = require("../../commandUtils/buildFlags");
 const cli_1 = require("../../fingerprint/cli");
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
@@ -42,6 +43,10 @@ class BuildDev extends EasCommand_1.default {
             description: 'Install and run the development build without starting the bundler server.',
             default: false,
         }),
+        simulator: core_1.Flags.string({
+            description: 'iOS simulator name or UDID to install and run the development build on. If no value is provided, you will be prompted to select a simulator.',
+            multiple: false,
+        }),
     };
     static contextDefinition = {
         ...this.ContextOptions.LoggedIn,
@@ -52,7 +57,7 @@ class BuildDev extends EasCommand_1.default {
         ...this.ContextOptions.ProjectId,
     };
     async runAsync() {
-        const { flags } = await this.parse(BuildDev);
+        const { flags } = await this.parse(BuildDev, (0, buildFlags_1.preprocessBuildCommandArgs)(this.argv));
         const { loggedIn: { actor, graphqlClient }, getDynamicPrivateProjectConfigAsync, projectDir, analytics, vcsClient, projectId, } = await this.getContextAsync(BuildDev, {
             nonInteractive: false,
             withServerSideEnvironment: null,
@@ -61,6 +66,10 @@ class BuildDev extends EasCommand_1.default {
         if (process.platform !== 'darwin' && platform === eas_build_job_1.Platform.IOS) {
             core_1.Errors.error('Running iOS builds in simulator is only supported on macOS.', { exit: 1 });
         }
+        if (flags.simulator && platform !== eas_build_job_1.Platform.IOS) {
+            core_1.Errors.error('The --simulator flag can only be used with --platform ios.', { exit: 1 });
+        }
+        const simulator = flags.simulator === '' ? true : flags.simulator;
         await vcsClient.ensureRepoExistsAsync();
         await (0, repository_1.ensureRepoIsCleanAsync)(vcsClient, flags.nonInteractive);
         await (0, configure_1.ensureProjectConfiguredAsync)({
@@ -103,7 +112,7 @@ class BuildDev extends EasCommand_1.default {
             const build = builds[0];
             log_1.default.succeed(`🎯 Found successful build with matching fingerprint on EAS servers. Running it...`);
             if (build.artifacts?.applicationArchiveUrl) {
-                await (0, runBuildAndSubmit_1.downloadAndRunAsync)(build);
+                await (0, runBuildAndSubmit_1.downloadAndRunAsync)(build, simulator);
                 if (!flags['skip-bundler']) {
                     await this.startDevServerAsync({ projectDir, platform });
                 }
@@ -143,6 +152,7 @@ class BuildDev extends EasCommand_1.default {
                 autoSubmit: false,
                 localBuildOptions: {},
                 profile: flags.profile ?? DEFAULT_EAS_BUILD_RUN_PROFILE_NAME,
+                simulator,
             },
             actor,
             getDynamicPrivateProjectConfigAsync,

package/build/commands/build/run.d.ts

@@ -10,6 +10,7 @@ export default class Run extends EasCommand {
         id: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         platform: import("@oclif/core/lib/interfaces").OptionFlag<"android" | "ios" | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         profile: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        simulator: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     static contextDefinition: {
         vcsClient: import("../../commandUtils/context/VcsClientContextField").default;

package/build/commands/build/run.js

@@ -6,6 +6,7 @@ const assert_1 = tslib_1.__importDefault(require("assert"));
 const fs_extra_1 = require("fs-extra");
 const queries_1 = require("../../build/queries");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const buildFlags_1 = require("../../commandUtils/buildFlags");
 const pagination_1 = require("../../commandUtils/pagination");
 const generated_1 = require("../../graphql/generated");
 const BuildQuery_1 = require("../../graphql/queries/BuildQuery");
@@ -44,6 +45,10 @@ class Run extends EasCommand_1.default {
             description: 'Name of the build profile used to create the build to run. When specified, only builds created with the specified build profile will be queried.',
             helpValue: 'PROFILE_NAME',
         }),
+        simulator: core_1.Flags.string({
+            description: 'iOS simulator name or UDID to install and run the build on. If no value is provided, you will be prompted to select a simulator.',
+            multiple: false,
+        }),
         ...pagination_1.EasPaginatedQueryFlags,
     };
     static contextDefinition = {
@@ -52,23 +57,26 @@ class Run extends EasCommand_1.default {
         ...this.ContextOptions.Vcs,
     };
     async runAsync() {
-        const { flags: rawFlags } = await this.parse(Run);
+        const { flags: rawFlags } = await this.parse(Run, (0, buildFlags_1.preprocessBuildCommandArgs)(this.argv));
         const flags = await this.sanitizeFlagsAsync(rawFlags);
         const queryOptions = (0, pagination_1.getPaginatedQueryOptions)(flags);
         const { loggedIn: { graphqlClient }, projectId, } = await this.getContextAsync(Run, {
             nonInteractive: false,
         });
         const simulatorBuildPath = await getPathToSimulatorBuildAppAsync(graphqlClient, projectId, flags, queryOptions);
-        await (0, run_1.runAsync)(simulatorBuildPath, flags.selectedPlatform);
+        await (0, run_1.runAsync)(simulatorBuildPath, flags.selectedPlatform, flags.simulator);
     }
     async sanitizeFlagsAsync(flags) {
-        const { platform, limit, offset, profile, ...runArchiveFlags } = flags;
+        const { platform, limit, offset, profile, simulator, ...runArchiveFlags } = flags;
         const selectedPlatform = await resolvePlatformAsync(platform);
         if (platform === 'ios' && process.platform !== 'darwin') {
             core_1.Errors.error('You can only use an iOS simulator to run apps on macOS devices', {
                 exit: 1,
             });
         }
+        if (simulator && selectedPlatform !== generated_1.AppPlatform.Ios) {
+            core_1.Errors.error('The --simulator flag can only be used with --platform ios.', { exit: 1 });
+        }
         if (runArchiveFlags.path &&
             !((runArchiveFlags.path.endsWith('.tar.gz') ||
                 runArchiveFlags.path.endsWith('.app') ||
@@ -87,6 +95,7 @@ class Run extends EasCommand_1.default {
             limit,
             offset,
             profile,
+            simulator: simulator === '' ? true : simulator,
         };
     }
 }

package/build/commands/integrations/convex/connect.d.ts

@@ -12,6 +12,7 @@ export default class IntegrationsConvexConnect extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     runAsync(): Promise<void>;
+    private upsertConvexUrlEasEnvVarAsync;
     private resolveRegionAsync;
     private resolveTeamNameAsync;
     private resolveProjectNameAsync;

package/build/commands/integrations/convex/connect.js

@@ -7,11 +7,15 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const dotenv_1 = tslib_1.__importDefault(require("dotenv"));
 const fs = tslib_1.__importStar(require("fs-extra"));
 const path_1 = tslib_1.__importDefault(require("path"));
+const environment_1 = require("../../../build/utils/environment");
 const EasCommand_1 = tslib_1.__importDefault(require("../../../commandUtils/EasCommand"));
 const convex_1 = require("../../../commandUtils/convex");
 const flags_1 = require("../../../commandUtils/flags");
+const generated_1 = require("../../../graphql/generated");
 const ConvexMutation_1 = require("../../../graphql/mutations/ConvexMutation");
+const EnvironmentVariableMutation_1 = require("../../../graphql/mutations/EnvironmentVariableMutation");
 const ConvexQuery_1 = require("../../../graphql/queries/ConvexQuery");
+const EnvironmentVariablesQuery_1 = require("../../../graphql/queries/EnvironmentVariablesQuery");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const ora_1 = require("../../../ora");
 const projectUtils_1 = require("../../../project/projectUtils");
@@ -21,6 +25,12 @@ const CONVEX_REGIONS = [
     { title: 'EU West (aws-eu-west-1)', value: 'aws-eu-west-1' },
 ];
 const DEFAULT_REGION = 'aws-us-east-1';
+const EAS_CONVEX_ENV_VAR_NAME = 'EXPO_PUBLIC_CONVEX_URL';
+const EAS_CONVEX_ENVIRONMENTS = [
+    environment_1.DefaultEnvironment.Production,
+    environment_1.DefaultEnvironment.Preview,
+    environment_1.DefaultEnvironment.Development,
+];
 class IntegrationsConvexConnect extends EasCommand_1.default {
     static description = 'connect Convex to your Expo project';
     static contextDefinition = {
@@ -99,21 +109,63 @@ class IntegrationsConvexConnect extends EasCommand_1.default {
             spinner.fail('Failed to set up Convex project');
             throw error;
         }
-        // 6. Send team invite (non-fatal)
-        await this.sendTeamInviteAsync(graphqlClient, connection, actor, { nonInteractive });
-        // 7. Write deploy key and URL to .env.local
+        // 6. Save the Convex URL as an EAS environment variable for builds
+        await this.upsertConvexUrlEasEnvVarAsync(graphqlClient, projectId, setupResult.convexDeploymentUrl, nonInteractive);
+        // 7. Send team invite (non-fatal)
+        const teamInviteResult = await this.sendTeamInviteAsync(graphqlClient, connection, actor, {
+            nonInteractive,
+        });
+        // 8. Write deploy key and URL to .env.local
         await this.writeEnvLocalAsync(projectDir, setupResult.deployKey, setupResult.convexDeploymentUrl, nonInteractive);
-        // 8. Success message
+        // 9. Success message
         log_1.default.addNewLineIfNone();
         log_1.default.log(chalk_1.default.green('Convex is ready!'));
         log_1.default.newLine();
         log_1.default.log('Next steps:');
         log_1.default.log(`  1. Start the Convex dev server: ${chalk_1.default.cyan('npx convex dev')}`);
+        log_1.default.log(`  2. Learn how to connect to your new Convex database by following our quickstart guide: ${chalk_1.default.cyan('https://docs.expo.dev/guides/using-convex')}`);
+        log_1.default.log(`  3. Read more about Convex: ${chalk_1.default.cyan('https://docs.convex.dev/')}`);
         log_1.default.newLine();
-        if (this.getActorEmail(actor)) {
+        if (teamInviteResult === 'sent') {
             log_1.default.log(`Check your email for an invitation to join your Convex team. Accept it for full dashboard access.`);
         }
     }
+    async upsertConvexUrlEasEnvVarAsync(graphqlClient, projectId, convexUrl, nonInteractive) {
+        const existingVariables = await EnvironmentVariablesQuery_1.EnvironmentVariablesQuery.byAppIdAsync(graphqlClient, {
+            appId: projectId,
+            filterNames: [EAS_CONVEX_ENV_VAR_NAME],
+        });
+        const existingProjectVariable = existingVariables.find(variable => variable.scope === generated_1.EnvironmentVariableScope.Project);
+        if (existingProjectVariable) {
+            if (!nonInteractive) {
+                const overwrite = await (0, prompts_1.confirmAsync)({
+                    message: `EAS already has an ${EAS_CONVEX_ENV_VAR_NAME} environment variable for this project. Overwrite it?`,
+                });
+                if (!overwrite) {
+                    log_1.default.warn(`Skipped updating EAS environment variable ${chalk_1.default.bold(EAS_CONVEX_ENV_VAR_NAME)}.`);
+                    return;
+                }
+            }
+            await EnvironmentVariableMutation_1.EnvironmentVariableMutation.updateAsync(graphqlClient, {
+                id: existingProjectVariable.id,
+                name: EAS_CONVEX_ENV_VAR_NAME,
+                value: convexUrl,
+                environments: EAS_CONVEX_ENVIRONMENTS,
+                visibility: generated_1.EnvironmentVariableVisibility.Public,
+                type: generated_1.EnvironmentSecretType.String,
+            });
+            log_1.default.withTick(`Updated EAS environment variable ${chalk_1.default.bold(EAS_CONVEX_ENV_VAR_NAME)} for builds`);
+            return;
+        }
+        await EnvironmentVariableMutation_1.EnvironmentVariableMutation.createForAppAsync(graphqlClient, {
+            name: EAS_CONVEX_ENV_VAR_NAME,
+            value: convexUrl,
+            environments: EAS_CONVEX_ENVIRONMENTS,
+            visibility: generated_1.EnvironmentVariableVisibility.Public,
+            type: generated_1.EnvironmentSecretType.String,
+        }, projectId);
+        log_1.default.withTick(`Created EAS environment variable ${chalk_1.default.bold(EAS_CONVEX_ENV_VAR_NAME)} for builds`);
+    }
     async resolveRegionAsync(flagValue, nonInteractive) {
         if (flagValue) {
             return flagValue;
@@ -169,24 +221,30 @@ class IntegrationsConvexConnect extends EasCommand_1.default {
         return actor.__typename === 'User' ? actor.email : null;
     }
     async sendTeamInviteAsync(graphqlClient, connection, actor, { nonInteractive }) {
+        if (connection.hasBeenClaimed) {
+            log_1.default.warn('Convex team has already been claimed. Skipping Convex team invitation.');
+            return 'skipped';
+        }
         const email = this.getActorEmail(actor);
         if (!email) {
             log_1.default.warn(`Could not determine your verified email address, so no Convex team invitation was sent. Run ${chalk_1.default.cyan('eas integrations:convex:team:invite')} after signing in with a user account.`);
-            return;
+            return 'skipped';
         }
         if (!(await (0, convex_1.confirmRecentConvexInviteAsync)(connection, { nonInteractive }))) {
             log_1.default.warn('Skipped sending Convex team invitation.');
-            return;
+            return 'skipped';
         }
         try {
             await ConvexMutation_1.ConvexMutation.sendConvexTeamInviteToVerifiedEmailAsync(graphqlClient, {
                 convexTeamConnectionId: connection.id,
             });
             log_1.default.withTick(`Sent Convex team invitation to ${chalk_1.default.bold(email)}`);
+            return 'sent';
         }
         catch (error) {
             log_1.default.warn(`Failed to send Convex team invitation to ${email}. Run ${chalk_1.default.cyan('eas integrations:convex:team:invite')} to retry.`);
             log_1.default.warn(error instanceof Error ? error.message : String(error));
+            return 'failed';
         }
     }
     async installConvexPackageAsync(projectDir) {

package/build/commands/integrations/convex/team/invite.js

@@ -48,6 +48,10 @@ class IntegrationsConvexTeamInvite extends EasCommand_1.default {
         this.logTeam(connection);
         this.logPreviousInvite(connection);
         log_1.default.newLine();
+        if (connection.hasBeenClaimed) {
+            log_1.default.warn('Convex team has already been claimed. Skipping Convex team invitation.');
+            return;
+        }
         if (!(await (0, convex_1.confirmRecentConvexInviteAsync)(connection, { nonInteractive }))) {
             log_1.default.warn('Skipped sending Convex team invitation.');
             return;
@@ -71,6 +75,7 @@ class IntegrationsConvexTeamInvite extends EasCommand_1.default {
     logTeam(connection) {
         log_1.default.log(chalk_1.default.bold(`Convex team ${(0, convex_1.formatConvexTeam)(connection)}`));
         log_1.default.log(`${chalk_1.default.bold('Dashboard')}: ${(0, log_1.link)((0, convex_1.getConvexTeamDashboardUrl)(connection), { dim: false })}`);
+        log_1.default.log(`${chalk_1.default.bold('Claimed')}: ${connection.hasBeenClaimed ? 'Yes' : 'No'}`);
     }
     logPreviousInvite(connection) {
         if (!connection.invitedEmail && !connection.invitedAt) {
@@ -82,7 +87,7 @@ class IntegrationsConvexTeamInvite extends EasCommand_1.default {
             log_1.default.log(`${chalk_1.default.bold('Email')}: ${connection.invitedEmail}`);
         }
         if (connection.invitedAt) {
-            log_1.default.log(`${chalk_1.default.bold('Sent at')}: ${connection.invitedAt}`);
+            log_1.default.log(`${chalk_1.default.bold('Sent at')}: ${(0, convex_1.formatConvexInviteTimestamp)(connection.invitedAt)}`);
         }
     }
     async resolveConnectionAsync(connections, team, nonInteractive) {

package/build/commands/observe/events.js

@@ -6,11 +6,12 @@ const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasComm
 const errors_1 = require("../../commandUtils/errors");
 const flags_1 = require("../../commandUtils/flags");
 const pagination_1 = require("../../commandUtils/pagination");
-const generated_1 = require("../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const fetchEvents_1 = require("../../observe/fetchEvents");
 const metricNames_1 = require("../../observe/metricNames");
 const formatEvents_1 = require("../../observe/formatEvents");
+const platforms_1 = require("../../observe/platforms");
+const resolveProjectContext_1 = require("../../observe/resolveProjectContext");
 const startAndEndTime_1 = require("../../observe/startAndEndTime");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
@@ -34,7 +35,7 @@ class ObserveEvents extends EasCommand_1.default {
         })(),
         platform: core_1.Flags.option({
             description: 'Filter by platform',
-            options: Object.values(generated_1.AppObservePlatform).map(s => s.toLowerCase()),
+            options: platforms_1.allowedPlatformFlagValues,
         })(),
         after: core_1.Flags.string({
             description: 'Cursor for pagination. Use the endCursor from a previous query to fetch the next page.',
@@ -76,20 +77,13 @@ class ObserveEvents extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags, args } = await this.parse(ObserveEvents);
-        let projectId;
-        let graphqlClient;
-        if (flags['project-id']) {
-            projectId = flags['project-id'];
-            const ctx = await this.getContextAsync({ contextDefinition: ObserveEvents.loggedInOnlyContextDefinition }, { nonInteractive: flags['non-interactive'] });
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
-        else {
-            const ctx = await this.getContextAsync(ObserveEvents, {
-                nonInteractive: flags['non-interactive'],
-            });
-            projectId = ctx.projectId;
-            graphqlClient = ctx.loggedIn.graphqlClient;
-        }
+        const { projectId, graphqlClient } = await (0, resolveProjectContext_1.resolveObserveCommandContextAsync)({
+            command: this,
+            commandClass: ObserveEvents,
+            loggedInOnlyContextDefinition: ObserveEvents.loggedInOnlyContextDefinition,
+            projectIdOverride: flags['project-id'],
+            nonInteractive: flags['non-interactive'],
+        });
         if (flags.json) {
             (0, json_1.enableJsonOutput)();
         }
@@ -113,14 +107,8 @@ class ObserveEvents extends EasCommand_1.default {
         }
         const orderBy = (0, fetchEvents_1.resolveOrderBy)(flags.sort);
         const { daysBack, startTime, endTime } = (0, startAndEndTime_1.resolveTimeRange)(flags);
-        const platform = flags.platform
-            ? flags.platform === 'android'
-                ? generated_1.AppObservePlatform.Android
-                : generated_1.AppObservePlatform.Ios
-            : undefined;
-        const platforms = platform
-            ? [platform === generated_1.AppObservePlatform.Android ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios]
-            : [generated_1.AppPlatform.Android, generated_1.AppPlatform.Ios];
+        const platform = (0, platforms_1.appObservePlatformFromFlag)(flags.platform);
+        const platforms = (0, platforms_1.appPlatformsFromFlag)(flags.platform);
         const [{ events, pageInfo }, totalEventCount] = await Promise.all([
             (0, fetchEvents_1.fetchObserveEventsAsync)(graphqlClient, projectId, {
                 metricName,

package/build/commands/observe/logs.d.ts

@@ -0,0 +1,29 @@
+import EasCommand from '../../commandUtils/EasCommand';
+export default class ObserveLogs extends EasCommand {
+    static hidden: boolean;
+    static description: string;
+    static args: {
+        eventName: import("@oclif/core/lib/interfaces").Arg<string | undefined, Record<string, unknown>>;
+    };
+    static flags: {
+        json: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        platform: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        after: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        limit: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined>;
+        start: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        end: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        days: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'app-version': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'update-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'session-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'all-events': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'project-id': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+    };
+    static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
+        projectId: import("../../commandUtils/context/ProjectIdContextField").ProjectIdContextField;
+    };
+    private static loggedInOnlyContextDefinition;
+    runAsync(): Promise<void>;
+}