eas-cli 19.0.0 → 19.0.2

package/build/commands/simulator/start.d.ts

@@ -3,6 +3,7 @@ export default class SimulatorStart extends EasCommand {
     static hidden: boolean;
     static description: string;
     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<"android" | "ios", import("@oclif/core/lib/interfaces").CustomOptions>;
         type: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;

package/build/commands/simulator/start.js

@@ -11,6 +11,7 @@ const DeviceRunSessionQuery_1 = require("../../graphql/queries/DeviceRunSessionQ
 const log_1 = tslib_1.__importStar(require("../../log"));
 const ora_1 = require("../../ora");
 const utils_1 = require("../../simulator/utils");
+const json_1 = require("../../utils/json");
 const promise_1 = require("../../utils/promise");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const POLL_INTERVAL_MS = 5_000; // 5 seconds
@@ -19,6 +20,7 @@ const POLL_TIMEOUT_MS = 15 * 60 * 1_000; // 15 minutes
 // so adding a new enum value in codegen fails the build until it is wired up here.
 const DEVICE_RUN_SESSION_TYPE_FLAG_VALUES = {
     [generated_1.DeviceRunSessionType.AgentDevice]: 'agent-device',
+    [generated_1.DeviceRunSessionType.Argent]: 'argent',
     [generated_1.DeviceRunSessionType.ServeSim]: 'serve-sim',
 };
 const DEVICE_RUN_SESSION_TYPE_BY_FLAG_VALUE = Object.fromEntries(Object.entries(DEVICE_RUN_SESSION_TYPE_FLAG_VALUES).map(([type, value]) => [value, type]));
@@ -39,7 +41,7 @@ class SimulatorStart extends EasCommand_1.default {
         'package-version': core_1.Flags.string({
             description: 'Version of the package backing the device run session (e.g. "0.1.3-alpha.3"). Defaults to "latest" when omitted.',
         }),
-        ...flags_1.EASNonInteractiveFlag,
+        ...flags_1.EasNonInteractiveAndJsonFlags,
     };
     static contextDefinition = {
         ...this.ContextOptions.ProjectId,
@@ -47,8 +49,12 @@ class SimulatorStart extends EasCommand_1.default {
     };
     async runAsync() {
         const { flags } = await this.parse(SimulatorStart);
+        const { json: jsonFlag, nonInteractive } = (0, flags_1.resolveNonInteractiveAndJsonFlags)(flags);
+        if (jsonFlag) {
+            (0, json_1.enableJsonOutput)();
+        }
         const { projectId, loggedIn: { graphqlClient }, } = await this.getContextAsync(SimulatorStart, {
-            nonInteractive: flags['non-interactive'],
+            nonInteractive,
         });
         const platform = flags.platform === 'android' ? generated_1.AppPlatform.Android : generated_1.AppPlatform.Ios;
         const createSpinner = (0, ora_1.ora)('🚀 Creating device run session').start();
@@ -104,10 +110,19 @@ class SimulatorStart extends EasCommand_1.default {
             await ensureDeviceRunSessionStoppedSafelyAsync(graphqlClient, deviceRunSessionId);
             throw new Error(`Timed out after ${Math.round(POLL_TIMEOUT_MS / 1000)}s waiting for ${flags.type} session to be ready. ${(0, log_1.link)(jobRunUrl)}`);
         }
+        if (jsonFlag) {
+            (0, json_1.printJsonOnlyOutput)({
+                id: deviceRunSessionId,
+                type: flags.type,
+                jobRunUrl,
+                remoteConfig,
+            });
+            return;
+        }
         log_1.default.newLine();
         log_1.default.log((0, utils_1.formatRemoteSessionInstructions)(remoteConfig));
         log_1.default.newLine();
-        if (flags['non-interactive']) {
+        if (nonInteractive) {
             log_1.default.log(`When you are done, stop the session with: eas simulator:stop --id ${deviceRunSessionId}`);
             return;
         }

package/build/graphql/generated.d.ts

@@ -2982,6 +2982,15 @@ export declare enum AppsFilter {
     /** New Projects */
     New = "NEW"
 }
+export type ArgentRunSessionRemoteConfig = {
+    __typename?: 'ArgentRunSessionRemoteConfig';
+    toolsUrl: Scalars['String']['output'];
+    /**
+     * URL of the web preview surface for the session. Null when web previews are
+     * not available for the platform (e.g. Android).
+     */
+    webPreviewUrl?: Maybe<Scalars['String']['output']>;
+};
 export type AscApiKeyInput = {
     issuerIdentifier: Scalars['String']['input'];
     keyIdentifier: Scalars['String']['input'];
@@ -3588,6 +3597,7 @@ export declare enum BuildPhase {
     EasBuildInternal = "EAS_BUILD_INTERNAL",
     FailBuild = "FAIL_BUILD",
     FixGradlew = "FIX_GRADLEW",
+    GradleBuildProfile = "GRADLE_BUILD_PROFILE",
     InstallCustomTools = "INSTALL_CUSTOM_TOOLS",
     InstallDependencies = "INSTALL_DEPENDENCIES",
     InstallPods = "INSTALL_PODS",
@@ -4471,7 +4481,7 @@ export type DeviceRunSessionQuery = {
 export type DeviceRunSessionQueryByIdArgs = {
     deviceRunSessionId: Scalars['ID']['input'];
 };
-export type DeviceRunSessionRemoteConfig = AgentDeviceRunSessionRemoteConfig | ServeSimRunSessionRemoteConfig;
+export type DeviceRunSessionRemoteConfig = AgentDeviceRunSessionRemoteConfig | ArgentRunSessionRemoteConfig | ServeSimRunSessionRemoteConfig;
 export declare enum DeviceRunSessionStatus {
     Errored = "ERRORED",
     InProgress = "IN_PROGRESS",
@@ -4480,6 +4490,7 @@ export declare enum DeviceRunSessionStatus {
 }
 export declare enum DeviceRunSessionType {
     AgentDevice = "AGENT_DEVICE",
+    Argent = "ARGENT",
     ServeSim = "SERVE_SIM"
 }
 export type DiscordUser = {
@@ -5107,6 +5118,25 @@ export type EditUpdateBranchInput = {
     name?: InputMaybe<Scalars['String']['input']>;
     newName: Scalars['String']['input'];
 };
+export type EmbeddedUpdate = {
+    __typename?: 'EmbeddedUpdate';
+    channel: Scalars['String']['output'];
+    createdAt: Scalars['DateTime']['output'];
+    /** The manifest UUID baked into the binary by expo-updates at build time. */
+    id: Scalars['ID']['output'];
+    launchAsset: EmbeddedUpdateAsset;
+    platform: AppPlatform;
+    runtimeVersion: Scalars['String']['output'];
+};
+export type EmbeddedUpdateAsset = {
+    __typename?: 'EmbeddedUpdateAsset';
+    contentType: Scalars['String']['output'];
+    fileSHA256: Scalars['String']['output'];
+    fileSize: Scalars['Int']['output'];
+    finalFileSize?: Maybe<Scalars['Int']['output']>;
+    id: Scalars['ID']['output'];
+    storageKey: Scalars['String']['output'];
+};
 export type EmbeddedUpdateAssetMutation = {
     __typename?: 'EmbeddedUpdateAssetMutation';
     /**
@@ -5129,6 +5159,17 @@ export type EmbeddedUpdateAssetUploadSpec = {
     /** Storage key (`{appId}/{embeddedUpdateId}`). Same key in both upload and destination buckets. */
     storageKey: Scalars['String']['output'];
 };
+export type EmbeddedUpdateMutation = {
+    __typename?: 'EmbeddedUpdateMutation';
+    /**
+     * Register an embedded bundle as the launch asset for a given app/platform/channel.
+     * Returns EMBEDDED_UPDATE_ASSET_NOT_AVAILABLE if the asset has not been finalized yet.
+     */
+    uploadEmbeddedUpdate: EmbeddedUpdate;
+};
+export type EmbeddedUpdateMutationUploadEmbeddedUpdateArgs = {
+    input: UploadEmbeddedUpdateInput;
+};
 export declare enum EntityTypeName {
     AccountEntity = "AccountEntity",
     AccountSsoConfigurationEntity = "AccountSSOConfigurationEntity",
@@ -6177,6 +6218,7 @@ export type JobRun = {
     createdAt: Scalars['DateTime']['output'];
     displayName?: Maybe<Scalars['String']['output']>;
     endedAt?: Maybe<Scalars['DateTime']['output']>;
+    enqueuedAt?: Maybe<Scalars['DateTime']['output']>;
     errors: Array<JobRunError>;
     expiresAt: Scalars['DateTime']['output'];
     gitCommitHash?: Maybe<Scalars['String']['output']>;
@@ -6926,6 +6968,8 @@ export type RootMutation = {
     echoTurn: EchoTurnMutation;
     /** Mutations for Echo versions */
     echoVersion: EchoVersionMutation;
+    /** Mutations that register embedded update bundles for bundle diffing. */
+    embeddedUpdate: EmbeddedUpdateMutation;
     embeddedUpdateAsset: EmbeddedUpdateAssetMutation;
     /** Mutations that create and delete EnvironmentSecrets */
     environmentSecret: EnvironmentSecretMutation;
@@ -8243,6 +8287,15 @@ export type UpdatesMetricsData = {
     installsDataset: CumulativeUpdatesDataset;
     labels: Array<Scalars['String']['output']>;
 };
+export type UploadEmbeddedUpdateInput = {
+    appId: Scalars['ID']['input'];
+    channel: Scalars['String']['input'];
+    /** UUID baked into the binary by expo-updates at build time (from app.manifest id field). */
+    embeddedUpdateId: Scalars['ID']['input'];
+    platform: AppPlatform;
+    runtimeVersion: Scalars['String']['input'];
+    turtleBuildId?: InputMaybe<Scalars['ID']['input']>;
+};
 export type UploadSession = {
     __typename?: 'UploadSession';
     /** Create an Upload Session for a specific account */
@@ -16866,6 +16919,10 @@ export type DeviceRunSessionByIdQuery = {
                 agentDeviceRemoteSessionUrl: string;
                 agentDeviceRemoteSessionToken: string;
                 webPreviewUrl?: string | null;
+            } | {
+                __typename: 'ArgentRunSessionRemoteConfig';
+                toolsUrl: string;
+                webPreviewUrl?: string | null;
             } | {
                 __typename: 'ServeSimRunSessionRemoteConfig';
                 previewUrl: string;

package/build/graphql/generated.js

@@ -279,6 +279,7 @@ var BuildPhase;
     BuildPhase["EasBuildInternal"] = "EAS_BUILD_INTERNAL";
     BuildPhase["FailBuild"] = "FAIL_BUILD";
     BuildPhase["FixGradlew"] = "FIX_GRADLEW";
+    BuildPhase["GradleBuildProfile"] = "GRADLE_BUILD_PROFILE";
     BuildPhase["InstallCustomTools"] = "INSTALL_CUSTOM_TOOLS";
     BuildPhase["InstallDependencies"] = "INSTALL_DEPENDENCIES";
     BuildPhase["InstallPods"] = "INSTALL_PODS";
@@ -414,6 +415,7 @@ var DeviceRunSessionStatus;
 var DeviceRunSessionType;
 (function (DeviceRunSessionType) {
     DeviceRunSessionType["AgentDevice"] = "AGENT_DEVICE";
+    DeviceRunSessionType["Argent"] = "ARGENT";
     DeviceRunSessionType["ServeSim"] = "SERVE_SIM";
 })(DeviceRunSessionType || (exports.DeviceRunSessionType = DeviceRunSessionType = {}));
 var DistributionType;

package/build/graphql/queries/DeviceRunSessionQuery.js

@@ -29,6 +29,10 @@ exports.DeviceRunSessionQuery = {
                       agentDeviceRemoteSessionToken
                       webPreviewUrl
                     }
+                    ... on ArgentRunSessionRemoteConfig {
+                      toolsUrl
+                      webPreviewUrl
+                    }
                     ... on ServeSimRunSessionRemoteConfig {
                       previewUrl
                       streamUrl

package/build/project/ios/entitlements.d.ts

@@ -1,8 +1,9 @@
 import { JSONObject } from '@expo/json-file';
+import { Client } from '../../vcs/vcs';
 interface Target {
     buildConfiguration?: string;
     targetName: string;
 }
-export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>): Promise<JSONObject>;
+export declare function getManagedApplicationTargetEntitlementsAsync(projectDir: string, env: Record<string, string>, vcsClient: Client): Promise<JSONObject>;
 export declare function getNativeTargetEntitlementsAsync(projectDir: string, target: Target): Promise<JSONObject | null>;
 export {};

package/build/project/ios/entitlements.js

@@ -2,15 +2,84 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getManagedApplicationTargetEntitlementsAsync = getManagedApplicationTargetEntitlementsAsync;
 exports.getNativeTargetEntitlementsAsync = getNativeTargetEntitlementsAsync;
+const tslib_1 = require("tslib");
 const config_plugins_1 = require("@expo/config-plugins");
+const prebuild_config_1 = require("@expo/prebuild-config");
+const log_1 = tslib_1.__importDefault(require("../../log"));
+const sentry_1 = tslib_1.__importDefault(require("../../sentry"));
 const expoCli_1 = require("../../utils/expoCli");
 const plist_1 = require("../../utils/plist");
-async function getManagedApplicationTargetEntitlementsAsync(projectDir, env) {
-    const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', '--type', 'introspect'], {
-        env,
-    });
-    const expWithMods = JSON.parse(stdout);
-    return expWithMods.ios?.entitlements ?? {};
+const projectUtils_1 = require("../projectUtils");
+const workflow_1 = require("../workflow");
+async function getManagedApplicationTargetEntitlementsAsync(projectDir, env, vcsClient) {
+    let expoConfigError;
+    if ((0, projectUtils_1.isExpoInstalled)(projectDir)) {
+        try {
+            const { stdout } = await (0, expoCli_1.spawnExpoCommand)(projectDir, ['config', '--json', '--type', 'introspect'], {
+                env: {
+                    ...env,
+                    EXPO_NO_DOTENV: '1',
+                },
+            });
+            const expWithMods = JSON.parse(stdout);
+            return expWithMods.ios?.entitlements ?? {};
+        }
+        catch (error) {
+            try {
+                sentry_1.default.withScope(scope => {
+                    if (process.env.EAS_BUILD_PROJECT_ID) {
+                        scope.setTag('app_id', process.env.EAS_BUILD_PROJECT_ID);
+                    }
+                    if (process.env.EAS_BUILD_ID) {
+                        scope.setTag('build_id', process.env.EAS_BUILD_ID);
+                    }
+                    scope.setTag('config_resolution', 'ios_entitlements_introspection');
+                    scope.setExtra('message', 'iOS entitlements config fallback');
+                    scope.setExtra('stdout', error.stdout);
+                    scope.setExtra('stderr', error.stderr);
+                    sentry_1.default.captureException(error);
+                });
+            }
+            catch {
+                // do nothing
+            }
+            expoConfigError = error;
+            log_1.default.warn(`Failed to read the app config from the project using the local Expo CLI: ${formatError(error)}`);
+            log_1.default.warn('Falling back to the version of "@expo/config" shipped with the EAS CLI.');
+        }
+    }
+    try {
+        return await resolveManagedApplicationTargetEntitlementsWithBundledConfigAsync(projectDir, env, vcsClient);
+    }
+    catch (fallbackError) {
+        if (expoConfigError) {
+            throw new Error(`Failed to resolve iOS entitlements from Expo config. The local Expo CLI failed with: ${formatError(expoConfigError)}. The bundled config fallback also failed with: ${formatError(fallbackError)}`, { cause: fallbackError });
+        }
+        throw new Error(`Failed to resolve iOS entitlements from Expo config using the bundled config fallback: ${formatError(fallbackError)}`, { cause: fallbackError });
+    }
+}
+async function resolveManagedApplicationTargetEntitlementsWithBundledConfigAsync(projectDir, env, vcsClient) {
+    const originalProcessEnv = process.env;
+    try {
+        process.env = {
+            ...process.env,
+            ...env,
+        };
+        const { exp } = await (0, prebuild_config_1.getPrebuildConfigAsync)(projectDir, { platforms: ['ios'] });
+        const expWithMods = await (0, config_plugins_1.compileModsAsync)(exp, {
+            projectRoot: projectDir,
+            platforms: ['ios'],
+            introspect: true,
+            ignoreExistingNativeFiles: await (0, workflow_1.hasIgnoredIosProjectAsync)(projectDir, vcsClient),
+        });
+        return expWithMods.ios?.entitlements ?? {};
+    }
+    finally {
+        process.env = originalProcessEnv;
+    }
+}
+function formatError(error) {
+    return error.stderr?.trim() || error.stdout?.trim() || error.message;
 }
 async function getNativeTargetEntitlementsAsync(projectDir, target) {
     const entitlementsPath = config_plugins_1.IOSConfig.Entitlements.getEntitlementsPath(projectDir, target);

package/build/project/ios/target.js

@@ -29,7 +29,7 @@ async function resolveManagedProjectTargetsAsync({ exp, projectDir, xcodeBuildCo
         targetName: applicationTargetName,
         buildConfiguration,
     });
-    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {});
+    const applicationTargetEntitlements = await (0, entitlements_1.getManagedApplicationTargetEntitlementsAsync)(projectDir, env ?? {}, vcsClient);
     const appExtensions = exp.extra?.eas?.build?.experimental?.ios?.appExtensions ?? [];
     const { error } = AppExtensionsConfigSchema.validate(appExtensions, {
         allowUnknown: false,

package/build/simulator/utils.js

@@ -15,6 +15,17 @@ function formatRemoteSessionInstructions(remoteConfig) {
             }
             return lines.join('\n');
         }
+        case 'ArgentRunSessionRemoteConfig': {
+            const lines = [
+                '🔑 Open the following URL to access the Argent tools for this session:',
+                '',
+                remoteConfig.toolsUrl,
+            ];
+            if (remoteConfig.webPreviewUrl) {
+                lines.push('', '🌐 Open the following URL in your browser to preview the simulator:', '', remoteConfig.webPreviewUrl);
+            }
+            return lines.join('\n');
+        }
         case 'ServeSimRunSessionRemoteConfig':
             return [
                 '🌐 Open the following URL in your browser to access the simulator:',