@expo/build-tools 20.0.0 → 20.1.0

package/dist/builders/android.js

@@ -22,6 +22,7 @@ const saveBuildCache_1 = require("../steps/functions/saveBuildCache");
 const gradleConfig_1 = require("../steps/utils/android/gradleConfig");
 const artifacts_1 = require("../utils/artifacts");
 const expoUpdates_1 = require("../utils/expoUpdates");
+const expoUpdatesEmbedded_1 = require("../utils/expoUpdatesEmbedded");
 const hooks_1 = require("../utils/hooks");
 const prepareBuildExecutable_1 = require("../utils/prepareBuildExecutable");
 async function androidBuilder(ctx) {
@@ -177,6 +178,11 @@ async function buildAsync(ctx) {
             logger: ctx.logger,
         });
     });
+    if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
+        await ctx.runBuildPhase(eas_build_job_1.BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
+            await (0, expoUpdatesEmbedded_1.uploadEmbeddedBundleAsync)(ctx);
+        });
+    }
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.SAVE_CACHE, async () => {
         if (ctx.isLocal) {
             ctx.logger.info('Local builds do not support saving cache.');

package/dist/builders/ios.js

@@ -26,6 +26,7 @@ const restoreBuildCache_1 = require("../steps/functions/restoreBuildCache");
 const saveBuildCache_1 = require("../steps/functions/saveBuildCache");
 const artifacts_1 = require("../utils/artifacts");
 const expoUpdates_1 = require("../utils/expoUpdates");
+const expoUpdatesEmbedded_1 = require("../utils/expoUpdatesEmbedded");
 const hooks_1 = require("../utils/hooks");
 const prepareBuildExecutable_1 = require("../utils/prepareBuildExecutable");
 const processes_1 = require("../utils/processes");
@@ -192,6 +193,11 @@ async function buildAsync(ctx) {
             logger: ctx.logger,
         });
     });
