@expo/build-tools 22.3.0 → 22.4.0

package/dist/ios/xcode.d.ts

@@ -0,0 +1,3 @@
+export declare function getXcodeVersionAsync({ env }: {
+    env: NodeJS.ProcessEnv;
+}): Promise<string>;

package/dist/ios/xcode.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getXcodeVersionAsync = getXcodeVersionAsync;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const turtle_spawn_1 = __importDefault(require("@expo/turtle-spawn"));
+async function getXcodeVersionAsync({ env }) {
+    let stdout;
+    try {
+        ({ stdout } = await (0, turtle_spawn_1.default)('xcodebuild', ['-version'], { stdio: 'pipe', env }));
+    }
+    catch (error) {
+        throw new eas_build_job_1.SystemError('Failed to get Xcode version', { cause: error });
+    }
+    const version = /^Xcode\s+(\d+(?:\.\d+)*)$/m.exec(stdout)?.[1];
+    if (!version) {
+        throw new eas_build_job_1.SystemError(`Failed to determine Xcode version from: ${stdout.trim()}`);
+    }
+    return version;
+}

package/dist/steps/functions/downloadBuild.js

@@ -19,6 +19,8 @@ const node_path_1 = __importDefault(require("node:path"));
 const stream_1 = __importDefault(require("stream"));
 const util_1 = require("util");
 const zod_1 = require("zod");
+const bplist_parser_1 = __importDefault(require("bplist-parser"));
+const plist_1 = __importDefault(require("plist"));
 const artifacts_1 = require("../../utils/artifacts");
 const files_1 = require("../../utils/files");
 const retryOnDNSFailure_1 = require("../../utils/retryOnDNSFailure");
@@ -163,12 +165,34 @@ async function downloadBuildAsync(params) {
         onlyFiles: false,
         onlyDirectories: false,
     });
+    let matchingFilesRoot = extractionDirectory;
+    if (matchingFiles.length === 0 &&
+        extensions.includes('app') &&
+        (await isIosAppBundleAsync(extractionDirectory))) {
+        const appBundlePath = `${extractionDirectory}.app`;
+        await node_fs_1.default.promises.rename(extractionDirectory, appBundlePath);
+        matchingFiles.push(appBundlePath);
+        matchingFilesRoot = node_path_1.default.dirname(appBundlePath);
+    }
     if (matchingFiles.length === 0) {
         throw new eas_build_job_1.UserError('EAS_DOWNLOAD_BUILD_NO_MATCHING_FILES', `No ${extensions.map(ext => `.${ext}`).join(', ')} entries found in the archive.`);
     }
-    logger.info(`Found ${matchingFiles.length} matching ${(0, strings_1.pluralize)(matchingFiles.length, 'entry')}:\n${matchingFiles.map(f => `- ${node_path_1.default.relative(extractionDirectory, f)}`).join('\n')}`);
+    logger.info(`Found ${matchingFiles.length} matching ${(0, strings_1.pluralize)(matchingFiles.length, 'entry')}:\n${matchingFiles.map(f => `- ${node_path_1.default.relative(matchingFilesRoot, f)}`).join('\n')}`);
     return { artifactPath: matchingFiles[0] };
 }
