@expo/build-tools 22.2.0 → 22.4.0

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -69,7 +69,7 @@ const sentry_1 = require("../../sentry");
 const retry_1 = require("../../utils/retry");
 const turtleFetch_1 = require("../../utils/turtleFetch");
 const XCODE_DEVELOPER_DIR = '/Applications/Xcode.app/Contents/Developer';
-const SERVE_SIM_PACKAGE_SPEC = '@expo/serve-sim@latest';
+const SERVE_SIM_PACKAGE_NAME = '@expo/serve-sim';
 const SERVE_SIM_HOST = '127.0.0.1';
 const SERVE_SIM_MAX_DIMENSION = '1280';
 const SERVE_SIM_MJPEG_QUALITY = '0.55';
@@ -473,10 +473,13 @@ function metricsCorsOriginToServeSimArgs(env) {
     }
     return args;
 }
-function createServeSimArgs({ port, turnArgs = [], metricsCorsArgs = [], }) {
+function createServeSimPackageSpec(packageVersion) {
+    return `${SERVE_SIM_PACKAGE_NAME}@${packageVersion ?? 'latest'}`;
+}
+function createServeSimArgs({ port, turnArgs = [], metricsCorsArgs = [], packageVersion, }) {
     return [
         '--yes',
-        SERVE_SIM_PACKAGE_SPEC,
+        createServeSimPackageSpec(packageVersion),
         '--port',
         String(port),
         '--host',
@@ -540,14 +543,14 @@ async function waitForServeSimReadyAsync({ serveSim, port, timeoutMs, }) {
     }
     throw new eas_build_job_1.SystemError(`Timed out waiting for serve-sim readiness at ${readyUrl}${lastError instanceof Error ? `: ${lastError.message}` : ''}. Last output:\n${serveSim.getOutput() || '<empty>'}`);
 }
-async function startServeSimWithTunnelAsync(ctx, { baseDomain, env, logger, timeoutMs, }) {
+async function startServeSimWithTunnelAsync(ctx, { baseDomain, env, logger, timeoutMs, packageVersion, }) {
     const port = await findAvailablePortAsync();
-    logger.info(`Launching ${SERVE_SIM_PACKAGE_SPEC} on ${SERVE_SIM_HOST}:${port}.`);
+    logger.info(`Launching ${createServeSimPackageSpec(packageVersion)} on ${SERVE_SIM_HOST}:${port}.`);
     const turnArgs = await fetchServeSimTurnArgsAsync(ctx, { env, logger });
     const metricsCorsArgs = metricsCorsOriginToServeSimArgs(env);
     const serveSim = spawnDetached({
         command: 'npx',
-        args: createServeSimArgs({ port, turnArgs, metricsCorsArgs }),
+        args: createServeSimArgs({ port, turnArgs, metricsCorsArgs, packageVersion }),
         env,
     });
     try {

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/cacheKey.d.ts

@@ -1,5 +1,11 @@
 import { Platform } from '@expo/eas-build-job';
-export declare const CACHE_KEY_PREFIX_BY_PLATFORM: Record<Platform, string>;
+export type CcacheBuildTarget = {
+    platform: Platform.ANDROID;
+} | {
+    platform: Platform.IOS;
+    simulator: boolean;
+};
+export declare function getCcacheKeyPrefix(target: CcacheBuildTarget): string;
 export declare const PUBLIC_CACHE_KEY_PREFIX_BY_PLATFORM: Record<Platform, string>;
 export declare function getCcachePath(env: Record<string, string | undefined>): string;
-export declare function generateDefaultBuildCacheKeyAsync(workingDirectory: string, platform: Platform): Promise<string>;
+export declare function generateDefaultBuildCacheKeyAsync(workingDirectory: string, target: CcacheBuildTarget): Promise<string>;

package/dist/utils/cacheKey.js

@@ -36,7 +36,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PUBLIC_CACHE_KEY_PREFIX_BY_PLATFORM = exports.CACHE_KEY_PREFIX_BY_PLATFORM = void 0;
+exports.PUBLIC_CACHE_KEY_PREFIX_BY_PLATFORM = void 0;
+exports.getCcacheKeyPrefix = getCcacheKeyPrefix;
 exports.getCcachePath = getCcachePath;
 exports.generateDefaultBuildCacheKeyAsync = generateDefaultBuildCacheKeyAsync;
 const eas_build_job_1 = require("@expo/eas-build-job");
@@ -46,16 +47,19 @@ const assert_1 = __importDefault(require("assert"));
 const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const packageManager_1 = require("./packageManager");
-const IOS_CACHE_KEY_PREFIX = 'ios-ccache-';
+const IOS_DEVICE_CACHE_KEY_PREFIX = 'ios-device-ccache-';
+const IOS_SIMULATOR_CACHE_KEY_PREFIX = 'ios-simulator-ccache-';
 const ANDROID_CACHE_KEY_PREFIX = 'android-ccache-';
 const PUBLIC_IOS_CACHE_KEY_PREFIX = 'public-ios-ccache-';
 const PUBLIC_ANDROID_CACHE_KEY_PREFIX = 'public-android-ccache-';
 const DARWIN_CACHE_PATH = 'Library/Caches/ccache';
 const LINUX_CACHE_PATH = '.cache/ccache';
-exports.CACHE_KEY_PREFIX_BY_PLATFORM = {
-    [eas_build_job_1.Platform.ANDROID]: ANDROID_CACHE_KEY_PREFIX,
-    [eas_build_job_1.Platform.IOS]: IOS_CACHE_KEY_PREFIX,
-};
+function getCcacheKeyPrefix(target) {
+    if (target.platform === eas_build_job_1.Platform.IOS) {
+        return target.simulator ? IOS_SIMULATOR_CACHE_KEY_PREFIX : IOS_DEVICE_CACHE_KEY_PREFIX;
+    }
+    return ANDROID_CACHE_KEY_PREFIX;
+}
 exports.PUBLIC_CACHE_KEY_PREFIX_BY_PLATFORM = {
     [eas_build_job_1.Platform.ANDROID]: PUBLIC_ANDROID_CACHE_KEY_PREFIX,
     [eas_build_job_1.Platform.IOS]: PUBLIC_IOS_CACHE_KEY_PREFIX,
@@ -68,14 +72,14 @@ function getCcachePath(env) {
     (0, assert_1.default)(env.HOME, 'Failed to infer directory: $HOME environment variable is empty.');
     return path_1.default.join(env.HOME, PATH_BY_PLATFORM[os_1.default.platform()]);
 }
-async function generateDefaultBuildCacheKeyAsync(workingDirectory, platform) {
+async function generateDefaultBuildCacheKeyAsync(workingDirectory, target) {
     // This will resolve which package manager and use the relevant lock file
     // The lock file hash is the key and ensures cache is fresh
     const packagerRunDir = (0, packageManager_1.findPackagerRootDir)(workingDirectory);
     const manager = PackageManagerUtils.createForProject(packagerRunDir);
     const lockPath = path_1.default.join(packagerRunDir, manager.lockFile);
     try {
-        return `${exports.CACHE_KEY_PREFIX_BY_PLATFORM[platform]}${(0, steps_1.hashFiles)([lockPath])}`;
+        return `${getCcacheKeyPrefix(target)}${(0, steps_1.hashFiles)([lockPath])}`;
     }
     catch (err) {
         throw new Error(`Failed to read lockfile for cache key generation: ${err.message}`);

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.2.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",
@@ -54,6 +54,7 @@
     "@sentry/node": "7.77.0",
     "@urql/core": "^6.0.1",
     "bplist-parser": "0.3.2",
+    "content-disposition": "1.0.1",
     "fast-glob": "^3.3.2",
     "fast-xml-parser": "^4.4.1",
     "fs-extra": "^11.2.0",
@@ -77,7 +78,8 @@
     "zod": "^4.3.5"
   },
   "devDependencies": {
-    "@expo/repack-app": "~0.6.1",
+    "@expo/repack-app": "~0.9.0",
+    "@types/content-disposition": "0.5.9",
     "@types/fs-extra": "^11.0.4",
     "@types/jest": "^29.5.12",
     "@types/lodash": "^4.17.4",
@@ -100,5 +102,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "5484dd607468c7711d915a2521df10531f8b9908"
+  "gitHead": "39c39ad4bfdd1e7e74417bb6f7178b011ce61bbe"
 }