eas-cli 18.9.1 → 18.11.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

@@ -108,9 +108,21 @@ async function makeProjectTarballAsync(vcsClient) {
     (0, timer_1.startTimer)(compressTimerLabel);
     try {
         await vcsClient.makeShallowCopyAsync(shallowClonePath);
-        await tar.create({ cwd: shallowClonePath, file: tarPath, prefix: 'project', gzip: true }, [
-            '.',
-        ]);
+        await tar.create({
+            cwd: shallowClonePath,
+            file: tarPath,
+            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) {
         clearTimeout(timer);

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

@@ -0,0 +1,12 @@
+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;
+export declare function formatConvexTeamConnection(connection: ConvexTeamConnectionData): string;
+export declare function formatConvexProject(project: ConvexProjectData): string;
+export declare function logNoConvexTeams(accountName: string): void;
+export declare function logNoConvexProject(projectName: string): void;
+export declare function confirmRecentConvexInviteAsync(connection: ConvexTeamConnectionData, { nonInteractive }: {
+    nonInteractive: boolean;
+}): Promise<boolean>;

package/build/commandUtils/convex.js

@@ -0,0 +1,77 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatConvexInviteTimestamp = formatConvexInviteTimestamp;
+exports.getConvexTeamDashboardUrl = getConvexTeamDashboardUrl;
+exports.getConvexProjectDashboardUrl = getConvexProjectDashboardUrl;
+exports.formatConvexTeam = formatConvexTeam;
+exports.formatConvexTeamConnection = formatConvexTeamConnection;
+exports.formatConvexProject = formatConvexProject;
+exports.logNoConvexTeams = logNoConvexTeams;
+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)}`;
+}
+function getConvexProjectDashboardUrl(project) {
+    return `${getConvexTeamDashboardUrl(project.convexTeamConnection)}/${encodeURIComponent(project.convexProjectSlug)}`;
+}
+function formatConvexTeam(connection) {
+    return `${connection.convexTeamName} / ${connection.convexTeamSlug}`;
+}
+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')}: ${formatConvexInviteTimestamp(connection.invitedAt)}`);
+    }
+    return lines.join('\n');
+}
+function formatConvexProject(project) {
+    return [
+        `${chalk_1.default.bold('Name')}: ${project.convexProjectName}`,
+        `${chalk_1.default.bold('Slug')}: ${project.convexProjectSlug}`,
+        `${chalk_1.default.bold('Identifier')}: ${project.convexProjectIdentifier}`,
+        `${chalk_1.default.bold('Team')}: ${formatConvexTeam(project.convexTeamConnection)}`,
+        `${chalk_1.default.bold('Dashboard')}: ${(0, log_1.link)(getConvexProjectDashboardUrl(project), { dim: false })}`,
+    ].join('\n');
+}
+function logNoConvexTeams(accountName) {
+    log_1.default.warn(`No Convex team is linked to account ${chalk_1.default.bold(accountName)} on EAS.`);
+}
+function logNoConvexProject(projectName) {
+    log_1.default.warn(`No Convex project is linked to Expo app ${chalk_1.default.bold(projectName)} on EAS.`);
+}
+async function confirmRecentConvexInviteAsync(connection, { nonInteractive }) {
+    const invitedAt = connection.invitedAt ? new Date(connection.invitedAt) : null;
+    if (!invitedAt || Number.isNaN(invitedAt.getTime())) {
+        return true;
+    }
+    const timeSinceInviteMs = Date.now() - invitedAt.getTime();
+    if (timeSinceInviteMs >= RECENT_INVITE_THRESHOLD_MS) {
+        return true;
+    }
+    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;
+    }
+    return await (0, prompts_1.confirmAsync)({
+        message: `${previousInvite} Are you sure you want to send another invite?`,
+    });
+}

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/resign.js

@@ -143,7 +143,6 @@ class BuildResign extends EasCommand_1.default {
                 },
             },
             secrets: (0, prepareJob_1.prepareCredentialsToResign)(credentialsResult.credentials),
-            builderEnvironment: { image: 'default' },
         };
         const newBuild = await BuildMutation_1.BuildMutation.retryIosBuildAsync(graphqlClient, {
             buildId: build.id,

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

@@ -0,0 +1,24 @@
+import EasCommand from '../../../commandUtils/EasCommand';
+export default class IntegrationsConvexConnect extends EasCommand {
+    static description: string;
+    static contextDefinition: {
+        loggedIn: import("../../../commandUtils/context/LoggedInContextField").default;
+        privateProjectConfig: import("../../../commandUtils/context/PrivateProjectConfigContextField").PrivateProjectConfigContextField;
+    };
+    static flags: {
+        region: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'team-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'project-name': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    runAsync(): Promise<void>;
+    private resolveRegionAsync;
+    private resolveTeamNameAsync;
+    private resolveProjectNameAsync;
+    private selectConnectionAsync;
+    private getActorEmail;
+    private sendTeamInviteAsync;
+    private installConvexPackageAsync;
+    private writeEnvLocalAsync;
+    private mergeEnvContent;
+}