+    if (ctx.env.EAS_UPDATE_EXPERIMENTAL_UPLOAD_EMBEDDED_BUNDLE) {
+        await ctx.runBuildPhase(eas_build_job_1.BuildPhase.UPLOAD_EMBEDDED_BUNDLE, async () => {
+            await (0, expoUpdatesEmbedded_1.uploadEmbeddedBundleAsync)(ctx);
+        });
+    }
     await ctx.runBuildPhase(eas_build_job_1.BuildPhase.SAVE_CACHE, async () => {
         if (ctx.isLocal) {
             ctx.logger.info('Local builds do not support saving cache.');

package/dist/datadog.d.ts

@@ -1,7 +1,14 @@
+type MetricsTarget = {
+    kind: 'build';
+    turtleBuildId: string;
+} | {
+    kind: 'jobRun';
+    turtleJobRunId: string;
+};
 type DatadogSetupOptions = {
     expoApiV2BaseUrl: string;
-    turtleBuildId: string;
     robotAccessToken: string;
+    target: MetricsTarget;
 };
 export declare const Datadog: {
     setup(opts: DatadogSetupOptions | null): void;

package/dist/datadog.js

@@ -13,7 +13,7 @@ exports.Datadog = {
         if (!setupOptions) {
             return;
         }
-        const { expoApiV2BaseUrl, turtleBuildId, robotAccessToken } = setupOptions;
+        const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
         const metrics = [
             {
                 name,
@@ -22,14 +22,17 @@ exports.Datadog = {
                 tags,
             },
         ];
-        const uploadPromise = (0, turtleFetch_1.turtleFetch)(new URL(`turtle-builds/${turtleBuildId}/metrics`, expoApiV2BaseUrl).toString(), 'POST', {
+        const metricsPath = target.kind === 'build'
+            ? `turtle-builds/${target.turtleBuildId}/metrics`
+            : `turtle-job-runs/${target.turtleJobRunId}/metrics`;
+        const uploadPromise = (0, turtleFetch_1.turtleFetch)(new URL(metricsPath, expoApiV2BaseUrl).toString(), 'POST', {
             json: { metrics },
             headers: {
                 Authorization: `Bearer ${robotAccessToken}`,
             },
             retries: 2,
         }).catch(err => {
-            sentry_1.Sentry.capture('Failed to report turtle build metric', err, {
+            sentry_1.Sentry.capture(`Failed to report turtle ${target.kind} metric`, err, {
                 extras: { metrics },
             });
         });
@@ -39,26 +42,29 @@ exports.Datadog = {
         if (!setupOptions) {
             return;
         }
-        const { expoApiV2BaseUrl, turtleBuildId, robotAccessToken } = setupOptions;
-        const log = {
-            buildId: turtleBuildId,
-            message,
-            tags,
-        };
-        const uploadPromise = (0, turtleFetch_1.turtleFetch)(new URL('turtle-builds/logs', expoApiV2BaseUrl).toString(), 'POST', {
+        const { expoApiV2BaseUrl, robotAccessToken, target } = setupOptions;
+        const log = target.kind === 'build'
+            ? { buildId: target.turtleBuildId, message, tags }
+            : { jobRunId: target.turtleJobRunId, message, tags };
+        const logsPath = target.kind === 'build' ? 'turtle-builds/logs' : 'turtle-job-runs/logs';
+        const uploadPromise = (0, turtleFetch_1.turtleFetch)(new URL(logsPath, expoApiV2BaseUrl).toString(), 'POST', {
             json: log,
             headers: {
                 Authorization: `Bearer ${robotAccessToken}`,
             },
             shouldThrowOnNotOk: false,
         }).catch(err => {
-            sentry_1.Sentry.capture('Failed to report turtle build log', err, {
+            sentry_1.Sentry.capture(`Failed to report turtle ${target.kind} log`, err, {
                 extras: { log },
             });
         });
         pendingUploads.push(uploadPromise);
     },
     async flushAsync() {
-        await Promise.allSettled(pendingUploads);
+        // Rotate so each flush only awaits its own batch; uploads enqueued during the
+        // await land in the fresh array for a later flush.
+        const uploads = pendingUploads;
+        pendingUploads = [];
+        await Promise.allSettled(uploads);
     },
 };

package/dist/steps/functions/startIosSimulator.js

@@ -52,6 +52,12 @@ function createStartIosSimulatorBuildFunction() {
                 deviceIdentifier: originalDeviceIdentifier,
                 env,
             });
+            try {
+                await IosSimulatorUtils_1.IosSimulatorUtils.disableApsdAsync({ udid, env });
+            }
+            catch (err) {
+                logger.warn({ err }, 'Failed to disable apsd in the Simulator.');
+            }
             await IosSimulatorUtils_1.IosSimulatorUtils.waitForReadyAsync({ udid, env });
             logger.info('');
             const device = await IosSimulatorUtils_1.IosSimulatorUtils.getDeviceAsync({ udid, env });
@@ -76,6 +82,12 @@ function createStartIosSimulatorBuildFunction() {
                         deviceIdentifier: cloneDeviceName,
                         env,
                     });
+                    try {
+                        await IosSimulatorUtils_1.IosSimulatorUtils.disableApsdAsync({ udid: cloneUdid, env });
+                    }
+                    catch (err) {
+                        logger.warn({ err }, 'Failed to disable apsd in the Simulator.');
+                    }
                     await IosSimulatorUtils_1.IosSimulatorUtils.waitForReadyAsync({
                         udid: cloneUdid,
                         env,

package/dist/steps/utils/remoteDeviceRunSession.js

@@ -135,7 +135,7 @@ async function startServeSimWithTunnelAsync({ baseDomain, env, logger, timeoutMs
             '--stream-quality',
             '0.55',
             '--codec',
-            'h264',
+            'webrtc',
         ],
         env,
     });

package/dist/utils/IosSimulatorUtils.d.ts

@@ -49,6 +49,10 @@ export declare namespace IosSimulatorUtils {
         udid: IosSimulatorUuid;
         env: NodeJS.ProcessEnv;
     }): Promise<void>;
+    export function disableApsdAsync({ udid, env, }: {
+        udid: IosSimulatorUuid;
+        env: NodeJS.ProcessEnv;
+    }): Promise<void>;
     export function collectLogsAsync({ deviceIdentifier, env, }: {
         deviceIdentifier: IosSimulatorName | IosSimulatorUuid;
         env: NodeJS.ProcessEnv;

package/dist/utils/IosSimulatorUtils.js

@@ -77,6 +77,11 @@ var IosSimulatorUtils;
         });
     }
     IosSimulatorUtils.waitForReadyAsync = waitForReadyAsync;
+    async function disableApsdAsync({ udid, env, }) {
+        await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'spawn', udid, 'launchctl', 'disable', 'system/com.apple.apsd'], { env });
+        await (0, turtle_spawn_1.default)('xcrun', ['simctl', 'spawn', udid, 'launchctl', 'bootout', 'system/com.apple.apsd'], { env });
+    }
+    IosSimulatorUtils.disableApsdAsync = disableApsdAsync;
     async function collectLogsAsync({ deviceIdentifier, env, }) {
         const outputDir = await node_fs_1.default.promises.mkdtemp(node_path_1.default.join(node_os_1.default.tmpdir(), 'ios-simulator-logs-'));
         const outputPath = node_path_1.default.join(outputDir, `${deviceIdentifier}.logarchive`);

package/dist/utils/expoUpdatesEmbedded.d.ts

@@ -0,0 +1,3 @@
+import { BuildJob } from '@expo/eas-build-job';
+import { BuildContext } from '../context';
+export declare function uploadEmbeddedBundleAsync(ctx: BuildContext<BuildJob>): Promise<void>;

package/dist/utils/expoUpdatesEmbedded.js

@@ -0,0 +1,109 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uploadEmbeddedBundleAsync = uploadEmbeddedBundleAsync;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const logger_1 = require("@expo/logger");
+const results_1 = require("@expo/results");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const os_1 = __importDefault(require("os"));
+const path_1 = __importDefault(require("path"));
+const node_stream_zip_1 = __importDefault(require("node-stream-zip"));
+const artifacts_1 = require("./artifacts");
+const easCli_1 = require("./easCli");
+const resolve_1 = require("../ios/resolve");
+const expoUpdates_1 = require("./expoUpdates");
+async function uploadEmbeddedBundleAsync(ctx) {
+    if (!(await (0, expoUpdates_1.isEASUpdateConfigured)(ctx))) {
+        ctx.markBuildPhaseSkipped();
+        return;
+    }
+    const { platform } = ctx.job;
+    if (platform === eas_build_job_1.Platform.IOS && ctx.job.simulator) {
+        ctx.markBuildPhaseSkipped();
+        return;
+    }
+    const channel = ctx.job.updates?.channel;
+    if (!channel) {
+        ctx.logger.warn('Skipping embedded bundle upload: no channel configured for this build profile.');
+        ctx.markBuildPhaseHasWarnings();
+        return;
+    }
+    const projectDir = ctx.getReactNativeProjectDirectory();
+    let archivePattern;
+    if (platform === eas_build_job_1.Platform.IOS) {
+        archivePattern = (0, resolve_1.resolveArtifactPath)(ctx);
+    }
+    else if (platform === eas_build_job_1.Platform.ANDROID) {
+        archivePattern =
+            ctx.job.applicationArchivePath ??
+                'android/app/build/outputs/**/*.{apk,aab}';
+    }
+    else {
+        throw new Error(`Uploading embedded updates is not supported for the ${platform} platform.`);
+    }
+    const [archivePath] = await (0, artifacts_1.findArtifacts)({
+        rootDir: projectDir,
+        patternOrPath: archivePattern,
+        logger: null,
+    }).catch(() => []);
+    if (!archivePath) {
+        ctx.logger.warn('Skipping embedded bundle upload: build archive not found.');
+        ctx.markBuildPhaseHasWarnings();
+        return;
+    }
+    const tmpDir = await fs_extra_1.default.mkdtemp(path_1.default.join(os_1.default.tmpdir(), 'eas-embedded-bundle-'));
+    const bundleName = platform === eas_build_job_1.Platform.IOS ? 'main.jsbundle' : 'index.android.bundle';
+    const bundlePath = path_1.default.join(tmpDir, bundleName);
+    const manifestPath = path_1.default.join(tmpDir, 'app.manifest');
+    const zip = new node_stream_zip_1.default.async({ file: archivePath });
+    try {
+        const entries = Object.values(await zip.entries());
+        const bundleEntry = entries.find(e => platform === eas_build_job_1.Platform.IOS
+            ? e.name.endsWith('/main.jsbundle')
+            : e.name.endsWith('assets/index.android.bundle'));
+        const manifestEntry = entries.find(e => platform === eas_build_job_1.Platform.IOS
+            ? e.name.includes('EXUpdates.bundle/app.manifest')
+            : e.name.endsWith('assets/app.manifest'));
+        if (!bundleEntry || !manifestEntry) {
+            ctx.logger.warn('Skipping embedded bundle upload: bundle or manifest not found in archive.');
+            ctx.markBuildPhaseHasWarnings();
+            return;
+        }
+        await zip.extract(bundleEntry.name, bundlePath);
+        await zip.extract(manifestEntry.name, manifestPath);
+        const args = [
+            'update:embedded:upload',
+            '--platform',
+            platform,
+            '--bundle',
+            bundlePath,
+            '--manifest',
+            manifestPath,
+            '--channel',
+            channel,
+            '--non-interactive',
+        ];
+        if (ctx.env.EAS_BUILD_ID) {
+            args.push('--build-id', ctx.env.EAS_BUILD_ID);
+        }
+        await (0, easCli_1.runEasCliCommand)({
+            args,
+            options: {
+                cwd: projectDir,
+                env: ctx.env,
+                logger: ctx.logger,
+                mode: logger_1.PipeMode.STDERR_ONLY_AS_STDOUT,
+            },
+        });
+    }
+    catch (err) {
+        ctx.logger.warn({ err }, 'Failed to upload embedded bundle.');
+        ctx.markBuildPhaseHasWarnings();
+    }
+    finally {
+        await (0, results_1.asyncResult)(zip.close());
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expo/build-tools",
-  "version": "20.0.0",
+  "version": "20.1.0",
   "bugs": "https://github.com/expo/eas-cli/issues",
   "license": "BUSL-1.1",
   "author": "Expo <support@expo.io>",
@@ -38,14 +38,14 @@
     "@expo/config": "55.0.10",
     "@expo/config-plugins": "55.0.7",
     "@expo/downloader": "20.0.0",
-    "@expo/eas-build-job": "20.0.0",
+    "@expo/eas-build-job": "20.1.0",
     "@expo/env": "^0.4.0",
     "@expo/logger": "20.0.0",
     "@expo/package-manager": "1.9.10",
     "@expo/plist": "^0.2.0",
     "@expo/results": "^1.0.0",
     "@expo/spawn-async": "1.7.2",
-    "@expo/steps": "20.0.0",
+    "@expo/steps": "20.1.0",
     "@expo/template-file": "20.0.0",
     "@expo/turtle-spawn": "20.0.0",
     "@expo/xcpretty": "^4.3.1",
@@ -100,5 +100,5 @@
     "typescript": "^5.5.4",
     "uuid": "^9.0.1"
   },
-  "gitHead": "890387b3b62c2ed2a946ec0e1197ff69f3e29342"
+  "gitHead": "33225d2b73a34db5cbdfeaa537aedb6c6b4a84af"
 }