+async function isIosAppBundleAsync(directory) {
+    try {
+        const infoPlist = await node_fs_1.default.promises.readFile(node_path_1.default.join(directory, 'Info.plist'));
+        const isBinaryPlist = infoPlist.subarray(0, 8).toString('ascii') === 'bplist00';
+        const parsedInfoPlist = (isBinaryPlist
+            ? bplist_parser_1.default.parseBuffer(infoPlist)[0]
+            : plist_1.default.parse(infoPlist.toString('utf8')));
+        return parsedInfoPlist?.CFBundlePackageType === 'APPL';
+    }
+    catch {
+        return false;
+    }
+}
 function parseHttpApplicationArchiveUrl(value) {
     try {
         const applicationArchiveUrl = zod_1.z.string().parse(value);

package/dist/steps/functions/installMaestro.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInstallMaestroBuildFunction = createInstallMaestroBuildFunction;
 exports.installIdbFromBrew = installIdbFromBrew;
+const downloader_1 = __importDefault(require("@expo/downloader"));
 const eas_build_job_1 = require("@expo/eas-build-job");
 const results_1 = require("@expo/results");
 const steps_1 = require("@expo/steps");
@@ -16,6 +17,10 @@ const path_1 = __importDefault(require("path"));
 const semver_1 = __importDefault(require("semver"));
 const maestroBackend_1 = require("./maestroBackend");
 const datadog_1 = require("../../datadog");
+const xcode_1 = require("../../ios/xcode");
+const IosSimulatorUtils_1 = require("../../utils/IosSimulatorUtils");
+const download_1 = require("../../utils/download");
+const MAESTRO_RUNNER_WDA_CACHE_DOWNLOAD_TIMEOUT_MS = 20_000;
 function createInstallMaestroBuildFunction() {
     return new steps_1.BuildFunction({
         namespace: 'eas',
@@ -118,10 +123,12 @@ function createInstallMaestroBuildFunction() {
                             requestedVersion === 'latest' ||
                             (requestedVersion === undefined &&
                                 (!currentMaestroRunnerVersion || semver_1.default.gt(currentMaestroRunnerVersion, '1.1.15'))))) {
-                        const xcodeVersion = await getXcodeVersion({ env });
+                        // `getXcodeVersionAsync` returns the raw version (e.g. "16.4"), which
+                        // `semver.coerce` normalizes (e.g. "16.4.0") for comparison and display.
+                        const xcodeVersion = semver_1.default.coerce(await (0, xcode_1.getXcodeVersionAsync)({ env }));
                         // maestro-runner 1.1.16 added `arch` to its xcodebuild destination. Xcode versions
                         // below 26 reject that option, so use the last compatible maestro-runner version.
-                        if (semver_1.default.lt(xcodeVersion, '26.0.0')) {
+                        if (xcodeVersion && semver_1.default.lt(xcodeVersion, '26.0.0')) {
                             if (requestedMaestroRunnerVersion) {
                                 throw new eas_build_job_1.UserError('ERR_MAESTRO_INVALID_INPUT', `maestro-runner ${requestedVersion} is not compatible with Xcode ${xcodeVersion}. Use maestro-runner 1.1.15 or an Xcode 26+ image.`);
                             }
@@ -147,6 +154,12 @@ function createInstallMaestroBuildFunction() {
                 logger.error(maestroVersionResult.reason, 'Failed to get Maestro version.');
                 throw new Error(`Failed to ensure ${backend} is installed.`);
             }
+            if (backend === 'maestro-runner' && global.runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
+                await installMaestroRunnerWdaCache({
+                    logger,
+                    env,
+                });
+            }
             logger.info(`${backend} ${maestroVersionResult.value} is ready.`);
             outputs.maestro_version.set(maestroVersionResult.value);
             datadog_1.Datadog.distribution('eas.maestro.install', 1, {
@@ -156,19 +169,87 @@ function createInstallMaestroBuildFunction() {
         },
     });
 }
-async function getXcodeVersion({ env }) {
-    let stdout;
+async function installMaestroRunnerWdaCache({ logger, env, }) {
+    if (!env.HOME) {
+        logger.warn('Skipping the prebuilt WebDriverAgent cache because the $HOME environment variable is empty.');
+        return;
+    }
+    const maestroRunnerHome = path_1.default.join(env.HOME, '.maestro-runner');
     try {
-        ({ stdout } = await (0, turtle_spawn_1.default)('xcodebuild', ['-version'], { stdio: 'pipe', env }));
+        const wdaVersion = await getMaestroRunnerWdaVersion({ maestroRunnerHome });
+        if (!wdaVersion) {
+            logger.info('Skipping the prebuilt WebDriverAgent cache because the installed WDA version is unknown.');
+            return;
+        }
+        const xcodeVersion = await (0, xcode_1.getXcodeVersionAsync)({ env });
+        const iosRuntimes = await IosSimulatorUtils_1.IosSimulatorUtils.getAvailableRuntimesAsync({ env });
+        const iosRuntimeIdentifierPrefix = 'com.apple.CoreSimulator.SimRuntime.iOS-';
+        // maestro-runner derives its WDA cache key from the runtime identifier, not from the runtime
+        // version. These values can differ for patched runtimes, for example the iOS-26-3 identifier
+        // can report version 26.3.1.
+        const iosRuntimeVersions = [
+            ...new Set(iosRuntimes.map(runtime => runtime.identifier.slice(iosRuntimeIdentifierPrefix.length).replaceAll('-', '.'))),
+        ];
+        if (iosRuntimeVersions.length === 0) {
+            logger.info('Skipping the prebuilt WebDriverAgent cache because no iOS runtime is available.');
+            return;
+        }
+        const tempDirectory = await fs_1.default.promises.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'install_maestro_runner_wda_cache'));
+        try {
+            const archivePath = path_1.default.join(tempDirectory, 'wda-cache.tar.gz');
+            const directArchiveUrl = `https://storage.googleapis.com/turtle-v2/maestro-runner-wda-cache/` +
+                `xcode-${encodeURIComponent(xcodeVersion)}-wda-${encodeURIComponent(wdaVersion)}.tar.gz`;
+            const proxiedArchiveUrl = (0, download_1.getProxiedDownloadUrl)({
+                directUrl: directArchiveUrl,
+                proxyBaseUrl: env.EAS_BUILD_COCOAPODS_CACHE_URL,
+            });
+            logger.info(`Downloading the prebuilt WebDriverAgent cache for Xcode ${xcodeVersion}`);
+            if (proxiedArchiveUrl) {
+                try {
+                    await (0, downloader_1.default)(proxiedArchiveUrl, archivePath, {
+                        retry: 3,
+                        timeout: MAESTRO_RUNNER_WDA_CACHE_DOWNLOAD_TIMEOUT_MS,
+                    });
+                }
+                catch (err) {
+                    logger.debug({ err }, 'Failed to download the prebuilt WebDriverAgent cache via the proxy; falling back to the direct URL.');
+                    await (0, downloader_1.default)(directArchiveUrl, archivePath, {
+                        retry: 3,
+                        timeout: MAESTRO_RUNNER_WDA_CACHE_DOWNLOAD_TIMEOUT_MS,
+                    });
+                }
+            }
+            else {
+                await (0, downloader_1.default)(directArchiveUrl, archivePath, {
+                    retry: 3,
+                    timeout: MAESTRO_RUNNER_WDA_CACHE_DOWNLOAD_TIMEOUT_MS,
+                });
+            }
+            await fs_1.default.promises.mkdir(maestroRunnerHome, { recursive: true });
+            await (0, turtle_spawn_1.default)('tar', ['-xzf', archivePath, '-C', maestroRunnerHome], { logger, env });
+            const genericProductsDirectory = path_1.default.join(maestroRunnerHome, 'cache', 'wda-builds', 'generic', 'DerivedData', 'Build', 'Products');
+            for (const runtimeVersion of iosRuntimeVersions) {
+                const productsDirectory = path_1.default.join(maestroRunnerHome, 'cache', 'wda-builds', `sim-ios${runtimeVersion}-iphone`, 'DerivedData', 'Build', 'Products');
+                await fs_1.default.promises.cp(genericProductsDirectory, productsDirectory, { recursive: true });
+            }
+            logger.info(`Installed the prebuilt WebDriverAgent cache for iOS ${iosRuntimeVersions.join(', ')}.`);
+        }
+        finally {
+            await fs_1.default.promises.rm(tempDirectory, { force: true, recursive: true });
+        }
     }
-    catch (error) {
-        throw new eas_build_job_1.SystemError('Failed to get Xcode version', { cause: error });
+    catch (err) {
+        logger.warn({ err }, 'Failed to install the prebuilt WebDriverAgent cache. maestro-runner will build WebDriverAgent when it is needed.');
     }
-    const xcodeVersion = semver_1.default.coerce(/^Xcode\s+(\S+)/m.exec(stdout)?.[1])?.version;
-    if (!xcodeVersion) {
-        throw new eas_build_job_1.SystemError(`Failed to parse Xcode version from xcodebuild output: ${stdout.trim()}`);
+}
+async function getMaestroRunnerWdaVersion({ maestroRunnerHome, }) {
+    try {
+        const packageJson = JSON.parse(await fs_1.default.promises.readFile(path_1.default.join(maestroRunnerHome, 'drivers', 'ios', 'WebDriverAgent', 'package.json'), 'utf8'));
+        return typeof packageJson.version === 'string' ? packageJson.version : null;
+    }
+    catch {
+        return null;
     }
-    return xcodeVersion;
 }
 async function getMaestroVersion({ env, backend, }) {
     switch (backend) {

package/dist/steps/functions/launchApplication.d.ts

@@ -1,9 +1,11 @@
 import { bunyan } from '@expo/logger';
 import { BuildFunction, BuildRuntimePlatform, BuildStepEnv } from '@expo/steps';
 export declare function createLaunchApplicationFunction(): BuildFunction;
-export declare function launchApplicationAsync({ applicationIdentifier, activityName, runtimePlatform, env, logger, }: {
+export declare function launchApplicationAsync({ applicationIdentifier, activityName, launchArgs, openUrl, runtimePlatform, env, logger, }: {
     applicationIdentifier: string;
     activityName?: string;
+    launchArgs?: string[];
+    openUrl?: string;
     runtimePlatform: BuildRuntimePlatform;
     env: BuildStepEnv;
     logger: bunyan;

package/dist/steps/functions/launchApplication.js

@@ -25,15 +25,29 @@ function createLaunchApplicationFunction() {
                 required: false,
                 allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
             }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'launch_args',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.JSON,
+            }),
+            steps_1.BuildStepInput.createProvider({
+                id: 'open_url',
+                required: false,
+                allowedValueTypeName: steps_1.BuildStepInputValueTypeName.STRING,
+            }),
         ],
         fn: async ({ global, logger }, { inputs, env }) => {
             const applicationIdentifier = parseNonEmptyStringInput(inputs.application_identifier.value, 'application_identifier');
             const activityName = inputs.activity_name.value === undefined
                 ? undefined
                 : parseNonEmptyStringInput(inputs.activity_name.value, 'activity_name');
+            const launchArgs = parseLaunchArgsInput(inputs.launch_args.value);
+            const openUrl = inputs.open_url.value === undefined ? undefined : parseOpenUrlInput(inputs.open_url.value);
             await launchApplicationAsync({
                 applicationIdentifier,
                 activityName,
+                launchArgs,
+                openUrl,
                 runtimePlatform: global.runtimePlatform,
                 env,
                 logger,
@@ -41,23 +55,47 @@ function createLaunchApplicationFunction() {
         },
     });
 }
-async function launchApplicationAsync({ applicationIdentifier, activityName, runtimePlatform, env, logger, }) {
+async function launchApplicationAsync({ applicationIdentifier, activityName, launchArgs = [], openUrl, runtimePlatform, env, logger, }) {
     if (runtimePlatform === steps_1.BuildRuntimePlatform.DARWIN) {
-        logger.info(`Launching ${applicationIdentifier}.`);
-        await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'launch', 'booted', applicationIdentifier], {
+        logApplicationLaunch(logger, applicationIdentifier, launchArgs);
+        await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'launch', 'booted', applicationIdentifier, ...launchArgs], {
             env,
             logger,
         });
+        if (openUrl) {
+            logger.info(`Opening ${openUrl} in ${applicationIdentifier}.`);
+            await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'openurl', 'booted', openUrl], { env, logger });
+        }
         return;
     }
     if (!activityName) {
         throw new eas_build_job_1.UserError('EAS_LAUNCH_APPLICATION_MISSING_ACTIVITY', 'Launching an Android application requires activity_name.');
     }
-    logger.info(`Launching ${applicationIdentifier}.`);
-    await (0, turtle_spawn_1.default)('adb', ['shell', 'am', 'start', '-n', `${applicationIdentifier}/${activityName}`], {
+    logApplicationLaunch(logger, applicationIdentifier, launchArgs);
+    // Android does not support process arguments like iOS. Pass raw `am start` Intent
+    // arguments instead, such as `--es key value` or `--ez key true`.
+    await (0, turtle_spawn_1.default)('adb', ['shell', 'am', 'start', ...launchArgs, '-n', `${applicationIdentifier}/${activityName}`], {
         env,
         logger,
     });
+    if (openUrl) {
+        logger.info(`Opening ${openUrl} in ${applicationIdentifier}.`);
+        await (0, turtle_spawn_1.default)('adb', [
+            'shell',
+            'am',
+            'start',
+            '-a',
+            'android.intent.action.VIEW',
+            '-d',
+            openUrl,
+            '-n',
+            `${applicationIdentifier}/${activityName}`,
+        ], { env, logger });
+    }
+}
+function logApplicationLaunch(logger, applicationIdentifier, launchArgs) {
+    const argumentsDescription = launchArgs.length > 0 ? ` with arguments ${JSON.stringify(launchArgs)}` : '';
+    logger.info(`Launching ${applicationIdentifier}${argumentsDescription}.`);
 }
 function parseNonEmptyStringInput(value, inputName) {
     if (typeof value !== 'string' || value.length === 0) {
@@ -65,3 +103,19 @@ function parseNonEmptyStringInput(value, inputName) {
     }
     return value;
 }
+function parseLaunchArgsInput(value) {
+    if (value === undefined) {
+        return [];
+    }
+    if (!Array.isArray(value) || !value.every(argument => typeof argument === 'string')) {
+        throw new eas_build_job_1.UserError('EAS_LAUNCH_APPLICATION_INVALID_INPUT', 'Input "launch_args" must be an array of strings.');
+    }
+    return value;
+}
+function parseOpenUrlInput(value) {
+    const openUrl = parseNonEmptyStringInput(value, 'open_url');
+    if (!URL.canParse(openUrl)) {
+        throw new eas_build_job_1.UserError('EAS_LAUNCH_APPLICATION_INVALID_INPUT', 'Input "open_url" must be a valid URL.');
+    }
+    return openUrl;
+}

package/dist/steps/utils/ios/xcactivitylog.js

@@ -16,6 +16,7 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const zod_1 = require("zod");
 const sentry_1 = require("../../../sentry");
+const download_1 = require("../../../utils/download");
 const DEFAULT_XCLOGPARSER_VERSION = 'v0.2.47';
 const XCLOGPARSER_DOWNLOAD_URL = 'https://storage.googleapis.com/turtle-v2/xclogparser';
 const XCLOGPARSER_DOWNLOAD_TIMEOUT_MS = 20_000;
@@ -123,7 +124,7 @@ async function downloadXclogparser({ tempDir, version, logger, proxyBaseUrl, env
     const zipName = getXclogparserZipName(version);
     const zipPath = path_1.default.join(tempDir, zipName);
     const directUrl = `${XCLOGPARSER_DOWNLOAD_URL}/${zipName}`;
-    const proxiedUrl = getProxiedDownloadUrl({ directUrl, proxyBaseUrl });
+    const proxiedUrl = (0, download_1.getProxiedDownloadUrl)({ directUrl, proxyBaseUrl });
     if (proxiedUrl) {
         const proxiedDownloadResult = await (0, results_1.asyncResult)(downloadAndUnpackXclogparser({ tempDir, zipPath, sourceUrl: proxiedUrl, env }));
         if (!proxiedDownloadResult.ok) {
@@ -188,13 +189,6 @@ const COMPILE_SIGNATURE_PREFIXES = ['SwiftCompile ', 'SwiftGeneratePch '];
 function getXclogparserZipName(version) {
     return `XCLogParser-macOS-x86-64-arm64-${version}.zip`;
 }
-function getProxiedDownloadUrl({ directUrl, proxyBaseUrl, }) {
-    if (!proxyBaseUrl) {
-        return null;
-    }
-    const parsedUrl = new URL(directUrl);
-    return directUrl.replace(`${parsedUrl.protocol}//${parsedUrl.host}`, `${proxyBaseUrl}/${parsedUrl.host}`);
-}
 function isCompileStep(step) {
     const detailStepType = step.detailStepType ?? '';
     const signature = step.signature ?? '';

package/dist/utils/IosSimulatorUtils.d.ts

@@ -27,6 +27,14 @@ export declare namespace IosSimulatorUtils {
         runtimeDisplayName: string;
         displayName: string;
     };
+    export type IosSimulatorRuntime = {
+        identifier: string;
+        isAvailable?: boolean;
+        version?: string;
+    };
+    export function getAvailableRuntimesAsync({ env, }: {
+        env: NodeJS.ProcessEnv;
+    }): Promise<IosSimulatorRuntime[]>;
     export function getAvailableDevicesAsync({ env, filter, }: {
         env: NodeJS.ProcessEnv;
         filter: 'available' | 'booted';

package/dist/utils/IosSimulatorUtils.js

@@ -13,6 +13,15 @@ const promises_1 = require("node:timers/promises");
 const retry_1 = require("./retry");
 var IosSimulatorUtils;
 (function (IosSimulatorUtils) {
+    async function getAvailableRuntimesAsync({ env, }) {
+        const { stdout } = await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'list', 'runtimes', '--json'], { env });
+        const { runtimes } = JSON.parse(stdout);
+        return runtimes.flatMap(runtime => runtime.isAvailable !== false &&
+            runtime.identifier?.startsWith('com.apple.CoreSimulator.SimRuntime.iOS-')
+            ? [{ ...runtime, identifier: runtime.identifier }]
+            : []);
+    }
+    IosSimulatorUtils.getAvailableRuntimesAsync = getAvailableRuntimesAsync;
     async function getAvailableDevicesAsync({ env, filter, }) {
         const result = await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'list', 'devices', '--json', '--no-escape-slashes', filter], { env });
         const xcrunData = JSON.parse(result.stdout);

package/dist/utils/download.d.ts

@@ -0,0 +1,4 @@
+export declare function getProxiedDownloadUrl({ directUrl, proxyBaseUrl, }: {
+    directUrl: string;
+    proxyBaseUrl?: string;
+}): string | null;

package/dist/utils/download.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getProxiedDownloadUrl = getProxiedDownloadUrl;
+function getProxiedDownloadUrl({ directUrl, proxyBaseUrl, }) {
+    if (!proxyBaseUrl) {
+        return null;
+    }
+    const parsedUrl = new URL(directUrl);
+    return directUrl.replace(`${parsedUrl.protocol}//${parsedUrl.host}`, `${proxyBaseUrl.replace(/\/$/, '')}/${parsedUrl.host}`);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "22.3.0",
+  "version": "22.4.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -46,7 +46,7 @@
     "@expo/plist": "^0.3.5",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "22.1.0",
+    "@expo/steps": "22.4.0",
     "@expo/template-file": "22.0.0",
     "@expo/turtle-spawn": "22.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -102,5 +102,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "70066fc8beedabdd31081f18c18928461d400806"
+  "gitHead": "39c39ad4bfdd1e7e74417bb6f7178b011ce61bbe"
 }